diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
deleted file mode 100644
index d9177bebb5..0000000000
--- a/.eslintignore.errorfiles
+++ /dev/null
@@ -1,16 +0,0 @@
-# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
-
-src/Markdown.js
-src/NodeAnimator.js
-src/components/structures/RoomDirectory.js
-src/components/views/rooms/MemberList.js
-src/ratelimitedfunc.js
-src/utils/DMRoomMap.js
-src/utils/MultiInviter.js
-test/components/structures/MessagePanel-test.js
-test/components/views/dialogs/InteractiveAuthDialog-test.js
-test/mock-clock.js
-src/component-index.js
-test/end-to-end-tests/node_modules/
-test/end-to-end-tests/element/
-test/end-to-end-tests/synapse/
diff --git a/.eslintrc.js b/.eslintrc.js
index 9ae51f9bc5..9d68942228 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,9 @@
 module.exports = {
-    extends: ["matrix-org", "matrix-org/react-legacy"],
-    parser: "babel-eslint",
-
+    plugins: ["matrix-org"],
+    extends: [
+        "plugin:matrix-org/babel",
+        "plugin:matrix-org/react",
+    ],
     env: {
         browser: true,
         node: true,
@@ -15,35 +17,65 @@ module.exports = {
         "prefer-promise-reject-errors": "off",
         "no-async-promise-executor": "off",
         "quotes": "off",
-    },
+        "no-extra-boolean-cast": "off",
 
+        // Bind or arrow functions in props causes performance issues (but we
+        // currently use them in some places).
+        // It's disabled here, but we should using it sparingly.
+        "react/jsx-no-bind": "off",
+        "react/jsx-key": ["error"],
+
+        "no-restricted-properties": [
+            "error",
+            ...buildRestrictedPropertiesOptions(
+                ["window.innerHeight", "window.innerWidth", "window.visualViewport"],
+                "Use UIStore to access window dimensions instead.",
+            ),
+            ...buildRestrictedPropertiesOptions(
+                ["*.mxcUrlToHttp", "*.getHttpUriForMxc"],
+                "Use Media helper instead to centralise access for customisation.",
+            ),
+        ],
+    },
     overrides: [{
-        "files": ["src/**/*.{ts,tsx}"],
-        "extends": ["matrix-org/ts"],
-        "rules": {
+        files: [
+            "src/**/*.{ts,tsx}",
+            "test/**/*.{ts,tsx}",
+        ],
+        extends: [
+            "plugin:matrix-org/typescript",
+            "plugin:matrix-org/react",
+        ],
+        rules: {
+            // Things we do that break the ideal style
+            "prefer-promise-reject-errors": "off",
+            "quotes": "off",
+            "no-extra-boolean-cast": "off",
+
+            // Remove Babel things manually due to override limitations
+            "@babel/no-invalid-this": ["off"],
+
             // We're okay being explicit at the moment
             "@typescript-eslint/no-empty-interface": "off",
             // We disable this while we're transitioning
             "@typescript-eslint/no-explicit-any": "off",
             // We'd rather not do this but we do
             "@typescript-eslint/ban-ts-comment": "off",
-
-            "quotes": "off",
-            "no-extra-boolean-cast": "off",
-            "no-restricted-properties": [
-                "error",
-                ...buildRestrictedPropertiesOptions(
-                    ["window.innerHeight", "window.innerWidth", "window.visualViewport"],
-                    "Use UIStore to access window dimensions instead",
-                ),
-            ],
         },
     }],
+    settings: {
+        react: {
+            version: "detect",
+        }
+    }
 };
 
 function buildRestrictedPropertiesOptions(properties, message) {
     return properties.map(prop => {
-        const [object, property] = prop.split(".");
+        let [object, property] = prop.split(".");
+        if (object === "*") {
+            object = undefined;
+        }
         return {
             object,
             property,
diff --git a/.flowconfig b/.flowconfig
deleted file mode 100644
index 81770c6585..0000000000
--- a/.flowconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-[include]
-src/**/*.js
-test/**/*.js
-
-[ignore]
-node_modules/
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..2c068fff33
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @matrix-org/element-web
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..e9ede862d2
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
+
+<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
+
+<!-- To specify text for the changelog entry (otherwise the PR title will be used):
+Notes:
+
+Changes in this project generate changelog entries in element-web by default.
+To suppress this:
+
+element-web notes: none
+
+...or to specify different notes:
+element-web notes: <notes>
+-->
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
new file mode 100644
index 0000000000..4f9826391a
--- /dev/null
+++ b/.github/workflows/develop.yml
@@ -0,0 +1,46 @@
+name: Develop
+on:
+    # These tests won't work for non-develop branches at the moment as they
+    # won't pull in the right versions of other repos, so they're only enabled
+    # on develop.
+    push:
+        branches: [develop]
+    pull_request:
+        branches: [develop]
+jobs:
+    end-to-end:
+        runs-on: ubuntu-latest
+        env: 
+          PR_NUMBER: ${{github.event.number}}
+        container: vectorim/element-web-ci-e2etests-env:latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+            - name: Prepare End-to-End tests
+              run: ./scripts/ci/prepare-end-to-end-tests.sh
+            - name: Run End-to-End tests
+              run: ./scripts/ci/run-end-to-end-tests.sh
+            - name: Archive logs
+              uses: actions/upload-artifact@v2
+              if: ${{ always() }}
+              with:
+                path: |
+                    test/end-to-end-tests/logs/**/*
+                    test/end-to-end-tests/synapse/installations/consent/homeserver.log
+                retention-days: 14
+            - name: Download previous benchmark data
+              uses: actions/cache@v1
+              with:
+                path: ./cache
+                key: ${{ runner.os }}-benchmark
+            - name: Store benchmark result
+              uses: matrix-org/github-action-benchmark@jsperfentry-1
+              with:
+                tool: 'jsperformanceentry'
+                output-file-path: test/end-to-end-tests/performance-entries.json
+                fail-on-alert: false
+                comment-on-alert: false
+                # Only temporary to monitor where failures occur
+                alert-comment-cc-users: '@gsouquet'
+                github-token: ${{ secrets.DEPLOY_GH_PAGES }}
+                auto-push: ${{ github.ref == 'refs/heads/develop' }}
diff --git a/.github/workflows/layered-build.yaml b/.github/workflows/layered-build.yaml
new file mode 100644
index 0000000000..c8717667d7
--- /dev/null
+++ b/.github/workflows/layered-build.yaml
@@ -0,0 +1,33 @@
+name: Layered Preview Build
+on:
+    pull_request:
+        branches: [develop]
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        env:
+          PR_NUMBER: ${{github.event.number}}
+        steps:
+            - uses: actions/checkout@v2
+            - name: Build
+              run: scripts/ci/layered.sh && cd element-web && cp element.io/develop/config.json config.json && CI_PACKAGE=true yarn build
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v2
+              with:
+                  name: previewbuild
+                  path: element-web/webapp
+                  # We'll only use this in a triggered job, then we're done with it
+                  retention-days: 1
+            - uses: actions/github-script@v3.1.0
+              with:
+                script: |
+                    var fs = require('fs');
+                    fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
+            - name: Upload PR Info
+              uses: actions/upload-artifact@v2
+              with:
+                  name: pr.json
+                  path: pr.json
+                  # We'll only use this in a triggered job, then we're done with it
+                  retention-days: 1
+
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
new file mode 100644
index 0000000000..a6a408bdbd
--- /dev/null
+++ b/.github/workflows/netlify.yaml
@@ -0,0 +1,80 @@
+name: Upload Preview Build to Netlify
+on:
+    workflow_run:
+        workflows: ["Layered Preview Build"]
+        types:
+            - completed
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        if: >
+            ${{ github.event.workflow_run.conclusion == 'success' }}
+        steps:
+            # There's a 'download artifact' action but it hasn't been updated for the
+            # workflow_run action (https://github.com/actions/download-artifact/issues/60)
+            # so instead we get this mess:
+            - name: 'Download artifact'
+              uses: actions/github-script@v3.1.0
+              with:
+                script: |
+                  var artifacts = await github.actions.listWorkflowRunArtifacts({
+                     owner: context.repo.owner,
+                     repo: context.repo.repo,
+                     run_id: ${{github.event.workflow_run.id }},
+                  });
+                  var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                    return artifact.name == "previewbuild"
+                  })[0];
+                  var download = await github.actions.downloadArtifact({
+                     owner: context.repo.owner,
+                     repo: context.repo.repo,
+                     artifact_id: matchArtifact.id,
+                     archive_format: 'zip',
+                  });
+                  var fs = require('fs');
+                  fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
+
+                  var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
+                    return artifact.name == "pr.json"
+                  })[0];
+                  var download = await github.actions.downloadArtifact({
+                     owner: context.repo.owner,
+                     repo: context.repo.repo,
+                     artifact_id: prInfoArtifact.id,
+                     archive_format: 'zip',
+                  });
+                  var fs = require('fs');
+                  fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
+            - name: Extract Artifacts
+              run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
+            - name: 'Read PR Info'
+              id: readctx
+              uses: actions/github-script@v3.1.0
+              with:
+                script: |
+                    var fs = require('fs');
+                    var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
+                    console.log(`::set-output name=prnumber::${pr.number}`);
+            - name: Deploy to Netlify
+              id: netlify
+              uses: nwtgck/actions-netlify@v1.2
+              with:
+                  publish-dir: webapp
+                  deploy-message: "Deploy from GitHub Actions"
+                  # These don't work because we're in workflow_run
+                  enable-pull-request-comment: false
+                  enable-commit-comment: false
+              env:
+                  NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+                  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+              timeout-minutes: 1
+            - name: Edit PR Description
+              uses: velas/pr-description@v1.0.1
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  pull-request-number: ${{ steps.readctx.outputs.prnumber }}
+                  description-message: |
+                      Preview: ${{ steps.netlify.outputs.deploy-url }}
+                      ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
+
diff --git a/.github/workflows/preview_changelog.yaml b/.github/workflows/preview_changelog.yaml
new file mode 100644
index 0000000000..d68d19361d
--- /dev/null
+++ b/.github/workflows/preview_changelog.yaml
@@ -0,0 +1,12 @@
+name: Preview Changelog
+on:
+  pull_request_target:
+    types: [ opened, edited, labeled ]
+jobs:
+    changelog:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Preview Changelog
+              uses: matrix-org/allchange@main
+              with:
+                  ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/typecheck.yaml b/.github/workflows/typecheck.yaml
new file mode 100644
index 0000000000..f6ab643958
--- /dev/null
+++ b/.github/workflows/typecheck.yaml
@@ -0,0 +1,26 @@
+name: Type Check
+on:
+    pull_request:
+        branches: [develop]
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        env:
+          PR_NUMBER: ${{github.event.number}}
+        steps:
+            - uses: actions/checkout@v2
+            - uses: c-hive/gha-yarn-cache@v2
+            - name: Install Deps
+              run: "./scripts/ci/install-deps.sh --ignore-scripts"
+            - name: Typecheck
+              run: "yarn run lint:types"
+            - name: Switch js-sdk to release mode
+              run: |
+                  scripts/ci/js-sdk-to-release.js
+                  cd node_modules/matrix-js-sdk
+                  yarn install
+                  yarn run build:compile
+                  yarn run build:types
+            - name: Typecheck (release mode)
+              run: "yarn run lint:types"
+
diff --git a/.gitignore b/.gitignore
index 50aa10fbfd..102f4b5ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ package-lock.json
 
 .DS_Store
 *.tmp
+
+.vscode
+.vscode/
diff --git a/.node-version b/.node-version
new file mode 100644
index 0000000000..8351c19397
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+14
diff --git a/.stylelintrc.js b/.stylelintrc.js
index 0e6de7000f..c044b19a63 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -17,6 +17,7 @@ module.exports = {
         "selector-list-comma-newline-after": null,
         "at-rule-no-unknown": null,
         "no-descending-specificity": null,
+        "no-empty-first-line": true,
         "scss/at-rule-no-unknown": [true, {
             // https://github.com/vector-im/element-web/issues/10544
             "ignoreAtRules": ["define-mixin"],
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3d9afd51d..c28d72a3eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,964 @@
+Changes in [3.31.0](https://github.com/vector-im/element-desktop/releases/tag/v3.31.0) (2021-09-27)
+===================================================================================================
+
+## ✨ Features
+ * Say Joining space instead of Joining room where we know its a space ([\#6818](https://github.com/matrix-org/matrix-react-sdk/pull/6818)). Fixes vector-im/element-web#19064 and vector-im/element-web#19064.
+ * Add warning that some spaces may not be relinked to the newly upgraded room ([\#6805](https://github.com/matrix-org/matrix-react-sdk/pull/6805)). Fixes vector-im/element-web#18858 and vector-im/element-web#18858.
+ * Delabs Spaces, iterate some copy and move communities/space toggle to preferences ([\#6594](https://github.com/matrix-org/matrix-react-sdk/pull/6594)). Fixes vector-im/element-web#18088, vector-im/element-web#18524 vector-im/element-web#18088 and vector-im/element-web#18088.
+ * Show "Message" in the user info panel instead of "Start chat" ([\#6319](https://github.com/matrix-org/matrix-react-sdk/pull/6319)). Fixes vector-im/element-web#17877 and vector-im/element-web#17877. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix space keyboard shortcuts conflicting with native zoom shortcuts ([\#6804](https://github.com/matrix-org/matrix-react-sdk/pull/6804)).
+ * Replace plain text emoji at the end of a line ([\#6784](https://github.com/matrix-org/matrix-react-sdk/pull/6784)). Fixes vector-im/element-web#18833 and vector-im/element-web#18833. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Simplify Space Panel layout and fix some edge cases ([\#6800](https://github.com/matrix-org/matrix-react-sdk/pull/6800)). Fixes vector-im/element-web#18694 and vector-im/element-web#18694.
+ * Show unsent message warning on Space Panel buttons ([\#6778](https://github.com/matrix-org/matrix-react-sdk/pull/6778)). Fixes vector-im/element-web#18891 and vector-im/element-web#18891.
+ * Hide mute/unmute button in UserInfo for Spaces as it makes no sense ([\#6790](https://github.com/matrix-org/matrix-react-sdk/pull/6790)). Fixes vector-im/element-web#19007 and vector-im/element-web#19007.
+ * Fix automatic field population in space create menu not validating ([\#6792](https://github.com/matrix-org/matrix-react-sdk/pull/6792)). Fixes vector-im/element-web#19005 and vector-im/element-web#19005.
+ * Optimize input label transition on focus ([\#6783](https://github.com/matrix-org/matrix-react-sdk/pull/6783)). Fixes vector-im/element-web#12876 and vector-im/element-web#12876. Contributed by [MadLittleMods](https://github.com/MadLittleMods).
+ * Adapt and re-use the RolesRoomSettingsTab for Spaces ([\#6779](https://github.com/matrix-org/matrix-react-sdk/pull/6779)). Fixes vector-im/element-web#18908 vector-im/element-web#18909 and vector-im/element-web#18908.
+ * Deduplicate join rule management between rooms and spaces ([\#6724](https://github.com/matrix-org/matrix-react-sdk/pull/6724)). Fixes vector-im/element-web#18798 and vector-im/element-web#18798.
+ * Add config option to turn on in-room event sending timing metrics ([\#6766](https://github.com/matrix-org/matrix-react-sdk/pull/6766)).
+ * Improve the upgrade for restricted user experience ([\#6764](https://github.com/matrix-org/matrix-react-sdk/pull/6764)). Fixes vector-im/element-web#18677 and vector-im/element-web#18677.
+ * Improve tooltips on space quick actions and explore button ([\#6760](https://github.com/matrix-org/matrix-react-sdk/pull/6760)). Fixes vector-im/element-web#18528 and vector-im/element-web#18528.
+ * Make space members and user info behave more expectedly ([\#6765](https://github.com/matrix-org/matrix-react-sdk/pull/6765)). Fixes vector-im/element-web#17018 and vector-im/element-web#17018.
+ * hide no-op m.room.encryption events and better word param changes ([\#6747](https://github.com/matrix-org/matrix-react-sdk/pull/6747)). Fixes vector-im/element-web#18597 and vector-im/element-web#18597.
+ * Respect m.space.parent relations if they hold valid permissions ([\#6746](https://github.com/matrix-org/matrix-react-sdk/pull/6746)). Fixes vector-im/element-web#10935 and vector-im/element-web#10935.
+ * Space panel accessibility improvements ([\#6744](https://github.com/matrix-org/matrix-react-sdk/pull/6744)). Fixes vector-im/element-web#18892 and vector-im/element-web#18892.
+
+## 🐛 Bug Fixes
+ * Fix spacing for message composer buttons ([\#6854](https://github.com/matrix-org/matrix-react-sdk/pull/6854)).
+ * Fix accessing field on oobData which may be undefined ([\#6830](https://github.com/matrix-org/matrix-react-sdk/pull/6830)). Fixes vector-im/element-web#19085 and vector-im/element-web#19085.
+ * Fix reactions aria-label not being a string and thus being read as [Object object] ([\#6828](https://github.com/matrix-org/matrix-react-sdk/pull/6828)).
+ * Fix missing null guard in space hierarchy pagination ([\#6821](https://github.com/matrix-org/matrix-react-sdk/pull/6821)). Fixes matrix-org/element-web-rageshakes#6299 and matrix-org/element-web-rageshakes#6299.
+ * Fix checks to show prompt to start new chats ([\#6812](https://github.com/matrix-org/matrix-react-sdk/pull/6812)).
+ * Fix room list scroll jumps ([\#6777](https://github.com/matrix-org/matrix-react-sdk/pull/6777)). Fixes vector-im/element-web#17460 vector-im/element-web#18440 and vector-im/element-web#17460. Contributed by [robintown](https://github.com/robintown).
+ * Fix various message bubble alignment issues ([\#6785](https://github.com/matrix-org/matrix-react-sdk/pull/6785)). Fixes vector-im/element-web#18293, vector-im/element-web#18294 vector-im/element-web#18305 and vector-im/element-web#18293. Contributed by [robintown](https://github.com/robintown).
+ * Make message bubble font size consistent ([\#6795](https://github.com/matrix-org/matrix-react-sdk/pull/6795)). Contributed by [robintown](https://github.com/robintown).
+ * Fix edge cases around joining new room which does not belong to active space ([\#6797](https://github.com/matrix-org/matrix-react-sdk/pull/6797)). Fixes vector-im/element-web#19025 and vector-im/element-web#19025.
+ * Fix edge case space issues around creation and initial view ([\#6798](https://github.com/matrix-org/matrix-react-sdk/pull/6798)). Fixes vector-im/element-web#19023 and vector-im/element-web#19023.
+ * Stop spinner on space preview if the join fails ([\#6803](https://github.com/matrix-org/matrix-react-sdk/pull/6803)). Fixes vector-im/element-web#19034 and vector-im/element-web#19034.
+ * Fix emoji picker and stickerpicker not appearing correctly when opened ([\#6793](https://github.com/matrix-org/matrix-react-sdk/pull/6793)). Fixes vector-im/element-web#19012 and vector-im/element-web#19012. Contributed by [Palid](https://github.com/Palid).
+ * Fix autocomplete not having y-scroll ([\#6794](https://github.com/matrix-org/matrix-react-sdk/pull/6794)). Fixes vector-im/element-web#18997 and vector-im/element-web#18997. Contributed by [Palid](https://github.com/Palid).
+ * Fix broken edge case with public space creation with no alias ([\#6791](https://github.com/matrix-org/matrix-react-sdk/pull/6791)). Fixes vector-im/element-web#19003 and vector-im/element-web#19003.
+ * Redirect from /#/welcome to /#/home if already logged in ([\#6786](https://github.com/matrix-org/matrix-react-sdk/pull/6786)). Fixes vector-im/element-web#18990 and vector-im/element-web#18990. Contributed by [aaronraimist](https://github.com/aaronraimist).
+ * Fix build issues from two conflicting PRs landing without merge conflict ([\#6780](https://github.com/matrix-org/matrix-react-sdk/pull/6780)).
+ * Render guest settings only in public rooms/spaces ([\#6693](https://github.com/matrix-org/matrix-react-sdk/pull/6693)). Fixes vector-im/element-web#18776 and vector-im/element-web#18776. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix message bubble corners being wrong in the presence of hidden events ([\#6776](https://github.com/matrix-org/matrix-react-sdk/pull/6776)). Fixes vector-im/element-web#18124 and vector-im/element-web#18124. Contributed by [robintown](https://github.com/robintown).
+ * Debounce read marker update on scroll ([\#6771](https://github.com/matrix-org/matrix-react-sdk/pull/6771)). Fixes vector-im/element-web#18961 and vector-im/element-web#18961.
+ * Use cursor:pointer on space panel buttons ([\#6770](https://github.com/matrix-org/matrix-react-sdk/pull/6770)). Fixes vector-im/element-web#18951 and vector-im/element-web#18951.
+ * Fix regressed tab view buttons in space update toast ([\#6761](https://github.com/matrix-org/matrix-react-sdk/pull/6761)). Fixes vector-im/element-web#18781 and vector-im/element-web#18781.
+
+Changes in [3.31.0-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v3.31.0-rc.2) (2021-09-22)
+=============================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix spacing for message composer buttons ([\#6854](https://github.com/matrix-org/matrix-react-sdk/pull/6854)).
+
+Changes in [3.31.0-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v3.31.0-rc.1) (2021-09-21)
+=============================================================================================================
+
+## ✨ Features
+ * Say Joining space instead of Joining room where we know its a space ([\#6818](https://github.com/matrix-org/matrix-react-sdk/pull/6818)). Fixes vector-im/element-web#19064 and vector-im/element-web#19064.
+ * Add warning that some spaces may not be relinked to the newly upgraded room ([\#6805](https://github.com/matrix-org/matrix-react-sdk/pull/6805)). Fixes vector-im/element-web#18858 and vector-im/element-web#18858.
+ * Delabs Spaces, iterate some copy and move communities/space toggle to preferences ([\#6594](https://github.com/matrix-org/matrix-react-sdk/pull/6594)). Fixes vector-im/element-web#18088, vector-im/element-web#18524 vector-im/element-web#18088 and vector-im/element-web#18088.
+ * Show "Message" in the user info panel instead of "Start chat" ([\#6319](https://github.com/matrix-org/matrix-react-sdk/pull/6319)). Fixes vector-im/element-web#17877 and vector-im/element-web#17877. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix space keyboard shortcuts conflicting with native zoom shortcuts ([\#6804](https://github.com/matrix-org/matrix-react-sdk/pull/6804)).
+ * Replace plain text emoji at the end of a line ([\#6784](https://github.com/matrix-org/matrix-react-sdk/pull/6784)). Fixes vector-im/element-web#18833 and vector-im/element-web#18833. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Simplify Space Panel layout and fix some edge cases ([\#6800](https://github.com/matrix-org/matrix-react-sdk/pull/6800)). Fixes vector-im/element-web#18694 and vector-im/element-web#18694.
+ * Show unsent message warning on Space Panel buttons ([\#6778](https://github.com/matrix-org/matrix-react-sdk/pull/6778)). Fixes vector-im/element-web#18891 and vector-im/element-web#18891.
+ * Hide mute/unmute button in UserInfo for Spaces as it makes no sense ([\#6790](https://github.com/matrix-org/matrix-react-sdk/pull/6790)). Fixes vector-im/element-web#19007 and vector-im/element-web#19007.
+ * Fix automatic field population in space create menu not validating ([\#6792](https://github.com/matrix-org/matrix-react-sdk/pull/6792)). Fixes vector-im/element-web#19005 and vector-im/element-web#19005.
+ * Optimize input label transition on focus ([\#6783](https://github.com/matrix-org/matrix-react-sdk/pull/6783)). Fixes vector-im/element-web#12876 and vector-im/element-web#12876. Contributed by [MadLittleMods](https://github.com/MadLittleMods).
+ * Adapt and re-use the RolesRoomSettingsTab for Spaces ([\#6779](https://github.com/matrix-org/matrix-react-sdk/pull/6779)). Fixes vector-im/element-web#18908 vector-im/element-web#18909 and vector-im/element-web#18908.
+ * Deduplicate join rule management between rooms and spaces ([\#6724](https://github.com/matrix-org/matrix-react-sdk/pull/6724)). Fixes vector-im/element-web#18798 and vector-im/element-web#18798.
+ * Add config option to turn on in-room event sending timing metrics ([\#6766](https://github.com/matrix-org/matrix-react-sdk/pull/6766)).
+ * Improve the upgrade for restricted user experience ([\#6764](https://github.com/matrix-org/matrix-react-sdk/pull/6764)). Fixes vector-im/element-web#18677 and vector-im/element-web#18677.
+ * Improve tooltips on space quick actions and explore button ([\#6760](https://github.com/matrix-org/matrix-react-sdk/pull/6760)). Fixes vector-im/element-web#18528 and vector-im/element-web#18528.
+ * Make space members and user info behave more expectedly ([\#6765](https://github.com/matrix-org/matrix-react-sdk/pull/6765)). Fixes vector-im/element-web#17018 and vector-im/element-web#17018.
+ * hide no-op m.room.encryption events and better word param changes ([\#6747](https://github.com/matrix-org/matrix-react-sdk/pull/6747)). Fixes vector-im/element-web#18597 and vector-im/element-web#18597.
+ * Respect m.space.parent relations if they hold valid permissions ([\#6746](https://github.com/matrix-org/matrix-react-sdk/pull/6746)). Fixes vector-im/element-web#10935 and vector-im/element-web#10935.
+ * Space panel accessibility improvements ([\#6744](https://github.com/matrix-org/matrix-react-sdk/pull/6744)). Fixes vector-im/element-web#18892 and vector-im/element-web#18892.
+
+## 🐛 Bug Fixes
+ * Revert Firefox composer deletion hacks ([\#6844](https://github.com/matrix-org/matrix-react-sdk/pull/6844)). Fixes vector-im/element-web#19103 and vector-im/element-web#19103. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix accessing field on oobData which may be undefined ([\#6830](https://github.com/matrix-org/matrix-react-sdk/pull/6830)). Fixes vector-im/element-web#19085 and vector-im/element-web#19085.
+ * Fix pill deletion on Firefox 78 ([\#6832](https://github.com/matrix-org/matrix-react-sdk/pull/6832)). Fixes vector-im/element-web#19077 and vector-im/element-web#19077. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix reactions aria-label not being a string and thus being read as [Object object] ([\#6828](https://github.com/matrix-org/matrix-react-sdk/pull/6828)).
+ * Fix missing null guard in space hierarchy pagination ([\#6821](https://github.com/matrix-org/matrix-react-sdk/pull/6821)). Fixes matrix-org/element-web-rageshakes#6299 and matrix-org/element-web-rageshakes#6299.
+ * Fix checks to show prompt to start new chats ([\#6812](https://github.com/matrix-org/matrix-react-sdk/pull/6812)).
+ * Fix room list scroll jumps ([\#6777](https://github.com/matrix-org/matrix-react-sdk/pull/6777)). Fixes vector-im/element-web#17460 vector-im/element-web#18440 and vector-im/element-web#17460. Contributed by [robintown](https://github.com/robintown).
+ * Fix various message bubble alignment issues ([\#6785](https://github.com/matrix-org/matrix-react-sdk/pull/6785)). Fixes vector-im/element-web#18293, vector-im/element-web#18294 vector-im/element-web#18305 and vector-im/element-web#18293. Contributed by [robintown](https://github.com/robintown).
+ * Make message bubble font size consistent ([\#6795](https://github.com/matrix-org/matrix-react-sdk/pull/6795)). Contributed by [robintown](https://github.com/robintown).
+ * Fix edge cases around joining new room which does not belong to active space ([\#6797](https://github.com/matrix-org/matrix-react-sdk/pull/6797)). Fixes vector-im/element-web#19025 and vector-im/element-web#19025.
+ * Fix edge case space issues around creation and initial view ([\#6798](https://github.com/matrix-org/matrix-react-sdk/pull/6798)). Fixes vector-im/element-web#19023 and vector-im/element-web#19023.
+ * Stop spinner on space preview if the join fails ([\#6803](https://github.com/matrix-org/matrix-react-sdk/pull/6803)). Fixes vector-im/element-web#19034 and vector-im/element-web#19034.
+ * Fix emoji picker and stickerpicker not appearing correctly when opened ([\#6793](https://github.com/matrix-org/matrix-react-sdk/pull/6793)). Fixes vector-im/element-web#19012 and vector-im/element-web#19012. Contributed by [Palid](https://github.com/Palid).
+ * Fix autocomplete not having y-scroll ([\#6794](https://github.com/matrix-org/matrix-react-sdk/pull/6794)). Fixes vector-im/element-web#18997 and vector-im/element-web#18997. Contributed by [Palid](https://github.com/Palid).
+ * Fix broken edge case with public space creation with no alias ([\#6791](https://github.com/matrix-org/matrix-react-sdk/pull/6791)). Fixes vector-im/element-web#19003 and vector-im/element-web#19003.
+ * Redirect from /#/welcome to /#/home if already logged in ([\#6786](https://github.com/matrix-org/matrix-react-sdk/pull/6786)). Fixes vector-im/element-web#18990 and vector-im/element-web#18990. Contributed by [aaronraimist](https://github.com/aaronraimist).
+ * Fix build issues from two conflicting PRs landing without merge conflict ([\#6780](https://github.com/matrix-org/matrix-react-sdk/pull/6780)).
+ * Render guest settings only in public rooms/spaces ([\#6693](https://github.com/matrix-org/matrix-react-sdk/pull/6693)). Fixes vector-im/element-web#18776 and vector-im/element-web#18776. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix message bubble corners being wrong in the presence of hidden events ([\#6776](https://github.com/matrix-org/matrix-react-sdk/pull/6776)). Fixes vector-im/element-web#18124 and vector-im/element-web#18124. Contributed by [robintown](https://github.com/robintown).
+ * Debounce read marker update on scroll ([\#6771](https://github.com/matrix-org/matrix-react-sdk/pull/6771)). Fixes vector-im/element-web#18961 and vector-im/element-web#18961.
+ * Use cursor:pointer on space panel buttons ([\#6770](https://github.com/matrix-org/matrix-react-sdk/pull/6770)). Fixes vector-im/element-web#18951 and vector-im/element-web#18951.
+ * Fix regressed tab view buttons in space update toast ([\#6761](https://github.com/matrix-org/matrix-react-sdk/pull/6761)). Fixes vector-im/element-web#18781 and vector-im/element-web#18781.
+
+Changes in [3.30.0](https://github.com/vector-im/element-desktop/releases/tag/v3.30.0) (2021-09-14)
+===================================================================================================
+
+## ✨ Features
+ * Add bubble highlight styling ([\#6582](https://github.com/matrix-org/matrix-react-sdk/pull/6582)). Fixes vector-im/element-web#18295 and vector-im/element-web#18295. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * [Release] Add config option to turn on in-room event sending timing metrics  ([\#6773](https://github.com/matrix-org/matrix-react-sdk/pull/6773)).
+ * Create narrow mode for Composer ([\#6682](https://github.com/matrix-org/matrix-react-sdk/pull/6682)). Fixes vector-im/element-web#18533 and vector-im/element-web#18533.
+ * Prefer matrix.to alias links over room id in spaces & share ([\#6745](https://github.com/matrix-org/matrix-react-sdk/pull/6745)). Fixes vector-im/element-web#18796 and vector-im/element-web#18796.
+ * Stop automatic playback of voice messages if a non-voice message is encountered ([\#6728](https://github.com/matrix-org/matrix-react-sdk/pull/6728)). Fixes vector-im/element-web#18850 and vector-im/element-web#18850.
+ * Show call length during a call ([\#6700](https://github.com/matrix-org/matrix-react-sdk/pull/6700)). Fixes vector-im/element-web#18566 and vector-im/element-web#18566. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Serialize and retry mass-leave when leaving space ([\#6737](https://github.com/matrix-org/matrix-react-sdk/pull/6737)). Fixes vector-im/element-web#18789 and vector-im/element-web#18789.
+ * Improve form handling in and around space creation ([\#6739](https://github.com/matrix-org/matrix-react-sdk/pull/6739)). Fixes vector-im/element-web#18775 and vector-im/element-web#18775.
+ * Split autoplay GIFs and videos into different settings ([\#6726](https://github.com/matrix-org/matrix-react-sdk/pull/6726)). Fixes vector-im/element-web#5771 and vector-im/element-web#5771. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Add autoplay for voice messages ([\#6710](https://github.com/matrix-org/matrix-react-sdk/pull/6710)). Fixes vector-im/element-web#18804, vector-im/element-web#18715, vector-im/element-web#18714 vector-im/element-web#17961 and vector-im/element-web#18804.
+ * Allow to use basic html to format invite messages ([\#6703](https://github.com/matrix-org/matrix-react-sdk/pull/6703)). Fixes vector-im/element-web#15738 and vector-im/element-web#15738. Contributed by [skolmer](https://github.com/skolmer).
+ * Allow widgets, when eligible, to interact with more rooms as per MSC2762 ([\#6684](https://github.com/matrix-org/matrix-react-sdk/pull/6684)).
+ * Remove arbitrary limits from send/receive events for widgets ([\#6719](https://github.com/matrix-org/matrix-react-sdk/pull/6719)). Fixes vector-im/element-web#17994 and vector-im/element-web#17994.
+ * Reload suggested rooms if we see the state change down /sync ([\#6715](https://github.com/matrix-org/matrix-react-sdk/pull/6715)). Fixes vector-im/element-web#18761 and vector-im/element-web#18761.
+ * When creating private spaces, make the initial rooms restricted if supported ([\#6721](https://github.com/matrix-org/matrix-react-sdk/pull/6721)). Fixes vector-im/element-web#18722 and vector-im/element-web#18722.
+ * Threading exploration work ([\#6658](https://github.com/matrix-org/matrix-react-sdk/pull/6658)). Fixes vector-im/element-web#18532 and vector-im/element-web#18532.
+ * Default to `Don't leave any` when leaving a space ([\#6697](https://github.com/matrix-org/matrix-react-sdk/pull/6697)). Fixes vector-im/element-web#18592 and vector-im/element-web#18592. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Special case redaction event sending from widgets per MSC2762 ([\#6686](https://github.com/matrix-org/matrix-react-sdk/pull/6686)). Fixes vector-im/element-web#18573 and vector-im/element-web#18573.
+ * Add active speaker indicators ([\#6639](https://github.com/matrix-org/matrix-react-sdk/pull/6639)). Fixes vector-im/element-web#17627 and vector-im/element-web#17627. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Increase general app performance by optimizing layers ([\#6644](https://github.com/matrix-org/matrix-react-sdk/pull/6644)). Fixes vector-im/element-web#18730 and vector-im/element-web#18730. Contributed by [Palid](https://github.com/Palid).
+
+## 🐛 Bug Fixes
+ * Fix autocomplete not having y-scroll ([\#6802](https://github.com/matrix-org/matrix-react-sdk/pull/6802)).
+ * Fix emoji picker and stickerpicker not appearing correctly when opened ([\#6801](https://github.com/matrix-org/matrix-react-sdk/pull/6801)).
+ * Debounce read marker update on scroll ([\#6774](https://github.com/matrix-org/matrix-react-sdk/pull/6774)).
+ * Fix Space creation wizard go to my first room button behaviour ([\#6748](https://github.com/matrix-org/matrix-react-sdk/pull/6748)). Fixes vector-im/element-web#18764 and vector-im/element-web#18764.
+ * Fix scroll being stuck at bottom ([\#6751](https://github.com/matrix-org/matrix-react-sdk/pull/6751)). Fixes vector-im/element-web#18903 and vector-im/element-web#18903.
+ * Fix widgets not remembering identity verification when asked to. ([\#6742](https://github.com/matrix-org/matrix-react-sdk/pull/6742)). Fixes vector-im/element-web#15631 and vector-im/element-web#15631.
+ * Add missing pluralisation i18n strings for Spaces ([\#6738](https://github.com/matrix-org/matrix-react-sdk/pull/6738)). Fixes vector-im/element-web#18780 and vector-im/element-web#18780.
+ * Make ForgotPassword UX slightly more user friendly ([\#6636](https://github.com/matrix-org/matrix-react-sdk/pull/6636)). Fixes vector-im/element-web#11531 and vector-im/element-web#11531. Contributed by [Palid](https://github.com/Palid).
+ * Don't context switch room on SpaceStore ready as it can break permalinks ([\#6730](https://github.com/matrix-org/matrix-react-sdk/pull/6730)). Fixes vector-im/element-web#17974 and vector-im/element-web#17974.
+ * Fix explore rooms button not working during space creation wizard ([\#6729](https://github.com/matrix-org/matrix-react-sdk/pull/6729)). Fixes vector-im/element-web#18762 and vector-im/element-web#18762.
+ * Fix bug where one party's media would sometimes not be shown ([\#6731](https://github.com/matrix-org/matrix-react-sdk/pull/6731)).
+ * Only make the initial space rooms suggested by default ([\#6714](https://github.com/matrix-org/matrix-react-sdk/pull/6714)). Fixes vector-im/element-web#18760 and vector-im/element-web#18760.
+ * Replace fake username in EventTilePreview with a proper loading state ([\#6702](https://github.com/matrix-org/matrix-react-sdk/pull/6702)). Fixes vector-im/element-web#15897 and vector-im/element-web#15897. Contributed by [skolmer](https://github.com/skolmer).
+ * Don't send prehistorical events to widgets during decryption at startup ([\#6695](https://github.com/matrix-org/matrix-react-sdk/pull/6695)). Fixes vector-im/element-web#18060 and vector-im/element-web#18060.
+ * When creating subspaces properly set restricted join rule ([\#6725](https://github.com/matrix-org/matrix-react-sdk/pull/6725)). Fixes vector-im/element-web#18797 and vector-im/element-web#18797.
+ * Fix the Image View not openning for some pinned messages ([\#6723](https://github.com/matrix-org/matrix-react-sdk/pull/6723)). Fixes vector-im/element-web#18422 and vector-im/element-web#18422. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show autocomplete sections vertically ([\#6722](https://github.com/matrix-org/matrix-react-sdk/pull/6722)). Fixes vector-im/element-web#18860 and vector-im/element-web#18860. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix EmojiPicker filtering to lower case emojibase data strings ([\#6717](https://github.com/matrix-org/matrix-react-sdk/pull/6717)). Fixes vector-im/element-web#18686 and vector-im/element-web#18686.
+ * Clear currentRoomId when viewing home page, fixing document title ([\#6716](https://github.com/matrix-org/matrix-react-sdk/pull/6716)). Fixes vector-im/element-web#18668 and vector-im/element-web#18668.
+ * Fix membership updates to Spaces not applying in real-time ([\#6713](https://github.com/matrix-org/matrix-react-sdk/pull/6713)). Fixes vector-im/element-web#18737 and vector-im/element-web#18737.
+ * Don't show a double stacked invite modals when inviting to Spaces ([\#6698](https://github.com/matrix-org/matrix-react-sdk/pull/6698)). Fixes vector-im/element-web#18745 and vector-im/element-web#18745. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remove non-functional DuckDuckGo Autocomplete Provider ([\#6712](https://github.com/matrix-org/matrix-react-sdk/pull/6712)). Fixes vector-im/element-web#18778 and vector-im/element-web#18778.
+ * Filter members on `MemberList` load ([\#6708](https://github.com/matrix-org/matrix-react-sdk/pull/6708)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix improper voice messages being produced in Firefox and sometimes other browsers. ([\#6696](https://github.com/matrix-org/matrix-react-sdk/pull/6696)). Fixes vector-im/element-web#18587 and vector-im/element-web#18587.
+ * Fix client forgetting which capabilities a widget was approved for ([\#6685](https://github.com/matrix-org/matrix-react-sdk/pull/6685)). Fixes vector-im/element-web#18786 and vector-im/element-web#18786.
+ * Fix left panel widgets not remembering collapsed state ([\#6687](https://github.com/matrix-org/matrix-react-sdk/pull/6687)). Fixes vector-im/element-web#17803 and vector-im/element-web#17803.
+ * Fix changelog link colour back to blue ([\#6692](https://github.com/matrix-org/matrix-react-sdk/pull/6692)). Fixes vector-im/element-web#18726 and vector-im/element-web#18726.
+ * Soften codeblock border color ([\#6564](https://github.com/matrix-org/matrix-react-sdk/pull/6564)). Fixes vector-im/element-web#18367 and vector-im/element-web#18367. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Pause ringing more aggressively ([\#6691](https://github.com/matrix-org/matrix-react-sdk/pull/6691)). Fixes vector-im/element-web#18588 and vector-im/element-web#18588. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix command autocomplete ([\#6680](https://github.com/matrix-org/matrix-react-sdk/pull/6680)). Fixes vector-im/element-web#18670 and vector-im/element-web#18670. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Don't re-sort the room-list based on profile/status changes ([\#6595](https://github.com/matrix-org/matrix-react-sdk/pull/6595)). Fixes vector-im/element-web#110 and vector-im/element-web#110. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix codeblock formatting with syntax highlighting on ([\#6681](https://github.com/matrix-org/matrix-react-sdk/pull/6681)). Fixes vector-im/element-web#18739 vector-im/element-web#18365 and vector-im/element-web#18739. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Add padding to the Add button in the notification settings ([\#6665](https://github.com/matrix-org/matrix-react-sdk/pull/6665)). Fixes vector-im/element-web#18706 and vector-im/element-web#18706. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
+Changes in [3.29.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.29.1) (2021-09-13)
+===================================================================================================
+
+## 🔒 SECURITY FIXES
+ * Fix a security issue with message key sharing. See https://matrix.org/blog/2021/09/13/vulnerability-disclosure-key-sharing
+   for details.
+
+Changes in [3.29.0](https://github.com/vector-im/element-desktop/releases/tag/v3.29.0) (2021-08-31)
+===================================================================================================
+
+## ✨ Features
+ * [Release]Increase general app performance by optimizing layers ([\#6672](https://github.com/matrix-org/matrix-react-sdk/pull/6672)). Fixes vector-im/element-web#18730 and vector-im/element-web#18730. Contributed by [Palid](https://github.com/Palid).
+ * Add a warning on E2EE rooms if you try to make them public ([\#5698](https://github.com/matrix-org/matrix-react-sdk/pull/5698)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow pagination of the space hierarchy and use new APIs ([\#6507](https://github.com/matrix-org/matrix-react-sdk/pull/6507)). Fixes vector-im/element-web#18089 and vector-im/element-web#18427.
+ * Improve emoji in composer ([\#6650](https://github.com/matrix-org/matrix-react-sdk/pull/6650)). Fixes vector-im/element-web#18593 and vector-im/element-web#18593. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow playback of replied-to voice message ([\#6629](https://github.com/matrix-org/matrix-react-sdk/pull/6629)). Fixes vector-im/element-web#18599 and vector-im/element-web#18599. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Format autocomplete suggestions vertically ([\#6620](https://github.com/matrix-org/matrix-react-sdk/pull/6620)). Fixes vector-im/element-web#17574 and vector-im/element-web#17574. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remember last `MemberList` search query per-room ([\#6640](https://github.com/matrix-org/matrix-react-sdk/pull/6640)). Fixes vector-im/element-web#18613 and vector-im/element-web#18613. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Sentry rageshakes ([\#6597](https://github.com/matrix-org/matrix-react-sdk/pull/6597)). Fixes vector-im/element-web#11111 and vector-im/element-web#11111. Contributed by [novocaine](https://github.com/novocaine).
+ * Autocomplete has been updated to match modern accessibility standards. Navigate via up/down arrows rather than Tab. Enter or Tab to confirm a suggestion. This should be familiar to Slack & Discord users. You can now use Tab to navigate around the application and do more without touching your mouse. No more accidentally sending half of people's names because the completion didn't fire on Enter! ([\#5659](https://github.com/matrix-org/matrix-react-sdk/pull/5659)). Fixes vector-im/element-web#4872, vector-im/element-web#11071, vector-im/element-web#17171, vector-im/element-web#15646 vector-im/element-web#4872 and vector-im/element-web#4872.
+ * Add new call tile states ([\#6610](https://github.com/matrix-org/matrix-react-sdk/pull/6610)). Fixes vector-im/element-web#18521 and vector-im/element-web#18521. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Left align call tiles ([\#6609](https://github.com/matrix-org/matrix-react-sdk/pull/6609)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Make loading encrypted images look snappier ([\#6590](https://github.com/matrix-org/matrix-react-sdk/pull/6590)). Fixes vector-im/element-web#17878 and vector-im/element-web#17862. Contributed by [Palid](https://github.com/Palid).
+ * Offer a way to create a space based on existing community ([\#6543](https://github.com/matrix-org/matrix-react-sdk/pull/6543)). Fixes vector-im/element-web#18092.
+ * Accessibility improvements in and around Spaces ([\#6569](https://github.com/matrix-org/matrix-react-sdk/pull/6569)). Fixes vector-im/element-web#18094 and vector-im/element-web#18094.
+
+## 🐛 Bug Fixes
+ * [Release] Fix commit edit history ([\#6690](https://github.com/matrix-org/matrix-react-sdk/pull/6690)). Fixes vector-im/element-web#18742 and vector-im/element-web#18742. Contributed by [Palid](https://github.com/Palid).
+ * Fix images not rendering when sent from other clients. ([\#6661](https://github.com/matrix-org/matrix-react-sdk/pull/6661)). Fixes vector-im/element-web#18702 and vector-im/element-web#18702.
+ * Fix autocomplete scrollbar and make the autocomplete a little smaller ([\#6655](https://github.com/matrix-org/matrix-react-sdk/pull/6655)). Fixes vector-im/element-web#18682 and vector-im/element-web#18682. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix replies on the bubble layout ([\#6451](https://github.com/matrix-org/matrix-react-sdk/pull/6451)). Fixes vector-im/element-web#18184. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show "Enable encryption in settings" only when the user can do that ([\#6646](https://github.com/matrix-org/matrix-react-sdk/pull/6646)). Fixes vector-im/element-web#18646 and vector-im/element-web#18646. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix cross signing setup from settings screen ([\#6633](https://github.com/matrix-org/matrix-react-sdk/pull/6633)). Fixes vector-im/element-web#17761 and vector-im/element-web#17761.
+ * Fix call tiles on the bubble layout ([\#6647](https://github.com/matrix-org/matrix-react-sdk/pull/6647)). Fixes vector-im/element-web#18648 and vector-im/element-web#18648. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix error on accessing encrypted media without encryption keys ([\#6625](https://github.com/matrix-org/matrix-react-sdk/pull/6625)). Contributed by [Palid](https://github.com/Palid).
+ * Fix jitsi widget sometimes being permanently stuck in the bottom-right corner ([\#6632](https://github.com/matrix-org/matrix-react-sdk/pull/6632)). Fixes vector-im/element-web#17226 and vector-im/element-web#17226. Contributed by [Palid](https://github.com/Palid).
+ * Fix FilePanel pagination in E2EE rooms ([\#6630](https://github.com/matrix-org/matrix-react-sdk/pull/6630)). Fixes vector-im/element-web#18415 and vector-im/element-web#18415. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix call tile buttons ([\#6624](https://github.com/matrix-org/matrix-react-sdk/pull/6624)). Fixes vector-im/element-web#18565 and vector-im/element-web#18565. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix vertical call tile spacing issues ([\#6621](https://github.com/matrix-org/matrix-react-sdk/pull/6621)). Fixes vector-im/element-web#18558 and vector-im/element-web#18558. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix long display names in call tiles ([\#6618](https://github.com/matrix-org/matrix-react-sdk/pull/6618)). Fixes vector-im/element-web#18562 and vector-im/element-web#18562. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Avoid access token overflow ([\#6616](https://github.com/matrix-org/matrix-react-sdk/pull/6616)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Properly handle media errors  ([\#6615](https://github.com/matrix-org/matrix-react-sdk/pull/6615)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix glare related regressions ([\#6614](https://github.com/matrix-org/matrix-react-sdk/pull/6614)). Fixes vector-im/element-web#18538 and vector-im/element-web#18538. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix long display names in call toasts ([\#6617](https://github.com/matrix-org/matrix-react-sdk/pull/6617)). Fixes vector-im/element-web#18557 and vector-im/element-web#18557. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix PiP of held calls ([\#6611](https://github.com/matrix-org/matrix-react-sdk/pull/6611)). Fixes vector-im/element-web#18539 and vector-im/element-web#18539. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix call tile behaviour on narrow layouts ([\#6556](https://github.com/matrix-org/matrix-react-sdk/pull/6556)). Fixes vector-im/element-web#18398. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix video call persisting when widget removed ([\#6608](https://github.com/matrix-org/matrix-react-sdk/pull/6608)). Fixes vector-im/element-web#15703 and vector-im/element-web#15703.
+ * Fix toast colors ([\#6606](https://github.com/matrix-org/matrix-react-sdk/pull/6606)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remove tiny scrollbar dot from code blocks ([\#6596](https://github.com/matrix-org/matrix-react-sdk/pull/6596)). Fixes vector-im/element-web#18474. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve handling of pills in the composer ([\#6353](https://github.com/matrix-org/matrix-react-sdk/pull/6353)). Fixes vector-im/element-web#10134 vector-im/element-web#10896 and vector-im/element-web#15037. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
+Changes in [3.28.1](https://github.com/vector-im/element-desktop/releases/tag/v3.28.1) (2021-08-17)
+===================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix multiple VoIP regressions ([matrix-org/matrix-js-sdk#1860](https://github.com/matrix-org/matrix-js-sdk/pull/1860)).
+
+Changes in [3.28.0](https://github.com/vector-im/element-desktop/releases/tag/v3.28.0) (2021-08-16)
+===================================================================================================
+
+## ✨ Features
+ * Show how long a call was on call tiles ([\#6570](https://github.com/matrix-org/matrix-react-sdk/pull/6570)). Fixes vector-im/element-web#18405. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Add regional indicators to emoji picker ([\#6490](https://github.com/matrix-org/matrix-react-sdk/pull/6490)). Fixes vector-im/element-web#14963. Contributed by [robintown](https://github.com/robintown).
+ * Make call control buttons accessible to screen reader users ([\#6181](https://github.com/matrix-org/matrix-react-sdk/pull/6181)). Fixes vector-im/element-web#18358. Contributed by [pvagner](https://github.com/pvagner).
+ * Skip sending a thumbnail if it is not a sufficient saving over the original ([\#6559](https://github.com/matrix-org/matrix-react-sdk/pull/6559)). Fixes vector-im/element-web#17906.
+ * Increase PiP snapping speed ([\#6539](https://github.com/matrix-org/matrix-react-sdk/pull/6539)). Fixes vector-im/element-web#18371. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve and move the incoming call toast ([\#6470](https://github.com/matrix-org/matrix-react-sdk/pull/6470)). Fixes vector-im/element-web#17912. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow all of the URL schemes that Firefox allows ([\#6457](https://github.com/matrix-org/matrix-react-sdk/pull/6457)). Contributed by [aaronraimist](https://github.com/aaronraimist).
+ * Improve bubble layout colors ([\#6452](https://github.com/matrix-org/matrix-react-sdk/pull/6452)). Fixes vector-im/element-web#18081. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Spaces let users switch between Home and All Rooms behaviours ([\#6497](https://github.com/matrix-org/matrix-react-sdk/pull/6497)). Fixes vector-im/element-web#18093.
+ * Support for MSC2285 (hidden read receipts) ([\#6390](https://github.com/matrix-org/matrix-react-sdk/pull/6390)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Group pinned message events with MELS ([\#6349](https://github.com/matrix-org/matrix-react-sdk/pull/6349)). Fixes vector-im/element-web#17938. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Make version copiable ([\#6227](https://github.com/matrix-org/matrix-react-sdk/pull/6227)). Fixes vector-im/element-web#17603 and vector-im/element-web#18329. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve voice messages uploading state ([\#6530](https://github.com/matrix-org/matrix-react-sdk/pull/6530)). Fixes vector-im/element-web#18226 and vector-im/element-web#18224.
+ * Add surround with feature ([\#5510](https://github.com/matrix-org/matrix-react-sdk/pull/5510)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve call event tile wording ([\#6545](https://github.com/matrix-org/matrix-react-sdk/pull/6545)). Fixes vector-im/element-web#18376. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show an avatar/a turned off microphone icon for muted users ([\#6486](https://github.com/matrix-org/matrix-react-sdk/pull/6486)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Prompt user to leave rooms/subspaces in a space when leaving space ([\#6424](https://github.com/matrix-org/matrix-react-sdk/pull/6424)). Fixes vector-im/element-web#18071.
+ * Add customisation point to override widget variables ([\#6455](https://github.com/matrix-org/matrix-react-sdk/pull/6455)). Fixes vector-im/element-web#18035.
+ * Add support for screen sharing in 1:1 calls ([\#5992](https://github.com/matrix-org/matrix-react-sdk/pull/5992)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
+## 🐛 Bug Fixes
+ * [Release] Fix glare related regressions ([\#6622](https://github.com/matrix-org/matrix-react-sdk/pull/6622)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * [Release] Fix PiP of held calls ([\#6612](https://github.com/matrix-org/matrix-react-sdk/pull/6612)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * [Release] Fix toast colors ([\#6607](https://github.com/matrix-org/matrix-react-sdk/pull/6607)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix [object Object] in Widget Permissions ([\#6560](https://github.com/matrix-org/matrix-react-sdk/pull/6560)). Fixes vector-im/element-web#18384. Contributed by [Palid](https://github.com/Palid).
+ * Fix right margin for events on IRC layout ([\#6542](https://github.com/matrix-org/matrix-react-sdk/pull/6542)). Fixes vector-im/element-web#18354.
+ * Mirror only usermedia feeds ([\#6512](https://github.com/matrix-org/matrix-react-sdk/pull/6512)). Fixes vector-im/element-web#5633. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix LogoutDialog warning + TypeScript migration ([\#6533](https://github.com/matrix-org/matrix-react-sdk/pull/6533)).
+ * Fix the wrong font being used in the room topic field ([\#6527](https://github.com/matrix-org/matrix-react-sdk/pull/6527)). Fixes vector-im/element-web#18339. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix inconsistent styling for links on hover ([\#6513](https://github.com/matrix-org/matrix-react-sdk/pull/6513)). Contributed by [janogarcia](https://github.com/janogarcia).
+ * Fix incorrect height for encoded placeholder images ([\#6514](https://github.com/matrix-org/matrix-react-sdk/pull/6514)). Contributed by [Palid](https://github.com/Palid).
+ * Fix call events layout for message bubble ([\#6465](https://github.com/matrix-org/matrix-react-sdk/pull/6465)). Fixes vector-im/element-web#18144.
+ * Improve subspaces and some utilities around room/space creation ([\#6458](https://github.com/matrix-org/matrix-react-sdk/pull/6458)). Fixes vector-im/element-web#18090 vector-im/element-web#18091 and vector-im/element-web#17256.
+ * Restore pointer cursor for SenderProfile in message bubbles ([\#6501](https://github.com/matrix-org/matrix-react-sdk/pull/6501)). Fixes vector-im/element-web#18249.
+ * Fix issues with the Call View ([\#6472](https://github.com/matrix-org/matrix-react-sdk/pull/6472)). Fixes vector-im/element-web#18221. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Align event list summary read receipts when using message bubbles ([\#6500](https://github.com/matrix-org/matrix-react-sdk/pull/6500)). Fixes vector-im/element-web#18143.
+ * Better positioning for unbubbled events in timeline ([\#6477](https://github.com/matrix-org/matrix-react-sdk/pull/6477)). Fixes vector-im/element-web#18132.
+ * Realign reactions row with messages in modern layout ([\#6491](https://github.com/matrix-org/matrix-react-sdk/pull/6491)). Fixes vector-im/element-web#18118. Contributed by [robintown](https://github.com/robintown).
+ * Fix CreateRoomDialog exploding when making public room outside of a space ([\#6492](https://github.com/matrix-org/matrix-react-sdk/pull/6492)). Fixes vector-im/element-web#18275.
+ * Fix call crashing because `element` was undefined ([\#6488](https://github.com/matrix-org/matrix-react-sdk/pull/6488)). Fixes vector-im/element-web#18270. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Upscale thumbnails to the container size ([\#6589](https://github.com/matrix-org/matrix-react-sdk/pull/6589)). Fixes vector-im/element-web#18307.
+ * Fix create room dialog in spaces no longer adding to the space ([\#6587](https://github.com/matrix-org/matrix-react-sdk/pull/6587)). Fixes vector-im/element-web#18465.
+ * Don't show a modal on call reject/user hangup ([\#6580](https://github.com/matrix-org/matrix-react-sdk/pull/6580)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fade Call View Buttons after `componentDidMount` ([\#6581](https://github.com/matrix-org/matrix-react-sdk/pull/6581)). Fixes vector-im/element-web#18439. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix missing expand button on codeblocks ([\#6565](https://github.com/matrix-org/matrix-react-sdk/pull/6565)). Fixes vector-im/element-web#18388. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * allow customizing the bubble layout colors ([\#6568](https://github.com/matrix-org/matrix-react-sdk/pull/6568)). Fixes vector-im/element-web#18408. Contributed by [benneti](https://github.com/benneti).
+ * Don't flash "Missed call" when accepting a call ([\#6567](https://github.com/matrix-org/matrix-react-sdk/pull/6567)). Fixes vector-im/element-web#18404. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix clicking whitespaces on replies ([\#6571](https://github.com/matrix-org/matrix-react-sdk/pull/6571)). Fixes vector-im/element-web#18327. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix disabled state for voice messages + send button tooltip ([\#6562](https://github.com/matrix-org/matrix-react-sdk/pull/6562)). Fixes vector-im/element-web#18413.
+ * Fix voice feed being cut-off ([\#6550](https://github.com/matrix-org/matrix-react-sdk/pull/6550)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix sizing issues of the screen picker ([\#6498](https://github.com/matrix-org/matrix-react-sdk/pull/6498)). Fixes vector-im/element-web#18281. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Stop voice messages that are playing when starting a recording ([\#6563](https://github.com/matrix-org/matrix-react-sdk/pull/6563)). Fixes vector-im/element-web#18410.
+ * Properly set style attribute on shared usercontent iframe ([\#6561](https://github.com/matrix-org/matrix-react-sdk/pull/6561)). Fixes vector-im/element-web#18414.
+ * Null guard space inviter to prevent the app exploding ([\#6558](https://github.com/matrix-org/matrix-react-sdk/pull/6558)).
+ * Make the ringing sound mutable/disablable ([\#6534](https://github.com/matrix-org/matrix-react-sdk/pull/6534)). Fixes vector-im/element-web#15591. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix wrong cursor being used in PiP ([\#6551](https://github.com/matrix-org/matrix-react-sdk/pull/6551)). Fixes vector-im/element-web#18383. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Re-pin Jitsi if the widget already exists ([\#6226](https://github.com/matrix-org/matrix-react-sdk/pull/6226)). Fixes vector-im/element-web#17679. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix broken call notification regression ([\#6526](https://github.com/matrix-org/matrix-react-sdk/pull/6526)). Fixes vector-im/element-web#18335. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * createRoom, only send join rule event if we have a join rule to put in it ([\#6516](https://github.com/matrix-org/matrix-react-sdk/pull/6516)). Fixes vector-im/element-web#18301.
+ * Fix clicking pills inside replies ([\#6508](https://github.com/matrix-org/matrix-react-sdk/pull/6508)). Fixes vector-im/element-web#18283. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix grecaptcha regression ([\#6503](https://github.com/matrix-org/matrix-react-sdk/pull/6503)). Fixes vector-im/element-web#18284. Contributed by [Palid](https://github.com/Palid).
+
+Changes in [3.27.0](https://github.com/vector-im/element-desktop/releases/tag/v3.27.0) (2021-08-02)
+===================================================================================================
+
+## 🔒 SECURITY FIXES
+ * Sanitize untrusted variables from message previews before translation
+   Fixes vector-im/element-web#18314
+
+## ✨ Features
+ * Fix editing of `<sub>` & `<sup`> & `<u>`
+   [\#6469](https://github.com/matrix-org/matrix-react-sdk/pull/6469)
+   Fixes vector-im/element-web#18211
+ * Zoom images in lightbox to where the cursor points
+   [\#6418](https://github.com/matrix-org/matrix-react-sdk/pull/6418)
+   Fixes vector-im/element-web#17870
+ * Avoid hitting the settings store from TextForEvent
+   [\#6205](https://github.com/matrix-org/matrix-react-sdk/pull/6205)
+   Fixes vector-im/element-web#17650
+ * Initial MSC3083 + MSC3244 support
+   [\#6212](https://github.com/matrix-org/matrix-react-sdk/pull/6212)
+   Fixes vector-im/element-web#17686 and vector-im/element-web#17661
+ * Navigate to the first room with notifications when clicked on space notification dot
+   [\#5974](https://github.com/matrix-org/matrix-react-sdk/pull/5974)
+ * Add matrix: to the list of permitted URL schemes
+   [\#6388](https://github.com/matrix-org/matrix-react-sdk/pull/6388)
+ * Add "Copy Link" to room context menu
+   [\#6374](https://github.com/matrix-org/matrix-react-sdk/pull/6374)
+ * 💭 Message bubble layout
+   [\#6291](https://github.com/matrix-org/matrix-react-sdk/pull/6291)
+   Fixes vector-im/element-web#4635, vector-im/element-web#17773 vector-im/element-web#16220 and vector-im/element-web#7687
+ * Play only one audio file at a time
+   [\#6417](https://github.com/matrix-org/matrix-react-sdk/pull/6417)
+   Fixes vector-im/element-web#17439
+ * Move download button for media to the action bar
+   [\#6386](https://github.com/matrix-org/matrix-react-sdk/pull/6386)
+   Fixes vector-im/element-web#17943
+ * Improved display of one-to-one call history with summary boxes for each call
+   [\#6121](https://github.com/matrix-org/matrix-react-sdk/pull/6121)
+   Fixes vector-im/element-web#16409
+ * Notification settings UI refresh
+   [\#6352](https://github.com/matrix-org/matrix-react-sdk/pull/6352)
+   Fixes vector-im/element-web#17782
+ * Fix EventIndex double handling events and erroring
+   [\#6385](https://github.com/matrix-org/matrix-react-sdk/pull/6385)
+   Fixes vector-im/element-web#18008
+ * Improve reply rendering
+   [\#3553](https://github.com/matrix-org/matrix-react-sdk/pull/3553)
+   Fixes vector-im/riot-web#9217, vector-im/riot-web#7633, vector-im/riot-web#7530, vector-im/riot-web#7169, vector-im/riot-web#7151, vector-im/riot-web#6692 vector-im/riot-web#6579 and vector-im/element-web#17440
+
+## 🐛 Bug Fixes
+ * Fix CreateRoomDialog exploding when making public room outside of a space
+   [\#6493](https://github.com/matrix-org/matrix-react-sdk/pull/6493)
+ * Fix regression where registration would soft-crash on captcha
+   [\#6505](https://github.com/matrix-org/matrix-react-sdk/pull/6505)
+   Fixes vector-im/element-web#18284
+ * only send join rule event if we have a join rule to put in it
+   [\#6517](https://github.com/matrix-org/matrix-react-sdk/pull/6517)
+ * Improve the new download button's discoverability and interactions.
+   [\#6510](https://github.com/matrix-org/matrix-react-sdk/pull/6510)
+ * Fix voice recording UI looking broken while microphone permissions are being requested.
+   [\#6479](https://github.com/matrix-org/matrix-react-sdk/pull/6479)
+   Fixes vector-im/element-web#18223
+ * Match colors of room and user avatars in DMs
+   [\#6393](https://github.com/matrix-org/matrix-react-sdk/pull/6393)
+   Fixes vector-im/element-web#2449
+ * Fix onPaste handler to work with copying files from Finder
+   [\#5389](https://github.com/matrix-org/matrix-react-sdk/pull/5389)
+   Fixes vector-im/element-web#15536 and vector-im/element-web#16255
+ * Fix infinite pagination loop when offline
+   [\#6478](https://github.com/matrix-org/matrix-react-sdk/pull/6478)
+   Fixes vector-im/element-web#18242
+ * Fix blurhash rounded corners missing regression
+   [\#6467](https://github.com/matrix-org/matrix-react-sdk/pull/6467)
+   Fixes vector-im/element-web#18110
+ * Fix position of the space hierarchy spinner
+   [\#6462](https://github.com/matrix-org/matrix-react-sdk/pull/6462)
+   Fixes vector-im/element-web#18182
+ * Fix display of image messages that lack thumbnails
+   [\#6456](https://github.com/matrix-org/matrix-react-sdk/pull/6456)
+   Fixes vector-im/element-web#18175
+ * Fix crash with large audio files.
+   [\#6436](https://github.com/matrix-org/matrix-react-sdk/pull/6436)
+   Fixes vector-im/element-web#18149
+ * Make diff colors in codeblocks more pleasant
+   [\#6355](https://github.com/matrix-org/matrix-react-sdk/pull/6355)
+   Fixes vector-im/element-web#17939
+ * Show the correct audio file duration while loading the file.
+   [\#6435](https://github.com/matrix-org/matrix-react-sdk/pull/6435)
+   Fixes vector-im/element-web#18160
+ * Fix various timeline settings not applying immediately.
+   [\#6261](https://github.com/matrix-org/matrix-react-sdk/pull/6261)
+   Fixes vector-im/element-web#17748
+ * Fix issues with room list duplication
+   [\#6391](https://github.com/matrix-org/matrix-react-sdk/pull/6391)
+   Fixes vector-im/element-web#14508
+ * Fix grecaptcha throwing useless error sometimes
+   [\#6401](https://github.com/matrix-org/matrix-react-sdk/pull/6401)
+   Fixes vector-im/element-web#15142
+ * Update Emojibase and Twemoji and switch to IamCal (Slack-style) shortcodes
+   [\#6347](https://github.com/matrix-org/matrix-react-sdk/pull/6347)
+   Fixes vector-im/element-web#13857 and vector-im/element-web#13334
+ * Respect compound emojis in default avatar initial generation
+   [\#6397](https://github.com/matrix-org/matrix-react-sdk/pull/6397)
+   Fixes vector-im/element-web#18040
+ * Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
+   [\#6394](https://github.com/matrix-org/matrix-react-sdk/pull/6394)
+   Fixes vector-im/element-web#18031
+ * Standardise spelling and casing of homeserver, identity server, and integration manager
+   [\#6365](https://github.com/matrix-org/matrix-react-sdk/pull/6365)
+ * Fix widgets not receiving decrypted events when they have permission.
+   [\#6371](https://github.com/matrix-org/matrix-react-sdk/pull/6371)
+   Fixes vector-im/element-web#17615
+ * Prevent client hangs when calculating blurhashes
+   [\#6366](https://github.com/matrix-org/matrix-react-sdk/pull/6366)
+   Fixes vector-im/element-web#17945
+ * Exclude state events from widgets reading room events
+   [\#6378](https://github.com/matrix-org/matrix-react-sdk/pull/6378)
+ * Cache feature_spaces\* flags to improve performance
+   [\#6381](https://github.com/matrix-org/matrix-react-sdk/pull/6381)
+
+Changes in [3.26.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.26.0) (2021-07-19)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.26.0-rc.1...v3.26.0)
+
+ * Fix 'User' type import
+   [\#6376](https://github.com/matrix-org/matrix-react-sdk/pull/6376)
+
+Changes in [3.26.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.26.0-rc.1) (2021-07-14)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.25.0...v3.26.0-rc.1)
+
+ * Fix voice messages in right panels
+   [\#6370](https://github.com/matrix-org/matrix-react-sdk/pull/6370)
+ * Use TileShape enum more universally
+   [\#6369](https://github.com/matrix-org/matrix-react-sdk/pull/6369)
+ * Translations update from Weblate
+   [\#6373](https://github.com/matrix-org/matrix-react-sdk/pull/6373)
+ * Hide world readable history option in encrypted rooms
+   [\#5947](https://github.com/matrix-org/matrix-react-sdk/pull/5947)
+ * Make the Image View buttons easier to hit
+   [\#6372](https://github.com/matrix-org/matrix-react-sdk/pull/6372)
+ * Reorder buttons in the Image View
+   [\#6368](https://github.com/matrix-org/matrix-react-sdk/pull/6368)
+ * Add VS Code to gitignore
+   [\#6367](https://github.com/matrix-org/matrix-react-sdk/pull/6367)
+ * Fix inviter exploding due to member being null
+   [\#6362](https://github.com/matrix-org/matrix-react-sdk/pull/6362)
+ * Increase sample count in voice message thumbnail
+   [\#6359](https://github.com/matrix-org/matrix-react-sdk/pull/6359)
+ * Improve arraySeed utility
+   [\#6360](https://github.com/matrix-org/matrix-react-sdk/pull/6360)
+ * Convert FontManager to TS and stub it out for tests
+   [\#6358](https://github.com/matrix-org/matrix-react-sdk/pull/6358)
+ * Adjust recording waveform behaviour for voice messages
+   [\#6357](https://github.com/matrix-org/matrix-react-sdk/pull/6357)
+ * Do not honor string power levels
+   [\#6245](https://github.com/matrix-org/matrix-react-sdk/pull/6245)
+ * Add alias and directory customisation points
+   [\#6343](https://github.com/matrix-org/matrix-react-sdk/pull/6343)
+ * Fix multiinviter user already in room and clean up code
+   [\#6354](https://github.com/matrix-org/matrix-react-sdk/pull/6354)
+ * Fix right panel not closing user info when changing rooms
+   [\#6341](https://github.com/matrix-org/matrix-react-sdk/pull/6341)
+ * Quit sticker picker on m.sticker
+   [\#5679](https://github.com/matrix-org/matrix-react-sdk/pull/5679)
+ * Don't autodetect language in inline code blocks
+   [\#6350](https://github.com/matrix-org/matrix-react-sdk/pull/6350)
+ * Make ghost button background transparent
+   [\#6331](https://github.com/matrix-org/matrix-react-sdk/pull/6331)
+ * only consider valid & loaded url previews for show N more prompt
+   [\#6346](https://github.com/matrix-org/matrix-react-sdk/pull/6346)
+ * Extract MXCs from _matrix/media/r0/ URLs for inline images in messages
+   [\#6335](https://github.com/matrix-org/matrix-react-sdk/pull/6335)
+ * Fix small visual regression with the site name on url previews
+   [\#6342](https://github.com/matrix-org/matrix-react-sdk/pull/6342)
+ * Make PIP CallView draggable/movable
+   [\#5952](https://github.com/matrix-org/matrix-react-sdk/pull/5952)
+ * Convert VoiceUserSettingsTab to TS
+   [\#6340](https://github.com/matrix-org/matrix-react-sdk/pull/6340)
+ * Simplify typescript definition for Modernizr
+   [\#6339](https://github.com/matrix-org/matrix-react-sdk/pull/6339)
+ * Remember the last used server for room directory searches
+   [\#6322](https://github.com/matrix-org/matrix-react-sdk/pull/6322)
+ * Focus composer after reacting
+   [\#6332](https://github.com/matrix-org/matrix-react-sdk/pull/6332)
+ * Fix bug which prevented more than one event getting pinned
+   [\#6336](https://github.com/matrix-org/matrix-react-sdk/pull/6336)
+ * Make DeviceListener also update on megolm key in SSSS
+   [\#6337](https://github.com/matrix-org/matrix-react-sdk/pull/6337)
+ * Improve URL previews
+   [\#6326](https://github.com/matrix-org/matrix-react-sdk/pull/6326)
+ * Don't close settings dialog when opening spaces feedback prompt
+   [\#6334](https://github.com/matrix-org/matrix-react-sdk/pull/6334)
+ * Update import location for types
+   [\#6330](https://github.com/matrix-org/matrix-react-sdk/pull/6330)
+ * Improve blurhash rendering performance
+   [\#6329](https://github.com/matrix-org/matrix-react-sdk/pull/6329)
+ * Use a proper color scheme for codeblocks
+   [\#6320](https://github.com/matrix-org/matrix-react-sdk/pull/6320)
+ * Burn `sdk.getComponent()` with 🔥
+   [\#6308](https://github.com/matrix-org/matrix-react-sdk/pull/6308)
+ * Fix instances of the Edit Message Composer's save button being wrongly
+   disabled
+   [\#6307](https://github.com/matrix-org/matrix-react-sdk/pull/6307)
+ * Do not generate a lockfile when running in CI
+   [\#6327](https://github.com/matrix-org/matrix-react-sdk/pull/6327)
+ * Update lockfile with correct dependencies
+   [\#6324](https://github.com/matrix-org/matrix-react-sdk/pull/6324)
+ * Clarify the keys we use when submitting rageshakes
+   [\#6321](https://github.com/matrix-org/matrix-react-sdk/pull/6321)
+ * Fix ImageView context menu
+   [\#6318](https://github.com/matrix-org/matrix-react-sdk/pull/6318)
+ * TypeScript migration
+   [\#6315](https://github.com/matrix-org/matrix-react-sdk/pull/6315)
+ * Move animation to compositor
+   [\#6310](https://github.com/matrix-org/matrix-react-sdk/pull/6310)
+ * Reorganize preferences
+   [\#5742](https://github.com/matrix-org/matrix-react-sdk/pull/5742)
+ * Fix being able to un-rotate images
+   [\#6313](https://github.com/matrix-org/matrix-react-sdk/pull/6313)
+ * Fix icon size in passphrase prompt
+   [\#6312](https://github.com/matrix-org/matrix-react-sdk/pull/6312)
+ * Use sleep & defer from js-sdk instead of duplicating it
+   [\#6305](https://github.com/matrix-org/matrix-react-sdk/pull/6305)
+ * Convert EventTimeline, EventTimelineSet and TimelineWindow to TS
+   [\#6295](https://github.com/matrix-org/matrix-react-sdk/pull/6295)
+ * Comply with new member-delimiter-style rule
+   [\#6306](https://github.com/matrix-org/matrix-react-sdk/pull/6306)
+ * Fix Test Linting
+   [\#6304](https://github.com/matrix-org/matrix-react-sdk/pull/6304)
+ * Convert Markdown to TypeScript
+   [\#6303](https://github.com/matrix-org/matrix-react-sdk/pull/6303)
+ * Convert RoomHeader to TS
+   [\#6302](https://github.com/matrix-org/matrix-react-sdk/pull/6302)
+ * Prevent RoomDirectory from exploding when filterString is wrongly nulled
+   [\#6296](https://github.com/matrix-org/matrix-react-sdk/pull/6296)
+ * Add support for blurhash (MSC2448)
+   [\#5099](https://github.com/matrix-org/matrix-react-sdk/pull/5099)
+ * Remove rateLimitedFunc
+   [\#6300](https://github.com/matrix-org/matrix-react-sdk/pull/6300)
+ * Convert some Key Verification classes to TypeScript
+   [\#6299](https://github.com/matrix-org/matrix-react-sdk/pull/6299)
+ * Typescript conversion of Composer components and more
+   [\#6292](https://github.com/matrix-org/matrix-react-sdk/pull/6292)
+ * Upgrade browserlist target versions
+   [\#6298](https://github.com/matrix-org/matrix-react-sdk/pull/6298)
+ * Fix browser crashing when searching for a malformed HTML tag
+   [\#6297](https://github.com/matrix-org/matrix-react-sdk/pull/6297)
+ * Add custom audio player
+   [\#6264](https://github.com/matrix-org/matrix-react-sdk/pull/6264)
+ * Lint MXC APIs to centralise access
+   [\#6293](https://github.com/matrix-org/matrix-react-sdk/pull/6293)
+ * Remove reminescent references to the tinter
+   [\#6290](https://github.com/matrix-org/matrix-react-sdk/pull/6290)
+ * More js-sdk type consolidation
+   [\#6263](https://github.com/matrix-org/matrix-react-sdk/pull/6263)
+ * Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
+   [\#6243](https://github.com/matrix-org/matrix-react-sdk/pull/6243)
+ * Migrate to `eslint-plugin-matrix-org`
+   [\#6285](https://github.com/matrix-org/matrix-react-sdk/pull/6285)
+ * Avoid cyclic dependencies by moving watchers out of constructor
+   [\#6287](https://github.com/matrix-org/matrix-react-sdk/pull/6287)
+ * Add spacing between toast buttons with cross browser support in mind
+   [\#6284](https://github.com/matrix-org/matrix-react-sdk/pull/6284)
+ * Deprecate Tinter and TintableSVG
+   [\#6279](https://github.com/matrix-org/matrix-react-sdk/pull/6279)
+ * Migrate FilePanel to TypeScript
+   [\#6283](https://github.com/matrix-org/matrix-react-sdk/pull/6283)
+
+Changes in [3.25.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.25.0) (2021-07-05)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.25.0-rc.1...v3.25.0)
+
+ * Remove reminescent references to the tinter
+   [\#6316](https://github.com/matrix-org/matrix-react-sdk/pull/6316)
+ * Update to released version of js-sdk
+
+Changes in [3.25.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.25.0-rc.1) (2021-06-29)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.24.0...v3.25.0-rc.1)
+
+ * Update to js-sdk v12.0.1-rc.1
+ * Translations update from Weblate
+   [\#6286](https://github.com/matrix-org/matrix-react-sdk/pull/6286)
+ * Fix back button on user info card after clicking a permalink
+   [\#6277](https://github.com/matrix-org/matrix-react-sdk/pull/6277)
+ * Group ACLs with MELS
+   [\#6280](https://github.com/matrix-org/matrix-react-sdk/pull/6280)
+ * Fix editState not getting passed through
+   [\#6282](https://github.com/matrix-org/matrix-react-sdk/pull/6282)
+ * Migrate message context menu to IconizedContextMenu
+   [\#5671](https://github.com/matrix-org/matrix-react-sdk/pull/5671)
+ * Improve audio recording performance
+   [\#6240](https://github.com/matrix-org/matrix-react-sdk/pull/6240)
+ * Fix multiple timeline panels handling composer and edit events
+   [\#6278](https://github.com/matrix-org/matrix-react-sdk/pull/6278)
+ * Let m.notice messages mark a room as unread
+   [\#6281](https://github.com/matrix-org/matrix-react-sdk/pull/6281)
+ * Removes the override on the Bubble Container
+   [\#5953](https://github.com/matrix-org/matrix-react-sdk/pull/5953)
+ * Fix IRC layout regressions
+   [\#6193](https://github.com/matrix-org/matrix-react-sdk/pull/6193)
+ * Fix trashcan.svg by exporting it with its viewbox
+   [\#6248](https://github.com/matrix-org/matrix-react-sdk/pull/6248)
+ * Fix tiny scrollbar dot on chrome/electron in Forward Dialog
+   [\#6276](https://github.com/matrix-org/matrix-react-sdk/pull/6276)
+ * Upgrade puppeteer to use newer version of Chrome
+   [\#6268](https://github.com/matrix-org/matrix-react-sdk/pull/6268)
+ * Make toast dismiss button less prominent
+   [\#6275](https://github.com/matrix-org/matrix-react-sdk/pull/6275)
+ * Encrypt the voice message file if needed
+   [\#6269](https://github.com/matrix-org/matrix-react-sdk/pull/6269)
+ * Fix hyper-precise presence
+   [\#6270](https://github.com/matrix-org/matrix-react-sdk/pull/6270)
+ * Fix issues around private spaces, including previewable
+   [\#6265](https://github.com/matrix-org/matrix-react-sdk/pull/6265)
+ * Make _pinned messages_ in `m.room.pinned_events` event clickable
+   [\#6257](https://github.com/matrix-org/matrix-react-sdk/pull/6257)
+ * Fix space avatar management layout being broken
+   [\#6266](https://github.com/matrix-org/matrix-react-sdk/pull/6266)
+ * Convert EntityTile, MemberTile and PresenceLabel to TS
+   [\#6251](https://github.com/matrix-org/matrix-react-sdk/pull/6251)
+ * Fix UserInfo not working when rendered without a room
+   [\#6260](https://github.com/matrix-org/matrix-react-sdk/pull/6260)
+ * Update membership reason handling, including leave reason displaying
+   [\#6253](https://github.com/matrix-org/matrix-react-sdk/pull/6253)
+ * Consolidate types with js-sdk changes
+   [\#6220](https://github.com/matrix-org/matrix-react-sdk/pull/6220)
+ * Fix edit history modal
+   [\#6258](https://github.com/matrix-org/matrix-react-sdk/pull/6258)
+ * Convert MemberList to TS
+   [\#6249](https://github.com/matrix-org/matrix-react-sdk/pull/6249)
+ * Fix two PRs duplicating the css attribute
+   [\#6259](https://github.com/matrix-org/matrix-react-sdk/pull/6259)
+ * Improve invite error messages in InviteDialog for room invites
+   [\#6201](https://github.com/matrix-org/matrix-react-sdk/pull/6201)
+ * Fix invite dialog being cut off when it has limited results
+   [\#6256](https://github.com/matrix-org/matrix-react-sdk/pull/6256)
+ * Fix pinning event in a room which hasn't had events pinned in before
+   [\#6255](https://github.com/matrix-org/matrix-react-sdk/pull/6255)
+ * Allow modal widget buttons to be disabled when the modal opens
+   [\#6178](https://github.com/matrix-org/matrix-react-sdk/pull/6178)
+ * Decrease e2e shield fill mask size so that it doesn't overlap
+   [\#6250](https://github.com/matrix-org/matrix-react-sdk/pull/6250)
+ * Dial Pad UI bug fixes
+   [\#5786](https://github.com/matrix-org/matrix-react-sdk/pull/5786)
+ * Simple handling of mid-call output changes
+   [\#6247](https://github.com/matrix-org/matrix-react-sdk/pull/6247)
+ * Improve ForwardDialog performance by using TruncatedList
+   [\#6228](https://github.com/matrix-org/matrix-react-sdk/pull/6228)
+ * Fix dependency and lockfile mismatch
+   [\#6246](https://github.com/matrix-org/matrix-react-sdk/pull/6246)
+ * Improve room directory click behaviour
+   [\#6234](https://github.com/matrix-org/matrix-react-sdk/pull/6234)
+ * Fix keyboard accessibility of the space panel
+   [\#6239](https://github.com/matrix-org/matrix-react-sdk/pull/6239)
+ * Add ways to manage addresses for Spaces
+   [\#6151](https://github.com/matrix-org/matrix-react-sdk/pull/6151)
+ * Hide communities invites and the community autocompleter when Spaces on
+   [\#6244](https://github.com/matrix-org/matrix-react-sdk/pull/6244)
+ * Convert bunch of files to TS
+   [\#6241](https://github.com/matrix-org/matrix-react-sdk/pull/6241)
+ * Open local addresses section by default when there are no existing local
+   addresses
+   [\#6179](https://github.com/matrix-org/matrix-react-sdk/pull/6179)
+ * Allow reordering of the space panel via Drag and Drop
+   [\#6137](https://github.com/matrix-org/matrix-react-sdk/pull/6137)
+ * Replace drag and drop mechanism in communities with something simpler
+   [\#6134](https://github.com/matrix-org/matrix-react-sdk/pull/6134)
+ * EventTilePreview fixes
+   [\#6000](https://github.com/matrix-org/matrix-react-sdk/pull/6000)
+ * Upgrade @types/react and @types/react-dom
+   [\#6233](https://github.com/matrix-org/matrix-react-sdk/pull/6233)
+ * Fix type error in the SpaceStore
+   [\#6242](https://github.com/matrix-org/matrix-react-sdk/pull/6242)
+ * Add experimental options to the Spaces beta
+   [\#6199](https://github.com/matrix-org/matrix-react-sdk/pull/6199)
+ * Consolidate types with js-sdk changes
+   [\#6215](https://github.com/matrix-org/matrix-react-sdk/pull/6215)
+ * Fix branch matching for Buildkite
+   [\#6236](https://github.com/matrix-org/matrix-react-sdk/pull/6236)
+ * Migrate SearchBar to TypeScript
+   [\#6230](https://github.com/matrix-org/matrix-react-sdk/pull/6230)
+ * Add support to keyboard shortcuts dialog for [digits]
+   [\#6088](https://github.com/matrix-org/matrix-react-sdk/pull/6088)
+ * Fix modal opening race condition
+   [\#6238](https://github.com/matrix-org/matrix-react-sdk/pull/6238)
+ * Deprecate FormButton in favour of AccessibleButton
+   [\#6229](https://github.com/matrix-org/matrix-react-sdk/pull/6229)
+ * Add PR template
+   [\#6216](https://github.com/matrix-org/matrix-react-sdk/pull/6216)
+ * Prefer canonical aliases while autocompleting rooms
+   [\#6222](https://github.com/matrix-org/matrix-react-sdk/pull/6222)
+ * Fix quote button
+   [\#6232](https://github.com/matrix-org/matrix-react-sdk/pull/6232)
+ * Restore branch matching support for GitHub Actions e2e tests
+   [\#6224](https://github.com/matrix-org/matrix-react-sdk/pull/6224)
+ * Fix View Source accessing renamed private field on MatrixEvent
+   [\#6225](https://github.com/matrix-org/matrix-react-sdk/pull/6225)
+ * Fix ConfirmUserActionDialog returning an input field rather than text
+   [\#6219](https://github.com/matrix-org/matrix-react-sdk/pull/6219)
+ * Revert "Partially restore immutable event objects at the rendering layer"
+   [\#6221](https://github.com/matrix-org/matrix-react-sdk/pull/6221)
+ * Add jq to e2e tests Dockerfile
+   [\#6218](https://github.com/matrix-org/matrix-react-sdk/pull/6218)
+ * Partially restore immutable event objects at the rendering layer
+   [\#6196](https://github.com/matrix-org/matrix-react-sdk/pull/6196)
+ * Update MSC number references for voice messages
+   [\#6197](https://github.com/matrix-org/matrix-react-sdk/pull/6197)
+ * Fix phase enum usage in JS modules as well
+   [\#6214](https://github.com/matrix-org/matrix-react-sdk/pull/6214)
+ * Migrate some dialogs to TypeScript
+   [\#6185](https://github.com/matrix-org/matrix-react-sdk/pull/6185)
+ * Typescript fixes due to MatrixEvent being TSified
+   [\#6208](https://github.com/matrix-org/matrix-react-sdk/pull/6208)
+ * Allow click-to-ping, quote & emoji picker for edit composer too
+   [\#5858](https://github.com/matrix-org/matrix-react-sdk/pull/5858)
+ * Add call silencing
+   [\#6082](https://github.com/matrix-org/matrix-react-sdk/pull/6082)
+ * Fix types in SlashCommands
+   [\#6207](https://github.com/matrix-org/matrix-react-sdk/pull/6207)
+ * Benchmark multiple common user scenario
+   [\#6190](https://github.com/matrix-org/matrix-react-sdk/pull/6190)
+ * Fix forward dialog message preview display names
+   [\#6204](https://github.com/matrix-org/matrix-react-sdk/pull/6204)
+ * Remove stray bullet point in reply preview
+   [\#6206](https://github.com/matrix-org/matrix-react-sdk/pull/6206)
+ * Stop requesting null next replies from the server
+   [\#6203](https://github.com/matrix-org/matrix-react-sdk/pull/6203)
+ * Fix soft crash caused by a broken shouldComponentUpdate
+   [\#6202](https://github.com/matrix-org/matrix-react-sdk/pull/6202)
+ * Keep composer reply when scrolling away from a highlighted event
+   [\#6200](https://github.com/matrix-org/matrix-react-sdk/pull/6200)
+ * Cache virtual/native room mappings when they're created
+   [\#6194](https://github.com/matrix-org/matrix-react-sdk/pull/6194)
+ * Disable comment-on-alert
+   [\#6191](https://github.com/matrix-org/matrix-react-sdk/pull/6191)
+ * Bump postcss from 7.0.35 to 7.0.36
+   [\#6195](https://github.com/matrix-org/matrix-react-sdk/pull/6195)
+
+Changes in [3.24.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.24.0) (2021-06-21)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.24.0-rc.1...v3.24.0)
+
+ * Upgrade to JS SDK 12.0.0
+ * [Release] Keep composer reply when scrolling away from a highlighted event
+   [\#6211](https://github.com/matrix-org/matrix-react-sdk/pull/6211)
+ * [Release] Remove stray bullet point in reply preview
+   [\#6210](https://github.com/matrix-org/matrix-react-sdk/pull/6210)
+ * [Release] Stop requesting null next replies from the server
+   [\#6209](https://github.com/matrix-org/matrix-react-sdk/pull/6209)
+
+Changes in [3.24.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.24.0-rc.1) (2021-06-15)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.23.0...v3.24.0-rc.1)
+
+ * Upgrade to JS SDK 12.0.0-rc.1
+ * Translations update from Weblate
+   [\#6192](https://github.com/matrix-org/matrix-react-sdk/pull/6192)
+ * Disable comment-on-alert for PR coming from a fork
+   [\#6189](https://github.com/matrix-org/matrix-react-sdk/pull/6189)
+ * Add JS benchmark tracking in CI
+   [\#6177](https://github.com/matrix-org/matrix-react-sdk/pull/6177)
+ * Upgrade matrix-react-test-utils for React 17 peer deps
+   [\#6187](https://github.com/matrix-org/matrix-react-sdk/pull/6187)
+ * Fix display name overlaps on the IRC layout
+   [\#6186](https://github.com/matrix-org/matrix-react-sdk/pull/6186)
+ * Small fixes to the spaces experience
+   [\#6184](https://github.com/matrix-org/matrix-react-sdk/pull/6184)
+ * Add footer and privacy note to the start dm dialog
+   [\#6111](https://github.com/matrix-org/matrix-react-sdk/pull/6111)
+ * Format mxids when disambiguation needed
+   [\#5880](https://github.com/matrix-org/matrix-react-sdk/pull/5880)
+ * Move various createRoom types to the js-sdk
+   [\#6183](https://github.com/matrix-org/matrix-react-sdk/pull/6183)
+ * Fix HTML tag for Event Tile when not rendered in a list
+   [\#6175](https://github.com/matrix-org/matrix-react-sdk/pull/6175)
+ * Remove legacy polyfills and unused dependencies
+   [\#6176](https://github.com/matrix-org/matrix-react-sdk/pull/6176)
+ * Fix buggy hovering/selecting of event tiles
+   [\#6173](https://github.com/matrix-org/matrix-react-sdk/pull/6173)
+ * Add room intro warning when e2ee is not enabled
+   [\#5929](https://github.com/matrix-org/matrix-react-sdk/pull/5929)
+ * Migrate end to end tests to GitHub actions
+   [\#6156](https://github.com/matrix-org/matrix-react-sdk/pull/6156)
+ * Fix expanding last collapsed sticky session when zoomed in
+   [\#6171](https://github.com/matrix-org/matrix-react-sdk/pull/6171)
+ * ⚛️ Upgrade to React@17
+   [\#6165](https://github.com/matrix-org/matrix-react-sdk/pull/6165)
+ * Revert refreshStickyHeaders optimisations
+   [\#6168](https://github.com/matrix-org/matrix-react-sdk/pull/6168)
+ * Add logging for which rooms calls are in
+   [\#6170](https://github.com/matrix-org/matrix-react-sdk/pull/6170)
+ * Restore read receipt animation from event to event
+   [\#6169](https://github.com/matrix-org/matrix-react-sdk/pull/6169)
+ * Restore copy button icon when sharing permalink
+   [\#6166](https://github.com/matrix-org/matrix-react-sdk/pull/6166)
+ * Restore Page Up/Down key bindings when focusing the composer
+   [\#6167](https://github.com/matrix-org/matrix-react-sdk/pull/6167)
+ * Timeline rendering optimizations
+   [\#6143](https://github.com/matrix-org/matrix-react-sdk/pull/6143)
+ * Bump css-what from 5.0.0 to 5.0.1
+   [\#6164](https://github.com/matrix-org/matrix-react-sdk/pull/6164)
+ * Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
+   [\#6145](https://github.com/matrix-org/matrix-react-sdk/pull/6145)
+ * Bump trim-newlines from 3.0.0 to 3.0.1
+   [\#6163](https://github.com/matrix-org/matrix-react-sdk/pull/6163)
+ * Fix upgrade to element home button in top left menu
+   [\#6162](https://github.com/matrix-org/matrix-react-sdk/pull/6162)
+ * Fix unpinning of pinned messages and panel empty state
+   [\#6140](https://github.com/matrix-org/matrix-react-sdk/pull/6140)
+ * Better handling for widgets that fail to load
+   [\#6161](https://github.com/matrix-org/matrix-react-sdk/pull/6161)
+ * Improved forwarding UI
+   [\#5999](https://github.com/matrix-org/matrix-react-sdk/pull/5999)
+ * Fixes for sharing room links
+   [\#6118](https://github.com/matrix-org/matrix-react-sdk/pull/6118)
+ * Fix setting watchers
+   [\#6160](https://github.com/matrix-org/matrix-react-sdk/pull/6160)
+ * Fix Stickerpicker context menu
+   [\#6152](https://github.com/matrix-org/matrix-react-sdk/pull/6152)
+ * Add warning to private space creation flow
+   [\#6155](https://github.com/matrix-org/matrix-react-sdk/pull/6155)
+ * Add prop to alwaysShowTimestamps on TimelinePanel
+   [\#6159](https://github.com/matrix-org/matrix-react-sdk/pull/6159)
+ * Fix notif panel timestamp padding
+   [\#6157](https://github.com/matrix-org/matrix-react-sdk/pull/6157)
+ * Fixes and refactoring for the ImageView
+   [\#6149](https://github.com/matrix-org/matrix-react-sdk/pull/6149)
+ * Fix timestamps
+   [\#6148](https://github.com/matrix-org/matrix-react-sdk/pull/6148)
+ * Make it easier to pan images in the lightbox
+   [\#6147](https://github.com/matrix-org/matrix-react-sdk/pull/6147)
+ * Fix scroll token for EventTile and EventListSummary node type
+   [\#6154](https://github.com/matrix-org/matrix-react-sdk/pull/6154)
+ * Convert bunch of things to Typescript
+   [\#6153](https://github.com/matrix-org/matrix-react-sdk/pull/6153)
+ * Lint the typescript tests
+   [\#6142](https://github.com/matrix-org/matrix-react-sdk/pull/6142)
+ * Fix jumping to bottom without a highlighted event
+   [\#6146](https://github.com/matrix-org/matrix-react-sdk/pull/6146)
+ * Repair event status position in timeline
+   [\#6141](https://github.com/matrix-org/matrix-react-sdk/pull/6141)
+ * Adapt for js-sdk MatrixClient conversion to TS
+   [\#6132](https://github.com/matrix-org/matrix-react-sdk/pull/6132)
+ * Improve pinned messages in Labs
+   [\#6096](https://github.com/matrix-org/matrix-react-sdk/pull/6096)
+ * Map phone number lookup results to their native rooms
+   [\#6136](https://github.com/matrix-org/matrix-react-sdk/pull/6136)
+ * Fix mx_Event containment rules and empty read avatar row
+   [\#6138](https://github.com/matrix-org/matrix-react-sdk/pull/6138)
+ * Improve switch room rendering
+   [\#6079](https://github.com/matrix-org/matrix-react-sdk/pull/6079)
+ * Add CSS containment rules for shorter reflow operations
+   [\#6127](https://github.com/matrix-org/matrix-react-sdk/pull/6127)
+ * ignore hash/fragment when de-duplicating links for url previews
+   [\#6135](https://github.com/matrix-org/matrix-react-sdk/pull/6135)
+ * Clicking jump to bottom resets room hash
+   [\#5823](https://github.com/matrix-org/matrix-react-sdk/pull/5823)
+ * Use passive option for scroll handlers
+   [\#6113](https://github.com/matrix-org/matrix-react-sdk/pull/6113)
+ * Optimise memberSort performance for large list
+   [\#6130](https://github.com/matrix-org/matrix-react-sdk/pull/6130)
+ * Tweak event border radius to match action bar
+   [\#6133](https://github.com/matrix-org/matrix-react-sdk/pull/6133)
+ * Log when we ignore a second call in a room
+   [\#6131](https://github.com/matrix-org/matrix-react-sdk/pull/6131)
+ * Performance monitoring measurements
+   [\#6041](https://github.com/matrix-org/matrix-react-sdk/pull/6041)
+
+Changes in [3.23.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.23.0) (2021-06-07)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.23.0-rc.1...v3.23.0)
+
+ * Upgrade to JS SDK 11.2.0
+ * [Release] Fix notif panel timestamp padding
+   [\#6158](https://github.com/matrix-org/matrix-react-sdk/pull/6158)
+
+Changes in [3.23.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.23.0-rc.1) (2021-06-01)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.22.0...v3.23.0-rc.1)
+
+ * Upgrade to JS SDK 11.2.0-rc.1
+ * Translations update from Weblate
+   [\#6128](https://github.com/matrix-org/matrix-react-sdk/pull/6128)
+ * Fix all DMs wrongly appearing in room list when `m.direct` is changed
+   [\#6122](https://github.com/matrix-org/matrix-react-sdk/pull/6122)
+ * Update way of checking for registration disabled
+   [\#6123](https://github.com/matrix-org/matrix-react-sdk/pull/6123)
+ * Fix the ability to remove avatar from a space via settings
+   [\#6126](https://github.com/matrix-org/matrix-react-sdk/pull/6126)
+ * Switch to stable endpoint/fields for MSC2858
+   [\#6125](https://github.com/matrix-org/matrix-react-sdk/pull/6125)
+ * Clear stored editor state when canceling editing using a shortcut
+   [\#6117](https://github.com/matrix-org/matrix-react-sdk/pull/6117)
+ * Respect newlines in space topics
+   [\#6124](https://github.com/matrix-org/matrix-react-sdk/pull/6124)
+ * Add url param `defaultUsername` to prefill the login username field
+   [\#5674](https://github.com/matrix-org/matrix-react-sdk/pull/5674)
+ * Bump ws from 7.4.2 to 7.4.6
+   [\#6115](https://github.com/matrix-org/matrix-react-sdk/pull/6115)
+ * Sticky headers repositioning without layout trashing
+   [\#6110](https://github.com/matrix-org/matrix-react-sdk/pull/6110)
+ * Handle user_busy in voip calls
+   [\#6112](https://github.com/matrix-org/matrix-react-sdk/pull/6112)
+ * Avoid showing warning modals from the invite dialog after it unmounts
+   [\#6105](https://github.com/matrix-org/matrix-react-sdk/pull/6105)
+ * Fix misleading child counts in spaces
+   [\#6109](https://github.com/matrix-org/matrix-react-sdk/pull/6109)
+ * Close creation menu when expanding space panel via expand hierarchy
+   [\#6090](https://github.com/matrix-org/matrix-react-sdk/pull/6090)
+ * Prevent having duplicates in pending room state
+   [\#6108](https://github.com/matrix-org/matrix-react-sdk/pull/6108)
+ * Update reactions row on event decryption
+   [\#6106](https://github.com/matrix-org/matrix-react-sdk/pull/6106)
+ * Destroy playback instance on voice message unmount
+   [\#6101](https://github.com/matrix-org/matrix-react-sdk/pull/6101)
+ * Fix message preview not up to date
+   [\#6102](https://github.com/matrix-org/matrix-react-sdk/pull/6102)
+ * Convert some Flow typed files to TS (round 2)
+   [\#6076](https://github.com/matrix-org/matrix-react-sdk/pull/6076)
+ * Remove unused middlePanelResized event listener
+   [\#6086](https://github.com/matrix-org/matrix-react-sdk/pull/6086)
+ * Fix accessing currentState on an invalid joinedRoom
+   [\#6100](https://github.com/matrix-org/matrix-react-sdk/pull/6100)
+ * Remove Promise allSettled polyfill as js-sdk uses it directly
+   [\#6097](https://github.com/matrix-org/matrix-react-sdk/pull/6097)
+ * Prevent DecoratedRoomAvatar to update its state for the same value
+   [\#6099](https://github.com/matrix-org/matrix-react-sdk/pull/6099)
+ * Skip generatePreview if event is not part of the live timeline
+   [\#6098](https://github.com/matrix-org/matrix-react-sdk/pull/6098)
+ * fix sticky headers when results num get displayed
+   [\#6095](https://github.com/matrix-org/matrix-react-sdk/pull/6095)
+ * Improve addEventsToTimeline performance scoping WhoIsTypingTile::setState
+   [\#6094](https://github.com/matrix-org/matrix-react-sdk/pull/6094)
+ * Safeguards to prevent layout trashing for window dimensions
+   [\#6092](https://github.com/matrix-org/matrix-react-sdk/pull/6092)
+ * Use local room state to render space hierarchy if the room is known
+   [\#6089](https://github.com/matrix-org/matrix-react-sdk/pull/6089)
+ * Add spinner in UserMenu to list pending long running actions
+   [\#6085](https://github.com/matrix-org/matrix-react-sdk/pull/6085)
+ * Stop overscroll in Firefox Nightly for macOS
+   [\#6093](https://github.com/matrix-org/matrix-react-sdk/pull/6093)
+ * Move SettingsStore watchers/monitors over to ES6 maps for performance
+   [\#6063](https://github.com/matrix-org/matrix-react-sdk/pull/6063)
+ * Bump libolm version.
+   [\#6080](https://github.com/matrix-org/matrix-react-sdk/pull/6080)
+ * Improve styling of the message action bar
+   [\#6066](https://github.com/matrix-org/matrix-react-sdk/pull/6066)
+ * Improve explore rooms when no results are found
+   [\#6070](https://github.com/matrix-org/matrix-react-sdk/pull/6070)
+ * Remove logo spinner
+   [\#6078](https://github.com/matrix-org/matrix-react-sdk/pull/6078)
+ * Fix add reaction prompt showing even when user is not joined to room
+   [\#6073](https://github.com/matrix-org/matrix-react-sdk/pull/6073)
+ * Vectorize spinners
+   [\#5680](https://github.com/matrix-org/matrix-react-sdk/pull/5680)
+ * Fix handling of via servers for suggested rooms
+   [\#6077](https://github.com/matrix-org/matrix-react-sdk/pull/6077)
+ * Upgrade showChatEffects to room-level setting exposure
+   [\#6075](https://github.com/matrix-org/matrix-react-sdk/pull/6075)
+ * Delete RoomView dead code
+   [\#6071](https://github.com/matrix-org/matrix-react-sdk/pull/6071)
+ * Reduce noise in tests
+   [\#6074](https://github.com/matrix-org/matrix-react-sdk/pull/6074)
+ * Fix room name issues in right panel summary card
+   [\#6069](https://github.com/matrix-org/matrix-react-sdk/pull/6069)
+ * Cache normalized room name
+   [\#6072](https://github.com/matrix-org/matrix-react-sdk/pull/6072)
+ * Update MemberList to reflect changes for invite permission change
+   [\#6061](https://github.com/matrix-org/matrix-react-sdk/pull/6061)
+ * Delete RoomView dead code
+   [\#6065](https://github.com/matrix-org/matrix-react-sdk/pull/6065)
+ * Show subspace rooms count even if it is 0 for consistency
+   [\#6067](https://github.com/matrix-org/matrix-react-sdk/pull/6067)
+
 Changes in [3.22.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.22.0) (2021-05-24)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.22.0-rc.1...v3.22.0)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.md
similarity index 71%
rename from CONTRIBUTING.rst
rename to CONTRIBUTING.md
index f7c8c8b1c5..f0ca3eb8a7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
 Contributing code to The React SDK
 ==================================
 
-matrix-react-sdk follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst
+matrix-react-sdk follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.md
diff --git a/README.md b/README.md
index b3e96ef001..4588a0586e 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ All code lands on the `develop` branch - `master` is only used for stable releas
 **Please file PRs against `develop`!!**
 
 Please follow the standard Matrix contributor's guide:
-https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst
+https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md
 
 Please follow the Matrix JS/React code style as per:
 https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md
@@ -48,7 +48,7 @@ Code should be committed as follows:
  * CSS: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/css
  * Theme specific CSS & resources: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/themes
 
-React components in matrix-react-sdk are come in two different flavours:
+React components in matrix-react-sdk come in two different flavours:
 'structures' and 'views'.  Structures are stateful components which handle the
 more complicated business logic of the app, delegating their actual presentation
 rendering to stateless 'view' components.  For instance, the RoomView component
diff --git a/__mocks__/FontManager.js b/__mocks__/FontManager.js
new file mode 100644
index 0000000000..41eab4bf94
--- /dev/null
+++ b/__mocks__/FontManager.js
@@ -0,0 +1,6 @@
+// Stub out FontManager for tests as it doesn't validate anything we don't already know given
+// our fixed test environment and it requires the installation of node-canvas.
+
+module.exports = {
+    fixupColorFonts: () => Promise.resolve(),
+};
diff --git a/__mocks__/workerMock.js b/__mocks__/workerMock.js
new file mode 100644
index 0000000000..6ee585673e
--- /dev/null
+++ b/__mocks__/workerMock.js
@@ -0,0 +1 @@
+module.exports = jest.fn();
diff --git a/babel.config.js b/babel.config.js
index 0a3a34a391..f00e83652c 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -10,7 +10,6 @@ module.exports = {
             ],
         }],
         "@babel/preset-typescript",
-        "@babel/preset-flow",
         "@babel/preset-react",
     ],
     "plugins": [
@@ -19,7 +18,6 @@ module.exports = {
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
-        "@babel/plugin-transform-flow-comments",
         "@babel/plugin-syntax-dynamic-import",
         "@babel/plugin-transform-runtime",
     ],
diff --git a/package.json b/package.json
index 13047b69cf..46ff26bf32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.22.0",
+  "version": "3.31.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -25,9 +25,9 @@
   "bin": {
     "reskindex": "scripts/reskindex.js"
   },
-  "main": "./src/index.js",
-  "matrix_src_main": "./src/index.js",
-  "matrix_lib_main": "./lib/index.js",
+  "main": "./src/index.ts",
+  "matrix_src_main": "./src/index.ts",
+  "matrix_lib_main": "./lib/index.ts",
   "matrix_lib_typings": "./lib/index.d.ts",
   "scripts": {
     "prepublishOnly": "yarn build",
@@ -45,7 +45,8 @@
     "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",
     "start:build": "babel src -w -s -d lib --verbose --extensions \".ts,.js\"",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
+    "lint:js": "eslint --max-warnings 0 src test",
+    "lint:js-fix": "eslint --fix src test",
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
@@ -54,8 +55,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
+    "@sentry/browser": "^6.11.0",
+    "@sentry/tracing": "^6.11.0",
     "await-lock": "^2.1.0",
-    "blueimp-canvas-to-blob": "^3.28.0",
+    "blurhash": "^1.1.3",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
     "cheerio": "^1.0.0-rc.9",
@@ -64,8 +67,8 @@
     "counterpart": "^0.18.6",
     "diff-dom": "^4.2.2",
     "diff-match-patch": "^1.0.5",
-    "emojibase-data": "^5.1.1",
-    "emojibase-regex": "^4.1.1",
+    "emojibase-data": "^6.2.0",
+    "emojibase-regex": "^5.1.3",
     "escape-html": "^1.0.3",
     "file-saver": "^2.0.5",
     "filesize": "6.1.0",
@@ -76,30 +79,31 @@
     "highlight.js": "^10.5.0",
     "html-entities": "^1.4.0",
     "is-ip": "^3.1.0",
+    "jszip": "^3.7.0",
     "katex": "^0.12.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.20",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.14",
+    "matrix-widget-api": "^0.1.0-beta.16",
     "minimist": "^1.2.5",
     "opus-recorder": "^8.0.3",
     "pako": "^2.0.3",
     "parse5": "^6.0.1",
     "png-chunks-extract": "^1.0.0",
+    "posthog-js": "1.12.2",
     "prop-types": "^15.7.2",
     "qrcode": "^1.4.4",
-    "qs": "^6.9.6",
     "re-resizable": "^6.9.0",
-    "react": "^16.14.0",
-    "react-beautiful-dnd": "^4.0.1",
-    "react-dom": "^16.14.0",
+    "react": "17.0.2",
+    "react-beautiful-dnd": "^13.1.0",
+    "react-blurhash": "^0.1.3",
+    "react-dom": "17.0.2",
     "react-focus-lock": "^2.5.0",
     "react-transition-group": "^4.4.1",
     "resize-observer-polyfill": "^1.5.1",
     "rfc4648": "^1.4.0",
     "sanitize-html": "^2.3.2",
     "tar-js": "^0.3.0",
-    "text-encoding-utf-8": "^1.0.2",
     "url": "^0.11.0",
     "what-input": "^5.2.10",
     "zxcvbn": "^4.4.2"
@@ -107,25 +111,30 @@
   "devDependencies": {
     "@babel/cli": "^7.12.10",
     "@babel/core": "^7.12.10",
+    "@babel/eslint-parser": "^7.12.10",
+    "@babel/eslint-plugin": "^7.12.10",
     "@babel/parser": "^7.12.11",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-decorators": "^7.12.12",
     "@babel/plugin-proposal-export-default-from": "^7.12.1",
     "@babel/plugin-proposal-numeric-separator": "^7.12.7",
     "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-    "@babel/plugin-transform-flow-comments": "^7.12.1",
     "@babel/plugin-transform-runtime": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
-    "@babel/preset-flow": "^7.12.1",
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.10",
     "@babel/traverse": "^7.12.12",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "@peculiar/webcrypto": "^1.1.4",
+    "@sentry/types": "^6.10.0",
     "@sinonjs/fake-timers": "^7.0.2",
     "@types/classnames": "^2.2.11",
+    "@types/commonmark": "^0.27.4",
     "@types/counterpart": "^0.18.1",
+    "@types/css-font-loading-module": "^0.0.6",
+    "@types/diff-match-patch": "^1.0.32",
+    "@types/file-saver": "^2.0.3",
     "@types/flux": "^3.1.9",
     "@types/jest": "^26.0.20",
     "@types/linkifyjs": "^2.1.3",
@@ -135,23 +144,23 @@
     "@types/pako": "^1.0.1",
     "@types/parse5": "^6.0.0",
     "@types/qrcode": "^1.3.5",
-    "@types/react": "^16.9",
-    "@types/react-dom": "^16.9.10",
+    "@types/react": "17.0.14",
+    "@types/react-beautiful-dnd": "^13.0.0",
+    "@types/react-dom": "17.0.9",
     "@types/react-transition-group": "^4.4.0",
     "@types/sanitize-html": "^2.3.1",
     "@types/zxcvbn": "^4.4.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
-    "babel-eslint": "^10.1.0",
+    "@typescript-eslint/eslint-plugin": "^4.17.0",
+    "@typescript-eslint/parser": "^4.17.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
+    "allchange": "^1.0.3",
     "babel-jest": "^26.6.3",
     "chokidar": "^3.5.1",
     "concurrently": "^5.3.0",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.6",
     "eslint": "7.18.0",
-    "eslint-config-matrix-org": "^0.2.0",
-    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-flowtype": "^5.2.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "glob": "^7.1.6",
@@ -159,24 +168,27 @@
     "jest-canvas-mock": "^2.3.0",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-fetch-mock": "^3.0.3",
+    "jest-raw-loader": "^1.0.1",
     "matrix-mock-request": "^1.2.3",
-    "matrix-react-test-utils": "^0.2.2",
+    "matrix-react-test-utils": "^0.2.3",
     "matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
-    "react-test-renderer": "^16.14.0",
+    "raw-loader": "^4.0.2",
+    "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
+    "rrweb-snapshot": "1.1.7",
     "stylelint": "^13.9.0",
     "stylelint-config-standard": "^20.0.0",
     "stylelint-scss": "^3.18.0",
-    "typescript": "^4.1.3",
+    "typescript": "4.3.5",
     "walk": "^2.3.14"
   },
   "resolutions": {
-    "**/@types/react": "^16.14"
+    "@types/react": "17.0.14"
   },
   "jest": {
     "testEnvironment": "./__test-utils__/environment.js",
     "testMatch": [
-      "<rootDir>/test/**/*-test.[jt]s"
+      "<rootDir>/test/**/*-test.[jt]s?(x)"
     ],
     "setupFiles": [
       "jest-canvas-mock"
@@ -189,7 +201,10 @@
       "\\$webapp/i18n/languages.json": "<rootDir>/__mocks__/languages.json",
       "decoderWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
       "decoderWorker\\.min\\.wasm": "<rootDir>/__mocks__/empty.js",
-      "waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js"
+      "waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
+      "workers/(.+)\\.worker\\.ts": "<rootDir>/__mocks__/workerMock.js",
+      "^!!raw-loader!.*": "jest-raw-loader",
+      "RecorderWorklet": "<rootDir>/__mocks__/empty.js"
     },
     "transformIgnorePatterns": [
       "/node_modules/(?!matrix-js-sdk).+$"
diff --git a/release_config.yaml b/release_config.yaml
new file mode 100644
index 0000000000..12e857cbdd
--- /dev/null
+++ b/release_config.yaml
@@ -0,0 +1,4 @@
+subprojects:
+    matrix-js-sdk:
+        includeByDefault: false
+
diff --git a/res/css/_animations.scss b/res/css/_animations.scss
new file mode 100644
index 0000000000..26252fcaf6
--- /dev/null
+++ b/res/css/_animations.scss
@@ -0,0 +1,80 @@
+/*
+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.
+*/
+
+/**
+ * React Transition Group animations are prefixed with 'mx_rtg--' so that we
+ * know they should not be used anywhere outside of React Transition Groups.
+*/
+
+.mx_rtg--fade-enter {
+    opacity: 0;
+}
+.mx_rtg--fade-enter-active {
+    opacity: 1;
+    transition: opacity 300ms ease;
+}
+.mx_rtg--fade-exit {
+    opacity: 1;
+}
+.mx_rtg--fade-exit-active {
+    opacity: 0;
+    transition: opacity 300ms ease;
+}
+
+@keyframes mx--anim-pulse {
+    0% { opacity: 1; }
+    50% { opacity: 0.7; }
+    100% { opacity: 1; }
+}
+
+@keyframes mx_Dialog_lightbox_background_keyframes {
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: $lightbox-background-bg-opacity;
+    }
+}
+
+@keyframes mx_ImageView_panel_keyframes {
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
+}
+
+@media (prefers-reduced-motion) {
+    @keyframes mx--anim-pulse {
+        // Override all keyframes in reduced-motion
+    }
+
+    @keyframes mx_Dialog_lightbox_background_keyframes {
+        // Override all keyframes in reduced-motion
+    }
+
+    @keyframes mx_ImageView_panel_keyframes {
+        // Override all keyframes in reduced-motion
+    }
+
+    .mx_rtg--fade-enter-active {
+        transition: none;
+    }
+    .mx_rtg--fade-exit-active {
+        transition: none;
+    }
+}
diff --git a/res/css/_common.scss b/res/css/_common.scss
index b128a82442..d7f8355d81 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -18,6 +18,7 @@ limitations under the License.
 
 @import "./_font-sizes.scss";
 @import "./_font-weights.scss";
+@import "./_animations.scss";
 
 $hover-transition: 0.08s cubic-bezier(.46, .03, .52, .96); // quadratic
 
@@ -52,8 +53,8 @@ html {
 body {
     font-family: $font-family;
     font-size: $font-15px;
-    background-color: $primary-bg-color;
-    color: $primary-fg-color;
+    background-color: $background;
+    color: $primary-content;
     border: 0px;
     margin: 0px;
 
@@ -88,7 +89,7 @@ b {
 }
 
 h2 {
-    color: $primary-fg-color;
+    color: $primary-content;
     font-weight: 400;
     font-size: $font-18px;
     margin-top: 16px;
@@ -104,8 +105,8 @@ a:visited {
 input[type=text],
 input[type=search],
 input[type=password] {
+    font-family: inherit;
     padding: 9px;
-    font-family: $font-family;
     font-size: $font-14px;
     font-weight: 600;
     min-width: 0;
@@ -141,13 +142,12 @@ textarea::placeholder {
 
 input[type=text], input[type=password], textarea {
     background-color: transparent;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 /* Required by Firefox */
 textarea {
-    font-family: $font-family;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 input[type=text]:focus, input[type=password]:focus, textarea:focus {
@@ -168,12 +168,12 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 // it has the appearance of a text box so the controls
 // appear to be part of the input
 
-.mx_Dialog, .mx_MatrixChat {
+.mx_Dialog, .mx_MatrixChat_wrapper {
     .mx_textinput > input[type=text],
     .mx_textinput > input[type=search] {
         border: none;
         flex: 1;
-        color: $primary-fg-color;
+        color: $primary-content;
     }
 
     :not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=text],
@@ -184,7 +184,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
         background-color: transparent;
         color: $input-darker-fg-color;
         border-radius: 4px;
-        border: 1px solid rgba($primary-fg-color, .1);
+        border: 1px solid rgba($primary-content, .1);
         // these things should probably not be defined globally
         margin: 9px;
     }
@@ -209,7 +209,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     :not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=search],
     .mx_textinput {
         color: $input-darker-fg-color;
-        background-color: $primary-bg-color;
+        background-color: $background;
         border: none;
     }
 }
@@ -271,7 +271,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 .mx_Dialog {
-    background-color: $primary-bg-color;
+    background-color: $background;
     color: $light-fg-color;
     z-index: 4012;
     font-weight: 300;
@@ -318,6 +318,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 .mx_Dialog_lightbox .mx_Dialog_background {
     opacity: $lightbox-background-bg-opacity;
     background-color: $lightbox-background-bg-color;
+    animation-name: mx_Dialog_lightbox_background_keyframes;
+    animation-duration: 300ms;
 }
 
 .mx_Dialog_lightbox .mx_Dialog {
@@ -379,7 +381,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 .mx_Dialog_content {
     margin: 24px 0 68px;
     font-size: $font-14px;
-    color: $primary-fg-color;
+    color: $primary-content;
     word-wrap: break-word;
 }
 
@@ -488,8 +490,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: $primary-content;
+    background-color: $background;
 }
 
 .mx_textButton {
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 418b8f51c9..1bf17ab265 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -1,8 +1,10 @@
 // autogenerated by rethemendex.sh
+@import "./_animations.scss";
 @import "./_common.scss";
 @import "./_font-sizes.scss";
 @import "./_font-weights.scss";
 @import "./structures/_AutoHideScrollbar.scss";
+@import "./structures/_BackdropPanel.scss";
 @import "./structures/_CompatibilityPage.scss";
 @import "./structures/_ContextualMenu.scss";
 @import "./structures/_CreateRoom.scss";
@@ -27,8 +29,8 @@
 @import "./structures/_RoomView.scss";
 @import "./structures/_ScrollPanel.scss";
 @import "./structures/_SearchBox.scss";
+@import "./structures/_SpaceHierarchy.scss";
 @import "./structures/_SpacePanel.scss";
-@import "./structures/_SpaceRoomDirectory.scss";
 @import "./structures/_SpaceRoomView.scss";
 @import "./structures/_TabbedView.scss";
 @import "./structures/_ToastContainer.scss";
@@ -37,6 +39,11 @@
 @import "./structures/_ViewSource.scss";
 @import "./structures/auth/_CompleteSecurity.scss";
 @import "./structures/auth/_Login.scss";
+@import "./views/audio_messages/_AudioPlayer.scss";
+@import "./views/audio_messages/_PlayPauseButton.scss";
+@import "./views/audio_messages/_PlaybackContainer.scss";
+@import "./views/audio_messages/_SeekBar.scss";
+@import "./views/audio_messages/_Waveform.scss";
 @import "./views/auth/_AuthBody.scss";
 @import "./views/auth/_AuthButtons.scss";
 @import "./views/auth/_AuthFooter.scss";
@@ -52,7 +59,6 @@
 @import "./views/avatars/_BaseAvatar.scss";
 @import "./views/avatars/_DecoratedRoomAvatar.scss";
 @import "./views/avatars/_MemberStatusMessageAvatar.scss";
-@import "./views/avatars/_PulsedAvatar.scss";
 @import "./views/avatars/_WidgetAvatar.scss";
 @import "./views/beta/_BetaCard.scss";
 @import "./views/context_menus/_CallContextMenu.scss";
@@ -63,7 +69,6 @@
 @import "./views/dialogs/_AddExistingToSpaceDialog.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
-@import "./views/dialogs/_BetaFeedbackDialog.scss";
 @import "./views/dialogs/_BugReportDialog.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
 @import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
@@ -72,15 +77,23 @@
 @import "./views/dialogs/_CreateCommunityPrototypeDialog.scss";
 @import "./views/dialogs/_CreateGroupDialog.scss";
 @import "./views/dialogs/_CreateRoomDialog.scss";
+@import "./views/dialogs/_CreateSpaceFromCommunityDialog.scss";
+@import "./views/dialogs/_CreateSubspaceDialog.scss";
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
+@import "./views/dialogs/_ExportDialog.scss";
 @import "./views/dialogs/_FeedbackDialog.scss";
+@import "./views/dialogs/_ForwardDialog.scss";
+@import "./views/dialogs/_GenericFeatureFeedbackDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_HostSignupDialog.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
+@import "./views/dialogs/_JoinRuleDropdown.scss";
 @import "./views/dialogs/_KeyboardShortcutsDialog.scss";
+@import "./views/dialogs/_LeaveSpaceDialog.scss";
+@import "./views/dialogs/_ManageRestrictedJoinRuleDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
 @import "./views/dialogs/_ModalWidgetDialog.scss";
 @import "./views/dialogs/_NewSessionReviewDialog.scss";
@@ -115,14 +128,15 @@
 @import "./views/elements/_AddressTile.scss";
 @import "./views/elements/_DesktopBuildsNotice.scss";
 @import "./views/elements/_DesktopCapturerSourcePicker.scss";
+@import "./views/elements/_DialPadBackspaceButton.scss";
 @import "./views/elements/_DirectorySearchBox.scss";
 @import "./views/elements/_Dropdown.scss";
 @import "./views/elements/_EditableItemList.scss";
 @import "./views/elements/_ErrorBoundary.scss";
 @import "./views/elements/_EventListSummary.scss";
+@import "./views/elements/_EventTilePreview.scss";
 @import "./views/elements/_FacePile.scss";
 @import "./views/elements/_Field.scss";
-@import "./views/elements/_FormButton.scss";
 @import "./views/elements/_ImageView.scss";
 @import "./views/elements/_InfoTooltip.scss";
 @import "./views/elements/_InlineSpinner.scss";
@@ -144,6 +158,7 @@
 @import "./views/elements/_StyledCheckbox.scss";
 @import "./views/elements/_StyledRadioButton.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
+@import "./views/elements/_TagComposer.scss";
 @import "./views/elements/_TextWithTooltip.scss";
 @import "./views/elements/_ToggleSwitch.scss";
 @import "./views/elements/_Tooltip.scss";
@@ -153,18 +168,20 @@
 @import "./views/groups/_GroupPublicityToggle.scss";
 @import "./views/groups/_GroupRoomList.scss";
 @import "./views/groups/_GroupUserSettings.scss";
+@import "./views/messages/_CallEvent.scss";
 @import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
 @import "./views/messages/_EventTileBubble.scss";
 @import "./views/messages/_MEmoteBody.scss";
 @import "./views/messages/_MFileBody.scss";
 @import "./views/messages/_MImageBody.scss";
+@import "./views/messages/_MImageReplyBody.scss";
 @import "./views/messages/_MJitsiWidgetEvent.scss";
 @import "./views/messages/_MNoticeBody.scss";
 @import "./views/messages/_MStickerBody.scss";
 @import "./views/messages/_MTextBody.scss";
 @import "./views/messages/_MVideoBody.scss";
-@import "./views/messages/_MVoiceMessageBody.scss";
+@import "./views/messages/_MediaBody.scss";
 @import "./views/messages/_MessageActionBar.scss";
 @import "./views/messages/_MessageTimestamp.scss";
 @import "./views/messages/_MjolnirBody.scss";
@@ -192,10 +209,12 @@
 @import "./views/rooms/_E2EIcon.scss";
 @import "./views/rooms/_EditMessageComposer.scss";
 @import "./views/rooms/_EntityTile.scss";
+@import "./views/rooms/_EventBubbleTile.scss";
 @import "./views/rooms/_EventTile.scss";
 @import "./views/rooms/_GroupLayout.scss";
 @import "./views/rooms/_IRCLayout.scss";
 @import "./views/rooms/_JumpToBottomButton.scss";
+@import "./views/rooms/_LinkPreviewGroup.scss";
 @import "./views/rooms/_LinkPreviewWidget.scss";
 @import "./views/rooms/_MemberInfo.scss";
 @import "./views/rooms/_MemberList.scss";
@@ -206,6 +225,7 @@
 @import "./views/rooms/_PinnedEventTile.scss";
 @import "./views/rooms/_PresenceLabel.scss";
 @import "./views/rooms/_ReplyPreview.scss";
+@import "./views/rooms/_ReplyTile.scss";
 @import "./views/rooms/_RoomBreadcrumbs.scss";
 @import "./views/rooms/_RoomHeader.scss";
 @import "./views/rooms/_RoomList.scss";
@@ -225,6 +245,8 @@
 @import "./views/settings/_E2eAdvancedPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
 @import "./views/settings/_IntegrationManager.scss";
+@import "./views/settings/_JoinRuleSettings.scss";
+@import "./views/settings/_LayoutSwitcher.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
 @import "./views/settings/_ProfileSettings.scss";
@@ -251,14 +273,16 @@
 @import "./views/spaces/_SpacePublicShare.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
 @import "./views/toasts/_AnalyticsToast.scss";
+@import "./views/toasts/_IncomingCallToast.scss";
 @import "./views/toasts/_NonUrgentEchoFailureToast.scss";
 @import "./views/verification/_VerificationShowSas.scss";
-@import "./views/voice_messages/_PlayPauseButton.scss";
-@import "./views/voice_messages/_PlaybackContainer.scss";
-@import "./views/voice_messages/_Waveform.scss";
+@import "./views/voip/CallView/_CallViewButtons.scss";
 @import "./views/voip/_CallContainer.scss";
+@import "./views/voip/_CallPreview.scss";
 @import "./views/voip/_CallView.scss";
 @import "./views/voip/_CallViewForRoom.scss";
+@import "./views/voip/_CallViewHeader.scss";
+@import "./views/voip/_CallViewSidebar.scss";
 @import "./views/voip/_DialPad.scss";
 @import "./views/voip/_DialPadContextMenu.scss";
 @import "./views/voip/_DialPadModal.scss";
diff --git a/res/css/structures/_BackdropPanel.scss b/res/css/structures/_BackdropPanel.scss
new file mode 100644
index 0000000000..482507cb15
--- /dev/null
+++ b/res/css/structures/_BackdropPanel.scss
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_BackdropPanel {
+    position: absolute;
+    left: 0;
+    top: 0;
+    height: 100vh;
+    width: 100%;
+    overflow: hidden;
+    filter: blur(var(--lp-background-blur));
+    // Force a new layer for the backdropPanel so it's better hardware supported
+    transform: translateZ(0);
+}
+
+.mx_BackdropPanel--image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    min-height: 100%;
+    z-index: 0;
+    pointer-events: none;
+    overflow: hidden;
+}
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index d7f2cb76e8..9f2b9e24b8 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -34,7 +34,7 @@ limitations under the License.
     border-radius: 8px;
     box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
     background-color: $menu-bg-color;
-    color: $primary-fg-color;
+    color: $primary-content;
     position: absolute;
     font-size: $font-14px;
     z-index: 5001;
diff --git a/res/css/structures/_CreateRoom.scss b/res/css/structures/_CreateRoom.scss
index e859beb20e..3d23ccc4b2 100644
--- a/res/css/structures/_CreateRoom.scss
+++ b/res/css/structures/_CreateRoom.scss
@@ -18,7 +18,7 @@ limitations under the License.
     width: 960px;
     margin-left: auto;
     margin-right: auto;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_CreateRoom input,
diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index 7b975110e1..c180a8a02d 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -45,9 +45,14 @@ limitations under the License.
 
 /* Overrides for the attachment body tiles */
 
-.mx_FilePanel .mx_EventTile {
+.mx_FilePanel .mx_EventTile:not([data-layout=bubble]) {
     word-break: break-word;
-    margin-top: 32px;
+    margin-top: 10px;
+    padding-top: 0;
+
+    .mx_EventTile_line {
+        padding-left: 0;
+    }
 }
 
 .mx_FilePanel .mx_EventTile .mx_MImageBody {
@@ -118,10 +123,6 @@ limitations under the License.
     padding-left: 0px;
 }
 
-.mx_FilePanel .mx_EventTile:hover .mx_EventTile_line {
-    background-color: $primary-bg-color;
-}
-
 .mx_FilePanel_empty::before {
     mask-image: url('$(res)/img/element-icons/room/files.svg');
 }
diff --git a/res/css/structures/_GroupFilterPanel.scss b/res/css/structures/_GroupFilterPanel.scss
index 444435dd57..ceea20ed79 100644
--- a/res/css/structures/_GroupFilterPanel.scss
+++ b/res/css/structures/_GroupFilterPanel.scss
@@ -14,10 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
+
+.mx_GroupFilterPanelContainer {
+    flex-grow: 0;
+    flex-shrink: 0;
+    width: $groupFilterPanelWidth;
+    height: 100%;
+
+    // Create another flexbox so the GroupFilterPanel fills the container
+    display: flex;
+    flex-direction: column;
+
+    // GroupFilterPanel handles its own CSS
+}
+
 .mx_GroupFilterPanel {
-    flex: 1;
+    z-index: 1;
     background-color: $groupFilterPanel-bg-color;
+    flex: 1;
     cursor: pointer;
+    position: relative;
 
     display: flex;
     flex-direction: column;
@@ -56,12 +73,6 @@ limitations under the License.
 .mx_GroupFilterPanel .mx_TagTile {
     // opacity: 0.5;
     position: relative;
-
-    .mx_BetaDot {
-        position: absolute;
-        right: -13px;
-        top: -11px;
-    }
 }
 
 .mx_GroupFilterPanel .mx_TagTile.mx_TagTile_prototype {
@@ -75,13 +86,13 @@ limitations under the License.
 }
 
 .mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected_prototype {
-    background-color: $primary-bg-color;
+    background-color: $background;
     border-radius: 6px;
 }
 
 .mx_TagTile_selected_prototype {
     .mx_TagTile_homeIcon::before {
-        background-color: $primary-fg-color; // dark-on-light
+        background-color: $primary-content; // dark-on-light
     }
 }
 
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 2350d9f28a..5e224b1f38 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -132,7 +132,7 @@ limitations under the License.
     width: 100%;
     height: 31px;
     overflow: hidden;
-    color: $primary-fg-color;
+    color: $primary-content;
     font-weight: bold;
     font-size: $font-22px;
     padding-left: 19px;
@@ -323,7 +323,7 @@ limitations under the License.
 }
 
 .mx_GroupView_featuredThing .mx_BaseAvatar {
-    /* To prevent misalignment with mx_TintableSvg (in addButton) */
+    /* To prevent misalignment with img (in addButton) */
     vertical-align: initial;
 }
 
@@ -368,6 +368,65 @@ limitations under the License.
     padding: 40px 20px;
 }
 
+.mx_GroupView_spaceUpgradePrompt {
+    padding: 16px 50px;
+    background-color: $header-panel-bg-color;
+    border-radius: 8px;
+    max-width: 632px;
+    font-size: $font-15px;
+    line-height: $font-24px;
+    margin-top: 24px;
+    position: relative;
+
+    > h2 {
+        font-size: inherit;
+        font-weight: $font-semi-bold;
+    }
+
+    > p, h2 {
+        margin: 0;
+    }
+
+    &::before {
+        content: "";
+        position: absolute;
+        height: $font-24px;
+        width: 20px;
+        left: 18px;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+        mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
+        background-color: $secondary-content;
+    }
+
+    .mx_AccessibleButton_kind_link {
+        padding: 0;
+    }
+
+    .mx_GroupView_spaceUpgradePrompt_close {
+        width: 16px;
+        height: 16px;
+        border-radius: 8px;
+        background-color: $input-darker-bg-color;
+        position: absolute;
+        top: 16px;
+        right: 16px;
+
+        &::before {
+            content: "";
+            position: absolute;
+            width: inherit;
+            height: inherit;
+            mask-repeat: no-repeat;
+            mask-position: center;
+            mask-size: 8px;
+            mask-image: url('$(res)/img/image-view/close.svg');
+            background-color: $secondary-content;
+        }
+    }
+}
+
 .mx_GroupView .mx_MemberInfo .mx_AutoHideScrollbar > :not(.mx_MemberInfo_avatar) {
     padding-left: 16px;
     padding-right: 16px;
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index c7dd678c07..5ddea244f3 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -14,31 +14,47 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
 $roomListCollapsedWidth: 68px;
 
+.mx_MatrixChat--with-avatar {
+    .mx_LeftPanel,
+    .mx_LeftPanel .mx_LeftPanel_roomListContainer {
+        background-color: transparent;
+    }
+}
+
+.mx_LeftPanel_wrapper {
+    display: flex;
+    max-width: 50%;
+    position: relative;
+
+    // Contain the amount of layers rendered by constraining what actually needs re-layering via css
+    contain: layout paint;
+
+    .mx_LeftPanel_wrapper--user {
+        background-color: $roomlist-bg-color;
+        display: flex;
+        overflow: hidden;
+        position: relative;
+
+        &[data-collapsed] {
+            max-width: $roomListCollapsedWidth;
+        }
+    }
+}
+
+
+
 .mx_LeftPanel {
     background-color: $roomlist-bg-color;
     // 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
     display: flex;
     contain: content;
-
-    .mx_LeftPanel_GroupFilterPanelContainer {
-        flex-grow: 0;
-        flex-shrink: 0;
-        flex-basis: $groupFilterPanelWidth;
-        height: 100%;
-
-        // Create another flexbox so the GroupFilterPanel fills the container
-        display: flex;
-        flex-direction: column;
-
-        // GroupFilterPanel handles its own CSS
-    }
+    position: relative;
+    flex-grow: 1;
+    overflow: hidden;
 
     // Note: The 'room list' in this context is actually everything that isn't the tag
     // panel, such as the menu options, breadcrumbs, filtering, etc
@@ -111,6 +127,29 @@ $roomListCollapsedWidth: 68px;
                 }
             }
 
+            .mx_LeftPanel_dialPadButton {
+                width: 32px;
+                height: 32px;
+                border-radius: 8px;
+                background-color: $roomlist-button-bg-color;
+                position: relative;
+                margin-left: 8px;
+
+                &::before {
+                    content: '';
+                    position: absolute;
+                    top: 8px;
+                    left: 8px;
+                    width: 16px;
+                    height: 16px;
+                    mask-image: url('$(res)/img/element-icons/call/dialpad.svg');
+                    mask-position: center;
+                    mask-size: contain;
+                    mask-repeat: no-repeat;
+                    background: $secondary-content;
+                }
+            }
+
             .mx_LeftPanel_exploreButton {
                 width: 32px;
                 height: 32px;
@@ -130,7 +169,7 @@ $roomListCollapsedWidth: 68px;
                     mask-position: center;
                     mask-size: contain;
                     mask-repeat: no-repeat;
-                    background: $secondary-fg-color;
+                    background: $secondary-content;
                 }
 
                 &.mx_LeftPanel_exploreButton_space::before {
@@ -148,6 +187,8 @@ $roomListCollapsedWidth: 68px;
         }
 
         .mx_LeftPanel_roomListWrapper {
+            // Make the y-scrollbar more responsive
+            padding-right: 2px;
             overflow: hidden;
             margin-top: 10px; // so we're not up against the search/filter
             flex: 1 0 0; // needed in Safari to properly set flex-basis
@@ -169,6 +210,7 @@ $roomListCollapsedWidth: 68px;
 
     // These styles override the defaults for the minimized (66px) layout
     &.mx_LeftPanel_minimized {
+        flex-grow: 0;
         min-width: unset;
         width: unset !important;
 
@@ -185,6 +227,12 @@ $roomListCollapsedWidth: 68px;
                 flex-direction: column;
                 justify-content: center;
 
+                .mx_LeftPanel_dialPadButton {
+                    margin-left: 0;
+                    margin-top: 8px;
+                    background-color: transparent;
+                }
+
                 .mx_LeftPanel_exploreButton {
                     margin-left: 0;
                     margin-top: 8px;
diff --git a/res/css/structures/_LeftPanelWidget.scss b/res/css/structures/_LeftPanelWidget.scss
index 6e2d99bb37..93c2898395 100644
--- a/res/css/structures/_LeftPanelWidget.scss
+++ b/res/css/structures/_LeftPanelWidget.scss
@@ -113,7 +113,7 @@ limitations under the License.
 
     &:hover .mx_LeftPanelWidget_resizerHandle {
         opacity: 0.8;
-        background-color: $primary-fg-color;
+        background-color: $primary-content;
     }
 
     .mx_LeftPanelWidget_maximizeButton {
diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 8199121420..407a1c270c 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -38,7 +38,7 @@ limitations under the License.
         width: 4px !important;
         border-radius: 4px !important;
 
-        background-color: $primary-fg-color;
+        background-color: $primary-content;
         opacity: 0.8;
     }
 }
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index a220c5d505..fdf5cb1a03 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -29,8 +29,6 @@ limitations under the License.
 .mx_MatrixChat_wrapper {
     display: flex;
 
-    flex-direction: column;
-
     width: 100%;
     height: 100%;
 }
@@ -42,13 +40,12 @@ limitations under the License.
 }
 
 .mx_MatrixChat {
+    position: relative;
     width: 100%;
     height: 100%;
 
     display: flex;
 
-    order: 2;
-
     flex: 1;
     min-height: 0;
 }
@@ -66,8 +63,8 @@ limitations under the License.
 }
 
 /* not the left panel, and not the resize handle, so the roomview/groupview/... */
-.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle) {
-    background-color: $primary-bg-color;
+.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
+    background-color: $background;
 
     flex: 1 1 0;
     min-width: 0;
@@ -94,7 +91,7 @@ limitations under the License.
 
         content: ' ';
 
-        background-color: $primary-fg-color;
+        background-color: $primary-content;
         opacity: 0.8;
     }
 }
diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss
index 1258ace069..68e1dd6a9a 100644
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -49,7 +49,7 @@ limitations under the License.
         bottom: 0;
         left: 0;
         right: 0;
-        background-color: $tertiary-fg-color;
+        background-color: $tertiary-content;
         height: 1px;
         opacity: 0.4;
         content: '';
@@ -70,7 +70,7 @@ limitations under the License.
 }
 
 .mx_NotificationPanel .mx_EventTile_roomName a {
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_NotificationPanel .mx_EventTile_avatar {
@@ -79,13 +79,12 @@ limitations under the License.
 
 .mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
 .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
-    color: $primary-fg-color;
+    color: $primary-content;
     font-size: $font-12px;
     display: inline;
-    padding-left: 0px;
 }
 
-.mx_NotificationPanel .mx_EventTile_senderDetails {
+.mx_NotificationPanel .mx_EventTile:not([data-layout=bubble]) .mx_EventTile_senderDetails {
     padding-left: 36px; // align with the room name
     position: relative;
 
@@ -103,9 +102,10 @@ limitations under the License.
     visibility: visible;
     position: initial;
     display: inline;
+    padding-left: 5px;
 }
 
-.mx_NotificationPanel .mx_EventTile_line {
+.mx_NotificationPanel .mx_EventTile:not([data-layout=bubble]) .mx_EventTile_line {
     margin-right: 0px;
     padding-left: 36px; // align with the room name
     padding-top: 0px;
@@ -118,7 +118,7 @@ limitations under the License.
 }
 
 .mx_NotificationPanel .mx_EventTile:hover .mx_EventTile_line {
-    background-color: $primary-bg-color;
+    background-color: $background;
 }
 
 .mx_NotificationPanel .mx_EventTile_content {
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 52a2a68b6a..5316cba61d 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -43,7 +43,7 @@ limitations under the License.
 .mx_RightPanel_headerButtonGroup {
     height: 100%;
     display: flex;
-    background-color: $primary-bg-color;
+    background-color: $background;
     padding: 0 9px;
     align-items: center;
 }
@@ -121,23 +121,51 @@ $pulse-color: $pinned-unread-color;
         box-shadow: 0 0 0 0 rgba($pulse-color, 1);
         animation: mx_RightPanel_indicator_pulse 2s infinite;
         animation-iteration-count: 1;
+
+        &::after {
+            content: "";
+            position: absolute;
+            width: inherit;
+            height: inherit;
+            top: 0;
+            left: 0;
+            transform: scale(1);
+            transform-origin: center center;
+            animation-name: mx_RightPanel_indicator_pulse_shadow;
+            animation-duration: inherit;
+            animation-iteration-count: inherit;
+            border-radius: 50%;
+            background: rgba($pulse-color, 1);
+        }
     }
 }
 
 @keyframes mx_RightPanel_indicator_pulse {
     0% {
         transform: scale(0.95);
-        box-shadow: 0 0 0 0 rgba($pulse-color, 0.7);
     }
 
     70% {
         transform: scale(1);
-        box-shadow: 0 0 0 10px rgba($pulse-color, 0);
     }
 
     100% {
         transform: scale(0.95);
-        box-shadow: 0 0 0 0 rgba($pulse-color, 0);
+    }
+}
+
+@keyframes mx_RightPanel_indicator_pulse_shadow {
+    0% {
+        opacity: 0.7;
+    }
+
+    70% {
+        transform: scale(2.2);
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 0;
     }
 }
 
diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index ec07500af5..b6219da9e4 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -28,7 +28,7 @@ limitations under the License.
 
 .mx_RoomDirectory {
     margin-bottom: 12px;
-    color: $primary-fg-color;
+    color: $primary-content;
     word-break: break-word;
     display: flex;
     flex-direction: column;
@@ -71,14 +71,14 @@ limitations under the License.
             font-weight: $font-semi-bold;
             font-size: $font-15px;
             line-height: $font-18px;
-            color: $primary-fg-color;
+            color: $primary-content;
         }
 
         > p {
             margin: 40px auto 60px;
             font-size: $font-14px;
             line-height: $font-20px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
             max-width: 464px; // easier reading
         }
 
@@ -97,7 +97,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_table {
-    color: $primary-fg-color;
+    color: $primary-content;
     display: grid;
     font-size: $font-12px;
     grid-template-columns: max-content auto max-content max-content max-content;
@@ -183,3 +183,40 @@ limitations under the License.
         padding: 0;
     }
 }
+
+@media screen and (max-width: 700px) {
+    .mx_RoomDirectory_roomMemberCount {
+        padding: 0px;
+    }
+
+    .mx_AccessibleButton_kind_secondary {
+        padding: 0px !important;
+    }
+
+    .mx_RoomDirectory_join {
+        margin-left: 0px;
+    }
+
+    .mx_RoomDirectory_alias {
+        margin-top: 10px;
+        margin-bottom: 10px;
+    }
+
+    .mx_RoomDirectory_roomDescription {
+        padding-bottom: 0px;
+    }
+
+    .mx_RoomDirectory_name {
+        margin-bottom: 5px;
+    }
+
+    .mx_RoomDirectory_roomAvatar {
+        margin-top: 10px;
+    }
+
+    .mx_RoomDirectory_table {
+        grid-template-columns: auto;
+        row-gap: 14px;
+        margin-top: 5px;
+    }
+}
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
index 7fdafab5a6..bbd60a5ff3 100644
--- a/res/css/structures/_RoomSearch.scss
+++ b/res/css/structures/_RoomSearch.scss
@@ -33,14 +33,14 @@ limitations under the License.
         height: 16px;
         mask: url('$(res)/img/element-icons/roomlist/search.svg');
         mask-repeat: no-repeat;
-        background-color: $secondary-fg-color;
+        background-color: $secondary-content;
         margin-left: 7px;
     }
 
     .mx_RoomSearch_input {
         border: none !important; // !important to override default app-wide styles
         flex: 1 !important; // !important to override default app-wide styles
-        color: $primary-fg-color !important; // !important to override default app-wide styles
+        color: $primary-content !important; // !important to override default app-wide styles
         padding: 0;
         height: 100%;
         width: 100%;
@@ -48,12 +48,12 @@ limitations under the License.
         line-height: $font-16px;
 
         &:not(.mx_RoomSearch_inputExpanded)::placeholder {
-            color: $tertiary-fg-color !important; // !important to override default app-wide styles
+            color: $tertiary-content !important; // !important to override default app-wide styles
         }
     }
 
     &.mx_RoomSearch_hasQuery {
-        border-color: $secondary-fg-color;
+        border-color: $secondary-content;
     }
 
     &.mx_RoomSearch_focused {
@@ -62,7 +62,7 @@ limitations under the License.
     }
 
     &.mx_RoomSearch_focused, &.mx_RoomSearch_hasQuery {
-        background-color: $roomlist-filter-active-bg-color;
+        background-color: $background;
 
         .mx_RoomSearch_clearButton {
             width: 16px;
@@ -71,7 +71,7 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background-color: $secondary-fg-color;
+            background-color: $secondary-content;
             margin-right: 8px;
         }
     }
diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index 8cc00aba0f..bdfbca1afa 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -27,7 +27,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_image {
     margin-right: -12px;
-    border: 1px solid $primary-bg-color;
+    border: 1px solid $background;
 }
 
 .mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_initial {
@@ -39,7 +39,7 @@ limitations under the License.
     display: inline-block;
     color: #acacac;
     background-color: #ddd;
-    border: 1px solid $primary-bg-color;
+    border: 1px solid $background;
     border-radius: 40px;
     width: 24px;
     height: 24px;
@@ -112,7 +112,7 @@ limitations under the License.
 
         .mx_AccessibleButton {
             padding: 5px 10px;
-            padding-left: 28px; // 16px for the icon, 2px margin to text, 10px regular padding
+            padding-left: 30px; // 18px for the icon, 2px margin to text, 10px regular padding
             display: inline-block;
             position: relative;
 
@@ -128,13 +128,14 @@ limitations under the License.
                 mask-repeat: no-repeat;
                 mask-position: center;
                 mask-size: contain;
+                width: 18px;
+                height: 18px;
+                top: 50%; // text sizes are dynamic
+                transform: translateY(-50%);
             }
 
             &.mx_RoomStatusBar_unsentCancelAllBtn::before {
                 mask-image: url('$(res)/img/element-icons/trashcan.svg');
-                width: 12px;
-                height: 16px;
-                top: calc(50% - 8px); // text sizes are dynamic
             }
 
             &.mx_RoomStatusBar_unsentResendAllBtn {
@@ -142,9 +143,6 @@ limitations under the License.
 
                 &::before {
                     mask-image: url('$(res)/img/element-icons/retry.svg');
-                    width: 18px;
-                    height: 18px;
-                    top: calc(50% - 9px); // text sizes are dynamic
                 }
             }
         }
@@ -173,14 +171,14 @@ limitations under the License.
 }
 
 .mx_RoomStatusBar_connectionLostBar_desc {
-    color: $primary-fg-color;
+    color: $primary-content;
     font-size: $font-13px;
     opacity: 0.5;
     padding-bottom: 20px;
 }
 
 .mx_RoomStatusBar_resend_link {
-    color: $primary-fg-color !important;
+    color: $primary-content !important;
     text-decoration: underline !important;
     cursor: pointer;
 }
@@ -189,7 +187,7 @@ limitations under the License.
     height: 50px;
     line-height: $font-50px;
 
-    color: $primary-fg-color;
+    color: $primary-content;
     opacity: 0.5;
     overflow-y: hidden;
     display: block;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 0efa2d01a1..fd9c4a14fc 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -14,10 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_RoomView_wrapper {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    position: relative;
+    justify-content: center;
+    // Contain the amount of layers rendered by constraining what actually needs re-layering via css
+    contain: strict;
+}
+
 .mx_RoomView {
     word-wrap: break-word;
     display: flex;
     flex-direction: column;
+    flex: 1;
+    position: relative;
 }
 
 
@@ -40,7 +52,7 @@ limitations under the License.
 
     pointer-events: none;
 
-    background-color: $primary-bg-color;
+    background-color: $background;
     opacity: 0.95;
 
     position: absolute;
@@ -57,14 +69,15 @@ limitations under the License.
 
 @keyframes mx_RoomView_fileDropTarget_image_animation {
     from {
-        width: 0px;
+        transform: scaleX(0);
     }
     to {
-        width: 32px;
+        transform: scaleX(1);
     }
 }
 
 .mx_RoomView_fileDropTarget_image {
+    width: 32px;
     animation: mx_RoomView_fileDropTarget_image_animation;
     animation-duration: 0.5s;
     margin-bottom: 16px;
@@ -76,7 +89,6 @@ limitations under the License.
     margin: 0px auto;
 
     overflow: auto;
-    flex: 0 0 auto;
 }
 
 .mx_RoomView_auxPanel_fullHeight {
@@ -86,7 +98,7 @@ limitations under the License.
     left: 0;
     right: 0;
     z-index: 3000;
-    background-color: $primary-bg-color;
+    background-color: $background;
 }
 
 .mx_RoomView_auxPanel_hiddenHighlights {
@@ -152,7 +164,6 @@ limitations under the License.
     flex: 1;
     display: flex;
     flex-direction: column;
-    contain: content;
 }
 
 .mx_RoomView_statusArea {
@@ -160,7 +171,7 @@ limitations under the License.
     flex: 0 0 auto;
 
     max-height: 0px;
-    background-color: $primary-bg-color;
+    background-color: $background;
     z-index: 1000;
     overflow: hidden;
 
@@ -245,7 +256,7 @@ hr.mx_RoomView_myReadMarker {
 }
 
 .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
-    background-color: $primary-bg-color;
+    background-color: $background;
 }
 
 .mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {
diff --git a/res/css/structures/_ScrollPanel.scss b/res/css/structures/_ScrollPanel.scss
index 7b75c69e86..a668594bba 100644
--- a/res/css/structures/_ScrollPanel.scss
+++ b/res/css/structures/_ScrollPanel.scss
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 .mx_ScrollPanel {
-
     .mx_RoomView_MessageList {
         position: relative;
         display: flex;
diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceHierarchy.scss
similarity index 80%
rename from res/css/structures/_SpaceRoomDirectory.scss
rename to res/css/structures/_SpaceHierarchy.scss
index 7925686bf1..a5d589f9c2 100644
--- a/res/css/structures/_SpaceRoomDirectory.scss
+++ b/res/css/structures/_SpaceHierarchy.scss
@@ -14,21 +14,6 @@ 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_SpaceRoomDirectory,
 .mx_SpaceRoomView_landing {
     .mx_Dialog_title {
         display: flex;
@@ -52,7 +37,7 @@ limitations under the License.
 
             > div {
                 font-weight: 400;
-                color: $secondary-fg-color;
+                color: $secondary-content;
                 font-size: $font-15px;
                 line-height: $font-24px;
             }
@@ -61,29 +46,36 @@ limitations under the License.
 
     .mx_AccessibleButton_kind_link {
         padding: 0;
+        font-size: inherit;
     }
 
     .mx_SearchBox {
         margin: 24px 0 16px;
     }
 
-    .mx_SpaceRoomDirectory_noResults {
+    .mx_SpaceHierarchy_noResults {
         text-align: center;
 
         > div {
             font-size: $font-15px;
             line-height: $font-24px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
         }
     }
 
-    .mx_SpaceRoomDirectory_listHeader {
+    .mx_SpaceHierarchy_listHeader {
         display: flex;
         min-height: 32px;
         align-items: center;
         font-size: $font-15px;
         line-height: $font-24px;
-        color: $primary-fg-color;
+        color: $primary-content;
+        margin-bottom: 12px;
+
+        > h4 {
+            font-weight: $font-semi-bold;
+            margin: 0;
+        }
 
         .mx_AccessibleButton {
             padding: 4px 12px;
@@ -104,7 +96,7 @@ limitations under the License.
         }
     }
 
-    .mx_SpaceRoomDirectory_error {
+    .mx_SpaceHierarchy_error {
         position: relative;
         font-weight: $font-semi-bold;
         color: $notice-primary-color;
@@ -123,43 +115,44 @@ limitations under the License.
             background-image: url("$(res)/img/element-icons/warning-badge.svg");
         }
     }
-}
 
-.mx_SpaceRoomDirectory_list {
-    margin-top: 16px;
-    padding-bottom: 40px;
+    .mx_SpaceHierarchy_list {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+    }
 
-    .mx_SpaceRoomDirectory_roomCount {
+    .mx_SpaceHierarchy_roomCount {
         > h3 {
             display: inline;
             font-weight: $font-semi-bold;
             font-size: $font-18px;
             line-height: $font-22px;
-            color: $primary-fg-color;
+            color: $primary-content;
         }
 
         > span {
             margin-left: 8px;
             font-size: $font-15px;
             line-height: $font-24px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
         }
     }
 
-    .mx_SpaceRoomDirectory_subspace {
+    .mx_SpaceHierarchy_subspace {
         .mx_BaseAvatar_image {
             border-radius: 8px;
         }
     }
 
-    .mx_SpaceRoomDirectory_subspace_toggle {
+    .mx_SpaceHierarchy_subspace_toggle {
         position: absolute;
         left: -1px;
         top: 10px;
         height: 16px;
         width: 16px;
         border-radius: 4px;
-        background-color: $primary-bg-color;
+        background-color: $background;
 
         &::before {
             content: '';
@@ -170,27 +163,26 @@ limitations under the License.
             width: 16px;
             mask-repeat: no-repeat;
             mask-position: center;
-            background-color: $tertiary-fg-color;
+            background-color: $tertiary-content;
             mask-size: 16px;
             transform: rotate(270deg);
             mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         }
 
-        &.mx_SpaceRoomDirectory_subspace_toggle_shown::before {
+        &.mx_SpaceHierarchy_subspace_toggle_shown::before {
             transform: rotate(0deg);
         }
     }
 
-    .mx_SpaceRoomDirectory_subspace_children {
+    .mx_SpaceHierarchy_subspace_children {
         position: relative;
         padding-left: 12px;
     }
 
-    .mx_SpaceRoomDirectory_roomTile {
+    .mx_SpaceHierarchy_roomTile {
         position: relative;
         padding: 8px 16px;
         border-radius: 8px;
-        min-height: 56px;
         box-sizing: border-box;
 
         display: grid;
@@ -204,7 +196,7 @@ limitations under the License.
             grid-column: 1;
         }
 
-        .mx_SpaceRoomDirectory_roomTile_name {
+        .mx_SpaceHierarchy_roomTile_name {
             font-weight: $font-semi-bold;
             font-size: $font-15px;
             line-height: $font-18px;
@@ -214,7 +206,7 @@ limitations under the License.
             .mx_InfoTooltip {
                 display: inline;
                 margin-left: 12px;
-                color: $tertiary-fg-color;
+                color: $tertiary-content;
                 font-size: $font-12px;
                 line-height: $font-15px;
 
@@ -232,10 +224,10 @@ limitations under the License.
             }
         }
 
-        .mx_SpaceRoomDirectory_roomTile_info {
+        .mx_SpaceHierarchy_roomTile_info {
             font-size: $font-14px;
             line-height: $font-18px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
             grid-row: 2;
             grid-column: 1/3;
             display: -webkit-box;
@@ -244,7 +236,7 @@ limitations under the License.
             overflow: hidden;
         }
 
-        .mx_SpaceRoomDirectory_actions {
+        .mx_SpaceHierarchy_actions {
             text-align: right;
             margin-left: 20px;
             grid-column: 3;
@@ -269,7 +261,7 @@ limitations under the License.
             }
         }
 
-        &:hover {
+        &:hover, &:focus-within {
             background-color: $groupFilterPanel-bg-color;
 
             .mx_AccessibleButton {
@@ -278,8 +270,12 @@ limitations under the License.
         }
     }
 
-    .mx_SpaceRoomDirectory_roomTile,
-    .mx_SpaceRoomDirectory_subspace_children {
+    li.mx_SpaceHierarchy_roomTileWrapper {
+        list-style: none;
+    }
+
+    .mx_SpaceHierarchy_roomTile,
+    .mx_SpaceHierarchy_subspace_children {
         &::before {
             content: "";
             position: absolute;
@@ -291,12 +287,12 @@ limitations under the License.
         }
     }
 
-    .mx_SpaceRoomDirectory_actions {
-        .mx_SpaceRoomDirectory_actionsText {
+    .mx_SpaceHierarchy_actions {
+        .mx_SpaceHierarchy_actionsText {
             font-weight: normal;
             font-size: $font-12px;
             line-height: $font-15px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
         }
     }
 
@@ -307,7 +303,7 @@ limitations under the License.
         margin: 20px 0;
     }
 
-    .mx_SpaceRoomDirectory_createRoom {
+    .mx_SpaceHierarchy_createRoom {
         display: block;
         margin: 16px auto 0;
         width: max-content;
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index c433ccf275..30d421a351 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -20,18 +20,20 @@ $gutterSize: 16px;
 $activeBorderTransparentGap: 1px;
 
 $activeBackgroundColor: $roomtile-selected-bg-color;
-$activeBorderColor: $secondary-fg-color;
+$activeBorderColor: $secondary-content;
 
 .mx_SpacePanel {
-    flex: 0 0 auto;
     background-color: $groupFilterPanel-bg-color;
+    flex: 0 0 auto;
     padding: 0;
     margin: 0;
+    position: relative;
+    // Fix for the blurred avatar-background
+    z-index: 1;
 
     // Create another flexbox so the Panel fills the container
     display: flex;
     flex-direction: column;
-    overflow-y: auto;
 
     .mx_SpacePanel_spaceTreeWrapper {
         flex: 1;
@@ -69,6 +71,12 @@ $activeBorderColor: $secondary-fg-color;
         cursor: pointer;
     }
 
+    .mx_SpaceItem_dragging {
+        .mx_SpaceButton_toggleCollapse {
+            visibility: hidden;
+        }
+    }
+
     .mx_SpaceTreeLevel {
         display: flex;
         flex-direction: column;
@@ -95,6 +103,16 @@ $activeBorderColor: $secondary-fg-color;
         }
     }
 
+    .mx_SpaceItem_new {
+        position: relative;
+
+        .mx_BetaDot {
+            position: absolute;
+            left: 33px;
+            top: -5px;
+        }
+    }
+
     .mx_SpaceItem:not(.hasSubSpaces) > .mx_SpaceButton {
         margin-left: $gutterSize;
         min-width: 40px;
@@ -106,6 +124,7 @@ $activeBorderColor: $secondary-fg-color;
         align-items: center;
         padding: 4px 4px 4px 0;
         width: 100%;
+        cursor: pointer;
 
         &.mx_SpaceButton_active {
             &:not(.mx_SpaceButton_narrow) .mx_SpaceButton_selectionWrapper {
@@ -130,7 +149,6 @@ $activeBorderColor: $secondary-fg-color;
         &:not(.mx_SpaceButton_narrow) {
             .mx_SpaceButton_selectionWrapper {
                 width: 100%;
-                padding-right: 16px;
                 overflow: hidden;
             }
         }
@@ -142,7 +160,6 @@ $activeBorderColor: $secondary-fg-color;
             display: block;
             text-overflow: ellipsis;
             overflow: hidden;
-            padding-right: 8px;
             font-size: $font-14px;
             line-height: $font-18px;
         }
@@ -187,22 +204,17 @@ $activeBorderColor: $secondary-fg-color;
         }
 
         &.mx_SpaceButton_new .mx_SpaceButton_icon {
-            background-color: $accent-color;
-            transition: all .1s ease-in-out; // TODO transition
+            background-color: $roomlist-button-bg-color;
 
             &::before {
-                background-color: #ffffff;
+                background-color: $primary-content;
                 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_SpaceButton_newCancel .mx_SpaceButton_icon::before {
+            transform: rotate(45deg);
         }
 
         .mx_BaseAvatar_image {
@@ -216,8 +228,7 @@ $activeBorderColor: $secondary-fg-color;
             margin-top: auto;
             margin-bottom: auto;
             display: none;
-            position: absolute;
-            right: 4px;
+            position: relative;
 
             &::before {
                 top: 2px;
@@ -230,14 +241,12 @@ $activeBorderColor: $secondary-fg-color;
                 mask-size: contain;
                 mask-repeat: no-repeat;
                 mask-image: url('$(res)/img/element-icons/context-menu.svg');
-                background: $primary-fg-color;
+                background: $primary-content;
             }
         }
     }
 
     .mx_SpacePanel_badgeContainer {
-        position: absolute;
-
         // Create a flexbox to make aligning dot badges easier
         display: flex;
         align-items: center;
@@ -255,6 +264,7 @@ $activeBorderColor: $secondary-fg-color;
     &.collapsed {
         .mx_SpaceButton {
             .mx_SpacePanel_badgeContainer {
+                position: absolute;
                 right: 0;
                 top: 0;
 
@@ -284,19 +294,12 @@ $activeBorderColor: $secondary-fg-color;
     }
 
     &:not(.collapsed) {
-        .mx_SpacePanel_badgeContainer {
-            position: absolute;
-            right: 4px;
-        }
-
         .mx_SpaceButton:hover,
         .mx_SpaceButton:focus-within,
         .mx_SpaceButton_hasMenuOpen {
-            &:not(.mx_SpaceButton_home):not(.mx_SpaceButton_invite) {
+            &:not(.mx_SpaceButton_invite) {
                 // Hide the badge container on hover because it'll be a menu button
                 .mx_SpacePanel_badgeContainer {
-                    width: 0;
-                    height: 0;
                     display: none;
                 }
 
@@ -363,6 +366,14 @@ $activeBorderColor: $secondary-fg-color;
     .mx_SpacePanel_iconExplore::before {
         mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
     }
+
+    .mx_SpacePanel_noIcon {
+        display: none;
+
+        & + .mx_IconizedContextMenu_label {
+            padding-left: 5px !important; // override default iconized label style to align with header
+        }
+    }
 }
 
 
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 4bc4af467c..812b6dcea9 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -32,7 +32,7 @@ $SpaceRoomViewInnerWidth: 428px;
     }
 
     > span {
-        color: $secondary-fg-color;
+        color: $secondary-content;
     }
 
     &::before {
@@ -45,7 +45,7 @@ $SpaceRoomViewInnerWidth: 428px;
         mask-position: center;
         mask-repeat: no-repeat;
         mask-size: 24px;
-        background-color: $tertiary-fg-color;
+        background-color: $tertiary-content;
     }
 
     &:hover {
@@ -56,12 +56,15 @@ $SpaceRoomViewInnerWidth: 428px;
         }
 
         > span {
-            color: $primary-fg-color;
+            color: $primary-content;
         }
     }
 }
 
 .mx_SpaceRoomView {
+    overflow-y: auto;
+    flex: 1;
+
     .mx_MainSplit > div:first-child {
         padding: 80px 60px;
         flex-grow: 1;
@@ -72,13 +75,13 @@ $SpaceRoomViewInnerWidth: 428px;
             margin: 0;
             font-size: $font-24px;
             font-weight: $font-semi-bold;
-            color: $primary-fg-color;
+            color: $primary-content;
             width: max-content;
         }
 
         .mx_SpaceRoomView_description {
             font-size: $font-15px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
             margin-top: 12px;
             margin-bottom: 24px;
             max-width: $SpaceRoomViewInnerWidth;
@@ -154,7 +157,7 @@ $SpaceRoomViewInnerWidth: 428px;
             font-weight: $font-semi-bold;
             font-size: $font-14px;
             line-height: $font-24px;
-            color: $primary-fg-color;
+            color: $primary-content;
             margin-top: 24px;
             position: relative;
             padding-left: 24px;
@@ -176,7 +179,19 @@ $SpaceRoomViewInnerWidth: 428px;
                 mask-position: center;
                 mask-size: contain;
                 mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
-                background-color: $secondary-fg-color;
+                background-color: $secondary-content;
+            }
+        }
+
+        .mx_SpaceRoomView_preview_migratedCommunity {
+            margin-bottom: 16px;
+            padding: 8px 12px;
+            border-radius: 8px;
+            border: 1px solid $input-border-color;
+            width: max-content;
+
+            .mx_BaseAvatar {
+                margin-right: 4px;
             }
         }
 
@@ -195,14 +210,15 @@ $SpaceRoomViewInnerWidth: 428px;
 
                 .mx_SpaceRoomView_preview_inviter_mxid {
                     line-height: $font-24px;
-                    color: $secondary-fg-color;
+                    color: $secondary-content;
                 }
             }
         }
 
-        > .mx_BaseAvatar_image,
-        > .mx_BaseAvatar > .mx_BaseAvatar_image {
-            border-radius: 12px;
+        > .mx_RoomAvatar_isSpaceRoom {
+            &.mx_BaseAvatar_image, .mx_BaseAvatar_image {
+                border-radius: 12px;
+            }
         }
 
         h1.mx_SpaceRoomView_preview_name {
@@ -212,7 +228,7 @@ $SpaceRoomViewInnerWidth: 428px;
         .mx_SpaceRoomView_preview_topic {
             font-size: $font-14px;
             line-height: $font-22px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
             margin: 20px 0;
             max-height: 160px;
             overflow-y: auto;
@@ -234,6 +250,10 @@ $SpaceRoomViewInnerWidth: 428px;
     }
 
     .mx_SpaceRoomView_landing {
+        display: flex;
+        flex-direction: column;
+        min-width: 0;
+
         > .mx_BaseAvatar_image,
         > .mx_BaseAvatar > .mx_BaseAvatar_image {
             border-radius: 12px;
@@ -242,7 +262,7 @@ $SpaceRoomViewInnerWidth: 428px;
         .mx_SpaceRoomView_landing_name {
             margin: 24px 0 16px;
             font-size: $font-15px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
 
             > span {
                 display: inline-block;
@@ -315,7 +335,7 @@ $SpaceRoomViewInnerWidth: 428px;
                     top: 0;
                     height: 24px;
                     width: 24px;
-                    background: $tertiary-fg-color;
+                    background: $tertiary-content;
                     mask-position: center;
                     mask-size: contain;
                     mask-repeat: no-repeat;
@@ -328,26 +348,21 @@ $SpaceRoomViewInnerWidth: 428px;
             font-size: $font-15px;
             margin-top: 12px;
             margin-bottom: 16px;
-            white-space: pre;
-        }
-
-        > hr {
-            border: none;
-            height: 1px;
-            background-color: $groupFilterPanel-bg-color;
+            white-space: pre-wrap;
+            word-wrap: break-word;
         }
 
         .mx_SearchBox {
             margin: 0 0 20px;
+            flex: 0;
         }
 
         .mx_SpaceFeedbackPrompt {
-            margin-bottom: 16px;
-
-            // hide the HR as we have our own
-            & + hr {
-                display: none;
-            }
+            padding: 7px; // 8px - 1px border
+            border: 1px solid rgba($primary-content, .1);
+            border-radius: 8px;
+            width: max-content;
+            margin: 0 0 -40px auto; // collapse its own height to not push other components down
         }
     }
 
@@ -365,6 +380,45 @@ $SpaceRoomViewInnerWidth: 428px;
         }
     }
 
+    .mx_SpaceRoomView_betaWarning {
+        padding: 12px 12px 12px 54px;
+        position: relative;
+        font-size: $font-15px;
+        line-height: $font-24px;
+        width: 432px;
+        border-radius: 8px;
+        background-color: $info-plinth-bg-color;
+        color: $secondary-content;
+        box-sizing: border-box;
+
+        > h3 {
+            font-weight: $font-semi-bold;
+            font-size: inherit;
+            line-height: inherit;
+            margin: 0;
+        }
+
+        > p {
+            font-size: inherit;
+            line-height: inherit;
+            margin: 0;
+        }
+
+        &::before {
+            mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
+            mask-position: center;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+            content: '';
+            width: 20px;
+            height: 20px;
+            position: absolute;
+            top: 14px;
+            left: 14px;
+            background-color: $secondary-content;
+        }
+    }
+
     .mx_SpaceRoomView_inviteTeammates {
         // XXX remove this when spaces leaves Beta
         .mx_SpaceRoomView_inviteTeammates_betaDisclaimer {
@@ -384,7 +438,7 @@ $SpaceRoomViewInnerWidth: 428px;
         }
 
         .mx_SpaceRoomView_inviteTeammates_buttons {
-            color: $secondary-fg-color;
+            color: $secondary-content;
             margin-top: 28px;
 
             .mx_AccessibleButton {
@@ -400,7 +454,7 @@ $SpaceRoomViewInnerWidth: 428px;
                     width: 24px;
                     top: 0;
                     left: 0;
-                    background-color: $secondary-fg-color;
+                    background-color: $secondary-content;
                     mask-repeat: no-repeat;
                     mask-position: center;
                     mask-size: contain;
@@ -419,7 +473,7 @@ $SpaceRoomViewInnerWidth: 428px;
 }
 
 .mx_SpaceRoomView_info {
-    color: $secondary-fg-color;
+    color: $secondary-content;
     font-size: $font-15px;
     line-height: $font-24px;
     margin: 20px 0;
@@ -438,7 +492,7 @@ $SpaceRoomViewInnerWidth: 428px;
             left: -2px;
             mask-position: center;
             mask-repeat: no-repeat;
-            background-color: $tertiary-fg-color;
+            background-color: $tertiary-content;
         }
     }
 
@@ -464,66 +518,3 @@ $SpaceRoomViewInnerWidth: 428px;
         }
     }
 }
-
-.mx_SpaceFeedbackPrompt {
-    margin-top: 18px;
-    margin-bottom: 12px;
-
-    > hr {
-        border: none;
-        border-top: 1px solid $input-border-color;
-        margin-bottom: 12px;
-    }
-
-    > div {
-        display: flex;
-        flex-direction: row;
-        font-size: $font-15px;
-        line-height: $font-24px;
-
-        > span {
-            color: $secondary-fg-color;
-            position: relative;
-            padding-left: 32px;
-            font-size: inherit;
-            line-height: inherit;
-            margin-right: auto;
-
-            &::before {
-                content: '';
-                position: absolute;
-                left: 0;
-                top: 2px;
-                height: 20px;
-                width: 20px;
-                background-color: $secondary-fg-color;
-                mask-repeat: no-repeat;
-                mask-size: contain;
-                mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
-                mask-position: center;
-            }
-        }
-
-        .mx_AccessibleButton_kind_link {
-            color: $accent-color;
-            position: relative;
-            padding: 0 0 0 24px;
-            margin-left: 8px;
-            font-size: inherit;
-            line-height: inherit;
-
-            &::before {
-                content: '';
-                position: absolute;
-                left: 0;
-                height: 16px;
-                width: 16px;
-                background-color: $accent-color;
-                mask-repeat: no-repeat;
-                mask-size: contain;
-                mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
-                mask-position: center;
-            }
-        }
-    }
-}
diff --git a/res/css/structures/_TabbedView.scss b/res/css/structures/_TabbedView.scss
index 39a8ebed32..e185197f25 100644
--- a/res/css/structures/_TabbedView.scss
+++ b/res/css/structures/_TabbedView.scss
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Travis Ralston
 Copyright 2019 New Vector Ltd
+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.
@@ -20,7 +21,6 @@ limitations under the License.
     padding: 0 0 0 16px;
     display: flex;
     flex-direction: column;
-    position: absolute;
     top: 0;
     bottom: 0;
     left: 0;
@@ -28,11 +28,93 @@ limitations under the License.
     margin-top: 8px;
 }
 
+.mx_TabbedView_tabsOnLeft {
+    flex-direction: column;
+    position: absolute;
+
+    .mx_TabbedView_tabLabels {
+        width: 170px;
+        max-width: 170px;
+        position: fixed;
+    }
+
+    .mx_TabbedView_tabPanel {
+        margin-left: 240px; // 170px sidebar + 70px padding
+        flex-direction: column;
+    }
+
+    .mx_TabbedView_tabLabel_active {
+        background-color: $tab-label-active-bg-color;
+        color: $tab-label-active-fg-color;
+    }
+
+    .mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
+        background-color: $tab-label-active-icon-bg-color;
+    }
+
+    .mx_TabbedView_maskedIcon {
+        width: 16px;
+        height: 16px;
+        margin-left: 8px;
+        margin-right: 16px;
+    }
+
+    .mx_TabbedView_maskedIcon::before {
+        mask-size: 16px;
+        width: 16px;
+        height: 16px;
+    }
+}
+
+.mx_TabbedView_tabsOnTop {
+    flex-direction: column;
+
+    .mx_TabbedView_tabLabels {
+        display: flex;
+        margin-bottom: 8px;
+    }
+
+    .mx_TabbedView_tabLabel {
+        padding-left: 0px;
+        padding-right: 52px;
+
+        .mx_TabbedView_tabLabel_text {
+            font-size: 15px;
+            color: $tertiary-content;
+        }
+    }
+
+    .mx_TabbedView_tabPanel {
+        flex-direction: row;
+    }
+
+    .mx_TabbedView_tabLabel_active {
+        color: $accent-color;
+        .mx_TabbedView_tabLabel_text {
+            color: $accent-color;
+        }
+    }
+
+    .mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
+        background-color: $accent-color;
+    }
+
+    .mx_TabbedView_maskedIcon {
+        width: 22px;
+        height: 22px;
+        margin-left: 0px;
+        margin-right: 8px;
+    }
+
+    .mx_TabbedView_maskedIcon::before {
+        mask-size: 22px;
+        width: inherit;
+        height: inherit;
+    }
+}
+
 .mx_TabbedView_tabLabels {
-    width: 170px;
-    max-width: 170px;
     color: $tab-label-fg-color;
-    position: fixed;
 }
 
 .mx_TabbedView_tabLabel {
@@ -46,43 +128,25 @@ limitations under the License.
     position: relative;
 }
 
-.mx_TabbedView_tabLabel_active {
-    background-color: $tab-label-active-bg-color;
-    color: $tab-label-active-fg-color;
-}
-
 .mx_TabbedView_maskedIcon {
-    margin-left: 8px;
-    margin-right: 16px;
-    width: 16px;
-    height: 16px;
     display: inline-block;
 }
 
 .mx_TabbedView_maskedIcon::before {
     display: inline-block;
-    background-color: $tab-label-icon-bg-color;
+    background-color: $icon-button-color;
     mask-repeat: no-repeat;
-    mask-size: 16px;
-    width: 16px;
-    height: 16px;
     mask-position: center;
     content: '';
 }
 
-.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
-    background-color: $tab-label-active-icon-bg-color;
-}
-
 .mx_TabbedView_tabLabel_text {
     vertical-align: middle;
 }
 
 .mx_TabbedView_tabPanel {
-    margin-left: 240px; // 170px sidebar + 70px padding
     flex-grow: 1;
     display: flex;
-    flex-direction: column;
     min-height: 0; // firefox
 }
 
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 09f834a6e3..55181a8b53 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -28,7 +28,7 @@ limitations under the License.
         margin: 0 4px;
         grid-row: 2 / 4;
         grid-column: 1;
-        background-color: $dark-panel-bg-color;
+        background-color: $system;
         box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
         border-radius: 8px;
     }
@@ -36,8 +36,8 @@ limitations under the License.
     .mx_Toast_toast {
         grid-row: 1 / 3;
         grid-column: 1;
-        color: $primary-fg-color;
-        background-color: $dark-panel-bg-color;
+        background-color: $system;
+        color: $primary-content;
         box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
         border-radius: 8px;
         overflow: hidden;
@@ -63,7 +63,7 @@ limitations under the License.
 
             &.mx_Toast_icon_verification::after {
                 mask-image: url("$(res)/img/e2e/normal.svg");
-                background-color: $primary-fg-color;
+                background-color: $primary-content;
             }
 
             &.mx_Toast_icon_verification_warning {
@@ -71,7 +71,7 @@ limitations under the License.
                 &::before {
                     background-color: #ffffff;
                     mask-image: url('$(res)/img/e2e/normal.svg');
-                    mask-size: 90%;
+                    mask-size: 80%;
                 }
 
                 &::after {
@@ -82,7 +82,7 @@ limitations under the License.
 
             &.mx_Toast_icon_secure_backup::after {
                 mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
-                background-color: $primary-fg-color;
+                background-color: $primary-content;
             }
 
             .mx_Toast_title, .mx_Toast_body {
@@ -122,7 +122,7 @@ limitations under the License.
                 float: right;
                 font-size: $font-12px;
                 line-height: $font-22px;
-                color: $muted-fg-color;
+                color: $secondary-content;
             }
         }
 
@@ -135,10 +135,14 @@ limitations under the License.
             float: right;
             display: flex;
 
-            .mx_FormButton {
+            .mx_AccessibleButton {
                 min-width: 96px;
                 box-sizing: border-box;
             }
+
+            .mx_AccessibleButton + .mx_AccessibleButton {
+                margin-left: 5px;
+            }
         }
 
         .mx_Toast_description {
@@ -159,7 +163,7 @@ limitations under the License.
         }
 
         .mx_Toast_detail {
-            color: $secondary-fg-color;
+            color: $secondary-content;
         }
 
         .mx_Toast_deviceID {
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index 17e6ad75df..c10e7f60df 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -35,7 +35,7 @@ limitations under the License.
         // we cheat opacity on the theme colour with an after selector here
         &::after {
             content: '';
-            border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
+            border-bottom: 1px solid $primary-content;
             opacity: 0.2;
             display: block;
             padding-top: 8px;
@@ -58,7 +58,7 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background: $tertiary-fg-color;
+            background: $tertiary-content;
             mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         }
     }
@@ -176,7 +176,7 @@ limitations under the License.
             width: 85%;
             opacity: 0.2;
             border: none;
-            border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
+            border-bottom: 1px solid $primary-content;
         }
 
         &.mx_IconizedContextMenu {
@@ -292,7 +292,7 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background: $primary-fg-color;
+            background: $primary-content;
         }
     }
 
diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index 248eab5d88..e3d6135ef3 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -24,7 +24,7 @@ limitations under the License.
 .mx_ViewSource_heading {
     font-size: $font-17px;
     font-weight: 400;
-    color: $primary-fg-color;
+    color: $primary-content;
     margin-top: 0.7em;
 }
 
diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 9c98ca3a1c..c4aaaca1d0 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -96,3 +96,10 @@ div.mx_AccessibleButton_kind_link.mx_Login_forgot {
         cursor: not-allowed;
     }
 }
+.mx_Login_spinner {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+    padding: 14px;
+}
diff --git a/res/css/views/audio_messages/_AudioPlayer.scss b/res/css/views/audio_messages/_AudioPlayer.scss
new file mode 100644
index 0000000000..3c2551e36a
--- /dev/null
+++ b/res/css/views/audio_messages/_AudioPlayer.scss
@@ -0,0 +1,67 @@
+/*
+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_MediaBody.mx_AudioPlayer_container {
+    padding: 16px 12px 12px 12px;
+
+    .mx_AudioPlayer_primaryContainer {
+        display: flex;
+
+        .mx_PlayPauseButton {
+            margin-right: 8px;
+        }
+
+        .mx_AudioPlayer_mediaInfo {
+            flex: 1;
+            overflow: hidden; // makes the ellipsis on the file name work
+
+            & > * {
+                display: block;
+            }
+
+            .mx_AudioPlayer_mediaName {
+                color: $primary-content;
+                font-size: $font-15px;
+                line-height: $font-15px;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                overflow: hidden;
+                padding-bottom: 4px; // mimics the line-height differences in the Figma
+            }
+
+            .mx_AudioPlayer_byline {
+                font-size: $font-12px;
+                line-height: $font-12px;
+            }
+        }
+    }
+
+    .mx_AudioPlayer_seek {
+        display: flex;
+        align-items: center;
+
+        .mx_SeekBar {
+            flex: 1;
+        }
+
+        .mx_Clock {
+            width: $font-42px; // we're not using a monospace font, so fake it
+            min-width: $font-42px; // for flexbox
+            padding-left: 4px; // isolate from seek bar
+            text-align: right;
+        }
+    }
+}
diff --git a/res/css/views/voice_messages/_PlayPauseButton.scss b/res/css/views/audio_messages/_PlayPauseButton.scss
similarity index 91%
rename from res/css/views/voice_messages/_PlayPauseButton.scss
rename to res/css/views/audio_messages/_PlayPauseButton.scss
index 6caedafa29..714da3e605 100644
--- a/res/css/views/voice_messages/_PlayPauseButton.scss
+++ b/res/css/views/audio_messages/_PlayPauseButton.scss
@@ -18,6 +18,8 @@ limitations under the License.
     position: relative;
     width: 32px;
     height: 32px;
+    min-width: 32px; // for when the button is used in a flexbox
+    min-height: 32px; // for when the button is used in a flexbox
     border-radius: 32px;
     background-color: $voice-playback-button-bg-color;
 
diff --git a/res/css/views/voice_messages/_PlaybackContainer.scss b/res/css/views/audio_messages/_PlaybackContainer.scss
similarity index 72%
rename from res/css/views/voice_messages/_PlaybackContainer.scss
rename to res/css/views/audio_messages/_PlaybackContainer.scss
index 20def16d6a..3886e38583 100644
--- a/res/css/views/voice_messages/_PlaybackContainer.scss
+++ b/res/css/views/audio_messages/_PlaybackContainer.scss
@@ -18,29 +18,28 @@ limitations under the License.
 // are shared amongst multiple voice message components.
 
 // Container for live recording and playback controls
-.mx_VoiceMessagePrimaryContainer {
-    // 7px top and bottom for visual design. 12px left & right, but the waveform (right)
-    // has a 1px padding on it that we want to account for.
-    padding: 7px 12px 7px 11px;
-    background-color: $voice-record-waveform-bg-color;
-    border-radius: 12px;
+.mx_MediaBody.mx_VoiceMessagePrimaryContainer {
+    // The waveform (right) has a 1px padding on it that we want to account for, otherwise
+    // inherit from mx_MediaBody
+    padding-right: 11px;
 
     // Cheat at alignment a bit
     display: flex;
     align-items: center;
 
-    color: $voice-record-waveform-fg-color;
-    font-size: $font-14px;
-    line-height: $font-24px;
+    contain: content;
 
     .mx_Waveform {
         .mx_Waveform_bar {
             background-color: $voice-record-waveform-incomplete-fg-color;
+            height: 100%;
+            /* Variable set by a JS component */
+            transform: scaleY(max(0.05, var(--barHeight)));
 
             &.mx_Waveform_bar_100pct {
                 // Small animation to remove the mechanical feel of progress
                 transition: background-color 250ms ease;
-                background-color: $voice-record-waveform-fg-color;
+                background-color: $secondary-content;
             }
         }
     }
@@ -50,4 +49,8 @@ limitations under the License.
         padding-right: 6px; // with the fixed width this ends up as a visual 8px most of the time, as intended.
         padding-left: 8px; // isolate from recording circle / play control
     }
+
+    &.mx_VoiceMessagePrimaryContainer_noWaveform {
+        max-width: 162px; // with all the padding this results in 185px wide
+    }
 }
diff --git a/res/css/views/audio_messages/_SeekBar.scss b/res/css/views/audio_messages/_SeekBar.scss
new file mode 100644
index 0000000000..03449d009b
--- /dev/null
+++ b/res/css/views/audio_messages/_SeekBar.scss
@@ -0,0 +1,103 @@
+/*
+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.
+*/
+
+// CSS inspiration from:
+// * https://www.w3schools.com/howto/howto_js_rangeslider.asp
+// * https://stackoverflow.com/a/28283806
+// * https://css-tricks.com/styling-cross-browser-compatible-range-inputs-css/
+
+.mx_SeekBar {
+    // Dev note: we deliberately do not have the -ms-track (and friends) selectors because we don't
+    // need to support IE.
+
+    appearance: none; // default style override
+
+    width: 100%;
+    height: 1px;
+    background: $quaternary-content;
+    outline: none; // remove blue selection border
+    position: relative; // for before+after pseudo elements later on
+
+    cursor: pointer;
+
+    &::-webkit-slider-thumb {
+        appearance: none; // default style override
+
+        // Dev note: This needs to be duplicated with the -moz-range-thumb selector
+        // because otherwise Edge (webkit) will fail to see the styles and just refuse
+        // to apply them.
+        width: 8px;
+        height: 8px;
+        border-radius: 8px;
+        background-color: $tertiary-content;
+        cursor: pointer;
+    }
+
+    &::-moz-range-thumb {
+        width: 8px;
+        height: 8px;
+        border-radius: 8px;
+        background-color: $tertiary-content;
+        cursor: pointer;
+
+        // Firefox adds a border on the thumb
+        border: none;
+    }
+
+    // This is for webkit support, but we can't limit the functionality of it to just webkit
+    // browsers. Firefox responds to webkit-prefixed values now, which means we can't use media
+    // or support queries to selectively apply the rule. An upside is that this CSS doesn't work
+    // in firefox, so it's just wasted CPU/GPU time.
+    &::before { // ::before to ensure it ends up under the thumb
+        content: '';
+        background-color: $tertiary-content;
+
+        // Absolute positioning to ensure it overlaps with the existing bar
+        position: absolute;
+        top: 0;
+        left: 0;
+
+        // Sizing to match the bar
+        width: 100%;
+        height: 1px;
+
+        // And finally dynamic width without overly hurting the rendering engine.
+        transform-origin: 0 100%;
+        transform: scaleX(var(--fillTo));
+    }
+
+    // This is firefox's built-in support for the above, with 100% less hacks.
+    &::-moz-range-progress {
+        background-color: $tertiary-content;
+        height: 1px;
+    }
+
+    &:disabled {
+        opacity: 0.5;
+    }
+
+    // Increase clickable area for the slider (approximately same size as browser default)
+    // We do it this way to keep the same padding and margins of the element, avoiding margin math.
+    // Source: https://front-back.com/expand-clickable-areas-for-a-better-touch-experience/
+    &::after {
+        content: '';
+        position: absolute;
+        top: -6px;
+        bottom: -6px;
+        left: 0;
+        right: 0;
+    }
+}
diff --git a/res/css/views/voice_messages/_Waveform.scss b/res/css/views/audio_messages/_Waveform.scss
similarity index 100%
rename from res/css/views/voice_messages/_Waveform.scss
rename to res/css/views/audio_messages/_Waveform.scss
diff --git a/res/css/views/auth/_AuthButtons.scss b/res/css/views/auth/_AuthButtons.scss
index 8deb0f80ac..3a2ad2adf8 100644
--- a/res/css/views/auth/_AuthButtons.scss
+++ b/res/css/views/auth/_AuthButtons.scss
@@ -39,7 +39,7 @@ limitations under the License.
     min-width: 80px;
 
     background-color: $accent-color;
-    color: $primary-bg-color;
+    color: $background;
 
     cursor: pointer;
 
diff --git a/res/css/views/auth/_InteractiveAuthEntryComponents.scss b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
index ffaad3cd7a..ec07b765fd 100644
--- a/res/css/views/auth/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
@@ -85,7 +85,7 @@ limitations under the License.
 .mx_InteractiveAuthEntryComponents_termsPolicy {
     display: flex;
     flex-direction: row;
-    justify-content: start;
+    justify-content: flex-start;
     align-items: center;
 }
 
diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
index 257b512579..4922068462 100644
--- a/res/css/views/avatars/_DecoratedRoomAvatar.scss
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -47,7 +47,7 @@ limitations under the License.
         mask-position: center;
         mask-size: contain;
         mask-repeat: no-repeat;
-        background: $secondary-fg-color;
+        background: $secondary-content;
         mask-image: url('$(res)/img/globe.svg');
     }
 
diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss
index 3463a653fc..a6b61d3ead 100644
--- a/res/css/views/beta/_BetaCard.scss
+++ b/res/css/views/beta/_BetaCard.scss
@@ -19,49 +19,68 @@ limitations under the License.
     padding: 24px;
     background-color: $settings-profile-placeholder-bg-color;
     border-radius: 8px;
-    display: flex;
     box-sizing: border-box;
 
-    > div {
-        .mx_BetaCard_title {
-            font-weight: $font-semi-bold;
-            font-size: $font-18px;
-            line-height: $font-22px;
-            color: $primary-fg-color;
-            margin: 4px 0 14px;
+    .mx_BetaCard_columns {
+        display: flex;
 
-            .mx_BetaCard_betaPill {
-                margin-left: 12px;
+        > div {
+            .mx_BetaCard_title {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                line-height: $font-22px;
+                color: $primary-content;
+                margin: 4px 0 14px;
+
+                .mx_BetaCard_betaPill {
+                    margin-left: 12px;
+                }
+            }
+
+            .mx_BetaCard_caption {
+                font-size: $font-15px;
+                line-height: $font-20px;
+                color: $secondary-content;
+                margin-bottom: 20px;
+            }
+
+            .mx_BetaCard_buttons .mx_AccessibleButton {
+                display: block;
+                margin: 12px 0;
+                padding: 7px 40px;
+                width: auto;
+            }
+
+            .mx_BetaCard_disclaimer {
+                font-size: $font-12px;
+                line-height: $font-15px;
+                color: $secondary-content;
+                margin-top: 20px;
             }
         }
 
-        .mx_BetaCard_caption {
-            font-size: $font-15px;
-            line-height: $font-20px;
-            color: $secondary-fg-color;
-            margin-bottom: 20px;
-        }
-
-        .mx_AccessibleButton {
-            display: block;
-            margin: 12px 0;
-            padding: 7px 40px;
-            width: auto;
-        }
-
-        .mx_BetaCard_disclaimer {
-            font-size: $font-12px;
-            line-height: $font-15px;
-            color: $secondary-fg-color;
-            margin-top: 20px;
+        > img {
+            margin: auto 0 auto 20px;
+            width: 300px;
+            object-fit: contain;
+            height: 100%;
         }
     }
 
-    > img {
-        margin: auto 0 auto 20px;
-        width: 300px;
-        object-fit: contain;
-        height: 100%;
+    .mx_BetaCard_relatedSettings {
+        .mx_SettingsFlag {
+            margin: 16px 0 0;
+            font-size: $font-15px;
+            line-height: $font-24px;
+            color: $primary-content;
+
+            .mx_SettingsFlag_microcopy {
+                margin-top: 4px;
+                font-size: $font-12px;
+                line-height: $font-15px;
+                color: $secondary-content;
+            }
+        }
     }
 }
 
@@ -91,24 +110,53 @@ $dot-size: 12px;
     width: $dot-size;
     transform: scale(1);
     background: rgba($pulse-color, 1);
-    box-shadow: 0 0 0 0 rgba($pulse-color, 1);
     animation: mx_Beta_bluePulse 2s infinite;
     animation-iteration-count: 20;
+    position: relative;
+    pointer-events: none;
+
+    &::after {
+        content: "";
+        position: absolute;
+        width: inherit;
+        height: inherit;
+        top: 0;
+        left: 0;
+        transform: scale(1);
+        transform-origin: center center;
+        animation-name: mx_Beta_bluePulse_shadow;
+        animation-duration: inherit;
+        animation-iteration-count: inherit;
+        border-radius: 50%;
+        background: rgba($pulse-color, 1);
+    }
 }
 
 @keyframes mx_Beta_bluePulse {
     0% {
         transform: scale(0.95);
-        box-shadow: 0 0 0 0 rgba($pulse-color, 0.7);
     }
 
     70% {
         transform: scale(1);
-        box-shadow: 0 0 0 10px rgba($pulse-color, 0);
     }
 
     100% {
         transform: scale(0.95);
-        box-shadow: 0 0 0 0 rgba($pulse-color, 0);
+    }
+}
+
+@keyframes mx_Beta_bluePulse_shadow {
+    0% {
+        opacity: 0.7;
+    }
+
+    70% {
+        transform: scale(2.2);
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 0;
     }
 }
diff --git a/res/css/views/context_menus/_IconizedContextMenu.scss b/res/css/views/context_menus/_IconizedContextMenu.scss
index 204435995f..ca40f18cd4 100644
--- a/res/css/views/context_menus/_IconizedContextMenu.scss
+++ b/res/css/views/context_menus/_IconizedContextMenu.scss
@@ -36,7 +36,7 @@ limitations under the License.
             //
             // Therefore, we just hack in a line and border the thing ourselves
             &::before {
-                border-top: 1px solid $primary-fg-color;
+                border-top: 1px solid $primary-content;
                 opacity: 0.1;
                 content: '';
 
@@ -63,7 +63,7 @@ limitations under the License.
             padding-top: 12px;
             padding-bottom: 12px;
             text-decoration: none;
-            color: $primary-fg-color;
+            color: $primary-content;
             font-size: $font-15px;
             line-height: $font-24px;
 
@@ -99,6 +99,10 @@ limitations under the License.
             .mx_IconizedContextMenu_icon + .mx_IconizedContextMenu_label {
                 padding-left: 14px;
             }
+
+            .mx_BetaCard_betaPill {
+                margin-left: 16px;
+            }
         }
     }
 
@@ -115,7 +119,7 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background: $primary-fg-color;
+            background: $primary-content;
         }
     }
 
@@ -145,12 +149,17 @@ limitations under the License.
         }
     }
 
-    .mx_IconizedContextMenu_checked {
+    .mx_IconizedContextMenu_checked,
+    .mx_IconizedContextMenu_unchecked {
         margin-left: 16px;
         margin-right: -5px;
+    }
 
-        &::before {
-            mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
-        }
+    .mx_IconizedContextMenu_checked::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+    }
+
+    .mx_IconizedContextMenu_unchecked::before {
+        content: unset;
     }
 }
diff --git a/res/css/views/context_menus/_MessageContextMenu.scss b/res/css/views/context_menus/_MessageContextMenu.scss
index 2ecb93e734..5af748e28d 100644
--- a/res/css/views/context_menus/_MessageContextMenu.scss
+++ b/res/css/views/context_menus/_MessageContextMenu.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2021 Michael Weimann <mail@michael-weimann.eu>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,16 +16,69 @@ limitations under the License.
 */
 
 .mx_MessageContextMenu {
-    padding: 6px;
-}
 
-.mx_MessageContextMenu_field {
-    display: block;
-    padding: 3px 6px 3px 6px;
-    cursor: pointer;
-    white-space: nowrap;
-}
+    .mx_IconizedContextMenu_icon {
+        width: 16px;
+        height: 16px;
+        display: block;
 
-.mx_MessageContextMenu_field.mx_MessageContextMenu_fieldSet {
-    font-weight: bold;
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            display: block;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-content;
+        }
+    }
+
+    .mx_MessageContextMenu_iconCollapse::before {
+        mask-image: url('$(res)/img/element-icons/message/chevron-up.svg');
+    }
+
+    .mx_MessageContextMenu_iconReport::before {
+        mask-image: url('$(res)/img/element-icons/warning-badge.svg');
+    }
+
+    .mx_MessageContextMenu_iconLink::before {
+        mask-image: url('$(res)/img/element-icons/link.svg');
+    }
+
+    .mx_MessageContextMenu_iconPermalink::before {
+        mask-image: url('$(res)/img/element-icons/room/share.svg');
+    }
+
+    .mx_MessageContextMenu_iconUnhidePreview::before {
+        mask-image: url('$(res)/img/element-icons/settings/appearance.svg');
+    }
+
+    .mx_MessageContextMenu_iconForward::before {
+        mask-image: url('$(res)/img/element-icons/message/fwd.svg');
+    }
+
+    .mx_MessageContextMenu_iconRedact::before {
+        mask-image: url('$(res)/img/element-icons/trashcan.svg');
+    }
+
+    .mx_MessageContextMenu_iconResend::before {
+        mask-image: url('$(res)/img/element-icons/retry.svg');
+    }
+
+    .mx_MessageContextMenu_iconSource::before {
+        mask-image: url('$(res)/img/element-icons/room/format-bar/code.svg');
+    }
+
+    .mx_MessageContextMenu_iconQuote::before {
+        mask-image: url('$(res)/img/element-icons/room/format-bar/quote.svg');
+    }
+
+    .mx_MessageContextMenu_iconPin::before {
+        mask-image: url('$(res)/img/element-icons/room/pin-upright.svg');
+    }
+
+    .mx_MessageContextMenu_iconUnpin::before {
+        mask-image: url('$(res)/img/element-icons/room/pin.svg');
+    }
 }
diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss
index fceb7fba34..1a97fb56c7 100644
--- a/res/css/views/context_menus/_StatusMessageContextMenu.scss
+++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss
@@ -27,7 +27,7 @@ input.mx_StatusMessageContextMenu_message {
     border-radius: 4px;
     border: 1px solid $input-border-color;
     padding: 6.5px 11px;
-    background-color: $primary-bg-color;
+    background-color: $background;
     font-weight: normal;
     margin: 0 0 10px;
 }
diff --git a/res/css/views/context_menus/_TagTileContextMenu.scss b/res/css/views/context_menus/_TagTileContextMenu.scss
index 8929c8906e..14f5ec817e 100644
--- a/res/css/views/context_menus/_TagTileContextMenu.scss
+++ b/res/css/views/context_menus/_TagTileContextMenu.scss
@@ -38,10 +38,23 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/view-community.svg');
 }
 
+.mx_TagTileContextMenu_moveUp::before {
+    transform: rotate(180deg);
+    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+}
+
+.mx_TagTileContextMenu_moveDown::before {
+    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+}
+
 .mx_TagTileContextMenu_hideCommunity::before {
     mask-image: url('$(res)/img/element-icons/hide.svg');
 }
 
+.mx_TagTileContextMenu_createSpace::before {
+    mask-image: url('$(res)/img/element-icons/message/fwd.svg');
+}
+
 .mx_TagTileContextMenu_separator {
     margin-top: 0;
     margin-bottom: 0;
diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
index 2776c477fc..444b29c9bf 100644
--- a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
@@ -44,70 +44,17 @@ limitations under the License.
 
         > h3 {
             margin: 0;
-            color: $secondary-fg-color;
+            color: $secondary-content;
             font-size: $font-12px;
             font-weight: $font-semi-bold;
             line-height: $font-15px;
         }
 
-        .mx_AddExistingToSpace_entry {
-            display: flex;
-            margin-top: 12px;
-
-            // we can't target .mx_BaseAvatar here as it'll break the decorated avatar styling
-            .mx_DecoratedRoomAvatar {
-                margin-right: 12px;
-            }
-
-            .mx_AddExistingToSpace_entry_name {
-                font-size: $font-15px;
-                line-height: 30px;
-                flex-grow: 1;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                margin-right: 12px;
-            }
-
-            .mx_Checkbox {
-                align-items: center;
-            }
-        }
-    }
-
-    .mx_AddExistingToSpace_section_spaces {
-        .mx_BaseAvatar {
-            margin-right: 12px;
-        }
-
-        .mx_BaseAvatar_image {
-            border-radius: 8px;
-        }
-    }
-
-    .mx_AddExistingToSpace_section_experimental {
-        position: relative;
-        border-radius: 8px;
-        margin: 12px 0;
-        padding: 8px 8px 8px 42px;
-        background-color: $header-panel-bg-color;
-
-        font-size: $font-12px;
-        line-height: $font-15px;
-        color: $secondary-fg-color;
-
-        &::before {
-            content: '';
-            position: absolute;
-            left: 10px;
-            top: calc(50% - 8px); // vertical centering
-            height: 16px;
-            width: 16px;
-            background-color: $secondary-fg-color;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
-            mask-position: center;
+        .mx_AccessibleButton_kind_link {
+            font-size: $font-12px;
+            line-height: $font-15px;
+            margin-top: 8px;
+            padding: 0;
         }
     }
 
@@ -119,7 +66,7 @@ limitations under the License.
             flex-grow: 1;
             font-size: $font-12px;
             line-height: $font-15px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
 
             .mx_ProgressBar {
                 height: 8px;
@@ -132,7 +79,7 @@ limitations under the License.
                 margin-top: 8px;
                 font-size: $font-15px;
                 line-height: $font-24px;
-                color: $primary-fg-color;
+                color: $primary-content;
             }
 
             > * {
@@ -158,7 +105,7 @@ limitations under the License.
                 margin-top: 4px;
                 font-size: $font-12px;
                 line-height: $font-15px;
-                color: $primary-fg-color;
+                color: $primary-content;
             }
         }
 
@@ -179,7 +126,7 @@ limitations under the License.
             &::before {
                 content: '';
                 position: absolute;
-                background-color: $primary-fg-color;
+                background-color: $primary-content;
                 mask-repeat: no-repeat;
                 mask-position: center;
                 mask-size: contain;
@@ -198,84 +145,113 @@ limitations under the License.
 
 .mx_AddExistingToSpaceDialog {
     width: 480px;
-    color: $primary-fg-color;
+    color: $primary-content;
     display: flex;
     flex-direction: column;
     flex-wrap: nowrap;
     min-height: 0;
     height: 80vh;
 
-    .mx_Dialog_title {
-        display: flex;
-
-        .mx_BaseAvatar_image {
-            border-radius: 8px;
-            margin: 0;
-            vertical-align: unset;
-        }
-
-        .mx_BaseAvatar {
-            display: inline-flex;
-            margin: auto 16px auto 5px;
-            vertical-align: middle;
-        }
-
-        > 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_AddExistingToSpace {
         display: contents;
     }
 }
+
+.mx_SubspaceSelector {
+    display: flex;
+
+    .mx_BaseAvatar_image {
+        border-radius: 8px;
+        margin: 0;
+        vertical-align: unset;
+    }
+
+    .mx_BaseAvatar {
+        display: inline-flex;
+        margin: auto 16px auto 5px;
+        vertical-align: middle;
+    }
+
+    > div {
+        > h1 {
+            font-weight: $font-semi-bold;
+            font-size: $font-18px;
+            line-height: $font-22px;
+            margin: 0;
+        }
+    }
+
+    .mx_Dropdown_input {
+        border: none;
+
+        > .mx_Dropdown_option {
+            padding-left: 0;
+            flex: unset;
+            height: unset;
+            color: $secondary-content;
+            font-size: $font-15px;
+            line-height: $font-24px;
+
+            .mx_BaseAvatar {
+                display: none;
+            }
+        }
+
+        .mx_Dropdown_menu {
+            .mx_SubspaceSelector_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_SubspaceSelector_onlySpace {
+        color: $secondary-content;
+        font-size: $font-15px;
+        line-height: $font-24px;
+    }
+}
+
+.mx_AddExistingToSpace_entry {
+    display: flex;
+    margin-top: 12px;
+
+    .mx_DecoratedRoomAvatar, // we can't target .mx_BaseAvatar here as it'll break the decorated avatar styling
+    .mx_BaseAvatar.mx_RoomAvatar_isSpaceRoom {
+        margin-right: 12px;
+    }
+
+    img.mx_RoomAvatar_isSpaceRoom,
+    .mx_RoomAvatar_isSpaceRoom img {
+        border-radius: 8px;
+    }
+
+    .mx_AddExistingToSpace_entry_name {
+        font-size: $font-15px;
+        line-height: 30px;
+        flex-grow: 1;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        margin-right: 12px;
+    }
+
+    .mx_Checkbox {
+        align-items: center;
+    }
+}
diff --git a/res/css/views/dialogs/_AddressPickerDialog.scss b/res/css/views/dialogs/_AddressPickerDialog.scss
index 136e497994..a1147e6fbc 100644
--- a/res/css/views/dialogs/_AddressPickerDialog.scss
+++ b/res/css/views/dialogs/_AddressPickerDialog.scss
@@ -29,7 +29,6 @@ limitations under the License.
 .mx_AddressPickerDialog_input:focus {
     height: 26px;
     font-size: $font-14px;
-    font-family: $font-family;
     padding-left: 12px;
     padding-right: 12px;
     margin: 0 !important;
diff --git a/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss b/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
index beae03f00f..5d6c817b14 100644
--- a/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
+++ b/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
@@ -65,7 +65,7 @@ limitations under the License.
                 .mx_CommunityPrototypeInviteDialog_personName {
                     font-weight: 600;
                     font-size: $font-14px;
-                    color: $primary-fg-color;
+                    color: $primary-content;
                     margin-left: 7px;
                 }
 
diff --git a/res/css/views/dialogs/_ConfirmUserActionDialog.scss b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
index 823f4d1e28..5ac0f07b14 100644
--- a/res/css/views/dialogs/_ConfirmUserActionDialog.scss
+++ b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
@@ -34,10 +34,9 @@ limitations under the License.
 }
 
 .mx_ConfirmUserActionDialog_reasonField {
-    font-family: $font-family;
     font-size: $font-14px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: $primary-content;
+    background-color: $background;
 
     border-radius: 3px;
     border: solid 1px $input-border-color;
diff --git a/res/css/views/dialogs/_CreateGroupDialog.scss b/res/css/views/dialogs/_CreateGroupDialog.scss
index f7bfc61a98..ef9c2b73d4 100644
--- a/res/css/views/dialogs/_CreateGroupDialog.scss
+++ b/res/css/views/dialogs/_CreateGroupDialog.scss
@@ -29,8 +29,8 @@ limitations under the License.
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: $primary-content;
+    background-color: $background;
 }
 
 .mx_CreateGroupDialog_input_hasPrefixAndSuffix {
diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 2678f7b4ad..9cfa8ce25a 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -55,8 +55,8 @@ limitations under the License.
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: $primary-content;
+    background-color: $background;
     width: 100%;
 }
 
@@ -65,7 +65,7 @@ limitations under the License.
 .mx_CreateRoomDialog_aliasContainer {
     display: flex;
     // put margin on container so it can collapse with siblings
-    margin: 10px 0;
+    margin: 24px 0 10px;
 
     .mx_RoomAliasField {
         margin: 0;
@@ -101,10 +101,6 @@ limitations under the License.
         margin-left: 30px;
     }
 
-    .mx_CreateRoomDialog_topic {
-        margin-bottom: 36px;
-    }
-
     .mx_Dialog_content > .mx_SettingsFlag {
         margin-top: 24px;
     }
@@ -114,4 +110,3 @@ limitations under the License.
         font-size: $font-12px;
     }
 }
-
diff --git a/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss b/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
new file mode 100644
index 0000000000..6ff328f6ab
--- /dev/null
+++ b/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
@@ -0,0 +1,187 @@
+/*
+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_CreateSpaceFromCommunityDialog_wrapper {
+    .mx_Dialog {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+.mx_CreateSpaceFromCommunityDialog {
+    width: 480px;
+    color: $primary-content;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    min-height: 0;
+
+    .mx_CreateSpaceFromCommunityDialog_content {
+        > p {
+            font-size: $font-15px;
+            line-height: $font-24px;
+
+            &:first-of-type {
+                margin-top: 0;
+            }
+
+            &.mx_CreateSpaceFromCommunityDialog_flairNotice {
+                font-size: $font-12px;
+                line-height: $font-15px;
+            }
+        }
+
+        .mx_SpaceBasicSettings {
+            > p {
+                font-size: $font-12px;
+                line-height: $font-15px;
+                margin: 16px 0;
+            }
+
+            .mx_Field_textarea {
+                margin-bottom: 0;
+            }
+        }
+
+        .mx_JoinRuleDropdown .mx_Dropdown_menu {
+            width: auto !important; // override fixed width
+        }
+
+        .mx_CreateSpaceFromCommunityDialog_nonPublicSpacer {
+            height: 63px; // balance the height of the missing room alias field to prevent modal bouncing
+        }
+    }
+
+    .mx_CreateSpaceFromCommunityDialog_footer {
+        display: flex;
+        margin-top: 20px;
+
+        > span {
+            flex-grow: 1;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-content;
+
+            .mx_ProgressBar {
+                height: 8px;
+                width: 100%;
+
+                @mixin ProgressBarBorderRadius 8px;
+            }
+
+            .mx_CreateSpaceFromCommunityDialog_progressText {
+                margin-top: 8px;
+                font-size: $font-15px;
+                line-height: $font-24px;
+                color: $primary-content;
+            }
+
+            > * {
+                vertical-align: middle;
+            }
+        }
+
+        .mx_CreateSpaceFromCommunityDialog_error {
+            padding-left: 12px;
+
+            > img {
+                align-self: center;
+            }
+
+            .mx_CreateSpaceFromCommunityDialog_errorHeading {
+                font-weight: $font-semi-bold;
+                font-size: $font-15px;
+                line-height: $font-18px;
+                color: $notice-primary-color;
+            }
+
+            .mx_CreateSpaceFromCommunityDialog_errorCaption {
+                margin-top: 4px;
+                font-size: $font-12px;
+                line-height: $font-15px;
+                color: $primary-content;
+            }
+        }
+
+        .mx_AccessibleButton {
+            display: inline-block;
+            align-self: center;
+        }
+
+        .mx_AccessibleButton_kind_primary {
+            padding: 8px 36px;
+            margin-left: 24px;
+        }
+
+        .mx_AccessibleButton_kind_primary_outline {
+            margin-left: auto;
+        }
+
+        .mx_CreateSpaceFromCommunityDialog_retryButton {
+            margin-left: 12px;
+            padding-left: 24px;
+            position: relative;
+
+            &::before {
+                content: '';
+                position: absolute;
+                background-color: $primary-content;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+                mask-image: url('$(res)/img/element-icons/retry.svg');
+                width: 18px;
+                height: 18px;
+                left: 0;
+            }
+        }
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+    }
+}
+
+.mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog {
+    .mx_InfoDialog {
+        max-width: 500px;
+    }
+
+    .mx_AccessibleButton_kind_link {
+        padding: 0;
+    }
+
+    .mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark {
+        position: relative;
+        border-radius: 50%;
+        border: 3px solid $accent-color;
+        width: 68px;
+        height: 68px;
+        margin: 12px auto 32px;
+
+        &::before {
+            width: inherit;
+            height: inherit;
+            content: '';
+            position: absolute;
+            background-color: $accent-color;
+            mask-repeat: no-repeat;
+            mask-position: center;
+            mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+            mask-size: 48px;
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_CreateSubspaceDialog.scss b/res/css/views/dialogs/_CreateSubspaceDialog.scss
new file mode 100644
index 0000000000..1ed10df35c
--- /dev/null
+++ b/res/css/views/dialogs/_CreateSubspaceDialog.scss
@@ -0,0 +1,81 @@
+/*
+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_CreateSubspaceDialog_wrapper {
+    .mx_Dialog {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+.mx_CreateSubspaceDialog {
+    width: 480px;
+    color: $primary-content;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    min-height: 0;
+
+    .mx_CreateSubspaceDialog_content {
+        flex-grow: 1;
+
+        .mx_CreateSubspaceDialog_betaNotice {
+            padding: 12px 16px;
+            border-radius: 8px;
+            background-color: $header-panel-bg-color;
+
+            .mx_BetaCard_betaPill {
+                margin-right: 8px;
+                vertical-align: middle;
+            }
+        }
+
+        .mx_JoinRuleDropdown + p {
+            color: $muted-fg-color;
+            font-size: $font-12px;
+        }
+    }
+
+    .mx_CreateSubspaceDialog_footer {
+        display: flex;
+        margin-top: 20px;
+
+        .mx_CreateSubspaceDialog_footer_prompt {
+            flex-grow: 1;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-content;
+
+            > * {
+                vertical-align: middle;
+            }
+        }
+
+        .mx_AccessibleButton {
+            display: inline-block;
+            align-self: center;
+        }
+
+        .mx_AccessibleButton_kind_primary {
+            margin-left: 16px;
+            padding: 8px 36px;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 8fee740016..4d35e8d569 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -55,22 +55,6 @@ limitations under the License.
     padding-right: 24px;
 }
 
-.mx_DevTools_inputCell {
-    display: table-cell;
-    width: 240px;
-}
-
-.mx_DevTools_inputCell input {
-    display: inline-block;
-    border: 0;
-    border-bottom: 1px solid $input-underline-color;
-    padding: 0;
-    width: 240px;
-    color: $input-fg-color;
-    font-family: $font-family;
-    font-size: $font-16px;
-}
-
 .mx_DevTools_textarea {
     font-size: $font-12px;
     max-width: 684px;
@@ -139,7 +123,6 @@ limitations under the License.
     + .mx_DevTools_tgl-btn {
         padding: 2px;
         transition: all .2s ease;
-        font-family: sans-serif;
         perspective: 100px;
         &::after,
         &::before {
diff --git a/res/css/views/dialogs/_ExportDialog.scss b/res/css/views/dialogs/_ExportDialog.scss
new file mode 100644
index 0000000000..d578e72ead
--- /dev/null
+++ b/res/css/views/dialogs/_ExportDialog.scss
@@ -0,0 +1,91 @@
+/*
+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_ExportDialog {
+    .mx_ExportDialog_subheading {
+        font-size: $font-16px;
+        display: block;
+        font-family: $font-family;
+        font-weight: $font-semi-bold;
+        color: $primary-content;
+        margin-top: 18px;
+        margin-bottom: 12px;
+    }
+
+    &.mx_ExportDialog_Exporting {
+        .mx_ExportDialog_options {
+            pointer-events: none;
+        }
+
+        .mx_Field_select::before {
+            display: none;
+        }
+
+        .mx_RadioButton input[type="radio"]:checked + div > div {
+            background: $greyed-fg-color;
+        }
+
+        .mx_RadioButton input[type=radio]:checked + div {
+            border-color: unset;
+        }
+
+        .mx_Field_valid.mx_Field label,
+        .mx_Field_valid.mx_Field:focus-within label {
+            color: unset;
+        }
+
+        .mx_Field_valid.mx_Field, .mx_Field_valid.mx_Field:focus-within {
+            border-color: $input-border-color;
+        }
+
+        .mx_Checkbox input[type="checkbox"]:checked + label > .mx_Checkbox_background {
+            background: $greyed-fg-color;
+            border-color: $greyed-fg-color;
+        }
+    }
+
+    .mx_ExportDialog_progress {
+        .mx_Dialog_buttons {
+            margin-top: unset;
+            margin-left: 18px;
+        }
+
+        .mx_Spinner {
+            width: unset;
+            height: unset;
+            flex: unset;
+            margin-right: 10px;
+        }
+
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-end;
+        align-items: center;
+    }
+
+    .mx_RadioButton > .mx_RadioButton_content {
+        margin-top: 5px;
+        margin-bottom: 5px;
+    }
+
+    .mx_Field {
+        width: 256px;
+    }
+
+    .mx_Field_postfix {
+        padding: 9px 10px;
+    }
+}
diff --git a/res/css/views/dialogs/_FeedbackDialog.scss b/res/css/views/dialogs/_FeedbackDialog.scss
index fd225dd882..74733f7220 100644
--- a/res/css/views/dialogs/_FeedbackDialog.scss
+++ b/res/css/views/dialogs/_FeedbackDialog.scss
@@ -33,7 +33,7 @@ limitations under the License.
         padding-left: 52px;
 
         > p {
-            color: $tertiary-fg-color;
+            color: $tertiary-content;
         }
 
         .mx_AccessibleButton_kind_link {
diff --git a/res/css/views/dialogs/_ForwardDialog.scss b/res/css/views/dialogs/_ForwardDialog.scss
new file mode 100644
index 0000000000..da8ce3de5b
--- /dev/null
+++ b/res/css/views/dialogs/_ForwardDialog.scss
@@ -0,0 +1,163 @@
+/*
+Copyright 2021 Robin Townsend <robin@robin.town>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_ForwardDialog {
+    width: 520px;
+    color: $primary-content;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    min-height: 0;
+    height: 80vh;
+
+    > h3 {
+        margin: 0 0 6px;
+        color: $secondary-content;
+        font-size: $font-12px;
+        font-weight: $font-semi-bold;
+        line-height: $font-15px;
+    }
+
+    > .mx_ForwardDialog_preview {
+        max-height: 30%;
+        flex-shrink: 0;
+        overflow-y: auto;
+
+        .mx_EventTile[data-layout=bubble] {
+            margin-top: 20px;
+        }
+
+        div {
+            pointer-events: none;
+        }
+
+        .mx_EventTile_msgOption {
+            display: none;
+        }
+
+        // When forwarding messages from encrypted rooms, EventTile will complain
+        // that our preview is unencrypted, which doesn't actually matter
+        .mx_EventTile_e2eIcon_unencrypted {
+            display: none;
+        }
+
+        // We also hide download links to not encourage users to try interacting
+        .mx_MFileBody_download {
+            display: none;
+        }
+    }
+
+    > hr {
+        width: 100%;
+        border: none;
+        border-top: 1px solid $input-border-color;
+        margin: 12px 0;
+    }
+
+    > .mx_ForwardList {
+        display: contents;
+
+        .mx_SearchBox {
+            // To match the space around the title
+            margin: 0 0 15px 0;
+            flex-grow: 0;
+        }
+
+        .mx_ForwardList_content {
+            flex-grow: 1;
+        }
+
+        .mx_ForwardList_noResults {
+            display: block;
+            margin-top: 24px;
+        }
+
+        .mx_ForwardList_results {
+            &:not(:first-child) {
+                margin-top: 24px;
+            }
+
+            .mx_ForwardList_entry {
+                display: flex;
+                justify-content: space-between;
+                height: 32px;
+                padding: 6px;
+                border-radius: 8px;
+
+                &:hover {
+                    background-color: $groupFilterPanel-bg-color;
+                }
+
+                .mx_ForwardList_roomButton {
+                    display: flex;
+                    margin-right: 12px;
+                    min-width: 0;
+
+                    .mx_DecoratedRoomAvatar {
+                        margin-right: 12px;
+                    }
+
+                    .mx_ForwardList_entry_name {
+                        font-size: $font-15px;
+                        line-height: 30px;
+                        overflow: hidden;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        margin-right: 12px;
+                    }
+                }
+
+                .mx_ForwardList_sendButton {
+                    position: relative;
+
+                    &:not(.mx_ForwardList_canSend) .mx_ForwardList_sendLabel {
+                        // Hide the "Send" label while preserving button size
+                        visibility: hidden;
+                    }
+
+                    .mx_ForwardList_sendIcon, .mx_NotificationBadge {
+                        position: absolute;
+                    }
+
+                    .mx_NotificationBadge {
+                        // Match the failed to send indicator's color with the disabled button
+                        background-color: $button-danger-disabled-fg-color;
+                    }
+
+                    &.mx_ForwardList_sending .mx_ForwardList_sendIcon {
+                        background-color: $button-primary-bg-color;
+                        mask-image: url('$(res)/img/element-icons/circle-sending.svg');
+                        mask-position: center;
+                        mask-repeat: no-repeat;
+                        mask-size: 14px;
+                        width: 14px;
+                        height: 14px;
+                    }
+
+                    &.mx_ForwardList_sent .mx_ForwardList_sendIcon {
+                        background-color: $button-primary-bg-color;
+                        mask-image: url('$(res)/img/element-icons/circle-sent.svg');
+                        mask-position: center;
+                        mask-repeat: no-repeat;
+                        mask-size: 14px;
+                        width: 14px;
+                        height: 14px;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_BetaFeedbackDialog.scss b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
similarity index 87%
rename from res/css/views/dialogs/_BetaFeedbackDialog.scss
rename to res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
index 9f5f6b512e..ab7496249d 100644
--- a/res/css/views/dialogs/_BetaFeedbackDialog.scss
+++ b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_BetaFeedbackDialog {
-    .mx_BetaFeedbackDialog_subheading {
-        color: $primary-fg-color;
+.mx_GenericFeatureFeedbackDialog {
+    .mx_GenericFeatureFeedbackDialog_subheading {
+        color: $primary-content;
         font-size: $font-14px;
         line-height: $font-20px;
         margin-bottom: 24px;
diff --git a/res/css/views/dialogs/_HostSignupDialog.scss b/res/css/views/dialogs/_HostSignupDialog.scss
index ac4bc41951..d8a6652a39 100644
--- a/res/css/views/dialogs/_HostSignupDialog.scss
+++ b/res/css/views/dialogs/_HostSignupDialog.scss
@@ -70,11 +70,11 @@ limitations under the License.
 }
 
 .mx_HostSignupDialog_text_dark {
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_HostSignupDialog_text_light {
-    color: $secondary-fg-color;
+    color: $secondary-content;
 }
 
 .mx_HostSignup_maximize_button {
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index d8ff56663a..a753115614 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -14,14 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_InviteDialog_transferWrapper .mx_Dialog {
+    padding-bottom: 16px;
+}
+
 .mx_InviteDialog_addressBar {
     display: flex;
     flex-direction: row;
+    // Right margin for the design. We could apply this to the whole dialog, but then the scrollbar
+    // for the user section gets weird.
+    margin: 8px 45px 0 0;
 
     .mx_InviteDialog_editor {
         flex: 1;
         width: 100%; // Needed to make the Field inside grow
-        background-color: $user-tile-hover-bg-color;
+        background-color: $header-panel-bg-color;
         border-radius: 4px;
         min-height: 25px;
         padding-left: 8px;
@@ -49,7 +56,7 @@ limitations under the License.
             box-sizing: border-box;
             min-width: 40%;
             flex: 1 !important;
-            color: $primary-fg-color !important;
+            color: $primary-content !important;
         }
     }
 
@@ -73,7 +80,7 @@ limitations under the License.
 }
 
 .mx_InviteDialog_section {
-    padding-bottom: 10px;
+    padding-bottom: 4px;
 
     h3 {
         font-size: $font-12px;
@@ -82,6 +89,14 @@ limitations under the License.
         text-transform: uppercase;
     }
 
+    > p {
+        margin: 0;
+    }
+
+    > span {
+        color: $primary-content;
+    }
+
     .mx_InviteDialog_subname {
         margin-bottom: 10px;
         margin-top: -10px; // HACK: Positioning with margins is bad
@@ -90,12 +105,69 @@ limitations under the License.
     }
 }
 
+.mx_InviteDialog_section_hidden_suggestions_disclaimer {
+    padding: 8px 0 16px 0;
+    font-size: $font-14px;
+
+    > span {
+        color: $primary-content;
+        font-weight: 600;
+    }
+
+    > p {
+        margin: 0;
+    }
+}
+
+.mx_InviteDialog_footer {
+    border-top: 1px solid $input-border-color;
+
+    > h3 {
+        margin: 12px 0;
+        font-size: $font-12px;
+        color: $muted-fg-color;
+        font-weight: bold;
+        text-transform: uppercase;
+    }
+
+    .mx_InviteDialog_footer_link {
+        display: flex;
+        justify-content: space-between;
+        border-radius: 4px;
+        border: solid 1px $light-fg-color;
+        padding: 8px;
+
+        > a {
+            text-decoration: none;
+            flex-shrink: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+
+    .mx_InviteDialog_footer_link_copy {
+        flex-shrink: 0;
+        cursor: pointer;
+        margin-left: 20px;
+        display: inherit;
+
+        > div {
+            mask-image: url($copy-button-url);
+            background-color: $message-action-bar-fg-color;
+            margin-left: 5px;
+            width: 20px;
+            height: 20px;
+            background-repeat: no-repeat;
+        }
+    }
+}
+
 .mx_InviteDialog_roomTile {
     cursor: pointer;
     padding: 5px 10px;
 
     &:hover {
-        background-color: $user-tile-hover-bg-color;
+        background-color: $header-panel-bg-color;
         border-radius: 4px;
     }
 
@@ -142,12 +214,13 @@ limitations under the License.
 
     .mx_InviteDialog_roomTile_nameStack {
         display: inline-block;
+        overflow: hidden;
     }
 
     .mx_InviteDialog_roomTile_name {
         font-weight: 600;
         font-size: $font-14px;
-        color: $primary-fg-color;
+        color: $primary-content;
         margin-left: 7px;
     }
 
@@ -157,6 +230,13 @@ limitations under the License.
         margin-left: 7px;
     }
 
+    .mx_InviteDialog_roomTile_name,
+    .mx_InviteDialog_roomTile_userId {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
     .mx_InviteDialog_roomTile_time {
         text-align: right;
         font-size: $font-12px;
@@ -210,26 +290,165 @@ limitations under the License.
     }
 }
 
-.mx_InviteDialog {
+.mx_InviteDialog_other {
     // Prevent the dialog from jumping around randomly when elements change.
-    height: 590px;
+    height: 600px;
     padding-left: 20px; // the design wants some padding on the left
+
+    .mx_InviteDialog_userSections {
+        height: calc(100% - 115px); // mx_InviteDialog's height minus some for the upper and lower elements
+    }
+}
+
+.mx_InviteDialog_content {
+    height: calc(100% - 36px); // full height minus the size of the header
+    overflow: hidden;
+}
+
+.mx_InviteDialog_transfer {
+    width: 496px;
+    height: 466px;
+    flex-direction: column;
+
+    .mx_InviteDialog_content {
+        flex-direction: column;
+
+        .mx_TabbedView {
+            height: calc(100% - 60px);
+        }
+        overflow: visible;
+    }
+
+    .mx_InviteDialog_addressBar {
+        margin-top: 8px;
+    }
+
+    input[type="checkbox"] {
+        margin-right: 8px;
+    }
 }
 
 .mx_InviteDialog_userSections {
-    margin-top: 10px;
+    margin-top: 4px;
     overflow-y: auto;
-    padding-right: 45px;
-    height: 455px; // mx_InviteDialog's height minus some for the upper elements
+    padding: 0 45px 4px 0;
 }
 
-// Right margin for the design. We could apply this to the whole dialog, but then the scrollbar
-// for the user section gets weird.
-.mx_InviteDialog_helpText,
-.mx_InviteDialog_addressBar {
-    margin-right: 45px;
+.mx_InviteDialog_hasFooter .mx_InviteDialog_userSections {
+    height: calc(100% - 175px);
+}
+
+.mx_InviteDialog_helpText {
+    margin: 0;
 }
 
 .mx_InviteDialog_helpText .mx_AccessibleButton_kind_link {
     padding: 0;
 }
+
+.mx_InviteDialog_dialPad .mx_InviteDialog_dialPadField {
+    border-top: 0;
+    border-left: 0;
+    border-right: 0;
+    border-radius: 0;
+    margin-top: 0;
+    border-color: $quaternary-content;
+
+    input {
+        font-size: 18px;
+        font-weight: 600;
+        padding-top: 0;
+    }
+}
+
+.mx_InviteDialog_dialPad .mx_InviteDialog_dialPadField:focus-within {
+    border-color: $accent-color;
+}
+
+.mx_InviteDialog_dialPadField .mx_Field_postfix {
+    /* Remove border separator between postfix and field content */
+    border-left: none;
+}
+
+.mx_InviteDialog_dialPad {
+    width: 224px;
+    margin-top: 16px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.mx_InviteDialog_dialPad .mx_DialPad {
+    row-gap: 16px;
+    column-gap: 48px;
+
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.mx_InviteDialog_transferConsultConnect {
+    padding-top: 16px;
+    /* This wants a drop shadow the full width of the dialog, so relative-position it
+     * and make it wider, then compensate with padding
+     */
+    position: relative;
+    width: 496px;
+    left: -24px;
+    padding-left: 24px;
+    padding-right: 24px;
+    border-top: 1px solid $quinary-content;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.mx_InviteDialog_transferConsultConnect_pushRight {
+    margin-left: auto;
+}
+
+.mx_InviteDialog_userDirectoryIcon::before {
+    mask-image: url('$(res)/img/voip/tab-userdirectory.svg');
+}
+
+.mx_InviteDialog_dialPadIcon::before {
+    mask-image: url('$(res)/img/voip/tab-dialpad.svg');
+}
+
+.mx_InviteDialog_multiInviterError {
+    > h4 {
+        font-size: $font-15px;
+        line-height: $font-24px;
+        color: $secondary-content;
+        font-weight: normal;
+    }
+
+    > div {
+        .mx_InviteDialog_multiInviterError_entry {
+            margin-bottom: 24px;
+
+            .mx_InviteDialog_multiInviterError_entry_userProfile {
+                .mx_InviteDialog_multiInviterError_entry_name {
+                    margin-left: 6px;
+                    font-size: $font-15px;
+                    line-height: $font-24px;
+                    font-weight: $font-semi-bold;
+                    color: $primary-content;
+                }
+
+                .mx_InviteDialog_multiInviterError_entry_userId {
+                    margin-left: 6px;
+                    font-size: $font-12px;
+                    line-height: $font-15px;
+                    color: $tertiary-content;
+                }
+            }
+
+            .mx_InviteDialog_multiInviterError_entry_error {
+                margin-left: 32px;
+                font-size: $font-15px;
+                line-height: $font-24px;
+                color: $notice-primary-color;
+            }
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_JoinRuleDropdown.scss b/res/css/views/dialogs/_JoinRuleDropdown.scss
new file mode 100644
index 0000000000..91691cf53b
--- /dev/null
+++ b/res/css/views/dialogs/_JoinRuleDropdown.scss
@@ -0,0 +1,67 @@
+/*
+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_JoinRuleDropdown {
+    margin-bottom: 8px;
+    font-weight: normal;
+    font-family: $font-family;
+    font-size: $font-14px;
+    color: $primary-content;
+
+    .mx_Dropdown_input {
+        border: 1px solid $input-border-color;
+    }
+
+    .mx_Dropdown_option {
+        font-size: $font-14px;
+        line-height: $font-32px;
+        height: 32px;
+        min-height: 32px;
+
+        > div {
+            padding-left: 30px;
+            position: relative;
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 16px;
+                width: 16px;
+                left: 6px;
+                top: 8px;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                background-color: $secondary-content;
+            }
+        }
+    }
+
+    .mx_JoinRuleDropdown_invite::before {
+        mask-image: url('$(res)/img/element-icons/lock.svg');
+        mask-size: contain;
+    }
+
+    .mx_JoinRuleDropdown_public::before {
+        mask-image: url('$(res)/img/globe.svg');
+        mask-size: 12px;
+    }
+
+    .mx_JoinRuleDropdown_restricted::before {
+        mask-image: url('$(res)/img/element-icons/community-members.svg');
+        mask-size: contain;
+    }
+}
+
diff --git a/res/css/views/dialogs/_LeaveSpaceDialog.scss b/res/css/views/dialogs/_LeaveSpaceDialog.scss
new file mode 100644
index 0000000000..0d85a87faf
--- /dev/null
+++ b/res/css/views/dialogs/_LeaveSpaceDialog.scss
@@ -0,0 +1,96 @@
+/*
+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_LeaveSpaceDialog_wrapper {
+    .mx_Dialog {
+        display: flex;
+        flex-direction: column;
+        padding: 24px 32px;
+    }
+}
+
+.mx_LeaveSpaceDialog {
+    width: 440px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    max-height: 520px;
+
+    .mx_Dialog_content {
+        flex-grow: 1;
+        margin: 0;
+        overflow-y: auto;
+
+        .mx_RadioButton + .mx_RadioButton {
+            margin-top: 16px;
+        }
+
+        .mx_SearchBox {
+            // To match the space around the title
+            margin: 0 0 15px 0;
+            flex-grow: 0;
+            border-radius: 8px;
+        }
+
+        .mx_LeaveSpaceDialog_noResults {
+            display: block;
+            margin-top: 24px;
+        }
+
+        .mx_LeaveSpaceDialog_section {
+            margin: 16px 0;
+        }
+
+        .mx_LeaveSpaceDialog_section_warning {
+            position: relative;
+            border-radius: 8px;
+            margin: 12px 0 0;
+            padding: 12px 8px 12px 42px;
+            background-color: $header-panel-bg-color;
+
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-content;
+
+            &::before {
+                content: '';
+                position: absolute;
+                left: 10px;
+                top: calc(50% - 8px); // vertical centering
+                height: 16px;
+                width: 16px;
+                background-color: $secondary-content;
+                mask-repeat: no-repeat;
+                mask-size: contain;
+                mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
+                mask-position: center;
+            }
+        }
+
+        > p {
+            color: $primary-content;
+        }
+    }
+
+    .mx_Dialog_buttons {
+        margin-top: 20px;
+
+        .mx_Dialog_primary {
+            background-color: $notice-primary-color !important; // override default colour
+            border-color: $notice-primary-color;
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss
new file mode 100644
index 0000000000..9a05e7f20a
--- /dev/null
+++ b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss
@@ -0,0 +1,150 @@
+/*
+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_ManageRestrictedJoinRuleDialog_wrapper {
+    .mx_Dialog {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+.mx_ManageRestrictedJoinRuleDialog {
+    width: 480px;
+    color: $primary-content;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    min-height: 0;
+    height: 60vh;
+
+    .mx_SearchBox {
+        // To match the space around the title
+        margin: 0 0 15px 0;
+        flex-grow: 0;
+    }
+
+    .mx_ManageRestrictedJoinRuleDialog_content {
+        flex-grow: 1;
+    }
+
+    .mx_ManageRestrictedJoinRuleDialog_noResults {
+        display: block;
+        margin-top: 24px;
+    }
+
+    .mx_ManageRestrictedJoinRuleDialog_section {
+        &:not(:first-child) {
+            margin-top: 24px;
+        }
+
+        > h3 {
+            margin: 0;
+            color: $secondary-content;
+            font-size: $font-12px;
+            font-weight: $font-semi-bold;
+            line-height: $font-15px;
+        }
+
+        .mx_ManageRestrictedJoinRuleDialog_entry {
+            display: flex;
+            margin-top: 12px;
+
+            > div {
+                flex-grow: 1;
+            }
+
+            img.mx_RoomAvatar_isSpaceRoom,
+            .mx_RoomAvatar_isSpaceRoom img {
+                border-radius: 4px;
+            }
+
+            .mx_ManageRestrictedJoinRuleDialog_entry_name {
+                margin: 0 8px;
+                font-size: $font-15px;
+                line-height: 30px;
+                flex-grow: 1;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+
+            .mx_ManageRestrictedJoinRuleDialog_entry_description {
+                margin-top: 8px;
+                font-size: $font-12px;
+                line-height: $font-15px;
+                color: $tertiary-content;
+            }
+
+            .mx_Checkbox {
+                align-items: center;
+            }
+        }
+    }
+
+    .mx_ManageRestrictedJoinRuleDialog_section_spaces {
+        .mx_BaseAvatar {
+            margin-right: 12px;
+        }
+
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+        }
+    }
+
+    .mx_ManageRestrictedJoinRuleDialog_section_info {
+        position: relative;
+        border-radius: 8px;
+        margin: 12px 0;
+        padding: 8px 8px 8px 42px;
+        background-color: $header-panel-bg-color;
+
+        font-size: $font-12px;
+        line-height: $font-15px;
+        color: $secondary-content;
+
+        &::before {
+            content: '';
+            position: absolute;
+            left: 10px;
+            top: calc(50% - 8px); // vertical centering
+            height: 16px;
+            width: 16px;
+            background-color: $secondary-content;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+            mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
+            mask-position: center;
+        }
+    }
+
+    .mx_ManageRestrictedJoinRuleDialog_footer {
+        margin-top: 20px;
+
+        .mx_ManageRestrictedJoinRuleDialog_footer_buttons {
+            display: flex;
+            width: max-content;
+            margin-left: auto;
+
+            .mx_AccessibleButton {
+                display: inline-block;
+
+                & + .mx_AccessibleButton {
+                    margin-left: 24px;
+                }
+            }
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.scss b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
index e9d777effd..4574344a28 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.scss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
@@ -37,7 +37,7 @@ limitations under the License.
     list-style-type: none;
     font-size: $font-14px;
     padding: 0;
-    color: $primary-fg-color;
+    color: $primary-content;
 
     span.mx_EditHistoryMessage_deletion, span.mx_EditHistoryMessage_insertion {
         padding: 0px 2px;
diff --git a/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss b/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
index 31fc6d7a04..02c89e2e42 100644
--- a/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
+++ b/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
@@ -19,7 +19,7 @@ limitations under the License.
 
     .mx_Dialog_content {
         margin-bottom: 24px;
-        color: $tertiary-fg-color;
+        color: $tertiary-content;
     }
 
     .mx_Dialog_primary {
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index c97a3b69b7..f18b4917cf 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -72,7 +72,7 @@ limitations under the License.
             margin-top: 0px;
             margin-bottom: 0px;
             font-size: 16pt;
-            color: $primary-fg-color;
+            color: $primary-content;
         }
 
         > * {
@@ -81,7 +81,7 @@ limitations under the License.
         }
 
         .workspace-channel-details {
-            color: $primary-fg-color;
+            color: $primary-content;
             font-weight: 600;
 
             .channel {
diff --git a/res/css/views/dialogs/_ServerOfflineDialog.scss b/res/css/views/dialogs/_ServerOfflineDialog.scss
index ae4b70beb3..7a1b0bbcab 100644
--- a/res/css/views/dialogs/_ServerOfflineDialog.scss
+++ b/res/css/views/dialogs/_ServerOfflineDialog.scss
@@ -17,10 +17,10 @@ limitations under the License.
 .mx_ServerOfflineDialog {
     .mx_ServerOfflineDialog_content {
         padding-right: 85px;
-        color: $primary-fg-color;
+        color: $primary-content;
 
         hr {
-            border-color: $primary-fg-color;
+            border-color: $primary-content;
             opacity: 0.1;
             border-bottom: none;
         }
diff --git a/res/css/views/dialogs/_ServerPickerDialog.scss b/res/css/views/dialogs/_ServerPickerDialog.scss
index b01b49d7af..9a05751f91 100644
--- a/res/css/views/dialogs/_ServerPickerDialog.scss
+++ b/res/css/views/dialogs/_ServerPickerDialog.scss
@@ -22,7 +22,7 @@ limitations under the License.
         margin-bottom: 0;
 
         > p {
-            color: $secondary-fg-color;
+            color: $secondary-content;
             font-size: $font-14px;
             margin: 16px 0;
 
@@ -38,7 +38,7 @@ limitations under the License.
         > h4 {
             font-size: $font-15px;
             font-weight: $font-semi-bold;
-            color: $secondary-fg-color;
+            color: $secondary-content;
             margin-left: 8px;
         }
 
diff --git a/res/css/views/dialogs/_SetEmailDialog.scss b/res/css/views/dialogs/_SetEmailDialog.scss
index 37bee7a9ff..a39d51dfce 100644
--- a/res/css/views/dialogs/_SetEmailDialog.scss
+++ b/res/css/views/dialogs/_SetEmailDialog.scss
@@ -19,7 +19,7 @@ limitations under the License.
     border: 1px solid $input-border-color;
     padding: 9px;
     color: $input-fg-color;
-    background-color: $primary-bg-color;
+    background-color: $background;
     font-size: $font-15px;
     width: 100%;
     max-width: 280px;
diff --git a/res/css/views/dialogs/_SettingsDialog.scss b/res/css/views/dialogs/_SettingsDialog.scss
index 6c4ed35c5a..b3b6802c3d 100644
--- a/res/css/views/dialogs/_SettingsDialog.scss
+++ b/res/css/views/dialogs/_SettingsDialog.scss
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Not actually a component but things shared by settings components
-.mx_UserSettingsDialog, .mx_RoomSettingsDialog {
+.mx_UserSettingsDialog, .mx_RoomSettingsDialog, .mx_SpaceSettingsDialog {
     width: 90vw;
     max-width: 1000px;
     // set the height too since tabbed view scrolls itself.
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index ce3fdd021f..4d5e1409db 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -50,7 +50,8 @@ limitations under the License.
     margin-left: 20px;
     display: inherit;
 }
-.mx_ShareDialog_matrixto_copy > div {
+.mx_ShareDialog_matrixto_copy::after {
+    content: "";
     mask-image: url($copy-button-url);
     background-color: $message-action-bar-fg-color;
     margin-left: 5px;
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss
index 6e5fd9c8c8..e26e4f8b49 100644
--- a/res/css/views/dialogs/_SpaceSettingsDialog.scss
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss
@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 .mx_SpaceSettingsDialog {
-    width: 480px;
-    color: $primary-fg-color;
+    color: $primary-content;
 
     .mx_SpaceSettings_errorText {
         font-weight: $font-semi-bold;
@@ -32,8 +31,44 @@ limitations under the License.
         margin-left: 16px;
     }
 
-    .mx_AccessibleButton_kind_danger {
-        margin-top: 28px;
+    .mx_SettingsTab_section {
+        .mx_SettingsTab_section_caption {
+            margin-top: 12px;
+            margin-bottom: 20px;
+        }
+
+        & + .mx_SettingsTab_subheading {
+            border-top: 1px solid $quinary-content;
+            margin-top: 0;
+            padding-top: 24px;
+        }
+
+        .mx_RadioButton {
+            margin-top: 8px;
+            margin-bottom: 4px;
+
+            .mx_RadioButton_content {
+                font-weight: $font-semi-bold;
+                line-height: $font-18px;
+                color: $primary-content;
+            }
+
+            & + span {
+                font-size: $font-15px;
+                line-height: $font-18px;
+                color: $secondary-content;
+                margin-left: 26px;
+            }
+        }
+
+        .mx_SettingsTab_showAdvanced {
+            margin: 16px 0;
+            padding: 0;
+        }
+
+        .mx_SettingsFlag {
+            margin-top: 24px;
+        }
     }
 
     .mx_SpaceSettingsDialog_buttons {
@@ -52,4 +87,14 @@ limitations under the License.
     .mx_AccessibleButton_hasKind {
         padding: 8px 22px;
     }
+
+    .mx_TabbedView_tabLabel {
+        .mx_SpaceSettingsDialog_generalIcon::before {
+            mask-image: url('$(res)/img/element-icons/settings.svg');
+        }
+
+        .mx_SpaceSettingsDialog_visibilityIcon::before {
+            mask-image: url('$(res)/img/element-icons/eye.svg');
+        }
+    }
 }
diff --git a/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss b/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
index 30b79c1a9a..98edbf8ad8 100644
--- a/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
+++ b/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
@@ -28,6 +28,7 @@ limitations under the License.
         left: 0;
         top: 2px; // alignment
         background-image: url("$(res)/img/element-icons/warning-badge.svg");
+        background-size: contain;
     }
 
     .mx_AccessSecretStorageDialog_reset_link {
@@ -43,7 +44,7 @@ limitations under the License.
     margin-right: 8px;
     position: relative;
     top: 5px;
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
 }
 
 .mx_AccessSecretStorageDialog_resetBadge::before {
diff --git a/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
index d30803b1f0..b14206ff6d 100644
--- a/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
@@ -56,7 +56,7 @@ limitations under the License.
     margin-right: 8px;
     position: relative;
     top: 5px;
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
 }
 
 .mx_CreateSecretStorageDialog_secureBackupTitle::before {
@@ -101,7 +101,7 @@ limitations under the License.
     margin-right: 8px;
     position: relative;
     top: 5px;
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
 }
 
 .mx_CreateSecretStorageDialog_optionIcon_securePhrase {
diff --git a/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss b/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
index 05ce158413..4a48012672 100644
--- a/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
+++ b/res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
@@ -26,7 +26,7 @@ limitations under the License.
     &::before {
         mask: url("$(res)/img/e2e/lock-warning-filled.svg");
         mask-repeat: no-repeat;
-        background-color: $primary-fg-color;
+        background-color: $primary-content;
         content: "";
         position: absolute;
         top: -6px;
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index ae0927386a..93cecd8676 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -34,7 +34,7 @@ limitations under the License.
     box-sizing: border-box;
     border-radius: 4px;
     border: 1px solid $dialog-close-fg-color;
-    background-color: $primary-bg-color;
+    background-color: $background;
     max-height: calc(100vh - 20px); // allow 10px padding on both top and bottom
     overflow-y: auto;
 }
@@ -153,7 +153,7 @@ limitations under the License.
         mask-position: center;
         mask-size: contain;
         mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
-        background-color: $primary-fg-color;
+        background-color: $primary-content;
     }
 
     .mx_NetworkDropdown_handle_server {
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index 2997c83cfd..7bc47a3c98 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -72,7 +72,7 @@ limitations under the License.
 
 .mx_AccessibleButton_kind_danger_outline {
     color: $button-danger-bg-color;
-    background-color: $button-secondary-bg-color;
+    background-color: transparent;
     border: 1px solid $button-danger-bg-color;
 }
 
diff --git a/res/css/views/elements/_AddressSelector.scss b/res/css/views/elements/_AddressSelector.scss
index 087504390c..a7d463353b 100644
--- a/res/css/views/elements/_AddressSelector.scss
+++ b/res/css/views/elements/_AddressSelector.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_AddressSelector {
     position: absolute;
-    background-color: $primary-bg-color;
+    background-color: $background;
     width: 485px;
     max-height: 116px;
     overflow-y: auto;
@@ -31,8 +31,8 @@ limitations under the License.
 }
 
 .mx_AddressSelector_addressListElement .mx_AddressTile {
-    background-color: $primary-bg-color;
-    border: solid 1px $primary-bg-color;
+    background-color: $background;
+    border: solid 1px $background;
 }
 
 .mx_AddressSelector_addressListElement.mx_AddressSelector_selected {
diff --git a/res/css/views/elements/_AddressTile.scss b/res/css/views/elements/_AddressTile.scss
index c42f52f8f4..90c40842f7 100644
--- a/res/css/views/elements/_AddressTile.scss
+++ b/res/css/views/elements/_AddressTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
     background-color: rgba(74, 73, 74, 0.1);
     border: solid 1px $input-border-color;
     line-height: $font-26px;
-    color: $primary-fg-color;
+    color: $primary-content;
     font-size: $font-14px;
     font-weight: normal;
     margin-right: 4px;
diff --git a/res/css/views/elements/_DesktopCapturerSourcePicker.scss b/res/css/views/elements/_DesktopCapturerSourcePicker.scss
index 69dde5925e..b4a2c69b86 100644
--- a/res/css/views/elements/_DesktopCapturerSourcePicker.scss
+++ b/res/css/views/elements/_DesktopCapturerSourcePicker.scss
@@ -16,57 +16,41 @@ limitations under the License.
 
 .mx_desktopCapturerSourcePicker {
     overflow: hidden;
-}
 
-.mx_desktopCapturerSourcePicker_tabLabels {
-    display: flex;
-    padding: 0 0 8px 0;
-}
+    .mx_desktopCapturerSourcePicker_tab {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        align-items: flex-start;
+        height: 500px;
+        overflow: overlay;
 
-.mx_desktopCapturerSourcePicker_tabLabel,
-.mx_desktopCapturerSourcePicker_tabLabel_selected {
-    width: 100%;
-    text-align: center;
-    border-radius: 8px;
-    padding: 8px 0;
-    font-size: $font-13px;
-}
+        .mx_desktopCapturerSourcePicker_source {
+            width: 50%;
+            display: flex;
+            flex-direction: column;
 
-.mx_desktopCapturerSourcePicker_tabLabel_selected {
-    background-color: $tab-label-active-bg-color;
-    color: $tab-label-active-fg-color;
-}
+            .mx_desktopCapturerSourcePicker_source_thumbnail {
+                margin: 4px;
+                padding: 4px;
+                border-width: 2px;
+                border-radius: 8px;
+                border-style: solid;
+                border-color: transparent;
 
-.mx_desktopCapturerSourcePicker_panel {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    align-items: flex-start;
-    height: 500px;
-    overflow: overlay;
-}
+                &.mx_desktopCapturerSourcePicker_source_thumbnail_selected,
+                &:hover,
+                &:focus {
+                    border-color: $accent-color;
+                }
+            }
 
-.mx_desktopCapturerSourcePicker_stream_button {
-    display: flex;
-    flex-direction: column;
-    margin: 8px;
-    border-radius: 4px;
-}
-
-.mx_desktopCapturerSourcePicker_stream_button:hover,
-.mx_desktopCapturerSourcePicker_stream_button:focus {
-    background: $roomtile-selected-bg-color;
-}
-
-.mx_desktopCapturerSourcePicker_stream_thumbnail {
-    margin: 4px;
-    width: 312px;
-}
-
-.mx_desktopCapturerSourcePicker_stream_name {
-    margin: 0 4px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    width: 312px;
+            .mx_desktopCapturerSourcePicker_source_name {
+                margin: 0 4px;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
+            }
+        }
+    }
 }
diff --git a/res/css/views/elements/_DialPadBackspaceButton.scss b/res/css/views/elements/_DialPadBackspaceButton.scss
new file mode 100644
index 0000000000..40e4af7025
--- /dev/null
+++ b/res/css/views/elements/_DialPadBackspaceButton.scss
@@ -0,0 +1,40 @@
+/*
+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_DialPadBackspaceButton {
+    position: relative;
+    height: 28px;
+    width: 28px;
+
+    &::before {
+        /* force this element to appear on the DOM */
+        content: "";
+
+        background-color: #8D97A5;
+        width: inherit;
+        height: inherit;
+        top: 0px;
+        left: 0px;
+        position: absolute;
+        display: inline-block;
+        vertical-align: middle;
+
+        mask-image: url('$(res)/img/element-icons/call/delete.svg');
+        mask-position: 8px;
+        mask-size: 20px;
+        mask-repeat: no-repeat;
+    }
+}
diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 2a2508c17c..1acac70e42 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_Dropdown {
     position: relative;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_Dropdown_disabled {
@@ -27,7 +27,7 @@ limitations under the License.
     display: flex;
     align-items: center;
     position: relative;
-    border-radius: 3px;
+    border-radius: 4px;
     border: 1px solid $strong-input-border-color;
     font-size: $font-12px;
     user-select: none;
@@ -52,7 +52,7 @@ limitations under the License.
     padding-right: 9px;
     mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
     mask-repeat: no-repeat;
-    background: $primary-fg-color;
+    background: $primary-content;
 }
 
 .mx_Dropdown_option {
@@ -109,9 +109,9 @@ input.mx_Dropdown_option:focus {
     z-index: 2;
     margin: 0;
     padding: 0px;
-    border-radius: 3px;
+    border-radius: 4px;
     border: 1px solid $input-focused-border-color;
-    background-color: $primary-bg-color;
+    background-color: $background;
     max-height: 200px;
     overflow-y: auto;
 }
diff --git a/res/css/views/elements/_EventTilePreview.scss b/res/css/views/elements/_EventTilePreview.scss
new file mode 100644
index 0000000000..6bb726168f
--- /dev/null
+++ b/res/css/views/elements/_EventTilePreview.scss
@@ -0,0 +1,22 @@
+/*
+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_EventTilePreview_loader {
+    &.mx_IRCLayout,
+    &.mx_GroupLayout {
+        padding: 9px 0;
+    }
+}
diff --git a/res/css/views/elements/_FacePile.scss b/res/css/views/elements/_FacePile.scss
index c691baffb5..875e0e34d5 100644
--- a/res/css/views/elements/_FacePile.scss
+++ b/res/css/views/elements/_FacePile.scss
@@ -25,7 +25,7 @@ limitations under the License.
         }
 
         .mx_BaseAvatar_image {
-            border: 1px solid $primary-bg-color;
+            border: 1px solid $background;
         }
 
         .mx_BaseAvatar_initial {
@@ -47,7 +47,7 @@ limitations under the License.
                 left: 0;
                 height: inherit;
                 width: inherit;
-                background: $tertiary-fg-color;
+                background: $tertiary-content;
                 mask-position: center;
                 mask-size: 20px;
                 mask-repeat: no-repeat;
@@ -60,6 +60,6 @@ limitations under the License.
         margin-left: 12px;
         font-size: $font-14px;
         line-height: $font-24px;
-        color: $tertiary-fg-color;
+        color: $tertiary-content;
     }
 }
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index f67da6477b..71d37a015d 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -38,16 +38,16 @@ limitations under the License.
 .mx_Field input,
 .mx_Field select,
 .mx_Field textarea {
+    font-family: inherit;
     font-weight: normal;
-    font-family: $font-family;
     font-size: $font-14px;
     border: none;
     // Even without a border here, we still need this avoid overlapping the rounded
     // corners on the field above.
     border-radius: 4px;
     padding: 8px 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: $primary-content;
+    background-color: $background;
     flex: 1;
     min-width: 0;
 }
@@ -67,7 +67,7 @@ limitations under the License.
     height: 6px;
     mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
     mask-repeat: no-repeat;
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
     z-index: 1;
     pointer-events: none;
 }
@@ -98,14 +98,14 @@ limitations under the License.
     transition:
         font-size 0.25s ease-out 0.1s,
         color 0.25s ease-out 0.1s,
-        top 0.25s ease-out 0.1s,
+        transform 0.25s ease-out 0.1s,
         background-color 0.25s ease-out 0.1s;
-    color: $primary-fg-color;
+    color: $primary-content;
     background-color: transparent;
     font-size: $font-14px;
+    transform: translateY(0);
     position: absolute;
     left: 0px;
-    top: 0px;
     margin: 7px 8px;
     padding: 2px;
     pointer-events: none; // Allow clicks to fall through to the input
@@ -124,10 +124,10 @@ limitations under the License.
     transition:
         font-size 0.25s ease-out 0s,
         color 0.25s ease-out 0s,
-        top 0.25s ease-out 0s,
+        transform 0.25s ease-out 0s,
         background-color 0.25s ease-out 0s;
     font-size: $font-10px;
-    top: -13px;
+    transform: translateY(-13px);
     padding: 0 2px;
     background-color: $field-focused-label-bg-color;
     pointer-events: initial;
diff --git a/res/css/views/elements/_FormButton.scss b/res/css/views/elements/_FormButton.scss
deleted file mode 100644
index eda201ff03..0000000000
--- a/res/css/views/elements/_FormButton.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-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_FormButton {
-    line-height: $font-16px;
-    padding: 5px 15px;
-    font-size: $font-12px;
-    height: min-content;
-
-    &:not(:last-child) {
-        margin-right: 8px;
-    }
-
-    &.mx_AccessibleButton_kind_primary {
-        color: $accent-color;
-        background-color: $accent-bg-color;
-    }
-
-    &.mx_AccessibleButton_kind_danger {
-        color: $notice-primary-color;
-        background-color: $notice-primary-bg-color;
-    }
-
-    &.mx_AccessibleButton_kind_secondary {
-        color: $secondary-fg-color;
-        border: 1px solid $secondary-fg-color;
-        background-color: unset;
-    }
-}
diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 71035dadc3..787d33ddc2 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -14,6 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+$button-size: 32px;
+$icon-size: 22px;
+$button-gap: 24px;
+
+:root {
+    --image-view-panel-height: 68px;
+}
+
 .mx_ImageView {
     display: flex;
     width: 100%;
@@ -22,6 +30,7 @@ limitations under the License.
 }
 
 .mx_ImageView_image_wrapper {
+    pointer-events: initial;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -30,20 +39,29 @@ limitations under the License.
 }
 
 .mx_ImageView_image {
-    pointer-events: all;
     flex-shrink: 0;
+
+    &.mx_ImageView_image_animating {
+        transition: transform 200ms ease 0s;
+    }
+
+    &.mx_ImageView_image_animatingLoading {
+        transition: transform 300ms ease 0s;
+    }
 }
 
 .mx_ImageView_panel {
     width: 100%;
-    height: 68px;
+    height: var(--image-view-panel-height);
     display: flex;
     justify-content: space-between;
     align-items: center;
+    animation-name: mx_ImageView_panel_keyframes;
+    animation-duration: 300ms;
 }
 
 .mx_ImageView_info_wrapper {
-    pointer-events: all;
+    pointer-events: initial;
     padding-left: 32px;
     display: flex;
     flex-direction: row;
@@ -63,19 +81,20 @@ limitations under the License.
 
 .mx_ImageView_toolbar {
     padding-right: 16px;
-    pointer-events: all;
+    pointer-events: initial;
     display: flex;
     align-items: center;
+    gap: calc($button-gap - ($button-size - $icon-size));
 }
 
 .mx_ImageView_button {
-    margin-left: 24px;
+    padding: calc(($button-size - $icon-size) / 2);
     display: block;
 
     &::before {
         content: '';
-        height: 22px;
-        width: 22px;
+        height: $icon-size;
+        width: $icon-size;
         mask-repeat: no-repeat;
         mask-size: contain;
         mask-position: center;
@@ -109,12 +128,23 @@ limitations under the License.
 }
 
 .mx_ImageView_button_close {
+    padding: calc($button-size - $button-size);
     border-radius: 100%;
     background: #21262c; // same on all themes
     &::before {
-        width: 32px;
-        height: 32px;
+        width: $button-size;
+        height: $button-size;
         mask-image: url('$(res)/img/image-view/close.svg');
         mask-size: 40%;
     }
 }
+
+@media (prefers-reduced-motion) {
+    .mx_ImageView_image_animating {
+        transition: none !important;
+    }
+
+    .mx_ImageView_image_animatingLoading {
+        transition: none !important;
+    }
+}
diff --git a/res/css/views/elements/_InfoTooltip.scss b/res/css/views/elements/_InfoTooltip.scss
index 5858a60629..5329e7f1f8 100644
--- a/res/css/views/elements/_InfoTooltip.scss
+++ b/res/css/views/elements/_InfoTooltip.scss
@@ -30,5 +30,12 @@ limitations under the License.
     mask-position: center;
     content: '';
     vertical-align: middle;
+}
+
+.mx_InfoTooltip_icon_info::before {
     mask-image: url('$(res)/img/element-icons/info.svg');
 }
+
+.mx_InfoTooltip_icon_warning::before {
+    mask-image: url('$(res)/img/element-icons/warning.svg');
+}
diff --git a/res/css/views/elements/_InviteReason.scss b/res/css/views/elements/_InviteReason.scss
index 2c2e5687e6..8024ed59a3 100644
--- a/res/css/views/elements/_InviteReason.scss
+++ b/res/css/views/elements/_InviteReason.scss
@@ -32,12 +32,12 @@ limitations under the License.
         justify-content: center;
         align-items: center;
         cursor: pointer;
-        color: $secondary-fg-color;
+        color: $secondary-content;
 
         &::before {
             content: "";
             margin-right: 8px;
-            background-color: $secondary-fg-color;
+            background-color: $secondary-content;
             mask-image: url('$(res)/img/feather-customised/eye.svg');
             display: inline-block;
             width: 18px;
diff --git a/res/css/views/elements/_MiniAvatarUploader.scss b/res/css/views/elements/_MiniAvatarUploader.scss
index df4676ab56..46ffd9a01c 100644
--- a/res/css/views/elements/_MiniAvatarUploader.scss
+++ b/res/css/views/elements/_MiniAvatarUploader.scss
@@ -37,7 +37,7 @@ limitations under the License.
         right: -6px;
         bottom: -6px;
 
-        background-color: $primary-bg-color;
+        background-color: $background;
         border-radius: 50%;
         z-index: 1;
 
@@ -45,7 +45,7 @@ limitations under the License.
             height: 100%;
             width: 100%;
 
-            background-color: $secondary-fg-color;
+            background-color: $secondary-content;
             mask-position: center;
             mask-repeat: no-repeat;
             mask-image: url('$(res)/img/element-icons/camera.svg');
diff --git a/res/css/views/elements/_ReplyThread.scss b/res/css/views/elements/_ReplyThread.scss
index bf44a11728..e19be82e25 100644
--- a/res/css/views/elements/_ReplyThread.scss
+++ b/res/css/views/elements/_ReplyThread.scss
@@ -16,22 +16,57 @@ limitations under the License.
 
 .mx_ReplyThread {
     margin-top: 0;
-}
-
-.mx_ReplyThread .mx_DateSeparator {
-    font-size: 1em !important;
-    margin-top: 0;
-    margin-bottom: 0;
-    padding-bottom: 1px;
-    bottom: -5px;
-}
-
-.mx_ReplyThread_show {
-    cursor: pointer;
-}
-
-blockquote.mx_ReplyThread {
     margin-left: 0;
-    padding-left: 10px;
-    border-left: 4px solid $blockquote-bar-color;
+    margin-right: 0;
+    margin-bottom: 8px;
+    padding: 0 10px;
+    border-left: 2px solid $button-bg-color;
+    border-radius: 2px;
+
+    .mx_ReplyThread_show {
+        cursor: pointer;
+    }
+
+    &.mx_ReplyThread_color1 {
+        border-left-color: $username-variant1-color;
+    }
+
+    &.mx_ReplyThread_color2 {
+        border-left-color: $username-variant2-color;
+    }
+
+    &.mx_ReplyThread_color3 {
+        border-left-color: $username-variant3-color;
+    }
+
+    &.mx_ReplyThread_color4 {
+        border-left-color: $username-variant4-color;
+    }
+
+    &.mx_ReplyThread_color5 {
+        border-left-color: $username-variant5-color;
+    }
+
+    &.mx_ReplyThread_color6 {
+        border-left-color: $username-variant6-color;
+    }
+
+    &.mx_ReplyThread_color7 {
+        border-left-color: $username-variant7-color;
+    }
+
+    &.mx_ReplyThread_color8 {
+        border-left-color: $username-variant8-color;
+    }
+}
+
+.mx_ReplyThread--expanded {
+    .mx_EventTile_body {
+        display: block;
+        overflow-y: scroll !important;
+    }
+    .mx_EventTile_collapsedCodeBlock {
+        // !important needed due to .mx_ReplyTile .mx_EventTile_content .mx_EventTile_pre_container > pre
+        display: block !important;
+    }
 }
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index d60282695c..1043fd08d1 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -18,7 +18,7 @@ a.mx_Pill {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    max-width: calc(100% - 1ch);
+    max-width: 100%;
 }
 
 .mx_Pill {
@@ -43,7 +43,7 @@ a.mx_Pill {
 /* More specific to override `.markdown-body a` color */
 .mx_EventTile_content .markdown-body a.mx_UserPill,
 .mx_UserPill {
-    color: $primary-fg-color;
+    color: $primary-content;
     background-color: $other-user-pill-bg-color;
 }
 
diff --git a/res/css/views/elements/_SSOButtons.scss b/res/css/views/elements/_SSOButtons.scss
index e02816780f..a98e7b4024 100644
--- a/res/css/views/elements/_SSOButtons.scss
+++ b/res/css/views/elements/_SSOButtons.scss
@@ -35,7 +35,7 @@ limitations under the License.
         font-size: $font-14px;
         font-weight: $font-semi-bold;
         border: 1px solid $input-border-color;
-        color: $primary-fg-color;
+        color: $primary-content;
 
         > img {
             object-fit: contain;
diff --git a/res/css/views/elements/_ServerPicker.scss b/res/css/views/elements/_ServerPicker.scss
index 188eb5d655..d828d7cb88 100644
--- a/res/css/views/elements/_ServerPicker.scss
+++ b/res/css/views/elements/_ServerPicker.scss
@@ -74,7 +74,7 @@ limitations under the License.
 
     .mx_ServerPicker_desc {
         margin-top: -12px;
-        color: $tertiary-fg-color;
+        color: $tertiary-content;
         grid-column: 1 / 2;
         grid-row: 3;
         margin-bottom: 16px;
diff --git a/res/css/views/elements/_Spinner.scss b/res/css/views/elements/_Spinner.scss
index 93d5e2d96c..2df46687af 100644
--- a/res/css/views/elements/_Spinner.scss
+++ b/res/css/views/elements/_Spinner.scss
@@ -37,7 +37,7 @@ limitations under the License.
 }
 
 .mx_Spinner_icon {
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
     mask: url('$(res)/img/spinner.svg');
     mask-size: contain;
     animation: 1.1s steps(12, end) infinite spin;
diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
index 62fb5c5512..1ae787dfc2 100644
--- a/res/css/views/elements/_StyledRadioButton.scss
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -46,7 +46,7 @@ limitations under the License.
         width: $font-16px;
     }
 
-    > input[type=radio] {
+    input[type=radio] {
         // Remove the OS's representation
         margin: 0;
         padding: 0;
@@ -112,6 +112,12 @@ limitations under the License.
             }
         }
     }
+
+    .mx_RadioButton_innerLabel {
+        display: flex;
+        position: relative;
+        top: 4px;
+    }
 }
 
 .mx_RadioButton_outlined {
diff --git a/res/css/views/elements/_TagComposer.scss b/res/css/views/elements/_TagComposer.scss
new file mode 100644
index 0000000000..f5bdb8d2d5
--- /dev/null
+++ b/res/css/views/elements/_TagComposer.scss
@@ -0,0 +1,77 @@
+/*
+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_TagComposer {
+    .mx_TagComposer_input {
+        display: flex;
+
+        .mx_Field {
+            flex: 1;
+            margin: 0; // override from field styles
+        }
+
+        .mx_AccessibleButton {
+            min-width: 70px;
+            padding: 0 8px; // override from button styles
+            margin-left: 16px; // distance from <Field>
+        }
+
+        .mx_Field, .mx_Field input, .mx_AccessibleButton {
+            // So they look related to each other by feeling the same
+            border-radius: 8px;
+        }
+    }
+
+    .mx_TagComposer_tags {
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 12px; // this plus 12px from the tags makes 24px from the input
+
+        .mx_TagComposer_tag {
+            padding: 6px 8px 8px 12px;
+            position: relative;
+            margin-right: 12px;
+            margin-top: 12px;
+
+            // Cheaty way to get an opacified variable colour background
+            &::before {
+                content: '';
+                border-radius: 20px;
+                background-color: $tertiary-content;
+                opacity: 0.15;
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+
+                // Pass through the pointer otherwise we have effectively put a whole div
+                // on top of the component, which makes it hard to interact with buttons.
+                pointer-events: none;
+            }
+        }
+
+        .mx_AccessibleButton {
+            background-image: url('$(res)/img/subtract.svg');
+            width: 16px;
+            height: 16px;
+            margin-left: 8px;
+            display: inline-block;
+            vertical-align: middle;
+            cursor: pointer;
+        }
+    }
+}
diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index d90c818f94..6c5a7da55a 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -84,7 +84,7 @@ limitations under the License.
 // These tooltips use an older style with a chevron
 .mx_Field_tooltip {
     background-color: $menu-bg-color;
-    color: $primary-fg-color;
+    color: $primary-content;
     border: 1px solid $menu-border-color;
     text-align: unset;
 
diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss
index 400e40e233..91c68158c9 100644
--- a/res/css/views/emojipicker/_EmojiPicker.scss
+++ b/res/css/views/emojipicker/_EmojiPicker.scss
@@ -57,7 +57,7 @@ limitations under the License.
 }
 
 .mx_EmojiPicker_anchor::before {
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
     content: '';
     display: inline-block;
     mask-size: 100%;
@@ -89,7 +89,7 @@ limitations under the License.
     margin: 8px;
     border-radius: 4px;
     border: 1px solid $input-border-color;
-    background-color: $primary-bg-color;
+    background-color: $background;
     display: flex;
 
     input {
@@ -126,7 +126,7 @@ limitations under the License.
 .mx_EmojiPicker_search_icon::after {
     mask: url('$(res)/img/emojipicker/search.svg') no-repeat;
     mask-size: 100%;
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
     content: '';
     display: inline-block;
     width: 100%;
diff --git a/res/css/views/groups/_GroupRoomList.scss b/res/css/views/groups/_GroupRoomList.scss
index fefd17849c..2f6559f7c4 100644
--- a/res/css/views/groups/_GroupRoomList.scss
+++ b/res/css/views/groups/_GroupRoomList.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_GroupRoomTile {
     position: relative;
-    color: $primary-fg-color;
+    color: $primary-content;
     cursor: pointer;
     display: flex;
     align-items: center;
diff --git a/res/css/views/messages/_CallEvent.scss b/res/css/views/messages/_CallEvent.scss
new file mode 100644
index 0000000000..7934f8f3c2
--- /dev/null
+++ b/res/css/views/messages/_CallEvent.scss
@@ -0,0 +1,219 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_CallEvent_wrapper {
+    display: flex;
+    width: 100%;
+
+    .mx_CallEvent {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+
+        background-color: $dark-panel-bg-color;
+        border-radius: 8px;
+        width: 65%;
+        box-sizing: border-box;
+        height: 60px;
+        margin: 4px 0;
+
+        .mx_CallEvent_iconButton {
+            display: inline-flex;
+            margin-right: 8px;
+
+            &::before {
+                content: '';
+
+                height: 16px;
+                width: 16px;
+                background-color: $secondary-content;
+                mask-repeat: no-repeat;
+                mask-size: contain;
+                mask-position: center;
+            }
+        }
+
+        .mx_CallEvent_silence::before {
+            mask-image: url('$(res)/img/voip/silence.svg');
+        }
+
+        .mx_CallEvent_unSilence::before {
+            mask-image: url('$(res)/img/voip/un-silence.svg');
+        }
+
+        &.mx_CallEvent_voice {
+            .mx_CallEvent_type_icon::before,
+            .mx_CallEvent_content_button_callBack span::before,
+            .mx_CallEvent_content_button_answer span::before {
+                mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
+            }
+        }
+
+        &.mx_CallEvent_video {
+            .mx_CallEvent_type_icon::before,
+            .mx_CallEvent_content_button_callBack span::before,
+            .mx_CallEvent_content_button_answer span::before {
+                mask-image: url('$(res)/img/element-icons/call/video-call.svg');
+            }
+        }
+
+        &.mx_CallEvent_voice.mx_CallEvent_missed .mx_CallEvent_type_icon::before {
+            mask-image: url('$(res)/img/voip/missed-voice.svg');
+        }
+
+        &.mx_CallEvent_video.mx_CallEvent_missed .mx_CallEvent_type_icon::before {
+            mask-image: url('$(res)/img/voip/missed-video.svg');
+        }
+
+        &.mx_CallEvent_voice.mx_CallEvent_rejected .mx_CallEvent_type_icon::before,
+        &.mx_CallEvent_voice.mx_CallEvent_noAnswer .mx_CallEvent_type_icon::before {
+            mask-image: url('$(res)/img/voip/declined-voice.svg');
+        }
+
+        &.mx_CallEvent_video.mx_CallEvent_rejected .mx_CallEvent_type_icon::before,
+        &.mx_CallEvent_video.mx_CallEvent_noAnswer .mx_CallEvent_type_icon::before {
+            mask-image: url('$(res)/img/voip/declined-video.svg');
+        }
+
+        .mx_CallEvent_info {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-left: 12px;
+            min-width: 0;
+
+            .mx_CallEvent_info_basic {
+                display: flex;
+                flex-direction: column;
+                margin-left: 10px; // To match mx_CallEvent
+                min-width: 0;
+
+                .mx_CallEvent_sender {
+                    font-weight: 600;
+                    font-size: 1.5rem;
+                    line-height: 1.8rem;
+                    margin-bottom: 3px;
+
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+
+                .mx_CallEvent_type {
+                    font-weight: 400;
+                    color: $secondary-content;
+                    font-size: 1.2rem;
+                    line-height: $font-13px;
+                    display: flex;
+                    align-items: center;
+
+                    .mx_CallEvent_type_icon {
+                        height: 13px;
+                        width: 13px;
+                        margin-right: 5px;
+
+                        &::before {
+                            content: '';
+                            position: absolute;
+                            height: 13px;
+                            width: 13px;
+                            background-color: $secondary-content;
+                            mask-repeat: no-repeat;
+                            mask-size: contain;
+                        }
+                    }
+                }
+            }
+        }
+
+        .mx_CallEvent_content {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            color: $secondary-content;
+            margin-right: 16px;
+            gap: 8px;
+            min-width: max-content;
+
+            .mx_CallEvent_content_button {
+                padding: 0px 12px;
+
+                span {
+                    padding: 1px 0;
+                    display: flex;
+                    align-items: center;
+
+                    &::before {
+                        content: '';
+                        display: inline-block;
+                        background-color: $button-fg-color;
+                        mask-position: center;
+                        mask-repeat: no-repeat;
+                        mask-size: 16px;
+                        width: 16px;
+                        height: 16px;
+                        margin-right: 8px;
+
+                        flex-shrink: 0;
+                    }
+                }
+            }
+
+            .mx_CallEvent_content_button_reject span::before {
+                mask-image: url('$(res)/img/element-icons/call/hangup.svg');
+            }
+
+            .mx_CallEvent_content_tooltip {
+                margin-right: 5px;
+            }
+        }
+
+        &.mx_CallEvent_narrow {
+            height: unset;
+            width: 290px;
+            flex-direction: column;
+            align-items: unset;
+            gap: 16px;
+
+            .mx_CallEvent_iconButton {
+                position: absolute;
+                margin-right: 0;
+                top: 12px;
+                right: 12px;
+                height: 16px;
+                width: 16px;
+                display: flex;
+            }
+
+            .mx_CallEvent_info {
+                align-items: unset;
+                margin-top: 12px;
+                margin-right: 12px;
+
+                .mx_CallEvent_sender {
+                    margin-bottom: 8px;
+                }
+            }
+
+            .mx_CallEvent_content {
+                margin-left: 54px; // mx_CallEvent margin (12px) + avatar (32px) + mx_CallEvent_info_basic margin (10px)
+                margin-bottom: 16px;
+            }
+        }
+    }
+}
diff --git a/res/css/views/messages/_MFileBody.scss b/res/css/views/messages/_MFileBody.scss
index c215d69ec2..e23696e6a9 100644
--- a/res/css/views/messages/_MFileBody.scss
+++ b/res/css/views/messages/_MFileBody.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016, 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.
@@ -60,14 +60,10 @@ limitations under the License.
 }
 
 .mx_MFileBody_info {
-    background-color: $message-body-panel-bg-color;
-    border-radius: 12px;
-    width: 243px; // same width as a playable voice message, accounting for padding
-    padding: 6px 12px;
-    color: $message-body-panel-fg-color;
+    cursor: pointer;
 
     .mx_MFileBody_info_icon {
-        background-color: $message-body-panel-icon-bg-color;
+        background-color: $system;
         border-radius: 20px;
         display: inline-block;
         width: 32px;
@@ -82,13 +78,13 @@ limitations under the License.
             mask-position: center;
             mask-size: cover;
             mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
-            background-color: $message-body-panel-icon-fg-color;
-            width: 13px;
+            background-color: $secondary-content;
+            width: 15px;
             height: 15px;
 
             position: absolute;
             top: 8px;
-            left: 9px;
+            left: 8px;
         }
     }
 
diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 1c773c2f06..920c3011f5 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -14,18 +14,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MImageBody {
-    display: block;
-    margin-right: 34px;
+$timelineImageBorderRadius: 4px;
+
+.mx_MImageBody_thumbnail--blurhash {
+    position: absolute;
+    left: 0;
+    top: 0;
 }
 
 .mx_MImageBody_thumbnail {
-    position: absolute;
-    width: 100%;
+    object-fit: contain;
+    border-radius: $timelineImageBorderRadius;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
     height: 100%;
-    left: 0;
-    top: 0;
-    border-radius: 4px;
+    width: 100%;
+
+    .mx_Blurhash > canvas {
+        animation: mx--anim-pulse 1.75s infinite cubic-bezier(.4, 0, .6, 1);
+        border-radius: $timelineImageBorderRadius;
+    }
+
+    .mx_no-image-placeholder {
+        background-color: $primary-content;
+    }
 }
 
 .mx_MImageBody_thumbnail_container {
@@ -37,17 +51,6 @@ limitations under the License.
     position: relative;
 }
 
-.mx_MImageBody_thumbnail_spinner {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-}
-
-// Inner img and TintableSvg should be centered around 0, 0
-.mx_MImageBody_thumbnail_spinner > * {
-    transform: translate(-50%, -50%);
-}
-
 .mx_MImageBody_gifLabel {
     position: absolute;
     display: block;
@@ -97,5 +100,5 @@ limitations under the License.
 }
 
 .mx_EventTile:hover .mx_HiddenImagePlaceholder {
-    background-color: $primary-bg-color;
+    background-color: $background;
 }
diff --git a/res/css/views/messages/_MImageReplyBody.scss b/res/css/views/messages/_MImageReplyBody.scss
new file mode 100644
index 0000000000..70c53f8c9c
--- /dev/null
+++ b/res/css/views/messages/_MImageReplyBody.scss
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Tulir Asokan <tulir@maunium.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_MImageReplyBody {
+    display: flex;
+
+    .mx_MImageBody_thumbnail_container {
+        flex: 1;
+        margin-right: 4px;
+    }
+
+    .mx_MImageReplyBody_info {
+        flex: 1;
+
+        .mx_MImageReplyBody_sender {
+            grid-area: sender;
+        }
+
+        .mx_MImageReplyBody_filename {
+            grid-area: filename;
+        }
+    }
+}
+
diff --git a/res/css/views/messages/_MediaBody.scss b/res/css/views/messages/_MediaBody.scss
new file mode 100644
index 0000000000..874de05c71
--- /dev/null
+++ b/res/css/views/messages/_MediaBody.scss
@@ -0,0 +1,30 @@
+/*
+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.
+*/
+
+// A "media body" is any file upload looking thing, apart from images and videos (they
+// have unique styles).
+
+.mx_MediaBody {
+    background-color: $quinary-content;
+    border-radius: 12px;
+    max-width: 243px; // use max-width instead of width so it fits within right panels
+
+    color: $secondary-content;
+    font-size: $font-14px;
+    line-height: $font-24px;
+
+    padding: 6px 12px;
+}
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index e2fafe6c62..46fc11956f 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -23,7 +23,7 @@ limitations under the License.
     height: 32px;
     line-height: $font-24px;
     border-radius: 8px;
-    background: $primary-bg-color;
+    background: $background;
     border: 1px solid $input-border-color;
     top: -32px;
     right: 8px;
@@ -77,11 +77,11 @@ limitations under the License.
     mask-size: 18px;
     mask-repeat: no-repeat;
     mask-position: center;
-    background-color: $secondary-fg-color;
+    background-color: $secondary-content;
 }
 
 .mx_MessageActionBar_maskButton:hover::after {
-    background-color: $primary-fg-color;
+    background-color: $primary-content;
 }
 
 .mx_MessageActionBar_reactButton::after {
@@ -92,6 +92,10 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/message-bar/reply.svg');
 }
 
+.mx_MessageActionBar_threadButton::after {
+    mask-image: url('$(res)/img/element-icons/message/thread.svg');
+}
+
 .mx_MessageActionBar_editButton::after {
     mask-image: url('$(res)/img/element-icons/room/message-bar/edit.svg');
 }
@@ -107,3 +111,22 @@ limitations under the License.
 .mx_MessageActionBar_cancelButton::after {
     mask-image: url('$(res)/img/element-icons/trashcan.svg');
 }
+
+.mx_MessageActionBar_downloadButton::after {
+    mask-size: 14px;
+    mask-image: url('$(res)/img/download.svg');
+}
+
+.mx_MessageActionBar_expandMessageButton::after {
+    mask-size: 12px;
+    mask-image: url('$(res)/img/element-icons/expand-message.svg');
+}
+
+.mx_MessageActionBar_collapseMessageButton::after {
+    mask-size: 12px;
+    mask-image: url('$(res)/img/element-icons/collapse-message.svg');
+}
+
+.mx_MessageActionBar_downloadButton.mx_MessageActionBar_downloadSpinnerButton::after {
+    background-color: transparent; // hide the download icon mask
+}
diff --git a/res/css/views/messages/_ReactionsRow.scss b/res/css/views/messages/_ReactionsRow.scss
index e05065eb02..1b0b847932 100644
--- a/res/css/views/messages/_ReactionsRow.scss
+++ b/res/css/views/messages/_ReactionsRow.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_ReactionsRow {
     margin: 6px 0;
-    color: $primary-fg-color;
+    color: $primary-content;
 
     .mx_ReactionsRow_addReactionButton {
         position: relative;
@@ -26,6 +26,7 @@ limitations under the License.
         height: 24px;
         vertical-align: middle;
         margin-left: 4px;
+        margin-right: 4px;
 
         &::before {
             content: '';
@@ -35,7 +36,7 @@ limitations under the License.
             mask-size: 16px;
             mask-repeat: no-repeat;
             mask-position: center;
-            background-color: $tertiary-fg-color;
+            background-color: $tertiary-content;
             mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
         }
 
@@ -45,7 +46,7 @@ limitations under the License.
 
         &:hover, &.mx_ReactionsRow_addReactionButton_active {
             &::before {
-                background-color: $primary-fg-color;
+                background-color: $primary-content;
             }
         }
     }
@@ -63,10 +64,10 @@ limitations under the License.
     vertical-align: middle;
 
     &:link, &:visited {
-        color: $tertiary-fg-color;
+        color: $tertiary-content;
     }
 
     &:hover {
-        color: $primary-fg-color;
+        color: $primary-content;
     }
 }
diff --git a/res/css/views/messages/_SenderProfile.scss b/res/css/views/messages/_SenderProfile.scss
index 655cb39489..08644b14e3 100644
--- a/res/css/views/messages/_SenderProfile.scss
+++ b/res/css/views/messages/_SenderProfile.scss
@@ -14,7 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_SenderProfile_name {
+.mx_SenderProfile_displayName {
     font-weight: 600;
 }
 
+.mx_SenderProfile_mxid {
+    font-weight: 600;
+    font-size: 1.1rem;
+    margin-left: 5px;
+    opacity: 0.5; // Match mx_TextualEvent
+}
diff --git a/res/css/views/messages/_TextualEvent.scss b/res/css/views/messages/_TextualEvent.scss
index be7565b3c5..e87fed90de 100644
--- a/res/css/views/messages/_TextualEvent.scss
+++ b/res/css/views/messages/_TextualEvent.scss
@@ -17,4 +17,9 @@ limitations under the License.
 .mx_TextualEvent {
     opacity: 0.5;
     overflow-y: hidden;
+
+    a {
+        color: $accent-color;
+        cursor: pointer;
+    }
 }
diff --git a/res/css/views/messages/_ViewSourceEvent.scss b/res/css/views/messages/_ViewSourceEvent.scss
index 66825030e0..b0e40a5152 100644
--- a/res/css/views/messages/_ViewSourceEvent.scss
+++ b/res/css/views/messages/_ViewSourceEvent.scss
@@ -43,8 +43,10 @@ limitations under the License.
         margin-bottom: 7px;
         mask-image: url('$(res)/img/feather-customised/minimise.svg');
     }
+}
 
-    &:hover .mx_ViewSourceEvent_toggle {
+.mx_EventTile:hover {
+    .mx_ViewSourceEvent_toggle {
         visibility: visible;
     }
 }
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index 4faa4b594f..afaed50fa4 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -21,7 +21,7 @@ limitations under the License.
         mask-image: url('$(res)/img/e2e/normal.svg');
         mask-repeat: no-repeat;
         mask-position: center;
-        mask-size: 90%;
+        mask-size: 80%;
     }
 
     &.mx_cryptoEvent_icon::after {
@@ -48,6 +48,7 @@ limitations under the License.
     .mx_cryptoEvent_buttons {
         align-items: center;
         display: flex;
+        gap: 5px;
     }
 
     .mx_cryptoEvent_state {
diff --git a/res/css/views/right_panel/_BaseCard.scss b/res/css/views/right_panel/_BaseCard.scss
index 9a5a59bda8..8c1a55fe05 100644
--- a/res/css/views/right_panel/_BaseCard.scss
+++ b/res/css/views/right_panel/_BaseCard.scss
@@ -93,7 +93,7 @@ limitations under the License.
         }
 
         > h1 {
-            color: $tertiary-fg-color;
+            color: $tertiary-content;
             font-size: $font-12px;
             font-weight: 500;
         }
@@ -145,7 +145,7 @@ limitations under the License.
         justify-content: space-around;
 
         .mx_AccessibleButton_kind_secondary {
-            color: $secondary-fg-color;
+            color: $secondary-content;
             background-color: rgba(141, 151, 165, 0.2);
             font-weight: $font-semi-bold;
             font-size: $font-14px;
diff --git a/res/css/views/right_panel/_PinnedMessagesCard.scss b/res/css/views/right_panel/_PinnedMessagesCard.scss
index b6b8238bed..f3861a3dec 100644
--- a/res/css/views/right_panel/_PinnedMessagesCard.scss
+++ b/res/css/views/right_panel/_PinnedMessagesCard.scss
@@ -32,4 +32,59 @@ limitations under the License.
             margin-right: 6px;
         }
     }
+
+    .mx_PinnedMessagesCard_empty {
+        display: flex;
+        height: 100%;
+
+        > div {
+            height: max-content;
+            text-align: center;
+            margin: auto 40px;
+
+            .mx_PinnedMessagesCard_MessageActionBar {
+                pointer-events: none;
+                display: flex;
+                height: 32px;
+                line-height: $font-24px;
+                border-radius: 8px;
+                background: $background;
+                border: 1px solid $input-border-color;
+                padding: 1px;
+                width: max-content;
+                margin: 0 auto;
+                box-sizing: border-box;
+
+                .mx_MessageActionBar_maskButton {
+                    display: inline-block;
+                    position: relative;
+                }
+
+                .mx_MessageActionBar_optionsButton {
+                    background: $roomlist-button-bg-color;
+                    border-radius: 6px;
+                    z-index: 1;
+
+                    &::after {
+                        background-color: $primary-content;
+                    }
+                }
+            }
+
+            > h2 {
+                font-weight: $font-semi-bold;
+                font-size: $font-15px;
+                line-height: $font-24px;
+                color: $primary-content;
+                margin-top: 24px;
+                margin-bottom: 20px;
+            }
+
+            > span {
+                font-size: $font-12px;
+                line-height: $font-15px;
+                color: $secondary-content;
+            }
+        }
+    }
 }
diff --git a/res/css/views/right_panel/_RoomSummaryCard.scss b/res/css/views/right_panel/_RoomSummaryCard.scss
index dc7804d072..c137bb7677 100644
--- a/res/css/views/right_panel/_RoomSummaryCard.scss
+++ b/res/css/views/right_panel/_RoomSummaryCard.scss
@@ -27,7 +27,7 @@ limitations under the License.
 
         .mx_RoomSummaryCard_alias {
             font-size: $font-13px;
-            color: $secondary-fg-color;
+            color: $secondary-content;
         }
 
         h2, .mx_RoomSummaryCard_alias {
@@ -115,7 +115,7 @@ limitations under the License.
             // as we will be applying it in its children
             padding: 0;
             height: auto;
-            color: $tertiary-fg-color;
+            color: $tertiary-content;
 
             .mx_RoomSummaryCard_icon_app {
                 padding: 10px 48px 10px 12px; // based on typical mx_RoomSummaryCard_Button padding
@@ -128,7 +128,7 @@ limitations under the License.
                 }
 
                 span {
-                    color: $primary-fg-color;
+                    color: $primary-content;
                 }
             }
 
@@ -232,6 +232,10 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/files.svg');
 }
 
+.mx_RoomSummaryCard_icon_threads::before {
+    mask-image: url('$(res)/img/element-icons/message/thread.svg');
+}
+
 .mx_RoomSummaryCard_icon_share::before {
     mask-image: url('$(res)/img/element-icons/room/share.svg');
 }
@@ -239,3 +243,7 @@ limitations under the License.
 .mx_RoomSummaryCard_icon_settings::before {
     mask-image: url('$(res)/img/element-icons/settings.svg');
 }
+
+.mx_RoomSummaryCard_icon_export::before {
+    mask-image: url('$(res)/img/element-icons/export.svg');
+}
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 87420ae4e7..edc82cfdbf 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -55,7 +55,7 @@ limitations under the License.
     }
 
     .mx_UserInfo_separator {
-        border-bottom: 1px solid rgba($primary-fg-color, .1);
+        border-bottom: 1px solid rgba($primary-content, .1);
     }
 
     .mx_UserInfo_memberDetailsContainer {
@@ -259,16 +259,6 @@ limitations under the License.
 
     .mx_AccessibleButton.mx_AccessibleButton_hasKind {
         padding: 8px 18px;
-
-        &.mx_AccessibleButton_kind_primary {
-            color: $accent-color;
-            background-color: $accent-bg-color;
-        }
-
-        &.mx_AccessibleButton_kind_danger {
-            color: $notice-primary-color;
-            background-color: $notice-primary-bg-color;
-        }
     }
 
     .mx_VerificationShowSas .mx_AccessibleButton,
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index a8466a1626..95856a5d69 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -58,7 +58,7 @@ limitations under the License.
     }
 
     .mx_VerificationPanel_reciprocate_section {
-        .mx_FormButton {
+        .mx_AccessibleButton {
             width: 100%;
             box-sizing: border-box;
             padding: 10px;
@@ -87,7 +87,7 @@ limitations under the License.
         }
 
         .mx_VerificationPanel_QRPhase_startOption {
-            background-color: $user-tile-hover-bg-color;
+            background-color: $header-panel-bg-color;
             border-radius: 10px;
             flex: 1;
             display: flex;
diff --git a/res/css/views/right_panel/_WidgetCard.scss b/res/css/views/right_panel/_WidgetCard.scss
index a90e744a5a..824f1fcb2f 100644
--- a/res/css/views/right_panel/_WidgetCard.scss
+++ b/res/css/views/right_panel/_WidgetCard.scss
@@ -51,7 +51,7 @@ limitations under the License.
                 mask-position: center;
                 mask-size: contain;
                 mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
-                background-color: $secondary-fg-color;
+                background-color: $secondary-content;
             }
         }
     }
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index fd80836237..cfcb0c48a2 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -64,7 +64,7 @@ $MiniAppTileHeight: 200px;
     &:hover {
         .mx_AppsContainer_resizerHandle::after {
             opacity: 0.8;
-            background: $primary-fg-color;
+            background: $primary-content;
         }
 
         .mx_ResizeHandle_horizontal::before {
@@ -79,7 +79,7 @@ $MiniAppTileHeight: 200px;
 
             content: '';
 
-            background-color: $primary-fg-color;
+            background-color: $primary-content;
             opacity: 0.8;
         }
     }
diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index f8e0a382b1..fcdab37f5a 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -4,27 +4,29 @@
     z-index: 1001;
     width: 100%;
     border: 1px solid $primary-hairline-color;
-    background: $primary-bg-color;
+    background: $background;
     border-bottom: none;
     border-radius: 8px 8px 0 0;
-    max-height: 50vh;
-    overflow: auto;
+    overflow: clip;
+    display: flex;
+    flex-direction: column;
     box-shadow: 0px -16px 32px $composer-shadow-color;
 }
 
 .mx_Autocomplete_ProviderSection {
     border-bottom: 1px solid $primary-hairline-color;
+    width: 100%;
 }
 
 /* a "block" completion takes up a whole line */
 .mx_Autocomplete_Completion_block {
-    height: 34px;
+    min-height: 34px;
     display: flex;
     padding: 0 12px;
     user-select: none;
     cursor: pointer;
     align-items: center;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_Autocomplete_Completion_block * {
@@ -40,7 +42,7 @@
     user-select: none;
     cursor: pointer;
     align-items: center;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_Autocomplete_Completion_pill > * {
@@ -59,8 +61,9 @@
 
 .mx_Autocomplete_Completion_container_pill {
     margin: 12px;
-    display: flex;
-    flex-flow: wrap;
+    height: 100%;
+    overflow-y: scroll;
+    max-height: 35vh;
 }
 
 .mx_Autocomplete_Completion_container_truncate {
@@ -68,7 +71,6 @@
     .mx_Autocomplete_Completion_subtitle,
     .mx_Autocomplete_Completion_description {
         /* Ellipsis for long names/subtitles/descriptions */
-        max-width: 150px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -83,7 +85,7 @@
 
 .mx_Autocomplete_provider_name {
     margin: 12px;
-    color: $primary-fg-color;
+    color: $primary-content;
     font-weight: 400;
     opacity: 0.4;
 }
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index e1ba468204..752d3b0a54 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -31,7 +31,7 @@ limitations under the License.
 
     @keyframes visualbell {
         from { background-color: $visual-bell-bg-color; }
-        to { background-color: $primary-bg-color; }
+        to { background-color: $background; }
     }
 
     &.mx_BasicMessageComposer_input_error {
@@ -65,6 +65,14 @@ limitations under the License.
                     font-size: $font-10-4px;
                 }
             }
+
+            span.mx_UserPill {
+                cursor: pointer;
+            }
+
+            span.mx_RoomPill {
+                cursor: default;
+            }
         }
 
         &.mx_BasicMessageComposer_input_disabled {
diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss
index a3473dedec..68ad44cf6a 100644
--- a/res/css/views/rooms/_E2EIcon.scss
+++ b/res/css/views/rooms/_E2EIcon.scss
@@ -45,7 +45,7 @@ limitations under the License.
     mask-image: url('$(res)/img/e2e/normal.svg');
     mask-repeat: no-repeat;
     mask-position: center;
-    mask-size: 90%;
+    mask-size: 80%;
 }
 
 // transparent-looking border surrounding the shield for when overlain over avatars
@@ -59,7 +59,7 @@ limitations under the License.
     }
     // shrink the infill of the badge
     &::before {
-        mask-size: 65%;
+        mask-size: 60%;
     }
 }
 
diff --git a/res/css/views/rooms/_EditMessageComposer.scss b/res/css/views/rooms/_EditMessageComposer.scss
index 214bfc4a1a..bf3c7c9b42 100644
--- a/res/css/views/rooms/_EditMessageComposer.scss
+++ b/res/css/views/rooms/_EditMessageComposer.scss
@@ -28,7 +28,7 @@ limitations under the License.
     .mx_BasicMessageComposer_input {
         border-radius: 4px;
         border: solid 1px $primary-hairline-color;
-        background-color: $primary-bg-color;
+        background-color: $background;
         max-height: 200px;
         padding: 3px 6px;
 
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 27a4e67089..a2ebd6c11b 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -18,7 +18,7 @@ limitations under the License.
 .mx_EntityTile {
     display: flex;
     align-items: center;
-    color: $primary-fg-color;
+    color: $primary-content;
     cursor: pointer;
 
     .mx_E2EIcon {
@@ -86,12 +86,12 @@ limitations under the License.
 
 .mx_EntityTile_ellipsis .mx_EntityTile_name {
     font-style: italic;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_EntityTile_invitePlaceholder .mx_EntityTile_name {
     font-style: italic;
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_EntityTile_unavailable .mx_EntityTile_avatar,
diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
new file mode 100644
index 0000000000..389a5c9706
--- /dev/null
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -0,0 +1,360 @@
+/*
+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_EventTile[data-layout=bubble],
+.mx_EventListSummary[data-layout=bubble] {
+    --avatarSize: 32px;
+    --gutterSize: 11px;
+    --cornerRadius: 12px;
+    --maxWidth: 70%;
+}
+
+.mx_EventTile[data-layout=bubble] {
+    position: relative;
+    margin-top: var(--gutterSize);
+    margin-left: 49px;
+    margin-right: 100px;
+    font-size: $font-14px;
+
+    &.mx_EventTile_continuation {
+        margin-top: 2px;
+    }
+
+    &.mx_EventTile_highlight {
+        &::before {
+            background-color: $event-highlight-bg-color;
+        }
+
+        color: $event-highlight-fg-color;
+    }
+
+    /* For replies */
+    .mx_EventTile {
+        padding-top: 0;
+    }
+
+    &::before {
+        content: '';
+        position: absolute;
+        top: -1px;
+        bottom: -1px;
+        left: -60px;
+        right: -60px;
+        z-index: -1;
+        border-radius: 4px;
+    }
+
+    &:hover,
+    &.mx_EventTile_selected {
+
+        &::before {
+            background: $eventbubble-bg-hover;
+        }
+
+        .mx_EventTile_avatar {
+            img {
+                box-shadow: 0 0 0 3px $eventbubble-bg-hover;
+            }
+        }
+    }
+
+    .mx_SenderProfile,
+    .mx_EventTile_line {
+        width: fit-content;
+        max-width: 70%;
+    }
+
+    > .mx_SenderProfile {
+        position: relative;
+        top: -2px;
+        left: 2px;
+        font-size: $font-15px;
+    }
+
+    &[data-self=false] {
+        .mx_EventTile_line {
+            border-bottom-right-radius: var(--cornerRadius);
+        }
+        .mx_EventTile_avatar {
+            left: -34px;
+        }
+
+        .mx_MessageActionBar {
+            right: 0;
+            transform: translate3d(90%, 50%, 0);
+        }
+
+        --backgroundColor: $eventbubble-others-bg;
+    }
+    &[data-self=true] {
+        .mx_EventTile_line {
+            border-bottom-left-radius: var(--cornerRadius);
+            float: right;
+            > a {
+                left: auto;
+                right: -68px;
+            }
+        }
+        .mx_SenderProfile {
+            display: none;
+        }
+
+        .mx_ReplyTile .mx_SenderProfile {
+            display: block;
+        }
+
+        .mx_ReactionsRow {
+            float: right;
+            clear: right;
+            display: flex;
+
+            /* Moving the "add reaction button" before the reactions */
+            > :last-child {
+                order: -1;
+            }
+        }
+        .mx_EventTile_avatar {
+            top: -19px; // height of the sender block
+            right: -35px;
+        }
+
+        --backgroundColor: $eventbubble-self-bg;
+    }
+
+    .mx_EventTile_line {
+        position: relative;
+        padding: var(--gutterSize);
+        border-top-left-radius: var(--cornerRadius);
+        border-top-right-radius: var(--cornerRadius);
+        background: var(--backgroundColor);
+        display: flex;
+        gap: 5px;
+        margin: 0 -12px 0 -9px;
+        > a {
+            position: absolute;
+            padding: 10px 20px;
+            top: 0;
+            left: -68px;
+        }
+    }
+
+    &.mx_EventTile_continuation[data-self=false] .mx_EventTile_line {
+        border-top-left-radius: 0;
+    }
+    &.mx_EventTile_lastInSection[data-self=false] .mx_EventTile_line {
+        border-bottom-left-radius: var(--cornerRadius);
+    }
+
+    &.mx_EventTile_continuation[data-self=true] .mx_EventTile_line {
+        border-top-right-radius: 0;
+    }
+    &.mx_EventTile_lastInSection[data-self=true] .mx_EventTile_line {
+        border-bottom-right-radius: var(--cornerRadius);
+    }
+
+    .mx_EventTile_avatar {
+        position: absolute;
+        top: 0;
+        line-height: 1;
+        z-index: 9;
+        img {
+            box-shadow: 0 0 0 3px $eventbubble-avatar-outline;
+            border-radius: 50%;
+        }
+    }
+
+    &.mx_EventTile_noSender {
+        .mx_EventTile_avatar {
+            top: -19px;
+        }
+    }
+
+    .mx_BaseAvatar,
+    .mx_EventTile_avatar {
+        line-height: 1;
+    }
+
+    &[data-has-reply=true] {
+        > .mx_EventTile_line {
+            flex-direction: column;
+        }
+
+        .mx_ReplyThread_show {
+            order: 99999;
+        }
+
+        .mx_ReplyThread {
+            .mx_EventTile_reply {
+                max-width: 90%;
+                padding: 0;
+                > a {
+                    display: none !important;
+                }
+            }
+
+            .mx_EventTile {
+                display: flex;
+                gap: var(--gutterSize);
+                .mx_EventTile_avatar {
+                    position: static;
+                }
+                .mx_SenderProfile {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    .mx_EditMessageComposer_buttons {
+        position: static;
+        padding: 0;
+        margin: 0;
+        background: transparent;
+    }
+
+    .mx_ReactionsRow {
+        margin-right: -18px;
+        margin-left: -9px;
+    }
+
+    /* Special layout scenario for "Unable To Decrypt (UTD)" events */
+    &.mx_EventTile_bad > .mx_EventTile_line {
+        display: grid;
+        grid-template:
+            "reply reply" auto
+            "shield body" auto
+            "shield link" auto
+            / auto  1fr;
+        .mx_EventTile_e2eIcon {
+            grid-area: shield;
+        }
+        .mx_UnknownBody {
+            grid-area: body;
+        }
+        .mx_EventTile_keyRequestInfo {
+            grid-area: link;
+        }
+        .mx_ReplyThread_wrapper {
+            grid-area: reply;
+        }
+    }
+
+
+    .mx_EventTile_readAvatars {
+        position: absolute;
+        right: -110px;
+        bottom: 0;
+        top: auto;
+    }
+
+    .mx_MTextBody {
+        max-width: 100%;
+    }
+}
+
+.mx_EventTile.mx_EventTile_bubbleContainer[data-layout=bubble],
+.mx_EventTile.mx_EventTile_leftAlignedBubble[data-layout=bubble],
+.mx_EventTile.mx_EventTile_info[data-layout=bubble],
+.mx_EventListSummary[data-layout=bubble][data-expanded=false] {
+    --backgroundColor: transparent;
+    --gutterSize: 0;
+
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    padding: 5px 0;
+
+    .mx_EventTile_avatar {
+        position: static;
+        order: -1;
+        margin-right: 5px;
+    }
+
+    .mx_EventTile_line,
+    .mx_EventTile_info {
+        min-width: 100%;
+        // Preserve alignment with left edge of text in bubbles
+        margin: 0;
+    }
+
+    .mx_EventTile_e2eIcon {
+        margin-left: 9px;
+    }
+
+    .mx_EventTile_line > a {
+        // Align timestamps with those of normal bubble tiles
+        right: auto;
+        top: -11px;
+        left: -95px;
+    }
+}
+
+.mx_EventListSummary[data-layout=bubble] {
+    --maxWidth: 70%;
+    margin-left: calc(var(--avatarSize) + var(--gutterSize));
+    margin-right: 94px;
+    .mx_EventListSummary_toggle {
+        float: none;
+        margin: 0;
+        order: 9;
+        margin-left: 5px;
+        margin-right: 55px;
+    }
+    .mx_EventListSummary_avatars {
+        padding-top: 0;
+    }
+
+    &::after {
+        content: "";
+        clear: both;
+    }
+
+    .mx_EventTile {
+        margin: 0 6px;
+        padding: 2px 0;
+    }
+
+    .mx_EventTile_line {
+        margin: 0;
+        > a {
+            // Align timestamps with those of normal bubble tiles
+            left: -76px;
+        }
+    }
+
+    .mx_MessageActionBar {
+        transform: translate3d(90%, 0, 0);
+    }
+}
+
+.mx_EventListSummary[data-expanded=false][data-layout=bubble] {
+    // Align with left edge of bubble tiles
+    padding: 0 49px;
+}
+
+/* events that do not require bubble layout */
+.mx_EventListSummary[data-layout=bubble],
+.mx_EventTile.mx_EventTile_bad[data-layout=bubble] {
+    .mx_EventTile_line {
+        background: transparent;
+    }
+
+    &:hover {
+        &::before {
+            background: transparent;
+        }
+    }
+}
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 51d9e1cc9d..470851654b 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-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.
@@ -16,104 +16,311 @@ limitations under the License.
 */
 
 $left-gutter: 64px;
+$hover-select-border: 4px;
 
-.mx_EventTile {
+.mx_EventTile:not([data-layout=bubble]) {
     max-width: 100%;
     clear: both;
     padding-top: 18px;
     font-size: $font-14px;
     position: relative;
-}
 
-.mx_EventTile.mx_EventTile_info {
-    padding-top: 1px;
-}
+    &.mx_EventTile_info {
+        padding-top: 1px;
+    }
 
-.mx_EventTile_avatar {
-    top: 14px;
-    left: 8px;
-    cursor: pointer;
-    user-select: none;
-}
+    .mx_EventTile_avatar {
+        top: 14px;
+        left: 8px;
+        cursor: pointer;
+        user-select: none;
+    }
 
-.mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
-    top: $font-6px;
-    left: $left-gutter;
-}
+    &.mx_EventTile_info .mx_EventTile_avatar {
+        top: $font-6px;
+        left: $left-gutter;
+    }
 
-.mx_EventTile_continuation {
-    padding-top: 0px !important;
+    &.mx_EventTile_continuation {
+        padding-top: 0px !important;
+
+        &.mx_EventTile_isEditing {
+            padding-top: 5px !important;
+            margin-top: -5px;
+        }
+    }
 
     &.mx_EventTile_isEditing {
-        padding-top: 5px !important;
-        margin-top: -5px;
+        background-color: $header-panel-bg-color;
     }
-}
 
-.mx_EventTile_isEditing {
-    background-color: $header-panel-bg-color;
-}
+    .mx_SenderProfile {
+        color: $primary-content;
+        font-size: $font-14px;
+        display: inline-block; /* anti-zalgo, with overflow hidden */
+        overflow: hidden;
+        padding-bottom: 0px;
+        padding-top: 0px;
+        margin: 0px;
+        /* the next three lines, along with overflow hidden, truncate long display names */
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        max-width: calc(100% - $left-gutter);
+    }
 
-.mx_EventTile .mx_SenderProfile {
-    color: $primary-fg-color;
-    font-size: $font-14px;
-    display: inline-block; /* anti-zalgo, with overflow hidden */
-    overflow: hidden;
-    cursor: pointer;
-    padding-bottom: 0px;
-    padding-top: 0px;
-    margin: 0px;
-    /* the next three lines, along with overflow hidden, truncate long display names */
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-width: calc(100% - $left-gutter);
-}
+    .mx_SenderProfile .mx_Flair {
+        opacity: 0.7;
+        margin-left: 5px;
+        display: inline-block;
+        vertical-align: top;
+        overflow: hidden;
+        user-select: none;
 
-.mx_EventTile .mx_SenderProfile .mx_Flair {
-    opacity: 0.7;
-    margin-left: 5px;
-    display: inline-block;
-    vertical-align: top;
-    overflow: hidden;
-    user-select: none;
+        img {
+            vertical-align: -2px;
+            margin-right: 2px;
+            border-radius: 8px;
+        }
+    }
 
-    img {
-        vertical-align: -2px;
-        margin-right: 2px;
+    &.mx_EventTile_isEditing .mx_MessageTimestamp {
+        visibility: hidden;
+    }
+
+    .mx_MessageTimestamp {
+        display: block;
+        white-space: nowrap;
+        left: 0px;
+        text-align: center;
+        user-select: none;
+    }
+
+    &.mx_EventTile_continuation .mx_EventTile_line {
+        clear: both;
+    }
+
+    .mx_EventTile_line, .mx_EventTile_reply {
+        position: relative;
+        padding-left: $left-gutter;
         border-radius: 8px;
     }
-}
 
-.mx_EventTile_isEditing .mx_MessageTimestamp {
-    visibility: hidden !important;
-}
-
-.mx_EventTile .mx_MessageTimestamp {
-    display: block;
-    visibility: hidden;
-    white-space: nowrap;
-    left: 0px;
-    text-align: center;
-    user-select: none;
-}
-
-.mx_EventTile_continuation .mx_EventTile_line {
-    clear: both;
-}
-
-.mx_EventTile_line, .mx_EventTile_reply {
-    position: relative;
-    padding-left: $left-gutter;
-    border-radius: 8px;
-}
-
-.mx_RoomView_timeline_rr_enabled,
-// on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
-.mx_EventListSummary {
-    .mx_EventTile_line {
-        /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
-        margin-right: 110px;
+    .mx_EventTile_reply {
+        margin-right: 10px;
     }
+
+    &.mx_EventTile_selected > div > a > .mx_MessageTimestamp {
+        left: calc(-$hover-select-border);
+    }
+
+    /* this is used for the tile for the event which is selected via the URL.
+     * TODO: ultimately we probably want some transition on here.
+     */
+    &.mx_EventTile_selected > .mx_EventTile_line {
+        border-left: $accent-color 4px solid;
+        padding-left: calc($left-gutter - $hover-select-border);
+        background-color: $event-selected-color;
+    }
+
+    &.mx_EventTile_highlight,
+    &.mx_EventTile_highlight .markdown-body {
+        color: $event-highlight-fg-color;
+
+        .mx_EventTile_line {
+            background-color: $event-highlight-bg-color;
+        }
+    }
+
+    &.mx_EventTile_selected.mx_EventTile_info .mx_EventTile_line {
+        padding-left: calc($left-gutter + 18px - $hover-select-border);
+    }
+
+    &.mx_EventTile:hover .mx_EventTile_line,
+    &.mx_EventTile.mx_EventTile_actionBarFocused .mx_EventTile_line,
+    &.mx_EventTile.focus-visible:focus-within .mx_EventTile_line {
+        background-color: $event-selected-color;
+    }
+
+    .mx_EventTile_searchHighlight {
+        background-color: $accent-color;
+        color: $accent-fg-color;
+        border-radius: 5px;
+        padding-left: 2px;
+        padding-right: 2px;
+        cursor: pointer;
+    }
+
+    .mx_EventTile_searchHighlight a {
+        background-color: $accent-color;
+        color: $accent-fg-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-content;
+            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;
+    }
+
+    .mx_EventTile_msgOption {
+        float: right;
+        text-align: right;
+        position: relative;
+        width: 90px;
+
+        /* Hack to stop the height of this pushing the messages apart.
+           Replaces margin-top: -6px. This interacts better with a read
+           marker being in between. Content overflows. */
+        height: 1px;
+
+        margin-right: 10px;
+    }
+
+    .mx_EventTile_msgOption a {
+        text-decoration: none;
+    }
+
+    /* De-zalgoing */
+    .mx_EventTile_body {
+        overflow-y: hidden;
+    }
+
+    &:hover.mx_EventTile_verified .mx_EventTile_line,
+    &:hover.mx_EventTile_unverified .mx_EventTile_line,
+    &:hover.mx_EventTile_unknown .mx_EventTile_line {
+        padding-left: calc($left-gutter - $hover-select-border);
+    }
+
+    &:hover.mx_EventTile_verified .mx_EventTile_line {
+        border-left: $e2e-verified-color $EventTile_e2e_state_indicator_width solid;
+    }
+
+    &:hover.mx_EventTile_unverified .mx_EventTile_line {
+        border-left: $e2e-unverified-color $EventTile_e2e_state_indicator_width solid;
+    }
+
+    &:hover.mx_EventTile_unknown .mx_EventTile_line {
+        border-left: $e2e-unknown-color $EventTile_e2e_state_indicator_width solid;
+    }
+
+    &:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
+    &:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line,
+    &:hover.mx_EventTile_unknown.mx_EventTile_info .mx_EventTile_line {
+        padding-left: calc($left-gutter + 18px - $hover-select-border);
+    }
+
+    /* End to end encryption stuff */
+    &:hover .mx_EventTile_e2eIcon {
+        opacity: 1;
+    }
+
+    // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
+    &:hover.mx_EventTile_verified .mx_EventTile_line > a > .mx_MessageTimestamp,
+    &:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp,
+    &:hover.mx_EventTile_unknown .mx_EventTile_line > a > .mx_MessageTimestamp {
+        left: calc(-$hover-select-border);
+    }
+
+    // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
+    &:hover.mx_EventTile_verified .mx_EventTile_line > .mx_EventTile_e2eIcon,
+    &:hover.mx_EventTile_unverified .mx_EventTile_line > .mx_EventTile_e2eIcon,
+    &:hover.mx_EventTile_unknown .mx_EventTile_line > .mx_EventTile_e2eIcon {
+        display: block;
+        left: 41px;
+    }
+
+    .mx_MImageBody {
+        margin-right: 34px;
+    }
+
+    .mx_EventTile_e2eIcon {
+        position: absolute;
+        top: 6px;
+        left: 44px;
+        bottom: 0;
+        right: 0;
+    }
+
+    .mx_ReactionsRow {
+        margin: 0;
+        padding: 4px 64px;
+    }
+}
+
+.mx_EventTile:not([data-layout=bubble]).mx_EventTile_info .mx_EventTile_line,
+.mx_EventListSummary:not([data-layout=bubble]) > :not(.mx_EventTile) .mx_EventTile_avatar ~ .mx_EventTile_line {
+    padding-left: calc($left-gutter + 18px);
+}
+
+.mx_EventListSummary:not([data-layout=bubble]) .mx_EventTile_line {
+    padding-left: calc($left-gutter);
+}
+
+/* all the overflow-y: hidden; are to trap Zalgos -
+   but they introduce an implicit overflow-x: auto.
+   so make that explicitly hidden too to avoid random
+   horizontal scrollbars occasionally appearing, like in
+   https://github.com/vector-im/vector-web/issues/1154 */
+.mx_EventTile_content {
+    overflow-y: hidden;
+    overflow-x: hidden;
+    margin-right: 34px;
+}
+
+/* Spoiler stuff */
+.mx_EventTile_spoiler {
+    cursor: pointer;
+}
+
+.mx_EventTile_spoiler_reason {
+    color: $event-timestamp-color;
+    font-size: $font-11px;
+}
+
+.mx_EventTile_spoiler_content {
+    filter: blur(5px) saturate(0.1) sepia(1);
+    transition-duration: 0.5s;
+}
+
+.mx_EventTile_spoiler.visible > .mx_EventTile_spoiler_content {
+    filter: none;
+}
+
+.mx_RoomView_timeline_rr_enabled {
+    .mx_EventTile[data-layout=group] {
+        .mx_EventTile_line {
+            /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
+            margin-right: 110px;
+        }
+    }
+    // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
+}
+
+.mx_SenderProfile {
+    cursor: pointer;
 }
 
 .mx_EventTile_bubbleContainer {
@@ -130,138 +337,15 @@ $left-gutter: 64px;
     .mx_EventTile_msgOption {
         grid-column: 2;
     }
-}
 
-.mx_EventTile_reply {
-    margin-right: 10px;
-}
-
-/* HACK to override line-height which is already marked important elsewhere */
-.mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
-    font-size: 48px !important;
-    line-height: 57px !important;
-}
-
-.mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
-    visibility: visible;
-}
-
-.mx_EventTile_selected > div > a > .mx_MessageTimestamp {
-    left: 3px;
-    width: auto;
-}
-
-// Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
-// The first set is to handle the 'group layout' (default) and the second for the IRC layout
-.mx_EventTile_last > div > a > .mx_MessageTimestamp,
-.mx_EventTile:hover > div > a > .mx_MessageTimestamp,
-.mx_EventTile.mx_EventTile_actionBarFocused > div > a > .mx_MessageTimestamp,
-.mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp,
-.mx_IRCLayout .mx_EventTile_last > a > .mx_MessageTimestamp,
-.mx_IRCLayout .mx_EventTile:hover > a > .mx_MessageTimestamp,
-.mx_IRCLayout .mx_ReplyThread .mx_EventTile > a > .mx_MessageTimestamp,
-.mx_IRCLayout .mx_EventTile.mx_EventTile_actionBarFocused > a > .mx_MessageTimestamp,
-.mx_IRCLayout .mx_EventTile.focus-visible:focus-within > a > .mx_MessageTimestamp {
-    visibility: visible;
-}
-
-.mx_EventTile:hover .mx_MessageActionBar,
-.mx_EventTile.mx_EventTile_actionBarFocused .mx_MessageActionBar,
-[data-whatinput='keyboard'] .mx_EventTile:focus-within .mx_MessageActionBar,
-.mx_EventTile.focus-visible:focus-within .mx_MessageActionBar {
-    visibility: visible;
-}
-
-/* this is used for the tile for the event which is selected via the URL.
- * TODO: ultimately we probably want some transition on here.
- */
-.mx_EventTile_selected > .mx_EventTile_line {
-    border-left: $accent-color 4px solid;
-    padding-left: 60px;
-    background-color: $event-selected-color;
-}
-
-.mx_EventTile_highlight,
-.mx_EventTile_highlight .markdown-body {
-    color: $event-highlight-fg-color;
-
-    .mx_EventTile_line {
-        background-color: $event-highlight-bg-color;
+    &:hover {
+        .mx_EventTile_line {
+            // To avoid bubble events being highlighted
+            background-color: inherit !important;
+        }
     }
 }
 
-.mx_EventTile_selected.mx_EventTile_info .mx_EventTile_line {
-    padding-left: 78px;
-}
-
-.mx_EventTile:hover .mx_EventTile_line,
-.mx_EventTile.mx_EventTile_actionBarFocused .mx_EventTile_line,
-.mx_EventTile.focus-visible:focus-within .mx_EventTile_line {
-    background-color: $event-selected-color;
-}
-
-.mx_EventTile_searchHighlight {
-    background-color: $accent-color;
-    color: $accent-fg-color;
-    border-radius: 5px;
-    padding-left: 2px;
-    padding-right: 2px;
-    cursor: pointer;
-}
-
-.mx_EventTile_searchHighlight a {
-    background-color: $accent-color;
-    color: $accent-fg-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;
-}
-
-.mx_EventTile_msgOption {
-    float: right;
-    text-align: right;
-    position: relative;
-    width: 90px;
-
-    /* Hack to stop the height of this pushing the messages apart.
-       Replaces margin-top: -6px. This interacts better with a read
-       marker being in between. Content overflows. */
-    height: 1px;
-
-    margin-right: 10px;
-}
-
-.mx_EventTile_msgOption a {
-    text-decoration: none;
-}
-
 .mx_EventTile_readAvatars {
     position: relative;
     display: inline-block;
@@ -292,52 +376,27 @@ $left-gutter: 64px;
     position: absolute;
 }
 
-/* all the overflow-y: hidden; are to trap Zalgos -
-   but they introduce an implicit overflow-x: auto.
-   so make that explicitly hidden too to avoid random
-   horizontal scrollbars occasionally appearing, like in
-   https://github.com/vector-im/vector-web/issues/1154
-    */
-.mx_EventTile_content {
-    display: block;
-    overflow-y: hidden;
-    overflow-x: hidden;
-    margin-right: 34px;
+/* HACK to override line-height which is already marked important elsewhere */
+.mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
+    font-size: 48px !important;
+    line-height: 57px !important;
 }
 
-/* De-zalgoing */
-.mx_EventTile_body {
-    overflow-y: hidden;
-}
-
-/* Spoiler stuff */
-.mx_EventTile_spoiler {
+.mx_EventTile_content .mx_EventTile_edited {
+    user-select: none;
+    font-size: $font-12px;
+    color: $roomtopic-color;
+    display: inline-block;
+    margin-left: 9px;
     cursor: pointer;
 }
 
-.mx_EventTile_spoiler_reason {
-    color: $event-timestamp-color;
-    font-size: $font-11px;
-}
-
-.mx_EventTile_spoiler_content {
-    filter: blur(5px) saturate(0.1) sepia(1);
-    transition-duration: 0.5s;
-}
-
-.mx_EventTile_spoiler.visible > .mx_EventTile_spoiler_content {
-    filter: none;
-}
 
 .mx_EventTile_e2eIcon {
-    position: absolute;
-    top: 6px;
-    left: 44px;
+    position: relative;
     width: 14px;
     height: 14px;
     display: block;
-    bottom: 0;
-    right: 0;
     opacity: 0.2;
     background-repeat: no-repeat;
     background-size: contain;
@@ -360,7 +419,7 @@ $left-gutter: 64px;
         mask-image: url('$(res)/img/e2e/normal.svg');
         mask-repeat: no-repeat;
         mask-position: center;
-        mask-size: 90%;
+        mask-size: 80%;
     }
 }
 
@@ -396,91 +455,16 @@ $left-gutter: 64px;
     opacity: 1;
 }
 
-.mx_EventTile_keyRequestInfo {
-    font-size: $font-12px;
-}
-
-.mx_EventTile_keyRequestInfo_text {
-    opacity: 0.5;
-}
-
-.mx_EventTile_keyRequestInfo_text a {
-    color: $primary-fg-color;
-    text-decoration: underline;
-    cursor: pointer;
-}
-
-.mx_EventTile_keyRequestInfo_tooltip_contents p {
-    text-align: auto;
-    margin-left: 3px;
-    margin-right: 3px;
-}
-
-.mx_EventTile_keyRequestInfo_tooltip_contents p:first-child {
-    margin-top: 0px;
-}
-
-.mx_EventTile_keyRequestInfo_tooltip_contents p:last-child {
-    margin-bottom: 0px;
-}
-
-.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
-    padding-left: 60px;
-}
-
-.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line {
-    border-left: $e2e-verified-color $EventTile_e2e_state_indicator_width solid;
-}
-
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
-    border-left: $e2e-unverified-color $EventTile_e2e_state_indicator_width solid;
-}
-
-.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
-    border-left: $e2e-unknown-color $EventTile_e2e_state_indicator_width solid;
-}
-
-.mx_EventTile:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unknown.mx_EventTile_info .mx_EventTile_line {
-    padding-left: 78px;
-}
-
-/* End to end encryption stuff */
-.mx_EventTile:hover .mx_EventTile_e2eIcon {
-    opacity: 1;
-}
-
-// Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
-.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > a > .mx_MessageTimestamp,
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp,
-.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line > a > .mx_MessageTimestamp {
-    width: $MessageTimestamp_width_hover;
-}
-
-// Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
-.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > .mx_EventTile_e2eIcon,
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > .mx_EventTile_e2eIcon,
-.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line > .mx_EventTile_e2eIcon {
-    display: block;
-    left: 41px;
-}
-
-.mx_EventTile_content .mx_EventTile_edited {
-    user-select: none;
-    font-size: $font-12px;
-    color: $roomtopic-color;
-    display: inline-block;
-    margin-left: 9px;
-    cursor: pointer;
-}
-
 /* Various markdown overrides */
 
-.mx_EventTile_body pre {
-    border: 1px solid transparent;
+.mx_EventTile_body {
+    a:hover {
+        text-decoration: underline;
+    }
+
+    pre {
+        border: 1px solid transparent;
+    }
 }
 
 .mx_EventTile_content .markdown-body {
@@ -492,8 +476,11 @@ $left-gutter: 64px;
 
     pre, code {
         font-family: $monospace-font-family !important;
-        // deliberate constants as we're behind an invert filter
-        color: #333;
+        background-color: $header-panel-bg-color;
+    }
+
+    pre code > * {
+        display: inline;
     }
 
     pre {
@@ -502,11 +489,10 @@ $left-gutter: 64px;
         // https://github.com/vector-im/vector-web/issues/754
         overflow-x: overlay;
         overflow-y: visible;
-    }
 
-    code {
-        // deliberate constants as we're behind an invert filter
-        background-color: #f8f8f8;
+        &::-webkit-scrollbar-corner {
+            background: transparent;
+        }
     }
 }
 
@@ -528,7 +514,7 @@ $left-gutter: 64px;
 
 .mx_EventTile:hover .mx_EventTile_body pre,
 .mx_EventTile.focus-visible:focus-within .mx_EventTile_body pre {
-    border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
+    border: 1px solid $tertiary-content;
 }
 
 .mx_EventTile_pre_container {
@@ -598,6 +584,12 @@ $left-gutter: 64px;
     color: $accent-color-alt;
 }
 
+.mx_EventTile_content .markdown-body blockquote {
+    border-left: 2px solid $blockquote-bar-color;
+    border-radius: 2px;
+    padding: 0 10px;
+}
+
 .mx_EventTile_content .markdown-body .hljs {
     display: inline !important;
 }
@@ -616,12 +608,42 @@ $left-gutter: 64px;
 
 /* end of overrides */
 
+
+.mx_EventTile_keyRequestInfo {
+    font-size: $font-12px;
+}
+
+.mx_EventTile_keyRequestInfo_text {
+    opacity: 0.5;
+}
+
+.mx_EventTile_keyRequestInfo_text a {
+    color: $primary-content;
+    text-decoration: underline;
+    cursor: pointer;
+}
+
+.mx_EventTile_keyRequestInfo_tooltip_contents p {
+    text-align: auto;
+    margin-left: 3px;
+    margin-right: 3px;
+}
+
+.mx_EventTile_keyRequestInfo_tooltip_contents p:first-child {
+    margin-top: 0px;
+}
+
+.mx_EventTile_keyRequestInfo_tooltip_contents p:last-child {
+    margin-bottom: 0px;
+}
+
 .mx_EventTile_tileError {
     color: red;
     text-align: center;
 
     // Remove some of the default tile padding so that the error is centered
     margin-right: 0;
+
     .mx_EventTile_line {
         padding-left: 0;
         margin-right: 0;
@@ -636,6 +658,13 @@ $left-gutter: 64px;
     }
 }
 
+.mx_EventTile:hover .mx_MessageActionBar,
+.mx_EventTile.mx_EventTile_actionBarFocused .mx_MessageActionBar,
+[data-whatinput='keyboard'] .mx_EventTile:focus-within .mx_MessageActionBar,
+.mx_EventTile.focus-visible:focus-within .mx_MessageActionBar {
+    visibility: visible;
+}
+
 @media only screen and (max-width: 480px) {
     .mx_EventTile_line, .mx_EventTile_reply {
         padding-left: 0;
@@ -646,3 +675,71 @@ $left-gutter: 64px;
         margin-right: 0;
     }
 }
+
+.mx_ThreadInfo:hover {
+    cursor: pointer;
+}
+
+.mx_ThreadView {
+    display: flex;
+    flex-direction: column;
+
+    .mx_ScrollPanel {
+        margin-top: 20px;
+
+        .mx_RoomView_MessageList {
+            padding: 0;
+        }
+    }
+
+    .mx_EventTile_senderDetails {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        margin-bottom: 6px;
+
+        a {
+            flex: 1;
+            min-width: none;
+            max-width: 100%;
+            display: flex;
+            align-items: center;
+
+            .mx_SenderProfile {
+                flex: 1;
+            }
+        }
+    }
+
+    .mx_ThreadView_List {
+        flex: 1;
+        overflow: scroll;
+    }
+
+    .mx_EventTile_roomName {
+        display: none;
+    }
+
+    .mx_EventTile_line {
+        padding-left: 0 !important;
+        order: 10 !important;
+    }
+
+    .mx_EventTile {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        margin-top: 0;
+        padding-bottom: 5px;
+        margin-bottom: 5px;
+
+        .mx_MessageTimestamp {
+            left: auto;
+            right: 0;
+        }
+    }
+
+    .mx_MessageComposer_sendMessage {
+        margin-right: 0;
+    }
+}
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index 818509785b..ebb7f99e45 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -24,12 +24,9 @@ $left-gutter: 64px;
             margin-left: $left-gutter;
         }
 
-        > .mx_EventTile_line {
-            padding-left: $left-gutter;
-        }
-
         > .mx_EventTile_avatar {
             position: absolute;
+            z-index: 9;
         }
 
         .mx_MessageTimestamp {
@@ -43,10 +40,6 @@ $left-gutter: 64px;
             line-height: $font-22px;
         }
     }
-
-    .mx_EventTile_info .mx_EventTile_line {
-        padding-left: calc($left-gutter + 18px);
-    }
 }
 
 /* Compact layout overrides */
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index cf61ce569d..578c0325d2 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -29,6 +29,7 @@ $irc-line-height: $font-18px;
         // timestamps are links which shouldn't be underlined
         > a {
             text-decoration: none;
+            min-width: 45px;
         }
 
         display: flex;
@@ -49,18 +50,6 @@ $irc-line-height: $font-18px;
             }
         }
 
-        > .mx_SenderProfile {
-            order: 2;
-            flex-shrink: 0;
-            width: var(--name-width);
-            text-overflow: ellipsis;
-            text-align: left;
-            display: flex;
-            align-items: center;
-            overflow: visible;
-            justify-content: flex-end;
-        }
-
         .mx_EventTile_line, .mx_EventTile_reply {
             padding: 0;
             display: flex;
@@ -127,6 +116,11 @@ $irc-line-height: $font-18px;
         .mx_EditMessageComposer_buttons {
             position: relative;
         }
+
+        .mx_ReactionsRow {
+            padding-left: 0;
+            padding-right: 0;
+        }
     }
 
     .mx_EventTile_emote {
@@ -173,44 +167,46 @@ $irc-line-height: $font-18px;
         border-left: 0;
     }
 
-    .mx_SenderProfile_hover {
-        background-color: $primary-bg-color;
-        overflow: hidden;
+    .mx_SenderProfile {
+        width: var(--name-width);
         display: flex;
+        order: 2;
+        flex-shrink: 0;
+        justify-content: flex-start;
+        align-items: center;
 
-        > .mx_SenderProfile_name {
+        > .mx_SenderProfile_displayName {
+            width: 100%;
+            text-align: end;
             overflow: hidden;
             text-overflow: ellipsis;
-            min-width: var(--name-width);
-            text-align: end;
+        }
+
+        > .mx_SenderProfile_mxid {
+            visibility: collapse;
         }
     }
 
     .mx_SenderProfile:hover {
-        justify-content: flex-start;
-    }
-
-    .mx_SenderProfile_hover:hover {
         overflow: visible;
-        width: max(auto, 100%);
         z-index: 10;
+
+        > .mx_SenderProfile_displayName {
+            overflow: visible;
+        }
+
+        > .mx_SenderProfile_mxid {
+            visibility: visible;
+        }
     }
 
     .mx_ReplyThread {
         margin: 0;
         .mx_SenderProfile {
+            order: unset;
+            max-width: unset;
             width: unset;
-            max-width: var(--name-width);
-        }
-
-        .mx_SenderProfile_hover {
             background: transparent;
-
-            > span {
-                > .mx_SenderProfile_name {
-                    min-width: inherit;
-                }
-            }
         }
 
         .mx_EventTile_emote {
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index a8dc2ce11c..2b38b509de 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -56,7 +56,7 @@ limitations under the License.
     height: 38px;
     border-radius: 19px;
     box-sizing: border-box;
-    background: $primary-bg-color;
+    background: $background;
     border: 1.3px solid $muted-fg-color;
     cursor: pointer;
 }
diff --git a/res/css/views/rooms/_LinkPreviewGroup.scss b/res/css/views/rooms/_LinkPreviewGroup.scss
new file mode 100644
index 0000000000..ed341904fd
--- /dev/null
+++ b/res/css/views/rooms/_LinkPreviewGroup.scss
@@ -0,0 +1,38 @@
+/*
+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_LinkPreviewGroup {
+    .mx_LinkPreviewGroup_hide {
+        cursor: pointer;
+        width: 18px;
+        height: 18px;
+
+        img {
+            flex: 0 0 40px;
+            visibility: hidden;
+        }
+    }
+
+    &:hover .mx_LinkPreviewGroup_hide img,
+    .mx_LinkPreviewGroup_hide.focus-visible:focus img {
+        visibility: visible;
+    }
+
+    > .mx_AccessibleButton {
+        color: $accent-color;
+        text-align: center;
+    }
+}
diff --git a/res/css/views/rooms/_LinkPreviewWidget.scss b/res/css/views/rooms/_LinkPreviewWidget.scss
index 022cf3ed28..24900ee14b 100644
--- a/res/css/views/rooms/_LinkPreviewWidget.scss
+++ b/res/css/views/rooms/_LinkPreviewWidget.scss
@@ -19,7 +19,8 @@ limitations under the License.
     margin-right: 15px;
     margin-bottom: 15px;
     display: flex;
-    border-left: 4px solid $preview-widget-bar-color;
+    border-left: 2px solid $preview-widget-bar-color;
+    border-radius: 2px;
     color: $preview-widget-fg-color;
 }
 
@@ -33,38 +34,29 @@ limitations under the License.
 .mx_LinkPreviewWidget_caption {
     margin-left: 15px;
     flex: 1 1 auto;
+    overflow: hidden; // cause it to wrap rather than clip
 }
 
 .mx_LinkPreviewWidget_title {
-    display: inline;
     font-weight: bold;
     white-space: normal;
-}
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
 
-.mx_LinkPreviewWidget_siteName {
-    display: inline;
+    .mx_LinkPreviewWidget_siteName {
+        font-weight: normal;
+    }
 }
 
 .mx_LinkPreviewWidget_description {
     margin-top: 8px;
     white-space: normal;
     word-wrap: break-word;
-}
-
-.mx_LinkPreviewWidget_cancel {
-    cursor: pointer;
-    width: 18px;
-    height: 18px;
-
-    img {
-        flex: 0 0 40px;
-        visibility: hidden;
-    }
-}
-
-.mx_LinkPreviewWidget:hover .mx_LinkPreviewWidget_cancel img,
-.mx_LinkPreviewWidget_cancel.focus-visible:focus img {
-    visibility: visible;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
 }
 
 .mx_MatrixChat_useCompactLayout {
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index 3f7f83d334..4abd9c7c30 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -111,7 +111,7 @@ limitations under the License.
 .mx_MemberInfo_field {
     cursor: pointer;
     font-size: $font-15px;
-    color: $primary-fg-color;
+    color: $primary-content;
     margin-left: 8px;
     line-height: $font-23px;
 }
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index e6c0cc3f46..c20dd43daf 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -130,7 +130,7 @@ limitations under the License.
 
 @keyframes visualbell {
     from { background-color: $visual-bell-bg-color; }
-    to { background-color: $primary-bg-color; }
+    to { background-color: $background; }
 }
 
 .mx_MessageComposer_input_error {
@@ -160,13 +160,11 @@ limitations under the License.
     resize: none;
     outline: none;
     box-shadow: none;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: $primary-content;
+    background-color: $background;
     font-size: $font-14px;
     max-height: 120px;
     overflow: auto;
-    /* needed for FF */
-    font-family: $font-family;
 }
 
 /* hack for FF as vertical alignment of custom placeholder text is broken */
@@ -187,13 +185,26 @@ limitations under the License.
     }
 }
 
+.mx_ContextualMenu {
+    .mx_MessageComposer_button {
+        padding-left: calc(var(--size) + 6px);
+    }
+}
+
 .mx_MessageComposer_button {
+    --size: 26px;
     position: relative;
-    margin-right: 6px;
     cursor: pointer;
-    height: 26px;
-    width: 26px;
+    height: var(--size);
+    line-height: var(--size);
+    width: auto;
+    padding-left: var(--size);
     border-radius: 100%;
+    margin-right: 6px;
+
+    &:last-child {
+        margin-right: auto;
+    }
 
     &::before {
         content: '';
@@ -209,8 +220,22 @@ limitations under the License.
         mask-position: center;
     }
 
-    &:hover {
-        background: rgba($accent-color, 0.1);
+    &::after {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 0;
+        width: var(--size);
+        height: var(--size);
+        border-radius: 50%;
+    }
+
+    &:hover,
+    &.mx_MessageComposer_closeButtonMenu {
+        &::after {
+            background: rgba($accent-color, 0.1);
+        }
 
         &::before {
             background-color: $accent-color;
@@ -239,10 +264,18 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/composer/sticker.svg');
 }
 
+.mx_MessageComposer_buttonMenu::before {
+    mask-image: url('$(res)/img/image-view/more.svg');
+}
+
+.mx_MessageComposer_closeButtonMenu::before {
+    transform: rotate(90deg);
+    transform-origin: center;
+}
+
 .mx_MessageComposer_sendMessage {
     cursor: pointer;
     position: relative;
-    margin-right: 6px;
     width: 32px;
     height: 32px;
     border-radius: 100%;
@@ -342,3 +375,28 @@ limitations under the License.
         height: 50px;
     }
 }
+
+/**
+ * Unstable compact mode
+ */
+
+.mx_MessageComposer.mx_MessageComposer--compact {
+    margin-right: 0;
+
+    .mx_MessageComposer_wrapper {
+        padding: 0 0 0 25px;
+    }
+
+    .mx_MessageComposer_button:last-child {
+        margin-right: 0;
+    }
+
+    .mx_MessageComposer_e2eIcon {
+        left: 0;
+    }
+}
+
+.mx_MessageComposer_Menu .mx_CallContextMenu_item {
+    display: flex;
+    align-items: center;
+}
diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
index e0cccfa885..f0e471d384 100644
--- a/res/css/views/rooms/_NewRoomIntro.scss
+++ b/res/css/views/rooms/_NewRoomIntro.scss
@@ -67,6 +67,6 @@ limitations under the License.
     > p {
         margin: 0;
         font-size: $font-15px;
-        color: $secondary-fg-color;
+        color: $secondary-content;
     }
 }
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
index 64b2623238..670e057cfa 100644
--- a/res/css/views/rooms/_NotificationBadge.scss
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -42,7 +42,7 @@ limitations under the License.
         // These are the 3 background types
 
         &.mx_NotificationBadge_dot {
-            background-color: $primary-fg-color; // increased visibility
+            background-color: $primary-content; // increased visibility
 
             width: 6px;
             height: 6px;
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index 15b3c16faa..07978a8f65 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -67,7 +67,7 @@ limitations under the License.
             //left: 0;
             height: inherit;
             width: inherit;
-            background: $secondary-fg-color;
+            background: $secondary-content;
             mask-position: center;
             mask-size: 8px;
             mask-repeat: no-repeat;
@@ -87,7 +87,7 @@ limitations under the License.
         .mx_PinnedEventTile_timestamp {
             font-size: inherit;
             line-height: inherit;
-            color: $secondary-fg-color;
+            color: $secondary-content;
         }
 
         .mx_AccessibleButton_kind_link {
diff --git a/res/css/views/rooms/_ReplyPreview.scss b/res/css/views/rooms/_ReplyPreview.scss
index 10f8e21e43..70a820e412 100644
--- a/res/css/views/rooms/_ReplyPreview.scss
+++ b/res/css/views/rooms/_ReplyPreview.scss
@@ -16,34 +16,40 @@ limitations under the License.
 
 .mx_ReplyPreview {
     border: 1px solid $primary-hairline-color;
-    background: $primary-bg-color;
+    background: $background;
     border-bottom: none;
     border-radius: 8px 8px 0 0;
     max-height: 50vh;
     overflow: auto;
     box-shadow: 0px -16px 32px $composer-shadow-color;
+
+    .mx_ReplyPreview_section {
+        border-bottom: 1px solid $primary-hairline-color;
+
+        .mx_ReplyPreview_header {
+            margin: 8px;
+            color: $primary-content;
+            font-weight: 400;
+            opacity: 0.4;
+        }
+
+        .mx_ReplyPreview_tile {
+            margin: 0 8px;
+        }
+
+        .mx_ReplyPreview_title {
+            float: left;
+        }
+
+        .mx_ReplyPreview_cancel {
+            float: right;
+            cursor: pointer;
+            display: flex;
+        }
+
+        .mx_ReplyPreview_clear {
+            clear: both;
+        }
+    }
 }
 
-.mx_ReplyPreview_section {
-    border-bottom: 1px solid $primary-hairline-color;
-}
-
-.mx_ReplyPreview_header {
-    margin: 12px;
-    color: $primary-fg-color;
-    font-weight: 400;
-    opacity: 0.4;
-}
-
-.mx_ReplyPreview_title {
-    float: left;
-}
-
-.mx_ReplyPreview_cancel {
-    float: right;
-    cursor: pointer;
-}
-
-.mx_ReplyPreview_clear {
-    clear: both;
-}
diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss
new file mode 100644
index 0000000000..3ef6491ec9
--- /dev/null
+++ b/res/css/views/rooms/_ReplyTile.scss
@@ -0,0 +1,117 @@
+/*
+Copyright 2020 Tulir Asokan <tulir@maunium.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_ReplyTile {
+    position: relative;
+    padding: 2px 0;
+    font-size: $font-14px;
+    line-height: $font-16px;
+
+    &.mx_ReplyTile_audio .mx_MFileBody_info_icon::before {
+        mask-image: url("$(res)/img/element-icons/speaker.svg");
+    }
+
+    &.mx_ReplyTile_video .mx_MFileBody_info_icon::before {
+        mask-image: url("$(res)/img/element-icons/call/video-call.svg");
+    }
+
+    .mx_MFileBody {
+        .mx_MFileBody_info {
+            margin: 5px 0;
+        }
+
+        .mx_MFileBody_download {
+            display: none;
+        }
+    }
+
+    > a {
+        display: flex;
+        flex-direction: column;
+        text-decoration: none;
+        color: $primary-content;
+    }
+
+    .mx_RedactedBody {
+        padding: 4px 0 2px 20px;
+
+        &::before {
+            height: 13px;
+            width: 13px;
+            top: 5px;
+        }
+    }
+
+    // We do reply size limiting with CSS to avoid duplicating the TextualBody component.
+    .mx_EventTile_content {
+        $reply-lines: 2;
+        $line-height: $font-22px;
+
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: $reply-lines;
+        line-height: $line-height;
+
+        .mx_EventTile_body.mx_EventTile_bigEmoji {
+            line-height: $line-height !important;
+            font-size: $font-14px !important; // Override the big emoji override
+        }
+
+        // Hide line numbers
+        .mx_EventTile_lineNumbers {
+            display: none;
+        }
+
+        // Hack to cut content in <pre> tags too
+        .mx_EventTile_pre_container > pre {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: $reply-lines;
+            padding: 4px;
+        }
+
+        .markdown-body blockquote,
+        .markdown-body dl,
+        .markdown-body ol,
+        .markdown-body p,
+        .markdown-body pre,
+        .markdown-body table,
+        .markdown-body ul {
+            margin-bottom: 4px;
+        }
+    }
+
+    &.mx_ReplyTile_info {
+        padding-top: 0;
+    }
+
+    .mx_SenderProfile {
+        font-size: $font-14px;
+        line-height: $font-17px;
+
+        display: inline-block; // anti-zalgo, with overflow hidden
+        padding: 0;
+        margin: 0;
+
+        // truncate long display names
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+}
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 4142b0a2ef..81dfa90c96 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_RoomHeader {
     flex: 0 0 50px;
     border-bottom: 1px solid $primary-hairline-color;
-    background-color: $roomheader-bg-color;
+    background-color: $background;
 
     .mx_RoomHeader_e2eIcon {
         height: 12px;
@@ -74,7 +74,7 @@ limitations under the License.
 
 .mx_RoomHeader_buttons {
     display: flex;
-    background-color: $primary-bg-color;
+    background-color: $background;
 }
 
 .mx_RoomHeader_info {
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 8eda25d0c9..7d967661a6 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -43,11 +43,11 @@ limitations under the License.
     div:first-child {
         font-weight: $font-semi-bold;
         line-height: $font-18px;
-        color: $primary-fg-color;
+        color: $primary-content;
     }
 
     .mx_AccessibleButton {
-        color: $primary-fg-color;
+        color: $primary-content;
         position: relative;
         padding: 8px 8px 8px 32px;
         font-size: inherit;
@@ -64,7 +64,7 @@ limitations under the License.
             position: absolute;
             top: 8px;
             left: 8px;
-            background: $secondary-fg-color;
+            background: $secondary-content;
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
index 146b3edf71..6db2185dd5 100644
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -172,14 +172,12 @@ limitations under the License.
         }
     }
 
-    // In the general case, we leave height of headers alone even if sticky, so
-    // that the sublists below them do not jump. However, that leaves a gap
-    // when scrolled to the top above the first sublist (whose header can only
-    // ever stick to top), so we force height to 0 for only that first header.
-    // See also https://github.com/vector-im/element-web/issues/14429.
-    &:first-child .mx_RoomSublist_headerContainer {
-        height: 0;
-        padding-bottom: 4px;
+    // In the general case, we reserve space for each sublist header to prevent
+    // scroll jumps when they become sticky. However, that leaves a gap when
+    // scrolled to the top above the first sublist (whose header can only ever
+    // stick to top), so we make sure to exclude the first visible sublist.
+    &:not(.mx_RoomSublist_hidden) ~ .mx_RoomSublist .mx_RoomSublist_headerContainer {
+        height: 24px;
     }
 
     .mx_RoomSublist_resizeBox {
@@ -233,7 +231,7 @@ limitations under the License.
         &:hover, &.mx_RoomSublist_hasMenuOpen {
             .mx_RoomSublist_resizerHandle {
                 opacity: 0.8;
-                background-color: $primary-fg-color;
+                background-color: $primary-content;
             }
         }
     }
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 03146e0325..0c04f27115 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -124,7 +124,7 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background: $primary-fg-color;
+            background: $primary-content;
         }
     }
 
@@ -193,6 +193,10 @@ limitations under the License.
         mask-image: url('$(res)/img/element-icons/settings.svg');
     }
 
+    .mx_RoomTile_iconCopyLink::before {
+        mask-image: url('$(res)/img/element-icons/link.svg');
+    }
+
     .mx_RoomTile_iconInvite::before {
         mask-image: url('$(res)/img/element-icons/room/invite.svg');
     }
diff --git a/res/css/views/rooms/_SearchBar.scss b/res/css/views/rooms/_SearchBar.scss
index d9f730a8b6..e08168a122 100644
--- a/res/css/views/rooms/_SearchBar.scss
+++ b/res/css/views/rooms/_SearchBar.scss
@@ -47,7 +47,7 @@ limitations under the License.
         padding: 5px;
         font-size: $font-15px;
         cursor: pointer;
-        color: $primary-fg-color;
+        color: $primary-content;
         border-bottom: 2px solid $accent-color;
         font-weight: 600;
     }
diff --git a/res/css/views/rooms/_SendMessageComposer.scss b/res/css/views/rooms/_SendMessageComposer.scss
index 9f6a8d52ce..4b7eb54188 100644
--- a/res/css/views/rooms/_SendMessageComposer.scss
+++ b/res/css/views/rooms/_SendMessageComposer.scss
@@ -29,8 +29,10 @@ limitations under the License.
         display: flex;
         flex-direction: column;
         // min-height at this level so the mx_BasicMessageComposer_input
-        // still stays vertically centered when less than 50px
-        min-height: 50px;
+        // still stays vertically centered when less than 55px.
+        // We also set this to ensure the voice message recording widget
+        // doesn't cause a jump.
+        min-height: 55px;
 
         .mx_BasicMessageComposer_input {
             padding: 3px 0;
diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 8841b042a0..7c7d96e713 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -41,7 +41,7 @@ limitations under the License.
     height: 38px;
     border-radius: 19px;
     box-sizing: border-box;
-    background: $primary-bg-color;
+    background: $background;
     border: 1.3px solid $muted-fg-color;
     cursor: pointer;
 }
@@ -62,7 +62,7 @@ limitations under the License.
     display: block;
     width: 18px;
     height: 18px;
-    background: $primary-bg-color;
+    background: $background;
     border: 1.3px solid $muted-fg-color;
     border-radius: 10px;
     margin: 5px auto;
diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.scss b/res/css/views/rooms/_VoiceRecordComposerTile.scss
index a3ee104bd8..69fe292c0a 100644
--- a/res/css/views/rooms/_VoiceRecordComposerTile.scss
+++ b/res/css/views/rooms/_VoiceRecordComposerTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
     height: 28px;
     border: 2px solid $voice-record-stop-border-color;
     border-radius: 32px;
-    margin-right: 16px; // between us and the send button
+    margin-right: 8px; // between us and the waveform component
     position: relative;
 
     &::after {
@@ -36,19 +36,38 @@ limitations under the License.
 }
 
 .mx_VoiceRecordComposerTile_delete {
-    width: 14px; // w&h are size of icon
-    height: 18px;
+    width: 24px;
+    height: 24px;
     vertical-align: middle;
-    margin-right: 11px; // distance from left edge of waveform container (container has some margin too)
+    margin-right: 8px; // distance from left edge of waveform container (container has some margin too)
     background-color: $voice-record-icon-color;
     mask-repeat: no-repeat;
     mask-size: contain;
     mask-image: url('$(res)/img/element-icons/trashcan.svg');
 }
 
+.mx_VoiceRecordComposerTile_uploadingState {
+    margin-right: 10px;
+    color: $secondary-content;
+}
+
+.mx_VoiceRecordComposerTile_failedState {
+    margin-right: 21px;
+
+    .mx_VoiceRecordComposerTile_uploadState_badge {
+        display: inline-block;
+        margin-right: 4px;
+        vertical-align: middle;
+    }
+}
+
 .mx_MessageComposer_row .mx_VoiceMessagePrimaryContainer {
     // Note: remaining class properties are in the PlayerContainer CSS.
 
+    // fixed height to reduce layout jumps with the play button appearing
+    // https://github.com/vector-im/element-web/issues/18431
+    height: 32px;
+
     margin: 6px; // force the composer area to put a gutter around us
     margin-right: 12px; // isolate from stop/send button
 
@@ -68,7 +87,7 @@ limitations under the License.
             height: 10px;
             position: absolute;
             left: 12px; // 12px from the left edge for container padding
-            top: 18px; // vertically center (middle align with clock)
+            top: 17px; // vertically center (middle align with clock)
             border-radius: 10px;
         }
     }
diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index 1c0dabbeb5..49655742bb 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -36,7 +36,7 @@ limitations under the License.
 }
 
 .mx_WhoIsTypingTile_avatars .mx_BaseAvatar {
-    border: 1px solid $primary-bg-color;
+    border: 1px solid $background;
     border-radius: 40px;
 }
 
@@ -45,7 +45,7 @@ limitations under the License.
     display: inline-block;
     color: #acacac;
     background-color: #ddd;
-    border: 1px solid $primary-bg-color;
+    border: 1px solid $background;
     border-radius: 40px;
     width: 24px;
     height: 24px;
diff --git a/res/css/views/settings/_JoinRuleSettings.scss b/res/css/views/settings/_JoinRuleSettings.scss
new file mode 100644
index 0000000000..8b520b2ab1
--- /dev/null
+++ b/res/css/views/settings/_JoinRuleSettings.scss
@@ -0,0 +1,88 @@
+/*
+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_JoinRuleSettings_upgradeRequired {
+    margin-left: 16px;
+    padding: 4px 16px;
+    border: 1px solid $accent-color;
+    border-radius: 8px;
+    color: $accent-color;
+    font-size: $font-12px;
+    line-height: $font-15px;
+}
+
+.mx_JoinRuleSettings_spacesWithAccess {
+    > h4 {
+        color: $secondary-content;
+        font-weight: $font-semi-bold;
+        font-size: $font-12px;
+        line-height: $font-15px;
+        text-transform: uppercase;
+    }
+
+    > span {
+        font-weight: 500;
+        font-size: $font-14px;
+        line-height: 32px; // matches height of avatar for v-align
+        color: $secondary-content;
+        display: inline-block;
+
+        img.mx_RoomAvatar_isSpaceRoom,
+        .mx_RoomAvatar_isSpaceRoom img {
+            border-radius: 8px;
+        }
+
+        .mx_BaseAvatar {
+            margin-right: 8px;
+        }
+
+        & + span {
+            margin-left: 16px;
+        }
+    }
+}
+
+.mx_JoinRuleSettings_radioButton {
+    padding-top: 16px;
+    margin-bottom: 8px;
+
+    .mx_RadioButton_content {
+        margin-left: 14px;
+        font-weight: $font-semi-bold;
+        font-size: $font-15px;
+        line-height: $font-24px;
+        color: $primary-content;
+        display: block;
+    }
+
+    & + span {
+        display: inline-block;
+        margin-left: 34px;
+        margin-bottom: 16px;
+        font-size: $font-15px;
+        line-height: $font-24px;
+        color: $secondary-content;
+
+        & + .mx_RadioButton {
+            border-top: 1px solid $menu-border-color;
+        }
+    }
+}
+
+.mx_JoinRuleSettings_linkButton {
+    padding: 0;
+    font-size: inherit;
+}
diff --git a/res/css/views/settings/_LayoutSwitcher.scss b/res/css/views/settings/_LayoutSwitcher.scss
new file mode 100644
index 0000000000..00fb8aba56
--- /dev/null
+++ b/res/css/views/settings/_LayoutSwitcher.scss
@@ -0,0 +1,91 @@
+/*
+Copyright 2020 - 2021 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_LayoutSwitcher {
+    .mx_LayoutSwitcher_RadioButtons {
+        display: flex;
+        flex-direction: row;
+        gap: 24px;
+
+        color: $primary-content;
+
+        > .mx_LayoutSwitcher_RadioButton {
+            flex-grow: 0;
+            flex-shrink: 1;
+            display: flex;
+            flex-direction: column;
+
+            width: 300px;
+
+            border: 1px solid $appearance-tab-border-color;
+            border-radius: 10px;
+
+            .mx_EventTile_msgOption,
+            .mx_MessageActionBar {
+                display: none;
+            }
+
+            .mx_LayoutSwitcher_RadioButton_preview {
+                flex-grow: 1;
+                display: flex;
+                align-items: center;
+                padding: 10px;
+                pointer-events: none;
+            }
+
+            .mx_RadioButton {
+                flex-grow: 0;
+                padding: 10px;
+            }
+
+            .mx_EventTile_content {
+                margin-right: 0;
+            }
+
+            &.mx_LayoutSwitcher_RadioButton_selected {
+                border-color: $accent-color;
+            }
+        }
+
+        .mx_RadioButton {
+            border-top: 1px solid $appearance-tab-border-color;
+
+            > input + div {
+                border-color: rgba($muted-fg-color, 0.2);
+            }
+        }
+
+        .mx_RadioButton_checked {
+            background-color: rgba($accent-color, 0.08);
+        }
+
+        .mx_EventTile {
+            margin: 0;
+            &[data-layout=bubble] {
+                margin-right: 40px;
+            }
+            &[data-layout=irc] {
+                > a {
+                    display: none;
+                }
+            }
+            .mx_EventTile_line {
+                max-width: 90%;
+            }
+        }
+    }
+}
diff --git a/res/css/views/settings/_Notifications.scss b/res/css/views/settings/_Notifications.scss
index 77a7bc5b68..a0e46c0071 100644
--- a/res/css/views/settings/_Notifications.scss
+++ b/res/css/views/settings/_Notifications.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+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.
@@ -14,82 +14,79 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_UserNotifSettings_tableRow {
-    display: table-row;
-}
+.mx_UserNotifSettings {
+    color: $primary-content; // override from default settings page styles
 
-.mx_UserNotifSettings_inputCell {
-    display: table-cell;
-    padding-bottom: 8px;
-    padding-right: 8px;
-    width: 16px;
-}
+    .mx_UserNotifSettings_pushRulesTable {
+        width: calc(100% + 12px); // +12px to line up center of 'Noisy' column with toggle switches
+        table-layout: fixed;
+        border-collapse: collapse;
+        border-spacing: 0;
+        margin-top: 40px;
 
-.mx_UserNotifSettings_labelCell {
-    padding-bottom: 8px;
-    width: 400px;
-    display: table-cell;
-}
+        tr > th {
+            font-weight: $font-semi-bold;
+        }
 
-.mx_UserNotifSettings_pushRulesTableWrapper {
-    padding-bottom: 8px;
-}
+        tr > th:first-child {
+            text-align: left;
+            font-size: $font-18px;
+        }
 
-.mx_UserNotifSettings_pushRulesTable {
-    width: 100%;
-    table-layout: fixed;
-}
+        tr > th:nth-child(n + 2) {
+            color: $secondary-content;
+            font-size: $font-12px;
+            vertical-align: middle;
+            width: 66px;
+        }
 
-.mx_UserNotifSettings_pushRulesTable thead {
-    font-weight: bold;
-}
+        tr > td:nth-child(n + 2) {
+            text-align: center;
+        }
 
-.mx_UserNotifSettings_pushRulesTable tbody th {
-    font-weight: 400;
-}
+        tr > td {
+            padding-top: 8px;
+        }
 
-.mx_UserNotifSettings_pushRulesTable tbody th:first-child {
-    text-align: left;
-}
+        // Override StyledRadioButton default styles
+        .mx_RadioButton {
+            justify-content: center;
 
-.mx_UserNotifSettings_keywords {
-    cursor: pointer;
-    color: $accent-color;
-}
+            .mx_RadioButton_content {
+                display: none;
+            }
 
-.mx_UserNotifSettings_devicesTable td {
-    padding-left: 20px;
-    padding-right: 20px;
-}
+            .mx_RadioButton_spacer {
+                display: none;
+            }
+        }
+    }
 
-.mx_UserNotifSettings_notifTable {
-    display: table;
-    position: relative;
-}
+    .mx_UserNotifSettings_floatingSection {
+        margin-top: 40px;
 
-.mx_UserNotifSettings_notifTable .mx_Spinner {
-    position: absolute;
-}
+        & > div:first-child { // section header
+            font-size: $font-18px;
+            font-weight: $font-semi-bold;
+        }
 
-.mx_NotificationSound_soundUpload {
-    display: none;
-}
+        > table {
+            border-collapse: collapse;
+            border-spacing: 0;
+            margin-top: 8px;
 
-.mx_NotificationSound_browse {
-    color: $accent-color;
-    border: 1px solid $accent-color;
-    background-color: transparent;
-}
+            tr > td:first-child {
+                // Just for a bit of spacing
+                padding-right: 8px;
+            }
+        }
+    }
 
-.mx_NotificationSound_save {
-    margin-left: 5px;
-    color: white;
-    background-color: $accent-color;
-}
+    .mx_UserNotifSettings_clearNotifsButton {
+        margin-top: 8px;
+    }
 
-.mx_NotificationSound_resetSound {
-    margin-top: 5px;
-    color: white;
-    border: $warning-color;
-    background-color: $warning-color;
+    .mx_TagComposer {
+        margin-top: 35px; // lots of distance from the last line of the table
+    }
 }
diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
index 4cbcb8e708..63a5fa7edf 100644
--- a/res/css/views/settings/_ProfileSettings.scss
+++ b/res/css/views/settings/_ProfileSettings.scss
@@ -16,6 +16,7 @@ limitations under the License.
 
 .mx_ProfileSettings_controls_topic {
     & > textarea {
+        font-family: inherit;
         resize: vertical;
     }
 }
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 892f5fe744..5aa9db7e86 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -25,7 +25,7 @@ limitations under the License.
 .mx_SettingsTab_heading {
     font-size: $font-20px;
     font-weight: 600;
-    color: $primary-fg-color;
+    color: $primary-content;
     margin-bottom: 10px;
 }
 
@@ -36,9 +36,8 @@ limitations under the License.
 .mx_SettingsTab_subheading {
     font-size: $font-16px;
     display: block;
-    font-family: $font-family;
     font-weight: 600;
-    color: $primary-fg-color;
+    color: $primary-content;
     margin-bottom: 10px;
     margin-top: 12px;
 }
@@ -47,19 +46,25 @@ limitations under the License.
     color: $settings-subsection-fg-color;
     font-size: $font-14px;
     display: block;
-    margin: 10px 100px 10px 0; // Align with the rest of the view
+    margin: 10px 80px 10px 0; // Align with the rest of the view
 }
 
 .mx_SettingsTab_section {
+    $right-gutter: 80px;
+
     margin-bottom: 24px;
 
     .mx_SettingsFlag {
-        margin-right: 100px;
+        margin-right: $right-gutter;
         margin-bottom: 10px;
     }
 
+    > p {
+        margin-right: $right-gutter;
+    }
+
     &.mx_SettingsTab_subsectionText .mx_SettingsFlag {
-        margin-right: 0px !important;
+        margin-right: 0 !important;
     }
 }
 
@@ -67,12 +72,19 @@ limitations under the License.
     vertical-align: middle;
     display: inline-block;
     font-size: $font-14px;
-    color: $primary-fg-color;
+    color: $primary-content;
     max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch
     box-sizing: border-box;
     padding-right: 10px;
 }
 
+.mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_microcopy {
+    margin-top: 4px;
+    font-size: $font-12px;
+    line-height: $font-15px;
+    color: $secondary-content;
+}
+
 .mx_SettingsTab_section .mx_SettingsFlag .mx_ToggleSwitch {
     float: right;
 }
diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index 23dcc532b2..a3b3b17899 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_SecurityRoomSettingsTab {
+    .mx_SettingsTab_showAdvanced {
+        padding: 0;
+        margin-bottom: 16px;
+    }
+}
+
 .mx_SecurityRoomSettingsTab_warning {
     display: block;
 
@@ -26,5 +33,7 @@ limitations under the License.
 }
 
 .mx_SecurityRoomSettingsTab_encryptionSection {
-    margin-bottom: 25px;
+    padding-bottom: 24px;
+    border-bottom: 1px solid $menu-border-color;
+    margin-bottom: 32px;
 }
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index 94983a60bf..57c6e9b865 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.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,8 +15,7 @@ limitations under the License.
 */
 
 .mx_AppearanceUserSettingsTab_fontSlider,
-.mx_AppearanceUserSettingsTab_fontSlider_preview,
-.mx_AppearanceUserSettingsTab_Layout {
+.mx_AppearanceUserSettingsTab_fontSlider_preview {
     @mixin mx_Settings_fullWidthField;
 }
 
@@ -25,7 +24,7 @@ limitations under the License.
 }
 
 .mx_AppearanceUserSettingsTab_fontScaling {
-    color: $primary-fg-color;
+    color: $primary-content;
 }
 
 .mx_AppearanceUserSettingsTab_fontSlider {
@@ -45,6 +44,11 @@ limitations under the License.
     border-radius: 10px;
     padding: 0 16px 9px 16px;
     pointer-events: none;
+    display: flow-root;
+
+    .mx_EventTile[data-layout=bubble] {
+        margin-top: 30px;
+    }
 
     .mx_EventTile_msgOption {
         display: none;
@@ -77,7 +81,7 @@ limitations under the License.
 
 .mx_AppearanceUserSettingsTab_themeSection {
     $radio-bg-color: $input-darker-bg-color;
-    color: $primary-fg-color;
+    color: $primary-content;
 
     > .mx_ThemeSelectors {
         display: flex;
@@ -151,69 +155,8 @@ limitations under the License.
     margin-left: calc($font-16px + 10px);
 }
 
-.mx_AppearanceUserSettingsTab_Layout_RadioButtons {
-    display: flex;
-    flex-direction: row;
-
-    color: $primary-fg-color;
-
-    .mx_AppearanceUserSettingsTab_spacer {
-        width: 24px;
-    }
-
-    > .mx_AppearanceUserSettingsTab_Layout_RadioButton {
-        flex-grow: 0;
-        flex-shrink: 1;
-        display: flex;
-        flex-direction: column;
-
-        width: 300px;
-
-        border: 1px solid $appearance-tab-border-color;
-        border-radius: 10px;
-
-        .mx_EventTile_msgOption,
-        .mx_MessageActionBar {
-            display: none;
-        }
-
-        .mx_AppearanceUserSettingsTab_Layout_RadioButton_preview {
-            flex-grow: 1;
-            display: flex;
-            align-items: center;
-            padding: 10px;
-            pointer-events: none;
-        }
-
-        .mx_RadioButton {
-            flex-grow: 0;
-            padding: 10px;
-        }
-
-        .mx_EventTile_content {
-            margin-right: 0;
-        }
-
-        &.mx_AppearanceUserSettingsTab_Layout_RadioButton_selected {
-            border-color: $accent-color;
-        }
-    }
-
-    .mx_RadioButton {
-        border-top: 1px solid $appearance-tab-border-color;
-
-        > input + div {
-            border-color: rgba($muted-fg-color, 0.2);
-        }
-    }
-
-    .mx_RadioButton_checked {
-        background-color: rgba($accent-color, 0.08);
-    }
-}
-
 .mx_AppearanceUserSettingsTab_Advanced {
-    color: $primary-fg-color;
+    color: $primary-content;
 
     > * {
         margin-bottom: 16px;
diff --git a/res/css/views/settings/tabs/user/_HelpUserSettingsTab.scss b/res/css/views/settings/tabs/user/_HelpUserSettingsTab.scss
index 0f879d209e..3e61e80a9d 100644
--- a/res/css/views/settings/tabs/user/_HelpUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_HelpUserSettingsTab.scss
@@ -28,28 +28,33 @@ limitations under the License.
     user-select: all;
 }
 
-.mx_HelpUserSettingsTab_accessToken {
+.mx_HelpUserSettingsTab_copy {
     display: flex;
-    justify-content: space-between;
     border-radius: 5px;
     border: solid 1px $light-fg-color;
     margin-bottom: 10px;
     margin-top: 10px;
     padding: 10px;
-}
+    width: max-content;
+    max-width: 100%;
 
-.mx_HelpUserSettingsTab_accessToken_copy {
-    flex-shrink: 0;
-    cursor: pointer;
-    margin-left: 20px;
-    display: inherit;
-}
+    .mx_HelpUserSettingsTab_copyButton {
+        flex-shrink: 0;
+        width: 20px;
+        height: 20px;
+        cursor: pointer;
+        margin-left: 20px;
+        display: block;
 
-.mx_HelpUserSettingsTab_accessToken_copy > div {
-    mask-image: url($copy-button-url);
-    background-color: $message-action-bar-fg-color;
-    margin-left: 5px;
-    width: 20px;
-    height: 20px;
-    background-repeat: no-repeat;
+        &::before {
+            content: "";
+
+            mask-image: url($copy-button-url);
+            background-color: $message-action-bar-fg-color;
+            width: 20px;
+            height: 20px;
+            display: block;
+            background-repeat: no-repeat;
+        }
+    }
 }
diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index be0af9123b..16f607c95f 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -21,5 +21,37 @@ limitations under the License.
 
     .mx_SettingsTab_section {
         margin-bottom: 30px;
+
+        > details {
+            > summary {
+                cursor: pointer;
+                color: $primary-content;
+            }
+
+            & + .mx_SettingsFlag {
+                margin-top: 20px;
+            }
+        }
+    }
+
+    .mx_PreferencesUserSettingsTab_CommunityMigrator {
+        margin-right: 200px;
+
+        > div {
+            font-weight: $font-semi-bold;
+            font-size: $font-15px;
+            line-height: $font-18px;
+            color: $primary-content;
+            margin: 16px 0;
+
+            .mx_BaseAvatar {
+                margin-right: 12px;
+                vertical-align: middle;
+            }
+
+            .mx_AccessibleButton {
+                float: right;
+            }
+        }
     }
 }
diff --git a/res/css/views/spaces/_SpaceBasicSettings.scss b/res/css/views/spaces/_SpaceBasicSettings.scss
index 204ccab2b7..bff574ded3 100644
--- a/res/css/views/spaces/_SpaceBasicSettings.scss
+++ b/res/css/views/spaces/_SpaceBasicSettings.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_SpaceBasicSettings {
     .mx_Field {
-        margin: 32px 0;
+        margin: 24px 0;
     }
 
     .mx_SpaceBasicSettings_avatarContainer {
@@ -27,7 +27,7 @@ limitations under the License.
             position: relative;
             height: 80px;
             width: 80px;
-            background-color: $tertiary-fg-color;
+            background-color: $tertiary-content;
             border-radius: 16px;
         }
 
@@ -73,7 +73,7 @@ limitations under the License.
         }
     }
 
-    .mx_FormButton {
+    .mx_AccessibleButton_hasKind {
         padding: 8px 22px;
         margin-left: auto;
         display: block;
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
index 88b9d8f693..7084c2f20e 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.scss
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$spacePanelWidth: 71px;
+$spacePanelWidth: 68px;
 
 .mx_SpaceCreateMenu_wrapper {
     // background blur everything except SpacePanel
@@ -28,7 +28,7 @@ $spacePanelWidth: 71px;
         padding: 24px;
         width: 480px;
         box-sizing: border-box;
-        background-color: $primary-bg-color;
+        background-color: $background;
         position: relative;
 
         > div {
@@ -40,16 +40,14 @@ $spacePanelWidth: 71px;
 
             > p {
                 font-size: $font-15px;
-                color: $secondary-fg-color;
-                margin: 0;
+                color: $secondary-content;
             }
-        }
 
-        // XXX remove this when spaces leaves Beta
-        .mx_BetaCard_betaPill {
-            position: absolute;
-            top: 24px;
-            right: 24px;
+            .mx_SpaceFeedbackPrompt {
+                border-top: 1px solid $input-border-color;
+                padding-top: 12px;
+                margin-top: 16px;
+            }
         }
 
         .mx_SpaceCreateMenuType {
@@ -78,7 +76,7 @@ $spacePanelWidth: 71px;
                 width: 28px;
                 top: 0;
                 left: 0;
-                background-color: $tertiary-fg-color;
+                background-color: $tertiary-content;
                 transform: rotate(90deg);
                 mask-repeat: no-repeat;
                 mask-position: 2px 3px;
@@ -94,8 +92,35 @@ $spacePanelWidth: 71px;
             width: min-content;
         }
 
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+            font-size: inherit;
+        }
+
         .mx_AccessibleButton_disabled {
             cursor: not-allowed;
         }
     }
 }
+
+.mx_SpaceFeedbackPrompt {
+    font-size: $font-15px;
+    line-height: $font-24px;
+
+    > span {
+        color: $secondary-content;
+        position: relative;
+        font-size: inherit;
+        line-height: inherit;
+        margin-right: auto;
+    }
+
+    .mx_AccessibleButton_kind_link {
+        color: $accent-color;
+        position: relative;
+        padding: 0;
+        margin-left: 8px;
+        font-size: inherit;
+        line-height: inherit;
+    }
+}
diff --git a/res/css/views/toasts/_IncomingCallToast.scss b/res/css/views/toasts/_IncomingCallToast.scss
new file mode 100644
index 0000000000..cb05b1a977
--- /dev/null
+++ b/res/css/views/toasts/_IncomingCallToast.scss
@@ -0,0 +1,156 @@
+/*
+Copyright 2020 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_IncomingCallToast {
+    display: flex;
+    flex-direction: row;
+    pointer-events: initial; // restore pointer events so the user can accept/decline
+
+    .mx_IncomingCallToast_content {
+        display: flex;
+        flex-direction: column;
+        margin-left: 8px;
+
+        .mx_CallEvent_caller {
+            font-weight: bold;
+            font-size: $font-15px;
+            line-height: $font-18px;
+
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            margin-top: 2px;
+            margin-right: 6px;
+
+            max-width: 200px;
+        }
+
+        .mx_CallEvent_type {
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $tertiary-content;
+
+            margin-top: 4px;
+            margin-bottom: 6px;
+
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .mx_CallEvent_type_icon {
+                height: 16px;
+                width: 16px;
+                margin-right: 6px;
+
+                &::before {
+                    content: '';
+                    position: absolute;
+                    height: inherit;
+                    width: inherit;
+                    background-color: $tertiary-content;
+                    mask-repeat: no-repeat;
+                    mask-size: contain;
+                }
+            }
+        }
+
+        &.mx_IncomingCallToast_content_voice {
+            .mx_CallEvent_type .mx_CallEvent_type_icon::before,
+            .mx_IncomingCallToast_buttons .mx_IncomingCallToast_button_accept span::before {
+                mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
+            }
+        }
+
+        &.mx_IncomingCallToast_content_video {
+            .mx_CallEvent_type .mx_CallEvent_type_icon::before,
+            .mx_IncomingCallToast_buttons .mx_IncomingCallToast_button_accept span::before {
+                mask-image: url('$(res)/img/element-icons/call/video-call.svg');
+            }
+        }
+
+        .mx_IncomingCallToast_buttons {
+            margin-top: 8px;
+            display: flex;
+            flex-direction: row;
+            gap: 12px;
+
+            .mx_IncomingCallToast_button {
+                height: 24px;
+                padding: 0px 8px;
+                flex-shrink: 0;
+                flex-grow: 1;
+                margin-right: 0;
+                font-size: $font-15px;
+                line-height: $font-24px;
+
+                span {
+                    padding: 8px 0;
+                    display: flex;
+                    align-items: center;
+
+                    &::before {
+                        content: '';
+                        display: inline-block;
+                        background-color: $button-fg-color;
+                        mask-position: center;
+                        mask-repeat: no-repeat;
+                        margin-right: 8px;
+                    }
+                }
+
+                &.mx_IncomingCallToast_button_accept span::before {
+                    mask-size: 13px;
+                    width: 13px;
+                    height: 13px;
+                }
+
+                &.mx_IncomingCallToast_button_decline span::before {
+                    mask-image: url('$(res)/img/element-icons/call/hangup.svg');
+                    mask-size: 16px;
+                    width: 16px;
+                    height: 16px;
+                }
+            }
+        }
+    }
+
+    .mx_IncomingCallToast_iconButton {
+        display: flex;
+        height: 20px;
+        width: 20px;
+
+        &::before {
+            content: '';
+
+            height: inherit;
+            width: inherit;
+            background-color: $tertiary-content;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+            mask-position: center;
+        }
+    }
+
+    .mx_IncomingCallToast_silence::before {
+        mask-image: url('$(res)/img/voip/silence.svg');
+    }
+
+    .mx_IncomingCallToast_unSilence::before {
+        mask-image: url('$(res)/img/voip/un-silence.svg');
+    }
+}
diff --git a/res/css/views/voip/CallView/_CallViewButtons.scss b/res/css/views/voip/CallView/_CallViewButtons.scss
new file mode 100644
index 0000000000..8e343f0ff3
--- /dev/null
+++ b/res/css/views/voip/CallView/_CallViewButtons.scss
@@ -0,0 +1,102 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 - 2021 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_CallViewButtons {
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    bottom: 5px;
+    opacity: 1;
+    transition: opacity 0.5s;
+    z-index: 200; // To be above _all_ feeds
+
+    &.mx_CallViewButtons_hidden {
+        opacity: 0.001; // opacity 0 can cause a re-layout
+        pointer-events: none;
+    }
+
+    .mx_CallViewButtons_button {
+        cursor: pointer;
+        margin-left: 2px;
+        margin-right: 2px;
+
+
+        &::before {
+            content: '';
+            display: inline-block;
+
+            height: 48px;
+            width: 48px;
+
+            background-repeat: no-repeat;
+            background-size: contain;
+            background-position: center;
+        }
+
+
+        &.mx_CallViewButtons_dialpad::before {
+            background-image: url('$(res)/img/voip/dialpad.svg');
+        }
+
+        &.mx_CallViewButtons_button_micOn::before {
+            background-image: url('$(res)/img/voip/mic-on.svg');
+        }
+
+        &.mx_CallViewButtons_button_micOff::before {
+            background-image: url('$(res)/img/voip/mic-off.svg');
+        }
+
+        &.mx_CallViewButtons_button_vidOn::before {
+            background-image: url('$(res)/img/voip/vid-on.svg');
+        }
+
+        &.mx_CallViewButtons_button_vidOff::before {
+            background-image: url('$(res)/img/voip/vid-off.svg');
+        }
+
+        &.mx_CallViewButtons_button_screensharingOn::before {
+            background-image: url('$(res)/img/voip/screensharing-on.svg');
+        }
+
+        &.mx_CallViewButtons_button_screensharingOff::before {
+            background-image: url('$(res)/img/voip/screensharing-off.svg');
+        }
+
+        &.mx_CallViewButtons_button_sidebarOn::before {
+            background-image: url('$(res)/img/voip/sidebar-on.svg');
+        }
+
+        &.mx_CallViewButtons_button_sidebarOff::before {
+            background-image: url('$(res)/img/voip/sidebar-off.svg');
+        }
+
+        &.mx_CallViewButtons_button_hangup::before {
+            background-image: url('$(res)/img/voip/hangup.svg');
+        }
+
+        &.mx_CallViewButtons_button_more::before {
+            background-image: url('$(res)/img/voip/more.svg');
+        }
+
+        &.mx_CallViewButtons_button_invisible {
+            visibility: hidden;
+            pointer-events: none;
+            position: absolute;
+        }
+    }
+}
diff --git a/res/css/views/voip/_CallContainer.scss b/res/css/views/voip/_CallContainer.scss
index 8262075559..a0137b18e8 100644
--- a/res/css/views/voip/_CallContainer.scss
+++ b/res/css/views/voip/_CallContainer.scss
@@ -26,77 +26,7 @@ limitations under the License.
     // different level.
     pointer-events: none;
 
-    .mx_CallPreview {
-        pointer-events: initial; // restore pointer events so the user can leave/interact
-        cursor: pointer;
-
-        .mx_CallView_video {
-            width: 350px;
-        }
-
-        .mx_VideoFeed_local {
-            border-radius: 8px;
-            overflow: hidden;
-        }
-    }
-
     .mx_AppTile_persistedWrapper div {
         min-width: 350px;
     }
-
-    .mx_IncomingCallBox {
-        min-width: 250px;
-        background-color: $voipcall-plinth-color;
-        padding: 8px;
-        box-shadow: 0px 14px 24px rgba(0, 0, 0, 0.08);
-        border-radius: 8px;
-
-        pointer-events: initial; // restore pointer events so the user can accept/decline
-        cursor: pointer;
-
-        .mx_IncomingCallBox_CallerInfo {
-            display: flex;
-            direction: row;
-
-            img, .mx_BaseAvatar_initial {
-                margin: 8px;
-            }
-
-            > div {
-                display: flex;
-                flex-direction: column;
-
-                justify-content: center;
-            }
-
-            h1, p {
-                margin: 0px;
-                padding: 0px;
-                font-size: $font-14px;
-                line-height: $font-16px;
-            }
-
-            h1 {
-                font-weight: bold;
-            }
-        }
-
-        .mx_IncomingCallBox_buttons {
-            padding: 8px;
-            display: flex;
-            flex-direction: row;
-
-            > .mx_IncomingCallBox_spacer {
-                width: 8px;
-            }
-
-            > * {
-                flex-shrink: 0;
-                flex-grow: 1;
-                margin-right: 0;
-                font-size: $font-15px;
-                line-height: $font-24px;
-            }
-        }
-    }
 }
diff --git a/res/css/views/voip/_CallPreview.scss b/res/css/views/voip/_CallPreview.scss
new file mode 100644
index 0000000000..0fd97d4676
--- /dev/null
+++ b/res/css/views/voip/_CallPreview.scss
@@ -0,0 +1,32 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_CallPreview {
+    position: fixed;
+    left: 0;
+    top: 0;
+
+    pointer-events: initial; // restore pointer events so the user can leave/interact
+
+    .mx_VideoFeed_remote.mx_VideoFeed_voice {
+        min-height: 150px;
+    }
+
+    .mx_VideoFeed_local {
+        border-radius: 8px;
+        overflow: hidden;
+    }
+}
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index 0be75be28c..aa0aa4e2a6 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -39,20 +39,20 @@ limitations under the License.
 .mx_CallView_pip {
     width: 320px;
     padding-bottom: 8px;
-    margin-top: 10px;
-    background-color: $voipcall-plinth-color;
+    background-color: $system;
     box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.20);
     border-radius: 8px;
 
+    .mx_CallView_video_hold,
     .mx_CallView_voice {
         height: 180px;
     }
 
-    .mx_CallView_callControls {
+    .mx_CallViewButtons {
         bottom: 0px;
     }
 
-    .mx_CallView_callControls_button {
+    .mx_CallViewButtons_button {
         &::before {
             width: 36px;
             height: 36px;
@@ -68,7 +68,30 @@ limitations under the License.
 .mx_CallView_content {
     position: relative;
     display: flex;
+    justify-content: center;
     border-radius: 8px;
+
+    > .mx_VideoFeed {
+        width: 100%;
+        height: 100%;
+        border-width: 0 !important; // Override mx_VideoFeed_speaking
+
+        &.mx_VideoFeed_voice {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .mx_VideoFeed_video {
+            height: 100%;
+            background-color: #000;
+        }
+
+        .mx_VideoFeed_mic {
+            left: 10px;
+            bottom: 10px;
+        }
+    }
 }
 
 .mx_CallView_voice {
@@ -177,202 +200,22 @@ limitations under the License.
     }
 }
 
-.mx_CallView_header {
-    height: 44px;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: left;
-    flex-shrink: 0;
-}
 
-.mx_CallView_header_callType {
-    font-size: 1.2rem;
-    font-weight: bold;
-    vertical-align: middle;
-}
-
-.mx_CallView_header_secondaryCallInfo {
-    &::before {
-        content: '·';
-        margin-left: 6px;
-        margin-right: 6px;
-    }
-}
-
-.mx_CallView_header_controls {
-    margin-left: auto;
-}
-
-.mx_CallView_header_button {
-    display: inline-block;
-    vertical-align: middle;
-    cursor: pointer;
-
-    &::before {
-        content: '';
-        display: inline-block;
-        height: 20px;
-        width: 20px;
-        vertical-align: middle;
-        background-color: $secondary-fg-color;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        mask-position: center;
-    }
-}
-
-.mx_CallView_header_button_fullscreen {
-    &::before {
-        mask-image: url('$(res)/img/element-icons/call/fullscreen.svg');
-    }
-}
-
-.mx_CallView_header_button_expand {
-    &::before {
-        mask-image: url('$(res)/img/element-icons/call/expand.svg');
-    }
-}
-
-.mx_CallView_header_callInfo {
-    margin-left: 12px;
-    margin-right: 16px;
-}
-
-.mx_CallView_header_roomName {
-    font-weight: bold;
-    font-size: 12px;
-    line-height: initial;
-    height: 15px;
-}
-
-.mx_CallView_secondaryCall_roomName {
-    margin-left: 4px;
-}
-
-.mx_CallView_header_callTypeSmall {
-    font-size: 12px;
-    color: $secondary-fg-color;
-    line-height: initial;
-    height: 15px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-width: 240px;
-}
-
-.mx_CallView_header_phoneIcon {
-    display: inline-block;
-    margin-right: 6px;
-    height: 16px;
-    width: 16px;
-    vertical-align: middle;
-
-    &::before {
-        content: '';
-        display: inline-block;
-        vertical-align: top;
-
-        height: 16px;
-        width: 16px;
-        background-color: $warning-color;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        mask-position: center;
-        mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
-    }
-}
-
-.mx_CallView_callControls {
-    position: absolute;
-    display: flex;
-    justify-content: center;
-    bottom: 5px;
-    width: 100%;
+.mx_CallView_presenting {
     opacity: 1;
     transition: opacity 0.5s;
+
+    position: absolute;
+    margin-top: 18px;
+    padding: 4px 8px;
+    border-radius: 4px;
+
+    // Same on both themes
+    color: white;
+    background-color: #17191c;
 }
 
-.mx_CallView_callControls_hidden {
+.mx_CallView_presenting_hidden {
     opacity: 0.001; // opacity 0 can cause a re-layout
     pointer-events: none;
 }
-
-.mx_CallView_callControls_button {
-    cursor: pointer;
-    margin-left: 8px;
-    margin-right: 8px;
-
-
-    &::before {
-        content: '';
-        display: inline-block;
-
-        height: 48px;
-        width: 48px;
-
-        background-repeat: no-repeat;
-        background-size: contain;
-        background-position: center;
-    }
-}
-
-.mx_CallView_callControls_dialpad {
-    margin-right: auto;
-    &::before {
-        background-image: url('$(res)/img/voip/dialpad.svg');
-    }
-}
-
-.mx_CallView_callControls_button_dialpad_hidden {
-    margin-right: auto;
-    cursor: initial;
-}
-
-.mx_CallView_callControls_button_micOn {
-    &::before {
-        background-image: url('$(res)/img/voip/mic-on.svg');
-    }
-}
-
-.mx_CallView_callControls_button_micOff {
-    &::before {
-        background-image: url('$(res)/img/voip/mic-off.svg');
-    }
-}
-
-.mx_CallView_callControls_button_vidOn {
-    &::before {
-        background-image: url('$(res)/img/voip/vid-on.svg');
-    }
-}
-
-.mx_CallView_callControls_button_vidOff {
-    &::before {
-        background-image: url('$(res)/img/voip/vid-off.svg');
-    }
-}
-
-.mx_CallView_callControls_button_hangup {
-    &::before {
-        background-image: url('$(res)/img/voip/hangup.svg');
-    }
-}
-
-.mx_CallView_callControls_button_more {
-    margin-left: auto;
-    &::before {
-        background-image: url('$(res)/img/voip/more.svg');
-    }
-}
-
-.mx_CallView_callControls_button_more_hidden {
-    margin-left: auto;
-    cursor: initial;
-}
-
-.mx_CallView_callControls_button_invisible {
-    visibility: hidden;
-    pointer-events: none;
-    position: absolute;
-}
diff --git a/res/css/views/voip/_CallViewForRoom.scss b/res/css/views/voip/_CallViewForRoom.scss
index 769e00338e..d23fcc18bc 100644
--- a/res/css/views/voip/_CallViewForRoom.scss
+++ b/res/css/views/voip/_CallViewForRoom.scss
@@ -39,7 +39,7 @@ limitations under the License.
                 width: 100%;
                 max-width: 64px;
 
-                background-color: $primary-fg-color;
+                background-color: $primary-content;
             }
         }
     }
diff --git a/res/css/views/voip/_CallViewHeader.scss b/res/css/views/voip/_CallViewHeader.scss
new file mode 100644
index 0000000000..0575f4f535
--- /dev/null
+++ b/res/css/views/voip/_CallViewHeader.scss
@@ -0,0 +1,129 @@
+/*
+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_CallViewHeader {
+    height: 44px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: left;
+    flex-shrink: 0;
+    cursor: pointer;
+}
+
+.mx_CallViewHeader_callType {
+    font-size: 1.2rem;
+    font-weight: bold;
+    vertical-align: middle;
+}
+
+.mx_CallViewHeader_secondaryCallInfo {
+    &::before {
+        content: '·';
+        margin-left: 6px;
+        margin-right: 6px;
+    }
+}
+
+.mx_CallViewHeader_controls {
+    margin-left: auto;
+}
+
+.mx_CallViewHeader_button {
+    display: inline-block;
+    vertical-align: middle;
+    cursor: pointer;
+
+    &::before {
+        content: '';
+        display: inline-block;
+        height: 20px;
+        width: 20px;
+        vertical-align: middle;
+        background-color: $secondary-content;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        mask-position: center;
+    }
+}
+
+.mx_CallViewHeader_button_fullscreen {
+    &::before {
+        mask-image: url('$(res)/img/element-icons/call/fullscreen.svg');
+    }
+}
+
+.mx_CallViewHeader_button_expand {
+    &::before {
+        mask-image: url('$(res)/img/element-icons/call/expand.svg');
+    }
+}
+
+.mx_CallViewHeader_callInfo {
+    margin-left: 12px;
+    margin-right: 16px;
+}
+
+.mx_CallViewHeader_roomName {
+    font-weight: bold;
+    font-size: 12px;
+    line-height: initial;
+    height: 15px;
+}
+
+.mx_CallView_secondaryCall_roomName {
+    margin-left: 4px;
+}
+
+.mx_CallViewHeader_callTypeSmall {
+    font-size: 12px;
+    color: $secondary-content;
+    line-height: initial;
+    height: 15px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 240px;
+}
+
+.mx_CallViewHeader_callTypeIcon {
+    display: inline-block;
+    margin-right: 6px;
+    height: 16px;
+    width: 16px;
+    vertical-align: middle;
+
+    &::before {
+        content: '';
+        display: inline-block;
+        vertical-align: top;
+
+        height: 16px;
+        width: 16px;
+        background-color: $secondary-content;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        mask-position: center;
+    }
+
+    &.mx_CallViewHeader_callTypeIcon_voice::before {
+        mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
+    }
+
+    &.mx_CallViewHeader_callTypeIcon_video::before {
+        mask-image: url('$(res)/img/element-icons/call/video-call.svg');
+    }
+}
diff --git a/res/css/views/voip/_CallViewSidebar.scss b/res/css/views/voip/_CallViewSidebar.scss
new file mode 100644
index 0000000000..fd9c76defc
--- /dev/null
+++ b/res/css/views/voip/_CallViewSidebar.scss
@@ -0,0 +1,60 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_CallViewSidebar {
+    position: absolute;
+    right: 16px;
+    bottom: 16px;
+    z-index: 100; // To be above the primary feed
+
+    overflow: auto;
+
+    height: calc(100% - 32px); // Subtract the top and bottom padding
+    width: 20%;
+
+    display: flex;
+    flex-direction: column-reverse;
+    justify-content: flex-start;
+    align-items: flex-end;
+    gap: 12px;
+
+    > .mx_VideoFeed {
+        width: 100%;
+        border-radius: 4px;
+
+        &.mx_VideoFeed_voice {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .mx_VideoFeed_video {
+            border-radius: 4px;
+        }
+
+        .mx_VideoFeed_mic {
+            left: 6px;
+            bottom: 6px;
+        }
+    }
+
+    &.mx_CallViewSidebar_pipMode {
+        top: 16px;
+        bottom: unset;
+        justify-content: flex-end;
+        gap: 4px;
+    }
+}
diff --git a/res/css/views/voip/_DialPad.scss b/res/css/views/voip/_DialPad.scss
index 0c7bff0ce8..288f1f5d31 100644
--- a/res/css/views/voip/_DialPad.scss
+++ b/res/css/views/voip/_DialPad.scss
@@ -16,23 +16,42 @@ limitations under the License.
 
 .mx_DialPad {
     display: grid;
+    row-gap: 16px;
+    column-gap: 0px;
+    margin-top: 24px;
+    margin-left: auto;
+    margin-right: auto;
+
+    /* squeeze the dial pad buttons together horizontally */
     grid-template-columns: repeat(3, 1fr);
-    gap: 16px;
 }
 
 .mx_DialPad_button {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
     width: 40px;
     height: 40px;
-    background-color: $theme-button-bg-color;
+    background-color: $quinary-content;
     border-radius: 40px;
     font-size: 18px;
     font-weight: 600;
     text-align: center;
     vertical-align: middle;
-    line-height: 40px;
+    margin-left: auto;
+    margin-right: auto;
 }
 
-.mx_DialPad_deleteButton, .mx_DialPad_dialButton {
+.mx_DialPad_button .mx_DialPad_buttonSubText {
+    font-size: 8px;
+}
+
+.mx_DialPad_dialButton {
+    /* Always show the dial button in the center grid column */
+    grid-column: 2;
+    background-color: $accent-color;
+
     &::before {
         content: '';
         display: inline-block;
@@ -42,21 +61,7 @@ limitations under the License.
         mask-repeat: no-repeat;
         mask-size: 20px;
         mask-position: center;
-        background-color: $primary-bg-color;
-    }
-}
-
-.mx_DialPad_deleteButton {
-    background-color: $notice-primary-color;
-    &::before {
-        mask-image: url('$(res)/img/element-icons/call/delete.svg');
-        mask-position: 9px; // delete icon is right-heavy so have to be slightly to the left to look centered
-    }
-}
-
-.mx_DialPad_dialButton {
-    background-color: $accent-color;
-    &::before {
+        background-color: #FFF; // on all themes
         mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
     }
 }
diff --git a/res/css/views/voip/_DialPadContextMenu.scss b/res/css/views/voip/_DialPadContextMenu.scss
index 520f51cf93..d2014241e9 100644
--- a/res/css/views/voip/_DialPadContextMenu.scss
+++ b/res/css/views/voip/_DialPadContextMenu.scss
@@ -14,10 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_DialPadContextMenu_dialPad .mx_DialPad {
+    row-gap: 16px;
+    column-gap: 32px;
+}
+
+.mx_DialPadContextMenuWrapper {
+    padding: 15px;
+}
+
 .mx_DialPadContextMenu_header {
-    margin-top: 12px;
-    margin-left: 12px;
-    margin-right: 12px;
+    border: none;
+    margin-top: 32px;
+    margin-left: 20px;
+    margin-right: 20px;
+
+    /* a separator between the input line and the dial buttons */
+    border-bottom: 1px solid $quaternary-content;
+    transition: border-bottom 0.25s;
+}
+
+.mx_DialPadContextMenu_cancel {
+    float: right;
+    mask: url('$(res)/img/feather-customised/cancel.svg');
+    mask-repeat: no-repeat;
+    mask-position: center;
+    mask-size: cover;
+    width: 14px;
+    height: 14px;
+    background-color: $dialog-close-fg-color;
+    cursor: pointer;
+}
+
+.mx_DialPadContextMenu_header:focus-within {
+    border-bottom: 1px solid $accent-color;
 }
 
 .mx_DialPadContextMenu_title {
@@ -27,21 +57,22 @@ limitations under the License.
 }
 
 .mx_DialPadContextMenu_dialled {
-    height: 1em;
+    height: 1.5em;
     font-size: 18px;
     font-weight: 600;
+    border: none;
+    margin: 0px;
+}
+.mx_DialPadContextMenu_dialled input {
+    font-size: 18px;
+    font-weight: 600;
+    overflow: hidden;
+    max-width: 185px;
+    text-align: left;
+    padding: 8px 0px;
+    background-color: rgb(0, 0, 0, 0);
 }
 
 .mx_DialPadContextMenu_dialPad {
     margin: 16px;
 }
-
-.mx_DialPadContextMenu_horizSep {
-    position: relative;
-    &::before {
-        content: '';
-        position: absolute;
-        width: 100%;
-        border-bottom: 1px solid $input-darker-bg-color;
-    }
-}
diff --git a/res/css/views/voip/_DialPadModal.scss b/res/css/views/voip/_DialPadModal.scss
index f9d7673a38..f378507f90 100644
--- a/res/css/views/voip/_DialPadModal.scss
+++ b/res/css/views/voip/_DialPadModal.scss
@@ -19,14 +19,23 @@ limitations under the License.
 }
 
 .mx_DialPadModal {
-    width: 192px;
-    height: 368px;
+    width: 292px;
+    height: 370px;
+    padding: 16px 0px 0px 0px;
 }
 
 .mx_DialPadModal_header {
-    margin-top: 12px;
-    margin-left: 12px;
-    margin-right: 12px;
+    margin-top: 32px;
+    margin-left: 40px;
+    margin-right: 40px;
+
+    /* a separator between the input line and the dial buttons */
+    border-bottom: 1px solid $quaternary-content;
+    transition: border-bottom 0.25s;
+}
+
+.mx_DialPadModal_header:focus-within {
+    border-bottom: 1px solid $accent-color;
 }
 
 .mx_DialPadModal_title {
@@ -45,11 +54,18 @@ limitations under the License.
     height: 14px;
     background-color: $dialog-close-fg-color;
     cursor: pointer;
+    margin-right: 16px;
 }
 
 .mx_DialPadModal_field {
     border: none;
     margin: 0px;
+    height: 30px;
+}
+
+.mx_DialPadModal_field .mx_Field_postfix {
+    /* Remove border separator between postfix and field content */
+    border-left: none;
 }
 
 .mx_DialPadModal_field input {
@@ -62,13 +78,3 @@ limitations under the License.
     margin-right: 16px;
     margin-top: 16px;
 }
-
-.mx_DialPadModal_horizSep {
-    position: relative;
-    &::before {
-        content: '';
-        position: absolute;
-        width: 100%;
-        border-bottom: 1px solid $input-darker-bg-color;
-    }
-}
diff --git a/res/css/views/voip/_VideoFeed.scss b/res/css/views/voip/_VideoFeed.scss
index 7d85ac264e..1f17a54692 100644
--- a/res/css/views/voip/_VideoFeed.scss
+++ b/res/css/views/voip/_VideoFeed.scss
@@ -14,39 +14,65 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_VideoFeed_voice {
-    // We don't want to collide with the call controls that have 52px of height
-    padding-bottom: 52px;
-    background-color: $inverted-bg-color;
-}
-
-
-.mx_VideoFeed_remote {
-    width: 100%;
-    height: 100%;
+.mx_VideoFeed {
+    overflow: hidden;
+    position: relative;
+    box-sizing: border-box;
+    border: transparent 2px solid;
     display: flex;
-    justify-content: center;
-    align-items: center;
 
-    &.mx_VideoFeed_video {
-        background-color: #000;
+    &.mx_VideoFeed_voice {
+        background-color: $inverted-bg-color;
+        aspect-ratio: 16 / 9;
     }
-}
 
-.mx_VideoFeed_local {
-    max-width: 25%;
-    max-height: 25%;
-    position: absolute;
-    right: 10px;
-    top: 10px;
-    z-index: 100;
-    border-radius: 4px;
+    &.mx_VideoFeed_speaking {
+        border: $accent-color 2px solid;
 
-    &.mx_VideoFeed_video {
+        .mx_VideoFeed_video {
+            border-radius: 0;
+        }
+    }
+
+    .mx_VideoFeed_video {
+        width: 100%;
         background-color: transparent;
+
+        &.mx_VideoFeed_video_mirror {
+            transform: scale(-1, 1);
+        }
+    }
+
+    .mx_VideoFeed_mic {
+        position: absolute;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        width: 24px;
+        height: 24px;
+
+        background-color: rgba(0, 0, 0, 0.5); // Same on both themes
+        border-radius: 100%;
+
+        &::before {
+            position: absolute;
+            content: "";
+            width: 16px;
+            height: 16px;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+            mask-position: center;
+            background-color: white; // Same on both themes
+            border-radius: 7px;
+        }
+
+        &.mx_VideoFeed_mic_muted::before {
+            mask-image: url('$(res)/img/voip/mic-muted.svg');
+        }
+
+        &.mx_VideoFeed_mic_unmuted::before {
+            mask-image: url('$(res)/img/voip/mic-unmuted.svg');
+        }
     }
 }
-
-.mx_VideoFeed_mirror {
-    transform: scale(-1, 1);
-}
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
index a52e5a3800..128aac8139 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 differ
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2
index 660a93193d..a95e89c094 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 differ
diff --git a/res/img/betas/.gitkeep b/res/img/betas/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/res/img/betas/spaces.png b/res/img/betas/spaces.png
deleted file mode 100644
index f4cfa90b4e..0000000000
Binary files a/res/img/betas/spaces.png and /dev/null differ
diff --git a/res/img/element-icons/call/dialpad.svg b/res/img/element-icons/call/dialpad.svg
new file mode 100644
index 0000000000..a97e80aa0b
--- /dev/null
+++ b/res/img/element-icons/call/dialpad.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" viewBox="0 0 12 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 14.25C5.175 14.25 4.5 14.925 4.5 15.75C4.5 16.575 5.175 17.25 6 17.25C6.825 17.25 7.5 16.575 7.5 15.75C7.5 14.925 6.825 14.25 6 14.25ZM1.5 0.75C0.675 0.75 0 1.425 0 2.25C0 3.075 0.675 3.75 1.5 3.75C2.325 3.75 3 3.075 3 2.25C3 1.425 2.325 0.75 1.5 0.75ZM1.5 5.25C0.675 5.25 0 5.925 0 6.75C0 7.575 0.675 8.25 1.5 8.25C2.325 8.25 3 7.575 3 6.75C3 5.925 2.325 5.25 1.5 5.25ZM1.5 9.75C0.675 9.75 0 10.425 0 11.25C0 12.075 0.675 12.75 1.5 12.75C2.325 12.75 3 12.075 3 11.25C3 10.425 2.325 9.75 1.5 9.75ZM10.5 3.75C11.325 3.75 12 3.075 12 2.25C12 1.425 11.325 0.75 10.5 0.75C9.675 0.75 9 1.425 9 2.25C9 3.075 9.675 3.75 10.5 3.75ZM6 9.75C5.175 9.75 4.5 10.425 4.5 11.25C4.5 12.075 5.175 12.75 6 12.75C6.825 12.75 7.5 12.075 7.5 11.25C7.5 10.425 6.825 9.75 6 9.75ZM10.5 9.75C9.675 9.75 9 10.425 9 11.25C9 12.075 9.675 12.75 10.5 12.75C11.325 12.75 12 12.075 12 11.25C12 10.425 11.325 9.75 10.5 9.75ZM10.5 5.25C9.675 5.25 9 5.925 9 6.75C9 7.575 9.675 8.25 10.5 8.25C11.325 8.25 12 7.575 12 6.75C12 5.925 11.325 5.25 10.5 5.25ZM6 5.25C5.175 5.25 4.5 5.925 4.5 6.75C4.5 7.575 5.175 8.25 6 8.25C6.825 8.25 7.5 7.575 7.5 6.75C7.5 5.925 6.825 5.25 6 5.25ZM6 0.75C5.175 0.75 4.5 1.425 4.5 2.25C4.5 3.075 5.175 3.75 6 3.75C6.825 3.75 7.5 3.075 7.5 2.25C7.5 1.425 6.825 0.75 6 0.75Z" fill="#737D8C"/>
+</svg>
diff --git a/res/img/element-icons/collapse-message.svg b/res/img/element-icons/collapse-message.svg
new file mode 100644
index 0000000000..91b0713f43
--- /dev/null
+++ b/res/img/element-icons/collapse-message.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 11 14"><defs/><path fill="#737D8C" fill-rule="evenodd" d="M.2192.234A.753.753 0 011.2815.2321l3.7243 3.7003L8.7181.2202A.753.753 0 019.7805.2185a.747.747 0 01.0017 1.0589L5.5396 5.52a.753.753 0 01-1.0624.0018L.221 1.2928A.747.747 0 01.2192.234zM9.7822 13.7663a.7529.7529 0 01-1.0623.0017l-3.7243-3.7003L1.2833 13.78a.753.753 0 01-1.0624.0018.7471.7471 0 01-.0017-1.059l4.2426-4.2426a.753.753 0 011.0624-.0017l4.2563 4.2289a.747.747 0 01.0017 1.0589z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/expand-message.svg b/res/img/element-icons/expand-message.svg
new file mode 100644
index 0000000000..a1c5149718
--- /dev/null
+++ b/res/img/element-icons/expand-message.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 11 14"><defs/><path fill="#17191C" fill-rule="evenodd" d="M.2192 8.494a.753.753 0 011.0623-.0018l3.7243 3.7003 3.7123-3.7123a.753.753 0 011.0624-.0017.747.747 0 01.0017 1.059L5.5396 13.78a.753.753 0 01-1.0624.0018L.221 9.5528A.747.747 0 01.2192 8.494zM9.7822 5.5063A.753.753 0 018.72 5.508L4.9956 1.8077 1.2833 5.52a.753.753 0 01-1.0624.0018.747.747 0 01-.0017-1.059L4.4618.2202A.753.753 0 015.5242.2185l4.2563 4.2289a.747.747 0 01.0017 1.0589z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/export.svg b/res/img/element-icons/export.svg
new file mode 100644
index 0000000000..49899e9520
--- /dev/null
+++ b/res/img/element-icons/export.svg
@@ -0,0 +1,14 @@
+<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="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47716 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM12.7071 17.7071C12.6112 17.803 12.5007 17.8753 12.3828 17.9241L11.2929 17.7071L11.2925 17.7067L7.2929 13.7071C6.90237 13.3166 6.90237 12.6834 7.2929 12.2929C7.68342 11.9024 8.31658 11.9024 8.70711 12.2929L11 14.5858L11 7C11 6.44771 11.4477 6 12 6C12.5523 6 13 6.44771 13 7L13 14.5858L15.2929 12.2929C15.6834 11.9024 16.3166 11.9024 16.7071 12.2929C17.0976 12.6834 17.0976 13.3166 16.7071 13.7071L12.7071 17.7071ZM12.3828 17.9241L11.295 17.7092C11.4758 17.8889 11.7249 18 12 18C12.1356 18 12.2649 17.973 12.3828 17.9241Z"
+  fill="#C1C6CD"
+ />
+</svg>
diff --git a/res/img/element-icons/eye.svg b/res/img/element-icons/eye.svg
new file mode 100644
index 0000000000..0460a6201d
--- /dev/null
+++ b/res/img/element-icons/eye.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="M14.3094 5.96587C15.3206 7.15704 15.3417 8.85457 14.3412 10.0548C13.0889 11.5571 10.9822 13.3332 8.02104 13.3332C5.05992 13.3332 2.9532 11.5571 1.70087 10.0548C0.700398 8.85457 0.721506 7.15704 1.7327 5.96587C3.01174 4.45918 5.1391 2.6665 8.02104 2.6665C10.903 2.6665 13.0303 4.45918 14.3094 5.96587ZM11.5556 7.99984C11.5556 9.96352 9.96369 11.5554 8.00001 11.5554C6.03633 11.5554 4.44446 9.96352 4.44446 7.99984C4.44446 6.03616 6.03633 4.44428 8.00001 4.44428C9.96369 4.44428 11.5556 6.03616 11.5556 7.99984ZM8.00001 9.77761C8.98185 9.77761 9.77779 8.98168 9.77779 7.99984C9.77779 7.018 8.98185 6.22206 8.00001 6.22206C7.01817 6.22206 6.22224 7.018 6.22224 7.99984C6.22224 8.98168 7.01817 9.77761 8.00001 9.77761Z" fill="white"/>
+</svg>
diff --git a/res/img/element-icons/message/chevron-up.svg b/res/img/element-icons/message/chevron-up.svg
new file mode 100644
index 0000000000..4eb5ecc33e
--- /dev/null
+++ b/res/img/element-icons/message/chevron-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-up"><polyline points="18 15 12 9 6 15"></polyline></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/message/corner-up-right.svg b/res/img/element-icons/message/corner-up-right.svg
new file mode 100644
index 0000000000..0b8f961b7b
--- /dev/null
+++ b/res/img/element-icons/message/corner-up-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-corner-up-right"><polyline points="15 14 20 9 15 4"></polyline><path d="M4 20v-7a4 4 0 0 1 4-4h12"></path></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/message/fwd.svg b/res/img/element-icons/message/fwd.svg
new file mode 100644
index 0000000000..8bcc70d092
--- /dev/null
+++ b/res/img/element-icons/message/fwd.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="M10.9454 4.27941C10.653 3.98601 10.6539 3.51114 10.9472 3.21875C11.2406 2.92637 11.7155 2.92719 12.0079 3.22059L15.5312 6.75612C15.8229 7.0488 15.8229 7.52226 15.5312 7.81494L12.0079 11.3505C11.7155 11.6439 11.2407 11.6447 10.9473 11.3523C10.6539 11.06 10.653 10.5851 10.9454 10.2917L13.2292 8H6.36588C4.95064 8 3.75282 9.20272 3.75282 10.75C3.75282 12.2973 4.95064 13.5 6.36588 13.5H7.93524C8.34945 13.5 8.68524 13.8358 8.68524 14.25C8.68524 14.6642 8.34945 15 7.93524 15H6.36588C4.06634 15 2.25282 13.0687 2.25282 10.75C2.25282 8.43128 4.06634 6.5 6.36588 6.5H13.1583L10.9454 4.27941Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/message/link.svg b/res/img/element-icons/message/link.svg
new file mode 100644
index 0000000000..c89dd41c23
--- /dev/null
+++ b/res/img/element-icons/message/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/message/repeat.svg b/res/img/element-icons/message/repeat.svg
new file mode 100644
index 0000000000..c7657b08ed
--- /dev/null
+++ b/res/img/element-icons/message/repeat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-repeat"><polyline points="17 1 21 5 17 9"></polyline><path d="M3 11V9a4 4 0 0 1 4-4h14"></path><polyline points="7 23 3 19 7 15"></polyline><path d="M21 13v2a4 4 0 0 1-4 4H3"></path></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/message/share.svg b/res/img/element-icons/message/share.svg
new file mode 100644
index 0000000000..df38c14d63
--- /dev/null
+++ b/res/img/element-icons/message/share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-share"><path d="M4 12v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-8"></path><polyline points="16 6 12 2 8 6"></polyline><line x1="12" y1="2" x2="12" y2="15"></line></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/message/thread.svg b/res/img/element-icons/message/thread.svg
new file mode 100644
index 0000000000..b4a7cc0066
--- /dev/null
+++ b/res/img/element-icons/message/thread.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="M3 8V8C1.89543 8 1 7.10457 1 6V3C1 1.89543 1.89543 1 3 1H15C16.1046 1 17 1.89484 17 2.9994C17 3.88147 17 4.95392 17 6.00008C17 7.10465 16.1046 8 15 8H10.5" stroke="#737D8C" stroke-width="1.5" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2011 16.7176C12.9087 17.011 12.9088 17.4866 13.2012 17.78C13.4936 18.0734 13.9677 18.0733 14.2601 17.78C14.9484 17.0894 15.6519 16.3829 16.1834 15.8491L16.8282 15.2014L17.0099 15.0188L17.0579 14.9706L17.0702 14.9582L17.0733 14.955L17.0741 14.9542L17.0743 14.954L17.0743 14.954L16.5444 14.4233L17.0744 14.954C17.3663 14.6606 17.3661 14.1855 17.0741 13.8922L14.2539 11.061C13.9616 10.7675 13.4875 10.7674 13.195 11.0606C12.9024 11.3539 12.9023 11.8295 13.1946 12.123L14.7442 13.6787L10.1137 13.6787C8.69795 13.6787 7.49996 12.4759 7.49996 10.9288L7.49996 7.00002C7.49996 6.58581 7.16417 6.25002 6.74996 6.25002C6.33574 6.25002 5.99996 6.58581 5.99996 7.00002L5.99996 10.9288C5.99996 13.2476 7.81395 15.1787 10.1137 15.1787H14.7341C14.2713 15.6436 13.7316 16.1854 13.2011 16.7176Z" fill="#737D8C"/>
+</svg>
diff --git a/res/img/element-icons/message/view-in-timeline.svg b/res/img/element-icons/message/view-in-timeline.svg
new file mode 100644
index 0000000000..9f05950ce0
--- /dev/null
+++ b/res/img/element-icons/message/view-in-timeline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#737D8C" fill-rule="evenodd" d="M1 2.75A.75.75 0 0 1 1.75 2h.005a.75.75 0 0 1 0 1.5H1.75A.75.75 0 0 1 1 2.75Zm2.495 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.005a.75.75 0 0 1 0 1.5h-.005a.75.75 0 0 1-.75-.75ZM1 6.75A.75.75 0 0 1 1.75 6h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 1 6.75ZM1 9.75A.75.75 0 0 1 1.75 9h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 1 9.75ZM1 13.75a.75.75 0 0 1 .75-.75h.005a.75.75 0 0 1 0 1.5H1.75a.75.75 0 0 1-.75-.75Zm2.495 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 0 1.5h-.01a.75.75 0 0 1-.75-.75Zm2.5 0a.75.75 0 0 1 .75-.75h.005a.75.75 0 0 1 0 1.5h-.005a.75.75 0 0 1-.75-.75Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/res/img/element-icons/room/pin.svg b/res/img/element-icons/room/pin.svg
index 2448fc61c5..f090f60be8 100644
--- a/res/img/element-icons/room/pin.svg
+++ b/res/img/element-icons/room/pin.svg
@@ -1,7 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M18.5151 20.0831L15.6941 17.2621L17.2621 15.6941L20.0831 18.5151C21.5741 20.0061 22.1529 21.7793 21.9661 21.9661C21.7793 22.1529 20.0061 21.5741 18.5151 20.0831Z" fill="#737D8C"/>
-    <path d="M7.46196 11.3821C7.07677 11.5059 5.49073 12.0989 3.63366 12.0744C1.77658 12.0499 1.67795 10.8941 2.46811 10.1039L6.28598 6.28602L9.42196 9.42203L7.46196 11.3821Z" fill="#737D8C"/>
-    <path d="M11.3821 7.46202C11.5059 7.07682 12.0989 5.49077 12.0744 3.63368C12.0499 1.77658 10.8941 1.67795 10.1039 2.46812L6.28598 6.28602L9.42196 9.42203L11.3821 7.46202Z" fill="#737D8C"/>
-    <path d="M7.40596 11.438L11.4379 7.40602L14.9099 10.206L10.2059 14.9101L7.40596 11.438Z" fill="#737D8C"/>
-    <path d="M11.774 11.774C9.31114 14.2369 8.61779 17.7115 9.83827 20.3213C10.3104 21.3308 11.6288 21.3273 12.4169 20.5392L20.5391 12.4169C21.3271 11.6289 21.3307 10.3104 20.3212 9.83829C17.7114 8.61779 14.2369 9.31115 11.774 11.774Z" fill="#737D8C"/>
+    <path d="m11.068 2c-0.32021 4.772e-4 -0.66852 0.17244-0.96484 0.46875-2.5464 2.5435-5.0905 5.0892-7.6348 7.6348-0.79016 0.7902-0.69302 1.9462 1.1641 1.9707 1.855 0.02447 3.4407-0.56671 3.8281-0.69141l2.4355 3.1445c-0.83503 1.9462-0.86902 4.062-0.058594 5.7949 0.47213 1.0095 1.79 1.0049 2.5781 0.2168l3.2773-3.2773 2.8223 2.8223c1.491 1.491 3.2644 2.0696 3.4512 1.8828s-0.39181-1.9602-1.8828-3.4512l-2.8223-2.8223 3.2773-3.2773c0.788-0.788 0.79075-2.106-0.21875-2.5781-1.733-0.81044-3.8468-0.77643-5.793 0.058594l-3.1445-2.4355c0.1247-0.38742 0.71588-1.9731 0.69141-3.8281-0.015311-1.1607-0.47217-1.6336-1.0059-1.6328z" fill="#737d8c"/>
 </svg>
diff --git a/res/img/element-icons/speaker.svg b/res/img/element-icons/speaker.svg
new file mode 100644
index 0000000000..fd811d2cda
--- /dev/null
+++ b/res/img/element-icons/speaker.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.97991 1.48403L4 4.80062L1 4.80062C0.447715 4.80062 0 5.24834 0 5.80062V10.2006C0 10.7529 0.447714 11.2006 0.999999 11.2006L4 11.2006L7.97991 14.5172C8.30557 14.7886 8.8 14.557 8.8 14.1331V1.86814C8.8 1.44422 8.30557 1.21265 7.97991 1.48403Z" fill="#737D8C"/>
+<path d="M14.1258 2.79107C13.8998 2.50044 13.4809 2.44808 13.1903 2.67413C12.9 2.89992 12.8475 3.3181 13.0726 3.6087L13.0731 3.60935L13.0738 3.61021L13.0829 3.62231C13.0917 3.63418 13.1059 3.65355 13.1248 3.68011C13.1625 3.73326 13.2187 3.81496 13.2872 3.92256C13.4243 4.13812 13.6097 4.45554 13.7955 4.85371C14.169 5.65407 14.5329 6.75597 14.5329 8.00036C14.5329 9.24475 14.169 10.3466 13.7955 11.147C13.6097 11.5452 13.4243 11.8626 13.2872 12.0782C13.2187 12.1858 13.1625 12.2675 13.1248 12.3206C13.1059 12.3472 13.0917 12.3665 13.0829 12.3784L13.0738 12.3905L13.0731 12.3914L13.0725 12.3921C12.8475 12.6827 12.9 13.1008 13.1903 13.3266C13.4809 13.5526 13.8998 13.5003 14.1258 13.2097L13.629 12.8232C14.1258 13.2096 14.1258 13.2097 14.1258 13.2097L14.1272 13.2079L14.1291 13.2055L14.1346 13.1982L14.1523 13.1748C14.1669 13.1552 14.187 13.1277 14.2119 13.0926C14.2617 13.0225 14.3305 12.9221 14.4121 12.794C14.5749 12.5381 14.7895 12.1698 15.0037 11.7109C15.4302 10.7969 15.8663 9.49883 15.8663 8.00036C15.8663 6.50189 15.4302 5.20379 15.0037 4.28987C14.7895 3.83089 14.5749 3.4626 14.4121 3.20673C14.3305 3.07862 14.2617 2.97818 14.2119 2.90811C14.187 2.87306 14.1669 2.84556 14.1523 2.82596L14.1346 2.80249L14.1291 2.79525L14.1272 2.79278L14.1264 2.79183C14.1264 2.79183 14.1258 2.79107 13.5996 3.20036L14.1258 2.79107Z" fill="#737D8C"/>
+<path d="M11.7264 5.19121C11.5004 4.90058 11.0815 4.84823 10.7909 5.07427C10.501 5.29973 10.4482 5.71698 10.6722 6.00752L10.6745 6.01057C10.6775 6.01457 10.6831 6.02223 10.691 6.03338C10.7069 6.05572 10.7318 6.09189 10.7628 6.14057C10.8249 6.23827 10.9103 6.38426 10.9961 6.56815C11.1696 6.93993 11.3335 7.44183 11.3335 8.00051C11.3335 8.55918 11.1696 9.06108 10.9961 9.43287C10.9103 9.61675 10.8249 9.76275 10.7628 9.86045C10.7318 9.90912 10.7069 9.94529 10.691 9.96763C10.6831 9.97879 10.6775 9.98645 10.6745 9.99044L10.6722 9.9935C10.4482 10.284 10.501 10.7013 10.7909 10.9267C11.0815 11.1528 11.5004 11.1004 11.7264 10.8098L11.2002 10.4005C11.7264 10.8098 11.7264 10.8098 11.7264 10.8098L11.7276 10.8083L11.7291 10.8064L11.7329 10.8014L11.7439 10.7868C11.7526 10.7751 11.7642 10.7593 11.7781 10.7396C11.806 10.7004 11.8436 10.6455 11.8876 10.5763C11.9755 10.4383 12.0901 10.2414 12.2043 9.99672C12.4308 9.51136 12.6669 8.81326 12.6669 8.00051C12.6669 7.18775 12.4308 6.48965 12.2043 6.0043C12.0901 5.75961 11.9755 5.56275 11.8876 5.42473C11.8436 5.35555 11.806 5.30065 11.7781 5.26138C11.7642 5.24173 11.7526 5.22596 11.7439 5.21422L11.7329 5.19964L11.7291 5.19465L11.7276 5.19274L11.727 5.19193C11.727 5.19193 11.7264 5.19121 11.2002 5.60051L11.7264 5.19121Z" fill="#737D8C"/>
+</svg>
diff --git a/res/img/element-icons/trashcan.svg b/res/img/element-icons/trashcan.svg
index f8fb8b5c46..4106f0bd60 100644
--- a/res/img/element-icons/trashcan.svg
+++ b/res/img/element-icons/trashcan.svg
@@ -1,3 +1,3 @@
-<svg width="12" height="17" viewBox="0 0 12 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.857143 14.5C0.857143 15.4491 1.62857 16.5 2.57143 16.5H9.42857C10.3714 16.5 11.1429 15.2542 11.1429 14.3051V5.67692C11.1429 4.72781 10.3714 3.95128 9.42857 3.95128H2.57143C1.62857 3.95128 0.857143 4.72781 0.857143 5.67692V14.5ZM11.1429 1.36282H9L8.39143 0.750218C8.23714 0.59491 8.01429 0.5 7.79143 0.5H4.20857C3.98571 0.5 3.76286 0.59491 3.60857 0.750218L3 1.36282H0.857143C0.385714 1.36282 0 1.75109 0 2.22564C0 2.70019 0.385714 3.08846 0.857143 3.08846H11.1429C11.6143 3.08846 12 2.70019 12 2.22564C12 1.75109 11.6143 1.36282 11.1429 1.36282Z" fill="#737D8C"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6 19C6 20.1 6.9 21 8 21H16C17.1 21 18 20.1 18 19V9C18 7.9 17.1 7 16 7H8C6.9 7 6 7.9 6 9V19ZM18 4H15.5L14.79 3.29C14.61 3.11 14.35 3 14.09 3H9.91C9.65 3 9.39 3.11 9.21 3.29L8.5 4H6C5.45 4 5 4.45 5 5C5 5.55 5.45 6 6 6H18C18.55 6 19 5.55 19 5C19 4.45 18.55 4 18 4Z" fill="#8D99A5"/>
 </svg>
diff --git a/res/img/element-icons/warning-badge.svg b/res/img/element-icons/warning-badge.svg
index 1ae4e40ffe..1c8da9aa8e 100644
--- a/res/img/element-icons/warning-badge.svg
+++ b/res/img/element-icons/warning-badge.svg
@@ -1,5 +1,32 @@
-<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="#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"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   fill="none"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <path
+     id="path2"
+     d="M 12 2 C 6.47715 2 2 6.47715 2 12 C 2 17.5228 6.47715 22 12 22 C 17.5228 22 22 17.5228 22 12 C 22 6.47715 17.5228 2 12 2 z M 11.880859 5.5039062 C 12.720859 5.4439063 13.470547 6.0746875 13.560547 6.9296875 L 13.560547 7.1699219 L 13.080078 13.169922 C 13.035078 13.724922 12.570625 14.144531 12.015625 14.144531 L 11.925781 14.144531 C 11.400781 14.099531 10.996172 13.694922 10.951172 13.169922 L 10.470703 7.1699219 C 10.395703 6.3149219 11.025859 5.5639064 11.880859 5.5039062 z M 12 15.763672 C 12.729 15.763672 13.320312 16.354884 13.320312 17.083984 C 13.320313 17.812984 12.729 18.404297 12 18.404297 C 11.271 18.404297 10.679688 17.812984 10.679688 17.083984 C 10.679688 16.354884 11.271 15.763672 12 15.763672 z "
+     style="fill:#ff4b55;fill-opacity:1" />
 </svg>
diff --git a/res/img/element-icons/warning.svg b/res/img/element-icons/warning.svg
new file mode 100644
index 0000000000..eef5193140
--- /dev/null
+++ b/res/img/element-icons/warning.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 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 16ZM6.9806 4.5101C6.9306 3.9401 7.3506 3.4401 7.9206 3.4001C8.4806 3.3601 8.9806 3.7801 9.0406 4.3501V4.5101L8.7206 8.5101C8.6906 8.8801 8.3806 9.1601 8.0106 9.1601H7.9506C7.6006 9.1301 7.3306 8.8601 7.3006 8.5101L6.9806 4.5101ZM8.88012 11.1202C8.88012 11.6062 8.48613 12.0002 8.00012 12.0002C7.51411 12.0002 7.12012 11.6062 7.12012 11.1202C7.12012 10.6342 7.51411 10.2402 8.00012 10.2402C8.48613 10.2402 8.88012 10.6342 8.88012 11.1202Z" fill="#8D99A5"/>
+</svg>
diff --git a/res/img/feather-customised/globe.svg b/res/img/feather-customised/globe.svg
deleted file mode 100644
index 8af7dc41dc..0000000000
--- a/res/img/feather-customised/globe.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg">
-    <g style="stroke:#454545;stroke-width:.8;fill:none;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round" transform="translate(1 1)">
-        <circle cx="5" cy="5" r="5"/>
-        <path d="m0 5h10"/>
-        <path d="m5 0c1.25064019 1.36917645 1.96137638 3.14601693 2 5-.03862362 1.85398307-.74935981 3.63082355-2 5-1.25064019-1.36917645-1.96137638-3.14601693-2-5 .03862362-1.85398307.74935981-3.63082355 2-5z"/>
-    </g>
-</svg>
diff --git a/res/img/subtract.svg b/res/img/subtract.svg
new file mode 100644
index 0000000000..55e25831ef
--- /dev/null
+++ b/res/img/subtract.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 16C12.4183 16 16 12.4183 16 8C16 3.58167 12.4183 0 8 0C3.58173 0 0 3.58167 0 8C0 12.4183 3.58173 16 8 16ZM3.96967 5.0304L6.93933 8L3.96967 10.9697L5.03033 12.0304L8 9.06067L10.9697 12.0304L12.0303 10.9697L9.06067 8L12.0303 5.0304L10.9697 3.96973L8 6.93945L5.03033 3.96973L3.96967 5.0304Z" fill="#8D97A5"/>
+</svg>
diff --git a/res/img/voip/declined-video.svg b/res/img/voip/declined-video.svg
new file mode 100644
index 0000000000..509ffa8fd1
--- /dev/null
+++ b/res/img/voip/declined-video.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="M0 4.81815C0 3.76379 0.89543 2.90906 2 2.90906H9.33333C10.4379 2.90906 11.3333 3.76379 11.3333 4.81815V11.1818C11.3333 12.2361 10.4379 13.0909 9.33333 13.0909H2C0.895429 13.0909 0 12.2361 0 11.1818V4.81815ZM12.6667 6.09089L14.9169 4.37255C15.3534 4.03921 16 4.33587 16 4.86947V11.1305C16 11.6641 15.3534 11.9607 14.9169 11.6274L12.6667 9.90907V6.09089ZM7.82332 5.81539C7.96503 5.95709 7.96503 6.18685 7.82332 6.32855L6.17983 7.97204L7.89372 9.68593C8.03543 9.82763 8.03543 10.0574 7.89372 10.1991C7.75201 10.3408 7.52226 10.3408 7.38055 10.1991L5.66667 8.48521L3.95278 10.1991C3.81107 10.3408 3.58132 10.3408 3.43961 10.1991C3.29791 10.0574 3.29791 9.82763 3.43961 9.68593L5.1535 7.97204L3.51001 6.32855C3.36831 6.18685 3.36831 5.95709 3.51001 5.81539C3.65172 5.67368 3.88147 5.67368 4.02318 5.81539L5.66667 7.45887L7.31015 5.81539C7.45186 5.67368 7.68161 5.67368 7.82332 5.81539Z" fill="#737D8C"/>
+</svg>
diff --git a/res/img/voip/declined-voice.svg b/res/img/voip/declined-voice.svg
new file mode 100644
index 0000000000..78e8d90cdf
--- /dev/null
+++ b/res/img/voip/declined-voice.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 d="M5.35116 10.6409C6.11185 11.4622 7.94306 12.8843 8.44217 13.1761C8.47169 13.1934 8.50549 13.2135 8.54328 13.2359C9.30489 13.6887 11.6913 15.1074 13.4301 13.7797C14.7772 12.7511 14.3392 11.594 13.8858 11.2501C13.5754 11.0086 12.6608 10.3431 11.8003 9.74356C10.9553 9.15489 10.4844 9.62653 10.1659 9.94543C10.1601 9.95129 10.1543 9.9571 10.1485 9.96285L9.50791 10.6035C9.34477 10.7666 9.0966 10.7071 8.8589 10.5204C8.00599 9.87084 7.37856 9.24399 7.06465 8.93008L7.06201 8.92744C6.74815 8.61357 6.12909 7.99392 5.47955 7.14101C5.29283 6.90331 5.23329 6.65515 5.39643 6.49201L6.03708 5.85136C6.04283 5.84561 6.04864 5.83981 6.0545 5.83396C6.3734 5.51555 6.84504 5.04464 6.25636 4.19966C5.65687 3.33915 4.9913 2.42455 4.74984 2.11412C4.40588 1.66071 3.2488 1.22269 2.22021 2.5698C0.89255 4.30858 2.31122 6.69502 2.76397 7.45663C2.78644 7.49443 2.80653 7.52822 2.82379 7.55774C3.11562 8.05685 4.52989 9.88025 5.35116 10.6409Z" fill="#737D8C"/>
+<path d="M13.7979 2.05203C13.9599 1.8876 13.9599 1.62101 13.7979 1.45658C13.636 1.29214 13.3734 1.29214 13.2114 1.45658L11.3332 3.36362L9.4549 1.45658C9.29295 1.29214 9.03037 1.29214 8.86842 1.45658C8.70647 1.62101 8.70647 1.8876 8.86842 2.05203L10.7467 3.95907L8.78797 5.9478C8.62602 6.11223 8.62602 6.37883 8.78797 6.54326C8.94992 6.70769 9.21249 6.70769 9.37444 6.54326L11.3332 4.55453L13.2919 6.54326C13.4538 6.70769 13.7164 6.70769 13.8784 6.54326C14.0403 6.37883 14.0403 6.11223 13.8784 5.9478L11.9196 3.95907L13.7979 2.05203Z" fill="#737D8C"/>
+</svg>
diff --git a/res/img/voip/mic-muted.svg b/res/img/voip/mic-muted.svg
new file mode 100644
index 0000000000..0cb7ad1c9e
--- /dev/null
+++ b/res/img/voip/mic-muted.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.9206 1.0544C1.68141 0.815201 1.29359 0.815201 1.0544 1.0544C0.815201 1.29359 0.815201 1.68141 1.0544 1.9206L4.55 5.41621V7C4.55 8.3531 5.6469 9.45 7 9.45C7.45436 9.45 7.87983 9.32632 8.24458 9.11079L9.12938 9.99558C8.52863 10.4234 7.7937 10.675 7 10.675C4.97035 10.675 3.325 9.02965 3.325 7C3.325 6.66173 3.05077 6.3875 2.7125 6.3875C2.37423 6.3875 2.1 6.66173 2.1 7C2.1 9.49877 3.97038 11.5607 6.3875 11.8621V12.5125C6.3875 12.8508 6.66173 13.125 7 13.125C7.33827 13.125 7.6125 12.8508 7.6125 12.5125V11.8621C8.50718 11.7505 9.32696 11.3978 10.0047 10.8709L12.0794 12.9456C12.3186 13.1848 12.7064 13.1848 12.9456 12.9456C13.1848 12.7064 13.1848 12.3186 12.9456 12.0794L1.9206 1.0544Z" fill="white"/>
+<path d="M10.5474 7.96338L11.5073 8.92525C11.7601 8.33424 11.9 7.68346 11.9 7C11.9 6.66173 11.6258 6.3875 11.2875 6.3875C10.9492 6.3875 10.675 6.66173 10.675 7C10.675 7.33336 10.6306 7.65634 10.5474 7.96338Z" fill="white"/>
+<path d="M4.81385 2.21784L9.45 6.86366V3.325C9.45 1.9719 8.3531 0.875 7 0.875C6.04532 0.875 5.21818 1.42104 4.81385 2.21784Z" fill="white"/>
+</svg>
diff --git a/res/img/voip/mic-unmuted.svg b/res/img/voip/mic-unmuted.svg
new file mode 100644
index 0000000000..8334cafa0a
--- /dev/null
+++ b/res/img/voip/mic-unmuted.svg
@@ -0,0 +1,4 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.4645 3.29384C4.4645 1.95795 5.59973 0.875 7.0001 0.875C8.40048 0.875 9.53571 1.95795 9.53571 3.29384V6.91127C9.53571 8.24716 8.40048 9.33011 7.0001 9.33011C5.59973 9.33011 4.4645 8.24716 4.4645 6.91127V3.29384Z" fill="white"/>
+<path d="M2.56269 6.1391C3.01153 6.1391 3.37539 6.4862 3.37539 6.91437C3.37539 8.81701 4.99198 10.3617 6.99032 10.3666C6.99359 10.3666 6.99686 10.3666 7.00014 10.3666C7.0034 10.3666 7.00665 10.3666 7.0099 10.3666C9.00814 10.3616 10.6246 8.81694 10.6246 6.91437C10.6246 6.4862 10.9885 6.1391 11.4373 6.1391C11.8861 6.1391 12.25 6.4862 12.25 6.91437C12.25 9.41469 10.3257 11.4854 7.81283 11.8576V12.3497C7.81283 12.7779 7.44898 13.125 7.00014 13.125C6.5513 13.125 6.18744 12.7779 6.18744 12.3497V11.8576C3.67448 11.4855 1.75 9.41478 1.75 6.91437C1.75 6.4862 2.11386 6.1391 2.56269 6.1391Z" fill="white"/>
+</svg>
diff --git a/res/img/voip/missed-video.svg b/res/img/voip/missed-video.svg
new file mode 100644
index 0000000000..a2f3bc73ac
--- /dev/null
+++ b/res/img/voip/missed-video.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="M0 4.81815C0 3.76379 0.89543 2.90906 2 2.90906H9.33333C10.4379 2.90906 11.3333 3.76379 11.3333 4.81815V11.1818C11.3333 12.2361 10.4379 13.0909 9.33333 13.0909H2C0.895429 13.0909 0 12.2361 0 11.1818V4.81815ZM12.6667 6.09089L14.9169 4.37255C15.3534 4.03921 16 4.33587 16 4.86947V11.1305C16 11.6641 15.3534 11.9607 14.9169 11.6274L12.6667 9.90907V6.09089ZM3.68584 8.54792C3.68584 8.82819 3.45653 9.05751 3.17625 9.05751C2.89598 9.05751 2.66667 8.82819 2.66667 8.54792V6.50957C2.66667 6.22929 2.89598 5.99998 3.17625 5.99998H5.2146C5.49488 5.99998 5.72419 6.22929 5.72419 6.50957C5.72419 6.78984 5.49488 7.01916 5.2146 7.01916H4.39926L6.2083 8.82819L8.73076 6.30573C8.9295 6.10699 9.25054 6.10699 9.44928 6.30573C9.64802 6.50447 9.64802 6.82551 9.44928 7.02425L6.56501 9.90852C6.36627 10.1073 6.04523 10.1073 5.84649 9.90852L3.68584 7.74787V8.54792Z" fill="#8D97A5"/>
+</svg>
diff --git a/res/img/voip/missed-voice.svg b/res/img/voip/missed-voice.svg
new file mode 100644
index 0000000000..5e3993584e
--- /dev/null
+++ b/res/img/voip/missed-voice.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 d="M4.00016 6C4.36683 6 4.66683 5.7 4.66683 5.33333V4.28667L7.4935 7.11333C7.7535 7.37333 8.1735 7.37333 8.4335 7.11333L12.2068 3.34C12.4668 3.08 12.4668 2.66 12.2068 2.4C11.9468 2.14 11.5268 2.14 11.2668 2.4L7.96683 5.7L5.60016 3.33333H6.66683C7.0335 3.33333 7.3335 3.03333 7.3335 2.66667C7.3335 2.3 7.0335 2 6.66683 2H4.00016C3.6335 2 3.3335 2.3 3.3335 2.66667V5.33333C3.3335 5.7 3.6335 6 4.00016 6Z" fill="#8D97A5"/>
+<path d="M8.00557 8.67107C6.88076 8.62784 4.56757 8.91974 4.0052 9.06763C3.97195 9.07638 3.93363 9.08616 3.89078 9.0971C3.02734 9.31746 0.321813 10.008 0.0294949 12.1958C-0.196977 13.8909 0.937169 14.4039 1.50412 14.3258C1.89653 14.2766 3.02006 14.0989 4.05816 13.9127C5.07753 13.7298 5.07701 13.0573 5.07666 12.6026C5.07665 12.5943 5.07664 12.586 5.07664 12.5778L5.07665 11.6636C5.07665 11.4308 5.29543 11.2962 5.5972 11.2598C6.66548 11.1147 7.5573 11.1143 8.00369 11.1143L8.00745 11.1143C8.45377 11.1143 9.33453 11.1147 10.4028 11.2598C10.7046 11.2962 10.9234 11.4308 10.9234 11.6636L10.9234 12.5778C10.9234 12.586 10.9233 12.5943 10.9233 12.6026C10.923 13.0573 10.9225 13.7298 11.9418 13.9127C12.9799 14.099 14.1035 14.2766 14.4959 14.3258C15.0628 14.4039 16.197 13.8909 15.9705 12.1958C15.6782 10.008 12.9727 9.31747 12.1092 9.0971C12.0664 9.08617 12.0281 9.07639 11.9948 9.06764C11.4324 8.91975 9.13037 8.62783 8.00557 8.67107Z" fill="#8D97A5"/>
+</svg>
diff --git a/res/img/voip/screensharing-off.svg b/res/img/voip/screensharing-off.svg
new file mode 100644
index 0000000000..dc19e9892e
--- /dev/null
+++ b/res/img/voip/screensharing-off.svg
@@ -0,0 +1,18 @@
+<svg width="50" height="49" viewBox="0 0 50 49" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="25" cy="20" r="20" fill="white"/>
+</g>
+<rect x="14.6008" y="12.8" width="20.8" height="14.4" rx="1.6" fill="white" stroke="#737D8C" stroke-width="1.6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.3617 23.36C24.3617 23.7135 24.6483 24 25.0017 24C25.3552 24 25.6417 23.7135 25.6417 23.36L25.6417 18.1851L27.6692 20.2125C27.9191 20.4625 28.3243 20.4625 28.5743 20.2125C28.8242 19.9626 28.8242 19.5574 28.5743 19.3075L25.4543 16.1875C25.2043 15.9375 24.7991 15.9375 24.5492 16.1875L21.4292 19.3075C21.1792 19.5574 21.1792 19.9626 21.4292 20.2125C21.6791 20.4625 22.0843 20.4625 22.3343 20.2125L24.3617 18.1851L24.3617 23.36Z" fill="#737D8C"/>
+<defs>
+<filter id="filter0_d" x="0.947663" y="0" width="48.1047" height="48.1047" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4.05234"/>
+<feGaussianBlur stdDeviation="2.02617"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/screensharing-on.svg b/res/img/voip/screensharing-on.svg
new file mode 100644
index 0000000000..a8e7fe308e
--- /dev/null
+++ b/res/img/voip/screensharing-on.svg
@@ -0,0 +1,18 @@
+<svg width="50" height="49" viewBox="0 0 50 49" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="25" cy="20" r="20" fill="#0DBD8B"/>
+</g>
+<rect x="14.6008" y="12.8" width="20.8" height="14.4" rx="1.6" fill="#0DBD8B" stroke="white" stroke-width="1.6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.3617 23.36C24.3617 23.7135 24.6483 24 25.0017 24C25.3552 24 25.6417 23.7135 25.6417 23.36L25.6417 18.1851L27.6692 20.2125C27.9191 20.4625 28.3243 20.4625 28.5743 20.2125C28.8242 19.9626 28.8242 19.5574 28.5743 19.3075L25.4543 16.1875C25.2043 15.9375 24.7991 15.9375 24.5492 16.1875L21.4292 19.3075C21.1792 19.5574 21.1792 19.9626 21.4292 20.2125C21.6791 20.4625 22.0843 20.4625 22.3343 20.2125L24.3617 18.1851L24.3617 23.36Z" fill="white"/>
+<defs>
+<filter id="filter0_d" x="0.947663" y="0" width="48.1047" height="48.1047" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4.05234"/>
+<feGaussianBlur stdDeviation="2.02617"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/sidebar-off.svg b/res/img/voip/sidebar-off.svg
new file mode 100644
index 0000000000..7637a9ab55
--- /dev/null
+++ b/res/img/voip/sidebar-off.svg
@@ -0,0 +1,20 @@
+<svg width="48" height="47" viewBox="0 0 48 47" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="#737D8C"/>
+</g>
+<rect x="12.5618" y="12.8992" width="20.3525" height="14.4496" rx="2.43819" fill="white" stroke="#737D8C" stroke-width="1.12362"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.9132 20.5009C33.2675 20.5009 34.3655 19.4205 34.3655 18.0876C34.3655 16.7548 33.2675 15.6743 31.9132 15.6743C30.5589 15.6743 29.4609 16.7548 29.4609 18.0876C29.4609 19.4205 30.5589 20.5009 31.9132 20.5009ZM27.8242 26.132C27.8282 23.7187 28.976 21.3054 31.9113 21.3054C34.7818 21.3054 35.9984 23.7187 35.9984 26.132C35.9984 28.5453 32.7288 28.5453 31.9113 28.5453C31.0939 28.5453 27.8206 28.3403 27.8242 26.132Z" fill="white"/>
+<path d="M27.8242 26.132L28.386 26.1329L27.8242 26.132ZM35.9984 26.132H35.4366H35.9984ZM33.8037 18.0876C33.8037 19.1017 32.9658 19.9391 31.9132 19.9391V21.0627C33.5693 21.0627 34.9273 19.7392 34.9273 18.0876H33.8037ZM31.9132 16.2361C32.9658 16.2361 33.8037 17.0735 33.8037 18.0876H34.9273C34.9273 16.4361 33.5693 15.1125 31.9132 15.1125V16.2361ZM30.0227 18.0876C30.0227 17.0735 30.8606 16.2361 31.9132 16.2361V15.1125C30.2571 15.1125 28.8991 16.4361 28.8991 18.0876H30.0227ZM31.9132 19.9391C30.8606 19.9391 30.0227 19.1017 30.0227 18.0876H28.8991C28.8991 19.7392 30.2571 21.0627 31.9132 21.0627V19.9391ZM31.9113 20.7436C30.2659 20.7436 29.0747 21.4314 28.3132 22.4845C27.5693 23.5133 27.2645 24.8471 27.2624 26.1311L28.386 26.1329C28.3879 25.0036 28.659 23.924 29.2238 23.1429C29.771 22.386 30.6214 21.8672 31.9113 21.8672V20.7436ZM36.5602 26.132C36.5602 24.8414 36.2364 23.5081 35.4845 22.4817C34.7168 21.4338 33.5275 20.7436 31.9113 20.7436V21.8672C33.1657 21.8672 34.0199 22.3836 34.5781 23.1457C35.1521 23.9293 35.4366 25.0093 35.4366 26.132H36.5602ZM31.9113 29.1071C32.3157 29.1071 33.4213 29.1105 34.4365 28.7775C34.9481 28.6096 35.4778 28.3438 35.8839 27.9122C36.3025 27.4673 36.5602 26.8767 36.5602 26.132H35.4366C35.4366 26.594 35.2857 26.9083 35.0656 27.1422C34.8331 27.3893 34.4943 27.576 34.0863 27.7098C33.2623 27.9801 32.3244 27.9835 31.9113 27.9835V29.1071ZM27.2624 26.1311C27.26 27.5996 28.3757 28.3418 29.3716 28.6961C30.3797 29.0547 31.4763 29.1071 31.9113 29.1071V27.9835C31.5289 27.9835 30.5802 27.9334 29.7482 27.6375C28.9039 27.3371 28.3848 26.8728 28.386 26.1329L27.2624 26.1311Z" fill="#737D8C"/>
+<rect x="0.0339116" y="-0.787426" width="29.1443" height="3.36793" rx="1.68396" transform="matrix(0.681883 0.731461 -0.742244 0.670129 13.0943 8.71545)" fill="white" stroke="#737D8C" stroke-width="1.12362"/>
+<defs>
+<filter id="filter0_d" x="0.589744" y="0" width="46.8205" height="46.8205" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="3.41026"/>
+<feGaussianBlur stdDeviation="1.70513"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/sidebar-on.svg b/res/img/voip/sidebar-on.svg
new file mode 100644
index 0000000000..a625334be4
--- /dev/null
+++ b/res/img/voip/sidebar-on.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="47" viewBox="0 0 48 47" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="white"/>
+</g>
+<rect x="12.5" y="12.5" width="20.4763" height="15.3319" rx="2.5" fill="#737D8C" stroke="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.912 20.5618C33.2664 20.5618 34.3643 19.4287 34.3643 18.0309C34.3643 16.6331 33.2664 15.5 31.912 15.5C30.5577 15.5 29.4598 16.6331 29.4598 18.0309C29.4598 19.4287 30.5577 20.5618 31.912 20.5618ZM27.8242 26.467C27.8282 23.9361 28.976 21.4052 31.9113 21.4052C34.7818 21.4052 35.9985 23.9361 35.9985 26.467C35.9985 28.9978 32.7288 28.9978 31.9114 28.9978C31.0939 28.9978 27.8206 28.7829 27.8242 26.467Z" fill="#737D8C"/>
+<path d="M27.8242 26.467L27.3242 26.4662L27.8242 26.467ZM35.9985 26.467H36.4985H35.9985ZM33.8643 18.0309C33.8643 19.1675 32.9755 20.0618 31.912 20.0618V21.0618C33.5573 21.0618 34.8643 19.6898 34.8643 18.0309H33.8643ZM31.912 16C32.9755 16 33.8643 16.8943 33.8643 18.0309H34.8643C34.8643 16.372 33.5573 15 31.912 15V16ZM29.9598 18.0309C29.9598 16.8943 30.8486 16 31.912 16V15C30.2668 15 28.9598 16.372 28.9598 18.0309H29.9598ZM31.912 20.0618C30.8486 20.0618 29.9598 19.1675 29.9598 18.0309H28.9598C28.9598 19.6898 30.2668 21.0618 31.912 21.0618V20.0618ZM31.9113 20.9052C30.2753 20.9052 29.1023 21.622 28.3569 22.7032C27.6274 23.7612 27.3263 25.1361 27.3242 26.4662L28.3242 26.4677C28.3261 25.2669 28.6009 24.1109 29.1802 23.2708C29.7434 22.4538 30.612 21.9052 31.9113 21.9052V20.9052ZM36.4985 26.467C36.4985 25.1313 36.1789 23.7567 35.4412 22.7007C34.6893 21.6242 33.5177 20.9052 31.9113 20.9052V21.9052C33.1755 21.9052 34.0475 22.4516 34.6214 23.2733C35.2097 24.1154 35.4985 25.2717 35.4985 26.467H36.4985ZM31.9114 29.4978C32.3162 29.4978 33.416 29.5011 34.4241 29.1543C34.9326 28.9794 35.4519 28.7044 35.847 28.264C36.2515 27.8131 36.4985 27.2184 36.4985 26.467H35.4985C35.4985 26.9809 35.3367 27.3354 35.1026 27.5962C34.8591 27.8677 34.5099 28.0673 34.0988 28.2087C33.2677 28.4946 32.3239 28.4978 31.9114 28.4978V29.4978ZM27.3242 26.4662C27.3219 27.9345 28.3854 28.6964 29.3851 29.0693C30.3864 29.4429 31.4779 29.4978 31.9114 29.4978V28.4978C31.5274 28.4978 30.5735 28.4453 29.7346 28.1324C28.8943 27.8189 28.3229 27.3153 28.3242 26.4677L27.3242 26.4662Z" fill="white"/>
+<defs>
+<filter id="filter0_d" x="0.589744" y="0" width="46.8205" height="46.8205" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="3.41026"/>
+<feGaussianBlur stdDeviation="1.70513"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/silence.svg b/res/img/voip/silence.svg
new file mode 100644
index 0000000000..332932dfff
--- /dev/null
+++ b/res/img/voip/silence.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="M7.56986 1.82566L4 4.80054L1.5 4.80054C0.671573 4.80054 0 5.47212 0 6.30054V9.70054C0 10.529 0.671573 11.2005 1.5 11.2005L4 11.2005L7.56986 14.1754C8.05836 14.5825 8.8 14.2351 8.8 13.5993L8.8 9.70054V6.30054L8.8 2.40182C8.8 1.76595 8.05836 1.41858 7.56986 1.82566ZM14.1546 2.76877C13.9162 2.46224 13.4745 2.40702 13.1679 2.64543L13.0443 3.6318L13.0446 3.63212L13.0448 3.63238L13.0536 3.64417C13.0623 3.65582 13.0764 3.67498 13.0951 3.7013C13.1325 3.75399 13.1883 3.83518 13.2564 3.94222C13.3929 4.15668 13.5774 4.47271 13.7624 4.86922C14.1345 5.66647 14.4965 6.763 14.4965 8.00044C14.4965 9.23789 14.1345 10.3344 13.7624 11.1317C13.5774 11.5282 13.3929 11.8442 13.2564 12.0587C13.1883 12.1657 13.1325 12.2469 13.0951 12.2996C13.0764 12.3259 13.0623 12.3451 13.0536 12.3567L13.0448 12.3685L13.0446 12.3688L13.0443 12.3691L13.0441 12.3694L13.0438 12.3698L13.0436 12.37C12.8063 12.6765 12.8618 13.1174 13.1679 13.3555C13.4745 13.5939 13.9162 13.5386 14.1546 13.2321L13.5996 12.8004C14.1546 13.2321 14.1548 13.2319 14.1549 13.2317L14.1552 13.2313L14.156 13.2303L14.158 13.2278L14.1636 13.2204L14.1815 13.1966C14.1963 13.1768 14.2166 13.1491 14.2416 13.1138C14.2917 13.0433 14.3609 12.9423 14.4428 12.8136C14.6063 12.5567 14.8218 12.187 15.0368 11.7264C15.4647 10.8093 15.9027 9.50586 15.9027 8.00044C15.9027 6.49503 15.4647 5.19156 15.0368 4.27453C14.8218 3.8139 14.6063 3.44421 14.4428 3.18724C14.3609 3.05857 14.2917 2.95762 14.2416 2.88709C14.2166 2.8518 14.1963 2.82408 14.1815 2.80426L14.1636 2.78048L14.158 2.7731L14.156 2.77055L14.1552 2.76956L14.1549 2.76914C14.1548 2.76895 14.1546 2.76877 13.5996 3.20045L14.1546 2.76877ZM11.7552 5.16879C11.5168 4.86227 11.075 4.80705 10.7685 5.04546C10.4628 5.28321 10.4071 5.72319 10.6432 6.02961L10.6452 6.03231C10.6481 6.03609 10.6535 6.04353 10.6613 6.05445C10.6768 6.07633 10.7014 6.11199 10.732 6.1601C10.7935 6.2567 10.878 6.4013 10.963 6.58353C11.1351 6.95221 11.2971 7.44874 11.2971 8.00047C11.2971 8.5522 11.1351 9.04873 10.963 9.41741C10.878 9.59964 10.7935 9.74424 10.732 9.84084C10.7014 9.88895 10.6768 9.92461 10.6613 9.94648C10.6535 9.95741 10.6481 9.96484 10.6452 9.96863L10.6432 9.97132C10.4071 10.2777 10.4628 10.7177 10.7685 10.9555C11.075 11.1939 11.5168 11.1387 11.7552 10.8321L11.2002 10.4005C11.7552 10.8321 11.7553 10.832 11.7555 10.8318L11.7558 10.8314L11.7564 10.8305L11.758 10.8286L11.7619 10.8234L11.7731 10.8085C11.782 10.7966 11.7937 10.7806 11.8078 10.7607C11.8361 10.721 11.874 10.6656 11.9184 10.5958C12.0069 10.4567 12.1224 10.2584 12.2374 10.0121C12.4653 9.52364 12.7033 8.82017 12.7033 8.00047C12.7033 7.18077 12.4653 6.4773 12.2374 5.98884C12.1224 5.74249 12.0069 5.54424 11.9184 5.40512C11.874 5.33538 11.8361 5.27996 11.8078 5.24023C11.7937 5.22035 11.782 5.20435 11.7731 5.1924L11.7619 5.17752L11.758 5.17238L11.7564 5.17039L11.7558 5.16954L11.7555 5.16916C11.7553 5.16897 11.7552 5.16879 11.2002 5.60047L11.7552 5.16879Z" fill="#8D99A5"/>
+</svg>
diff --git a/res/img/voip/tab-dialpad.svg b/res/img/voip/tab-dialpad.svg
new file mode 100644
index 0000000000..b7add0addb
--- /dev/null
+++ b/res/img/voip/tab-dialpad.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 19C10.9 19 10 19.9 10 21C10 22.1 10.9 23 12 23C13.1 23 14 22.1 14 21C14 19.9 13.1 19 12 19ZM6 1C4.9 1 4 1.9 4 3C4 4.1 4.9 5 6 5C7.1 5 8 4.1 8 3C8 1.9 7.1 1 6 1ZM6 7C4.9 7 4 7.9 4 9C4 10.1 4.9 11 6 11C7.1 11 8 10.1 8 9C8 7.9 7.1 7 6 7ZM6 13C4.9 13 4 13.9 4 15C4 16.1 4.9 17 6 17C7.1 17 8 16.1 8 15C8 13.9 7.1 13 6 13ZM18 5C19.1 5 20 4.1 20 3C20 1.9 19.1 1 18 1C16.9 1 16 1.9 16 3C16 4.1 16.9 5 18 5ZM12 13C10.9 13 10 13.9 10 15C10 16.1 10.9 17 12 17C13.1 17 14 16.1 14 15C14 13.9 13.1 13 12 13ZM18 13C16.9 13 16 13.9 16 15C16 16.1 16.9 17 18 17C19.1 17 20 16.1 20 15C20 13.9 19.1 13 18 13ZM18 7C16.9 7 16 7.9 16 9C16 10.1 16.9 11 18 11C19.1 11 20 10.1 20 9C20 7.9 19.1 7 18 7ZM12 7C10.9 7 10 7.9 10 9C10 10.1 10.9 11 12 11C13.1 11 14 10.1 14 9C14 7.9 13.1 7 12 7ZM12 1C10.9 1 10 1.9 10 3C10 4.1 10.9 5 12 5C13.1 5 14 4.1 14 3C14 1.9 13.1 1 12 1Z" fill="#8D97A5"/>
+</svg>
diff --git a/res/img/voip/tab-userdirectory.svg b/res/img/voip/tab-userdirectory.svg
new file mode 100644
index 0000000000..792ded7be4
--- /dev/null
+++ b/res/img/voip/tab-userdirectory.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" 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="M18.1502 21.1214C16.3946 22.3074 14.2782 23 12 23C9.52367 23 7.23845 22.1817 5.4 20.8008C2.72821 18.794 1 15.5988 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 15.797 21.0762 19.1446 18.1502 21.1214ZM12 12.55C13.8225 12.55 15.3 10.9494 15.3 8.975C15.3 7.00058 13.8225 5.4 12 5.4C10.1775 5.4 8.7 7.00058 8.7 8.975C8.7 10.9494 10.1775 12.55 12 12.55ZM12 20.8C14.3782 20.8 16.536 19.8566 18.1197 18.3237C17.1403 15.9056 14.7693 14.2 12 14.2C9.23066 14.2 6.85969 15.9056 5.88028 18.3237C7.46399 19.8566 9.62183 20.8 12 20.8Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.1502 21.1214C16.3946 22.3074 14.2782 23 12 23C9.52367 23 7.23845 22.1817 5.4 20.8008C2.72821 18.794 1 15.5988 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 15.797 21.0762 19.1446 18.1502 21.1214ZM12 12.55C13.8225 12.55 15.3 10.9494 15.3 8.975C15.3 7.00058 13.8225 5.4 12 5.4C10.1775 5.4 8.7 7.00058 8.7 8.975C8.7 10.9494 10.1775 12.55 12 12.55ZM12 20.8C14.3782 20.8 16.536 19.8566 18.1197 18.3237C17.1403 15.9056 14.7693 14.2 12 14.2C9.23066 14.2 6.85969 15.9056 5.88028 18.3237C7.46399 19.8566 9.62183 20.8 12 20.8Z" fill="#8D97A5"/>
+<path d="M18.1502 21.1214L18.9339 22.2814L18.1502 21.1214ZM5.4 20.8008L4.55919 21.9202H4.55919L5.4 20.8008ZM18.1197 18.3237L19.0934 19.3296L19.7717 18.6731L19.4173 17.7981L18.1197 18.3237ZM5.88028 18.3237L4.58268 17.7981L4.22829 18.6731L4.90659 19.3296L5.88028 18.3237ZM12 24.4C14.5662 24.4 16.9541 23.619 18.9339 22.2814L17.3665 19.9613C15.835 20.9959 13.9902 21.6 12 21.6V24.4ZM4.55919 21.9202C6.63176 23.477 9.21011 24.4 12 24.4V21.6C9.83723 21.6 7.84514 20.8865 6.24081 19.6814L4.55919 21.9202ZM-0.399998 12C-0.399998 16.0577 1.55052 19.6603 4.55919 21.9202L6.24081 19.6814C3.90591 17.9276 2.4 15.1399 2.4 12H-0.399998ZM12 -0.399998C5.15167 -0.399998 -0.399998 5.15167 -0.399998 12H2.4C2.4 6.69807 6.69807 2.4 12 2.4V-0.399998ZM24.4 12C24.4 5.15167 18.8483 -0.399998 12 -0.399998V2.4C17.3019 2.4 21.6 6.69807 21.6 12H24.4ZM18.9339 22.2814C22.2288 20.0554 24.4 16.2815 24.4 12H21.6C21.6 15.3124 19.9236 18.2337 17.3665 19.9613L18.9339 22.2814ZM13.9 8.975C13.9 10.2838 12.9459 11.15 12 11.15V13.95C14.6991 13.95 16.7 11.615 16.7 8.975H13.9ZM12 6.8C12.9459 6.8 13.9 7.66616 13.9 8.975H16.7C16.7 6.335 14.6991 4 12 4V6.8ZM10.1 8.975C10.1 7.66616 11.0541 6.8 12 6.8V4C9.30086 4 7.3 6.335 7.3 8.975H10.1ZM12 11.15C11.0541 11.15 10.1 10.2838 10.1 8.975H7.3C7.3 11.615 9.30086 13.95 12 13.95V11.15ZM17.146 17.3178C15.8129 18.6081 14.0004 19.4 12 19.4V22.2C14.756 22.2 17.2591 21.1051 19.0934 19.3296L17.146 17.3178ZM12 15.6C14.1797 15.6 16.0494 16.9415 16.8221 18.8493L19.4173 17.7981C18.2312 14.8697 15.359 12.8 12 12.8V15.6ZM7.17788 18.8493C7.95058 16.9415 9.8203 15.6 12 15.6V12.8C8.64102 12.8 5.7688 14.8697 4.58268 17.7981L7.17788 18.8493ZM12 19.4C9.99963 19.4 8.18709 18.6081 6.85397 17.3178L4.90659 19.3296C6.74088 21.1051 9.24402 22.2 12 22.2V19.4Z" fill="#8D97A5" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/voip/un-silence.svg b/res/img/voip/un-silence.svg
new file mode 100644
index 0000000000..c00b366f84
--- /dev/null
+++ b/res/img/voip/un-silence.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 d="M1.18262 0.960693L14.3815 14.1596" stroke="#8D99A5" stroke-width="1.61751" stroke-miterlimit="10" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.57061 4.20635L5.19539 4.51904H3.58059L10.2419 11.1804V8.87764L5.57061 4.20635ZM10.2419 6.59013V2.15546C10.2419 1.42405 9.38884 1.0245 8.82695 1.49274L6.81834 3.16658L10.2419 6.59013ZM5.19526 11.2479H2.7146C1.76172 11.2479 0.989258 10.4754 0.989258 9.52254V6.24438C0.989258 5.69051 1.25024 5.1976 1.65595 4.88191L10.2419 13.4679V13.6117C10.2419 14.3431 9.38884 14.7426 8.82695 14.2744L5.19526 11.248V11.2479Z" fill="#8D99A5"/>
+</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 2d0e3d2a8b..f012dff0a1 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -1,28 +1,37 @@
+// Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A741
+$accent: #0DBD8B;
+$alert: #FF5B55;
+$links: #0086e6;
+$primary-content: #ffffff;
+$secondary-content: #A9B2BC;
+$tertiary-content: #8E99A4;
+$quaternary-content: #6F7882;
+$quinary-content: #394049;
+$system: #21262C;
+$background: #15191E;
+$panels: rgba($system, 0.9);
+$panel-base: #8D97A5; // This color is not intended for use in the app
+$panel-selected: rgba($panel-base, 0.3);
+$panel-hover: rgba($panel-base, 0.1);
+$panel-actions: rgba($panel-base, 0.2);
+$space-nav: rgba($panel-base, 0.1);
+
+// TODO: Move userId colors here
+
 // unified palette
 // try to use these colors when possible
-$bg-color: #15191E;
-$base-color: $bg-color;
-$base-text-color: #ffffff;
 $header-panel-bg-color: #20252B;
 $header-panel-border-color: #000000;
 $header-panel-text-primary-color: #B9BEC6;
 $header-panel-text-secondary-color: #c8c8cd;
-$text-primary-color: #ffffff;
 $text-secondary-color: #B9BEC6;
-$quaternary-fg-color: #6F7882;
 $search-bg-color: #181b21;
 $search-placeholder-color: #61708b;
 $room-highlight-color: #343a46;
 
 // typical text (dark-on-white in light skin)
-$primary-fg-color: $text-primary-color;
-$primary-bg-color: $bg-color;
 $muted-fg-color: $header-panel-text-primary-color;
 
-// additional text colors
-$secondary-fg-color: #A9B2BC;
-$tertiary-fg-color: #8E99A4;
-
 // used for dialog box text
 $light-fg-color: $header-panel-text-secondary-color;
 
@@ -41,13 +50,13 @@ $info-plinth-fg-color: #888;
 $preview-bar-bg-color: $header-panel-bg-color;
 
 $groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
-$inverted-bg-color: $base-color;
+$inverted-bg-color: $background;
 
 // used by AddressSelector
 $selected-color: $room-highlight-color;
 
 // selected for hoverover & selected event tiles
-$event-selected-color: #21262c;
+$event-selected-color: $system;
 
 // used for the hairline dividers in RoomView
 $primary-hairline-color: transparent;
@@ -62,7 +71,7 @@ $input-focused-border-color: #238cf5;
 $input-valid-border-color: $accent-color;
 $input-invalid-border-color: $warning-color;
 
-$field-focused-label-bg-color: $bg-color;
+$field-focused-label-bg-color: $background;
 
 $resend-button-divider-color: #b9bec64a; // muted-text with a 4A opacity.
 
@@ -73,15 +82,15 @@ $scrollbar-track-color: transparent;
 // context menus
 $menu-border-color: $header-panel-border-color;
 $menu-bg-color: $header-panel-bg-color;
-$menu-box-shadow-color: $bg-color;
+$menu-box-shadow-color: $background;
 $menu-selected-color: $room-highlight-color;
 
 $avatar-initial-color: #ffffff;
-$avatar-bg-color: $bg-color;
+$avatar-bg-color: $background;
 
-$h3-color: $primary-fg-color;
+$h3-color: $primary-content;
 
-$dialog-title-fg-color: $base-text-color;
+$dialog-title-fg-color: $primary-content;
 $dialog-backdrop-color: #000;
 $dialog-shadow-color: rgba(0, 0, 0, 0.48);
 $dialog-close-fg-color: #9fa9ba;
@@ -91,44 +100,39 @@ $lightbox-background-bg-color: #000;
 $lightbox-background-bg-opacity: 0.85;
 
 $settings-grey-fg-color: #a2a2a2;
-$settings-profile-placeholder-bg-color: #21262c;
+$settings-profile-placeholder-bg-color: $system;
 $settings-profile-overlay-placeholder-fg-color: #454545;
 $settings-profile-button-bg-color: #e7e7e7;
 $settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
 $settings-subsection-fg-color: $text-secondary-color;
 
-$topleftmenu-color: $text-primary-color;
-$roomheader-color: $text-primary-color;
-$roomheader-bg-color: $bg-color;
+$topleftmenu-color: $primary-content;
+$roomheader-color: $primary-content;
 $roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
-$roomheader-addroom-fg-color: $text-primary-color;
+$roomheader-addroom-fg-color: $primary-content;
 $groupFilterPanel-button-color: $header-panel-text-primary-color;
 $groupheader-button-color: $header-panel-text-primary-color;
 $rightpanel-button-color: $header-panel-text-primary-color;
-$icon-button-color: #8E99A4;
+$icon-button-color: $tertiary-content;
 $roomtopic-color: $text-secondary-color;
 $eventtile-meta-color: $roomtopic-color;
 
 $header-divider-color: $header-panel-text-primary-color;
 $composer-e2e-icon-color: $header-panel-text-primary-color;
 
-// this probably shouldn't have it's own colour
-$voipcall-plinth-color: #394049;
-
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
 
 $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
-$roomlist-filter-active-bg-color: $bg-color;
 $roomlist-bg-color: rgba(33, 38, 44, 0.90);
-$roomlist-header-color: $tertiary-fg-color;
-$roomsublist-divider-color: $primary-fg-color;
+$roomlist-header-color: $tertiary-content;
+$roomsublist-divider-color: $primary-content;
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
 
-$roomtile-preview-color: $secondary-fg-color;
+$roomtile-preview-color: $secondary-content;
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
 
@@ -152,20 +156,20 @@ $event-highlight-bg-color: #25271F;
 $event-timestamp-color: $text-secondary-color;
 
 // Tabbed views
-$tab-label-fg-color: $text-primary-color;
-$tab-label-active-fg-color: $text-primary-color;
+$tab-label-fg-color: $primary-content;
+$tab-label-active-fg-color: $primary-content;
 $tab-label-bg-color: transparent;
 $tab-label-active-bg-color: $accent-color;
-$tab-label-icon-bg-color: $text-primary-color;
-$tab-label-active-icon-bg-color: $text-primary-color;
+$tab-label-icon-bg-color: $primary-content;
+$tab-label-active-icon-bg-color: $primary-content;
 
 // Buttons
-$button-primary-fg-color: #ffffff;
+$button-primary-fg-color: $primary-content;
 $button-primary-bg-color: $accent-color;
 $button-secondary-bg-color: transparent;
-$button-danger-fg-color: #ffffff;
+$button-danger-fg-color: $primary-content;
 $button-danger-bg-color: $notice-primary-color;
-$button-danger-disabled-fg-color: #ffffff;
+$button-danger-disabled-fg-color: $primary-content;
 $button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
 $button-link-fg-color: $accent-color;
 $button-link-bg-color: transparent;
@@ -174,12 +178,15 @@ $button-link-bg-color: transparent;
 $togglesw-off-color: $room-highlight-color;
 
 $progressbar-fg-color: $accent-color;
-$progressbar-bg-color: #21262c;
+$progressbar-bg-color: $system;
 
 $visual-bell-bg-color: #800;
 
 $room-warning-bg-color: $header-panel-bg-color;
 
+$authpage-body-bg-color: $background;
+$authpage-primary-color: $primary-content;
+
 $dark-panel-bg-color: $header-panel-bg-color;
 $panel-gradient: rgba(34, 38, 46, 0), rgba(34, 38, 46, 1);
 
@@ -197,37 +204,33 @@ $reaction-row-button-selected-border-color: $accent-color;
 $kbd-border-color: #000000;
 
 $tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
-$tooltip-timeline-fg-color: #ffffff;
-
-$interactive-tooltip-bg-color: $base-color;
-$interactive-tooltip-fg-color: #ffffff;
+$tooltip-timeline-fg-color: $primary-content;
 
 $breadcrumb-placeholder-bg-color: #272c35;
 
-$user-tile-hover-bg-color: $header-panel-bg-color;
-
-$message-body-panel-fg-color: $secondary-fg-color;
-$message-body-panel-bg-color: #394049; // "Dark Tile"
-$message-body-panel-icon-fg-color: #21262C; // "Separator"
-$message-body-panel-icon-bg-color: $tertiary-fg-color;
-
-$voice-record-stop-border-color: $quaternary-fg-color;
-$voice-record-waveform-bg-color: $message-body-panel-bg-color;
-$voice-record-waveform-fg-color: $message-body-panel-fg-color;
-$voice-record-waveform-incomplete-fg-color: $quaternary-fg-color;
-$voice-record-icon-color: $quaternary-fg-color;
-$voice-playback-button-bg-color: $message-body-panel-icon-bg-color;
-$voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
+$voice-record-stop-border-color: $quaternary-content;
+$voice-record-waveform-incomplete-fg-color: $quaternary-content;
+$voice-record-icon-color: $quaternary-content;
+$voice-playback-button-bg-color: $system;
+$voice-playback-button-fg-color: $secondary-content;
 
 // Appearance tab colors
 $appearance-tab-border-color: $room-highlight-color;
 
-// blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 60px;
-$groupFilterPanel-background-blur-amount: 30px;
+// blur amounts for left left panel (only for element theme)
+:root {
+    --lp-background-blur: 45px;
+}
 
 $composer-shadow-color: rgba(0, 0, 0, 0.28);
 
+// Bubble tiles
+$eventbubble-self-bg: #14322E;
+$eventbubble-others-bg: $event-selected-color;
+$eventbubble-bg-hover: #1C2026;
+$eventbubble-avatar-outline: $background;
+$eventbubble-reply-color: #C1C6CD;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
@@ -273,24 +276,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
 }
 
 // markdown overrides:
-.mx_EventTile_content .markdown-body pre:hover {
-    border-color: #808080 !important; // inverted due to rules below
-    scrollbar-color: rgba(0, 0, 0, 0.2) transparent; // copied from light theme due to inversion below
-    // the code above works only in Firefox, this is for other browsers
-    // see https://developer.mozilla.org/en-US/docs/Web/CSS/scrollbar-color
-    &::-webkit-scrollbar-thumb {
-        background-color: rgba(0, 0, 0, 0.2); // copied from light theme due to inversion below
-    }
-}
 .mx_EventTile_content .markdown-body {
-    pre, code {
-        filter: invert(1);
-    }
-
-    pre code {
-        filter: none;
-    }
-
     table {
         tr {
             background-color: #000000;
@@ -300,18 +286,17 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
             background-color: #080808;
         }
     }
-
-    blockquote {
-        color: #919191;
-    }
 }
 
-// diff highlight colors
-// intentionally swapped to avoid inversion
+// highlight.js overrides
+.hljs-tag {
+    color: inherit; // Without this they'd be weirdly blue which doesn't match the theme
+}
+
 .hljs-addition {
-    background: #fdd;
+    background: #1a4b59;
 }
 
 .hljs-deletion {
-    background: #dfd;
+    background: #53232a;
 }
diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index f9695018e4..df83d6db88 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -2,10 +2,7 @@
 @import "../../light/css/_paths.scss";
 @import "../../light/css/_fonts.scss";
 @import "../../light/css/_light.scss";
-// important this goes before _mods,
-// as $groupFilterPanel-background-blur-amount and
-// $roomlist-background-blur-amount
-// are overridden in _dark.scss
 @import "_dark.scss";
 @import "../../light/css/_mods.scss";
 @import "../../../../res/css/_components.scss";
+@import url("highlight.js/styles/atom-one-dark.css");
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index a852ad94e9..bed1e9c661 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -1,3 +1,6 @@
+// Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A741
+$system: #21262C;
+
 // unified palette
 // try to use these colors when possible
 $bg-color: #181b21;
@@ -20,6 +23,14 @@ $tertiary-fg-color: $primary-fg-color;
 $primary-bg-color: $bg-color;
 $muted-fg-color: $header-panel-text-primary-color;
 
+// Legacy theme backports
+$primary-content: $primary-fg-color;
+$secondary-content: $secondary-fg-color;
+$tertiary-content: $tertiary-fg-color;
+$quaternary-content: #6F7882;
+$quinary-content: $quaternary-content;
+$background: $primary-bg-color;
+
 // used for dialog box text
 $light-fg-color: $header-panel-text-secondary-color;
 
@@ -108,13 +119,11 @@ $eventtile-meta-color: $roomtopic-color;
 $header-divider-color: $header-panel-text-primary-color;
 $composer-e2e-icon-color: $header-panel-text-primary-color;
 
-// this probably shouldn't have it's own colour
-$voipcall-plinth-color: #394049;
-
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
 
+
 $roomlist-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
 $roomlist-filter-active-bg-color: $roomlist-button-bg-color;
 $roomlist-bg-color: $header-panel-bg-color;
@@ -193,22 +202,10 @@ $kbd-border-color: #000000;
 $tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 
-$interactive-tooltip-bg-color: $base-color;
-$interactive-tooltip-fg-color: #ffffff;
-
 $breadcrumb-placeholder-bg-color: #272c35;
 
-$user-tile-hover-bg-color: $header-panel-bg-color;
-
-$message-body-panel-fg-color: $secondary-fg-color;
-$message-body-panel-bg-color: #394049;
-$message-body-panel-icon-fg-color: $primary-bg-color;
-$message-body-panel-icon-bg-color: $secondary-fg-color;
-
 // See non-legacy dark for variable information
 $voice-record-stop-border-color: #6F7882;
-$voice-record-waveform-bg-color: $message-body-panel-bg-color;
-$voice-record-waveform-fg-color: $message-body-panel-fg-color;
 $voice-record-waveform-incomplete-fg-color: #6F7882;
 $voice-record-icon-color: #6F7882;
 $voice-playback-button-bg-color: $tertiary-fg-color;
@@ -219,6 +216,13 @@ $appearance-tab-border-color: $room-highlight-color;
 
 $composer-shadow-color: tranparent;
 
+// Bubble tiles
+$eventbubble-self-bg: #14322E;
+$eventbubble-others-bg: $event-selected-color;
+$eventbubble-bg-hover: #1C2026;
+$eventbubble-avatar-outline: $bg-color;
+$eventbubble-reply-color: #C1C6CD;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
@@ -246,7 +250,7 @@ $composer-shadow-color: tranparent;
 @define-mixin mx_DialogButton_secondary {
     // flip colours for the secondary ones
     font-weight: 600;
-    border: 1px solid $accent-color ! important;
+    border: 1px solid $accent-color !important;
     color: $accent-color;
     background-color: $button-secondary-bg-color;
 }
@@ -264,18 +268,7 @@ $composer-shadow-color: tranparent;
 }
 
 // markdown overrides:
-.mx_EventTile_content .markdown-body pre:hover {
-    border-color: #808080 !important; // inverted due to rules below
-}
 .mx_EventTile_content .markdown-body {
-    pre, code {
-        filter: invert(1);
-    }
-
-    pre code {
-        filter: none;
-    }
-
     table {
         tr {
             background-color: #000000;
@@ -287,12 +280,7 @@ $composer-shadow-color: tranparent;
     }
 }
 
-// diff highlight colors
-// intentionally swapped to avoid inversion
-.hljs-addition {
-    background: #fdd;
-}
-
-.hljs-deletion {
-    background: #dfd;
+// highlight.js overrides:
+.hljs-tag {
+    color: inherit; // Without this they'd be weirdly blue which doesn't match the theme
 }
diff --git a/res/themes/legacy-dark/css/legacy-dark.scss b/res/themes/legacy-dark/css/legacy-dark.scss
index 2a4d432d26..840794f7c0 100644
--- a/res/themes/legacy-dark/css/legacy-dark.scss
+++ b/res/themes/legacy-dark/css/legacy-dark.scss
@@ -4,3 +4,4 @@
 @import "../../legacy-light/css/_legacy-light.scss";
 @import "_legacy-dark.scss";
 @import "../../../../res/css/_components.scss";
+@import url("highlight.js/styles/atom-one-dark.css");
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 84666bc662..2ce5b6062c 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -8,9 +8,12 @@
 /* Noto Color Emoji contains digits, in fixed-width, therefore causing
    digits in flowed text to stand out.
    TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
+$font-family: 'Nunito', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Arial', 'Helvetica', sans-serif, 'Noto Color Emoji';
 
-$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
+$monospace-font-family: 'Inconsolata', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Courier', monospace, 'Noto Color Emoji';
+
+// Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=557%3A0
+$system: #F4F6FA;
 
 // unified palette
 // try to use these colors when possible
@@ -28,6 +31,14 @@ $tertiary-fg-color: $primary-fg-color;
 $primary-bg-color: #ffffff;
 $muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
 
+// Legacy theme backports
+$primary-content: $primary-fg-color;
+$secondary-content: $secondary-fg-color;
+$tertiary-content: $tertiary-fg-color;
+$quaternary-content: #C1C6CD;
+$quinary-content: #e3e8f0;
+$background: $primary-bg-color;
+
 // used for dialog box text
 $light-fg-color: #747474;
 
@@ -175,8 +186,7 @@ $eventtile-meta-color: $roomtopic-color;
 $composer-e2e-icon-color: #91a1c0;
 $header-divider-color: #91a1c0;
 
-// this probably shouldn't have it's own colour
-$voipcall-plinth-color: #F4F6FA;
+$voipcall-plinth-color: $system;
 
 // ********************
 
@@ -316,34 +326,29 @@ $kbd-border-color: $reaction-row-button-border-color;
 $tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 
-$interactive-tooltip-bg-color: #27303a;
-$interactive-tooltip-fg-color: #ffffff;
-
 $breadcrumb-placeholder-bg-color: #e8eef5;
 
-$user-tile-hover-bg-color: $header-panel-bg-color;
-
-$message-body-panel-fg-color: $secondary-fg-color;
-$message-body-panel-bg-color: #E3E8F0;
-$message-body-panel-icon-fg-color: $secondary-fg-color;
-$message-body-panel-icon-bg-color: $primary-bg-color;
-
 // See non-legacy _light for variable information
 $voice-record-stop-symbol-color: #ff4b55;
 $voice-record-live-circle-color: #ff4b55;
 $voice-record-stop-border-color: #E3E8F0;
-$voice-record-waveform-bg-color: $message-body-panel-bg-color;
-$voice-record-waveform-fg-color: $message-body-panel-fg-color;
 $voice-record-waveform-incomplete-fg-color: #C1C6CD;
 $voice-record-icon-color: $tertiary-fg-color;
-$voice-playback-button-bg-color: $message-body-panel-icon-bg-color;
-$voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
+$voice-playback-button-bg-color: $system;
+$voice-playback-button-fg-color: $secondary-content;
 
 // FontSlider colors
 $appearance-tab-border-color: $input-darker-bg-color;
 
 $composer-shadow-color: tranparent;
 
+// Bubble tiles
+$eventbubble-self-bg: #F0FBF8;
+$eventbubble-others-bg: $system;
+$eventbubble-bg-hover: #FAFBFD;
+$eventbubble-avatar-outline: #fff;
+$eventbubble-reply-color: #C1C6CD;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
@@ -380,7 +385,7 @@ $composer-shadow-color: tranparent;
 @define-mixin mx_DialogButton_secondary {
     // flip colours for the secondary ones
     font-weight: 600;
-    border: 1px solid $accent-color ! important;
+    border: 1px solid $accent-color !important;
     color: $accent-color;
     background-color: $button-secondary-bg-color;
 }
diff --git a/res/themes/legacy-light/css/legacy-light.scss b/res/themes/legacy-light/css/legacy-light.scss
index e39a1765f3..347d240fc6 100644
--- a/res/themes/legacy-light/css/legacy-light.scss
+++ b/res/themes/legacy-light/css/legacy-light.scss
@@ -3,3 +3,4 @@
 @import "_fonts.scss";
 @import "_legacy-light.scss";
 @import "../../../../res/css/_components.scss";
+@import url("highlight.js/styles/atom-one-light.css");
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 1b9254d100..af302bf252 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -16,6 +16,25 @@ limitations under the License.
 
 $font-family: var(--font-family, $font-family);
 $monospace-font-family: var(--font-family-monospace, $monospace-font-family);
+
+// Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A741
+$accent: var(--accent);
+$alert: var(--alert);
+$links: var(--links);
+$primary-content: var(--primary-content);
+$secondary-content: var(--secondary-content);
+$tertiary-content: var(--tertiary-content);
+$quaternary-content: var(--quaternary-content);
+$quinary-content: var(--quinary-content);
+$system: var(--system);
+$background: var(--background);
+$panels: rgba($system, 0.9);
+$panel-base: var(--panel-base); // This color is not intended for use in the app
+$panel-selected: rgba($panel-base, 0.3);
+$panel-hover: rgba($panel-base, 0.1);
+$panel-actions: rgba($panel-base, 0.2);
+$space-nav: rgba($panel-base, 0.1);
+
 //
 // --accent-color
 $accent-color: var(--accent-color);
@@ -38,7 +57,7 @@ $lightbox-border-color: var(--timeline-background-color);
 $menu-bg-color: var(--timeline-background-color);
 $avatar-bg-color: var(--timeline-background-color);
 $message-action-bar-bg-color: var(--timeline-background-color);
-$primary-bg-color: var(--timeline-background-color);
+$background: var(--timeline-background-color);
 $togglesw-ball-color: var(--timeline-background-color);
 $droptarget-bg-color: var(--timeline-background-color-50pct); //still needs alpha at .5
 $authpage-modal-bg-color: var(--timeline-background-color-50pct); //still needs alpha at .59
@@ -48,7 +67,6 @@ $roomheader-bg-color: var(--timeline-background-color);
 $roomtile-selected-bg-color: var(--roomlist-highlights-color);
 //
 // --sidebar-color
-$interactive-tooltip-bg-color: var(--sidebar-color);
 $groupFilterPanel-bg-color: var(--sidebar-color);
 $tooltip-timeline-bg-color: var(--sidebar-color);
 $dialog-backdrop-color: var(--sidebar-color-50pct);
@@ -69,7 +87,7 @@ $roomlist-bg-color: var(--roomlist-background-color);
 //
 // --timeline-text-color
 $message-action-bar-fg-color: var(--timeline-text-color);
-$primary-fg-color: var(--timeline-text-color);
+$primary-content: var(--timeline-text-color);
 $settings-profile-overlay-placeholder-fg-color: var(--timeline-text-color);
 $roomtopic-color: var(--timeline-text-color-50pct);
 $tab-label-fg-color: var(--timeline-text-color);
@@ -82,6 +100,8 @@ $tab-label-fg-color: var(--timeline-text-color);
 // was #4e5054
 $authpage-lang-color: var(--timeline-text-color);
 $roomheader-color: var(--timeline-text-color);
+// was #232f32
+$authpage-primary-color: var(--timeline-text-color);
 // --roomlist-text-secondary-color
 $roomtile-preview-color: var(--roomlist-text-secondary-color);
 $roomlist-header-color: var(--roomlist-text-secondary-color);
@@ -139,4 +159,11 @@ $event-selected-color: var(--timeline-highlights-color);
 $event-highlight-bg-color: var(--timeline-highlights-color);
 //
 // redirect some variables away from their hardcoded values in the light theme
-$settings-grey-fg-color: $primary-fg-color;
+$settings-grey-fg-color: $primary-content;
+
+// --eventbubble colors
+$eventbubble-self-bg: var(--eventbubble-self-bg, $eventbubble-self-bg);
+$eventbubble-others-bg: var(--eventbubble-others-bg, $eventbubble-others-bg);
+$eventbubble-bg-hover: var(--eventbubble-bg-hover, $eventbubble-bg-hover);
+$eventbubble-avatar-outline: var(--eventbubble-avatar-outline, $eventbubble-avatar-outline);
+$eventbubble-reply-color: var(--eventbubble-reply-color, $eventbubble-reply-color);
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index c889f43d0b..26cd1766c1 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -8,24 +8,38 @@
 /* Noto Color Emoji contains digits, in fixed-width, therefore causing
    digits in flowed text to stand out.
    TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: Inter, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
+$font-family: 'Inter', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Arial', 'Helvetica', sans-serif, 'Noto Color Emoji';
 
-$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
+$monospace-font-family: 'Inconsolata', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Courier', monospace, 'Noto Color Emoji';
+
+// Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A120
+$accent: #0DBD8B;
+$alert: #FF5B55;
+$links: #0086e6;
+$primary-content: #17191C;
+$secondary-content: #737D8C;
+$tertiary-content: #8D97A5;
+$quaternary-content: #c1c6cd;
+$quinary-content: #E3E8F0;
+$system: #F4F6FA;
+$background: #ffffff;
+$panels: rgba($system, 0.9);
+$panel-selected: rgba($tertiary-content, 0.3);
+$panel-hover: rgba($tertiary-content, 0.1);
+$panel-actions: rgba($tertiary-content, 0.2);
+$space-nav: rgba($tertiary-content, 0.15);
+
+// TODO: Move userId colors here
 
 // unified palette
 // try to use these colors when possible
-$accent-color: #0DBD8B;
+$accent-color: $accent;
 $accent-bg-color: rgba(3, 179, 129, 0.16);
 $notice-primary-color: #ff4b55;
 $notice-primary-bg-color: rgba(255, 75, 85, 0.16);
-$primary-fg-color: #2e2f32;
-$secondary-fg-color: #737D8C;
-$tertiary-fg-color: #8D99A5;
-$quaternary-fg-color: #C1C6CD;
 $header-panel-bg-color: #f3f8fd;
 
 // typical text (dark-on-white in light skin)
-$primary-bg-color: #ffffff;
 $muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
 
 // used for dialog box text
@@ -35,12 +49,12 @@ $light-fg-color: #747474;
 $focus-bg-color: #dddddd;
 
 // button UI (white-on-green in light skin)
-$accent-fg-color: #ffffff;
+$accent-fg-color: $background;
 $accent-color-50pct: rgba($accent-color, 0.5);
 $accent-color-darker: #92caad;
 $accent-color-alt: #238CF5;
 
-$selection-fg-color: $primary-bg-color;
+$selection-fg-color: $background;
 
 $focus-brightness: 105%;
 
@@ -79,7 +93,7 @@ $primary-hairline-color: transparent;
 
 // used for the border of input text fields
 $input-border-color: #e7e7e7;
-$input-darker-bg-color: #e3e8f0;
+$input-darker-bg-color: $quinary-content;
 $input-darker-fg-color: #9fa9ba;
 $input-lighter-bg-color: #f2f5f8;
 $input-lighter-fg-color: $input-darker-fg-color;
@@ -87,7 +101,7 @@ $input-focused-border-color: #238cf5;
 $input-valid-border-color: $accent-color;
 $input-invalid-border-color: $warning-color;
 
-$field-focused-label-bg-color: #ffffff;
+$field-focused-label-bg-color: $background;
 
 $button-bg-color: $accent-color;
 $button-fg-color: white;
@@ -109,8 +123,8 @@ $menu-bg-color: #fff;
 $menu-box-shadow-color: rgba(118, 131, 156, 0.6);
 $menu-selected-color: #f5f8fa;
 
-$avatar-initial-color: #ffffff;
-$avatar-bg-color: #ffffff;
+$avatar-initial-color: $background;
+$avatar-bg-color: $background;
 
 $h3-color: #3d3b39;
 
@@ -138,7 +152,7 @@ $blockquote-bar-color: #ddd;
 $blockquote-fg-color: #777;
 
 $settings-grey-fg-color: #a2a2a2;
-$settings-profile-placeholder-bg-color: #f4f6fa;
+$settings-profile-placeholder-bg-color: $system;
 $settings-profile-overlay-placeholder-fg-color: #2e2f32;
 $settings-profile-button-bg-color: #e7e7e7;
 $settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
@@ -154,42 +168,39 @@ $rte-group-pill-color: #aaa;
 
 $topleftmenu-color: #212121;
 $roomheader-color: #45474a;
-$roomheader-bg-color: $primary-bg-color;
 $roomheader-addroom-bg-color: rgba(92, 100, 112, 0.2);
 $roomheader-addroom-fg-color: #5c6470;
 $groupFilterPanel-button-color: #91A1C0;
 $groupheader-button-color: #91A1C0;
 $rightpanel-button-color: #91A1C0;
-$icon-button-color: #C1C6CD;
+$icon-button-color: $quaternary-content;
 $roomtopic-color: #9e9e9e;
 $eventtile-meta-color: $roomtopic-color;
 
 $composer-e2e-icon-color: #91A1C0;
 $header-divider-color: #91A1C0;
 
-// this probably shouldn't have it's own colour
-$voipcall-plinth-color: #F4F6FA;
+$voipcall-plinth-color: $system;
 
 // ********************
 
-$theme-button-bg-color: #e3e8f0;
+$theme-button-bg-color: $quinary-content;
 
 $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
-$roomlist-filter-active-bg-color: #ffffff;
 $roomlist-bg-color: rgba(245, 245, 245, 0.90);
-$roomlist-header-color: $tertiary-fg-color;
-$roomsublist-divider-color: $primary-fg-color;
+$roomlist-header-color: $tertiary-content;
+$roomsublist-divider-color: $primary-content;
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
 
-$roomtile-preview-color: $secondary-fg-color;
+$roomtile-preview-color: $secondary-content;
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: #FFF;
 
 $presence-online: $accent-color;
 $presence-away: #d9b072;
-$presence-offline: #E3E8F0;
+$presence-offline: $quinary-content;
 
 // ********************
 
@@ -252,7 +263,7 @@ $lightbox-border-color: #ffffff;
 
 // Tabbed views
 $tab-label-fg-color: #45474a;
-$tab-label-active-fg-color: #ffffff;
+$tab-label-active-fg-color: $background;
 $tab-label-bg-color: transparent;
 $tab-label-active-bg-color: $accent-color;
 $tab-label-icon-bg-color: #454545;
@@ -262,9 +273,9 @@ $tab-label-active-icon-bg-color: $tab-label-active-fg-color;
 $button-primary-fg-color: #ffffff;
 $button-primary-bg-color: $accent-color;
 $button-secondary-bg-color: $accent-fg-color;
-$button-danger-fg-color: #ffffff;
+$button-danger-fg-color: $background;
 $button-danger-bg-color: $notice-primary-color;
-$button-danger-disabled-fg-color: #ffffff;
+$button-danger-disabled-fg-color: $background;
 $button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
 $button-link-fg-color: $accent-color;
 $button-link-bg-color: transparent;
@@ -289,7 +300,7 @@ $memberstatus-placeholder-color: $muted-fg-color;
 
 $authpage-bg-color: #2e3649;
 $authpage-modal-bg-color: rgba(245, 245, 245, 0.90);
-$authpage-body-bg-color: #ffffff;
+$authpage-body-bg-color: $background;
 $authpage-focus-bg-color: #dddddd;
 $authpage-lang-color: #4e5054;
 $authpage-primary-color: #232f32;
@@ -298,8 +309,8 @@ $authpage-secondary-color: #61708b;
 $dark-panel-bg-color: $secondary-accent-color;
 $panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1);
 
-$message-action-bar-bg-color: $primary-bg-color;
-$message-action-bar-fg-color: $primary-fg-color;
+$message-action-bar-bg-color: $background;
+$message-action-bar-fg-color: $primary-content;
 $message-action-bar-border-color: #e9edf1;
 $message-action-bar-hover-border-color: $focus-bg-color;
 
@@ -313,42 +324,37 @@ $kbd-border-color: $reaction-row-button-border-color;
 
 $inverted-bg-color: #27303a;
 $tooltip-timeline-bg-color: $inverted-bg-color;
-$tooltip-timeline-fg-color: #ffffff;
-
-$interactive-tooltip-bg-color: #27303a;
-$interactive-tooltip-fg-color: #ffffff;
+$tooltip-timeline-fg-color: $background;
 
 $breadcrumb-placeholder-bg-color: #e8eef5;
 
-$user-tile-hover-bg-color: $header-panel-bg-color;
-
-$message-body-panel-fg-color: $secondary-fg-color;
-$message-body-panel-bg-color: #E3E8F0; // "Separator"
-$message-body-panel-icon-fg-color: $secondary-fg-color;
-$message-body-panel-icon-bg-color: $primary-bg-color;
-
 // These two don't change between themes. They are the $warning-color, but we don't
 // want custom themes to affect them by accident.
 $voice-record-stop-symbol-color: #ff4b55;
 $voice-record-live-circle-color: #ff4b55;
 
-$voice-record-stop-border-color: #E3E8F0; // "Separator"
-$voice-record-waveform-bg-color: $message-body-panel-bg-color;
-$voice-record-waveform-fg-color: $message-body-panel-fg-color;
-$voice-record-waveform-incomplete-fg-color: $quaternary-fg-color;
-$voice-record-icon-color: $tertiary-fg-color;
-$voice-playback-button-bg-color: $message-body-panel-icon-bg-color;
-$voice-playback-button-fg-color: $message-body-panel-icon-fg-color;
+$voice-record-stop-border-color: $quinary-content;
+$voice-record-waveform-incomplete-fg-color: $quaternary-content;
+$voice-record-icon-color: $tertiary-content;
+$voice-playback-button-bg-color: $system;
+$voice-playback-button-fg-color: $secondary-content;
 
 // FontSlider colors
 $appearance-tab-border-color: $input-darker-bg-color;
 
-// blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 40px;
-$groupFilterPanel-background-blur-amount: 20px;
-
+// blur amounts for left left panel (only for element theme)
+:root {
+    --lp-background-blur: 40px;
+}
 $composer-shadow-color: rgba(0, 0, 0, 0.04);
 
+// Bubble tiles
+$eventbubble-self-bg: #F0FBF8;
+$eventbubble-others-bg: $system;
+$eventbubble-bg-hover: #FAFBFD;
+$eventbubble-avatar-outline: $background;
+$eventbubble-reply-color: $quaternary-content;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
@@ -385,7 +391,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.04);
 @define-mixin mx_DialogButton_secondary {
     // flip colours for the secondary ones
     font-weight: 600;
-    border: 1px solid $accent-color ! important;
+    border: 1px solid $accent-color !important;
     color: $accent-color;
     background-color: $button-secondary-bg-color;
 }
diff --git a/res/themes/light/css/_mods.scss b/res/themes/light/css/_mods.scss
index fbca58dfb1..15f6d4b0fe 100644
--- a/res/themes/light/css/_mods.scss
+++ b/res/themes/light/css/_mods.scss
@@ -4,27 +4,6 @@
 // set the user avatar (if any) as a background so
 // it can be blurred by the tag panel and room list
 
-@supports (backdrop-filter: none) {
-    .mx_LeftPanel {
-        background-image: var(--avatar-url, unset);
-        background-repeat: no-repeat;
-        background-size: cover;
-        background-position: left top;
-    }
-
-    .mx_GroupFilterPanel {
-        backdrop-filter: blur($groupFilterPanel-background-blur-amount);
-    }
-
-    .mx_SpacePanel {
-        backdrop-filter: blur($groupFilterPanel-background-blur-amount);
-    }
-
-    .mx_LeftPanel .mx_LeftPanel_roomListContainer {
-        backdrop-filter: blur($roomlist-background-blur-amount);
-    }
-}
-
 .mx_RoomSublist_showNButton {
     background-color: transparent !important;
 }
diff --git a/res/themes/light/css/light.scss b/res/themes/light/css/light.scss
index f31ce5c139..4e912bc756 100644
--- a/res/themes/light/css/light.scss
+++ b/res/themes/light/css/light.scss
@@ -4,3 +4,4 @@
 @import "_light.scss";
 @import "_mods.scss";
 @import "../../../../res/css/_components.scss";
+@import url("highlight.js/styles/atom-one-light.css");
diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile
index 3fdd0d7bf6..6d33987d8c 100644
--- a/scripts/ci/Dockerfile
+++ b/scripts/ci/Dockerfile
@@ -3,6 +3,6 @@
 # docker push vectorim/element-web-ci-e2etests-env:latest
 FROM node:14-buster
 RUN apt-get update
-RUN apt-get -y install build-essential python3-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev uuid-runtime
+RUN apt-get -y install jq build-essential python3-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev uuid-runtime
 # dependencies for chrome (installed by puppeteer)
-RUN apt-get -y install gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
+RUN apt-get -y install gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm-dev libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
index bbda74ef9d..fcbf6b1198 100755
--- a/scripts/ci/install-deps.sh
+++ b/scripts/ci/install-deps.sh
@@ -6,8 +6,8 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk
 
 pushd matrix-js-sdk
 yarn link
-yarn install $@
+yarn install --pure-lockfile $@
 popd
 
 yarn link matrix-js-sdk
-yarn install $@
+yarn install --pure-lockfile $@
diff --git a/scripts/ci/js-sdk-to-release.js b/scripts/ci/js-sdk-to-release.js
new file mode 100755
index 0000000000..e1fecfde03
--- /dev/null
+++ b/scripts/ci/js-sdk-to-release.js
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+const fsProm = require('fs/promises');
+
+const PKGJSON = 'node_modules/matrix-js-sdk/package.json';
+
+async function main() {
+    const pkgJson = JSON.parse(await fsProm.readFile(PKGJSON, 'utf8'));
+    for (const field of ['main', 'typings']) {
+        if (pkgJson["matrix_lib_"+field] !== undefined) {
+            pkgJson[field] = pkgJson["matrix_lib_"+field];
+        }
+    }
+    await fsProm.writeFile(PKGJSON, JSON.stringify(pkgJson, null, 2));
+}
+
+main();
diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh
index 039f90c7df..2e163456fe 100755
--- a/scripts/ci/layered.sh
+++ b/scripts/ci/layered.sh
@@ -13,13 +13,13 @@
 scripts/fetchdep.sh matrix-org matrix-js-sdk
 pushd matrix-js-sdk
 yarn link
-yarn install
+yarn install --pure-lockfile
 popd
 
 # Now set up the react-sdk
 yarn link matrix-js-sdk
 yarn link
-yarn install
+yarn install --pure-lockfile
 yarn reskindex
 
 # Finally, set up element-web
@@ -27,6 +27,6 @@ scripts/fetchdep.sh vector-im element-web
 pushd element-web
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
-yarn install
+yarn install --pure-lockfile
 yarn build:res
 popd
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/prepare-end-to-end-tests.sh
similarity index 65%
rename from scripts/ci/end-to-end-tests.sh
rename to scripts/ci/prepare-end-to-end-tests.sh
index edb8870d8e..147e1f6445 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/prepare-end-to-end-tests.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
-#
-# script which is run by the CI build (after `yarn test`).
-#
-# clones element-web develop and runs the tests against our version of react-sdk.
 
 set -ev
 
@@ -19,7 +15,7 @@ cd element-web
 element_web_dir=`pwd`
 CI_PACKAGE=true yarn build
 cd ..
-# run end to end tests
+# prepare end to end tests
 pushd test/end-to-end-tests
 ln -s $element_web_dir element/element-web
 # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
@@ -28,9 +24,4 @@ echo "--- Install synapse & other dependencies"
 ./install.sh
 # install static webserver to server symlinked local copy of element
 ./element/install-webserver.sh
-rm -r logs || true
-mkdir logs
-echo "+++ Running end-to-end tests"
-TESTS_STARTED=1
-./run.sh --no-sandbox --log-directory logs/
 popd
diff --git a/scripts/ci/run-end-to-end-tests.sh b/scripts/ci/run-end-to-end-tests.sh
new file mode 100755
index 0000000000..3c99391fc7
--- /dev/null
+++ b/scripts/ci/run-end-to-end-tests.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ev
+
+handle_error() {
+    EXIT_CODE=$?
+    exit $EXIT_CODE
+}
+
+trap 'handle_error' ERR
+
+# run end to end tests
+pushd test/end-to-end-tests
+rm -r logs || true
+mkdir logs
+echo "--- Running end-to-end tests"
+TESTS_STARTED=1
+./run.sh --no-sandbox --log-directory logs/
+popd
diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index fe1f49c361..ec021236d9 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -10,6 +10,7 @@ defbranch="$3"
 
 rm -r "$defrepo" || true
 
+# A function that clones a branch of a repo based on the org, repo and branch
 clone() {
     org=$1
     repo=$2
@@ -21,30 +22,45 @@ clone() {
     fi
 }
 
-# Try the PR author's branch in case it exists on the deps as well.
-# First we check if BUILDKITE_BRANCH is defined,
-# if it isn't we can assume this is a Netlify build
-if [ -z ${BUILDKITE_BRANCH+x} ]; then 
-	# Netlify doesn't give us info about the fork so we have to get it from GitHub API
-	apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/"
-	apiEndpoint+=$REVIEW_ID
-	head=$(curl $apiEndpoint | jq -r '.head.label')
-else 
-	head=$BUILDKITE_BRANCH
+# A function that gets info about a PR from the GitHub API based on its number
+getPRInfo() {
+    number=$1
+    if [ -n "$number" ]; then
+        echo "Getting info about a PR with number $number"
+
+        apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/"
+        apiEndpoint+=$number
+
+        head=$(curl $apiEndpoint | jq -r '.head.label')
+    fi
+}
+
+# Some CIs don't give us enough info, so we just get the PR number and ask the
+# GH API for more info - "fork:branch". Some give us this directly.
+if [ -n "$BUILDKITE_BRANCH" ]; then
+    # BuildKite
+    head=$BUILDKITE_BRANCH
+elif [ -n "$PR_NUMBER" ]; then
+    # GitHub
+    getPRInfo $PR_NUMBER
+elif [ -n "$REVIEW_ID" ]; then
+    # Netlify
+    getPRInfo $REVIEW_ID
 fi
 
-# If head is set, it will contain either:
-#   * "branch" when the author's branch and target branch are in the same repo
-#   * "fork:branch" when the author's branch is in their fork or if this is a Netlify build
-# We can split on `:` into an array to check.
+# $head will always be in the format "fork:branch", so we split it by ":" into
+# an array. The first element will then be the fork and the second the branch.
+# Based on that we clone
 BRANCH_ARRAY=(${head//:/ })
-if [[ "${#BRANCH_ARRAY[@]}" == "1" ]]; then
-    clone $deforg $defrepo $BUILDKITE_BRANCH
-elif [[ "${#BRANCH_ARRAY[@]}" == "2" ]]; then
-    clone ${BRANCH_ARRAY[0]} $defrepo ${BRANCH_ARRAY[1]}
-fi
+clone ${BRANCH_ARRAY[0]} $defrepo ${BRANCH_ARRAY[1]}
+
 # Try the target branch of the push or PR.
-clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
+if [ -n $GITHUB_BASE_REF ]; then
+    clone $deforg $defrepo $GITHUB_BASE_REF
+elif [ -n $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]; then
+    clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
+fi
+
 # Try HEAD which is the branch name in Netlify (not BRANCH which is pull/xxxx/head for PR builds)
 clone $deforg $defrepo $HEAD
 # Use the default branch as the last resort.
diff --git a/scripts/generate-eslint-error-ignore-file b/scripts/generate-eslint-error-ignore-file
deleted file mode 100755
index 54aacfc9fa..0000000000
--- a/scripts/generate-eslint-error-ignore-file
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# generates .eslintignore.errorfiles to list the files which have errors in,
-# so that they can be ignored in future automated linting.
-
-out=.eslintignore.errorfiles
-
-cd `dirname $0`/..
-
-echo "generating $out"
-
-{
-    cat <<EOF
-# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
-
-EOF
-
-    ./node_modules/.bin/eslint -f json src test |
-        jq -r '.[] | select((.errorCount + .warningCount) > 0) | .filePath' |
-        sed -e 's/.*matrix-react-sdk\///';
-} > "$out"
-# also append rules from eslintignore file
-cat .eslintignore >> $out
diff --git a/src/@types/common.ts b/src/@types/common.ts
index b887bd4090..36ef7a9ace 100644
--- a/src/@types/common.ts
+++ b/src/@types/common.ts
@@ -14,11 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { JSXElementConstructor } from "react";
+import React, { JSXElementConstructor } from "react";
 
 // Based on https://stackoverflow.com/a/53229857/3532235
-export type Without<T, U> = {[P in Exclude<keyof T, keyof U>] ? : never};
+export type Without<T, U> = {[P in Exclude<keyof T, keyof U>]?: never};
 export type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
 export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 
 export type ComponentClass = keyof JSX.IntrinsicElements | JSXElementConstructor<any>;
+export type ReactAnyComponent = React.Component | React.ExoticComponent;
diff --git a/src/@types/diff-dom.ts b/src/@types/diff-dom.ts
new file mode 100644
index 0000000000..38ff6432cf
--- /dev/null
+++ b/src/@types/diff-dom.ts
@@ -0,0 +1,38 @@
+/*
+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.
+*/
+
+declare module "diff-dom" {
+    export interface IDiff {
+        action: string;
+        name: string;
+        text?: string;
+        route: number[];
+        value: string;
+        element: unknown;
+        oldValue: string;
+        newValue: string;
+    }
+
+    interface IOpts {
+    }
+
+    export class DiffDOM {
+        public constructor(opts?: IOpts);
+        public apply(tree: unknown, diffs: IDiff[]): unknown;
+        public undo(tree: unknown, diffs: IDiff[]): unknown;
+        public diff(a: HTMLElement | string, b: HTMLElement | string): IDiff[];
+    }
+}
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 22280b8a28..38f237b9c3 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -15,7 +15,10 @@ limitations under the License.
 */
 
 import "matrix-js-sdk/src/@types/global"; // load matrix-js-sdk's type extensions first
-import * as ModernizrStatic from "modernizr";
+// Load types for the WG CSS Font Loading APIs https://github.com/Microsoft/TypeScript/issues/13569
+import "@types/css-font-loading-module";
+import "@types/modernizr";
+
 import ContentMessages from "../ContentMessages";
 import { IMatrixClientPeg } from "../MatrixClientPeg";
 import ToastStore from "../stores/ToastStore";
@@ -23,31 +26,37 @@ import DeviceListener from "../DeviceListener";
 import { RoomListStoreClass } from "../stores/room-list/RoomListStore";
 import { PlatformPeg } from "../PlatformPeg";
 import RoomListLayoutStore from "../stores/room-list/RoomListLayoutStore";
-import {IntegrationManagers} from "../integrations/IntegrationManagers";
-import {ModalManager} from "../Modal";
+import { IntegrationManagers } from "../integrations/IntegrationManagers";
+import { ModalManager } from "../Modal";
 import SettingsStore from "../settings/SettingsStore";
-import {ActiveRoomObserver} from "../ActiveRoomObserver";
-import {Notifier} from "../Notifier";
-import type {Renderer} from "react-dom";
+import { ActiveRoomObserver } from "../ActiveRoomObserver";
+import { Notifier } from "../Notifier";
+import type { Renderer } from "react-dom";
 import RightPanelStore from "../stores/RightPanelStore";
 import WidgetStore from "../stores/WidgetStore";
 import CallHandler from "../CallHandler";
-import {Analytics} from "../Analytics";
+import { Analytics } from "../Analytics";
 import CountlyAnalytics from "../CountlyAnalytics";
 import UserActivity from "../UserActivity";
-import {ModalWidgetStore} from "../stores/ModalWidgetStore";
+import { ModalWidgetStore } from "../stores/ModalWidgetStore";
 import { WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
 import VoipUserMapper from "../VoipUserMapper";
-import {SpaceStoreClass} from "../stores/SpaceStore";
+import { SpaceStoreClass } from "../stores/SpaceStore";
 import TypingStore from "../stores/TypingStore";
 import { EventIndexPeg } from "../indexing/EventIndexPeg";
-import {VoiceRecordingStore} from "../stores/VoiceRecordingStore";
+import { VoiceRecordingStore } from "../stores/VoiceRecordingStore";
 import PerformanceMonitor from "../performance";
 import UIStore from "../stores/UIStore";
+import { SetupEncryptionStore } from "../stores/SetupEncryptionStore";
+import { RoomScrollStateStore } from "../stores/RoomScrollStateStore";
+import { ConsoleLogger, IndexedDBLogStore } from "../rageshake/rageshake";
+import ActiveWidgetStore from "../stores/ActiveWidgetStore";
+import { Skinner } from "../Skinner";
+
+/* eslint-disable @typescript-eslint/naming-convention */
 
 declare global {
     interface Window {
-        Modernizr: ModernizrStatic;
         matrixChat: ReturnType<Renderer>;
         mxMatrixClientPeg: IMatrixClientPeg;
         Olm: {
@@ -84,6 +93,31 @@ declare global {
         mxPerformanceMonitor: PerformanceMonitor;
         mxPerformanceEntryNames: any;
         mxUIStore: UIStore;
+        mxSetupEncryptionStore?: SetupEncryptionStore;
+        mxRoomScrollStateStore?: RoomScrollStateStore;
+        mxActiveWidgetStore?: ActiveWidgetStore;
+        mxSkinner?: Skinner;
+        mxOnRecaptchaLoaded?: () => void;
+        electron?: Electron;
+    }
+
+    interface DesktopCapturerSource {
+        id: string;
+        name: string;
+        thumbnailURL: string;
+    }
+
+    interface GetSourcesOptions {
+        types: Array<string>;
+        thumbnailSize?: {
+            height: number;
+            width: number;
+        };
+        fetchWindowIcons?: boolean;
+    }
+
+    interface Electron {
+        getDesktopCapturerSources(options: GetSourcesOptions): Promise<Array<DesktopCapturerSource>>;
     }
 
     interface Document {
@@ -108,20 +142,7 @@ declare global {
     }
 
     interface StorageEstimate {
-        usageDetails?: {[key: string]: number};
-    }
-
-    export interface ISettledFulfilled<T> {
-        status: "fulfilled";
-        value: T;
-    }
-    export interface ISettledRejected {
-        status: "rejected";
-        reason: any;
-    }
-
-    interface PromiseConstructor {
-        allSettled<T>(promises: Promise<T>[]): Promise<Array<ISettledFulfilled<T> | ISettledRejected>>;
+        usageDetails?: { [key: string]: number };
     }
 
     interface HTMLAudioElement {
@@ -138,11 +159,28 @@ declare global {
         setSinkId(outputId: string);
     }
 
+    interface HTMLStyleElement {
+        disabled?: boolean;
+    }
+
+    // Add Chrome-specific `instant` ScrollBehaviour
+    type _ScrollBehavior = ScrollBehavior | "instant";
+
+    interface _ScrollOptions {
+        behavior?: _ScrollBehavior;
+    }
+
+    interface _ScrollIntoViewOptions extends _ScrollOptions {
+        block?: ScrollLogicalPosition;
+        inline?: ScrollLogicalPosition;
+    }
+
     interface Element {
         // Safari & IE11 only have this prefixed: we used prefixed versions
         // previously so let's continue to support them for now
         webkitRequestFullScreen(options?: FullscreenOptions): Promise<void>;
         msRequestFullscreen(options?: FullscreenOptions): Promise<void>;
+        scrollIntoView(arg?: boolean | _ScrollIntoViewOptions): void;
     }
 
     interface Error {
@@ -179,4 +217,30 @@ declare global {
             parameterDescriptors?: AudioParamDescriptor[];
         }
     );
+
+    // eslint-disable-next-line no-var
+    var grecaptcha:
+        | undefined
+        | {
+              reset: (id: string) => void;
+              render: (
+                  divId: string,
+                  options: {
+                      sitekey: string;
+                      callback: (response: string) => void;
+                  },
+              ) => string;
+              isReady: () => boolean;
+          };
+
+    // eslint-disable-next-line no-var, camelcase
+    var mx_rage_logger: ConsoleLogger;
+    // eslint-disable-next-line no-var, camelcase
+    var mx_rage_initPromise: Promise<void>;
+    // eslint-disable-next-line no-var, camelcase
+    var mx_rage_initStoragePromise: Promise<void>;
+    // eslint-disable-next-line no-var, camelcase
+    var mx_rage_store: IndexedDBLogStore;
 }
+
+/* eslint-enable @typescript-eslint/naming-convention */
diff --git a/res/css/views/messages/_MVoiceMessageBody.scss b/src/@types/raw-loader.d.ts
similarity index 85%
rename from res/css/views/messages/_MVoiceMessageBody.scss
rename to src/@types/raw-loader.d.ts
index 3dfb98f778..efd825204e 100644
--- a/res/css/views/messages/_MVoiceMessageBody.scss
+++ b/src/@types/raw-loader.d.ts
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MVoiceMessageBody {
-    display: inline-block; // makes the playback controls magically line up
+declare module '!!raw-loader!*' {
+    const contents: string;
+    export default contents;
 }
diff --git a/res/css/views/avatars/_PulsedAvatar.scss b/src/@types/svg.d.ts
similarity index 61%
rename from res/css/views/avatars/_PulsedAvatar.scss
rename to src/@types/svg.d.ts
index ce9e3382ab..96f671c52f 100644
--- a/res/css/views/avatars/_PulsedAvatar.scss
+++ b/src/@types/svg.d.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 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.
@@ -14,17 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_PulsedAvatar {
-    @keyframes shadow-pulse {
-        0% {
-            box-shadow: 0 0 0 0px rgba($accent-color, 0.2);
-        }
-        100% {
-            box-shadow: 0 0 0 6px rgba($accent-color, 0);
-        }
-    }
-
-    img {
-        animation: shadow-pulse 1s infinite;
-    }
+declare module "*.svg" {
+    const path: string;
+    export default path;
 }
diff --git a/src/RoomNotifsTypes.ts b/src/@types/worker-loader.d.ts
similarity index 70%
rename from src/RoomNotifsTypes.ts
rename to src/@types/worker-loader.d.ts
index 0e7093e434..a8f5d8e9a4 100644
--- a/src/RoomNotifsTypes.ts
+++ b/src/@types/worker-loader.d.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+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.
@@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {
-    ALL_MESSAGES,
-    ALL_MESSAGES_LOUD,
-    MENTIONS_ONLY,
-    MUTE,
-} from "./RoomNotifs";
+declare module "*.worker.ts" {
+    class WebpackWorker extends Worker {
+        constructor();
+    }
 
-export type Volume = ALL_MESSAGES_LOUD | ALL_MESSAGES | MENTIONS_ONLY | MUTE;
+    export default WebpackWorker;
+}
diff --git a/src/ActiveRoomObserver.ts b/src/ActiveRoomObserver.ts
index 1126dc9496..c7423fab8f 100644
--- a/src/ActiveRoomObserver.ts
+++ b/src/ActiveRoomObserver.ts
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { EventSubscription } from 'fbemitter';
 import RoomViewStore from './stores/RoomViewStore';
 
 type Listener = (isActive: boolean) => void;
@@ -30,7 +31,7 @@ type Listener = (isActive: boolean) => void;
 export class ActiveRoomObserver {
     private listeners: {[key: string]: Listener[]} = {};
     private _activeRoomId = RoomViewStore.getRoomId();
-    private readonly roomStoreToken: string;
+    private readonly roomStoreToken: EventSubscription;
 
     constructor() {
         // TODO: We could self-destruct when the last listener goes away, or at least stop listening.
diff --git a/src/AddThreepid.js b/src/AddThreepid.ts
similarity index 90%
rename from src/AddThreepid.js
rename to src/AddThreepid.ts
index f06f7c187d..54250c5eb3 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.ts
@@ -16,14 +16,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
-import * as sdk from './index';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 import IdentityAuthClient from './IdentityAuthClient';
-import {SSOAuthEntry} from "./components/views/auth/InteractiveAuthEntryComponents";
+import { SSOAuthEntry } from "./components/views/auth/InteractiveAuthEntryComponents";
+import { IRequestMsisdnTokenResponse, IRequestTokenResponse } from "matrix-js-sdk";
+import InteractiveAuthDialog from "./components/views/dialogs/InteractiveAuthDialog";
 
-function getIdServerDomain() {
+function getIdServerDomain(): string {
     return MatrixClientPeg.get().idBaseUrl.split("://")[1];
 }
 
@@ -40,10 +41,13 @@ function getIdServerDomain() {
  * https://gist.github.com/jryans/839a09bf0c5a70e2f36ed990d50ed928
  */
 export default class AddThreepid {
+    private sessionId: string;
+    private submitUrl: string;
+    private clientSecret: string;
+    private bind: boolean;
+
     constructor() {
         this.clientSecret = MatrixClientPeg.get().generateClientSecret();
-        this.sessionId = null;
-        this.submitUrl = null;
     }
 
     /**
@@ -52,7 +56,7 @@ export default class AddThreepid {
      * @param {string} emailAddress The email address to add
      * @return {Promise} Resolves when the email has been sent. Then call checkEmailLinkClicked().
      */
-    addEmailAddress(emailAddress) {
+    public addEmailAddress(emailAddress: string): Promise<IRequestTokenResponse> {
         return MatrixClientPeg.get().requestAdd3pidEmailToken(emailAddress, this.clientSecret, 1).then((res) => {
             this.sessionId = res.sid;
             return res;
@@ -72,7 +76,7 @@ export default class AddThreepid {
      * @param {string} emailAddress The email address to add
      * @return {Promise} Resolves when the email has been sent. Then call checkEmailLinkClicked().
      */
-    async bindEmailAddress(emailAddress) {
+    public async bindEmailAddress(emailAddress: string): Promise<IRequestTokenResponse> {
         this.bind = true;
         if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
             // For separate bind, request a token directly from the IS.
@@ -105,7 +109,7 @@ export default class AddThreepid {
      * @param {string} phoneNumber The national or international formatted phone number to add
      * @return {Promise} Resolves when the text message has been sent. Then call haveMsisdnToken().
      */
-    addMsisdn(phoneCountry, phoneNumber) {
+    public addMsisdn(phoneCountry: string, phoneNumber: string): Promise<IRequestMsisdnTokenResponse> {
         return MatrixClientPeg.get().requestAdd3pidMsisdnToken(
             phoneCountry, phoneNumber, this.clientSecret, 1,
         ).then((res) => {
@@ -129,7 +133,7 @@ export default class AddThreepid {
      * @param {string} phoneNumber The national or international formatted phone number to add
      * @return {Promise} Resolves when the text message has been sent. Then call haveMsisdnToken().
      */
-    async bindMsisdn(phoneCountry, phoneNumber) {
+    public async bindMsisdn(phoneCountry: string, phoneNumber: string): Promise<IRequestMsisdnTokenResponse> {
         this.bind = true;
         if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
             // For separate bind, request a token directly from the IS.
@@ -161,7 +165,7 @@ export default class AddThreepid {
      * with a "message" property which contains a human-readable message detailing why
      * the request failed.
      */
-    async checkEmailLinkClicked() {
+    public async checkEmailLinkClicked(): Promise<any[]> {
         try {
             if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
                 if (this.bind) {
@@ -175,7 +179,7 @@ export default class AddThreepid {
                     });
                 } else {
                     try {
-                        await this._makeAddThreepidOnlyRequest();
+                        await this.makeAddThreepidOnlyRequest();
 
                         // The spec has always required this to use UI auth but synapse briefly
                         // implemented it without, so this may just succeed and that's OK.
@@ -186,10 +190,6 @@ export default class AddThreepid {
                             throw e;
                         }
 
-                        // pop up an interactive auth dialog
-                        const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
-
-
                         const dialogAesthetics = {
                             [SSOAuthEntry.PHASE_PREAUTH]: {
                                 title: _t("Use Single Sign On to continue"),
@@ -209,7 +209,7 @@ export default class AddThreepid {
                             title: _t("Add Email Address"),
                             matrixClient: MatrixClientPeg.get(),
                             authData: e.data,
-                            makeRequest: this._makeAddThreepidOnlyRequest,
+                            makeRequest: this.makeAddThreepidOnlyRequest,
                             aestheticsForStagePhases: {
                                 [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
                                 [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
@@ -236,26 +236,26 @@ export default class AddThreepid {
     }
 
     /**
-     * @param {Object} auth UI auth object
+     * @param {{type: string, session?: string}} auth UI auth object
      * @return {Promise<Object>} Response from /3pid/add call (in current spec, an empty object)
      */
-    _makeAddThreepidOnlyRequest = (auth) => {
+    private makeAddThreepidOnlyRequest = (auth?: {type: string, session?: string}): Promise<{}> => {
         return MatrixClientPeg.get().addThreePidOnly({
             sid: this.sessionId,
             client_secret: this.clientSecret,
             auth,
         });
-    }
+    };
 
     /**
      * Takes a phone number verification code as entered by the user and validates
-     * it with the ID server, then if successful, adds the phone number.
+     * it with the identity server, then if successful, adds the phone number.
      * @param {string} msisdnToken phone number verification code as entered by the user
      * @return {Promise} Resolves if the phone number was added. Rejects with an object
      * with a "message" property which contains a human-readable message detailing why
      * the request failed.
      */
-    async haveMsisdnToken(msisdnToken) {
+    public async haveMsisdnToken(msisdnToken: string): Promise<any[]> {
         const authClient = new IdentityAuthClient();
         const supportsSeparateAddAndBind =
             await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind();
@@ -292,7 +292,7 @@ export default class AddThreepid {
                 });
             } else {
                 try {
-                    await this._makeAddThreepidOnlyRequest();
+                    await this.makeAddThreepidOnlyRequest();
 
                     // The spec has always required this to use UI auth but synapse briefly
                     // implemented it without, so this may just succeed and that's OK.
@@ -303,9 +303,6 @@ export default class AddThreepid {
                         throw e;
                     }
 
-                    // pop up an interactive auth dialog
-                    const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
-
                     const dialogAesthetics = {
                         [SSOAuthEntry.PHASE_PREAUTH]: {
                             title: _t("Use Single Sign On to continue"),
@@ -325,7 +322,7 @@ export default class AddThreepid {
                         title: _t("Add Phone Number"),
                         matrixClient: MatrixClientPeg.get(),
                         authData: e.data,
-                        makeRequest: this._makeAddThreepidOnlyRequest,
+                        makeRequest: this.makeAddThreepidOnlyRequest,
                         aestheticsForStagePhases: {
                             [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
                             [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
diff --git a/src/Analytics.tsx b/src/Analytics.tsx
index 212bfd3757..fc4664039f 100644
--- a/src/Analytics.tsx
+++ b/src/Analytics.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 
-import {getCurrentLanguage, _t, _td, IVariables} from './languageHandler';
+import { getCurrentLanguage, _t, _td, IVariables } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';
 import Modal from './Modal';
@@ -270,7 +270,7 @@ export class Analytics {
         localStorage.removeItem(LAST_VISIT_TS_KEY);
     }
 
-    private async _track(data: IData) {
+    private async track(data: IData) {
         if (this.disabled) return;
 
         const now = new Date();
@@ -304,7 +304,7 @@ export class Analytics {
     }
 
     public ping() {
-        this._track({
+        this.track({
             ping: "1",
         });
         localStorage.setItem(LAST_VISIT_TS_KEY, String(new Date().getTime())); // update last visit ts
@@ -324,14 +324,14 @@ export class Analytics {
             // But continue anyway because we still want to track the change
         }
 
-        this._track({
+        this.track({
             gt_ms: String(generationTimeMs),
         });
     }
 
     public trackEvent(category: string, action: string, name?: string, value?: string) {
         if (this.disabled) return;
-        this._track({
+        this.track({
             e_c: category,
             e_a: action,
             e_n: name,
@@ -390,21 +390,22 @@ export class Analytics {
             { expl: _td('Your device resolution'), value: resolution },
         ];
 
+        // FIXME: Using an import will result in test failures
         const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
         Modal.createTrackedDialog('Analytics Details', '', ErrorDialog, {
             title: _t('Analytics'),
             description: <div className="mx_AnalyticsModal">
-                <div>{_t('The information being sent to us to help make %(brand)s better includes:', {
+                <div>{ _t('The information being sent to us to help make %(brand)s better includes:', {
                     brand: SdkConfig.get().brand,
-                })}</div>
+                }) }</div>
                 <table>
                     { rows.map((row) => <tr key={row[0]}>
-                        <td>{_t(
+                        <td>{ _t(
                             customVariables[row[0]].expl,
                             customVariables[row[0]].getTextVariables ?
                                 customVariables[row[0]].getTextVariables() :
                                 null,
-                        )}</td>
+                        ) }</td>
                         { row[1] !== undefined && <td><code>{ row[1] }</code></td> }
                     </tr>) }
                     { otherVariables.map((item, index) =>
diff --git a/src/AsyncWrapper.js b/src/AsyncWrapper.tsx
similarity index 61%
rename from src/AsyncWrapper.js
rename to src/AsyncWrapper.tsx
index 359828b312..68e33e02fe 100644
--- a/src/AsyncWrapper.js
+++ b/src/AsyncWrapper.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2020 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.
@@ -15,52 +14,63 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { ComponentType } from "react";
+
 import * as sdk from './index';
-import PropTypes from 'prop-types';
 import { _t } from './languageHandler';
+import { IDialogProps } from "./components/views/dialogs/IDialogProps";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+type AsyncImport<T> = { default: T };
+
+interface IProps extends IDialogProps {
+    // A promise which resolves with the real component
+    prom: Promise<ComponentType | AsyncImport<ComponentType>>;
+}
+
+interface IState {
+    component?: ComponentType;
+    error?: Error;
+}
 
 /**
  * Wrap an asynchronous loader function with a react component which shows a
  * spinner until the real component loads.
  */
-export default class AsyncWrapper extends React.Component {
-    static propTypes = {
-        /** A promise which resolves with the real component
-         */
-        prom: PropTypes.object.isRequired,
-    };
+export default class AsyncWrapper extends React.Component<IProps, IState> {
+    private unmounted = false;
 
-    state = {
+    public state = {
         component: null,
         error: null,
     };
 
     componentDidMount() {
-        this._unmounted = false;
         // XXX: temporary logging to try to diagnose
         // https://github.com/vector-im/element-web/issues/3148
-        console.log('Starting load of AsyncWrapper for modal');
+        logger.log('Starting load of AsyncWrapper for modal');
         this.props.prom.then((result) => {
-            if (this._unmounted) {
-                return;
-            }
+            if (this.unmounted) return;
+
             // Take the 'default' member if it's there, then we support
             // passing in just an import()ed module, since ES6 async import
             // always returns a module *namespace*.
-            const component = result.default ? result.default : result;
-            this.setState({component});
+            const component = (result as AsyncImport<ComponentType>).default
+                ? (result as AsyncImport<ComponentType>).default
+                : result as ComponentType;
+            this.setState({ component });
         }).catch((e) => {
             console.warn('AsyncWrapper promise failed', e);
-            this.setState({error: e});
+            this.setState({ error: e });
         });
     }
 
     componentWillUnmount() {
-        this._unmounted = true;
+        this.unmounted = true;
     }
 
-    _onWrapperCancelClick = () => {
+    private onWrapperCancelClick = () => {
         this.props.onFinished(false);
     };
 
@@ -69,14 +79,13 @@ export default class AsyncWrapper extends React.Component {
             const Component = this.state.component;
             return <Component {...this.props} />;
         } else if (this.state.error) {
+            // FIXME: Using an import will result in test failures
             const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            return <BaseDialog onFinished={this.props.onFinished}
-                title={_t("Error")}
-            >
-                {_t("Unable to load! Check your network connectivity and try again.")}
+            return <BaseDialog onFinished={this.props.onFinished} title={_t("Error")}>
+                { _t("Unable to load! Check your network connectivity and try again.") }
                 <DialogButtons primaryButton={_t("Dismiss")}
-                    onPrimaryButtonClick={this._onWrapperCancelClick}
+                    onPrimaryButtonClick={this.onWrapperCancelClick}
                     hasCancel={false}
                 />
             </BaseDialog>;
diff --git a/src/Avatar.ts b/src/Avatar.ts
index e6b47f8a7f..93109a470e 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -14,18 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {User} from "matrix-js-sdk/src/models/user";
-import {Room} from "matrix-js-sdk/src/models/room";
+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 { ResizeMethod } from "matrix-js-sdk/src/@types/partials";
+import { split } from "lodash";
 
 import DMRoomMap from './utils/DMRoomMap';
-import {mediaFromMxc} from "./customisations/Media";
-import SettingsStore from "./settings/SettingsStore";
-
-export type ResizeMethod = "crop" | "scale";
+import { mediaFromMxc } from "./customisations/Media";
+import SpaceStore from "./stores/SpaceStore";
 
 // 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) {
+export function avatarUrlForMember(
+    member: RoomMember,
+    width: number,
+    height: number,
+    resizeMethod: ResizeMethod,
+): string {
     let url: string;
     if (member?.getMxcAvatarUrl()) {
         url = mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
@@ -39,7 +44,12 @@ export function avatarUrlForMember(member: RoomMember, width: number, height: nu
     return url;
 }
 
-export function avatarUrlForUser(user: User, width: number, height: number, resizeMethod?: ResizeMethod) {
+export function avatarUrlForUser(
+    user: Pick<User, "avatarUrl">,
+    width: number,
+    height: number,
+    resizeMethod?: ResizeMethod,
+): string | null {
     if (!user.avatarUrl) return null;
     return mediaFromMxc(user.avatarUrl).getThumbnailOfSourceHttp(width, height, resizeMethod);
 }
@@ -113,27 +123,13 @@ export function getInitialLetter(name: string): string {
         return undefined;
     }
 
-    let idx = 0;
     const initial = name[0];
     if ((initial === '@' || initial === '#' || initial === '+') && name[1]) {
-        idx++;
+        name = name.substring(1);
     }
 
-    // string.codePointAt(0) would do this, but that isn't supported by
-    // some browsers (notably PhantomJS).
-    let chars = 1;
-    const first = name.charCodeAt(idx);
-
-    // check if it’s the start of a surrogate pair
-    if (first >= 0xD800 && first <= 0xDBFF && name[idx+1]) {
-        const second = name.charCodeAt(idx+1);
-        if (second >= 0xDC00 && second <= 0xDFFF) {
-            chars++;
-        }
-    }
-
-    const firstChar = name.substring(idx, idx+chars);
-    return firstChar.toUpperCase();
+    // rely on the grapheme cluster splitter in lodash so that we don't break apart compound emojis
+    return split(name, "", 1)[0].toUpperCase();
 }
 
 export function avatarUrlForRoom(room: Room, width: number, height: number, resizeMethod?: ResizeMethod) {
@@ -144,7 +140,7 @@ export function avatarUrlForRoom(room: Room, width: number, height: number, resi
     }
 
     // space rooms cannot be DMs so skip the rest
-    if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) return null;
+    if (SpaceStore.spacesEnabled && room.isSpaceRoom()) return null;
 
     // If the room is not a DM don't fallback to a member avatar
     if (!DMRoomMap.shared().getUserIdForRoomId(room.roomId)) return null;
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 5483ea6874..5b4b15cc67 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -17,16 +17,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {encodeUnpaddedBase64} from "matrix-js-sdk/src/crypto/olmlib";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { encodeUnpaddedBase64 } from "matrix-js-sdk/src/crypto/olmlib";
 import dis from './dispatcher/dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
-import {ActionPayload} from "./dispatcher/payloads";
-import {CheckUpdatesPayload} from "./dispatcher/payloads/CheckUpdatesPayload";
-import {Action} from "./dispatcher/actions";
-import {hideToast as hideUpdateToast} from "./toasts/UpdateToast";
-import {MatrixClientPeg} from "./MatrixClientPeg";
-import {idbLoad, idbSave, idbDelete} from "./utils/StorageManager";
+import { ActionPayload } from "./dispatcher/payloads";
+import { CheckUpdatesPayload } from "./dispatcher/payloads/CheckUpdatesPayload";
+import { Action } from "./dispatcher/actions";
+import { hideToast as hideUpdateToast } from "./toasts/UpdateToast";
+import { MatrixClientPeg } from "./MatrixClientPeg";
+import { idbLoad, idbSave, idbDelete } from "./utils/StorageManager";
 
 export const SSO_HOMESERVER_URL_KEY = "mx_sso_hs_url";
 export const SSO_ID_SERVER_URL_KEY = "mx_sso_is_url";
@@ -335,7 +335,7 @@ export default abstract class BasePlatform {
 
         try {
             const key = await crypto.subtle.decrypt(
-                {name: "AES-GCM", iv: data.iv, additionalData}, data.cryptoKey,
+                { name: "AES-GCM", iv: data.iv, additionalData }, data.cryptoKey,
                 data.encrypted,
             );
             return encodeUnpaddedBase64(key);
@@ -348,7 +348,7 @@ export default abstract class BasePlatform {
     /**
      * Create and store a pickle key for encrypting libolm objects.
      * @param {string} userId the user ID for the user that the pickle key is for.
-     * @param {string} userId the device ID that the pickle key is for.
+     * @param {string} deviceId the device ID that the pickle key is for.
      * @returns {string|null} the pickle key, or null if the platform does not
      *     support storing pickle keys.
      */
@@ -360,7 +360,7 @@ export default abstract class BasePlatform {
         const randomArray = new Uint8Array(32);
         crypto.getRandomValues(randomArray);
         const cryptoKey = await crypto.subtle.generateKey(
-            {name: "AES-GCM", length: 256}, false, ["encrypt", "decrypt"],
+            { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"],
         );
         const iv = new Uint8Array(32);
         crypto.getRandomValues(iv);
@@ -375,11 +375,11 @@ export default abstract class BasePlatform {
         }
 
         const encrypted = await crypto.subtle.encrypt(
-            {name: "AES-GCM", iv, additionalData}, cryptoKey, randomArray,
+            { name: "AES-GCM", iv, additionalData }, cryptoKey, randomArray,
         );
 
         try {
-            await idbSave("pickleKey", [userId, deviceId], {encrypted, iv, cryptoKey});
+            await idbSave("pickleKey", [userId, deviceId], { encrypted, iv, cryptoKey });
         } catch (e) {
             return null;
         }
diff --git a/src/BlurhashEncoder.ts b/src/BlurhashEncoder.ts
new file mode 100644
index 0000000000..2aee370fe9
--- /dev/null
+++ b/src/BlurhashEncoder.ts
@@ -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.
+*/
+
+import { defer, IDeferred } from "matrix-js-sdk/src/utils";
+
+// @ts-ignore - `.ts` is needed here to make TS happy
+import BlurhashWorker from "./workers/blurhash.worker.ts";
+
+interface IBlurhashWorkerResponse {
+    seq: number;
+    blurhash: string;
+}
+
+export class BlurhashEncoder {
+    private static internalInstance = new BlurhashEncoder();
+
+    public static get instance(): BlurhashEncoder {
+        return BlurhashEncoder.internalInstance;
+    }
+
+    private readonly worker: Worker;
+    private seq = 0;
+    private pendingDeferredMap = new Map<number, IDeferred<string>>();
+
+    constructor() {
+        this.worker = new BlurhashWorker();
+        this.worker.onmessage = this.onMessage;
+    }
+
+    private onMessage = (ev: MessageEvent<IBlurhashWorkerResponse>) => {
+        const { seq, blurhash } = ev.data;
+        const deferred = this.pendingDeferredMap.get(seq);
+        if (deferred) {
+            this.pendingDeferredMap.delete(seq);
+            deferred.resolve(blurhash);
+        }
+    };
+
+    public getBlurhash(imageData: ImageData): Promise<string> {
+        const seq = this.seq++;
+        const deferred = defer<string>();
+        this.pendingDeferredMap.set(seq, deferred);
+        this.worker.postMessage({ seq, imageData });
+        return deferred.promise;
+    }
+}
+
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 0d87451b5f..bc9ccc4bcd 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -1,7 +1,8 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017, 2018 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2021 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.
@@ -55,19 +56,17 @@ limitations under the License.
 
 import React from 'react';
 
-import {MatrixClientPeg} from './MatrixClientPeg';
-import PlatformPeg from './PlatformPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
-import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore from './settings/SettingsStore';
-import {Jitsi} from "./widgets/Jitsi";
-import {WidgetType} from "./widgets/WidgetType";
-import {SettingLevel} from "./settings/SettingLevel";
+import { Jitsi } from "./widgets/Jitsi";
+import { WidgetType } from "./widgets/WidgetType";
+import { SettingLevel } from "./settings/SettingLevel";
 import { ActionPayload } from "./dispatcher/payloads";
-import {base32} from "rfc4648";
+import { base32 } from "rfc4648";
 
 import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
@@ -77,10 +76,9 @@ import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions";
 import { MatrixCall, CallErrorCode, CallState, CallEvent, CallParty, CallType } from "matrix-js-sdk/src/webrtc/call";
 import Analytics from './Analytics';
 import CountlyAnalytics from "./CountlyAnalytics";
-import {UIFeature} from "./settings/UIFeature";
+import { UIFeature } from "./settings/UIFeature";
 import { CallError } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from 'matrix-js-sdk/src/logger';
-import DesktopCapturerSourcePicker from "./components/views/elements/DesktopCapturerSourcePicker"
 import { Action } from './dispatcher/actions';
 import VoipUserMapper from './VoipUserMapper';
 import { addManagedHybridWidget, isManagedHybridWidgetEnabled } from './widgets/ManagedHybrid';
@@ -88,6 +86,12 @@ import { randomUppercaseString, randomLowercaseString } from "matrix-js-sdk/src/
 import EventEmitter from 'events';
 import SdkConfig from './SdkConfig';
 import { ensureDMExists, findDMForUser } from './createRoom';
+import { RuleId, TweakName, Tweaks } from "matrix-js-sdk/src/@types/PushRules";
+import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor';
+import { WidgetLayoutStore, Container } from './stores/widgets/WidgetLayoutStore';
+import { getIncomingCallToastKey } from './toasts/IncomingCallToast';
+import ToastStore from './stores/ToastStore';
+import IncomingCallToast from "./toasts/IncomingCallToast";
 
 export const PROTOCOL_PSTN = 'm.protocol.pstn';
 export const PROTOCOL_PSTN_PREFIXED = 'im.vector.protocol.pstn';
@@ -124,24 +128,20 @@ interface ThirdpartyLookupResponseFields {
 }
 
 interface ThirdpartyLookupResponse {
-    userid: string,
-    protocol: string,
-    fields: ThirdpartyLookupResponseFields,
+    userid: string;
+    protocol: string;
+    fields: ThirdpartyLookupResponseFields;
 }
 
-// Unlike 'CallType' in js-sdk, this one includes screen sharing
-// (because a screen sharing call is only a screen sharing call to the caller,
-// to the callee it's just a video call, at least as far as the current impl
-// is concerned).
 export enum PlaceCallType {
     Voice = 'voice',
     Video = 'video',
-    ScreenSharing = 'screensharing',
 }
 
 export enum CallHandlerEvent {
     CallsChanged = "calls_changed",
     CallChangeRoom = "call_change_room",
+    SilencedCallsChanged = "silenced_calls_changed",
 }
 
 export default class CallHandler extends EventEmitter {
@@ -154,7 +154,7 @@ export default class CallHandler extends EventEmitter {
     private supportsPstnProtocol = null;
     private pstnSupportPrefixed = null; // True if the server only support the prefixed pstn protocol
     private supportsSipNativeVirtual = null; // im.vector.protocol.sip_virtual and im.vector.protocol.sip_native
-    private pstnSupportCheckTimer: NodeJS.Timeout; // number actually because we're in the browser
+    private pstnSupportCheckTimer: number;
     // For rooms we've been invited to, true if they're from virtual user, false if we've checked and they aren't.
     private invitedRoomsAreVirtual = new Map<string, boolean>();
     private invitedRoomCheckInProgress = false;
@@ -164,9 +164,11 @@ export default class CallHandler extends EventEmitter {
     // do the async lookup when we get new information and then store these mappings here
     private assertedIdentityNativeUsers = new Map<string, string>();
 
+    private silencedCalls = new Set<string>(); // callIds
+
     static sharedInstance() {
         if (!window.mxCallHandler) {
-            window.mxCallHandler = new CallHandler()
+            window.mxCallHandler = new CallHandler();
         }
 
         return window.mxCallHandler;
@@ -185,7 +187,7 @@ export default class CallHandler extends EventEmitter {
             const nativeUser = this.assertedIdentityNativeUsers[call.callId];
             if (nativeUser) {
                 const room = findDMForUser(MatrixClientPeg.get(), nativeUser);
-                if (room) return room.roomId
+                if (room) return room.roomId;
             }
         }
 
@@ -224,6 +226,41 @@ export default class CallHandler extends EventEmitter {
         }
     }
 
+    public silenceCall(callId: string) {
+        this.silencedCalls.add(callId);
+        this.emit(CallHandlerEvent.SilencedCallsChanged, this.silencedCalls);
+
+        // Don't pause audio if we have calls which are still ringing
+        if (this.areAnyCallsUnsilenced()) return;
+        this.pause(AudioID.Ring);
+    }
+
+    public unSilenceCall(callId: string) {
+        this.silencedCalls.delete(callId);
+        this.emit(CallHandlerEvent.SilencedCallsChanged, this.silencedCalls);
+        this.play(AudioID.Ring);
+    }
+
+    public isCallSilenced(callId: string): boolean {
+        return this.silencedCalls.has(callId);
+    }
+
+    /**
+     * Returns true if there is at least one unsilenced call
+     * @returns {boolean}
+     */
+    private areAnyCallsUnsilenced(): boolean {
+        for (const call of this.calls.values()) {
+            if (
+                call.state === CallState.Ringing &&
+                !this.isCallSilenced(call.callId)
+            ) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private async checkProtocols(maxTries) {
         try {
             const protocols = await MatrixClientPeg.get().getThirdpartyProtocols();
@@ -238,7 +275,7 @@ export default class CallHandler extends EventEmitter {
                 this.supportsPstnProtocol = null;
             }
 
-            dis.dispatch({action: Action.PstnSupportUpdated});
+            dis.dispatch({ action: Action.PstnSupportUpdated });
 
             if (protocols[PROTOCOL_SIP_NATIVE] !== undefined && protocols[PROTOCOL_SIP_VIRTUAL] !== undefined) {
                 this.supportsSipNativeVirtual = Boolean(
@@ -246,12 +283,12 @@ export default class CallHandler extends EventEmitter {
                 );
             }
 
-            dis.dispatch({action: Action.VirtualRoomSupportUpdated});
+            dis.dispatch({ action: Action.VirtualRoomSupportUpdated });
         } catch (e) {
             if (maxTries === 1) {
-                console.log("Failed to check for protocol support and no retries remain: assuming no support", e);
+                logger.log("Failed to check for protocol support and no retries remain: assuming no support", e);
             } else {
-                console.log("Failed to check for protocol support: will retry", e);
+                logger.log("Failed to check for protocol support: will retry", e);
                 this.pstnSupportCheckTimer = setTimeout(() => {
                     this.checkProtocols(maxTries - 1);
                 }, 10000);
@@ -299,6 +336,13 @@ export default class CallHandler extends EventEmitter {
             action: 'incoming_call',
             call: call,
         }, true);
+    };
+
+    public getCallById(callId: string): MatrixCall {
+        for (const call of this.calls.values()) {
+            if (call.callId === callId) return call;
+        }
+        return null;
     }
 
     getCallForRoom(roomId: string): MatrixCall {
@@ -355,7 +399,7 @@ export default class CallHandler extends EventEmitter {
                     // or chrome doesn't think so and is denying the request. Not sure what
                     // we can really do here...
                     // https://github.com/vector-im/element-web/issues/7657
-                    console.log("Unable to play audio clip", e);
+                    logger.log("Unable to play audio clip", e);
                 }
             };
             if (this.audioPromises.has(audioId)) {
@@ -394,7 +438,7 @@ export default class CallHandler extends EventEmitter {
     }
 
     private setCallListeners(call: MatrixCall) {
-        let mappedRoomId = CallHandler.sharedInstance().roomIdForCall(call);
+        let mappedRoomId = this.roomIdForCall(call);
 
         call.on(CallEvent.Error, (err: CallError) => {
             if (!this.matchesCallForThisRoom(call)) return;
@@ -428,78 +472,12 @@ export default class CallHandler extends EventEmitter {
             this.removeCallForRoom(mappedRoomId);
         });
         call.on(CallEvent.State, (newState: CallState, oldState: CallState) => {
-            if (!this.matchesCallForThisRoom(call)) return;
-
-            this.setCallState(call, newState);
-
-            switch (oldState) {
-                case CallState.Ringing:
-                    this.pause(AudioID.Ring);
-                    break;
-                case CallState.InviteSent:
-                    this.pause(AudioID.Ringback);
-                    break;
-            }
-
-            switch (newState) {
-                case CallState.Ringing:
-                    this.play(AudioID.Ring);
-                    break;
-                case CallState.InviteSent:
-                    this.play(AudioID.Ringback);
-                    break;
-                case CallState.Ended:
-                {
-                    Analytics.trackEvent('voip', 'callEnded', 'hangupReason', call.hangupReason);
-                    this.removeCallForRoom(mappedRoomId);
-                    if (oldState === CallState.InviteSent && (
-                        call.hangupParty === CallParty.Remote ||
-                        (call.hangupParty === CallParty.Local && call.hangupReason === CallErrorCode.InviteTimeout)
-                    )) {
-                        this.play(AudioID.Busy);
-                        let title;
-                        let description;
-                        if (call.hangupReason === CallErrorCode.UserHangup) {
-                            title = _t("Call Declined");
-                            description = _t("The other party declined the call.");
-                        } else if (call.hangupReason === CallErrorCode.UserBusy) {
-                            title = _t("User Busy");
-                            description = _t("The user you called is busy.");
-                        } else if (call.hangupReason === CallErrorCode.InviteTimeout) {
-                            title = _t("Call Failed");
-                            // XXX: full stop appended as some relic here, but these
-                            // strings need proper input from design anyway, so let's
-                            // not change this string until we have a proper one.
-                            description = _t('The remote side failed to pick up') + '.';
-                        } else {
-                            title = _t("Call Failed");
-                            description = _t("The call could not be established");
-                        }
-
-                        Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
-                            title, description,
-                        });
-                    } else if (
-                        call.hangupReason === CallErrorCode.AnsweredElsewhere && oldState === CallState.Connecting
-                    ) {
-                        Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
-                            title: _t("Answered Elsewhere"),
-                            description: _t("The call was answered on another device."),
-                        });
-                    } else if (oldState !== CallState.Fledgling && oldState !== CallState.Ringing) {
-                        // don't play the end-call sound for calls that never got off the ground
-                        this.play(AudioID.CallEnd);
-                    }
-
-                    this.logCallStats(call, mappedRoomId);
-                    break;
-                }
-            }
+            this.onCallStateChanged(newState, oldState, call);
         });
         call.on(CallEvent.Replaced, (newCall: MatrixCall) => {
             if (!this.matchesCallForThisRoom(call)) return;
 
-            console.log(`Call ID ${call.callId} is being replaced by call ID ${newCall.callId}`);
+            logger.log(`Call ID ${call.callId} is being replaced by call ID ${newCall.callId}`);
 
             if (call.state === CallState.Ringing) {
                 this.pause(AudioID.Ring);
@@ -507,15 +485,15 @@ export default class CallHandler extends EventEmitter {
                 this.pause(AudioID.Ringback);
             }
 
-            this.calls.set(mappedRoomId, newCall);
-            this.emit(CallHandlerEvent.CallsChanged, this.calls);
+            this.removeCallForRoom(mappedRoomId);
+            this.addCallForRoom(mappedRoomId, newCall);
             this.setCallListeners(newCall);
             this.setCallState(newCall, newCall.state);
         });
         call.on(CallEvent.AssertedIdentityChanged, async () => {
             if (!this.matchesCallForThisRoom(call)) return;
 
-            console.log(`Call ID ${call.callId} got new asserted identity:`, call.getRemoteAssertedIdentity());
+            logger.log(`Call ID ${call.callId} got new asserted identity:`, call.getRemoteAssertedIdentity());
 
             const newAssertedIdentity = call.getRemoteAssertedIdentity().id;
             let newNativeAssertedIdentity = newAssertedIdentity;
@@ -525,7 +503,7 @@ export default class CallHandler extends EventEmitter {
                     newNativeAssertedIdentity = response[0].userid;
                 }
             }
-            console.log(`Asserted identity ${newAssertedIdentity} mapped to ${newNativeAssertedIdentity}`);
+            logger.log(`Asserted identity ${newAssertedIdentity} mapped to ${newNativeAssertedIdentity}`);
 
             if (newNativeAssertedIdentity) {
                 this.assertedIdentityNativeUsers[call.callId] = newNativeAssertedIdentity;
@@ -538,17 +516,100 @@ export default class CallHandler extends EventEmitter {
                 await ensureDMExists(MatrixClientPeg.get(), newNativeAssertedIdentity);
 
                 const newMappedRoomId = this.roomIdForCall(call);
-                console.log(`Old room ID: ${mappedRoomId}, new room ID: ${newMappedRoomId}`);
+                logger.log(`Old room ID: ${mappedRoomId}, new room ID: ${newMappedRoomId}`);
                 if (newMappedRoomId !== mappedRoomId) {
                     this.removeCallForRoom(mappedRoomId);
                     mappedRoomId = newMappedRoomId;
-                    this.calls.set(mappedRoomId, call);
-                    this.emit(CallHandlerEvent.CallChangeRoom, call);
+                    logger.log("Moving call to room " + mappedRoomId);
+                    this.addCallForRoom(mappedRoomId, call, true);
                 }
             }
         });
     }
 
+    private onCallStateChanged = (newState: CallState, oldState: CallState, call: MatrixCall): void => {
+        if (!this.matchesCallForThisRoom(call)) return;
+
+        const mappedRoomId = this.roomIdForCall(call);
+        this.setCallState(call, newState);
+
+        switch (oldState) {
+            case CallState.Ringing:
+                this.pause(AudioID.Ring);
+                break;
+            case CallState.InviteSent:
+                this.pause(AudioID.Ringback);
+                break;
+        }
+
+        if (newState !== CallState.Ringing) {
+            this.silencedCalls.delete(call.callId);
+        }
+
+        switch (newState) {
+            case CallState.Ringing: {
+                const incomingCallPushRule = (
+                    new PushProcessor(MatrixClientPeg.get()).getPushRuleById(RuleId.IncomingCall)
+                );
+                const pushRuleEnabled = incomingCallPushRule?.enabled;
+                const tweakSetToRing = incomingCallPushRule?.actions.some((action: Tweaks) => (
+                    action.set_tweak === TweakName.Sound &&
+                    action.value === "ring"
+                ));
+
+                if (pushRuleEnabled && tweakSetToRing) {
+                    this.play(AudioID.Ring);
+                } else {
+                    this.silenceCall(call.callId);
+                }
+                break;
+            }
+            case CallState.InviteSent: {
+                this.play(AudioID.Ringback);
+                break;
+            }
+            case CallState.Ended: {
+                const hangupReason = call.hangupReason;
+                Analytics.trackEvent('voip', 'callEnded', 'hangupReason', hangupReason);
+                this.removeCallForRoom(mappedRoomId);
+                if (oldState === CallState.InviteSent && call.hangupParty === CallParty.Remote) {
+                    this.play(AudioID.Busy);
+
+                    // Don't show a modal when we got rejected/the call was hung up
+                    if (!hangupReason || [CallErrorCode.UserHangup, "user hangup"].includes(hangupReason)) break;
+
+                    let title;
+                    let description;
+                    // TODO: We should either do away with these or figure out a copy for each code (expect user_hangup...)
+                    if (call.hangupReason === CallErrorCode.UserBusy) {
+                        title = _t("User Busy");
+                        description = _t("The user you called is busy.");
+                    } else {
+                        title = _t("Call Failed");
+                        description = _t("The call could not be established");
+                    }
+
+                    Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
+                        title, description,
+                    });
+                } else if (
+                    hangupReason === CallErrorCode.AnsweredElsewhere && oldState === CallState.Connecting
+                ) {
+                    Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
+                        title: _t("Answered Elsewhere"),
+                        description: _t("The call was answered on another device."),
+                    });
+                } else if (oldState !== CallState.Fledgling && oldState !== CallState.Ringing) {
+                    // don't play the end-call sound for calls that never got off the ground
+                    this.play(AudioID.CallEnd);
+                }
+
+                this.logCallStats(call, mappedRoomId);
+                break;
+            }
+        }
+    };
+
     private async logCallStats(call: MatrixCall, mappedRoomId: string) {
         const stats = await call.getCurrentCallStats();
         logger.debug(
@@ -595,10 +656,23 @@ export default class CallHandler extends EventEmitter {
     private setCallState(call: MatrixCall, status: CallState) {
         const mappedRoomId = CallHandler.sharedInstance().roomIdForCall(call);
 
-        console.log(
+        logger.log(
             `Call state in ${mappedRoomId} changed to ${status}`,
         );
 
+        const toastKey = getIncomingCallToastKey(call.callId);
+        if (status === CallState.Ringing) {
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key: toastKey,
+                priority: 100,
+                component: IncomingCallToast,
+                bodyClassName: "mx_IncomingCallToast",
+                props: { call },
+            });
+        } else {
+            ToastStore.sharedInstance().dismissToast(toastKey);
+        }
+
         dis.dispatch({
             action: 'call_state',
             room_id: mappedRoomId,
@@ -607,29 +681,30 @@ export default class CallHandler extends EventEmitter {
     }
 
     private removeCallForRoom(roomId: string) {
+        logger.log("Removing call for room ", roomId);
         this.calls.delete(roomId);
         this.emit(CallHandlerEvent.CallsChanged, this.calls);
     }
 
     private showICEFallbackPrompt() {
         const cli = MatrixClientPeg.get();
-        const code = sub => <code>{sub}</code>;
+        const code = sub => <code>{ sub }</code>;
         Modal.createTrackedDialog('No TURN servers', '', QuestionDialog, {
             title: _t("Call failed due to misconfigured server"),
             description: <div>
-                <p>{_t(
+                <p>{ _t(
                     "Please ask the administrator of your homeserver " +
                     "(<code>%(homeserverDomain)s</code>) to configure a TURN server in " +
                     "order for calls to work reliably.",
                     { homeserverDomain: cli.getDomain() }, { code },
-                )}</p>
-                <p>{_t(
+                ) }</p>
+                <p>{ _t(
                     "Alternatively, you can try to use the public server at " +
                     "<code>turn.matrix.org</code>, but this will not be as reliable, and " +
                     "it will share your IP address with that server. You can also manage " +
                     "this in Settings.",
                     null, { code },
-                )}</p>
+                ) }</p>
             </div>,
             button: _t('Try using turn.matrix.org'),
             cancelButton: _t('OK'),
@@ -647,19 +722,19 @@ export default class CallHandler extends EventEmitter {
         if (call.type === CallType.Voice) {
             title = _t("Unable to access microphone");
             description = <div>
-                {_t(
+                { _t(
                     "Call failed because microphone could not be accessed. " +
                     "Check that a microphone is plugged in and set up correctly.",
-                )}
+                ) }
             </div>;
         } else if (call.type === CallType.Video) {
             title = _t("Unable to access webcam / microphone");
             description = <div>
-                {_t("Call failed because webcam or microphone could not be accessed. Check that:")}
+                { _t("Call failed because webcam or microphone could not be accessed. Check that:") }
                 <ul>
-                    <li>{_t("A microphone and webcam are plugged in and set up correctly")}</li>
-                    <li>{_t("Permission is granted to use the webcam")}</li>
-                    <li>{_t("No other application is using the webcam")}</li>
+                    <li>{ _t("A microphone and webcam are plugged in and set up correctly") }</li>
+                    <li>{ _t("Permission is granted to use the webcam") }</li>
+                    <li>{ _t("No other application is using the webcam") }</li>
                 </ul>
             </div>;
         }
@@ -677,11 +752,18 @@ export default class CallHandler extends EventEmitter {
         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 + " ms");
+        logger.log("Current turn creds expire in " + timeUntilTurnCresExpire + " ms");
         const call = MatrixClientPeg.get().createCall(mappedRoomId);
 
-        this.calls.set(roomId, call);
-        this.emit(CallHandlerEvent.CallsChanged, this.calls);
+        try {
+            this.addCallForRoom(roomId, call);
+        } catch (e) {
+            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;
+        }
         if (transferee) {
             this.transferees[call.callId] = transferee;
         }
@@ -694,25 +776,6 @@ export default class CallHandler extends EventEmitter {
             call.placeVoiceCall();
         } else if (type === 'video') {
             call.placeVideoCall();
-        } else if (type === PlaceCallType.ScreenSharing) {
-            const screenCapErrorString = PlatformPeg.get().screenCaptureErrorString();
-            if (screenCapErrorString) {
-                this.removeCallForRoom(roomId);
-                console.log("Can't capture screen: " + screenCapErrorString);
-                Modal.createTrackedDialog('Call Handler', 'Unable to capture screen', ErrorDialog, {
-                    title: _t('Unable to capture screen'),
-                    description: screenCapErrorString,
-                });
-                return;
-            }
-
-            call.placeScreenSharingCall(
-                async (): Promise<DesktopCapturerSource> => {
-                    const {finished} = Modal.createDialog(DesktopCapturerSourcePicker);
-                    const [source] = await finished;
-                    return source;
-                },
-            );
         } else {
             console.error("Unknown conf call type: " + type);
         }
@@ -752,13 +815,8 @@ export default class CallHandler extends EventEmitter {
                         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;
-                    }
+                    // We leave the check for whether there's already a call in this room until later,
+                    // otherwise it can race.
 
                     const members = room.getJoinedMembers();
                     if (members.length <= 1) {
@@ -804,7 +862,7 @@ export default class CallHandler extends EventEmitter {
 
                     const mappedRoomId = CallHandler.sharedInstance().roomIdForCall(call);
                     if (this.getCallForRoom(mappedRoomId)) {
-                        console.log(
+                        logger.log(
                             "Got incoming call for room " + mappedRoomId +
                             " but there's already a call for this room: ignoring",
                         );
@@ -812,9 +870,11 @@ export default class CallHandler extends EventEmitter {
                     }
 
                     Analytics.trackEvent('voip', 'receiveCall', 'type', call.type);
-                    this.calls.set(mappedRoomId, call)
-                    this.emit(CallHandlerEvent.CallsChanged, this.calls);
+
+                    this.addCallForRoom(mappedRoomId, call);
                     this.setCallListeners(call);
+                    // Explicitly handle first state change
+                    this.onCallStateChanged(call.state, null, call);
 
                     // get ready to send encrypted events in the room, so if the user does answer
                     // the call, we'll be ready to send. NB. This is the protocol-level room ID not
@@ -825,6 +885,8 @@ export default class CallHandler extends EventEmitter {
                 break;
             case 'hangup':
             case 'reject':
+                this.stopRingingIfPossible(this.calls.get(payload.room_id).callId);
+
                 if (!this.calls.get(payload.room_id)) {
                     return; // no call to hangup
                 }
@@ -837,11 +899,15 @@ export default class CallHandler extends EventEmitter {
                 // the hangup event away)
                 break;
             case 'hangup_all':
+                this.stopRingingIfPossible(this.calls.get(payload.room_id).callId);
+
                 for (const call of this.calls.values()) {
                     call.hangup(CallErrorCode.UserHangup, false);
                 }
                 break;
             case 'answer': {
+                this.stopRingingIfPossible(this.calls.get(payload.room_id).callId);
+
                 if (!this.calls.has(payload.room_id)) {
                     return; // no call to answer
                 }
@@ -867,7 +933,19 @@ export default class CallHandler extends EventEmitter {
             case Action.DialNumber:
                 this.dialNumber(payload.number);
                 break;
+            case Action.TransferCallToMatrixID:
+                this.startTransferToMatrixID(payload.call, payload.destination, payload.consultFirst);
+                break;
+            case Action.TransferCallToPhoneNumber:
+                this.startTransferToPhoneNumber(payload.call, payload.destination, payload.consultFirst);
+                break;
         }
+    };
+
+    private stopRingingIfPossible(callId: string): void {
+        this.silencedCalls.delete(callId);
+        if (this.areAnyCallsUnsilenced()) return;
+        this.pause(AudioID.Ring);
     }
 
     private async dialNumber(number: string) {
@@ -888,7 +966,7 @@ export default class CallHandler extends EventEmitter {
             const nativeLookupResults = await this.sipNativeLookup(userId);
             const lookupSuccess = nativeLookupResults.length > 0 && nativeLookupResults[0].fields.lookup_success;
             nativeUserId = lookupSuccess ? nativeLookupResults[0].userid : userId;
-            console.log("Looked up " + number + " to " + userId + " and mapped to native user " + nativeUserId);
+            logger.log("Looked up " + number + " to " + userId + " and mapped to native user " + nativeUserId);
         } else {
             nativeUserId = userId;
         }
@@ -899,6 +977,50 @@ export default class CallHandler extends EventEmitter {
             action: 'view_room',
             room_id: roomId,
         });
+
+        await this.placeCall(roomId, PlaceCallType.Voice, null);
+    }
+
+    private async startTransferToPhoneNumber(call: MatrixCall, destination: string, consultFirst: boolean) {
+        const results = await this.pstnLookup(destination);
+        if (!results || results.length === 0 || !results[0].userid) {
+            Modal.createTrackedDialog('', '', ErrorDialog, {
+                title: _t("Unable to transfer call"),
+                description: _t("There was an error looking up the phone number"),
+            });
+            return;
+        }
+
+        await this.startTransferToMatrixID(call, results[0].userid, consultFirst);
+    }
+
+    private async startTransferToMatrixID(call: MatrixCall, destination: string, consultFirst: boolean) {
+        if (consultFirst) {
+            const dmRoomId = await ensureDMExists(MatrixClientPeg.get(), destination);
+
+            dis.dispatch({
+                action: 'place_call',
+                type: call.type,
+                room_id: dmRoomId,
+                transferee: call,
+            });
+            dis.dispatch({
+                action: 'view_room',
+                room_id: dmRoomId,
+                should_peek: false,
+                joining: false,
+            });
+        } else {
+            try {
+                await call.transfer(destination);
+            } catch (e) {
+                logger.log("Failed to transfer call", e);
+                Modal.createTrackedDialog('Failed to transfer call', '', ErrorDialog, {
+                    title: _t('Transfer Failed'),
+                    description: _t('Failed to transfer call'),
+                });
+            }
+        }
     }
 
     setActiveCallRoomId(activeCallRoomId: string) {
@@ -936,14 +1058,10 @@ export default class CallHandler extends EventEmitter {
 
         // prevent double clicking the call button
         const room = MatrixClientPeg.get().getRoom(roomId);
-        const currentJitsiWidgets = WidgetUtils.getRoomWidgetsOfType(room, WidgetType.JITSI);
-        const hasJitsi = currentJitsiWidgets.length > 0
-            || WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentJitsiWidgets, WidgetType.JITSI);
-        if (hasJitsi) {
-            Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
-                title: _t('Call in Progress'),
-                description: _t('A call is currently being placed!'),
-            });
+        const jitsiWidget = WidgetStore.instance.getApps(roomId).find((app) => WidgetType.JITSI.matches(app.type));
+        if (jitsiWidget) {
+            // If there already is a Jitsi widget pin it
+            WidgetLayoutStore.instance.moveToContainer(room, jitsiWidget, Container.Top);
             return;
         }
 
@@ -962,7 +1080,7 @@ export default class CallHandler extends EventEmitter {
             confId = 'Jitsi' + random;
         }
 
-        let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl({auth: jitsiAuth});
+        let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl({ auth: jitsiAuth });
 
         // TODO: Remove URL hacks when the mobile clients eventually support v2 widgets
         const parsedUrl = new URL(widgetUrl);
@@ -986,7 +1104,7 @@ export default class CallHandler extends EventEmitter {
         );
 
         WidgetUtils.setRoomWidget(roomId, widgetId, WidgetType.JITSI, widgetUrl, 'Jitsi', widgetData).then(() => {
-            console.log('Jitsi widget added');
+            logger.log('Jitsi widget added');
         }).catch((e) => {
             if (e.errcode === 'M_FORBIDDEN') {
                 Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
@@ -1031,4 +1149,21 @@ export default class CallHandler extends EventEmitter {
             messaging.transport.send(ElementWidgetActions.HangupCall, {});
         });
     }
+
+    private addCallForRoom(roomId: string, call: MatrixCall, changedRooms = false): void {
+        if (this.calls.has(roomId)) {
+            logger.log(`Couldn't add call to room ${roomId}: already have a call for this room`);
+            throw new Error("Already have a call for room " + roomId);
+        }
+
+        logger.log("setting call for room " + roomId);
+        this.calls.set(roomId, call);
+
+        // Should we always emit CallsChanged too?
+        if (changedRooms) {
+            this.emit(CallHandlerEvent.CallChangeRoom, call);
+        } else {
+            this.emit(CallHandlerEvent.CallsChanged, this.calls);
+        }
+    }
 }
diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
deleted file mode 100644
index 634f0bb336..0000000000
--- a/src/CallMediaHandler.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-import SettingsStore from "./settings/SettingsStore";
-import {SettingLevel} from "./settings/SettingLevel";
-import {setMatrixCallAudioInput, setMatrixCallVideoInput} from "matrix-js-sdk/src/matrix";
-
-export default {
-    hasAnyLabeledDevices: async function() {
-        const devices = await navigator.mediaDevices.enumerateDevices();
-        return devices.some(d => !!d.label);
-    },
-
-    getDevices: function() {
-        // Only needed for Electron atm, though should work in modern browsers
-        // once permission has been granted to the webapp
-        return navigator.mediaDevices.enumerateDevices().then(function(devices) {
-            const audiooutput = [];
-            const audioinput = [];
-            const videoinput = [];
-
-            devices.forEach((device) => {
-                switch (device.kind) {
-                    case 'audiooutput': audiooutput.push(device); break;
-                    case 'audioinput': audioinput.push(device); break;
-                    case 'videoinput': videoinput.push(device); break;
-                }
-            });
-
-            // console.log("Loaded WebRTC Devices", mediaDevices);
-            return {
-                audiooutput,
-                audioinput,
-                videoinput,
-            };
-        }, (error) => { console.log('Unable to refresh WebRTC Devices: ', error); });
-    },
-
-    loadDevices: function() {
-        const audioDeviceId = SettingsStore.getValue("webrtc_audioinput");
-        const videoDeviceId = SettingsStore.getValue("webrtc_videoinput");
-
-        setMatrixCallAudioInput(audioDeviceId);
-        setMatrixCallVideoInput(videoDeviceId);
-    },
-
-    setAudioOutput: function(deviceId) {
-        SettingsStore.setValue("webrtc_audiooutput", null, SettingLevel.DEVICE, deviceId);
-    },
-
-    setAudioInput: function(deviceId) {
-        SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId);
-        setMatrixCallAudioInput(deviceId);
-    },
-
-    setVideoInput: function(deviceId) {
-        SettingsStore.setValue("webrtc_videoinput", null, SettingLevel.DEVICE, deviceId);
-        setMatrixCallVideoInput(deviceId);
-    },
-
-    getAudioOutput: function() {
-        return SettingsStore.getValueAt(SettingLevel.DEVICE, "webrtc_audiooutput");
-    },
-
-    getAudioInput: function() {
-        return SettingsStore.getValueAt(SettingLevel.DEVICE, "webrtc_audioinput");
-    },
-
-    getVideoInput: function() {
-        return SettingsStore.getValueAt(SettingLevel.DEVICE, "webrtc_videoinput");
-    },
-};
diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx
index b21829ac63..60242b373a 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.tsx
@@ -17,9 +17,9 @@ limitations under the License.
 */
 
 import React from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
 import dis from './dispatcher/dispatcher';
-import {MatrixClientPeg} from './MatrixClientPeg';
-import {MatrixClient} from "matrix-js-sdk/src/client";
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
@@ -27,9 +27,6 @@ import RoomViewStore from './stores/RoomViewStore';
 import encrypt from "browser-encrypt-attachment";
 import extractPngChunks from "png-chunks-extract";
 import Spinner from "./components/views/elements/Spinner";
-
-// Polyfill for Canvas.toBlob API using Canvas.toDataURL
-import "blueimp-canvas-to-blob";
 import { Action } from "./dispatcher/actions";
 import CountlyAnalytics from "./CountlyAnalytics";
 import {
@@ -39,8 +36,13 @@ import {
     UploadProgressPayload,
     UploadStartedPayload,
 } from "./dispatcher/payloads/UploadPayload";
-import {IUpload} from "./models/IUpload";
-import { IImageInfo } from "matrix-js-sdk/src/@types/partials";
+import { IUpload } from "./models/IUpload";
+import { IAbortablePromise, IImageInfo } from "matrix-js-sdk/src/@types/partials";
+import { BlurhashEncoder } from "./BlurhashEncoder";
+import SettingsStore from "./settings/SettingsStore";
+import { decorateStartSendingTime, sendRoundTripMetric } from "./sendTimePerformanceMetrics";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const MAX_WIDTH = 800;
 const MAX_HEIGHT = 600;
@@ -49,6 +51,8 @@ const MAX_HEIGHT = 600;
 //                  5669 px (x-axis)      , 5669 px (y-axis)      , per metre
 const PHYS_HIDPI = [0x00, 0x00, 0x16, 0x25, 0x00, 0x00, 0x16, 0x25, 0x01];
 
+export const BLURHASH_FIELD = "xyz.amorgan.blurhash"; // MSC2448
+
 export class UploadCanceledError extends Error {}
 
 type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
@@ -79,14 +83,11 @@ interface IThumbnail {
         };
         w: number;
         h: number;
+        [BLURHASH_FIELD]: string;
     };
     thumbnail: Blob;
 }
 
-interface IAbortablePromise<T> extends Promise<T> {
-    abort(): void;
-}
-
 /**
  * Create a thumbnail for a image DOM element.
  * The image will be smaller than MAX_WIDTH and MAX_HEIGHT.
@@ -105,44 +106,62 @@ interface IAbortablePromise<T> extends Promise<T> {
  * @return {Promise} A promise that resolves with an object with an info key
  *  and a thumbnail key.
  */
-function createThumbnail(
+async function createThumbnail(
     element: ThumbnailableElement,
     inputWidth: number,
     inputHeight: number,
     mimeType: string,
 ): Promise<IThumbnail> {
-    return new Promise((resolve) => {
-        let targetWidth = inputWidth;
-        let targetHeight = inputHeight;
-        if (targetHeight > MAX_HEIGHT) {
-            targetWidth = Math.floor(targetWidth * (MAX_HEIGHT / targetHeight));
-            targetHeight = MAX_HEIGHT;
-        }
-        if (targetWidth > MAX_WIDTH) {
-            targetHeight = Math.floor(targetHeight * (MAX_WIDTH / targetWidth));
-            targetWidth = MAX_WIDTH;
-        }
+    let targetWidth = inputWidth;
+    let targetHeight = inputHeight;
+    if (targetHeight > MAX_HEIGHT) {
+        targetWidth = Math.floor(targetWidth * (MAX_HEIGHT / targetHeight));
+        targetHeight = MAX_HEIGHT;
+    }
+    if (targetWidth > MAX_WIDTH) {
+        targetHeight = Math.floor(targetHeight * (MAX_WIDTH / targetWidth));
+        targetWidth = MAX_WIDTH;
+    }
 
-        const canvas = document.createElement("canvas");
+    let canvas: HTMLCanvasElement | OffscreenCanvas;
+    if (window.OffscreenCanvas) {
+        canvas = new window.OffscreenCanvas(targetWidth, targetHeight);
+    } else {
+        canvas = document.createElement("canvas");
         canvas.width = targetWidth;
         canvas.height = targetHeight;
-        canvas.getContext("2d").drawImage(element, 0, 0, targetWidth, targetHeight);
-        canvas.toBlob(function(thumbnail) {
-            resolve({
-                info: {
-                    thumbnail_info: {
-                        w: targetWidth,
-                        h: targetHeight,
-                        mimetype: thumbnail.type,
-                        size: thumbnail.size,
-                    },
-                    w: inputWidth,
-                    h: inputHeight,
-                },
-                thumbnail: thumbnail,
-            });
-        }, mimeType);
-    });
+    }
+
+    const context = canvas.getContext("2d");
+    context.drawImage(element, 0, 0, targetWidth, targetHeight);
+
+    let thumbnailPromise: Promise<Blob>;
+
+    if (window.OffscreenCanvas) {
+        thumbnailPromise = (canvas as OffscreenCanvas).convertToBlob({ type: mimeType });
+    } else {
+        thumbnailPromise = new Promise<Blob>(resolve => (canvas as HTMLCanvasElement).toBlob(resolve, mimeType));
+    }
+
+    const imageData = context.getImageData(0, 0, targetWidth, targetHeight);
+    // thumbnailPromise and blurhash promise are being awaited concurrently
+    const blurhash = await BlurhashEncoder.instance.getBlurhash(imageData);
+    const thumbnail = await thumbnailPromise;
+
+    return {
+        info: {
+            thumbnail_info: {
+                w: targetWidth,
+                h: targetHeight,
+                mimetype: thumbnail.type,
+                size: thumbnail.size,
+            },
+            w: inputWidth,
+            h: inputHeight,
+            [BLURHASH_FIELD]: blurhash,
+        },
+        thumbnail,
+    };
 }
 
 /**
@@ -191,9 +210,17 @@ async function loadImageElement(imageFile: File) {
     const [hidpi] = await Promise.all([parsePromise, imgPromise]);
     const width = hidpi ? (img.width >> 1) : img.width;
     const height = hidpi ? (img.height >> 1) : img.height;
-    return {width, height, img};
+    return { width, height, img };
 }
 
+// Minimum size for image files before we generate a thumbnail for them.
+const IMAGE_SIZE_THRESHOLD_THUMBNAIL = 1 << 15; // 32KB
+// Minimum size improvement for image thumbnails, if both are not met then don't bother uploading thumbnail.
+const IMAGE_THUMBNAIL_MIN_REDUCTION_SIZE = 1 << 16; // 1MB
+const IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT = 0.1; // 10%
+// We don't apply these thresholds to video thumbnails as a poster image is always useful
+// and videos tend to be much larger.
+
 /**
  * Read the metadata for an image file and create and upload a thumbnail of the image.
  *
@@ -202,27 +229,38 @@ async function loadImageElement(imageFile: File) {
  * @param {File} imageFile The image to read and thumbnail.
  * @return {Promise} A promise that resolves with the attachment info.
  */
-function infoForImageFile(matrixClient, roomId, imageFile) {
+async function infoForImageFile(matrixClient: MatrixClient, roomId: string, imageFile: File) {
     let thumbnailType = "image/png";
     if (imageFile.type === "image/jpeg") {
         thumbnailType = "image/jpeg";
     }
 
-    let imageInfo;
-    return loadImageElement(imageFile).then((r) => {
-        return createThumbnail(r.img, r.width, r.height, thumbnailType);
-    }).then((result) => {
-        imageInfo = result.info;
-        return uploadFile(matrixClient, roomId, result.thumbnail);
-    }).then((result) => {
-        imageInfo.thumbnail_url = result.url;
-        imageInfo.thumbnail_file = result.file;
+    const imageElement = await loadImageElement(imageFile);
+
+    const result = await createThumbnail(imageElement.img, imageElement.width, imageElement.height, thumbnailType);
+    const imageInfo = result.info;
+
+    // we do all sizing checks here because we still rely on thumbnail generation for making a blurhash from.
+    const sizeDifference = imageFile.size - imageInfo.thumbnail_info.size;
+    if (
+        imageFile.size <= IMAGE_SIZE_THRESHOLD_THUMBNAIL || // image is small enough already
+        (sizeDifference <= IMAGE_THUMBNAIL_MIN_REDUCTION_SIZE && // thumbnail is not sufficiently smaller than original
+            sizeDifference <= (imageFile.size * IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT))
+    ) {
+        delete imageInfo["thumbnail_info"];
         return imageInfo;
-    });
+    }
+
+    const uploadResult = await uploadFile(matrixClient, roomId, result.thumbnail);
+
+    imageInfo["thumbnail_url"] = uploadResult.url;
+    imageInfo["thumbnail_file"] = uploadResult.file;
+    return imageInfo;
 }
 
 /**
- * Load a file into a newly created video element.
+ * Load a file into a newly created video element and pull some strings
+ * in an attempt to guarantee the first frame will be showing.
  *
  * @param {File} videoFile The file to load in an video element.
  * @return {Promise} A promise that resolves with the video image element.
@@ -231,20 +269,25 @@ function loadVideoElement(videoFile): Promise<HTMLVideoElement> {
     return new Promise((resolve, reject) => {
         // Load the file into an html element
         const video = document.createElement("video");
+        video.preload = "metadata";
+        video.playsInline = true;
+        video.muted = true;
 
         const reader = new FileReader();
 
         reader.onload = function(ev) {
-            video.src = ev.target.result as string;
-
-            // Once ready, returns its size
             // Wait until we have enough data to thumbnail the first frame.
-            video.onloadeddata = function() {
+            video.onloadeddata = async function() {
                 resolve(video);
+                video.pause();
             };
             video.onerror = function(e) {
                 reject(e);
             };
+
+            video.src = ev.target.result as string;
+            video.load();
+            video.play();
         };
         reader.onerror = function(e) {
             reject(e);
@@ -309,12 +352,12 @@ function readFileAsArrayBuffer(file: File | Blob): Promise<ArrayBuffer> {
  *  If the file is unencrypted then the object will have a "url" key.
  *  If the file is encrypted then the object will have a "file" key.
  */
-function uploadFile(
+export function uploadFile(
     matrixClient: MatrixClient,
     roomId: string,
     file: File | Blob,
     progressHandler?: any, // TODO: Types
-): Promise<{url?: string, file?: any}> { // TODO: Types
+): IAbortablePromise<{url?: string, file?: any}> { // TODO: Types
     let canceled = false;
     if (matrixClient.isRoomEncrypted(roomId)) {
         // If the room is encrypted then encrypt the file before uploading it.
@@ -345,11 +388,11 @@ function uploadFile(
             if (file.type) {
                 encryptInfo.mimetype = file.type;
             }
-            return {"file": encryptInfo};
-        });
-        (prom as IAbortablePromise<any>).abort = () => {
+            return { "file": encryptInfo };
+        }) as IAbortablePromise<{ file: any }>;
+        prom.abort = () => {
             canceled = true;
-            if (uploadPromise) MatrixClientPeg.get().cancelUpload(uploadPromise);
+            if (uploadPromise) matrixClient.cancelUpload(uploadPromise);
         };
         return prom;
     } else {
@@ -359,11 +402,11 @@ function uploadFile(
         const promise1 = basePromise.then(function(url) {
             if (canceled) throw new UploadCanceledError();
             // If the attachment isn't encrypted then include the URL directly.
-            return {"url": url};
-        });
-        (promise1 as any).abort = () => {
+            return { url };
+        }) as IAbortablePromise<{ url: string }>;
+        promise1.abort = () => {
             canceled = true;
-            MatrixClientPeg.get().cancelUpload(basePromise);
+            matrixClient.cancelUpload(basePromise);
         };
         return promise1;
     }
@@ -375,11 +418,11 @@ export default class ContentMessages {
 
     sendStickerContentToRoom(url: string, roomId: string, info: IImageInfo, text: string, matrixClient: MatrixClient) {
         const startTime = CountlyAnalytics.getTimestamp();
-        const prom = MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
+        const prom = matrixClient.sendStickerMessage(roomId, url, info, text).catch((e) => {
             console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
             throw e;
         });
-        CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, false, {msgtype: "m.sticker"});
+        CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, false, { msgtype: "m.sticker" });
         return prom;
     }
 
@@ -393,20 +436,21 @@ export default class ContentMessages {
 
     async sendContentListToRoom(files: File[], roomId: string, matrixClient: MatrixClient) {
         if (matrixClient.isGuest()) {
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({ action: 'require_registration' });
             return;
         }
 
         const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
         if (isQuoting) {
+            // FIXME: Using an import will result in Element crashing
             const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            const {finished} = Modal.createTrackedDialog<[boolean]>('Upload Reply Warning', '', QuestionDialog, {
+            const { finished } = Modal.createTrackedDialog<[boolean]>('Upload Reply Warning', '', QuestionDialog, {
                 title: _t('Replying With Files'),
                 description: (
-                    <div>{_t(
+                    <div>{ _t(
                         'At this time it is not possible to reply with a file. ' +
                         'Would you like to upload this file without replying?',
-                    )}</div>
+                    ) }</div>
                 ),
                 hasCancelButton: true,
                 button: _t("Continue"),
@@ -417,7 +461,7 @@ export default class ContentMessages {
 
         if (!this.mediaConfig) { // hot-path optimization to not flash a spinner if we don't need to
             const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
-            await this.ensureMediaConfigFetched();
+            await this.ensureMediaConfigFetched(matrixClient);
             modal.close();
         }
 
@@ -433,8 +477,9 @@ export default class ContentMessages {
         }
 
         if (tooBigFiles.length > 0) {
+            // FIXME: Using an import will result in Element crashing
             const UploadFailureDialog = sdk.getComponent("dialogs.UploadFailureDialog");
-            const {finished} = Modal.createTrackedDialog<[boolean]>('Upload Failure', '', UploadFailureDialog, {
+            const { finished } = Modal.createTrackedDialog<[boolean]>('Upload Failure', '', UploadFailureDialog, {
                 badFiles: tooBigFiles,
                 totalFiles: files.length,
                 contentMessages: this,
@@ -443,7 +488,6 @@ export default class ContentMessages {
             if (!shouldContinue) return;
         }
 
-        const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog");
         let uploadAll = false;
         // Promise to complete before sending next file into room, used for synchronisation of file-sending
         // to match the order the files were specified in
@@ -451,7 +495,9 @@ export default class ContentMessages {
         for (let i = 0; i < okFiles.length; ++i) {
             const file = okFiles[i];
             if (!uploadAll) {
-                const {finished} = Modal.createTrackedDialog<[boolean, boolean]>('Upload Files confirmation',
+                // FIXME: Using an import will result in Element crashing
+                const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog");
+                const { finished } = Modal.createTrackedDialog<[boolean, boolean]>('Upload Files confirmation',
                     '', UploadConfirmDialog, {
                         file,
                         currentIndex: i,
@@ -472,7 +518,7 @@ export default class ContentMessages {
         return this.inprogress.filter(u => !u.canceled);
     }
 
-    cancelUpload(promise: Promise<any>) {
+    cancelUpload(promise: Promise<any>, matrixClient: MatrixClient) {
         let upload: IUpload;
         for (let i = 0; i < this.inprogress.length; ++i) {
             if (this.inprogress[i].promise === promise) {
@@ -482,8 +528,8 @@ export default class ContentMessages {
         }
         if (upload) {
             upload.canceled = true;
-            MatrixClientPeg.get().cancelUpload(upload.promise);
-            dis.dispatch<UploadCanceledPayload>({action: Action.UploadCanceled, upload});
+            matrixClient.cancelUpload(upload.promise);
+            dis.dispatch<UploadCanceledPayload>({ action: Action.UploadCanceled, upload });
         }
     }
 
@@ -497,6 +543,10 @@ export default class ContentMessages {
             msgtype: "", // set later
         };
 
+        if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+            decorateStartSendingTime(content);
+        }
+
         // if we have a mime type for the file, add it to the message metadata
         if (file.type) {
             content.info.mimetype = file.type;
@@ -529,10 +579,10 @@ export default class ContentMessages {
                 content.msgtype = 'm.file';
                 resolve();
             }
-        });
+        }) as IAbortablePromise<void>;
 
         // create temporary abort handler for before the actual upload gets passed off to js-sdk
-        (prom as IAbortablePromise<any>).abort = () => {
+        prom.abort = () => {
             upload.canceled = true;
         };
 
@@ -544,15 +594,15 @@ export default class ContentMessages {
             promise: prom,
         };
         this.inprogress.push(upload);
-        dis.dispatch<UploadStartedPayload>({action: Action.UploadStarted, upload});
+        dis.dispatch<UploadStartedPayload>({ action: Action.UploadStarted, upload });
 
         // Focus the composer view
-        dis.fire(Action.FocusComposer);
+        dis.fire(Action.FocusSendMessageComposer);
 
         function onProgress(ev) {
             upload.total = ev.total;
             upload.loaded = ev.loaded;
-            dis.dispatch<UploadProgressPayload>({action: Action.UploadProgress, upload});
+            dis.dispatch<UploadProgressPayload>({ action: Action.UploadProgress, upload });
         }
 
         let error;
@@ -561,9 +611,7 @@ export default class ContentMessages {
             // XXX: upload.promise must be the promise that
             // is returned by uploadFile as it has an abort()
             // method hacked onto it.
-            upload.promise = uploadFile(
-                matrixClient, roomId, file, onProgress,
-            );
+            upload.promise = uploadFile(matrixClient, roomId, file, onProgress);
             return upload.promise.then(function(result) {
                 content.file = result.file;
                 content.url = result.url;
@@ -574,18 +622,24 @@ export default class ContentMessages {
         }).then(function() {
             if (upload.canceled) throw new UploadCanceledError();
             const prom = matrixClient.sendMessage(roomId, content);
+            if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+                prom.then(resp => {
+                    sendRoundTripMetric(matrixClient, roomId, resp.event_id);
+                });
+            }
             CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, false, content);
             return prom;
         }, function(err) {
             error = err;
             if (!upload.canceled) {
-                let desc = _t("The file '%(fileName)s' failed to upload.", {fileName: upload.fileName});
+                let desc = _t("The file '%(fileName)s' failed to upload.", { fileName: upload.fileName });
                 if (err.http_status === 413) {
                     desc = _t(
                         "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
-                        {fileName: upload.fileName},
+                        { fileName: upload.fileName },
                     );
                 }
+                // FIXME: Using an import will result in Element crashing
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Upload failed', '', ErrorDialog, {
                     title: _t('Upload Failed'),
@@ -606,10 +660,10 @@ export default class ContentMessages {
                 if (error && error.http_status === 413) {
                     this.mediaConfig = null;
                 }
-                dis.dispatch<UploadErrorPayload>({action: Action.UploadFailed, upload, error});
+                dis.dispatch<UploadErrorPayload>({ action: Action.UploadFailed, upload, error });
             } else {
-                dis.dispatch<UploadFinishedPayload>({action: Action.UploadFinished, upload});
-                dis.dispatch({action: 'message_sent'});
+                dis.dispatch<UploadFinishedPayload>({ action: Action.UploadFinished, upload });
+                dis.dispatch({ action: 'message_sent' });
             }
         });
     }
@@ -623,16 +677,16 @@ export default class ContentMessages {
         return true;
     }
 
-    private ensureMediaConfigFetched() {
+    private ensureMediaConfigFetched(matrixClient: MatrixClient) {
         if (this.mediaConfig !== null) return;
 
-        console.log("[Media Config] Fetching");
-        return MatrixClientPeg.get().getMediaConfig().then((config) => {
-            console.log("[Media Config] Fetched config:", config);
+        logger.log("[Media Config] Fetching");
+        return matrixClient.getMediaConfig().then((config) => {
+            logger.log("[Media Config] Fetched config:", config);
             return config;
         }).catch(() => {
             // Media repo can't or won't report limits, so provide an empty object (no limits).
-            console.log("[Media Config] Could not fetch config, so not limiting uploads.");
+            logger.log("[Media Config] Could not fetch config, so not limiting uploads.");
             return {};
         }).then((config) => {
             this.mediaConfig = config;
diff --git a/src/CountlyAnalytics.ts b/src/CountlyAnalytics.ts
index 5545ed8483..aa47d3063f 100644
--- a/src/CountlyAnalytics.ts
+++ b/src/CountlyAnalytics.ts
@@ -14,28 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {randomString} from "matrix-js-sdk/src/randomstring";
+import { randomString } from "matrix-js-sdk/src/randomstring";
+import { IContent } from "matrix-js-sdk/src/models/event";
+import { sleep } from "matrix-js-sdk/src/utils";
 
-import {getCurrentLanguage} from './languageHandler';
+import { getCurrentLanguage } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';
-import {MatrixClientPeg} from "./MatrixClientPeg";
-import {sleep} from "./utils/promise";
+import { MatrixClientPeg } from "./MatrixClientPeg";
 import RoomViewStore from "./stores/RoomViewStore";
 import { Action } from "./dispatcher/actions";
 
-// polyfill textencoder if necessary
-import * as TextEncodingUtf8 from 'text-encoding-utf-8';
-let TextEncoder = window.TextEncoder;
-if (!TextEncoder) {
-    TextEncoder = TextEncodingUtf8.TextEncoder;
-}
-
 const INACTIVITY_TIME = 20; // seconds
 const HEARTBEAT_INTERVAL = 5_000; // ms
 const SESSION_UPDATE_INTERVAL = 60; // seconds
 const MAX_PENDING_EVENTS = 1000;
 
+export type Rating = 1 | 2 | 3 | 4 | 5;
+
 enum Orientation {
     Landscape = "landscape",
     Portrait = "portrait",
@@ -262,7 +258,7 @@ interface ICreateRoomEvent extends IEvent {
         num_users: number;
         is_encrypted: boolean;
         is_public: boolean;
-    }
+    };
 }
 
 interface IJoinRoomEvent extends IEvent {
@@ -345,8 +341,8 @@ const getRoomStats = (roomId: string) => {
         "is_encrypted": cli?.isRoomEncrypted(roomId),
         // eslint-disable-next-line camelcase
         "is_public": room?.currentState.getStateEvents("m.room.join_rules", "")?.getContent()?.join_rule === "public",
-    }
-}
+    };
+};
 
 // async wrapper for regex-powered String.prototype.replace
 const strReplaceAsync = async (str: string, regex: RegExp, fn: (...args: string[]) => Promise<string>) => {
@@ -370,8 +366,8 @@ export default class CountlyAnalytics {
 
     private initTime = CountlyAnalytics.getTimestamp();
     private firstPage = true;
-    private heartbeatIntervalId: NodeJS.Timeout;
-    private activityIntervalId: NodeJS.Timeout;
+    private heartbeatIntervalId: number;
+    private activityIntervalId: number;
     private trackTime = true;
     private lastBeat: number;
     private storedDuration = 0;
@@ -421,7 +417,7 @@ export default class CountlyAnalytics {
 
         this.anonymous = anonymous;
         if (anonymous) {
-            await this.changeUserKey(randomString(64))
+            await this.changeUserKey(randomString(64));
         } else {
             await this.changeUserKey(await hashHex(MatrixClientPeg.get().getUserId()), true);
         }
@@ -445,7 +441,7 @@ export default class CountlyAnalytics {
         await this.track("Opt-Out" );
         this.endSession();
         window.clearInterval(this.heartbeatIntervalId);
-        window.clearTimeout(this.activityIntervalId)
+        window.clearTimeout(this.activityIntervalId);
         this.baseUrl = null;
         // remove listeners bound in trackSessions()
         window.removeEventListener("beforeunload", this.endSession);
@@ -457,7 +453,7 @@ export default class CountlyAnalytics {
         window.removeEventListener("scroll", this.onUserActivity);
     }
 
-    public reportFeedback(rating: 1 | 2 | 3 | 4 | 5, comment: string) {
+    public reportFeedback(rating: Rating, comment: string) {
         this.track<IStarRatingEvent>("[CLY]_star_rating", { rating, comment }, null, {}, true);
     }
 
@@ -542,7 +538,7 @@ export default class CountlyAnalytics {
 
         // sanitize the error from identifiers
         error = await strReplaceAsync(error, /([!@+#]).+?:[\w:.]+/g, async (substring: string, glyph: string) => {
-            return glyph + await hashHex(substring.substring(1));
+            return glyph + (await hashHex(substring.substring(1)));
         });
 
         const metrics = this.getMetrics();
@@ -669,14 +665,14 @@ export default class CountlyAnalytics {
     }
 
     private queue(args: Omit<IEvent, "timestamp" | "hour" | "dow" | "count"> & Partial<Pick<IEvent, "count">>) {
-        const {count = 1, ...rest} = args;
+        const { count = 1, ...rest } = args;
         const ev = {
             ...this.getTimeParams(),
             ...rest,
             count,
             platform: this.appPlatform,
             app_version: this.appVersion,
-        }
+        };
 
         this.pendingEvents.push(ev);
         if (this.pendingEvents.length > MAX_PENDING_EVENTS) {
@@ -687,7 +683,7 @@ export default class CountlyAnalytics {
     private getOrientation = (): Orientation => {
         return window.matchMedia("(orientation: landscape)").matches
             ? Orientation.Landscape
-            : Orientation.Portrait
+            : Orientation.Portrait;
     };
 
     private reportOrientation = () => {
@@ -756,7 +752,7 @@ export default class CountlyAnalytics {
             const request: Parameters<typeof CountlyAnalytics.prototype.request>[0] = {
                 begin_session: 1,
                 user_details: JSON.stringify(userDetails),
-            }
+            };
 
             const metrics = this.getMetrics();
             if (metrics) {
@@ -780,7 +776,7 @@ export default class CountlyAnalytics {
 
     private endSession = () => {
         if (this.sessionStarted) {
-            window.removeEventListener("resize", this.reportOrientation)
+            window.removeEventListener("resize", this.reportOrientation);
 
             this.reportViewDuration();
             this.request({
@@ -875,7 +871,7 @@ export default class CountlyAnalytics {
         roomId: string,
         isEdit: boolean,
         isReply: boolean,
-        content: {format?: string, msgtype: string},
+        content: IContent,
     ) {
         if (this.disabled) return;
         const cli = MatrixClientPeg.get();
diff --git a/src/DateUtils.ts b/src/DateUtils.ts
index e4a1175d88..221ecfeb2a 100644
--- a/src/DateUtils.ts
+++ b/src/DateUtils.ts
@@ -123,6 +123,31 @@ export function formatTime(date: Date, showTwelveHour = false): string {
     return pad(date.getHours()) + ':' + pad(date.getMinutes());
 }
 
+export function formatCallTime(delta: Date): string {
+    const hours = delta.getUTCHours();
+    const minutes = delta.getUTCMinutes();
+    const seconds = delta.getUTCSeconds();
+
+    let output = "";
+    if (hours) output += `${hours}h `;
+    if (minutes || output) output += `${minutes}m `;
+    if (seconds || output) output += `${seconds}s`;
+
+    return output;
+}
+
+export function formatSeconds(inSeconds: number): string {
+    const hours = Math.floor(inSeconds / (60 * 60)).toFixed(0).padStart(2, '0');
+    const minutes = Math.floor((inSeconds % (60 * 60)) / 60).toFixed(0).padStart(2, '0');
+    const seconds = Math.floor(((inSeconds % (60 * 60)) % 60)).toFixed(0).padStart(2, '0');
+
+    let output = "";
+    if (hours !== "00") output += `${hours}:`;
+    output += `${minutes}:${seconds}`;
+
+    return output;
+}
+
 const MILLIS_IN_DAY = 86400000;
 export function wantsDateSeparator(prevEventDate: Date, nextEventDate: Date): boolean {
     if (!nextEventDate || !prevEventDate) {
@@ -136,3 +161,20 @@ export function wantsDateSeparator(prevEventDate: Date, nextEventDate: Date): bo
     // Compare weekdays
     return prevEventDate.getDay() !== nextEventDate.getDay();
 }
+
+export function formatFullDateNoDay(date: Date) {
+    return _t("%(date)s at %(time)s", {
+        date: date.toLocaleDateString().replace(/\//g, '-'),
+        time: date.toLocaleTimeString().replace(/:/g, '-'),
+    });
+}
+
+export function formatFullDateNoDayNoTime(date: Date) {
+    return (
+        date.getFullYear() +
+        "/" +
+        pad(date.getMonth() + 1) +
+        "/" +
+        pad(date.getDate())
+    );
+}
diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.ts
similarity index 79%
rename from src/DecryptionFailureTracker.js
rename to src/DecryptionFailureTracker.ts
index b02a5e937b..df306a54f5 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
+Copyright 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.
@@ -14,34 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 export class DecryptionFailure {
-    constructor(failedEventId, errorCode) {
-        this.failedEventId = failedEventId;
-        this.errorCode = errorCode;
+    public readonly ts: number;
+
+    constructor(public readonly failedEventId: string, public readonly errorCode: string) {
         this.ts = Date.now();
     }
 }
 
+type TrackingFn = (count: number, trackedErrCode: string) => void;
+type ErrCodeMapFn = (errcode: string) => string;
+
 export class DecryptionFailureTracker {
     // Array of items of type DecryptionFailure. Every `CHECK_INTERVAL_MS`, this list
     // is checked for failures that happened > `GRACE_PERIOD_MS` ago. Those that did
     // are accumulated in `failureCounts`.
-    failures = [];
+    public failures: DecryptionFailure[] = [];
 
     // A histogram of the number of failures that will be tracked at the next tracking
     // interval, split by failure error code.
-    failureCounts = {
+    public failureCounts: Record<string, number> = {
         // [errorCode]: 42
     };
 
     // Event IDs of failures that were tracked previously
-    trackedEventHashMap = {
+    public trackedEventHashMap: Record<string, boolean> = {
         // [eventId]: true
     };
 
     // Set to an interval ID when `start` is called
-    checkInterval = null;
-    trackInterval = null;
+    public checkInterval: number = null;
+    public trackInterval: number = null;
 
     // Spread the load on `Analytics` by tracking at a low frequency, `TRACK_INTERVAL_MS`.
     static TRACK_INTERVAL_MS = 60000;
@@ -67,7 +73,7 @@ export class DecryptionFailureTracker {
      * @param {function?} errorCodeMapFn The function used to map error codes to the
      * trackedErrorCode. If not provided, the `.code` of errors will be used.
      */
-    constructor(fn, errorCodeMapFn) {
+    constructor(private readonly fn: TrackingFn, private readonly errorCodeMapFn?: ErrCodeMapFn) {
         if (!fn || typeof fn !== 'function') {
             throw new Error('DecryptionFailureTracker requires tracking function');
         }
@@ -75,9 +81,6 @@ export class DecryptionFailureTracker {
         if (errorCodeMapFn && typeof errorCodeMapFn !== 'function') {
             throw new Error('DecryptionFailureTracker second constructor argument should be a function');
         }
-
-        this._trackDecryptionFailure = fn;
-        this._mapErrorCode = errorCodeMapFn;
     }
 
     // loadTrackedEventHashMap() {
@@ -88,7 +91,7 @@ export class DecryptionFailureTracker {
     //     localStorage.setItem('mx-decryption-failure-event-id-hashes', JSON.stringify(this.trackedEventHashMap));
     // }
 
-    eventDecrypted(e, err) {
+    public eventDecrypted(e: MatrixEvent, err: MatrixError | Error): void {
         if (err) {
             this.addDecryptionFailure(new DecryptionFailure(e.getId(), err.code));
         } else {
@@ -97,18 +100,18 @@ export class DecryptionFailureTracker {
         }
     }
 
-    addDecryptionFailure(failure) {
+    public addDecryptionFailure(failure: DecryptionFailure): void {
         this.failures.push(failure);
     }
 
-    removeDecryptionFailuresForEvent(e) {
+    public removeDecryptionFailuresForEvent(e: MatrixEvent): void {
         this.failures = this.failures.filter((f) => f.failedEventId !== e.getId());
     }
 
     /**
      * Start checking for and tracking failures.
      */
-    start() {
+    public start(): void {
         this.checkInterval = setInterval(
             () => this.checkFailures(Date.now()),
             DecryptionFailureTracker.CHECK_INTERVAL_MS,
@@ -123,7 +126,7 @@ export class DecryptionFailureTracker {
     /**
      * Clear state and stop checking for and tracking failures.
      */
-    stop() {
+    public stop(): void {
         clearInterval(this.checkInterval);
         clearInterval(this.trackInterval);
 
@@ -132,11 +135,11 @@ export class DecryptionFailureTracker {
     }
 
     /**
-     * Mark failures that occured before nowTs - GRACE_PERIOD_MS as failures that should be
+     * Mark failures that occurred before nowTs - GRACE_PERIOD_MS as failures that should be
      * tracked. Only mark one failure per event ID.
      * @param {number} nowTs the timestamp that represents the time now.
      */
-    checkFailures(nowTs) {
+    public checkFailures(nowTs: number): void {
         const failuresGivenGrace = [];
         const failuresNotReady = [];
         while (this.failures.length > 0) {
@@ -165,7 +168,7 @@ export class DecryptionFailureTracker {
         const trackedEventIds = [...dedupedFailuresMap.keys()];
 
         this.trackedEventHashMap = trackedEventIds.reduce(
-            (result, eventId) => ({...result, [eventId]: true}),
+            (result, eventId) => ({ ...result, [eventId]: true }),
             this.trackedEventHashMap,
         );
 
@@ -175,10 +178,10 @@ export class DecryptionFailureTracker {
 
         const dedupedFailures = dedupedFailuresMap.values();
 
-        this._aggregateFailures(dedupedFailures);
+        this.aggregateFailures(dedupedFailures);
     }
 
-    _aggregateFailures(failures) {
+    private aggregateFailures(failures: DecryptionFailure[]): void {
         for (const failure of failures) {
             const errorCode = failure.errorCode;
             this.failureCounts[errorCode] = (this.failureCounts[errorCode] || 0) + 1;
@@ -189,12 +192,12 @@ export class DecryptionFailureTracker {
      * If there are failures that should be tracked, call the given trackDecryptionFailure
      * function with the number of failures that should be tracked.
      */
-    trackFailures() {
+    public trackFailures(): void {
         for (const errorCode of Object.keys(this.failureCounts)) {
             if (this.failureCounts[errorCode] > 0) {
-                const trackedErrorCode = this._mapErrorCode ? this._mapErrorCode(errorCode) : errorCode;
+                const trackedErrorCode = this.errorCodeMapFn ? this.errorCodeMapFn(errorCode) : errorCode;
 
-                this._trackDecryptionFailure(this.failureCounts[errorCode], trackedErrorCode);
+                this.fn(this.failureCounts[errorCode], trackedErrorCode);
                 this.failureCounts[errorCode] = 0;
             }
         }
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index df494e6bdd..f218e6c6a7 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from "./dispatcher/dispatcher";
 import {
     hideToast as hideBulkUnverifiedSessionsToast,
@@ -33,6 +33,9 @@ import { isSecretStorageBeingAccessed, accessSecretStorage } from "./SecurityMan
 import { isSecureBackupRequired } from './utils/WellKnownUtils';
 import { isLoggedIn } from './components/structures/MatrixChat';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { ActionPayload } from "./dispatcher/payloads";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 
@@ -58,28 +61,28 @@ export default class DeviceListener {
     }
 
     start() {
-        MatrixClientPeg.get().on('crypto.willUpdateDevices', this._onWillUpdateDevices);
-        MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
-        MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
-        MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
-        MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
-        MatrixClientPeg.get().on('accountData', this._onAccountData);
-        MatrixClientPeg.get().on('sync', this._onSync);
-        MatrixClientPeg.get().on('RoomState.events', this._onRoomStateEvents);
-        this.dispatcherRef = dis.register(this._onAction);
-        this._recheck();
+        MatrixClientPeg.get().on('crypto.willUpdateDevices', this.onWillUpdateDevices);
+        MatrixClientPeg.get().on('crypto.devicesUpdated', this.onDevicesUpdated);
+        MatrixClientPeg.get().on('deviceVerificationChanged', this.onDeviceVerificationChanged);
+        MatrixClientPeg.get().on('userTrustStatusChanged', this.onUserTrustStatusChanged);
+        MatrixClientPeg.get().on('crossSigning.keysChanged', this.onCrossSingingKeysChanged);
+        MatrixClientPeg.get().on('accountData', this.onAccountData);
+        MatrixClientPeg.get().on('sync', this.onSync);
+        MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
+        this.dispatcherRef = dis.register(this.onAction);
+        this.recheck();
     }
 
     stop() {
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this._onWillUpdateDevices);
-            MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
-            MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
-            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
-            MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
-            MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
-            MatrixClientPeg.get().removeListener('sync', this._onSync);
-            MatrixClientPeg.get().removeListener('RoomState.events', this._onRoomStateEvents);
+            MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this.onWillUpdateDevices);
+            MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this.onDevicesUpdated);
+            MatrixClientPeg.get().removeListener('deviceVerificationChanged', this.onDeviceVerificationChanged);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this.onUserTrustStatusChanged);
+            MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this.onCrossSingingKeysChanged);
+            MatrixClientPeg.get().removeListener('accountData', this.onAccountData);
+            MatrixClientPeg.get().removeListener('sync', this.onSync);
+            MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
         }
         if (this.dispatcherRef) {
             dis.unregister(this.dispatcherRef);
@@ -99,19 +102,20 @@ export default class DeviceListener {
      * @param {String[]} deviceIds List of device IDs to dismiss notifications for
      */
     async dismissUnverifiedSessions(deviceIds: Iterable<string>) {
+        logger.log("Dismissing unverified sessions: " + Array.from(deviceIds).join(','));
         for (const d of deviceIds) {
             this.dismissed.add(d);
         }
 
-        this._recheck();
+        this.recheck();
     }
 
     dismissEncryptionSetup() {
         this.dismissedThisDeviceToast = true;
-        this._recheck();
+        this.recheck();
     }
 
-    _ensureDeviceIdsAtStartPopulated() {
+    private ensureDeviceIdsAtStartPopulated() {
         if (this.ourDeviceIdsAtStart === null) {
             const cli = MatrixClientPeg.get();
             this.ourDeviceIdsAtStart = new Set(
@@ -120,39 +124,39 @@ export default class DeviceListener {
         }
     }
 
-    _onWillUpdateDevices = async (users: string[], initialFetch?: boolean) => {
+    private onWillUpdateDevices = async (users: string[], initialFetch?: boolean) => {
         // If we didn't know about *any* devices before (ie. it's fresh login),
         // then they are all pre-existing devices, so ignore this and set the
         // devicesAtStart list to the devices that we see after the fetch.
         if (initialFetch) return;
 
         const myUserId = MatrixClientPeg.get().getUserId();
-        if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+        if (users.includes(myUserId)) this.ensureDeviceIdsAtStartPopulated();
 
         // No need to do a recheck here: we just need to get a snapshot of our devices
         // before we download any new ones.
     };
 
-    _onDevicesUpdated = (users: string[]) => {
+    private onDevicesUpdated = (users: string[]) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        this._recheck();
+        this.recheck();
     };
 
-    _onDeviceVerificationChanged = (userId: string) => {
+    private onDeviceVerificationChanged = (userId: string) => {
         if (userId !== MatrixClientPeg.get().getUserId()) return;
-        this._recheck();
+        this.recheck();
     };
 
-    _onUserTrustStatusChanged = (userId: string) => {
+    private onUserTrustStatusChanged = (userId: string) => {
         if (userId !== MatrixClientPeg.get().getUserId()) return;
-        this._recheck();
+        this.recheck();
     };
 
-    _onCrossSingingKeysChanged = () => {
-        this._recheck();
+    private onCrossSingingKeysChanged = () => {
+        this.recheck();
     };
 
-    _onAccountData = (ev) => {
+    private onAccountData = (ev: MatrixEvent) => {
         // User may have:
         // * migrated SSSS to symmetric
         // * uploaded keys to secret storage
@@ -160,34 +164,35 @@ export default class DeviceListener {
         // which result in account data changes affecting checks below.
         if (
             ev.getType().startsWith('m.secret_storage.') ||
-            ev.getType().startsWith('m.cross_signing.')
+            ev.getType().startsWith('m.cross_signing.') ||
+            ev.getType() === 'm.megolm_backup.v1'
         ) {
-            this._recheck();
+            this.recheck();
         }
     };
 
-    _onSync = (state, prevState) => {
-        if (state === 'PREPARED' && prevState === null) this._recheck();
+    private onSync = (state, prevState) => {
+        if (state === 'PREPARED' && prevState === null) this.recheck();
     };
 
-    _onRoomStateEvents = (ev: MatrixEvent) => {
+    private onRoomStateEvents = (ev: MatrixEvent) => {
         if (ev.getType() !== "m.room.encryption") {
             return;
         }
 
         // If a room changes to encrypted, re-check as it may be our first
         // encrypted room. This also catches encrypted room creation as well.
-        this._recheck();
+        this.recheck();
     };
 
-    _onAction = ({ action }) => {
+    private onAction = ({ action }: ActionPayload) => {
         if (action !== "on_logged_in") return;
-        this._recheck();
+        this.recheck();
     };
 
     // The server doesn't tell us when key backup is set up, so we poll
     // & cache the result
-    async _getKeyBackupInfo() {
+    private async getKeyBackupInfo() {
         const now = (new Date()).getTime();
         if (!this.keyBackupInfo || this.keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
             this.keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
@@ -205,10 +210,10 @@ export default class DeviceListener {
         return cli && cli.getRooms().some(r => cli.isRoomEncrypted(r.roomId));
     }
 
-    async _recheck() {
+    private async recheck() {
         const cli = MatrixClientPeg.get();
 
-        if (!await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) return;
+        if (!(await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing"))) return;
 
         if (!cli.isCryptoEnabled()) return;
         // don't recheck until the initial sync is complete: lots of account data events will fire
@@ -234,7 +239,7 @@ export default class DeviceListener {
                 // Cross-signing on account but this device doesn't trust the master key (verify this session)
                 showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
             } else {
-                const backupInfo = await this._getKeyBackupInfo();
+                const backupInfo = await this.getKeyBackupInfo();
                 if (backupInfo) {
                     // No cross-signing on account but key backup available (upgrade encryption)
                     showSetupEncryptionToast(SetupKind.UPGRADE_ENCRYPTION);
@@ -255,7 +260,7 @@ export default class DeviceListener {
 
         // This needs to be done after awaiting on downloadKeys() above, so
         // we make sure we get the devices after the fetch is done.
-        this._ensureDeviceIdsAtStartPopulated();
+        this.ensureDeviceIdsAtStartPopulated();
 
         // Unverified devices that were there last time the app ran
         // (technically could just be a boolean: we don't actually
@@ -283,6 +288,9 @@ export default class DeviceListener {
             }
         }
 
+        logger.log("Old unverified sessions: " + Array.from(oldUnverifiedDeviceIds).join(','));
+        logger.log("New unverified sessions: " + Array.from(newUnverifiedDeviceIds).join(','));
+
         // Display or hide the batch toast for old unverified sessions
         if (oldUnverifiedDeviceIds.size > 0) {
             showBulkUnverifiedSessionsToast(oldUnverifiedDeviceIds);
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 9497d9de4c..ea1813876c 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -19,7 +19,7 @@ import Modal from './Modal';
 import * as sdk from './';
 import MultiInviter from './utils/MultiInviter';
 import { _t } from './languageHandler';
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import GroupStore from './stores/GroupStore';
 import StyledCheckbox from './components/views/elements/StyledCheckbox';
 
@@ -103,7 +103,7 @@ function _onGroupInviteFinished(groupId, addrs) {
         if (errorList.length > 0) {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to invite the following users to the group', '', ErrorDialog, {
-                title: _t("Failed to invite the following users to %(groupId)s:", {groupId: groupId}),
+                title: _t("Failed to invite the following users to %(groupId)s:", { groupId: groupId }),
                 description: errorList.join(", "),
             });
         }
@@ -111,7 +111,7 @@ function _onGroupInviteFinished(groupId, addrs) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Failed to invite users to group', '', ErrorDialog, {
             title: _t("Failed to invite users to community"),
-            description: _t("Failed to invite users to %(groupId)s", {groupId: groupId}),
+            description: _t("Failed to invite users to %(groupId)s", { groupId: groupId }),
         });
     });
 }
@@ -137,7 +137,7 @@ function _onGroupAddRoomFinished(groupId, addrs, addRoomsPublicly) {
                 // Add this group as related
                 if (!groups.includes(groupId)) {
                     groups.push(groupId);
-                    return MatrixClientPeg.get().sendStateEvent(roomId, 'm.room.related_groups', {groups}, '');
+                    return MatrixClientPeg.get().sendStateEvent(roomId, 'm.room.related_groups', { groups }, '');
                 }
             });
     })).then(() => {
@@ -152,7 +152,7 @@ function _onGroupAddRoomFinished(groupId, addrs, addRoomsPublicly) {
             {
                 title: _t(
                     "Failed to add the following rooms to %(groupId)s:",
-                    {groupId},
+                    { groupId },
                 ),
                 description: errorList.join(", "),
             },
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index ef5ac383e3..2eee5214af 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -17,25 +17,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, { ReactNode } from 'react';
 import sanitizeHtml from 'sanitize-html';
-import { IExtendedSanitizeOptions } from './@types/sanitize-html';
+import cheerio from 'cheerio';
 import * as linkify from 'linkifyjs';
-import linkifyMatrix from './linkify-matrix';
 import _linkifyElement from 'linkifyjs/element';
 import _linkifyString from 'linkifyjs/string';
 import classNames from 'classnames';
 import EMOJIBASE_REGEX from 'emojibase-regex';
-import url from 'url';
 import katex from 'katex';
 import { AllHtmlEntities } from 'html-entities';
-import SettingsStore from './settings/SettingsStore';
-import cheerio from 'cheerio';
+import { IContent } from 'matrix-js-sdk/src/models/event';
 
-import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
-import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
+import { IExtendedSanitizeOptions } from './@types/sanitize-html';
+import linkifyMatrix from './linkify-matrix';
+import SettingsStore from './settings/SettingsStore';
+import { tryTransformPermalinkToLocalHref } from "./utils/permalinks/Permalinks";
+import { getEmojiFromUnicode } from "./emoji";
 import ReplyThread from "./components/views/elements/ReplyThread";
-import {mediaFromMxc} from "./customisations/Media";
+import { mediaFromMxc } from "./customisations/Media";
 
 linkifyMatrix(linkify);
 
@@ -57,7 +57,35 @@ const BIGEMOJI_REGEX = new RegExp(`^(${EMOJIBASE_REGEX.source})+$`, 'i');
 
 const COLOR_REGEX = /^#[0-9a-fA-F]{6}$/;
 
-export const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'];
+export const PERMITTED_URL_SCHEMES = [
+    "bitcoin",
+    "ftp",
+    "geo",
+    "http",
+    "https",
+    "im",
+    "irc",
+    "ircs",
+    "magnet",
+    "mailto",
+    "matrix",
+    "mms",
+    "news",
+    "nntp",
+    "openpgp4fpr",
+    "sip",
+    "sftp",
+    "sms",
+    "smsto",
+    "ssh",
+    "tel",
+    "urn",
+    "webcal",
+    "wtai",
+    "xmpp",
+];
+
+const MEDIA_API_MXC_REGEX = /\/_matrix\/media\/r0\/(?:download|thumbnail)\/(.+?)\/(.+?)(?:[?/]|$)/;
 
 /*
  * Return true if the given string contains emoji
@@ -66,7 +94,7 @@ export const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'
  * need emojification.
  * unicodeToImage uses this function.
  */
-function mightContainEmoji(str: string) {
+function mightContainEmoji(str: string): boolean {
     return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
 }
 
@@ -76,21 +104,9 @@ function mightContainEmoji(str: string) {
  * @param {String} char The emoji character
  * @return {String} The shortcode (such as :thumbup:)
  */
-export function unicodeToShortcode(char: string) {
-    const data = getEmojiFromUnicode(char);
-    return (data && data.shortcodes ? `:${data.shortcodes[0]}:` : '');
-}
-
-/**
- * Returns the unicode character for an emoji shortcode
- *
- * @param {String} shortcode The shortcode (such as :thumbup:)
- * @return {String} The emoji character; null if none exists
- */
-export function shortcodeToUnicode(shortcode: string) {
-    shortcode = shortcode.slice(1, shortcode.length - 1);
-    const data = SHORTCODE_TO_EMOJI.get(shortcode);
-    return data ? data.unicode : null;
+export function unicodeToShortcode(char: string): string {
+    const shortcodes = getEmojiFromUnicode(char)?.shortcodes;
+    return shortcodes?.length ? `:${shortcodes[0]}:` : '';
 }
 
 export function processHtmlForSending(html: string): string {
@@ -124,20 +140,20 @@ export function processHtmlForSending(html: string): string {
  * Given an untrusted HTML string, return a React node with an sanitized version
  * of that HTML.
  */
-export function sanitizedHtmlNode(insaneHtml: string) {
+export function sanitizedHtmlNode(insaneHtml: string): ReactNode {
     const saneHtml = sanitizeHtml(insaneHtml, sanitizeHtmlParams);
 
     return <div dangerouslySetInnerHTML={{ __html: saneHtml }} dir="auto" />;
 }
 
-export function getHtmlText(insaneHtml: string) {
+export function getHtmlText(insaneHtml: string): string {
     return sanitizeHtml(insaneHtml, {
         allowedTags: [],
         allowedAttributes: {},
         selfClosing: [],
         allowedSchemes: [],
         disallowedTagsMode: 'discard',
-    })
+    });
 }
 
 /**
@@ -148,12 +164,10 @@ export function getHtmlText(insaneHtml: string) {
  * other places we need to sanitise URLs.
  * @return true if permitted, otherwise false
  */
-export function isUrlPermitted(inputUrl: string) {
+export function isUrlPermitted(inputUrl: string): boolean {
     try {
-        const parsed = url.parse(inputUrl);
-        if (!parsed.protocol) return false;
         // URL parser protocol includes the trailing colon
-        return PERMITTED_URL_SCHEMES.includes(parsed.protocol.slice(0, -1));
+        return PERMITTED_URL_SCHEMES.includes(new URL(inputUrl).protocol.slice(0, -1));
     } catch (e) {
         return false;
     }
@@ -175,18 +189,31 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
         return { tagName, attribs };
     },
     'img': function(tagName: string, attribs: sanitizeHtml.Attributes) {
+        let src = attribs.src;
         // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
         // because transformTags is used _before_ we filter by allowedSchemesByTag and
         // we don't want to allow images with `https?` `src`s.
         // We also drop inline images (as if they were not present at all) when the "show
         // images" preference is disabled. Future work might expose some UI to reveal them
         // like standalone image events have.
-        if (!attribs.src || !attribs.src.startsWith('mxc://') || !SettingsStore.getValue("showImages")) {
-            return { tagName, attribs: {}};
+        if (!src || !SettingsStore.getValue("showImages")) {
+            return { tagName, attribs: {} };
         }
+
+        if (!src.startsWith("mxc://")) {
+            const match = MEDIA_API_MXC_REGEX.exec(src);
+            if (match) {
+                src = `mxc://${match[1]}/${match[2]}`;
+            }
+        }
+
+        if (!src.startsWith("mxc://")) {
+            return { tagName, attribs: {} };
+        }
+
         const width = Number(attribs.width) || 800;
         const height = Number(attribs.height) || 600;
-        attribs.src = mediaFromMxc(attribs.src).getThumbnailOfSourceHttp(width, height);
+        attribs.src = mediaFromMxc(src).getThumbnailOfSourceHttp(width, height);
         return { tagName, attribs };
     },
     'code': function(tagName: string, attribs: sanitizeHtml.Attributes) {
@@ -351,20 +378,21 @@ class HtmlHighlighter extends BaseHighlighter<string> {
     }
 }
 
-interface IContent {
-    format?: string;
-    // eslint-disable-next-line camelcase
-    formatted_body?: string;
-    body: string;
-}
-
 interface IOpts {
     highlightLink?: string;
     disableBigEmoji?: boolean;
     stripReplyFallback?: boolean;
     returnString?: boolean;
     forComposerQuote?: boolean;
-    ref?: React.Ref<any>;
+    ref?: React.Ref<HTMLSpanElement>;
+}
+
+export interface IOptsReturnNode extends IOpts {
+    returnString: false | undefined;
+}
+
+export interface IOptsReturnString extends IOpts {
+    returnString: true;
 }
 
 /* turn a matrix event body into html
@@ -380,6 +408,8 @@ interface IOpts {
  * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
  * opts.ref: React ref to attach to any React components returned (not compatible with opts.returnString)
  */
+export function bodyToHtml(content: IContent, highlights: string[], opts: IOptsReturnString): string;
+export function bodyToHtml(content: IContent, highlights: string[], opts: IOptsReturnNode): ReactNode;
 export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts = {}) {
     const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
     let bodyHasEmoji = false;
@@ -399,9 +429,14 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
     try {
         if (highlights && highlights.length > 0) {
             const highlighter = new HtmlHighlighter("mx_EventTile_searchHighlight", opts.highlightLink);
-            const safeHighlights = highlights.map(function(highlight) {
-                return sanitizeHtml(highlight, sanitizeParams);
-            });
+            const safeHighlights = highlights
+                // sanitizeHtml can hang if an unclosed HTML tag is thrown at it
+                // A search for `<foo` will make the browser crash
+                // an alternative would be to escape HTML special characters
+                // but that would bring no additional benefit as the highlighter
+                // does not work with those special chars
+                .filter((highlight: string): boolean => !highlight.includes("<"))
+                .map((highlight: string): string => sanitizeHtml(highlight, sanitizeParams));
             // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeParams structure.
             sanitizeParams.textFilter = function(safeText) {
                 return highlighter.applyHighlights(safeText, safeHighlights).join('');
@@ -501,7 +536,7 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
  * @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
  * @returns {string} Linkified string
  */
-export function linkifyString(str: string, options = linkifyMatrix.options) {
+export function linkifyString(str: string, options = linkifyMatrix.options): string {
     return _linkifyString(str, options);
 }
 
@@ -512,7 +547,7 @@ export function linkifyString(str: string, options = linkifyMatrix.options) {
  * @param {object} [options] Options for linkifyElement. Default: linkifyMatrix.options
  * @returns {object}
  */
-export function linkifyElement(element: HTMLElement, options = linkifyMatrix.options) {
+export function linkifyElement(element: HTMLElement, options = linkifyMatrix.options): HTMLElement {
     return _linkifyElement(element, options);
 }
 
@@ -523,7 +558,7 @@ export function linkifyElement(element: HTMLElement, options = linkifyMatrix.opt
  * @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
  * @returns {string}
  */
-export function linkifyAndSanitizeHtml(dirtyHtml: string, options = linkifyMatrix.options) {
+export function linkifyAndSanitizeHtml(dirtyHtml: string, options = linkifyMatrix.options): string {
     return sanitizeHtml(linkifyString(dirtyHtml, options), sanitizeHtmlParams);
 }
 
@@ -534,7 +569,7 @@ export function linkifyAndSanitizeHtml(dirtyHtml: string, options = linkifyMatri
  * @param {Node} node
  * @returns {bool}
  */
-export function checkBlockNode(node: Node) {
+export function checkBlockNode(node: Node): boolean {
     switch (node.nodeName) {
         case "H1":
         case "H2":
diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.tsx
similarity index 68%
rename from src/IdentityAuthClient.js
rename to src/IdentityAuthClient.tsx
index 9239c1bc75..ae55c20438 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.tsx
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from "react";
 import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
-import { createClient } from 'matrix-js-sdk/src/matrix';
+import { createClient, MatrixClient } from 'matrix-js-sdk/src/matrix';
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
-import * as sdk from './index';
 import { _t } from './languageHandler';
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 import {
@@ -27,21 +27,25 @@ import {
     doesIdentityServerHaveTerms,
     useDefaultIdentityServer,
 } from './utils/IdentityServerUtils';
-import { abbreviateUrl } from './utils/UrlUtils';
+
+import { logger } from "matrix-js-sdk/src/logger";
+import QuestionDialog from "./components/views/dialogs/QuestionDialog";
+import { abbreviateUrl } from "./utils/UrlUtils";
 
 export class AbortedIdentityActionError extends Error {}
 
 export default class IdentityAuthClient {
+    private accessToken: string;
+    private tempClient: MatrixClient;
+    private authEnabled = true;
+
     /**
      * Creates a new identity auth client
      * @param {string} identityUrl The URL to contact the identity server with.
      * When provided, this class will operate solely within memory, refusing to
      * persist any information such as tokens. Default null (not provided).
      */
-    constructor(identityUrl = null) {
-        this.accessToken = null;
-        this.authEnabled = true;
-
+    constructor(identityUrl?: string) {
         if (identityUrl) {
             // XXX: We shouldn't have to create a whole new MatrixClient just to
             // do identity server auth. The functions don't take an identity URL
@@ -52,32 +56,29 @@ export default class IdentityAuthClient {
                 baseUrl: "", // invalid by design
                 idBaseUrl: identityUrl,
             });
-        } else {
-            // Indicates that we're using the real client, not some workaround.
-            this.tempClient = null;
         }
     }
 
-    get _matrixClient() {
+    private get matrixClient(): MatrixClient {
         return this.tempClient ? this.tempClient : MatrixClientPeg.get();
     }
 
-    _writeToken() {
+    private writeToken(): void {
         if (this.tempClient) return; // temporary client: ignore
         window.localStorage.setItem("mx_is_access_token", this.accessToken);
     }
 
-    _readToken() {
+    private readToken(): string {
         if (this.tempClient) return null; // temporary client: ignore
         return window.localStorage.getItem("mx_is_access_token");
     }
 
-    hasCredentials() {
-        return this.accessToken != null; // undef or null
+    public hasCredentials(): boolean {
+        return Boolean(this.accessToken);
     }
 
     // Returns a promise that resolves to the access_token string from the IS
-    async getAccessToken({ check = true } = {}) {
+    public async getAccessToken({ check = true } = {}): Promise<string> {
         if (!this.authEnabled) {
             // The current IS doesn't support authentication
             return null;
@@ -85,21 +86,21 @@ export default class IdentityAuthClient {
 
         let token = this.accessToken;
         if (!token) {
-            token = this._readToken();
+            token = this.readToken();
         }
 
         if (!token) {
             token = await this.registerForToken(check);
             if (token) {
                 this.accessToken = token;
-                this._writeToken();
+                this.writeToken();
             }
             return token;
         }
 
         if (check) {
             try {
-                await this._checkToken(token);
+                await this.checkToken(token);
             } catch (e) {
                 if (
                     e instanceof TermsNotSignedError ||
@@ -112,7 +113,7 @@ export default class IdentityAuthClient {
                 token = await this.registerForToken();
                 if (token) {
                     this.accessToken = token;
-                    this._writeToken();
+                    this.writeToken();
                 }
             }
         }
@@ -120,14 +121,14 @@ export default class IdentityAuthClient {
         return token;
     }
 
-    async _checkToken(token) {
-        const identityServerUrl = this._matrixClient.getIdentityServerUrl();
+    private async checkToken(token: string): Promise<void> {
+        const identityServerUrl = this.matrixClient.getIdentityServerUrl();
 
         try {
-            await this._matrixClient.getIdentityAccount(token);
+            await this.matrixClient.getIdentityAccount(token);
         } catch (e) {
             if (e.errcode === "M_TERMS_NOT_SIGNED") {
-                console.log("Identity Server requires new terms to be agreed to");
+                logger.log("Identity server requires new terms to be agreed to");
                 await startTermsFlow([new Service(
                     SERVICE_TYPES.IS,
                     identityServerUrl,
@@ -141,28 +142,28 @@ export default class IdentityAuthClient {
         if (
             !this.tempClient &&
             !doesAccountDataHaveIdentityServer() &&
-            !await doesIdentityServerHaveTerms(identityServerUrl)
+            !(await doesIdentityServerHaveTerms(identityServerUrl))
         ) {
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            const { finished } = Modal.createTrackedDialog('Default identity server terms warning', '',
+            const { finished } = Modal.createTrackedDialog(
+                'Default identity server terms warning', '',
                 QuestionDialog, {
-                title: _t("Identity server has no terms of service"),
-                description: (
-                    <div>
-                        <p>{_t(
-                            "This action requires accessing the default identity server " +
+                    title: _t("Identity server has no terms of service"),
+                    description: (
+                        <div>
+                            <p>{ _t(
+                                "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: () => <b>{abbreviateUrl(identityServerUrl)}</b>,
-                            },
-                        )}</p>
-                        <p>{_t(
-                            "Only continue if you trust the owner of the server.",
-                        )}</p>
-                    </div>
-                ),
-                button: _t("Trust"),
+                                {
+                                    server: () => <b>{ abbreviateUrl(identityServerUrl) }</b>,
+                                },
+                            ) }</p>
+                            <p>{ _t(
+                                "Only continue if you trust the owner of the server.",
+                            ) }</p>
+                        </div>
+                    ),
+                    button: _t("Trust"),
                 });
             const [confirmed] = await finished;
             if (confirmed) {
@@ -182,13 +183,13 @@ export default class IdentityAuthClient {
         // See also https://github.com/vector-im/element-web/issues/10455.
     }
 
-    async registerForToken(check=true) {
+    public async registerForToken(check = true): Promise<string> {
         const hsOpenIdToken = await MatrixClientPeg.get().getOpenIdToken();
         // XXX: The spec is `token`, but we used `access_token` for a Sydent release.
         const { access_token: accessToken, token } =
-            await this._matrixClient.registerWithIdentityServer(hsOpenIdToken);
+            await this.matrixClient.registerWithIdentityServer(hsOpenIdToken);
         const identityAccessToken = token ? token : accessToken;
-        if (check) await this._checkToken(identityAccessToken);
+        if (check) await this.checkToken(identityAccessToken);
         return identityAccessToken;
     }
 }
diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts
index 63c4ac0f86..6169f431f4 100644
--- a/src/KeyBindingsDefaults.ts
+++ b/src/KeyBindingsDefaults.ts
@@ -156,36 +156,34 @@ const messageComposerBindings = (): KeyBinding<MessageComposerAction>[] => {
         }
     }
     return bindings;
-}
+};
 
 const autocompleteBindings = (): KeyBinding<AutocompleteAction>[] => {
     return [
         {
-            action: AutocompleteAction.CompleteOrNextSelection,
+            action: AutocompleteAction.ForceComplete,
             keyCombo: {
                 key: Key.TAB,
             },
         },
         {
-            action: AutocompleteAction.CompleteOrNextSelection,
+            action: AutocompleteAction.ForceComplete,
             keyCombo: {
                 key: Key.TAB,
                 ctrlKey: true,
             },
         },
         {
-            action: AutocompleteAction.CompleteOrPrevSelection,
+            action: AutocompleteAction.Complete,
             keyCombo: {
-                key: Key.TAB,
-                shiftKey: true,
+                key: Key.ENTER,
             },
         },
         {
-            action: AutocompleteAction.CompleteOrPrevSelection,
+            action: AutocompleteAction.Complete,
             keyCombo: {
-                key: Key.TAB,
+                key: Key.ENTER,
                 ctrlKey: true,
-                shiftKey: true,
             },
         },
         {
@@ -207,7 +205,7 @@ const autocompleteBindings = (): KeyBinding<AutocompleteAction>[] => {
             },
         },
     ];
-}
+};
 
 const roomListBindings = (): KeyBinding<RoomListAction>[] => {
     return [
@@ -248,7 +246,7 @@ const roomListBindings = (): KeyBinding<RoomListAction>[] => {
             },
         },
     ];
-}
+};
 
 const roomBindings = (): KeyBinding<RoomAction>[] => {
     const bindings: KeyBinding<RoomAction>[] = [
@@ -312,7 +310,7 @@ const roomBindings = (): KeyBinding<RoomAction>[] => {
     }
 
     return bindings;
-}
+};
 
 const navigationBindings = (): KeyBinding<NavigationAction>[] => {
     return [
@@ -396,7 +394,7 @@ const navigationBindings = (): KeyBinding<NavigationAction>[] => {
             },
         },
     ];
-}
+};
 
 export const defaultBindingsProvider: IKeyBindingsProvider = {
     getMessageComposerBindings: messageComposerBindings,
@@ -404,4 +402,4 @@ export const defaultBindingsProvider: IKeyBindingsProvider = {
     getRoomListBindings: roomListBindings,
     getRoomBindings: roomBindings,
     getNavigationBindings: navigationBindings,
-}
+};
diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts
index aac14bde20..3a893e2ec8 100644
--- a/src/KeyBindingsManager.ts
+++ b/src/KeyBindingsManager.ts
@@ -52,13 +52,11 @@ export enum MessageComposerAction {
 
 /** Actions for text editing autocompletion */
 export enum AutocompleteAction {
-    /**
-     * Select previous selection or, if the autocompletion window is not shown, open the window and select the first
-     * selection.
-     */
-    CompleteOrPrevSelection = 'ApplySelection',
-    /** Select next selection or, if the autocompletion window is not shown, open it and select the first selection */
-    CompleteOrNextSelection = 'CompleteOrNextSelection',
+    /** Accepts chosen autocomplete selection */
+    Complete = 'Complete',
+    /** Accepts chosen autocomplete selection or,
+     * if the autocompletion window is not shown, open the window and select the first selection */
+    ForceComplete = 'ForceComplete',
     /** Move to the previous autocomplete selection */
     PrevSelection = 'PrevSelection',
     /** Move to the next autocomplete selection */
@@ -140,12 +138,12 @@ export type KeyCombo = {
     ctrlKey?: boolean;
     metaKey?: boolean;
     shiftKey?: boolean;
-}
+};
 
 export type KeyBinding<T extends string> = {
     action: T;
     keyCombo: KeyCombo;
-}
+};
 
 /**
  * Helper method to check if a KeyboardEvent matches a KeyCombo
diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index b0a1292ba1..3685f7b938 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -20,9 +20,10 @@ limitations under the License.
 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";
+import { decryptAES, encryptAES, IEncryptedPayload } from "matrix-js-sdk/src/crypto/aes";
+import { QueryDict } from 'matrix-js-sdk/src/utils';
 
-import {IMatrixClientCreds, MatrixClientPeg} from './MatrixClientPeg';
+import { IMatrixClientCreds, MatrixClientPeg } from './MatrixClientPeg';
 import SecurityCustomisations from "./customisations/Security";
 import EventIndexPeg from './indexing/EventIndexPeg';
 import createMatrixClient from './utils/createMatrixClient';
@@ -33,7 +34,6 @@ import Presence from './Presence';
 import dis from './dispatcher/dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import Modal from './Modal';
-import * as sdk from './index';
 import ActiveWidgetStore from './stores/ActiveWidgetStore';
 import PlatformPeg from "./PlatformPeg";
 import { sendLoginRequest } from "./Login";
@@ -41,17 +41,24 @@ import * as StorageManager from './utils/StorageManager';
 import SettingsStore from "./settings/SettingsStore";
 import TypingStore from "./stores/TypingStore";
 import ToastStore from "./stores/ToastStore";
-import {IntegrationManagers} from "./integrations/IntegrationManagers";
-import {Mjolnir} from "./mjolnir/Mjolnir";
+import { IntegrationManagers } from "./integrations/IntegrationManagers";
+import { Mjolnir } from "./mjolnir/Mjolnir";
 import DeviceListener from "./DeviceListener";
-import {Jitsi} from "./widgets/Jitsi";
-import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY, SSO_IDP_ID_KEY} from "./BasePlatform";
+import { Jitsi } from "./widgets/Jitsi";
+import { SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY, SSO_IDP_ID_KEY } from "./BasePlatform";
 import ThreepidInviteStore from "./stores/ThreepidInviteStore";
 import CountlyAnalytics from "./CountlyAnalytics";
+import { PosthogAnalytics } from "./PosthogAnalytics";
 import CallHandler from './CallHandler';
 import LifecycleCustomisations from "./customisations/Lifecycle";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
-import {_t} from "./languageHandler";
+import { _t } from "./languageHandler";
+import LazyLoadingResyncDialog from "./components/views/dialogs/LazyLoadingResyncDialog";
+import LazyLoadingDisabledDialog from "./components/views/dialogs/LazyLoadingDisabledDialog";
+import SessionRestoreErrorDialog from "./components/views/dialogs/SessionRestoreErrorDialog";
+import StorageEvictedDialog from "./components/views/dialogs/StorageEvictedDialog";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const HOMESERVER_URL_KEY = "mx_hs_url";
 const ID_SERVER_URL_KEY = "mx_is_url";
@@ -62,7 +69,7 @@ interface ILoadSessionOpts {
     guestIsUrl?: string;
     ignoreGuest?: boolean;
     defaultDeviceDisplayName?: string;
-    fragmentQueryParams?: Record<string, string>;
+    fragmentQueryParams?: QueryDict;
 }
 
 /**
@@ -113,10 +120,10 @@ export async function loadSession(opts: ILoadSessionOpts = {}): Promise<boolean>
             fragmentQueryParams.guest_user_id &&
             fragmentQueryParams.guest_access_token
         ) {
-            console.log("Using guest access credentials");
+            logger.log("Using guest access credentials");
             return doSetLoggedIn({
-                userId: fragmentQueryParams.guest_user_id,
-                accessToken: fragmentQueryParams.guest_access_token,
+                userId: fragmentQueryParams.guest_user_id as string,
+                accessToken: fragmentQueryParams.guest_access_token as string,
                 homeserverUrl: guestHsUrl,
                 identityServerUrl: guestIsUrl,
                 guest: true,
@@ -154,7 +161,7 @@ export async function loadSession(opts: ILoadSessionOpts = {}): Promise<boolean>
  *     return [null, null].
  */
 export async function getStoredSessionOwner(): Promise<[string, boolean]> {
-    const {hsUrl, userId, hasAccessToken, isGuest} = await getStoredSessionVars();
+    const { hsUrl, userId, hasAccessToken, isGuest } = await getStoredSessionVars();
     return hsUrl && userId && hasAccessToken ? [userId, isGuest] : [null, null];
 }
 
@@ -170,7 +177,7 @@ export async function getStoredSessionOwner(): Promise<[string, boolean]> {
  *    login, else false
  */
 export function attemptTokenLogin(
-    queryParams: Record<string, string>,
+    queryParams: QueryDict,
     defaultDeviceDisplayName?: string,
     fragmentAfterLogin?: string,
 ): Promise<boolean> {
@@ -195,11 +202,11 @@ export function attemptTokenLogin(
         homeserver,
         identityServer,
         "m.login.token", {
-            token: queryParams.loginToken,
+            token: queryParams.loginToken as string,
             initial_device_display_name: defaultDeviceDisplayName,
         },
     ).then(function(creds) {
-        console.log("Logged in with token");
+        logger.log("Logged in with token");
         return clearStorage().then(async () => {
             await persistCredentials(creds);
             // remember that we just logged in
@@ -238,8 +245,6 @@ export function handleInvalidStoreError(e: InvalidStoreError): Promise<void> {
         return Promise.resolve().then(() => {
             const lazyLoadEnabled = e.value;
             if (lazyLoadEnabled) {
-                const LazyLoadingResyncDialog =
-                    sdk.getComponent("views.dialogs.LazyLoadingResyncDialog");
                 return new Promise((resolve) => {
                     Modal.createDialog(LazyLoadingResyncDialog, {
                         onFinished: resolve,
@@ -250,8 +255,6 @@ export function handleInvalidStoreError(e: InvalidStoreError): Promise<void> {
                 // between LL/non-LL version on same host.
                 // as disabling LL when previously enabled
                 // is a strong indicator of this (/develop & /app)
-                const LazyLoadingDisabledDialog =
-                    sdk.getComponent("views.dialogs.LazyLoadingDisabledDialog");
                 return new Promise((resolve) => {
                     Modal.createDialog(LazyLoadingDisabledDialog, {
                         onFinished: resolve,
@@ -272,7 +275,7 @@ function registerAsGuest(
     isUrl: string,
     defaultDeviceDisplayName: string,
 ): Promise<boolean> {
-    console.log(`Doing guest login on ${hsUrl}`);
+    logger.log(`Doing guest login on ${hsUrl}`);
 
     // create a temporary MatrixClient to do the login
     const client = createClient({
@@ -284,7 +287,7 @@ function registerAsGuest(
             initial_device_display_name: defaultDeviceDisplayName,
         },
     }).then((creds) => {
-        console.log(`Registered as guest: ${creds.user_id}`);
+        logger.log(`Registered as guest: ${creds.user_id}`);
         return doSetLoggedIn({
             userId: creds.user_id,
             deviceId: creds.device_id,
@@ -303,7 +306,7 @@ export interface IStoredSession {
     hsUrl: string;
     isUrl: string;
     hasAccessToken: boolean;
-    accessToken: string | object;
+    accessToken: string | IEncryptedPayload;
     userId: string;
     deviceId: string;
     isGuest: boolean;
@@ -346,11 +349,11 @@ export async function getStoredSessionVars(): Promise<IStoredSession> {
         isGuest = localStorage.getItem("matrix-is-guest") === "true";
     }
 
-    return {hsUrl, isUrl, hasAccessToken, accessToken, userId, deviceId, isGuest};
+    return { hsUrl, isUrl, hasAccessToken, accessToken, userId, deviceId, isGuest };
 }
 
 // The pickle key is a string of unspecified length and format.  For AES, we
-// need a 256-bit Uint8Array.  So we HKDF the pickle key to generate the AES
+// need a 256-bit Uint8Array. So we HKDF the pickle key to generate the AES
 // key.  The AES key should be zeroed after it is used.
 async function pickleKeyToAesKey(pickleKey: string): Promise<Uint8Array> {
     const pickleKeyBuffer = new Uint8Array(pickleKey.length);
@@ -402,7 +405,7 @@ export async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }):
         return false;
     }
 
-    const {hsUrl, isUrl, hasAccessToken, accessToken, userId, deviceId, isGuest} = await getStoredSessionVars();
+    const { hsUrl, isUrl, hasAccessToken, accessToken, userId, deviceId, isGuest } = await getStoredSessionVars();
 
     if (hasAccessToken && !accessToken) {
         abortLogin();
@@ -410,27 +413,27 @@ export async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }):
 
     if (accessToken && userId && hsUrl) {
         if (ignoreGuest && isGuest) {
-            console.log("Ignoring stored guest account: " + userId);
+            logger.log("Ignoring stored guest account: " + userId);
             return false;
         }
 
         let decryptedAccessToken = accessToken;
         const pickleKey = await PlatformPeg.get().getPickleKey(userId, deviceId);
         if (pickleKey) {
-            console.log("Got pickle key");
+            logger.log("Got pickle key");
             if (typeof accessToken !== "string") {
                 const encrKey = await pickleKeyToAesKey(pickleKey);
                 decryptedAccessToken = await decryptAES(accessToken, encrKey, "access_token");
                 encrKey.fill(0);
             }
         } else {
-            console.log("No pickle key available");
+            logger.log("No pickle key available");
         }
 
         const freshLogin = sessionStorage.getItem("mx_fresh_login") === "true";
         sessionStorage.removeItem("mx_fresh_login");
 
-        console.log(`Restoring session for ${userId}`);
+        logger.log(`Restoring session for ${userId}`);
         await doSetLoggedIn({
             userId: userId,
             deviceId: deviceId,
@@ -443,7 +446,7 @@ export async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }):
         }, false);
         return true;
     } else {
-        console.log("No previous session found.");
+        logger.log("No previous session found.");
         return false;
     }
 }
@@ -451,9 +454,6 @@ export async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }):
 async function handleLoadSessionFailure(e: Error): Promise<boolean> {
     console.error("Unable to load session", e);
 
-    const SessionRestoreErrorDialog =
-          sdk.getComponent('views.dialogs.SessionRestoreErrorDialog');
-
     const modal = Modal.createTrackedDialog('Session Restore Error', '', SessionRestoreErrorDialog, {
         error: e.message,
     });
@@ -490,12 +490,12 @@ export async function setLoggedIn(credentials: IMatrixClientCreds): Promise<Matr
         : null;
 
     if (pickleKey) {
-        console.log("Created pickle key");
+        logger.log("Created pickle key");
     } else {
-        console.log("Pickle key not created");
+        logger.log("Pickle key not created");
     }
 
-    return doSetLoggedIn(Object.assign({}, credentials, {pickleKey}), true);
+    return doSetLoggedIn(Object.assign({}, credentials, { pickleKey }), true);
 }
 
 /**
@@ -546,7 +546,7 @@ async function doSetLoggedIn(
 
     const softLogout = isSoftLogout();
 
-    console.log(
+    logger.log(
         "setLoggedIn: mxid: " + credentials.userId +
         " deviceId: " + credentials.deviceId +
         " guest: " + credentials.guest +
@@ -562,7 +562,7 @@ async function doSetLoggedIn(
     //
     // we fire it *synchronously* to make sure it fires before on_logged_in.
     // (dis.dispatch uses `setTimeout`, which does not guarantee ordering.)
-    dis.dispatch({action: 'on_logging_in'}, true);
+    dis.dispatch({ action: 'on_logging_in' }, true);
 
     if (clearStorageEnabled) {
         await clearStorage();
@@ -579,6 +579,9 @@ async function doSetLoggedIn(
     Analytics.setLoggedIn(credentials.guest, credentials.homeserverUrl);
 
     MatrixClientPeg.replaceUsingCreds(credentials);
+
+    PosthogAnalytics.instance.updateAnonymityFromSettings(credentials.userId);
+
     const client = MatrixClientPeg.get();
 
     if (credentials.freshLogin && SettingsStore.getValue("feature_dehydration")) {
@@ -612,7 +615,6 @@ async function doSetLoggedIn(
 }
 
 function showStorageEvictedDialog(): Promise<boolean> {
-    const StorageEvictedDialog = sdk.getComponent('views.dialogs.StorageEvictedDialog');
     return new Promise(resolve => {
         Modal.createTrackedDialog('Storage evicted', '', StorageEvictedDialog, {
             onFinished: resolve,
@@ -689,7 +691,7 @@ async function persistCredentials(credentials: IMatrixClientCreds): Promise<void
 
     SecurityCustomisations.persistCredentials?.(credentials);
 
-    console.log(`Session persisted for ${credentials.userId}`);
+    logger.log(`Session persisted for ${credentials.userId}`);
 }
 
 let _isLoggingOut = false;
@@ -704,6 +706,8 @@ export function logout(): void {
         CountlyAnalytics.instance.enable(/* anonymous = */ true);
     }
 
+    PosthogAnalytics.instance.logout();
+
     if (MatrixClientPeg.get().isGuest()) {
         // logout doesn't work for guest sessions
         // Also we sometimes want to re-log in a guest session if we abort the login.
@@ -724,7 +728,7 @@ export function logout(): void {
             // token still valid, but we should fix this by having access
             // tokens expire (and if you really think you've been compromised,
             // change your password).
-            console.log("Failed to call logout API: token will not be invalidated");
+            logger.log("Failed to call logout API: token will not be invalidated");
             onLoggedOut();
         },
     );
@@ -740,12 +744,12 @@ export function softLogout(): void {
 
     // Dev note: please keep this log line around. It can be useful for track down
     // random clients stopping in the middle of the logs.
-    console.log("Soft logout initiated");
+    logger.log("Soft logout initiated");
     _isLoggingOut = true; // to avoid repeated flags
     // Ensure that we dispatch a view change **before** stopping the client so
     // so that React components unmount first. This avoids React soft crashes
     // that can occur when components try to use a null client.
-    dis.dispatch({action: 'on_client_not_viable'}); // generic version of on_logged_out
+    dis.dispatch({ action: 'on_client_not_viable' }); // generic version of on_logged_out
     stopMatrixClient(/*unsetClient=*/false);
 
     // DO NOT CALL LOGOUT. A soft logout preserves data, logout does not.
@@ -766,13 +770,13 @@ export function isLoggingOut(): boolean {
  * syncing the client.
  */
 async function startMatrixClient(startSyncing = true): Promise<void> {
-    console.log(`Lifecycle: Starting MatrixClient`);
+    logger.log(`Lifecycle: Starting MatrixClient`);
 
     // dispatch this before starting the matrix client: it's used
     // to add listeners for the 'sync' event so otherwise we'd have
     // a race condition (and we need to dispatch synchronously for this
     // to work).
-    dis.dispatch({action: 'will_start_client'}, true);
+    dis.dispatch({ action: 'will_start_client' }, true);
 
     // reset things first just in case
     TypingStore.sharedInstance().reset();
@@ -782,7 +786,7 @@ async function startMatrixClient(startSyncing = true): Promise<void> {
     UserActivity.sharedInstance().start();
     DMRoomMap.makeShared().start();
     IntegrationManagers.sharedInstance().startWatching();
-    ActiveWidgetStore.start();
+    ActiveWidgetStore.instance.start();
     CallHandler.sharedInstance().start();
 
     // Start Mjolnir even though we haven't checked the feature flag yet. Starting
@@ -814,7 +818,7 @@ async function startMatrixClient(startSyncing = true): Promise<void> {
 
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.
-    dis.dispatch({action: 'client_started'});
+    dis.dispatch({ action: 'client_started' });
 
     if (isSoftLogout()) {
         softLogout();
@@ -830,9 +834,9 @@ export async function onLoggedOut(): Promise<void> {
     // Ensure that we dispatch a view change **before** stopping the client so
     // so that React components unmount first. This avoids React soft crashes
     // that can occur when components try to use a null client.
-    dis.dispatch({action: 'on_logged_out'}, true);
+    dis.dispatch({ action: 'on_logged_out' }, true);
     stopMatrixClient();
-    await clearStorage({deleteEverything: true});
+    await clearStorage({ deleteEverything: true });
     LifecycleCustomisations.onLoggedOutAndStorageCleared?.();
 }
 
@@ -888,7 +892,7 @@ export function stopMatrixClient(unsetClient = true): void {
     UserActivity.sharedInstance().stop();
     TypingStore.sharedInstance().reset();
     Presence.stop();
-    ActiveWidgetStore.stop();
+    ActiveWidgetStore.instance.stop();
     IntegrationManagers.sharedInstance().stopWatching();
     Mjolnir.sharedInstance().stop();
     DeviceListener.sharedInstance().stop();
diff --git a/src/Login.ts b/src/Login.ts
index 7caab22d88..bb1ab2ef36 100644
--- a/src/Login.ts
+++ b/src/Login.ts
@@ -16,11 +16,13 @@ limitations under the License.
 */
 
 // @ts-ignore - XXX: tsc doesn't like this: our js-sdk imports are complex so this isn't surprising
-import {createClient} from "matrix-js-sdk/src/matrix";
+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";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 interface ILoginOptions {
     defaultDeviceDisplayName?: string;
 }
@@ -166,7 +168,7 @@ export default class Login {
             return sendLoginRequest(
                 this.fallbackHsUrl, this.isUrl, 'm.login.password', loginParams,
             ).catch((fallbackError) => {
-                console.log("fallback HS login failed", fallbackError);
+                logger.log("fallback HS login failed", fallbackError);
                 // throw the original error
                 throw originalError;
             });
@@ -184,13 +186,12 @@ export default class Login {
             }
             throw originalLoginError;
         }).catch((error) => {
-            console.log("Login failed", error);
+            logger.log("Login failed", error);
             throw error;
         });
     }
 }
 
-
 /**
  * Send a login request to the given server, and format the response
  * as a MatrixClientCreds
@@ -219,12 +220,12 @@ export async function sendLoginRequest(
     if (wellknown) {
         if (wellknown["m.homeserver"] && wellknown["m.homeserver"]["base_url"]) {
             hsUrl = wellknown["m.homeserver"]["base_url"];
-            console.log(`Overrode homeserver setting with ${hsUrl} from login response`);
+            logger.log(`Overrode homeserver setting with ${hsUrl} from login response`);
         }
         if (wellknown["m.identity_server"] && wellknown["m.identity_server"]["base_url"]) {
             // TODO: should we prompt here?
             isUrl = wellknown["m.identity_server"]["base_url"];
-            console.log(`Overrode IS setting with ${isUrl} from login response`);
+            logger.log(`Overrode IS setting with ${isUrl} from login response`);
         }
     }
 
diff --git a/src/Markdown.js b/src/Markdown.ts
similarity index 74%
rename from src/Markdown.js
rename to src/Markdown.ts
index f670bded12..96169d4011 100644
--- a/src/Markdown.js
+++ b/src/Markdown.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+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.
@@ -15,16 +16,24 @@ limitations under the License.
 */
 
 import * as commonmark from 'commonmark';
-import {escape} from "lodash";
+import { escape } from "lodash";
 
 const ALLOWED_HTML_TAGS = ['sub', 'sup', 'del', 'u'];
 
 // These types of node are definitely text
 const TEXT_NODES = ['text', 'softbreak', 'linebreak', 'paragraph', 'document'];
 
-function is_allowed_html_tag(node) {
+// As far as @types/commonmark is concerned, these are not public, so add them
+interface CommonmarkHtmlRendererInternal extends commonmark.HtmlRenderer {
+    paragraph: (node: commonmark.Node, entering: boolean) => void;
+    link: (node: commonmark.Node, entering: boolean) => void;
+    html_inline: (node: commonmark.Node) => void; // eslint-disable-line camelcase
+    html_block: (node: commonmark.Node) => void; // eslint-disable-line camelcase
+}
+
+function isAllowedHtmlTag(node: commonmark.Node): boolean {
     if (node.literal != null &&
-        node.literal.match('^<((div|span) data-mx-maths="[^"]*"|\/(div|span))>$') != null) {
+        node.literal.match('^<((div|span) data-mx-maths="[^"]*"|/(div|span))>$') != null) {
         return true;
     }
 
@@ -39,21 +48,12 @@ function is_allowed_html_tag(node) {
     return false;
 }
 
-function html_if_tag_allowed(node) {
-    if (is_allowed_html_tag(node)) {
-        this.lit(node.literal);
-        return;
-    } else {
-        this.lit(escape(node.literal));
-    }
-}
-
 /*
  * Returns true if the parse output containing the node
  * comprises multiple block level elements (ie. lines),
  * or false if it is only a single line.
  */
-function is_multi_line(node) {
+function isMultiLine(node: commonmark.Node): boolean {
     let par = node;
     while (par.parent) {
         par = par.parent;
@@ -67,6 +67,9 @@ function is_multi_line(node) {
  * it's plain text.
  */
 export default class Markdown {
+    private input: string;
+    private parsed: commonmark.Node;
+
     constructor(input) {
         this.input = input;
 
@@ -74,7 +77,7 @@ export default class Markdown {
         this.parsed = parser.parse(this.input);
     }
 
-    isPlainText() {
+    isPlainText(): boolean {
         const walker = this.parsed.walker();
 
         let ev;
@@ -87,7 +90,7 @@ export default class Markdown {
                 // if it's an allowed html tag, we need to render it and therefore
                 // we will need to use HTML. If it's not allowed, it's not HTML since
                 // we'll just be treating it as text.
-                if (is_allowed_html_tag(node)) {
+                if (isAllowedHtmlTag(node)) {
                     return false;
                 }
             } else {
@@ -97,7 +100,7 @@ export default class Markdown {
         return true;
     }
 
-    toHTML({ externalLinks = false } = {}) {
+    toHTML({ externalLinks = false } = {}): string {
         const renderer = new commonmark.HtmlRenderer({
             safe: false,
 
@@ -107,7 +110,7 @@ export default class Markdown {
             // block quote ends up all on one line
             // (https://github.com/vector-im/element-web/issues/3154)
             softbreak: '<br />',
-        });
+        }) as CommonmarkHtmlRendererInternal;
 
         // Trying to strip out the wrapping <p/> causes a lot more complication
         // than it's worth, i think.  For instance, this code will go and strip
@@ -118,16 +121,16 @@ export default class Markdown {
         //
         // Let's try sending with <p/>s anyway for now, though.
 
-        const real_paragraph = renderer.paragraph;
+        const realParagraph = renderer.paragraph;
 
-        renderer.paragraph = function(node, entering) {
+        renderer.paragraph = function(node: commonmark.Node, entering: boolean) {
             // If there is only one top level node, just return the
             // bare text: it's a single line of text and so should be
             // 'inline', rather than unnecessarily wrapped in its own
             // p tag. If, however, we have multiple nodes, each gets
             // its own p tag to keep them as separate paragraphs.
-            if (is_multi_line(node)) {
-                real_paragraph.call(this, node, entering);
+            if (isMultiLine(node)) {
+                realParagraph.call(this, node, entering);
             }
         };
 
@@ -150,19 +153,26 @@ export default class Markdown {
             }
         };
 
-        renderer.html_inline = html_if_tag_allowed;
+        renderer.html_inline = function(node: commonmark.Node) {
+            if (isAllowedHtmlTag(node)) {
+                this.lit(node.literal);
+                return;
+            } else {
+                this.lit(escape(node.literal));
+            }
+        };
 
-        renderer.html_block = function(node) {
-/*
+        renderer.html_block = function(node: commonmark.Node) {
+            /*
             // as with `paragraph`, we only insert line breaks
             // if there are multiple lines in the markdown.
             const isMultiLine = is_multi_line(node);
             if (isMultiLine) this.cr();
-*/
-            html_if_tag_allowed.call(this, node);
-/*
+            */
+            renderer.html_inline(node);
+            /*
             if (isMultiLine) this.cr();
-*/
+            */
         };
 
         return renderer.render(this.parsed);
@@ -177,23 +187,22 @@ export default class Markdown {
      * N.B. this does **NOT** render arbitrary MD to plain text - only MD
      * which has no formatting.  Otherwise it emits HTML(!).
      */
-    toPlaintext() {
-        const renderer = new commonmark.HtmlRenderer({safe: false});
-        const real_paragraph = renderer.paragraph;
+    toPlaintext(): string {
+        const renderer = new commonmark.HtmlRenderer({ safe: false }) as CommonmarkHtmlRendererInternal;
 
-        renderer.paragraph = function(node, entering) {
+        renderer.paragraph = function(node: commonmark.Node, entering: boolean) {
             // as with toHTML, only append lines to paragraphs if there are
             // multiple paragraphs
-            if (is_multi_line(node)) {
+            if (isMultiLine(node)) {
                 if (!entering && node.next) {
                     this.lit('\n\n');
                 }
             }
         };
 
-        renderer.html_block = function(node) {
+        renderer.html_block = function(node: commonmark.Node) {
             this.lit(node.literal);
-            if (is_multi_line(node) && node.next) this.lit('\n\n');
+            if (isMultiLine(node) && node.next) this.lit('\n\n');
         };
 
         return renderer.render(this.parsed);
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 7db5ed1a4e..3860a5c133 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -17,25 +17,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ICreateClientOpts } from 'matrix-js-sdk/src/matrix';
-import {MatrixClient} from 'matrix-js-sdk/src/client';
-import {MemoryStore} from 'matrix-js-sdk/src/store/memory';
+import { ICreateClientOpts, PendingEventOrdering } from 'matrix-js-sdk/src/matrix';
+import { IStartClientOpts, MatrixClient } from 'matrix-js-sdk/src/client';
+import { MemoryStore } from 'matrix-js-sdk/src/store/memory';
 import * as utils from 'matrix-js-sdk/src/utils';
-import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
-import {EventTimelineSet} from 'matrix-js-sdk/src/models/event-timeline-set';
+import { EventTimeline } from 'matrix-js-sdk/src/models/event-timeline';
+import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set';
 import * as sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
 import Modal from './Modal';
-import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import { verificationMethods } from 'matrix-js-sdk/src/crypto';
 import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientBackedSettingsHandler";
 import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks, tryToUnlockSecretStorageWithDehydrationKey } from './SecurityManager';
-import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import { SHOW_QR_CODE_METHOD } from "matrix-js-sdk/src/crypto/verification/QRCode";
 import SecurityCustomisations from "./customisations/Security";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export interface IMatrixClientCreds {
     homeserverUrl: string;
     identityServerUrl: string;
@@ -47,25 +49,8 @@ export interface IMatrixClientCreds {
     freshLogin?: boolean;
 }
 
-// TODO: Move this to the js-sdk
-export interface IOpts {
-    initialSyncLimit?: number;
-    pendingEventOrdering?: "detached" | "chronological";
-    lazyLoadMembers?: boolean;
-    clientWellKnownPollPeriod?: number;
-}
-
 export interface IMatrixClientPeg {
-    opts: IOpts;
-
-    /**
-     * Sets the script href passed to the IndexedDB web worker
-     * If set, a separate web worker will be started to run the IndexedDB
-     * queries on.
-     *
-     * @param {string} script href to the script to be passed to the web worker
-     */
-    setIndexedDbWorkerScript(script: string): void;
+    opts: IStartClientOpts;
 
     /**
      * Return the server name of the user's homeserver
@@ -122,12 +107,12 @@ export interface IMatrixClientPeg {
  * This module provides a singleton instance of this class so the 'current'
  * Matrix Client object is available easily.
  */
-class _MatrixClientPeg implements IMatrixClientPeg {
+class MatrixClientPegClass implements IMatrixClientPeg {
     // These are the default options used when when the
     // client is started in 'start'. These can be altered
     // at any time up to after the 'will_start_client'
     // event is finished processing.
-    public opts: IOpts = {
+    public opts: IStartClientOpts = {
         initialSyncLimit: 20,
     };
 
@@ -141,10 +126,6 @@ class _MatrixClientPeg implements IMatrixClientPeg {
     constructor() {
     }
 
-    public setIndexedDbWorkerScript(script: string): void {
-        createMatrixClient.indexedDbWorkerScript = script;
-    }
-
     public get(): MatrixClient {
         return this.matrixClient;
     }
@@ -187,7 +168,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         for (const dbType of ['indexeddb', 'memory']) {
             try {
                 const promise = this.matrixClient.store.startup();
-                console.log("MatrixClientPeg: waiting for MatrixClient store to initialise");
+                logger.log("MatrixClientPeg: waiting for MatrixClient store to initialise");
                 await promise;
                 break;
             } catch (err) {
@@ -219,6 +200,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         } catch (e) {
             if (e && e.name === 'InvalidCryptoStoreError') {
                 // The js-sdk found a crypto DB too new for it to use
+                // FIXME: Using an import will result in test failures
                 const CryptoStoreTooNewDialog =
                     sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
                 Modal.createDialog(CryptoStoreTooNewDialog);
@@ -230,9 +212,10 @@ class _MatrixClientPeg implements IMatrixClientPeg {
 
         const opts = utils.deepCopy(this.opts);
         // the react sdk doesn't work without this, so don't allow
-        opts.pendingEventOrdering = "detached";
+        opts.pendingEventOrdering = PendingEventOrdering.Detached;
         opts.lazyLoadMembers = true;
         opts.clientWellKnownPollPeriod = 2 * 60 * 60; // 2 hours
+        opts.experimentalThreadSupport = SettingsStore.getValue("feature_thread");
 
         // Connect the matrix client to the dispatcher and setting handlers
         MatrixActionCreators.start(this.matrixClient);
@@ -244,9 +227,9 @@ class _MatrixClientPeg implements IMatrixClientPeg {
     public async start(): Promise<any> {
         const opts = await this.assign();
 
-        console.log(`MatrixClientPeg: really starting MatrixClient`);
+        logger.log(`MatrixClientPeg: really starting MatrixClient`);
         await this.get().startClient(opts);
-        console.log(`MatrixClientPeg: MatrixClient started`);
+        logger.log(`MatrixClientPeg: MatrixClient started`);
     }
 
     public getCredentials(): IMatrixClientCreds {
@@ -320,7 +303,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
 }
 
 if (!window.mxMatrixClientPeg) {
-    window.mxMatrixClientPeg = new _MatrixClientPeg();
+    window.mxMatrixClientPeg = new MatrixClientPegClass();
 }
 
 export const MatrixClientPeg = window.mxMatrixClientPeg;
diff --git a/src/MediaDeviceHandler.ts b/src/MediaDeviceHandler.ts
new file mode 100644
index 0000000000..154f167745
--- /dev/null
+++ b/src/MediaDeviceHandler.ts
@@ -0,0 +1,125 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+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.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SettingsStore from "./settings/SettingsStore";
+import { SettingLevel } from "./settings/SettingLevel";
+import EventEmitter from 'events';
+import { MatrixClientPeg } from "./MatrixClientPeg";
+
+// XXX: MediaDeviceKind is a union type, so we make our own enum
+export enum MediaDeviceKindEnum {
+    AudioOutput = "audiooutput",
+    AudioInput = "audioinput",
+    VideoInput = "videoinput",
+}
+
+export type IMediaDevices = Record<MediaDeviceKindEnum, Array<MediaDeviceInfo>>;
+
+export enum MediaDeviceHandlerEvent {
+    AudioOutputChanged = "audio_output_changed",
+}
+
+export default class MediaDeviceHandler extends EventEmitter {
+    private static internalInstance;
+
+    public static get instance(): MediaDeviceHandler {
+        if (!MediaDeviceHandler.internalInstance) {
+            MediaDeviceHandler.internalInstance = new MediaDeviceHandler();
+        }
+        return MediaDeviceHandler.internalInstance;
+    }
+
+    public static async hasAnyLabeledDevices(): Promise<boolean> {
+        const devices = await navigator.mediaDevices.enumerateDevices();
+        return devices.some(d => Boolean(d.label));
+    }
+
+    public static async getDevices(): Promise<IMediaDevices> {
+        // Only needed for Electron atm, though should work in modern browsers
+        // once permission has been granted to the webapp
+
+        try {
+            const devices = await navigator.mediaDevices.enumerateDevices();
+            const output = {
+                [MediaDeviceKindEnum.AudioOutput]: [],
+                [MediaDeviceKindEnum.AudioInput]: [],
+                [MediaDeviceKindEnum.VideoInput]: [],
+            };
+
+            devices.forEach((device) => output[device.kind].push(device));
+            return output;
+        } catch (error) {
+            console.warn('Unable to refresh WebRTC Devices: ', error);
+        }
+    }
+
+    /**
+     * Retrieves devices from the SettingsStore and tells the js-sdk to use them
+     */
+    public static loadDevices(): void {
+        const audioDeviceId = SettingsStore.getValue("webrtc_audioinput");
+        const videoDeviceId = SettingsStore.getValue("webrtc_videoinput");
+
+        MatrixClientPeg.get().getMediaHandler().setAudioInput(audioDeviceId);
+        MatrixClientPeg.get().getMediaHandler().setVideoInput(videoDeviceId);
+    }
+
+    public setAudioOutput(deviceId: string): void {
+        SettingsStore.setValue("webrtc_audiooutput", null, SettingLevel.DEVICE, deviceId);
+        this.emit(MediaDeviceHandlerEvent.AudioOutputChanged, deviceId);
+    }
+
+    /**
+     * This will not change the device that a potential call uses. The call will
+     * need to be ended and started again for this change to take effect
+     * @param {string} deviceId
+     */
+    public setAudioInput(deviceId: string): void {
+        SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId);
+        MatrixClientPeg.get().getMediaHandler().setAudioInput(deviceId);
+    }
+
+    /**
+     * This will not change the device that a potential call uses. The call will
+     * need to be ended and started again for this change to take effect
+     * @param {string} deviceId
+     */
+    public setVideoInput(deviceId: string): void {
+        SettingsStore.setValue("webrtc_videoinput", null, SettingLevel.DEVICE, deviceId);
+        MatrixClientPeg.get().getMediaHandler().setVideoInput(deviceId);
+    }
+
+    public setDevice(deviceId: string, kind: MediaDeviceKindEnum): void {
+        switch (kind) {
+            case MediaDeviceKindEnum.AudioOutput: this.setAudioOutput(deviceId); break;
+            case MediaDeviceKindEnum.AudioInput: this.setAudioInput(deviceId); break;
+            case MediaDeviceKindEnum.VideoInput: this.setVideoInput(deviceId); break;
+        }
+    }
+
+    public static getAudioOutput(): string {
+        return SettingsStore.getValueAt(SettingLevel.DEVICE, "webrtc_audiooutput");
+    }
+
+    public static getAudioInput(): string {
+        return SettingsStore.getValueAt(SettingLevel.DEVICE, "webrtc_audioinput");
+    }
+
+    public static getVideoInput(): string {
+        return SettingsStore.getValueAt(SettingLevel.DEVICE, "webrtc_videoinput");
+    }
+}
diff --git a/src/Modal.tsx b/src/Modal.tsx
index ce11c571b6..1e84078ddb 100644
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -15,14 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 import React from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
+import { defer } from "matrix-js-sdk/src/utils";
 
 import Analytics from './Analytics';
 import dis from './dispatcher/dispatcher';
-import {defer} from './utils/promise';
 import AsyncWrapper from './AsyncWrapper';
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
@@ -193,7 +192,7 @@ export class ModalManager {
         modal.elem = <AsyncWrapper key={modalCount} prom={prom} {...props} onFinished={closeDialog} />;
         modal.close = closeDialog;
 
-        return {modal, closeDialog, onFinishedProm};
+        return { modal, closeDialog, onFinishedProm };
     }
 
     private getCloseFn<T extends any[]>(
@@ -282,7 +281,7 @@ export class ModalManager {
         isStaticModal = false,
         options: IOptions<T> = {},
     ): IHandle<T> {
-        const {modal, closeDialog, onFinishedProm} = this.buildModal<T>(prom, props, className, options);
+        const { modal, closeDialog, onFinishedProm } = this.buildModal<T>(prom, props, className, options);
         if (isPriorityModal) {
             // XXX: This is destructive
             this.priorityModal = modal;
@@ -305,7 +304,7 @@ export class ModalManager {
         props?: IProps<T>,
         className?: string,
     ): IHandle<T> {
-        const {modal, closeDialog, onFinishedProm} = this.buildModal<T>(prom, props, className, {});
+        const { modal, closeDialog, onFinishedProm } = this.buildModal<T>(prom, props, className, {});
 
         this.modals.push(modal);
         this.reRender();
@@ -379,13 +378,13 @@ export class ModalManager {
             const dialog = (
                 <div className={classes}>
                     <div className="mx_Dialog">
-                        {modal.elem}
+                        { modal.elem }
                     </div>
                     <div className="mx_Dialog_background" onClick={this.onBackgroundClick} />
                 </div>
             );
 
-            ReactDOM.render(dialog, ModalManager.getOrCreateContainer());
+            setImmediate(() => ReactDOM.render(dialog, ModalManager.getOrCreateContainer()));
         } else {
             // This is safe to call repeatedly if we happen to do that
             ReactDOM.unmountComponentAtNode(ModalManager.getOrCreateContainer());
diff --git a/src/NodeAnimator.js b/src/NodeAnimator.tsx
similarity index 63%
rename from src/NodeAnimator.js
rename to src/NodeAnimator.tsx
index 8456e6e9fd..1a8942f5f5 100644
--- a/src/NodeAnimator.js
+++ b/src/NodeAnimator.tsx
@@ -1,6 +1,21 @@
 import React from "react";
 import ReactDom from "react-dom";
-import PropTypes from 'prop-types';
+
+interface IChildProps {
+    style: React.CSSProperties;
+    ref: (node: React.ReactInstance) => void;
+}
+
+interface IProps {
+    // either a list of child nodes, or a single child.
+    children: React.ReactNode;
+
+    // optional transition information for changing existing children
+    transition?: object;
+
+    // a list of state objects to apply to each child node in turn
+    startStyles: React.CSSProperties[];
+}
 
 /**
  * The NodeAnimator contains components and animates transitions.
@@ -9,55 +24,45 @@ import PropTypes from 'prop-types';
  * from DOM order. This makes it a lot simpler and lighter: if you need fully
  * automatic positional animation, look at react-shuffle or similar libraries.
  */
-export default class NodeAnimator extends React.Component {
-    static propTypes = {
-        // either a list of child nodes, or a single child.
-        children: PropTypes.any,
-
-        // optional transition information for changing existing children
-        transition: PropTypes.object,
-
-        // a list of state objects to apply to each child node in turn
-        startStyles: PropTypes.array,
-    };
-
-    static defaultProps = {
+export default class NodeAnimator extends React.Component<IProps> {
+    private nodes = {};
+    private children: { [key: string]: React.DetailedReactHTMLElement<any, HTMLElement> };
+    public static defaultProps: Partial<IProps> = {
         startStyles: [],
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
-        this.nodes = {};
-        this._updateChildren(this.props.children);
+        this.updateChildren(this.props.children);
     }
 
-    componentDidUpdate() {
-        this._updateChildren(this.props.children);
+    public componentDidUpdate(): void {
+        this.updateChildren(this.props.children);
     }
 
     /**
      *
      * @param {HTMLElement} node element to apply styles to
-     * @param {object} styles a key/value pair of CSS properties
+     * @param {React.CSSProperties} styles a key/value pair of CSS properties
      * @returns {void}
      */
-    _applyStyles(node, styles) {
+    private applyStyles(node: HTMLElement, styles: React.CSSProperties): void {
         Object.entries(styles).forEach(([property, value]) => {
             node.style[property] = value;
         });
     }
 
-    _updateChildren(newChildren) {
+    private updateChildren(newChildren: React.ReactNode): void {
         const oldChildren = this.children || {};
         this.children = {};
-        React.Children.toArray(newChildren).forEach((c) => {
+        React.Children.toArray(newChildren).forEach((c: any) => {
             if (oldChildren[c.key]) {
                 const old = oldChildren[c.key];
                 const oldNode = ReactDom.findDOMNode(this.nodes[old.key]);
 
-                if (oldNode && oldNode.style.left !== c.props.style.left) {
-                    this._applyStyles(oldNode, { left: c.props.style.left });
+                if (oldNode && (oldNode as HTMLElement).style.left !== c.props.style.left) {
+                    this.applyStyles(oldNode as HTMLElement, { left: c.props.style.left });
                     // console.log("translation: "+oldNode.style.left+" -> "+c.props.style.left);
                 }
                 // clone the old element with the props (and children) of the new element
@@ -66,7 +71,7 @@ export default class NodeAnimator extends React.Component {
             } else {
                 // new element. If we have a startStyle, use that as the style and go through
                 // the enter animations
-                const newProps = {};
+                const newProps: Partial<IChildProps> = {};
                 const restingStyle = c.props.style;
 
                 const startStyles = this.props.startStyles;
@@ -76,7 +81,7 @@ export default class NodeAnimator extends React.Component {
                     // console.log("mounted@startstyle0: "+JSON.stringify(startStyle));
                 }
 
-                newProps.ref = ((n) => this._collectNode(
+                newProps.ref = ((n) => this.collectNode(
                     c.key, n, restingStyle,
                 ));
 
@@ -85,7 +90,7 @@ export default class NodeAnimator extends React.Component {
         });
     }
 
-    _collectNode(k, node, restingStyle) {
+    private collectNode(k: string, node: React.ReactInstance, restingStyle: React.CSSProperties): void {
         if (
             node &&
             this.nodes[k] === undefined &&
@@ -96,7 +101,7 @@ export default class NodeAnimator extends React.Component {
             // start from startStyle 1: 0 is the one we gave it
             // to start with, so now we animate 1 etc.
             for (let i = 1; i < startStyles.length; ++i) {
-                this._applyStyles(domNode, startStyles[i]);
+                this.applyStyles(domNode as HTMLElement, startStyles[i]);
                 // console.log("start:"
                 //             JSON.stringify(startStyles[i]),
                 //             );
@@ -104,7 +109,7 @@ export default class NodeAnimator extends React.Component {
 
             // and then we animate to the resting state
             setTimeout(() => {
-                this._applyStyles(domNode, restingStyle);
+                this.applyStyles(domNode as HTMLElement, restingStyle);
             }, 0);
 
             // console.log("enter:",
@@ -113,7 +118,7 @@ export default class NodeAnimator extends React.Component {
         this.nodes[k] = node;
     }
 
-    render() {
+    public render(): JSX.Element {
         return (
             <>{ Object.values(this.children) }</>
         );
diff --git a/src/Notifier.ts b/src/Notifier.ts
index 4f55046e72..81c9bf7f4f 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -27,16 +27,18 @@ import * as TextForEvent from './TextForEvent';
 import Analytics from './Analytics';
 import * as Avatar from './Avatar';
 import dis from './dispatcher/dispatcher';
-import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
 import SettingsStore from "./settings/SettingsStore";
 import { hideToast as hideNotificationsToast } from "./toasts/DesktopNotificationsToast";
-import {SettingLevel} from "./settings/SettingLevel";
-import {isPushNotifyDisabled} from "./settings/controllers/NotificationControllers";
+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";
+import { mediaFromMxc } from "./customisations/Media";
+import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 /*
  * Dispatches:
@@ -68,7 +70,7 @@ export const Notifier = {
     // or not
     pendingEncryptedEventIds: [],
 
-    notificationMessageForEvent: function(ev: MatrixEvent) {
+    notificationMessageForEvent: function(ev: MatrixEvent): string {
         if (typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
             return typehandlers[ev.getContent().msgtype](ev);
         }
@@ -160,7 +162,7 @@ export const Notifier = {
 
     _playAudioNotification: async function(ev: MatrixEvent, room: Room) {
         const sound = this.getSoundForRoom(room.roomId);
-        console.log(`Got sound ${sound && sound.name || "default"} for ${room.roomId}`);
+        logger.log(`Got sound ${sound && sound.name || "default"} for ${room.roomId}`);
 
         try {
             const selector =
@@ -240,7 +242,6 @@ export const Notifier = {
                         ? _t('%(brand)s does not have permission to send you notifications - ' +
                             'please check your browser settings', { brand })
                         : _t('%(brand)s was not given permission to send notifications - please try again', { brand });
-                    const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createTrackedDialog('Unable to enable Notifications', result, ErrorDialog, {
                         title: _t('Unable to enable Notifications'),
                         description,
@@ -329,7 +330,7 @@ export const Notifier = {
 
     onEvent: function(ev: MatrixEvent) {
         if (!this.isSyncing) return; // don't alert for any messages initially
-        if (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId) return;
+        if (ev.getSender() === MatrixClientPeg.get().credentials.userId) return;
 
         MatrixClientPeg.get().decryptEventIfNeeded(ev);
 
diff --git a/src/PageTypes.js b/src/PageTypes.ts
similarity index 74%
rename from src/PageTypes.js
rename to src/PageTypes.ts
index 09e0eadbd7..73967f351e 100644
--- a/src/PageTypes.js
+++ b/src/PageTypes.ts
@@ -16,11 +16,13 @@ limitations under the License.
 */
 
 /** The types of page which can be shown by the LoggedInView */
-export default {
-    HomePage: "home_page",
-    RoomView: "room_view",
-    RoomDirectory: "room_directory",
-    UserView: "user_view",
-    GroupView: "group_view",
-    MyGroups: "my_groups",
-};
+enum PageType {
+    HomePage = "home_page",
+    RoomView = "room_view",
+    RoomDirectory = "room_directory",
+    UserView = "user_view",
+    GroupView = "group_view",
+    MyGroups = "my_groups",
+}
+
+export default PageType;
diff --git a/src/PasswordReset.js b/src/PasswordReset.ts
similarity index 89%
rename from src/PasswordReset.js
rename to src/PasswordReset.ts
index 88ae00d088..76f54de245 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.ts
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { createClient } from 'matrix-js-sdk/src/matrix';
+import { createClient, IRequestTokenResponse, MatrixClient } from 'matrix-js-sdk/src/matrix';
 import { _t } from './languageHandler';
 
 /**
@@ -26,12 +26,18 @@ import { _t } from './languageHandler';
  * API on the homeserver in question with the new password.
  */
 export default class PasswordReset {
+    private client: MatrixClient;
+    private clientSecret: string;
+    private identityServerDomain: string;
+    private password: string;
+    private sessionId: string;
+
     /**
      * Configure the endpoints for password resetting.
      * @param {string} homeserverUrl The URL to the HS which has the account to reset.
      * @param {string} identityUrl The URL to the IS which has linked the email -> mxid mapping.
      */
-    constructor(homeserverUrl, identityUrl) {
+    constructor(homeserverUrl: string, identityUrl: string) {
         this.client = createClient({
             baseUrl: homeserverUrl,
             idBaseUrl: identityUrl,
@@ -47,7 +53,7 @@ export default class PasswordReset {
      * @param {string} newPassword The new password for the account.
      * @return {Promise} Resolves when the email has been sent. Then call checkEmailLinkClicked().
      */
-    resetPassword(emailAddress, newPassword) {
+    public resetPassword(emailAddress: string, newPassword: string): Promise<IRequestTokenResponse> {
         this.password = newPassword;
         return this.client.requestPasswordEmailToken(emailAddress, this.clientSecret, 1).then((res) => {
             this.sessionId = res.sid;
@@ -69,7 +75,7 @@ export default class PasswordReset {
      * with a "message" property which contains a human-readable message detailing why
      * the reset failed, e.g. "There is no mapped matrix user ID for the given email address".
      */
-    async checkEmailLinkClicked() {
+    public async checkEmailLinkClicked(): Promise<void> {
         const creds = {
             sid: this.sessionId,
             client_secret: this.clientSecret,
diff --git a/src/PosthogAnalytics.ts b/src/PosthogAnalytics.ts
new file mode 100644
index 0000000000..bdc0814b5d
--- /dev/null
+++ b/src/PosthogAnalytics.ts
@@ -0,0 +1,361 @@
+/*
+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 posthog, { PostHog } from 'posthog-js';
+import PlatformPeg from './PlatformPeg';
+import SdkConfig from './SdkConfig';
+import SettingsStore from './settings/SettingsStore';
+import { MatrixClientPeg } from "./MatrixClientPeg";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+/* Posthog analytics tracking.
+ *
+ * Anonymity behaviour is as follows:
+ *
+ * - If Posthog isn't configured in `config.json`, events are not sent.
+ * - If [Do Not Track](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/doNotTrack) is
+ *   enabled, events are not sent (this detection is built into posthog and turned on via the
+ *   `respect_dnt` flag being passed to `posthog.init`).
+ * - If the `feature_pseudonymous_analytics_opt_in` labs flag is `true`, track pseudonomously by maintaining
+ *   a randomised analytics ID in account_data for that user (shared between devices) and sending it to posthog to
+     identify the user.
+ * - Otherwise, if the existing `analyticsOptIn` flag is `true`, track anonymously, i.e. do not identify the user
+     using any identifier that would be consistent across devices.
+ * - If both flags are false or not set, events are not sent.
+ */
+
+interface IEvent {
+    // The event name that will be used by PostHog. Event names should use snake_case.
+    eventName: string;
+
+    // The properties of the event that will be stored in PostHog. This is just a placeholder,
+    // extending interfaces must override this with a concrete definition to do type validation.
+    properties: {};
+}
+
+export enum Anonymity {
+    Disabled,
+    Anonymous,
+    Pseudonymous
+}
+
+// If an event extends IPseudonymousEvent, the event contains pseudonymous data
+// that won't be sent unless the user has explicitly consented to pseudonymous tracking.
+// For example, it might contain hashed user IDs or room IDs.
+// Such events will be automatically dropped if PosthogAnalytics.anonymity isn't set to Pseudonymous.
+export interface IPseudonymousEvent extends IEvent {}
+
+// If an event extends IAnonymousEvent, the event strictly contains *only* anonymous data;
+// i.e. no identifiers that can be associated with the user.
+export interface IAnonymousEvent extends IEvent {}
+
+export interface IRoomEvent extends IPseudonymousEvent {
+    hashedRoomId: string;
+}
+
+interface IPageView extends IAnonymousEvent {
+    eventName: "$pageview";
+    properties: {
+        durationMs?: number;
+        screen?: string;
+    };
+}
+
+const whitelistedScreens = new Set([
+    "register", "login", "forgot_password", "soft_logout", "new", "settings", "welcome", "home", "start", "directory",
+    "start_sso", "start_cas", "groups", "complete_security", "post_registration", "room", "user", "group",
+]);
+
+export async function getRedactedCurrentLocation(
+    origin: string,
+    hash: string,
+    pathname: string,
+    anonymity: Anonymity,
+): Promise<string> {
+    // Redact PII from the current location.
+    // For known screens, assumes a URL structure of /<screen name>/might/be/pii
+    if (origin.startsWith('file://')) {
+        pathname = "/<redacted_file_scheme_url>/";
+    }
+
+    let hashStr;
+    if (hash == "") {
+        hashStr = "";
+    } else {
+        let [beforeFirstSlash, screen] = hash.split("/");
+
+        if (!whitelistedScreens.has(screen)) {
+            screen = "<redacted_screen_name>";
+        }
+
+        hashStr = `${beforeFirstSlash}/${screen}/<redacted>`;
+    }
+    return origin + pathname + hashStr;
+}
+
+interface PlatformProperties {
+    appVersion: string;
+    appPlatform: string;
+}
+
+export class PosthogAnalytics {
+    /* Wrapper for Posthog analytics.
+     * 3 modes of anonymity are supported, governed by this.anonymity
+     * - Anonymity.Disabled means *no data* is passed to posthog
+     * - Anonymity.Anonymous means no identifier is passed to posthog
+     * - Anonymity.Pseudonymous means an analytics ID stored in account_data and shared between devices
+     *   is passed to posthog.
+     *
+     * To update anonymity, call updateAnonymityFromSettings() or you can set it directly via setAnonymity().
+     *
+     * To pass an event to Posthog:
+     *
+     * 1. Declare a type for the event, extending IAnonymousEvent or IPseudonymousEvent.
+     * 2. Call the appropriate track*() method. Pseudonymous events will be dropped when anonymity is
+     *    Anonymous or Disabled; Anonymous events will be dropped when anonymity is Disabled.
+     */
+
+    private anonymity = Anonymity.Disabled;
+    // set true during the constructor if posthog config is present, otherwise false
+    private enabled = false;
+    private static _instance = null;
+    private platformSuperProperties = {};
+    private static ANALYTICS_ID_EVENT_TYPE = "im.vector.web.analytics_id";
+
+    public static get instance(): PosthogAnalytics {
+        if (!this._instance) {
+            this._instance = new PosthogAnalytics(posthog);
+        }
+        return this._instance;
+    }
+
+    constructor(private readonly posthog: PostHog) {
+        const posthogConfig = SdkConfig.get()["posthog"];
+        if (posthogConfig) {
+            this.posthog.init(posthogConfig.projectApiKey, {
+                api_host: posthogConfig.apiHost,
+                autocapture: false,
+                mask_all_text: true,
+                mask_all_element_attributes: true,
+                // This only triggers on page load, which for our SPA isn't particularly useful.
+                // Plus, the .capture call originating from somewhere in posthog makes it hard
+                // to redact URLs, which requires async code.
+                //
+                // To raise this manually, just call .capture("$pageview") or posthog.capture_pageview.
+                capture_pageview: false,
+                sanitize_properties: this.sanitizeProperties,
+                respect_dnt: true,
+            });
+            this.enabled = true;
+        } else {
+            this.enabled = false;
+        }
+    }
+
+    private sanitizeProperties = (properties: posthog.Properties): posthog.Properties => {
+        // Callback from posthog to sanitize properties before sending them to the server.
+        //
+        // Here we sanitize posthog's built in properties which leak PII e.g. url reporting.
+        // See utils.js _.info.properties in posthog-js.
+
+        // Replace the $current_url with a redacted version.
+        // $redacted_current_url is injected by this class earlier in capture(), as its generation
+        // is async and can't be done in this non-async callback.
+        if (!properties['$redacted_current_url']) {
+            logger.log("$redacted_current_url not set in sanitizeProperties, will drop $current_url entirely");
+        }
+        properties['$current_url'] = properties['$redacted_current_url'];
+        delete properties['$redacted_current_url'];
+
+        if (this.anonymity == Anonymity.Anonymous) {
+            // drop referrer information for anonymous users
+            properties['$referrer'] = null;
+            properties['$referring_domain'] = null;
+            properties['$initial_referrer'] = null;
+            properties['$initial_referring_domain'] = null;
+
+            // drop device ID, which is a UUID persisted in local storage
+            properties['$device_id'] = null;
+        }
+
+        return properties;
+    };
+
+    private static getAnonymityFromSettings(): Anonymity {
+        // determine the current anonymity level based on current user settings
+
+        // "Send anonymous usage data which helps us improve Element. This will use a cookie."
+        const analyticsOptIn = SettingsStore.getValue("analyticsOptIn", null, true);
+
+        // (proposed wording) "Send pseudonymous usage data which helps us improve Element. This will use a cookie."
+        //
+        // TODO: Currently, this is only a labs flag, for testing purposes.
+        const pseudonumousOptIn = SettingsStore.getValue("feature_pseudonymous_analytics_opt_in", null, true);
+
+        let anonymity;
+        if (pseudonumousOptIn) {
+            anonymity = Anonymity.Pseudonymous;
+        } else if (analyticsOptIn) {
+            anonymity = Anonymity.Anonymous;
+        } else {
+            anonymity = Anonymity.Disabled;
+        }
+
+        return anonymity;
+    }
+
+    private registerSuperProperties(properties: posthog.Properties) {
+        if (this.enabled) {
+            this.posthog.register(properties);
+        }
+    }
+
+    private static async getPlatformProperties(): Promise<PlatformProperties> {
+        const platform = PlatformPeg.get();
+        let appVersion;
+        try {
+            appVersion = await platform.getAppVersion();
+        } catch (e) {
+            // this happens if no version is set i.e. in dev
+            appVersion = "unknown";
+        }
+
+        return {
+            appVersion,
+            appPlatform: platform.getHumanReadableName(),
+        };
+    }
+
+    private async capture(eventName: string, properties: posthog.Properties) {
+        if (!this.enabled) {
+            return;
+        }
+        const { origin, hash, pathname } = window.location;
+        properties['$redacted_current_url'] = await getRedactedCurrentLocation(
+            origin, hash, pathname, this.anonymity);
+        this.posthog.capture(eventName, properties);
+    }
+
+    public isEnabled(): boolean {
+        return this.enabled;
+    }
+
+    public setAnonymity(anonymity: Anonymity): void {
+        // Update this.anonymity.
+        // This is public for testing purposes, typically you want to call updateAnonymityFromSettings
+        // to ensure this value is in step with the user's settings.
+        if (this.enabled && (anonymity == Anonymity.Disabled || anonymity == Anonymity.Anonymous)) {
+            // when transitioning to Disabled or Anonymous ensure we clear out any prior state
+            // set in posthog e.g. distinct ID
+            this.posthog.reset();
+            // Restore any previously set platform super properties
+            this.registerSuperProperties(this.platformSuperProperties);
+        }
+        this.anonymity = anonymity;
+    }
+
+    private static getRandomAnalyticsId(): string {
+        return [...crypto.getRandomValues(new Uint8Array(16))].map((c) => c.toString(16)).join('');
+    }
+
+    public async identifyUser(client: MatrixClient, analyticsIdGenerator: () => string): Promise<void> {
+        if (this.anonymity == Anonymity.Pseudonymous) {
+            // Check the user's account_data for an analytics ID to use. Storing the ID in account_data allows
+            // different devices to send the same ID.
+            try {
+                const accountData = await client.getAccountDataFromServer(PosthogAnalytics.ANALYTICS_ID_EVENT_TYPE);
+                let analyticsID = accountData?.id;
+                if (!analyticsID) {
+                    // Couldn't retrieve an analytics ID from user settings, so create one and set it on the server.
+                    // Note there's a race condition here - if two devices do these steps at the same time, last write
+                    // wins, and the first writer will send tracking with an ID that doesn't match the one on the server
+                    // until the next time account data is refreshed and this function is called (most likely on next
+                    // page load). This will happen pretty infrequently, so we can tolerate the possibility.
+                    analyticsID = analyticsIdGenerator();
+                    await client.setAccountData("im.vector.web.analytics_id", { id: analyticsID });
+                }
+                this.posthog.identify(analyticsID);
+            } catch (e) {
+                // The above could fail due to network requests, but not essential to starting the application,
+                // so swallow it.
+                logger.log("Unable to identify user for tracking" + e.toString());
+            }
+        }
+    }
+
+    public getAnonymity(): Anonymity {
+        return this.anonymity;
+    }
+
+    public logout(): void {
+        if (this.enabled) {
+            this.posthog.reset();
+        }
+        this.setAnonymity(Anonymity.Anonymous);
+    }
+
+    public async trackPseudonymousEvent<E extends IPseudonymousEvent>(
+        eventName: E["eventName"],
+        properties: E["properties"] = {},
+    ) {
+        if (this.anonymity == Anonymity.Anonymous || this.anonymity == Anonymity.Disabled) return;
+        await this.capture(eventName, properties);
+    }
+
+    public async trackAnonymousEvent<E extends IAnonymousEvent>(
+        eventName: E["eventName"],
+        properties: E["properties"] = {},
+    ): Promise<void> {
+        if (this.anonymity == Anonymity.Disabled) return;
+        await this.capture(eventName, properties);
+    }
+
+    public async trackPageView(durationMs: number): Promise<void> {
+        const hash = window.location.hash;
+
+        let screen = null;
+        const split = hash.split("/");
+        if (split.length >= 2) {
+            screen = split[1];
+        }
+
+        await this.trackAnonymousEvent<IPageView>("$pageview", {
+            durationMs,
+            screen,
+        });
+    }
+
+    public async updatePlatformSuperProperties(): Promise<void> {
+        // Update super properties in posthog with our platform (app version, platform).
+        // These properties will be subsequently passed in every event.
+        //
+        // This only needs to be done once per page lifetime. Note that getPlatformProperties
+        // is async and can involve a network request if we are running in a browser.
+        this.platformSuperProperties = await PosthogAnalytics.getPlatformProperties();
+        this.registerSuperProperties(this.platformSuperProperties);
+    }
+
+    public async updateAnonymityFromSettings(userId?: string): Promise<void> {
+        // Update this.anonymity based on the user's analytics opt-in settings
+        // Identify the user (via hashed user ID) to posthog if anonymity is pseudonmyous
+        this.setAnonymity(PosthogAnalytics.getAnonymityFromSettings());
+        if (userId && this.getAnonymity() == Anonymity.Pseudonymous) {
+            await this.identifyUser(MatrixClientPeg.get(), PosthogAnalytics.getRandomAnalyticsId);
+        }
+    }
+}
diff --git a/src/Presence.ts b/src/Presence.ts
index 8f2e127cb4..af35060363 100644
--- a/src/Presence.ts
+++ b/src/Presence.ts
@@ -16,10 +16,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from "./MatrixClientPeg";
+import { MatrixClientPeg } from "./MatrixClientPeg";
 import dis from "./dispatcher/dispatcher";
 import Timer from './utils/Timer';
-import {ActionPayload} from "./dispatcher/payloads";
+import { ActionPayload } from "./dispatcher/payloads";
 
 // Time in ms after that a user is considered as unavailable/away
 const UNAVAILABLE_TIME_MS = 3 * 60 * 1000; // 3 mins
@@ -78,7 +78,7 @@ class Presence {
             this.setState(State.Online);
             this.unavailableTimer.restart();
         }
-    }
+    };
 
     /**
      * Set the presence state.
@@ -98,7 +98,7 @@ class Presence {
         }
 
         try {
-            await MatrixClientPeg.get().setPresence({presence: this.state});
+            await MatrixClientPeg.get().setPresence({ presence: this.state });
             console.info("Presence:", newState);
         } catch (err) {
             console.error("Failed to set presence:", err);
diff --git a/src/Registration.js b/src/Registration.tsx
similarity index 71%
rename from src/Registration.js
rename to src/Registration.tsx
index 0df2ec3eb3..90e81c0d45 100644
--- a/src/Registration.js
+++ b/src/Registration.tsx
@@ -20,10 +20,11 @@ limitations under the License.
  * registration code.
  */
 
+import React from "react";
 import dis from './dispatcher/dispatcher';
-import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
+import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 
 // Regex for what a "safe" or "Matrix-looking" localpart would be.
 // TODO: Update as needed for https://github.com/matrix-org/matrix-doc/issues/1514
@@ -41,9 +42,11 @@ export const SAFE_LOCALPART_REGEX = /^[a-z0-9=_\-./]+$/;
  * @param {bool} options.screen_after
  *     If present the screen to redirect to after a successful login or register.
  */
-export async function startAnyRegistrationFlow(options) {
+export async function startAnyRegistrationFlow(
+    // eslint-disable-next-line camelcase
+    options: { go_home_on_cancel?: boolean, go_welcome_on_cancel?: boolean, screen_after?: boolean},
+): Promise<void> {
     if (options === undefined) options = {};
-    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
     const modal = Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
         hasCancelButton: true,
         quitOnly: true,
@@ -51,18 +54,23 @@ export async function startAnyRegistrationFlow(options) {
         description: _t("Use your account or create a new one to continue."),
         button: _t("Create Account"),
         extraButtons: [
-            <button key="start_login" onClick={() => {
-                modal.close();
-                dis.dispatch({action: 'start_login', screenAfterLogin: options.screen_after});
-            }}>{ _t('Sign In') }</button>,
+            <button
+                key="start_login"
+                onClick={() => {
+                    modal.close();
+                    dis.dispatch({ action: 'start_login', screenAfterLogin: options.screen_after });
+                }}
+            >
+                { _t('Sign In') }
+            </button>,
         ],
         onFinished: (proceed) => {
             if (proceed) {
-                dis.dispatch({action: 'start_registration', screenAfterLogin: options.screen_after});
+                dis.dispatch({ action: 'start_registration', screenAfterLogin: options.screen_after });
             } else if (options.go_home_on_cancel) {
-                dis.dispatch({action: 'view_home_page'});
+                dis.dispatch({ action: 'view_home_page' });
             } else if (options.go_welcome_on_cancel) {
-                dis.dispatch({action: 'view_welcome_page'});
+                dis.dispatch({ action: 'view_welcome_page' });
             }
         },
     });
diff --git a/src/Resend.js b/src/Resend.ts
similarity index 63%
rename from src/Resend.js
rename to src/Resend.ts
index f1e5fb38f5..0b5c279165 100644
--- a/src/Resend.js
+++ b/src/Resend.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 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.
@@ -15,47 +14,46 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixEvent, EventStatus } from 'matrix-js-sdk/src/models/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
+
+import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';
-import { EventStatus } from 'matrix-js-sdk/src/models/event';
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 export default class Resend {
-    static resendUnsentEvents(room) {
-        return Promise.all(room.getPendingEvents().filter(function(ev) {
+    static resendUnsentEvents(room: Room): Promise<void[]> {
+        return Promise.all(room.getPendingEvents().filter(function(ev: MatrixEvent) {
             return ev.status === EventStatus.NOT_SENT;
-        }).map(function(event) {
+        }).map(function(event: MatrixEvent) {
             return Resend.resend(event);
         }));
     }
 
-    static cancelUnsentEvents(room) {
-        room.getPendingEvents().filter(function(ev) {
+    static cancelUnsentEvents(room: Room): void {
+        room.getPendingEvents().filter(function(ev: MatrixEvent) {
             return ev.status === EventStatus.NOT_SENT;
-        }).forEach(function(event) {
+        }).forEach(function(event: MatrixEvent) {
             Resend.removeFromQueue(event);
         });
     }
 
-    static resend(event) {
+    static resend(event: MatrixEvent): Promise<void> {
         const room = MatrixClientPeg.get().getRoom(event.getRoomId());
         return MatrixClientPeg.get().resendEvent(event, room).then(function(res) {
             dis.dispatch({
                 action: 'message_sent',
                 event: event,
             });
-        }, function(err) {
+        }, function(err: Error) {
             // XXX: temporary logging to try to diagnose
             // https://github.com/vector-im/element-web/issues/3148
-            console.log('Resend got send failure: ' + err.name + '(' + err + ')');
-
-            dis.dispatch({
-                action: 'message_send_failed',
-                event: event,
-            });
+            logger.log('Resend got send failure: ' + err.name + '(' + err + ')');
         });
     }
 
-    static removeFromQueue(event) {
+    static removeFromQueue(event: MatrixEvent): void {
         MatrixClientPeg.get().cancelPendingEvent(event);
     }
 }
diff --git a/src/Roles.ts b/src/Roles.ts
index b4be97fdce..ae0d316d30 100644
--- a/src/Roles.ts
+++ b/src/Roles.ts
@@ -31,6 +31,6 @@ export function textualPowerLevel(level: number, usersDefault: number): string {
     if (LEVEL_ROLE_MAP[level]) {
         return LEVEL_ROLE_MAP[level];
     } else {
-        return _t("Custom (%(level)s)", {level});
+        return _t("Custom (%(level)s)", { level });
     }
 }
diff --git a/src/RoomAliasCache.js b/src/RoomAliasCache.ts
similarity index 81%
rename from src/RoomAliasCache.js
rename to src/RoomAliasCache.ts
index bb511ba4d7..c318db2d3f 100644
--- a/src/RoomAliasCache.js
+++ b/src/RoomAliasCache.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -24,12 +24,12 @@ limitations under the License.
  * A similar thing could also be achieved via `pushState` with a state object,
  * but keeping it separate like this seems easier in case we do want to extend.
  */
-const aliasToIDMap = new Map();
+const aliasToIDMap = new Map<string, string>();
 
-export function storeRoomAliasInCache(alias, id) {
+export function storeRoomAliasInCache(alias: string, id: string): void {
     aliasToIDMap.set(alias, id);
 }
 
-export function getCachedRoomIDForAlias(alias) {
+export function getCachedRoomIDForAlias(alias: string): string {
     return aliasToIDMap.get(alias);
 }
diff --git a/src/RoomInvite.js b/src/RoomInvite.tsx
similarity index 50%
rename from src/RoomInvite.js
rename to src/RoomInvite.tsx
index aa758ecbdc..7d093f4092 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017, 2018 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 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,15 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import {MatrixClientPeg} from './MatrixClientPeg';
-import MultiInviter from './utils/MultiInviter';
+import React from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { User } from "matrix-js-sdk/src/models/user";
+
+import { MatrixClientPeg } from './MatrixClientPeg';
+import MultiInviter, { CompletionStates } from './utils/MultiInviter';
 import Modal from './Modal';
-import * as sdk from './';
 import { _t } from './languageHandler';
-import InviteDialog, {KIND_DM, KIND_INVITE} from "./components/views/dialogs/InviteDialog";
+import InviteDialog, { KIND_DM, KIND_INVITE, Member } from "./components/views/dialogs/InviteDialog";
 import CommunityPrototypeInviteDialog from "./components/views/dialogs/CommunityPrototypeInviteDialog";
-import {CommunityPrototypeStore} from "./stores/CommunityPrototypeStore";
+import { CommunityPrototypeStore } from "./stores/CommunityPrototypeStore";
+import BaseAvatar from "./components/views/avatars/BaseAvatar";
+import { mediaFromMxc } from "./customisations/Media";
+import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+
+export interface IInviteResult {
+    states: CompletionStates;
+    inviter: MultiInviter;
+}
 
 /**
  * Invites multiple addresses to a room
@@ -32,24 +41,23 @@ import {CommunityPrototypeStore} from "./stores/CommunityPrototypeStore";
  * no option to cancel.
  *
  * @param {string} roomId The ID of the room to invite to
- * @param {string[]} addrs Array of strings of addresses to invite. May be matrix IDs or 3pids.
+ * @param {string[]} addresses Array of strings of addresses to invite. May be matrix IDs or 3pids.
  * @returns {Promise} Promise
  */
-export function inviteMultipleToRoom(roomId, addrs) {
+export function inviteMultipleToRoom(roomId: string, addresses: string[]): Promise<IInviteResult> {
     const inviter = new MultiInviter(roomId);
-    return inviter.invite(addrs).then(states => Promise.resolve({states, inviter}));
+    return inviter.invite(addresses).then(states => Promise.resolve({ states, inviter }));
 }
 
-export function showStartChatInviteDialog(initialText) {
+export function showStartChatInviteDialog(initialText = ""): void {
     // This dialog handles the room creation internally - we don't need to worry about it.
-    const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
     Modal.createTrackedDialog(
-        'Start DM', '', InviteDialog, {kind: KIND_DM, initialText},
+        'Start DM', '', InviteDialog, { kind: KIND_DM, initialText },
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
     );
 }
 
-export function showRoomInviteDialog(roomId, initialText = "") {
+export function showRoomInviteDialog(roomId: string, initialText = ""): void {
     // This dialog handles the room creation internally - we don't need to worry about it.
     Modal.createTrackedDialog(
         "Invite Users", "", InviteDialog, {
@@ -61,14 +69,14 @@ export function showRoomInviteDialog(roomId, initialText = "") {
     );
 }
 
-export function showCommunityRoomInviteDialog(roomId, communityName) {
+export function showCommunityRoomInviteDialog(roomId: string, communityName: string): void {
     Modal.createTrackedDialog(
-        'Invite Users to Community', '', CommunityPrototypeInviteDialog, {communityName, roomId},
+        'Invite Users to Community', '', CommunityPrototypeInviteDialog, { communityName, roomId },
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
     );
 }
 
-export function showCommunityInviteDialog(communityId) {
+export function showCommunityInviteDialog(communityId: string): void {
     const chat = CommunityPrototypeStore.instance.getGeneralChat(communityId);
     if (chat) {
         const name = CommunityPrototypeStore.instance.getCommunityName(communityId);
@@ -83,7 +91,7 @@ export function showCommunityInviteDialog(communityId) {
  * @param {MatrixEvent} event The event to check
  * @returns {boolean} True if valid, false otherwise
  */
-export function isValid3pidInvite(event) {
+export function isValid3pidInvite(event: MatrixEvent): boolean {
     if (!event || event.getType() !== "m.room.third_party_invite") return false;
 
     // any events without these keys are not valid 3pid invites, so we ignore them
@@ -96,13 +104,12 @@ export function isValid3pidInvite(event) {
     return true;
 }
 
-export function inviteUsersToRoom(roomId, userIds) {
+export function inviteUsersToRoom(roomId: string, userIds: string[]): Promise<void> {
     return inviteMultipleToRoom(roomId, userIds).then((result) => {
         const room = MatrixClientPeg.get().getRoom(roomId);
         showAnyInviteErrors(result.states, room, result.inviter);
     }).catch((err) => {
         console.error(err.stack);
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Failed to invite', '', ErrorDialog, {
             title: _t("Failed to invite"),
             description: ((err && err.message) ? err.message : _t("Operation failed")),
@@ -110,35 +117,66 @@ export function inviteUsersToRoom(roomId, userIds) {
     });
 }
 
-export function showAnyInviteErrors(addrs, room, inviter) {
+export function showAnyInviteErrors(
+    states: CompletionStates,
+    room: Room,
+    inviter: MultiInviter,
+    userMap?: Map<string, Member>,
+): boolean {
     // Show user any errors
-    const failedUsers = Object.keys(addrs).filter(a => addrs[a] === 'error');
+    const failedUsers = Object.keys(states).filter(a => states[a] === 'error');
     if (failedUsers.length === 1 && inviter.fatal) {
         // Just get the first message because there was a fatal problem on the first
         // user. This usually means that no other users were attempted, making it
         // pointless for us to list who failed exactly.
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Failed to invite users to the room', '', ErrorDialog, {
-            title: _t("Failed to invite users to the room:", {roomName: room.name}),
+            title: _t("Failed to invite users to the room:", { roomName: room.name }),
             description: inviter.getErrorText(failedUsers[0]),
         });
         return false;
     } else {
         const errorList = [];
         for (const addr of failedUsers) {
-            if (addrs[addr] === "error") {
+            if (states[addr] === "error") {
                 const reason = inviter.getErrorText(addr);
                 errorList.push(addr + ": " + reason);
             }
         }
 
+        const cli = MatrixClientPeg.get();
         if (errorList.length > 0) {
             // React 16 doesn't let us use `errorList.join(<br />)` anymore, so this is our solution
-            const description = <div>{errorList.map(e => <div key={e}>{e}</div>)}</div>;
+            const description = <div className="mx_InviteDialog_multiInviterError">
+                <h4>{ _t("We sent the others, but the below people couldn't be invited to <RoomName/>", {}, {
+                    RoomName: () => <b>{ room.name }</b>,
+                }) }</h4>
+                <div>
+                    { failedUsers.map(addr => {
+                        const user = userMap?.get(addr) || cli.getUser(addr);
+                        const name = (user as Member).name || (user as User).rawDisplayName;
+                        const avatarUrl = (user as Member).getMxcAvatarUrl?.() || (user as User).avatarUrl;
+                        return <div key={addr} className="mx_InviteDialog_multiInviterError_entry">
+                            <div className="mx_InviteDialog_multiInviterError_entry_userProfile">
+                                <BaseAvatar
+                                    url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(24) : null}
+                                    name={name}
+                                    idName={user.userId}
+                                    width={24}
+                                    height={24}
+                                />
+                                <span className="mx_InviteDialog_multiInviterError_entry_name">{ name }</span>
+                                <span className="mx_InviteDialog_multiInviterError_entry_userId">{ user.userId }</span>
+                            </div>
+                            <div className="mx_InviteDialog_multiInviterError_entry_error">
+                                { inviter.getErrorText(addr) }
+                            </div>
+                        </div>;
+                    }) }
+                </div>
+            </div>;
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Failed to invite the following users to the room', '', ErrorDialog, {
-                title: _t("Failed to invite the following users to the %(roomName)s room:", {roomName: room.name}),
+            Modal.createTrackedDialog("Some invites could not be sent", "", ErrorDialog, {
+                title: _t("Some invites couldn't be sent"),
                 description,
             });
             return false;
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.ts
similarity index 65%
rename from src/RoomNotifs.js
rename to src/RoomNotifs.ts
index 600655f635..5abee9a6ad 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.ts
@@ -15,29 +15,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
-import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
+import { MatrixClientPeg } from './MatrixClientPeg';
+import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor';
+import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room";
+import { IAnnotatedPushRule, PushRuleKind } from "matrix-js-sdk/src/@types/PushRules";
 
-export const ALL_MESSAGES_LOUD = 'all_messages_loud';
-export const ALL_MESSAGES = 'all_messages';
-export const MENTIONS_ONLY = 'mentions_only';
-export const MUTE = 'mute';
+export enum RoomNotifState {
+    AllMessagesLoud = 'all_messages_loud',
+    AllMessages = 'all_messages',
+    MentionsOnly = 'mentions_only',
+    Mute = 'mute',
+}
 
-export const BADGE_STATES = [ALL_MESSAGES, ALL_MESSAGES_LOUD];
-export const MENTION_BADGE_STATES = [...BADGE_STATES, MENTIONS_ONLY];
+export const BADGE_STATES = [RoomNotifState.AllMessages, RoomNotifState.AllMessagesLoud];
+export const MENTION_BADGE_STATES = [...BADGE_STATES, RoomNotifState.MentionsOnly];
 
-export function shouldShowNotifBadge(roomNotifState) {
+export function shouldShowNotifBadge(roomNotifState: RoomNotifState): boolean {
     return BADGE_STATES.includes(roomNotifState);
 }
 
-export function shouldShowMentionBadge(roomNotifState) {
+export function shouldShowMentionBadge(roomNotifState: RoomNotifState): boolean {
     return MENTION_BADGE_STATES.includes(roomNotifState);
 }
 
-export function aggregateNotificationCount(rooms) {
-    return rooms.reduce((result, room) => {
+export function aggregateNotificationCount(rooms: Room[]): {count: number, highlight: boolean} {
+    return rooms.reduce<{count: number, highlight: boolean}>((result, room) => {
         const roomNotifState = getRoomNotifsState(room.roomId);
-        const highlight = room.getUnreadNotificationCount('highlight') > 0;
+        const highlight = room.getUnreadNotificationCount(NotificationCountType.Highlight) > 0;
         // use helper method to include highlights in the previous version of the room
         const notificationCount = getUnreadNotificationCount(room);
 
@@ -52,12 +56,12 @@ export function aggregateNotificationCount(rooms) {
             }
         }
         return result;
-    }, {count: 0, highlight: false});
+    }, { count: 0, highlight: false });
 }
 
-export function getRoomHasBadge(room) {
+export function getRoomHasBadge(room: Room): boolean {
     const roomNotifState = getRoomNotifsState(room.roomId);
-    const highlight = room.getUnreadNotificationCount('highlight') > 0;
+    const highlight = room.getUnreadNotificationCount(NotificationCountType.Highlight) > 0;
     const notificationCount = room.getUnreadNotificationCount();
 
     const notifBadges = notificationCount > 0 && shouldShowNotifBadge(roomNotifState);
@@ -66,14 +70,14 @@ export function getRoomHasBadge(room) {
     return notifBadges || mentionBadges;
 }
 
-export function getRoomNotifsState(roomId) {
-    if (MatrixClientPeg.get().isGuest()) return ALL_MESSAGES;
+export function getRoomNotifsState(roomId: string): RoomNotifState {
+    if (MatrixClientPeg.get().isGuest()) return RoomNotifState.AllMessages;
 
     // look through the override rules for a rule affecting this room:
     // if one exists, it will take precedence.
     const muteRule = findOverrideMuteRule(roomId);
     if (muteRule) {
-        return MUTE;
+        return RoomNotifState.Mute;
     }
 
     // for everything else, look at the room rule.
@@ -89,27 +93,27 @@ export function getRoomNotifsState(roomId) {
     // XXX: We have to assume the default is to notify for all messages
     // (in particular this will be 'wrong' for one to one rooms because
     // they will notify loudly for all messages)
-    if (!roomRule || !roomRule.enabled) return ALL_MESSAGES;
+    if (!roomRule || !roomRule.enabled) return RoomNotifState.AllMessages;
 
     // a mute at the room level will still allow mentions
     // to notify
-    if (isMuteRule(roomRule)) return MENTIONS_ONLY;
+    if (isMuteRule(roomRule)) return RoomNotifState.MentionsOnly;
 
     const actionsObject = PushProcessor.actionListToActionsObject(roomRule.actions);
-    if (actionsObject.tweaks.sound) return ALL_MESSAGES_LOUD;
+    if (actionsObject.tweaks.sound) return RoomNotifState.AllMessagesLoud;
 
     return null;
 }
 
-export function setRoomNotifsState(roomId, newState) {
-    if (newState === MUTE) {
+export function setRoomNotifsState(roomId: string, newState: RoomNotifState): Promise<void> {
+    if (newState === RoomNotifState.Mute) {
         return setRoomNotifsStateMuted(roomId);
     } else {
         return setRoomNotifsStateUnmuted(roomId, newState);
     }
 }
 
-export function getUnreadNotificationCount(room, type=null) {
+export function getUnreadNotificationCount(room: Room, type: NotificationCountType = null): number {
     let notificationCount = room.getUnreadNotificationCount(type);
 
     // Check notification counts in the old room just in case there's some lost
@@ -124,21 +128,21 @@ export function getUnreadNotificationCount(room, type=null) {
             // notifying the user for unread messages because they would have extreme
             // difficulty changing their notification preferences away from "All Messages"
             // and "Noisy".
-            notificationCount += oldRoom.getUnreadNotificationCount("highlight");
+            notificationCount += oldRoom.getUnreadNotificationCount(NotificationCountType.Highlight);
         }
     }
 
     return notificationCount;
 }
 
-function setRoomNotifsStateMuted(roomId) {
+function setRoomNotifsStateMuted(roomId: string): Promise<any> {
     const cli = MatrixClientPeg.get();
     const promises = [];
 
     // delete the room rule
     const roomRule = cli.getRoomPushRule('global', roomId);
     if (roomRule) {
-        promises.push(cli.deletePushRule('global', 'room', roomRule.rule_id));
+        promises.push(cli.deletePushRule('global', PushRuleKind.RoomSpecific, roomRule.rule_id));
     }
 
     // add/replace an override rule to squelch everything in this room
@@ -146,7 +150,7 @@ function setRoomNotifsStateMuted(roomId) {
     // is an override rule, not a room rule: it still pertains to this room
     // though, so using the room ID as the rule ID is logical and prevents
     // duplicate copies of the rule.
-    promises.push(cli.addPushRule('global', 'override', roomId, {
+    promises.push(cli.addPushRule('global', PushRuleKind.Override, roomId, {
         conditions: [
             {
                 kind: 'event_match',
@@ -162,30 +166,30 @@ function setRoomNotifsStateMuted(roomId) {
     return Promise.all(promises);
 }
 
-function setRoomNotifsStateUnmuted(roomId, newState) {
+function setRoomNotifsStateUnmuted(roomId: string, newState: RoomNotifState): Promise<any> {
     const cli = MatrixClientPeg.get();
     const promises = [];
 
     const overrideMuteRule = findOverrideMuteRule(roomId);
     if (overrideMuteRule) {
-        promises.push(cli.deletePushRule('global', 'override', overrideMuteRule.rule_id));
+        promises.push(cli.deletePushRule('global', PushRuleKind.Override, overrideMuteRule.rule_id));
     }
 
-    if (newState === 'all_messages') {
+    if (newState === RoomNotifState.AllMessages) {
         const roomRule = cli.getRoomPushRule('global', roomId);
         if (roomRule) {
-            promises.push(cli.deletePushRule('global', 'room', roomRule.rule_id));
+            promises.push(cli.deletePushRule('global', PushRuleKind.RoomSpecific, roomRule.rule_id));
         }
-    } else if (newState === 'mentions_only') {
-        promises.push(cli.addPushRule('global', 'room', roomId, {
+    } else if (newState === RoomNotifState.MentionsOnly) {
+        promises.push(cli.addPushRule('global', PushRuleKind.RoomSpecific, roomId, {
             actions: [
                 'dont_notify',
             ],
         }));
         // https://matrix.org/jira/browse/SPEC-400
-        promises.push(cli.setPushRuleEnabled('global', 'room', roomId, true));
-    } else if ('all_messages_loud') {
-        promises.push(cli.addPushRule('global', 'room', roomId, {
+        promises.push(cli.setPushRuleEnabled('global', PushRuleKind.RoomSpecific, roomId, true));
+    } else if (newState === RoomNotifState.AllMessagesLoud) {
+        promises.push(cli.addPushRule('global', PushRuleKind.RoomSpecific, roomId, {
             actions: [
                 'notify',
                 {
@@ -195,13 +199,13 @@ function setRoomNotifsStateUnmuted(roomId, newState) {
             ],
         }));
         // https://matrix.org/jira/browse/SPEC-400
-        promises.push(cli.setPushRuleEnabled('global', 'room', roomId, true));
+        promises.push(cli.setPushRuleEnabled('global', PushRuleKind.RoomSpecific, roomId, true));
     }
 
     return Promise.all(promises);
 }
 
-function findOverrideMuteRule(roomId) {
+function findOverrideMuteRule(roomId: string): IAnnotatedPushRule {
     const cli = MatrixClientPeg.get();
     if (!cli.pushRules ||
         !cli.pushRules['global'] ||
@@ -218,7 +222,7 @@ function findOverrideMuteRule(roomId) {
     return null;
 }
 
-function isRuleForRoom(roomId, rule) {
+function isRuleForRoom(roomId: string, rule: IAnnotatedPushRule): boolean {
     if (rule.conditions.length !== 1) {
         return false;
     }
@@ -226,6 +230,6 @@ function isRuleForRoom(roomId, rule) {
     return (cond.kind === 'event_match' && cond.key === 'room_id' && cond.pattern === roomId);
 }
 
-function isMuteRule(rule) {
+function isMuteRule(rule: IAnnotatedPushRule): boolean {
     return (rule.actions.length === 1 && rule.actions[0] === 'dont_notify');
 }
diff --git a/src/Rooms.js b/src/Rooms.ts
similarity index 77%
rename from src/Rooms.js
rename to src/Rooms.ts
index 955498faaa..6e2fd4d3a2 100644
--- a/src/Rooms.js
+++ b/src/Rooms.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+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.
@@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { MatrixClientPeg } from './MatrixClientPeg';
+import AliasCustomisations from './customisations/Alias';
 
 /**
  * Given a room object, return the alias we should use for it,
@@ -25,11 +28,22 @@ import {MatrixClientPeg} from './MatrixClientPeg';
  * @param {Object} room The room object
  * @returns {string} A display alias for the given room
  */
-export function getDisplayAliasForRoom(room) {
-    return room.getCanonicalAlias() || room.getAltAliases()[0];
+export function getDisplayAliasForRoom(room: Room): string {
+    return getDisplayAliasForAliasSet(
+        room.getCanonicalAlias(), room.getAltAliases(),
+    );
 }
 
-export function looksLikeDirectMessageRoom(room, myUserId) {
+// The various display alias getters should all feed through this one path so
+// there's a single place to change the logic.
+export function getDisplayAliasForAliasSet(canonicalAlias: string, altAliases: string[]): string {
+    if (AliasCustomisations.getDisplayAliasForAliasSet) {
+        return AliasCustomisations.getDisplayAliasForAliasSet(canonicalAlias, altAliases);
+    }
+    return canonicalAlias || altAliases?.[0];
+}
+
+export function looksLikeDirectMessageRoom(room: Room, myUserId: string): boolean {
     const myMembership = room.getMyMembership();
     const me = room.getMember(myUserId);
 
@@ -48,7 +62,7 @@ export function looksLikeDirectMessageRoom(room, myUserId) {
     return false;
 }
 
-export function guessAndSetDMRoom(room, isDirect) {
+export function guessAndSetDMRoom(room: Room, isDirect: boolean): Promise<void> {
     let newTarget;
     if (isDirect) {
         const guessedUserId = guessDMRoomTargetId(
@@ -70,10 +84,8 @@ export function guessAndSetDMRoom(room, isDirect) {
                    this room as a DM room
  * @returns {object} A promise
  */
-export function setDMRoom(roomId, userId) {
-    if (MatrixClientPeg.get().isGuest()) {
-        return Promise.resolve();
-    }
+export async function setDMRoom(roomId: string, userId: string): Promise<void> {
+    if (MatrixClientPeg.get().isGuest()) return;
 
     const mDirectEvent = MatrixClientPeg.get().getAccountData('m.direct');
     let dmRoomMap = {};
@@ -102,8 +114,7 @@ export function setDMRoom(roomId, userId) {
         dmRoomMap[userId] = roomList;
     }
 
-
-    return MatrixClientPeg.get().setAccountData('m.direct', dmRoomMap);
+    await MatrixClientPeg.get().setAccountData('m.direct', dmRoomMap);
 }
 
 /**
@@ -114,7 +125,7 @@ export function setDMRoom(roomId, userId) {
  * @param {string} myUserId User ID of the current user
  * @returns {string} User ID of the user that the room is probably a DM with
  */
-function guessDMRoomTargetId(room, myUserId) {
+function guessDMRoomTargetId(room: Room, myUserId: string): string {
     let oldestTs;
     let oldestUser;
 
diff --git a/src/ScalarAuthClient.ts b/src/ScalarAuthClient.ts
index a09c3494a8..e791633c8e 100644
--- a/src/ScalarAuthClient.ts
+++ b/src/ScalarAuthClient.ts
@@ -17,14 +17,16 @@ limitations under the License.
 import url from 'url';
 import SettingsStore from "./settings/SettingsStore";
 import { Service, startTermsFlow, TermsInteractionCallback, TermsNotSignedError } from './Terms';
-import {MatrixClientPeg} from "./MatrixClientPeg";
+import { MatrixClientPeg } from "./MatrixClientPeg";
 import request from "browser-request";
 
 import SdkConfig from "./SdkConfig";
-import {WidgetType} from "./widgets/WidgetType";
-import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
+import { WidgetType } from "./widgets/WidgetType";
+import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
 import { Room } from "matrix-js-sdk/src/models/room";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 // The version of the integration manager API we're intending to work with
 const imApiVersion = "1.1";
 
@@ -109,7 +111,7 @@ export default class ScalarAuthClient {
             request({
                 method: "GET",
                 uri: url,
-                qs: {scalar_token: token, v: imApiVersion},
+                qs: { scalar_token: token, v: imApiVersion },
                 json: true,
             }, (err, response, body) => {
                 if (err) {
@@ -136,7 +138,7 @@ export default class ScalarAuthClient {
             return token;
         }).catch((e) => {
             if (e instanceof TermsNotSignedError) {
-                console.log("Integration manager requires new terms to be agreed to");
+                logger.log("Integration manager requires new terms to be agreed to");
                 // The terms endpoints are new and so live on standard _matrix prefixes,
                 // but IM rest urls are currently configured with paths, so remove the
                 // path from the base URL before passing it to the js-sdk
@@ -189,7 +191,7 @@ export default class ScalarAuthClient {
             request({
                 method: 'POST',
                 uri: scalarRestUrl + '/register',
-                qs: {v: imApiVersion},
+                qs: { v: imApiVersion },
                 body: openidTokenObject,
                 json: true,
             }, (err, response, body) => {
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.ts
similarity index 83%
rename from src/ScalarMessaging.js
rename to src/ScalarMessaging.ts
index 3f75b3788c..888b9ce9ed 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.ts
@@ -208,7 +208,6 @@ Example:
     ]
 }
 
-
 membership_state AND bot_options
 --------------------------------
 Get the content of the "m.room.member" or "m.room.bot.options" state event respectively.
@@ -236,23 +235,43 @@ Example:
 }
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
-import {IntegrationManagers} from "./integrations/IntegrationManagers";
-import {WidgetType} from "./widgets/WidgetType";
-import {objectClone} from "./utils/objects";
+import { IntegrationManagers } from "./integrations/IntegrationManagers";
+import { WidgetType } from "./widgets/WidgetType";
+import { objectClone } from "./utils/objects";
 
-function sendResponse(event, res) {
+import { logger } from "matrix-js-sdk/src/logger";
+
+enum Action {
+    CloseScalar = "close_scalar",
+    GetWidgets = "get_widgets",
+    SetWidgets = "set_widgets",
+    SetWidget = "set_widget",
+    JoinRulesState = "join_rules_state",
+    SetPlumbingState = "set_plumbing_state",
+    GetMembershipCount = "get_membership_count",
+    GetRoomEncryptionState = "get_room_enc_state",
+    CanSendEvent = "can_send_event",
+    MembershipState = "membership_state",
+    invite = "invite",
+    BotOptions = "bot_options",
+    SetBotOptions = "set_bot_options",
+    SetBotPower = "set_bot_power",
+}
+
+function sendResponse(event: MessageEvent<any>, res: any): void {
     const data = objectClone(event.data);
     data.response = res;
+    // @ts-ignore
     event.source.postMessage(data, event.origin);
 }
 
-function sendError(event, msg, nestedError) {
+function sendError(event: MessageEvent<any>, msg: string, nestedError?: Error): void {
     console.error("Action:" + event.data.action + " failed with message: " + msg);
     const data = objectClone(event.data);
     data.response = {
@@ -263,11 +282,12 @@ function sendError(event, msg, nestedError) {
     if (nestedError) {
         data.response.error._error = nestedError;
     }
+    // @ts-ignore
     event.source.postMessage(data, event.origin);
 }
 
-function inviteUser(event, roomId, userId) {
-    console.log(`Received request to invite ${userId} into room ${roomId}`);
+function inviteUser(event: MessageEvent<any>, roomId: string, userId: string): void {
+    logger.log(`Received request to invite ${userId} into room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -294,7 +314,7 @@ function inviteUser(event, roomId, userId) {
     });
 }
 
-function setWidget(event, roomId) {
+function setWidget(event: MessageEvent<any>, roomId: string): void {
     const widgetId = event.data.widget_id;
     let widgetType = event.data.type;
     const widgetUrl = event.data.url;
@@ -355,7 +375,7 @@ function setWidget(event, roomId) {
     }
 }
 
-function getWidgets(event, roomId) {
+function getWidgets(event: MessageEvent<any>, roomId: string): void {
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -381,7 +401,7 @@ function getWidgets(event, roomId) {
     sendResponse(event, widgetStateEvents);
 }
 
-function getRoomEncState(event, roomId) {
+function getRoomEncState(event: MessageEvent<any>, roomId: string): void {
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -397,11 +417,11 @@ function getRoomEncState(event, roomId) {
     sendResponse(event, roomIsEncrypted);
 }
 
-function setPlumbingState(event, roomId, status) {
+function setPlumbingState(event: MessageEvent<any>, roomId: string, status: string): void {
     if (typeof status !== 'string') {
         throw new Error('Plumbing state status should be a string');
     }
-    console.log(`Received request to set plumbing state to status "${status}" in room ${roomId}`);
+    logger.log(`Received request to set plumbing state to status "${status}" in room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -416,8 +436,8 @@ function setPlumbingState(event, roomId, status) {
     });
 }
 
-function setBotOptions(event, roomId, userId) {
-    console.log(`Received request to set options for bot ${userId} in room ${roomId}`);
+function setBotOptions(event: MessageEvent<any>, roomId: string, userId: string): void {
+    logger.log(`Received request to set options for bot ${userId} in room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -432,13 +452,13 @@ function setBotOptions(event, roomId, userId) {
     });
 }
 
-function setBotPower(event, roomId, userId, level) {
+function setBotPower(event: MessageEvent<any>, roomId: string, userId: string, level: number): void {
     if (!(Number.isInteger(level) && level >= 0)) {
         sendError(event, _t('Power level must be positive integer.'));
         return;
     }
 
-    console.log(`Received request to set power level to ${level} for bot ${userId} in room ${roomId}.`);
+    logger.log(`Received request to set power level to ${level} for bot ${userId} in room ${roomId}.`);
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -463,22 +483,22 @@ function setBotPower(event, roomId, userId, level) {
     });
 }
 
-function getMembershipState(event, roomId, userId) {
-    console.log(`membership_state of ${userId} in room ${roomId} requested.`);
+function getMembershipState(event: MessageEvent<any>, roomId: string, userId: string): void {
+    logger.log(`membership_state of ${userId} in room ${roomId} requested.`);
     returnStateEvent(event, roomId, "m.room.member", userId);
 }
 
-function getJoinRules(event, roomId) {
-    console.log(`join_rules of ${roomId} requested.`);
+function getJoinRules(event: MessageEvent<any>, roomId: string): void {
+    logger.log(`join_rules of ${roomId} requested.`);
     returnStateEvent(event, roomId, "m.room.join_rules", "");
 }
 
-function botOptions(event, roomId, userId) {
-    console.log(`bot_options of ${userId} in room ${roomId} requested.`);
+function botOptions(event: MessageEvent<any>, roomId: string, userId: string): void {
+    logger.log(`bot_options of ${userId} in room ${roomId} requested.`);
     returnStateEvent(event, roomId, "m.room.bot.options", "_" + userId);
 }
 
-function getMembershipCount(event, roomId) {
+function getMembershipCount(event: MessageEvent<any>, roomId: string): void {
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -493,7 +513,7 @@ function getMembershipCount(event, roomId) {
     sendResponse(event, count);
 }
 
-function canSendEvent(event, roomId) {
+function canSendEvent(event: MessageEvent<any>, roomId: string): void {
     const evType = "" + event.data.event_type; // force stringify
     const isState = Boolean(event.data.is_state);
     const client = MatrixClientPeg.get();
@@ -527,7 +547,7 @@ function canSendEvent(event, roomId) {
     sendResponse(event, true);
 }
 
-function returnStateEvent(event, roomId, eventType, stateKey) {
+function returnStateEvent(event: MessageEvent<any>, roomId: string, eventType: string, stateKey: string): void {
     const client = MatrixClientPeg.get();
     if (!client) {
         sendError(event, _t('You need to be logged in.'));
@@ -546,8 +566,9 @@ function returnStateEvent(event, roomId, eventType, stateKey) {
     sendResponse(event, stateEvent.getContent());
 }
 
-const onMessage = function(event) {
+const onMessage = function(event: MessageEvent<any>): void {
     if (!event.origin) { // stupid chrome
+        // @ts-ignore
         event.origin = event.originalEvent.origin;
     }
 
@@ -581,8 +602,8 @@ const onMessage = function(event) {
         return;
     }
 
-    if (event.data.action === "close_scalar") {
-        dis.dispatch({ action: "close_scalar" });
+    if (event.data.action === Action.CloseScalar) {
+        dis.dispatch({ action: Action.CloseScalar });
         sendResponse(event, null);
         return;
     }
@@ -595,10 +616,10 @@ const onMessage = function(event) {
         // Get and set user widgets (not associated with a specific room)
         // If roomId is specified, it must be validated, so room-based widgets agreed
         // handled further down.
-        if (event.data.action === "get_widgets") {
+        if (event.data.action === Action.GetWidgets) {
             getWidgets(event, null);
             return;
-        } else if (event.data.action === "set_widget") {
+        } else if (event.data.action === Action.SetWidgets) {
             setWidget(event, null);
             return;
         } else {
@@ -608,33 +629,33 @@ const onMessage = function(event) {
     }
 
     if (roomId !== RoomViewStore.getRoomId()) {
-        sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId}));
+        sendError(event, _t('Room %(roomId)s not visible', { roomId: roomId }));
         return;
     }
 
     // Get and set room-based widgets
-    if (event.data.action === "get_widgets") {
+    if (event.data.action === Action.GetWidgets) {
         getWidgets(event, roomId);
         return;
-    } else if (event.data.action === "set_widget") {
+    } else if (event.data.action === Action.SetWidget) {
         setWidget(event, roomId);
         return;
     }
 
     // These APIs don't require userId
-    if (event.data.action === "join_rules_state") {
+    if (event.data.action === Action.JoinRulesState) {
         getJoinRules(event, roomId);
         return;
-    } else if (event.data.action === "set_plumbing_state") {
+    } else if (event.data.action === Action.SetPlumbingState) {
         setPlumbingState(event, roomId, event.data.status);
         return;
-    } else if (event.data.action === "get_membership_count") {
+    } else if (event.data.action === Action.GetMembershipCount) {
         getMembershipCount(event, roomId);
         return;
-    } else if (event.data.action === "get_room_enc_state") {
+    } else if (event.data.action === Action.GetRoomEncryptionState) {
         getRoomEncState(event, roomId);
         return;
-    } else if (event.data.action === "can_send_event") {
+    } else if (event.data.action === Action.CanSendEvent) {
         canSendEvent(event, roomId);
         return;
     }
@@ -644,19 +665,19 @@ const onMessage = function(event) {
         return;
     }
     switch (event.data.action) {
-        case "membership_state":
+        case Action.MembershipState:
             getMembershipState(event, roomId, userId);
             break;
-        case "invite":
+        case Action.invite:
             inviteUser(event, roomId, userId);
             break;
-        case "bot_options":
+        case Action.BotOptions:
             botOptions(event, roomId, userId);
             break;
-        case "set_bot_options":
+        case Action.SetBotOptions:
             setBotOptions(event, roomId, userId);
             break;
-        case "set_bot_power":
+        case Action.SetBotPower:
             setBotPower(event, roomId, userId, event.data.level);
             break;
         default:
@@ -666,16 +687,16 @@ const onMessage = function(event) {
 };
 
 let listenerCount = 0;
-let openManagerUrl = null;
+let openManagerUrl: string = null;
 
-export function startListening() {
+export function startListening(): void {
     if (listenerCount === 0) {
         window.addEventListener("message", onMessage, false);
     }
     listenerCount += 1;
 }
 
-export function stopListening() {
+export function stopListening(): void {
     listenerCount -= 1;
     if (listenerCount === 0) {
         window.removeEventListener("message", onMessage);
@@ -690,6 +711,6 @@ export function stopListening() {
     }
 }
 
-export function setOpenManagerUrl(url) {
+export function setOpenManagerUrl(url: string): void {
     openManagerUrl = url;
 }
diff --git a/src/Searching.js b/src/Searching.ts
similarity index 78%
rename from src/Searching.js
rename to src/Searching.ts
index 2b17aee054..37f85efa77 100644
--- a/src/Searching.js
+++ b/src/Searching.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,26 +14,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {
+    IResultRoomEvents,
+    ISearchRequestBody,
+    ISearchResponse,
+    ISearchResult,
+    ISearchResults,
+    SearchOrderBy,
+} from "matrix-js-sdk/src/@types/search";
+import { IRoomEventFilter } from "matrix-js-sdk/src/filter";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import { ISearchArgs } from "./indexing/BaseEventIndexManager";
 import EventIndexPeg from "./indexing/EventIndexPeg";
-import {MatrixClientPeg} from "./MatrixClientPeg";
+import { MatrixClientPeg } from "./MatrixClientPeg";
+import { SearchResult } from "matrix-js-sdk/src/models/search-result";
 
 const SEARCH_LIMIT = 10;
 
-async function serverSideSearch(term, roomId = undefined) {
+async function serverSideSearch(
+    term: string,
+    roomId: string = undefined,
+): Promise<{ response: ISearchResponse, query: ISearchRequestBody }> {
     const client = MatrixClientPeg.get();
 
-    const filter = {
+    const filter: IRoomEventFilter = {
         limit: SEARCH_LIMIT,
     };
 
     if (roomId !== undefined) filter.rooms = [roomId];
 
-    const body = {
+    const body: ISearchRequestBody = {
         search_categories: {
             room_events: {
                 search_term: term,
                 filter: filter,
-                order_by: "recent",
+                order_by: SearchOrderBy.Recent,
                 event_context: {
                     before_limit: 1,
                     after_limit: 1,
@@ -43,33 +59,28 @@ async function serverSideSearch(term, roomId = undefined) {
         },
     };
 
-    const response = await client.search({body: body});
+    const response = await client.search({ body: body });
 
-    const result = {
-        response: response,
-        query: body,
-    };
-
-    return result;
+    return { response, query: body };
 }
 
-async function serverSideSearchProcess(term, roomId = undefined) {
+async function serverSideSearchProcess(term: string, roomId: string = undefined): Promise<ISearchResults> {
     const client = MatrixClientPeg.get();
     const result = await serverSideSearch(term, roomId);
 
     // The js-sdk method backPaginateRoomEventsSearch() uses _query internally
-    // so we're reusing the concept here since we wan't to delegate the
+    // so we're reusing the concept here since we want to delegate the
     // pagination back to backPaginateRoomEventsSearch() in some cases.
-    const searchResult = {
+    const searchResults: ISearchResults = {
         _query: result.query,
         results: [],
         highlights: [],
     };
 
-    return client.processRoomEventsSearch(searchResult, result.response);
+    return client.processRoomEventsSearch(searchResults, result.response);
 }
 
-function compareEvents(a, b) {
+function compareEvents(a: ISearchResult, b: ISearchResult): number {
     const aEvent = a.result;
     const bEvent = b.result;
 
@@ -79,7 +90,7 @@ function compareEvents(a, b) {
     return 0;
 }
 
-async function combinedSearch(searchTerm) {
+async function combinedSearch(searchTerm: string): Promise<ISearchResults> {
     const client = MatrixClientPeg.get();
 
     // Create two promises, one for the local search, one for the
@@ -111,10 +122,10 @@ async function combinedSearch(searchTerm) {
     // returns since that one can be either a server-side one, a local one or a
     // fake one to fetch the remaining cached events. See the docs for
     // combineEvents() for an explanation why we need to cache events.
-    const emptyResult = {
+    const emptyResult: ISeshatSearchResults = {
         seshatQuery: localQuery,
         _query: serverQuery,
-        serverSideNextBatch: serverResponse.next_batch,
+        serverSideNextBatch: serverResponse.search_categories.room_events.next_batch,
         cachedEvents: [],
         oldestEventFrom: "server",
         results: [],
@@ -125,7 +136,7 @@ async function combinedSearch(searchTerm) {
     const combinedResult = combineResponses(emptyResult, localResponse, serverResponse.search_categories.room_events);
 
     // Let the client process the combined result.
-    const response = {
+    const response: ISearchResponse = {
         search_categories: {
             room_events: combinedResult,
         },
@@ -139,10 +150,14 @@ async function combinedSearch(searchTerm) {
     return result;
 }
 
-async function localSearch(searchTerm, roomId = undefined, processResult = true) {
+async function localSearch(
+    searchTerm: string,
+    roomId: string = undefined,
+    processResult = true,
+): Promise<{ response: IResultRoomEvents, query: ISearchArgs }> {
     const eventIndex = EventIndexPeg.get();
 
-    const searchArgs = {
+    const searchArgs: ISearchArgs = {
         search_term: searchTerm,
         before_limit: 1,
         after_limit: 1,
@@ -167,11 +182,18 @@ async function localSearch(searchTerm, roomId = undefined, processResult = true)
     return result;
 }
 
-async function localSearchProcess(searchTerm, roomId = undefined) {
+export interface ISeshatSearchResults extends ISearchResults {
+    seshatQuery?: ISearchArgs;
+    cachedEvents?: ISearchResult[];
+    oldestEventFrom?: "local" | "server";
+    serverSideNextBatch?: string;
+}
+
+async function localSearchProcess(searchTerm: string, roomId: string = undefined): Promise<ISeshatSearchResults> {
     const emptyResult = {
         results: [],
         highlights: [],
-    };
+    } as ISeshatSearchResults;
 
     if (searchTerm === "") return emptyResult;
 
@@ -179,7 +201,7 @@ async function localSearchProcess(searchTerm, roomId = undefined) {
 
     emptyResult.seshatQuery = result.query;
 
-    const response = {
+    const response: ISearchResponse = {
         search_categories: {
             room_events: result.response,
         },
@@ -192,7 +214,7 @@ async function localSearchProcess(searchTerm, roomId = undefined) {
     return processedResult;
 }
 
-async function localPagination(searchResult) {
+async function localPagination(searchResult: ISeshatSearchResults): Promise<ISeshatSearchResults> {
     const eventIndex = EventIndexPeg.get();
 
     const searchArgs = searchResult.seshatQuery;
@@ -221,10 +243,10 @@ async function localPagination(searchResult) {
     return result;
 }
 
-function compareOldestEvents(firstResults, secondResults) {
+function compareOldestEvents(firstResults: ISearchResult[], secondResults: ISearchResult[]): number {
     try {
-        const oldestFirstEvent = firstResults.results[firstResults.results.length - 1].result;
-        const oldestSecondEvent = secondResults.results[secondResults.results.length - 1].result;
+        const oldestFirstEvent = firstResults[firstResults.length - 1].result;
+        const oldestSecondEvent = secondResults[secondResults.length - 1].result;
 
         if (oldestFirstEvent.origin_server_ts <= oldestSecondEvent.origin_server_ts) {
             return -1;
@@ -236,7 +258,12 @@ function compareOldestEvents(firstResults, secondResults) {
     }
 }
 
-function combineEventSources(previousSearchResult, response, a, b) {
+function combineEventSources(
+    previousSearchResult: ISeshatSearchResults,
+    response: IResultRoomEvents,
+    a: ISearchResult[],
+    b: ISearchResult[],
+): void {
     // Merge event sources and sort the events.
     const combinedEvents = a.concat(b).sort(compareEvents);
     // Put half of the events in the response, and cache the other half.
@@ -353,8 +380,12 @@ function combineEventSources(previousSearchResult, response, a, b) {
  * different event sources.
  *
  */
-function combineEvents(previousSearchResult, localEvents = undefined, serverEvents = undefined) {
-    const response = {};
+function combineEvents(
+    previousSearchResult: ISeshatSearchResults,
+    localEvents: IResultRoomEvents = undefined,
+    serverEvents: IResultRoomEvents = undefined,
+): IResultRoomEvents {
+    const response = {} as IResultRoomEvents;
 
     const cachedEvents = previousSearchResult.cachedEvents;
     let oldestEventFrom = previousSearchResult.oldestEventFrom;
@@ -364,7 +395,7 @@ function combineEvents(previousSearchResult, localEvents = undefined, serverEven
         // This is a first search call, combine the events from the server and
         // the local index. Note where our oldest event came from, we shall
         // fetch the next batch of events from the other source.
-        if (compareOldestEvents(localEvents, serverEvents) < 0) {
+        if (compareOldestEvents(localEvents.results, serverEvents.results) < 0) {
             oldestEventFrom = "local";
         }
 
@@ -375,7 +406,7 @@ function combineEvents(previousSearchResult, localEvents = undefined, serverEven
         // meaning that our oldest event was on the server.
         // Change the source of the oldest event if our local event is older
         // than the cached one.
-        if (compareOldestEvents(localEvents, cachedEvents) < 0) {
+        if (compareOldestEvents(localEvents.results, cachedEvents) < 0) {
             oldestEventFrom = "local";
         }
         combineEventSources(previousSearchResult, response, localEvents.results, cachedEvents);
@@ -384,7 +415,7 @@ function combineEvents(previousSearchResult, localEvents = undefined, serverEven
         // meaning that our oldest event was in the local index.
         // Change the source of the oldest event if our server event is older
         // than the cached one.
-        if (compareOldestEvents(serverEvents, cachedEvents) < 0) {
+        if (compareOldestEvents(serverEvents.results, cachedEvents) < 0) {
             oldestEventFrom = "server";
         }
         combineEventSources(previousSearchResult, response, serverEvents.results, cachedEvents);
@@ -412,7 +443,11 @@ function combineEvents(previousSearchResult, localEvents = undefined, serverEven
  * @return {object} A response object that combines the events from the
  * different event sources.
  */
-function combineResponses(previousSearchResult, localEvents = undefined, serverEvents = undefined) {
+function combineResponses(
+    previousSearchResult: ISeshatSearchResults,
+    localEvents: IResultRoomEvents = undefined,
+    serverEvents: IResultRoomEvents = undefined,
+): IResultRoomEvents {
     // Combine our events first.
     const response = combineEvents(previousSearchResult, localEvents, serverEvents);
 
@@ -454,42 +489,51 @@ function combineResponses(previousSearchResult, localEvents = undefined, serverE
     return response;
 }
 
-function restoreEncryptionInfo(searchResultSlice = []) {
+interface IEncryptedSeshatEvent {
+    curve25519Key: string;
+    ed25519Key: string;
+    algorithm: string;
+    forwardingCurve25519KeyChain: string[];
+}
+
+function restoreEncryptionInfo(searchResultSlice: SearchResult[] = []): void {
     for (let i = 0; i < searchResultSlice.length; i++) {
         const timeline = searchResultSlice[i].context.getTimeline();
 
         for (let j = 0; j < timeline.length; j++) {
-            const ev = timeline[j];
+            const mxEv = timeline[j];
+            const ev = mxEv.event as IEncryptedSeshatEvent;
 
-            if (ev.event.curve25519Key) {
-                ev.makeEncrypted(
-                    "m.room.encrypted",
-                    { algorithm: ev.event.algorithm },
-                    ev.event.curve25519Key,
-                    ev.event.ed25519Key,
+            if (ev.curve25519Key) {
+                mxEv.makeEncrypted(
+                    EventType.RoomMessageEncrypted,
+                    { algorithm: ev.algorithm },
+                    ev.curve25519Key,
+                    ev.ed25519Key,
                 );
-                ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
+                // @ts-ignore
+                mxEv.forwardingCurve25519KeyChain = ev.forwardingCurve25519KeyChain;
 
-                delete ev.event.curve25519Key;
-                delete ev.event.ed25519Key;
-                delete ev.event.algorithm;
-                delete ev.event.forwardingCurve25519KeyChain;
+                delete ev.curve25519Key;
+                delete ev.ed25519Key;
+                delete ev.algorithm;
+                delete ev.forwardingCurve25519KeyChain;
             }
         }
     }
 }
 
-async function combinedPagination(searchResult) {
+async function combinedPagination(searchResult: ISeshatSearchResults): Promise<ISeshatSearchResults> {
     const eventIndex = EventIndexPeg.get();
     const client = MatrixClientPeg.get();
 
     const searchArgs = searchResult.seshatQuery;
     const oldestEventFrom = searchResult.oldestEventFrom;
 
-    let localResult;
-    let serverSideResult;
+    let localResult: IResultRoomEvents;
+    let serverSideResult: ISearchResponse;
 
-    // Fetch events from the local index if we have a token for itand if it's
+    // Fetch events from the local index if we have a token for it and if it's
     // the local indexes turn or the server has exhausted its results.
     if (searchArgs.next_batch && (!searchResult.serverSideNextBatch || oldestEventFrom === "server")) {
         localResult = await eventIndex.search(searchArgs);
@@ -498,11 +542,11 @@ async function combinedPagination(searchResult) {
     // Fetch events from the server if we have a token for it and if it's the
     // local indexes turn or the local index has exhausted its results.
     if (searchResult.serverSideNextBatch && (oldestEventFrom === "local" || !searchArgs.next_batch)) {
-        const body = {body: searchResult._query, next_batch: searchResult.serverSideNextBatch};
+        const body = { body: searchResult._query, next_batch: searchResult.serverSideNextBatch };
         serverSideResult = await client.search(body);
     }
 
-    let serverEvents;
+    let serverEvents: IResultRoomEvents;
 
     if (serverSideResult) {
         serverEvents = serverSideResult.search_categories.room_events;
@@ -532,8 +576,8 @@ async function combinedPagination(searchResult) {
     return result;
 }
 
-function eventIndexSearch(term, roomId = undefined) {
-    let searchPromise;
+function eventIndexSearch(term: string, roomId: string = undefined): Promise<ISearchResults> {
+    let searchPromise: Promise<ISearchResults>;
 
     if (roomId !== undefined) {
         if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
@@ -554,7 +598,7 @@ function eventIndexSearch(term, roomId = undefined) {
     return searchPromise;
 }
 
-function eventIndexSearchPagination(searchResult) {
+function eventIndexSearchPagination(searchResult: ISeshatSearchResults): Promise<ISeshatSearchResults> {
     const client = MatrixClientPeg.get();
 
     const seshatQuery = searchResult.seshatQuery;
@@ -580,7 +624,7 @@ function eventIndexSearchPagination(searchResult) {
     }
 }
 
-export function searchPagination(searchResult) {
+export function searchPagination(searchResult: ISearchResults): Promise<ISearchResults> {
     const eventIndex = EventIndexPeg.get();
     const client = MatrixClientPeg.get();
 
@@ -590,7 +634,7 @@ export function searchPagination(searchResult) {
     else return eventIndexSearchPagination(searchResult);
 }
 
-export default function eventSearch(term, roomId = undefined) {
+export default function eventSearch(term: string, roomId: string = undefined): Promise<ISearchResults> {
     const eventIndex = EventIndexPeg.get();
 
     if (eventIndex === null) return serverSideSearchProcess(term, roomId);
diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
index 09c8d30614..925b023584 100644
--- a/src/SecurityManager.ts
+++ b/src/SecurityManager.ts
@@ -14,11 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ICryptoCallbacks, IDeviceTrustLevel, ISecretStorageKeyInfo } from 'matrix-js-sdk/src/matrix';
+import { ICryptoCallbacks } from 'matrix-js-sdk/src/matrix';
+import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/crypto/api';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import Modal from './Modal';
 import * as sdk from './index';
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
 import { _t } from './languageHandler';
@@ -28,6 +29,9 @@ import AccessSecretStorageDialog from './components/views/dialogs/security/Acces
 import RestoreKeyBackupDialog from './components/views/dialogs/security/RestoreKeyBackupDialog';
 import SettingsStore from "./settings/SettingsStore";
 import SecurityCustomisations from "./customisations/Security";
+import { DeviceTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning';
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
 // only meant to act as a cache to avoid prompting the user multiple times
@@ -41,8 +45,8 @@ let secretStorageBeingAccessed = false;
 let nonInteractive = false;
 
 let dehydrationCache: {
-    key?: Uint8Array,
-    keyInfo?: ISecretStorageKeyInfo,
+    key?: Uint8Array;
+    keyInfo?: ISecretStorageKeyInfo;
 } = {};
 
 function isCachingAllowed(): boolean {
@@ -134,7 +138,7 @@ async function getSecretStorageKey(
 
     const keyFromCustomisations = SecurityCustomisations.getSecretStorageKey?.();
     if (keyFromCustomisations) {
-        console.log("Using key from security customisations (secret storage)")
+        logger.log("Using key from security customisations (secret storage)");
         cacheSecretStorageKey(keyId, keyInfo, keyFromCustomisations);
         return [keyId, keyFromCustomisations];
     }
@@ -184,7 +188,7 @@ export async function getDehydrationKey(
 ): Promise<Uint8Array> {
     const keyFromCustomisations = SecurityCustomisations.getSecretStorageKey?.();
     if (keyFromCustomisations) {
-        console.log("Using key from security customisations (dehydration)")
+        logger.log("Using key from security customisations (dehydration)");
         return keyFromCustomisations;
     }
 
@@ -223,7 +227,7 @@ export async function getDehydrationKey(
     const key = await inputToKey(input);
 
     // need to copy the key because rehydration (unpickling) will clobber it
-    dehydrationCache = {key: new Uint8Array(key), keyInfo};
+    dehydrationCache = { key: new Uint8Array(key), keyInfo };
 
     return key;
 }
@@ -244,15 +248,15 @@ async function onSecretRequested(
     deviceId: string,
     requestId: string,
     name: string,
-    deviceTrust: IDeviceTrustLevel,
+    deviceTrust: DeviceTrustLevel,
 ): Promise<string> {
-    console.log("onSecretRequested", userId, deviceId, requestId, name, deviceTrust);
+    logger.log("onSecretRequested", userId, deviceId, requestId, name, deviceTrust);
     const client = MatrixClientPeg.get();
     if (userId !== client.getUserId()) {
         return;
     }
     if (!deviceTrust || !deviceTrust.isVerified()) {
-        console.log(`Ignoring secret request from untrusted device ${deviceId}`);
+        logger.log(`Ignoring secret request from untrusted device ${deviceId}`);
         return;
     }
     if (
@@ -265,7 +269,7 @@ async function onSecretRequested(
         const keyId = name.replace("m.cross_signing.", "");
         const key = await callbacks.getCrossSigningKeyCache(keyId);
         if (!key) {
-            console.log(
+            logger.log(
                 `${keyId} requested by ${deviceId}, but not found in cache`,
             );
         }
@@ -273,7 +277,7 @@ async function onSecretRequested(
     } else if (name === "m.megolm_backup.v1") {
         const key = await client.crypto.getSessionBackupPrivateKey();
         if (!key) {
-            console.log(
+            logger.log(
                 `session backup key requested by ${deviceId}, but not found in cache`,
             );
         }
@@ -327,7 +331,7 @@ export async function accessSecretStorage(func = async () => { }, forceReset = f
     const cli = MatrixClientPeg.get();
     secretStorageBeingAccessed = true;
     try {
-        if (!await cli.hasSecretStorageKey() || forceReset) {
+        if (!(await cli.hasSecretStorageKey()) || forceReset) {
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
@@ -353,6 +357,7 @@ export async function accessSecretStorage(func = async () => { }, forceReset = f
                 throw new Error("Secret storage creation canceled");
             }
         } else {
+            // FIXME: Using an import will result in test failures
             const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
             await cli.bootstrapCrossSigning({
                 authUploadDeviceSigningKeys: async (makeRequest) => {
@@ -380,12 +385,12 @@ export async function accessSecretStorage(func = async () => { }, forceReset = f
                 if (secretStorageKeyInfo[keyId] && secretStorageKeyInfo[keyId].passphrase) {
                     dehydrationKeyInfo = { passphrase: secretStorageKeyInfo[keyId].passphrase };
                 }
-                console.log("Setting dehydration key");
+                logger.log("Setting dehydration key");
                 await cli.setDehydrationKey(secretStorageKeys[keyId], dehydrationKeyInfo, "Backup device");
             } else if (!keyId) {
                 console.warn("Not setting dehydration key: no SSSS key found");
             } else {
-                console.log("Not setting dehydration key: feature disabled");
+                logger.log("Not setting dehydration key: feature disabled");
             }
         }
 
@@ -413,8 +418,8 @@ export async function tryToUnlockSecretStorageWithDehydrationKey(
 ): Promise<void> {
     const key = dehydrationCache.key;
     let restoringBackup = false;
-    if (key && await client.isSecretStorageReady()) {
-        console.log("Trying to set up cross-signing using dehydration key");
+    if (key && (await client.isSecretStorageReady())) {
+        logger.log("Trying to set up cross-signing using dehydration key");
         secretStorageBeingAccessed = true;
         nonInteractive = true;
         try {
diff --git a/src/SendHistoryManager.ts b/src/SendHistoryManager.ts
index e9268ad642..eeba643d81 100644
--- a/src/SendHistoryManager.ts
+++ b/src/SendHistoryManager.ts
@@ -1,4 +1,3 @@
-//@flow
 /*
 Copyright 2017 Aviral Dasgupta
 
@@ -15,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {clamp} from "lodash";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { clamp } from "lodash";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
-import {SerializedPart} from "./editor/parts";
+import { SerializedPart } from "./editor/parts";
 import EditorModel from "./editor/model";
 
 interface IHistoryItem {
diff --git a/src/Skinner.js b/src/Skinner.ts
similarity index 84%
rename from src/Skinner.js
rename to src/Skinner.ts
index ef340e4052..6b20781b59 100644
--- a/src/Skinner.js
+++ b/src/Skinner.ts
@@ -14,12 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-class Skinner {
-    constructor() {
-        this.components = null;
-    }
+import React from "react";
 
-    getComponent(name) {
+export interface IComponents {
+    [key: string]: React.Component;
+}
+
+export interface ISkinObject {
+    components: IComponents;
+}
+
+export class Skinner {
+    public components: IComponents = null;
+
+    public getComponent(name: string): React.Component {
         if (!name) throw new Error(`Invalid component name: ${name}`);
         if (this.components === null) {
             throw new Error(
@@ -30,7 +38,7 @@ class Skinner {
             );
         }
 
-        const doLookup = (components) => {
+        const doLookup = (components: IComponents): React.Component => {
             if (!components) return null;
             let comp = components[name];
             // XXX: Temporarily also try 'views.' as we're currently
@@ -58,7 +66,7 @@ class Skinner {
         return comp;
     }
 
-    load(skinObject) {
+    public load(skinObject: ISkinObject): void {
         if (this.components !== null) {
             throw new Error(
                 "Attempted to load a skin while a skin is already loaded"+
@@ -72,6 +80,7 @@ class Skinner {
         }
 
         // Now that we have a skin, load our components too
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
         const idx = require("./component-index");
         if (!idx || !idx.components) throw new Error("Invalid react-sdk component index");
         for (const c in idx.components) {
@@ -79,7 +88,7 @@ class Skinner {
         }
     }
 
-    addComponent(name, comp) {
+    public addComponent(name: string, comp: any) {
         let slot = name;
         if (comp.replaces !== undefined) {
             if (comp.replaces.indexOf('.') > -1) {
@@ -91,7 +100,7 @@ class Skinner {
         this.components[slot] = comp;
     }
 
-    reset() {
+    public reset(): void {
         this.components = null;
     }
 }
@@ -105,8 +114,8 @@ class Skinner {
 // See https://derickbailey.com/2016/03/09/creating-a-true-singleton-in-node-js-with-es6-symbols/
 // or https://nodejs.org/api/modules.html#modules_module_caching_caveats
 // ("Modules are cached based on their resolved filename")
-if (global.mxSkinner === undefined) {
-    global.mxSkinner = new Skinner();
+if (window.mxSkinner === undefined) {
+    window.mxSkinner = new Skinner();
 }
-export default global.mxSkinner;
+export default window.mxSkinner;
 
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 4a7b37b5e5..f3214c4757 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -17,25 +17,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 import * as React from 'react';
+import { User } from "matrix-js-sdk/src/models/user";
 
 import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers';
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';
-import * as sdk from './index';
-import {_t, _td} from './languageHandler';
+import { _t, _td } from './languageHandler';
 import Modal from './Modal';
 import MultiInviter from './utils/MultiInviter';
 import { linkifyAndSanitizeHtml } from './HtmlUtils';
 import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 import WidgetUtils from "./utils/WidgetUtils";
-import {textToHtmlRainbow} from "./utils/colour";
+import { textToHtmlRainbow } from "./utils/colour";
 import { getAddressType } from './UserAddress';
 import { abbreviateUrl } from './utils/UrlUtils';
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/IdentityServerUtils';
-import {isPermalinkHost, parsePermalink} from "./utils/permalinks/Permalinks";
-import {inviteUsersToRoom} from "./RoomInvite";
+import { isPermalinkHost, parsePermalink } from "./utils/permalinks/Permalinks";
 import { WidgetType } from "./widgets/WidgetType";
 import { Jitsi } from "./widgets/Jitsi";
 import { parseFragment as parseHtml, Element as ChildElement } from "parse5";
@@ -46,10 +44,18 @@ import { Action } from "./dispatcher/actions";
 import { EffectiveMembership, getEffectiveMembership, leaveRoomBehaviour } from "./utils/membership";
 import SdkConfig from "./SdkConfig";
 import SettingsStore from "./settings/SettingsStore";
-import {UIFeature} from "./settings/UIFeature";
-import {CHAT_EFFECTS} from "./effects"
+import { UIFeature } from "./settings/UIFeature";
+import { CHAT_EFFECTS } from "./effects";
 import CallHandler from "./CallHandler";
-import {guessAndSetDMRoom} from "./Rooms";
+import { guessAndSetDMRoom } from "./Rooms";
+import { upgradeRoom } from './utils/RoomUpgrade';
+import UploadConfirmDialog from './components/views/dialogs/UploadConfirmDialog';
+import DevtoolsDialog from './components/views/dialogs/DevtoolsDialog';
+import RoomUpgradeWarningDialog from "./components/views/dialogs/RoomUpgradeWarningDialog";
+import InfoDialog from "./components/views/dialogs/InfoDialog";
+import SlashCommandHelpDialog from "./components/views/dialogs/SlashCommandHelpDialog";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -63,7 +69,6 @@ const singleMxcUpload = async (): Promise<any> => {
         fileSelector.onchange = (ev: HTMLInputEvent) => {
             const file = ev.target.files[0];
 
-            const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog");
             Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, {
                 file,
                 onFinished: (shouldContinue) => {
@@ -143,11 +148,15 @@ export class Command {
 }
 
 function reject(error) {
-    return {error};
+    return { error };
 }
 
 function success(promise?: Promise<any>) {
-    return {promise};
+    return { promise };
+}
+
+function successSync(value: any) {
+    return success(Promise.resolve(value));
 }
 
 /* Disable the "unexpected this" error for these commands - all of the run
@@ -160,7 +169,7 @@ export const Commands = [
         args: '<message>',
         description: _td('Sends the given message as a spoiler'),
         runFn: function(roomId, message) {
-            return success(ContentHelpers.makeHtmlMessage(
+            return successSync(ContentHelpers.makeHtmlMessage(
                 message,
                 `<span data-mx-spoiler>${message}</span>`,
             ));
@@ -176,7 +185,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(ContentHelpers.makeTextMessage(message));
+            return successSync(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -189,7 +198,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(ContentHelpers.makeTextMessage(message));
+            return successSync(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -202,7 +211,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(ContentHelpers.makeTextMessage(message));
+            return successSync(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -215,7 +224,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(ContentHelpers.makeTextMessage(message));
+            return successSync(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -224,7 +233,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(ContentHelpers.makeTextMessage(messages));
+            return successSync(ContentHelpers.makeTextMessage(messages));
         },
         category: CommandCategories.messages,
     }),
@@ -233,26 +242,10 @@ export const Commands = [
         args: '<message>',
         description: _td('Sends a message as html, without interpreting it as markdown'),
         runFn: function(roomId, messages) {
-            return success(ContentHelpers.makeHtmlMessage(messages, messages));
+            return successSync(ContentHelpers.makeHtmlMessage(messages, messages));
         },
         category: CommandCategories.messages,
     }),
-    new Command({
-        command: 'ddg',
-        args: '<query>',
-        description: _td('Searches DuckDuckGo for results'),
-        runFn: function() {
-            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-            // TODO Don't explain this away, actually show a search UI here.
-            Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
-                title: _t('/ddg is not a command'),
-                description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
-            });
-            return success();
-        },
-        category: CommandCategories.actions,
-        hideCompletionAfterSpace: true,
-    }),
     new Command({
         command: 'upgraderoom',
         args: '<new_version>',
@@ -265,58 +258,13 @@ export const Commands = [
                     return reject(_t("You do not have the required permissions to use this command."));
                 }
 
-                const RoomUpgradeWarningDialog = sdk.getComponent("dialogs.RoomUpgradeWarningDialog");
-
-                const {finished} = Modal.createTrackedDialog('Slash Commands', 'upgrade room confirmation',
-                    RoomUpgradeWarningDialog, {roomId: roomId, targetVersion: args}, /*className=*/null,
+                const { finished } = Modal.createTrackedDialog('Slash Commands', 'upgrade room confirmation',
+                    RoomUpgradeWarningDialog, { roomId: roomId, targetVersion: args }, /*className=*/null,
                     /*isPriority=*/false, /*isStatic=*/true);
 
                 return success(finished.then(async ([resp]) => {
-                    if (!resp.continue) return;
-
-                    let checkForUpgradeFn;
-                    try {
-                        const upgradePromise = cli.upgradeRoom(roomId, args);
-
-                        // We have to wait for the js-sdk to give us the room back so
-                        // we can more effectively abuse the MultiInviter behaviour
-                        // which heavily relies on the Room object being available.
-                        if (resp.invite) {
-                            checkForUpgradeFn = async (newRoom) => {
-                                // The upgradePromise should be done by the time we await it here.
-                                const {replacement_room: newRoomId} = await upgradePromise;
-                                if (newRoom.roomId !== newRoomId) return;
-
-                                const toInvite = [
-                                    ...room.getMembersWithMembership("join"),
-                                    ...room.getMembersWithMembership("invite"),
-                                ].map(m => m.userId).filter(m => m !== cli.getUserId());
-
-                                if (toInvite.length > 0) {
-                                    // Errors are handled internally to this function
-                                    await inviteUsersToRoom(newRoomId, toInvite);
-                                }
-
-                                cli.removeListener('Room', checkForUpgradeFn);
-                            };
-                            cli.on('Room', checkForUpgradeFn);
-                        }
-
-                        // We have to await after so that the checkForUpgradesFn has a proper reference
-                        // to the new room's ID.
-                        await upgradePromise;
-                    } catch (e) {
-                        console.error(e);
-
-                        if (checkForUpgradeFn) cli.removeListener('Room', checkForUpgradeFn);
-
-                        const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-                        Modal.createTrackedDialog('Slash Commands', 'room upgrade error', ErrorDialog, {
-                            title: _t('Error upgrading room'),
-                            description: _t(
-                                'Double check that your server supports the room version chosen and try again.'),
-                        });
-                    }
+                    if (!resp?.continue) return;
+                    await upgradeRoom(room, args, resp.invite);
                 }));
             }
             return reject(this.getUsage());
@@ -345,7 +293,7 @@ export const Commands = [
                 const cli = MatrixClientPeg.get();
                 const ev = cli.getRoom(roomId).currentState.getStateEvents('m.room.member', cli.getUserId());
                 const content = {
-                    ...ev ? ev.getContent() : { membership: 'join' },
+                    ...(ev ? ev.getContent() : { membership: 'join' }),
                     displayname: args,
                 };
                 return success(cli.sendStateEvent(roomId, 'm.room.member', content, cli.getUserId()));
@@ -366,7 +314,7 @@ export const Commands = [
 
             return success(promise.then((url) => {
                 if (!url) return;
-                return MatrixClientPeg.get().sendStateEvent(roomId, 'm.room.avatar', {url}, '');
+                return MatrixClientPeg.get().sendStateEvent(roomId, 'm.room.avatar', { url }, '');
             }));
         },
         category: CommandCategories.actions,
@@ -389,7 +337,7 @@ export const Commands = [
                 if (!url) return;
                 const ev = room.currentState.getStateEvents('m.room.member', userId);
                 const content = {
-                    ...ev ? ev.getContent() : { membership: 'join' },
+                    ...(ev ? ev.getContent() : { membership: 'join' }),
                     avatar_url: url,
                 };
                 return cli.sendStateEvent(roomId, 'm.room.member', content, userId);
@@ -430,7 +378,6 @@ export const Commands = [
             const topic = topicEvents && topicEvents.getContent().topic;
             const topicHtml = topic ? linkifyAndSanitizeHtml(topic) : _t('This room has no topic.');
 
-            const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
             Modal.createTrackedDialog('Slash Commands', 'Topic', InfoDialog, {
                 title: room.name,
                 description: <div dangerouslySetInnerHTML={{ __html: topicHtml }} />,
@@ -477,14 +424,14 @@ export const Commands = [
                                 'Identity server',
                                 QuestionDialog, {
                                     title: _t("Use an identity server"),
-                                    description: <p>{_t(
+                                    description: <p>{ _t(
                                         "Use an identity server to invite by email. " +
                                         "Click continue to use the default identity server " +
                                         "(%(defaultIdentityServerName)s) or manage in Settings.",
                                         {
                                             defaultIdentityServerName: abbreviateUrl(defaultIdentityServerUrl),
                                         },
-                                    )}</p>,
+                                    ) }</p>,
                                     button: _t("Continue"),
                                 },
                             );
@@ -519,7 +466,7 @@ export const Commands = [
         aliases: ['j', 'goto'],
         args: '<room-address>',
         description: _td('Joins room with given address'),
-        runFn: function(_, args) {
+        runFn: function(roomId, args) {
             if (args) {
                 // Note: we support 2 versions of this command. The first is
                 // the public-facing one for most users and the other is a
@@ -733,11 +680,10 @@ export const Commands = [
                     ignoredUsers.push(userId); // de-duped internally in the js-sdk
                     return success(
                         cli.setIgnoredUsers(ignoredUsers).then(() => {
-                            const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
                             Modal.createTrackedDialog('Slash Commands', 'User ignored', InfoDialog, {
                                 title: _t('Ignored user'),
                                 description: <div>
-                                    <p>{ _t('You are now ignoring %(userId)s', {userId}) }</p>
+                                    <p>{ _t('You are now ignoring %(userId)s', { userId }) }</p>
                                 </div>,
                             });
                         }),
@@ -764,11 +710,10 @@ export const Commands = [
                     if (index !== -1) ignoredUsers.splice(index, 1);
                     return success(
                         cli.setIgnoredUsers(ignoredUsers).then(() => {
-                            const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
                             Modal.createTrackedDialog('Slash Commands', 'User unignored', InfoDialog, {
                                 title: _t('Unignored user'),
                                 description: <div>
-                                    <p>{ _t('You are no longer ignoring %(userId)s', {userId}) }</p>
+                                    <p>{ _t('You are no longer ignoring %(userId)s', { userId }) }</p>
                                 </div>,
                             });
                         }),
@@ -834,8 +779,7 @@ export const Commands = [
         command: 'devtools',
         description: _td('Opens the Developer Tools dialog'),
         runFn: function(roomId) {
-            const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
-            Modal.createDialog(DevtoolsDialog, {roomId});
+            Modal.createDialog(DevtoolsDialog, { roomId });
             return success();
         },
         category: CommandCategories.advanced,
@@ -859,7 +803,7 @@ export const Commands = [
                     const iframe = embed.childNodes[0] as ChildElement;
                     if (iframe.tagName.toLowerCase() === 'iframe' && iframe.attrs) {
                         const srcAttr = iframe.attrs.find(a => a.name === 'src');
-                        console.log("Pulling URL out of iframe (embed code)");
+                        logger.log("Pulling URL out of iframe (embed code)");
                         widgetUrl = srcAttr.value;
                     }
                 }
@@ -879,7 +823,7 @@ export const Commands = [
                 // Make the widget a Jitsi widget if it looks like a Jitsi widget
                 const jitsiData = Jitsi.getInstance().parsePreferredConferenceUrl(widgetUrl);
                 if (jitsiData) {
-                    console.log("Making /addwidget widget a Jitsi conference");
+                    logger.log("Making /addwidget widget a Jitsi conference");
                     type = WidgetType.JITSI;
                     name = "Jitsi Conference";
                     data = jitsiData;
@@ -939,7 +883,6 @@ export const Commands = [
                         await cli.setDeviceVerified(userId, deviceId, true);
 
                         // Tell the user we verified everything
-                        const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
                         Modal.createTrackedDialog('Slash Commands', 'Verified key', InfoDialog, {
                             title: _t('Verified key'),
                             description: <div>
@@ -947,7 +890,7 @@ export const Commands = [
                                     {
                                         _t('The signing key you provided matches the signing key you received ' +
                                             'from %(userId)s\'s session %(deviceId)s. Session marked as verified.',
-                                        {userId, deviceId})
+                                        { userId, deviceId })
                                     }
                                 </p>
                             </div>,
@@ -978,7 +921,7 @@ export const Commands = [
         args: '<message>',
         runFn: function(roomId, args) {
             if (!args) return reject(this.getUserId());
-            return success(ContentHelpers.makeHtmlMessage(args, textToHtmlRainbow(args)));
+            return successSync(ContentHelpers.makeHtmlMessage(args, textToHtmlRainbow(args)));
         },
         category: CommandCategories.messages,
     }),
@@ -988,7 +931,7 @@ export const Commands = [
         args: '<message>',
         runFn: function(roomId, args) {
             if (!args) return reject(this.getUserId());
-            return success(ContentHelpers.makeHtmlEmote(args, textToHtmlRainbow(args)));
+            return successSync(ContentHelpers.makeHtmlEmote(args, textToHtmlRainbow(args)));
         },
         category: CommandCategories.messages,
     }),
@@ -996,8 +939,6 @@ export const Commands = [
         command: "help",
         description: _td("Displays list of commands with usages and descriptions"),
         runFn: function() {
-            const SlashCommandHelpDialog = sdk.getComponent('dialogs.SlashCommandHelpDialog');
-
             Modal.createTrackedDialog('Slash Commands', 'Help', SlashCommandHelpDialog);
             return success();
         },
@@ -1015,9 +956,8 @@ export const Commands = [
             const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
             dis.dispatch<ViewUserPayload>({
                 action: Action.ViewUser,
-                // XXX: We should be using a real member object and not assuming what the
-                // receiver wants.
-                member: member || {userId},
+                // XXX: We should be using a real member object and not assuming what the receiver wants.
+                member: member || { userId } as User,
             });
             return success();
         },
@@ -1073,7 +1013,7 @@ export const Commands = [
         command: "msg",
         description: _td("Sends a message to the given user"),
         args: "<user-id> <message>",
-        runFn: function(_, args) {
+        runFn: function(roomId, args) {
             if (args) {
                 // matches the first whitespace delimited group and then the rest of the string
                 const matches = args.match(/^(\S+?)(?: +(.*))?$/s);
@@ -1169,16 +1109,16 @@ export const Commands = [
                         };
                         MatrixClientPeg.get().sendMessage(roomId, content);
                     }
-                    dis.dispatch({action: `effects.${effect.command}`});
+                    dis.dispatch({ action: `effects.${effect.command}` });
                 })());
             },
             category: CommandCategories.effects,
-        })
+        });
     }),
 ];
 
 // build a map from names and aliases to the Command objects.
-export const CommandMap = new Map();
+export const CommandMap = new Map<string, Command>();
 Commands.forEach(cmd => {
     CommandMap.set(cmd.command, cmd);
     cmd.aliases.forEach(alias => {
@@ -1186,15 +1126,15 @@ Commands.forEach(cmd => {
     });
 });
 
-export function parseCommandString(input: string) {
+export function parseCommandString(input: string): { cmd?: string, args?: string } {
     // trim any trailing whitespace, as it can confuse the parser for
     // IRC-style commands
     input = input.replace(/\s+$/, '');
     if (input[0] !== '/') return {}; // not a command
 
     const bits = input.match(/^(\S+?)(?:[ \n]+((.|\n)*))?$/);
-    let cmd;
-    let args;
+    let cmd: string;
+    let args: string;
     if (bits) {
         cmd = bits[1].substring(1).toLowerCase();
         args = bits[2];
@@ -1202,7 +1142,12 @@ export function parseCommandString(input: string) {
         cmd = input;
     }
 
-    return {cmd, args};
+    return { cmd, args };
+}
+
+interface ICmd {
+    cmd?: Command;
+    args?: string;
 }
 
 /**
@@ -1213,8 +1158,8 @@ 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(input: string) {
-    const {cmd, args} = parseCommandString(input);
+export function getCommand(input: string): ICmd {
+    const { cmd, args } = parseCommandString(input);
 
     if (CommandMap.has(cmd) && CommandMap.get(cmd).isEnabled()) {
         return {
diff --git a/src/Terms.ts b/src/Terms.ts
index a6ea40a6e8..86d006c832 100644
--- a/src/Terms.ts
+++ b/src/Terms.ts
@@ -15,11 +15,14 @@ limitations under the License.
 */
 
 import classNames from 'classnames';
+import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import * as sdk from '.';
 import Modal from './Modal';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export class TermsNotSignedError extends Error {}
 
 /**
@@ -32,7 +35,7 @@ export class Service {
      * @param {string} baseUrl The Base URL of the service (ie. before '/_matrix')
      * @param {string} accessToken The user's access token for the service
      */
-    constructor(public serviceType: string, public baseUrl: string, public accessToken: string) {
+    constructor(public serviceType: SERVICE_TYPES, public baseUrl: string, public accessToken: string) {
     }
 }
 
@@ -48,13 +51,13 @@ export interface Policy {
 }
 
 export type Policies = {
-    [policy: string]: Policy,
+    [policy: string]: Policy;
 };
 
 export type TermsInteractionCallback = (
     policiesAndServicePairs: {
-        service: Service,
-        policies: Policies,
+        service: Service;
+        policies: Policies;
     }[],
     agreedUrls: string[],
     extraClassNames?: string,
@@ -117,7 +120,7 @@ export async function startTermsFlow(
     // but that is not a thing the API supports, so probably best to just show
     // things they've not agreed to yet.
     const unagreedPoliciesAndServicePairs = [];
-    for (const {service, policies} of policiesAndServicePairs) {
+    for (const { service, policies } of policiesAndServicePairs) {
         const unagreedPolicies = {};
         for (const [policyName, policy] of Object.entries(policies)) {
             let policyAgreed = false;
@@ -131,7 +134,7 @@ export async function startTermsFlow(
             if (!policyAgreed) unagreedPolicies[policyName] = policy;
         }
         if (Object.keys(unagreedPolicies).length > 0) {
-            unagreedPoliciesAndServicePairs.push({service, policies: unagreedPolicies});
+            unagreedPoliciesAndServicePairs.push({ service, policies: unagreedPolicies });
         }
     }
 
@@ -139,16 +142,16 @@ export async function startTermsFlow(
     const numAcceptedBeforeAgreement = agreedUrlSet.size;
     if (unagreedPoliciesAndServicePairs.length > 0) {
         const newlyAgreedUrls = await interactionCallback(unagreedPoliciesAndServicePairs, [...agreedUrlSet]);
-        console.log("User has agreed to URLs", newlyAgreedUrls);
+        logger.log("User has agreed to URLs", newlyAgreedUrls);
         // Merge with previously agreed URLs
         newlyAgreedUrls.forEach(url => agreedUrlSet.add(url));
     } else {
-        console.log("User has already agreed to all required policies");
+        logger.log("User has already agreed to all required policies");
     }
 
     // We only ever add to the set of URLs, so if anything has changed then we'd see a different length
     if (agreedUrlSet.size !== numAcceptedBeforeAgreement) {
-        const newAcceptedTerms = {accepted: Array.from(agreedUrlSet)};
+        const newAcceptedTerms = { accepted: Array.from(agreedUrlSet) };
         await MatrixClientPeg.get().setAccountData('m.accepted_terms', newAcceptedTerms);
     }
 
@@ -180,14 +183,15 @@ export async function startTermsFlow(
 
 export function dialogTermsInteractionCallback(
     policiesAndServicePairs: {
-        service: Service,
-        policies: { [policy: string]: Policy },
+        service: Service;
+        policies: { [policy: string]: Policy };
     }[],
     agreedUrls: string[],
     extraClassNames?: string,
 ): Promise<string[]> {
     return new Promise((resolve, reject) => {
-        console.log("Terms that need agreement", policiesAndServicePairs);
+        logger.log("Terms that need agreement", policiesAndServicePairs);
+        // FIXME: Using an import will result in test failures
         const TermsDialog = sdk.getComponent("views.dialogs.TermsDialog");
 
         Modal.createTrackedDialog('Terms of Service', '', TermsDialog, {
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
deleted file mode 100644
index 86f9ff20f4..0000000000
--- a/src/TextForEvent.js
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import {MatrixClientPeg} from './MatrixClientPeg';
-import { _t } from './languageHandler';
-import * as Roles from './Roles';
-import {isValid3pidInvite} from "./RoomInvite";
-import SettingsStore from "./settings/SettingsStore";
-import {ALL_RULE_TYPES, ROOM_RULE_TYPES, SERVER_RULE_TYPES, USER_RULE_TYPES} from "./mjolnir/BanList";
-import {WIDGET_LAYOUT_EVENT_TYPE} from "./stores/widgets/WidgetLayoutStore";
-
-function textForMemberEvent(ev) {
-    // XXX: SYJS-16 "sender is sometimes null for join messages"
-    const senderName = ev.sender ? ev.sender.name : ev.getSender();
-    const targetName = ev.target ? ev.target.name : ev.getStateKey();
-    const prevContent = ev.getPrevContent();
-    const content = ev.getContent();
-
-    const reason = content.reason ? (_t('Reason') + ': ' + content.reason) : '';
-    switch (content.membership) {
-        case 'invite': {
-            const threePidContent = content.third_party_invite;
-            if (threePidContent) {
-                if (threePidContent.display_name) {
-                    return _t('%(targetName)s accepted the invitation for %(displayName)s.', {
-                        targetName,
-                        displayName: threePidContent.display_name,
-                    });
-                } else {
-                    return _t('%(targetName)s accepted an invitation.', {targetName});
-                }
-            } else {
-                return _t('%(senderName)s invited %(targetName)s.', {senderName, targetName});
-            }
-        }
-        case 'ban':
-            return _t('%(senderName)s banned %(targetName)s.', {senderName, targetName}) + ' ' + reason;
-        case 'join':
-            if (prevContent && prevContent.membership === 'join') {
-                if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
-                    return _t('%(oldDisplayName)s changed their display name to %(displayName)s.', {
-                        oldDisplayName: prevContent.displayname,
-                        displayName: content.displayname,
-                    });
-                } else if (!prevContent.displayname && content.displayname) {
-                    return _t('%(senderName)s set their display name to %(displayName)s.', {
-                        senderName: ev.getSender(),
-                        displayName: content.displayname,
-                    });
-                } else if (prevContent.displayname && !content.displayname) {
-                    return _t('%(senderName)s removed their display name (%(oldDisplayName)s).', {
-                        senderName,
-                        oldDisplayName: prevContent.displayname,
-                    });
-                } else if (prevContent.avatar_url && !content.avatar_url) {
-                    return _t('%(senderName)s removed their profile picture.', {senderName});
-                } else if (prevContent.avatar_url && content.avatar_url &&
-                    prevContent.avatar_url !== content.avatar_url) {
-                    return _t('%(senderName)s changed their profile picture.', {senderName});
-                } else if (!prevContent.avatar_url && content.avatar_url) {
-                    return _t('%(senderName)s set a profile picture.', {senderName});
-                } else if (SettingsStore.getValue("showHiddenEventsInTimeline")) {
-                    // This is a null rejoin, it will only be visible if the Labs option is enabled
-                    return _t("%(senderName)s made no change.", {senderName});
-                } else {
-                    return "";
-                }
-            } else {
-                if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);
-                return _t('%(targetName)s joined the room.', {targetName});
-            }
-        case 'leave':
-            if (ev.getSender() === ev.getStateKey()) {
-                if (prevContent.membership === "invite") {
-                    return _t('%(targetName)s rejected the invitation.', {targetName});
-                } else {
-                    return _t('%(targetName)s left the room.', {targetName});
-                }
-            } else if (prevContent.membership === "ban") {
-                return _t('%(senderName)s unbanned %(targetName)s.', {senderName, targetName});
-            } else if (prevContent.membership === "invite") {
-                return _t('%(senderName)s withdrew %(targetName)s\'s invitation.', {
-                    senderName,
-                    targetName,
-                }) + ' ' + reason;
-            } else if (prevContent.membership === "join") {
-                return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
-            } else {
-                return "";
-            }
-    }
-}
-
-function textForTopicEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    return _t('%(senderDisplayName)s changed the topic to "%(topic)s".', {
-        senderDisplayName,
-        topic: ev.getContent().topic,
-    });
-}
-
-function textForRoomNameEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-
-    if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
-        return _t('%(senderDisplayName)s removed the room name.', {senderDisplayName});
-    }
-    if (ev.getPrevContent().name) {
-        return _t('%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.', {
-            senderDisplayName,
-            oldRoomName: ev.getPrevContent().name,
-            newRoomName: ev.getContent().name,
-        });
-    }
-    return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
-        senderDisplayName,
-        roomName: ev.getContent().name,
-    });
-}
-
-function textForTombstoneEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    return _t('%(senderDisplayName)s upgraded this room.', {senderDisplayName});
-}
-
-function textForJoinRulesEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    switch (ev.getContent().join_rule) {
-        case "public":
-            return _t('%(senderDisplayName)s made the room public to whoever knows the link.', {senderDisplayName});
-        case "invite":
-            return _t('%(senderDisplayName)s made the room invite only.', {senderDisplayName});
-        default:
-            // The spec supports "knock" and "private", however nothing implements these.
-            return _t('%(senderDisplayName)s changed the join rule to %(rule)s', {
-                senderDisplayName,
-                rule: ev.getContent().join_rule,
-            });
-    }
-}
-
-function textForGuestAccessEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    switch (ev.getContent().guest_access) {
-        case "can_join":
-            return _t('%(senderDisplayName)s has allowed guests to join the room.', {senderDisplayName});
-        case "forbidden":
-            return _t('%(senderDisplayName)s has prevented guests from joining the room.', {senderDisplayName});
-        default:
-            // There's no other options we can expect, however just for safety's sake we'll do this.
-            return _t('%(senderDisplayName)s changed guest access to %(rule)s', {
-                senderDisplayName,
-                rule: ev.getContent().guest_access,
-            });
-    }
-}
-
-function textForRelatedGroupsEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const groups = ev.getContent().groups || [];
-    const prevGroups = ev.getPrevContent().groups || [];
-    const added = groups.filter((g) => !prevGroups.includes(g));
-    const removed = prevGroups.filter((g) => !groups.includes(g));
-
-    if (added.length && !removed.length) {
-        return _t('%(senderDisplayName)s enabled flair for %(groups)s in this room.', {
-            senderDisplayName,
-            groups: added.join(', '),
-        });
-    } else if (!added.length && removed.length) {
-        return _t('%(senderDisplayName)s disabled flair for %(groups)s in this room.', {
-            senderDisplayName,
-            groups: removed.join(', '),
-        });
-    } else if (added.length && removed.length) {
-        return _t('%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for ' +
-            '%(oldGroups)s in this room.', {
-            senderDisplayName,
-            newGroups: added.join(', '),
-            oldGroups: removed.join(', '),
-        });
-    } else {
-        // Don't bother rendering this change (because there were no changes)
-        return '';
-    }
-}
-
-function textForServerACLEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const prevContent = ev.getPrevContent();
-    const current = ev.getContent();
-    const prev = {
-        deny: Array.isArray(prevContent.deny) ? prevContent.deny : [],
-        allow: Array.isArray(prevContent.allow) ? prevContent.allow : [],
-        allow_ip_literals: !(prevContent.allow_ip_literals === false),
-    };
-
-    let text = "";
-    if (prev.deny.length === 0 && prev.allow.length === 0) {
-        text = _t("%(senderDisplayName)s set the server ACLs for this room.", {senderDisplayName});
-    } else {
-        text = _t("%(senderDisplayName)s changed the server ACLs for this room.", {senderDisplayName});
-    }
-
-    if (!Array.isArray(current.allow)) {
-        current.allow = [];
-    }
-
-    // If we know for sure everyone is banned, mark the room as obliterated
-    if (current.allow.length === 0) {
-        return text + " " + _t("🎉 All servers are banned from participating! This room can no longer be used.");
-    }
-
-    return text;
-}
-
-function textForMessageEvent(ev) {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    let message = senderDisplayName + ': ' + ev.getContent().body;
-    if (ev.getContent().msgtype === "m.emote") {
-        message = "* " + senderDisplayName + " " + message;
-    } else if (ev.getContent().msgtype === "m.image") {
-        message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName});
-    }
-    return message;
-}
-
-function textForCanonicalAliasEvent(ev) {
-    const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const oldAlias = ev.getPrevContent().alias;
-    const oldAltAliases = ev.getPrevContent().alt_aliases || [];
-    const newAlias = ev.getContent().alias;
-    const newAltAliases = ev.getContent().alt_aliases || [];
-    const removedAltAliases = oldAltAliases.filter(alias => !newAltAliases.includes(alias));
-    const addedAltAliases = newAltAliases.filter(alias => !oldAltAliases.includes(alias));
-
-    if (!removedAltAliases.length && !addedAltAliases.length) {
-        if (newAlias) {
-            return _t('%(senderName)s set the main address for this room to %(address)s.', {
-                senderName: senderName,
-                address: ev.getContent().alias,
-            });
-        } else if (oldAlias) {
-            return _t('%(senderName)s removed the main address for this room.', {
-                senderName: senderName,
-            });
-        }
-    } else if (newAlias === oldAlias) {
-        if (addedAltAliases.length && !removedAltAliases.length) {
-            return _t('%(senderName)s added the alternative addresses %(addresses)s for this room.', {
-                senderName: senderName,
-                addresses: addedAltAliases.join(", "),
-                count: addedAltAliases.length,
-            });
-        } if (removedAltAliases.length && !addedAltAliases.length) {
-            return _t('%(senderName)s removed the alternative addresses %(addresses)s for this room.', {
-                senderName: senderName,
-                addresses: removedAltAliases.join(", "),
-                count: removedAltAliases.length,
-            });
-        } if (removedAltAliases.length && addedAltAliases.length) {
-            return _t('%(senderName)s changed the alternative addresses for this room.', {
-                senderName: senderName,
-            });
-        }
-    } else {
-        // both alias and alt_aliases where modified
-        return _t('%(senderName)s changed the main and alternative addresses for this room.', {
-            senderName: senderName,
-        });
-    }
-    // in case there is no difference between the two events,
-    // say something as we can't simply hide the tile from here
-    return _t('%(senderName)s changed the addresses for this room.', {
-        senderName: senderName,
-    });
-}
-
-function textForCallAnswerEvent(event) {
-    const senderName = event.sender ? event.sender.name : _t('Someone');
-    const supported = MatrixClientPeg.get().supportsVoip() ? '' : _t('(not supported by this browser)');
-    return _t('%(senderName)s answered the call.', {senderName}) + ' ' + supported;
-}
-
-function textForCallHangupEvent(event) {
-    const senderName = event.sender ? event.sender.name : _t('Someone');
-    const eventContent = event.getContent();
-    let reason = "";
-    if (!MatrixClientPeg.get().supportsVoip()) {
-        reason = _t('(not supported by this browser)');
-    } else if (eventContent.reason) {
-        if (eventContent.reason === "ice_failed") {
-            // We couldn't establish a connection at all
-            reason = _t('(could not connect media)');
-        } else if (eventContent.reason === "ice_timeout") {
-            // We established a connection but it died
-            reason = _t('(connection failed)');
-        } else if (eventContent.reason === "user_media_failed") {
-            // The other side couldn't open capture devices
-            reason = _t("(their device couldn't start the camera / microphone)");
-        } else if (eventContent.reason === "unknown_error") {
-            // An error code the other side doesn't have a way to express
-            // (as opposed to an error code they gave but we don't know about,
-            // in which case we show the error code)
-            reason = _t("(an error occurred)");
-        } else if (eventContent.reason === "invite_timeout") {
-            reason = _t('(no answer)');
-        } else if (eventContent.reason === "user hangup" || eventContent.reason === "user_hangup") {
-            // workaround for https://github.com/vector-im/element-web/issues/5178
-            // it seems Android randomly sets a reason of "user hangup" which is
-            // interpreted as an error code :(
-            // https://github.com/vector-im/riot-android/issues/2623
-            // Also the correct hangup code as of VoIP v1 (with underscore)
-            reason = '';
-        } else {
-            reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
-        }
-    }
-    return _t('%(senderName)s ended the call.', {senderName}) + ' ' + reason;
-}
-
-function textForCallRejectEvent(event) {
-    const senderName = event.sender ? event.sender.name : _t('Someone');
-    return _t('%(senderName)s declined the call.', {senderName});
-}
-
-function textForCallInviteEvent(event) {
-    const senderName = event.sender ? event.sender.name : _t('Someone');
-    // FIXME: Find a better way to determine this from the event?
-    let isVoice = true;
-    if (event.getContent().offer && event.getContent().offer.sdp &&
-            event.getContent().offer.sdp.indexOf('m=video') !== -1) {
-        isVoice = false;
-    }
-    const isSupported = MatrixClientPeg.get().supportsVoip();
-
-    // This ladder could be reduced down to a couple string variables, however other languages
-    // can have a hard time translating those strings. In an effort to make translations easier
-    // and more accurate, we break out the string-based variables to a couple booleans.
-    if (isVoice && isSupported) {
-        return _t("%(senderName)s placed a voice call.", {senderName});
-    } else if (isVoice && !isSupported) {
-        return _t("%(senderName)s placed a voice call. (not supported by this browser)", {senderName});
-    } else if (!isVoice && isSupported) {
-        return _t("%(senderName)s placed a video call.", {senderName});
-    } else if (!isVoice && !isSupported) {
-        return _t("%(senderName)s placed a video call. (not supported by this browser)", {senderName});
-    }
-}
-
-function textForThreePidInviteEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-
-    if (!isValid3pidInvite(event)) {
-        const targetDisplayName = event.getPrevContent().display_name || _t("Someone");
-        return _t('%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.', {
-            senderName,
-            targetDisplayName,
-        });
-    }
-
-    return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.', {
-        senderName,
-        targetDisplayName: event.getContent().display_name,
-    });
-}
-
-function textForHistoryVisibilityEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-    switch (event.getContent().history_visibility) {
-        case 'invited':
-            return _t('%(senderName)s made future room history visible to all room members, '
-                + 'from the point they are invited.', {senderName});
-        case 'joined':
-            return _t('%(senderName)s made future room history visible to all room members, '
-                + 'from the point they joined.', {senderName});
-        case 'shared':
-            return _t('%(senderName)s made future room history visible to all room members.', {senderName});
-        case 'world_readable':
-            return _t('%(senderName)s made future room history visible to anyone.', {senderName});
-        default:
-            return _t('%(senderName)s made future room history visible to unknown (%(visibility)s).', {
-                senderName,
-                visibility: event.getContent().history_visibility,
-            });
-    }
-}
-
-// Currently will only display a change if a user's power level is changed
-function textForPowerEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-    if (!event.getPrevContent() || !event.getPrevContent().users ||
-        !event.getContent() || !event.getContent().users) {
-        return '';
-    }
-    const userDefault = event.getContent().users_default || 0;
-    // Construct set of userIds
-    const users = [];
-    Object.keys(event.getContent().users).forEach(
-        (userId) => {
-            if (users.indexOf(userId) === -1) users.push(userId);
-        },
-    );
-    Object.keys(event.getPrevContent().users).forEach(
-        (userId) => {
-            if (users.indexOf(userId) === -1) users.push(userId);
-        },
-    );
-    const diff = [];
-    // XXX: This is also surely broken for i18n
-    users.forEach((userId) => {
-        // Previous power level
-        const from = event.getPrevContent().users[userId];
-        // Current power level
-        const to = event.getContent().users[userId];
-        if (to !== from) {
-            diff.push(
-                _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
-                    userId,
-                    fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
-                    toPowerLevel: Roles.textualPowerLevel(to, userDefault),
-                }),
-            );
-        }
-    });
-    if (!diff.length) {
-        return '';
-    }
-    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
-        senderName,
-        powerLevelDiffText: diff.join(", "),
-    });
-}
-
-function textForPinnedEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-    return _t("%(senderName)s changed the pinned messages for the room.", {senderName});
-}
-
-function textForWidgetEvent(event) {
-    const senderName = event.getSender();
-    const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
-    const {name, type, url} = event.getContent() || {};
-
-    let widgetName = name || prevName || type || prevType || '';
-    // Apply sentence case to widget name
-    if (widgetName && widgetName.length > 0) {
-        widgetName = widgetName[0].toUpperCase() + widgetName.slice(1);
-    }
-
-    // If the widget was removed, its content should be {}, but this is sufficiently
-    // equivalent to that condition.
-    if (url) {
-        if (prevUrl) {
-            return _t('%(widgetName)s widget modified by %(senderName)s', {
-                widgetName, senderName,
-            });
-        } else {
-            return _t('%(widgetName)s widget added by %(senderName)s', {
-                widgetName, senderName,
-            });
-        }
-    } else {
-        return _t('%(widgetName)s widget removed by %(senderName)s', {
-            widgetName, senderName,
-        });
-    }
-}
-
-function textForWidgetLayoutEvent(event) {
-    const senderName = event.sender?.name || event.getSender();
-    return _t("%(senderName)s has updated the widget layout", {senderName});
-}
-
-function textForMjolnirEvent(event) {
-    const senderName = event.getSender();
-    const {entity: prevEntity} = event.getPrevContent();
-    const {entity, recommendation, reason} = event.getContent();
-
-    // Rule removed
-    if (!entity) {
-        if (USER_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s removed the rule banning users matching %(glob)s",
-                {senderName, glob: prevEntity});
-        } else if (ROOM_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s removed the rule banning rooms matching %(glob)s",
-                {senderName, glob: prevEntity});
-        } else if (SERVER_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s removed the rule banning servers matching %(glob)s",
-                {senderName, glob: prevEntity});
-        }
-
-        // Unknown type. We'll say something, but we shouldn't end up here.
-        return _t("%(senderName)s removed a ban rule matching %(glob)s", {senderName, glob: prevEntity});
-    }
-
-    // Invalid rule
-    if (!recommendation || !reason) return _t(`%(senderName)s updated an invalid ban rule`, {senderName});
-
-    // Rule updated
-    if (entity === prevEntity) {
-        if (USER_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s",
-                {senderName, glob: entity, reason});
-        } else if (ROOM_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s",
-                {senderName, glob: entity, reason});
-        } else if (SERVER_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s",
-                {senderName, glob: entity, reason});
-        }
-
-        // Unknown type. We'll say something but we shouldn't end up here.
-        return _t("%(senderName)s updated a ban rule matching %(glob)s for %(reason)s",
-            {senderName, glob: entity, reason});
-    }
-
-    // New rule
-    if (!prevEntity) {
-        if (USER_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s created a rule banning users matching %(glob)s for %(reason)s",
-                {senderName, glob: entity, reason});
-        } else if (ROOM_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s",
-                {senderName, glob: entity, reason});
-        } else if (SERVER_RULE_TYPES.includes(event.getType())) {
-            return _t("%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s",
-                {senderName, glob: entity, reason});
-        }
-
-        // Unknown type. We'll say something but we shouldn't end up here.
-        return _t("%(senderName)s created a ban rule matching %(glob)s for %(reason)s",
-            {senderName, glob: entity, reason});
-    }
-
-    // else the entity !== prevEntity - count as a removal & add
-    if (USER_RULE_TYPES.includes(event.getType())) {
-        return _t(
-            "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching " +
-            "%(newGlob)s for %(reason)s",
-            {senderName, oldGlob: prevEntity, newGlob: entity, reason},
-        );
-    } else if (ROOM_RULE_TYPES.includes(event.getType())) {
-        return _t(
-            "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching " +
-            "%(newGlob)s for %(reason)s",
-            {senderName, oldGlob: prevEntity, newGlob: entity, reason},
-        );
-    } else if (SERVER_RULE_TYPES.includes(event.getType())) {
-        return _t(
-            "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching " +
-            "%(newGlob)s for %(reason)s",
-            {senderName, oldGlob: prevEntity, newGlob: entity, reason},
-        );
-    }
-
-    // Unknown type. We'll say something but we shouldn't end up here.
-    return _t("%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s " +
-        "for %(reason)s", {senderName, oldGlob: prevEntity, newGlob: entity, reason});
-}
-
-const handlers = {
-    'm.room.message': textForMessageEvent,
-    'm.call.invite': textForCallInviteEvent,
-    'm.call.answer': textForCallAnswerEvent,
-    'm.call.hangup': textForCallHangupEvent,
-    'm.call.reject': textForCallRejectEvent,
-};
-
-const stateHandlers = {
-    'm.room.canonical_alias': textForCanonicalAliasEvent,
-    'm.room.name': textForRoomNameEvent,
-    'm.room.topic': textForTopicEvent,
-    'm.room.member': textForMemberEvent,
-    'm.room.third_party_invite': textForThreePidInviteEvent,
-    'm.room.history_visibility': textForHistoryVisibilityEvent,
-    'm.room.power_levels': textForPowerEvent,
-    'm.room.pinned_events': textForPinnedEvent,
-    'm.room.server_acl': textForServerACLEvent,
-    'm.room.tombstone': textForTombstoneEvent,
-    'm.room.join_rules': textForJoinRulesEvent,
-    'm.room.guest_access': textForGuestAccessEvent,
-    'm.room.related_groups': textForRelatedGroupsEvent,
-
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-    'im.vector.modular.widgets': textForWidgetEvent,
-    [WIDGET_LAYOUT_EVENT_TYPE]: textForWidgetLayoutEvent,
-};
-
-// Add all the Mjolnir stuff to the renderer
-for (const evType of ALL_RULE_TYPES) {
-    stateHandlers[evType] = textForMjolnirEvent;
-}
-
-export function textForEvent(ev) {
-    const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
-    if (handler) return handler(ev);
-    return '';
-}
diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
new file mode 100644
index 0000000000..6fb4107d20
--- /dev/null
+++ b/src/TextForEvent.tsx
@@ -0,0 +1,746 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import React from 'react';
+import { _t } from './languageHandler';
+import * as Roles from './Roles';
+import { isValid3pidInvite } from "./RoomInvite";
+import SettingsStore from "./settings/SettingsStore";
+import { ALL_RULE_TYPES, ROOM_RULE_TYPES, SERVER_RULE_TYPES, USER_RULE_TYPES } from "./mjolnir/BanList";
+import { WIDGET_LAYOUT_EVENT_TYPE } from "./stores/widgets/WidgetLayoutStore";
+import { RightPanelPhases } from './stores/RightPanelStorePhases';
+import { Action } from './dispatcher/actions';
+import defaultDispatcher from './dispatcher/dispatcher';
+import { SetRightPanelPhasePayload } from './dispatcher/payloads/SetRightPanelPhasePayload';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClientPeg } from "./MatrixClientPeg";
+
+// These functions are frequently used just to check whether an event has
+// any text to display at all. For this reason they return deferred values
+// to avoid the expense of looking up translations when they're not needed.
+
+function textForCallInviteEvent(event: MatrixEvent): () => string | null {
+    const getSenderName = () => event.sender ? event.sender.name : _t('Someone');
+    // FIXME: Find a better way to determine this from the event?
+    let isVoice = true;
+    if (event.getContent().offer && event.getContent().offer.sdp &&
+        event.getContent().offer.sdp.indexOf('m=video') !== -1) {
+        isVoice = false;
+    }
+    const isSupported = MatrixClientPeg.get().supportsVoip();
+
+    // This ladder could be reduced down to a couple string variables, however other languages
+    // can have a hard time translating those strings. In an effort to make translations easier
+    // and more accurate, we break out the string-based variables to a couple booleans.
+    if (isVoice && isSupported) {
+        return () => _t("%(senderName)s placed a voice call.", {
+            senderName: getSenderName(),
+        });
+    } else if (isVoice && !isSupported) {
+        return () => _t("%(senderName)s placed a voice call. (not supported by this browser)", {
+            senderName: getSenderName(),
+        });
+    } else if (!isVoice && isSupported) {
+        return () => _t("%(senderName)s placed a video call.", {
+            senderName: getSenderName(),
+        });
+    } else if (!isVoice && !isSupported) {
+        return () => _t("%(senderName)s placed a video call. (not supported by this browser)", {
+            senderName: getSenderName(),
+        });
+    }
+}
+
+function textForMemberEvent(ev: MatrixEvent, allowJSX: boolean, showHiddenEvents?: boolean): () => string | null {
+    // XXX: SYJS-16 "sender is sometimes null for join messages"
+    const senderName = ev.sender ? ev.sender.name : ev.getSender();
+    const targetName = ev.target ? ev.target.name : ev.getStateKey();
+    const prevContent = ev.getPrevContent();
+    const content = ev.getContent();
+    const reason = content.reason;
+
+    switch (content.membership) {
+        case 'invite': {
+            const threePidContent = content.third_party_invite;
+            if (threePidContent) {
+                if (threePidContent.display_name) {
+                    return () => _t('%(targetName)s accepted the invitation for %(displayName)s', {
+                        targetName,
+                        displayName: threePidContent.display_name,
+                    });
+                } else {
+                    return () => _t('%(targetName)s accepted an invitation', { targetName });
+                }
+            } else {
+                return () => _t('%(senderName)s invited %(targetName)s', { senderName, targetName });
+            }
+        }
+        case 'ban':
+            return () => reason
+                ? _t('%(senderName)s banned %(targetName)s: %(reason)s', { senderName, targetName, reason })
+                : _t('%(senderName)s banned %(targetName)s', { senderName, targetName });
+        case 'join':
+            if (prevContent && prevContent.membership === 'join') {
+                if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
+                    return () => _t('%(oldDisplayName)s changed their display name to %(displayName)s', {
+                        oldDisplayName: prevContent.displayname,
+                        displayName: content.displayname,
+                    });
+                } else if (!prevContent.displayname && content.displayname) {
+                    return () => _t('%(senderName)s set their display name to %(displayName)s', {
+                        senderName: ev.getSender(),
+                        displayName: content.displayname,
+                    });
+                } else if (prevContent.displayname && !content.displayname) {
+                    return () => _t('%(senderName)s removed their display name (%(oldDisplayName)s)', {
+                        senderName,
+                        oldDisplayName: prevContent.displayname,
+                    });
+                } else if (prevContent.avatar_url && !content.avatar_url) {
+                    return () => _t('%(senderName)s removed their profile picture', { senderName });
+                } else if (prevContent.avatar_url && content.avatar_url &&
+                    prevContent.avatar_url !== content.avatar_url) {
+                    return () => _t('%(senderName)s changed their profile picture', { senderName });
+                } else if (!prevContent.avatar_url && content.avatar_url) {
+                    return () => _t('%(senderName)s set a profile picture', { senderName });
+                } else if (showHiddenEvents ?? SettingsStore.getValue("showHiddenEventsInTimeline")) {
+                    // This is a null rejoin, it will only be visible if using 'show hidden events' (labs)
+                    return () => _t("%(senderName)s made no change", { senderName });
+                } else {
+                    return null;
+                }
+            } else {
+                if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);
+                return () => _t('%(targetName)s joined the room', { targetName });
+            }
+        case 'leave':
+            if (ev.getSender() === ev.getStateKey()) {
+                if (prevContent.membership === "invite") {
+                    return () => _t('%(targetName)s rejected the invitation', { targetName });
+                } else {
+                    return () => reason
+                        ? _t('%(targetName)s left the room: %(reason)s', { targetName, reason })
+                        : _t('%(targetName)s left the room', { targetName });
+                }
+            } else if (prevContent.membership === "ban") {
+                return () => _t('%(senderName)s unbanned %(targetName)s', { senderName, targetName });
+            } else if (prevContent.membership === "invite") {
+                return () => reason
+                    ? _t('%(senderName)s withdrew %(targetName)s\'s invitation: %(reason)s', {
+                        senderName,
+                        targetName,
+                        reason,
+                    })
+                    : _t('%(senderName)s withdrew %(targetName)s\'s invitation', { senderName, targetName });
+            } else if (prevContent.membership === "join") {
+                return () => reason
+                    ? _t('%(senderName)s kicked %(targetName)s: %(reason)s', {
+                        senderName,
+                        targetName,
+                        reason,
+                    })
+                    : _t('%(senderName)s kicked %(targetName)s', { senderName, targetName });
+            } else {
+                return null;
+            }
+    }
+}
+
+function textForTopicEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    return () => _t('%(senderDisplayName)s changed the topic to "%(topic)s".', {
+        senderDisplayName,
+        topic: ev.getContent().topic,
+    });
+}
+
+function textForRoomAvatarEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev?.sender?.name || ev.getSender();
+    return () => _t('%(senderDisplayName)s changed the room avatar.', { senderDisplayName });
+}
+
+function textForRoomNameEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+
+    if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
+        return () => _t('%(senderDisplayName)s removed the room name.', { senderDisplayName });
+    }
+    if (ev.getPrevContent().name) {
+        return () => _t('%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.', {
+            senderDisplayName,
+            oldRoomName: ev.getPrevContent().name,
+            newRoomName: ev.getContent().name,
+        });
+    }
+    return () => _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
+        senderDisplayName,
+        roomName: ev.getContent().name,
+    });
+}
+
+function textForTombstoneEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    return () => _t('%(senderDisplayName)s upgraded this room.', { senderDisplayName });
+}
+
+function textForJoinRulesEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    switch (ev.getContent().join_rule) {
+        case "public":
+            return () => _t('%(senderDisplayName)s made the room public to whoever knows the link.', {
+                senderDisplayName,
+            });
+        case "invite":
+            return () => _t('%(senderDisplayName)s made the room invite only.', {
+                senderDisplayName,
+            });
+        default:
+            // The spec supports "knock" and "private", however nothing implements these.
+            return () => _t('%(senderDisplayName)s changed the join rule to %(rule)s', {
+                senderDisplayName,
+                rule: ev.getContent().join_rule,
+            });
+    }
+}
+
+function textForGuestAccessEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    switch (ev.getContent().guest_access) {
+        case "can_join":
+            return () => _t('%(senderDisplayName)s has allowed guests to join the room.', { senderDisplayName });
+        case "forbidden":
+            return () => _t('%(senderDisplayName)s has prevented guests from joining the room.', { senderDisplayName });
+        default:
+            // There's no other options we can expect, however just for safety's sake we'll do this.
+            return () => _t('%(senderDisplayName)s changed guest access to %(rule)s', {
+                senderDisplayName,
+                rule: ev.getContent().guest_access,
+            });
+    }
+}
+
+function textForRelatedGroupsEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const groups = ev.getContent().groups || [];
+    const prevGroups = ev.getPrevContent().groups || [];
+    const added = groups.filter((g) => !prevGroups.includes(g));
+    const removed = prevGroups.filter((g) => !groups.includes(g));
+
+    if (added.length && !removed.length) {
+        return () => _t('%(senderDisplayName)s enabled flair for %(groups)s in this room.', {
+            senderDisplayName,
+            groups: added.join(', '),
+        });
+    } else if (!added.length && removed.length) {
+        return () => _t('%(senderDisplayName)s disabled flair for %(groups)s in this room.', {
+            senderDisplayName,
+            groups: removed.join(', '),
+        });
+    } else if (added.length && removed.length) {
+        return () => _t('%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for ' +
+            '%(oldGroups)s in this room.', {
+            senderDisplayName,
+            newGroups: added.join(', '),
+            oldGroups: removed.join(', '),
+        });
+    } else {
+        // Don't bother rendering this change (because there were no changes)
+        return null;
+    }
+}
+
+function textForServerACLEvent(ev: MatrixEvent): () => string | null {
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const prevContent = ev.getPrevContent();
+    const current = ev.getContent();
+    const prev = {
+        deny: Array.isArray(prevContent.deny) ? prevContent.deny : [],
+        allow: Array.isArray(prevContent.allow) ? prevContent.allow : [],
+        allow_ip_literals: !(prevContent.allow_ip_literals === false),
+    };
+
+    let getText = null;
+    if (prev.deny.length === 0 && prev.allow.length === 0) {
+        getText = () => _t("%(senderDisplayName)s set the server ACLs for this room.", { senderDisplayName });
+    } else {
+        getText = () => _t("%(senderDisplayName)s changed the server ACLs for this room.", { senderDisplayName });
+    }
+
+    if (!Array.isArray(current.allow)) {
+        current.allow = [];
+    }
+
+    // If we know for sure everyone is banned, mark the room as obliterated
+    if (current.allow.length === 0) {
+        return () => getText() + " " +
+            _t("🎉 All servers are banned from participating! This room can no longer be used.");
+    }
+
+    return getText;
+}
+
+function textForMessageEvent(ev: MatrixEvent): () => string | null {
+    return () => {
+        const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+        let message = ev.getContent().body;
+        if (ev.isRedacted()) {
+            message = _t("Message deleted");
+            const unsigned = ev.getUnsigned();
+            const redactedBecauseUserId = unsigned?.redacted_because?.sender;
+            if (redactedBecauseUserId && redactedBecauseUserId !== ev.getSender()) {
+                const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
+                const sender = room?.getMember(redactedBecauseUserId);
+                message = _t("Message deleted by %(name)s", { name: sender?.name
+ || redactedBecauseUserId });
+            }
+        }
+        if (ev.getContent().msgtype === "m.emote") {
+            message = "* " + senderDisplayName + " " + message;
+        } else if (ev.getContent().msgtype === "m.image") {
+            message = _t('%(senderDisplayName)s sent an image.', { senderDisplayName });
+        } else if (ev.getType() == "m.sticker") {
+            message = _t('%(senderDisplayName)s sent a sticker.', { senderDisplayName });
+        } else {
+            // in this case, parse it as a plain text message
+            message = senderDisplayName + ': ' + message;
+        }
+        return message;
+    };
+}
+
+function textForCanonicalAliasEvent(ev: MatrixEvent): () => string | null {
+    const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const oldAlias = ev.getPrevContent().alias;
+    const oldAltAliases = ev.getPrevContent().alt_aliases || [];
+    const newAlias = ev.getContent().alias;
+    const newAltAliases = ev.getContent().alt_aliases || [];
+    const removedAltAliases = oldAltAliases.filter(alias => !newAltAliases.includes(alias));
+    const addedAltAliases = newAltAliases.filter(alias => !oldAltAliases.includes(alias));
+
+    if (!removedAltAliases.length && !addedAltAliases.length) {
+        if (newAlias) {
+            return () => _t('%(senderName)s set the main address for this room to %(address)s.', {
+                senderName: senderName,
+                address: ev.getContent().alias,
+            });
+        } else if (oldAlias) {
+            return () => _t('%(senderName)s removed the main address for this room.', {
+                senderName: senderName,
+            });
+        }
+    } else if (newAlias === oldAlias) {
+        if (addedAltAliases.length && !removedAltAliases.length) {
+            return () => _t('%(senderName)s added the alternative addresses %(addresses)s for this room.', {
+                senderName: senderName,
+                addresses: addedAltAliases.join(", "),
+                count: addedAltAliases.length,
+            });
+        } if (removedAltAliases.length && !addedAltAliases.length) {
+            return () => _t('%(senderName)s removed the alternative addresses %(addresses)s for this room.', {
+                senderName: senderName,
+                addresses: removedAltAliases.join(", "),
+                count: removedAltAliases.length,
+            });
+        } if (removedAltAliases.length && addedAltAliases.length) {
+            return () => _t('%(senderName)s changed the alternative addresses for this room.', {
+                senderName: senderName,
+            });
+        }
+    } else {
+        // both alias and alt_aliases where modified
+        return () => _t('%(senderName)s changed the main and alternative addresses for this room.', {
+            senderName: senderName,
+        });
+    }
+    // in case there is no difference between the two events,
+    // say something as we can't simply hide the tile from here
+    return () => _t('%(senderName)s changed the addresses for this room.', {
+        senderName: senderName,
+    });
+}
+
+function textForThreePidInviteEvent(event: MatrixEvent): () => string | null {
+    const senderName = event.sender ? event.sender.name : event.getSender();
+
+    if (!isValid3pidInvite(event)) {
+        return () => _t('%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.', {
+            senderName,
+            targetDisplayName: event.getPrevContent().display_name || _t("Someone"),
+        });
+    }
+
+    return () => _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.', {
+        senderName,
+        targetDisplayName: event.getContent().display_name,
+    });
+}
+
+function textForHistoryVisibilityEvent(event: MatrixEvent): () => string | null {
+    const senderName = event.sender ? event.sender.name : event.getSender();
+    switch (event.getContent().history_visibility) {
+        case 'invited':
+            return () => _t('%(senderName)s made future room history visible to all room members, '
+                + 'from the point they are invited.', { senderName });
+        case 'joined':
+            return () => _t('%(senderName)s made future room history visible to all room members, '
+                + 'from the point they joined.', { senderName });
+        case 'shared':
+            return () => _t('%(senderName)s made future room history visible to all room members.', { senderName });
+        case 'world_readable':
+            return () => _t('%(senderName)s made future room history visible to anyone.', { senderName });
+        default:
+            return () => _t('%(senderName)s made future room history visible to unknown (%(visibility)s).', {
+                senderName,
+                visibility: event.getContent().history_visibility,
+            });
+    }
+}
+
+// Currently will only display a change if a user's power level is changed
+function textForPowerEvent(event: MatrixEvent): () => string | null {
+    const senderName = event.sender ? event.sender.name : event.getSender();
+    if (!event.getPrevContent() || !event.getPrevContent().users ||
+        !event.getContent() || !event.getContent().users) {
+        return null;
+    }
+    const previousUserDefault = event.getPrevContent().users_default || 0;
+    const currentUserDefault = event.getContent().users_default || 0;
+    // Construct set of userIds
+    const users = [];
+    Object.keys(event.getContent().users).forEach(
+        (userId) => {
+            if (users.indexOf(userId) === -1) users.push(userId);
+        },
+    );
+    Object.keys(event.getPrevContent().users).forEach(
+        (userId) => {
+            if (users.indexOf(userId) === -1) users.push(userId);
+        },
+    );
+    const diffs = [];
+    users.forEach((userId) => {
+        // Previous power level
+        let from = event.getPrevContent().users[userId];
+        if (!Number.isInteger(from)) {
+            from = previousUserDefault;
+        }
+        // Current power level
+        let to = event.getContent().users[userId];
+        if (!Number.isInteger(to)) {
+            to = currentUserDefault;
+        }
+        if (from === previousUserDefault && to === currentUserDefault) { return; }
+        if (to !== from) {
+            diffs.push({ userId, from, to });
+        }
+    });
+    if (!diffs.length) {
+        return null;
+    }
+    // XXX: This is also surely broken for i18n
+    return () => _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
+        senderName,
+        powerLevelDiffText: diffs.map(diff =>
+            _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
+                userId: diff.userId,
+                fromPowerLevel: Roles.textualPowerLevel(diff.from, previousUserDefault),
+                toPowerLevel: Roles.textualPowerLevel(diff.to, currentUserDefault),
+            }),
+        ).join(", "),
+    });
+}
+
+const onPinnedOrUnpinnedMessageClick = (messageId: string, roomId: string): void => {
+    defaultDispatcher.dispatch({
+        action: 'view_room',
+        event_id: messageId,
+        highlighted: true,
+        room_id: roomId,
+    });
+};
+
+const onPinnedMessagesClick = (): void => {
+    defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.PinnedMessages,
+        allowClose: false,
+    });
+};
+
+function textForPinnedEvent(event: MatrixEvent, allowJSX: boolean): () => string | JSX.Element | null {
+    if (!SettingsStore.getValue("feature_pinning")) return null;
+    const senderName = event.sender ? event.sender.name : event.getSender();
+    const roomId = event.getRoomId();
+
+    const pinned = event.getContent().pinned ?? [];
+    const previouslyPinned = event.getPrevContent().pinned ?? [];
+    const newlyPinned = pinned.filter(item => previouslyPinned.indexOf(item) < 0);
+    const newlyUnpinned = previouslyPinned.filter(item => pinned.indexOf(item) < 0);
+
+    if (newlyPinned.length === 1 && newlyUnpinned.length === 0) {
+        // A single message was pinned, include a link to that message.
+        if (allowJSX) {
+            const messageId = newlyPinned.pop();
+
+            return () => (
+                <span>
+                    { _t(
+                        "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.",
+                        { senderName },
+                        {
+                            "a": (sub) =>
+                                <a onClick={(e) => onPinnedOrUnpinnedMessageClick(messageId, roomId)}>
+                                    { sub }
+                                </a>,
+                            "b": (sub) =>
+                                <a onClick={onPinnedMessagesClick}>
+                                    { sub }
+                                </a>,
+                        },
+                    ) }
+                </span>
+            );
+        }
+
+        return () => _t("%(senderName)s pinned a message to this room. See all pinned messages.", { senderName });
+    }
+
+    if (newlyUnpinned.length === 1 && newlyPinned.length === 0) {
+        // A single message was unpinned, include a link to that message.
+        if (allowJSX) {
+            const messageId = newlyUnpinned.pop();
+
+            return () => (
+                <span>
+                    { _t(
+                        "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.",
+                        { senderName },
+                        {
+                            "a": (sub) =>
+                                <a onClick={(e) => onPinnedOrUnpinnedMessageClick(messageId, roomId)}>
+                                    { sub }
+                                </a>,
+                            "b": (sub) =>
+                                <a onClick={onPinnedMessagesClick}>
+                                    { sub }
+                                </a>,
+                        },
+                    ) }
+                </span>
+            );
+        }
+
+        return () => _t("%(senderName)s unpinned a message from this room. See all pinned messages.", { senderName });
+    }
+
+    if (allowJSX) {
+        return () => (
+            <span>
+                { _t(
+                    "%(senderName)s changed the <a>pinned messages</a> for the room.",
+                    { senderName },
+                    { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> },
+                ) }
+            </span>
+        );
+    }
+
+    return () => _t("%(senderName)s changed the pinned messages for the room.", { senderName });
+}
+
+function textForWidgetEvent(event: MatrixEvent): () => string | null {
+    const senderName = event.getSender();
+    const { name: prevName, type: prevType, url: prevUrl } = event.getPrevContent();
+    const { name, type, url } = event.getContent() || {};
+
+    let widgetName = name || prevName || type || prevType || '';
+    // Apply sentence case to widget name
+    if (widgetName && widgetName.length > 0) {
+        widgetName = widgetName[0].toUpperCase() + widgetName.slice(1);
+    }
+
+    // If the widget was removed, its content should be {}, but this is sufficiently
+    // equivalent to that condition.
+    if (url) {
+        if (prevUrl) {
+            return () => _t('%(widgetName)s widget modified by %(senderName)s', {
+                widgetName, senderName,
+            });
+        } else {
+            return () => _t('%(widgetName)s widget added by %(senderName)s', {
+                widgetName, senderName,
+            });
+        }
+    } else {
+        return () => _t('%(widgetName)s widget removed by %(senderName)s', {
+            widgetName, senderName,
+        });
+    }
+}
+
+function textForWidgetLayoutEvent(event: MatrixEvent): () => string | null {
+    const senderName = event.sender?.name || event.getSender();
+    return () => _t("%(senderName)s has updated the widget layout", { senderName });
+}
+
+function textForMjolnirEvent(event: MatrixEvent): () => string | null {
+    const senderName = event.getSender();
+    const { entity: prevEntity } = event.getPrevContent();
+    const { entity, recommendation, reason } = event.getContent();
+
+    // Rule removed
+    if (!entity) {
+        if (USER_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s removed the rule banning users matching %(glob)s",
+                { senderName, glob: prevEntity });
+        } else if (ROOM_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s removed the rule banning rooms matching %(glob)s",
+                { senderName, glob: prevEntity });
+        } else if (SERVER_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s removed the rule banning servers matching %(glob)s",
+                { senderName, glob: prevEntity });
+        }
+
+        // Unknown type. We'll say something, but we shouldn't end up here.
+        return () => _t("%(senderName)s removed a ban rule matching %(glob)s", { senderName, glob: prevEntity });
+    }
+
+    // Invalid rule
+    if (!recommendation || !reason) return () => _t(`%(senderName)s updated an invalid ban rule`, { senderName });
+
+    // Rule updated
+    if (entity === prevEntity) {
+        if (USER_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s",
+                { senderName, glob: entity, reason });
+        } else if (ROOM_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s",
+                { senderName, glob: entity, reason });
+        } else if (SERVER_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s",
+                { senderName, glob: entity, reason });
+        }
+
+        // Unknown type. We'll say something but we shouldn't end up here.
+        return () => _t("%(senderName)s updated a ban rule matching %(glob)s for %(reason)s",
+            { senderName, glob: entity, reason });
+    }
+
+    // New rule
+    if (!prevEntity) {
+        if (USER_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s created a rule banning users matching %(glob)s for %(reason)s",
+                { senderName, glob: entity, reason });
+        } else if (ROOM_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s",
+                { senderName, glob: entity, reason });
+        } else if (SERVER_RULE_TYPES.includes(event.getType())) {
+            return () => _t("%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s",
+                { senderName, glob: entity, reason });
+        }
+
+        // Unknown type. We'll say something but we shouldn't end up here.
+        return () => _t("%(senderName)s created a ban rule matching %(glob)s for %(reason)s",
+            { senderName, glob: entity, reason });
+    }
+
+    // else the entity !== prevEntity - count as a removal & add
+    if (USER_RULE_TYPES.includes(event.getType())) {
+        return () => _t(
+            "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching " +
+            "%(newGlob)s for %(reason)s",
+            { senderName, oldGlob: prevEntity, newGlob: entity, reason },
+        );
+    } else if (ROOM_RULE_TYPES.includes(event.getType())) {
+        return () => _t(
+            "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching " +
+            "%(newGlob)s for %(reason)s",
+            { senderName, oldGlob: prevEntity, newGlob: entity, reason },
+        );
+    } else if (SERVER_RULE_TYPES.includes(event.getType())) {
+        return () => _t(
+            "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching " +
+            "%(newGlob)s for %(reason)s",
+            { senderName, oldGlob: prevEntity, newGlob: entity, reason },
+        );
+    }
+
+    // Unknown type. We'll say something but we shouldn't end up here.
+    return () => _t("%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s " +
+        "for %(reason)s", { senderName, oldGlob: prevEntity, newGlob: entity, reason });
+}
+
+interface IHandlers {
+    [type: string]:
+        (ev: MatrixEvent, allowJSX: boolean, showHiddenEvents?: boolean) =>
+            (() => string | JSX.Element | null);
+}
+
+const handlers: IHandlers = {
+    'm.room.message': textForMessageEvent,
+    'm.sticker': textForMessageEvent,
+    'm.call.invite': textForCallInviteEvent,
+};
+
+const stateHandlers: IHandlers = {
+    'm.room.canonical_alias': textForCanonicalAliasEvent,
+    'm.room.name': textForRoomNameEvent,
+    'm.room.topic': textForTopicEvent,
+    'm.room.member': textForMemberEvent,
+    "m.room.avatar": textForRoomAvatarEvent,
+    'm.room.third_party_invite': textForThreePidInviteEvent,
+    'm.room.history_visibility': textForHistoryVisibilityEvent,
+    'm.room.power_levels': textForPowerEvent,
+    'm.room.pinned_events': textForPinnedEvent,
+    'm.room.server_acl': textForServerACLEvent,
+    'm.room.tombstone': textForTombstoneEvent,
+    'm.room.join_rules': textForJoinRulesEvent,
+    'm.room.guest_access': textForGuestAccessEvent,
+    'm.room.related_groups': textForRelatedGroupsEvent,
+
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+    'im.vector.modular.widgets': textForWidgetEvent,
+    [WIDGET_LAYOUT_EVENT_TYPE]: textForWidgetLayoutEvent,
+};
+
+// Add all the Mjolnir stuff to the renderer
+for (const evType of ALL_RULE_TYPES) {
+    stateHandlers[evType] = textForMjolnirEvent;
+}
+
+/**
+ * Determines whether the given event has text to display.
+ * @param ev The event
+ * @param showHiddenEvents An optional cached setting value for showHiddenEventsInTimeline
+ *     to avoid hitting the settings store
+ */
+export function hasText(ev: MatrixEvent, showHiddenEvents?: boolean): boolean {
+    const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
+    return Boolean(handler?.(ev, false, showHiddenEvents));
+}
+
+/**
+ * Gets the textual content of the given event.
+ * @param ev The event
+ * @param allowJSX Whether to output rich JSX content
+ * @param showHiddenEvents An optional cached setting value for showHiddenEventsInTimeline
+ *     to avoid hitting the settings store
+ */
+export function textForEvent(ev: MatrixEvent): string;
+export function textForEvent(ev: MatrixEvent, allowJSX: true, showHiddenEvents?: boolean): string | JSX.Element;
+export function textForEvent(ev: MatrixEvent, allowJSX = false, showHiddenEvents?: boolean): string | JSX.Element {
+    const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
+    return handler?.(ev, allowJSX, showHiddenEvents)?.() || '';
+}
diff --git a/src/Tinter.js b/src/Tinter.js
deleted file mode 100644
index ca5a460e16..0000000000
--- a/src/Tinter.js
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-Copyright 2015 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-const DEBUG = 0;
-
-// utility to turn #rrggbb or rgb(r,g,b) into [red,green,blue]
-function colorToRgb(color) {
-    if (!color) {
-        return [0, 0, 0];
-    }
-
-    if (color[0] === '#') {
-        color = color.slice(1);
-        if (color.length === 3) {
-            color = color[0] + color[0] +
-                    color[1] + color[1] +
-                    color[2] + color[2];
-        }
-        const val = parseInt(color, 16);
-        const r = (val >> 16) & 255;
-        const g = (val >> 8) & 255;
-        const b = val & 255;
-        return [r, g, b];
-    } else {
-        const match = color.match(/rgb\((.*?),(.*?),(.*?)\)/);
-        if (match) {
-            return [
-                parseInt(match[1]),
-                parseInt(match[2]),
-                parseInt(match[3]),
-            ];
-        }
-    }
-    return [0, 0, 0];
-}
-
-// utility to turn [red,green,blue] into #rrggbb
-function rgbToColor(rgb) {
-    const val = (rgb[0] << 16) | (rgb[1] << 8) | rgb[2];
-    return '#' + (0x1000000 + val).toString(16).slice(1);
-}
-
-class Tinter {
-    constructor() {
-        // The default colour keys to be replaced as referred to in CSS
-        // (should be overridden by .mx_theme_accentColor and .mx_theme_secondaryAccentColor)
-        this.keyRgb = [
-            "rgb(118, 207, 166)", // Vector Green
-            "rgb(234, 245, 240)", // Vector Light Green
-            "rgb(211, 239, 225)", // roomsublist-label-bg-color (20% Green overlaid on Light Green)
-        ];
-
-        // Some algebra workings for calculating the tint % of Vector Green & Light Green
-        // x * 118 + (1 - x) * 255 = 234
-        // x * 118 + 255 - 255 * x = 234
-        // x * 118 - x * 255 = 234 - 255
-        // (255 - 118) x = 255 - 234
-        // x = (255 - 234) / (255 - 118) = 0.16
-
-        // The colour keys to be replaced as referred to in SVGs
-        this.keyHex = [
-            "#76CFA6", // Vector Green
-            "#EAF5F0", // Vector Light Green
-            "#D3EFE1", // roomsublist-label-bg-color (20% Green overlaid on Light Green)
-            "#FFFFFF", // white highlights of the SVGs (for switching to dark theme)
-            "#000000", // black lowlights of the SVGs (for switching to dark theme)
-        ];
-
-        // track the replacement colours actually being used
-        // defaults to our keys.
-        this.colors = [
-            this.keyHex[0],
-            this.keyHex[1],
-            this.keyHex[2],
-            this.keyHex[3],
-            this.keyHex[4],
-        ];
-
-        // track the most current tint request inputs (which may differ from the
-        // end result stored in this.colors
-        this.currentTint = [
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-        ];
-
-        this.cssFixups = [
-            // { theme: {
-            //      style: a style object that should be fixed up taken from a stylesheet
-            //      attr: name of the attribute to be clobbered, e.g. 'color'
-            //      index: ordinal of primary, secondary or tertiary
-            //   },
-            // }
-        ];
-
-        // CSS attributes to be fixed up
-        this.cssAttrs = [
-            "color",
-            "backgroundColor",
-            "borderColor",
-            "borderTopColor",
-            "borderBottomColor",
-            "borderLeftColor",
-        ];
-
-        this.svgAttrs = [
-            "fill",
-            "stroke",
-        ];
-
-        // List of functions to call when the tint changes.
-        this.tintables = [];
-
-        // the currently loaded theme (if any)
-        this.theme = undefined;
-
-        // whether to force a tint (e.g. after changing theme)
-        this.forceTint = false;
-    }
-
-    /**
-     * Register a callback to fire when the tint changes.
-     * This is used to rewrite the tintable SVGs with the new tint.
-     *
-     * It's not possible to unregister a tintable callback. So this can only be
-     * used to register a static callback. If a set of tintables will change
-     * over time then the best bet is to register a single callback for the
-     * entire set.
-     *
-     * To ensure the tintable work happens at least once, it is also called as
-     * part of registration.
-     *
-     * @param {Function} tintable Function to call when the tint changes.
-     */
-    registerTintable(tintable) {
-        this.tintables.push(tintable);
-        tintable();
-    }
-
-    getKeyRgb() {
-        return this.keyRgb;
-    }
-
-    tint(primaryColor, secondaryColor, tertiaryColor) {
-        return;
-        // eslint-disable-next-line no-unreachable
-        this.currentTint[0] = primaryColor;
-        this.currentTint[1] = secondaryColor;
-        this.currentTint[2] = tertiaryColor;
-
-        this.calcCssFixups();
-
-        if (DEBUG) {
-            console.log("Tinter.tint(" + primaryColor + ", " +
-                secondaryColor + ", " +
-                tertiaryColor + ")");
-        }
-
-        if (!primaryColor) {
-            primaryColor = this.keyRgb[0];
-            secondaryColor = this.keyRgb[1];
-            tertiaryColor = this.keyRgb[2];
-        }
-
-        if (!secondaryColor) {
-            const x = 0.16; // average weighting factor calculated from vector green & light green
-            const rgb = colorToRgb(primaryColor);
-            rgb[0] = x * rgb[0] + (1 - x) * 255;
-            rgb[1] = x * rgb[1] + (1 - x) * 255;
-            rgb[2] = x * rgb[2] + (1 - x) * 255;
-            secondaryColor = rgbToColor(rgb);
-        }
-
-        if (!tertiaryColor) {
-            const x = 0.19;
-            const rgb1 = colorToRgb(primaryColor);
-            const rgb2 = colorToRgb(secondaryColor);
-            rgb1[0] = x * rgb1[0] + (1 - x) * rgb2[0];
-            rgb1[1] = x * rgb1[1] + (1 - x) * rgb2[1];
-            rgb1[2] = x * rgb1[2] + (1 - x) * rgb2[2];
-            tertiaryColor = rgbToColor(rgb1);
-        }
-
-        if (this.forceTint == false &&
-            this.colors[0] === primaryColor &&
-            this.colors[1] === secondaryColor &&
-            this.colors[2] === tertiaryColor) {
-            return;
-        }
-
-        this.forceTint = false;
-
-        this.colors[0] = primaryColor;
-        this.colors[1] = secondaryColor;
-        this.colors[2] = tertiaryColor;
-
-        if (DEBUG) {
-            console.log("Tinter.tint final: (" + primaryColor + ", " +
-                secondaryColor + ", " +
-                tertiaryColor + ")");
-        }
-
-        // go through manually fixing up the stylesheets.
-        this.applyCssFixups();
-
-        // tell all the SVGs to go fix themselves up
-        // we don't do this as a dispatch otherwise it will visually lag
-        this.tintables.forEach(function(tintable) {
-            tintable();
-        });
-    }
-
-    tintSvgWhite(whiteColor) {
-        this.currentTint[3] = whiteColor;
-
-        if (!whiteColor) {
-            whiteColor = this.colors[3];
-        }
-        if (this.colors[3] === whiteColor) {
-            return;
-        }
-        this.colors[3] = whiteColor;
-        this.tintables.forEach(function(tintable) {
-            tintable();
-        });
-    }
-
-    tintSvgBlack(blackColor) {
-        this.currentTint[4] = blackColor;
-
-        if (!blackColor) {
-            blackColor = this.colors[4];
-        }
-        if (this.colors[4] === blackColor) {
-            return;
-        }
-        this.colors[4] = blackColor;
-        this.tintables.forEach(function(tintable) {
-            tintable();
-        });
-    }
-
-
-    setTheme(theme) {
-        this.theme = theme;
-
-        // update keyRgb from the current theme CSS itself, if it defines it
-        if (document.getElementById('mx_theme_accentColor')) {
-            this.keyRgb[0] = window.getComputedStyle(
-                document.getElementById('mx_theme_accentColor')).color;
-        }
-        if (document.getElementById('mx_theme_secondaryAccentColor')) {
-            this.keyRgb[1] = window.getComputedStyle(
-                document.getElementById('mx_theme_secondaryAccentColor')).color;
-        }
-        if (document.getElementById('mx_theme_tertiaryAccentColor')) {
-            this.keyRgb[2] = window.getComputedStyle(
-                document.getElementById('mx_theme_tertiaryAccentColor')).color;
-        }
-
-        this.calcCssFixups();
-        this.forceTint = true;
-
-        this.tint(this.currentTint[0], this.currentTint[1], this.currentTint[2]);
-
-        if (theme === 'dark') {
-            // abuse the tinter to change all the SVG's #fff to #2d2d2d
-            // XXX: obviously this shouldn't be hardcoded here.
-            this.tintSvgWhite('#2d2d2d');
-            this.tintSvgBlack('#dddddd');
-        } else {
-            this.tintSvgWhite('#ffffff');
-            this.tintSvgBlack('#000000');
-        }
-    }
-
-    calcCssFixups() {
-        // cache our fixups
-        if (this.cssFixups[this.theme]) return;
-
-        if (DEBUG) {
-            console.debug("calcCssFixups start for " + this.theme + " (checking " +
-                document.styleSheets.length +
-                " stylesheets)");
-        }
-
-        this.cssFixups[this.theme] = [];
-
-        for (let i = 0; i < document.styleSheets.length; i++) {
-            const ss = document.styleSheets[i];
-            try {
-                if (!ss) continue; // well done safari >:(
-                // Chromium apparently sometimes returns null here; unsure why.
-                // see $14534907369972FRXBx:matrix.org in HQ
-                // ...ah, it's because there's a third party extension like
-                // privacybadger inserting its own stylesheet in there with a
-                // resource:// URI or something which results in a XSS error.
-                // See also #vector:matrix.org/$145357669685386ebCfr:matrix.org
-                // ...except some browsers apparently return stylesheets without
-                // hrefs, which we have no choice but ignore right now
-
-                // XXX seriously? we are hardcoding the name of vector's CSS file in
-                // here?
-                //
-                // Why do we need to limit it to vector's CSS file anyway - if there
-                // are other CSS files affecting the doc don't we want to apply the
-                // same transformations to them?
-                //
-                // Iterating through the CSS looking for matches to hack on feels
-                // pretty horrible anyway. And what if the application skin doesn't use
-                // Vector Green as its primary color?
-                // --richvdh
-
-                // Yes, tinting assumes that you are using the Element skin for now.
-                // The right solution will be to move the CSS over to react-sdk.
-                // And yes, the default assets for the base skin might as well use
-                // Vector Green as any other colour.
-                // --matthew
-
-                // stylesheets we don't have permission to access (eg. ones from extensions) have a null
-                // href and will throw exceptions if we try to access their rules.
-                if (!ss.href || !ss.href.match(new RegExp('/theme-' + this.theme + '.css$'))) continue;
-                if (ss.disabled) continue;
-                if (!ss.cssRules) continue;
-
-                if (DEBUG) console.debug("calcCssFixups checking " + ss.cssRules.length + " rules for " + ss.href);
-
-                for (let j = 0; j < ss.cssRules.length; j++) {
-                    const rule = ss.cssRules[j];
-                    if (!rule.style) continue;
-                    if (rule.selectorText && rule.selectorText.match(/#mx_theme/)) continue;
-                    for (let k = 0; k < this.cssAttrs.length; k++) {
-                        const attr = this.cssAttrs[k];
-                        for (let l = 0; l < this.keyRgb.length; l++) {
-                            if (rule.style[attr] === this.keyRgb[l]) {
-                                this.cssFixups[this.theme].push({
-                                    style: rule.style,
-                                    attr: attr,
-                                    index: l,
-                                });
-                            }
-                        }
-                    }
-                }
-            } catch (e) {
-                // Catch any random exceptions that happen here: all sorts of things can go
-                // wrong with this (nulls, SecurityErrors) and mostly it's for other
-                // stylesheets that we don't want to proces anyway. We should not propagate an
-                // exception out since this will cause the app to fail to start.
-                console.log("Failed to calculate CSS fixups for a stylesheet: " + ss.href, e);
-            }
-        }
-        if (DEBUG) {
-            console.log("calcCssFixups end (" +
-                this.cssFixups[this.theme].length +
-                " fixups)");
-        }
-    }
-
-    applyCssFixups() {
-        if (DEBUG) {
-            console.log("applyCssFixups start (" +
-                this.cssFixups[this.theme].length +
-                " fixups)");
-        }
-        for (let i = 0; i < this.cssFixups[this.theme].length; i++) {
-            const cssFixup = this.cssFixups[this.theme][i];
-            try {
-                cssFixup.style[cssFixup.attr] = this.colors[cssFixup.index];
-            } catch (e) {
-                // Firefox Quantum explodes if you manually edit the CSS in the
-                // inspector and then try to do a tint, as apparently all the
-                // fixups are then stale.
-                console.error("Failed to apply cssFixup in Tinter! ", e.name);
-            }
-        }
-        if (DEBUG) console.log("applyCssFixups end");
-    }
-
-    // XXX: we could just move this all into TintableSvg, but as it's so similar
-    // to the CSS fixup stuff in Tinter (just that the fixups are stored in TintableSvg)
-    // keeping it here for now.
-    calcSvgFixups(svgs) {
-        // go through manually fixing up SVG colours.
-        // we could do this by stylesheets, but keeping the stylesheets
-        // updated would be a PITA, so just brute-force search for the
-        // key colour; cache the element and apply.
-
-        if (DEBUG) console.log("calcSvgFixups start for " + svgs);
-        const fixups = [];
-        for (let i = 0; i < svgs.length; i++) {
-            let svgDoc;
-            try {
-                svgDoc = svgs[i].contentDocument;
-            } catch (e) {
-                let msg = 'Failed to get svg.contentDocument of ' + svgs[i].toString();
-                if (e.message) {
-                    msg += e.message;
-                }
-                if (e.stack) {
-                    msg += ' | stack: ' + e.stack;
-                }
-                console.error(msg);
-            }
-            if (!svgDoc) continue;
-            const tags = svgDoc.getElementsByTagName("*");
-            for (let j = 0; j < tags.length; j++) {
-                const tag = tags[j];
-                for (let k = 0; k < this.svgAttrs.length; k++) {
-                    const attr = this.svgAttrs[k];
-                    for (let l = 0; l < this.keyHex.length; l++) {
-                        if (tag.getAttribute(attr) &&
-                            tag.getAttribute(attr).toUpperCase() === this.keyHex[l]) {
-                            fixups.push({
-                                node: tag,
-                                attr: attr,
-                                index: l,
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        if (DEBUG) console.log("calcSvgFixups end");
-
-        return fixups;
-    }
-
-    applySvgFixups(fixups) {
-        if (DEBUG) console.log("applySvgFixups start for " + fixups);
-        for (let i = 0; i < fixups.length; i++) {
-            const svgFixup = fixups[i];
-            svgFixup.node.setAttribute(svgFixup.attr, this.colors[svgFixup.index]);
-        }
-        if (DEBUG) console.log("applySvgFixups end");
-    }
-}
-
-if (global.singletonTinter === undefined) {
-    global.singletonTinter = new Tinter();
-}
-export default global.singletonTinter;
diff --git a/src/Unread.js b/src/Unread.ts
similarity index 72%
rename from src/Unread.js
rename to src/Unread.ts
index 25c425aa9a..da5b883f92 100644
--- a/src/Unread.js
+++ b/src/Unread.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+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.
@@ -14,9 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from "./MatrixClientPeg";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import { MatrixClientPeg } from "./MatrixClientPeg";
 import shouldHideEvent from './shouldHideEvent';
-import {haveTileForEvent} from "./components/views/rooms/EventTile";
+import { haveTileForEvent } from "./components/views/rooms/EventTile";
 
 /**
  * Returns true iff this event arriving in a room should affect the room's
@@ -25,28 +29,27 @@ import {haveTileForEvent} from "./components/views/rooms/EventTile";
  * @param {Object} ev The event
  * @returns {boolean} True if the given event should affect the unread message count
  */
-export function eventTriggersUnreadCount(ev) {
-    if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
-        return false;
-    } else if (ev.getType() == 'm.room.member') {
-        return false;
-    } else if (ev.getType() == 'm.room.third_party_invite') {
-        return false;
-    } else if (ev.getType() == 'm.call.answer' || ev.getType() == 'm.call.hangup') {
-        return false;
-    } else if (ev.getType() == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
-        return false;
-    } else if (ev.getType() == 'm.room.aliases' || ev.getType() == 'm.room.canonical_alias') {
-        return false;
-    } else if (ev.getType() == 'm.room.server_acl') {
-        return false;
-    } else if (ev.isRedacted()) {
+export function eventTriggersUnreadCount(ev: MatrixEvent): boolean {
+    if (ev.getSender() === MatrixClientPeg.get().credentials.userId) {
         return false;
     }
+
+    switch (ev.getType()) {
+        case EventType.RoomMember:
+        case EventType.RoomThirdPartyInvite:
+        case EventType.CallAnswer:
+        case EventType.CallHangup:
+        case EventType.RoomAliases:
+        case EventType.RoomCanonicalAlias:
+        case EventType.RoomServerAcl:
+            return false;
+    }
+
+    if (ev.isRedacted()) return false;
     return haveTileForEvent(ev);
 }
 
-export function doesRoomHaveUnreadMessages(room) {
+export function doesRoomHaveUnreadMessages(room: Room): boolean {
     const myUserId = MatrixClientPeg.get().getUserId();
 
     // get the most recent read receipt sent by our account.
@@ -60,9 +63,7 @@ export function doesRoomHaveUnreadMessages(room) {
     //             https://github.com/vector-im/element-web/issues/2427
     // ...and possibly some of the others at
     //             https://github.com/vector-im/element-web/issues/3363
-    if (room.timeline.length &&
-        room.timeline[room.timeline.length - 1].sender &&
-        room.timeline[room.timeline.length - 1].sender.userId === myUserId) {
+    if (room.timeline.length && room.timeline[room.timeline.length - 1].getSender() === myUserId) {
         return false;
     }
 
diff --git a/src/UserActivity.ts b/src/UserActivity.ts
index 606075ec7c..c35ced0cc4 100644
--- a/src/UserActivity.ts
+++ b/src/UserActivity.ts
@@ -191,10 +191,10 @@ export default class UserActivity {
             this.lastScreenY = event.screenY;
         }
 
-        dis.dispatch({action: 'user_activity'});
+        dis.dispatch({ action: 'user_activity' });
         if (!this.activeNowTimeout.isRunning()) {
             this.activeNowTimeout.start();
-            dis.dispatch({action: 'user_activity_start'});
+            dis.dispatch({ action: 'user_activity_start' });
 
             UserActivity.runTimersUntilTimeout(this.attachedActiveNowTimers, this.activeNowTimeout);
         } else {
diff --git a/src/UserAddress.js b/src/UserAddress.ts
similarity index 57%
rename from src/UserAddress.js
rename to src/UserAddress.ts
index e7501a0d91..248814aa01 100644
--- a/src/UserAddress.js
+++ b/src/UserAddress.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector 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.
@@ -15,43 +15,40 @@ limitations under the License.
 */
 
 const emailRegex = /^\S+@\S+\.\S+$/;
-
 const mxUserIdRegex = /^@\S+:\S+$/;
 const mxRoomIdRegex = /^!\S+:\S+$/;
 
-import PropTypes from 'prop-types';
-export const addressTypes = [
-    'mx-user-id', 'mx-room-id', 'email',
-];
+export enum AddressType {
+    Email = "email",
+    MatrixUserId = "mx-user-id",
+    MatrixRoomId = "mx-room-id",
+}
+
+export const addressTypes = [AddressType.Email, AddressType.MatrixRoomId, AddressType.MatrixUserId];
 
 // PropType definition for an object describing
 // an address that can be invited to a room (which
 // could be a third party identifier or a matrix ID)
 // along with some additional information about the
 // address / target.
-export const UserAddressType = PropTypes.shape({
-    addressType: PropTypes.oneOf(addressTypes).isRequired,
-    address: PropTypes.string.isRequired,
-    displayName: PropTypes.string,
-    avatarMxc: PropTypes.string,
+export interface IUserAddress {
+    addressType: AddressType;
+    address: string;
+    displayName?: string;
+    avatarMxc?: string;
     // true if the address is known to be a valid address (eg. is a real
     // user we've seen) or false otherwise (eg. is just an address the
     // user has entered)
-    isKnown: PropTypes.bool,
-});
+    isKnown?: boolean;
+}
 
-export function getAddressType(inputText) {
-    const isEmailAddress = emailRegex.test(inputText);
-    const isUserId = mxUserIdRegex.test(inputText);
-    const isRoomId = mxRoomIdRegex.test(inputText);
-
-    // sanity check the input for user IDs
-    if (isEmailAddress) {
-        return 'email';
-    } else if (isUserId) {
-        return 'mx-user-id';
-    } else if (isRoomId) {
-        return 'mx-room-id';
+export function getAddressType(inputText: string): AddressType | null {
+    if (emailRegex.test(inputText)) {
+        return AddressType.Email;
+    } else if (mxUserIdRegex.test(inputText)) {
+        return AddressType.MatrixUserId;
+    } else if (mxRoomIdRegex.test(inputText)) {
+        return AddressType.MatrixRoomId;
     } else {
         return null;
     }
diff --git a/src/VoipUserMapper.ts b/src/VoipUserMapper.ts
index d576a5434c..e2e590548e 100644
--- a/src/VoipUserMapper.ts
+++ b/src/VoipUserMapper.ts
@@ -20,11 +20,15 @@ import DMRoomMap from "./utils/DMRoomMap";
 import CallHandler, { VIRTUAL_ROOM_EVENT_TYPE } from './CallHandler';
 import { Room } from 'matrix-js-sdk/src/models/room';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 // Functions for mapping virtual users & rooms. Currently the only lookup
 // is sip virtual: there could be others in the future.
 
 export default class VoipUserMapper {
-    private virtualRoomIdCache = new Set<string>();
+    // We store mappings of virtual -> native room IDs here until the local echo for the
+    // account data arrives.
+    private virtualToNativeRoomIdCache = new Map<string, string>();
 
     public static sharedInstance(): VoipUserMapper {
         if (window.mxVoipUserMapper === undefined) window.mxVoipUserMapper = new VoipUserMapper();
@@ -49,10 +53,20 @@ export default class VoipUserMapper {
             native_room: roomId,
         });
 
+        this.virtualToNativeRoomIdCache.set(virtualRoomId, roomId);
+
         return virtualRoomId;
     }
 
     public nativeRoomForVirtualRoom(roomId: string): string {
+        const cachedNativeRoomId = this.virtualToNativeRoomIdCache.get(roomId);
+        if (cachedNativeRoomId) {
+            logger.log(
+                "Returning native room ID " + cachedNativeRoomId + " for virtual room ID " + roomId + " from cache",
+            );
+            return cachedNativeRoomId;
+        }
+
         const virtualRoom = MatrixClientPeg.get().getRoom(roomId);
         if (!virtualRoom) return null;
         const virtualRoomEvent = virtualRoom.getAccountData(VIRTUAL_ROOM_EVENT_TYPE);
@@ -67,7 +81,7 @@ export default class VoipUserMapper {
     public isVirtualRoom(room: Room): boolean {
         if (this.nativeRoomForVirtualRoom(room.roomId)) return true;
 
-        if (this.virtualRoomIdCache.has(room.roomId)) return true;
+        if (this.virtualToNativeRoomIdCache.has(room.roomId)) return true;
 
         // also look in the create event for the claimed native room ID, which is the only
         // way we can recognise a virtual room we've created when it first arrives down
@@ -86,7 +100,7 @@ export default class VoipUserMapper {
         if (!CallHandler.sharedInstance().getSupportsVirtualRooms()) return;
 
         const inviterId = invitedRoom.getDMInviter();
-        console.log(`Checking virtual-ness of room ID ${invitedRoom.roomId}, invited by ${inviterId}`);
+        logger.log(`Checking virtual-ness of room ID ${invitedRoom.roomId}, invited by ${inviterId}`);
         const result = await CallHandler.sharedInstance().sipNativeLookup(inviterId);
         if (result.length === 0) {
             return;
@@ -110,7 +124,7 @@ export default class VoipUserMapper {
 
             // also put this room in the virtual room ID cache so isVirtualRoom return the right answer
             // in however long it takes for the echo of setAccountData to come down the sync
-            this.virtualRoomIdCache.add(invitedRoom.roomId);
+            this.virtualToNativeRoomIdCache.set(invitedRoom.roomId, nativeRoom.roomId);
         }
     }
 }
diff --git a/src/WhoIsTyping.ts b/src/WhoIsTyping.ts
index a8ca425ea8..938218d270 100644
--- a/src/WhoIsTyping.ts
+++ b/src/WhoIsTyping.ts
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Room} from "matrix-js-sdk/src/models/room";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
-import {MatrixClientPeg} from "./MatrixClientPeg";
+import { MatrixClientPeg } from "./MatrixClientPeg";
 import { _t } from './languageHandler';
 
 export function usersTypingApartFromMeAndIgnored(room: Room): RoomMember[] {
@@ -61,7 +61,7 @@ export function whoIsTypingString(whoIsTyping: RoomMember[], limit: number): str
     if (whoIsTyping.length === 0) {
         return '';
     } else if (whoIsTyping.length === 1) {
-        return _t('%(displayName)s is typing …', {displayName: whoIsTyping[0].name});
+        return _t('%(displayName)s is typing …', { displayName: whoIsTyping[0].name });
     }
 
     const names = whoIsTyping.map(m => m.name);
@@ -73,6 +73,6 @@ export function whoIsTypingString(whoIsTyping: RoomMember[], limit: number): str
         });
     } else {
         const lastPerson = names.pop();
-        return _t('%(names)s and %(lastPerson)s are typing …', {names: names.join(', '), lastPerson: lastPerson});
+        return _t('%(names)s and %(lastPerson)s are typing …', { names: names.join(', '), lastPerson: lastPerson });
     }
 }
diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 2a3e576e31..c66984191f 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -17,10 +17,10 @@ limitations under the License.
 import * as React from "react";
 import classNames from "classnames";
 
-import * as sdk from "../index";
 import Modal from "../Modal";
 import { _t, _td } from "../languageHandler";
-import {isMac, Key} from "../Keyboard";
+import { isMac, Key } from "../Keyboard";
+import InfoDialog from "../components/views/dialogs/InfoDialog";
 
 // TS: once languageHandler is TS we can probably inline this into the enum
 _td("Navigation");
@@ -57,6 +57,8 @@ export enum Modifiers {
 
 // Meta-modifier: isMac ? CMD : CONTROL
 export const CMD_OR_CTRL = isMac ? Modifiers.COMMAND : Modifiers.CONTROL;
+// Meta-key representing the digits [0-9] often found at the top of standard keyboard layouts
+export const DIGITS = "digits";
 
 interface IKeybind {
     modifiers?: Modifiers[];
@@ -161,7 +163,7 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 modifiers: [Modifiers.SHIFT],
                 key: Key.PAGE_UP,
             }],
-                description: _td("Jump to oldest unread message"),
+            description: _td("Jump to oldest unread message"),
         }, {
             keybinds: [{
                 modifiers: [CMD_OR_CTRL, Modifiers.SHIFT],
@@ -319,6 +321,7 @@ const alternateKeyName: Record<string, string> = {
     [Key.SPACE]: _td("Space"),
     [Key.HOME]: _td("Home"),
     [Key.END]: _td("End"),
+    [DIGITS]: _td("[number]"),
 };
 const keyIcon: Record<string, string> = {
     [Key.ARROW_UP]: "↑",
@@ -329,7 +332,7 @@ const keyIcon: Record<string, string> = {
 
 const Shortcut: React.FC<{
     shortcut: IShortcut;
-}> = ({shortcut}) => {
+}> = ({ shortcut }) => {
     const classes = classNames({
         "mx_KeyboardShortcutsDialog_inline": shortcut.keybinds.every(k => !k.modifiers || k.modifiers.length === 0),
     });
@@ -367,12 +370,11 @@ export const toggleDialog = () => {
     const sections = categoryOrder.map(category => {
         const list = shortcuts[category];
         return <div className="mx_KeyboardShortcutsDialog_category" key={category}>
-            <h3>{_t(category)}</h3>
-            <div>{list.map(shortcut => <Shortcut key={shortcut.description} shortcut={shortcut} />)}</div>
+            <h3>{ _t(category) }</h3>
+            <div>{ list.map(shortcut => <Shortcut key={shortcut.description} shortcut={shortcut} />) }</div>
         </div>;
     });
 
-    const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
     activeModal = Modal.createTrackedDialog("Keyboard Shortcuts", "", InfoDialog, {
         className: "mx_KeyboardShortcutsDialog",
         title: _t("Keyboard Shortcuts"),
diff --git a/src/accessibility/RovingTabIndex.tsx b/src/accessibility/RovingTabIndex.tsx
index 4cb537f318..68e10049fd 100644
--- a/src/accessibility/RovingTabIndex.tsx
+++ b/src/accessibility/RovingTabIndex.tsx
@@ -26,8 +26,8 @@ import React, {
     Dispatch,
 } from "react";
 
-import {Key} from "../Keyboard";
-import {FocusHandler, Ref} from "./roving/types";
+import { Key } from "../Keyboard";
+import { FocusHandler, Ref } from "./roving/types";
 
 /**
  * Module to simplify implementing the Roving TabIndex accessibility technique
@@ -150,38 +150,68 @@ const reducer = (state: IState, action: IAction) => {
 
 interface IProps {
     handleHomeEnd?: boolean;
+    handleUpDown?: boolean;
     children(renderProps: {
         onKeyDownHandler(ev: React.KeyboardEvent);
     });
     onKeyDown?(ev: React.KeyboardEvent, state: IState);
 }
 
-export const RovingTabIndexProvider: React.FC<IProps> = ({children, handleHomeEnd, onKeyDown}) => {
+export const RovingTabIndexProvider: React.FC<IProps> = ({ children, handleHomeEnd, handleUpDown, onKeyDown }) => {
     const [state, dispatch] = useReducer<Reducer<IState, IAction>>(reducer, {
         activeRef: null,
         refs: [],
     });
 
-    const context = useMemo<IContext>(() => ({state, dispatch}), [state]);
+    const context = useMemo<IContext>(() => ({ state, dispatch }), [state]);
 
     const onKeyDownHandler = useCallback((ev) => {
         let handled = false;
         // Don't interfere with input default keydown behaviour
-        if (handleHomeEnd && ev.target.tagName !== "INPUT" && ev.target.tagName !== "TEXTAREA") {
+        if (ev.target.tagName !== "INPUT" && ev.target.tagName !== "TEXTAREA") {
             // check if we actually have any items
             switch (ev.key) {
                 case Key.HOME:
-                    handled = true;
-                    // move focus to first item
-                    if (context.state.refs.length > 0) {
-                        context.state.refs[0].current.focus();
+                    if (handleHomeEnd) {
+                        handled = true;
+                        // move focus to first item
+                        if (context.state.refs.length > 0) {
+                            context.state.refs[0].current.focus();
+                        }
                     }
                     break;
+
                 case Key.END:
-                    handled = true;
-                    // move focus to last item
-                    if (context.state.refs.length > 0) {
-                        context.state.refs[context.state.refs.length - 1].current.focus();
+                    if (handleHomeEnd) {
+                        handled = true;
+                        // move focus to last item
+                        if (context.state.refs.length > 0) {
+                            context.state.refs[context.state.refs.length - 1].current.focus();
+                        }
+                    }
+                    break;
+
+                case Key.ARROW_UP:
+                    if (handleUpDown) {
+                        handled = true;
+                        if (context.state.refs.length > 0) {
+                            const idx = context.state.refs.indexOf(context.state.activeRef);
+                            if (idx > 0) {
+                                context.state.refs[idx - 1].current.focus();
+                            }
+                        }
+                    }
+                    break;
+
+                case Key.ARROW_DOWN:
+                    if (handleUpDown) {
+                        handled = true;
+                        if (context.state.refs.length > 0) {
+                            const idx = context.state.refs.indexOf(context.state.activeRef);
+                            if (idx < context.state.refs.length - 1) {
+                                context.state.refs[idx + 1].current.focus();
+                            }
+                        }
                     }
                     break;
             }
@@ -193,10 +223,10 @@ export const RovingTabIndexProvider: React.FC<IProps> = ({children, handleHomeEn
         } else if (onKeyDown) {
             return onKeyDown(ev, context.state);
         }
-    }, [context.state, onKeyDown, handleHomeEnd]);
+    }, [context.state, onKeyDown, handleHomeEnd, handleUpDown]);
 
     return <RovingTabIndexContext.Provider value={context}>
-        { children({onKeyDownHandler}) }
+        { children({ onKeyDownHandler }) }
     </RovingTabIndexContext.Provider>;
 };
 
@@ -218,13 +248,13 @@ export const useRovingTabIndex = (inputRef?: Ref): [FocusHandler, boolean, Ref]
     useLayoutEffect(() => {
         context.dispatch({
             type: Type.Register,
-            payload: {ref},
+            payload: { ref },
         });
         // teardown
         return () => {
             context.dispatch({
                 type: Type.Unregister,
-                payload: {ref},
+                payload: { ref },
             });
         };
     }, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -232,7 +262,7 @@ export const useRovingTabIndex = (inputRef?: Ref): [FocusHandler, boolean, Ref]
     const onFocus = useCallback(() => {
         context.dispatch({
             type: Type.SetFocus,
-            payload: {ref},
+            payload: { ref },
         });
     }, [ref, context]);
 
@@ -241,6 +271,6 @@ export const useRovingTabIndex = (inputRef?: Ref): [FocusHandler, boolean, Ref]
 };
 
 // re-export the semantic helper components for simplicity
-export {RovingTabIndexWrapper} from "./roving/RovingTabIndexWrapper";
-export {RovingAccessibleButton} from "./roving/RovingAccessibleButton";
-export {RovingAccessibleTooltipButton} from "./roving/RovingAccessibleTooltipButton";
+export { RovingTabIndexWrapper } from "./roving/RovingTabIndexWrapper";
+export { RovingAccessibleButton } from "./roving/RovingAccessibleButton";
+export { RovingAccessibleTooltipButton } from "./roving/RovingAccessibleTooltipButton";
diff --git a/src/accessibility/Toolbar.tsx b/src/accessibility/Toolbar.tsx
index e756d948e5..90538760bb 100644
--- a/src/accessibility/Toolbar.tsx
+++ b/src/accessibility/Toolbar.tsx
@@ -16,8 +16,8 @@ limitations under the License.
 
 import React from "react";
 
-import {IState, RovingTabIndexProvider} from "./RovingTabIndex";
-import {Key} from "../Keyboard";
+import { IState, RovingTabIndexProvider } from "./RovingTabIndex";
+import { Key } from "../Keyboard";
 
 interface IProps extends Omit<React.HTMLProps<HTMLDivElement>, "onKeyDown"> {
 }
@@ -25,7 +25,7 @@ interface IProps extends Omit<React.HTMLProps<HTMLDivElement>, "onKeyDown"> {
 // This component implements the Toolbar design pattern from the WAI-ARIA Authoring Practices guidelines.
 // https://www.w3.org/TR/wai-aria-practices-1.1/#toolbar
 // All buttons passed in children must use RovingTabIndex to set `onFocus`, `isActive`, `ref`
-const Toolbar: React.FC<IProps> = ({children, ...props}) => {
+const Toolbar: React.FC<IProps> = ({ children, ...props }) => {
     const onKeyDown = (ev: React.KeyboardEvent, state: IState) => {
         const target = ev.target as HTMLElement;
         // Don't interfere with input default keydown behaviour
@@ -62,9 +62,9 @@ const Toolbar: React.FC<IProps> = ({children, ...props}) => {
     };
 
     return <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
-        {({onKeyDownHandler}) => <div {...props} onKeyDown={onKeyDownHandler} role="toolbar">
+        { ({ onKeyDownHandler }) => <div {...props} onKeyDown={onKeyDownHandler} role="toolbar">
             { children }
-        </div>}
+        </div> }
     </RovingTabIndexProvider>;
 };
 
diff --git a/src/accessibility/context_menu/MenuGroup.tsx b/src/accessibility/context_menu/MenuGroup.tsx
index 9334e17a18..97f9694f83 100644
--- a/src/accessibility/context_menu/MenuGroup.tsx
+++ b/src/accessibility/context_menu/MenuGroup.tsx
@@ -23,7 +23,7 @@ interface IProps extends React.HTMLAttributes<HTMLDivElement> {
 }
 
 // Semantic component for representing a role=group for grouping menu radios/checkboxes
-export const MenuGroup: React.FC<IProps> = ({children, label, ...props}) => {
+export const MenuGroup: React.FC<IProps> = ({ children, label, ...props }) => {
     return <div {...props} role="group" aria-label={label}>
         { children }
     </div>;
diff --git a/src/accessibility/context_menu/MenuItem.tsx b/src/accessibility/context_menu/MenuItem.tsx
index 9a7c1d1f0a..9c0b248274 100644
--- a/src/accessibility/context_menu/MenuItem.tsx
+++ b/src/accessibility/context_menu/MenuItem.tsx
@@ -27,7 +27,7 @@ interface IProps extends React.ComponentProps<typeof AccessibleButton> {
 }
 
 // Semantic component for representing a role=menuitem
-export const MenuItem: React.FC<IProps> = ({children, label, tooltip, ...props}) => {
+export const MenuItem: React.FC<IProps> = ({ children, label, tooltip, ...props }) => {
     const ariaLabel = props["aria-label"] || label;
 
     if (tooltip) {
diff --git a/src/accessibility/context_menu/MenuItemCheckbox.tsx b/src/accessibility/context_menu/MenuItemCheckbox.tsx
index 5eb8cc4819..67da4cc85a 100644
--- a/src/accessibility/context_menu/MenuItemCheckbox.tsx
+++ b/src/accessibility/context_menu/MenuItemCheckbox.tsx
@@ -26,7 +26,7 @@ interface IProps extends React.ComponentProps<typeof AccessibleButton> {
 }
 
 // Semantic component for representing a role=menuitemcheckbox
-export const MenuItemCheckbox: React.FC<IProps> = ({children, label, active, disabled, ...props}) => {
+export const MenuItemCheckbox: React.FC<IProps> = ({ children, label, active, disabled, ...props }) => {
     return (
         <AccessibleButton
             {...props}
diff --git a/src/accessibility/context_menu/MenuItemRadio.tsx b/src/accessibility/context_menu/MenuItemRadio.tsx
index 472f13ff14..eb50d45836 100644
--- a/src/accessibility/context_menu/MenuItemRadio.tsx
+++ b/src/accessibility/context_menu/MenuItemRadio.tsx
@@ -26,7 +26,7 @@ interface IProps extends React.ComponentProps<typeof AccessibleButton> {
 }
 
 // Semantic component for representing a role=menuitemradio
-export const MenuItemRadio: React.FC<IProps> = ({children, label, active, disabled, ...props}) => {
+export const MenuItemRadio: React.FC<IProps> = ({ children, label, active, disabled, ...props }) => {
     return (
         <AccessibleButton
             {...props}
diff --git a/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx b/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
index d373f892c9..66846cc484 100644
--- a/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
+++ b/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
@@ -18,7 +18,7 @@ limitations under the License.
 
 import React from "react";
 
-import {Key} from "../../Keyboard";
+import { Key } from "../../Keyboard";
 import StyledCheckbox from "../../components/views/elements/StyledCheckbox";
 
 interface IProps extends React.ComponentProps<typeof StyledCheckbox> {
@@ -28,7 +28,7 @@ interface IProps extends React.ComponentProps<typeof StyledCheckbox> {
 }
 
 // Semantic component for representing a styled role=menuitemcheckbox
-export const StyledMenuItemCheckbox: React.FC<IProps> = ({children, label, onChange, onClose, ...props}) => {
+export const StyledMenuItemCheckbox: React.FC<IProps> = ({ children, label, onChange, onClose, ...props }) => {
     const onKeyDown = (e: React.KeyboardEvent) => {
         if (e.key === Key.ENTER || e.key === Key.SPACE) {
             e.stopPropagation();
diff --git a/src/accessibility/context_menu/StyledMenuItemRadio.tsx b/src/accessibility/context_menu/StyledMenuItemRadio.tsx
index 5e5aa90a38..e3d340ef3e 100644
--- a/src/accessibility/context_menu/StyledMenuItemRadio.tsx
+++ b/src/accessibility/context_menu/StyledMenuItemRadio.tsx
@@ -18,7 +18,7 @@ limitations under the License.
 
 import React from "react";
 
-import {Key} from "../../Keyboard";
+import { Key } from "../../Keyboard";
 import StyledRadioButton from "../../components/views/elements/StyledRadioButton";
 
 interface IProps extends React.ComponentProps<typeof StyledRadioButton> {
@@ -28,7 +28,7 @@ interface IProps extends React.ComponentProps<typeof StyledRadioButton> {
 }
 
 // Semantic component for representing a styled role=menuitemradio
-export const StyledMenuItemRadio: React.FC<IProps> = ({children, label, onChange, onClose, ...props}) => {
+export const StyledMenuItemRadio: React.FC<IProps> = ({ children, label, onChange, onClose, ...props }) => {
     const onKeyDown = (e: React.KeyboardEvent) => {
         if (e.key === Key.ENTER || e.key === Key.SPACE) {
             e.stopPropagation();
diff --git a/src/accessibility/roving/RovingAccessibleButton.tsx b/src/accessibility/roving/RovingAccessibleButton.tsx
index 3473ef1bc9..f9ce87db6a 100644
--- a/src/accessibility/roving/RovingAccessibleButton.tsx
+++ b/src/accessibility/roving/RovingAccessibleButton.tsx
@@ -17,15 +17,15 @@ limitations under the License.
 import React from "react";
 
 import AccessibleButton from "../../components/views/elements/AccessibleButton";
-import {useRovingTabIndex} from "../RovingTabIndex";
-import {Ref} from "./types";
+import { useRovingTabIndex } from "../RovingTabIndex";
+import { Ref } from "./types";
 
 interface IProps extends Omit<React.ComponentProps<typeof AccessibleButton>, "onFocus" | "inputRef" | "tabIndex"> {
     inputRef?: Ref;
 }
 
 // Wrapper to allow use of useRovingTabIndex for simple AccessibleButtons outside of React Functional Components.
-export const RovingAccessibleButton: React.FC<IProps> = ({inputRef, ...props}) => {
+export const RovingAccessibleButton: React.FC<IProps> = ({ inputRef, ...props }) => {
     const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
     return <AccessibleButton {...props} onFocus={onFocus} inputRef={ref} tabIndex={isActive ? 0 : -1} />;
 };
diff --git a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
index 2cb974d60e..d9e393d728 100644
--- a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
+++ b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
@@ -17,8 +17,8 @@ limitations under the License.
 import React from "react";
 
 import AccessibleTooltipButton from "../../components/views/elements/AccessibleTooltipButton";
-import {useRovingTabIndex} from "../RovingTabIndex";
-import {Ref} from "./types";
+import { useRovingTabIndex } from "../RovingTabIndex";
+import { Ref } from "./types";
 
 type ATBProps = React.ComponentProps<typeof AccessibleTooltipButton>;
 interface IProps extends Omit<ATBProps, "onFocus" | "inputRef" | "tabIndex"> {
@@ -26,7 +26,7 @@ interface IProps extends Omit<ATBProps, "onFocus" | "inputRef" | "tabIndex"> {
 }
 
 // Wrapper to allow use of useRovingTabIndex for simple AccessibleTooltipButtons outside of React Functional Components.
-export const RovingAccessibleTooltipButton: React.FC<IProps> = ({inputRef, ...props}) => {
+export const RovingAccessibleTooltipButton: React.FC<IProps> = ({ inputRef, ...props }) => {
     const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
     return <AccessibleTooltipButton {...props} onFocus={onFocus} inputRef={ref} tabIndex={isActive ? 0 : -1} />;
 };
diff --git a/src/accessibility/roving/RovingTabIndexWrapper.tsx b/src/accessibility/roving/RovingTabIndexWrapper.tsx
index 5211f30215..974bb9a388 100644
--- a/src/accessibility/roving/RovingTabIndexWrapper.tsx
+++ b/src/accessibility/roving/RovingTabIndexWrapper.tsx
@@ -16,8 +16,8 @@ limitations under the License.
 
 import React from "react";
 
-import {useRovingTabIndex} from "../RovingTabIndex";
-import {FocusHandler, Ref} from "./types";
+import { useRovingTabIndex } from "../RovingTabIndex";
+import { FocusHandler, Ref } from "./types";
 
 interface IProps {
     inputRef?: Ref;
@@ -29,7 +29,7 @@ interface IProps {
 }
 
 // Wrapper to allow use of useRovingTabIndex outside of React Functional Components.
-export const RovingTabIndexWrapper: React.FC<IProps> = ({children, inputRef}) => {
+export const RovingTabIndexWrapper: React.FC<IProps> = ({ children, inputRef }) => {
     const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
-    return children({onFocus, isActive, ref});
+    return children({ onFocus, isActive, ref });
 };
diff --git a/src/accessibility/roving/types.ts b/src/accessibility/roving/types.ts
index f0a43e5fb8..cc6a98e1d7 100644
--- a/src/accessibility/roving/types.ts
+++ b/src/accessibility/roving/types.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {RefObject} from "react";
+import { RefObject } from "react";
 
 export type Ref = RefObject<HTMLElement>;
 
diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.ts
similarity index 68%
rename from src/actions/MatrixActionCreators.js
rename to src/actions/MatrixActionCreators.ts
index 93a4fcf07c..70b86f8ee5 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector 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.
@@ -14,7 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from '../dispatcher/dispatcher';
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline";
+
+import dis from "../dispatcher/dispatcher";
+import { ActionPayload } from "../dispatcher/payloads";
 
 // TODO: migrate from sync_state to MatrixActions.sync so that more js-sdk events
 //       become dispatches in the same place.
@@ -27,7 +33,7 @@ import dis from '../dispatcher/dispatcher';
  * @param {string} prevState the previous sync state.
  * @returns {Object} an action of type MatrixActions.sync.
  */
-function createSyncAction(matrixClient, state, prevState) {
+function createSyncAction(matrixClient: MatrixClient, state: string, prevState: string): ActionPayload {
     return {
         action: 'MatrixActions.sync',
         state,
@@ -53,7 +59,7 @@ function createSyncAction(matrixClient, state, prevState) {
  * @param {MatrixEvent} accountDataEvent the account data event.
  * @returns {AccountDataAction} an action of type MatrixActions.accountData.
  */
-function createAccountDataAction(matrixClient, accountDataEvent) {
+function createAccountDataAction(matrixClient: MatrixClient, accountDataEvent: MatrixEvent): ActionPayload {
     return {
         action: 'MatrixActions.accountData',
         event: accountDataEvent,
@@ -81,7 +87,11 @@ function createAccountDataAction(matrixClient, accountDataEvent) {
  * @param {Room} room the room where account data was changed
  * @returns {RoomAccountDataAction} an action of type MatrixActions.Room.accountData.
  */
-function createRoomAccountDataAction(matrixClient, accountDataEvent, room) {
+function createRoomAccountDataAction(
+    matrixClient: MatrixClient,
+    accountDataEvent: MatrixEvent,
+    room: Room,
+): ActionPayload {
     return {
         action: 'MatrixActions.Room.accountData',
         event: accountDataEvent,
@@ -106,7 +116,7 @@ function createRoomAccountDataAction(matrixClient, accountDataEvent, room) {
  * @param {Room} room the Room that was stored.
  * @returns {RoomAction} an action of type `MatrixActions.Room`.
  */
-function createRoomAction(matrixClient, room) {
+function createRoomAction(matrixClient: MatrixClient, room: Room): ActionPayload {
     return { action: 'MatrixActions.Room', room };
 }
 
@@ -127,7 +137,7 @@ function createRoomAction(matrixClient, room) {
  * @param {Room} room the Room whose tags were changed.
  * @returns {RoomTagsAction} an action of type `MatrixActions.Room.tags`.
  */
-function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
+function createRoomTagsAction(matrixClient: MatrixClient, roomTagsEvent: MatrixEvent, room: Room): ActionPayload {
     return { action: 'MatrixActions.Room.tags', room };
 }
 
@@ -140,7 +150,7 @@ function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
  * @param {Room} room the room the receipt happened in.
  * @returns {Object} an action of type MatrixActions.Room.receipt.
  */
-function createRoomReceiptAction(matrixClient, event, room) {
+function createRoomReceiptAction(matrixClient: MatrixClient, event: MatrixEvent, room: Room): ActionPayload {
     return {
         action: 'MatrixActions.Room.receipt',
         event,
@@ -178,7 +188,17 @@ function createRoomReceiptAction(matrixClient, event, room) {
  * @param {EventTimeline} data.timeline the timeline being altered.
  * @returns {RoomTimelineAction} an action of type `MatrixActions.Room.timeline`.
  */
-function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTimeline, removed, data) {
+function createRoomTimelineAction(
+    matrixClient: MatrixClient,
+    timelineEvent: MatrixEvent,
+    room: Room,
+    toStartOfTimeline: boolean,
+    removed: boolean,
+    data: {
+        liveEvent: boolean;
+        timeline: EventTimeline;
+    },
+): ActionPayload {
     return {
         action: 'MatrixActions.Room.timeline',
         event: timelineEvent,
@@ -208,8 +228,13 @@ function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTi
  * @param {string} oldMembership the previous membership, can be null.
  * @returns {RoomMembershipAction} an action of type `MatrixActions.Room.myMembership`.
  */
-function createSelfMembershipAction(matrixClient, room, membership, oldMembership) {
-    return { action: 'MatrixActions.Room.myMembership', room, membership, oldMembership};
+function createSelfMembershipAction(
+    matrixClient: MatrixClient,
+    room: Room,
+    membership: string,
+    oldMembership: string,
+): ActionPayload {
+    return { action: 'MatrixActions.Room.myMembership', room, membership, oldMembership };
 }
 
 /**
@@ -228,61 +253,65 @@ function createSelfMembershipAction(matrixClient, room, membership, oldMembershi
  * @param {MatrixEvent} event the matrix event that was decrypted.
  * @returns {EventDecryptedAction} an action of type `MatrixActions.Event.decrypted`.
  */
-function createEventDecryptedAction(matrixClient, event) {
+function createEventDecryptedAction(matrixClient: MatrixClient, event: MatrixEvent): ActionPayload {
     return { action: 'MatrixActions.Event.decrypted', event };
 }
 
+type Listener = () => void;
+type ActionCreator = (matrixClient: MatrixClient, ...args: any) => ActionPayload;
+
+// A list of callbacks to call to unregister all listeners added
+let matrixClientListenersStop: Listener[] = [];
+
+/**
+ * Start listening to events of type eventName on matrixClient and when they are emitted,
+ * dispatch an action created by the actionCreator function.
+ * @param {MatrixClient} matrixClient a MatrixClient to register a listener with.
+ * @param {string} eventName the event to listen to on MatrixClient.
+ * @param {function} actionCreator a function that should return an action to dispatch
+ *                                 when given the MatrixClient as an argument as well as
+ *                                 arguments emitted in the MatrixClient event.
+ */
+function addMatrixClientListener(matrixClient: MatrixClient, eventName: string, actionCreator: ActionCreator): void {
+    const listener: Listener = (...args) => {
+        const payload = actionCreator(matrixClient, ...args);
+        if (payload) {
+            dis.dispatch(payload, true);
+        }
+    };
+    matrixClient.on(eventName, listener);
+    matrixClientListenersStop.push(() => {
+        matrixClient.removeListener(eventName, listener);
+    });
+}
+
 /**
  * This object is responsible for dispatching actions when certain events are emitted by
  * the given MatrixClient.
  */
 export default {
-    // A list of callbacks to call to unregister all listeners added
-    _matrixClientListenersStop: [],
-
     /**
      * Start listening to certain events from the MatrixClient and dispatch actions when
      * they are emitted.
      * @param {MatrixClient} matrixClient the MatrixClient to listen to events from
      */
-    start(matrixClient) {
-        this._addMatrixClientListener(matrixClient, 'sync', createSyncAction);
-        this._addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
-        this._addMatrixClientListener(matrixClient, 'Room.accountData', createRoomAccountDataAction);
-        this._addMatrixClientListener(matrixClient, 'Room', createRoomAction);
-        this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
-        this._addMatrixClientListener(matrixClient, 'Room.receipt', createRoomReceiptAction);
-        this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
-        this._addMatrixClientListener(matrixClient, 'Room.myMembership', createSelfMembershipAction);
-        this._addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
-    },
-
-    /**
-     * Start listening to events of type eventName on matrixClient and when they are emitted,
-     * dispatch an action created by the actionCreator function.
-     * @param {MatrixClient} matrixClient a MatrixClient to register a listener with.
-     * @param {string} eventName the event to listen to on MatrixClient.
-     * @param {function} actionCreator a function that should return an action to dispatch
-     *                                 when given the MatrixClient as an argument as well as
-     *                                 arguments emitted in the MatrixClient event.
-     */
-    _addMatrixClientListener(matrixClient, eventName, actionCreator) {
-        const listener = (...args) => {
-            const payload = actionCreator(matrixClient, ...args);
-            if (payload) {
-                dis.dispatch(payload, true);
-            }
-        };
-        matrixClient.on(eventName, listener);
-        this._matrixClientListenersStop.push(() => {
-            matrixClient.removeListener(eventName, listener);
-        });
+    start(matrixClient: MatrixClient) {
+        addMatrixClientListener(matrixClient, 'sync', createSyncAction);
+        addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
+        addMatrixClientListener(matrixClient, 'Room.accountData', createRoomAccountDataAction);
+        addMatrixClientListener(matrixClient, 'Room', createRoomAction);
+        addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
+        addMatrixClientListener(matrixClient, 'Room.receipt', createRoomReceiptAction);
+        addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
+        addMatrixClientListener(matrixClient, 'Room.myMembership', createSelfMembershipAction);
+        addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
     },
 
     /**
      * Stop listening to events.
      */
     stop() {
-        this._matrixClientListenersStop.forEach((stopListener) => stopListener());
+        matrixClientListenersStop.forEach((stopListener) => stopListener());
+        matrixClientListenersStop = [];
     },
 };
diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts
index 88946ee26f..a7f629c40d 100644
--- a/src/actions/RoomListActions.ts
+++ b/src/actions/RoomListActions.ts
@@ -19,13 +19,13 @@ import { asyncAction } from './actionCreators';
 import Modal from '../Modal';
 import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
-import * as sdk from '../index';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { AsyncActionPayload } from "../dispatcher/payloads";
 import RoomListStore from "../stores/room-list/RoomListStore";
 import { SortAlgorithm } from "../stores/room-list/algorithms/models";
 import { DefaultTagID } from "../stores/room-list/models";
+import ErrorDialog from '../components/views/dialogs/ErrorDialog';
 
 export default class RoomListActions {
     /**
@@ -88,7 +88,6 @@ export default class RoomListActions {
                 return Rooms.guessAndSetDMRoom(
                     room, newTag === DefaultTagID.DM,
                 ).catch((err) => {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to set direct chat tag " + err);
                     Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
                         title: _t('Failed to set direct chat tag'),
@@ -109,10 +108,9 @@ export default class RoomListActions {
                 const promiseToDelete = matrixClient.deleteRoomTag(
                     roomId, oldTag,
                 ).catch(function(err) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to remove tag " + oldTag + " from room: " + err);
                     Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
-                        title: _t('Failed to remove tag %(tagName)s from room', {tagName: oldTag}),
+                        title: _t('Failed to remove tag %(tagName)s from room', { tagName: oldTag }),
                         description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
                 });
@@ -129,10 +127,9 @@ export default class RoomListActions {
                 metaData = metaData || {};
 
                 const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to add tag " + newTag + " to room: " + err);
                     Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
-                        title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+                        title: _t('Failed to add tag %(tagName)s to room', { tagName: newTag }),
                         description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
 
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
index 021cd11b55..dc538134a1 100644
--- a/src/actions/TagOrderActions.ts
+++ b/src/actions/TagOrderActions.ts
@@ -53,11 +53,11 @@ export default class TagOrderActions {
             Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
             return matrixClient.setAccountData(
                 'im.vector.web.tag_ordering',
-                {tags, removedTags, _storeId: storeId},
+                { tags, removedTags, _storeId: storeId },
             );
         }, () => {
             // For an optimistic update
-            return {tags, removedTags};
+            return { tags, removedTags };
         });
     }
 
@@ -100,11 +100,11 @@ export default class TagOrderActions {
             Analytics.trackEvent('TagOrderActions', 'removeTag');
             return matrixClient.setAccountData(
                 'im.vector.web.tag_ordering',
-                {tags, removedTags, _storeId: storeId},
+                { tags, removedTags, _storeId: storeId },
             );
         }, () => {
             // For an optimistic update
-            return {removedTags};
+            return { removedTags };
         });
     }
 }
diff --git a/src/actions/actionCreators.ts b/src/actions/actionCreators.ts
index c789e3cd07..81e0b95098 100644
--- a/src/actions/actionCreators.ts
+++ b/src/actions/actionCreators.ts
@@ -51,9 +51,9 @@ export function asyncAction(id: string, fn: () => Promise<any>, pendingFn: () =>
             request: typeof pendingFn === 'function' ? pendingFn() : undefined,
         });
         fn().then((result) => {
-            dispatch({action: id + '.success', result});
+            dispatch({ action: id + '.success', result });
         }).catch((err) => {
-            dispatch({action: id + '.failure', err});
+            dispatch({ action: id + '.failure', err });
         });
     };
     return new AsyncActionPayload(helper);
diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.tsx
similarity index 66%
rename from src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
rename to src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.tsx
index de50feaedb..4d8f5e5663 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.tsx
@@ -15,55 +15,55 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../../index';
-import PropTypes from 'prop-types';
+
+import BaseDialog from "../../../../components/views/dialogs/BaseDialog";
+import Spinner from "../../../../components/views/elements/Spinner";
+import DialogButtons from "../../../../components/views/elements/DialogButtons";
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from '../../../../languageHandler';
 
 import SettingsStore from "../../../../settings/SettingsStore";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
-import {Action} from "../../../../dispatcher/actions";
-import {SettingLevel} from "../../../../settings/SettingLevel";
+import { Action } from "../../../../dispatcher/actions";
+import { SettingLevel } from "../../../../settings/SettingLevel";
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
+
+interface IState {
+    disabling: boolean;
+}
 
 /*
  * Allows the user to disable the Event Index.
  */
-export default class DisableEventIndexDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    }
-
-    constructor(props) {
+export default class DisableEventIndexDialog extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
-
         this.state = {
             disabling: false,
         };
     }
 
-    _onDisable = async () => {
+    private onDisable = async (): Promise<void> => {
         this.setState({
             disabling: true,
         });
 
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
-        this.props.onFinished();
+        this.props.onFinished(true);
         dis.fire(Action.ViewUserSettings);
-    }
-
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Spinner = sdk.getComponent('elements.Spinner');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    };
 
+    public render(): React.ReactNode {
         return (
             <BaseDialog onFinished={this.props.onFinished} title={_t("Are you sure?")}>
-                {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
-                {this.state.disabling ? <Spinner /> : <div />}
+                { _t("If disabled, messages from encrypted rooms won't appear in search results.") }
+                { this.state.disabling ? <Spinner /> : <div /> }
                 <DialogButtons
                     primaryButton={_t('Disable')}
-                    onPrimaryButtonClick={this._onDisable}
+                    onPrimaryButtonClick={this.onDisable}
                     primaryButtonClass="danger"
                     cancelButtonClass="warning"
                     onCancel={this.props.onFinished}
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx
index 0710c513da..ac7875b920 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.tsx
@@ -15,19 +15,20 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../../index';
 import { _t } from '../../../../languageHandler';
 import SdkConfig from '../../../../SdkConfig';
 import SettingsStore from "../../../../settings/SettingsStore";
 
 import Modal from '../../../../Modal';
-import {formatBytes, formatCountLong} from "../../../../utils/FormattingUtils";
+import { formatBytes, formatCountLong } from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
-import {SettingLevel} from "../../../../settings/SettingLevel";
+import { SettingLevel } from "../../../../settings/SettingLevel";
+import Field from '../../../../components/views/elements/Field';
+import BaseDialog from "../../../../components/views/dialogs/BaseDialog";
+import DialogButtons from "../../../../components/views/elements/DialogButtons";
+import { IDialogProps } from "../../../../components/views/dialogs/IDialogProps";
 
-interface IProps {
-    onFinished: (confirmed: boolean) => void;
-}
+interface IProps extends IDialogProps {}
 
 interface IState {
     eventIndexSize: number;
@@ -132,20 +133,20 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
     }
 
     private onDisable = async () => {
-        Modal.createTrackedDialogAsync("Disable message search", "Disable message search",
-            import("./DisableEventIndexDialog"),
+        const DisableEventIndexDialog = (await import("./DisableEventIndexDialog")).default;
+        Modal.createTrackedDialog("Disable message search", "Disable message search",
+            DisableEventIndexDialog,
             null, null, /* priority = */ false, /* static = */ true,
         );
     };
 
     private onCrawlerSleepTimeChange = (e) => {
-        this.setState({crawlerSleepTime: e.target.value});
+        this.setState({ crawlerSleepTime: e.target.value });
         SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
     };
 
     render() {
         const brand = SdkConfig.get().brand;
-        const Field = sdk.getComponent('views.elements.Field');
 
         let crawlerState;
         if (this.state.currentRoom === null) {
@@ -160,37 +161,34 @@ export default class ManageEventIndexDialog extends React.Component<IProps, ISta
 
         const eventIndexingSettings = (
             <div>
-                {_t(
+                { _t(
                     "%(brand)s is securely caching encrypted messages locally for them " +
                     "to appear in search results:",
                     { brand },
-                )}
+                ) }
                 <div className='mx_SettingsTab_subsectionText'>
-                    {crawlerState}<br />
-                    {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                    {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Indexed rooms:")} {_t("%(doneRooms)s out of %(totalRooms)s", {
+                    { crawlerState }<br />
+                    { _t("Space used:") } { formatBytes(this.state.eventIndexSize, 0) }<br />
+                    { _t("Indexed messages:") } { formatCountLong(this.state.eventCount) }<br />
+                    { _t("Indexed rooms:") } { _t("%(doneRooms)s out of %(totalRooms)s", {
                         doneRooms: formatCountLong(doneRooms),
                         totalRooms: formatCountLong(this.state.roomCount),
-                    })} <br />
+                    }) } <br />
                     <Field
                         label={_t('Message downloading sleep time(ms)')}
                         type='number'
-                        value={this.state.crawlerSleepTime}
+                        value={this.state.crawlerSleepTime.toString()}
                         onChange={this.onCrawlerSleepTimeChange} />
                 </div>
             </div>
         );
 
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
         return (
             <BaseDialog className='mx_ManageEventIndexDialog'
                 onFinished={this.props.onFinished}
                 title={_t("Message search")}
             >
-                {eventIndexingSettings}
+                { eventIndexingSettings }
                 <DialogButtons
                     primaryButton={_t("Done")}
                     onPrimaryButtonClick={this.props.onFinished}
diff --git a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js
index 549494b5cb..2cef1c0e41 100644
--- a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js
@@ -15,15 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import FileSaver from 'file-saver';
 import * as sdk from '../../../../index';
-import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
-import {_t, _td} from '../../../../languageHandler';
+import { _t, _td } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../SecurityManager';
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
-import {copyNode} from "../../../../utils/strings";
+import { copyNode } from "../../../../utils/strings";
 import PassphraseField from "../../../../components/views/auth/PassphraseField";
 
 const PHASE_PASSPHRASE = 0;
@@ -152,11 +152,11 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     }
 
     _onOptOutClick = () => {
-        this.setState({phase: PHASE_OPTOUT_CONFIRM});
+        this.setState({ phase: PHASE_OPTOUT_CONFIRM });
     }
 
     _onSetUpClick = () => {
-        this.setState({phase: PHASE_PASSPHRASE});
+        this.setState({ phase: PHASE_PASSPHRASE });
     }
 
     _onSkipPassPhraseClick = async () => {
@@ -179,7 +179,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             return;
         }
 
-        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        this.setState({ phase: PHASE_PASSPHRASE_CONFIRM });
     };
 
     _onPassPhraseConfirmNextClick = async (e) => {
@@ -232,15 +232,15 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         return <form onSubmit={this._onPassPhraseNextClick}>
-            <p>{_t(
+            <p>{ _t(
                 "<b>Warning</b>: You should only set up key backup from a trusted computer.", {},
-                { b: sub => <b>{sub}</b> },
-            )}</p>
-            <p>{_t(
+                { b: sub => <b>{ sub }</b> },
+            ) }</p>
+            <p>{ _t(
                 "We'll store an encrypted copy of your keys on our server. " +
                 "Secure your backup with a Security Phrase.",
-            )}</p>
-            <p>{_t("For maximum security, this should be different from your account password.")}</p>
+            ) }</p>
+            <p>{ _t("For maximum security, this should be different from your account password.") }</p>
 
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
@@ -268,9 +268,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             />
 
             <details>
-                <summary>{_t("Advanced")}</summary>
-                <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
-                    {_t("Set up with a Security Key")}
+                <summary>{ _t("Advanced") }</summary>
+                <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick}>
+                    { _t("Set up with a Security Key") }
                 </AccessibleButton>
             </details>
         </form>;
@@ -299,19 +299,19 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         let passPhraseMatch = null;
         if (matchText) {
             passPhraseMatch = <div className="mx_CreateKeyBackupDialog_passPhraseMatch">
-                <div>{matchText}</div>
+                <div>{ matchText }</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
-                        {changeText}
+                        { changeText }
                     </AccessibleButton>
                 </div>
             </div>;
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
-            <p>{_t(
+            <p>{ _t(
                 "Enter your Security Phrase a second time to confirm it.",
-            )}</p>
+            ) }</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
                     <div>
@@ -323,7 +323,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                             autoFocus={true}
                         />
                     </div>
-                    {passPhraseMatch}
+                    { passPhraseMatch }
                 </div>
             </div>
             <DialogButtons
@@ -337,27 +337,27 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
     _renderPhaseShowKey() {
         return <div>
-            <p>{_t(
+            <p>{ _t(
                 "Your Security Key is a safety net - you can use it to restore " +
                 "access to your encrypted messages if you forget your Security Phrase.",
-            )}</p>
-            <p>{_t(
+            ) }</p>
+            <p>{ _t(
                 "Keep a copy of it somewhere secure, like a password manager or even a safe.",
-            )}</p>
+            ) }</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyHeader">
-                    {_t("Your Security Key")}
+                    { _t("Your Security Key") }
                 </div>
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyContainer">
                     <div className="mx_CreateKeyBackupDialog_recoveryKey">
-                        <code ref={this._collectRecoveryKeyNode}>{this._keyBackupInfo.recovery_key}</code>
+                        <code ref={this._collectRecoveryKeyNode}>{ this._keyBackupInfo.recovery_key }</code>
                     </div>
                     <div className="mx_CreateKeyBackupDialog_recoveryKeyButtons">
                         <button className="mx_Dialog_primary" onClick={this._onCopyClick}>
-                            {_t("Copy")}
+                            { _t("Copy") }
                         </button>
                         <button className="mx_Dialog_primary" onClick={this._onDownloadClick}>
-                            {_t("Download")}
+                            { _t("Download") }
                         </button>
                     </div>
                 </div>
@@ -370,26 +370,26 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         if (this.state.copied) {
             introText = _t(
                 "Your Security Key has been <b>copied to your clipboard</b>, paste it to:",
-                {}, {b: s => <b>{s}</b>},
+                {}, { b: s => <b>{ s }</b> },
             );
         } else if (this.state.downloaded) {
             introText = _t(
                 "Your Security Key is in your <b>Downloads</b> folder.",
-                {}, {b: s => <b>{s}</b>},
+                {}, { b: s => <b>{ s }</b> },
             );
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            {introText}
+            { introText }
             <ul>
-                <li>{_t("<b>Print it</b> and store it somewhere safe", {}, {b: s => <b>{s}</b>})}</li>
-                <li>{_t("<b>Save it</b> on a USB key or backup drive", {}, {b: s => <b>{s}</b>})}</li>
-                <li>{_t("<b>Copy it</b> to your personal cloud storage", {}, {b: s => <b>{s}</b>})}</li>
+                <li>{ _t("<b>Print it</b> and store it somewhere safe", {}, { b: s => <b>{ s }</b> }) }</li>
+                <li>{ _t("<b>Save it</b> on a USB key or backup drive", {}, { b: s => <b>{ s }</b> }) }</li>
+                <li>{ _t("<b>Copy it</b> to your personal cloud storage", {}, { b: s => <b>{ s }</b> }) }</li>
             </ul>
             <DialogButtons primaryButton={_t("Continue")}
                 onPrimaryButtonClick={this._createBackup}
                 hasCancel={false}>
-                <button onClick={this._onKeepItSafeBackClick}>{_t("Back")}</button>
+                <button onClick={this._onKeepItSafeBackClick}>{ _t("Back") }</button>
             </DialogButtons>
         </div>;
     }
@@ -404,9 +404,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _renderPhaseDone() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            <p>{_t(
+            <p>{ _t(
                 "Your keys are being backed up (the first backup could take a few minutes).",
-            )}</p>
+            ) }</p>
             <DialogButtons primaryButton={_t('OK')}
                 onPrimaryButtonClick={this._onDone}
                 hasCancel={false}
@@ -417,10 +417,10 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _renderPhaseOptOutConfirm() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            {_t(
+            { _t(
                 "Without setting up Secure Message Recovery, you won't be able to restore your " +
                 "encrypted message history if you log out or use another session.",
-            )}
+            ) }
             <DialogButtons primaryButton={_t('Set up Secure Message Recovery')}
                 onPrimaryButtonClick={this._onSetUpClick}
                 hasCancel={false}
@@ -457,7 +457,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         if (this.state.error) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             content = <div>
-                <p>{_t("Unable to create key backup")}</p>
+                <p>{ _t("Unable to create key backup") }</p>
                 <div className="mx_Dialog_buttons">
                     <DialogButtons primaryButton={_t('Retry')}
                         onPrimaryButtonClick={this._createBackup}
@@ -499,7 +499,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 hasCancel={[PHASE_PASSPHRASE, PHASE_DONE].includes(this.state.phase)}
             >
                 <div>
-                    {content}
+                    { content }
                 </div>
             </BaseDialog>
         );
diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js
index 6d5703a768..5fbc97d2f1 100644
--- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js
@@ -15,16 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
-import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import FileSaver from 'file-saver';
-import {_t, _td} from '../../../../languageHandler';
+import { _t, _td } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../SecurityManager';
-import {copyNode} from "../../../../utils/strings";
-import {SSOAuthEntry} from "../../../../components/views/auth/InteractiveAuthEntryComponents";
+import { copyNode } from "../../../../utils/strings";
+import { SSOAuthEntry } from "../../../../components/views/auth/InteractiveAuthEntryComponents";
 import PassphraseField from "../../../../components/views/auth/PassphraseField";
 import StyledRadioButton from '../../../../components/views/elements/StyledRadioButton';
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
@@ -34,6 +34,8 @@ import RestoreKeyBackupDialog from "../../../../components/views/dialogs/securit
 import { getSecureBackupSetupMethods, isSecureBackupRequired } from '../../../../utils/WellKnownUtils';
 import SecurityCustomisations from "../../../../customisations/Security";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const PHASE_LOADING = 0;
 const PHASE_LOADERROR = 1;
 const PHASE_CHOOSE_KEY_PASSPHRASE = 2;
@@ -122,7 +124,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     _getInitialPhase() {
         const keyFromCustomisations = SecurityCustomisations.createSecretStorageKey?.();
         if (keyFromCustomisations) {
-            console.log("Created key via customisations, jumping to bootstrap step");
+            logger.log("Created key via customisations, jumping to bootstrap step");
             this._recoveryKey = {
                 privateKey: keyFromCustomisations,
             };
@@ -138,7 +140,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
             const backupSigStatus = (
                 // we may not have started crypto yet, in which case we definitely don't trust the backup
-                MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
+                MatrixClientPeg.get().isCryptoEnabled() && (await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo))
             );
 
             const { forceReset } = this.props;
@@ -155,7 +157,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 backupSigStatus,
             };
         } catch (e) {
-            this.setState({phase: PHASE_LOADERROR});
+            this.setState({ phase: PHASE_LOADERROR });
         }
     }
 
@@ -165,10 +167,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // We should never get here: the server should always require
             // UI auth to upload device signing keys. If we do, we upload
             // no keys which would be a no-op.
-            console.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
+            logger.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
         } catch (error) {
             if (!error.data || !error.data.flows) {
-                console.log("uploadDeviceSigningKeys advertised no flows!");
+                logger.log("uploadDeviceSigningKeys advertised no flows!");
                 return;
             }
             const canUploadKeysWithPasswordOnly = error.data.flows.some(f => {
@@ -304,7 +306,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         try {
             if (forceReset) {
-                console.log("Forcing secret storage reset");
+                logger.log("Forcing secret storage reset");
                 await cli.bootstrapSecretStorage({
                     createSecretStorageKey: async () => this._recoveryKey,
                     setupNewKeyBackup: true,
@@ -385,7 +387,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onLoadRetryClick = () => {
-        this.setState({phase: PHASE_LOADING});
+        this.setState({ phase: PHASE_LOADING });
         this._fetchBackupInfo();
     }
 
@@ -394,11 +396,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onCancelClick = () => {
-        this.setState({phase: PHASE_CONFIRM_SKIP});
+        this.setState({ phase: PHASE_CONFIRM_SKIP });
     }
 
     _onGoBackClick = () => {
-        this.setState({phase: PHASE_CHOOSE_KEY_PASSPHRASE});
+        this.setState({ phase: PHASE_CHOOSE_KEY_PASSPHRASE });
     }
 
     _onPassPhraseNextClick = async (e) => {
@@ -412,7 +414,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             return;
         }
 
-        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        this.setState({ phase: PHASE_PASSPHRASE_CONFIRM });
     };
 
     _onPassPhraseConfirmNextClick = async (e) => {
@@ -474,10 +476,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 outlined
             >
                 <div className="mx_CreateSecretStorageDialog_optionTitle">
-                    <span className="mx_CreateSecretStorageDialog_optionIcon mx_CreateSecretStorageDialog_optionIcon_secureBackup"></span>
-                    {_t("Generate a Security Key")}
+                    <span className="mx_CreateSecretStorageDialog_optionIcon mx_CreateSecretStorageDialog_optionIcon_secureBackup" />
+                    { _t("Generate a Security Key") }
                 </div>
-                <div>{_t("We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.")}</div>
+                <div>{ _t("We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.") }</div>
             </StyledRadioButton>
         );
     }
@@ -493,10 +495,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 outlined
             >
                 <div className="mx_CreateSecretStorageDialog_optionTitle">
-                    <span className="mx_CreateSecretStorageDialog_optionIcon mx_CreateSecretStorageDialog_optionIcon_securePhrase"></span>
-                    {_t("Enter a Security Phrase")}
+                    <span className="mx_CreateSecretStorageDialog_optionIcon mx_CreateSecretStorageDialog_optionIcon_securePhrase" />
+                    { _t("Enter a Security Phrase") }
                 </div>
-                <div>{_t("Use a secret phrase only you know, and optionally save a Security Key to use for backup.")}</div>
+                <div>{ _t("Use a secret phrase only you know, and optionally save a Security Key to use for backup.") }</div>
             </StyledRadioButton>
         );
     }
@@ -507,13 +509,13 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const optionPassphrase = setupMethods.includes("passphrase") ? this._renderOptionPassphrase() : null;
 
         return <form onSubmit={this._onChooseKeyPassphraseFormSubmit}>
-            <p className="mx_CreateSecretStorageDialog_centeredBody">{_t(
+            <p className="mx_CreateSecretStorageDialog_centeredBody">{ _t(
                 "Safeguard against losing access to encrypted messages & data by " +
                 "backing up encryption keys on your server.",
-            )}</p>
+            ) }</p>
             <div className="mx_CreateSecretStorageDialog_primaryContainer" role="radiogroup">
-                {optionKey}
-                {optionPassphrase}
+                { optionKey }
+                { optionPassphrase }
             </div>
             <DialogButtons
                 primaryButton={_t("Continue")}
@@ -536,7 +538,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         let nextCaption = _t("Next");
         if (this.state.canUploadKeysWithPasswordOnly) {
             authPrompt = <div>
-                <div>{_t("Enter your account password to confirm the upgrade:")}</div>
+                <div>{ _t("Enter your account password to confirm the upgrade:") }</div>
                 <div><Field
                     type="password"
                     label={_t("Password")}
@@ -548,22 +550,22 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         } else if (!this.state.backupSigStatus.usable) {
             authPrompt = <div>
-                <div>{_t("Restore your key backup to upgrade your encryption")}</div>
+                <div>{ _t("Restore your key backup to upgrade your encryption") }</div>
             </div>;
             nextCaption = _t("Restore");
         } else {
             authPrompt = <p>
-                {_t("You'll need to authenticate with the server to confirm the upgrade.")}
+                { _t("You'll need to authenticate with the server to confirm the upgrade.") }
             </p>;
         }
 
         return <form onSubmit={this._onMigrateFormSubmit}>
-            <p>{_t(
+            <p>{ _t(
                 "Upgrade this session to allow it to verify other sessions, " +
                 "granting them access to encrypted messages and marking them " +
                 "as trusted for other users.",
-            )}</p>
-            <div>{authPrompt}</div>
+            ) }</p>
+            <div>{ authPrompt }</div>
             <DialogButtons
                 primaryButton={nextCaption}
                 onPrimaryButtonClick={this._onMigrateFormSubmit}
@@ -571,7 +573,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
             >
                 <button type="button" className="danger" onClick={this._onCancelClick}>
-                    {_t('Skip')}
+                    { _t('Skip') }
                 </button>
             </DialogButtons>
         </form>;
@@ -579,10 +581,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _renderPhasePassPhrase() {
         return <form onSubmit={this._onPassPhraseNextClick}>
-            <p>{_t(
+            <p>{ _t(
                 "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.",
-            )}</p>
+            ) }</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
                 <PassphraseField
@@ -609,7 +611,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 <button type="button"
                     onClick={this._onCancelClick}
                     className="danger"
-                >{_t("Cancel")}</button>
+                >{ _t("Cancel") }</button>
             </DialogButtons>
         </form>;
     }
@@ -637,18 +639,18 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         let passPhraseMatch = null;
         if (matchText) {
             passPhraseMatch = <div>
-                <div>{matchText}</div>
+                <div>{ matchText }</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
-                        {changeText}
+                        { changeText }
                     </AccessibleButton>
                 </div>
             </div>;
         }
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
-            <p>{_t(
+            <p>{ _t(
                 "Enter your Security Phrase a second time to confirm it.",
-            )}</p>
+            ) }</p>
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
                 <Field
                     type="password"
@@ -660,7 +662,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     autoComplete="new-password"
                 />
                 <div className="mx_CreateSecretStorageDialog_passPhraseMatch">
-                    {passPhraseMatch}
+                    { passPhraseMatch }
                 </div>
             </div>
             <DialogButtons
@@ -672,7 +674,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 <button type="button"
                     onClick={this._onCancelClick}
                     className="danger"
-                >{_t("Skip")}</button>
+                >{ _t("Skip") }</button>
             </DialogButtons>
         </form>;
     }
@@ -691,35 +693,36 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         }
         return <div>
-            <p>{_t(
+            <p>{ _t(
                 "Store your Security Key somewhere safe, like a password manager or a safe, " +
                 "as it’s used to safeguard your encrypted data.",
-            )}</p>
+            ) }</p>
             <div className="mx_CreateSecretStorageDialog_primaryContainer">
                 <div className="mx_CreateSecretStorageDialog_recoveryKeyContainer">
                     <div className="mx_CreateSecretStorageDialog_recoveryKey">
-                        <code ref={this._collectRecoveryKeyNode}>{this._recoveryKey.encodedPrivateKey}</code>
+                        <code ref={this._collectRecoveryKeyNode}>{ this._recoveryKey.encodedPrivateKey }</code>
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
-                        <AccessibleButton kind='primary' className="mx_Dialog_primary"
+                        <AccessibleButton kind='primary'
+                            className="mx_Dialog_primary"
                             onClick={this._onDownloadClick}
                             disabled={this.state.phase === PHASE_STORING}
                         >
-                            {_t("Download")}
+                            { _t("Download") }
                         </AccessibleButton>
-                        <span>{_t("or")}</span>
+                        <span>{ _t("or") }</span>
                         <AccessibleButton
                             kind='primary'
                             className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"
                             onClick={this._onCopyClick}
                             disabled={this.state.phase === PHASE_STORING}
                         >
-                            {this.state.copied ? _t("Copied!") : _t("Copy")}
+                            { this.state.copied ? _t("Copied!") : _t("Copy") }
                         </AccessibleButton>
                     </div>
                 </div>
             </div>
-            {continueButton}
+            { continueButton }
         </div>;
     }
 
@@ -732,7 +735,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _renderPhaseLoadError() {
         return <div>
-            <p>{_t("Unable to query secret storage status")}</p>
+            <p>{ _t("Unable to query secret storage status") }</p>
             <div className="mx_Dialog_buttons">
                 <DialogButtons primaryButton={_t('Retry')}
                     onPrimaryButtonClick={this._onLoadRetryClick}
@@ -745,17 +748,17 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _renderPhaseSkipConfirm() {
         return <div>
-            <p>{_t(
+            <p>{ _t(
                 "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.",
-            )}</p>
-            <p>{_t(
+            ) }</p>
+            <p>{ _t(
                 "You can also set up Secure Backup & manage your keys in Settings.",
-            )}</p>
+            ) }</p>
             <DialogButtons primaryButton={_t('Go back')}
                 onPrimaryButtonClick={this._onGoBackClick}
                 hasCancel={false}
             >
-                <button type="button" className="danger" onClick={this._onCancel}>{_t('Cancel')}</button>
+                <button type="button" className="danger" onClick={this._onCancel}>{ _t('Cancel') }</button>
             </DialogButtons>
         </div>;
     }
@@ -787,7 +790,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         let content;
         if (this.state.error) {
             content = <div>
-                <p>{_t("Unable to set up secret storage")}</p>
+                <p>{ _t("Unable to set up secret storage") }</p>
                 <div className="mx_Dialog_buttons">
                     <DialogButtons primaryButton={_t('Retry')}
                         onPrimaryButtonClick={this._bootstrapSecretStorage}
@@ -857,7 +860,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 fixedWidth={false}
             >
                 <div>
-                    {content}
+                    { content }
                 </div>
             </BaseDialog>
         );
diff --git a/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js
index 60f2ca9168..dbed9f3968 100644
--- a/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import FileSaver from 'file-saver';
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
@@ -55,11 +55,11 @@ export default class ExportE2eKeysDialog extends React.Component {
 
         const passphrase = this._passphrase1.current.value;
         if (passphrase !== this._passphrase2.current.value) {
-            this.setState({errStr: _t('Passphrases must match')});
+            this.setState({ errStr: _t('Passphrases must match') });
             return false;
         }
         if (!passphrase) {
-            this.setState({errStr: _t('Passphrase must not be empty')});
+            this.setState({ errStr: _t('Passphrase must not be empty') });
             return false;
         }
 
@@ -148,8 +148,12 @@ export default class ExportE2eKeysDialog extends React.Component {
                                     </label>
                                 </div>
                                 <div className='mx_E2eKeysDialog_inputCell'>
-                                    <input ref={this._passphrase1} id='passphrase1'
-                                        autoFocus={true} size='64' type='password'
+                                    <input
+                                        ref={this._passphrase1}
+                                        id='passphrase1'
+                                        autoFocus={true}
+                                        size='64'
+                                        type='password'
                                         disabled={disableForm}
                                     />
                                 </div>
@@ -161,8 +165,10 @@ export default class ExportE2eKeysDialog extends React.Component {
                                     </label>
                                 </div>
                                 <div className='mx_E2eKeysDialog_inputCell'>
-                                    <input ref={this._passphrase2} id='passphrase2'
-                                        size='64' type='password'
+                                    <input ref={this._passphrase2}
+                                        id='passphrase2'
+                                        size='64'
+                                        type='password'
                                         disabled={disableForm}
                                     />
                                 </div>
diff --git a/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js
index 70fc997230..0936ad696d 100644
--- a/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import PropTypes from 'prop-types';
 
 import { MatrixClient } from 'matrix-js-sdk/src/client';
@@ -174,7 +174,10 @@ export default class ImportE2eKeysDialog extends React.Component {
                         </div>
                     </div>
                     <div className='mx_Dialog_buttons'>
-                        <input className='mx_Dialog_primary' type='submit' value={_t('Import')}
+                        <input
+                            className='mx_Dialog_primary'
+                            type='submit'
+                            value={_t('Import')}
                             disabled={!this.state.enableSubmit || disableForm}
                         />
                         <button onClick={this._onCancelClick} disabled={disableForm}>
diff --git a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js
index 8c09cc6d16..263d25c98c 100644
--- a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js
@@ -18,12 +18,12 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import * as sdk from "../../../../index";
-import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
 import RestoreKeyBackupDialog from "../../../../components/views/dialogs/security/RestoreKeyBackupDialog";
-import {Action} from "../../../../dispatcher/actions";
+import { Action } from "../../../../dispatcher/actions";
 
 export default class NewRecoveryMethodDialog extends React.PureComponent {
     static propTypes = {
@@ -54,28 +54,28 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
 
         const title = <span className="mx_KeyBackupFailedDialog_title">
-            {_t("New Recovery Method")}
+            { _t("New Recovery Method") }
         </span>;
 
-        const newMethodDetected = <p>{_t(
+        const newMethodDetected = <p>{ _t(
             "A new Security Phrase and key for Secure Messages have been detected.",
-        )}</p>;
+        ) }</p>;
 
-        const hackWarning = <p className="warning">{_t(
+        const hackWarning = <p className="warning">{ _t(
             "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.",
-        )}</p>;
+        ) }</p>;
 
         let content;
         if (MatrixClientPeg.get().getKeyBackupEnabled()) {
             content = <div>
-                {newMethodDetected}
-                <p>{_t(
+                { newMethodDetected }
+                <p>{ _t(
                     "This session is encrypting history using the new recovery method.",
-                )}</p>
-                {hackWarning}
+                ) }</p>
+                { hackWarning }
                 <DialogButtons
                     primaryButton={_t("OK")}
                     onPrimaryButtonClick={this.onOkClick}
@@ -85,8 +85,8 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
             </div>;
         } else {
             content = <div>
-                {newMethodDetected}
-                {hackWarning}
+                { newMethodDetected }
+                { hackWarning }
                 <DialogButtons
                     primaryButton={_t("Set up Secure Messages")}
                     onPrimaryButtonClick={this.onSetupClick}
@@ -101,7 +101,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
                 onFinished={this.props.onFinished}
                 title={title}
             >
-                {content}
+                { content }
             </BaseDialog>
         );
     }
diff --git a/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js
index b60e6fd3cb..f586c9430a 100644
--- a/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js
@@ -21,7 +21,7 @@ import * as sdk from "../../../../index";
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
-import {Action} from "../../../../dispatcher/actions";
+import { Action } from "../../../../dispatcher/actions";
 
 export default class RecoveryMethodRemovedDialog extends React.PureComponent {
     static propTypes = {
@@ -46,7 +46,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
 
         const title = <span className="mx_KeyBackupFailedDialog_title">
-            {_t("Recovery Method Removed")}
+            { _t("Recovery Method Removed") }
         </span>;
 
         return (
@@ -55,21 +55,21 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
                 title={title}
             >
                 <div>
-                    <p>{_t(
+                    <p>{ _t(
                         "This session has detected that your Security Phrase and key " +
                         "for Secure Messages have been removed.",
-                    )}</p>
-                    <p>{_t(
+                    ) }</p>
+                    <p>{ _t(
                         "If you did this accidentally, you can setup Secure Messages on " +
                         "this session which will re-encrypt this session's message " +
                         "history with a new recovery method.",
-                    )}</p>
-                    <p className="warning">{_t(
+                    ) }</p>
+                    <p className="warning">{ _t(
                         "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.",
-                    )}</p>
+                    ) }</p>
                     <DialogButtons
                         primaryButton={_t("Set up Secure Messages")}
                         onPrimaryButtonClick={this.onSetupClick}
diff --git a/src/audio/ManagedPlayback.ts b/src/audio/ManagedPlayback.ts
new file mode 100644
index 0000000000..5db07671f1
--- /dev/null
+++ b/src/audio/ManagedPlayback.ts
@@ -0,0 +1,37 @@
+/*
+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 { DEFAULT_WAVEFORM, Playback } from "./Playback";
+import { PlaybackManager } from "./PlaybackManager";
+
+/**
+ * A managed playback is a Playback instance that is guided by a PlaybackManager.
+ */
+export class ManagedPlayback extends Playback {
+    public constructor(private manager: PlaybackManager, buf: ArrayBuffer, seedWaveform = DEFAULT_WAVEFORM) {
+        super(buf, seedWaveform);
+    }
+
+    public async play(): Promise<void> {
+        this.manager.pauseAllExcept(this);
+        return super.play();
+    }
+
+    public destroy() {
+        this.manager.destroyPlaybackInstance(this);
+        super.destroy();
+    }
+}
diff --git a/src/audio/Playback.ts b/src/audio/Playback.ts
new file mode 100644
index 0000000000..9ad4c85df5
--- /dev/null
+++ b/src/audio/Playback.ts
@@ -0,0 +1,310 @@
+/*
+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 EventEmitter from "events";
+import { UPDATE_EVENT } from "../stores/AsyncStore";
+import { arrayFastResample, arrayRescale, arraySeed, arraySmoothingResample } from "../utils/arrays";
+import { SimpleObservable } from "matrix-widget-api";
+import { IDestroyable } from "../utils/IDestroyable";
+import { PlaybackClock } from "./PlaybackClock";
+import { createAudioContext, decodeOgg } from "./compat";
+import { clamp } from "../utils/numbers";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+export enum PlaybackState {
+    Decoding = "decoding",
+    Stopped = "stopped", // no progress on timeline
+    Paused = "paused", // some progress on timeline
+    Playing = "playing", // active progress through timeline
+}
+
+export const PLAYBACK_WAVEFORM_SAMPLES = 39;
+const THUMBNAIL_WAVEFORM_SAMPLES = 100; // arbitrary: [30,120]
+export const DEFAULT_WAVEFORM = arraySeed(0, PLAYBACK_WAVEFORM_SAMPLES);
+
+function makePlaybackWaveform(input: number[]): number[] {
+    // First, convert negative amplitudes to positive so we don't detect zero as "noisy".
+    const noiseWaveform = input.map(v => Math.abs(v));
+
+    // Then, we'll resample the waveform using a smoothing approach so we can keep the same rough shape.
+    // We also rescale the waveform to be 0-1 so we end up with a clamped waveform to rely upon.
+    return arrayRescale(arraySmoothingResample(noiseWaveform, PLAYBACK_WAVEFORM_SAMPLES), 0, 1);
+}
+
+export class Playback extends EventEmitter implements IDestroyable {
+    /**
+     * Stable waveform for representing a thumbnail of the media. Values are
+     * guaranteed to be between zero and one, inclusive.
+     */
+    public readonly thumbnailWaveform: number[];
+
+    private readonly context: AudioContext;
+    private source: AudioBufferSourceNode | MediaElementAudioSourceNode;
+    private state = PlaybackState.Decoding;
+    private audioBuf: AudioBuffer;
+    private element: HTMLAudioElement;
+    private resampledWaveform: number[];
+    private waveformObservable = new SimpleObservable<number[]>();
+    private readonly clock: PlaybackClock;
+    private readonly fileSize: number;
+
+    /**
+     * Creates a new playback instance from a buffer.
+     * @param {ArrayBuffer} buf The buffer containing the sound sample.
+     * @param {number[]} seedWaveform Optional seed waveform to present until the proper waveform
+     * can be calculated. Contains values between zero and one, inclusive.
+     */
+    constructor(private buf: ArrayBuffer, seedWaveform = DEFAULT_WAVEFORM) {
+        super();
+        // Capture the file size early as reading the buffer will result in a 0-length buffer left behind
+        this.fileSize = this.buf.byteLength;
+        this.context = createAudioContext();
+        this.resampledWaveform = arrayFastResample(seedWaveform ?? DEFAULT_WAVEFORM, PLAYBACK_WAVEFORM_SAMPLES);
+        this.thumbnailWaveform = arrayFastResample(seedWaveform ?? DEFAULT_WAVEFORM, THUMBNAIL_WAVEFORM_SAMPLES);
+        this.waveformObservable.update(this.resampledWaveform);
+        this.clock = new PlaybackClock(this.context);
+    }
+
+    /**
+     * Size of the audio clip in bytes. May be zero if unknown. This is updated
+     * when the playback goes through phase changes.
+     */
+    public get sizeBytes(): number {
+        return this.fileSize;
+    }
+
+    /**
+     * Stable waveform for the playback. Values are guaranteed to be between
+     * zero and one, inclusive.
+     */
+    public get waveform(): number[] {
+        return this.resampledWaveform;
+    }
+
+    public get waveformData(): SimpleObservable<number[]> {
+        return this.waveformObservable;
+    }
+
+    public get clockInfo(): PlaybackClock {
+        return this.clock;
+    }
+
+    public get currentState(): PlaybackState {
+        return this.state;
+    }
+
+    public get isPlaying(): boolean {
+        return this.currentState === PlaybackState.Playing;
+    }
+
+    public emit(event: PlaybackState, ...args: any[]): boolean {
+        this.state = event;
+        super.emit(event, ...args);
+        super.emit(UPDATE_EVENT, event, ...args);
+        return true; // we don't ever care if the event had listeners, so just return "yes"
+    }
+
+    public destroy() {
+        // Dev note: It's critical that we call stop() during cleanup to ensure that downstream callers
+        // are aware of the final clock position before the user triggered an unload.
+        // noinspection JSIgnoredPromiseFromCall - not concerned about being called async here
+        this.stop();
+        this.removeAllListeners();
+        this.clock.destroy();
+        this.waveformObservable.close();
+        if (this.element) {
+            URL.revokeObjectURL(this.element.src);
+            this.element.remove();
+        }
+    }
+
+    public async prepare() {
+        // The point where we use an audio element is fairly arbitrary, though we don't want
+        // it to be too low. As of writing, voice messages want to show a waveform but audio
+        // messages do not. Using an audio element means we can't show a waveform preview, so
+        // we try to target the difference between a voice message file and large audio file.
+        // Overall, the point of this is to avoid memory-related issues due to storing a massive
+        // audio buffer in memory, as that can balloon to far greater than the input buffer's
+        // byte length.
+        if (this.buf.byteLength > 5 * 1024 * 1024) { // 5mb
+            logger.log("Audio file too large: processing through <audio /> element");
+            this.element = document.createElement("AUDIO") as HTMLAudioElement;
+            const prom = new Promise((resolve, reject) => {
+                this.element.onloadeddata = () => resolve(null);
+                this.element.onerror = (e) => reject(e);
+            });
+            this.element.src = URL.createObjectURL(new Blob([this.buf]));
+            await prom; // make sure the audio element is ready for us
+        } else {
+            // Safari compat: promise API not supported on this function
+            this.audioBuf = await new Promise((resolve, reject) => {
+                this.context.decodeAudioData(this.buf, b => resolve(b), async e => {
+                    try {
+                        // This error handler is largely for Safari as well, which doesn't support Opus/Ogg
+                        // very well.
+                        console.error("Error decoding recording: ", e);
+                        console.warn("Trying to re-encode to WAV instead...");
+
+                        const wav = await decodeOgg(this.buf);
+
+                        // noinspection ES6MissingAwait - not needed when using callbacks
+                        this.context.decodeAudioData(wav, b => resolve(b), e => {
+                            console.error("Still failed to decode recording: ", e);
+                            reject(e);
+                        });
+                    } catch (e) {
+                        console.error("Caught decoding error:", e);
+                        reject(e);
+                    }
+                });
+            });
+
+            // Update the waveform to the real waveform once we have channel data to use. We don't
+            // exactly trust the user-provided waveform to be accurate...
+            const waveform = Array.from(this.audioBuf.getChannelData(0));
+            this.resampledWaveform = makePlaybackWaveform(waveform);
+        }
+
+        this.waveformObservable.update(this.resampledWaveform);
+
+        this.clock.flagLoadTime(); // must happen first because setting the duration fires a clock update
+        this.clock.durationSeconds = this.element ? this.element.duration : this.audioBuf.duration;
+
+        // Signal that we're not decoding anymore. This is done last to ensure the clock is updated for
+        // when the downstream callers try to use it.
+        this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
+    }
+
+    private onPlaybackEnd = async () => {
+        await this.context.suspend();
+        this.emit(PlaybackState.Stopped);
+    };
+
+    public async play() {
+        // We can't restart a buffer source, so we need to create a new one if we hit the end
+        if (this.state === PlaybackState.Stopped) {
+            this.disconnectSource();
+            this.makeNewSourceBuffer();
+            if (this.element) {
+                await this.element.play();
+            } else {
+                (this.source as AudioBufferSourceNode).start();
+            }
+        }
+
+        // We use the context suspend/resume functions because it allows us to pause a source
+        // node, but that still doesn't help us when the source node runs out (see above).
+        await this.context.resume();
+        this.clock.flagStart();
+        this.emit(PlaybackState.Playing);
+    }
+
+    private disconnectSource() {
+        if (this.element) return; // leave connected, we can (and must) re-use it
+        this.source?.disconnect();
+        this.source?.removeEventListener("ended", this.onPlaybackEnd);
+    }
+
+    private makeNewSourceBuffer() {
+        if (this.element && this.source) return; // leave connected, we can (and must) re-use it
+
+        if (this.element) {
+            this.source = this.context.createMediaElementSource(this.element);
+        } else {
+            this.source = this.context.createBufferSource();
+            this.source.buffer = this.audioBuf;
+        }
+
+        this.source.addEventListener("ended", this.onPlaybackEnd);
+        this.source.connect(this.context.destination);
+    }
+
+    public async pause() {
+        await this.context.suspend();
+        this.emit(PlaybackState.Paused);
+    }
+
+    public async stop() {
+        await this.onPlaybackEnd();
+        this.clock.flagStop();
+    }
+
+    public async toggle() {
+        if (this.isPlaying) await this.pause();
+        else await this.play();
+    }
+
+    public async skipTo(timeSeconds: number) {
+        // Dev note: this function talks a lot about clock desyncs. There is a clock running
+        // independently to the audio context and buffer so that accurate human-perceptible
+        // time can be exposed. The PlaybackClock class has more information, but the short
+        // version is that we need to line up the useful time (clip position) with the context
+        // time, and avoid as many deviations as possible as otherwise the user could see the
+        // wrong time, and we stop playback at the wrong time, etc.
+
+        timeSeconds = clamp(timeSeconds, 0, this.clock.durationSeconds);
+
+        // Track playing state so we don't cause seeking to start playing the track.
+        const isPlaying = this.isPlaying;
+
+        if (isPlaying) {
+            // Pause first so we can get an accurate measurement of time
+            await this.context.suspend();
+        }
+
+        // We can't simply tell the context/buffer to jump to a time, so we have to
+        // start a whole new buffer and start it from the new time offset.
+        const now = this.context.currentTime;
+        this.disconnectSource();
+        this.makeNewSourceBuffer();
+
+        // We have to resync the clock because it can get confused about where we're
+        // at in the audio clip.
+        this.clock.syncTo(now, timeSeconds);
+
+        // Always start the source to queue it up. We have to do this now (and pause
+        // quickly if we're not supposed to be playing) as otherwise the clock can desync
+        // when it comes time to the user hitting play. After a couple jumps, the user
+        // will have desynced the clock enough to be about 10-15 seconds off, while this
+        // keeps it as close to perfect as humans can perceive.
+        if (this.element) {
+            this.element.currentTime = timeSeconds;
+        } else {
+            (this.source as AudioBufferSourceNode).start(now, timeSeconds);
+        }
+
+        // Dev note: it's critical that the code gap between `this.source.start()` and
+        // `this.pause()` is as small as possible: we do not want to delay *anything*
+        // as that could cause a clock desync, or a buggy feeling as a single note plays
+        // during seeking.
+
+        if (isPlaying) {
+            // If we were playing before, continue the context so the clock doesn't desync.
+            await this.context.resume();
+        } else {
+            // As mentioned above, we'll have to pause the clip if we weren't supposed to
+            // be playing it just yet. If we didn't have this, the audio clip plays but all
+            // the states will be wrong: clock won't advance, pause state doesn't match the
+            // blaring noise leaving the user's speakers, etc.
+            //
+            // Also as mentioned, if the code gap is small enough then this should be
+            // executed immediately after the start time, leaving no feasible time for the
+            // user's speakers to play any sound.
+            await this.pause();
+        }
+    }
+}
diff --git a/src/audio/PlaybackClock.ts b/src/audio/PlaybackClock.ts
new file mode 100644
index 0000000000..5716d6ac2f
--- /dev/null
+++ b/src/audio/PlaybackClock.ts
@@ -0,0 +1,151 @@
+/*
+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 { SimpleObservable } from "matrix-widget-api";
+import { IDestroyable } from "../utils/IDestroyable";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+/**
+ * Tracks accurate human-perceptible time for an audio clip, as informed
+ * by managed playback. This clock is tightly coupled with the operation
+ * of the Playback class, making assumptions about how the provided
+ * AudioContext will be used (suspended/resumed to preserve time, etc).
+ *
+ * But why do we need a clock? The AudioContext exposes time information,
+ * and so does the audio buffer, but not in a way that is useful for humans
+ * to perceive. The audio buffer time is often lagged behind the context
+ * time due to internal processing delays of the audio API. Additionally,
+ * the context's time is tracked from when it was first initialized/started,
+ * not related to positioning within the clip. However, the context time
+ * is the most accurate time we can use to determine position within the
+ * clip if we're fast enough to track the pauses and stops.
+ *
+ * As a result, we track every play, pause, stop, and seek event from the
+ * Playback class (kinda: it calls us, which is close enough to the same
+ * thing). These events are then tracked on the AudioContext time scale,
+ * with assumptions that code execution will result in negligible desync
+ * of the clock, or at least no perceptible difference in time. It's
+ * extremely important that the calling code, and the clock's own code,
+ * is extremely fast between the event happening and the clock time being
+ * tracked - anything more than a dozen milliseconds is likely to stack up
+ * poorly, leading to clock desync.
+ *
+ * Clock desync can be dangerous for the stability of the playback controls:
+ * if the clock thinks the user is somewhere else in the clip, it could
+ * inform the playback of the wrong place in time, leading to dead air in
+ * the output or, if severe enough, a clock that won't stop running while
+ * the audio is paused/stopped. Other examples include the clip stopping at
+ * 90% time due to playback ending, the clip playing from the wrong spot
+ * relative to the time, and negative clock time.
+ *
+ * Note that the clip duration is fed to the clock: this is to ensure that
+ * we have the most accurate time possible to present.
+ */
+export class PlaybackClock implements IDestroyable {
+    private clipStart = 0;
+    private stopped = true;
+    private lastCheck = 0;
+    private observable = new SimpleObservable<number[]>();
+    private timerId: number;
+    private clipDuration = 0;
+    private placeholderDuration = 0;
+
+    public constructor(private context: AudioContext) {
+    }
+
+    public get durationSeconds(): number {
+        return this.clipDuration || this.placeholderDuration;
+    }
+
+    public set durationSeconds(val: number) {
+        this.clipDuration = val;
+        this.observable.update([this.timeSeconds, this.clipDuration]);
+    }
+
+    public get timeSeconds(): number {
+        // The modulo is to ensure that we're only looking at the most recent clip
+        // time, as the context is long-running and multiple plays might not be
+        // informed to us (if the control is looping, for example). By taking the
+        // remainder of the division operation, we're assuming that playback is
+        // incomplete or stopped, thus giving an accurate position within the active
+        // clip segment.
+        return (this.context.currentTime - this.clipStart) % this.clipDuration;
+    }
+
+    public get liveData(): SimpleObservable<number[]> {
+        return this.observable;
+    }
+
+    private checkTime = (force = false) => {
+        const now = this.timeSeconds; // calculated dynamically
+        if (this.lastCheck !== now || force) {
+            this.observable.update([now, this.durationSeconds]);
+            this.lastCheck = now;
+        }
+    };
+
+    /**
+     * Populates default information about the audio clip from the event body.
+     * The placeholders will be overridden once known.
+     * @param {MatrixEvent} event The event to use for placeholders.
+     */
+    public populatePlaceholdersFrom(event: MatrixEvent) {
+        const durationMs = Number(event.getContent()['info']?.['duration']);
+        if (Number.isFinite(durationMs)) this.placeholderDuration = durationMs / 1000;
+    }
+
+    /**
+     * Mark the time in the audio context where the clip starts/has been loaded.
+     * This is to ensure the clock isn't skewed into thinking it is ~0.5s into
+     * a clip when the duration is set.
+     */
+    public flagLoadTime() {
+        this.clipStart = this.context.currentTime;
+    }
+
+    public flagStart() {
+        if (this.stopped) {
+            this.clipStart = this.context.currentTime;
+            this.stopped = false;
+        }
+
+        if (!this.timerId) {
+            // cast to number because the types are wrong
+            // 100ms interval to make sure the time is as accurate as possible without
+            // being overly insane
+            this.timerId = <number><any>setInterval(this.checkTime, 100);
+        }
+    }
+
+    public flagStop() {
+        this.stopped = true;
+
+        // Reset the clock time now so that the update going out will trigger components
+        // to check their seek/position information (alongside the clock).
+        this.clipStart = this.context.currentTime;
+    }
+
+    public syncTo(contextTime: number, clipTime: number) {
+        this.clipStart = contextTime - clipTime;
+        this.stopped = false; // count as a mid-stream pause (if we were stopped)
+        this.checkTime(true);
+    }
+
+    public destroy() {
+        this.observable.close();
+        if (this.timerId) clearInterval(this.timerId);
+    }
+}
diff --git a/src/audio/PlaybackManager.ts b/src/audio/PlaybackManager.ts
new file mode 100644
index 0000000000..58c0b9b624
--- /dev/null
+++ b/src/audio/PlaybackManager.ts
@@ -0,0 +1,56 @@
+/*
+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 { DEFAULT_WAVEFORM, Playback, PlaybackState } from "./Playback";
+import { ManagedPlayback } from "./ManagedPlayback";
+
+/**
+ * Handles management of playback instances to ensure certain functionality, like
+ * one playback operating at any one time.
+ */
+export class PlaybackManager {
+    private static internalInstance: PlaybackManager;
+
+    private instances: ManagedPlayback[] = [];
+
+    public static get instance(): PlaybackManager {
+        if (!PlaybackManager.internalInstance) {
+            PlaybackManager.internalInstance = new PlaybackManager();
+        }
+        return PlaybackManager.internalInstance;
+    }
+
+    /**
+     * Pauses all other playback instances. If no playback is provided, all playing
+     * instances are paused.
+     * @param playback Optional. The playback to leave untouched.
+     */
+    public pauseAllExcept(playback?: Playback) {
+        this.instances
+            .filter(p => p !== playback && p.currentState === PlaybackState.Playing)
+            .forEach(p => p.pause());
+    }
+
+    public destroyPlaybackInstance(playback: ManagedPlayback) {
+        this.instances = this.instances.filter(p => p !== playback);
+    }
+
+    public createPlaybackInstance(buf: ArrayBuffer, waveform = DEFAULT_WAVEFORM): Playback {
+        const instance = new ManagedPlayback(this, buf, waveform);
+        this.instances.push(instance);
+        return instance;
+    }
+}
diff --git a/src/audio/PlaybackQueue.ts b/src/audio/PlaybackQueue.ts
new file mode 100644
index 0000000000..611b88938a
--- /dev/null
+++ b/src/audio/PlaybackQueue.ts
@@ -0,0 +1,219 @@
+/*
+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 { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { Playback, PlaybackState } from "./Playback";
+import { UPDATE_EVENT } from "../stores/AsyncStore";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { arrayFastClone } from "../utils/arrays";
+import { PlaybackManager } from "./PlaybackManager";
+import { isVoiceMessage } from "../utils/EventUtils";
+import RoomViewStore from "../stores/RoomViewStore";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+/**
+ * Audio playback queue management for a given room. This keeps track of where the user
+ * was at for each playback, what order the playbacks were played in, and triggers subsequent
+ * playbacks.
+ *
+ * Currently this is only intended to be used by voice messages.
+ *
+ * The primary mechanics are:
+ * * Persisted clock state for each playback instance (tied to Event ID).
+ * * Limited memory of playback order (see code; not persisted).
+ * * Autoplay of next eligible playback instance.
+ */
+export class PlaybackQueue {
+    private static queues = new Map<string, PlaybackQueue>(); // keyed by room ID
+
+    private playbacks = new Map<string, Playback>(); // keyed by event ID
+    private clockStates = new Map<string, number>(); // keyed by event ID
+    private playbackIdOrder: string[] = []; // event IDs, last == current
+    private currentPlaybackId: string; // event ID, broken out from above for ease of use
+    private recentFullPlays = new Set<string>(); // event IDs
+
+    constructor(private client: MatrixClient, private room: Room) {
+        this.loadClocks();
+
+        RoomViewStore.addListener(() => {
+            if (RoomViewStore.getRoomId() === this.room.roomId) {
+                // Reset the state of the playbacks before they start mounting and enqueuing updates.
+                // We reset the entirety of the queue, including order, to ensure the user isn't left
+                // confused with what order the messages are playing in.
+                this.currentPlaybackId = null; // this in particular stops autoplay when the room is switched to
+                this.recentFullPlays = new Set<string>();
+                this.playbackIdOrder = [];
+            }
+        });
+    }
+
+    public static forRoom(roomId: string): PlaybackQueue {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(roomId);
+        if (!room) throw new Error("Unknown room");
+        if (PlaybackQueue.queues.has(room.roomId)) {
+            return PlaybackQueue.queues.get(room.roomId);
+        }
+        const queue = new PlaybackQueue(cli, room);
+        PlaybackQueue.queues.set(room.roomId, queue);
+        return queue;
+    }
+
+    private persistClocks() {
+        localStorage.setItem(
+            `mx_voice_message_clocks_${this.room.roomId}`,
+            JSON.stringify(Array.from(this.clockStates.entries())),
+        );
+    }
+
+    private loadClocks() {
+        const val = localStorage.getItem(`mx_voice_message_clocks_${this.room.roomId}`);
+        if (!!val) {
+            this.clockStates = new Map<string, number>(JSON.parse(val));
+        }
+    }
+
+    public unsortedEnqueue(mxEvent: MatrixEvent, playback: Playback) {
+        // We don't ever detach our listeners: we expect the Playback to clean up for us
+        this.playbacks.set(mxEvent.getId(), playback);
+        playback.on(UPDATE_EVENT, (state) => this.onPlaybackStateChange(playback, mxEvent, state));
+        playback.clockInfo.liveData.onUpdate((clock) => this.onPlaybackClock(playback, mxEvent, clock));
+    }
+
+    private onPlaybackStateChange(playback: Playback, mxEvent: MatrixEvent, newState: PlaybackState) {
+        // Remember where the user got to in playback
+        const wasLastPlaying = this.currentPlaybackId === mxEvent.getId();
+        if (newState === PlaybackState.Stopped && this.clockStates.has(mxEvent.getId()) && !wasLastPlaying) {
+            // noinspection JSIgnoredPromiseFromCall
+            playback.skipTo(this.clockStates.get(mxEvent.getId()));
+        } else if (newState === PlaybackState.Stopped) {
+            // Remove the now-useless clock for some space savings
+            this.clockStates.delete(mxEvent.getId());
+
+            if (wasLastPlaying) {
+                this.recentFullPlays.add(this.currentPlaybackId);
+                const orderClone = arrayFastClone(this.playbackIdOrder);
+                const last = orderClone.pop();
+                if (last === this.currentPlaybackId) {
+                    const next = orderClone.pop();
+                    if (next) {
+                        const instance = this.playbacks.get(next);
+                        if (!instance) {
+                            console.warn(
+                                "Voice message queue desync: Missing playback for next message: "
+                                + `Current=${this.currentPlaybackId} Last=${last} Next=${next}`,
+                            );
+                        } else {
+                            this.playbackIdOrder = orderClone;
+                            PlaybackManager.instance.pauseAllExcept(instance);
+
+                            // This should cause a Play event, which will re-populate our playback order
+                            // and update our current playback ID.
+                            // noinspection JSIgnoredPromiseFromCall
+                            instance.play();
+                        }
+                    } else {
+                        // else no explicit next event, so find an event we haven't played that comes next. The live
+                        // timeline is already most recent last, so we can iterate down that.
+                        const timeline = arrayFastClone(this.room.getLiveTimeline().getEvents());
+                        let scanForVoiceMessage = false;
+                        let nextEv: MatrixEvent;
+                        for (const event of timeline) {
+                            if (event.getId() === mxEvent.getId()) {
+                                scanForVoiceMessage = true;
+                                continue;
+                            }
+                            if (!scanForVoiceMessage) continue;
+
+                            if (!isVoiceMessage(event)) {
+                                const evType = event.getType();
+                                if (evType !== EventType.RoomMessage && evType !== EventType.Sticker) {
+                                    continue; // Event can be skipped for automatic playback consideration
+                                }
+                                break; // Stop automatic playback: next useful event is not a voice message
+                            }
+
+                            const havePlayback = this.playbacks.has(event.getId());
+                            const isRecentlyCompleted = this.recentFullPlays.has(event.getId());
+                            if (havePlayback && !isRecentlyCompleted) {
+                                nextEv = event;
+                                break;
+                            }
+                        }
+                        if (!nextEv) {
+                            // if we don't have anywhere to go, reset the recent playback queue so the user
+                            // can start a new chain of playbacks.
+                            this.recentFullPlays = new Set<string>();
+                            this.playbackIdOrder = [];
+                        } else {
+                            this.playbackIdOrder = orderClone;
+
+                            const instance = this.playbacks.get(nextEv.getId());
+                            PlaybackManager.instance.pauseAllExcept(instance);
+
+                            // This should cause a Play event, which will re-populate our playback order
+                            // and update our current playback ID.
+                            // noinspection JSIgnoredPromiseFromCall
+                            instance.play();
+                        }
+                    }
+                } else {
+                    console.warn(
+                        "Voice message queue desync: Expected playback stop to be last in order. "
+                        + `Current=${this.currentPlaybackId} Last=${last} EventID=${mxEvent.getId()}`,
+                    );
+                }
+            }
+        }
+
+        if (newState === PlaybackState.Playing) {
+            const order = this.playbackIdOrder;
+            if (this.currentPlaybackId !== mxEvent.getId() && !!this.currentPlaybackId) {
+                if (order.length === 0 || order[order.length - 1] !== this.currentPlaybackId) {
+                    const lastInstance = this.playbacks.get(this.currentPlaybackId);
+                    if (
+                        lastInstance.currentState === PlaybackState.Playing
+                        || lastInstance.currentState === PlaybackState.Paused
+                    ) {
+                        order.push(this.currentPlaybackId);
+                    }
+                }
+            }
+
+            this.currentPlaybackId = mxEvent.getId();
+            if (order.length === 0 || order[order.length - 1] !== this.currentPlaybackId) {
+                order.push(this.currentPlaybackId);
+            }
+        }
+
+        // Only persist clock information on pause/stop (end) to avoid overwhelming the storage.
+        // This should get triggered from normal voice message component unmount due to the playback
+        // stopping itself for cleanup.
+        if (newState === PlaybackState.Paused || newState === PlaybackState.Stopped) {
+            this.persistClocks();
+        }
+    }
+
+    private onPlaybackClock(playback: Playback, mxEvent: MatrixEvent, clocks: number[]) {
+        if (playback.currentState === PlaybackState.Decoding) return; // ignore pre-ready values
+
+        if (playback.currentState !== PlaybackState.Stopped) {
+            this.clockStates.set(mxEvent.getId(), clocks[0]); // [0] is the current seek position
+        }
+    }
+}
diff --git a/src/voice/RecorderWorklet.ts b/src/audio/RecorderWorklet.ts
similarity index 54%
rename from src/voice/RecorderWorklet.ts
rename to src/audio/RecorderWorklet.ts
index 7343d37066..73b053db93 100644
--- a/src/voice/RecorderWorklet.ts
+++ b/src/audio/RecorderWorklet.ts
@@ -14,23 +14,44 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {IAmplitudePayload, ITimingPayload, PayloadEvent, WORKLET_NAME} from "./consts";
-import {percentageOf} from "../utils/numbers";
+import { IAmplitudePayload, ITimingPayload, PayloadEvent, WORKLET_NAME } from "./consts";
+import { percentageOf } from "../utils/numbers";
 
 // from AudioWorkletGlobalScope: https://developer.mozilla.org/en-US/docs/Web/API/AudioWorkletGlobalScope
 declare const currentTime: number;
 // declare const currentFrame: number;
 // declare const sampleRate: number;
 
+// We rate limit here to avoid overloading downstream consumers with amplitude information.
+// The two major consumers are the voice message waveform thumbnail (resampled down to an
+// appropriate length) and the live waveform shown to the user. Effectively, this controls
+// the refresh rate of that live waveform and the number of samples the thumbnail has to
+// work with.
+const TARGET_AMPLITUDE_FREQUENCY = 16; // Hz
+
+function roundTimeToTargetFreq(seconds: number): number {
+    // Epsilon helps avoid floating point rounding issues (1 + 1 = 1.999999, etc)
+    return Math.round((seconds + Number.EPSILON) * TARGET_AMPLITUDE_FREQUENCY) / TARGET_AMPLITUDE_FREQUENCY;
+}
+
+function nextTimeForTargetFreq(roundedSeconds: number): number {
+    // The extra round is just to make sure we cut off any floating point issues
+    return roundTimeToTargetFreq(roundedSeconds + (1 / TARGET_AMPLITUDE_FREQUENCY));
+}
+
 class MxVoiceWorklet extends AudioWorkletProcessor {
     private nextAmplitudeSecond = 0;
+    private amplitudeIndex = 0;
 
     process(inputs, outputs, parameters) {
-        // We only fire amplitude updates once a second to avoid flooding the recording instance
-        // with useless data. Much of the data would end up discarded, so we ratelimit ourselves
-        // here.
-        const currentSecond = Math.round(currentTime);
-        if (currentSecond === this.nextAmplitudeSecond) {
+        const currentSecond = roundTimeToTargetFreq(currentTime);
+        // We special case the first ping because there's a fairly good chance that we'll miss the zeroth
+        // update. Firefox for instance takes 0.06 seconds (roughly) to call this function for the first
+        // time. Edge and Chrome occasionally lag behind too, but for the most part are on time.
+        //
+        // When this doesn't work properly we end up producing a waveform of nulls and no live preview
+        // of the recorded message.
+        if (currentSecond === this.nextAmplitudeSecond || this.nextAmplitudeSecond === 0) {
             // We're expecting exactly one mono input source, so just grab the very first frame of
             // samples for the analysis.
             const monoChan = inputs[0][0];
@@ -47,13 +68,13 @@ class MxVoiceWorklet extends AudioWorkletProcessor {
             this.port.postMessage(<IAmplitudePayload>{
                 ev: PayloadEvent.AmplitudeMark,
                 amplitude: amplitude,
-                forSecond: currentSecond,
+                forIndex: this.amplitudeIndex++,
             });
-            this.nextAmplitudeSecond++;
+            this.nextAmplitudeSecond = nextTimeForTargetFreq(currentSecond);
         }
 
         // We mostly use this worklet to fire regular clock updates through to components
-        this.port.postMessage(<ITimingPayload>{ev: PayloadEvent.Timekeep, timeSeconds: currentTime});
+        this.port.postMessage(<ITimingPayload>{ ev: PayloadEvent.Timekeep, timeSeconds: currentTime });
 
         // We're supposed to return false when we're "done" with the audio clip, but seeing as
         // we are acting as a passive processor we are never truly "done". The browser will clean
diff --git a/src/voice/VoiceRecording.ts b/src/audio/VoiceRecording.ts
similarity index 74%
rename from src/voice/VoiceRecording.ts
rename to src/audio/VoiceRecording.ts
index fde5779fa2..67b2acda0c 100644
--- a/src/voice/VoiceRecording.ts
+++ b/src/audio/VoiceRecording.ts
@@ -16,17 +16,21 @@ 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 {SimpleObservable} from "matrix-widget-api";
-import {clamp, percentageOf, percentageWithin} from "../utils/numbers";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import MediaDeviceHandler from "../MediaDeviceHandler";
+import { SimpleObservable } from "matrix-widget-api";
 import EventEmitter from "events";
-import {IDestroyable} from "../utils/IDestroyable";
-import {Singleflight} from "../utils/Singleflight";
-import {PayloadEvent, WORKLET_NAME} from "./consts";
-import {UPDATE_EVENT} from "../stores/AsyncStore";
-import {Playback} from "./Playback";
-import {createAudioContext} from "./compat";
+import { IDestroyable } from "../utils/IDestroyable";
+import { Singleflight } from "../utils/Singleflight";
+import { PayloadEvent, WORKLET_NAME } from "./consts";
+import { UPDATE_EVENT } from "../stores/AsyncStore";
+import { Playback } from "./Playback";
+import { createAudioContext } from "./compat";
+import { IEncryptedFile } from "matrix-js-sdk/src/@types/event";
+import { uploadFile } from "../ContentMessages";
+import { FixedRollingArray } from "../utils/FixedRollingArray";
+import { clamp } from "../utils/numbers";
+import mxRecorderWorkletPath from "./RecorderWorklet";
 
 const CHANNELS = 1; // stereo isn't important
 export const SAMPLE_RATE = 48000; // 48khz is what WebRTC uses. 12khz is where we lose quality.
@@ -49,20 +53,25 @@ export enum RecordingState {
     Uploaded = "uploaded",
 }
 
+export interface IUpload {
+    mxc?: string; // for unencrypted uploads
+    encrypted?: IEncryptedFile;
+}
+
 export class VoiceRecording extends EventEmitter implements IDestroyable {
     private recorder: Recorder;
     private recorderContext: AudioContext;
     private recorderSource: MediaStreamAudioSourceNode;
     private recorderStream: MediaStream;
-    private recorderFFT: AnalyserNode;
     private recorderWorklet: AudioWorkletNode;
     private recorderProcessor: ScriptProcessorNode;
     private buffer = new Uint8Array(0); // use this.audioBuffer to access
-    private mxc: string;
+    private lastUpload: IUpload;
     private recording = false;
     private observable: SimpleObservable<IRecordingUpdate>;
     private amplitudes: number[] = []; // at each second mark, generated
     private playback: Playback;
+    private liveWaveform = new FixedRollingArray(RECORDING_PLAYBACK_SAMPLES, 0);
 
     public constructor(private client: MatrixClient) {
         super();
@@ -97,34 +106,18 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
                 audio: {
                     channelCount: CHANNELS,
                     noiseSuppression: true, // browsers ignore constraints they can't honour
-                    deviceId: CallMediaHandler.getAudioInput(),
+                    deviceId: MediaDeviceHandler.getAudioInput(),
                 },
             });
             this.recorderContext = createAudioContext({
                 // latencyHint: "interactive", // we don't want a latency hint (this causes data smoothing)
             });
             this.recorderSource = this.recorderContext.createMediaStreamSource(this.recorderStream);
-            this.recorderFFT = this.recorderContext.createAnalyser();
-
-            // Bring the FFT time domain down a bit. The default is 2048, and this must be a power
-            // of two. We use 64 points because we happen to know down the line we need less than
-            // that, but 32 would be too few. Large numbers are not helpful here and do not add
-            // precision: they introduce higher precision outputs of the FFT (frequency data), but
-            // it makes the time domain less than helpful.
-            this.recorderFFT.fftSize = 64;
-
-            // Set up our worklet. We use this for timing information and waveform analysis: the
-            // web audio API prefers this be done async to avoid holding the main thread with math.
-            const mxRecorderWorkletPath = document.body.dataset.vectorRecorderWorkletScript;
-            if (!mxRecorderWorkletPath) {
-                // noinspection ExceptionCaughtLocallyJS
-                throw new Error("Unable to create recorder: no worklet script registered");
-            }
 
             // Connect our inputs and outputs
-            this.recorderSource.connect(this.recorderFFT);
-
             if (this.recorderContext.audioWorklet) {
+                // Set up our worklet. We use this for timing information and waveform analysis: the
+                // web audio API prefers this be done async to avoid holding the main thread with math.
                 await this.recorderContext.audioWorklet.addModule(mxRecorderWorkletPath);
                 this.recorderWorklet = new AudioWorkletNode(this.recorderContext, WORKLET_NAME);
                 this.recorderSource.connect(this.recorderWorklet);
@@ -138,8 +131,9 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
                             break;
                         case PayloadEvent.AmplitudeMark:
                             // Sanity check to make sure we're adding about one sample per second
-                            if (ev.data['forSecond'] === this.amplitudes.length) {
+                            if (ev.data['forIndex'] === this.amplitudes.length) {
                                 this.amplitudes.push(ev.data['amplitude']);
+                                this.liveWaveform.pushValue(ev.data['amplitude']);
                             }
                             break;
                     }
@@ -214,13 +208,6 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
         return this.buffer.length > 0;
     }
 
-    public get mxcUri(): string {
-        if (!this.mxc) {
-            throw new Error("Recording has not been uploaded yet");
-        }
-        return this.mxc;
-    }
-
     private onAudioProcess = (ev: AudioProcessingEvent) => {
         this.processAudioUpdate(ev.playbackTime);
 
@@ -231,36 +218,8 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
     private processAudioUpdate = (timeSeconds: number) => {
         if (!this.recording) return;
 
-        // The time domain is the input to the FFT, which means we use an array of the same
-        // size. The time domain is also known as the audio waveform. We're ignoring the
-        // output of the FFT here (frequency data) because we're not interested in it.
-        const data = new Float32Array(this.recorderFFT.fftSize);
-        if (!this.recorderFFT.getFloatTimeDomainData) {
-            // Safari compat
-            const data2 = new Uint8Array(this.recorderFFT.fftSize);
-            this.recorderFFT.getByteTimeDomainData(data2);
-            for (let i = 0; i < data2.length; i++) {
-                data[i] = percentageWithin(percentageOf(data2[i], 0, 256), -1, 1);
-            }
-        } else {
-            this.recorderFFT.getFloatTimeDomainData(data);
-        }
-
-        // We can't just `Array.from()` the array because we're dealing with 32bit floats
-        // and the built-in function won't consider that when converting between numbers.
-        // However, the runtime will convert the float32 to a float64 during the math operations
-        // which is why the loop works below. Note that a `.map()` call also doesn't work
-        // and will instead return a Float32Array still.
-        const translatedData: number[] = [];
-        for (let i = 0; i < data.length; i++) {
-            // We're clamping the values so we can do that math operation mentioned above,
-            // and to ensure that we produce consistent data (it's possible for the array
-            // to exceed the specified range with some audio input devices).
-            translatedData.push(clamp(data[i], 0, 1));
-        }
-
         this.observable.update({
-            waveform: translatedData,
+            waveform: this.liveWaveform.value.map(v => clamp(v, 0, 1)),
             timeSeconds: timeSeconds,
         });
 
@@ -283,14 +242,14 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
             this.stop();
         } else if (secondsLeft <= TARGET_WARN_TIME_LEFT) {
             Singleflight.for(this, "ending_soon").do(() => {
-                this.emit(RecordingState.EndingSoon, {secondsLeft});
+                this.emit(RecordingState.EndingSoon, { secondsLeft });
                 return Singleflight.Void;
             });
         }
     };
 
     public async start(): Promise<void> {
-        if (this.mxc || this.hasRecording) {
+        if (this.lastUpload || this.hasRecording) {
             throw new Error("Recording already prepared");
         }
         if (this.recording) {
@@ -362,20 +321,24 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
         this.observable.close();
     }
 
-    public async upload(): Promise<string> {
+    public async upload(inRoomId: string): Promise<IUpload> {
         if (!this.hasRecording) {
             throw new Error("No recording available to upload");
         }
 
-        if (this.mxc) return this.mxc;
+        if (this.lastUpload) return this.lastUpload;
 
-        this.emit(RecordingState.Uploading);
-        this.mxc = await this.client.uploadContent(new Blob([this.audioBuffer], {
-            type: this.contentType,
-        }), {
-            onlyContentUri: false, // to stop the warnings in the console
-        }).then(r => r['content_uri']);
-        this.emit(RecordingState.Uploaded);
-        return this.mxc;
+        try {
+            this.emit(RecordingState.Uploading);
+            const { url: mxc, file: encrypted } = await uploadFile(this.client, inRoomId, new Blob([this.audioBuffer], {
+                type: this.contentType,
+            }));
+            this.lastUpload = { mxc, encrypted };
+            this.emit(RecordingState.Uploaded);
+        } catch (e) {
+            this.emit(RecordingState.Ended);
+            throw e;
+        }
+        return this.lastUpload;
     }
 }
diff --git a/src/voice/compat.ts b/src/audio/compat.ts
similarity index 88%
rename from src/voice/compat.ts
rename to src/audio/compat.ts
index 316d779e28..37cbf4bb7b 100644
--- a/src/voice/compat.ts
+++ b/src/audio/compat.ts
@@ -14,13 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {SAMPLE_RATE} from "./VoiceRecording";
+import { SAMPLE_RATE } from "./VoiceRecording";
 
 // @ts-ignore - we know that this is not a module. We're looking for a path.
 import decoderWasmPath from 'opus-recorder/dist/decoderWorker.min.wasm';
 import wavEncoderPath from 'opus-recorder/dist/waveWorker.min.js';
 import decoderPath from 'opus-recorder/dist/decoderWorker.min.js';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export function createAudioContext(opts?: AudioContextOptions): AudioContext {
     if (window.AudioContext) {
         return new AudioContext(opts);
@@ -38,7 +40,7 @@ export function decodeOgg(audioBuffer: ArrayBuffer): Promise<ArrayBuffer> {
     // Condensed version of decoder example, using a promise:
     // https://github.com/chris-rudmin/opus-recorder/blob/master/example/decoder.html
     return new Promise((resolve) => { // no reject because the workers don't seem to have a fail path
-        console.log("Decoder WASM path: " + decoderWasmPath); // so we use the variable (avoid tree shake)
+        logger.log("Decoder WASM path: " + decoderWasmPath); // so we use the variable (avoid tree shake)
         const typedArray = new Uint8Array(audioBuffer);
         const decoderWorker = new Worker(decoderPath);
         const wavWorker = new Worker(wavEncoderPath);
@@ -57,7 +59,7 @@ export function decodeOgg(audioBuffer: ArrayBuffer): Promise<ArrayBuffer> {
 
         decoderWorker.onmessage = (ev) => {
             if (ev.data === null) { // null == done
-                wavWorker.postMessage({command: 'done'});
+                wavWorker.postMessage({ command: 'done' });
                 return;
             }
 
@@ -70,7 +72,7 @@ export function decodeOgg(audioBuffer: ArrayBuffer): Promise<ArrayBuffer> {
         wavWorker.onmessage = (ev) => {
             if (ev.data.message === 'page') {
                 // The encoding comes through as a single page
-                resolve(new Blob([ev.data.page], {type: "audio/wav"}).arrayBuffer());
+                resolve(new Blob([ev.data.page], { type: "audio/wav" }).arrayBuffer());
             }
         };
 
diff --git a/src/voice/consts.ts b/src/audio/consts.ts
similarity index 97%
rename from src/voice/consts.ts
rename to src/audio/consts.ts
index c530c60f0b..39e9b30904 100644
--- a/src/voice/consts.ts
+++ b/src/audio/consts.ts
@@ -32,6 +32,6 @@ export interface ITimingPayload extends IPayload {
 
 export interface IAmplitudePayload extends IPayload {
     ev: PayloadEvent.AmplitudeMark;
-    forSecond: number;
+    forIndex: number;
     amplitude: number;
 }
diff --git a/src/autocomplete/AutocompleteProvider.tsx b/src/autocomplete/AutocompleteProvider.tsx
index 2242fec914..2d82a9f591 100644
--- a/src/autocomplete/AutocompleteProvider.tsx
+++ b/src/autocomplete/AutocompleteProvider.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import type {ICompletion, ISelectionRange} from './Autocompleter';
+import type { ICompletion, ISelectionRange } from './Autocompleter';
 
 export interface ICommand {
     command: string | null;
@@ -27,11 +27,11 @@ export interface ICommand {
     };
 }
 
-export default class AutocompleteProvider {
+export default abstract class AutocompleteProvider {
     commandRegex: RegExp;
     forcedCommandRegex: RegExp;
 
-    constructor(commandRegex?: RegExp, forcedCommandRegex?: RegExp) {
+    protected constructor(commandRegex?: RegExp, forcedCommandRegex?: RegExp) {
         if (commandRegex) {
             if (!commandRegex.global) {
                 throw new Error('commandRegex must have global flag set');
@@ -93,23 +93,16 @@ export default class AutocompleteProvider {
         };
     }
 
-    async getCompletions(
+    abstract getCompletions(
         query: string,
         selection: ISelectionRange,
-        force = false,
-        limit = -1,
-    ): Promise<ICompletion[]> {
-        return [];
-    }
+        force: boolean,
+        limit: number,
+    ): Promise<ICompletion[]>;
 
-    getName(): string {
-        return 'Default Provider';
-    }
+    abstract getName(): string;
 
-    renderCompletions(completions: React.ReactNode[]): React.ReactNode | null {
-        console.error('stub; should be implemented in subclasses');
-        return null;
-    }
+    abstract renderCompletions(completions: React.ReactNode[]): React.ReactNode | null;
 
     // Whether we should provide completions even if triggered forcefully, without a sigil.
     shouldForceComplete(): boolean {
diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts
index 5409825f45..4c9e82f290 100644
--- a/src/autocomplete/Autocompleter.ts
+++ b/src/autocomplete/Autocompleter.ts
@@ -15,19 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ReactElement} from 'react';
-import Room from 'matrix-js-sdk/src/models/room';
+import { ReactElement } from 'react';
+import { Room } from 'matrix-js-sdk/src/models/room';
+
 import CommandProvider from './CommandProvider';
 import CommunityProvider from './CommunityProvider';
-import DuckDuckGoProvider from './DuckDuckGoProvider';
 import RoomProvider from './RoomProvider';
 import UserProvider from './UserProvider';
 import EmojiProvider from './EmojiProvider';
 import NotifProvider from './NotifProvider';
-import {timeout} from "../utils/promise";
-import AutocompleteProvider, {ICommand} from "./AutocompleteProvider";
-import SettingsStore from "../settings/SettingsStore";
+import { timeout } from "../utils/promise";
+import AutocompleteProvider, { ICommand } from "./AutocompleteProvider";
 import SpaceProvider from "./SpaceProvider";
+import SpaceStore from "../stores/SpaceStore";
 
 export interface ISelectionRange {
     beginning?: boolean; // whether the selection is in the first block of the editor or not
@@ -54,13 +54,12 @@ const PROVIDERS = [
     EmojiProvider,
     NotifProvider,
     CommandProvider,
-    CommunityProvider,
-    DuckDuckGoProvider,
 ];
 
-// as the spaces feature is device configurable only, and toggling it refreshes the page, we can do this here
-if (SettingsStore.getValue("feature_spaces")) {
+if (SpaceStore.spacesEnabled) {
     PROVIDERS.push(SpaceProvider);
+} else {
+    PROVIDERS.push(CommunityProvider);
 }
 
 // Providers will get rejected if they take longer than this.
diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx
index 9de25c0d84..143b7e4cdc 100644
--- a/src/autocomplete/CommandProvider.tsx
+++ b/src/autocomplete/CommandProvider.tsx
@@ -18,12 +18,12 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from '../languageHandler';
+import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
-import {TextualCompletion} from './Components';
-import {ICompletion, ISelectionRange} from "./Autocompleter";
-import {Command, Commands, CommandMap} from '../SlashCommands';
+import { TextualCompletion } from './Components';
+import { ICompletion, ISelectionRange } from "./Autocompleter";
+import { Command, Commands, CommandMap } from '../SlashCommands';
 
 const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
@@ -34,7 +34,7 @@ export default class CommandProvider extends AutocompleteProvider {
         super(COMMAND_RE);
         this.matcher = new QueryMatcher(Commands, {
             keys: ['command', 'args', 'description'],
-            funcs: [({aliases}) => aliases.join(" ")], // aliases
+            funcs: [({ aliases }) => aliases.join(" ")], // aliases
         });
     }
 
@@ -44,7 +44,7 @@ export default class CommandProvider extends AutocompleteProvider {
         force?: boolean,
         limit = -1,
     ): Promise<ICompletion[]> {
-        const {command, range} = this.getCurrentCommand(query, selection);
+        const { command, range } = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
         let matches = [];
@@ -53,7 +53,7 @@ export default class CommandProvider extends AutocompleteProvider {
             // The input looks like a command with arguments, perform exact match
             const name = command[1].substr(1); // strip leading `/`
             if (CommandMap.has(name) && CommandMap.get(name).isEnabled()) {
-                // some commands, namely `me` and `ddg` don't suit having the usage shown whilst typing their arguments
+                // some commands, namely `me` don't suit having the usage shown whilst typing their arguments
                 if (CommandMap.get(name).hideCompletionAfterSpace) return [];
                 matches = [CommandMap.get(name)];
             }
@@ -68,7 +68,6 @@ export default class CommandProvider extends AutocompleteProvider {
             }
         }
 
-
         return matches.filter(cmd => cmd.isEnabled()).map((result) => {
             let completion = result.getCommand() + ' ';
             const usedAlias = result.aliases.find(alias => `/${alias}` === command[1]);
@@ -96,8 +95,8 @@ export default class CommandProvider extends AutocompleteProvider {
     renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div
-                className="mx_Autocomplete_Completion_container_block"
-                role="listbox"
+                className="mx_Autocomplete_Completion_container_pill"
+                role="presentation"
                 aria-label={_t("Command Autocomplete")}
             >
                 { completions }
diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx
index c9358b0c61..4b42f4c64e 100644
--- a/src/autocomplete/CommunityProvider.tsx
+++ b/src/autocomplete/CommunityProvider.tsx
@@ -19,15 +19,15 @@ import React from 'react';
 import Group from "matrix-js-sdk/src/models/group";
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
-import {PillCompletion} from './Components';
-import * as sdk from '../index';
-import {sortBy} from "lodash";
-import {makeGroupPermalink} from "../utils/permalinks/Permalinks";
-import {ICompletion, ISelectionRange} from "./Autocompleter";
+import { PillCompletion } from './Components';
+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";
+import { mediaFromMxc } from "../customisations/Media";
+import BaseAvatar from '../components/views/avatars/BaseAvatar';
 
 const COMMUNITY_REGEX = /\B\+\S*/g;
 
@@ -56,8 +56,6 @@ export default class CommunityProvider extends AutocompleteProvider {
         force = false,
         limit = -1,
     ): Promise<ICompletion[]> {
-        const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
-
         // Disable autocompletions when composing commands because of various issues
         // (see https://github.com/vector-im/element-web/issues/4762)
         if (/^(\/join|\/leave)/.test(query)) {
@@ -66,11 +64,11 @@ export default class CommunityProvider extends AutocompleteProvider {
 
         const cli = MatrixClientPeg.get();
         let completions = [];
-        const {command, range} = this.getCurrentCommand(query, selection, force);
+        const { command, range } = this.getCurrentCommand(query, selection, force);
         if (command) {
-            const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership === 'join');
+            const joinedGroups = cli.getGroups().filter(({ myMembership }) => myMembership === 'join');
 
-            const groups = (await Promise.all(joinedGroups.map(async ({groupId}) => {
+            const groups = (await Promise.all(joinedGroups.map(async ({ groupId }) => {
                 try {
                     return FlairStore.getGroupProfileCached(cli, groupId);
                 } catch (e) { // if FlairStore failed, fall back to just groupId
@@ -90,7 +88,7 @@ export default class CommunityProvider extends AutocompleteProvider {
             completions = sortBy(completions, [
                 (c) => score(matchedString, c.groupId),
                 (c) => c.groupId.length,
-            ]).map(({avatarUrl, groupId, name}) => ({
+            ]).map(({ avatarUrl, groupId, name }) => ({
                 completion: groupId,
                 suffix: ' ',
                 type: "community",
@@ -118,7 +116,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
-                role="listbox"
+                role="presentation"
                 aria-label={_t("Community Autocomplete")}
             >
                 { completions }
diff --git a/src/autocomplete/Components.tsx b/src/autocomplete/Components.tsx
index 4b0d35698d..8f155f7f55 100644
--- a/src/autocomplete/Components.tsx
+++ b/src/autocomplete/Components.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {forwardRef} from 'react';
+import React, { forwardRef } from 'react';
 import classNames from 'classnames';
 
 /* These were earlier stateless functional components but had to be converted
@@ -31,7 +31,7 @@ interface ITextualCompletionProps {
 }
 
 export const TextualCompletion = forwardRef<ITextualCompletionProps, any>((props, ref) => {
-    const {title, subtitle, description, className, ...restProps} = props;
+    const { title, subtitle, description, className, ...restProps } = props;
     return (
         <div {...restProps}
             className={classNames('mx_Autocomplete_Completion_block', className)}
@@ -50,7 +50,7 @@ interface IPillCompletionProps extends ITextualCompletionProps {
 }
 
 export const PillCompletion = forwardRef<IPillCompletionProps, any>((props, ref) => {
-    const {title, subtitle, description, className, children, ...restProps} = props;
+    const { title, subtitle, description, className, children, ...restProps } = props;
     return (
         <div {...restProps}
             className={classNames('mx_Autocomplete_Completion_pill', className)}
diff --git a/src/autocomplete/DuckDuckGoProvider.tsx b/src/autocomplete/DuckDuckGoProvider.tsx
deleted file mode 100644
index 3ef9cc2f6f..0000000000
--- a/src/autocomplete/DuckDuckGoProvider.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-Copyright 2016 Aviral Dasgupta
-Copyright 2017 Vector Creations Ltd
-Copyright 2017, 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { _t } from '../languageHandler';
-import AutocompleteProvider from './AutocompleteProvider';
-
-import {TextualCompletion} from './Components';
-import {ICompletion, ISelectionRange} from "./Autocompleter";
-
-const DDG_REGEX = /\/ddg\s+(.+)$/g;
-const REFERRER = 'vector';
-
-export default class DuckDuckGoProvider extends AutocompleteProvider {
-    constructor() {
-        super(DDG_REGEX);
-    }
-
-    static getQueryUri(query: string) {
-        return `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}`
-         + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`;
-    }
-
-    async getCompletions(
-        query: string,
-        selection: ISelectionRange,
-        force = false,
-        limit = -1,
-    ): Promise<ICompletion[]> {
-        const {command, range} = this.getCurrentCommand(query, selection);
-        if (!query || !command) {
-            return [];
-        }
-
-        const response = await fetch(DuckDuckGoProvider.getQueryUri(command[1]), {
-            method: 'GET',
-        });
-        const json = await response.json();
-        const maxLength = limit > -1 ? limit : json.Results.length;
-        const results = json.Results.slice(0, maxLength).map((result) => {
-            return {
-                completion: result.Text,
-                component: (
-                    <TextualCompletion
-                        title={result.Text}
-                        description={result.Result} />
-                ),
-                range,
-            };
-        });
-        if (json.Answer) {
-            results.unshift({
-                completion: json.Answer,
-                component: (
-                    <TextualCompletion
-                        title={json.Answer}
-                        description={json.AnswerType} />
-                ),
-                range,
-            });
-        }
-        if (json.RelatedTopics && json.RelatedTopics.length > 0) {
-            results.unshift({
-                completion: json.RelatedTopics[0].Text,
-                component: (
-                    <TextualCompletion
-                        title={json.RelatedTopics[0].Text} />
-                ),
-                range,
-            });
-        }
-        if (json.AbstractText) {
-            results.unshift({
-                completion: json.AbstractText,
-                component: (
-                    <TextualCompletion
-                        title={json.AbstractText} />
-                ),
-                range,
-            });
-        }
-        return results;
-    }
-
-    getName() {
-        return '🔍 ' + _t('Results from DuckDuckGo');
-    }
-
-    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
-        return (
-            <div
-                className="mx_Autocomplete_Completion_container_block"
-                role="listbox"
-                aria-label={_t("DuckDuckGo Results")}
-            >
-                { completions }
-            </div>
-        );
-    }
-}
diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index b7c4a5120a..326651e037 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -21,11 +21,10 @@ import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
-import {PillCompletion} from './Components';
-import {ICompletion, ISelectionRange} from './Autocompleter';
-import {uniq, sortBy} from 'lodash';
+import { PillCompletion } from './Components';
+import { ICompletion, ISelectionRange } from './Autocompleter';
+import { uniq, sortBy } from 'lodash';
 import SettingsStore from "../settings/SettingsStore";
-import { shortcodeToUnicode } from '../HtmlUtils';
 import { EMOJI, IEmoji } from '../emoji';
 
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
@@ -36,20 +35,18 @@ const LIMIT = 20;
 // anchored to only match from the start of parts otherwise it'll show emoji suggestions whilst typing matrix IDs
 const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|(?:^|\\s):[+-\\w]*:?)$', 'g');
 
-interface IEmojiShort {
+interface ISortedEmoji {
     emoji: IEmoji;
-    shortname: string;
     _orderBy: number;
 }
 
-const EMOJI_SHORTNAMES: IEmojiShort[] = EMOJI.sort((a, b) => {
+const SORTED_EMOJI: ISortedEmoji[] = EMOJI.sort((a, b) => {
     if (a.group === b.group) {
         return a.order - b.order;
     }
     return a.group - b.group;
 }).map((emoji, index) => ({
     emoji,
-    shortname: `:${emoji.shortcodes[0]}:`,
     // Include the index so that we can preserve the original order
     _orderBy: index,
 }));
@@ -64,20 +61,18 @@ function score(query, space) {
 }
 
 export default class EmojiProvider extends AutocompleteProvider {
-    matcher: QueryMatcher<IEmojiShort>;
-    nameMatcher: QueryMatcher<IEmojiShort>;
+    matcher: QueryMatcher<ISortedEmoji>;
+    nameMatcher: QueryMatcher<ISortedEmoji>;
 
     constructor() {
         super(EMOJI_REGEX);
-        this.matcher = new QueryMatcher<IEmojiShort>(EMOJI_SHORTNAMES, {
-            keys: ['emoji.emoticon', 'shortname'],
-            funcs: [
-                (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases
-            ],
+        this.matcher = new QueryMatcher<ISortedEmoji>(SORTED_EMOJI, {
+            keys: [],
+            funcs: [o => o.emoji.shortcodes.map(s => `:${s}:`)],
             // For matching against ascii equivalents
             shouldMatchWordsOnly: false,
         });
-        this.nameMatcher = new QueryMatcher(EMOJI_SHORTNAMES, {
+        this.nameMatcher = new QueryMatcher(SORTED_EMOJI, {
             keys: ['emoji.annotation'],
             // For removing punctuation
             shouldMatchWordsOnly: true,
@@ -95,8 +90,9 @@ export default class EmojiProvider extends AutocompleteProvider {
         }
 
         let completions = [];
-        const {command, range} = this.getCurrentCommand(query, selection);
-        if (command) {
+        const { command, range } = this.getCurrentCommand(query, selection);
+
+        if (command && command[0].length > 2) {
             const matchedString = command[0];
             completions = this.matcher.match(matchedString, limit);
 
@@ -105,34 +101,33 @@ export default class EmojiProvider extends AutocompleteProvider {
 
             const sorters = [];
             // make sure that emoticons come first
-            sorters.push((c) => score(matchedString, c.emoji.emoticon || ""));
+            sorters.push(c => score(matchedString, c.emoji.emoticon || ""));
 
-            // then sort by score (Infinity if matchedString not in shortname)
-            sorters.push((c) => score(matchedString, c.shortname));
+            // then sort by score (Infinity if matchedString not in shortcode)
+            sorters.push(c => score(matchedString, c.emoji.shortcodes[0]));
             // then sort by max score of all shortcodes, trim off the `:`
-            sorters.push((c) => Math.min(...c.emoji.shortcodes.map(s => score(matchedString.substring(1), s))));
-            // If the matchedString is not empty, sort by length of shortname. Example:
+            sorters.push(c => Math.min(
+                ...c.emoji.shortcodes.map(s => score(matchedString.substring(1), s)),
+            ));
+            // If the matchedString is not empty, sort by length of shortcode. Example:
             //  matchedString = ":bookmark"
             //  completions = [":bookmark:", ":bookmark_tabs:", ...]
             if (matchedString.length > 1) {
-                sorters.push((c) => c.shortname.length);
+                sorters.push(c => c.emoji.shortcodes[0].length);
             }
             // Finally, sort by original ordering
-            sorters.push((c) => c._orderBy);
+            sorters.push(c => c._orderBy);
             completions = sortBy(uniq(completions), sorters);
 
-            completions = completions.map(({shortname}) => {
-                const unicode = shortcodeToUnicode(shortname);
-                return {
-                    completion: unicode,
-                    component: (
-                        <PillCompletion title={shortname} aria-label={unicode}>
-                            <span>{ unicode }</span>
-                        </PillCompletion>
-                    ),
-                    range,
-                };
-            }).slice(0, LIMIT);
+            completions = completions.map(c => ({
+                completion: c.emoji.unicode,
+                component: (
+                    <PillCompletion title={`:${c.emoji.shortcodes[0]}:`} aria-label={c.emoji.unicode}>
+                        <span>{ c.emoji.unicode }</span>
+                    </PillCompletion>
+                ),
+                range,
+            })).slice(0, LIMIT);
         }
         return completions;
     }
@@ -145,7 +140,7 @@ export default class EmojiProvider extends AutocompleteProvider {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill"
-                role="listbox"
+                role="presentation"
                 aria-label={_t("Emoji Autocomplete")}
             >
                 { completions }
diff --git a/src/autocomplete/NotifProvider.tsx b/src/autocomplete/NotifProvider.tsx
index 0bc7ead097..aa4f1174dc 100644
--- a/src/autocomplete/NotifProvider.tsx
+++ b/src/autocomplete/NotifProvider.tsx
@@ -15,13 +15,14 @@ limitations under the License.
 */
 
 import React from 'react';
-import Room from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
+
 import AutocompleteProvider from './AutocompleteProvider';
 import { _t } from '../languageHandler';
-import {MatrixClientPeg} from '../MatrixClientPeg';
-import {PillCompletion} from './Components';
-import * as sdk from '../index';
-import {ICompletion, ISelectionRange} from "./Autocompleter";
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import { PillCompletion } from './Components';
+import { ICompletion, ISelectionRange } from "./Autocompleter";
+import RoomAvatar from '../components/views/avatars/RoomAvatar';
 
 const AT_ROOM_REGEX = /@\S*/g;
 
@@ -39,13 +40,11 @@ export default class NotifProvider extends AutocompleteProvider {
         force = false,
         limit = -1,
     ): Promise<ICompletion[]> {
-        const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
-
         const client = MatrixClientPeg.get();
 
         if (!this.room.currentState.mayTriggerNotifOfType('room', client.credentials.userId)) return [];
 
-        const {command, range} = this.getCurrentCommand(query, selection, force);
+        const { command, range } = this.getCurrentCommand(query, selection, force);
         if (command && command[0] && '@room'.startsWith(command[0]) && command[0].length > 1) {
             return [{
                 completion: '@room',
@@ -71,7 +70,7 @@ export default class NotifProvider extends AutocompleteProvider {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
-                role="listbox"
+                role="presentation"
                 aria-label={_t("Notification Autocomplete")}
             >
                 { completions }
diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts
index 73bb37ff0f..3948be301c 100644
--- a/src/autocomplete/QueryMatcher.ts
+++ b/src/autocomplete/QueryMatcher.ts
@@ -16,8 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {at, uniq} from 'lodash';
-import {removeHiddenChars} from "matrix-js-sdk/src/utils";
+import { at, uniq } from 'lodash';
+import { removeHiddenChars } from "matrix-js-sdk/src/utils";
 
 interface IOptions<T extends {}> {
     keys: Array<string | keyof T>;
@@ -112,7 +112,7 @@ export default class QueryMatcher<T extends Object> {
             const index = resultKey.indexOf(query);
             if (index !== -1) {
                 matches.push(
-                    ...candidates.map((candidate) => ({index, ...candidate})),
+                    ...candidates.map((candidate) => ({ index, ...candidate })),
                 );
             }
         }
diff --git a/src/autocomplete/RoomProvider.tsx b/src/autocomplete/RoomProvider.tsx
index ad55b19101..00bfe6be5c 100644
--- a/src/autocomplete/RoomProvider.tsx
+++ b/src/autocomplete/RoomProvider.tsx
@@ -17,28 +17,24 @@ limitations under the License.
 */
 
 import React from "react";
-import {uniqBy, sortBy} from "lodash";
-import Room from "matrix-js-sdk/src/models/room";
+import { uniqBy, sortBy } from "lodash";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
-import {PillCompletion} from './Components';
-import {makeRoomPermalink} from "../utils/permalinks/Permalinks";
-import {ICompletion, ISelectionRange} from "./Autocompleter";
+import { PillCompletion } from './Components';
+import { makeRoomPermalink } from "../utils/permalinks/Permalinks";
+import { ICompletion, ISelectionRange } from "./Autocompleter";
 import RoomAvatar from '../components/views/avatars/RoomAvatar';
-import SettingsStore from "../settings/SettingsStore";
+import SpaceStore from "../stores/SpaceStore";
 
 const ROOM_REGEX = /\B#\S*/g;
 
-function score(query: string, space: string) {
-    const index = space.indexOf(query);
-    if (index === -1) {
-        return Infinity;
-    } else {
-        return index;
-    }
+// Prefer canonical aliases over non-canonical ones
+function canonicalScore(displayedAlias: string, room: Room): number {
+    return displayedAlias === room.getCanonicalAlias() ? 0 : 1;
 }
 
 function matcherObject(room: Room, displayedAlias: string, matchName = "") {
@@ -63,7 +59,8 @@ export default class RoomProvider extends AutocompleteProvider {
         const cli = MatrixClientPeg.get();
         let rooms = cli.getVisibleRooms();
 
-        if (SettingsStore.getValue("feature_spaces")) {
+        // if spaces are enabled then filter them out here as they get their own autocomplete provider
+        if (SpaceStore.spacesEnabled) {
             rooms = rooms.filter(r => !r.isSpaceRoom());
         }
 
@@ -77,7 +74,7 @@ export default class RoomProvider extends AutocompleteProvider {
         limit = -1,
     ): Promise<ICompletion[]> {
         let completions = [];
-        const {command, range} = this.getCurrentCommand(query, selection, force);
+        const { command, range } = this.getCurrentCommand(query, selection, force);
         if (command) {
             // the only reason we need to do this is because Fuse only matches on properties
             let matcherObjects = this.getRooms().reduce((aliases, room) => {
@@ -106,7 +103,7 @@ export default class RoomProvider extends AutocompleteProvider {
             const matchedString = command[0];
             completions = this.matcher.match(matchedString, limit);
             completions = sortBy(completions, [
-                (c) => score(matchedString, c.displayedAlias),
+                (c) => canonicalScore(c.displayedAlias, c.room),
                 (c) => c.displayedAlias.length,
             ]);
             completions = uniqBy(completions, (match) => match.room);
@@ -137,7 +134,7 @@ export default class RoomProvider extends AutocompleteProvider {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
-                role="listbox"
+                role="presentation"
                 aria-label={_t("Room Autocomplete")}
             >
                 { completions }
diff --git a/src/autocomplete/SpaceProvider.tsx b/src/autocomplete/SpaceProvider.tsx
index 0361a2c91e..1c99aee5ac 100644
--- a/src/autocomplete/SpaceProvider.tsx
+++ b/src/autocomplete/SpaceProvider.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 
 import { _t } from '../languageHandler';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import RoomProvider from "./RoomProvider";
 
 export default class SpaceProvider extends RoomProvider {
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 3cf43d0b84..48854657de 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -20,19 +20,19 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import {PillCompletion} from './Components';
-import * as sdk from '../index';
+import { PillCompletion } from './Components';
 import QueryMatcher from './QueryMatcher';
-import {sortBy} from 'lodash';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { sortBy } from 'lodash';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 
-import MatrixEvent from "matrix-js-sdk/src/models/event";
-import Room from "matrix-js-sdk/src/models/room";
-import RoomMember from "matrix-js-sdk/src/models/room-member";
-import RoomState from "matrix-js-sdk/src/models/room-state";
-import EventTimeline from "matrix-js-sdk/src/models/event-timeline";
-import {makeUserPermalink} from "../utils/permalinks/Permalinks";
-import {ICompletion, ISelectionRange} from "./Autocompleter";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
+import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline";
+import { makeUserPermalink } from "../utils/permalinks/Permalinks";
+import { ICompletion, ISelectionRange } from "./Autocompleter";
+import MemberAvatar from '../components/views/avatars/MemberAvatar';
 
 const USER_REGEX = /\B@\S*/g;
 
@@ -108,13 +108,11 @@ export default class UserProvider extends AutocompleteProvider {
         force = false,
         limit = -1,
     ): Promise<ICompletion[]> {
-        const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
-
         // lazy-load user list into matcher
-        if (!this.users) this._makeUsers();
+        if (!this.users) this.makeUsers();
 
         let completions = [];
-        const {command, range} = this.getCurrentCommand(rawQuery, selection, force);
+        const { command, range } = this.getCurrentCommand(rawQuery, selection, force);
 
         if (!command) return completions;
 
@@ -149,7 +147,7 @@ export default class UserProvider extends AutocompleteProvider {
         return _t('Users');
     }
 
-    _makeUsers() {
+    private makeUsers() {
         const events = this.room.getLiveTimeline().getEvents();
         const lastSpoken = {};
 
@@ -158,7 +156,7 @@ export default class UserProvider extends AutocompleteProvider {
         }
 
         const currentUserId = MatrixClientPeg.get().credentials.userId;
-        this.users = this.room.getJoinedMembers().filter(({userId}) => userId !== currentUserId);
+        this.users = this.room.getJoinedMembers().filter(({ userId }) => userId !== currentUserId);
         this.users = this.users.concat(this.room.getMembersWithMembership("invite"));
 
         this.users = sortBy(this.users, (member) => 1E20 - lastSpoken[member.userId] || 1E20);
@@ -183,7 +181,7 @@ export default class UserProvider extends AutocompleteProvider {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill"
-                role="listbox"
+                role="presentation"
                 aria-label={_t("User Autocomplete")}
             >
                 { completions }
diff --git a/src/boundThreepids.js b/src/boundThreepids.ts
similarity index 84%
rename from src/boundThreepids.js
rename to src/boundThreepids.ts
index 3b32815913..94ff36ad4f 100644
--- a/src/boundThreepids.js
+++ b/src/boundThreepids.ts
@@ -14,9 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 import IdentityAuthClient from './IdentityAuthClient';
 
-export async function getThreepidsWithBindStatus(client, filterMedium) {
+export async function getThreepidsWithBindStatus(
+    client: MatrixClient, filterMedium?: ThreepidMedium,
+): Promise<IThreepid[]> {
     const userId = client.getUserId();
 
     let { threepids } = await client.getThreePids();
@@ -31,7 +35,7 @@ export async function getThreepidsWithBindStatus(client, filterMedium) {
             const identityAccessToken = await authClient.getAccessToken({ check: false });
 
             // Restructure for lookup query
-            const query = threepids.map(({ medium, address }) => [medium, address]);
+            const query = threepids.map(({ medium, address }): [string, string] => [medium, address]);
             const lookupResults = await client.bulkLookupThreePids(query, identityAccessToken);
 
             // Record which are already bound
diff --git a/src/components/structures/AutoHideScrollbar.tsx b/src/components/structures/AutoHideScrollbar.tsx
index 66f998b616..a60df45770 100644
--- a/src/components/structures/AutoHideScrollbar.tsx
+++ b/src/components/structures/AutoHideScrollbar.tsx
@@ -15,14 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { HTMLAttributes, WheelEvent } from "react";
 
-interface IProps {
+interface IProps extends Omit<HTMLAttributes<HTMLDivElement>, "onScroll"> {
     className?: string;
-    onScroll?: () => void;
-    onWheel?: () => void;
-    style?: React.CSSProperties
-    tabIndex?: number,
+    onScroll?: (event: Event) => void;
+    onWheel?: (event: WheelEvent) => void;
+    style?: React.CSSProperties;
+    tabIndex?: number;
     wrappedRef?: (ref: HTMLDivElement) => void;
 }
 
@@ -52,14 +52,20 @@ export default class AutoHideScrollbar extends React.Component<IProps> {
     }
 
     public render() {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { className, onScroll, onWheel, style, tabIndex, wrappedRef, children, ...otherProps } = this.props;
+
         return (<div
+            {...otherProps}
             ref={this.containerRef}
-            style={this.props.style}
-            className={["mx_AutoHideScrollbar", this.props.className].join(" ")}
-            onWheel={this.props.onWheel}
-            tabIndex={this.props.tabIndex}
+            style={style}
+            className={["mx_AutoHideScrollbar", className].join(" ")}
+            onWheel={onWheel}
+            // Firefox sometimes makes this element focusable due to
+            // overflow:scroll;, so force it out of tab order by default.
+            tabIndex={tabIndex ?? -1}
         >
-            { this.props.children }
+            { children }
         </div>);
     }
 }
diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx
new file mode 100644
index 0000000000..08f6c33738
--- /dev/null
+++ b/src/components/structures/BackdropPanel.tsx
@@ -0,0 +1,44 @@
+/*
+Copyright 2021 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, { CSSProperties } from "react";
+
+interface IProps {
+    backgroundImage?: string;
+    blurMultiplier?: number;
+}
+
+export const BackdropPanel: React.FC<IProps> = ({ backgroundImage, blurMultiplier }) => {
+    if (!backgroundImage) return null;
+
+    const styles: CSSProperties = {};
+    if (blurMultiplier) {
+        const rootStyle = getComputedStyle(document.documentElement);
+        const blurValue = rootStyle.getPropertyValue('--lp-background-blur');
+        const pixelsValue = blurValue.replace('px', '');
+        const parsed = parseInt(pixelsValue, 10);
+        if (!isNaN(parsed)) {
+            styles.filter = `blur(${parsed * blurMultiplier}px)`;
+        }
+    }
+    return <div className="mx_BackdropPanel">
+        <img
+            style={styles}
+            className="mx_BackdropPanel--image"
+            src={backgroundImage} />
+    </div>;
+};
+export default BackdropPanel;
diff --git a/src/components/structures/CallEventGrouper.ts b/src/components/structures/CallEventGrouper.ts
new file mode 100644
index 0000000000..84e004d1de
--- /dev/null
+++ b/src/components/structures/CallEventGrouper.ts
@@ -0,0 +1,186 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { CallEvent, CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+import CallHandler, { CallHandlerEvent } from '../../CallHandler';
+import { EventEmitter } from 'events';
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+
+export enum CallEventGrouperEvent {
+    StateChanged = "state_changed",
+    SilencedChanged = "silenced_changed",
+    LengthChanged = "length_changed",
+}
+
+const CONNECTING_STATES = [
+    CallState.Connecting,
+    CallState.WaitLocalMedia,
+    CallState.CreateOffer,
+    CallState.CreateAnswer,
+];
+
+const SUPPORTED_STATES = [
+    CallState.Connected,
+    CallState.Ringing,
+];
+
+export enum CustomCallState {
+    Missed = "missed",
+}
+
+export default class CallEventGrouper extends EventEmitter {
+    private events: Set<MatrixEvent> = new Set<MatrixEvent>();
+    private call: MatrixCall;
+    public state: CallState | CustomCallState;
+
+    constructor() {
+        super();
+
+        CallHandler.sharedInstance().addListener(CallHandlerEvent.CallsChanged, this.setCall);
+        CallHandler.sharedInstance().addListener(CallHandlerEvent.SilencedCallsChanged, this.onSilencedCallsChanged);
+    }
+
+    private get invite(): MatrixEvent {
+        return [...this.events].find((event) => event.getType() === EventType.CallInvite);
+    }
+
+    private get hangup(): MatrixEvent {
+        return [...this.events].find((event) => event.getType() === EventType.CallHangup);
+    }
+
+    private get reject(): MatrixEvent {
+        return [...this.events].find((event) => event.getType() === EventType.CallReject);
+    }
+
+    private get selectAnswer(): MatrixEvent {
+        return [...this.events].find((event) => event.getType() === EventType.CallSelectAnswer);
+    }
+
+    public get isVoice(): boolean {
+        const invite = this.invite;
+        if (!invite) return;
+
+        // FIXME: Find a better way to determine this from the event?
+        if (invite.getContent()?.offer?.sdp?.indexOf('m=video') !== -1) return false;
+        return true;
+    }
+
+    public get hangupReason(): string | null {
+        return this.hangup?.getContent()?.reason;
+    }
+
+    public get rejectParty(): string {
+        return this.reject?.getSender();
+    }
+
+    public get gotRejected(): boolean {
+        return Boolean(this.reject);
+    }
+
+    public get duration(): Date {
+        if (!this.hangup || !this.selectAnswer) return;
+        return new Date(this.hangup.getDate().getTime() - this.selectAnswer.getDate().getTime());
+    }
+
+    /**
+     * Returns true if there are only events from the other side - we missed the call
+     */
+    private get callWasMissed(): boolean {
+        return ![...this.events].some((event) => event.sender?.userId === MatrixClientPeg.get().getUserId());
+    }
+
+    private get callId(): string | undefined {
+        return [...this.events][0]?.getContent()?.call_id;
+    }
+
+    private get roomId(): string | undefined {
+        return [...this.events][0]?.getRoomId();
+    }
+
+    private onSilencedCallsChanged = () => {
+        const newState = CallHandler.sharedInstance().isCallSilenced(this.callId);
+        this.emit(CallEventGrouperEvent.SilencedChanged, newState);
+    };
+
+    private onLengthChanged = (length: number): void => {
+        this.emit(CallEventGrouperEvent.LengthChanged, length);
+    };
+
+    public answerCall = () => {
+        defaultDispatcher.dispatch({
+            action: 'answer',
+            room_id: this.roomId,
+        });
+    };
+
+    public rejectCall = () => {
+        defaultDispatcher.dispatch({
+            action: 'reject',
+            room_id: this.roomId,
+        });
+    };
+
+    public callBack = () => {
+        defaultDispatcher.dispatch({
+            action: 'place_call',
+            type: this.isVoice ? CallType.Voice : CallType.Video,
+            room_id: this.roomId,
+        });
+    };
+
+    public toggleSilenced = () => {
+        const silenced = CallHandler.sharedInstance().isCallSilenced(this.callId);
+        silenced ?
+            CallHandler.sharedInstance().unSilenceCall(this.callId) :
+            CallHandler.sharedInstance().silenceCall(this.callId);
+    };
+
+    private setCallListeners() {
+        if (!this.call) return;
+        this.call.addListener(CallEvent.State, this.setState);
+        this.call.addListener(CallEvent.LengthChanged, this.onLengthChanged);
+    }
+
+    private setState = () => {
+        if (CONNECTING_STATES.includes(this.call?.state)) {
+            this.state = CallState.Connecting;
+        } else if (SUPPORTED_STATES.includes(this.call?.state)) {
+            this.state = this.call.state;
+        } else {
+            if (this.callWasMissed) this.state = CustomCallState.Missed;
+            else if (this.reject) this.state = CallState.Ended;
+            else if (this.hangup) this.state = CallState.Ended;
+            else if (this.invite && this.call) this.state = CallState.Connecting;
+        }
+        this.emit(CallEventGrouperEvent.StateChanged, this.state);
+    };
+
+    private setCall = () => {
+        if (this.call) return;
+
+        this.call = CallHandler.sharedInstance().getCallById(this.callId);
+        this.setCallListeners();
+        this.setState();
+    };
+
+    public add(event: MatrixEvent) {
+        this.events.add(event);
+        this.setCall();
+    }
+}
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index 9d8665c176..9f1a5adc9d 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -16,13 +16,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {CSSProperties, RefObject, useRef, useState} from "react";
+import React, { CSSProperties, RefObject, SyntheticEvent, useRef, useState } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
 
-import {Key} from "../../Keyboard";
-import {Writeable} from "../../@types/common";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { Key } from "../../Keyboard";
+import { Writeable } from "../../@types/common";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 import UIStore from "../../stores/UIStore";
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
@@ -45,7 +45,7 @@ function getOrCreateContainer(): HTMLDivElement {
 
 const ARIA_MENU_ITEM_ROLES = new Set(["menuitem", "menuitemcheckbox", "menuitemradio"]);
 
-interface IPosition {
+export interface IPosition {
     top?: number;
     bottom?: number;
     left?: number;
@@ -80,6 +80,10 @@ export interface IProps extends IPosition {
     managed?: boolean;
     wrapperClassName?: string;
 
+    // If true, this context menu will be mounted as a child to the parent container. Otherwise
+    // it will be mounted to a container at the root of the DOM.
+    mountAsChild?: boolean;
+
     // Function to be called on menu close
     onFinished();
     // on resize callback
@@ -222,6 +226,11 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
         }
     };
 
+    private onClick = (ev: React.MouseEvent) => {
+        // Don't allow clicks to escape the context menu wrapper
+        ev.stopPropagation();
+    };
+
     private onKeyDown = (ev: React.KeyboardEvent) => {
         // don't let keyboard handling escape the context menu
         ev.stopPropagation();
@@ -318,10 +327,16 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
 
         const menuClasses = classNames({
             'mx_ContextualMenu': true,
-            'mx_ContextualMenu_left': !hasChevron && position.left,
-            'mx_ContextualMenu_right': !hasChevron && position.right,
-            'mx_ContextualMenu_top': !hasChevron && position.top,
-            'mx_ContextualMenu_bottom': !hasChevron && position.bottom,
+            /**
+             * In some cases we may get the number of 0, which still means that we're supposed to properly
+             * add the specific position class, but as it was falsy things didn't work as intended.
+             * In addition, defensively check for counter cases where we may get more than one value,
+             * even if we shouldn't.
+             */
+            'mx_ContextualMenu_left': !hasChevron && position.left !== undefined && !position.right,
+            'mx_ContextualMenu_right': !hasChevron && position.right !== undefined && !position.left,
+            'mx_ContextualMenu_top': !hasChevron && position.top !== undefined && !position.bottom,
+            'mx_ContextualMenu_bottom': !hasChevron && position.bottom !== undefined && !position.top,
             'mx_ContextualMenu_withChevron_left': chevronFace === ChevronFace.Left,
             'mx_ContextualMenu_withChevron_right': chevronFace === ChevronFace.Right,
             'mx_ContextualMenu_withChevron_top': chevronFace === ChevronFace.Top,
@@ -371,8 +386,9 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
         return (
             <div
                 className={classNames("mx_ContextualMenu_wrapper", this.props.wrapperClassName)}
-                style={{...position, ...wrapperStyle}}
+                style={{ ...position, ...wrapperStyle }}
                 onKeyDown={this.onKeyDown}
+                onClick={this.onClick}
                 onContextMenu={this.onContextMenuPreventBubbling}
             >
                 <div
@@ -390,21 +406,41 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
     }
 
     render(): React.ReactChild {
-        return ReactDOM.createPortal(this.renderMenu(), getOrCreateContainer());
+        if (this.props.mountAsChild) {
+            // Render as a child of the current parent
+            return this.renderMenu();
+        } else {
+            // Render as a child of a container at the root of the DOM
+            return ReactDOM.createPortal(this.renderMenu(), getOrCreateContainer());
+        }
     }
 }
 
+export type ToRightOf = {
+    left: number;
+    top: number;
+    chevronOffset: number;
+};
+
 // Placement method for <ContextMenu /> to position context menu to right of elementRect with chevronOffset
-export const toRightOf = (elementRect: Pick<DOMRect, "right" | "top" | "height">, chevronOffset = 12) => {
+export const toRightOf = (elementRect: Pick<DOMRect, "right" | "top" | "height">, chevronOffset = 12): ToRightOf => {
     const left = elementRect.right + window.pageXOffset + 3;
     let top = elementRect.top + (elementRect.height / 2) + window.pageYOffset;
     top -= chevronOffset + 8; // where 8 is half the height of the chevron
-    return {left, top, chevronOffset};
+    return { left, top, chevronOffset };
+};
+
+export type AboveLeftOf = IPosition & {
+    chevronFace: ChevronFace;
 };
 
 // Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect,
 // and either above or below: wherever there is more space (maybe this should be aboveOrBelowLeftOf?)
-export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
+export const aboveLeftOf = (
+    elementRect: DOMRect,
+    chevronFace = ChevronFace.None,
+    vPadding = 0,
+): AboveLeftOf => {
     const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
 
     const buttonRight = elementRect.right + window.pageXOffset;
@@ -461,10 +497,14 @@ type ContextMenuTuple<T> = [boolean, RefObject<T>, () => void, () => void, (val:
 export const useContextMenu = <T extends any = HTMLElement>(): ContextMenuTuple<T> => {
     const button = useRef<T>(null);
     const [isOpen, setIsOpen] = useState(false);
-    const open = () => {
+    const open = (ev?: SyntheticEvent) => {
+        ev?.preventDefault();
+        ev?.stopPropagation();
         setIsOpen(true);
     };
-    const close = () => {
+    const close = (ev?: SyntheticEvent) => {
+        ev?.preventDefault();
+        ev?.stopPropagation();
         setIsOpen(false);
     };
 
@@ -498,15 +538,15 @@ export function createMenu(ElementClass, props) {
 
     ReactDOM.render(menu, getOrCreateContainer());
 
-    return {close: onFinished};
+    return { close: onFinished };
 }
 
 // re-export the semantic helper components for simplicity
-export {ContextMenuButton} from "../../accessibility/context_menu/ContextMenuButton";
-export {ContextMenuTooltipButton} from "../../accessibility/context_menu/ContextMenuTooltipButton";
-export {MenuGroup} from "../../accessibility/context_menu/MenuGroup";
-export {MenuItem} from "../../accessibility/context_menu/MenuItem";
-export {MenuItemCheckbox} from "../../accessibility/context_menu/MenuItemCheckbox";
-export {MenuItemRadio} from "../../accessibility/context_menu/MenuItemRadio";
-export {StyledMenuItemCheckbox} from "../../accessibility/context_menu/StyledMenuItemCheckbox";
-export {StyledMenuItemRadio} from "../../accessibility/context_menu/StyledMenuItemRadio";
+export { ContextMenuButton } from "../../accessibility/context_menu/ContextMenuButton";
+export { ContextMenuTooltipButton } from "../../accessibility/context_menu/ContextMenuTooltipButton";
+export { MenuGroup } from "../../accessibility/context_menu/MenuGroup";
+export { MenuItem } from "../../accessibility/context_menu/MenuItem";
+export { MenuItemCheckbox } from "../../accessibility/context_menu/MenuItemCheckbox";
+export { MenuItemRadio } from "../../accessibility/context_menu/MenuItemRadio";
+export { StyledMenuItemCheckbox } from "../../accessibility/context_menu/StyledMenuItemCheckbox";
+export { StyledMenuItemRadio } from "../../accessibility/context_menu/StyledMenuItemRadio";
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index 73359f17a5..5e31048207 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -21,7 +21,7 @@ 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 
 @replaceableComponent("structures.CustomRoomTagPanel")
 class CustomRoomTagPanel extends React.Component {
@@ -34,7 +34,7 @@ class CustomRoomTagPanel extends React.Component {
 
     componentDidMount() {
         this._tagStoreToken = CustomRoomTagStore.addListener(() => {
-            this.setState({tags: CustomRoomTagStore.getSortedTags()});
+            this.setState({ tags: CustomRoomTagStore.getSortedTags() });
         });
     }
 
@@ -56,7 +56,7 @@ class CustomRoomTagPanel extends React.Component {
         return (<div className={classes}>
             <div className="mx_CustomRoomTagPanel_divider" />
             <AutoHideScrollbar className="mx_CustomRoomTagPanel_scroller">
-                {tags}
+                { tags }
             </AutoHideScrollbar>
         </div>);
     }
@@ -64,7 +64,7 @@ class CustomRoomTagPanel extends React.Component {
 
 class CustomRoomTagTile extends React.Component {
     onClick = () => {
-        dis.dispatch({action: 'select_custom_room_tag', tag: this.props.tag.name});
+        dis.dispatch({ action: 'select_custom_room_tag', tag: this.props.tag.name });
     };
 
     render() {
@@ -84,7 +84,7 @@ class CustomRoomTagTile extends React.Component {
                 "mx_TagTile_badge": true,
                 "mx_TagTile_badgeHighlight": badgeNotifState.hasMentions,
             });
-            badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badgeNotifState.count)}</div>);
+            badgeElement = (<div className={badgeClasses}>{ FormattingUtils.formatCount(badgeNotifState.count) }</div>);
         }
 
         return (
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.tsx
similarity index 71%
rename from src/components/structures/EmbeddedPage.js
rename to src/components/structures/EmbeddedPage.tsx
index c37ab3df48..ec37eab254 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.tsx
@@ -17,47 +17,51 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import dis from '../../dispatcher/dispatcher';
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import classnames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
+import { ActionPayload } from "../../dispatcher/payloads";
 
-export default class EmbeddedPage extends React.PureComponent {
-    static propTypes = {
-        // URL to request embedded page content from
-        url: PropTypes.string,
-        // Class name prefix to apply for a given instance
-        className: PropTypes.string,
-        // Whether to wrap the page in a scrollbar
-        scrollbar: PropTypes.bool,
-        // Map of keys to replace with values, e.g {$placeholder: "value"}
-        replaceMap: PropTypes.object,
-    };
+interface IProps {
+    // URL to request embedded page content from
+    url?: string;
+    // Class name prefix to apply for a given instance
+    className?: string;
+    // Whether to wrap the page in a scrollbar
+    scrollbar?: boolean;
+    // Map of keys to replace with values, e.g {$placeholder: "value"}
+    replaceMap?: Map<string, string>;
+}
 
-    static contextType = MatrixClientContext;
+interface IState {
+    page: string;
+}
 
-    constructor(props, context) {
+export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
+    public static contextType = MatrixClientContext;
+    private unmounted = false;
+    private dispatcherRef: string = null;
+
+    constructor(props: IProps, context: typeof MatrixClientContext) {
         super(props, context);
 
-        this._dispatcherRef = null;
-
         this.state = {
             page: '',
         };
     }
 
-    translate(s) {
+    protected translate(s: string): string {
         // default implementation - skins may wish to extend this
         return sanitizeHtml(_t(s));
     }
 
-    componentDidMount() {
-        this._unmounted = false;
+    public componentDidMount(): void {
+        this.unmounted = false;
 
         if (!this.props.url) {
             return;
@@ -70,7 +74,7 @@ export default class EmbeddedPage extends React.PureComponent {
         request(
             { method: "GET", url: this.props.url },
             (err, response, body) => {
-                if (this._unmounted) {
+                if (this.unmounted) {
                     return;
                 }
 
@@ -92,22 +96,22 @@ export default class EmbeddedPage extends React.PureComponent {
             },
         );
 
-        this._dispatcherRef = dis.register(this.onAction);
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
-    componentWillUnmount() {
-        this._unmounted = true;
-        if (this._dispatcherRef !== null) dis.unregister(this._dispatcherRef);
+    public componentWillUnmount(): void {
+        this.unmounted = true;
+        if (this.dispatcherRef !== null) dis.unregister(this.dispatcherRef);
     }
 
-    onAction = (payload) => {
+    private onAction = (payload: ActionPayload): void => {
         // HACK: Workaround for the context's MatrixClient not being set up at render time.
         if (payload.action === 'client_started') {
             this.forceUpdate();
         }
     };
 
-    render() {
+    public render(): JSX.Element {
         // HACK: Workaround for the context's MatrixClient not updating.
         const client = this.context || MatrixClientPeg.get();
         const isGuest = client ? client.isGuest() : true;
@@ -120,16 +124,15 @@ export default class EmbeddedPage extends React.PureComponent {
 
         const content = <div className={`${className}_body`}
             dangerouslySetInnerHTML={{ __html: this.state.page }}
-        >
-        </div>;
+        />;
 
         if (this.props.scrollbar) {
             return <AutoHideScrollbar className={classes}>
-                {content}
+                { content }
             </AutoHideScrollbar>;
         } else {
             return <div className={classes}>
-                {content}
+                { content }
             </div>;
         }
     }
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.tsx
similarity index 79%
rename from src/components/structures/FilePanel.js
rename to src/components/structures/FilePanel.tsx
index bb7c1f9642..52cf5ae55b 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.tsx
@@ -16,37 +16,53 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
-import {Filter} from 'matrix-js-sdk/src/filter';
-import * as sdk from '../../index';
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { Filter } from 'matrix-js-sdk/src/filter';
+import { EventTimelineSet } from "matrix-js-sdk/src/models/event-timeline-set";
+import { Direction } from "matrix-js-sdk/src/models/event-timeline";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { TimelineWindow } from 'matrix-js-sdk/src/timeline-window';
+
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import EventIndexPeg from "../../indexing/EventIndexPeg";
 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";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import DesktopBuildsNotice, { WarningKind } from "../views/elements/DesktopBuildsNotice";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+import ResizeNotifier from '../../utils/ResizeNotifier';
+import TimelinePanel from "./TimelinePanel";
+import Spinner from "../views/elements/Spinner";
+import { TileShape } from '../views/rooms/EventTile';
+import { Layout } from "../../settings/Layout";
+
+interface IProps {
+    roomId: string;
+    onClose: () => void;
+    resizeNotifier: ResizeNotifier;
+}
+
+interface IState {
+    timelineSet: EventTimelineSet;
+}
 
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
 @replaceableComponent("structures.FilePanel")
-class FilePanel extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-        onClose: PropTypes.func.isRequired,
-    };
-
+class FilePanel extends React.Component<IProps, IState> {
     // This is used to track if a decrypted event was a live event and should be
     // added to the timeline.
-    decryptingEvents = new Set();
+    private decryptingEvents = new Set<string>();
+    public noRoom: boolean;
 
     state = {
         timelineSet: null,
     };
 
-    onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => {
+    private onRoomTimeline = (ev: MatrixEvent, room: Room, toStartOfTimeline: true, removed: true, data: any): void => {
         if (room?.roomId !== this.props?.roomId) return;
         if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
 
@@ -60,7 +76,7 @@ class FilePanel extends React.Component {
         }
     };
 
-    onEventDecrypted = (ev, err) => {
+    private onEventDecrypted = (ev: MatrixEvent, err?: any): void => {
         if (ev.getRoomId() !== this.props.roomId) return;
         const eventId = ev.getId();
 
@@ -70,7 +86,7 @@ class FilePanel extends React.Component {
         this.addEncryptedLiveEvent(ev);
     };
 
-    addEncryptedLiveEvent(ev, toStartOfTimeline) {
+    public addEncryptedLiveEvent(ev: MatrixEvent): void {
         if (!this.state.timelineSet) return;
 
         const timeline = this.state.timelineSet.getLiveTimeline();
@@ -84,7 +100,7 @@ class FilePanel extends React.Component {
         }
     }
 
-    async componentDidMount() {
+    public async componentDidMount(): Promise<void> {
         const client = MatrixClientPeg.get();
 
         await this.updateTimelineSet(this.props.roomId);
@@ -105,7 +121,7 @@ class FilePanel extends React.Component {
         }
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const client = MatrixClientPeg.get();
         if (client === null) return;
 
@@ -117,7 +133,7 @@ class FilePanel extends React.Component {
         }
     }
 
-    async fetchFileEventsServer(room) {
+    public async fetchFileEventsServer(room: Room): Promise<EventTimelineSet> {
         const client = MatrixClientPeg.get();
 
         const filter = new Filter(client.credentials.userId);
@@ -141,7 +157,11 @@ class FilePanel extends React.Component {
         return timelineSet;
     }
 
-    onPaginationRequest = (timelineWindow, direction, limit) => {
+    private onPaginationRequest = (
+        timelineWindow: TimelineWindow,
+        direction: Direction,
+        limit: number,
+    ): Promise<boolean> => {
         const client = MatrixClientPeg.get();
         const eventIndex = EventIndexPeg.get();
         const roomId = this.props.roomId;
@@ -159,7 +179,7 @@ class FilePanel extends React.Component {
         }
     };
 
-    async updateTimelineSet(roomId: string) {
+    public async updateTimelineSet(roomId: string): Promise<void> {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(roomId);
         const eventIndex = EventIndexPeg.get();
@@ -195,7 +215,7 @@ class FilePanel extends React.Component {
         }
     }
 
-    render() {
+    public render() {
         if (MatrixClientPeg.get().isGuest()) {
             return <BaseCard
                 className="mx_FilePanel mx_RoomView_messageListWrapper"
@@ -220,12 +240,10 @@ class FilePanel extends React.Component {
         }
 
         // wrap a TimelinePanel with the jump-to-event bits turned off.
-        const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
-        const Loader = sdk.getComponent("elements.Spinner");
 
         const emptyState = (<div className="mx_RightPanel_empty mx_FilePanel_empty">
-            <h2>{_t('No files visible in this room')}</h2>
-            <p>{_t('Attach files from chat or just drag and drop them anywhere in a room.')}</p>
+            <h2>{ _t('No files visible in this room') }</h2>
+            <p>{ _t('Attach files from chat or just drag and drop them anywhere in a room.') }</p>
         </div>);
 
         const isRoomEncrypted = this.noRoom ? false : MatrixClientPeg.get().isRoomEncrypted(this.props.roomId);
@@ -245,11 +263,12 @@ class FilePanel extends React.Component {
                         manageReadReceipts={false}
                         manageReadMarkers={false}
                         timelineSet={this.state.timelineSet}
-                        showUrlPreview = {false}
+                        showUrlPreview={false}
                         onPaginationRequest={this.onPaginationRequest}
-                        tileShape="file_grid"
+                        tileShape={TileShape.FileGrid}
                         resizeNotifier={this.props.resizeNotifier}
                         empty={emptyState}
+                        layout={Layout.Group}
                     />
                 </BaseCard>
             );
@@ -260,7 +279,7 @@ class FilePanel extends React.Component {
                     onClose={this.props.onClose}
                     previousPhase={RightPanelPhases.RoomSummary}
                 >
-                    <Loader />
+                    <Spinner />
                 </BaseCard>
             );
         }
diff --git a/src/components/structures/GenericErrorPage.js b/src/components/structures/GenericErrorPage.tsx
similarity index 71%
rename from src/components/structures/GenericErrorPage.js
rename to src/components/structures/GenericErrorPage.tsx
index cfd2016d47..d124c7111a 100644
--- a/src/components/structures/GenericErrorPage.js
+++ b/src/components/structures/GenericErrorPage.tsx
@@ -15,21 +15,20 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+interface IProps {
+    title: React.ReactNode;
+    message: React.ReactNode;
+}
 
 @replaceableComponent("structures.GenericErrorPage")
-export default class GenericErrorPage extends React.PureComponent {
-    static propTypes = {
-        title: PropTypes.object.isRequired, // jsx for title
-        message: PropTypes.object.isRequired, // jsx to display
-    };
-
+export default class GenericErrorPage extends React.PureComponent<IProps> {
     render() {
         return <div className='mx_GenericErrorPage'>
             <div className='mx_GenericErrorPage_box'>
-                <h1>{this.props.title}</h1>
-                <p>{this.props.message}</p>
+                <h1>{ this.props.title }</h1>
+                <p>{ this.props.message }</p>
             </div>
         </div>;
     }
diff --git a/src/components/structures/GroupFilterPanel.js b/src/components/structures/GroupFilterPanel.tsx
similarity index 62%
rename from src/components/structures/GroupFilterPanel.js
rename to src/components/structures/GroupFilterPanel.tsx
index 2ff91e4976..b6d05efa87 100644
--- a/src/components/structures/GroupFilterPanel.js
+++ b/src/components/structures/GroupFilterPanel.tsx
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import type { EventSubscription } from "fbemitter";
 import React from 'react';
 import GroupFilterOrderStore from '../../stores/GroupFilterOrderStore';
 
@@ -24,29 +25,49 @@ import * as sdk from '../../index';
 import dis from '../../dispatcher/dispatcher';
 import { _t } from '../../languageHandler';
 
-import { Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import UIStore from "../../stores/UIStore";
+
+interface IGroupFilterPanelProps {
+
+}
+
+// FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+type OrderedTagsTemporaryType = Array<{}>;
+// FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+type SelectedTagsTemporaryType = Array<{}>;
+
+interface IGroupFilterPanelState {
+    // FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+    orderedTags: OrderedTagsTemporaryType;
+    // FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
+    selectedTags: SelectedTagsTemporaryType;
+}
 
 @replaceableComponent("structures.GroupFilterPanel")
-class GroupFilterPanel extends React.Component {
-    static contextType = MatrixClientContext;
+class GroupFilterPanel extends React.Component<IGroupFilterPanelProps, IGroupFilterPanelState> {
+    public static contextType = MatrixClientContext;
 
-    state = {
+    public state = {
         orderedTags: [],
         selectedTags: [],
     };
 
-    componentDidMount() {
-        this.unmounted = false;
-        this.context.on("Group.myMembership", this._onGroupMyMembership);
-        this.context.on("sync", this._onClientSync);
+    private ref = React.createRef<HTMLDivElement>();
+    private unmounted = false;
+    private groupFilterOrderStoreToken?: EventSubscription;
 
-        this._groupFilterOrderStoreToken = GroupFilterOrderStore.addListener(() => {
+    public componentDidMount() {
+        this.unmounted = false;
+        this.context.on("Group.myMembership", this.onGroupMyMembership);
+        this.context.on("sync", this.onClientSync);
+
+        this.groupFilterOrderStoreToken = GroupFilterOrderStore.addListener(() => {
             if (this.unmounted) {
                 return;
             }
@@ -57,23 +78,25 @@ class GroupFilterPanel extends React.Component {
         });
         // This could be done by anything with a matrix client
         dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
+        UIStore.instance.trackElementDimensions("GroupPanel", this.ref.current);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount() {
         this.unmounted = true;
-        this.context.removeListener("Group.myMembership", this._onGroupMyMembership);
-        this.context.removeListener("sync", this._onClientSync);
-        if (this._groupFilterOrderStoreToken) {
-            this._groupFilterOrderStoreToken.remove();
+        this.context.removeListener("Group.myMembership", this.onGroupMyMembership);
+        this.context.removeListener("sync", this.onClientSync);
+        if (this.groupFilterOrderStoreToken) {
+            this.groupFilterOrderStoreToken.remove();
         }
+        UIStore.instance.stopTrackingElementDimensions("GroupPanel");
     }
 
-    _onGroupMyMembership = () => {
+    private onGroupMyMembership = () => {
         if (this.unmounted) return;
         dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
     };
 
-    _onClientSync = (syncState, prevState) => {
+    private onClientSync = (syncState, prevState) => {
         // Consider the client reconnected if there is no error with syncing.
         // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
         const reconnected = syncState !== "ERROR" && prevState !== syncState;
@@ -83,18 +106,18 @@ class GroupFilterPanel extends React.Component {
         }
     };
 
-    onMouseDown = e => {
+    private onClick = e => {
         // only dispatch if its not a no-op
         if (this.state.selectedTags.length > 0) {
-            dis.dispatch({action: 'deselect_tags'});
+            dis.dispatch({ action: 'deselect_tags' });
         }
     };
 
-    onClearFilterClick = ev => {
-        dis.dispatch({action: 'deselect_tags'});
+    private onClearFilterClick = ev => {
+        dis.dispatch({ action: 'deselect_tags' });
     };
 
-    renderGlobalIcon() {
+    private renderGlobalIcon() {
         if (!SettingsStore.getValue("feature_communities_v2_prototypes")) return null;
 
         return (
@@ -105,7 +128,7 @@ class GroupFilterPanel extends React.Component {
         );
     }
 
-    render() {
+    public render() {
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
         const ActionButton = sdk.getComponent('elements.ActionButton');
 
@@ -123,19 +146,13 @@ class GroupFilterPanel extends React.Component {
             mx_GroupFilterPanel_items_selected: itemsSelected,
         });
 
-        let betaDot;
-        if (SettingsStore.getBetaInfo("feature_spaces") && !localStorage.getItem("mx_seenSpacesBeta")) {
-            betaDot = <div className="mx_BetaDot" />;
-        }
-
         let createButton = (
             <ActionButton
                 tooltip
                 label={_t("Communities")}
                 action="toggle_my_groups"
-                className="mx_TagTile mx_TagTile_plus">
-                { betaDot }
-            </ActionButton>
+                className="mx_TagTile mx_TagTile_plus"
+            />
         );
 
         if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
@@ -148,31 +165,18 @@ class GroupFilterPanel extends React.Component {
             );
         }
 
-        return <div className={classes} onClick={this.onClearFilterClick}>
+        return <div className={classes} onClick={this.onClearFilterClick} ref={this.ref}>
             <AutoHideScrollbar
                 className="mx_GroupFilterPanel_scroller"
-                // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
-                // instead of onClick. Otherwise we experience https://github.com/vector-im/element-web/issues/6253
-                onMouseDown={this.onMouseDown}
+                onClick={this.onClick}
             >
-                <Droppable
-                    droppableId="tag-panel-droppable"
-                    type="draggable-TagTile"
-                >
-                    { (provided, snapshot) => (
-                        <div
-                            className="mx_GroupFilterPanel_tagTileContainer"
-                            ref={provided.innerRef}
-                        >
-                            { this.renderGlobalIcon() }
-                            { tags }
-                            <div>
-                                {createButton}
-                            </div>
-                            { provided.placeholder }
-                        </div>
-                    ) }
-                </Droppable>
+                <div className="mx_GroupFilterPanel_tagTileContainer">
+                    { this.renderGlobalIcon() }
+                    { tags }
+                    <div>
+                        { createButton }
+                    </div>
+                </div>
             </AutoHideScrollbar>
         </div>;
     }
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 3a2c611cc9..f4f1d50d63 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import * as sdk from '../../index';
 import dis from '../../dispatcher/dispatcher';
 import { getHostingLink } from '../../utils/HostingLink';
@@ -34,13 +34,16 @@ import classnames from 'classnames';
 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/src/models/group";
-import {sleep} from "../../utils/promise";
+import { makeGroupPermalink, makeUserPermalink } from "../../utils/permalinks/Permalinks";
+import { Group } from "matrix-js-sdk/src/models/group";
+import { sleep } from "matrix-js-sdk/src/utils";
 import RightPanelStore from "../../stores/RightPanelStore";
 import AutoHideScrollbar from "./AutoHideScrollbar";
-import {mediaFromMxc} from "../../customisations/Media";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../customisations/Media";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import { createSpaceFromCommunity } from "../../utils/space";
+import { Action } from "../../dispatcher/actions";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 
 const LONG_DESC_PLACEHOLDER = _td(
     `<h1>HTML for your community's page</h1>
@@ -115,7 +118,7 @@ class CategoryRoomList extends React.Component {
                         {
                             title: _t(
                                 "Failed to add the following rooms to the summary of %(groupId)s:",
-                                {groupId: this.props.groupId},
+                                { groupId: this.props.groupId },
                             ),
                             description: errorList.join(", "),
                         },
@@ -126,12 +129,11 @@ class CategoryRoomList extends React.Component {
     };
 
     render() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
         const addButton = this.props.editing ?
             (<AccessibleButton className="mx_GroupView_featuredThings_addButton"
                 onClick={this.onAddRoomsToSummaryClicked}
             >
-                <TintableSvg src={require("../../../res/img/icons-create-room.svg")} width="64" height="64" />
+                <img src={require("../../../res/img/icons-create-room.svg")} width="64" height="64" />
                 <div className="mx_GroupView_featuredThings_addButton_label">
                     { _t('Add a Room') }
                 </div>
@@ -195,9 +197,9 @@ class FeaturedRoom extends React.Component {
                 {
                     title: _t(
                         "Failed to remove the room from the summary of %(groupId)s",
-                        {groupId: this.props.groupId},
+                        { groupId: this.props.groupId },
                     ),
-                    description: _t("The room '%(roomName)s' could not be removed from the summary.", {roomName}),
+                    description: _t("The room '%(roomName)s' could not be removed from the summary.", { roomName }),
                 },
             );
         });
@@ -223,7 +225,7 @@ class FeaturedRoom extends React.Component {
 
         let roomNameNode = null;
         if (permalink) {
-            roomNameNode = <a href={permalink} onClick={this.onClick} >{ roomName }</a>;
+            roomNameNode = <a href={permalink} onClick={this.onClick}>{ roomName }</a>;
         } else {
             roomNameNode = <span>{ roomName }</span>;
         }
@@ -289,7 +291,7 @@ class RoleUserList extends React.Component {
                         {
                             title: _t(
                                 "Failed to add the following users to the summary of %(groupId)s:",
-                                {groupId: this.props.groupId},
+                                { groupId: this.props.groupId },
                             ),
                             description: errorList.join(", "),
                         },
@@ -300,10 +302,9 @@ class RoleUserList extends React.Component {
     };
 
     render() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
         const addButton = this.props.editing ?
             (<AccessibleButton className="mx_GroupView_featuredThings_addButton" onClick={this.onAddUsersClicked}>
-                <TintableSvg src={require("../../../res/img/icons-create-room.svg")} width="64" height="64" />
+                <img src={require("../../../res/img/icons-create-room.svg")} width="64" height="64" />
                 <div className="mx_GroupView_featuredThings_addButton_label">
                     { _t('Add a User') }
                 </div>
@@ -361,9 +362,12 @@ class FeaturedUser extends React.Component {
                 {
                     title: _t(
                         "Failed to remove a user from the summary of %(groupId)s",
-                        {groupId: this.props.groupId},
+                        { groupId: this.props.groupId },
+                    ),
+                    description: _t(
+                        "The user '%(displayName)s' could not be removed from the summary.",
+                        { displayName },
                     ),
-                    description: _t("The user '%(displayName)s' could not be removed from the summary.", {displayName}),
                 },
             );
         });
@@ -398,6 +402,8 @@ class FeaturedUser extends React.Component {
 const GROUP_JOINPOLICY_OPEN = "open";
 const GROUP_JOINPOLICY_INVITE = "invite";
 
+const UPGRADE_NOTICE_LS_KEY = "mx_hide_community_upgrade_notice";
+
 @replaceableComponent("structures.GroupView")
 export default class GroupView extends React.Component {
     static propTypes = {
@@ -421,6 +427,7 @@ export default class GroupView extends React.Component {
         publicityBusy: false,
         inviterProfile: null,
         showRightPanel: RightPanelStore.getSharedInstance().isOpenForGroup,
+        showUpgradeNotice: !localStorage.getItem(UPGRADE_NOTICE_LS_KEY),
     };
 
     componentDidMount() {
@@ -470,7 +477,7 @@ export default class GroupView extends React.Component {
             // Leave settings - the user might have clicked the "Leave" button
             this._closeSettings();
         }
-        this.setState({membershipBusy: false});
+        this.setState({ membershipBusy: false });
     };
 
     _initGroupStore(groupId, firstInit) {
@@ -491,7 +498,7 @@ export default class GroupView extends React.Component {
                         group_id: groupId,
                     },
                 });
-                dis.dispatch({action: 'require_registration', screen_after: {screen: `group/${groupId}`}});
+                dis.dispatch({ action: 'require_registration', screen_after: { screen: `group/${groupId}` } });
                 willDoOnboarding = true;
             }
             if (stateKey === GroupStore.STATE_KEY.Summary) {
@@ -592,7 +599,7 @@ export default class GroupView extends React.Component {
     };
 
     _closeSettings = () => {
-        dis.dispatch({action: 'close_settings'});
+        dis.dispatch({ action: 'close_settings' });
     };
 
     _onNameChange = (value) => {
@@ -620,7 +627,7 @@ export default class GroupView extends React.Component {
         const file = ev.target.files[0];
         if (!file) return;
 
-        this.setState({uploadingAvatar: true});
+        this.setState({ uploadingAvatar: true });
         this._matrixClient.uploadContent(file).then((url) => {
             const newProfileForm = Object.assign(this.state.profileForm, { avatar_url: url });
             this.setState({
@@ -632,7 +639,7 @@ export default class GroupView extends React.Component {
                 avatarChanged: true,
             });
         }).catch((e) => {
-            this.setState({uploadingAvatar: false});
+            this.setState({ uploadingAvatar: false });
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to upload avatar image", e);
             Modal.createTrackedDialog('Failed to upload image', '', ErrorDialog, {
@@ -649,7 +656,7 @@ export default class GroupView extends React.Component {
     };
 
     _onSaveClick = () => {
-        this.setState({saving: true});
+        this.setState({ saving: true });
         const savePromise = this.state.isUserPrivileged ? this._saveGroup() : Promise.resolve();
         savePromise.then((result) => {
             this.setState({
@@ -688,7 +695,7 @@ export default class GroupView extends React.Component {
     }
 
     _onAcceptInviteClick = async () => {
-        this.setState({membershipBusy: true});
+        this.setState({ membershipBusy: true });
 
         // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
         // spinner disappearing after we have fetched new group data.
@@ -697,7 +704,7 @@ export default class GroupView extends React.Component {
         GroupStore.acceptGroupInvite(this.props.groupId).then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
-            this.setState({membershipBusy: false});
+            this.setState({ membershipBusy: false });
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Error accepting invite', '', ErrorDialog, {
                 title: _t("Error"),
@@ -707,7 +714,7 @@ export default class GroupView extends React.Component {
     };
 
     _onRejectInviteClick = async () => {
-        this.setState({membershipBusy: true});
+        this.setState({ membershipBusy: true });
 
         // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
         // spinner disappearing after we have fetched new group data.
@@ -716,7 +723,7 @@ export default class GroupView extends React.Component {
         GroupStore.leaveGroup(this.props.groupId).then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
-            this.setState({membershipBusy: false});
+            this.setState({ membershipBusy: false });
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, {
                 title: _t("Error"),
@@ -727,11 +734,11 @@ export default class GroupView extends React.Component {
 
     _onJoinClick = async () => {
         if (this._matrixClient.isGuest()) {
-            dis.dispatch({action: 'require_registration', screen_after: {screen: `group/${this.props.groupId}`}});
+            dis.dispatch({ action: 'require_registration', screen_after: { screen: `group/${this.props.groupId}` } });
             return;
         }
 
-        this.setState({membershipBusy: true});
+        this.setState({ membershipBusy: true });
 
         // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
         // spinner disappearing after we have fetched new group data.
@@ -740,7 +747,7 @@ export default class GroupView extends React.Component {
         GroupStore.joinGroup(this.props.groupId).then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
-            this.setState({membershipBusy: false});
+            this.setState({ membershipBusy: false });
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Error joining room', '', ErrorDialog, {
                 title: _t("Error"),
@@ -773,7 +780,7 @@ export default class GroupView extends React.Component {
             title: _t("Leave Community"),
             description: (
                 <span>
-                    { _t("Leave %(groupName)s?", {groupName: this.props.groupId}) }
+                    { _t("Leave %(groupName)s?", { groupName: this.props.groupId }) }
                     { warnings }
                 </span>
             ),
@@ -782,7 +789,7 @@ export default class GroupView extends React.Component {
             onFinished: async (confirmed) => {
                 if (!confirmed) return;
 
-                this.setState({membershipBusy: true});
+                this.setState({ membershipBusy: true });
 
                 // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
                 // spinner disappearing after we have fetched new group data.
@@ -791,7 +798,7 @@ export default class GroupView extends React.Component {
                 GroupStore.leaveGroup(this.props.groupId).then(() => {
                     // don't reset membershipBusy here: wait for the membership change to come down the sync
                 }).catch((e) => {
-                    this.setState({membershipBusy: false});
+                    this.setState({ membershipBusy: false });
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createTrackedDialog('Error leaving community', '', ErrorDialog, {
                         title: _t("Error"),
@@ -806,6 +813,22 @@ export default class GroupView extends React.Component {
         showGroupAddRoomDialog(this.props.groupId);
     };
 
+    _dismissUpgradeNotice = () => {
+        localStorage.setItem(UPGRADE_NOTICE_LS_KEY, "true");
+        this.setState({ showUpgradeNotice: false });
+    }
+
+    _onCreateSpaceClick = () => {
+        createSpaceFromCommunity(this._matrixClient, this.props.groupId);
+    };
+
+    _onAdminsLinkClick = () => {
+        dis.dispatch({
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.GroupMemberList,
+        });
+    };
+
     _getGroupSection() {
         const groupSettingsSectionClasses = classnames({
             "mx_GroupView_group": this.state.editing,
@@ -818,12 +841,12 @@ export default class GroupView extends React.Component {
         let hostingSignup = null;
         if (hostingSignupLink && this.state.isUserPrivileged) {
             hostingSignup = <div className="mx_GroupView_hostingSignup">
-                {_t(
+                { _t(
                     "Want more than a community? <a>Get your own server</a>", {},
                     {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{sub}</a>,
+                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{ sub }</a>,
                     },
-                )}
+                ) }
                 <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">
                     <img src={require("../../../res/img/external-link.svg")} width="11" height="10" alt='' />
                 </a>
@@ -842,10 +865,46 @@ export default class GroupView extends React.Component {
                     },
                 ) }
             </div> : <div />;
+
+        let communitiesUpgradeNotice;
+        if (this.state.showUpgradeNotice) {
+            let text;
+            if (this.state.isUserPrivileged) {
+                text = _t("You can create a Space from this community <a>here</a>.", {}, {
+                    a: sub => <AccessibleButton onClick={this._onCreateSpaceClick} kind="link">
+                        { sub }
+                    </AccessibleButton>,
+                });
+            } else {
+                text = _t("Ask the <a>admins</a> of this community to make it into a Space " +
+                    "and keep a look out for the invite.", {}, {
+                    a: sub => <AccessibleButton onClick={this._onAdminsLinkClick} kind="link">
+                        { sub }
+                    </AccessibleButton>,
+                });
+            }
+
+            communitiesUpgradeNotice = <div className="mx_GroupView_spaceUpgradePrompt">
+                <h2>{ _t("Communities can now be made into Spaces") }</h2>
+                <p>
+                    { _t("Spaces are a new way to make a community, with new features coming.") }
+                    &nbsp;
+                    { text }
+                    &nbsp;
+                    { _t("Communities won't receive further updates.") }
+                </p>
+                <AccessibleButton
+                    className="mx_GroupView_spaceUpgradePrompt_close"
+                    onClick={this._dismissUpgradeNotice}
+                />
+            </div>;
+        }
+
         return <div className={groupSettingsSectionClasses}>
             { header }
             { hostingSignup }
             { changeDelayWarning }
+            { communitiesUpgradeNotice }
             { this._getJoinableNode() }
             { this._getLongDescriptionNode() }
             { this._getRoomsNode() }
@@ -855,7 +914,6 @@ export default class GroupView extends React.Component {
     _getRoomsNode() {
         const RoomDetailList = sdk.getComponent('rooms.RoomDetailList');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const TintableSvg = sdk.getComponent('elements.TintableSvg');
         const Spinner = sdk.getComponent('elements.Spinner');
         const TooltipButton = sdk.getComponent('elements.TooltipButton');
 
@@ -871,7 +929,7 @@ export default class GroupView extends React.Component {
                 onClick={this._onAddRoomsClick}
             >
                 <div className="mx_GroupView_rooms_header_addRow_button">
-                    <TintableSvg src={require("../../../res/img/icons-room-add.svg")} width="24" height="24" />
+                    <img src={require("../../../res/img/icons-room-add.svg")} width="24" height="24" />
                 </div>
                 <div className="mx_GroupView_rooms_header_addRow_label">
                     { _t('Add rooms to this community') }
@@ -1185,10 +1243,13 @@ export default class GroupView extends React.Component {
                     avatarImage = <Spinner />;
                 } else {
                     const GroupAvatar = sdk.getComponent('avatars.GroupAvatar');
-                    avatarImage = <GroupAvatar groupId={this.props.groupId}
+                    avatarImage = <GroupAvatar
+                        groupId={this.props.groupId}
                         groupName={this.state.profileForm.name}
                         groupAvatarUrl={this.state.profileForm.avatar_url}
-                        width={28} height={28} resizeMethod='crop'
+                        width={28}
+                        height={28}
+                        resizeMethod='crop'
                     />;
                 }
 
@@ -1199,9 +1260,12 @@ export default class GroupView extends React.Component {
                         </label>
                         <div className="mx_GroupView_avatarPicker_edit">
                             <label htmlFor="avatarInput" className="mx_GroupView_avatarPicker_label">
-                                <img src={require("../../../res/img/camera.svg")}
-                                    alt={_t("Upload avatar")} title={_t("Upload avatar")}
-                                    width="17" height="15" />
+                                <img
+                                    src={require("../../../res/img/camera.svg")}
+                                    alt={_t("Upload avatar")}
+                                    title={_t("Upload avatar")}
+                                    width="17"
+                                    height="15" />
                             </label>
                             <input id="avatarInput" className="mx_GroupView_uploadInput" type="file" onChange={this._onAvatarSelected} />
                         </div>
@@ -1238,7 +1302,8 @@ export default class GroupView extends React.Component {
                     groupAvatarUrl={groupAvatarUrl}
                     groupName={groupName}
                     onClick={onGroupHeaderItemClick}
-                    width={28} height={28}
+                    width={28}
+                    height={28}
                 />;
                 if (summary.profile && summary.profile.name) {
                     nameNode = <div onClick={onGroupHeaderItemClick}>
@@ -1269,28 +1334,32 @@ export default class GroupView extends React.Component {
                         key="_cancelButton"
                         onClick={this._onCancelClick}
                     >
-                        <img src={require("../../../res/img/cancel.svg")} className="mx_filterFlipColor"
-                            width="18" height="18" alt={_t("Cancel")} />
+                        <img
+                            src={require("../../../res/img/cancel.svg")}
+                            className="mx_filterFlipColor"
+                            width="18"
+                            height="18"
+                            alt={_t("Cancel")} />
                     </AccessibleButton>,
                 );
             } else {
                 if (summary.user && summary.user.membership === 'join') {
                     rightButtons.push(
-                        <AccessibleButton className="mx_GroupHeader_button mx_GroupHeader_editButton"
+                        <AccessibleButton
+                            className="mx_GroupHeader_button mx_GroupHeader_editButton"
                             key="_editButton"
                             onClick={this._onEditClick}
                             title={_t("Community Settings")}
-                        >
-                        </AccessibleButton>,
+                        />,
                     );
                 }
                 rightButtons.push(
-                    <AccessibleButton className="mx_GroupHeader_button mx_GroupHeader_shareButton"
+                    <AccessibleButton
+                        className="mx_GroupHeader_button mx_GroupHeader_shareButton"
                         key="_shareButton"
                         onClick={this._onShareClick}
                         title={_t('Share Community')}
-                    >
-                    </AccessibleButton>,
+                    />,
                 );
             }
 
@@ -1336,7 +1405,7 @@ export default class GroupView extends React.Component {
             if (this.state.error.httpStatus === 404) {
                 return (
                     <div className="mx_GroupView_error">
-                        { _t('Community %(groupId)s not found', {groupId: this.props.groupId}) }
+                        { _t('Community %(groupId)s not found', { groupId: this.props.groupId }) }
                     </div>
                 );
             } else {
@@ -1346,7 +1415,7 @@ export default class GroupView extends React.Component {
                 }
                 return (
                     <div className="mx_GroupView_error">
-                        { _t('Failed to load %(groupId)s', {groupId: this.props.groupId }) }
+                        { _t('Failed to load %(groupId)s', { groupId: this.props.groupId }) }
                         { extraText }
                     </div>
                 );
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index 68bb4322e6..4ed160d493 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -15,29 +15,29 @@ limitations under the License.
 */
 
 import * as React from "react";
-import {useContext, useState} from "react";
+import { useContext, useState } from "react";
 
 import AutoHideScrollbar from './AutoHideScrollbar';
-import {getHomePageUrl} from "../../utils/pages";
-import {_t} from "../../languageHandler";
+import { getHomePageUrl } from "../../utils/pages";
+import { _t } from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
 import dis from "../../dispatcher/dispatcher";
-import {Action} from "../../dispatcher/actions";
+import { Action } from "../../dispatcher/actions";
 import BaseAvatar from "../views/avatars/BaseAvatar";
-import {OwnProfileStore} from "../../stores/OwnProfileStore";
+import { OwnProfileStore } from "../../stores/OwnProfileStore";
 import AccessibleButton from "../views/elements/AccessibleButton";
-import {UPDATE_EVENT} from "../../stores/AsyncStore";
-import {useEventEmitter} from "../../hooks/useEventEmitter";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import { useEventEmitter } from "../../hooks/useEventEmitter";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import MiniAvatarUploader, {AVATAR_SIZE} from "../views/elements/MiniAvatarUploader";
+import MiniAvatarUploader, { AVATAR_SIZE } from "../views/elements/MiniAvatarUploader";
 import Analytics from "../../Analytics";
 import CountlyAnalytics from "../../CountlyAnalytics";
 
 const onClickSendDm = () => {
     Analytics.trackEvent('home_page', 'button', 'dm');
     CountlyAnalytics.instance.track("home_page_button", { button: "dm" });
-    dis.dispatch({action: 'view_create_chat'});
+    dis.dispatch({ action: 'view_create_chat' });
 };
 
 const onClickExplore = () => {
@@ -49,7 +49,7 @@ const onClickExplore = () => {
 const onClickNewRoom = () => {
     Analytics.trackEvent('home_page', 'button', 'create_room');
     CountlyAnalytics.instance.track("home_page_button", { button: "create_room" });
-    dis.dispatch({action: 'view_create_room'});
+    dis.dispatch({ action: 'view_create_room' });
 };
 
 interface IProps {
@@ -96,6 +96,7 @@ const HomePage: React.FC<IProps> = ({ justRegistered = false }) => {
     const pageUrl = getHomePageUrl(config);
 
     if (pageUrl) {
+        // FIXME: Using an import will result in wrench-element-tests failures
         const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
         return <EmbeddedPage className="mx_HomePage" url={pageUrl} scrollbar={true} />;
     }
@@ -117,7 +118,6 @@ const HomePage: React.FC<IProps> = ({ justRegistered = false }) => {
         </React.Fragment>;
     }
 
-
     return <AutoHideScrollbar className="mx_HomePage mx_HomePage_default">
         <div className="mx_HomePage_default_wrapper">
             { introSection }
diff --git a/src/components/structures/HostSignupAction.tsx b/src/components/structures/HostSignupAction.tsx
index 769775d549..41dc8a6da8 100644
--- a/src/components/structures/HostSignupAction.tsx
+++ b/src/components/structures/HostSignupAction.tsx
@@ -22,17 +22,20 @@ import {
 import { _t } from "../../languageHandler";
 import { HostSignupStore } from "../../stores/HostSignupStore";
 import SdkConfig from "../../SdkConfig";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 
-interface IProps {}
+interface IProps {
+    onClick?(): void;
+}
 
 interface IState {}
 
 @replaceableComponent("structures.HostSignupAction")
 export default class HostSignupAction extends React.PureComponent<IProps, IState> {
     private openDialog = async () => {
+        this.props.onClick?.();
         await HostSignupStore.instance.setHostSignupActive(true);
-    }
+    };
 
     public render(): React.ReactNode {
         const hostSignupConfig = SdkConfig.get().hostSignup;
diff --git a/src/components/structures/IndicatorScrollbar.js b/src/components/structures/IndicatorScrollbar.js
deleted file mode 100644
index 51a3b287f0..0000000000
--- a/src/components/structures/IndicatorScrollbar.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from "react";
-import PropTypes from "prop-types";
-import 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
-        // and mx_IndicatorScrollbar_rightOverflowIndicator elements to the list for positioning
-        // by the parent element.
-        trackHorizontalOverflow: PropTypes.bool,
-
-        // If true, when the user tries to use their mouse wheel in the component it will
-        // scroll horizontally rather than vertically. This should only be used on components
-        // with no vertical scroll opportunity.
-        verticalScrollsHorizontally: PropTypes.bool,
-    };
-
-    constructor(props) {
-        super(props);
-        this._collectScroller = this._collectScroller.bind(this);
-        this._collectScrollerComponent = this._collectScrollerComponent.bind(this);
-        this.checkOverflow = this.checkOverflow.bind(this);
-        this._scrollElement = null;
-        this._autoHideScrollbar = null;
-        this._likelyTrackpadUser = null;
-        this._checkAgainForTrackpad = 0; // ts in milliseconds to recheck this._likelyTrackpadUser
-
-        this.state = {
-            leftIndicatorOffset: 0,
-            rightIndicatorOffset: 0,
-        };
-    }
-
-    moveToOrigin() {
-        if (!this._scrollElement) return;
-
-        this._scrollElement.scrollLeft = 0;
-        this._scrollElement.scrollTop = 0;
-    }
-
-    _collectScroller(scroller) {
-        if (scroller && !this._scrollElement) {
-            this._scrollElement = scroller;
-            // Using the passive option to not block the main thread
-            // https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#improving_scrolling_performance_with_passive_listeners
-            this._scrollElement.addEventListener("scroll", this.checkOverflow, { passive: true });
-            this.checkOverflow();
-        }
-    }
-
-    _collectScrollerComponent(autoHideScrollbar) {
-        this._autoHideScrollbar = autoHideScrollbar;
-    }
-
-
-    componentDidUpdate(prevProps) {
-        const prevLen = prevProps && prevProps.children && prevProps.children.length || 0;
-        const curLen = this.props.children && this.props.children.length || 0;
-        // check overflow only if amount of children changes.
-        // if we don't guard here, we end up with an infinite
-        // render > componentDidUpdate > checkOverflow > setState > render loop
-        if (prevLen !== curLen) {
-            this.checkOverflow();
-        }
-    }
-
-    componentDidMount() {
-        this.checkOverflow();
-    }
-
-    checkOverflow() {
-        const hasTopOverflow = this._scrollElement.scrollTop > 0;
-        const hasBottomOverflow = this._scrollElement.scrollHeight >
-            (this._scrollElement.scrollTop + this._scrollElement.clientHeight);
-        const hasLeftOverflow = this._scrollElement.scrollLeft > 0;
-        const hasRightOverflow = this._scrollElement.scrollWidth >
-            (this._scrollElement.scrollLeft + this._scrollElement.clientWidth);
-
-        if (hasTopOverflow) {
-            this._scrollElement.classList.add("mx_IndicatorScrollbar_topOverflow");
-        } else {
-            this._scrollElement.classList.remove("mx_IndicatorScrollbar_topOverflow");
-        }
-        if (hasBottomOverflow) {
-            this._scrollElement.classList.add("mx_IndicatorScrollbar_bottomOverflow");
-        } else {
-            this._scrollElement.classList.remove("mx_IndicatorScrollbar_bottomOverflow");
-        }
-        if (hasLeftOverflow) {
-            this._scrollElement.classList.add("mx_IndicatorScrollbar_leftOverflow");
-        } else {
-            this._scrollElement.classList.remove("mx_IndicatorScrollbar_leftOverflow");
-        }
-        if (hasRightOverflow) {
-            this._scrollElement.classList.add("mx_IndicatorScrollbar_rightOverflow");
-        } else {
-            this._scrollElement.classList.remove("mx_IndicatorScrollbar_rightOverflow");
-        }
-
-        if (this.props.trackHorizontalOverflow) {
-            this.setState({
-                // Offset from absolute position of the container
-                leftIndicatorOffset: hasLeftOverflow ? `${this._scrollElement.scrollLeft}px` : '0',
-
-                // Negative because we're coming from the right
-                rightIndicatorOffset: hasRightOverflow ? `-${this._scrollElement.scrollLeft}px` : '0',
-            });
-        }
-    }
-
-    getScrollTop() {
-        return this._autoHideScrollbar.getScrollTop();
-    }
-
-    componentWillUnmount() {
-        if (this._scrollElement) {
-            this._scrollElement.removeEventListener("scroll", this.checkOverflow);
-        }
-    }
-
-    onMouseWheel = (e) => {
-        if (this.props.verticalScrollsHorizontally && this._scrollElement) {
-            // xyThreshold is the amount of horizontal motion required for the component to
-            // ignore the vertical delta in a scroll. Used to stop trackpads from acting in
-            // strange ways. Should be positive.
-            const xyThreshold = 0;
-
-            // yRetention is the factor multiplied by the vertical delta to try and reduce
-            // the harshness of the scroll behaviour. Should be a value between 0 and 1.
-            const yRetention = 1.0;
-
-            // whenever we see horizontal scrolling, assume the user is on a trackpad
-            // for at least the next 1 minute.
-            const now = new Date().getTime();
-            if (Math.abs(e.deltaX) > 0) {
-                this._likelyTrackpadUser = true;
-                this._checkAgainForTrackpad = now + (1 * 60 * 1000);
-            } else {
-                // if we haven't seen any horizontal scrolling for a while, assume
-                // the user might have plugged in a mousewheel
-                if (this._likelyTrackpadUser && now >= this._checkAgainForTrackpad) {
-                    this._likelyTrackpadUser = false;
-                }
-            }
-
-            // don't mess with the horizontal scroll for trackpad users
-            // See https://github.com/vector-im/element-web/issues/10005
-            if (this._likelyTrackpadUser) {
-                return;
-            }
-
-            if (Math.abs(e.deltaX) <= xyThreshold) { // we are vertically scrolling.
-                // HACK: We increase the amount of scroll to counteract smooth scrolling browsers.
-                // Smooth scrolling browsers (Firefox) use the relative area to determine the scroll
-                // amount, which means the likely small area of content results in a small amount of
-                // movement - not what people expect. We pick arbitrary values for when to apply more
-                // scroll, and how much to apply. On Windows 10, Chrome scrolls 100 units whereas
-                // Firefox scrolls just 3 due to smooth scrolling.
-
-                const additionalScroll = e.deltaY < 0 ? -50 : 50;
-
-                // noinspection JSSuspiciousNameCombination
-                const val = Math.abs(e.deltaY) < 25 ? (e.deltaY + additionalScroll) : e.deltaY;
-                this._scrollElement.scrollLeft += val * yRetention;
-            }
-        }
-    };
-
-    render() {
-        const leftIndicatorStyle = {left: this.state.leftIndicatorOffset};
-        const rightIndicatorStyle = {right: this.state.rightIndicatorOffset};
-        const leftOverflowIndicator = this.props.trackHorizontalOverflow
-            ? <div className="mx_IndicatorScrollbar_leftOverflowIndicator" style={leftIndicatorStyle} /> : null;
-        const rightOverflowIndicator = this.props.trackHorizontalOverflow
-            ? <div className="mx_IndicatorScrollbar_rightOverflowIndicator" style={rightIndicatorStyle} /> : null;
-
-        return (<AutoHideScrollbar
-            ref={this._collectScrollerComponent}
-            wrappedRef={this._collectScroller}
-            onWheel={this.onMouseWheel}
-            {...this.props}
-        >
-            { leftOverflowIndicator }
-            { this.props.children }
-            { rightOverflowIndicator }
-        </AutoHideScrollbar>);
-    }
-}
diff --git a/src/components/structures/IndicatorScrollbar.tsx b/src/components/structures/IndicatorScrollbar.tsx
new file mode 100644
index 0000000000..85de659481
--- /dev/null
+++ b/src/components/structures/IndicatorScrollbar.tsx
@@ -0,0 +1,198 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from "react";
+import AutoHideScrollbar from "./AutoHideScrollbar";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+interface IProps {
+    // If true, the scrollbar will append mx_IndicatorScrollbar_leftOverflowIndicator
+    // and mx_IndicatorScrollbar_rightOverflowIndicator elements to the list for positioning
+    // by the parent element.
+    trackHorizontalOverflow?: boolean;
+
+    // If true, when the user tries to use their mouse wheel in the component it will
+    // scroll horizontally rather than vertically. This should only be used on components
+    // with no vertical scroll opportunity.
+    verticalScrollsHorizontally?: boolean;
+
+    children: React.ReactNode;
+    className: string;
+}
+
+interface IState {
+    leftIndicatorOffset: number | string;
+    rightIndicatorOffset: number | string;
+}
+
+@replaceableComponent("structures.IndicatorScrollbar")
+export default class IndicatorScrollbar extends React.Component<IProps, IState> {
+    private autoHideScrollbar = createRef<AutoHideScrollbar>();
+    private scrollElement: HTMLDivElement;
+    private likelyTrackpadUser: boolean = null;
+    private checkAgainForTrackpad = 0; // ts in milliseconds to recheck this._likelyTrackpadUser
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            leftIndicatorOffset: 0,
+            rightIndicatorOffset: 0,
+        };
+    }
+
+    private collectScroller = (scroller: HTMLDivElement): void => {
+        if (scroller && !this.scrollElement) {
+            this.scrollElement = scroller;
+            // Using the passive option to not block the main thread
+            // https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#improving_scrolling_performance_with_passive_listeners
+            this.scrollElement.addEventListener("scroll", this.checkOverflow, { passive: true });
+            this.checkOverflow();
+        }
+    };
+
+    public componentDidUpdate(prevProps: IProps): void {
+        const prevLen = React.Children.count(prevProps.children);
+        const curLen = React.Children.count(this.props.children);
+        // check overflow only if amount of children changes.
+        // if we don't guard here, we end up with an infinite
+        // render > componentDidUpdate > checkOverflow > setState > render loop
+        if (prevLen !== curLen) {
+            this.checkOverflow();
+        }
+    }
+
+    public componentDidMount(): void {
+        this.checkOverflow();
+    }
+
+    private checkOverflow = (): void => {
+        const hasTopOverflow = this.scrollElement.scrollTop > 0;
+        const hasBottomOverflow = this.scrollElement.scrollHeight >
+            (this.scrollElement.scrollTop + this.scrollElement.clientHeight);
+        const hasLeftOverflow = this.scrollElement.scrollLeft > 0;
+        const hasRightOverflow = this.scrollElement.scrollWidth >
+            (this.scrollElement.scrollLeft + this.scrollElement.clientWidth);
+
+        if (hasTopOverflow) {
+            this.scrollElement.classList.add("mx_IndicatorScrollbar_topOverflow");
+        } else {
+            this.scrollElement.classList.remove("mx_IndicatorScrollbar_topOverflow");
+        }
+        if (hasBottomOverflow) {
+            this.scrollElement.classList.add("mx_IndicatorScrollbar_bottomOverflow");
+        } else {
+            this.scrollElement.classList.remove("mx_IndicatorScrollbar_bottomOverflow");
+        }
+        if (hasLeftOverflow) {
+            this.scrollElement.classList.add("mx_IndicatorScrollbar_leftOverflow");
+        } else {
+            this.scrollElement.classList.remove("mx_IndicatorScrollbar_leftOverflow");
+        }
+        if (hasRightOverflow) {
+            this.scrollElement.classList.add("mx_IndicatorScrollbar_rightOverflow");
+        } else {
+            this.scrollElement.classList.remove("mx_IndicatorScrollbar_rightOverflow");
+        }
+
+        if (this.props.trackHorizontalOverflow) {
+            this.setState({
+                // Offset from absolute position of the container
+                leftIndicatorOffset: hasLeftOverflow ? `${this.scrollElement.scrollLeft}px` : '0',
+
+                // Negative because we're coming from the right
+                rightIndicatorOffset: hasRightOverflow ? `-${this.scrollElement.scrollLeft}px` : '0',
+            });
+        }
+    };
+
+    public componentWillUnmount(): void {
+        if (this.scrollElement) {
+            this.scrollElement.removeEventListener("scroll", this.checkOverflow);
+        }
+    }
+
+    private onMouseWheel = (e: React.WheelEvent): void => {
+        if (this.props.verticalScrollsHorizontally && this.scrollElement) {
+            // xyThreshold is the amount of horizontal motion required for the component to
+            // ignore the vertical delta in a scroll. Used to stop trackpads from acting in
+            // strange ways. Should be positive.
+            const xyThreshold = 0;
+
+            // yRetention is the factor multiplied by the vertical delta to try and reduce
+            // the harshness of the scroll behaviour. Should be a value between 0 and 1.
+            const yRetention = 1.0;
+
+            // whenever we see horizontal scrolling, assume the user is on a trackpad
+            // for at least the next 1 minute.
+            const now = new Date().getTime();
+            if (Math.abs(e.deltaX) > 0) {
+                this.likelyTrackpadUser = true;
+                this.checkAgainForTrackpad = now + (1 * 60 * 1000);
+            } else {
+                // if we haven't seen any horizontal scrolling for a while, assume
+                // the user might have plugged in a mousewheel
+                if (this.likelyTrackpadUser && now >= this.checkAgainForTrackpad) {
+                    this.likelyTrackpadUser = false;
+                }
+            }
+
+            // don't mess with the horizontal scroll for trackpad users
+            // See https://github.com/vector-im/element-web/issues/10005
+            if (this.likelyTrackpadUser) {
+                return;
+            }
+
+            if (Math.abs(e.deltaX) <= xyThreshold) { // we are vertically scrolling.
+                // HACK: We increase the amount of scroll to counteract smooth scrolling browsers.
+                // Smooth scrolling browsers (Firefox) use the relative area to determine the scroll
+                // amount, which means the likely small area of content results in a small amount of
+                // movement - not what people expect. We pick arbitrary values for when to apply more
+                // scroll, and how much to apply. On Windows 10, Chrome scrolls 100 units whereas
+                // Firefox scrolls just 3 due to smooth scrolling.
+
+                const additionalScroll = e.deltaY < 0 ? -50 : 50;
+
+                // noinspection JSSuspiciousNameCombination
+                const val = Math.abs(e.deltaY) < 25 ? (e.deltaY + additionalScroll) : e.deltaY;
+                this.scrollElement.scrollLeft += val * yRetention;
+            }
+        }
+    };
+
+    public render(): JSX.Element {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { children, trackHorizontalOverflow, verticalScrollsHorizontally, ...otherProps } = this.props;
+
+        const leftIndicatorStyle = { left: this.state.leftIndicatorOffset };
+        const rightIndicatorStyle = { right: this.state.rightIndicatorOffset };
+        const leftOverflowIndicator = trackHorizontalOverflow
+            ? <div className="mx_IndicatorScrollbar_leftOverflowIndicator" style={leftIndicatorStyle} /> : null;
+        const rightOverflowIndicator = trackHorizontalOverflow
+            ? <div className="mx_IndicatorScrollbar_rightOverflowIndicator" style={rightIndicatorStyle} /> : null;
+
+        return (<AutoHideScrollbar
+            ref={this.autoHideScrollbar}
+            wrappedRef={this.collectScroller}
+            onWheel={this.onMouseWheel}
+            {...otherProps}
+        >
+            { leftOverflowIndicator }
+            { children }
+            { rightOverflowIndicator }
+        </AutoHideScrollbar>);
+    }
+}
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
deleted file mode 100644
index d419c9de6e..0000000000
--- a/src/components/structures/InteractiveAuth.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd.
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT 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 {InteractiveAuth} from "matrix-js-sdk/src/interactive-auth";
-import React, {createRef} from 'react';
-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
-        matrixClient: PropTypes.object.isRequired,
-
-        // response from initial request. If not supplied, will do a request on
-        // mount.
-        authData: PropTypes.shape({
-            flows: PropTypes.array,
-            params: PropTypes.object,
-            session: PropTypes.string,
-        }),
-
-        // callback
-        makeRequest: PropTypes.func.isRequired,
-
-        // callback called when the auth process has finished,
-        // successfully or unsuccessfully.
-        // @param {bool} status True if the operation requiring
-        //     auth was completed sucessfully, false if canceled.
-        // @param {object} result The result of the authenticated call
-        //     if successful, otherwise the error object.
-        // @param {object} extra Additional information about the UI Auth
-        //     process:
-        //      * emailSid {string} If email auth was performed, the sid of
-        //            the auth session.
-        //      * clientSecret {string} The client secret used in auth
-        //            sessions with the ID server.
-        onAuthFinished: PropTypes.func.isRequired,
-
-        // Inputs provided by the user to the auth process
-        // and used by various stages. As passed to js-sdk
-        // interactive-auth
-        inputs: PropTypes.object,
-
-        // As js-sdk interactive-auth
-        requestEmailToken: PropTypes.func,
-        sessionId: PropTypes.string,
-        clientSecret: PropTypes.string,
-        emailSid: PropTypes.string,
-
-        // If true, poll to see if the auth flow has been completed
-        // out-of-band
-        poll: PropTypes.bool,
-
-        // If true, components will be told that the 'Continue' button
-        // is managed by some other party and should not be managed by
-        // the component itself.
-        continueIsManaged: PropTypes.bool,
-
-        // Called when the stage changes, or the stage's phase changes. First
-        // argument is the stage, second is the phase. Some stages do not have
-        // phases and will be counted as 0 (numeric).
-        onStagePhaseChange: PropTypes.func,
-
-        // continueText and continueKind are passed straight through to the AuthEntryComponent.
-        continueText: PropTypes.string,
-        continueKind: PropTypes.string,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            authStage: null,
-            busy: false,
-            errorText: null,
-            stageErrorText: null,
-            submitButtonEnabled: false,
-        };
-
-        this._unmounted = false;
-        this._authLogic = new InteractiveAuth({
-            authData: this.props.authData,
-            doRequest: this._requestCallback,
-            busyChanged: this._onBusyChanged,
-            inputs: this.props.inputs,
-            stateUpdated: this._authStateUpdated,
-            matrixClient: this.props.matrixClient,
-            sessionId: this.props.sessionId,
-            clientSecret: this.props.clientSecret,
-            emailSid: this.props.emailSid,
-            requestEmailToken: this._requestEmailToken,
-        });
-
-        this._intervalId = null;
-        if (this.props.poll) {
-            this._intervalId = setInterval(() => {
-                this._authLogic.poll();
-            }, 2000);
-        }
-
-        this._stageComponent = createRef();
-    }
-
-    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
-        this._authLogic.attemptAuth().then((result) => {
-            const extra = {
-                emailSid: this._authLogic.getEmailSid(),
-                clientSecret: this._authLogic.getClientSecret(),
-            };
-            this.props.onAuthFinished(true, result, extra);
-        }).catch((error) => {
-            this.props.onAuthFinished(false, error);
-            console.error("Error during user-interactive auth:", error);
-            if (this._unmounted) {
-                return;
-            }
-
-            const msg = error.message || error.toString();
-            this.setState({
-                errorText: msg,
-            });
-        });
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-
-        if (this._intervalId !== null) {
-            clearInterval(this._intervalId);
-        }
-    }
-
-    _requestEmailToken = async (...args) => {
-        this.setState({
-            busy: true,
-        });
-        try {
-            return await this.props.requestEmailToken(...args);
-        } finally {
-            this.setState({
-                busy: false,
-            });
-        }
-    };
-
-    tryContinue = () => {
-        if (this._stageComponent.current && this._stageComponent.current.tryContinue) {
-            this._stageComponent.current.tryContinue();
-        }
-    };
-
-    _authStateUpdated = (stageType, stageState) => {
-        const oldStage = this.state.authStage;
-        this.setState({
-            busy: false,
-            authStage: stageType,
-            stageState: stageState,
-            errorText: stageState.error,
-        }, () => {
-            if (oldStage !== stageType) {
-                this._setFocus();
-            } else if (
-                !stageState.error && this._stageComponent.current &&
-                this._stageComponent.current.attemptFailed
-            ) {
-                this._stageComponent.current.attemptFailed();
-            }
-        });
-    };
-
-    _requestCallback = (auth) => {
-        // This wrapper just exists because the js-sdk passes a second
-        // 'busy' param for backwards compat. This throws the tests off
-        // so discard it here.
-        return this.props.makeRequest(auth);
-    };
-
-    _onBusyChanged = (busy) => {
-        // if we've started doing stuff, reset the error messages
-        if (busy) {
-            this.setState({
-                busy: true,
-                errorText: null,
-                stageErrorText: null,
-            });
-        }
-        // The JS SDK eagerly reports itself as "not busy" right after any
-        // immediate work has completed, but that's not really what we want at
-        // the UI layer, so we ignore this signal and show a spinner until
-        // there's a new screen to show the user. This is implemented by setting
-        // `busy: false` in `_authStateUpdated`.
-        // See also https://github.com/vector-im/element-web/issues/12546
-    };
-
-    _setFocus() {
-        if (this._stageComponent.current && this._stageComponent.current.focus) {
-            this._stageComponent.current.focus();
-        }
-    }
-
-    _submitAuthDict = authData => {
-        this._authLogic.submitAuthDict(authData);
-    };
-
-    _onPhaseChange = newPhase => {
-        if (this.props.onStagePhaseChange) {
-            this.props.onStagePhaseChange(this.state.authStage, newPhase || 0);
-        }
-    };
-
-    _onStageCancel = () => {
-        this.props.onAuthFinished(false, ERROR_USER_CANCELLED);
-    };
-
-    _renderCurrentStage() {
-        const stage = this.state.authStage;
-        if (!stage) {
-            if (this.state.busy) {
-                const Loader = sdk.getComponent("elements.Spinner");
-                return <Loader />;
-            } else {
-                return null;
-            }
-        }
-
-        const StageComponent = getEntryComponentForLoginType(stage);
-        return (
-            <StageComponent
-                ref={this._stageComponent}
-                loginType={stage}
-                matrixClient={this.props.matrixClient}
-                authSessionId={this._authLogic.getSessionId()}
-                clientSecret={this._authLogic.getClientSecret()}
-                stageParams={this._authLogic.getStageParams(stage)}
-                submitAuthDict={this._submitAuthDict}
-                errorText={this.state.stageErrorText}
-                busy={this.state.busy}
-                inputs={this.props.inputs}
-                stageState={this.state.stageState}
-                fail={this._onAuthStageFailed}
-                setEmailSid={this._setEmailSid}
-                showContinue={!this.props.continueIsManaged}
-                onPhaseChange={this._onPhaseChange}
-                continueText={this.props.continueText}
-                continueKind={this.props.continueKind}
-                onCancel={this._onStageCancel}
-            />
-        );
-    }
-
-    _onAuthStageFailed = e => {
-        this.props.onAuthFinished(false, e);
-    };
-
-    _setEmailSid = sid => {
-        this._authLogic.setEmailSid(sid);
-    };
-
-    render() {
-        let error = null;
-        if (this.state.errorText) {
-            error = (
-                <div className="error">
-                    { this.state.errorText }
-                </div>
-            );
-        }
-
-        return (
-            <div>
-                <div>
-                    { this._renderCurrentStage() }
-                    { error }
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/structures/InteractiveAuth.tsx b/src/components/structures/InteractiveAuth.tsx
new file mode 100644
index 0000000000..869cd29cba
--- /dev/null
+++ b/src/components/structures/InteractiveAuth.tsx
@@ -0,0 +1,300 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 {
+    AuthType,
+    IAuthData,
+    IAuthDict,
+    IInputs,
+    InteractiveAuth,
+    IStageStatus,
+} from "matrix-js-sdk/src/interactive-auth";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import React, { createRef } from 'react';
+
+import getEntryComponentForLoginType, { IStageComponent } from '../views/auth/InteractiveAuthEntryComponents';
+import Spinner from "../views/elements/Spinner";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+export const ERROR_USER_CANCELLED = new Error("User cancelled auth session");
+
+interface IProps {
+    // matrix client to use for UI auth requests
+    matrixClient: MatrixClient;
+    // response from initial request. If not supplied, will do a request on mount.
+    authData?: IAuthData;
+    // Inputs provided by the user to the auth process
+    // and used by various stages. As passed to js-sdk
+    // interactive-auth
+    inputs?: IInputs;
+    sessionId?: string;
+    clientSecret?: string;
+    emailSid?: string;
+    // If true, poll to see if the auth flow has been completed out-of-band
+    poll?: boolean;
+    // If true, components will be told that the 'Continue' button
+    // is managed by some other party and should not be managed by
+    // the component itself.
+    continueIsManaged?: boolean;
+    // continueText and continueKind are passed straight through to the AuthEntryComponent.
+    continueText?: string;
+    continueKind?: string;
+    // callback
+    makeRequest(auth: IAuthData): Promise<IAuthData>;
+    // callback called when the auth process has finished,
+    // successfully or unsuccessfully.
+    // @param {boolean} status True if the operation requiring
+    //     auth was completed successfully, false if canceled.
+    // @param {object} result The result of the authenticated call
+    //     if successful, otherwise the error object.
+    // @param {object} extra Additional information about the UI Auth
+    //     process:
+    //      * emailSid {string} If email auth was performed, the sid of
+    //            the auth session.
+    //      * clientSecret {string} The client secret used in auth
+    //            sessions with the ID server.
+    onAuthFinished(
+        status: boolean,
+        result: IAuthData | Error,
+        extra?: { emailSid?: string, clientSecret?: string },
+    ): void;
+    // As js-sdk interactive-auth
+    requestEmailToken?(email: string, secret: string, attempt: number, session: string): Promise<{ sid: string }>;
+    // Called when the stage changes, or the stage's phase changes. First
+    // argument is the stage, second is the phase. Some stages do not have
+    // phases and will be counted as 0 (numeric).
+    onStagePhaseChange?(stage: string, phase: string | number): void;
+}
+
+interface IState {
+    authStage?: AuthType;
+    stageState?: IStageStatus;
+    busy: boolean;
+    errorText?: string;
+    stageErrorText?: string;
+    submitButtonEnabled: boolean;
+}
+
+@replaceableComponent("structures.InteractiveAuthComponent")
+export default class InteractiveAuthComponent extends React.Component<IProps, IState> {
+    private readonly authLogic: InteractiveAuth;
+    private readonly intervalId: number = null;
+    private readonly stageComponent = createRef<IStageComponent>();
+
+    private unmounted = false;
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            authStage: null,
+            busy: false,
+            errorText: null,
+            stageErrorText: null,
+            submitButtonEnabled: false,
+        };
+
+        this.authLogic = new InteractiveAuth({
+            authData: this.props.authData,
+            doRequest: this.requestCallback,
+            busyChanged: this.onBusyChanged,
+            inputs: this.props.inputs,
+            stateUpdated: this.authStateUpdated,
+            matrixClient: this.props.matrixClient,
+            sessionId: this.props.sessionId,
+            clientSecret: this.props.clientSecret,
+            emailSid: this.props.emailSid,
+            requestEmailToken: this.requestEmailToken,
+        });
+
+        if (this.props.poll) {
+            this.intervalId = setInterval(() => {
+                this.authLogic.poll();
+            }, 2000);
+        }
+    }
+
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount() { // eslint-disable-line @typescript-eslint/naming-convention, camelcase
+        this.authLogic.attemptAuth().then((result) => {
+            const extra = {
+                emailSid: this.authLogic.getEmailSid(),
+                clientSecret: this.authLogic.getClientSecret(),
+            };
+            this.props.onAuthFinished(true, result, extra);
+        }).catch((error) => {
+            this.props.onAuthFinished(false, error);
+            console.error("Error during user-interactive auth:", error);
+            if (this.unmounted) {
+                return;
+            }
+
+            const msg = error.message || error.toString();
+            this.setState({
+                errorText: msg,
+            });
+        });
+    }
+
+    componentWillUnmount() {
+        this.unmounted = true;
+
+        if (this.intervalId !== null) {
+            clearInterval(this.intervalId);
+        }
+    }
+
+    private requestEmailToken = async (
+        email: string,
+        secret: string,
+        attempt: number,
+        session: string,
+    ): Promise<{sid: string}> => {
+        this.setState({
+            busy: true,
+        });
+        try {
+            return await this.props.requestEmailToken(email, secret, attempt, session);
+        } finally {
+            this.setState({
+                busy: false,
+            });
+        }
+    };
+
+    private tryContinue = (): void => {
+        this.stageComponent.current?.tryContinue?.();
+    };
+
+    private authStateUpdated = (stageType: AuthType, stageState: IStageStatus): void => {
+        const oldStage = this.state.authStage;
+        this.setState({
+            busy: false,
+            authStage: stageType,
+            stageState: stageState,
+            errorText: stageState.error,
+        }, () => {
+            if (oldStage !== stageType) {
+                this.setFocus();
+            } else if (!stageState.error) {
+                this.stageComponent.current?.attemptFailed?.();
+            }
+        });
+    };
+
+    private requestCallback = (auth: IAuthData, background: boolean): Promise<IAuthData> => {
+        // This wrapper just exists because the js-sdk passes a second
+        // 'busy' param for backwards compat. This throws the tests off
+        // so discard it here.
+        return this.props.makeRequest(auth);
+    };
+
+    private onBusyChanged = (busy: boolean): void => {
+        // if we've started doing stuff, reset the error messages
+        if (busy) {
+            this.setState({
+                busy: true,
+                errorText: null,
+                stageErrorText: null,
+            });
+        }
+        // The JS SDK eagerly reports itself as "not busy" right after any
+        // immediate work has completed, but that's not really what we want at
+        // the UI layer, so we ignore this signal and show a spinner until
+        // there's a new screen to show the user. This is implemented by setting
+        // `busy: false` in `authStateUpdated`.
+        // See also https://github.com/vector-im/element-web/issues/12546
+    };
+
+    private setFocus(): void {
+        this.stageComponent.current?.focus?.();
+    }
+
+    private submitAuthDict = (authData: IAuthDict): void => {
+        this.authLogic.submitAuthDict(authData);
+    };
+
+    private onPhaseChange = (newPhase: number): void => {
+        this.props.onStagePhaseChange?.(this.state.authStage, newPhase || 0);
+    };
+
+    private onStageCancel = (): void => {
+        this.props.onAuthFinished(false, ERROR_USER_CANCELLED);
+    };
+
+    private renderCurrentStage(): JSX.Element {
+        const stage = this.state.authStage;
+        if (!stage) {
+            if (this.state.busy) {
+                return <Spinner />;
+            } else {
+                return null;
+            }
+        }
+
+        const StageComponent = getEntryComponentForLoginType(stage);
+        return (
+            <StageComponent
+                ref={this.stageComponent as any}
+                loginType={stage}
+                matrixClient={this.props.matrixClient}
+                authSessionId={this.authLogic.getSessionId()}
+                clientSecret={this.authLogic.getClientSecret()}
+                stageParams={this.authLogic.getStageParams(stage)}
+                submitAuthDict={this.submitAuthDict}
+                errorText={this.state.stageErrorText}
+                busy={this.state.busy}
+                inputs={this.props.inputs}
+                stageState={this.state.stageState}
+                fail={this.onAuthStageFailed}
+                setEmailSid={this.setEmailSid}
+                showContinue={!this.props.continueIsManaged}
+                onPhaseChange={this.onPhaseChange}
+                continueText={this.props.continueText}
+                continueKind={this.props.continueKind}
+                onCancel={this.onStageCancel}
+            />
+        );
+    }
+
+    private onAuthStageFailed = (e: Error): void => {
+        this.props.onAuthFinished(false, e);
+    };
+
+    private setEmailSid = (sid: string): void => {
+        this.authLogic.setEmailSid(sid);
+    };
+
+    render() {
+        let error = null;
+        if (this.state.errorText) {
+            error = (
+                <div className="error">
+                    { this.state.errorText }
+                </div>
+            );
+        }
+
+        return (
+            <div>
+                <div>
+                    { this.renderCurrentStage() }
+                    { error }
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 5b6b9c3717..9a2ebd45e2 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -19,11 +19,10 @@ 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 dis from "../../dispatcher/dispatcher";
 import { _t } from "../../languageHandler";
 import RoomList from "../views/rooms/RoomList";
+import CallHandler from "../../CallHandler";
 import { HEADER_HEIGHT } from "../views/rooms/RoomSublist";
 import { Action } from "../../dispatcher/actions";
 import UserMenu from "./UserMenu";
@@ -32,16 +31,13 @@ import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
 import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import ResizeNotifier from "../../utils/ResizeNotifier";
-import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore, { LISTS_UPDATE_EVENT } from "../../stores/room-list/RoomListStore";
 import IndicatorScrollbar from "../structures/IndicatorScrollbar";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import { OwnProfileStore } from "../../stores/OwnProfileStore";
 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import SpaceStore, { UPDATE_SELECTED_SPACE } from "../../stores/SpaceStore";
 import { getKeyBindingsManager, RoomListAction } from "../../KeyBindingsManager";
 import UIStore from "../../stores/UIStore";
 
@@ -52,7 +48,6 @@ interface IProps {
 
 interface IState {
     showBreadcrumbs: boolean;
-    showGroupFilterPanel: boolean;
     activeSpace?: Room;
 }
 
@@ -69,8 +64,6 @@ const cssClasses = [
 export default class LeftPanel extends React.Component<IProps, IState> {
     private ref: React.RefObject<HTMLDivElement> = createRef();
     private listContainerRef: React.RefObject<HTMLDivElement> = createRef();
-    private groupFilterPanelWatcherRef: string;
-    private bgImageWatcherRef: string;
     private focusedElement = null;
     private isDoingStickyHeaders = false;
 
@@ -79,22 +72,16 @@ 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, () => {
-            this.setState({showGroupFilterPanel: SettingsStore.getValue("TagPanel.enableTagPanel")});
-        });
     }
 
     public componentDidMount() {
+        UIStore.instance.trackElementDimensions("LeftPanel", this.ref.current);
         UIStore.instance.trackElementDimensions("ListContainer", this.listContainerRef.current);
         UIStore.instance.on("ListContainer", this.refreshStickyHeaders);
         // Using the passive option to not block the main thread
@@ -103,11 +90,8 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     }
 
     public componentWillUnmount() {
-        SettingsStore.unwatchSetting(this.groupFilterPanelWatcherRef);
-        SettingsStore.unwatchSetting(this.bgImageWatcherRef);
         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);
         UIStore.instance.stopTrackingElementDimensions("ListContainer");
         UIStore.instance.removeListener("ListContainer", this.refreshStickyHeaders);
@@ -124,6 +108,10 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         this.setState({ activeSpace });
     };
 
+    private onDialPad = () => {
+        dis.fire(Action.OpenDialPad);
+    };
+
     private onExplore = () => {
         dis.fire(Action.ViewRoomDirectory);
     };
@@ -131,12 +119,12 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     private refreshStickyHeaders = () => {
         if (!this.listContainerRef.current) return; // ignore: no headers to sticky
         this.handleStickyHeaders(this.listContainerRef.current);
-    }
+    };
 
     private onBreadcrumbsUpdate = () => {
         const newVal = BreadcrumbsStore.instance.visible;
         if (newVal !== this.state.showBreadcrumbs) {
-            this.setState({showBreadcrumbs: newVal});
+            this.setState({ showBreadcrumbs: newVal });
 
             // Update the sticky headers too as the breadcrumbs will be popping in or out.
             if (!this.listContainerRef.current) return; // ignore: no headers to sticky
@@ -144,23 +132,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         }
     };
 
-    private onBackgroundImageUpdate = () => {
-        // Note: we do this in the LeftPanel as it uses this variable most prominently.
-        const avatarSize = 32; // arbitrary
-        let avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
-        const settingBgMxc = SettingsStore.getValue("RoomList.backgroundImage");
-        if (settingBgMxc) {
-            avatarUrl = mediaFromMxc(settingBgMxc).getSquareThumbnailHttp(avatarSize);
-        }
-
-        const avatarUrlProp = `url(${avatarUrl})`;
-        if (!avatarUrl) {
-            document.body.style.removeProperty("--avatar-url");
-        } else if (document.body.style.getPropertyValue("--avatar-url") !== avatarUrlProp) {
-            document.body.style.setProperty("--avatar-url", avatarUrlProp);
-        }
-    };
-
     private handleStickyHeaders(list: HTMLDivElement) {
         if (this.isDoingStickyHeaders) return;
         this.isDoingStickyHeaders = true;
@@ -387,9 +358,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                 <IndicatorScrollbar
                     className="mx_LeftPanel_breadcrumbsContainer mx_AutoHideScrollbar"
                     verticalScrollsHorizontally={true}
-                    // Firefox sometimes makes this element focusable due to
-                    // overflow:scroll;, so force it out of tab order.
-                    tabIndex={-1}
                 >
                     <RoomBreadcrumbs />
                 </IndicatorScrollbar>
@@ -397,7 +365,20 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         }
     }
 
-    private renderSearchExplore(): React.ReactNode {
+    private renderSearchDialExplore(): React.ReactNode {
+        let dialPadButton = null;
+
+        // If we have dialer support, show a button to bring up the dial pad
+        // to start a new call
+        if (CallHandler.sharedInstance().getSupportsPstnProtocol()) {
+            dialPadButton =
+                <AccessibleTooltipButton
+                    className={classNames("mx_LeftPanel_dialPadButton", {})}
+                    onClick={this.onDialPad}
+                    title={_t("Open dial pad")}
+                />;
+        }
+
         return (
             <div
                 className="mx_LeftPanel_filterContainer"
@@ -410,28 +391,23 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                     onKeyDown={this.onKeyDown}
                     onSelectRoom={this.selectRoom}
                 />
+
+                { dialPadButton }
+
                 <AccessibleTooltipButton
                     className={classNames("mx_LeftPanel_exploreButton", {
                         mx_LeftPanel_exploreButton_space: !!this.state.activeSpace,
                     })}
                     onClick={this.onExplore}
-                    title={_t("Explore rooms")}
+                    title={this.state.activeSpace
+                        ? _t("Explore %(spaceName)s", { spaceName: this.state.activeSpace.name })
+                        : _t("Explore rooms")}
                 />
             </div>
         );
     }
 
     public render(): React.ReactNode {
-        let leftLeftPanel;
-        if (this.state.showGroupFilterPanel) {
-            leftLeftPanel = (
-                <div className="mx_LeftPanel_GroupFilterPanelContainer">
-                    <GroupFilterPanel />
-                    {SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null}
-                </div>
-            );
-        }
-
         const roomList = <RoomList
             onKeyDown={this.onKeyDown}
             resizeNotifier={this.props.resizeNotifier}
@@ -439,6 +415,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
             onBlur={this.onBlur}
             isMinimized={this.props.isMinimized}
             activeSpace={this.state.activeSpace}
+            onResize={this.refreshStickyHeaders}
             onListCollapse={this.refreshStickyHeaders}
         />;
 
@@ -454,11 +431,10 @@ export default class LeftPanel extends React.Component<IProps, IState> {
 
         return (
             <div className={containerClasses} ref={this.ref}>
-                {leftLeftPanel}
                 <aside className="mx_LeftPanel_roomListContainer">
-                    {this.renderHeader()}
-                    {this.renderSearchExplore()}
-                    {this.renderBreadcrumbs()}
+                    { this.renderHeader() }
+                    { this.renderSearchDialExplore() }
+                    { this.renderBreadcrumbs() }
                     <RoomListNumResults onVisibilityChange={this.refreshStickyHeaders} />
                     <div className="mx_LeftPanel_roomListWrapper">
                         <div
@@ -468,7 +444,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                             // overflow:scroll;, so force it out of tab order.
                             tabIndex={-1}
                         >
-                            {roomList}
+                            { roomList }
                         </div>
                     </div>
                     { !this.props.isMinimized && <LeftPanelWidget /> }
diff --git a/src/components/structures/LeftPanelWidget.tsx b/src/components/structures/LeftPanelWidget.tsx
index 16142069c4..6b91acb5f8 100644
--- a/src/components/structures/LeftPanelWidget.tsx
+++ b/src/components/structures/LeftPanelWidget.tsx
@@ -14,19 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext, useMemo} from "react";
-import {Resizable} from "re-resizable";
+import React, { useContext, useMemo } from "react";
+import { Resizable } from "re-resizable";
 import classNames from "classnames";
 
 import AccessibleButton from "../views/elements/AccessibleButton";
-import {useRovingTabIndex} from "../../accessibility/RovingTabIndex";
-import {Key} from "../../Keyboard";
-import {useLocalStorageState} from "../../hooks/useLocalStorageState";
+import { useRovingTabIndex } from "../../accessibility/RovingTabIndex";
+import { Key } from "../../Keyboard";
+import { useLocalStorageState } from "../../hooks/useLocalStorageState";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import WidgetUtils, {IWidgetEvent} from "../../utils/WidgetUtils";
-import {useAccountData} from "../../hooks/useAccountData";
+import WidgetUtils, { IWidgetEvent } from "../../utils/WidgetUtils";
+import { useAccountData } from "../../hooks/useAccountData";
 import AppTile from "../views/elements/AppTile";
-import {useSettingValue} from "../../hooks/useSettings";
+import { useSettingValue } from "../../hooks/useSettings";
 import UIStore from "../../stores/UIStore";
 
 const MIN_HEIGHT = 100;
@@ -62,21 +62,20 @@ const LeftPanelWidget: React.FC = () => {
     let content;
     if (expanded) {
         content = <Resizable
-            size={{height} as any}
+            size={{ height } as any}
             minHeight={MIN_HEIGHT}
             maxHeight={Math.min(UIStore.instance.windowHeight / 2, MAX_HEIGHT)}
             onResizeStop={(e, dir, ref, d) => {
                 setHeight(height + d.height);
             }}
             handleWrapperClass="mx_LeftPanelWidget_resizerHandles"
-            handleClasses={{top: "mx_LeftPanelWidget_resizerHandle"}}
+            handleClasses={{ top: "mx_LeftPanelWidget_resizerHandle" }}
             className="mx_LeftPanelWidget_resizeBox"
             enable={{ top: true }}
         >
             <AppTile
                 app={app}
                 fullWidth
-                show
                 showMenubar={false}
                 userWidget
                 userId={cli.getUserId()}
@@ -115,7 +114,7 @@ const LeftPanelWidget: React.FC = () => {
                     aria-expanded={expanded}
                     aria-level={1}
                     onClick={() => {
-                        setExpanded(e => !e);
+                        setExpanded(!expanded);
                     }}
                 >
                     <span className={classNames({
@@ -125,15 +124,15 @@ const LeftPanelWidget: React.FC = () => {
                     <span>{ WidgetUtils.getWidgetName(app) }</span>
                 </AccessibleButton>
 
-                {/* Code for the maximise button for once we have full screen widgets */}
-                {/*<AccessibleTooltipButton
+                { /* Code for the maximise button for once we have full screen widgets */ }
+                { /*<AccessibleTooltipButton
                     tabIndex={tabIndex}
                     onClick={() => {
                     }}
                     className="mx_LeftPanelWidget_maximizeButton"
                     tooltipClassName="mx_LeftPanelWidget_maximizeButtonTooltip"
                     title={_t("Maximize")}
-                />*/}
+                />*/ }
             </div>
         </div>
 
diff --git a/src/components/structures/LegacyCommunityPreview.tsx b/src/components/structures/LegacyCommunityPreview.tsx
new file mode 100644
index 0000000000..32bafeb3fa
--- /dev/null
+++ b/src/components/structures/LegacyCommunityPreview.tsx
@@ -0,0 +1,115 @@
+/*
+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 } from "react";
+
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { _t } from "../../languageHandler";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import ErrorBoundary from "../views/elements/ErrorBoundary";
+import { IGroupSummary } from "../views/dialogs/CreateSpaceFromCommunityDialog";
+import { useAsyncMemo } from "../../hooks/useAsyncMemo";
+import Spinner from "../views/elements/Spinner";
+import GroupAvatar from "../views/avatars/GroupAvatar";
+import { linkifyElement } from "../../HtmlUtils";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { Action } from "../../dispatcher/actions";
+import { UserTab } from "../views/dialogs/UserSettingsDialog";
+
+interface IProps {
+    groupId: string;
+}
+
+const onSwapClick = () => {
+    defaultDispatcher.dispatch({
+        action: Action.ViewUserSettings,
+        initialTabId: UserTab.Preferences,
+    });
+};
+
+// XXX: temporary community migration component, reuses SpaceRoomView & SpacePreview classes for simplicity
+const LegacyCommunityPreview = ({ groupId }: IProps) => {
+    const cli = useContext(MatrixClientContext);
+
+    const groupSummary = useAsyncMemo<IGroupSummary>(() => cli.getGroupSummary(groupId), [cli, groupId]);
+
+    if (!groupSummary) {
+        return <main className="mx_SpaceRoomView">
+            <div className="mx_MainSplit">
+                <div className="mx_SpaceRoomView_preview">
+                    <Spinner />
+                </div>
+            </div>
+        </main>;
+    }
+
+    let visibilitySection: JSX.Element;
+    if (groupSummary.profile.is_public) {
+        visibilitySection = <span className="mx_SpaceRoomView_info_public">
+            { _t("Public community") }
+        </span>;
+    } else {
+        visibilitySection = <span className="mx_SpaceRoomView_info_private">
+            { _t("Private community") }
+        </span>;
+    }
+
+    return <main className="mx_SpaceRoomView">
+        <ErrorBoundary>
+            <div className="mx_MainSplit">
+                <div className="mx_SpaceRoomView_preview">
+                    <GroupAvatar
+                        groupId={groupId}
+                        groupName={groupSummary.profile.name}
+                        groupAvatarUrl={groupSummary.profile.avatar_url}
+                        height={80}
+                        width={80}
+                        resizeMethod='crop'
+                    />
+                    <h1 className="mx_SpaceRoomView_preview_name">
+                        { groupSummary.profile.name }
+                    </h1>
+                    <div className="mx_SpaceRoomView_info">
+                        { visibilitySection }
+                    </div>
+                    <div className="mx_SpaceRoomView_preview_topic" ref={e => e && linkifyElement(e)}>
+                        { groupSummary.profile.short_description }
+                    </div>
+                    <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
+                        { groupSummary.user?.membership === "join"
+                            ? _t("To view %(communityName)s, swap to communities in your <a>preferences</a>", {
+                                communityName: groupSummary.profile.name,
+                            }, {
+                                a: sub => (
+                                    <AccessibleButton onClick={onSwapClick} kind="link">{ sub }</AccessibleButton>
+                                ),
+                            })
+                            : _t("To join %(communityName)s, swap to communities in your <a>preferences</a>", {
+                                communityName: groupSummary.profile.name,
+                            }, {
+                                a: sub => (
+                                    <AccessibleButton onClick={onSwapClick} kind="link">{ sub }</AccessibleButton>
+                                ),
+                            })
+                        }
+                    </div>
+                </div>
+            </div>
+        </ErrorBoundary>
+    </main>;
+};
+
+export default LegacyCommunityPreview;
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 3091278e3a..84e0b446f5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017, 2018, 2020 New Vector Ltd
+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.
@@ -17,23 +15,19 @@ limitations under the License.
 */
 
 import * as React from 'react';
-import * as PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
-import { DragDropContext } from 'react-beautiful-dnd';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 
-import {Key} from '../../Keyboard';
+import { Key } from '../../Keyboard';
 import PageTypes from '../../PageTypes';
-import CallMediaHandler from '../../CallMediaHandler';
+import MediaDeviceHandler from '../../MediaDeviceHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
-import * as sdk from '../../index';
 import dis from '../../dispatcher/dispatcher';
 import { IMatrixClientCreds } from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 
-import TagOrderActions from '../../actions/TagOrderActions';
-import RoomListActions from '../../actions/RoomListActions';
 import ResizeHandle from '../views/elements/ResizeHandle';
-import {Resizer, CollapseDistributor} from '../../resizer';
+import { Resizer, CollapseDistributor } from '../../resizer';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
@@ -51,17 +45,31 @@ import { ViewRoomDeltaPayload } from "../../dispatcher/payloads/ViewRoomDeltaPay
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import NonUrgentToastContainer from "./NonUrgentToastContainer";
 import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
-import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
+import { IOOBData, IThreepidInvite } from "../../stores/ThreepidInviteStore";
 import Modal from "../../Modal";
 import { ICollapseConfig } from "../../resizer/distributors/collapse";
 import HostSignupContainer from '../views/host_signup/HostSignupContainer';
 import { getKeyBindingsManager, NavigationAction, RoomAction } from '../../KeyBindingsManager';
 import { IOpts } from "../../createRoom";
 import SpacePanel from "../views/spaces/SpacePanel";
-import {replaceableComponent} from "../../utils/replaceableComponent";
-import CallHandler, { CallHandlerEvent } from '../../CallHandler';
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import CallHandler from '../../CallHandler';
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import AudioFeedArrayForCall from '../views/voip/AudioFeedArrayForCall';
+import { OwnProfileStore } from '../../stores/OwnProfileStore';
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import RoomView from './RoomView';
+import ToastContainer from './ToastContainer';
+import MyGroups from "./MyGroups";
+import UserView from "./UserView";
+import GroupView from "./GroupView";
+import BackdropPanel from "./BackdropPanel";
+import SpaceStore from "../../stores/SpaceStore";
+import classNames from 'classnames';
+import GroupFilterPanel from './GroupFilterPanel';
+import CustomRoomTagPanel from './CustomRoomTagPanel';
+import { mediaFromMxc } from "../../customisations/Media";
+import LegacyCommunityPreview from "./LegacyCommunityPreview";
 
 // 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.
@@ -77,21 +85,23 @@ function canElementReceiveInput(el) {
 
 interface IProps {
     matrixClient: MatrixClient;
+    // Called with the credentials of a registered user (if they were a ROU that
+    // transitioned to PWLU)
     onRegistered: (credentials: IMatrixClientCreds) => Promise<MatrixClient>;
     hideToSRUsers: boolean;
     resizeNotifier: ResizeNotifier;
     // eslint-disable-next-line camelcase
-    page_type: string;
-    autoJoin: boolean;
+    page_type?: string;
+    autoJoin?: boolean;
     threepidInvite?: IThreepidInvite;
-    roomOobData?: object;
+    roomOobData?: IOOBData;
     currentRoomId: string;
     collapseLhs: boolean;
     config: {
         piwik: {
             policyUrl: string;
-        },
-        [key: string]: any,
+        };
+        [key: string]: any;
     };
     currentUserId?: string;
     currentGroupId?: string;
@@ -123,6 +133,7 @@ interface IState {
     usageLimitEventTs?: number;
     useCompactLayout: boolean;
     activeCalls: Array<MatrixCall>;
+    backgroundImage?: string;
 }
 
 /**
@@ -138,22 +149,13 @@ interface IState {
 class LoggedInView extends React.Component<IProps, IState> {
     static displayName = 'LoggedInView';
 
-    static propTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-        page_type: PropTypes.string.isRequired,
-        onRoomCreated: PropTypes.func,
-
-        // Called with the credentials of a registered user (if they were a ROU that
-        // transitioned to PWLU)
-        onRegistered: PropTypes.func,
-
-        // and lots and lots of other stuff.
-    };
-
+    private dispatcherRef: string;
     protected readonly _matrixClient: MatrixClient;
     protected readonly _roomView: React.RefObject<any>;
-    protected readonly _resizeContainer: React.RefObject<ResizeHandle>;
+    protected readonly _resizeContainer: React.RefObject<HTMLDivElement>;
+    protected readonly resizeHandler: React.RefObject<HTMLDivElement>;
     protected compactLayoutWatcherRef: string;
+    protected backgroundImageWatcherRef: string;
     protected resizer: Resizer;
 
     constructor(props, context) {
@@ -164,25 +166,26 @@ class LoggedInView extends React.Component<IProps, IState> {
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
             usageLimitDismissed: false,
-            activeCalls: [],
+            activeCalls: CallHandler.sharedInstance().getAllActiveCalls(),
         };
 
         // stash the MatrixClient in case we log out before we are unmounted
         this._matrixClient = this.props.matrixClient;
 
-        CallMediaHandler.loadDevices();
+        MediaDeviceHandler.loadDevices();
 
         fixupColorFonts();
 
         this._roomView = React.createRef();
         this._resizeContainer = React.createRef();
+        this.resizeHandler = React.createRef();
     }
 
     componentDidMount() {
-        document.addEventListener('keydown', this._onNativeKeyDown, false);
-        CallHandler.sharedInstance().addListener(CallHandlerEvent.CallsChanged, this.onCallsChanged);
+        document.addEventListener('keydown', this.onNativeKeyDown, false);
+        this.dispatcherRef = dis.register(this.onAction);
 
-        this._updateServerNoticeEvents();
+        this.updateServerNoticeEvents();
 
         this._matrixClient.on("accountData", this.onAccountData);
         this._matrixClient.on("sync", this.onSync);
@@ -197,64 +200,90 @@ class LoggedInView extends React.Component<IProps, IState> {
         this.compactLayoutWatcherRef = SettingsStore.watchSetting(
             "useCompactLayout", null, this.onCompactLayoutChanged,
         );
+        this.backgroundImageWatcherRef = SettingsStore.watchSetting(
+            "RoomList.backgroundImage", null, this.refreshBackgroundImage,
+        );
 
-        this.resizer = this._createResizer();
+        this.resizer = this.createResizer();
         this.resizer.attach();
-        this._loadResizerPreferences();
+
+        OwnProfileStore.instance.on(UPDATE_EVENT, this.refreshBackgroundImage);
+        this.loadResizerPreferences();
+        this.refreshBackgroundImage();
     }
 
     componentWillUnmount() {
-        document.removeEventListener('keydown', this._onNativeKeyDown, false);
-        CallHandler.sharedInstance().removeListener(CallHandlerEvent.CallsChanged, this.onCallsChanged);
+        document.removeEventListener('keydown', this.onNativeKeyDown, false);
+        dis.unregister(this.dispatcherRef);
         this._matrixClient.removeListener("accountData", this.onAccountData);
         this._matrixClient.removeListener("sync", this.onSync);
         this._matrixClient.removeListener("RoomState.events", this.onRoomStateEvents);
+        OwnProfileStore.instance.off(UPDATE_EVENT, this.refreshBackgroundImage);
         SettingsStore.unwatchSetting(this.compactLayoutWatcherRef);
+        SettingsStore.unwatchSetting(this.backgroundImageWatcherRef);
         this.resizer.detach();
     }
 
-    private onCallsChanged = () => {
-        this.setState({
-            activeCalls: CallHandler.sharedInstance().getAllActiveCalls(),
-        });
+    private refreshBackgroundImage = async (): Promise<void> => {
+        let backgroundImage = SettingsStore.getValue("RoomList.backgroundImage");
+        if (backgroundImage) {
+            // convert to http before going much further
+            backgroundImage = mediaFromMxc(backgroundImage).srcHttp;
+        } else {
+            backgroundImage = OwnProfileStore.instance.getHttpAvatarUrl();
+        }
+        this.setState({ backgroundImage });
     };
 
-    canResetTimelineInRoom = (roomId) => {
+    private onAction = (payload): void => {
+        switch (payload.action) {
+            case 'call_state': {
+                const activeCalls = CallHandler.sharedInstance().getAllActiveCalls();
+                if (activeCalls !== this.state.activeCalls) {
+                    this.setState({ activeCalls });
+                }
+                break;
+            }
+        }
+    };
+
+    public canResetTimelineInRoom = (roomId: string) => {
         if (!this._roomView.current) {
             return true;
         }
         return this._roomView.current.canResetTimeline();
     };
 
-    _createResizer() {
-        let size;
-        let collapsed;
+    private createResizer() {
+        let panelSize;
+        let panelCollapsed;
         const collapseConfig: ICollapseConfig = {
             // 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) {
-                    dis.dispatch({action: "hide_left_panel"});
+            onCollapsed: (collapsed) => {
+                panelCollapsed = collapsed;
+                if (collapsed) {
+                    dis.dispatch({ action: "hide_left_panel" });
                     window.localStorage.setItem("mx_lhs_size", '0');
                 } else {
-                    dis.dispatch({action: "show_left_panel"});
+                    dis.dispatch({ action: "show_left_panel" });
                 }
             },
-            onResized: (_size) => {
-                size = _size;
+            onResized: (size) => {
+                panelSize = size;
                 this.props.resizeNotifier.notifyLeftHandleResized();
             },
             onResizeStart: () => {
                 this.props.resizeNotifier.startResizing();
             },
             onResizeStop: () => {
-                if (!collapsed) window.localStorage.setItem("mx_lhs_size", '' + size);
+                if (!panelCollapsed) window.localStorage.setItem("mx_lhs_size", '' + panelSize);
                 this.props.resizeNotifier.stopResizing();
             },
             isItemCollapsed: domNode => {
                 return domNode.classList.contains("mx_LeftPanel_minimized");
             },
+            handler: this.resizeHandler.current,
         };
         const resizer = new Resizer(this._resizeContainer.current, CollapseDistributor, collapseConfig);
         resizer.setClassNames({
@@ -265,17 +294,17 @@ class LoggedInView extends React.Component<IProps, IState> {
         return resizer;
     }
 
-    _loadResizerPreferences() {
+    private loadResizerPreferences() {
         let lhsSize = parseInt(window.localStorage.getItem("mx_lhs_size"), 10);
         if (isNaN(lhsSize)) {
             lhsSize = 350;
         }
-        this.resizer.forHandleAt(0).resize(lhsSize);
+        this.resizer.forHandleWithId('lp-resizer').resize(lhsSize);
     }
 
-    onAccountData = (event) => {
+    private onAccountData = (event: MatrixEvent) => {
         if (event.getType() === "m.ignored_user_list") {
-            dis.dispatch({action: "ignore_state_changed"});
+            dis.dispatch({ action: "ignore_state_changed" });
         }
     };
 
@@ -305,16 +334,16 @@ class LoggedInView extends React.Component<IProps, IState> {
         }
 
         if (oldSyncState === 'PREPARED' && syncState === 'SYNCING') {
-            this._updateServerNoticeEvents();
+            this.updateServerNoticeEvents();
         } else {
-            this._calculateServerLimitToast(this.state.syncErrorData, this.state.usageLimitEventContent);
+            this.calculateServerLimitToast(this.state.syncErrorData, this.state.usageLimitEventContent);
         }
     };
 
     onRoomStateEvents = (ev, state) => {
         const serverNoticeList = RoomListStore.instance.orderedLists[DefaultTagID.ServerNotice];
         if (serverNoticeList && serverNoticeList.some(r => r.roomId === ev.getRoomId())) {
-            this._updateServerNoticeEvents();
+            this.updateServerNoticeEvents();
         }
     };
 
@@ -322,9 +351,9 @@ class LoggedInView extends React.Component<IProps, IState> {
         this.setState({
             usageLimitDismissed: true,
         });
-    }
+    };
 
-    _calculateServerLimitToast(syncError: IState["syncErrorData"], usageLimitEventContent?: IUsageLimit) {
+    private calculateServerLimitToast(syncError: IState["syncErrorData"], usageLimitEventContent?: IUsageLimit) {
         const error = syncError && syncError.error && syncError.error.errcode === "M_RESOURCE_LIMIT_EXCEEDED";
         if (error) {
             usageLimitEventContent = syncError.error.data;
@@ -344,7 +373,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         }
     }
 
-    _updateServerNoticeEvents = async () => {
+    private updateServerNoticeEvents = async () => {
         const serverNoticeList = RoomListStore.instance.orderedLists[DefaultTagID.ServerNotice];
         if (!serverNoticeList) return [];
 
@@ -376,7 +405,7 @@ class LoggedInView extends React.Component<IProps, IState> {
             );
         });
         const usageLimitEventContent = usageLimitEvent && usageLimitEvent.getContent();
-        this._calculateServerLimitToast(this.state.syncErrorData, usageLimitEventContent);
+        this.calculateServerLimitToast(this.state.syncErrorData, usageLimitEventContent);
         this.setState({
             usageLimitEventContent,
             usageLimitEventTs: pinnedEventTs,
@@ -385,7 +414,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         });
     };
 
-    _onPaste = (ev) => {
+    private onPaste = (ev) => {
         let canReceiveInput = false;
         let element = ev.target;
         // test for all parents because the target can be a child of a contenteditable element
@@ -397,7 +426,7 @@ class LoggedInView extends React.Component<IProps, IState> {
             // refocusing during a paste event will make the
             // paste end up in the newly focused element,
             // so dispatch synchronously before paste happens
-            dis.fire(Action.FocusComposer, true);
+            dis.fire(Action.FocusSendMessageComposer, true);
         }
     };
 
@@ -423,22 +452,22 @@ class LoggedInView extends React.Component<IProps, IState> {
     We also listen with a native listener on the document to get keydown events when no element is focused.
     Bubbling is irrelevant here as the target is the body element.
     */
-    _onReactKeyDown = (ev) => {
+    private onReactKeyDown = (ev) => {
         // events caught while bubbling up on the root element
         // of this component, so something must be focused.
-        this._onKeyDown(ev);
+        this.onKeyDown(ev);
     };
 
-    _onNativeKeyDown = (ev) => {
+    private onNativeKeyDown = (ev) => {
         // only pass this if there is no focused element.
-        // if there is, _onKeyDown will be called by the
+        // if there is, onKeyDown will be called by the
         // react keydown handler that respects the react bubbling order.
         if (ev.target === document.body) {
-            this._onKeyDown(ev);
+            this.onKeyDown(ev);
         }
     };
 
-    _onKeyDown = (ev) => {
+    private onKeyDown = (ev) => {
         let handled = false;
 
         const roomAction = getKeyBindingsManager().getRoomAction(ev);
@@ -448,7 +477,7 @@ class LoggedInView extends React.Component<IProps, IState> {
             case RoomAction.JumpToFirstMessage:
             case RoomAction.JumpToLatestMessage:
                 // pass the event down to the scroll panel
-                this._onScrollKeyPressed(ev);
+                this.onScrollKeyPressed(ev);
                 handled = true;
                 break;
             case RoomAction.FocusSearch:
@@ -537,24 +566,24 @@ class LoggedInView extends React.Component<IProps, IState> {
         }
 
         const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
-        if (!isModifier && !ev.altKey && !ev.ctrlKey && !ev.metaKey) {
+        if (!isModifier && !ev.ctrlKey && !ev.metaKey) {
             // The above condition is crafted to _allow_ characters with Shift
             // already pressed (but not the Shift key down itself).
-
             const isClickShortcut = ev.target !== document.body &&
                 (ev.key === Key.SPACE || ev.key === Key.ENTER);
 
-            // Do not capture the context menu key to improve keyboard accessibility
-            if (ev.key === Key.CONTEXT_MENU) {
-                return;
-            }
+            // We explicitly allow alt to be held due to it being a common accent modifier.
+            // XXX: Forwarding Dead keys in this way does not work as intended but better to at least
+            // move focus to the composer so the user can re-type the dead key correctly.
+            const isPrintable = ev.key.length === 1 || ev.key === "Dead";
 
-            if (!isClickShortcut && ev.key !== Key.TAB && !canElementReceiveInput(ev.target)) {
+            // If the user is entering a printable character outside of an input field
+            // redirect it to the composer for them.
+            if (!isClickShortcut && isPrintable && !canElementReceiveInput(ev.target)) {
                 // synchronous dispatch so we focus before key generates input
-                dis.fire(Action.FocusComposer, true);
+                dis.fire(Action.FocusSendMessageComposer, true);
                 ev.stopPropagation();
-                // we should *not* preventDefault() here as
-                // that would prevent typing in the now-focussed composer
+                // we should *not* preventDefault() here as that would prevent typing in the now-focused composer
             }
         }
     };
@@ -563,63 +592,13 @@ class LoggedInView extends React.Component<IProps, IState> {
      * dispatch a page-up/page-down/etc to the appropriate component
      * @param {Object} ev The key event
      */
-    _onScrollKeyPressed = (ev) => {
+    private onScrollKeyPressed = (ev) => {
         if (this._roomView.current) {
             this._roomView.current.handleScrollKey(ev);
         }
     };
 
-    _onDragEnd = (result) => {
-        // Dragged to an invalid destination, not onto a droppable
-        if (!result.destination) {
-            return;
-        }
-
-        const dest = result.destination.droppableId;
-
-        if (dest === 'tag-panel-droppable') {
-            // Could be "GroupTile +groupId:domain"
-            const draggableId = result.draggableId.split(' ').pop();
-
-            // Dispatch synchronously so that the GroupFilterPanel receives an
-            // optimistic update from GroupFilterOrderStore before the previous
-            // state is shown.
-            dis.dispatch(TagOrderActions.moveTag(
-                this._matrixClient,
-                draggableId,
-                result.destination.index,
-            ), true);
-        } else if (dest.startsWith('room-sub-list-droppable_')) {
-            this._onRoomTileEndDrag(result);
-        }
-    };
-
-    _onRoomTileEndDrag = (result) => {
-        let newTag = result.destination.droppableId.split('_')[1];
-        let prevTag = result.source.droppableId.split('_')[1];
-        if (newTag === 'undefined') newTag = undefined;
-        if (prevTag === 'undefined') prevTag = undefined;
-
-        const roomId = result.draggableId.split('_')[1];
-
-        const oldIndex = result.source.index;
-        const newIndex = result.destination.index;
-
-        dis.dispatch(RoomListActions.tagRoom(
-            this._matrixClient,
-            this._matrixClient.getRoom(roomId),
-            prevTag, newTag,
-            oldIndex, newIndex,
-        ), true);
-    };
-
     render() {
-        const RoomView = sdk.getComponent('structures.RoomView');
-        const UserView = sdk.getComponent('structures.UserView');
-        const GroupView = sdk.getComponent('structures.GroupView');
-        const MyGroups = sdk.getComponent('structures.MyGroups');
-        const ToastContainer = sdk.getComponent('structures.ToastContainer');
-
         let pageElement;
 
         switch (this.props.page_type) {
@@ -651,18 +630,26 @@ class LoggedInView extends React.Component<IProps, IState> {
                 pageElement = <UserView userId={this.props.currentUserId} resizeNotifier={this.props.resizeNotifier} />;
                 break;
             case PageTypes.GroupView:
-                pageElement = <GroupView
-                    groupId={this.props.currentGroupId}
-                    isNew={this.props.currentGroupIsNew}
-                    resizeNotifier={this.props.resizeNotifier}
-                />;
+                if (SpaceStore.spacesEnabled) {
+                    pageElement = <LegacyCommunityPreview groupId={this.props.currentGroupId} />;
+                } else {
+                    pageElement = <GroupView
+                        groupId={this.props.currentGroupId}
+                        isNew={this.props.currentGroupIsNew}
+                        resizeNotifier={this.props.resizeNotifier}
+                    />;
+                }
                 break;
         }
 
-        let bodyClasses = 'mx_MatrixChat';
-        if (this.state.useCompactLayout) {
-            bodyClasses += ' mx_MatrixChat_useCompactLayout';
-        }
+        const wrapperClasses = classNames({
+            'mx_MatrixChat_wrapper': true,
+            'mx_MatrixChat_useCompactLayout': this.state.useCompactLayout,
+        });
+        const bodyClasses = classNames({
+            'mx_MatrixChat': true,
+            'mx_MatrixChat--with-avatar': this.state.backgroundImage,
+        });
 
         const audioFeedArraysForCalls = this.state.activeCalls.map((call) => {
             return (
@@ -673,28 +660,55 @@ class LoggedInView extends React.Component<IProps, IState> {
         return (
             <MatrixClientContext.Provider value={this._matrixClient}>
                 <div
-                    onPaste={this._onPaste}
-                    onKeyDown={this._onReactKeyDown}
-                    className='mx_MatrixChat_wrapper'
+                    onPaste={this.onPaste}
+                    onKeyDown={this.onReactKeyDown}
+                    className={wrapperClasses}
                     aria-hidden={this.props.hideToSRUsers}
                 >
                     <ToastContainer />
-                    <DragDropContext onDragEnd={this._onDragEnd}>
-                        <div ref={this._resizeContainer} className={bodyClasses}>
-                            { SettingsStore.getValue("feature_spaces") ? <SpacePanel /> : null }
-                            <LeftPanel
-                                isMinimized={this.props.collapseLhs || false}
-                                resizeNotifier={this.props.resizeNotifier}
+                    <div className={bodyClasses}>
+                        <div className='mx_LeftPanel_wrapper'>
+                            { SettingsStore.getValue('TagPanel.enableTagPanel') &&
+                                (<div className="mx_GroupFilterPanelContainer">
+                                    <BackdropPanel
+                                        blurMultiplier={0.5}
+                                        backgroundImage={this.state.backgroundImage}
+                                    />
+                                    <GroupFilterPanel />
+                                    { SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null }
+                                </div>)
+                            }
+                            { SpaceStore.spacesEnabled ? <>
+                                <BackdropPanel
+                                    blurMultiplier={0.5}
+                                    backgroundImage={this.state.backgroundImage}
+                                />
+                                <SpacePanel />
+                            </> : null }
+                            <BackdropPanel
+                                backgroundImage={this.state.backgroundImage}
                             />
-                            <ResizeHandle />
+                            <div
+                                className="mx_LeftPanel_wrapper--user"
+                                ref={this._resizeContainer}
+                                data-collapsed={this.props.collapseLhs ? true : undefined}
+                            >
+                                <LeftPanel
+                                    isMinimized={this.props.collapseLhs || false}
+                                    resizeNotifier={this.props.resizeNotifier}
+                                />
+                            </div>
+                        </div>
+                        <ResizeHandle passRef={this.resizeHandler} id="lp-resizer" />
+                        <div className="mx_RoomView_wrapper">
                             { pageElement }
                         </div>
-                    </DragDropContext>
+                    </div>
                 </div>
                 <CallContainer />
                 <NonUrgentToastContainer />
                 <HostSignupContainer />
-                {audioFeedArraysForCalls}
+                { audioFeedArraysForCalls }
             </MatrixClientContext.Provider>
         );
     }
diff --git a/src/components/structures/MainSplit.js b/src/components/structures/MainSplit.tsx
similarity index 64%
rename from src/components/structures/MainSplit.js
rename to src/components/structures/MainSplit.tsx
index 5818d303fc..af7645767d 100644
--- a/src/components/structures/MainSplit.js
+++ b/src/components/structures/MainSplit.tsx
@@ -16,25 +16,35 @@ limitations under the License.
 */
 
 import React from 'react';
-import { Resizable } from 're-resizable';
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { NumberSize, Resizable } from 're-resizable';
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import ResizeNotifier from "../../utils/ResizeNotifier";
+import { Direction } from "re-resizable/lib/resizer";
+
+interface IProps {
+    resizeNotifier: ResizeNotifier;
+    collapsedRhs?: boolean;
+    panel?: JSX.Element;
+}
 
 @replaceableComponent("structures.MainSplit")
-export default class MainSplit extends React.Component {
-    _onResizeStart = () => {
+export default class MainSplit extends React.Component<IProps> {
+    private onResizeStart = (): void => {
         this.props.resizeNotifier.startResizing();
     };
 
-    _onResize = () => {
+    private onResize = (): void => {
         this.props.resizeNotifier.notifyRightHandleResized();
     };
 
-    _onResizeStop = (event, direction, refToElement, delta) => {
+    private onResizeStop = (
+        event: MouseEvent | TouchEvent, direction: Direction, elementRef: HTMLElement, delta: NumberSize,
+    ): void => {
         this.props.resizeNotifier.stopResizing();
-        window.localStorage.setItem("mx_rhs_size", this._loadSidePanelSize().width + delta.width);
+        window.localStorage.setItem("mx_rhs_size", (this.loadSidePanelSize().width + delta.width).toString());
     };
 
-    _loadSidePanelSize() {
+    private loadSidePanelSize(): {height: string | number, width: number} {
         let rhsSize = parseInt(window.localStorage.getItem("mx_rhs_size"), 10);
 
         if (isNaN(rhsSize)) {
@@ -47,7 +57,7 @@ export default class MainSplit extends React.Component {
         };
     }
 
-    render() {
+    public render(): JSX.Element {
         const bodyView = React.Children.only(this.props.children);
         const panelView = this.props.panel;
 
@@ -56,7 +66,7 @@ export default class MainSplit extends React.Component {
         let children;
         if (hasResizer) {
             children = <Resizable
-                defaultSize={this._loadSidePanelSize()}
+                defaultSize={this.loadSidePanelSize()}
                 minWidth={264}
                 maxWidth="50%"
                 enable={{
@@ -69,11 +79,11 @@ export default class MainSplit extends React.Component {
                     bottomLeft: false,
                     topLeft: false,
                 }}
-                onResizeStart={this._onResizeStart}
-                onResize={this._onResize}
-                onResizeStop={this._onResizeStop}
+                onResizeStart={this.onResizeStart}
+                onResize={this.onResize}
+                onResizeStop={this.onResizeStop}
                 className="mx_RightPanel_ResizeWrapper"
-                handleClasses={{left: "mx_RightPanel_ResizeHandle"}}
+                handleClasses={{ left: "mx_RightPanel_ResizeHandle" }}
             >
                 { panelView }
             </Resizable>;
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 16da9321e2..90ac47ffb5 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -19,6 +19,8 @@ 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";
+import { sleep, defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils";
+
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
 import 'focus-visible';
 // what-input helps improve keyboard accessibility
@@ -34,21 +36,19 @@ import dis from "../../dispatcher/dispatcher";
 import Notifier from '../../Notifier';
 
 import Modal from "../../Modal";
-import Tinter from "../../Tinter";
-import * as sdk from '../../index';
 import { showRoomInviteDialog, showStartChatInviteDialog } from '../../RoomInvite';
 import * as Rooms from '../../Rooms';
 import linkifyMatrix from "../../linkify-matrix";
 import * as Lifecycle from '../../Lifecycle';
 // LifecycleStore is not used but does listen to and dispatch actions
 import '../../stores/LifecycleStore';
-import PageTypes from '../../PageTypes';
+import PageType from '../../PageTypes';
 
-import createRoom, {IOpts} from "../../createRoom";
-import {_t, _td, getCurrentLanguage} from '../../languageHandler';
+import createRoom, { IOpts } from "../../createRoom";
+import { _t, _td, getCurrentLanguage } from '../../languageHandler';
 import SettingsStore from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
-import { startAnyRegistrationFlow } from "../../Registration.js";
+import { startAnyRegistrationFlow } from "../../Registration";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
@@ -56,7 +56,6 @@ import DMRoomMap from '../../utils/DMRoomMap';
 import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
 import { FontWatcher } from '../../settings/watchers/FontWatcher';
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
-import { defer, IDeferred, sleep } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
 import type LoggedInViewType from "./LoggedInView";
@@ -66,7 +65,7 @@ import {
     showToast as showAnalyticsToast,
     hideToast as hideAnalyticsToast,
 } from "../../toasts/AnalyticsToast";
-import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificationsToast";
+import { showToast as showNotificationsToast } from "../../toasts/DesktopNotificationsToast";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
@@ -74,20 +73,44 @@ import { SettingLevel } from "../../settings/SettingLevel";
 import { leaveRoomBehaviour } from "../../utils/membership";
 import CreateCommunityPrototypeDialog from "../views/dialogs/CreateCommunityPrototypeDialog";
 import ThreepidInviteStore, { IThreepidInvite, IThreepidInviteWireFormat } from "../../stores/ThreepidInviteStore";
-import {UIFeature} from "../../settings/UIFeature";
+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";
 import SpaceStore from "../../stores/SpaceStore";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 import RoomListStore from "../../stores/room-list/RoomListStore";
-import {RoomUpdateCause} from "../../stores/room-list/models";
+import { RoomUpdateCause } from "../../stores/room-list/models";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import SecurityCustomisations from "../../customisations/Security";
+import Spinner from "../views/elements/Spinner";
+import QuestionDialog from "../views/dialogs/QuestionDialog";
+import UserSettingsDialog from '../views/dialogs/UserSettingsDialog';
+import CreateGroupDialog from '../views/dialogs/CreateGroupDialog';
+import CreateRoomDialog from '../views/dialogs/CreateRoomDialog';
+import RoomDirectory from './RoomDirectory';
+import KeySignatureUploadFailedDialog from "../views/dialogs/KeySignatureUploadFailedDialog";
+import IncomingSasDialog from "../views/dialogs/IncomingSasDialog";
+import CompleteSecurity from "./auth/CompleteSecurity";
+import LoggedInView from './LoggedInView';
+import Welcome from "../views/auth/Welcome";
+import ForgotPassword from "./auth/ForgotPassword";
+import E2eSetup from "./auth/E2eSetup";
+import Registration from './auth/Registration';
+import Login from "./auth/Login";
+import ErrorBoundary from '../views/elements/ErrorBoundary';
+import VerificationRequestToast from '../views/toasts/VerificationRequestToast';
 
 import PerformanceMonitor, { PerformanceEntryNames } from "../../performance";
 import UIStore, { UI_EVENTS } from "../../stores/UIStore";
+import SoftLogout from './auth/SoftLogout';
+import { makeRoomPermalink } from "../../utils/permalinks/Permalinks";
+import { copyPlaintext } from "../../utils/strings";
+import { PosthogAnalytics } from '../../PosthogAnalytics';
+import { initSentry } from "../../sentry";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -122,7 +145,7 @@ export enum Views {
     SOFT_LOGOUT,
 }
 
-const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"];
+const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas", "welcome"];
 
 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require
@@ -136,7 +159,7 @@ const ONBOARDING_FLOW_STARTERS = [
 
 interface IScreen {
     screen: string;
-    params?: object;
+    params?: QueryDict;
 }
 
 /* eslint-disable camelcase */
@@ -156,14 +179,19 @@ interface IRoomInfo {
 /* eslint-enable camelcase */
 
 interface IProps { // TODO type things better
-    config: Record<string, any>;
+    config: {
+        piwik: {
+            policyUrl: string;
+        };
+        [key: string]: any;
+    };
     serverConfig?: ValidatedServerConfig;
     onNewScreen: (screen: string, replaceLast: boolean) => void;
     enableGuest?: boolean;
     // the queryParams extracted from the [real] query-string of the URI
-    realQueryParams?: Record<string, string>;
+    realQueryParams?: QueryDict;
     // the initial queryParams extracted from the hash-fragment of the URI
-    startingFragmentQueryParams?: Record<string, string>;
+    startingFragmentQueryParams?: QueryDict;
     // called when we have completed a token login
     onTokenLoginCompleted?: () => void;
     // Represents the screen to display as a result of parsing the initial window.location
@@ -171,7 +199,7 @@ interface IProps { // TODO type things better
     // displayname, if any, to set on the device when logging in/registering.
     defaultDeviceDisplayName?: string;
     // A function that makes a registration URL
-    makeRegistrationUrl: (object) => string;
+    makeRegistrationUrl: (params: QueryDict) => string;
 }
 
 interface IState {
@@ -179,7 +207,7 @@ interface IState {
     view: Views;
     // What the LoggedInView would be showing if visible
     // eslint-disable-next-line camelcase
-    page_type?: PageTypes;
+    page_type?: PageType;
     // The ID of the room we're viewing. This is either populated directly
     // in the case where we view a room by ID or by RoomView when it resolves
     // what ID an alias points at.
@@ -204,7 +232,7 @@ interface IState {
     resizeNotifier: ResizeNotifier;
     serverConfig?: ValidatedServerConfig;
     ready: boolean;
-    threepidInvite?: IThreepidInvite,
+    threepidInvite?: IThreepidInvite;
     roomOobData?: object;
     pendingInitialSync?: boolean;
     justRegistered?: boolean;
@@ -229,7 +257,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private pageChanging: boolean;
     private tokenLogin?: boolean;
     private accountPassword?: string;
-    private accountPasswordTimer?: NodeJS.Timeout;
+    private accountPasswordTimer?: number;
     private focusComposer: boolean;
     private subTitleStatus: string;
     private prevWindowWidth: number;
@@ -274,7 +302,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             if (this.screenAfterLogin.screen.startsWith("room/") && params['signurl'] && params['email']) {
                 // probably a threepid invite - try to store it
                 const roomId = this.screenAfterLogin.screen.substring("room/".length);
-                ThreepidInviteStore.instance.storeInvite(roomId, params as IThreepidInviteWireFormat);
+                ThreepidInviteStore.instance.storeInvite(roomId, params as unknown as IThreepidInviteWireFormat);
             }
         }
 
@@ -283,11 +311,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         this.pageChanging = false;
 
-        // check we have the right tint applied for this theme.
-        // N.B. we don't call the whole of setTheme() here as we may be
-        // racing with the theme CSS download finishing from index.js
-        Tinter.tint();
-
         // For PersistentElement
         this.state.resizeNotifier.on("middlePanelResized", this.dispatchTimelineResize);
 
@@ -368,7 +391,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         if (SettingsStore.getValue("analyticsOptIn")) {
             Analytics.enable();
         }
+
+        PosthogAnalytics.instance.updateAnonymityFromSettings();
+        PosthogAnalytics.instance.updatePlatformSuperProperties();
+
         CountlyAnalytics.instance.enable(/* anonymous = */ true);
+
+        initSentry(SdkConfig.get()["sentry"]);
     }
 
     private async postLoginSetup() {
@@ -401,7 +430,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             if (SecurityCustomisations.SHOW_ENCRYPTION_SETUP_UI === false) {
                 this.onLoggedIn();
             } else {
-                this.setStateForNewView({view: Views.COMPLETE_SECURITY});
+                this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
             }
         } else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
             this.setStateForNewView({ view: Views.E2E_SETUP });
@@ -412,7 +441,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle stage
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillUpdate(props, state) {
         if (this.shouldTrackPageChange(this.state, state)) {
             this.startPageChangeTimer();
@@ -424,9 +453,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             const durationMs = this.stopPageChangeTimer();
             Analytics.trackPageChange(durationMs);
             CountlyAnalytics.instance.trackPageChange(durationMs);
+            PosthogAnalytics.instance.trackPageView(durationMs);
         }
         if (this.focusComposer) {
-            dis.fire(Action.FocusComposer);
+            dis.fire(Action.FocusSendMessageComposer);
             this.focusComposer = false;
         }
     }
@@ -454,7 +484,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         let props = this.state.serverConfig;
         if (!props) props = this.props.serverConfig; // for unit tests
         if (!props) props = SdkConfig.get()["validated_server_config"];
-        return {serverConfig: props};
+        return { serverConfig: props };
     }
 
     private loadSession() {
@@ -472,9 +502,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             if (!loadedSession) {
                 // fall back to showing the welcome screen... unless we have a 3pid invite pending
                 if (ThreepidInviteStore.instance.pickBestInvite()) {
-                    dis.dispatch({action: 'start_registration'});
+                    dis.dispatch({ action: 'start_registration' });
                 } else {
-                    dis.dispatch({action: "view_welcome_page"});
+                    dis.dispatch({ action: "view_welcome_page" });
                 }
             } else if (SettingsStore.getValue("analyticsOptIn")) {
                 CountlyAnalytics.instance.enable(/* anonymous = */ false);
@@ -524,7 +554,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     onAction = (payload) => {
         // console.log(`MatrixClientPeg.onAction: ${payload.action}`);
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
         // Start the onboarding process for certain actions
         if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest() &&
@@ -538,14 +567,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 action: 'do_after_sync_prepared',
                 deferred_action: payload,
             });
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({ action: 'require_registration' });
             return;
         }
 
         switch (payload.action) {
             case 'MatrixActions.accountData':
                 // XXX: This is a collection of several hacks to solve a minor problem. We want to
-                // update our local state when the ID server changes, but don't want to put that in
+                // update our local state when the identity server changes, but don't want to put that in
                 // the js-sdk as we'd be then dictating how all consumers need to behave. However,
                 // this component is already bloated and we probably don't want this tiny logic in
                 // here, but there's no better place in the react-sdk for it. Additionally, we're
@@ -563,11 +592,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     }
 
                     // redispatch the change with a more specific action
-                    dis.dispatch({action: 'id_server_changed'});
+                    dis.dispatch({ action: 'id_server_changed' });
                 }
                 break;
             case 'logout':
-                dis.dispatch({action: "hangup_all"});
+                dis.dispatch({ action: "hangup_all" });
                 Lifecycle.logout();
                 break;
             case 'require_registration':
@@ -611,6 +640,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'forget_room':
                 this.forgetRoom(payload.room_id);
                 break;
+            case 'copy_room':
+                this.copyRoom(payload.room_id);
+                break;
             case 'reject_invite':
                 Modal.createTrackedDialog('Reject invitation', '', QuestionDialog, {
                     title: _t('Reject invitation'),
@@ -618,13 +650,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     onFinished: (confirm) => {
                         if (confirm) {
                             // FIXME: controller shouldn't be loading a view :(
-                            const Loader = sdk.getComponent("elements.Spinner");
-                            const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
+                            const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
 
                             MatrixClientPeg.get().leave(payload.room_id).then(() => {
                                 modal.close();
                                 if (this.state.currentRoomId === payload.room_id) {
-                                    dis.dispatch({action: 'view_home_page'});
+                                    dis.dispatch({ action: 'view_home_page' });
                                 }
                             }, (err) => {
                                 modal.close();
@@ -655,9 +686,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
             case Action.ViewUserSettings: {
                 const tabPayload = payload as OpenToTabPayload;
-                const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
                 Modal.createTrackedDialog('User settings', '', UserSettingsDialog,
-                    {initialTabId: tabPayload.initialTabId},
+                    { initialTabId: tabPayload.initialTabId },
                     /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
 
                 // View the welcome or home page if we need something to look at
@@ -668,11 +698,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.createRoom(payload.public, payload.defaultName);
                 break;
             case 'view_create_group': {
-                let CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog")
-                if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
-                    CreateGroupDialog = CreateCommunityPrototypeDialog;
-                }
-                Modal.createTrackedDialog('Create Community', '', CreateGroupDialog);
+                const prototype = SettingsStore.getValue("feature_communities_v2_prototypes");
+                Modal.createTrackedDialog(
+                    'Create Community',
+                    '',
+                    prototype ? CreateCommunityPrototypeDialog : CreateGroupDialog,
+                );
                 break;
             }
             case Action.ViewRoomDirectory: {
@@ -682,7 +713,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                         room_id: SpaceStore.instance.activeSpace.roomId,
                     });
                 } else {
-                    const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
                     Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
                         initialText: payload.initialText,
                     }, 'mx_RoomDirectory_dialogWrapper', false, true);
@@ -693,7 +723,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case 'view_my_groups':
-                this.setPage(PageTypes.MyGroups);
+                this.setPage(PageType.MyGroups);
                 this.notifyNewScreen('groups');
                 break;
             case 'view_group':
@@ -726,10 +756,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 localStorage.setItem("mx_seenSpacesBeta", "1");
                 // We just dispatch the page change rather than have to worry about
                 // what the logic is for each of these branches.
-                if (this.state.page_type === PageTypes.MyGroups) {
-                    dis.dispatch({action: 'view_last_screen'});
+                if (this.state.page_type === PageType.MyGroups) {
+                    dis.dispatch({ action: 'view_last_screen' });
                 } else {
-                    dis.dispatch({action: 'view_my_groups'});
+                    dis.dispatch({ action: 'view_my_groups' });
                 }
                 break;
             case 'hide_left_panel':
@@ -770,7 +800,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.onLoggedOut();
                 break;
             case 'will_start_client':
-                this.setState({ready: false}, () => {
+                this.setState({ ready: false }, () => {
                     // if the client is about to start, we are, by definition, not ready.
                     // Set ready to false now, then it'll be set to true when the sync
                     // listener we set below fires.
@@ -812,7 +842,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
     };
 
-    private setPage(pageType: string) {
+    private setPage(pageType: PageType) {
         this.setState({
             page_type: pageType,
         });
@@ -865,12 +895,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.focusComposer = true;
 
         if (roomInfo.room_alias) {
-            console.log(
+            logger.log(
                 `Switching to room alias ${roomInfo.room_alias} at event ` +
                 roomInfo.event_id,
             );
         } else {
-            console.log(`Switching to room id ${roomInfo.room_id} at event ` +
+            logger.log(`Switching to room id ${roomInfo.room_id} at event ` +
                 roomInfo.event_id,
             );
         }
@@ -919,7 +949,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.setState({
                 view: Views.LOGGED_IN,
                 currentRoomId: roomInfo.room_id || null,
-                page_type: PageTypes.RoomView,
+                page_type: PageType.RoomView,
                 threepidInvite: roomInfo.threepid_invite,
                 roomOobData: roomInfo.oob_data,
                 ready: true,
@@ -947,7 +977,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             currentGroupId: groupId,
             currentGroupIsNew: payload.group_is_new,
         });
-        this.setPage(PageTypes.GroupView);
+        this.setPage(PageType.GroupView);
         this.notifyNewScreen('group/' + groupId);
     }
 
@@ -988,8 +1018,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.setStateForNewView({
             view: Views.LOGGED_IN,
             justRegistered,
+            currentRoomId: null,
         });
-        this.setPage(PageTypes.HomePage);
+        this.setPage(PageType.HomePage);
         this.notifyNewScreen('home');
         ThemeController.isLogin = false;
         this.themeWatcher.recheck();
@@ -1006,8 +1037,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 return;
             }
             this.notifyNewScreen('user/' + userId);
-            this.setState({currentUserId: userId});
-            this.setPage(PageTypes.UserView);
+            this.setState({ currentUserId: userId });
+            this.setPage(PageType.UserView);
         });
     }
 
@@ -1024,7 +1055,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
         }
 
-        const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
         const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog, {
             defaultPublic,
             defaultName,
@@ -1086,7 +1116,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private leaveRoomWarnings(roomId: string) {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
-        const isSpace = SettingsStore.getValue("feature_spaces") && roomToLeave?.isSpaceRoom();
+        const isSpace = SpaceStore.spacesEnabled && roomToLeave?.isSpaceRoom();
         // Show a warning if there are additional complications.
         const warnings = [];
 
@@ -1094,7 +1124,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         if (memberCount === 1) {
             warnings.push((
                 <span className="warning" key="only_member_warning">
-                    {' '/* Whitespace, otherwise the sentences get smashed together */ }
+                    { ' '/* Whitespace, otherwise the sentences get smashed together */ }
                     { _t("You are the only person here. " +
                         "If you leave, no one will be able to join in the future, including you.") }
                 </span>
@@ -1109,7 +1139,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             if (rule !== "public") {
                 warnings.push((
                     <span className="warning" key="non_public_warning">
-                        {' '/* Whitespace, otherwise the sentences get smashed together */ }
+                        { ' '/* Whitespace, otherwise the sentences get smashed together */ }
                         { 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.") }
@@ -1121,18 +1151,23 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     private leaveRoom(roomId: string) {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         const warnings = this.leaveRoomWarnings(roomId);
 
-        const isSpace = SettingsStore.getValue("feature_spaces") && roomToLeave?.isSpaceRoom();
+        const isSpace = SpaceStore.spacesEnabled && roomToLeave?.isSpaceRoom();
         Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, {
             title: isSpace ? _t("Leave space") : _t("Leave room"),
             description: (
                 <span>
                     { 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}) }
+                        ? _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>
             ),
@@ -1142,8 +1177,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     const d = leaveRoomBehaviour(roomId);
 
                     // FIXME: controller shouldn't be loading a view :(
-                    const Loader = sdk.getComponent("elements.Spinner");
-                    const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
+                    const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
 
                     d.finally(() => modal.close());
                     dis.dispatch({
@@ -1170,12 +1204,23 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }).catch((err) => {
             const errCode = err.errcode || _td("unknown error code");
             Modal.createTrackedDialog("Failed to forget room", '', ErrorDialog, {
-                title: _t("Failed to forget room %(errCode)s", {errCode}),
+                title: _t("Failed to forget room %(errCode)s", { errCode }),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
             });
         });
     }
 
+    private async copyRoom(roomId: string) {
+        const roomLink = makeRoomPermalink(roomId);
+        const success = await copyPlaintext(roomLink);
+        if (!success) {
+            Modal.createTrackedDialog("Unable to copy room link", "", ErrorDialog, {
+                title: _t("Unable to copy room link"),
+                description: _t("Unable to copy a link to the room to the clipboard."),
+            });
+        }
+    }
+
     /**
      * Starts a chat with the welcome user, if the user doesn't already have one
      * @returns {string} The room ID of the new room, or null if no room was created
@@ -1254,7 +1299,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 if (welcomeUserRoom === null) {
                     // We didn't redirect to the welcome user room, so show
                     // the homepage.
-                    dis.dispatch({action: 'view_home_page', justRegistered: true});
+                    dis.dispatch({ action: 'view_home_page', justRegistered: true });
                 }
             } else if (ThreepidInviteStore.instance.pickBestInvite()) {
                 // The user has a 3pid invite pending - show them that
@@ -1263,11 +1308,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 // HACK: This is a pretty brutal way of threading the invite back through
                 // our systems, but it's the safest we have for now.
                 const params = ThreepidInviteStore.instance.translateToWireFormat(threepidInvite);
-                this.showScreen(`room/${threepidInvite.roomId}`, params)
+                this.showScreen(`room/${threepidInvite.roomId}`, params);
             } else {
                 // The user has just logged in after registering,
                 // so show the homepage.
-                dis.dispatch({action: 'view_home_page', justRegistered: true});
+                dis.dispatch({ action: 'view_home_page', justRegistered: true });
             }
         } else {
             this.showScreenAfterLogin();
@@ -1303,9 +1348,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.viewLastRoom();
         } else {
             if (MatrixClientPeg.get().isGuest()) {
-                dis.dispatch({action: 'view_welcome_page'});
+                dis.dispatch({ action: 'view_welcome_page' });
             } else {
-                dis.dispatch({action: 'view_home_page'});
+                dis.dispatch({ action: 'view_home_page' });
             }
         }
     }
@@ -1364,7 +1409,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         // such as when laptops unsleep.
         // https://github.com/vector-im/element-web/issues/3307#issuecomment-282895568
         cli.setCanResetTimelineCallback((roomId) => {
-            console.log("Request to reset timeline in room ", roomId, " viewing:", this.state.currentRoomId);
+            logger.log("Request to reset timeline in room ", roomId, " viewing:", this.state.currentRoomId);
             if (roomId !== this.state.currentRoomId) {
                 // It is safe to remove events from rooms we are not viewing.
                 return true;
@@ -1385,15 +1430,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // So dispatch directly from here. Ideally we'd use a SyncStateStore that
             // would do this dispatch and expose the sync state itself (by listening to
             // its own dispatch).
-            dis.dispatch({action: 'sync_state', prevState, state});
+            dis.dispatch({ action: 'sync_state', prevState, state });
 
             if (state === "ERROR" || state === "RECONNECTING") {
                 if (data.error instanceof InvalidStoreError) {
                     Lifecycle.handleInvalidStoreError(data.error);
                 }
-                this.setState({syncError: data.error || true});
+                this.setState({ syncError: data.error || true });
             } else if (this.state.syncError) {
-                this.setState({syncError: null});
+                this.setState({ syncError: null });
             }
 
             this.updateStatusIndicator(state, prevState);
@@ -1410,7 +1455,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 showNotificationsToast(false);
             }
 
-            dis.fire(Action.FocusComposer);
+            dis.fire(Action.FocusSendMessageComposer);
             this.setState({
                 ready: true,
             });
@@ -1438,7 +1483,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             });
         });
         cli.on('no_consent', function(message, consentUri) {
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             Modal.createTrackedDialog('No Consent Dialog', '', QuestionDialog, {
                 title: _t('Terms and Conditions'),
                 description: <div>
@@ -1461,7 +1505,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
 
         const dft = new DecryptionFailureTracker((total, errorCode) => {
-            Analytics.trackEvent('E2E', 'Decryption failure', errorCode, total);
+            Analytics.trackEvent('E2E', 'Decryption failure', errorCode, String(total));
             CountlyAnalytics.instance.track("decryption_failure", { errorCode }, null, { sum: total });
         }, (errorCode) => {
             // Map JS-SDK error codes to tracker codes for aggregation
@@ -1547,8 +1591,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
 
         cli.on("crypto.keySignatureUploadFailure", (failures, source, continuation) => {
-            const KeySignatureUploadFailedDialog =
-                sdk.getComponent('views.dialogs.KeySignatureUploadFailedDialog');
             Modal.createTrackedDialog(
                 'Failed to upload key signatures',
                 'Failed to upload key signatures',
@@ -1558,7 +1600,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         cli.on("crypto.verification.request", request => {
             if (request.verifier) {
-                const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
                 Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
                     verifier: request.verifier,
                 }, null, /* priority = */ false, /* static = */ true);
@@ -1567,16 +1608,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     key: 'verifreq_' + request.channel.transactionId,
                     title: _t("Verification requested"),
                     icon: "verification",
-                    props: {request},
-                    component: sdk.getComponent("toasts.VerificationRequestToast"),
+                    props: { request },
+                    component: VerificationRequestToast,
                     priority: 90,
                 });
             }
         });
-        // Fire the tinter right on startup to ensure the default theme is applied
-        // A later sync can/will correct the tint to be the right value for the user
-        const colorScheme = SettingsStore.getValue("roomColor");
-        Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
     }
 
     /**
@@ -1668,7 +1705,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // TODO if logged in, skip SSO
             let cli = MatrixClientPeg.get();
             if (!cli) {
-                const {hsUrl, isUrl} = this.props.serverConfig;
+                const { hsUrl, isUrl } = this.props.serverConfig;
                 cli = createClient({
                     baseUrl: hsUrl,
                     idBaseUrl: isUrl,
@@ -1678,7 +1715,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             const type = screen === "start_sso" ? "sso" : "cas";
             PlatformPeg.get().startSingleSignOn(cli, type, this.getFragmentAfterLogin());
         } else if (screen === 'groups') {
-            if (SettingsStore.getValue("feature_spaces")) {
+            if (SpaceStore.spacesEnabled) {
                 dis.dispatch({ action: "view_home_page" });
                 return;
             }
@@ -1765,11 +1802,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 subAction: params.action,
             });
         } else if (screen.indexOf('group/') === 0) {
-            if (SettingsStore.getValue("feature_spaces")) {
-                dis.dispatch({ action: "view_home_page" });
-                return;
-            }
-
             const groupId = screen.substring(6);
 
             // TODO: Check valid group ID
@@ -1792,7 +1824,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     onAliasClick(event: MouseEvent, alias: string) {
         event.preventDefault();
-        dis.dispatch({action: 'view_room', room_alias: alias});
+        dis.dispatch({ action: 'view_room', room_alias: alias });
     }
 
     onUserClick(event: MouseEvent, userId: string) {
@@ -1808,7 +1840,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     onGroupClick(event: MouseEvent, groupId: string) {
         event.preventDefault();
-        dis.dispatch({action: 'view_group', group_id: groupId});
+        dis.dispatch({ action: 'view_group', group_id: groupId });
     }
 
     onLogoutClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
@@ -1839,13 +1871,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         dis.dispatch({ action: 'timeline_resize' });
     }
 
-    onRoomCreated(roomId: string) {
-        dis.dispatch({
-            action: "view_room",
-            room_id: roomId,
-        });
-    }
-
     onRegisterClick = () => {
         this.showScreen("register");
     };
@@ -1869,15 +1894,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     onSendEvent(roomId: string, event: MatrixEvent) {
         const cli = MatrixClientPeg.get();
-        if (!cli) {
-            dis.dispatch({action: 'message_send_failed'});
-            return;
-        }
+        if (!cli) return;
 
         cli.sendEvent(roomId, event.getType(), event.getContent()).then(() => {
-            dis.dispatch({action: 'message_sent'});
-        }, (err) => {
-            dis.dispatch({action: 'message_send_failed'});
+            dis.dispatch({ action: 'message_sent' });
         });
     }
 
@@ -1924,10 +1944,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     onServerConfigChange = (serverConfig: ValidatedServerConfig) => {
-        this.setState({serverConfig});
+        this.setState({ serverConfig });
     };
 
-    private makeRegistrationUrl = (params: {[key: string]: string}) => {
+    private makeRegistrationUrl = (params: QueryDict) => {
         if (this.props.startingFragmentQueryParams.referrer) {
             params.referrer = this.props.startingFragmentQueryParams.referrer;
         }
@@ -1953,6 +1973,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         // Create and start the client
         await Lifecycle.setLoggedIn(credentials);
         await this.postLoginSetup();
+
         PerformanceMonitor.instance.stop(PerformanceEntryNames.LOGIN);
         PerformanceMonitor.instance.stop(PerformanceEntryNames.REGISTER);
     };
@@ -1979,21 +2000,18 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         let view = null;
 
         if (this.state.view === Views.LOADING) {
-            const Spinner = sdk.getComponent('elements.Spinner');
             view = (
                 <div className="mx_MatrixChat_splash">
                     <Spinner />
                 </div>
             );
         } else if (this.state.view === Views.COMPLETE_SECURITY) {
-            const CompleteSecurity = sdk.getComponent('structures.auth.CompleteSecurity');
             view = (
                 <CompleteSecurity
                     onFinished={this.onCompleteSecurityE2eSetupFinished}
                 />
             );
         } else if (this.state.view === Views.E2E_SETUP) {
-            const E2eSetup = sdk.getComponent('structures.auth.E2eSetup');
             view = (
                 <E2eSetup
                     onFinished={this.onCompleteSecurityE2eSetupFinished}
@@ -2014,43 +2032,37 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                  * we should go through and figure out what we actually need to pass down, as well
                  * as using something like redux to avoid having a billion bits of state kicking around.
                  */
-                const LoggedInView = sdk.getComponent('structures.LoggedInView');
                 view = (
                     <LoggedInView
                         {...this.props}
                         {...this.state}
                         ref={this.loggedInView}
                         matrixClient={MatrixClientPeg.get()}
-                        onRoomCreated={this.onRoomCreated}
-                        onCloseAllSettings={this.onCloseAllSettings}
                         onRegistered={this.onRegistered}
                         currentRoomId={this.state.currentRoomId}
                     />
                 );
             } else {
                 // we think we are logged in, but are still waiting for the /sync to complete
-                const Spinner = sdk.getComponent('elements.Spinner');
                 let errorBox;
                 if (this.state.syncError && !isStoreError) {
                     errorBox = <div className="mx_MatrixChat_syncError">
-                        {messageForSyncError(this.state.syncError)}
+                        { messageForSyncError(this.state.syncError) }
                     </div>;
                 }
                 view = (
                     <div className="mx_MatrixChat_splash">
-                        {errorBox}
+                        { errorBox }
                         <Spinner />
                         <a href="#" className="mx_MatrixChat_splashButtons" onClick={this.onLogoutClick}>
-                            {_t('Logout')}
+                            { _t('Logout') }
                         </a>
                     </div>
                 );
             }
         } 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)) {
-            const Registration = sdk.getComponent('structures.auth.Registration');
             const email = ThreepidInviteStore.instance.pickBestInvite()?.toEmail;
             view = (
                 <Registration
@@ -2069,7 +2081,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 />
             );
         } else if (this.state.view === Views.FORGOT_PASSWORD && SettingsStore.getValue(UIFeature.PasswordReset)) {
-            const ForgotPassword = sdk.getComponent('structures.auth.ForgotPassword');
             view = (
                 <ForgotPassword
                     onComplete={this.onLoginClick}
@@ -2080,7 +2091,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             );
         } else if (this.state.view === Views.LOGIN) {
             const showPasswordReset = SettingsStore.getValue(UIFeature.PasswordReset);
-            const Login = sdk.getComponent('structures.auth.Login');
             view = (
                 <Login
                     isSyncing={this.state.pendingInitialSync}
@@ -2091,12 +2101,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     onForgotPasswordClick={showPasswordReset ? this.onForgotPasswordClick : undefined}
                     onServerConfigChange={this.onServerConfigChange}
                     fragmentAfterLogin={fragmentAfterLogin}
-                    defaultUsername={this.props.startingFragmentQueryParams.defaultUsername}
+                    defaultUsername={this.props.startingFragmentQueryParams.defaultUsername as string}
                     {...this.getServerProperties()}
                 />
             );
         } else if (this.state.view === Views.SOFT_LOGOUT) {
-            const SoftLogout = sdk.getComponent('structures.auth.SoftLogout');
             view = (
                 <SoftLogout
                     realQueryParams={this.props.realQueryParams}
@@ -2108,9 +2117,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             console.error(`Unknown view ${this.state.view}`);
         }
 
-        const ErrorBoundary = sdk.getComponent('elements.ErrorBoundary');
         return <ErrorBoundary>
-            {view}
+            { view }
         </ErrorBoundary>;
     }
 }
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.tsx
similarity index 58%
rename from src/components/structures/MessagePanel.js
rename to src/components/structures/MessagePanel.tsx
index 6709fef814..42980efc57 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 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,32 +14,59 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef, KeyboardEvent, ReactNode, SyntheticEvent, TransitionEvent } from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import shouldHideEvent from '../../shouldHideEvent';
-import {wantsDateSeparator} from '../../DateUtils';
-import * as sdk from '../../index';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { EventType } from 'matrix-js-sdk/src/@types/event';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { Relations } from "matrix-js-sdk/src/models/relations";
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import shouldHideEvent from '../../shouldHideEvent';
+import { wantsDateSeparator } from '../../DateUtils';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
-import {Layout, LayoutPropType} from "../../settings/Layout";
-import {_t} from "../../languageHandler";
-import {haveTileForEvent} from "../views/rooms/EventTile";
-import {textForEvent} from "../../TextForEvent";
+import RoomContext from "../../contexts/RoomContext";
+import { Layout } from "../../settings/Layout";
+import { _t } from "../../languageHandler";
+import EventTile, { haveTileForEvent, IReadReceiptProps, TileShape } from "../views/rooms/EventTile";
+import { hasText } from "../../TextForEvent";
 import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 import DMRoomMap from "../../utils/DMRoomMap";
 import NewRoomIntro from "../views/rooms/NewRoomIntro";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 import defaultDispatcher from '../../dispatcher/dispatcher';
+import CallEventGrouper from "./CallEventGrouper";
+import WhoIsTypingTile from '../views/rooms/WhoIsTypingTile';
+import ScrollPanel, { IScrollState } from "./ScrollPanel";
+import EventListSummary from '../views/elements/EventListSummary';
+import MemberEventListSummary from '../views/elements/MemberEventListSummary';
+import DateSeparator from '../views/messages/DateSeparator';
+import ErrorBoundary from '../views/elements/ErrorBoundary';
+import ResizeNotifier from "../../utils/ResizeNotifier";
+import Spinner from "../views/elements/Spinner";
+import TileErrorBoundary from '../views/messages/TileErrorBoundary';
+import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
+import EditorStateTransfer from "../../utils/EditorStateTransfer";
+import { logger } from 'matrix-js-sdk/src/logger';
+import { Action } from '../../dispatcher/actions';
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
-const continuedTypes = ['m.sticker', 'm.room.message'];
+const continuedTypes = [EventType.Sticker, EventType.RoomMessage];
+const groupedEvents = [
+    EventType.RoomMember,
+    EventType.RoomThirdPartyInvite,
+    EventType.RoomServerAcl,
+    EventType.RoomPinnedEvents,
+];
 
 // check if there is a previous event and it has the same sender as this event
 // and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL
-function shouldFormContinuation(prevEvent, mxEvent) {
+export function shouldFormContinuation(
+    prevEvent: MatrixEvent,
+    mxEvent: MatrixEvent,
+    showHiddenEvents: boolean,
+): boolean {
     // sanity check inputs
     if (!prevEvent || !prevEvent.sender || !mxEvent.sender) return false;
     // check if within the max continuation period
@@ -52,8 +77,8 @@ function shouldFormContinuation(prevEvent, mxEvent) {
 
     // Some events should appear as continuations from previous events of different types.
     if (mxEvent.getType() !== prevEvent.getType() &&
-        (!continuedTypes.includes(mxEvent.getType()) ||
-            !continuedTypes.includes(prevEvent.getType()))) return false;
+        (!continuedTypes.includes(mxEvent.getType() as EventType) ||
+            !continuedTypes.includes(prevEvent.getType() as EventType))) return false;
 
     // Check if the sender is the same and hasn't changed their displayname/avatar between these events
     if (mxEvent.sender.userId !== prevEvent.sender.userId ||
@@ -61,99 +86,169 @@ function shouldFormContinuation(prevEvent, mxEvent) {
         mxEvent.sender.getMxcAvatarUrl() !== prevEvent.sender.getMxcAvatarUrl()) return false;
 
     // if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
-    if (!haveTileForEvent(prevEvent)) return false;
+    if (!haveTileForEvent(prevEvent, showHiddenEvents)) return false;
 
     return true;
 }
 
-const isMembershipChange = (e) => e.getType() === 'm.room.member' || e.getType() === 'm.room.third_party_invite';
+interface IProps {
+    // the list of MatrixEvents to display
+    events: MatrixEvent[];
+
+    // true to give the component a 'display: none' style.
+    hidden?: boolean;
+
+    // true to show a spinner at the top of the timeline to indicate
+    // back-pagination in progress
+    backPaginating?: boolean;
+
+    // true to show a spinner at the end of the timeline to indicate
+    // forward-pagination in progress
+    forwardPaginating?: boolean;
+
+    // ID of an event to highlight. If undefined, no event will be highlighted.
+    highlightedEventId?: string;
+
+    // The room these events are all in together, if any.
+    // (The notification panel won't have a room here, for example.)
+    room?: Room;
+
+    // Should we show URL Previews
+    showUrlPreview?: boolean;
+
+    // event after which we should show a read marker
+    readMarkerEventId?: string;
+
+    // whether the read marker should be visible
+    readMarkerVisible?: boolean;
+
+    // the userid of our user. This is used to suppress the read marker
+    // for pending messages.
+    ourUserId?: string;
+
+    // true to suppress the date at the start of the timeline
+    suppressFirstDateSeparator?: boolean;
+
+    // whether to show read receipts
+    showReadReceipts?: boolean;
+
+    // true if updates to the event list should cause the scroll panel to
+    // scroll down when we are at the bottom of the window. See ScrollPanel
+    // for more details.
+    stickyBottom?: boolean;
+
+    // className for the panel
+    className: string;
+
+    // shape parameter to be passed to EventTiles
+    tileShape?: TileShape;
+
+    // show twelve hour timestamps
+    isTwelveHour?: boolean;
+
+    // show timestamps always
+    alwaysShowTimestamps?: boolean;
+
+    // whether to show reactions for an event
+    showReactions?: boolean;
+
+    // which layout to use
+    layout?: Layout;
+
+    // whether or not to show flair at all
+    enableFlair?: boolean;
+
+    resizeNotifier: ResizeNotifier;
+    permalinkCreator?: RoomPermalinkCreator;
+    editState?: EditorStateTransfer;
+
+    // callback which is called when the panel is scrolled.
+    onScroll?(event: Event): void;
+
+    // callback which is called when the user interacts with the room timeline
+    onUserScroll(event: SyntheticEvent): void;
+
+    // callback which is called when more content is needed.
+    onFillRequest?(backwards: boolean): Promise<boolean>;
+
+    // helper function to access relations for an event
+    onUnfillRequest?(backwards: boolean, scrollToken: string): void;
+
+    getRelationsForEvent?(eventId: string, relationType: string, eventType: string): Relations;
+
+    hideThreadedMessages?: boolean;
+}
+
+interface IState {
+    ghostReadMarkers: string[];
+    showTypingNotifications: boolean;
+}
+
+interface IReadReceiptForUser {
+    lastShownEventId: string;
+    receipt: IReadReceiptProps;
+}
 
 /* (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.
-        hidden: PropTypes.bool,
+export default class MessagePanel extends React.Component<IProps, IState> {
+    static contextType = RoomContext;
 
-        // true to show a spinner at the top of the timeline to indicate
-        // back-pagination in progress
-        backPaginating: PropTypes.bool,
+    // opaque readreceipt info for each userId; used by ReadReceiptMarker
+    // to manage its animations
+    private readonly readReceiptMap: Record<string, object> = {};
 
-        // true to show a spinner at the end of the timeline to indicate
-        // forward-pagination in progress
-        forwardPaginating: PropTypes.bool,
+    // Track read receipts by event ID. For each _shown_ event ID, we store
+    // the list of read receipts to display:
+    //   [
+    //       {
+    //           userId: string,
+    //           member: RoomMember,
+    //           ts: number,
+    //       },
+    //   ]
+    // This is recomputed on each render. It's only stored on the component
+    // for ease of passing the data around since it's computed in one pass
+    // over all events.
+    private readReceiptsByEvent: Record<string, IReadReceiptProps[]> = {};
 
-        // the list of MatrixEvents to display
-        events: PropTypes.array.isRequired,
+    // Track read receipts by user ID. For each user ID we've ever shown a
+    // a read receipt for, we store an object:
+    //   {
+    //       lastShownEventId: string,
+    //       receipt: {
+    //           userId: string,
+    //           member: RoomMember,
+    //           ts: number,
+    //       },
+    //   }
+    // so that we can always keep receipts displayed by reverting back to
+    // the last shown event for that user ID when needed. This may feel like
+    // it duplicates the receipt storage in the room, but at this layer, we
+    // are tracking _shown_ event IDs, which the JS SDK knows nothing about.
+    // This is recomputed on each render, using the data from the previous
+    // render as our fallback for any user IDs we can't match a receipt to a
+    // displayed event in the current render cycle.
+    private readReceiptsByUserId: Record<string, IReadReceiptForUser> = {};
 
-        // ID of an event to highlight. If undefined, no event will be highlighted.
-        highlightedEventId: PropTypes.string,
+    private readonly showHiddenEventsInTimeline: boolean;
+    private isMounted = false;
 
-        // The room these events are all in together, if any.
-        // (The notification panel won't have a room here, for example.)
-        room: PropTypes.object,
+    private readMarkerNode = createRef<HTMLLIElement>();
+    private whoIsTyping = createRef<WhoIsTypingTile>();
+    private scrollPanel = createRef<ScrollPanel>();
 
-        // Should we show URL Previews
-        showUrlPreview: PropTypes.bool,
+    private readonly showTypingNotificationsWatcherRef: string;
+    private eventNodes: Record<string, HTMLElement>;
 
-        // event after which we should show a read marker
-        readMarkerEventId: PropTypes.string,
+    // A map of <callId, CallEventGrouper>
+    private callEventGroupers = new Map<string, CallEventGrouper>();
 
-        // whether the read marker should be visible
-        readMarkerVisible: PropTypes.bool,
+    private membersCount = 0;
 
-        // the userid of our user. This is used to suppress the read marker
-        // for pending messages.
-        ourUserId: PropTypes.string,
-
-        // true to suppress the date at the start of the timeline
-        suppressFirstDateSeparator: PropTypes.bool,
-
-        // whether to show read receipts
-        showReadReceipts: PropTypes.bool,
-
-        // true if updates to the event list should cause the scroll panel to
-        // scroll down when we are at the bottom of the window. See ScrollPanel
-        // for more details.
-        stickyBottom: PropTypes.bool,
-
-        // callback which is called when the panel is scrolled.
-        onScroll: PropTypes.func,
-
-        // callback which is called when the user interacts with the room timeline
-        onUserScroll: PropTypes.func,
-
-        // callback which is called when more content is needed.
-        onFillRequest: PropTypes.func,
-
-        // className for the panel
-        className: PropTypes.string.isRequired,
-
-        // shape parameter to be passed to EventTiles
-        tileShape: PropTypes.string,
-
-        // show twelve hour timestamps
-        isTwelveHour: PropTypes.bool,
-
-        // show timestamps always
-        alwaysShowTimestamps: PropTypes.bool,
-
-        // helper function to access relations for an event
-        getRelationsForEvent: PropTypes.func,
-
-        // whether to show reactions for an event
-        showReactions: PropTypes.bool,
-
-        // which layout to use
-        layout: LayoutPropType,
-
-        // whether or not to show flair at all
-        enableFlair: PropTypes.bool,
-    };
-
-    constructor(props) {
-        super(props);
+    constructor(props, context) {
+        super(props, context);
 
         this.state = {
             // previous positions the read marker has been in, so we can
@@ -162,65 +257,28 @@ export default class MessagePanel extends React.Component {
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
         };
 
-        // opaque readreceipt info for each userId; used by ReadReceiptMarker
-        // to manage its animations
-        this._readReceiptMap = {};
-
-        // Track read receipts by event ID. For each _shown_ event ID, we store
-        // the list of read receipts to display:
-        //   [
-        //       {
-        //           userId: string,
-        //           member: RoomMember,
-        //           ts: number,
-        //       },
-        //   ]
-        // This is recomputed on each render. It's only stored on the component
-        // for ease of passing the data around since it's computed in one pass
-        // over all events.
-        this._readReceiptsByEvent = {};
-
-        // Track read receipts by user ID. For each user ID we've ever shown a
-        // a read receipt for, we store an object:
-        //   {
-        //       lastShownEventId: string,
-        //       receipt: {
-        //           userId: string,
-        //           member: RoomMember,
-        //           ts: number,
-        //       },
-        //   }
-        // so that we can always keep receipts displayed by reverting back to
-        // the last shown event for that user ID when needed. This may feel like
-        // it duplicates the receipt storage in the room, but at this layer, we
-        // are tracking _shown_ event IDs, which the JS SDK knows nothing about.
-        // This is recomputed on each render, using the data from the previous
-        // render as our fallback for any user IDs we can't match a receipt to a
-        // displayed event in the current render cycle.
-        this._readReceiptsByUserId = {};
-
         // Cache hidden events setting on mount since Settings is expensive to
-        // query, and we check this in a hot code path.
-        this._showHiddenEventsInTimeline =
-            SettingsStore.getValue("showHiddenEventsInTimeline");
+        // query, and we check this in a hot code path. This is also cached in
+        // our RoomContext, however we still need a fallback for roomless MessagePanels.
+        this.showHiddenEventsInTimeline = SettingsStore.getValue("showHiddenEventsInTimeline");
 
-        this._isMounted = false;
-
-        this._readMarkerNode = createRef();
-        this._whoIsTyping = createRef();
-        this._scrollPanel = createRef();
-
-        this._showTypingNotificationsWatcherRef =
+        this.showTypingNotificationsWatcherRef =
             SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
     }
 
     componentDidMount() {
-        this._isMounted = true;
+        this.calculateRoomMembersCount();
+        this.props.room?.on("RoomState.members", this.calculateRoomMembersCount);
+        if (SettingsStore.getValue("feature_thread")) {
+            this.props.room?.getThreads().forEach(thread => thread.fetchReplyChain());
+        }
+        this.isMounted = true;
     }
 
     componentWillUnmount() {
-        this._isMounted = false;
-        SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
+        this.isMounted = false;
+        this.props.room?.off("RoomState.members", this.calculateRoomMembersCount);
+        SettingsStore.unwatchSetting(this.showTypingNotificationsWatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -231,16 +289,29 @@ export default class MessagePanel extends React.Component {
                 ghostReadMarkers,
             });
         }
+
+        const pendingEditItem = this.pendingEditItem;
+        if (!this.props.editState && this.props.room && pendingEditItem) {
+            defaultDispatcher.dispatch({
+                action: Action.EditEvent,
+                event: this.props.room.findEventById(pendingEditItem),
+                timelineRenderingType: this.context.timelineRenderingType,
+            });
+        }
     }
 
-    onShowTypingNotificationsChange = () => {
+    private calculateRoomMembersCount = (): void => {
+        this.membersCount = this.props.room?.getMembers().length || 0;
+    };
+
+    private onShowTypingNotificationsChange = (): void => {
         this.setState({
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
         });
     };
 
     /* get the DOM node representing the given event */
-    getNodeForEventId(eventId) {
+    public getNodeForEventId(eventId: string): HTMLElement {
         if (!this.eventNodes) {
             return undefined;
         }
@@ -250,8 +321,8 @@ export default class MessagePanel extends React.Component {
 
     /* return true if the content is fully scrolled down right now; else false.
      */
-    isAtBottom() {
-        return this._scrollPanel.current && this._scrollPanel.current.isAtBottom();
+    public isAtBottom(): boolean {
+        return this.scrollPanel.current?.isAtBottom();
     }
 
     /* get the current scroll state. See ScrollPanel.getScrollState for
@@ -259,8 +330,8 @@ export default class MessagePanel extends React.Component {
      *
      * returns null if we are not mounted.
      */
-    getScrollState() {
-        return this._scrollPanel.current ? this._scrollPanel.current.getScrollState() : null;
+    public getScrollState(): IScrollState {
+        return this.scrollPanel.current?.getScrollState() ?? null;
     }
 
     // returns one of:
@@ -269,15 +340,15 @@ export default class MessagePanel extends React.Component {
     //  -1: read marker is above the window
     //   0: read marker is within the window
     //  +1: read marker is below the window
-    getReadMarkerPosition() {
-        const readMarker = this._readMarkerNode.current;
-        const messageWrapper = this._scrollPanel.current;
+    public getReadMarkerPosition(): number {
+        const readMarker = this.readMarkerNode.current;
+        const messageWrapper = this.scrollPanel.current;
 
         if (!readMarker || !messageWrapper) {
             return null;
         }
 
-        const wrapperRect = ReactDOM.findDOMNode(messageWrapper).getBoundingClientRect();
+        const wrapperRect = (ReactDOM.findDOMNode(messageWrapper) as HTMLElement).getBoundingClientRect();
         const readMarkerRect = readMarker.getBoundingClientRect();
 
         // the read-marker pretends to have zero height when it is actually
@@ -293,17 +364,17 @@ export default class MessagePanel extends React.Component {
 
     /* jump to the top of the content.
      */
-    scrollToTop() {
-        if (this._scrollPanel.current) {
-            this._scrollPanel.current.scrollToTop();
+    public scrollToTop(): void {
+        if (this.scrollPanel.current) {
+            this.scrollPanel.current.scrollToTop();
         }
     }
 
     /* jump to the bottom of the content.
      */
-    scrollToBottom() {
-        if (this._scrollPanel.current) {
-            this._scrollPanel.current.scrollToBottom();
+    public scrollToBottom(): void {
+        if (this.scrollPanel.current) {
+            this.scrollPanel.current.scrollToBottom();
         }
     }
 
@@ -312,9 +383,9 @@ export default class MessagePanel extends React.Component {
      *
      * @param {number} mult: -1 to page up, +1 to page down
      */
-    scrollRelative(mult) {
-        if (this._scrollPanel.current) {
-            this._scrollPanel.current.scrollRelative(mult);
+    public scrollRelative(mult: number): void {
+        if (this.scrollPanel.current) {
+            this.scrollPanel.current.scrollRelative(mult);
         }
     }
 
@@ -323,9 +394,9 @@ export default class MessagePanel extends React.Component {
      *
      * @param {KeyboardEvent} ev: the keyboard event to handle
      */
-    handleScrollKey(ev) {
-        if (this._scrollPanel.current) {
-            this._scrollPanel.current.handleScrollKey(ev);
+    public handleScrollKey(ev: KeyboardEvent): void {
+        if (this.scrollPanel.current) {
+            this.scrollPanel.current.handleScrollKey(ev);
         }
     }
 
@@ -339,52 +410,67 @@ export default class MessagePanel extends React.Component {
      * node (specifically, the bottom of it) will be positioned. If omitted, it
      * defaults to 0.
      */
-    scrollToEvent(eventId, pixelOffset, offsetBase) {
-        if (this._scrollPanel.current) {
-            this._scrollPanel.current.scrollToToken(eventId, pixelOffset, offsetBase);
+    public scrollToEvent(eventId: string, pixelOffset: number, offsetBase: number): void {
+        if (this.scrollPanel.current) {
+            this.scrollPanel.current.scrollToToken(eventId, pixelOffset, offsetBase);
         }
     }
 
-    scrollToEventIfNeeded(eventId) {
+    public scrollToEventIfNeeded(eventId: string): void {
         const node = this.eventNodes[eventId];
         if (node) {
-            node.scrollIntoView({block: "nearest", behavior: "instant"});
+            node.scrollIntoView({
+                block: "nearest",
+                behavior: "instant",
+            });
         }
     }
 
     /* check the scroll state and send out pagination requests if necessary.
      */
-    checkFillState() {
-        if (this._scrollPanel.current) {
-            this._scrollPanel.current.checkFillState();
+    public checkFillState(): void {
+        if (this.scrollPanel.current) {
+            this.scrollPanel.current.checkFillState();
         }
     }
 
-    _isUnmounting = () => {
-        return !this._isMounted;
+    private isUnmounting = (): boolean => {
+        return !this.isMounted;
     };
 
+    private get showHiddenEvents(): boolean {
+        return this.context?.showHiddenEventsInTimeline ?? this.showHiddenEventsInTimeline;
+    }
+
     // TODO: Implement granular (per-room) hide options
-    _shouldShowEvent(mxEv) {
-        if (mxEv.sender && MatrixClientPeg.get().isUserIgnored(mxEv.sender.userId)) {
+    public shouldShowEvent(mxEv: MatrixEvent): boolean {
+        if (MatrixClientPeg.get().isUserIgnored(mxEv.getSender())) {
             return false; // ignored = no show (only happens if the ignore happens after an event was received)
         }
 
-        if (this._showHiddenEventsInTimeline) {
+        if (this.showHiddenEvents) {
             return true;
         }
 
-        if (!haveTileForEvent(mxEv)) {
+        if (!haveTileForEvent(mxEv, this.showHiddenEvents)) {
             return false; // no tile = no show
         }
 
         // Always show highlighted event
         if (this.props.highlightedEventId === mxEv.getId()) return true;
 
-        return !shouldHideEvent(mxEv);
+        // Checking if the message has a "parentEventId" as we do not
+        // want to hide the root event of the thread
+        if (mxEv.replyInThread && mxEv.parentEventId
+                && this.props.hideThreadedMessages
+                && SettingsStore.getValue("feature_thread")) {
+            return false;
+        }
+
+        return !shouldHideEvent(mxEv, this.context);
     }
 
-    _readMarkerForEvent(eventId, isLastEvent) {
+    public readMarkerForEvent(eventId: string, isLastEvent: boolean): ReactNode {
         const visible = !isLastEvent && this.props.readMarkerVisible;
 
         if (this.props.readMarkerEventId === eventId) {
@@ -397,13 +483,13 @@ export default class MessagePanel extends React.Component {
             // confused.
             if (visible) {
                 hr = <hr className="mx_RoomView_myReadMarker"
-                    style={{opacity: 1, width: '99%'}}
+                    style={{ opacity: 1, width: '99%' }}
                 />;
             }
 
             return (
                 <li key={"readMarker_"+eventId}
-                    ref={this._readMarkerNode}
+                    ref={this.readMarkerNode}
                     className="mx_RoomView_myReadMarker_container"
                     data-scroll-tokens={eventId}
                 >
@@ -422,8 +508,8 @@ export default class MessagePanel extends React.Component {
             // transition (ie. the read markers do but the event tiles do not)
             // and TransitionGroup requires that all its children are Transitions.
             const hr = <hr className="mx_RoomView_myReadMarker"
-                ref={this._collectGhostReadMarker}
-                onTransitionEnd={this._onGhostTransitionEnd}
+                ref={this.collectGhostReadMarker}
+                onTransitionEnd={this.onGhostTransitionEnd}
                 data-eventid={eventId}
             />;
 
@@ -443,7 +529,7 @@ export default class MessagePanel extends React.Component {
         return null;
     }
 
-    _collectGhostReadMarker = (node) => {
+    private collectGhostReadMarker = (node: HTMLElement): void => {
         if (node) {
             // now the element has appeared, change the style which will trigger the CSS transition
             requestAnimationFrame(() => {
@@ -453,15 +539,15 @@ export default class MessagePanel extends React.Component {
         }
     };
 
-    _onGhostTransitionEnd = (ev) => {
+    private onGhostTransitionEnd = (ev: TransitionEvent): void => {
         // we can now clean up the ghost element
-        const finishedEventId = ev.target.dataset.eventid;
+        const finishedEventId = (ev.target as HTMLElement).dataset.eventid;
         this.setState({
             ghostReadMarkers: this.state.ghostReadMarkers.filter(eid => eid !== finishedEventId),
         });
     };
 
-    _getNextEventInfo(arr, i) {
+    private getNextEventInfo(arr: MatrixEvent[], i: number): { nextEvent: MatrixEvent, nextTile: MatrixEvent } {
         const nextEvent = i < arr.length - 1
             ? arr[i + 1]
             : null;
@@ -470,16 +556,20 @@ export default class MessagePanel extends React.Component {
         // 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));
+        const nextTile = arr.slice(i + 1).find(e => this.shouldShowEvent(e));
 
-        return {nextEvent, nextTile};
+        return { nextEvent, nextTile };
     }
 
-    get _roomHasPendingEdit() {
-        return this.props.room && localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
+    private get pendingEditItem(): string | undefined {
+        try {
+            return localStorage.getItem(`mx_edit_room_${this.props.room.roomId}_${this.context.timelineRenderingType}`);
+        } catch (err) {
+            logger.error(err);
+            return undefined;
+        }
     }
-
-    _getEventTiles() {
+    private getEventTiles(): ReactNode[] {
         this.eventNodes = {};
 
         let i;
@@ -495,7 +585,7 @@ export default class MessagePanel extends React.Component {
         let lastShownNonLocalEchoIndex = -1;
         for (i = this.props.events.length-1; i >= 0; i--) {
             const mxEv = this.props.events[i];
-            if (!this._shouldShowEvent(mxEv)) {
+            if (!this.shouldShowEvent(mxEv)) {
                 continue;
             }
 
@@ -519,22 +609,36 @@ export default class MessagePanel extends React.Component {
         // 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 = {};
+        this.readReceiptsByEvent = {};
         if (this.props.showReadReceipts) {
-            this._readReceiptsByEvent = this._getReadReceiptsByShownEvent();
+            this.readReceiptsByEvent = this.getReadReceiptsByShownEvent();
         }
 
-        let grouper = null;
+        let grouper: BaseGrouper = null;
 
         for (i = 0; i < this.props.events.length; i++) {
             const mxEv = this.props.events[i];
             const eventId = mxEv.getId();
             const last = (mxEv === lastShownEvent);
-            const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i);
+            const { nextEvent, nextTile } = this.getNextEventInfo(this.props.events, i);
+
+            if (
+                mxEv.getType().indexOf("m.call.") === 0 ||
+                mxEv.getType().indexOf("org.matrix.call.") === 0
+            ) {
+                const callId = mxEv.getContent().call_id;
+                if (this.callEventGroupers.has(callId)) {
+                    this.callEventGroupers.get(callId).add(mxEv);
+                } else {
+                    const callEventGrouper = new CallEventGrouper();
+                    callEventGrouper.add(mxEv);
+                    this.callEventGroupers.set(callId, callEventGrouper);
+                }
+            }
 
             if (grouper) {
                 if (grouper.shouldGroup(mxEv)) {
-                    grouper.add(mxEv);
+                    grouper.add(mxEv, this.showHiddenEvents);
                     continue;
                 } else {
                     // not part of group, so get the group tiles, close the
@@ -547,33 +651,33 @@ export default class MessagePanel extends React.Component {
 
             for (const Grouper of groupers) {
                 if (Grouper.canStartGroup(this, mxEv)) {
-                    grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent, nextEvent, nextTile);
+                    grouper = new Grouper(
+                        this,
+                        mxEv,
+                        prevEvent,
+                        lastShownEvent,
+                        this.props.layout,
+                        nextEvent,
+                        nextTile,
+                    );
                 }
             }
             if (!grouper) {
-                const wantTile = this._shouldShowEvent(mxEv);
+                const wantTile = this.shouldShowEvent(mxEv);
                 const isGrouped = false;
                 if (wantTile) {
-                    // make sure we unpack the array returned by _getTilesForEvent,
+                    // 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, isGrouped,
-                        nextEvent, nextTile));
+                    ret.push(...this.getTilesForEvent(prevEvent, mxEv, last, isGrouped, nextEvent, nextTile));
                     prevEvent = mxEv;
                 }
 
-                const readMarker = this._readMarkerForEvent(eventId, i >= lastShownNonLocalEchoIndex);
+                const readMarker = this.readMarkerForEvent(eventId, i >= lastShownNonLocalEchoIndex);
                 if (readMarker) ret.push(readMarker);
             }
         }
 
-        if (!this.props.editState && this._roomHasPendingEdit) {
-            defaultDispatcher.dispatch({
-                action: "edit_event",
-                event: this.props.room.findEventById(this._roomHasPendingEdit),
-            });
-        }
-
         if (grouper) {
             ret.push(...grouper.getTiles());
         }
@@ -581,10 +685,14 @@ export default class MessagePanel extends React.Component {
         return ret;
     }
 
-    _getTilesForEvent(prevEvent, mxEv, last, isGrouped=false, nextEvent, nextEventWithTile) {
-        const TileErrorBoundary = sdk.getComponent('messages.TileErrorBoundary');
-        const EventTile = sdk.getComponent('rooms.EventTile');
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+    public getTilesForEvent(
+        prevEvent: MatrixEvent,
+        mxEv: MatrixEvent,
+        last = false,
+        isGrouped = false,
+        nextEvent?: MatrixEvent,
+        nextEventWithTile?: MatrixEvent,
+    ): ReactNode[] {
         const ret = [];
 
         const isEditing = this.props.editState &&
@@ -599,33 +707,32 @@ export default class MessagePanel extends React.Component {
         }
 
         // do we need a date separator since the last event?
-        const wantsDateSeparator = this._wantsDateSeparator(prevEvent, eventDate);
+        const wantsDateSeparator = this.wantsDateSeparator(prevEvent, eventDate);
         if (wantsDateSeparator && !isGrouped) {
             const dateSeparator = <li key={ts1}><DateSeparator key={ts1} ts={ts1} /></li>;
             ret.push(dateSeparator);
         }
 
         let willWantDateSeparator = false;
-        if (nextEvent) {
-            willWantDateSeparator = this._wantsDateSeparator(mxEv, nextEvent.getDate() || new Date());
+        let lastInSection = true;
+        if (nextEventWithTile) {
+            willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEventWithTile.getDate() || new Date());
+            lastInSection = willWantDateSeparator || mxEv.getSender() !== nextEventWithTile.getSender();
         }
 
         // is this a continuation of the previous message?
-        const continuation = !wantsDateSeparator && shouldFormContinuation(prevEvent, mxEv);
+        const continuation = !wantsDateSeparator &&
+            shouldFormContinuation(prevEvent, mxEv, this.showHiddenEvents);
 
         const eventId = mxEv.getId();
         const highlight = (eventId === this.props.highlightedEventId);
 
-        // we can't use local echoes as scroll tokens, because their event IDs change.
-        // Local echos have a send "status".
-        const scrollToken = mxEv.status ? undefined : eventId;
-
-        const readReceipts = this._readReceiptsByEvent[eventId];
+        const readReceipts = this.readReceiptsByEvent[eventId];
 
         let isLastSuccessful = false;
         const isSentState = s => !s || s === 'sent';
         const isSent = isSentState(mxEv.getAssociatedStatus());
-        const hasNextEvent = nextEvent && this._shouldShowEvent(nextEvent);
+        const hasNextEvent = nextEvent && this.shouldShowEvent(nextEvent);
         if (!hasNextEvent && isSent) {
             isLastSuccessful = true;
         } else if (hasNextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) {
@@ -646,30 +753,30 @@ export default class MessagePanel extends React.Component {
         // it's successful: we received it.
         isLastSuccessful = isLastSuccessful && mxEv.getSender() === MatrixClientPeg.get().getUserId();
 
+        const callEventGrouper = this.callEventGroupers.get(mxEv.getContent().call_id);
         // use txnId as key if available so that we don't remount during sending
         ret.push(
             <TileErrorBoundary key={mxEv.getTxnId() || eventId} mxEvent={mxEv}>
                 <EventTile
                     as="li"
-                    data-scroll-tokens={scrollToken}
-                    ref={this._collectEventNode.bind(this, eventId)}
+                    ref={this.collectEventNode.bind(this, eventId)}
                     alwaysShowTimestamps={this.props.alwaysShowTimestamps}
                     mxEvent={mxEv}
                     continuation={continuation}
                     isRedacted={mxEv.isRedacted()}
                     replacingEventId={mxEv.replacingEventId()}
                     editState={isEditing && this.props.editState}
-                    onHeightChanged={this._onHeightChanged}
+                    onHeightChanged={this.onHeightChanged}
                     readReceipts={readReceipts}
-                    readReceiptMap={this._readReceiptMap}
+                    readReceiptMap={this.readReceiptMap}
                     showUrlPreview={this.props.showUrlPreview}
-                    checkUnmounting={this._isUnmounting}
+                    checkUnmounting={this.isUnmounting}
                     eventSendStatus={mxEv.getAssociatedStatus()}
                     tileShape={this.props.tileShape}
                     isTwelveHour={this.props.isTwelveHour}
                     permalinkCreator={this.props.permalinkCreator}
                     last={last}
-                    lastInSection={willWantDateSeparator}
+                    lastInSection={lastInSection}
                     lastSuccessful={isLastSuccessful}
                     isSelectedEvent={highlight}
                     getRelationsForEvent={this.props.getRelationsForEvent}
@@ -677,6 +784,8 @@ export default class MessagePanel extends React.Component {
                     layout={this.props.layout}
                     enableFlair={this.props.enableFlair}
                     showReadReceipts={this.props.showReadReceipts}
+                    callEventGrouper={callEventGrouper}
+                    hideSender={this.membersCount <= 2 && this.props.layout === Layout.Bubble}
                 />
             </TileErrorBoundary>,
         );
@@ -684,7 +793,7 @@ export default class MessagePanel extends React.Component {
         return ret;
     }
 
-    _wantsDateSeparator(prevEvent, nextEventDate) {
+    public wantsDateSeparator(prevEvent: MatrixEvent, nextEventDate: Date): boolean {
         if (prevEvent == null) {
             // first event in the panel: depends if we could back-paginate from
             // here.
@@ -695,7 +804,7 @@ export default class MessagePanel extends React.Component {
 
     // Get a list of read receipts that should be shown next to this event
     // Receipts are objects which have a 'userId', 'roomMember' and 'ts'.
-    _getReadReceiptsForEvent(event) {
+    private getReadReceiptsForEvent(event: MatrixEvent): IReadReceiptProps[] {
         const myUserId = MatrixClientPeg.get().credentials.userId;
 
         // get list of read receipts, sorted most recent first
@@ -703,7 +812,7 @@ export default class MessagePanel extends React.Component {
         if (!room) {
             return null;
         }
-        const receipts = [];
+        const receipts: IReadReceiptProps[] = [];
         room.getReceiptsForEvent(event).forEach((r) => {
             if (!r.userId || r.type !== "m.read" || r.userId === myUserId) {
                 return; // ignore non-read receipts and receipts from self.
@@ -724,13 +833,13 @@ export default class MessagePanel extends React.Component {
     // Get an object that maps from event ID to a list of read receipts that
     // should be shown next to that event. If a hidden event has read receipts,
     // they are folded into the receipts of the last shown event.
-    _getReadReceiptsByShownEvent() {
+    private getReadReceiptsByShownEvent(): Record<string, IReadReceiptProps[]> {
         const receiptsByEvent = {};
         const receiptsByUserId = {};
 
         let lastShownEventId;
         for (const event of this.props.events) {
-            if (this._shouldShowEvent(event)) {
+            if (this.shouldShowEvent(event)) {
                 lastShownEventId = event.getId();
             }
             if (!lastShownEventId) {
@@ -738,7 +847,7 @@ export default class MessagePanel extends React.Component {
             }
 
             const existingReceipts = receiptsByEvent[lastShownEventId] || [];
-            const newReceipts = this._getReadReceiptsForEvent(event);
+            const newReceipts = this.getReadReceiptsForEvent(event);
             receiptsByEvent[lastShownEventId] = existingReceipts.concat(newReceipts);
 
             // Record these receipts along with their last shown event ID for
@@ -757,16 +866,16 @@ export default class MessagePanel extends React.Component {
         // someone which had one in the last. By looking through our previous
         // mapping of receipts by user ID, we can cover recover any receipts
         // that would have been lost by using the same event ID from last time.
-        for (const userId in this._readReceiptsByUserId) {
+        for (const userId in this.readReceiptsByUserId) {
             if (receiptsByUserId[userId]) {
                 continue;
             }
-            const { lastShownEventId, receipt } = this._readReceiptsByUserId[userId];
+            const { lastShownEventId, receipt } = this.readReceiptsByUserId[userId];
             const existingReceipts = receiptsByEvent[lastShownEventId] || [];
             receiptsByEvent[lastShownEventId] = existingReceipts.concat(receipt);
             receiptsByUserId[userId] = { lastShownEventId, receipt };
         }
-        this._readReceiptsByUserId = receiptsByUserId;
+        this.readReceiptsByUserId = receiptsByUserId;
 
         // After grouping receipts by shown events, do another pass to sort each
         // receipt list.
@@ -779,21 +888,21 @@ export default class MessagePanel extends React.Component {
         return receiptsByEvent;
     }
 
-    _collectEventNode = (eventId, node) => {
+    private collectEventNode = (eventId: string, node: EventTile): void => {
         this.eventNodes[eventId] = node?.ref?.current;
-    }
+    };
 
     // once dynamic content in the events load, make the scrollPanel check the
     // scroll offsets.
-    _onHeightChanged = () => {
-        const scrollPanel = this._scrollPanel.current;
+    public onHeightChanged = (): void => {
+        const scrollPanel = this.scrollPanel.current;
         if (scrollPanel) {
             scrollPanel.checkScroll();
         }
     };
 
-    _onTypingShown = () => {
-        const scrollPanel = this._scrollPanel.current;
+    private onTypingShown = (): void => {
+        const scrollPanel = this.scrollPanel.current;
         // this will make the timeline grow, so checkScroll
         scrollPanel.checkScroll();
         if (scrollPanel && scrollPanel.getScrollState().stuckAtBottom) {
@@ -801,8 +910,8 @@ export default class MessagePanel extends React.Component {
         }
     };
 
-    _onTypingHidden = () => {
-        const scrollPanel = this._scrollPanel.current;
+    private onTypingHidden = (): void => {
+        const scrollPanel = this.scrollPanel.current;
         if (scrollPanel) {
             // as hiding the typing notifications doesn't
             // update the scrollPanel, we tell it to apply
@@ -814,12 +923,12 @@ export default class MessagePanel extends React.Component {
         }
     };
 
-    updateTimelineMinHeight() {
-        const scrollPanel = this._scrollPanel.current;
+    public updateTimelineMinHeight(): void {
+        const scrollPanel = this.scrollPanel.current;
 
         if (scrollPanel) {
             const isAtBottom = scrollPanel.isAtBottom();
-            const whoIsTyping = this._whoIsTyping.current;
+            const whoIsTyping = this.whoIsTyping.current;
             const isTypingVisible = whoIsTyping && whoIsTyping.isVisible();
             // when messages get added to the timeline,
             // but somebody else is still typing,
@@ -831,18 +940,14 @@ export default class MessagePanel extends React.Component {
         }
     }
 
-    onTimelineReset() {
-        const scrollPanel = this._scrollPanel.current;
+    public onTimelineReset(): void {
+        const scrollPanel = this.scrollPanel.current;
         if (scrollPanel) {
             scrollPanel.clearPreventShrinking();
         }
     }
 
     render() {
-        const ErrorBoundary = sdk.getComponent('elements.ErrorBoundary');
-        const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
-        const WhoIsTypingTile = sdk.getComponent("rooms.WhoIsTypingTile");
-        const Spinner = sdk.getComponent("elements.Spinner");
         let topSpinner;
         let bottomSpinner;
         if (this.props.backPaginating) {
@@ -854,20 +959,13 @@ export default class MessagePanel extends React.Component {
 
         const style = this.props.hidden ? { display: 'none' } : {};
 
-        const className = classNames(
-            this.props.className,
-            {
-                "mx_MessagePanel_alwaysShowTimestamps": this.props.alwaysShowTimestamps,
-            },
-        );
-
         let whoIsTyping;
         if (this.props.room && !this.props.tileShape && this.state.showTypingNotifications) {
             whoIsTyping = (<WhoIsTypingTile
                 room={this.props.room}
-                onShown={this._onTypingShown}
-                onHidden={this._onTypingHidden}
-                ref={this._whoIsTyping} />
+                onShown={this.onTypingShown}
+                onHidden={this.onTypingHidden}
+                ref={this.whoIsTyping} />
             );
         }
 
@@ -883,11 +981,10 @@ export default class MessagePanel extends React.Component {
         return (
             <ErrorBoundary>
                 <ScrollPanel
-                    ref={this._scrollPanel}
-                    className={className}
+                    ref={this.scrollPanel}
+                    className={this.props.className}
                     onScroll={this.props.onScroll}
                     onUserScroll={this.props.onUserScroll}
-                    onResize={this.onResize}
                     onFillRequest={this.props.onFillRequest}
                     onUnfillRequest={this.props.onUnfillRequest}
                     style={style}
@@ -896,7 +993,7 @@ export default class MessagePanel extends React.Component {
                     fixedChildren={ircResizer}
                 >
                     { topSpinner }
-                    { this._getEventTiles() }
+                    { this.getEventTiles() }
                     { whoIsTyping }
                     { bottomSpinner }
                 </ScrollPanel>
@@ -905,6 +1002,32 @@ export default class MessagePanel extends React.Component {
     }
 }
 
+abstract class BaseGrouper {
+    static canStartGroup = (panel: MessagePanel, ev: MatrixEvent): boolean => true;
+
+    public events: MatrixEvent[] = [];
+    // events that we include in the group but then eject out and place above the group.
+    public ejectedEvents: MatrixEvent[] = [];
+    public readMarker: ReactNode;
+
+    constructor(
+        public readonly panel: MessagePanel,
+        public readonly event: MatrixEvent,
+        public readonly prevEvent: MatrixEvent,
+        public readonly lastShownEvent: MatrixEvent,
+        protected readonly layout: Layout,
+        public readonly nextEvent?: MatrixEvent,
+        public readonly nextEventTile?: MatrixEvent,
+    ) {
+        this.readMarker = panel.readMarkerForEvent(event.getId(), event === lastShownEvent);
+    }
+
+    public abstract shouldGroup(ev: MatrixEvent): boolean;
+    public abstract add(ev: MatrixEvent, showHiddenEvents?: boolean): void;
+    public abstract getTiles(): ReactNode[];
+    public abstract getNewPrevEvent(): MatrixEvent;
+}
+
 /* Grouper classes determine when events can be grouped together in a summary.
  * Groupers should have the following methods:
  * - canStartGroup (static): determines if a new group should be started with the
@@ -920,36 +1043,21 @@ export default class MessagePanel extends React.Component {
 // Wrap initial room creation events into an EventListSummary
 // Grouping only events sent by the same user that sent the `m.room.create` and only until
 // the first non-state event or membership event which is not regarding the sender of the `m.room.create` event
-class CreationGrouper {
-    static canStartGroup = function(panel, ev) {
-        return ev.getType() === "m.room.create";
+class CreationGrouper extends BaseGrouper {
+    static canStartGroup = function(panel: MessagePanel, ev: MatrixEvent): boolean {
+        return ev.getType() === EventType.RoomCreate;
     };
 
-    constructor(panel, createEvent, prevEvent, lastShownEvent) {
-        this.panel = panel;
-        this.createEvent = createEvent;
-        this.prevEvent = prevEvent;
-        this.lastShownEvent = lastShownEvent;
-        this.events = [];
-        // events that we include in the group but then eject out and place
-        // above the group.
-        this.ejectedEvents = [];
-        this.readMarker = panel._readMarkerForEvent(
-            createEvent.getId(),
-            createEvent === lastShownEvent,
-        );
-    }
-
-    shouldGroup(ev) {
+    public shouldGroup(ev: MatrixEvent): boolean {
         const panel = this.panel;
-        const createEvent = this.createEvent;
-        if (!panel._shouldShowEvent(ev)) {
+        const createEvent = this.event;
+        if (!panel.shouldShowEvent(ev)) {
             return true;
         }
-        if (panel._wantsDateSeparator(this.createEvent, ev.getDate())) {
+        if (panel.wantsDateSeparator(this.event, ev.getDate())) {
             return false;
         }
-        if (ev.getType() === "m.room.member"
+        if (ev.getType() === EventType.RoomMember
             && (ev.getStateKey() !== createEvent.getSender() || ev.getContent()["membership"] !== "join")) {
             return false;
         }
@@ -959,37 +1067,35 @@ class CreationGrouper {
         return false;
     }
 
-    add(ev) {
+    public add(ev: MatrixEvent): void {
         const panel = this.panel;
-        this.readMarker = this.readMarker || panel._readMarkerForEvent(
+        this.readMarker = this.readMarker || panel.readMarkerForEvent(
             ev.getId(),
             ev === this.lastShownEvent,
         );
-        if (!panel._shouldShowEvent(ev)) {
+        if (!panel.shouldShowEvent(ev)) {
             return;
         }
-        if (ev.getType() === "m.room.encryption") {
+        if (ev.getType() === EventType.RoomEncryption) {
             this.ejectedEvents.push(ev);
         } else {
             this.events.push(ev);
         }
     }
 
-    getTiles() {
+    public getTiles(): ReactNode[] {
         // If we don't have any events to group, don't even try to group them. The logic
         // below assumes that we have a group of events to deal with, but we might not if
         // the events we were supposed to group were redacted.
         if (!this.events || !this.events.length) return [];
 
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
-        const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
         const panel = this.panel;
         const ret = [];
         const isGrouped = true;
-        const createEvent = this.createEvent;
+        const createEvent = this.event;
         const lastShownEvent = this.lastShownEvent;
 
-        if (panel._wantsDateSeparator(this.prevEvent, createEvent.getDate())) {
+        if (panel.wantsDateSeparator(this.prevEvent, createEvent.getDate())) {
             const ts = createEvent.getTs();
             ret.push(
                 <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>,
@@ -997,13 +1103,13 @@ class CreationGrouper {
         }
 
         // If this m.room.create event should be shown (room upgrade) then show it before the summary
-        if (panel._shouldShowEvent(createEvent)) {
+        if (panel.shouldShowEvent(createEvent)) {
             // pass in the createEvent as prevEvent as well so no extra DateSeparator is rendered
-            ret.push(...panel._getTilesForEvent(createEvent, createEvent));
+            ret.push(...panel.getTilesForEvent(createEvent, createEvent));
         }
 
         for (const ejected of this.ejectedEvents) {
-            ret.push(...panel._getTilesForEvent(
+            ret.push(...panel.getTilesForEvent(
                 createEvent, ejected, createEvent === lastShownEvent, isGrouped,
             ));
         }
@@ -1013,7 +1119,7 @@ class CreationGrouper {
             // of EventListSummary, render each member event as if the previous
             // one was itself. This way, the timestamp of the previous event === the
             // timestamp of the current event, and no DateSeparator is inserted.
-            return panel._getTilesForEvent(e, e, e === lastShownEvent, isGrouped);
+            return panel.getTilesForEvent(e, e, e === lastShownEvent, isGrouped);
         }).reduce((a, b) => a.concat(b), []);
         // Get sender profile from the latest event in the summary as the m.room.create doesn't contain one
         const ev = this.events[this.events.length - 1];
@@ -1033,9 +1139,10 @@ class CreationGrouper {
             <EventListSummary
                 key="roomcreationsummary"
                 events={this.events}
-                onToggle={panel._onHeightChanged} // Update scroll state
+                onToggle={panel.onHeightChanged} // Update scroll state
                 summaryMembers={[ev.sender]}
                 summaryText={summaryText}
+                layout={this.layout}
             >
                 { eventTiles }
             </EventListSummary>,
@@ -1048,62 +1155,60 @@ class CreationGrouper {
         return ret;
     }
 
-    getNewPrevEvent() {
-        return this.createEvent;
+    public getNewPrevEvent(): MatrixEvent {
+        return this.event;
     }
 }
 
-class RedactionGrouper {
-    static canStartGroup = function(panel, ev) {
-        return panel._shouldShowEvent(ev) && ev.isRedacted();
-    }
+class RedactionGrouper extends BaseGrouper {
+    static canStartGroup = function(panel: MessagePanel, ev: MatrixEvent): boolean {
+        return panel.shouldShowEvent(ev) && ev.isRedacted();
+    };
 
-    constructor(panel, ev, prevEvent, lastShownEvent, nextEvent, nextEventTile) {
-        this.panel = panel;
-        this.readMarker = panel._readMarkerForEvent(
-            ev.getId(),
-            ev === lastShownEvent,
-        );
+    constructor(
+        panel: MessagePanel,
+        ev: MatrixEvent,
+        prevEvent: MatrixEvent,
+        lastShownEvent: MatrixEvent,
+        layout: Layout,
+        nextEvent: MatrixEvent,
+        nextEventTile: MatrixEvent,
+    ) {
+        super(panel, ev, prevEvent, lastShownEvent, layout, nextEvent, nextEventTile);
         this.events = [ev];
-        this.prevEvent = prevEvent;
-        this.lastShownEvent = lastShownEvent;
-        this.nextEvent = nextEvent;
-        this.nextEventTile = nextEventTile;
     }
 
-    shouldGroup(ev) {
+    public shouldGroup(ev: MatrixEvent): boolean {
         // absorb hidden events so that they do not break up streams of messages & redaction events being grouped
-        if (!this.panel._shouldShowEvent(ev)) {
+        if (!this.panel.shouldShowEvent(ev)) {
             return true;
         }
-        if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) {
+        if (this.panel.wantsDateSeparator(this.events[0], ev.getDate())) {
             return false;
         }
         return ev.isRedacted();
     }
 
-    add(ev) {
-        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
+    public add(ev: MatrixEvent): void {
+        this.readMarker = this.readMarker || this.panel.readMarkerForEvent(
             ev.getId(),
             ev === this.lastShownEvent,
         );
-        if (!this.panel._shouldShowEvent(ev)) {
+        if (!this.panel.shouldShowEvent(ev)) {
             return;
         }
         this.events.push(ev);
     }
 
-    getTiles() {
+    public getTiles(): ReactNode[] {
         if (!this.events || !this.events.length) return [];
 
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
-        const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
         const isGrouped = true;
         const panel = this.panel;
         const ret = [];
         const lastShownEvent = this.lastShownEvent;
 
-        if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
+        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>,
@@ -1114,11 +1219,11 @@ class RedactionGrouper {
             this.prevEvent ? this.events[0].getId() : "initial"
         );
 
-        const senders = new Set();
+        const senders = new Set<RoomMember>();
         let eventTiles = this.events.map((e, i) => {
             senders.add(e.sender);
             const prevEvent = i === 0 ? this.prevEvent : this.events[i - 1];
-            return panel._getTilesForEvent(
+            return panel.getTilesForEvent(
                 prevEvent, e, e === lastShownEvent, isGrouped, this.nextEvent, this.nextEventTile);
         }).reduce((a, b) => a.concat(b), []);
 
@@ -1131,9 +1236,10 @@ class RedactionGrouper {
                 key={key}
                 threshold={2}
                 events={this.events}
-                onToggle={panel._onHeightChanged} // Update scroll state
+                onToggle={panel.onHeightChanged} // Update scroll state
                 summaryMembers={Array.from(senders)}
                 summaryText={_t("%(count)s messages deleted.", { count: eventTiles.length })}
+                layout={this.layout}
             >
                 { eventTiles }
             </EventListSummary>,
@@ -1146,64 +1252,59 @@ class RedactionGrouper {
         return ret;
     }
 
-    getNewPrevEvent() {
+    public getNewPrevEvent(): MatrixEvent {
         return this.events[this.events.length - 1];
     }
 }
 
 // Wrap consecutive member events in a ListSummary, ignore if redacted
-class MemberGrouper {
-    static canStartGroup = function(panel, ev) {
-        return panel._shouldShowEvent(ev) && isMembershipChange(ev);
+class MemberGrouper extends BaseGrouper {
+    static canStartGroup = function(panel: MessagePanel, ev: MatrixEvent): boolean {
+        return panel.shouldShowEvent(ev) && groupedEvents.includes(ev.getType() as EventType);
+    };
+
+    constructor(
+        public readonly panel: MessagePanel,
+        public readonly event: MatrixEvent,
+        public readonly prevEvent: MatrixEvent,
+        public readonly lastShownEvent: MatrixEvent,
+        protected readonly layout: Layout,
+    ) {
+        super(panel, event, prevEvent, lastShownEvent, layout);
+        this.events = [event];
     }
 
-    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())) {
+    public shouldGroup(ev: MatrixEvent): boolean {
+        if (this.panel.wantsDateSeparator(this.events[0], ev.getDate())) {
             return false;
         }
-        return isMembershipChange(ev);
+        return groupedEvents.includes(ev.getType() as EventType);
     }
 
-    add(ev) {
-        if (ev.getType() === 'm.room.member') {
-            // We'll just double check that it's worth our time to do so, through an
-            // ugly hack. If textForEvent returns something, we should group it for
-            // rendering but if it doesn't then we'll exclude it.
-            const renderText = textForEvent(ev);
-            if (!renderText || renderText.trim().length === 0) return; // quietly ignore
+    public add(ev: MatrixEvent, showHiddenEvents?: boolean): void {
+        if (ev.getType() === EventType.RoomMember) {
+            // We can ignore any events that don't actually have a message to display
+            if (!hasText(ev, showHiddenEvents)) return;
         }
-        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
+        this.readMarker = this.readMarker || this.panel.readMarkerForEvent(
             ev.getId(),
             ev === this.lastShownEvent,
         );
         this.events.push(ev);
     }
 
-    getTiles() {
+    public getTiles(): ReactNode[] {
         // If we don't have any events to group, don't even try to group them. The logic
         // below assumes that we have a group of events to deal with, but we might not if
         // the events we were supposed to group were redacted.
         if (!this.events || !this.events.length) return [];
 
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
-        const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
         const isGrouped = true;
         const panel = this.panel;
         const lastShownEvent = this.lastShownEvent;
         const ret = [];
 
-        if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
+        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>,
@@ -1231,7 +1332,7 @@ class MemberGrouper {
             // of MemberEventListSummary, render each member event as if the previous
             // one was itself. This way, the timestamp of the previous event === the
             // timestamp of the current event, and no DateSeparator is inserted.
-            return panel._getTilesForEvent(e, e, e === lastShownEvent, isGrouped);
+            return panel.getTilesForEvent(e, e, e === lastShownEvent, isGrouped);
         }).reduce((a, b) => a.concat(b), []);
 
         if (eventTiles.length === 0) {
@@ -1239,10 +1340,12 @@ class MemberGrouper {
         }
 
         ret.push(
-            <MemberEventListSummary key={key}
+            <MemberEventListSummary
+                key={key}
                 events={this.events}
-                onToggle={panel._onHeightChanged} // Update scroll state
+                onToggle={panel.onHeightChanged} // Update scroll state
                 startExpanded={highlightInMels}
+                layout={this.layout}
             >
                 { eventTiles }
             </MemberEventListSummary>,
@@ -1255,7 +1358,7 @@ class MemberGrouper {
         return ret;
     }
 
-    getNewPrevEvent() {
+    public getNewPrevEvent(): MatrixEvent {
         return this.events[0];
     }
 }
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 1fab6c4348..2239325f1b 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -24,8 +24,7 @@ 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";
-import BetaCard from "../views/beta/BetaCard";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 
 @replaceableComponent("structures.MyGroups")
 export default class MyGroups extends React.Component {
@@ -41,19 +40,19 @@ export default class MyGroups extends React.Component {
     }
 
     _onCreateGroupClick = () => {
-        dis.dispatch({action: 'view_create_group'});
+        dis.dispatch({ action: 'view_create_group' });
     };
 
     _fetch() {
         this.context.getJoinedGroups().then((result) => {
-            this.setState({groups: result.groups, error: null});
+            this.setState({ groups: result.groups, error: null });
         }, (err) => {
             if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
                 // Indicate that the guest isn't in any groups (which should be true)
-                this.setState({groups: [], error: null});
+                this.setState({ groups: [], error: null });
                 return;
             }
-            this.setState({groups: null, error: err});
+            this.setState({ groups: null, error: err });
         });
     }
 
@@ -82,8 +81,7 @@ export default class MyGroups extends React.Component {
                         </p>
                         <p>
                             { _t(
-                                "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 " +
+                                "You can click on an avatar in the " +
                                 "filter panel at any time to see only the rooms and people associated " +
                                 "with that community.",
                             ) }
@@ -110,8 +108,7 @@ export default class MyGroups extends React.Component {
             <SimpleRoomHeader title={_t("Communities")} icon={require("../../../res/img/icons-groups.svg")} />
             <div className='mx_MyGroups_header'>
                 <div className="mx_MyGroups_headerCard">
-                    <AccessibleButton className='mx_MyGroups_headerCard_button' onClick={this._onCreateGroupClick}>
-                    </AccessibleButton>
+                    <AccessibleButton className='mx_MyGroups_headerCard_button' onClick={this._onCreateGroupClick} />
                     <div className="mx_MyGroups_headerCard_content">
                         <div className="mx_MyGroups_headerCard_header">
                             { _t('Create a new community') }
@@ -122,9 +119,9 @@ export default class MyGroups extends React.Component {
                         ) }
                     </div>
                 </div>
-                {/*<div className="mx_MyGroups_joinBox mx_MyGroups_headerCard">
+                { /*<div className="mx_MyGroups_joinBox mx_MyGroups_headerCard">
                     <AccessibleButton className='mx_MyGroups_headerCard_button' onClick={this._onJoinGroupClick}>
-                        <TintableSvg src={require("../../../res/img/icons-create-room.svg")} width="50" height="50" />
+                        <img src={require("../../../res/img/icons-create-room.svg")} width="50" height="50" />
                     </AccessibleButton>
                     <div className="mx_MyGroups_headerCard_content">
                         <div className="mx_MyGroups_headerCard_header">
@@ -138,9 +135,8 @@ export default class MyGroups extends React.Component {
                             { 'i': (sub) => <i>{ sub }</i> })
                         }
                     </div>
-                </div>*/}
+                </div>*/ }
             </div>
-            <BetaCard featureId="feature_spaces" title={_t("Communities are changing to Spaces")} />
             <div className="mx_MyGroups_content">
                 { contentHeader }
                 { content }
diff --git a/src/components/structures/NonUrgentToastContainer.tsx b/src/components/structures/NonUrgentToastContainer.tsx
index 7c193ec9d7..6e914c40fb 100644
--- a/src/components/structures/NonUrgentToastContainer.tsx
+++ b/src/components/structures/NonUrgentToastContainer.tsx
@@ -18,13 +18,13 @@ 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IProps {
 }
 
 interface IState {
-    toasts: ComponentClass[],
+    toasts: ComponentClass[];
 }
 
 @replaceableComponent("structures.NonUrgentToastContainer")
@@ -44,21 +44,21 @@ export default class NonUrgentToastContainer extends React.PureComponent<IProps,
     }
 
     private onUpdateToasts = () => {
-        this.setState({toasts: NonUrgentToastStore.instance.components});
+        this.setState({ toasts: NonUrgentToastStore.instance.components });
     };
 
     public render() {
         const toasts = this.state.toasts.map((t, i) => {
             return (
                 <div className="mx_NonUrgentToastContainer_toast" key={`toast-${i}`}>
-                    {React.createElement(t, {})}
+                    { React.createElement(t, {}) }
                 </div>
             );
         });
 
         return (
             <div className="mx_NonUrgentToastContainer" role="alert">
-                {toasts}
+                { toasts }
             </div>
         );
     }
diff --git a/src/components/structures/NotificationPanel.tsx b/src/components/structures/NotificationPanel.tsx
index b4f13f6b37..f71c017c06 100644
--- a/src/components/structures/NotificationPanel.tsx
+++ b/src/components/structures/NotificationPanel.tsx
@@ -22,6 +22,8 @@ import BaseCard from "../views/right_panel/BaseCard";
 import { replaceableComponent } from "../../utils/replaceableComponent";
 import TimelinePanel from "./TimelinePanel";
 import Spinner from "../views/elements/Spinner";
+import { TileShape } from "../views/rooms/EventTile";
+import { Layout } from "../../settings/Layout";
 
 interface IProps {
     onClose(): void;
@@ -34,8 +36,8 @@ interface IProps {
 export default class NotificationPanel extends React.PureComponent<IProps> {
     render() {
         const emptyState = (<div className="mx_RightPanel_empty mx_NotificationPanel_empty">
-            <h2>{_t('You’re all caught up')}</h2>
-            <p>{_t('You have no visible notifications.')}</p>
+            <h2>{ _t('You’re all caught up') }</h2>
+            <p>{ _t('You have no visible notifications.') }</p>
         </div>);
 
         let content;
@@ -48,8 +50,10 @@ export default class NotificationPanel extends React.PureComponent<IProps> {
                     manageReadMarkers={false}
                     timelineSet={timelineSet}
                     showUrlPreview={false}
-                    tileShape="notif"
+                    tileShape={TileShape.Notif}
                     empty={emptyState}
+                    alwaysShowTimestamps={true}
+                    layout={Layout.Group}
                 />
             );
         } else {
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 294865fe08..5d9d2a0b6a 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -17,13 +17,12 @@ limitations under the License.
 
 import React from 'react';
 import { Room } from "matrix-js-sdk/src/models/room";
-import { User } from "matrix-js-sdk/src/models/user";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 import dis from '../../dispatcher/dispatcher';
-import RateLimitedFunc from '../../ratelimitedfunc';
 import GroupStore from '../../stores/GroupStore';
 import {
     RIGHT_PANEL_PHASES_NO_ARGS,
@@ -45,15 +44,24 @@ import GroupRoomInfo from "../views/groups/GroupRoomInfo";
 import UserInfo from "../views/right_panel/UserInfo";
 import ThirdPartyMemberInfo from "../views/rooms/ThirdPartyMemberInfo";
 import FilePanel from "./FilePanel";
+import ThreadView from "./ThreadView";
+import ThreadPanel from "./ThreadPanel";
 import NotificationPanel from "./NotificationPanel";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import PinnedMessagesCard from "../views/right_panel/PinnedMessagesCard";
+import { throttle } from 'lodash';
+import SpaceStore from "../../stores/SpaceStore";
+import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
+import { E2EStatus } from '../../utils/ShieldUtils';
+import { SetRightPanelPhasePayload } from '../../dispatcher/payloads/SetRightPanelPhasePayload';
 
 interface IProps {
     room?: Room; // if showing panels for a given room, this is set
     groupId?: string; // if showing panels for a given group, this is set
-    user?: User; // used if we know the user ahead of opening the panel
+    member?: RoomMember; // used if we know the room member ahead of opening the panel
     resizeNotifier: ResizeNotifier;
+    permalinkCreator?: RoomPermalinkCreator;
+    e2eStatus?: E2EStatus;
 }
 
 interface IState {
@@ -73,7 +81,6 @@ interface IState {
 export default class RightPanel extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
 
-    private readonly delayedUpdate: RateLimitedFunc;
     private dispatcherRef: string;
 
     constructor(props, context) {
@@ -84,18 +91,18 @@ export default class RightPanel extends React.Component<IProps, IState> {
             isUserPrivilegedInGroup: null,
             member: this.getUserForPanel(),
         };
-
-        this.delayedUpdate = new RateLimitedFunc(() => {
-            this.forceUpdate();
-        }, 500);
     }
 
+    private readonly delayedUpdate = throttle((): void => {
+        this.forceUpdate();
+    }, 500, { leading: true, trailing: true });
+
     // Helper function to split out the logic for getPhaseFromProps() and the constructor
     // as both are called at the same time in the constructor.
-    private getUserForPanel() {
+    private getUserForPanel(): RoomMember {
         if (this.state && this.state.member) return this.state.member;
         const lastParams = RightPanelStore.getSharedInstance().roomPanelPhaseParams;
-        return this.props.user || lastParams['member'];
+        return this.props.member || lastParams['member'];
     }
 
     // gets the current phase from the props and also maybe the store
@@ -104,11 +111,11 @@ export default class RightPanel extends React.Component<IProps, IState> {
         const userForPanel = this.getUserForPanel();
         if (this.props.groupId) {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.groupPanelPhase)) {
-                dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.GroupMemberList});
+                dis.dispatch({ action: Action.SetRightPanelPhase, phase: RightPanelPhases.GroupMemberList });
                 return RightPanelPhases.GroupMemberList;
             }
             return rps.groupPanelPhase;
-        } else if (SettingsStore.getValue("feature_spaces") && this.props.room?.isSpaceRoom()
+        } else if (SpaceStore.spacesEnabled && this.props.room?.isSpaceRoom()
             && !RIGHT_PANEL_SPACE_PHASES.includes(rps.roomPanelPhase)
         ) {
             return RightPanelPhases.SpaceMemberList;
@@ -136,14 +143,14 @@ export default class RightPanel extends React.Component<IProps, IState> {
         return rps.roomPanelPhase;
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         this.dispatcherRef = dis.register(this.onAction);
         const cli = this.context;
         cli.on("RoomState.members", this.onRoomStateMember);
         this.initGroupStore(this.props.groupId);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         dis.unregister(this.dispatcherRef);
         if (this.context) {
             this.context.removeListener("RoomState.members", this.onRoomStateMember);
@@ -152,7 +159,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
+    public UNSAFE_componentWillReceiveProps(newProps: IProps): void { // eslint-disable-line
         if (newProps.groupId !== this.props.groupId) {
             this.unregisterGroupStore();
             this.initGroupStore(newProps.groupId);
@@ -174,7 +181,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
         });
     };
 
-    private onRoomStateMember = (ev: MatrixEvent, _, member: RoomMember) => {
+    private onRoomStateMember = (ev: MatrixEvent, state: RoomState, member: RoomMember) => {
         if (!this.props.room || member.roomId !== this.props.room.roomId) {
             return;
         }
@@ -189,6 +196,15 @@ export default class RightPanel extends React.Component<IProps, IState> {
     };
 
     private onAction = (payload: ActionPayload) => {
+        const isChangingRoom = payload.action === 'view_room' && payload.room_id !== this.props.room.roomId;
+        const isViewingThread = this.state.phase === RightPanelPhases.ThreadView;
+        if (isChangingRoom && isViewingThread) {
+            dis.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.ThreadPanel,
+            });
+        }
+
         if (payload.action === Action.AfterRightPanelPhaseChange) {
             this.setState({
                 phase: payload.phase,
@@ -208,7 +224,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
         // XXX: There are three different ways of 'closing' this panel depending on what state
         // things are in... this knows far more than it should do about the state of the rest
         // of the app and is generally a bit silly.
-        if (this.props.user) {
+        if (this.props.member) {
             // If we have a user prop then we're displaying a user from the 'user' page type
             // in LoggedInView, so need to change the page type to close the panel (we switch
             // to the home page which is not obviously the correct thing to do, but I'm not sure
@@ -264,7 +280,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
             case RightPanelPhases.EncryptionPanel:
                 panel = <UserInfo
                     user={this.state.member}
-                    room={this.state.phase === RightPanelPhases.SpaceMemberInfo ? this.state.space : this.props.room}
+                    room={this.context.getRoom(this.state.member.roomId) ?? this.props.room}
                     key={roomId || this.state.member.userId}
                     onClose={this.onClose}
                     phase={this.state.phase}
@@ -308,6 +324,23 @@ export default class RightPanel extends React.Component<IProps, IState> {
                 panel = <FilePanel roomId={roomId} resizeNotifier={this.props.resizeNotifier} onClose={this.onClose} />;
                 break;
 
+            case RightPanelPhases.ThreadView:
+                panel = <ThreadView
+                    room={this.props.room}
+                    resizeNotifier={this.props.resizeNotifier}
+                    onClose={this.onClose}
+                    mxEvent={this.state.event}
+                    permalinkCreator={this.props.permalinkCreator}
+                    e2eStatus={this.props.e2eStatus} />;
+                break;
+
+            case RightPanelPhases.ThreadPanel:
+                panel = <ThreadPanel
+                    roomId={roomId}
+                    resizeNotifier={this.props.resizeNotifier}
+                    onClose={this.onClose} />;
+                break;
+
             case RightPanelPhases.RoomSummary:
                 panel = <RoomSummaryCard room={this.props.room} onClose={this.onClose} />;
                 break;
diff --git a/src/components/structures/RoomDirectory.tsx b/src/components/structures/RoomDirectory.tsx
index 1e0605f263..3c5f99cc7d 100644
--- a/src/components/structures/RoomDirectory.tsx
+++ b/src/components/structures/RoomDirectory.tsx
@@ -16,6 +16,9 @@ limitations under the License.
 */
 
 import React from "react";
+import { IFieldType, IInstance, IProtocol, IPublicRoomsChunkRoom } from "matrix-js-sdk/src/client";
+import { Visibility } from "matrix-js-sdk/src/@types/partials";
+import { IRoomDirectoryOptions } from "matrix-js-sdk/src/@types/requests";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import dis from "../../dispatcher/dispatcher";
@@ -25,7 +28,7 @@ import { _t } from '../../languageHandler';
 import SdkConfig from '../../SdkConfig';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
-import {ALL_ROOMS, IFieldType, IInstance, IProtocol, Protocols} from "../views/directory/NetworkDropdown";
+import NetworkDropdown, { ALL_ROOMS, Protocols } from "../views/directory/NetworkDropdown";
 import SettingsStore from "../../settings/SettingsStore";
 import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
 import GroupStore from "../../stores/GroupStore";
@@ -34,21 +37,23 @@ import CountlyAnalytics from "../../CountlyAnalytics";
 import { replaceableComponent } from "../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../customisations/Media";
 import { IDialogProps } from "../views/dialogs/IDialogProps";
-import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
+import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
 import BaseAvatar from "../views/avatars/BaseAvatar";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import QuestionDialog from "../views/dialogs/QuestionDialog";
 import BaseDialog from "../views/dialogs/BaseDialog";
 import DirectorySearchBox from "../views/elements/DirectorySearchBox";
-import NetworkDropdown from "../views/directory/NetworkDropdown";
 import ScrollPanel from "./ScrollPanel";
 import Spinner from "../views/elements/Spinner";
 import { ActionPayload } from "../../dispatcher/payloads";
-
+import { getDisplayAliasForAliasSet } from "../../Rooms";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 800;
 
+const LAST_SERVER_KEY = "mx_last_room_directory_server";
+const LAST_INSTANCE_KEY = "mx_last_room_directory_instance";
+
 function track(action: string) {
     Analytics.trackEvent('RoomDirectory', action);
 }
@@ -58,46 +63,23 @@ interface IProps extends IDialogProps {
 }
 
 interface IState {
-    publicRooms: IRoom[];
+    publicRooms: IPublicRoomsChunkRoom[];
     loading: boolean;
     protocolsLoading: boolean;
     error?: string;
-    instanceId: string | symbol;
+    instanceId: string;
     roomServer: string;
     filterString: string;
     selectedCommunityId?: string;
     communityName?: string;
 }
 
-/* eslint-disable camelcase */
-interface IRoom {
-    room_id: string;
-    name?: string;
-    avatar_url?: string;
-    topic?: string;
-    canonical_alias?: string;
-    aliases?: string[];
-    world_readable: boolean;
-    guest_can_join: boolean;
-    num_joined_members: number;
-}
-
-interface IPublicRoomsRequest {
-    limit?: number;
-    since?: string;
-    server?: string;
-    filter?: object;
-    include_all_networks?: boolean;
-    third_party_instance_id?: string;
-}
-/* eslint-enable camelcase */
-
 @replaceableComponent("structures.RoomDirectory")
 export default class RoomDirectory extends React.Component<IProps, IState> {
     private readonly startTime: number;
-    private unmounted = false
+    private unmounted = false;
     private nextBatch: string = null;
-    private filterTimeout: NodeJS.Timeout;
+    private filterTimeout: number;
     private protocols: Protocols;
 
     constructor(props) {
@@ -117,6 +99,36 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         } else if (!selectedCommunityId) {
             MatrixClientPeg.get().getThirdpartyProtocols().then((response) => {
                 this.protocols = response;
+                const myHomeserver = MatrixClientPeg.getHomeserverName();
+                const lsRoomServer = localStorage.getItem(LAST_SERVER_KEY);
+                const lsInstanceId = localStorage.getItem(LAST_INSTANCE_KEY);
+
+                let roomServer = myHomeserver;
+                if (
+                    SdkConfig.get().roomDirectory?.servers?.includes(lsRoomServer) ||
+                    SettingsStore.getValue("room_directory_servers")?.includes(lsRoomServer)
+                ) {
+                    roomServer = lsRoomServer;
+                }
+
+                let instanceId: string = null;
+                if (roomServer === myHomeserver && (
+                    lsInstanceId === ALL_ROOMS ||
+                    Object.values(this.protocols).some(p => p.instances.some(i => i.instance_id === lsInstanceId))
+                )) {
+                    instanceId = lsInstanceId;
+                }
+
+                // Refresh the room list only if validation failed and we had to change these
+                if (this.state.instanceId !== instanceId || this.state.roomServer !== roomServer) {
+                    this.setState({
+                        protocolsLoading: false,
+                        instanceId,
+                        roomServer,
+                    });
+                    this.refreshRoomList();
+                    return;
+                }
                 this.setState({ protocolsLoading: false });
             }, (err) => {
                 console.warn(`error loading third party protocols: ${err}`);
@@ -151,8 +163,8 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             publicRooms: [],
             loading: true,
             error: null,
-            instanceId: undefined,
-            roomServer: MatrixClientPeg.getHomeserverName(),
+            instanceId: localStorage.getItem(LAST_INSTANCE_KEY),
+            roomServer: localStorage.getItem(LAST_SERVER_KEY),
             filterString: this.props.initialText || "",
             selectedCommunityId,
             communityName: null,
@@ -207,9 +219,9 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         this.getMoreRooms();
     };
 
-    private getMoreRooms() {
-        if (this.state.selectedCommunityId) return Promise.resolve(); // no more rooms
-        if (!MatrixClientPeg.get()) return Promise.resolve();
+    private getMoreRooms(): Promise<boolean> {
+        if (this.state.selectedCommunityId) return Promise.resolve(false); // no more rooms
+        if (!MatrixClientPeg.get()) return Promise.resolve(false);
 
         this.setState({
             loading: true,
@@ -220,7 +232,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         // remember the next batch token when we sent the request
         // too. If it's changed, appending to the list will corrupt it.
         const nextBatch = this.nextBatch;
-        const opts: IPublicRoomsRequest = { limit: 20 };
+        const opts: IRoomDirectoryOptions = { limit: 20 };
         if (roomServer != MatrixClientPeg.getHomeserverName()) {
             opts.server = roomServer;
         }
@@ -239,12 +251,12 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                 // if the filter or server has changed since this request was sent,
                 // throw away the result (don't even clear the busy flag
                 // since we must still have a request in flight)
-                return;
+                return false;
             }
 
             if (this.unmounted) {
                 // if we've been unmounted, we don't care either.
-                return;
+                return false;
             }
 
             if (this.state.filterString) {
@@ -264,14 +276,13 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                 filterString != this.state.filterString ||
                 roomServer != this.state.roomServer ||
                 nextBatch != this.nextBatch) {
-                // as above: we don't care about errors for old
-                // requests either
-                return;
+                // as above: we don't care about errors for old requests either
+                return false;
             }
 
             if (this.unmounted) {
                 // if we've been unmounted, we don't care either.
-                return;
+                return false;
             }
 
             console.error("Failed to get publicRooms: %s", JSON.stringify(err));
@@ -294,15 +305,15 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
      * HS admins to do this through the RoomSettings interface, but
      * this needs SPEC-417.
      */
-    private removeFromDirectory(room: IRoom) {
+    private removeFromDirectory(room: IPublicRoomsChunkRoom) {
         const alias = getDisplayAliasForRoom(room);
         const name = room.name || alias || _t('Unnamed room');
 
         let desc;
         if (alias) {
-            desc = _t('Delete the room address %(alias)s and remove %(name)s from the directory?', {alias, name});
+            desc = _t('Delete the room address %(alias)s and remove %(name)s from the directory?', { alias, name });
         } else {
-            desc = _t('Remove %(name)s from the directory?', {name: name});
+            desc = _t('Remove %(name)s from the directory?', { name: name });
         }
 
         Modal.createTrackedDialog('Remove from Directory', '', QuestionDialog, {
@@ -312,9 +323,9 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                 if (!shouldDelete) return;
 
                 const modal = Modal.createDialog(Spinner);
-                let step = _t('remove %(name)s from the directory.', {name: name});
+                let step = _t('remove %(name)s from the directory.', { name: name });
 
-                MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
+                MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, Visibility.Private).then(() => {
                     if (!alias) return;
                     step = _t('delete the address.');
                     return MatrixClientPeg.get().deleteAlias(alias);
@@ -336,16 +347,15 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         });
     }
 
-    private onRoomClicked = (room: IRoom, ev: ButtonEvent) => {
+    private onRoomClicked = (room: IPublicRoomsChunkRoom, ev: React.MouseEvent) => {
+        // If room was shift-clicked, remove it from the room directory
         if (ev.shiftKey && !this.state.selectedCommunityId) {
             ev.preventDefault();
             this.removeFromDirectory(room);
-        } else {
-            this.showRoom(room);
         }
     };
 
-    private onOptionChange = (server: string, instanceId?: string | symbol) => {
+    private onOptionChange = (server: string, instanceId?: string) => {
         // clear next batch so we don't try to load more rooms
         this.nextBatch = null;
         this.setState({
@@ -363,6 +373,14 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         // find the five gitter ones, at which point we do not want
         // to render all those rooms when switching back to 'all networks'.
         // Easiest to just blow away the state & re-fetch.
+
+        // We have to be careful here so that we don't set instanceId = "undefined"
+        localStorage.setItem(LAST_SERVER_KEY, server);
+        if (instanceId) {
+            localStorage.setItem(LAST_INSTANCE_KEY, instanceId);
+        } else {
+            localStorage.removeItem(LAST_INSTANCE_KEY);
+        }
     };
 
     private onFillRequest = (backwards: boolean) => {
@@ -373,7 +391,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
 
     private onFilterChange = (alias: string) => {
         this.setState({
-            filterString: alias || null,
+            filterString: alias || "",
         });
 
         // don't send the request for a little bit,
@@ -392,7 +410,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
     private onFilterClear = () => {
         // update immediately
         this.setState({
-            filterString: null,
+            filterString: "",
         }, this.refreshRoomList);
 
         if (this.filterTimeout) {
@@ -442,17 +460,17 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         }
     };
 
-    private onPreviewClick = (ev: ButtonEvent, room: IRoom) => {
+    private onPreviewClick = (ev: ButtonEvent, room: IPublicRoomsChunkRoom) => {
         this.showRoom(room, null, false, true);
         ev.stopPropagation();
     };
 
-    private onViewClick = (ev: ButtonEvent, room: IRoom) => {
+    private onViewClick = (ev: ButtonEvent, room: IPublicRoomsChunkRoom) => {
         this.showRoom(room);
         ev.stopPropagation();
     };
 
-    private onJoinClick = (ev: ButtonEvent, room: IRoom) => {
+    private onJoinClick = (ev: ButtonEvent, room: IPublicRoomsChunkRoom) => {
         this.showRoom(room, null, true);
         ev.stopPropagation();
     };
@@ -470,7 +488,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         this.showRoom(null, alias, autoJoin);
     }
 
-    private showRoom(room: IRoom, roomAlias?: string, autoJoin = false, shouldPeek = false) {
+    private showRoom(room: IPublicRoomsChunkRoom, roomAlias?: string, autoJoin = false, shouldPeek = false) {
         this.onFinished();
         const payload: ActionPayload = {
             action: 'view_room',
@@ -484,7 +502,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             // to the directory.
             if (MatrixClientPeg.get().isGuest()) {
                 if (!room.world_readable && !room.guest_can_join) {
-                    dis.dispatch({action: 'require_registration'});
+                    dis.dispatch({ action: 'require_registration' });
                     return;
                 }
             }
@@ -519,7 +537,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         dis.dispatch(payload);
     }
 
-    private createRoomCells(room: IRoom) {
+    private createRoomCells(room: IPublicRoomsChunkRoom) {
         const client = MatrixClientPeg.get();
         const clientRoom = client.getRoom(room.room_id);
         const hasJoinedRoom = clientRoom && clientRoom.getMyMembership() === "join";
@@ -568,11 +586,11 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         let avatarUrl = null;
         if (room.avatar_url) avatarUrl = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(32);
 
+        // We use onMouseDown instead of onClick, so that we can avoid text getting selected
         return [
-            <div key={ `${room.room_id}_avatar` }
-                onClick={(ev) => this.onRoomClicked(room, ev)}
-                // cancel onMouseDown otherwise shift-clicking highlights text
-                onMouseDown={(ev) => {ev.preventDefault();}}
+            <div
+                key={`${room.room_id}_avatar`}
+                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
                 className="mx_RoomDirectory_roomAvatar"
             >
                 <BaseAvatar
@@ -584,42 +602,50 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                     url={avatarUrl}
                 />
             </div>,
-            <div key={ `${room.room_id}_description` }
-                onClick={(ev) => this.onRoomClicked(room, ev)}
-                // cancel onMouseDown otherwise shift-clicking highlights text
-                onMouseDown={(ev) => {ev.preventDefault();}}
+            <div
+                key={`${room.room_id}_description`}
+                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
                 className="mx_RoomDirectory_roomDescription"
             >
-                <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
-                <div className="mx_RoomDirectory_topic"
-                    onClick={ (ev) => { ev.stopPropagation(); } }
+                <div
+                    className="mx_RoomDirectory_name"
+                    onMouseDown={(ev) => this.onRoomClicked(room, ev)}
+                >
+                    { name }
+                </div>&nbsp;
+                <div
+                    className="mx_RoomDirectory_topic"
+                    onMouseDown={(ev) => this.onRoomClicked(room, ev)}
                     dangerouslySetInnerHTML={{ __html: topic }}
                 />
-                <div className="mx_RoomDirectory_alias">{ getDisplayAliasForRoom(room) }</div>
+                <div
+                    className="mx_RoomDirectory_alias"
+                    onMouseDown={(ev) => this.onRoomClicked(room, ev)}
+                >
+                    { getDisplayAliasForRoom(room) }
+                </div>
             </div>,
-            <div key={ `${room.room_id}_memberCount` }
-                onClick={(ev) => this.onRoomClicked(room, ev)}
-                // cancel onMouseDown otherwise shift-clicking highlights text
-                onMouseDown={(ev) => {ev.preventDefault();}}
+            <div
+                key={`${room.room_id}_memberCount`}
+                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
                 className="mx_RoomDirectory_roomMemberCount"
             >
                 { room.num_joined_members }
             </div>,
-            <div key={ `${room.room_id}_preview` }
-                onClick={(ev) => this.onRoomClicked(room, ev)}
+            <div
+                key={`${room.room_id}_preview`}
+                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
                 // cancel onMouseDown otherwise shift-clicking highlights text
-                onMouseDown={(ev) => {ev.preventDefault();}}
                 className="mx_RoomDirectory_preview"
             >
-                {previewButton}
+                { previewButton }
             </div>,
-            <div key={ `${room.room_id}_join` }
-                onClick={(ev) => this.onRoomClicked(room, ev)}
-                // cancel onMouseDown otherwise shift-clicking highlights text
-                onMouseDown={(ev) => {ev.preventDefault();}}
+            <div
+                key={`${room.room_id}_join`}
+                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
                 className="mx_RoomDirectory_join"
             >
-                {joinOrViewButton}
+                { joinOrViewButton }
             </div>,
         ];
     }
@@ -770,16 +796,16 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                     showJoinButton={showJoinButton}
                     initialText={this.props.initialText}
                 />
-                {dropdown}
+                { dropdown }
             </div>;
         }
         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 => (
+                { a: sub => (
                     <AccessibleButton kind="secondary" onClick={this.onCreateRoomClick}>
                         { sub }
                     </AccessibleButton>
-                )},
+                ) },
             );
 
         const title = this.state.selectedCommunityId
@@ -788,16 +814,16 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             }) : _t("Explore rooms");
         return (
             <BaseDialog
-                className={'mx_RoomDirectory_dialog'}
+                className="mx_RoomDirectory_dialog"
                 hasCancel={true}
                 onFinished={this.onFinished}
                 title={title}
             >
                 <div className="mx_RoomDirectory">
-                    {explanation}
+                    { explanation }
                     <div className="mx_RoomDirectory_list">
-                        {listHeader}
-                        {content}
+                        { listHeader }
+                        { content }
                     </div>
                 </div>
             </BaseDialog>
@@ -807,6 +833,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
 
 // Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
 // but works with the objects we get from the public room list
-function getDisplayAliasForRoom(room: IRoom) {
-    return room.canonical_alias || room.aliases?.[0] || "";
+export function getDisplayAliasForRoom(room: IPublicRoomsChunkRoom) {
+    return getDisplayAliasForAliasSet(room.canonical_alias, room.aliases);
 }
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index bda46aef07..9acfb7bb8e 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -108,22 +108,22 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
     };
 
     private openSearch = () => {
-        defaultDispatcher.dispatch({action: "show_left_panel"});
-        defaultDispatcher.dispatch({action: "focus_room_filter"});
+        defaultDispatcher.dispatch({ action: "show_left_panel" });
+        defaultDispatcher.dispatch({ action: "focus_room_filter" });
     };
 
     private onChange = () => {
         if (!this.inputRef.current) return;
-        this.setState({query: this.inputRef.current.value});
+        this.setState({ query: this.inputRef.current.value });
     };
 
     private onFocus = (ev: React.FocusEvent<HTMLInputElement>) => {
-        this.setState({focused: true});
+        this.setState({ focused: true });
         ev.target.select();
     };
 
     private onBlur = (ev: React.FocusEvent<HTMLInputElement>) => {
-        this.setState({focused: false});
+        this.setState({ focused: false });
     };
 
     private onKeyDown = (ev: React.KeyboardEvent) => {
@@ -131,7 +131,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
         switch (action) {
             case RoomListAction.ClearSearch:
                 this.clearInput();
-                defaultDispatcher.fire(Action.FocusComposer);
+                defaultDispatcher.fire(Action.FocusSendMessageComposer);
                 break;
             case RoomListAction.NextRoom:
             case RoomListAction.PrevRoom:
@@ -209,9 +209,9 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
 
         return (
             <div className={classes}>
-                {icon}
-                {input}
-                {clearButton}
+                { icon }
+                { input }
+                { clearButton }
             </div>
         );
     }
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.tsx
similarity index 61%
rename from src/components/structures/RoomStatusBar.js
rename to src/components/structures/RoomStatusBar.tsx
index b2f0c70bd7..82f68bc435 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.tsx
@@ -15,95 +15,110 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t, _td } from '../../languageHandler';
-import {MatrixClientPeg} from '../../MatrixClientPeg';
 import Resend from '../../Resend';
 import dis from '../../dispatcher/dispatcher';
-import {messageForResourceLimitError} from '../../utils/ErrorUtils';
-import {Action} from "../../dispatcher/actions";
-import {replaceableComponent} from "../../utils/replaceableComponent";
-import {EventStatus} from "matrix-js-sdk/src/models/event";
+import { messageForResourceLimitError } from '../../utils/ErrorUtils';
+import { Action } from "../../dispatcher/actions";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import NotificationBadge from "../views/rooms/NotificationBadge";
-import {StaticNotificationState} from "../../stores/notifications/StaticNotificationState";
+import { StaticNotificationState } from "../../stores/notifications/StaticNotificationState";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import InlineSpinner from "../views/elements/InlineSpinner";
+import { SyncState } from "matrix-js-sdk/src/sync.api";
+import { ISyncStateData } from "matrix-js-sdk/src/sync";
+import { Room } from "matrix-js-sdk/src/models/room";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
 const STATUS_BAR_EXPANDED_LARGE = 2;
 
-export function getUnsentMessages(room) {
+export function getUnsentMessages(room: Room): MatrixEvent[] {
     if (!room) { return []; }
     return room.getPendingEvents().filter(function(ev) {
         return ev.status === EventStatus.NOT_SENT;
     });
 }
 
+interface IProps {
+    // the room this statusbar is representing.
+    room: Room;
+
+    // true if the room is being peeked at. This affects components that shouldn't
+    // logically be shown when peeking, such as a prompt to invite people to a room.
+    isPeeking?: boolean;
+    // callback for when the user clicks on the 'resend all' button in the
+    // 'unsent messages' bar
+    onResendAllClick?: () => void;
+
+    // callback for when the user clicks on the 'cancel all' button in the
+    // 'unsent messages' bar
+    onCancelAllClick?: () => void;
+
+    // callback for when the user clicks on the 'invite others' button in the
+    // 'you are alone' bar
+    onInviteClick?: () => void;
+
+    // callback for when we do something that changes the size of the
+    // status bar. This is used to trigger a re-layout in the parent
+    // component.
+    onResize?: () => void;
+
+    // callback for when the status bar can be hidden from view, as it is
+    // not displaying anything
+    onHidden?: () => void;
+
+    // callback for when the status bar is displaying something and should
+    // be visible
+    onVisible?: () => void;
+}
+
+interface IState {
+    syncState: SyncState;
+    syncStateData: ISyncStateData;
+    unsentMessages: MatrixEvent[];
+    isResending: boolean;
+}
+
 @replaceableComponent("structures.RoomStatusBar")
-export default class RoomStatusBar extends React.Component {
-    static propTypes = {
-        // the room this statusbar is representing.
-        room: PropTypes.object.isRequired,
+export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
+    public static contextType = MatrixClientContext;
 
-        // true if the room is being peeked at. This affects components that shouldn't
-        // logically be shown when peeking, such as a prompt to invite people to a room.
-        isPeeking: PropTypes.bool,
+    constructor(props: IProps, context: typeof MatrixClientContext) {
+        super(props, context);
 
-        // callback for when the user clicks on the 'resend all' button in the
-        // 'unsent messages' bar
-        onResendAllClick: PropTypes.func,
-
-        // callback for when the user clicks on the 'cancel all' button in the
-        // 'unsent messages' bar
-        onCancelAllClick: PropTypes.func,
-
-        // callback for when the user clicks on the 'invite others' button in the
-        // 'you are alone' bar
-        onInviteClick: PropTypes.func,
-
-        // callback for when we do something that changes the size of the
-        // status bar. This is used to trigger a re-layout in the parent
-        // component.
-        onResize: PropTypes.func,
-
-        // callback for when the status bar can be hidden from view, as it is
-        // not displaying anything
-        onHidden: PropTypes.func,
-
-        // callback for when the status bar is displaying something and should
-        // be visible
-        onVisible: PropTypes.func,
-    };
-
-    state = {
-        syncState: MatrixClientPeg.get().getSyncState(),
-        syncStateData: MatrixClientPeg.get().getSyncStateData(),
-        unsentMessages: getUnsentMessages(this.props.room),
-        isResending: false,
-    };
-
-    componentDidMount() {
-        MatrixClientPeg.get().on("sync", this.onSyncStateChange);
-        MatrixClientPeg.get().on("Room.localEchoUpdated", this._onRoomLocalEchoUpdated);
-
-        this._checkSize();
+        this.state = {
+            syncState: this.context.getSyncState(),
+            syncStateData: this.context.getSyncStateData(),
+            unsentMessages: getUnsentMessages(this.props.room),
+            isResending: false,
+        };
     }
 
-    componentDidUpdate() {
-        this._checkSize();
+    public componentDidMount(): void {
+        const client = this.context;
+        client.on("sync", this.onSyncStateChange);
+        client.on("Room.localEchoUpdated", this.onRoomLocalEchoUpdated);
+
+        this.checkSize();
     }
 
-    componentWillUnmount() {
+    public componentDidUpdate(): void {
+        this.checkSize();
+    }
+
+    public componentWillUnmount(): void {
         // we may have entirely lost our client as we're logging out before clicking login on the guest bar...
-        const client = MatrixClientPeg.get();
+        const client = this.context;
         if (client) {
             client.removeListener("sync", this.onSyncStateChange);
-            client.removeListener("Room.localEchoUpdated", this._onRoomLocalEchoUpdated);
+            client.removeListener("Room.localEchoUpdated", this.onRoomLocalEchoUpdated);
         }
     }
 
-    onSyncStateChange = (state, prevState, data) => {
+    private onSyncStateChange = (state: SyncState, prevState: SyncState, data: ISyncStateData): void => {
         if (state === "SYNCING" && prevState === "SYNCING") {
             return;
         }
@@ -113,20 +128,20 @@ export default class RoomStatusBar extends React.Component {
         });
     };
 
-    _onResendAllClick = () => {
+    private onResendAllClick = (): void => {
         Resend.resendUnsentEvents(this.props.room).then(() => {
-            this.setState({isResending: false});
+            this.setState({ isResending: false });
         });
-        this.setState({isResending: true});
-        dis.fire(Action.FocusComposer);
+        this.setState({ isResending: true });
+        dis.fire(Action.FocusSendMessageComposer);
     };
 
-    _onCancelAllClick = () => {
+    private onCancelAllClick = (): void => {
         Resend.cancelUnsentEvents(this.props.room);
-        dis.fire(Action.FocusComposer);
+        dis.fire(Action.FocusSendMessageComposer);
     };
 
-    _onRoomLocalEchoUpdated = (event, room, oldEventId, oldStatus) => {
+    private onRoomLocalEchoUpdated = (ev: MatrixEvent, room: Room) => {
         if (room.roomId !== this.props.room.roomId) return;
         const messages = getUnsentMessages(this.props.room);
         this.setState({
@@ -136,8 +151,8 @@ export default class RoomStatusBar extends React.Component {
     };
 
     // Check whether current size is greater than 0, if yes call props.onVisible
-    _checkSize() {
-        if (this._getSize()) {
+    private checkSize(): void {
+        if (this.getSize()) {
             if (this.props.onVisible) this.props.onVisible();
         } else {
             if (this.props.onHidden) this.props.onHidden();
@@ -147,8 +162,8 @@ export default class RoomStatusBar extends React.Component {
     // We don't need the actual height - just whether it is likely to have
     // changed - so we use '0' to indicate normal size, and other values to
     // indicate other sizes.
-    _getSize() {
-        if (this._shouldShowConnectionError()) {
+    private getSize(): number {
+        if (this.shouldShowConnectionError()) {
             return STATUS_BAR_EXPANDED;
         } else if (this.state.unsentMessages.length > 0 || this.state.isResending) {
             return STATUS_BAR_EXPANDED_LARGE;
@@ -156,7 +171,7 @@ export default class RoomStatusBar extends React.Component {
         return STATUS_BAR_HIDDEN;
     }
 
-    _shouldShowConnectionError() {
+    private shouldShowConnectionError(): boolean {
         // no conn bar trumps the "some not sent" msg since you can't resend without
         // a connection!
         // There's one situation in which we don't show this 'no connection' bar, and that's
@@ -164,12 +179,12 @@ export default class RoomStatusBar extends React.Component {
         const errorIsMauError = Boolean(
             this.state.syncStateData &&
             this.state.syncStateData.error &&
-            this.state.syncStateData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED',
+            this.state.syncStateData.error.name === 'M_RESOURCE_LIMIT_EXCEEDED',
         );
         return this.state.syncState === "ERROR" && !errorIsMauError;
     }
 
-    _getUnsentMessageContent() {
+    private getUnsentMessageContent(): JSX.Element {
         const unsentMessages = this.state.unsentMessages;
 
         let title;
@@ -221,18 +236,18 @@ export default class RoomStatusBar extends React.Component {
         }
 
         let buttonRow = <>
-            <AccessibleButton onClick={this._onCancelAllClick} className="mx_RoomStatusBar_unsentCancelAllBtn">
-                {_t("Delete all")}
+            <AccessibleButton onClick={this.onCancelAllClick} className="mx_RoomStatusBar_unsentCancelAllBtn">
+                { _t("Delete all") }
             </AccessibleButton>
-            <AccessibleButton onClick={this._onResendAllClick} className="mx_RoomStatusBar_unsentResendAllBtn">
-                {_t("Retry all")}
+            <AccessibleButton onClick={this.onResendAllClick} className="mx_RoomStatusBar_unsentResendAllBtn">
+                { _t("Retry all") }
             </AccessibleButton>
         </>;
         if (this.state.isResending) {
             buttonRow = <>
                 <InlineSpinner w={20} h={20} />
-                {/* span for css */}
-                <span>{_t("Sending")}</span>
+                { /* span for css */ }
+                <span>{ _t("Sending") }</span>
             </>;
         }
 
@@ -253,27 +268,31 @@ export default class RoomStatusBar extends React.Component {
                         </div>
                     </div>
                     <div className="mx_RoomStatusBar_unsentButtonBar">
-                        {buttonRow}
+                        { buttonRow }
                     </div>
                 </div>
             </div>
         </>;
     }
 
-    render() {
-        if (this._shouldShowConnectionError()) {
+    public render(): JSX.Element {
+        if (this.shouldShowConnectionError()) {
             return (
                 <div className="mx_RoomStatusBar">
                     <div role="alert">
                         <div className="mx_RoomStatusBar_connectionLostBar">
-                            <img src={require("../../../res/img/feather-customised/warning-triangle.svg")} width="24"
-                                height="24" title="/!\ " alt="/!\ " />
+                            <img
+                                src={require("../../../res/img/feather-customised/warning-triangle.svg")}
+                                width="24"
+                                height="24"
+                                title="/!\ "
+                                alt="/!\ " />
                             <div>
                                 <div className="mx_RoomStatusBar_connectionLostBar_title">
-                                    {_t('Connectivity to the server has been lost.')}
+                                    { _t('Connectivity to the server has been lost.') }
                                 </div>
                                 <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                                    {_t('Sent messages will be stored until your connection has returned.')}
+                                    { _t('Sent messages will be stored until your connection has returned.') }
                                 </div>
                             </div>
                         </div>
@@ -283,7 +302,7 @@ export default class RoomStatusBar extends React.Component {
         }
 
         if (this.state.unsentMessages.length > 0 || this.state.isResending) {
-            return this._getUnsentMessageContent();
+            return this.getUnsentMessageContent();
         }
 
         return null;
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 5ffc2fd0da..e5067f1fcf 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -23,9 +23,10 @@ limitations under the License.
 
 import React, { createRef } from 'react';
 import classNames from 'classnames';
-import { Room } from "matrix-js-sdk/src/models/room";
+import { IRecommendedVersion, NotificationCountType, Room } from "matrix-js-sdk/src/models/room";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventSubscription } from "fbemitter";
+import { ISearchResults } from 'matrix-js-sdk/src/@types/search';
 
 import shouldHideEvent from '../../shouldHideEvent';
 import { _t } from '../../languageHandler';
@@ -33,25 +34,22 @@ import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
 import ResizeNotifier from '../../utils/ResizeNotifier';
 import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
-import * as sdk from '../../index';
 import CallHandler, { PlaceCallType } from '../../CallHandler';
 import dis from '../../dispatcher/dispatcher';
-import Tinter from '../../Tinter';
-import rateLimitedFunc from '../../ratelimitedfunc';
 import * as Rooms from '../../Rooms';
 import eventSearch, { searchPagination } from '../../Searching';
 import MainSplit from './MainSplit';
 import RightPanel from './RightPanel';
 import RoomViewStore from '../../stores/RoomViewStore';
-import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
+import RoomScrollStateStore, { ScrollState } from '../../stores/RoomScrollStateStore';
 import WidgetEchoStore from '../../stores/WidgetEchoStore';
 import SettingsStore from "../../settings/SettingsStore";
 import { Layout } from "../../settings/Layout";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
 import { haveTileForEvent } from "../views/rooms/EventTile";
-import RoomContext from "../../contexts/RoomContext";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
+import RoomContext, { TimelineRenderingType } from "../../contexts/RoomContext";
+import MatrixClientContext, { withMatrixClientHOC, MatrixClientProps } from "../../contexts/MatrixClientContext";
 import { E2EStatus, shieldStatusForRoom } from '../../utils/ShieldUtils';
 import { Action } from "../../dispatcher/actions";
 import { IMatrixClientCreds } from "../../MatrixClientPeg";
@@ -59,13 +57,12 @@ import ScrollPanel from "./ScrollPanel";
 import TimelinePanel from "./TimelinePanel";
 import ErrorBoundary from "../views/elements/ErrorBoundary";
 import RoomPreviewBar from "../views/rooms/RoomPreviewBar";
-import ForwardMessage from "../views/rooms/ForwardMessage";
-import SearchBar from "../views/rooms/SearchBar";
+import SearchBar, { SearchScope } from "../views/rooms/SearchBar";
 import RoomUpgradeWarningBar from "../views/rooms/RoomUpgradeWarningBar";
 import AuxPanel from "../views/rooms/AuxPanel";
 import RoomHeader from "../views/rooms/RoomHeader";
 import { XOR } from "../../@types/common";
-import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
+import { IOOBData, IThreepidInvite } from "../../stores/ThreepidInviteStore";
 import EffectsOverlay from "../views/elements/EffectsOverlay";
 import { containsEmoji } from '../../effects/utils';
 import { CHAT_EFFECTS } from '../../effects';
@@ -81,8 +78,20 @@ import { objectHasDiff } from "../../utils/objects";
 import SpaceRoomView from "./SpaceRoomView";
 import { IOpts } from "../../createRoom";
 import { replaceableComponent } from "../../utils/replaceableComponent";
-import { omit } from 'lodash';
-import UIStore from "../../stores/UIStore";
+import EditorStateTransfer from "../../utils/EditorStateTransfer";
+import { throttle } from "lodash";
+import ErrorDialog from '../views/dialogs/ErrorDialog';
+import SearchResultTile from '../views/rooms/SearchResultTile';
+import Spinner from "../views/elements/Spinner";
+import UploadBar from './UploadBar';
+import RoomStatusBar from "./RoomStatusBar";
+import MessageComposer from '../views/rooms/MessageComposer';
+import JumpToBottomButton from "../views/rooms/JumpToBottomButton";
+import TopUnreadMessagesBar from "../views/rooms/TopUnreadMessagesBar";
+import SpaceStore from "../../stores/SpaceStore";
+
+import { logger } from "matrix-js-sdk/src/logger";
+import { EventTimeline } from 'matrix-js-sdk/src/models/event-timeline';
 
 const DEBUG = false;
 let debuglog = function(msg: string) {};
@@ -91,26 +100,12 @@ const BROWSER_SUPPORTS_SANDBOX = 'sandbox' in document.createElement('iframe');
 
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console
-    debuglog = console.log.bind(console);
+    debuglog = logger.log.bind(console);
 }
 
-interface IProps {
-    threepidInvite: IThreepidInvite,
-
-    // Any data about the room that would normally come from the homeserver
-    // but has been passed out-of-band, eg. the room name and avatar URL
-    // from an email invite (a workaround for the fact that we can't
-    // get this information from the HS using an email invite).
-    // Fields:
-    //  * name (string) The room's name
-    //  * avatarUrl (string) The mxc:// avatar URL for the room
-    //  * inviterName (string) The display name of the person who
-    //  *                      invited us to the room
-    oobData?: {
-        name?: string;
-        avatarUrl?: string;
-        inviterName?: string;
-    };
+interface IRoomProps extends MatrixClientProps {
+    threepidInvite: IThreepidInvite;
+    oobData?: IOOBData;
 
     resizeNotifier: ResizeNotifier;
     justCreatedOpts?: IOpts;
@@ -119,7 +114,7 @@ interface IProps {
     onRegistered?(credentials: IMatrixClientCreds): void;
 }
 
-export interface IState {
+export interface IRoomState {
     room?: Room;
     roomId?: string;
     roomAlias?: string;
@@ -136,18 +131,12 @@ export interface IState {
     // Whether to highlight the event scrolled to
     isInitialEventHighlighted?: boolean;
     replyToEvent?: MatrixEvent;
-    forwardingEvent?: MatrixEvent;
     numUnreadMessages: number;
     draggingFile: boolean;
     searching: boolean;
     searchTerm?: string;
-    searchScope?: "All" | "Room";
-    searchResults?: XOR<{}, {
-        count: number;
-        highlights: string[];
-        results: MatrixEvent[];
-        next_batch: string; // eslint-disable-line camelcase
-    }>;
+    searchScope?: SearchScope;
+    searchResults?: XOR<{}, ISearchResults>;
     searchHighlights?: string[];
     searchInProgress?: boolean;
     callState?: CallState;
@@ -155,7 +144,6 @@ export interface IState {
     canPeek: boolean;
     showApps: boolean;
     isPeeking: boolean;
-    showReadReceipts: boolean;
     showRightPanel: boolean;
     // error object, as from the matrix client/server API
     // If we failed to load information about the room,
@@ -170,19 +158,25 @@ export interface IState {
     // used by componentDidUpdate to avoid unnecessary checks
     atEndOfLiveTimelineInit: boolean;
     showTopUnreadMessagesBar: boolean;
-    auxPanelMaxHeight?: number;
     statusBarVisible: boolean;
     // We load this later by asking the js-sdk to suggest a version for us.
     // This object is the result of Room#getRecommendedVersion()
 
-    upgradeRecommendation?: {
-        version: string;
-        needsUpgrade: boolean;
-        urgent: boolean;
-    };
+    upgradeRecommendation?: IRecommendedVersion;
     canReact: boolean;
     canReply: boolean;
     layout: Layout;
+    lowBandwidth: boolean;
+    alwaysShowTimestamps: boolean;
+    showTwelveHourTimestamps: boolean;
+    readMarkerInViewThresholdMs: number;
+    readMarkerOutOfViewThresholdMs: number;
+    showHiddenEventsInTimeline: boolean;
+    showReadReceipts: boolean;
+    showRedactions: boolean;
+    showJoinLeaves: boolean;
+    showAvatarChanges: boolean;
+    showDisplaynameChanges: boolean;
     matrixClientIsReady: boolean;
     showUrlPreview?: boolean;
     e2eStatus?: E2EStatus;
@@ -193,15 +187,17 @@ export interface IState {
     // whether or not a spaces context switch brought us here,
     // if it did we don't want the room to be marked as read as soon as it is loaded.
     wasContextSwitch?: boolean;
+    editState?: EditorStateTransfer;
+    timelineRenderingType: TimelineRenderingType;
+    liveTimeline?: EventTimeline;
 }
 
 @replaceableComponent("structures.RoomView")
-export default class RoomView extends React.Component<IProps, IState> {
+export class RoomView extends React.Component<IRoomProps, IRoomState> {
     private readonly dispatcherRef: string;
     private readonly roomStoreToken: EventSubscription;
     private readonly rightPanelStoreToken: EventSubscription;
-    private readonly showReadReceiptsWatchRef: string;
-    private readonly layoutWatcherRef: string;
+    private settingWatchers: string[];
 
     private unmounted = false;
     private permalinkCreators: Record<string, RoomPermalinkCreator> = {};
@@ -232,7 +228,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             canPeek: false,
             showApps: false,
             isPeeking: false,
-            showReadReceipts: true,
             showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
             joining: false,
             atEndOfLiveTimeline: true,
@@ -242,8 +237,21 @@ export default class RoomView extends React.Component<IProps, IState> {
             canReact: false,
             canReply: false,
             layout: SettingsStore.getValue("layout"),
+            lowBandwidth: SettingsStore.getValue("lowBandwidth"),
+            alwaysShowTimestamps: SettingsStore.getValue("alwaysShowTimestamps"),
+            showTwelveHourTimestamps: SettingsStore.getValue("showTwelveHourTimestamps"),
+            readMarkerInViewThresholdMs: SettingsStore.getValue("readMarkerInViewThresholdMs"),
+            readMarkerOutOfViewThresholdMs: SettingsStore.getValue("readMarkerOutOfViewThresholdMs"),
+            showHiddenEventsInTimeline: SettingsStore.getValue("showHiddenEventsInTimeline"),
+            showReadReceipts: true,
+            showRedactions: true,
+            showJoinLeaves: true,
+            showAvatarChanges: true,
+            showDisplaynameChanges: true,
             matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
             dragCounter: 0,
+            timelineRenderingType: TimelineRenderingType.Room,
+            liveTimeline: undefined,
         };
 
         this.dispatcherRef = dis.register(this.onAction);
@@ -260,7 +268,6 @@ export default class RoomView extends React.Component<IProps, IState> {
         this.context.on("userTrustStatusChanged", this.onUserVerificationChanged);
         this.context.on("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
         this.context.on("Event.decrypted", this.onEventDecrypted);
-        this.context.on("event", this.onEvent);
         // Start listening for RoomViewStore updates
         this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
         this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
@@ -268,16 +275,36 @@ export default class RoomView extends React.Component<IProps, IState> {
         WidgetEchoStore.on(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
         WidgetStore.instance.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
-        this.showReadReceiptsWatchRef = SettingsStore.watchSetting("showReadReceipts", null,
-            this.onReadReceiptsChange);
-        this.layoutWatcherRef = SettingsStore.watchSetting("layout", null, this.onLayoutChange);
+        this.settingWatchers = [
+            SettingsStore.watchSetting("layout", null, (...[,,, value]) =>
+                this.setState({ layout: value as Layout }),
+            ),
+            SettingsStore.watchSetting("lowBandwidth", null, (...[,,, value]) =>
+                this.setState({ lowBandwidth: value as boolean }),
+            ),
+            SettingsStore.watchSetting("alwaysShowTimestamps", null, (...[,,, value]) =>
+                this.setState({ alwaysShowTimestamps: value as boolean }),
+            ),
+            SettingsStore.watchSetting("showTwelveHourTimestamps", null, (...[,,, value]) =>
+                this.setState({ showTwelveHourTimestamps: value as boolean }),
+            ),
+            SettingsStore.watchSetting("readMarkerInViewThresholdMs", null, (...[,,, value]) =>
+                this.setState({ readMarkerInViewThresholdMs: value as number }),
+            ),
+            SettingsStore.watchSetting("readMarkerOutOfViewThresholdMs", null, (...[,,, value]) =>
+                this.setState({ readMarkerOutOfViewThresholdMs: value as number }),
+            ),
+            SettingsStore.watchSetting("showHiddenEventsInTimeline", null, (...[,,, value]) =>
+                this.setState({ showHiddenEventsInTimeline: value as boolean }),
+            ),
+        ];
     }
 
     private onWidgetStoreUpdate = () => {
         if (this.state.room) {
             this.checkWidgets(this.state.room);
         }
-    }
+    };
 
     private checkWidgets = (room) => {
         this.setState({
@@ -314,7 +341,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         const roomId = RoomViewStore.getRoomId();
 
-        const newState: Pick<IState, any> = {
+        const newState: Pick<IRoomState, any> = {
             roomId,
             roomAlias: RoomViewStore.getRoomAlias(),
             roomLoading: RoomViewStore.isRoomLoading(),
@@ -323,20 +350,42 @@ export default class RoomView extends React.Component<IProps, IState> {
             initialEventId: RoomViewStore.getInitialEventId(),
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
             replyToEvent: RoomViewStore.getQuotingEvent(),
-            forwardingEvent: RoomViewStore.getForwardingEvent(),
             // we should only peek once we have a ready client
             shouldPeek: this.state.matrixClientIsReady && RoomViewStore.shouldPeek(),
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
+            showRedactions: SettingsStore.getValue("showRedactions", roomId),
+            showJoinLeaves: SettingsStore.getValue("showJoinLeaves", roomId),
+            showAvatarChanges: SettingsStore.getValue("showAvatarChanges", roomId),
+            showDisplaynameChanges: SettingsStore.getValue("showDisplaynameChanges", roomId),
             wasContextSwitch: RoomViewStore.getWasContextSwitch(),
         };
 
+        // Add watchers for each of the settings we just looked up
+        this.settingWatchers = this.settingWatchers.concat([
+            SettingsStore.watchSetting("showReadReceipts", roomId, (...[,,, value]) =>
+                this.setState({ showReadReceipts: value as boolean }),
+            ),
+            SettingsStore.watchSetting("showRedactions", roomId, (...[,,, value]) =>
+                this.setState({ showRedactions: value as boolean }),
+            ),
+            SettingsStore.watchSetting("showJoinLeaves", roomId, (...[,,, value]) =>
+                this.setState({ showJoinLeaves: value as boolean }),
+            ),
+            SettingsStore.watchSetting("showAvatarChanges", roomId, (...[,,, value]) =>
+                this.setState({ showAvatarChanges: value as boolean }),
+            ),
+            SettingsStore.watchSetting("showDisplaynameChanges", roomId, (...[,,, value]) =>
+                this.setState({ showDisplaynameChanges: value as boolean }),
+            ),
+        ]);
+
         if (!initial && this.state.shouldPeek && !newState.shouldPeek) {
             // Stop peeking because we have joined this room now
             this.context.stopPeeking();
         }
 
         // Temporary logging to diagnose https://github.com/vector-im/element-web/issues/4307
-        console.log(
+        logger.log(
             'RVS update:',
             newState.roomId,
             newState.roomAlias,
@@ -488,7 +537,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             } else if (room) {
                 // Stop peeking because we have joined this room previously
                 this.context.stopPeeking();
-                this.setState({isPeeking: false});
+                this.setState({ isPeeking: false });
             }
         }
     }
@@ -519,25 +568,17 @@ export default class RoomView extends React.Component<IProps, IState> {
         });
 
         window.addEventListener('beforeunload', this.onPageUnload);
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.on("middlePanelResized", this.onResize);
-        }
-        this.onResize();
     }
 
     shouldComponentUpdate(nextProps, nextState) {
         const hasPropsDiff = objectHasDiff(this.props, nextProps);
 
-        // React only shallow comparison and we only want to trigger
-        // a component re-render if a room requires an upgrade
-        const newUpgradeRecommendation = nextState.upgradeRecommendation || {}
-
-        const state = omit(this.state, ['upgradeRecommendation']);
-        const newState = omit(nextState, ['upgradeRecommendation'])
+        const { upgradeRecommendation, ...state } = this.state;
+        const { upgradeRecommendation: newUpgradeRecommendation, ...newState } = nextState;
 
         const hasStateDiff =
-            objectHasDiff(state, newState) ||
-            (newUpgradeRecommendation.needsUpgrade === true)
+            newUpgradeRecommendation?.needsUpgrade !== upgradeRecommendation?.needsUpgrade ||
+            objectHasDiff(state, newState);
 
         return hasPropsDiff || hasStateDiff;
     }
@@ -611,13 +652,9 @@ export default class RoomView extends React.Component<IProps, IState> {
             this.context.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
             this.context.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
             this.context.removeListener("Event.decrypted", this.onEventDecrypted);
-            this.context.removeListener("event", this.onEvent);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.removeListener("middlePanelResized", this.onResize);
-        }
 
         // Remove RoomStore listener
         if (this.roomStoreToken) {
@@ -638,18 +675,12 @@ export default class RoomView extends React.Component<IProps, IState> {
             );
         }
 
-        if (this.showReadReceiptsWatchRef) {
-            SettingsStore.unwatchSetting(this.showReadReceiptsWatchRef);
+        // cancel any pending calls to the throttled updated
+        this.updateRoomMembers.cancel();
+
+        for (const watcher of this.settingWatchers) {
+            SettingsStore.unwatchSetting(watcher);
         }
-
-        // cancel any pending calls to the rate_limited_funcs
-        this.updateRoomMembers.cancelPendingCall();
-
-        // no need to do this as Dir & Settings are now overlays. It just burnt CPU.
-        // console.log("Tinter.tint from RoomView.unmount");
-        // Tinter.tint(); // reset colourscheme
-
-        SettingsStore.unwatchSetting(this.layoutWatcherRef);
     }
 
     private onUserScroll = () => {
@@ -659,14 +690,9 @@ export default class RoomView extends React.Component<IProps, IState> {
                 room_id: this.state.room.roomId,
                 event_id: this.state.initialEventId,
                 highlighted: false,
+                replyingToEvent: this.state.replyToEvent,
             });
         }
-    }
-
-    private onLayoutChange = () => {
-        this.setState({
-            layout: SettingsStore.getValue("layout"),
-        });
     };
 
     private onRightPanelStoreUpdate = () => {
@@ -786,6 +812,37 @@ export default class RoomView extends React.Component<IProps, IState> {
             case 'focus_search':
                 this.onSearchClick();
                 break;
+
+            case Action.EditEvent: {
+                // Quit early if we're trying to edit events in wrong rendering context
+                if (payload.timelineRenderingType !== this.state.timelineRenderingType) return;
+                const editState = payload.event ? new EditorStateTransfer(payload.event) : null;
+                this.setState({ editState }, () => {
+                    if (payload.event) {
+                        this.messagePanel?.scrollToEventIfNeeded(payload.event.getId());
+                    }
+                });
+                break;
+            }
+
+            case Action.ComposerInsert: {
+                // re-dispatch to the correct composer
+                dis.dispatch({
+                    ...payload,
+                    action: this.state.editState ? "edit_composer_insert" : "send_composer_insert",
+                });
+                break;
+            }
+
+            case Action.FocusAComposer: {
+                // re-dispatch to the correct composer
+                dis.fire(this.state.editState ? Action.FocusEditMessageComposer : Action.FocusSendMessageComposer);
+                break;
+            }
+
+            case "scroll_to_bottom":
+                this.messagePanel?.jumpToLiveTimeline();
+                break;
         }
     };
 
@@ -793,8 +850,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         if (this.unmounted) return;
 
         // ignore events for other rooms
-        if (!room) return;
-        if (!this.state.room || room.roomId != this.state.room.roomId) return;
+        if (!room || room.roomId !== this.state.room?.roomId) return;
 
         // ignore events from filtered timelines
         if (data.timeline.getTimelineSet() !== room.getUnfilteredTimelineSet()) return;
@@ -815,38 +871,36 @@ export default class RoomView extends React.Component<IProps, IState> {
         // we'll only be showing a spinner.
         if (this.state.joining) return;
 
+        if (!ev.isBeingDecrypted() && !ev.isDecryptionFailure()) {
+            this.handleEffects(ev);
+        }
+
         if (ev.getSender() !== this.context.credentials.userId) {
             // update unread count when scrolled up
             if (!this.state.searchResults && this.state.atEndOfLiveTimeline) {
                 // no change
-            } else if (!shouldHideEvent(ev)) {
+            } else if (!shouldHideEvent(ev, this.state)) {
                 this.setState((state, props) => {
-                    return {numUnreadMessages: state.numUnreadMessages + 1};
+                    return { numUnreadMessages: state.numUnreadMessages + 1 };
                 });
             }
         }
     };
 
-    private onEventDecrypted = (ev) => {
+    private onEventDecrypted = (ev: MatrixEvent) => {
+        if (!this.state.room || !this.state.matrixClientIsReady) return; // not ready at all
+        if (ev.getRoomId() !== this.state.room.roomId) return; // not for us
         if (ev.isDecryptionFailure()) return;
         this.handleEffects(ev);
     };
 
-    private onEvent = (ev) => {
-        if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
-        this.handleEffects(ev);
-    };
-
-    private handleEffects = (ev) => {
-        if (!this.state.room || !this.state.matrixClientIsReady) return; // not ready at all
-        if (ev.getRoomId() !== this.state.room.roomId) return; // not for us
-
+    private handleEffects = (ev: MatrixEvent) => {
         const notifState = RoomNotificationStateStore.instance.getRoomState(this.state.room);
         if (!notifState.isUnread) return;
 
         CHAT_EFFECTS.forEach(effect => {
             if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
-                dis.dispatch({action: `effects.${effect.command}`});
+                dis.dispatch({ action: `effects.${effect.command}` });
             }
         });
     };
@@ -873,6 +927,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     // called when state.room is first initialised (either at initial load,
     // after a successful peek, or after we join the room).
     private onRoomLoaded = (room: Room) => {
+        if (this.unmounted) return;
         // Attach a widget store listener only when we get a room
         WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(room), this.onWidgetLayoutChange);
         this.onWidgetLayoutChange(); // provoke an update
@@ -884,12 +939,16 @@ export default class RoomView extends React.Component<IProps, IState> {
         this.updateE2EStatus(room);
         this.updatePermissions(room);
         this.checkWidgets(room);
+
+        this.setState({
+            liveTimeline: room.getLiveTimeline(),
+        });
     };
 
     private async calculateRecommendedVersion(room: Room) {
-        this.setState({
-            upgradeRecommendation: await room.getRecommendedVersion(),
-        });
+        const upgradeRecommendation = await room.getRecommendedVersion();
+        if (this.unmounted) return;
+        this.setState({ upgradeRecommendation });
     }
 
     private async loadMembersIfJoined(room: Room) {
@@ -899,7 +958,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 try {
                     await room.loadMembersIfNeeded();
                     if (!this.unmounted) {
-                        this.setState({membersLoaded: true});
+                        this.setState({ membersLoaded: true });
                     }
                 } catch (err) {
                     const errorMessage = `Fetching room members for ${room.roomId} failed.` +
@@ -927,7 +986,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
     }
 
-    private updatePreviewUrlVisibility({roomId}: Room) {
+    private updatePreviewUrlVisibility({ roomId }: Room) {
         // URL Previews in E2EE rooms can be a privacy leak so use a different setting which is per-room explicit
         const key = this.context.isRoomEncrypted(roomId) ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled';
         this.setState({
@@ -979,32 +1038,19 @@ export default class RoomView extends React.Component<IProps, IState> {
     };
 
     private async updateE2EStatus(room: Room) {
-        if (!this.context.isRoomEncrypted(room.roomId)) {
-            return;
-        }
-        if (!this.context.isCryptoEnabled()) {
-            // If crypto is not currently enabled, we aren't tracking devices at all,
-            // so we don't know what the answer is. Let's error on the safe side and show
-            // a warning for this case.
-            this.setState({
-                e2eStatus: E2EStatus.Warning,
-            });
-            return;
+        if (!this.context.isRoomEncrypted(room.roomId)) return;
+
+        // If crypto is not currently enabled, we aren't tracking devices at all,
+        // so we don't know what the answer is. Let's error on the safe side and show
+        // a warning for this case.
+        let e2eStatus = E2EStatus.Warning;
+        if (this.context.isCryptoEnabled()) {
+            /* At this point, the user has encryption on and cross-signing on */
+            e2eStatus = await shieldStatusForRoom(this.context, room);
         }
 
-        /* At this point, the user has encryption on and cross-signing on */
-        this.setState({
-            e2eStatus: await shieldStatusForRoom(this.context, room),
-        });
-    }
-
-    private updateTint() {
-        const room = this.state.room;
-        if (!room) return;
-
-        console.log("Tinter.tint from updateTint");
-        const colorScheme = SettingsStore.getValue("roomColor", room.roomId);
-        Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
+        if (this.unmounted) return;
+        this.setState({ e2eStatus });
     }
 
     private onAccountData = (event: MatrixEvent) => {
@@ -1018,12 +1064,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     private onRoomAccountData = (event: MatrixEvent, room: Room) => {
         if (room.roomId == this.state.roomId) {
             const type = event.getType();
-            if (type === "org.matrix.room.color_scheme") {
-                const colorScheme = event.getContent();
-                // XXX: we should validate the event
-                console.log("Tinter.tint from onRoomAccountData");
-                Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
-            } else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
+            if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
                 // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
                 this.updatePreviewUrlVisibility(room);
             }
@@ -1050,7 +1091,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             return;
         }
 
-        this.updateRoomMembers(member);
+        this.updateRoomMembers();
     };
 
     private onMyMembership = (room: Room, membership: string, oldMembership: string) => {
@@ -1067,15 +1108,15 @@ export default class RoomView extends React.Component<IProps, IState> {
             const canReact = room.getMyMembership() === "join" && room.currentState.maySendEvent("m.reaction", me);
             const canReply = room.maySendMessage();
 
-            this.setState({canReact, canReply});
+            this.setState({ canReact, canReply });
         }
     }
 
     // rate limited because a power level change will emit an event for every member in the room.
-    private updateRoomMembers = rateLimitedFunc(() => {
+    private updateRoomMembers = throttle(() => {
         this.updateDMState();
         this.updateE2EStatus(this.state.room);
-    }, 500);
+    }, 500, { leading: true, trailing: true });
 
     private checkDesktopNotifications() {
         const memberCount = this.state.room.getJoinedMemberCount() + this.state.room.getInvitedMemberCount();
@@ -1096,14 +1137,14 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
     }
 
-    private onSearchResultsFillRequest = (backwards: boolean) => {
+    private onSearchResultsFillRequest = (backwards: boolean): Promise<boolean> => {
         if (!backwards) {
             return Promise.resolve(false);
         }
 
         if (this.state.searchResults.next_batch) {
             debuglog("requesting more search results");
-            const searchPromise = searchPagination(this.state.searchResults);
+            const searchPromise = searchPagination(this.state.searchResults as ISearchResults);
             return this.handleSearchResult(searchPromise);
         } else {
             debuglog("no more search results");
@@ -1131,7 +1172,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                     room_id: this.getRoomId(),
                 },
             });
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({ action: 'require_registration' });
         } else {
             Promise.resolve().then(() => {
                 const signUrl = this.props.threepidInvite?.signUrl;
@@ -1166,13 +1207,13 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         // We always increment the counter no matter the types, because dragging is
         // still happening. If we didn't, the drag counter would get out of sync.
-        this.setState({dragCounter: this.state.dragCounter + 1});
+        this.setState({ dragCounter: this.state.dragCounter + 1 });
 
         // See:
         // https://docs.w3cub.com/dom/datatransfer/types
         // https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API/Recommended_drag_types#file
         if (ev.dataTransfer.types.includes("Files") || ev.dataTransfer.types.includes("application/x-moz-file")) {
-            this.setState({draggingFile: true});
+            this.setState({ draggingFile: true });
         }
     };
 
@@ -1211,7 +1252,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         ContentMessages.sharedInstance().sendContentListToRoom(
             ev.dataTransfer.files, this.state.room.roomId, this.context,
         );
-        dis.fire(Action.FocusComposer);
+        dis.fire(Action.FocusSendMessageComposer);
 
         this.setState({
             draggingFile: false,
@@ -1219,9 +1260,9 @@ export default class RoomView extends React.Component<IProps, IState> {
         });
     };
 
-    private injectSticker(url, info, text) {
+    private injectSticker(url: string, info: object, text: string) {
         if (this.context.isGuest()) {
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({ action: 'require_registration' });
             return;
         }
 
@@ -1234,7 +1275,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             });
     }
 
-    private onSearch = (term: string, scope) => {
+    private onSearch = (term: string, scope: SearchScope) => {
         this.setState({
             searchTerm: term,
             searchScope: scope,
@@ -1255,14 +1296,14 @@ export default class RoomView extends React.Component<IProps, IState> {
         this.searchId = new Date().getTime();
 
         let roomId;
-        if (scope === "Room") roomId = this.state.room.roomId;
+        if (scope === SearchScope.Room) roomId = this.state.room.roomId;
 
         debuglog("sending search request");
         const searchPromise = eventSearch(term, roomId);
         this.handleSearchResult(searchPromise);
     };
 
-    private handleSearchResult(searchPromise: Promise<any>) {
+    private handleSearchResult(searchPromise: Promise<any>): Promise<boolean> {
         // keep a record of the current search id, so that if the search terms
         // change before we get a response, we can ignore the results.
         const localSearchId = this.searchId;
@@ -1275,7 +1316,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             debuglog("search complete");
             if (this.unmounted || !this.state.searching || this.searchId != localSearchId) {
                 console.error("Discarding stale search results");
-                return;
+                return false;
             }
 
             // postgres on synapse returns us precise details of the strings
@@ -1300,13 +1341,13 @@ export default class RoomView extends React.Component<IProps, IState> {
                 searchResults: results,
             });
         }, (error) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Search failed", error);
             Modal.createTrackedDialog('Search failed', '', ErrorDialog, {
                 title: _t("Search failed"),
                 description: ((error && error.message) ? error.message :
                     _t("Server may be unavailable, overloaded, or search timed out :(")),
             });
+            return false;
         }).finally(() => {
             this.setState({
                 searchInProgress: false,
@@ -1315,9 +1356,6 @@ export default class RoomView extends React.Component<IProps, IState> {
     }
 
     private getSearchResultTiles() {
-        const SearchResultTile = sdk.getComponent('rooms.SearchResultTile');
-        const Spinner = sdk.getComponent("elements.Spinner");
-
         // XXX: todo: merge overlapping results somehow?
         // XXX: why doesn't searching on name work?
 
@@ -1365,11 +1403,11 @@ export default class RoomView extends React.Component<IProps, IState> {
                 // As per the spec, an all rooms search can create this condition,
                 // it happens with Seshat but not Synapse.
                 // It will make the result count not match the displayed count.
-                console.log("Hiding search result from an unknown room", roomId);
+                logger.log("Hiding search result from an unknown room", roomId);
                 continue;
             }
 
-            if (!haveTileForEvent(mxEv)) {
+            if (!haveTileForEvent(mxEv, this.state.showHiddenEventsInTimeline)) {
                 // XXX: can this ever happen? It will make the result count
                 // not match the displayed count.
                 continue;
@@ -1410,18 +1448,6 @@ export default class RoomView extends React.Component<IProps, IState> {
         dis.dispatch({ action: "open_room_settings" });
     };
 
-    private onCancelClick = () => {
-        console.log("updateTint from onCancelClick");
-        this.updateTint();
-        if (this.state.forwardingEvent) {
-            dis.dispatch({
-                action: 'forward_event',
-                event: null,
-            });
-        }
-        dis.fire(Action.FocusComposer);
-    };
-
     private onAppsClick = () => {
         dis.dispatch({
             action: "appsDrawer",
@@ -1429,13 +1455,6 @@ export default class RoomView extends React.Component<IProps, IState> {
         });
     };
 
-    private onLeaveClick = () => {
-        dis.dispatch({
-            action: 'leave_room',
-            room_id: this.state.room.roomId,
-        });
-    };
-
     private onForgetClick = () => {
         dis.dispatch({
             action: 'forget_room',
@@ -1456,7 +1475,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             console.error("Failed to reject invite: %s", error);
 
             const msg = error.message ? error.message : JSON.stringify(error);
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to reject invite', '', ErrorDialog, {
                 title: _t("Failed to reject invite"),
                 description: msg,
@@ -1490,7 +1508,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             console.error("Failed to reject invite: %s", error);
 
             const msg = error.message ? error.message : JSON.stringify(error);
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to reject invite', '', ErrorDialog, {
                 title: _t("Failed to reject invite"),
                 description: msg,
@@ -1526,10 +1543,19 @@ export default class RoomView extends React.Component<IProps, IState> {
 
     // jump down to the bottom of this room, where new events are arriving
     private jumpToLiveTimeline = () => {
-        dis.dispatch({
-            action: 'view_room',
-            room_id: this.state.room.roomId,
-        });
+        if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
+            // If we were viewing a highlighted event, firing view_room without
+            // an event will take care of both clearing the URL fragment and
+            // jumping to the bottom
+            dis.dispatch({
+                action: 'view_room',
+                room_id: this.state.room.roomId,
+            });
+        } else {
+            // Otherwise we have to jump manually
+            this.messagePanel.jumpToLiveTimeline();
+            dis.fire(Action.FocusSendMessageComposer);
+        }
     };
 
     // jump up to wherever our read marker is
@@ -1551,14 +1577,14 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         const showBar = this.messagePanel.canJumpToReadMarker();
         if (this.state.showTopUnreadMessagesBar != showBar) {
-            this.setState({showTopUnreadMessagesBar: showBar});
+            this.setState({ showTopUnreadMessagesBar: showBar });
         }
     };
 
     // get the current scroll position of the room, so that it can be
     // restored when we switch back to it.
     //
-    private getScrollState() {
+    private getScrollState(): ScrollState {
         const messagePanel = this.messagePanel;
         if (!messagePanel) return null;
 
@@ -1595,39 +1621,33 @@ export default class RoomView extends React.Component<IProps, IState> {
         };
     }
 
-    private onResize = () => {
-        // It seems flexbox doesn't give us a way to constrain the auxPanel height to have
-        // a minimum of the height of the video element, whilst also capping it from pushing out the page
-        // so we have to do it via JS instead.  In this implementation we cap the height by putting
-        // a maxHeight on the underlying remote video tag.
-
-        // header + footer + status + give us at least 120px of scrollback at all times.
-        let auxPanelMaxHeight = UIStore.instance.windowHeight -
-                (54 + // height of RoomHeader
-                 36 + // height of the status area
-                 51 + // minimum height of the message compmoser
-                 120); // amount of desired scrollback
-
-        // XXX: this is a bit of a hack and might possibly cause the video to push out the page anyway
-        // but it's better than the video going missing entirely
-        if (auxPanelMaxHeight < 50) auxPanelMaxHeight = 50;
-
-        this.setState({auxPanelMaxHeight: auxPanelMaxHeight});
-    };
-
     private onStatusBarVisible = () => {
-        if (this.unmounted) return;
-        this.setState({
-            statusBarVisible: true,
-        });
+        if (this.unmounted || this.state.statusBarVisible) return;
+        this.setState({ statusBarVisible: true });
     };
 
     private onStatusBarHidden = () => {
         // This is currently not desired as it is annoying if it keeps expanding and collapsing
-        if (this.unmounted) return;
-        this.setState({
-            statusBarVisible: false,
-        });
+        if (this.unmounted || !this.state.statusBarVisible) return;
+        this.setState({ statusBarVisible: false });
+    };
+
+    /**
+     * called by the parent component when PageUp/Down/etc is pressed.
+     *
+     * We pass it down to the scroll panel.
+     */
+    private handleScrollKey = ev => {
+        let panel;
+        if (this.searchResultsPanel.current) {
+            panel = this.searchResultsPanel.current;
+        } else if (this.messagePanel) {
+            panel = this.messagePanel;
+        }
+
+        if (panel) {
+            panel.handleScrollKey(ev);
+        }
     };
 
     /**
@@ -1644,10 +1664,6 @@ export default class RoomView extends React.Component<IProps, IState> {
     // otherwise react calls it with null on each update.
     private gatherTimelinePanelRef = r => {
         this.messagePanel = r;
-        if (r) {
-            console.log("updateTint from RoomView.gatherTimelinePanelRef");
-            this.updateTint();
-        }
     };
 
     private getOldRoom() {
@@ -1666,7 +1682,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     onHiddenHighlightsClick = () => {
         const oldRoom = this.getOldRoom();
         if (!oldRoom) return;
-        dis.dispatch({action: "view_room", room_id: oldRoom.roomId});
+        dis.dispatch({ action: "view_room", room_id: oldRoom.roomId });
     };
 
     render() {
@@ -1706,7 +1722,8 @@ export default class RoomView extends React.Component<IProps, IState> {
                                 onJoinClick={this.onJoinButtonClicked}
                                 onForgetClick={this.onForgetClick}
                                 onRejectClick={this.onRejectThreepidInviteButtonClicked}
-                                canPreview={false} error={this.state.roomLoadError}
+                                canPreview={false}
+                                error={this.state.roomLoadError}
                                 roomAlias={roomAlias}
                                 joining={this.state.joining}
                                 inviterName={inviterName}
@@ -1722,10 +1739,8 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
 
         const myMembership = this.state.room.getMyMembership();
-        if (myMembership === "invite"
-            // SpaceRoomView handles invites itself
-            && (!SettingsStore.getValue("feature_spaces") || !this.state.room.isSpaceRoom())
-        ) {
+        // SpaceRoomView handles invites itself
+        if (myMembership === "invite" && (!SpaceStore.spacesEnabled || !this.state.room.isSpaceRoom())) {
             if (this.state.joining || this.state.rejecting) {
                 return (
                     <ErrorBoundary>
@@ -1803,10 +1818,8 @@ export default class RoomView extends React.Component<IProps, IState> {
         let isStatusAreaExpanded = true;
 
         if (ContentMessages.sharedInstance().getCurrentUploads().length > 0) {
-            const UploadBar = sdk.getComponent('structures.UploadBar');
             statusBar = <UploadBar room={this.state.room} />;
         } else if (!this.state.searchResults) {
-            const RoomStatusBar = sdk.getComponent('structures.RoomStatusBar');
             isStatusAreaExpanded = this.state.statusBarVisible;
             statusBar = <RoomStatusBar
                 room={this.state.room}
@@ -1817,6 +1830,19 @@ export default class RoomView extends React.Component<IProps, IState> {
             />;
         }
 
+        const statusBarAreaClass = classNames("mx_RoomView_statusArea", {
+            "mx_RoomView_statusArea_expanded": isStatusAreaExpanded,
+        });
+
+        // if statusBar does not exist then statusBarArea is blank and takes up unnecessary space on the screen
+        // show statusBarArea only if statusBar is present
+        const statusBarArea = statusBar && <div className={statusBarAreaClass}>
+            <div className="mx_RoomView_statusAreaBox">
+                <div className="mx_RoomView_statusAreaBox_line" />
+                { statusBar }
+            </div>
+        </div>;
+
         const roomVersionRecommendation = this.state.upgradeRecommendation;
         const showRoomUpgradeBar = (
             roomVersionRecommendation &&
@@ -1828,11 +1854,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         let aux = null;
         let previewBar;
-        let hideCancel = false;
-        if (this.state.forwardingEvent) {
-            aux = <ForwardMessage onCancelClick={this.onCancelClick} />;
-        } else if (this.state.searching) {
-            hideCancel = true; // has own cancel
+        if (this.state.searching) {
             aux = <SearchBar
                 searchInProgress={this.state.searchInProgress}
                 onCancelClick={this.onCancelSearchClick}
@@ -1840,8 +1862,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 isRoomEncrypted={this.context.isRoomEncrypted(this.state.room.roomId)}
             />;
         } else if (showRoomUpgradeBar) {
-            aux = <RoomUpgradeWarningBar room={this.state.room} recommendation={roomVersionRecommendation} />;
-            hideCancel = true;
+            aux = <RoomUpgradeWarningBar room={this.state.room} />;
         } else if (myMembership !== "join") {
             // We do have a room object for this room, but we're not currently in it.
             // We may have a 3rd party invite to it.
@@ -1850,7 +1871,6 @@ export default class RoomView extends React.Component<IProps, IState> {
                 inviterName = this.props.oobData.inviterName;
             }
             const invitedEmail = this.props.threepidInvite?.toEmail;
-            hideCancel = true;
             previewBar = (
                 <RoomPreviewBar
                     onJoinClick={this.onJoinButtonClicked}
@@ -1864,7 +1884,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                     room={this.state.room}
                 />
             );
-            if (!this.state.canPeek && (!SettingsStore.getValue("feature_spaces") || !this.state.room?.isSpaceRoom())) {
+            if (!this.state.canPeek && (!SpaceStore.spacesEnabled || !this.state.room?.isSpaceRoom())) {
                 return (
                     <div className="mx_RoomView">
                         { previewBar }
@@ -1878,10 +1898,10 @@ export default class RoomView extends React.Component<IProps, IState> {
                     className="mx_RoomView_auxPanel_hiddenHighlights"
                     onClick={this.onHiddenHighlightsClick}
                 >
-                    {_t(
+                    { _t(
                         "You have %(count)s unread notifications in a prior version of this room.",
-                        {count: hiddenHighlightCount},
-                    )}
+                        { count: hiddenHighlightCount },
+                    ) }
                 </AccessibleButton>
             );
         }
@@ -1901,11 +1921,8 @@ export default class RoomView extends React.Component<IProps, IState> {
         const auxPanel = (
             <AuxPanel
                 room={this.state.room}
-                fullHeight={false}
                 userId={this.context.credentials.userId}
-                maxHeight={this.state.auxPanelMaxHeight}
                 showApps={this.state.showApps}
-                onResize={this.onResize}
                 resizeNotifier={this.props.resizeNotifier}
             >
                 { aux }
@@ -1918,12 +1935,9 @@ export default class RoomView extends React.Component<IProps, IState> {
             myMembership === 'join' && !this.state.searchResults
         );
         if (canSpeak) {
-            const MessageComposer = sdk.getComponent('rooms.MessageComposer');
             messageComposer =
                 <MessageComposer
                     room={this.state.room}
-                    callState={this.state.callState}
-                    showApps={this.state.showApps}
                     e2eStatus={this.state.e2eStatus}
                     resizeNotifier={this.props.resizeNotifier}
                     replyToEvent={this.state.replyToEvent}
@@ -1968,11 +1982,8 @@ export default class RoomView extends React.Component<IProps, IState> {
             hideMessagePanel = true;
         }
 
-        const shouldHighlight = this.state.isInitialEventHighlighted;
         let highlightedEventId = null;
-        if (this.state.forwardingEvent) {
-            highlightedEventId = this.state.forwardingEvent.getId();
-        } else if (shouldHighlight) {
+        if (this.state.isInitialEventHighlighted) {
             highlightedEventId = this.state.initialEventId;
         }
 
@@ -1999,19 +2010,19 @@ export default class RoomView extends React.Component<IProps, IState> {
                 onScroll={this.onMessageListScroll}
                 onUserScroll={this.onUserScroll}
                 onReadMarkerUpdated={this.updateTopUnreadMessagesBar}
-                showUrlPreview = {this.state.showUrlPreview}
+                showUrlPreview={this.state.showUrlPreview}
                 className={messagePanelClassNames}
                 membersLoaded={this.state.membersLoaded}
                 permalinkCreator={this.getPermalinkCreatorForRoom(this.state.room)}
                 resizeNotifier={this.props.resizeNotifier}
                 showReactions={true}
                 layout={this.state.layout}
+                editState={this.state.editState}
             />);
 
         let topUnreadMessagesBar = null;
         // Do not show TopUnreadMessagesBar if we have search results showing, it makes no sense
         if (this.state.showTopUnreadMessagesBar && !this.state.searchResults) {
-            const TopUnreadMessagesBar = sdk.getComponent('rooms.TopUnreadMessagesBar');
             topUnreadMessagesBar = (
                 <TopUnreadMessagesBar onScrollUpClick={this.jumpToReadMarker} onCloseClick={this.forgetReadMarker} />
             );
@@ -2019,22 +2030,20 @@ export default class RoomView extends React.Component<IProps, IState> {
         let jumpToBottom;
         // Do not show JumpToBottomButton if we have search results showing, it makes no sense
         if (!this.state.atEndOfLiveTimeline && !this.state.searchResults) {
-            const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton');
             jumpToBottom = (<JumpToBottomButton
-                highlight={this.state.room.getUnreadNotificationCount('highlight') > 0}
+                highlight={this.state.room.getUnreadNotificationCount(NotificationCountType.Highlight) > 0}
                 numUnreadMessages={this.state.numUnreadMessages}
                 onScrollToBottomClick={this.jumpToLiveTimeline}
-                roomId={this.state.roomId}
             />);
         }
 
-        const statusBarAreaClass = classNames("mx_RoomView_statusArea", {
-            "mx_RoomView_statusArea_expanded": isStatusAreaExpanded,
-        });
-
         const showRightPanel = this.state.room && this.state.showRightPanel;
         const rightPanel = showRightPanel
-            ? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} />
+            ? <RightPanel
+                room={this.state.room}
+                resizeNotifier={this.props.resizeNotifier}
+                permalinkCreator={this.getPermalinkCreatorForRoom(this.state.room)}
+                e2eStatus={this.state.e2eStatus} />
             : null;
 
         const timelineClasses = classNames("mx_RoomView_timeline", {
@@ -2050,7 +2059,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         return (
             <RoomContext.Provider value={this.state}>
                 <main className={mainClasses} ref={this.roomView} onKeyDown={this.onReactKeyDown}>
-                    {showChatEffects && this.roomView.current &&
+                    { showChatEffects && this.roomView.current &&
                         <EffectsOverlay roomWidth={this.roomView.current.offsetWidth} />
                     }
                     <ErrorBoundary>
@@ -2061,9 +2070,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                             inRoom={myMembership === 'join'}
                             onSearchClick={this.onSearchClick}
                             onSettingsClick={this.onSettingsClick}
-                            onCancelClick={(aux && !hideCancel) ? this.onCancelClick : null}
                             onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
-                            onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
                             e2eStatus={this.state.e2eStatus}
                             onAppsClick={this.state.hasPinnedWidgets ? this.onAppsClick : null}
                             appsShown={this.state.showApps}
@@ -2071,22 +2078,17 @@ export default class RoomView extends React.Component<IProps, IState> {
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
                             <div className="mx_RoomView_body">
-                                {auxPanel}
+                                { auxPanel }
                                 <div className={timelineClasses}>
-                                    {fileDropTarget}
-                                    {topUnreadMessagesBar}
-                                    {jumpToBottom}
-                                    {messagePanel}
-                                    {searchResultsPanel}
+                                    { fileDropTarget }
+                                    { topUnreadMessagesBar }
+                                    { jumpToBottom }
+                                    { messagePanel }
+                                    { searchResultsPanel }
                                 </div>
-                                <div className={statusBarAreaClass}>
-                                    <div className="mx_RoomView_statusAreaBox">
-                                        <div className="mx_RoomView_statusAreaBox_line" />
-                                        {statusBar}
-                                    </div>
-                                </div>
-                                {previewBar}
-                                {messageComposer}
+                                { statusBarArea }
+                                { previewBar }
+                                { messageComposer }
                             </div>
                         </MainSplit>
                     </ErrorBoundary>
@@ -2095,3 +2097,6 @@ export default class RoomView extends React.Component<IProps, IState> {
         );
     }
 }
+
+const RoomViewWithMatrixClient = withMatrixClientHOC(RoomView);
+export default RoomViewWithMatrixClient;
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.tsx
similarity index 69%
rename from src/components/structures/ScrollPanel.js
rename to src/components/structures/ScrollPanel.tsx
index f6e1530537..0ea070627a 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+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.
@@ -14,17 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from "react";
-import PropTypes from 'prop-types';
+import React, { createRef, CSSProperties, ReactNode, SyntheticEvent, KeyboardEvent } from "react";
 import Timer from '../../utils/Timer';
 import AutoHideScrollbar from "./AutoHideScrollbar";
-import {replaceableComponent} from "../../utils/replaceableComponent";
-import {getKeyBindingsManager, RoomAction} from "../../KeyBindingsManager";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import { getKeyBindingsManager, RoomAction } from "../../KeyBindingsManager";
+import ResizeNotifier from "../../utils/ResizeNotifier";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const DEBUG_SCROLL = false;
 
 // The amount of extra scroll distance to allow prior to unfilling.
-// See _getExcessHeight.
+// See getExcessHeight.
 const UNPAGINATION_PADDING = 6000;
 // The number of milliseconds to debounce calls to onUnfillRequest, to prevent
 // many scroll events causing many unfilling requests.
@@ -38,11 +40,80 @@ const PAGE_SIZE = 400;
 let debuglog;
 if (DEBUG_SCROLL) {
     // using bind means that we get to keep useful line numbers in the console
-    debuglog = console.log.bind(console, "ScrollPanel debuglog:");
+    debuglog = logger.log.bind(console, "ScrollPanel debuglog:");
 } else {
     debuglog = function() {};
 }
 
+interface IProps {
+    /* stickyBottom: if set to true, then once the user hits the bottom of
+     * the list, any new children added to the list will cause the list to
+     * scroll down to show the new element, rather than preserving the
+     * existing view.
+     */
+    stickyBottom?: boolean;
+
+    /* startAtBottom: if set to true, the view is assumed to start
+     * scrolled to the bottom.
+     * XXX: It's likely this is unnecessary and can be derived from
+     * stickyBottom, but I'm adding an extra parameter to ensure
+     * behaviour stays the same for other uses of ScrollPanel.
+     * If so, let's remove this parameter down the line.
+     */
+    startAtBottom?: boolean;
+
+    /* className: classnames to add to the top-level div
+     */
+    className?: string;
+
+    /* style: styles to add to the top-level div
+     */
+    style?: CSSProperties;
+
+    /* resizeNotifier: ResizeNotifier to know when middle column has changed size
+     */
+    resizeNotifier?: ResizeNotifier;
+
+    /* fixedChildren: allows for children to be passed which are rendered outside
+     * of the wrapper
+     */
+    fixedChildren?: ReactNode;
+
+    /* onFillRequest(backwards): a callback which is called on scroll when
+     * the user nears the start (backwards = true) or end (backwards =
+     * false) of the list.
+     *
+     * This should return a promise; no more calls will be made until the
+     * promise completes.
+     *
+     * The promise should resolve to true if there is more data to be
+     * retrieved in this direction (in which case onFillRequest may be
+     * called again immediately), or false if there is no more data in this
+     * directon (at this time) - which will stop the pagination cycle until
+     * the user scrolls again.
+     */
+    onFillRequest?(backwards: boolean): Promise<boolean>;
+
+    /* onUnfillRequest(backwards): a callback which is called on scroll when
+     * there are children elements that are far out of view and could be removed
+     * without causing pagination to occur.
+     *
+     * This function should accept a boolean, which is true to indicate the back/top
+     * of the panel and false otherwise, and a scroll token, which refers to the
+     * first element to remove if removing from the front/bottom, and last element
+     * to remove if removing from the back/top.
+     */
+    onUnfillRequest?(backwards: boolean, scrollToken: string): void;
+
+    /* onScroll: a callback which is called whenever any scroll happens.
+     */
+    onScroll?(event: Event): void;
+
+    /* onUserScroll: callback which is called when the user interacts with the room timeline
+     */
+    onUserScroll?(event: SyntheticEvent): void;
+}
+
 /* This component implements an intelligent scrolling list.
  *
  * It wraps a list of <li> children; when items are added to the start or end
@@ -84,97 +155,60 @@ if (DEBUG_SCROLL) {
  * offset as normal.
  */
 
+export interface IScrollState {
+    stuckAtBottom: boolean;
+    trackedNode?: HTMLElement;
+    trackedScrollToken?: string;
+    bottomOffset?: number;
+    pixelOffset?: number;
+}
+
+interface IPreventShrinkingState {
+    offsetFromBottom: number;
+    offsetNode: HTMLElement;
+}
+
 @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
-         * the list, any new children added to the list will cause the list to
-         * scroll down to show the new element, rather than preserving the
-         * existing view.
-         */
-        stickyBottom: PropTypes.bool,
-
-        /* startAtBottom: if set to true, the view is assumed to start
-         * scrolled to the bottom.
-         * XXX: It's likely this is unnecessary and can be derived from
-         * stickyBottom, but I'm adding an extra parameter to ensure
-         * behaviour stays the same for other uses of ScrollPanel.
-         * If so, let's remove this parameter down the line.
-         */
-        startAtBottom: PropTypes.bool,
-
-        /* onFillRequest(backwards): a callback which is called on scroll when
-         * the user nears the start (backwards = true) or end (backwards =
-         * false) of the list.
-         *
-         * This should return a promise; no more calls will be made until the
-         * promise completes.
-         *
-         * The promise should resolve to true if there is more data to be
-         * retrieved in this direction (in which case onFillRequest may be
-         * called again immediately), or false if there is no more data in this
-         * directon (at this time) - which will stop the pagination cycle until
-         * the user scrolls again.
-         */
-        onFillRequest: PropTypes.func,
-
-        /* onUnfillRequest(backwards): a callback which is called on scroll when
-         * there are children elements that are far out of view and could be removed
-         * without causing pagination to occur.
-         *
-         * This function should accept a boolean, which is true to indicate the back/top
-         * of the panel and false otherwise, and a scroll token, which refers to the
-         * first element to remove if removing from the front/bottom, and last element
-         * to remove if removing from the back/top.
-         */
-        onUnfillRequest: PropTypes.func,
-
-        /* onScroll: a callback which is called whenever any scroll happens.
-         */
-        onScroll: PropTypes.func,
-
-        /* onUserScroll: callback which is called when the user interacts with the room timeline
-         */
-        onUserScroll: PropTypes.func,
-
-        /* className: classnames to add to the top-level div
-         */
-        className: PropTypes.string,
-
-        /* style: styles to add to the top-level div
-         */
-        style: PropTypes.object,
-
-        /* resizeNotifier: ResizeNotifier to know when middle column has changed size
-         */
-        resizeNotifier: PropTypes.object,
-
-        /* fixedChildren: allows for children to be passed which are rendered outside
-         * of the wrapper
-         */
-        fixedChildren: PropTypes.node,
-    };
-
+export default class ScrollPanel extends React.Component<IProps> {
     static defaultProps = {
         stickyBottom: true,
         startAtBottom: true,
-        onFillRequest: function(backwards) { return Promise.resolve(false); },
-        onUnfillRequest: function(backwards, scrollToken) {},
+        onFillRequest: function(backwards: boolean) { return Promise.resolve(false); },
+        onUnfillRequest: function(backwards: boolean, scrollToken: string) {},
         onScroll: function() {},
     };
 
-    constructor(props) {
-        super(props);
+    private readonly pendingFillRequests: Record<"b" | "f", boolean> = {
+        b: null,
+        f: null,
+    };
+    private readonly itemlist = createRef<HTMLOListElement>();
+    private unmounted = false;
+    private scrollTimeout: Timer;
+    // Are we currently trying to backfill?
+    private isFilling: boolean;
+    // Is the current fill request caused by a props update?
+    private isFillingDueToPropsUpdate = false;
+    // Did another request to check the fill state arrive while we were trying to backfill?
+    private fillRequestWhileRunning: boolean;
+    // Is that next fill request scheduled because of a props update?
+    private pendingFillDueToPropsUpdate: boolean;
+    private scrollState: IScrollState;
+    private preventShrinkingState: IPreventShrinkingState;
+    private unfillDebouncer: number;
+    private bottomGrowth: number;
+    private pages: number;
+    private heightUpdateInProgress: boolean;
+    private divScroll: HTMLDivElement;
 
-        this._pendingFillRequests = {b: null, f: null};
+    constructor(props, context) {
+        super(props, context);
 
         if (this.props.resizeNotifier) {
             this.props.resizeNotifier.on("middlePanelResizedNoisy", this.onResize);
         }
 
         this.resetScrollState();
-
-        this._itemlist = createRef();
     }
 
     componentDidMount() {
@@ -187,7 +221,7 @@ export default class ScrollPanel extends React.Component {
         // adding events to the top).
         //
         // This will also re-check the fill state, in case the paginate was inadequate
-        this.checkScroll();
+        this.checkScroll(true);
         this.updatePreventShrinking();
     }
 
@@ -203,18 +237,18 @@ export default class ScrollPanel extends React.Component {
         }
     }
 
-    onScroll = ev => {
+    private onScroll = ev => {
         // skip scroll events caused by resizing
         if (this.props.resizeNotifier && this.props.resizeNotifier.isResizing) return;
-        debuglog("onScroll", this._getScrollNode().scrollTop);
-        this._scrollTimeout.restart();
-        this._saveScrollState();
+        debuglog("onScroll", this.getScrollNode().scrollTop);
+        this.scrollTimeout.restart();
+        this.saveScrollState();
         this.updatePreventShrinking();
         this.props.onScroll(ev);
         this.checkFillState();
     };
 
-    onResize = () => {
+    private onResize = () => {
         debuglog("onResize");
         this.checkScroll();
         // update preventShrinkingState if present
@@ -225,12 +259,12 @@ export default class ScrollPanel extends React.Component {
 
     // after an update to the contents of the panel, check that the scroll is
     // where it ought to be, and set off pagination requests if necessary.
-    checkScroll = () => {
+    public checkScroll = (isFromPropsUpdate = false) => {
         if (this.unmounted) {
             return;
         }
-        this._restoreSavedScrollState();
-        this.checkFillState();
+        this.restoreSavedScrollState();
+        this.checkFillState(0, isFromPropsUpdate);
     };
 
     // return true if the content is fully scrolled down right now; else false.
@@ -238,13 +272,20 @@ export default class ScrollPanel extends React.Component {
     // note that this is independent of the 'stuckAtBottom' state - it is simply
     // about whether the content is scrolled down right now, irrespective of
     // whether it will stay that way when the children update.
-    isAtBottom = () => {
-        const sn = this._getScrollNode();
+    public isAtBottom = () => {
+        const sn = this.getScrollNode();
         // fractional values (both too big and too small)
         // for scrollTop happen on certain browsers/platforms
         // when scrolled all the way down. E.g. Chrome 72 on debian.
-        // so check difference <= 1;
-        return Math.abs(sn.scrollHeight - (sn.scrollTop + sn.clientHeight)) <= 1;
+        //
+        // We therefore leave a bit of wiggle-room and assume we're at the
+        // bottom if the unscrolled area is less than one pixel high.
+        //
+        // non-standard DPI settings also seem to have effect here and can
+        // actually lead to scrollTop+clientHeight being *larger* than
+        // scrollHeight. (observed in element-desktop on Ubuntu 20.04)
+        //
+        return sn.scrollHeight - (sn.scrollTop + sn.clientHeight) <= 1;
     };
 
     // returns the vertical height in the given direction that can be removed from
@@ -278,10 +319,10 @@ export default class ScrollPanel extends React.Component {
     //   |#########|   -                                   |
     //   |#########|                                       |
     //   `---------'                                       -
-    _getExcessHeight(backwards) {
-        const sn = this._getScrollNode();
-        const contentHeight = this._getMessagesHeight();
-        const listHeight = this._getListHeight();
+    private getExcessHeight(backwards: boolean): number {
+        const sn = this.getScrollNode();
+        const contentHeight = this.getMessagesHeight();
+        const listHeight = this.getListHeight();
         const clippedHeight = contentHeight - listHeight;
         const unclippedScrollTop = sn.scrollTop + clippedHeight;
 
@@ -293,13 +334,13 @@ export default class ScrollPanel extends React.Component {
     }
 
     // check the scroll state and send out backfill requests if necessary.
-    checkFillState = async (depth=0) => {
+    public checkFillState = async (depth = 0, isFromPropsUpdate = false): Promise<void> => {
         if (this.unmounted) {
             return;
         }
 
         const isFirstCall = depth === 0;
-        const sn = this._getScrollNode();
+        const sn = this.getScrollNode();
 
         // if there is less than a screenful of messages above or below the
         // viewport, try to get some more messages.
@@ -329,18 +370,24 @@ export default class ScrollPanel extends React.Component {
         // don't allow more than 1 chain of calls concurrently
         // do make a note when a new request comes in while already running one,
         // so we can trigger a new chain of calls once done.
+        // However, we make an exception for when we're already filling due to a
+        // props (or children) update, because very often the children include
+        // spinners to say whether we're paginating or not, so this would cause
+        // infinite paginating.
         if (isFirstCall) {
-            if (this._isFilling) {
-                debuglog("_isFilling: not entering while request is ongoing, marking for a subsequent request");
-                this._fillRequestWhileRunning = true;
+            if (this.isFilling && !this.isFillingDueToPropsUpdate) {
+                debuglog("isFilling: not entering while request is ongoing, marking for a subsequent request");
+                this.fillRequestWhileRunning = true;
+                this.pendingFillDueToPropsUpdate = isFromPropsUpdate;
                 return;
             }
-            debuglog("_isFilling: setting");
-            this._isFilling = true;
+            debuglog("isFilling: setting");
+            this.isFilling = true;
+            this.isFillingDueToPropsUpdate = isFromPropsUpdate;
         }
 
-        const itemlist = this._itemlist.current;
-        const firstTile = itemlist && itemlist.firstElementChild;
+        const itemlist = this.itemlist.current;
+        const firstTile = itemlist && itemlist.firstElementChild as HTMLElement;
         const contentTop = firstTile && firstTile.offsetTop;
         const fillPromises = [];
 
@@ -348,13 +395,13 @@ export default class ScrollPanel extends React.Component {
         // try backward filling
         if (!firstTile || (sn.scrollTop - contentTop) < sn.clientHeight) {
             // need to back-fill
-            fillPromises.push(this._maybeFill(depth, true));
+            fillPromises.push(this.maybeFill(depth, true));
         }
         // if scrollTop gets to 2 screens from the end (so 1 screen below viewport),
         // try forward filling
         if ((sn.scrollHeight - sn.scrollTop) < sn.clientHeight * 2) {
             // need to forward-fill
-            fillPromises.push(this._maybeFill(depth, false));
+            fillPromises.push(this.maybeFill(depth, false));
         }
 
         if (fillPromises.length) {
@@ -365,26 +412,29 @@ export default class ScrollPanel extends React.Component {
             }
         }
         if (isFirstCall) {
-            debuglog("_isFilling: clearing");
-            this._isFilling = false;
+            debuglog("isFilling: clearing");
+            this.isFilling = false;
+            this.isFillingDueToPropsUpdate = false;
         }
 
-        if (this._fillRequestWhileRunning) {
-            this._fillRequestWhileRunning = false;
-            this.checkFillState();
+        if (this.fillRequestWhileRunning) {
+            const refillDueToPropsUpdate = this.pendingFillDueToPropsUpdate;
+            this.fillRequestWhileRunning = false;
+            this.pendingFillDueToPropsUpdate = false;
+            this.checkFillState(0, refillDueToPropsUpdate);
         }
     };
 
     // check if unfilling is possible and send an unfill request if necessary
-    _checkUnfillState(backwards) {
-        let excessHeight = this._getExcessHeight(backwards);
+    private checkUnfillState(backwards: boolean): void {
+        let excessHeight = this.getExcessHeight(backwards);
         if (excessHeight <= 0) {
             return;
         }
 
         const origExcessHeight = excessHeight;
 
-        const tiles = this._itemlist.current.children;
+        const tiles = this.itemlist.current.children;
 
         // The scroll token of the first/last tile to be unpaginated
         let markerScrollToken = null;
@@ -413,11 +463,11 @@ export default class ScrollPanel extends React.Component {
         if (markerScrollToken) {
             // Use a debouncer to prevent multiple unfill calls in quick succession
             // This is to make the unfilling process less aggressive
-            if (this._unfillDebouncer) {
-                clearTimeout(this._unfillDebouncer);
+            if (this.unfillDebouncer) {
+                clearTimeout(this.unfillDebouncer);
             }
-            this._unfillDebouncer = setTimeout(() => {
-                this._unfillDebouncer = null;
+            this.unfillDebouncer = setTimeout(() => {
+                this.unfillDebouncer = null;
                 debuglog("unfilling now", backwards, origExcessHeight);
                 this.props.onUnfillRequest(backwards, markerScrollToken);
             }, UNFILL_REQUEST_DEBOUNCE_MS);
@@ -425,9 +475,9 @@ export default class ScrollPanel extends React.Component {
     }
 
     // check if there is already a pending fill request. If not, set one off.
-    _maybeFill(depth, backwards) {
+    private maybeFill(depth: number, backwards: boolean): Promise<void> {
         const dir = backwards ? 'b' : 'f';
-        if (this._pendingFillRequests[dir]) {
+        if (this.pendingFillRequests[dir]) {
             debuglog("Already a "+dir+" fill in progress - not starting another");
             return;
         }
@@ -436,7 +486,7 @@ export default class ScrollPanel extends React.Component {
 
         // onFillRequest can end up calling us recursively (via onScroll
         // events) so make sure we set this before firing off the call.
-        this._pendingFillRequests[dir] = true;
+        this.pendingFillRequests[dir] = true;
 
         // wait 1ms before paginating, because otherwise
         // this will block the scroll event handler for +700ms
@@ -445,13 +495,13 @@ export default class ScrollPanel extends React.Component {
         return new Promise(resolve => setTimeout(resolve, 1)).then(() => {
             return this.props.onFillRequest(backwards);
         }).finally(() => {
-            this._pendingFillRequests[dir] = false;
+            this.pendingFillRequests[dir] = false;
         }).then((hasMoreResults) => {
             if (this.unmounted) {
                 return;
             }
             // Unpaginate once filling is complete
-            this._checkUnfillState(!backwards);
+            this.checkUnfillState(!backwards);
 
             debuglog(""+dir+" fill complete; hasMoreResults:"+hasMoreResults);
             if (hasMoreResults) {
@@ -477,7 +527,7 @@ export default class ScrollPanel extends React.Component {
      *   the number of pixels the bottom of the tracked child is above the
      *   bottom of the scroll panel.
      */
-    getScrollState = () => this.scrollState;
+    public getScrollState = (): IScrollState => this.scrollState;
 
     /* reset the saved scroll state.
      *
@@ -491,35 +541,35 @@ export default class ScrollPanel extends React.Component {
      * no use if no children exist yet, or if you are about to replace the
      * child list.)
      */
-    resetScrollState = () => {
+    public resetScrollState = (): void => {
         this.scrollState = {
             stuckAtBottom: this.props.startAtBottom,
         };
-        this._bottomGrowth = 0;
-        this._pages = 0;
-        this._scrollTimeout = new Timer(100);
-        this._heightUpdateInProgress = false;
+        this.bottomGrowth = 0;
+        this.pages = 0;
+        this.scrollTimeout = new Timer(100);
+        this.heightUpdateInProgress = false;
     };
 
     /**
      * jump to the top of the content.
      */
-    scrollToTop = () => {
-        this._getScrollNode().scrollTop = 0;
-        this._saveScrollState();
+    public scrollToTop = (): void => {
+        this.getScrollNode().scrollTop = 0;
+        this.saveScrollState();
     };
 
     /**
      * jump to the bottom of the content.
      */
-    scrollToBottom = () => {
+    public scrollToBottom = (): void => {
         // the easiest way to make sure that the scroll state is correctly
         // saved is to do the scroll, then save the updated state. (Calculating
         // it ourselves is hard, and we can't rely on an onScroll callback
         // happening, since there may be no user-visible change here).
-        const sn = this._getScrollNode();
+        const sn = this.getScrollNode();
         sn.scrollTop = sn.scrollHeight;
-        this._saveScrollState();
+        this.saveScrollState();
     };
 
     /**
@@ -527,18 +577,18 @@ export default class ScrollPanel extends React.Component {
      *
      * @param {number} mult: -1 to page up, +1 to page down
      */
-    scrollRelative = mult => {
-        const scrollNode = this._getScrollNode();
+    public scrollRelative = (mult: number): void => {
+        const scrollNode = this.getScrollNode();
         const delta = mult * scrollNode.clientHeight * 0.9;
         scrollNode.scrollBy(0, delta);
-        this._saveScrollState();
+        this.saveScrollState();
     };
 
     /**
      * Scroll up/down in response to a scroll key
      * @param {object} ev the keyboard event
      */
-    handleScrollKey = ev => {
+    public handleScrollKey = (ev: KeyboardEvent) => {
         let isScrolling = false;
         const roomAction = getKeyBindingsManager().getRoomAction(ev);
         switch (roomAction) {
@@ -575,17 +625,17 @@ export default class ScrollPanel extends React.Component {
      * node (specifically, the bottom of it) will be positioned. If omitted, it
      * defaults to 0.
      */
-    scrollToToken = (scrollToken, pixelOffset, offsetBase) => {
+    public scrollToToken = (scrollToken: string, pixelOffset: number, offsetBase: number): void => {
         pixelOffset = pixelOffset || 0;
         offsetBase = offsetBase || 0;
 
-        // set the trackedScrollToken so we can get the node through _getTrackedNode
+        // set the trackedScrollToken so we can get the node through getTrackedNode
         this.scrollState = {
             stuckAtBottom: false,
             trackedScrollToken: scrollToken,
         };
-        const trackedNode = this._getTrackedNode();
-        const scrollNode = this._getScrollNode();
+        const trackedNode = this.getTrackedNode();
+        const scrollNode = this.getScrollNode();
         if (trackedNode) {
             // set the scrollTop to the position we want.
             // note though, that this might not succeed if the combination of offsetBase and pixelOffset
@@ -593,36 +643,36 @@ export default class ScrollPanel extends React.Component {
             // This because when setting the scrollTop only 10 or so events might be loaded,
             // not giving enough content below the trackedNode to scroll downwards
             // enough so it ends up in the top of the viewport.
-            debuglog("scrollToken: setting scrollTop", {offsetBase, pixelOffset, offsetTop: trackedNode.offsetTop});
+            debuglog("scrollToken: setting scrollTop", { offsetBase, pixelOffset, offsetTop: trackedNode.offsetTop });
             scrollNode.scrollTop = (trackedNode.offsetTop - (scrollNode.clientHeight * offsetBase)) + pixelOffset;
-            this._saveScrollState();
+            this.saveScrollState();
         }
     };
 
-    _saveScrollState() {
+    private saveScrollState(): void {
         if (this.props.stickyBottom && this.isAtBottom()) {
             this.scrollState = { stuckAtBottom: true };
             debuglog("saved stuckAtBottom state");
             return;
         }
 
-        const scrollNode = this._getScrollNode();
+        const scrollNode = this.getScrollNode();
         const viewportBottom = scrollNode.scrollHeight - (scrollNode.scrollTop + scrollNode.clientHeight);
 
-        const itemlist = this._itemlist.current;
+        const itemlist = this.itemlist.current;
         const messages = itemlist.children;
         let node = null;
 
         // TODO: do a binary search here, as items are sorted by offsetTop
         // loop backwards, from bottom-most message (as that is the most common case)
-        for (let i = messages.length-1; i >= 0; --i) {
-            if (!messages[i].dataset.scrollTokens) {
+        for (let i = messages.length - 1; i >= 0; --i) {
+            if (!(messages[i] as HTMLElement).dataset.scrollTokens) {
                 continue;
             }
             node = messages[i];
             // break at the first message (coming from the bottom)
             // that has it's offsetTop above the bottom of the viewport.
-            if (this._topFromBottom(node) > viewportBottom) {
+            if (this.topFromBottom(node) > viewportBottom) {
                 // Use this node as the scrollToken
                 break;
             }
@@ -634,7 +684,7 @@ export default class ScrollPanel extends React.Component {
         }
         const scrollToken = node.dataset.scrollTokens.split(',')[0];
         debuglog("saving anchored scroll state to message", node && node.innerText, scrollToken);
-        const bottomOffset = this._topFromBottom(node);
+        const bottomOffset = this.topFromBottom(node);
         this.scrollState = {
             stuckAtBottom: false,
             trackedNode: node,
@@ -644,35 +694,35 @@ export default class ScrollPanel extends React.Component {
         };
     }
 
-    async _restoreSavedScrollState() {
+    private async restoreSavedScrollState(): Promise<void> {
         const scrollState = this.scrollState;
 
         if (scrollState.stuckAtBottom) {
-            const sn = this._getScrollNode();
+            const sn = this.getScrollNode();
             if (sn.scrollTop !== sn.scrollHeight) {
                 sn.scrollTop = sn.scrollHeight;
             }
         } else if (scrollState.trackedScrollToken) {
-            const itemlist = this._itemlist.current;
-            const trackedNode = this._getTrackedNode();
+            const itemlist = this.itemlist.current;
+            const trackedNode = this.getTrackedNode();
             if (trackedNode) {
-                const newBottomOffset = this._topFromBottom(trackedNode);
+                const newBottomOffset = this.topFromBottom(trackedNode);
                 const bottomDiff = newBottomOffset - scrollState.bottomOffset;
-                this._bottomGrowth += bottomDiff;
+                this.bottomGrowth += bottomDiff;
                 scrollState.bottomOffset = newBottomOffset;
-                const newHeight = `${this._getListHeight()}px`;
+                const newHeight = `${this.getListHeight()}px`;
                 if (itemlist.style.height !== newHeight) {
                     itemlist.style.height = newHeight;
                 }
                 debuglog("balancing height because messages below viewport grew by", bottomDiff);
             }
         }
-        if (!this._heightUpdateInProgress) {
-            this._heightUpdateInProgress = true;
+        if (!this.heightUpdateInProgress) {
+            this.heightUpdateInProgress = true;
             try {
-                await this._updateHeight();
+                await this.updateHeight();
             } finally {
-                this._heightUpdateInProgress = false;
+                this.heightUpdateInProgress = false;
             }
         } else {
             debuglog("not updating height because request already in progress");
@@ -680,11 +730,11 @@ export default class ScrollPanel extends React.Component {
     }
 
     // need a better name that also indicates this will change scrollTop? Rebalance height? Reveal content?
-    async _updateHeight() {
+    private async updateHeight(): Promise<void> {
         // wait until user has stopped scrolling
-        if (this._scrollTimeout.isRunning()) {
+        if (this.scrollTimeout.isRunning()) {
             debuglog("updateHeight waiting for scrolling to end ... ");
-            await this._scrollTimeout.finished();
+            await this.scrollTimeout.finished();
         } else {
             debuglog("updateHeight getting straight to business, no scrolling going on.");
         }
@@ -694,14 +744,14 @@ export default class ScrollPanel extends React.Component {
             return;
         }
 
-        const sn = this._getScrollNode();
-        const itemlist = this._itemlist.current;
-        const contentHeight = this._getMessagesHeight();
+        const sn = this.getScrollNode();
+        const itemlist = this.itemlist.current;
+        const contentHeight = this.getMessagesHeight();
         const minHeight = sn.clientHeight;
         const height = Math.max(minHeight, contentHeight);
-        this._pages = Math.ceil(height / PAGE_SIZE);
-        this._bottomGrowth = 0;
-        const newHeight = `${this._getListHeight()}px`;
+        this.pages = Math.ceil(height / PAGE_SIZE);
+        this.bottomGrowth = 0;
+        const newHeight = `${this.getListHeight()}px`;
 
         const scrollState = this.scrollState;
         if (scrollState.stuckAtBottom) {
@@ -713,7 +763,7 @@ export default class ScrollPanel extends React.Component {
             }
             debuglog("updateHeight to", newHeight);
         } else if (scrollState.trackedScrollToken) {
-            const trackedNode = this._getTrackedNode();
+            const trackedNode = this.getTrackedNode();
             // if the timeline has been reloaded
             // this can be called before scrollToBottom or whatever has been called
             // so don't do anything if the node has disappeared from
@@ -730,22 +780,22 @@ export default class ScrollPanel extends React.Component {
                 // yield out of date values and cause a jump
                 // when setting it
                 sn.scrollBy(0, topDiff);
-                debuglog("updateHeight to", {newHeight, topDiff});
+                debuglog("updateHeight to", { newHeight, topDiff });
             }
         }
     }
 
-    _getTrackedNode() {
+    private getTrackedNode(): HTMLElement {
         const scrollState = this.scrollState;
         const trackedNode = scrollState.trackedNode;
 
         if (!trackedNode || !trackedNode.parentElement) {
             let node;
-            const messages = this._itemlist.current.children;
+            const messages = this.itemlist.current.children;
             const scrollToken = scrollState.trackedScrollToken;
 
             for (let i = messages.length-1; i >= 0; --i) {
-                const m = messages[i];
+                const m = messages[i] as HTMLElement;
                 // 'data-scroll-tokens' is a DOMString of comma-separated scroll tokens
                 // There might only be one scroll token
                 if (m.dataset.scrollTokens &&
@@ -768,45 +818,45 @@ export default class ScrollPanel extends React.Component {
         return scrollState.trackedNode;
     }
 
-    _getListHeight() {
-        return this._bottomGrowth + (this._pages * PAGE_SIZE);
+    private getListHeight(): number {
+        return this.bottomGrowth + (this.pages * PAGE_SIZE);
     }
 
-    _getMessagesHeight() {
-        const itemlist = this._itemlist.current;
-        const lastNode = itemlist.lastElementChild;
+    private getMessagesHeight(): number {
+        const itemlist = this.itemlist.current;
+        const lastNode = itemlist.lastElementChild as HTMLElement;
         const lastNodeBottom = lastNode ? lastNode.offsetTop + lastNode.clientHeight : 0;
-        const firstNodeTop = itemlist.firstElementChild ? itemlist.firstElementChild.offsetTop : 0;
+        const firstNodeTop = itemlist.firstElementChild ? (itemlist.firstElementChild as HTMLElement).offsetTop : 0;
         // 18 is itemlist padding
         return lastNodeBottom - firstNodeTop + (18 * 2);
     }
 
-    _topFromBottom(node) {
+    private topFromBottom(node: HTMLElement): number {
         // current capped height - distance from top = distance from bottom of container to top of tracked element
-        return this._itemlist.current.clientHeight - node.offsetTop;
+        return this.itemlist.current.clientHeight - node.offsetTop;
     }
 
     /* get the DOM node which has the scrollTop property we care about for our
      * message panel.
      */
-    _getScrollNode() {
+    private getScrollNode(): HTMLDivElement {
         if (this.unmounted) {
             // this shouldn't happen, but when it does, turn the NPE into
             // something more meaningful.
-            throw new Error("ScrollPanel._getScrollNode called when unmounted");
+            throw new Error("ScrollPanel.getScrollNode called when unmounted");
         }
 
-        if (!this._divScroll) {
+        if (!this.divScroll) {
             // Likewise, we should have the ref by this point, but if not
             // turn the NPE into something meaningful.
-            throw new Error("ScrollPanel._getScrollNode called before AutoHideScrollbar ref collected");
+            throw new Error("ScrollPanel.getScrollNode called before AutoHideScrollbar ref collected");
         }
 
-        return this._divScroll;
+        return this.divScroll;
     }
 
-    _collectScroll = divScroll => {
-        this._divScroll = divScroll;
+    private collectScroll = (divScroll: HTMLDivElement) => {
+        this.divScroll = divScroll;
     };
 
     /**
@@ -814,15 +864,15 @@ export default class ScrollPanel extends React.Component {
     anything below it changes, by calling updatePreventShrinking, to keep
     the same minimum bottom offset, effectively preventing the timeline to shrink.
     */
-    preventShrinking = () => {
-        const messageList = this._itemlist.current;
+    public preventShrinking = (): void => {
+        const messageList = this.itemlist.current;
         const tiles = messageList && messageList.children;
         if (!messageList) {
             return;
         }
         let lastTileNode;
         for (let i = tiles.length - 1; i >= 0; i--) {
-            const node = tiles[i];
+            const node = tiles[i] as HTMLElement;
             if (node.dataset.scrollTokens) {
                 lastTileNode = node;
                 break;
@@ -841,8 +891,8 @@ export default class ScrollPanel extends React.Component {
     };
 
     /** Clear shrinking prevention. Used internally, and when the timeline is reloaded. */
-    clearPreventShrinking = () => {
-        const messageList = this._itemlist.current;
+    public clearPreventShrinking = (): void => {
+        const messageList = this.itemlist.current;
         const balanceElement = messageList && messageList.parentElement;
         if (balanceElement) balanceElement.style.paddingBottom = null;
         this.preventShrinkingState = null;
@@ -857,12 +907,12 @@ export default class ScrollPanel extends React.Component {
     from the bottom of the marked tile grows larger than
     what it was when marking.
     */
-    updatePreventShrinking = () => {
+    public updatePreventShrinking = (): void => {
         if (this.preventShrinkingState) {
-            const sn = this._getScrollNode();
+            const sn = this.getScrollNode();
             const scrollState = this.scrollState;
-            const messageList = this._itemlist.current;
-            const {offsetNode, offsetFromBottom} = this.preventShrinkingState;
+            const messageList = this.itemlist.current;
+            const { offsetNode, offsetFromBottom } = this.preventShrinkingState;
             // element used to set paddingBottom to balance the typing notifs disappearing
             const balanceElement = messageList.parentElement;
             // if the offsetNode got unmounted, clear
@@ -898,13 +948,15 @@ export default class ScrollPanel extends React.Component {
         // list-style-type: none; is no longer a list
         return (
             <AutoHideScrollbar
-                wrappedRef={this._collectScroll}
+                wrappedRef={this.collectScroll}
                 onScroll={this.onScroll}
                 onWheel={this.props.onUserScroll}
-                className={`mx_ScrollPanel ${this.props.className}`} style={this.props.style}>
+                className={`mx_ScrollPanel ${this.props.className}`}
+                style={this.props.style}
+            >
                 { this.props.fixedChildren }
                 <div className="mx_RoomView_messageListWrapper">
-                    <ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
+                    <ol ref={this.itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
                         { this.props.children }
                     </ol>
                 </div>
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.tsx
similarity index 53%
rename from src/components/structures/SearchBox.js
rename to src/components/structures/SearchBox.tsx
index abeb858274..82fe689022 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.tsx
@@ -15,115 +15,124 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef } from 'react';
 import { Key } from '../../Keyboard';
 import dis from '../../dispatcher/dispatcher';
-import {throttle} from 'lodash';
+import { throttle } from 'lodash';
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
 import classNames from 'classnames';
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+interface IProps {
+    onSearch?: (query: string) => void;
+    onCleared?: (source?: string) => void;
+    onKeyDown?: (ev: React.KeyboardEvent) => void;
+    onFocus?: (ev: React.FocusEvent) => void;
+    onBlur?: (ev: React.FocusEvent) => void;
+    className?: string;
+    placeholder: string;
+    blurredPlaceholder?: string;
+    autoFocus?: boolean;
+    initialValue?: string;
+    collapsed?: boolean;
+
+    // If true, the search box will focus and clear itself
+    // on room search focus action (it would be nicer to take
+    // this functionality out, but not obvious how that would work)
+    enableRoomSearchFocus?: boolean;
+}
+
+interface IState {
+    searchTerm: string;
+    blurred: boolean;
+}
 
 @replaceableComponent("structures.SearchBox")
-export default class SearchBox extends React.Component {
-    static propTypes = {
-        onSearch: PropTypes.func,
-        onCleared: PropTypes.func,
-        onKeyDown: PropTypes.func,
-        className: PropTypes.string,
-        placeholder: PropTypes.string.isRequired,
-        autoFocus: PropTypes.bool,
-        initialValue: PropTypes.string,
+export default class SearchBox extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+    private search = createRef<HTMLInputElement>();
 
-        // If true, the search box will focus and clear itself
-        // on room search focus action (it would be nicer to take
-        // this functionality out, but not obvious how that would work)
-        enableRoomSearchFocus: PropTypes.bool,
-    };
-
-    static defaultProps = {
+    static defaultProps: Partial<IProps> = {
         enableRoomSearchFocus: false,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
-        this._search = createRef();
-
         this.state = {
-            searchTerm: this.props.initialValue || "",
+            searchTerm: props.initialValue || "",
             blurred: true,
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         this.dispatcherRef = dis.register(this.onAction);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         dis.unregister(this.dispatcherRef);
     }
 
-    onAction = payload => {
+    private onAction = (payload): void => {
         if (!this.props.enableRoomSearchFocus) return;
 
         switch (payload.action) {
             case 'view_room':
-                if (this._search.current && payload.clear_search) {
-                    this._clearSearch();
+                if (this.search.current && payload.clear_search) {
+                    this.clearSearch();
                 }
                 break;
             case 'focus_room_filter':
-                if (this._search.current) {
-                    this._search.current.focus();
+                if (this.search.current) {
+                    this.search.current.focus();
                 }
                 break;
         }
     };
 
-    onChange = () => {
-        if (!this._search.current) return;
-        this.setState({ searchTerm: this._search.current.value });
+    private onChange = (): void => {
+        if (!this.search.current) return;
+        this.setState({ searchTerm: this.search.current.value });
         this.onSearch();
     };
 
-    onSearch = throttle(() => {
-        this.props.onSearch(this._search.current.value);
-    }, 200, {trailing: true, leading: true});
+    private onSearch = throttle((): void => {
+        this.props.onSearch(this.search.current.value);
+    }, 200, { trailing: true, leading: true });
 
-    _onKeyDown = ev => {
+    private onKeyDown = (ev: React.KeyboardEvent): void => {
         switch (ev.key) {
             case Key.ESCAPE:
-                this._clearSearch("keyboard");
+                this.clearSearch("keyboard");
                 break;
         }
         if (this.props.onKeyDown) this.props.onKeyDown(ev);
     };
 
-    _onFocus = ev => {
-        this.setState({blurred: false});
-        ev.target.select();
+    private onFocus = (ev: React.FocusEvent): void => {
+        this.setState({ blurred: false });
+        (ev.target as HTMLInputElement).select();
         if (this.props.onFocus) {
             this.props.onFocus(ev);
         }
     };
 
-    _onBlur = ev => {
-        this.setState({blurred: true});
+    private onBlur = (ev: React.FocusEvent): void => {
+        this.setState({ blurred: true });
         if (this.props.onBlur) {
             this.props.onBlur(ev);
         }
     };
 
-    _clearSearch(source) {
-        this._search.current.value = "";
+    private clearSearch(source?: string): void {
+        this.search.current.value = "";
         this.onChange();
         if (this.props.onCleared) {
             this.props.onCleared(source);
         }
     }
 
-    render() {
+    public render(): JSX.Element {
         // check for collapsed here and
         // not at parent so we keep
         // searchTerm in our state
@@ -136,8 +145,8 @@ export default class SearchBox extends React.Component {
                 key="button"
                 tabIndex={-1}
                 className="mx_SearchBox_closeButton"
-                onClick={ () => {this._clearSearch("button"); } }>
-            </AccessibleButton>) : undefined;
+                onClick={() => {this.clearSearch("button"); }}
+            />) : undefined;
 
         // show a shorter placeholder when blurred, if requested
         // this is used for the room filter field that has
@@ -147,18 +156,18 @@ export default class SearchBox extends React.Component {
             this.props.placeholder;
         const className = this.props.className || "";
         return (
-            <div className={classNames("mx_SearchBox", "mx_textinput", {"mx_SearchBox_blurred": this.state.blurred})}>
+            <div className={classNames("mx_SearchBox", "mx_textinput", { "mx_SearchBox_blurred": this.state.blurred })}>
                 <input
                     key="searchfield"
                     type="text"
-                    ref={this._search}
+                    ref={this.search}
                     className={"mx_textinput_icon mx_textinput_search " + className}
-                    value={ this.state.searchTerm }
-                    onFocus={ this._onFocus }
-                    onChange={ this.onChange }
-                    onKeyDown={ this._onKeyDown }
-                    onBlur={this._onBlur}
-                    placeholder={ placeholder }
+                    value={this.state.searchTerm}
+                    onFocus={this.onFocus}
+                    onChange={this.onChange}
+                    onKeyDown={this.onKeyDown}
+                    onBlur={this.onBlur}
+                    placeholder={placeholder}
                     autoComplete="off"
                     autoFocus={this.props.autoFocus}
                 />
diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx
new file mode 100644
index 0000000000..ed87b04c8a
--- /dev/null
+++ b/src/components/structures/SpaceHierarchy.tsx
@@ -0,0 +1,732 @@
+/*
+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, {
+    ReactNode,
+    useCallback,
+    useEffect,
+    useMemo,
+    useRef,
+    useState,
+    KeyboardEvent,
+    KeyboardEventHandler,
+    useContext,
+    SetStateAction,
+    Dispatch,
+} from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
+import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
+import { IHierarchyRelation, IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import classNames from "classnames";
+import { sortBy } from "lodash";
+
+import dis from "../../dispatcher/dispatcher";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { _t } from "../../languageHandler";
+import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
+import Spinner from "../views/elements/Spinner";
+import SearchBox from "./SearchBox";
+import RoomAvatar from "../views/avatars/RoomAvatar";
+import StyledCheckbox from "../views/elements/StyledCheckbox";
+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";
+import { getChildOrder } from "../../stores/SpaceStore";
+import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
+import { linkifyElement } from "../../HtmlUtils";
+import { useDispatcher } from "../../hooks/useDispatcher";
+import { Action } from "../../dispatcher/actions";
+import { Key } from "../../Keyboard";
+import { IState, RovingTabIndexProvider, useRovingTabIndex } from "../../accessibility/RovingTabIndex";
+import { getDisplayAliasForRoom } from "./RoomDirectory";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { useEventEmitterState } from "../../hooks/useEventEmitter";
+import { IOOBData } from "../../stores/ThreepidInviteStore";
+
+interface IProps {
+    space: Room;
+    initialText?: string;
+    additionalButtons?: ReactNode;
+    showRoom(
+        cli: MatrixClient,
+        hierarchy: RoomHierarchy,
+        roomId: string,
+        autoJoin?: boolean,
+        roomType?: RoomType,
+    ): void;
+}
+
+interface ITileProps {
+    room: IHierarchyRoom;
+    suggested?: boolean;
+    selected?: boolean;
+    numChildRooms?: number;
+    hasPermissions?: boolean;
+    onViewRoomClick(autoJoin: boolean, roomType: RoomType): void;
+    onToggleClick?(): void;
+}
+
+const Tile: React.FC<ITileProps> = ({
+    room,
+    suggested,
+    selected,
+    hasPermissions,
+    onToggleClick,
+    onViewRoomClick,
+    numChildRooms,
+    children,
+}) => {
+    const cli = useContext(MatrixClientContext);
+    const joinedRoom = cli.getRoom(room.room_id)?.getMyMembership() === "join" ? cli.getRoom(room.room_id) : null;
+    const joinedRoomName = useEventEmitterState(joinedRoom, "Room.name", room => room?.name);
+    const name = joinedRoomName || room.name || room.canonical_alias || room.aliases?.[0]
+        || (room.room_type === RoomType.Space ? _t("Unnamed Space") : _t("Unnamed Room"));
+
+    const [showChildren, toggleShowChildren] = useStateToggle(true);
+    const [onFocus, isActive, ref] = useRovingTabIndex();
+
+    const onPreviewClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        onViewRoomClick(false, room.room_type as RoomType);
+    };
+    const onJoinClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        onViewRoomClick(true, room.room_type as RoomType);
+    };
+
+    let button;
+    if (joinedRoom) {
+        button = <AccessibleButton
+            onClick={onPreviewClick}
+            kind="primary_outline"
+            onFocus={onFocus}
+            tabIndex={isActive ? 0 : -1}
+        >
+            { _t("View") }
+        </AccessibleButton>;
+    } else if (onJoinClick) {
+        button = <AccessibleButton
+            onClick={onJoinClick}
+            kind="primary"
+            onFocus={onFocus}
+            tabIndex={isActive ? 0 : -1}
+        >
+            { _t("Join") }
+        </AccessibleButton>;
+    }
+
+    let checkbox;
+    if (onToggleClick) {
+        if (hasPermissions) {
+            checkbox = <StyledCheckbox checked={!!selected} onChange={onToggleClick} tabIndex={isActive ? 0 : -1} />;
+        } else {
+            checkbox = <TextWithTooltip
+                tooltip={_t("You don't have permission")}
+                onClick={ev => { ev.stopPropagation(); }}
+            >
+                <StyledCheckbox disabled={true} tabIndex={isActive ? 0 : -1} />
+            </TextWithTooltip>;
+        }
+    }
+
+    let avatar;
+    if (joinedRoom) {
+        avatar = <RoomAvatar room={joinedRoom} width={20} height={20} />;
+    } else {
+        avatar = <BaseAvatar
+            name={name}
+            idName={room.room_id}
+            url={room.avatar_url ? mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(20) : null}
+            width={20}
+            height={20}
+        />;
+    }
+
+    let description = _t("%(count)s members", { count: room.num_joined_members });
+    if (numChildRooms !== undefined) {
+        description += " · " + _t("%(count)s rooms", { count: numChildRooms });
+    }
+
+    const topic = joinedRoom?.currentState?.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic || room.topic;
+    if (topic) {
+        description += " · " + 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>
+        { avatar }
+        <div className="mx_SpaceHierarchy_roomTile_name">
+            { name }
+            { suggestedSection }
+        </div>
+
+        <div
+            className="mx_SpaceHierarchy_roomTile_info"
+            ref={e => e && linkifyElement(e)}
+            onClick={ev => {
+                // prevent clicks on links from bubbling up to the room tile
+                if ((ev.target as HTMLElement).tagName === "A") {
+                    ev.stopPropagation();
+                }
+            }}
+        >
+            { description }
+        </div>
+        <div className="mx_SpaceHierarchy_actions">
+            { button }
+            { checkbox }
+        </div>
+    </React.Fragment>;
+
+    let childToggle: JSX.Element;
+    let childSection: JSX.Element;
+    let onKeyDown: KeyboardEventHandler;
+    if (children) {
+        // the chevron is purposefully a div rather than a button as it should be ignored for a11y
+        childToggle = <div
+            className={classNames("mx_SpaceHierarchy_subspace_toggle", {
+                mx_SpaceHierarchy_subspace_toggle_shown: showChildren,
+            })}
+            onClick={ev => {
+                ev.stopPropagation();
+                toggleShowChildren();
+            }}
+        />;
+
+        if (showChildren) {
+            const onChildrenKeyDown = (e) => {
+                if (e.key === Key.ARROW_LEFT) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    ref.current?.focus();
+                }
+            };
+
+            childSection = <div
+                className="mx_SpaceHierarchy_subspace_children"
+                onKeyDown={onChildrenKeyDown}
+                role="group"
+            >
+                { children }
+            </div>;
+        }
+
+        onKeyDown = (e) => {
+            let handled = false;
+
+            switch (e.key) {
+                case Key.ARROW_LEFT:
+                    if (showChildren) {
+                        handled = true;
+                        toggleShowChildren();
+                    }
+                    break;
+
+                case Key.ARROW_RIGHT:
+                    handled = true;
+                    if (showChildren) {
+                        const childSection = ref.current?.nextElementSibling;
+                        childSection?.querySelector<HTMLDivElement>(".mx_SpaceHierarchy_roomTile")?.focus();
+                    } else {
+                        toggleShowChildren();
+                    }
+                    break;
+            }
+
+            if (handled) {
+                e.preventDefault();
+                e.stopPropagation();
+            }
+        };
+    }
+
+    return <li
+        className="mx_SpaceHierarchy_roomTileWrapper"
+        role="treeitem"
+        aria-expanded={children ? showChildren : undefined}
+    >
+        <AccessibleButton
+            className={classNames("mx_SpaceHierarchy_roomTile", {
+                mx_SpaceHierarchy_subspace: room.room_type === RoomType.Space,
+            })}
+            onClick={(hasPermissions && onToggleClick) ? onToggleClick : onPreviewClick}
+            onKeyDown={onKeyDown}
+            inputRef={ref}
+            onFocus={onFocus}
+            tabIndex={isActive ? 0 : -1}
+        >
+            { content }
+            { childToggle }
+        </AccessibleButton>
+        { childSection }
+    </li>;
+};
+
+export const showRoom = (
+    cli: MatrixClient,
+    hierarchy: RoomHierarchy,
+    roomId: string,
+    autoJoin = false,
+    roomType?: RoomType,
+) => {
+    const room = hierarchy.roomMap.get(roomId);
+
+    // 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 (cli.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: Array.from(hierarchy.viaMap.get(roomId) || []),
+        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"),
+            roomType,
+        } as IOOBData,
+    });
+};
+
+interface IHierarchyLevelProps {
+    root: IHierarchyRoom;
+    roomSet: Set<IHierarchyRoom>;
+    hierarchy: RoomHierarchy;
+    parents: Set<string>;
+    selectedMap?: Map<string, Set<string>>;
+    onViewRoomClick(roomId: string, autoJoin: boolean, roomType?: RoomType): void;
+    onToggleClick?(parentId: string, childId: string): void;
+}
+
+export const HierarchyLevel = ({
+    root,
+    roomSet,
+    hierarchy,
+    parents,
+    selectedMap,
+    onViewRoomClick,
+    onToggleClick,
+}: IHierarchyLevelProps) => {
+    const cli = useContext(MatrixClientContext);
+    const space = cli.getRoom(root.room_id);
+    const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
+
+    const sortedChildren = sortBy(root.children_state, ev => {
+        return getChildOrder(ev.content.order, ev.origin_server_ts, ev.state_key);
+    });
+
+    const [subspaces, childRooms] = sortedChildren.reduce((result, ev: IHierarchyRelation) => {
+        const room = hierarchy.roomMap.get(ev.state_key);
+        if (room && roomSet.has(room)) {
+            result[room.room_type === RoomType.Space ? 0 : 1].push(room);
+        }
+        return result;
+    }, [[] as IHierarchyRoom[], [] as IHierarchyRoom[]]);
+
+    const newParents = new Set(parents).add(root.room_id);
+    return <React.Fragment>
+        {
+            childRooms.map(room => (
+                <Tile
+                    key={room.room_id}
+                    room={room}
+                    suggested={hierarchy.isSuggested(root.room_id, room.room_id)}
+                    selected={selectedMap?.get(root.room_id)?.has(room.room_id)}
+                    onViewRoomClick={(autoJoin, roomType) => {
+                        onViewRoomClick(room.room_id, autoJoin, roomType);
+                    }}
+                    hasPermissions={hasPermissions}
+                    onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, room.room_id) : undefined}
+                />
+            ))
+        }
+
+        {
+            subspaces.filter(room => !newParents.has(room.room_id)).map(space => (
+                <Tile
+                    key={space.room_id}
+                    room={space}
+                    numChildRooms={space.children_state.filter(ev => {
+                        const room = hierarchy.roomMap.get(ev.state_key);
+                        return room && roomSet.has(room) && !room.room_type;
+                    }).length}
+                    suggested={hierarchy.isSuggested(root.room_id, space.room_id)}
+                    selected={selectedMap?.get(root.room_id)?.has(space.room_id)}
+                    onViewRoomClick={(autoJoin, roomType) => {
+                        onViewRoomClick(space.room_id, autoJoin, roomType);
+                    }}
+                    hasPermissions={hasPermissions}
+                    onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, space.room_id) : undefined}
+                >
+                    <HierarchyLevel
+                        root={space}
+                        roomSet={roomSet}
+                        hierarchy={hierarchy}
+                        parents={newParents}
+                        selectedMap={selectedMap}
+                        onViewRoomClick={onViewRoomClick}
+                        onToggleClick={onToggleClick}
+                    />
+                </Tile>
+            ))
+        }
+    </React.Fragment>;
+};
+
+const INITIAL_PAGE_SIZE = 20;
+
+export const useSpaceSummary = (space: Room): {
+    loading: boolean;
+    rooms: IHierarchyRoom[];
+    hierarchy: RoomHierarchy;
+    loadMore(pageSize?: number): Promise <void>;
+} => {
+    const [rooms, setRooms] = useState<IHierarchyRoom[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [hierarchy, setHierarchy] = useState<RoomHierarchy>();
+
+    const resetHierarchy = useCallback(() => {
+        const hierarchy = new RoomHierarchy(space, INITIAL_PAGE_SIZE);
+        setHierarchy(hierarchy);
+
+        let discard = false;
+        hierarchy.load().then(() => {
+            if (discard) return;
+            setRooms(hierarchy.rooms);
+            setLoading(false);
+        });
+
+        return () => {
+            discard = true;
+        };
+    }, [space]);
+    useEffect(resetHierarchy, [resetHierarchy]);
+
+    useDispatcher(defaultDispatcher, (payload => {
+        if (payload.action === Action.UpdateSpaceHierarchy) {
+            setLoading(true);
+            setRooms([]); // TODO
+            resetHierarchy();
+        }
+    }));
+
+    const loadMore = useCallback(async (pageSize?: number) => {
+        if (loading || !hierarchy.canLoadMore || hierarchy.noSupport) return;
+
+        setLoading(true);
+        await hierarchy.load(pageSize);
+        setRooms(hierarchy.rooms);
+        setLoading(false);
+    }, [loading, hierarchy]);
+
+    return { loading, rooms, hierarchy, loadMore };
+};
+
+const useIntersectionObserver = (callback: () => void) => {
+    const handleObserver = (entries: IntersectionObserverEntry[]) => {
+        const target = entries[0];
+        if (target.isIntersecting) {
+            callback();
+        }
+    };
+
+    const observerRef = useRef<IntersectionObserver>();
+    return (element: HTMLDivElement) => {
+        if (observerRef.current) {
+            observerRef.current.disconnect();
+        } else if (element) {
+            observerRef.current = new IntersectionObserver(handleObserver, {
+                root: element.parentElement,
+                rootMargin: "0px 0px 600px 0px",
+            });
+        }
+
+        if (observerRef.current && element) {
+            observerRef.current.observe(element);
+        }
+    };
+};
+
+interface IManageButtonsProps {
+    hierarchy: RoomHierarchy;
+    selected: Map<string, Set<string>>;
+    setSelected: Dispatch<SetStateAction<Map<string, Set<string>>>>;
+    setError: Dispatch<SetStateAction<string>>;
+}
+
+const ManageButtons = ({ hierarchy, selected, setSelected, setError }: IManageButtonsProps) => {
+    const cli = useContext(MatrixClientContext);
+
+    const [removing, setRemoving] = useState(false);
+    const [saving, setSaving] = useState(false);
+
+    const selectedRelations = Array.from(selected.keys()).flatMap(parentId => {
+        return [
+            ...selected.get(parentId).values(),
+        ].map(childId => [parentId, childId]) as [string, string][];
+    });
+
+    const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
+        return hierarchy.isSuggested(parentId, childId);
+    });
+
+    const disabled = !selectedRelations.length || removing || saving;
+
+    let Button: React.ComponentType<React.ComponentProps<typeof AccessibleButton>> = AccessibleButton;
+    let props = {};
+    if (!selectedRelations.length) {
+        Button = AccessibleTooltipButton;
+        props = {
+            tooltip: _t("Select a room below first"),
+            yOffset: -40,
+        };
+    }
+
+    return <>
+        <Button
+            {...props}
+            onClick={async () => {
+                setRemoving(true);
+                try {
+                    for (const [parentId, childId] of selectedRelations) {
+                        await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
+
+                        hierarchy.removeRelation(parentId, childId);
+                    }
+                } catch (e) {
+                    setError(_t("Failed to remove some rooms. Try again later"));
+                }
+                setRemoving(false);
+                setSelected(new Map());
+            }}
+            kind="danger_outline"
+            disabled={disabled}
+        >
+            { removing ? _t("Removing...") : _t("Remove") }
+        </Button>
+        <Button
+            {...props}
+            onClick={async () => {
+                setSaving(true);
+                try {
+                    for (const [parentId, childId] of selectedRelations) {
+                        const suggested = !selectionAllSuggested;
+                        const existingContent = hierarchy.getRelation(parentId, childId)?.content;
+                        if (!existingContent || existingContent.suggested === suggested) continue;
+
+                        const content = {
+                            ...existingContent,
+                            suggested: !selectionAllSuggested,
+                        };
+
+                        await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId);
+
+                        // mutate the local state to save us having to refetch the world
+                        existingContent.suggested = content.suggested;
+                    }
+                } catch (e) {
+                    setError("Failed to update some suggestions. Try again later");
+                }
+                setSaving(false);
+                setSelected(new Map());
+            }}
+            kind="primary_outline"
+            disabled={disabled}
+        >
+            { saving
+                ? _t("Saving...")
+                : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested"))
+            }
+        </Button>
+    </>;
+};
+
+const SpaceHierarchy = ({
+    space,
+    initialText = "",
+    showRoom,
+    additionalButtons,
+}: IProps) => {
+    const cli = useContext(MatrixClientContext);
+    const [query, setQuery] = useState(initialText);
+
+    const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
+
+    const { loading, rooms, hierarchy, loadMore } = useSpaceSummary(space);
+
+    const filteredRoomSet = useMemo<Set<IHierarchyRoom>>(() => {
+        if (!rooms?.length) return new Set();
+        const lcQuery = query.toLowerCase().trim();
+        if (!lcQuery) return new Set(rooms);
+
+        const directMatches = rooms.filter(r => {
+            return r.name?.toLowerCase().includes(lcQuery) || r.topic?.toLowerCase().includes(lcQuery);
+        });
+
+        // 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);
+            hierarchy.backRefs.get(roomId)?.forEach(parentId => {
+                if (!visited.has(parentId)) {
+                    queue.push(parentId);
+                }
+            });
+        }
+
+        return new Set(rooms.filter(r => visited.has(r.room_id)));
+    }, [rooms, hierarchy, query]);
+
+    const [error, setError] = useState("");
+
+    const loaderRef = useIntersectionObserver(loadMore);
+
+    if (!loading && hierarchy.noSupport) {
+        return <p>{ _t("Your server does not support showing space hierarchies.") }</p>;
+    }
+
+    const onKeyDown = (ev: KeyboardEvent, state: IState): void => {
+        if (ev.key === Key.ARROW_DOWN && ev.currentTarget.classList.contains("mx_SpaceHierarchy_search")) {
+            state.refs[0]?.current?.focus();
+        }
+    };
+
+    const onToggleClick = (parentId: string, childId: string): void => {
+        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))));
+    };
+
+    return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
+        { ({ onKeyDownHandler }) => {
+            let content: JSX.Element;
+            if (loading && !rooms.length) {
+                content = <Spinner />;
+            } else {
+                const hasPermissions = space?.getMyMembership() === "join" &&
+                    space.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
+
+                let results: JSX.Element;
+                if (filteredRoomSet.size) {
+                    results = <>
+                        <HierarchyLevel
+                            root={hierarchy.roomMap.get(space.roomId)}
+                            roomSet={filteredRoomSet}
+                            hierarchy={hierarchy}
+                            parents={new Set()}
+                            selectedMap={selected}
+                            onToggleClick={hasPermissions ? onToggleClick : undefined}
+                            onViewRoomClick={(roomId, autoJoin, roomType) => {
+                                showRoom(cli, hierarchy, roomId, autoJoin, roomType);
+                            }}
+                        />
+                    </>;
+                } else if (!hierarchy.canLoadMore) {
+                    results = <div className="mx_SpaceHierarchy_noResults">
+                        <h3>{ _t("No results found") }</h3>
+                        <div>{ _t("You may want to try a different search or check for typos.") }</div>
+                    </div>;
+                }
+
+                let loader: JSX.Element;
+                if (hierarchy.canLoadMore) {
+                    loader = <div ref={loaderRef}>
+                        <Spinner />
+                    </div>;
+                }
+
+                content = <>
+                    <div className="mx_SpaceHierarchy_listHeader">
+                        <h4>{ query.trim() ? _t("Results") : _t("Rooms and spaces") }</h4>
+                        <span>
+                            { additionalButtons }
+                            { hasPermissions && (
+                                <ManageButtons
+                                    hierarchy={hierarchy}
+                                    selected={selected}
+                                    setSelected={setSelected}
+                                    setError={setError}
+                                />
+                            ) }
+                        </span>
+                    </div>
+                    { error && <div className="mx_SpaceHierarchy_error">
+                        { error }
+                    </div> }
+                    <ul
+                        className="mx_SpaceHierarchy_list"
+                        onKeyDown={onKeyDownHandler}
+                        role="tree"
+                        aria-label={_t("Space")}
+                    >
+                        { results }
+                    </ul>
+                    { loader }
+                </>;
+            }
+
+            return <>
+                <SearchBox
+                    className="mx_SpaceHierarchy_search mx_textinput_icon mx_textinput_search"
+                    placeholder={_t("Search names and descriptions")}
+                    onSearch={setQuery}
+                    autoFocus={true}
+                    initialValue={initialText}
+                    onKeyDown={onKeyDownHandler}
+                />
+
+                { content }
+            </>;
+        } }
+    </RovingTabIndexProvider>;
+};
+
+export default SpaceHierarchy;
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
deleted file mode 100644
index 8d59fe6c68..0000000000
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ /dev/null
@@ -1,669 +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.
-*/
-
-import React, {ReactNode, useMemo, useState} from "react";
-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";
-
-import {MatrixClientPeg} from "../../MatrixClientPeg";
-import dis from "../../dispatcher/dispatcher";
-import {_t} from "../../languageHandler";
-import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
-import BaseDialog from "../views/dialogs/BaseDialog";
-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 {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";
-import {getOrder} from "../../stores/SpaceStore";
-import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import {linkifyElement} from "../../HtmlUtils";
-
-interface IHierarchyProps {
-    space: Room;
-    initialText?: string;
-    refreshToken?: any;
-    additionalButtons?: ReactNode;
-    showRoom(room: ISpaceSummaryRoom, viaServers?: string[], autoJoin?: boolean): 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;
-        suggested?: boolean;
-        auto_join?: boolean;
-        via?: string[];
-    };
-}
-/* eslint-enable camelcase */
-
-interface ITileProps {
-    room: ISpaceSummaryRoom;
-    suggested?: boolean;
-    selected?: boolean;
-    numChildRooms?: number;
-    hasPermissions?: boolean;
-    onViewRoomClick(autoJoin: boolean): void;
-    onToggleClick?(): void;
-}
-
-const Tile: React.FC<ITileProps> = ({
-    room,
-    suggested,
-    selected,
-    hasPermissions,
-    onToggleClick,
-    onViewRoomClick,
-    numChildRooms,
-    children,
-}) => {
-    const cli = MatrixClientPeg.get();
-    const joinedRoom = cli.getRoom(room.room_id)?.getMyMembership() === "join" ? cli.getRoom(room.room_id) : null;
-    const name = joinedRoom?.name || room.name || room.canonical_alias || room.aliases?.[0]
-        || (room.room_type === RoomType.Space ? _t("Unnamed Space") : _t("Unnamed Room"));
-
-    const [showChildren, toggleShowChildren] = useStateToggle(true);
-
-    const onPreviewClick = (ev: ButtonEvent) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        onViewRoomClick(false);
-    }
-    const onJoinClick = (ev: ButtonEvent) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        onViewRoomClick(true);
-    }
-
-    let button;
-    if (joinedRoom) {
-        button = <AccessibleButton onClick={onPreviewClick} kind="primary_outline">
-            { _t("View") }
-        </AccessibleButton>;
-    } else if (onJoinClick) {
-        button = <AccessibleButton onClick={onJoinClick} kind="primary">
-            { _t("Join") }
-        </AccessibleButton>;
-    }
-
-    let checkbox;
-    if (onToggleClick) {
-        if (hasPermissions) {
-            checkbox = <StyledCheckbox checked={!!selected} onChange={onToggleClick} />;
-        } else {
-            checkbox = <TextWithTooltip
-                tooltip={_t("You don't have permission")}
-                onClick={ev => { ev.stopPropagation() }}
-            >
-                <StyledCheckbox disabled={true} />
-            </TextWithTooltip>;
-        }
-    }
-
-    let avatar;
-    if (joinedRoom) {
-        avatar = <RoomAvatar room={joinedRoom} width={20} height={20} />;
-    } else {
-        avatar = <BaseAvatar
-            name={name}
-            idName={room.room_id}
-            url={room.avatar_url ? mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(20) : null}
-            width={20}
-            height={20}
-        />;
-    }
-
-    let description = _t("%(count)s members", { count: room.num_joined_members });
-    if (numChildRooms !== undefined) {
-        description += " · " + _t("%(count)s rooms", { count: numChildRooms });
-    }
-
-    const topic = joinedRoom?.currentState?.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic || room.topic;
-    if (topic) {
-        description += " · " + 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>
-        { avatar }
-        <div className="mx_SpaceRoomDirectory_roomTile_name">
-            { name }
-            { suggestedSection }
-        </div>
-
-        <div
-            className="mx_SpaceRoomDirectory_roomTile_info"
-            ref={e => e && linkifyElement(e)}
-            onClick={ev => {
-                // prevent clicks on links from bubbling up to the room tile
-                if ((ev.target as HTMLElement).tagName === "A") {
-                    ev.stopPropagation();
-                }
-            }}
-        >
-            { description }
-        </div>
-        <div className="mx_SpaceRoomDirectory_actions">
-            { button }
-            { checkbox }
-        </div>
-    </React.Fragment>;
-
-    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) ? onToggleClick : onPreviewClick}
-        >
-            { content }
-            { childToggle }
-        </AccessibleButton>
-        { childSection }
-    </>;
-};
-
-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>;
-    relations: Map<string, Map<string, ISpaceSummaryEvent>>;
-    parents: Set<string>;
-    selectedMap?: Map<string, Set<string>>;
-    onViewRoomClick(roomId: string, autoJoin: boolean): void;
-    onToggleClick?(parentId: string, childId: string): void;
-}
-
-export const HierarchyLevel = ({
-    spaceId,
-    rooms,
-    relations,
-    parents,
-    selectedMap,
-    onViewRoomClick,
-    onToggleClick,
-}: IHierarchyLevelProps) => {
-    const cli = MatrixClientPeg.get();
-    const space = cli.getRoom(spaceId);
-    const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
-
-    const children = Array.from(relations.get(spaceId)?.values() || []);
-    const sortedChildren = sortBy(children, ev => {
-        // XXX: Space Summary API doesn't give the child origin_server_ts but once it does we should use it for sorting
-        return getOrder(ev.content.order, null, ev.state_key);
-    });
-    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;
-    }, [[], []]) || [[], []];
-
-    const newParents = new Set(parents).add(spaceId);
-    return <React.Fragment>
-        {
-            childRooms.map(roomId => (
-                <Tile
-                    key={roomId}
-                    room={rooms.get(roomId)}
-                    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}
-                />
-            ))
-        }
-
-        {
-            subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => (
-                <Tile
-                    key={roomId}
-                    room={rooms.get(roomId)}
-                    numChildRooms={Array.from(relations.get(roomId)?.values() || [])
-                        .filter(ev => rooms.has(ev.state_key) && !rooms.get(ev.state_key).room_type).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}
-                        relations={relations}
-                        parents={newParents}
-                        selectedMap={selectedMap}
-                        onViewRoomClick={onViewRoomClick}
-                        onToggleClick={onToggleClick}
-                    />
-                </Tile>
-            ))
-        }
-    </React.Fragment>
-};
-
-// mutate argument refreshToken to force a reload
-export const useSpaceSummary = (cli: MatrixClient, space: Room, refreshToken?: any): [
-    null,
-    ISpaceSummaryRoom[],
-    Map<string, Map<string, ISpaceSummaryEvent>>?,
-    Map<string, Set<string>>?,
-    Map<string, Set<string>>?,
-] | [Error] => {
-    // TODO pagination
-    return useAsyncMemo(async () => {
-        try {
-            const data = await cli.getSpaceSummary(space.roomId);
-
-            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, 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());
-                    ev.content.via.forEach(via => set.add(via));
-                }
-            });
-
-            return [null, data.rooms as ISpaceSummaryRoom[], parentChildRelations, viaMap, childParentRelations];
-        } catch (e) {
-            console.error(e); // TODO
-            return [e];
-        }
-    }, [space, refreshToken], [undefined]);
-};
-
-export const SpaceHierarchy: React.FC<IHierarchyProps> = ({
-    space,
-    initialText = "",
-    showRoom,
-    refreshToken,
-    additionalButtons,
-    children,
-}) => {
-    const cli = MatrixClientPeg.get();
-    const userId = cli.getUserId();
-    const [query, setQuery] = useState(initialText);
-
-    const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
-
-    const [summaryError, rooms, parentChildMap, viaMap, childParentMap] = useSpaceSummary(cli, space, refreshToken);
-
-    const roomsMap = useMemo(() => {
-        if (!rooms) return null;
-        const lcQuery = query.toLowerCase().trim();
-
-        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);
-        });
-
-        // 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 [error, setError] = useState("");
-    const [removing, setRemoving] = useState(false);
-    const [saving, setSaving] = useState(false);
-
-    if (summaryError) {
-        return <p>{_t("Your server does not support showing space hierarchies.")}</p>;
-    }
-
-    let content;
-    if (roomsMap) {
-        const numRooms = Array.from(roomsMap.values()).filter(r => !r.room_type).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 manageButtons;
-        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][];
-            });
-
-            const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
-                return parentChildMap.get(parentId)?.get(childId)?.content.suggested;
-            });
-
-            const disabled = !selectedRelations.length || removing || saving;
-
-            let Button: React.ComponentType<React.ComponentProps<typeof AccessibleButton>> = AccessibleButton;
-            let props = {};
-            if (!selectedRelations.length) {
-                Button = AccessibleTooltipButton;
-                props = {
-                    tooltip: _t("Select a room below first"),
-                    yOffset: -40,
-                };
-            }
-
-            manageButtons = <>
-                <Button
-                    {...props}
-                    onClick={async () => {
-                        setRemoving(true);
-                        try {
-                            for (const [parentId, childId] of selectedRelations) {
-                                await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
-                                parentChildMap.get(parentId).delete(childId);
-                                if (parentChildMap.get(parentId).size > 0) {
-                                    parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
-                                } else {
-                                    parentChildMap.delete(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") }
-                </Button>
-                <Button
-                    {...props}
-                    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"))
-                    }
-                </Button>
-            </>;
-        }
-
-        let results;
-        if (roomsMap.size) {
-            const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
-
-            results = <>
-                <HierarchyLevel
-                    spaceId={space.roomId}
-                    rooms={roomsMap}
-                    relations={parentChildMap}
-                    parents={new Set()}
-                    selectedMap={selected}
-                    onToggleClick={hasPermissions ? (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))));
-                    } : undefined}
-                    onViewRoomClick={(roomId, autoJoin) => {
-                        showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin);
-                    }}
-                />
-                { children && <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 }
-                <span>
-                    { additionalButtons }
-                    { manageButtons }
-                </span>
-            </div>
-            { error && <div className="mx_SpaceRoomDirectory_error">
-                { error }
-            </div> }
-            <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
-                { results }
-                { children }
-            </AutoHideScrollbar>
-        </>;
-    } else {
-        content = <Spinner />;
-    }
-
-    // TODO loading state/error state
-    return <>
-        <SearchBox
-            className="mx_textinput_icon mx_textinput_search"
-            placeholder={ _t("Search names and descriptions") }
-            onSearch={setQuery}
-            autoFocus={true}
-            initialValue={initialText}
-        />
-
-        { content }
-    </>;
-};
-
-interface IProps {
-    space: Room;
-    initialText?: string;
-    onFinished(): void;
-}
-
-const SpaceRoomDirectory: React.FC<IProps> = ({ space, onFinished, initialText }) => {
-    const onCreateRoomClick = () => {
-        dis.dispatch({
-            action: 'view_create_room',
-            public: true,
-        });
-        onFinished();
-    };
-
-    const title = <React.Fragment>
-        <RoomAvatar room={space} height={32} width={32} />
-        <div>
-            <h1>{ _t("Explore rooms") }</h1>
-            <div><RoomName room={space} /></div>
-        </div>
-    </React.Fragment>;
-
-    return (
-        <BaseDialog className="mx_SpaceRoomDirectory" hasCancel={true} onFinished={onFinished} title={title}>
-            <div className="mx_Dialog_content">
-                { _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>;
-                    }},
-                ) }
-
-                <SpaceHierarchy
-                    space={space}
-                    showRoom={(room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
-                        showRoom(room, viaServers, autoJoin);
-                        onFinished();
-                    }}
-                    initialText={initialText}
-                >
-                    <AccessibleButton
-                        onClick={onCreateRoomClick}
-                        kind="primary"
-                        className="mx_SpaceRoomDirectory_createRoom"
-                    >
-                        { _t("Create room") }
-                    </AccessibleButton>
-                </SpaceHierarchy>
-            </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/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 06d2bda16e..270db21408 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -14,57 +14,73 @@ 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 {EventSubscription} from "fbemitter";
+import React, { RefObject, useContext, useRef, useState } from "react";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { JoinRule, Preset } from "matrix-js-sdk/src/@types/partials";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventSubscription } from "fbemitter";
 
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import RoomAvatar from "../views/avatars/RoomAvatar";
-import {_t} from "../../languageHandler";
+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 {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite";
-import {useRoomMembers} from "../../hooks/useRoomMembers";
-import createRoom, {IOpts, Preset} from "../../createRoom";
+import { inviteMultipleToRoom, showRoomInviteDialog } from "../../RoomInvite";
+import { useRoomMembers } from "../../hooks/useRoomMembers";
+import createRoom, { IOpts } from "../../createRoom";
 import Field from "../views/elements/Field";
-import {useEventEmitter} from "../../hooks/useEventEmitter";
+import { useEventEmitter } from "../../hooks/useEventEmitter";
 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 dis 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 { ActionPayload } from "../../dispatcher/payloads";
 import RightPanel from "./RightPanel";
 import RightPanelStore from "../../stores/RightPanelStore";
-import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
-import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
-import {useStateArray} from "../../hooks/useStateArray";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { SetRightPanelPhasePayload } from "../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { useStateArray } from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
-import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
-import {showRoom, SpaceHierarchy} from "./SpaceRoomDirectory";
+import {
+    shouldShowSpaceSettings,
+    showAddExistingRooms,
+    showCreateNewRoom,
+    showCreateNewSubspace,
+    showSpaceSettings,
+} from "../../utils/space";
+import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
 import MemberAvatar from "../views/avatars/MemberAvatar";
-import {useStateToggle} from "../../hooks/useStateToggle";
 import SpaceStore from "../../stores/SpaceStore";
 import FacePile from "../views/elements/FacePile";
-import {AddExistingToSpace} from "../views/dialogs/AddExistingToSpaceDialog";
-import {ChevronFace, ContextMenuButton, useContextMenu} from "./ContextMenu";
+import {
+    AddExistingToSpace,
+    defaultDmsRenderer,
+    defaultRoomsRenderer,
+    defaultSpacesRenderer,
+} from "../views/dialogs/AddExistingToSpaceDialog";
+import { ChevronFace, ContextMenuButton, useContextMenu } from "./ContextMenu";
 import IconizedContextMenu, {
     IconizedContextMenuOption,
     IconizedContextMenuOptionList,
 } from "../views/context_menus/IconizedContextMenu";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import {BetaPill} from "../views/beta/BetaCard";
-import {USER_LABS_TAB} from "../views/dialogs/UserSettingsDialog";
-import SettingsStore from "../../settings/SettingsStore";
-import dis from "../../dispatcher/dispatcher";
-import Modal from "../../Modal";
-import BetaFeedbackDialog from "../views/dialogs/BetaFeedbackDialog";
-import SdkConfig from "../../SdkConfig";
+import { BetaPill } from "../views/beta/BetaCard";
+import { UserTab } from "../views/dialogs/UserSettingsDialog";
+import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
+import { SpaceFeedbackPrompt } from "../views/spaces/SpaceCreateMenu";
+import { CreateEventField, IGroupSummary } from "../views/dialogs/CreateSpaceFromCommunityDialog";
+import { useAsyncMemo } from "../../hooks/useAsyncMemo";
+import Spinner from "../views/elements/Spinner";
+import GroupAvatar from "../views/avatars/GroupAvatar";
+import { useDispatcher } from "../../hooks/useDispatcher";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IProps {
     space: Room;
@@ -76,7 +92,7 @@ interface IProps {
 
 interface IState {
     phase: Phase;
-    createdRooms?: boolean; // internal state for the creation wizard
+    firstRoomId?: string; // internal state for the creation wizard
     showRightPanel: boolean;
     myMembership: string;
 }
@@ -91,26 +107,6 @@ enum Phase {
     PrivateExistingRooms,
 }
 
-// XXX: Temporary for the Spaces Beta only
-export const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
-    if (!SdkConfig.get().bug_report_endpoint_url) return null;
-
-    return <div className="mx_SpaceFeedbackPrompt">
-        <hr />
-        <div>
-            <span className="mx_SpaceFeedbackPrompt_text">{ _t("Spaces are a beta feature.") }</span>
-            <AccessibleButton kind="link" onClick={() => {
-                if (onClick) onClick();
-                Modal.createTrackedDialog("Beta Feedback", "feature_spaces", BetaFeedbackDialog, {
-                    featureId: "feature_spaces",
-                });
-            }}>
-                { _t("Feedback") }
-            </AccessibleButton>
-        </div>
-    </div>;
-};
-
 const RoomMemberCount = ({ room, children }) => {
     const members = useRoomMembers(room);
     const count = members.length;
@@ -144,7 +140,7 @@ const SpaceInfo = ({ space }) => {
     return <div className="mx_SpaceRoomView_info">
         { visibilitySection }
         { joinRule === "public" && <RoomMemberCount room={space}>
-            {(count) => count > 0 ? (
+            { (count) => count > 0 ? (
                 <AccessibleButton
                     kind="link"
                     onClick={() => {
@@ -157,25 +153,59 @@ const SpaceInfo = ({ space }) => {
                 >
                     { _t("%(count)s members", { count }) }
                 </AccessibleButton>
-            ) : null}
+            ) : null }
         </RoomMemberCount> }
-    </div>
+    </div>;
 };
 
-const onBetaClick = () => {
+const onPreferencesClick = () => {
     defaultDispatcher.dispatch({
         action: Action.ViewUserSettings,
-        initialTabId: USER_LABS_TAB,
+        initialTabId: UserTab.Preferences,
     });
 };
 
-const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
+// XXX: temporary community migration component
+const GroupTile = ({ groupId }: { groupId: string }) => {
+    const cli = useContext(MatrixClientContext);
+    const groupSummary = useAsyncMemo<IGroupSummary>(() => cli.getGroupSummary(groupId), [cli, groupId]);
+
+    if (!groupSummary) return <Spinner />;
+
+    return <>
+        <GroupAvatar
+            groupId={groupId}
+            groupName={groupSummary.profile.name}
+            groupAvatarUrl={groupSummary.profile.avatar_url}
+            width={16}
+            height={16}
+            resizeMethod='crop'
+        />
+        { groupSummary.profile.name }
+    </>;
+};
+
+interface ISpacePreviewProps {
+    space: Room;
+    onJoinButtonClicked(): void;
+    onRejectButtonClicked(): void;
+}
+
+const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISpacePreviewProps) => {
     const cli = useContext(MatrixClientContext);
     const myMembership = useMyRoomMembership(space);
+    useDispatcher(defaultDispatcher, payload => {
+        if (payload.action === Action.JoinRoomError && payload.roomId === space.roomId) {
+            setBusy(false); // stop the spinner, join failed
+        }
+    });
 
     const [busy, setBusy] = useState(false);
 
-    const spacesEnabled = SettingsStore.getValue("feature_spaces");
+    const spacesEnabled = SpaceStore.spacesEnabled;
+
+    const cannotJoin = getEffectiveMembership(myMembership) === EffectiveMembership.Leave
+        && space.getJoinRule() !== JoinRule.Public;
 
     let inviterSection;
     let joinButtons;
@@ -200,11 +230,11 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
 
         if (inviteSender) {
             inviterSection = <div className="mx_SpaceRoomView_preview_inviter">
-                <MemberAvatar member={inviter} width={32} height={32} />
+                <MemberAvatar member={inviter} fallbackUserId={inviteSender} width={32} height={32} />
                 <div>
                     <div className="mx_SpaceRoomView_preview_inviter_name">
                         { _t("<inviter/> invites you", {}, {
-                            inviter: () => <b>{ inviter.name || inviteSender }</b>,
+                            inviter: () => <b>{ inviter?.name || inviteSender }</b>,
                         }) }
                     </div>
                     { inviter ? <div className="mx_SpaceRoomView_preview_inviter_mxid">
@@ -243,7 +273,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
                     setBusy(true);
                     onJoinButtonClicked();
                 }}
-                disabled={!spacesEnabled}
+                disabled={!spacesEnabled || cannotJoin}
             >
                 { _t("Join") }
             </AccessibleButton>
@@ -254,8 +284,38 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         joinButtons = <InlineSpinner />;
     }
 
+    let footer;
+    if (!spacesEnabled) {
+        footer = <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
+            { myMembership === "join"
+                ? _t("To view this Space, hide communities in your <a>preferences</a>", {}, {
+                    a: sub => <AccessibleButton onClick={onPreferencesClick} kind="link">{ sub }</AccessibleButton>,
+                })
+                : _t("To join this Space, hide communities in your <a>preferences</a>", {}, {
+                    a: sub => <AccessibleButton onClick={onPreferencesClick} kind="link">{ sub }</AccessibleButton>,
+                })
+            }
+        </div>;
+    } else if (cannotJoin) {
+        footer = <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
+            { _t("To view %(spaceName)s, you need an invite", {
+                spaceName: space.name,
+            }) }
+        </div>;
+    }
+
+    let migratedCommunitySection: JSX.Element;
+    const createContent = space.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent();
+    if (createContent[CreateEventField]) {
+        migratedCommunitySection = <div className="mx_SpaceRoomView_preview_migratedCommunity">
+            { _t("Created from <Community />", {}, {
+                Community: () => <GroupTile groupId={createContent[CreateEventField]} />,
+            }) }
+        </div>;
+    }
+
     return <div className="mx_SpaceRoomView_preview">
-        <BetaPill onClick={onBetaClick} />
+        { migratedCommunitySection }
         { inviterSection }
         <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
         <h1 className="mx_SpaceRoomView_preview_name">
@@ -263,7 +323,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         </h1>
         <SpaceInfo space={space} />
         <RoomTopic room={space}>
-            {(topic, ref) =>
+            { (topic, ref) =>
                 <div className="mx_SpaceRoomView_preview_topic" ref={ref}>
                     { topic }
                 </div>
@@ -273,25 +333,11 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         <div className="mx_SpaceRoomView_preview_joinButtons">
             { joinButtons }
         </div>
-        { !spacesEnabled && <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
-            { myMembership === "join"
-                ? _t("To view %(spaceName)s, turn on the <a>Spaces beta</a>", {
-                    spaceName: space.name,
-                }, {
-                    a: sub => <AccessibleButton onClick={onBetaClick} kind="link">{ sub }</AccessibleButton>,
-                })
-                : _t("To join %(spaceName)s, turn on the <a>Spaces beta</a>", {
-                    spaceName: space.name,
-                }, {
-                    a: sub => <AccessibleButton onClick={onBetaClick} kind="link">{ sub }</AccessibleButton>,
-                })
-            }
-        </div> }
+        { footer }
     </div>;
 };
 
-const SpaceLandingAddButton = ({ space, onNewRoomAdded }) => {
-    const cli = useContext(MatrixClientContext);
+const SpaceLandingAddButton = ({ space }) => {
     const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
 
     let contextMenu;
@@ -314,25 +360,33 @@ const SpaceLandingAddButton = ({ space, onNewRoomAdded }) => {
                         e.stopPropagation();
                         closeMenu();
 
-                        if (await showCreateNewRoom(cli, space)) {
-                            onNewRoomAdded();
+                        if (await showCreateNewRoom(space)) {
+                            defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
                         }
                     }}
                 />
                 <IconizedContextMenuOption
                     label={_t("Add existing room")}
                     iconClassName="mx_RoomList_iconHash"
-                    onClick={async (e) => {
+                    onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
                         closeMenu();
-
-                        const [added] = await showAddExistingRooms(cli, space);
-                        if (added) {
-                            onNewRoomAdded();
-                        }
+                        showAddExistingRooms(space);
                     }}
                 />
+                <IconizedContextMenuOption
+                    label={_t("Add space")}
+                    iconClassName="mx_RoomList_iconPlus"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        closeMenu();
+                        showCreateNewSubspace(space);
+                    }}
+                >
+                    <BetaPill />
+                </IconizedContextMenuOption>
             </IconizedContextMenuOptionList>
         </IconizedContextMenu>;
     }
@@ -373,19 +427,17 @@ const SpaceLanding = ({ space }) => {
 
     const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
 
-    const [refreshToken, forceUpdate] = useStateToggle(false);
-
     let addRoomButton;
     if (canAddRooms) {
-        addRoomButton = <SpaceLandingAddButton space={space} onNewRoomAdded={forceUpdate} />;
+        addRoomButton = <SpaceLandingAddButton space={space} />;
     }
 
     let settingsButton;
-    if (shouldShowSpaceSettings(cli, space)) {
+    if (shouldShowSpaceSettings(space)) {
         settingsButton = <AccessibleTooltipButton
             className="mx_SpaceRoomView_landing_settingsButton"
             onClick={() => {
-                showSpaceSettings(cli, space);
+                showSpaceSettings(space);
             }}
             title={_t("Settings")}
         />;
@@ -400,15 +452,16 @@ const SpaceLanding = ({ space }) => {
     };
 
     return <div className="mx_SpaceRoomView_landing">
+        <SpaceFeedbackPrompt />
         <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
         <div className="mx_SpaceRoomView_landing_name">
             <RoomName room={space}>
-                {(name) => {
+                { (name) => {
                     const tags = { name: () => <div className="mx_SpaceRoomView_landing_nameRow">
                         <h1>{ name }</h1>
                     </div> };
                     return _t("Welcome to <name/>", {}, tags) as JSX.Element;
-                }}
+                } }
             </RoomName>
         </div>
         <div className="mx_SpaceRoomView_landing_info">
@@ -418,21 +471,14 @@ const SpaceLanding = ({ space }) => {
             { settingsButton }
         </div>
         <RoomTopic room={space}>
-            {(topic, ref) => (
+            { (topic, ref) => (
                 <div className="mx_SpaceRoomView_landing_topic" ref={ref}>
                     { topic }
                 </div>
-            )}
+            ) }
         </RoomTopic>
-        <SpaceFeedbackPrompt />
-        <hr />
 
-        <SpaceHierarchy
-            space={space}
-            showRoom={showRoom}
-            refreshToken={refreshToken}
-            additionalButtons={addRoomButton}
-        />
+        <SpaceHierarchy space={space} showRoom={showRoom} additionalButtons={addRoomButton} />
     </div>;
 };
 
@@ -442,7 +488,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
     const numFields = 3;
     const placeholders = [_t("General"), _t("Random"), _t("Support")];
     const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("Random"), ""]);
-    const fields = new Array(numFields).fill(0).map((_, i) => {
+    const fields = new Array(numFields).fill(0).map((x, i) => {
         const name = "roomName" + i;
         return <Field
             key={name}
@@ -454,6 +500,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
             onChange={ev => setRoomName(i, ev.target.value)}
             autoFocus={i === 2}
             disabled={busy}
+            autoComplete="off"
         />;
     });
 
@@ -463,11 +510,12 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
         setError("");
         setBusy(true);
         try {
+            const isPublic = space.getJoinRule() === JoinRule.Public;
             const filteredRoomNames = roomNames.map(name => name.trim()).filter(Boolean);
-            await Promise.all(filteredRoomNames.map(name => {
+            const roomIds = await Promise.all(filteredRoomNames.map(name => {
                 return createRoom({
                     createOpts: {
-                        preset: space.getJoinRule() === "public" ? Preset.PublicChat : Preset.PrivateChat,
+                        preset: isPublic ? Preset.PublicChat : Preset.PrivateChat,
                         name,
                     },
                     spinner: false,
@@ -475,9 +523,11 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
                     andView: false,
                     inlineErrors: true,
                     parentSpace: space,
+                    joinRule: !isPublic ? JoinRule.Restricted : undefined,
+                    suggested: true,
                 });
             }));
-            onFinished(filteredRoomNames.length > 0);
+            onFinished(roomIds[0]);
         } catch (e) {
             console.error("Failed to create initial space rooms", e);
             setError(_t("Failed to create initial space rooms"));
@@ -487,7 +537,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
 
     let onClick = (ev) => {
         ev.preventDefault();
-        onFinished(false);
+        onFinished();
     };
     let buttonLabel = _t("Skip for now");
     if (roomNames.some(name => name.trim())) {
@@ -515,7 +565,6 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
                 value={buttonLabel}
             />
         </div>
-        <SpaceFeedbackPrompt />
     </div>;
 };
 
@@ -534,17 +583,20 @@ const SpaceAddExistingRooms = ({ space, onFinished }) => {
                     { _t("Skip for now") }
                 </AccessibleButton>
             }
+            filterPlaceholder={_t("Search for rooms or spaces")}
             onFinished={onFinished}
+            roomsRenderer={defaultRoomsRenderer}
+            spacesRenderer={defaultSpacesRenderer}
+            dmsRenderer={defaultDmsRenderer}
         />
-
-        <div className="mx_SpaceRoomView_buttons">
-
-        </div>
-        <SpaceFeedbackPrompt />
     </div>;
 };
 
-const SpaceSetupPublicShare = ({ justCreatedOpts, space, onFinished, createdRooms }) => {
+interface ISpaceSetupPublicShareProps extends Pick<IProps & IState, "justCreatedOpts" | "space" | "firstRoomId"> {
+    onFinished(): void;
+}
+
+const SpaceSetupPublicShare = ({ justCreatedOpts, space, onFinished, firstRoomId }: ISpaceSetupPublicShareProps) => {
     return <div className="mx_SpaceRoomView_publicShare">
         <h1>{ _t("Share %(name)s", {
             name: justCreatedOpts?.createOpts?.name || space.name,
@@ -557,10 +609,9 @@ const SpaceSetupPublicShare = ({ justCreatedOpts, space, onFinished, createdRoom
 
         <div className="mx_SpaceRoomView_buttons">
             <AccessibleButton kind="primary" onClick={onFinished}>
-                { createdRooms ? _t("Go to my first room") : _t("Go to my space") }
+                { firstRoomId ? _t("Go to my first room") : _t("Go to my space") }
             </AccessibleButton>
         </div>
-        <SpaceFeedbackPrompt />
     </div>;
 };
 
@@ -575,19 +626,22 @@ const SpaceSetupPrivateScope = ({ space, justCreatedOpts, onFinished }) => {
 
         <AccessibleButton
             className="mx_SpaceRoomView_privateScope_justMeButton"
-            onClick={() => { onFinished(false) }}
+            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) }}
+            onClick={() => { onFinished(true); }}
         >
             <h3>{ _t("Me and my teammates") }</h3>
             <div>{ _t("A private space for you and your teammates") }</div>
         </AccessibleButton>
-        <SpaceFeedbackPrompt />
+        <div className="mx_SpaceRoomView_betaWarning">
+            <h3>{ _t("Teammates might not be able to view or join any private rooms you make.") }</h3>
+            <p>{ _t("We're working on this, but just want to let you know.") }</p>
+        </div>
     </div>;
 };
 
@@ -605,7 +659,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
     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 fields = new Array(numFields).fill(0).map((x, i) => {
         const name = "emailAddress" + i;
         return <Field
             key={name}
@@ -644,7 +698,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
 
             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);
+                logger.log("Failed to invite users to space: ", result);
                 setError(_t("Failed to invite the following users to your space: %(csvUsers)s", {
                     csvUsers: failedUsers.join(", "),
                 }));
@@ -665,7 +719,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
     let buttonLabel = _t("Skip for now");
     if (emailAddresses.some(name => name.trim())) {
         onClick = onNextClick;
-        buttonLabel = busy ? _t("Inviting...") : _t("Continue")
+        buttonLabel = busy ? _t("Inviting...") : _t("Continue");
     }
 
     return <div className="mx_SpaceRoomView_inviteTeammates">
@@ -675,7 +729,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
         </div>
 
         <div className="mx_SpaceRoomView_inviteTeammates_betaDisclaimer">
-            <BetaPill onClick={onBetaClick} />
+            <BetaPill />
             { _t("<b>This is an experimental feature.</b> For now, " +
                 "new users receiving an invite will have to open the invite on <link/> to actually join.", {}, {
                 b: sub => <b>{ sub }</b>,
@@ -710,7 +764,6 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
                 value={buttonLabel}
             />
         </div>
-        <SpaceFeedbackPrompt />
     </div>;
 };
 
@@ -764,6 +817,11 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
     };
 
     private onAction = (payload: ActionPayload) => {
+        if (payload.action === "view_room" && payload.room_id === this.props.space.roomId) {
+            this.setState({ phase: Phase.Landing });
+            return;
+        }
+
         if (payload.action !== Action.ViewUser && payload.action !== "view_3pid_invite") return;
 
         if (payload.action === Action.ViewUser && payload.member) {
@@ -794,35 +852,10 @@ 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];
+        if (this.state.firstRoomId) {
             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));
-        }
-
-        if (suggestedRooms.length) {
-            const room = suggestedRooms[0];
-            defaultDispatcher.dispatch({
-                action: "view_room",
-                room_id: room.room_id,
-                room_alias: room.canonical_alias || room.aliases?.[0],
-                via_servers: room.viaServers,
-                oobData: {
-                    avatarUrl: room.avatar_url,
-                    name: room.name || room.canonical_alias || room.aliases?.[0] || _t("Empty room"),
-                },
+                room_id: this.state.firstRoomId,
             });
             return;
         }
@@ -833,7 +866,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
     private renderBody() {
         switch (this.state.phase) {
             case Phase.Landing:
-                if (this.state.myMembership === "join" && SettingsStore.getValue("feature_spaces")) {
+                if (this.state.myMembership === "join" && SpaceStore.spacesEnabled) {
                     return <SpaceLanding space={this.props.space} />;
                 } else {
                     return <SpacePreview
@@ -852,14 +885,14 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                         _t("Let's create a room for each of them.") + "\n" +
                         _t("You can add more later too, including already existing ones.")
                     }
-                    onFinished={(createdRooms: boolean) => this.setState({ phase: Phase.PublicShare, createdRooms })}
+                    onFinished={(firstRoomId: string) => this.setState({ phase: Phase.PublicShare, firstRoomId })}
                 />;
             case Phase.PublicShare:
                 return <SpaceSetupPublicShare
                     justCreatedOpts={this.props.justCreatedOpts}
                     space={this.props.space}
                     onFinished={this.goToFirstRoom}
-                    createdRooms={this.state.createdRooms}
+                    firstRoomId={this.state.firstRoomId}
                 />;
 
             case Phase.PrivateScope:
@@ -881,7 +914,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                     title={_t("What projects are you working on?")}
                     description={_t("We'll create rooms for each of them. " +
                         "You can add more later too, including already existing ones.")}
-                    onFinished={(createdRooms: boolean) => this.setState({ phase: Phase.Landing, createdRooms })}
+                    onFinished={(firstRoomId: string) => this.setState({ phase: Phase.Landing, firstRoomId })}
                 />;
             case Phase.PrivateExistingRooms:
                 return <SpaceAddExistingRooms
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index 0097d55cf5..037c33a600 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -17,10 +17,11 @@ limitations under the License.
 */
 
 import * as React from "react";
-import {_t} from '../../languageHandler';
-import * as sdk from "../../index";
+import { _t } from '../../languageHandler';
 import AutoHideScrollbar from './AutoHideScrollbar';
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import classNames from "classnames";
+import AccessibleButton from "../views/elements/AccessibleButton";
 
 /**
  * Represents a tab for the TabbedView.
@@ -37,9 +38,16 @@ export class Tab {
     }
 }
 
+export enum TabLocation {
+    LEFT = 'left',
+    TOP = 'top',
+}
+
 interface IProps {
     tabs: Tab[];
     initialTabId?: string;
+    tabLocation: TabLocation;
+    onChange?: (tabId: string) => void;
 }
 
 interface IState {
@@ -62,7 +70,11 @@ export default class TabbedView extends React.Component<IProps, IState> {
         };
     }
 
-    private _getActiveTabIndex() {
+    static defaultProps = {
+        tabLocation: TabLocation.LEFT,
+    };
+
+    private getActiveTabIndex() {
         if (!this.state || !this.state.activeTabIndex) return 0;
         return this.state.activeTabIndex;
     }
@@ -72,34 +84,33 @@ export default class TabbedView extends React.Component<IProps, IState> {
      * @param {Tab} tab the tab to show
      * @private
      */
-    private _setActiveTab(tab: Tab) {
+    private setActiveTab(tab: Tab) {
         const idx = this.props.tabs.indexOf(tab);
         if (idx !== -1) {
-            this.setState({activeTabIndex: idx});
+            if (this.props.onChange) this.props.onChange(tab.id);
+            this.setState({ activeTabIndex: idx });
         } else {
             console.error("Could not find tab " + tab.label + " in tabs");
         }
     }
 
-    private _renderTabLabel(tab: Tab) {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
+    private renderTabLabel(tab: Tab) {
         let classes = "mx_TabbedView_tabLabel ";
 
         const idx = this.props.tabs.indexOf(tab);
-        if (idx === this._getActiveTabIndex()) classes += "mx_TabbedView_tabLabel_active";
+        if (idx === this.getActiveTabIndex()) classes += "mx_TabbedView_tabLabel_active";
 
         let tabIcon = null;
         if (tab.icon) {
             tabIcon = <span className={`mx_TabbedView_maskedIcon ${tab.icon}`} />;
         }
 
-        const onClickHandler = () => this._setActiveTab(tab);
+        const onClickHandler = () => this.setActiveTab(tab);
 
         const label = _t(tab.label);
         return (
             <AccessibleButton className={classes} key={"tab_label_" + tab.label} onClick={onClickHandler}>
-                {tabIcon}
+                { tabIcon }
                 <span className="mx_TabbedView_tabLabel_text">
                     { label }
                 </span>
@@ -107,26 +118,32 @@ export default class TabbedView extends React.Component<IProps, IState> {
         );
     }
 
-    private _renderTabPanel(tab: Tab): React.ReactNode {
+    private renderTabPanel(tab: Tab): React.ReactNode {
         return (
             <div className="mx_TabbedView_tabPanel" key={"mx_tabpanel_" + tab.label}>
                 <AutoHideScrollbar className='mx_TabbedView_tabPanelContent'>
-                    {tab.body}
+                    { tab.body }
                 </AutoHideScrollbar>
             </div>
         );
     }
 
     public render(): React.ReactNode {
-        const labels = this.props.tabs.map(tab => this._renderTabLabel(tab));
-        const panel = this._renderTabPanel(this.props.tabs[this._getActiveTabIndex()]);
+        const labels = this.props.tabs.map(tab => this.renderTabLabel(tab));
+        const panel = this.renderTabPanel(this.props.tabs[this.getActiveTabIndex()]);
+
+        const tabbedViewClasses = classNames({
+            'mx_TabbedView': true,
+            'mx_TabbedView_tabsOnLeft': this.props.tabLocation == TabLocation.LEFT,
+            'mx_TabbedView_tabsOnTop': this.props.tabLocation == TabLocation.TOP,
+        });
 
         return (
-            <div className="mx_TabbedView">
+            <div className={tabbedViewClasses}>
                 <div className="mx_TabbedView_tabLabels">
-                    {labels}
+                    { labels }
                 </div>
-                {panel}
+                { panel }
             </div>
         );
     }
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
new file mode 100644
index 0000000000..ccf9d9d416
--- /dev/null
+++ b/src/components/structures/ThreadPanel.tsx
@@ -0,0 +1,93 @@
+/*
+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 from 'react';
+import { MatrixEvent, Room } from 'matrix-js-sdk/src';
+import { Thread, ThreadEvent } from 'matrix-js-sdk/src/models/thread';
+
+import BaseCard from "../views/right_panel/BaseCard";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import { MatrixClientPeg } from '../../MatrixClientPeg';
+
+import ResizeNotifier from '../../utils/ResizeNotifier';
+import EventTile from '../views/rooms/EventTile';
+
+interface IProps {
+    roomId: string;
+    onClose: () => void;
+    resizeNotifier: ResizeNotifier;
+}
+
+interface IState {
+    threads?: Thread[];
+}
+
+@replaceableComponent("structures.ThreadView")
+export default class ThreadPanel extends React.Component<IProps, IState> {
+    private room: Room;
+
+    constructor(props: IProps) {
+        super(props);
+        this.room = MatrixClientPeg.get().getRoom(this.props.roomId);
+    }
+
+    public componentDidMount(): void {
+        this.room.on(ThreadEvent.Update, this.onThreadEventReceived);
+        this.room.on(ThreadEvent.Ready, this.onThreadEventReceived);
+    }
+
+    public componentWillUnmount(): void {
+        this.room.removeListener(ThreadEvent.Update, this.onThreadEventReceived);
+        this.room.removeListener(ThreadEvent.Ready, this.onThreadEventReceived);
+    }
+
+    private onThreadEventReceived = () => this.updateThreads();
+
+    private updateThreads = (callback?: () => void): void => {
+        this.setState({
+            threads: this.room.getThreads(),
+        }, callback);
+    };
+
+    private renderEventTile(event: MatrixEvent): JSX.Element {
+        return <EventTile
+            key={event.getId()}
+            mxEvent={event}
+            enableFlair={false}
+            showReadReceipts={false}
+            as="div"
+        />;
+    }
+
+    public render(): JSX.Element {
+        return (
+            <BaseCard
+                className="mx_ThreadPanel"
+                onClose={this.props.onClose}
+                previousPhase={RightPanelPhases.RoomSummary}
+            >
+                {
+                    this.state?.threads.map((thread: Thread) => {
+                        if (thread.ready) {
+                            return this.renderEventTile(thread.rootEvent);
+                        }
+                    })
+                }
+            </BaseCard>
+        );
+    }
+}
diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
new file mode 100644
index 0000000000..8fac538bbc
--- /dev/null
+++ b/src/components/structures/ThreadView.tsx
@@ -0,0 +1,199 @@
+/*
+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 from 'react';
+import { MatrixEvent, Room } from 'matrix-js-sdk/src';
+import { Thread, ThreadEvent } from 'matrix-js-sdk/src/models/thread';
+
+import BaseCard from "../views/right_panel/BaseCard";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+
+import ResizeNotifier from '../../utils/ResizeNotifier';
+import { TileShape } from '../views/rooms/EventTile';
+import MessageComposer from '../views/rooms/MessageComposer';
+import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
+import { Layout } from '../../settings/Layout';
+import TimelinePanel from './TimelinePanel';
+import dis from "../../dispatcher/dispatcher";
+import { ActionPayload } from '../../dispatcher/payloads';
+import { SetRightPanelPhasePayload } from '../../dispatcher/payloads/SetRightPanelPhasePayload';
+import { Action } from '../../dispatcher/actions';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
+import { E2EStatus } from '../../utils/ShieldUtils';
+import EditorStateTransfer from '../../utils/EditorStateTransfer';
+import RoomContext, { TimelineRenderingType } from '../../contexts/RoomContext';
+
+interface IProps {
+    room: Room;
+    onClose: () => void;
+    resizeNotifier: ResizeNotifier;
+    mxEvent: MatrixEvent;
+    permalinkCreator?: RoomPermalinkCreator;
+    e2eStatus?: E2EStatus;
+}
+
+interface IState {
+    replyToEvent?: MatrixEvent;
+    thread?: Thread;
+    editState?: EditorStateTransfer;
+
+}
+
+@replaceableComponent("structures.ThreadView")
+export default class ThreadView extends React.Component<IProps, IState> {
+    static contextType = RoomContext;
+
+    private dispatcherRef: string;
+    private timelinePanelRef: React.RefObject<TimelinePanel> = React.createRef();
+
+    constructor(props: IProps) {
+        super(props);
+        this.state = {};
+    }
+
+    public componentDidMount(): void {
+        this.setupThread(this.props.mxEvent);
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    public componentWillUnmount(): void {
+        this.teardownThread();
+        dis.unregister(this.dispatcherRef);
+    }
+
+    public componentDidUpdate(prevProps) {
+        if (prevProps.mxEvent !== this.props.mxEvent) {
+            this.teardownThread();
+            this.setupThread(this.props.mxEvent);
+        }
+
+        if (prevProps.room !== this.props.room) {
+            dis.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.RoomSummary,
+            });
+        }
+    }
+
+    private onAction = (payload: ActionPayload): void => {
+        if (payload.phase == RightPanelPhases.ThreadView && payload.event) {
+            if (payload.event !== this.props.mxEvent) {
+                this.teardownThread();
+                this.setupThread(payload.event);
+            }
+        }
+        switch (payload.action) {
+            case Action.EditEvent: {
+                // Quit early if it's not a thread context
+                if (payload.timelineRenderingType !== TimelineRenderingType.Thread) return;
+                // Quit early if that's not a thread event
+                if (payload.event && !payload.event.getThread()) return;
+                const editState = payload.event ? new EditorStateTransfer(payload.event) : null;
+                this.setState({ editState }, () => {
+                    if (payload.event) {
+                        this.timelinePanelRef.current?.scrollToEventIfNeeded(payload.event.getId());
+                    }
+                });
+                break;
+            }
+            default:
+                break;
+        }
+    };
+
+    private setupThread = (mxEv: MatrixEvent) => {
+        let thread = mxEv.getThread();
+        if (!thread) {
+            const client = MatrixClientPeg.get();
+            thread = new Thread([mxEv], this.props.room, client);
+            mxEv.setThread(thread);
+        }
+        thread.on(ThreadEvent.Update, this.updateThread);
+        thread.once(ThreadEvent.Ready, this.updateThread);
+        this.updateThread(thread);
+    };
+
+    private teardownThread = () => {
+        if (this.state.thread) {
+            this.state.thread.removeListener(ThreadEvent.Update, this.updateThread);
+            this.state.thread.removeListener(ThreadEvent.Ready, this.updateThread);
+        }
+    };
+
+    private updateThread = (thread?: Thread) => {
+        if (thread) {
+            this.setState({
+                thread,
+                replyToEvent: thread.replyToEvent,
+            });
+        }
+
+        this.timelinePanelRef.current?.refreshTimeline();
+    };
+
+    public render(): JSX.Element {
+        return (
+            <RoomContext.Provider value={{
+                ...this.context,
+                timelineRenderingType: TimelineRenderingType.Thread,
+                liveTimeline: this.state?.thread?.timelineSet?.getLiveTimeline(),
+            }}>
+
+                <BaseCard
+                    className="mx_ThreadView"
+                    onClose={this.props.onClose}
+                    previousPhase={RightPanelPhases.RoomSummary}
+                    withoutScrollContainer={true}
+                >
+                    { this.state.thread && (
+                        <TimelinePanel
+                            ref={this.timelinePanelRef}
+                            showReadReceipts={false} // No RR support in thread's MVP
+                            manageReadReceipts={false} // No RR support in thread's MVP
+                            manageReadMarkers={false} // No RM support in thread's MVP
+                            sendReadReceiptOnLoad={false} // No RR support in thread's MVP
+                            timelineSet={this.state?.thread?.timelineSet}
+                            showUrlPreview={true}
+                            tileShape={TileShape.Thread}
+                            empty={<div>empty</div>}
+                            alwaysShowTimestamps={true}
+                            layout={Layout.Group}
+                            hideThreadedMessages={false}
+                            hidden={false}
+                            showReactions={true}
+                            className="mx_RoomView_messagePanel mx_GroupLayout"
+                            permalinkCreator={this.props.permalinkCreator}
+                            membersLoaded={true}
+                            editState={this.state.editState}
+                        />
+                    ) }
+
+                    { this.state?.thread?.timelineSet && (<MessageComposer
+                        room={this.props.room}
+                        resizeNotifier={this.props.resizeNotifier}
+                        replyInThread={true}
+                        replyToEvent={this.state?.thread?.replyToEvent}
+                        showReplyPreview={false}
+                        permalinkCreator={this.props.permalinkCreator}
+                        e2eStatus={this.props.e2eStatus}
+                        compact={true}
+                    />) }
+                </BaseCard>
+            </RoomContext.Provider>
+        );
+    }
+}
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.tsx
similarity index 69%
rename from src/components/structures/TimelinePanel.js
rename to src/components/structures/TimelinePanel.tsx
index 6300c7532e..6924181132 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.tsx
@@ -1,8 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector Ltd
-Copyright 2019-2020 The Matrix.org Foundation C.I.C.
+Copyright 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.
@@ -17,38 +14,193 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import SettingsStore from "../../settings/SettingsStore";
-import {LayoutPropType} from "../../settings/Layout";
-import React, {createRef} from 'react';
+import React, { createRef, ReactNode, SyntheticEvent } from 'react';
 import ReactDOM from "react-dom";
-import PropTypes from 'prop-types';
-import {EventTimeline} from "matrix-js-sdk/src/models/event-timeline";
-import {TimelineWindow} from "matrix-js-sdk/src/timeline-window";
+import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventTimelineSet } from "matrix-js-sdk/src/models/event-timeline-set";
+import { Direction, EventTimeline } from "matrix-js-sdk/src/models/event-timeline";
+import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
+import { EventType, RelationType } from 'matrix-js-sdk/src/@types/event';
+import { SyncState } from 'matrix-js-sdk/src/sync.api';
+
+import SettingsStore from "../../settings/SettingsStore";
+import { Layout } from "../../settings/Layout";
 import { _t } from '../../languageHandler';
-import {MatrixClientPeg} from "../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import RoomContext from "../../contexts/RoomContext";
 import UserActivity from "../../UserActivity";
 import Modal from "../../Modal";
 import dis from "../../dispatcher/dispatcher";
-import * as sdk from "../../index";
 import { Key } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
-import EditorStateTransfer from '../../utils/EditorStateTransfer';
-import {haveTileForEvent} from "../views/rooms/EventTile";
-import {UIFeature} from "../../settings/UIFeature";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { haveTileForEvent, TileShape } from "../views/rooms/EventTile";
+import { UIFeature } from "../../settings/UIFeature";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 import { arrayFastClone } from "../../utils/arrays";
+import MessagePanel from "./MessagePanel";
+import { IScrollState } from "./ScrollPanel";
+import { ActionPayload } from "../../dispatcher/payloads";
+import ResizeNotifier from "../../utils/ResizeNotifier";
+import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
+import Spinner from "../views/elements/Spinner";
+import EditorStateTransfer from '../../utils/EditorStateTransfer';
+import ErrorDialog from '../views/dialogs/ErrorDialog';
+import { debounce } from 'lodash';
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const PAGINATE_SIZE = 20;
 const INITIAL_SIZE = 20;
 const READ_RECEIPT_INTERVAL_MS = 500;
 
+const READ_MARKER_DEBOUNCE_MS = 100;
+
 const DEBUG = false;
 
-let debuglog = function() {};
+let debuglog = function(...s: any[]) {};
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console
-    debuglog = console.log.bind(console);
+    debuglog = logger.log.bind(console);
+}
+
+interface IProps {
+    // The js-sdk EventTimelineSet object for the timeline sequence we are
+    // representing.  This may or may not have a room, depending on what it's
+    // a timeline representing.  If it has a room, we maintain RRs etc for
+    // that room.
+    timelineSet: EventTimelineSet;
+    showReadReceipts?: boolean;
+    // Enable managing RRs and RMs. These require the timelineSet to have a room.
+    manageReadReceipts?: boolean;
+    sendReadReceiptOnLoad?: boolean;
+    manageReadMarkers?: boolean;
+
+    // true to give the component a 'display: none' style.
+    hidden?: boolean;
+
+    // ID of an event to highlight. If undefined, no event will be highlighted.
+    // typically this will be either 'eventId' or undefined.
+    highlightedEventId?: string;
+
+    // id of an event to jump to. If not given, will go to the end of the live timeline.
+    eventId?: string;
+
+    // where to position the event given by eventId, in pixels from the bottom of the viewport.
+    // If not given, will try to put the event half way down the viewport.
+    eventPixelOffset?: number;
+
+    // Should we show URL Previews
+    showUrlPreview?: boolean;
+
+    // maximum number of events to show in a timeline
+    timelineCap?: number;
+
+    // classname to use for the messagepanel
+    className?: string;
+
+    // shape property to be passed to EventTiles
+    tileShape?: TileShape;
+
+    // placeholder to use if the timeline is empty
+    empty?: ReactNode;
+
+    // whether to show reactions for an event
+    showReactions?: boolean;
+
+    // which layout to use
+    layout?: Layout;
+
+    // whether to always show timestamps for an event
+    alwaysShowTimestamps?: boolean;
+
+    resizeNotifier?: ResizeNotifier;
+    editState?: EditorStateTransfer;
+    permalinkCreator?: RoomPermalinkCreator;
+    membersLoaded?: boolean;
+
+    // callback which is called when the panel is scrolled.
+    onScroll?(event: Event): void;
+
+    // callback which is called when the user interacts with the room timeline
+    onUserScroll?(event: SyntheticEvent): void;
+
+    // callback which is called when the read-up-to mark is updated.
+    onReadMarkerUpdated?(): void;
+
+    // callback which is called when we wish to paginate the timeline window.
+    onPaginationRequest?(timelineWindow: TimelineWindow, direction: string, size: number): Promise<boolean>;
+
+    hideThreadedMessages?: boolean;
+}
+
+interface IState {
+    events: MatrixEvent[];
+    liveEvents: MatrixEvent[];
+    // track whether our room timeline is loading
+    timelineLoading: boolean;
+
+    // the index of the first event that is to be shown
+    firstVisibleEventIndex: number;
+
+    // canBackPaginate == false may mean:
+    //
+    // * we haven't (successfully) loaded the timeline yet, or:
+    //
+    // * we have got to the point where the room was created, or:
+    //
+    // * the server indicated that there were no more visible events
+    //  (normally implying we got to the start of the room), or:
+    //
+    // * we gave up asking the server for more events
+    canBackPaginate: boolean;
+
+    // canForwardPaginate == false may mean:
+    //
+    // * we haven't (successfully) loaded the timeline yet
+    //
+    // * we have got to the end of time and are now tracking the live
+    //   timeline, or:
+    //
+    // * the server indicated that there were no more visible events
+    //   (not sure if this ever happens when we're not at the live
+    //   timeline), or:
+    //
+    // * we are looking at some historical point, but gave up asking
+    //   the server for more events
+    canForwardPaginate: boolean;
+
+    // start with the read-marker visible, so that we see its animated
+    // disappearance when switching into the room.
+    readMarkerVisible: boolean;
+
+    readMarkerEventId: string;
+
+    backPaginating: boolean;
+    forwardPaginating: boolean;
+
+    // cache of matrixClient.getSyncState() (but from the 'sync' event)
+    clientSyncState: SyncState;
+
+    // should the event tiles have twelve hour times
+    isTwelveHour: boolean;
+
+    // always show timestamps on event tiles?
+    alwaysShowTimestamps: boolean;
+
+    // how long to show the RM for when it's visible in the window
+    readMarkerInViewThresholdMs: number;
+
+    // how long to show the RM for when it's scrolled off-screen
+    readMarkerOutOfViewThresholdMs: number;
+
+    editState?: EditorStateTransfer;
+}
+
+interface IEventIndexOpts {
+    ignoreOwn?: boolean;
+    allowPartial?: boolean;
 }
 
 /*
@@ -57,73 +209,11 @@ 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
-        // representing.  This may or may not have a room, depending on what it's
-        // a timeline representing.  If it has a room, we maintain RRs etc for
-        // that room.
-        timelineSet: PropTypes.object.isRequired,
-
-        showReadReceipts: PropTypes.bool,
-        // Enable managing RRs and RMs. These require the timelineSet to have a room.
-        manageReadReceipts: PropTypes.bool,
-        sendReadReceiptOnLoad: PropTypes.bool,
-        manageReadMarkers: PropTypes.bool,
-
-        // true to give the component a 'display: none' style.
-        hidden: PropTypes.bool,
-
-        // ID of an event to highlight. If undefined, no event will be highlighted.
-        // typically this will be either 'eventId' or undefined.
-        highlightedEventId: PropTypes.string,
-
-        // id of an event to jump to. If not given, will go to the end of the
-        // live timeline.
-        eventId: PropTypes.string,
-
-        // where to position the event given by eventId, in pixels from the
-        // bottom of the viewport. If not given, will try to put the event
-        // half way down the viewport.
-        eventPixelOffset: PropTypes.number,
-
-        // Should we show URL Previews
-        showUrlPreview: PropTypes.bool,
-
-        // callback which is called when the panel is scrolled.
-        onScroll: PropTypes.func,
-
-        // callback which is called when the user interacts with the room timeline
-        onUserScroll: PropTypes.func,
-
-        // callback which is called when the read-up-to mark is updated.
-        onReadMarkerUpdated: PropTypes.func,
-
-        // callback which is called when we wish to paginate the timeline
-        // window.
-        onPaginationRequest: PropTypes.func,
-
-        // maximum number of events to show in a timeline
-        timelineCap: PropTypes.number,
-
-        // classname to use for the messagepanel
-        className: PropTypes.string,
-
-        // shape property to be passed to EventTiles
-        tileShape: PropTypes.string,
-
-        // placeholder to use if the timeline is empty
-        empty: PropTypes.node,
-
-        // whether to show reactions for an event
-        showReactions: PropTypes.bool,
-
-        // which layout to use
-        layout: LayoutPropType,
-    }
+class TimelinePanel extends React.Component<IProps, IState> {
+    static contextType = RoomContext;
 
     // a map from room id to read marker event timestamp
-    static roomReadMarkerTsMap = {};
+    static roomReadMarkerTsMap: Record<string, number> = {};
 
     static defaultProps = {
         // By default, disable the timelineCap in favour of unpaginating based on
@@ -131,18 +221,24 @@ class TimelinePanel extends React.Component {
         timelineCap: Number.MAX_VALUE,
         className: 'mx_RoomView_messagePanel',
         sendReadReceiptOnLoad: true,
+        hideThreadedMessages: true,
     };
 
-    constructor(props) {
-        super(props);
+    private lastRRSentEventId: string = undefined;
+    private lastRMSentEventId: string = undefined;
+
+    private readonly messagePanel = createRef<MessagePanel>();
+    private readonly dispatcherRef: string;
+    private timelineWindow?: TimelineWindow;
+    private unmounted = false;
+    private readReceiptActivityTimer: Timer;
+    private readMarkerActivityTimer: Timer;
+
+    constructor(props, context) {
+        super(props, context);
 
         debuglog("TimelinePanel: mounting");
 
-        this.lastRRSentEventId = undefined;
-        this.lastRMSentEventId = undefined;
-
-        this._messagePanel = createRef();
-
         // XXX: we could track RM per TimelineSet rather than per Room.
         // but for now we just do it per room for simplicity.
         let initialReadMarker = null;
@@ -151,86 +247,45 @@ class TimelinePanel extends React.Component {
             if (readmarker) {
                 initialReadMarker = readmarker.getContent().event_id;
             } else {
-                initialReadMarker = this._getCurrentReadReceipt();
+                initialReadMarker = this.getCurrentReadReceipt();
             }
         }
 
         this.state = {
             events: [],
             liveEvents: [],
-            timelineLoading: true, // track whether our room timeline is loading
-
-            // the index of the first event that is to be shown
+            timelineLoading: true,
             firstVisibleEventIndex: 0,
-
-            // canBackPaginate == false may mean:
-            //
-            // * we haven't (successfully) loaded the timeline yet, or:
-            //
-            // * we have got to the point where the room was created, or:
-            //
-            // * the server indicated that there were no more visible events
-            //  (normally implying we got to the start of the room), or:
-            //
-            // * we gave up asking the server for more events
             canBackPaginate: false,
-
-            // canForwardPaginate == false may mean:
-            //
-            // * we haven't (successfully) loaded the timeline yet
-            //
-            // * we have got to the end of time and are now tracking the live
-            //   timeline, or:
-            //
-            // * the server indicated that there were no more visible events
-            //   (not sure if this ever happens when we're not at the live
-            //   timeline), or:
-            //
-            // * we are looking at some historical point, but gave up asking
-            //   the server for more events
             canForwardPaginate: false,
-
-            // start with the read-marker visible, so that we see its animated
-            // disappearance when switching into the room.
             readMarkerVisible: true,
-
             readMarkerEventId: initialReadMarker,
-
             backPaginating: false,
             forwardPaginating: false,
-
-            // cache of matrixClient.getSyncState() (but from the 'sync' event)
             clientSyncState: MatrixClientPeg.get().getSyncState(),
-
-            // should the event tiles have twelve hour times
             isTwelveHour: SettingsStore.getValue("showTwelveHourTimestamps"),
-
-            // always show timestamps on event tiles?
             alwaysShowTimestamps: SettingsStore.getValue("alwaysShowTimestamps"),
-
-            // how long to show the RM for when it's visible in the window
             readMarkerInViewThresholdMs: SettingsStore.getValue("readMarkerInViewThresholdMs"),
-
-            // how long to show the RM for when it's scrolled off-screen
             readMarkerOutOfViewThresholdMs: SettingsStore.getValue("readMarkerOutOfViewThresholdMs"),
         };
 
         this.dispatcherRef = dis.register(this.onAction);
-        MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
-        MatrixClientPeg.get().on("Room.timelineReset", this.onRoomTimelineReset);
-        MatrixClientPeg.get().on("Room.redaction", this.onRoomRedaction);
+        const cli = MatrixClientPeg.get();
+        cli.on("Room.timeline", this.onRoomTimeline);
+        cli.on("Room.timelineReset", this.onRoomTimelineReset);
+        cli.on("Room.redaction", this.onRoomRedaction);
         // same event handler as Room.redaction as for both we just do forceUpdate
-        MatrixClientPeg.get().on("Room.redactionCancelled", this.onRoomRedaction);
-        MatrixClientPeg.get().on("Room.receipt", this.onRoomReceipt);
-        MatrixClientPeg.get().on("Room.localEchoUpdated", this.onLocalEchoUpdated);
-        MatrixClientPeg.get().on("Room.accountData", this.onAccountData);
-        MatrixClientPeg.get().on("Event.decrypted", this.onEventDecrypted);
-        MatrixClientPeg.get().on("Event.replaced", this.onEventReplaced);
-        MatrixClientPeg.get().on("sync", this.onSync);
+        cli.on("Room.redactionCancelled", this.onRoomRedaction);
+        cli.on("Room.receipt", this.onRoomReceipt);
+        cli.on("Room.localEchoUpdated", this.onLocalEchoUpdated);
+        cli.on("Room.accountData", this.onAccountData);
+        cli.on("Event.decrypted", this.onEventDecrypted);
+        cli.on("Event.replaced", this.onEventReplaced);
+        cli.on("sync", this.onSync);
     }
 
     // TODO: [REACT-WARNING] Move into constructor
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillMount() {
         if (this.props.manageReadReceipts) {
             this.updateReadReceiptOnUserActivity();
@@ -239,11 +294,11 @@ class TimelinePanel extends React.Component {
             this.updateReadMarkerOnUserActivity();
         }
 
-        this._initTimeline(this.props);
+        this.initTimeline(this.props);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.timelineSet !== this.props.timelineSet) {
             // throw new Error("changing timelineSet on a TimelinePanel is not supported");
@@ -263,9 +318,9 @@ class TimelinePanel extends React.Component {
         const differentEventId = newProps.eventId != this.props.eventId;
         const differentHighlightedEventId = newProps.highlightedEventId != this.props.highlightedEventId;
         if (differentEventId || differentHighlightedEventId) {
-            console.log("TimelinePanel switching to eventId " + newProps.eventId +
+            logger.log("TimelinePanel switching to eventId " + newProps.eventId +
                         " (was " + this.props.eventId + ")");
-            return this._initTimeline(newProps);
+            return this.initTimeline(newProps);
         }
     }
 
@@ -275,13 +330,13 @@ class TimelinePanel extends React.Component {
         //
         // (We could use isMounted, but facebook have deprecated that.)
         this.unmounted = true;
-        if (this._readReceiptActivityTimer) {
-            this._readReceiptActivityTimer.abort();
-            this._readReceiptActivityTimer = null;
+        if (this.readReceiptActivityTimer) {
+            this.readReceiptActivityTimer.abort();
+            this.readReceiptActivityTimer = null;
         }
-        if (this._readMarkerActivityTimer) {
-            this._readMarkerActivityTimer.abort();
-            this._readMarkerActivityTimer = null;
+        if (this.readMarkerActivityTimer) {
+            this.readMarkerActivityTimer.abort();
+            this.readMarkerActivityTimer = null;
         }
 
         dis.unregister(this.dispatcherRef);
@@ -301,7 +356,7 @@ class TimelinePanel extends React.Component {
         }
     }
 
-    onMessageListUnfillRequest = (backwards, scrollToken) => {
+    private onMessageListUnfillRequest = (backwards: boolean, scrollToken: string): void => {
         // If backwards, unpaginate from the back (i.e. the start of the timeline)
         const dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
         debuglog("TimelinePanel: unpaginating events in direction", dir);
@@ -320,21 +375,30 @@ class TimelinePanel extends React.Component {
 
         if (count > 0) {
             debuglog("TimelinePanel: Unpaginating", count, "in direction", dir);
-            this._timelineWindow.unpaginate(count, backwards);
+            this.timelineWindow.unpaginate(count, backwards);
 
-            // We can now paginate in the unpaginated direction
-            const canPaginateKey = (backwards) ? 'canBackPaginate' : 'canForwardPaginate';
-            const { events, liveEvents, firstVisibleEventIndex } = this._getEvents();
-            this.setState({
-                [canPaginateKey]: true,
+            const { events, liveEvents, firstVisibleEventIndex } = this.getEvents();
+            const newState: Partial<IState> = {
                 events,
                 liveEvents,
                 firstVisibleEventIndex,
-            });
+            };
+
+            // We can now paginate in the unpaginated direction
+            if (backwards) {
+                newState.canBackPaginate = true;
+            } else {
+                newState.canForwardPaginate = true;
+            }
+            this.setState<null>(newState);
         }
     };
 
-    onPaginationRequest = (timelineWindow, direction, size) => {
+    private onPaginationRequest = (
+        timelineWindow: TimelineWindow,
+        direction: Direction,
+        size: number,
+    ): Promise<boolean> => {
         if (this.props.onPaginationRequest) {
             return this.props.onPaginationRequest(timelineWindow, direction, size);
         } else {
@@ -343,8 +407,8 @@ class TimelinePanel extends React.Component {
     };
 
     // set off a pagination request.
-    onMessageListFillRequest = backwards => {
-        if (!this._shouldPaginate()) return Promise.resolve(false);
+    private onMessageListFillRequest = (backwards: boolean): Promise<boolean> => {
+        if (!this.shouldPaginate()) return Promise.resolve(false);
 
         const dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
         const canPaginateKey = backwards ? 'canBackPaginate' : 'canForwardPaginate';
@@ -355,9 +419,9 @@ class TimelinePanel extends React.Component {
             return Promise.resolve(false);
         }
 
-        if (!this._timelineWindow.canPaginate(dir)) {
+        if (!this.timelineWindow.canPaginate(dir)) {
             debuglog("TimelinePanel: can't", dir, "paginate any further");
-            this.setState({[canPaginateKey]: false});
+            this.setState<null>({ [canPaginateKey]: false });
             return Promise.resolve(false);
         }
 
@@ -367,15 +431,15 @@ class TimelinePanel extends React.Component {
         }
 
         debuglog("TimelinePanel: Initiating paginate; backwards:"+backwards);
-        this.setState({[paginatingKey]: true});
+        this.setState<null>({ [paginatingKey]: true });
 
-        return this.onPaginationRequest(this._timelineWindow, dir, PAGINATE_SIZE).then((r) => {
+        return this.onPaginationRequest(this.timelineWindow, dir, PAGINATE_SIZE).then((r) => {
             if (this.unmounted) { return; }
 
             debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r);
 
-            const { events, liveEvents, firstVisibleEventIndex } = this._getEvents();
-            const newState = {
+            const { events, liveEvents, firstVisibleEventIndex } = this.getEvents();
+            const newState: Partial<IState> = {
                 [paginatingKey]: false,
                 [canPaginateKey]: r,
                 events,
@@ -388,7 +452,7 @@ class TimelinePanel extends React.Component {
             const otherDirection = backwards ? EventTimeline.FORWARDS : EventTimeline.BACKWARDS;
             const canPaginateOtherWayKey = backwards ? 'canForwardPaginate' : 'canBackPaginate';
             if (!this.state[canPaginateOtherWayKey] &&
-                    this._timelineWindow.canPaginate(otherDirection)) {
+                    this.timelineWindow.canPaginate(otherDirection)) {
                 debuglog('TimelinePanel: can now', otherDirection, 'paginate again');
                 newState[canPaginateOtherWayKey] = true;
             }
@@ -399,9 +463,9 @@ class TimelinePanel extends React.Component {
             // has in memory because we never gave the component a chance to scroll
             // itself into the right place
             return new Promise((resolve) => {
-                this.setState(newState, () => {
+                this.setState<null>(newState, () => {
                     // we can continue paginating in the given direction if:
-                    // - _timelineWindow.paginate says we can
+                    // - timelineWindow.paginate says we can
                     // - we're paginating forwards, or we won't be trying to
                     //   paginate backwards past the first visible event
                     resolve(r && (!backwards || firstVisibleEventIndex === 0));
@@ -410,48 +474,59 @@ class TimelinePanel extends React.Component {
         });
     };
 
-    onMessageListScroll = e => {
+    private onMessageListScroll = e => {
         if (this.props.onScroll) {
             this.props.onScroll(e);
         }
 
         if (this.props.manageReadMarkers) {
-            const rmPosition = this.getReadMarkerPosition();
-            // we hide the read marker when it first comes onto the screen, but if
-            // it goes back off the top of the screen (presumably because the user
-            // clicks on the 'jump to bottom' button), we need to re-enable it.
-            if (rmPosition < 0) {
-                this.setState({readMarkerVisible: true});
-            }
-
-            // if read marker position goes between 0 and -1/1,
-            // (and user is active), switch timeout
-            const timeout = this._readMarkerTimeout(rmPosition);
-            // NO-OP when timeout already has set to the given value
-            this._readMarkerActivityTimer.changeTimeout(timeout);
+            this.doManageReadMarkers();
         }
     };
 
-    onAction = payload => {
-        if (payload.action === 'ignore_state_changed') {
-            this.forceUpdate();
+    /*
+     * Debounced function to manage read markers because we don't need to
+     * do this on every tiny scroll update. It also sets state which causes
+     * a component update, which can in turn reset the scroll position, so
+     * it's important we allow the browser to scroll a bit before running this
+     * (hence trailing edge only and debounce rather than throttle because
+     * we really only need to update this once the user has finished scrolling,
+     * not periodically while they scroll).
+     */
+    private doManageReadMarkers = debounce(() => {
+        const rmPosition = this.getReadMarkerPosition();
+        // we hide the read marker when it first comes onto the screen, but if
+        // it goes back off the top of the screen (presumably because the user
+        // clicks on the 'jump to bottom' button), we need to re-enable it.
+        if (rmPosition < 0) {
+            this.setState({ readMarkerVisible: true });
         }
-        if (payload.action === "edit_event") {
-            const editState = payload.event ? new EditorStateTransfer(payload.event) : null;
-            this.setState({editState}, () => {
-                if (payload.event && this._messagePanel.current) {
-                    this._messagePanel.current.scrollToEventIfNeeded(
-                        payload.event.getId(),
-                    );
-                }
-            });
-        }
-        if (payload.action === "scroll_to_bottom") {
-            this.jumpToLiveTimeline();
+
+        // if read marker position goes between 0 and -1/1,
+        // (and user is active), switch timeout
+        const timeout = this.readMarkerTimeout(rmPosition);
+        // NO-OP when timeout already has set to the given value
+        this.readMarkerActivityTimer.changeTimeout(timeout);
+    }, READ_MARKER_DEBOUNCE_MS, { leading: false, trailing: true });
+
+    private onAction = (payload: ActionPayload): void => {
+        switch (payload.action) {
+            case "ignore_state_changed":
+                this.forceUpdate();
+                break;
         }
     };
 
-    onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => {
+    private onRoomTimeline = (
+        ev: MatrixEvent,
+        room: Room,
+        toStartOfTimeline: boolean,
+        removed: boolean,
+        data: {
+            timeline: EventTimeline;
+            liveEvent?: boolean;
+        },
+    ): void => {
         // ignore events for other timeline sets
         if (data.timeline.getTimelineSet() !== this.props.timelineSet) return;
 
@@ -459,13 +534,13 @@ class TimelinePanel extends React.Component {
         // updates from pagination will happen when the paginate completes.
         if (toStartOfTimeline || !data || !data.liveEvent) return;
 
-        if (!this._messagePanel.current) return;
+        if (!this.messagePanel.current) return;
 
-        if (!this._messagePanel.current.getScrollState().stuckAtBottom) {
+        if (!this.messagePanel.current.getScrollState().stuckAtBottom) {
             // we won't load this event now, because we don't want to push any
             // events off the other end of the timeline. But we need to note
             // that we can now paginate.
-            this.setState({canForwardPaginate: true});
+            this.setState({ canForwardPaginate: true });
             return;
         }
 
@@ -478,13 +553,13 @@ class TimelinePanel extends React.Component {
         // timeline window.
         //
         // see https://github.com/vector-im/vector-web/issues/1035
-        this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
+        this.timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
             if (this.unmounted) { return; }
 
-            const { events, liveEvents, firstVisibleEventIndex } = this._getEvents();
+            const { events, liveEvents, firstVisibleEventIndex } = this.getEvents();
             const lastLiveEvent = liveEvents[liveEvents.length - 1];
 
-            const updatedState = {
+            const updatedState: Partial<IState> = {
                 events,
                 liveEvents,
                 firstVisibleEventIndex,
@@ -501,23 +576,22 @@ class TimelinePanel extends React.Component {
                 // more than the timeout on userActiveRecently.
                 //
                 const myUserId = MatrixClientPeg.get().credentials.userId;
-                const sender = ev.sender ? ev.sender.userId : null;
                 callRMUpdated = false;
-                if (sender != myUserId && !UserActivity.sharedInstance().userActiveRecently()) {
+                if (ev.getSender() !== myUserId && !UserActivity.sharedInstance().userActiveRecently()) {
                     updatedState.readMarkerVisible = true;
                 } else if (lastLiveEvent && this.getReadMarkerPosition() === 0) {
                     // we know we're stuckAtBottom, so we can advance the RM
                     // immediately, to save a later render cycle
 
-                    this._setReadMarker(lastLiveEvent.getId(), lastLiveEvent.getTs(), true);
+                    this.setReadMarker(lastLiveEvent.getId(), lastLiveEvent.getTs(), true);
                     updatedState.readMarkerVisible = false;
                     updatedState.readMarkerEventId = lastLiveEvent.getId();
                     callRMUpdated = true;
                 }
             }
 
-            this.setState(updatedState, () => {
-                this._messagePanel.current.updateTimelineMinHeight();
+            this.setState<null>(updatedState, () => {
+                this.messagePanel.current.updateTimelineMinHeight();
                 if (callRMUpdated) {
                     this.props.onReadMarkerUpdated();
                 }
@@ -525,17 +599,17 @@ class TimelinePanel extends React.Component {
         });
     };
 
-    onRoomTimelineReset = (room, timelineSet) => {
+    private onRoomTimelineReset = (room: Room, timelineSet: EventTimelineSet): void => {
         if (timelineSet !== this.props.timelineSet) return;
 
-        if (this._messagePanel.current && this._messagePanel.current.isAtBottom()) {
-            this._loadTimeline();
+        if (this.messagePanel.current && this.messagePanel.current.isAtBottom()) {
+            this.loadTimeline();
         }
     };
 
-    canResetTimeline = () => this._messagePanel.current && this._messagePanel.current.isAtBottom();
+    public canResetTimeline = () => this.messagePanel?.current.isAtBottom();
 
-    onRoomRedaction = (ev, room) => {
+    private onRoomRedaction = (ev: MatrixEvent, room: Room): void => {
         if (this.unmounted) return;
 
         // ignore events for other rooms
@@ -546,7 +620,7 @@ class TimelinePanel extends React.Component {
         this.forceUpdate();
     };
 
-    onEventReplaced = (replacedEvent, room) => {
+    private onEventReplaced = (replacedEvent: MatrixEvent, room: Room): void => {
         if (this.unmounted) return;
 
         // ignore events for other rooms
@@ -557,7 +631,7 @@ class TimelinePanel extends React.Component {
         this.forceUpdate();
     };
 
-    onRoomReceipt = (ev, room) => {
+    private onRoomReceipt = (ev: MatrixEvent, room: Room): void => {
         if (this.unmounted) return;
 
         // ignore events for other rooms
@@ -566,22 +640,22 @@ class TimelinePanel extends React.Component {
         this.forceUpdate();
     };
 
-    onLocalEchoUpdated = (ev, room, oldEventId) => {
+    private onLocalEchoUpdated = (ev: MatrixEvent, room: Room, oldEventId: string): void => {
         if (this.unmounted) return;
 
         // ignore events for other rooms
         if (room !== this.props.timelineSet.room) return;
 
-        this._reloadEvents();
+        this.reloadEvents();
     };
 
-    onAccountData = (ev, room) => {
+    private onAccountData = (ev: MatrixEvent, room: Room): void => {
         if (this.unmounted) return;
 
         // ignore events for other rooms
         if (room !== this.props.timelineSet.room) return;
 
-        if (ev.getType() !== "m.fully_read") return;
+        if (ev.getType() !== EventType.FullyRead) return;
 
         // XXX: roomReadMarkerTsMap not updated here so it is now inconsistent. Replace
         // this mechanism of determining where the RM is relative to the view-port with
@@ -591,7 +665,7 @@ class TimelinePanel extends React.Component {
         }, this.props.onReadMarkerUpdated);
     };
 
-    onEventDecrypted = ev => {
+    private onEventDecrypted = (ev: MatrixEvent): void => {
         // Can be null for the notification timeline, etc.
         if (!this.props.timelineSet.room) return;
 
@@ -606,46 +680,46 @@ class TimelinePanel extends React.Component {
         }
     };
 
-    onSync = (state, prevState, data) => {
-        this.setState({clientSyncState: state});
+    private onSync = (clientSyncState: SyncState, prevState: SyncState, data: object): void => {
+        this.setState({ clientSyncState });
     };
 
-    _readMarkerTimeout(readMarkerPosition) {
+    private readMarkerTimeout(readMarkerPosition: number): number {
         return readMarkerPosition === 0 ?
-            this.state.readMarkerInViewThresholdMs :
-            this.state.readMarkerOutOfViewThresholdMs;
+            this.context?.readMarkerInViewThresholdMs ?? this.state.readMarkerInViewThresholdMs :
+            this.context?.readMarkerOutOfViewThresholdMs ?? this.state.readMarkerOutOfViewThresholdMs;
     }
 
-    async updateReadMarkerOnUserActivity() {
-        const initialTimeout = this._readMarkerTimeout(this.getReadMarkerPosition());
-        this._readMarkerActivityTimer = new Timer(initialTimeout);
+    private async updateReadMarkerOnUserActivity(): Promise<void> {
+        const initialTimeout = this.readMarkerTimeout(this.getReadMarkerPosition());
+        this.readMarkerActivityTimer = new Timer(initialTimeout);
 
-        while (this._readMarkerActivityTimer) { //unset on unmount
-            UserActivity.sharedInstance().timeWhileActiveRecently(this._readMarkerActivityTimer);
+        while (this.readMarkerActivityTimer) { //unset on unmount
+            UserActivity.sharedInstance().timeWhileActiveRecently(this.readMarkerActivityTimer);
             try {
-                await this._readMarkerActivityTimer.finished();
+                await this.readMarkerActivityTimer.finished();
             } catch (e) { continue; /* aborted */ }
             // outside of try/catch to not swallow errors
             this.updateReadMarker();
         }
     }
 
-    async updateReadReceiptOnUserActivity() {
-        this._readReceiptActivityTimer = new Timer(READ_RECEIPT_INTERVAL_MS);
-        while (this._readReceiptActivityTimer) { //unset on unmount
-            UserActivity.sharedInstance().timeWhileActiveNow(this._readReceiptActivityTimer);
+    private async updateReadReceiptOnUserActivity(): Promise<void> {
+        this.readReceiptActivityTimer = new Timer(READ_RECEIPT_INTERVAL_MS);
+        while (this.readReceiptActivityTimer) { //unset on unmount
+            UserActivity.sharedInstance().timeWhileActiveNow(this.readReceiptActivityTimer);
             try {
-                await this._readReceiptActivityTimer.finished();
+                await this.readReceiptActivityTimer.finished();
             } catch (e) { continue; /* aborted */ }
             // outside of try/catch to not swallow errors
             this.sendReadReceipt();
         }
     }
 
-    sendReadReceipt = () => {
+    private sendReadReceipt = (): void => {
         if (SettingsStore.getValue("lowBandwidth")) return;
 
-        if (!this._messagePanel.current) return;
+        if (!this.messagePanel.current) return;
         if (!this.props.manageReadReceipts) return;
         // This happens on user_activity_end which is delayed, and it's
         // very possible have logged out within that timeframe, so check
@@ -656,8 +730,8 @@ class TimelinePanel extends React.Component {
 
         let shouldSendRR = true;
 
-        const currentRREventId = this._getCurrentReadReceipt(true);
-        const currentRREventIndex = this._indexForEventId(currentRREventId);
+        const currentRREventId = this.getCurrentReadReceipt(true);
+        const currentRREventIndex = this.indexForEventId(currentRREventId);
         // We want to avoid sending out read receipts when we are looking at
         // events in the past which are before the latest RR.
         //
@@ -672,11 +746,11 @@ class TimelinePanel extends React.Component {
         // the user eventually hits the live timeline.
         //
         if (currentRREventId && currentRREventIndex === null &&
-                this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
+                this.timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
             shouldSendRR = false;
         }
 
-        const lastReadEventIndex = this._getLastDisplayedEventIndex({
+        const lastReadEventIndex = this.getLastDisplayedEventIndex({
             ignoreOwn: true,
         });
         if (lastReadEventIndex === null) {
@@ -704,16 +778,20 @@ class TimelinePanel extends React.Component {
             }
             this.lastRMSentEventId = this.state.readMarkerEventId;
 
+            const roomId = this.props.timelineSet.room.roomId;
+            const hiddenRR = SettingsStore.getValue("feature_hidden_read_receipts", roomId);
+
             debuglog('TimelinePanel: Sending Read Markers for ',
                 this.props.timelineSet.room.roomId,
                 'rm', this.state.readMarkerEventId,
                 lastReadEvent ? 'rr ' + lastReadEvent.getId() : '',
+                ' hidden:' + hiddenRR,
             );
             MatrixClientPeg.get().setRoomReadMarkers(
-                this.props.timelineSet.room.roomId,
+                roomId,
                 this.state.readMarkerEventId,
                 lastReadEvent, // Could be null, in which case no RR is sent
-                {},
+                { hidden: hiddenRR },
             ).catch((e) => {
                 // /read_markers API is not implemented on this HS, fallback to just RR
                 if (e.errcode === 'M_UNRECOGNIZED' && lastReadEvent) {
@@ -738,8 +816,8 @@ class TimelinePanel extends React.Component {
             // that sending an RR for the latest message will set our notif counter
             // to zero: it may not do this if we send an RR for somewhere before the end.
             if (this.isAtEndOfLiveTimeline()) {
-                this.props.timelineSet.room.setUnreadNotificationCount('total', 0);
-                this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
+                this.props.timelineSet.room.setUnreadNotificationCount(NotificationCountType.Total, 0);
+                this.props.timelineSet.room.setUnreadNotificationCount(NotificationCountType.Highlight, 0);
                 dis.dispatch({
                     action: 'on_room_read',
                     roomId: this.props.timelineSet.room.roomId,
@@ -750,7 +828,7 @@ class TimelinePanel extends React.Component {
 
     // if the read marker is on the screen, we can now assume we've caught up to the end
     // of the screen, so move the marker down to the bottom of the screen.
-    updateReadMarker = () => {
+    private updateReadMarker = (): void => {
         if (!this.props.manageReadMarkers) return;
         if (this.getReadMarkerPosition() === 1) {
             // the read marker is at an event below the viewport,
@@ -760,7 +838,7 @@ class TimelinePanel extends React.Component {
         // move the RM to *after* the message at the bottom of the screen. This
         // avoids a problem whereby we never advance the RM if there is a huge
         // message which doesn't fit on the screen.
-        const lastDisplayedIndex = this._getLastDisplayedEventIndex({
+        const lastDisplayedIndex = this.getLastDisplayedEventIndex({
             allowPartial: true,
         });
 
@@ -768,7 +846,7 @@ class TimelinePanel extends React.Component {
             return;
         }
         const lastDisplayedEvent = this.state.events[lastDisplayedIndex];
-        this._setReadMarker(
+        this.setReadMarker(
             lastDisplayedEvent.getId(),
             lastDisplayedEvent.getTs(),
         );
@@ -785,15 +863,14 @@ class TimelinePanel extends React.Component {
         this.sendReadReceipt();
     };
 
-
     // advance the read marker past any events we sent ourselves.
-    _advanceReadMarkerPastMyEvents() {
+    private advanceReadMarkerPastMyEvents(): void {
         if (!this.props.manageReadMarkers) return;
 
-        // we call `_timelineWindow.getEvents()` rather than using
+        // we call `timelineWindow.getEvents()` rather than using
         // `this.state.liveEvents`, because React batches the update to the
         // latter, so it may not have been updated yet.
-        const events = this._timelineWindow.getEvents();
+        const events = this.timelineWindow.getEvents();
 
         // first find where the current RM is
         let i;
@@ -810,7 +887,7 @@ class TimelinePanel extends React.Component {
         const myUserId = MatrixClientPeg.get().credentials.userId;
         for (i++; i < events.length; i++) {
             const ev = events[i];
-            if (!ev.sender || ev.sender.userId != myUserId) {
+            if (ev.getSender() !== myUserId) {
                 break;
             }
         }
@@ -818,45 +895,47 @@ class TimelinePanel extends React.Component {
         i--;
 
         const ev = events[i];
-        this._setReadMarker(ev.getId(), ev.getTs());
+        this.setReadMarker(ev.getId(), ev.getTs());
     }
 
     /* jump down to the bottom of this room, where new events are arriving
      */
-    jumpToLiveTimeline = () => {
+    public jumpToLiveTimeline = (): void => {
         // if we can't forward-paginate the existing timeline, then there
         // is no point reloading it - just jump straight to the bottom.
         //
         // Otherwise, reload the timeline rather than trying to paginate
         // through all of space-time.
-        if (this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
-            this._loadTimeline();
+        if (this.timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
+            this.loadTimeline();
         } else {
-            if (this._messagePanel.current) {
-                this._messagePanel.current.scrollToBottom();
-            }
+            this.messagePanel.current?.scrollToBottom();
         }
     };
 
+    public scrollToEventIfNeeded = (eventId: string): void => {
+        this.messagePanel.current?.scrollToEventIfNeeded(eventId);
+    };
+
     /* scroll to show the read-up-to marker. We put it 1/3 of the way down
      * the container.
      */
-    jumpToReadMarker = () => {
+    public jumpToReadMarker = (): void => {
         if (!this.props.manageReadMarkers) return;
-        if (!this._messagePanel.current) return;
+        if (!this.messagePanel.current) return;
         if (!this.state.readMarkerEventId) return;
 
         // we may not have loaded the event corresponding to the read-marker
-        // into the _timelineWindow. In that case, attempts to scroll to it
+        // into the timelineWindow. In that case, attempts to scroll to it
         // will fail.
         //
         // a quick way to figure out if we've loaded the relevant event is
         // simply to check if the messagepanel knows where the read-marker is.
-        const ret = this._messagePanel.current.getReadMarkerPosition();
+        const ret = this.messagePanel.current.getReadMarkerPosition();
         if (ret !== null) {
             // The messagepanel knows where the RM is, so we must have loaded
             // the relevant event.
-            this._messagePanel.current.scrollToEvent(this.state.readMarkerEventId,
+            this.messagePanel.current.scrollToEvent(this.state.readMarkerEventId,
                 0, 1/3);
             return;
         }
@@ -864,15 +943,15 @@ class TimelinePanel extends React.Component {
         // Looks like we haven't loaded the event corresponding to the read-marker.
         // As with jumpToLiveTimeline, we want to reload the timeline around the
         // read-marker.
-        this._loadTimeline(this.state.readMarkerEventId, 0, 1/3);
+        this.loadTimeline(this.state.readMarkerEventId, 0, 1/3);
     };
 
     /* update the read-up-to marker to match the read receipt
      */
-    forgetReadMarker = () => {
+    public forgetReadMarker = (): void => {
         if (!this.props.manageReadMarkers) return;
 
-        const rmId = this._getCurrentReadReceipt();
+        const rmId = this.getCurrentReadReceipt();
 
         // see if we know the timestamp for the rr event
         const tl = this.props.timelineSet.getTimelineForEvent(rmId);
@@ -884,28 +963,26 @@ class TimelinePanel extends React.Component {
             }
         }
 
-        this._setReadMarker(rmId, rmTs);
+        this.setReadMarker(rmId, rmTs);
     };
 
     /* return true if the content is fully scrolled down and we are
      * at the end of the live timeline.
      */
-    isAtEndOfLiveTimeline = () => {
-        return this._messagePanel.current
-            && this._messagePanel.current.isAtBottom()
-            && this._timelineWindow
-            && !this._timelineWindow.canPaginate(EventTimeline.FORWARDS);
-    }
-
+    public isAtEndOfLiveTimeline = (): boolean => {
+        return this.messagePanel.current?.isAtBottom()
+            && this.timelineWindow
+            && !this.timelineWindow.canPaginate(EventTimeline.FORWARDS);
+    };
 
     /* get the current scroll state. See ScrollPanel.getScrollState for
      * details.
      *
      * returns null if we are not mounted.
      */
-    getScrollState = () => {
-        if (!this._messagePanel.current) { return null; }
-        return this._messagePanel.current.getScrollState();
+    public getScrollState = (): IScrollState => {
+        if (!this.messagePanel.current) { return null; }
+        return this.messagePanel.current.getScrollState();
     };
 
     // returns one of:
@@ -914,11 +991,11 @@ class TimelinePanel extends React.Component {
     //  -1: read marker is above the window
     //   0: read marker is visible
     //  +1: read marker is below the window
-    getReadMarkerPosition = () => {
+    public getReadMarkerPosition = (): number => {
         if (!this.props.manageReadMarkers) return null;
-        if (!this._messagePanel.current) return null;
+        if (!this.messagePanel.current) return null;
 
-        const ret = this._messagePanel.current.getReadMarkerPosition();
+        const ret = this.messagePanel.current.getReadMarkerPosition();
         if (ret !== null) {
             return ret;
         }
@@ -937,7 +1014,7 @@ class TimelinePanel extends React.Component {
         return null;
     };
 
-    canJumpToReadMarker = () => {
+    public canJumpToReadMarker = (): boolean => {
         // 1. Do not show jump bar if neither the RM nor the RR are set.
         // 3. We want to show the bar if the read-marker is off the top of the screen.
         // 4. Also, if pos === null, the event might not be paginated - show the unread bar
@@ -952,19 +1029,19 @@ class TimelinePanel extends React.Component {
      *
      * We pass it down to the scroll panel.
      */
-    handleScrollKey = ev => {
-        if (!this._messagePanel.current) { return; }
+    public handleScrollKey = ev => {
+        if (!this.messagePanel.current) { return; }
 
         // jump to the live timeline on ctrl-end, rather than the end of the
         // timeline window.
         if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey && ev.key === Key.END) {
             this.jumpToLiveTimeline();
         } else {
-            this._messagePanel.current.handleScrollKey(ev);
+            this.messagePanel.current.handleScrollKey(ev);
         }
     };
 
-    _initTimeline(props) {
+    private initTimeline(props: IProps): void {
         const initialEvent = props.eventId;
         const pixelOffset = props.eventPixelOffset;
 
@@ -975,7 +1052,7 @@ class TimelinePanel extends React.Component {
             offsetBase = 0.5;
         }
 
-        return this._loadTimeline(initialEvent, pixelOffset, offsetBase);
+        return this.loadTimeline(initialEvent, pixelOffset, offsetBase);
     }
 
     /**
@@ -991,47 +1068,47 @@ class TimelinePanel extends React.Component {
      * @param {number?} offsetBase the reference point for the pixelOffset. 0
      *     means the top of the container, 1 means the bottom, and fractional
      *     values mean somewhere in the middle. If omitted, it defaults to 0.
-     *
-     * returns a promise which will resolve when the load completes.
      */
-    _loadTimeline(eventId, pixelOffset, offsetBase) {
-        this._timelineWindow = new TimelineWindow(
+    private loadTimeline(eventId?: string, pixelOffset?: number, offsetBase?: number): void {
+        this.timelineWindow = new TimelineWindow(
             MatrixClientPeg.get(), this.props.timelineSet,
-            {windowLimit: this.props.timelineCap});
+            { windowLimit: this.props.timelineCap });
 
         const onLoaded = () => {
+            if (this.unmounted) return;
+
             // clear the timeline min-height when
             // (re)loading the timeline
-            if (this._messagePanel.current) {
-                this._messagePanel.current.onTimelineReset();
+            if (this.messagePanel.current) {
+                this.messagePanel.current.onTimelineReset();
             }
-            this._reloadEvents();
+            this.reloadEvents();
 
             // If we switched away from the room while there were pending
             // outgoing events, the read-marker will be before those events.
             // We need to skip over any which have subsequently been sent.
-            this._advanceReadMarkerPastMyEvents();
+            this.advanceReadMarkerPastMyEvents();
 
             this.setState({
-                canBackPaginate: this._timelineWindow.canPaginate(EventTimeline.BACKWARDS),
-                canForwardPaginate: this._timelineWindow.canPaginate(EventTimeline.FORWARDS),
+                canBackPaginate: this.timelineWindow.canPaginate(EventTimeline.BACKWARDS),
+                canForwardPaginate: this.timelineWindow.canPaginate(EventTimeline.FORWARDS),
                 timelineLoading: false,
             }, () => {
                 // initialise the scroll state of the message panel
-                if (!this._messagePanel.current) {
+                if (!this.messagePanel.current) {
                     // this shouldn't happen - we know we're mounted because
                     // we're in a setState callback, and we know
                     // timelineLoading is now false, so render() should have
                     // mounted the message panel.
-                    console.log("can't initialise scroll state because " +
+                    logger.log("can't initialise scroll state because " +
                                 "messagePanel didn't load");
                     return;
                 }
                 if (eventId) {
-                    this._messagePanel.current.scrollToEvent(eventId, pixelOffset,
+                    this.messagePanel.current.scrollToEvent(eventId, pixelOffset,
                         offsetBase);
                 } else {
-                    this._messagePanel.current.scrollToBottom();
+                    this.messagePanel.current.scrollToBottom();
                 }
 
                 if (this.props.sendReadReceiptOnLoad) {
@@ -1041,11 +1118,12 @@ class TimelinePanel extends React.Component {
         };
 
         const onError = (error) => {
+            if (this.unmounted) return;
+
             this.setState({ timelineLoading: false });
             console.error(
                 `Error loading timeline panel at ${eventId}: ${error}`,
             );
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
             let onFinished;
 
@@ -1093,10 +1171,10 @@ class TimelinePanel extends React.Component {
         if (timeline) {
             // This is a hot-path optimization by skipping a promise tick
             // by repeating a no-op sync branch in TimelineSet.getTimelineForEvent & MatrixClient.getEventTimeline
-            this._timelineWindow.load(eventId, INITIAL_SIZE); // in this branch this method will happen in sync time
+            this.timelineWindow.load(eventId, INITIAL_SIZE); // in this branch this method will happen in sync time
             onLoaded();
         } else {
-            const prom = this._timelineWindow.load(eventId, INITIAL_SIZE);
+            const prom = this.timelineWindow.load(eventId, INITIAL_SIZE);
             this.setState({
                 events: [],
                 liveEvents: [],
@@ -1111,17 +1189,23 @@ class TimelinePanel extends React.Component {
     // handle the completion of a timeline load or localEchoUpdate, by
     // reloading the events from the timelinewindow and pending event list into
     // the state.
-    _reloadEvents() {
+    private reloadEvents(): void {
         // we might have switched rooms since the load started - just bin
         // the results if so.
         if (this.unmounted) return;
 
-        this.setState(this._getEvents());
+        this.setState(this.getEvents());
+    }
+
+    // Force refresh the timeline before threads support pending events
+    public refreshTimeline(): void {
+        this.loadTimeline();
+        this.reloadEvents();
     }
 
     // get the list of events from the timeline window and the pending event list
-    _getEvents() {
-        const events = this._timelineWindow.getEvents();
+    private getEvents(): Pick<IState, "events" | "liveEvents" | "firstVisibleEventIndex"> {
+        const events: MatrixEvent[] = this.timelineWindow.getEvents();
 
         // `arrayFastClone` performs a shallow copy of the array
         // we want the last event to be decrypted first but displayed last
@@ -1133,14 +1217,14 @@ class TimelinePanel extends React.Component {
                 client.decryptEventIfNeeded(event);
             });
 
-        const firstVisibleEventIndex = this._checkForPreJoinUISI(events);
+        const firstVisibleEventIndex = this.checkForPreJoinUISI(events);
 
         // Hold onto the live events separately. The read receipt and read marker
         // should use this list, so that they don't advance into pending events.
         const liveEvents = [...events];
 
         // if we're at the end of the live timeline, append the pending events
-        if (!this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
+        if (!this.timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
             events.push(...this.props.timelineSet.getPendingEvents());
         }
 
@@ -1161,7 +1245,7 @@ class TimelinePanel extends React.Component {
      * undecryptable event that was sent while the user was not in the room.  If no
      * such events were found, then it returns 0.
      */
-    _checkForPreJoinUISI(events) {
+    private checkForPreJoinUISI(events: MatrixEvent[]): number {
         const room = this.props.timelineSet.room;
 
         if (events.length === 0 || !room ||
@@ -1225,7 +1309,7 @@ class TimelinePanel extends React.Component {
         return 0;
     }
 
-    _indexForEventId(evId) {
+    private indexForEventId(evId: string): number | null {
         for (let i = 0; i < this.state.events.length; ++i) {
             if (evId == this.state.events[i].getId()) {
                 return i;
@@ -1234,15 +1318,14 @@ class TimelinePanel extends React.Component {
         return null;
     }
 
-    _getLastDisplayedEventIndex(opts) {
-        opts = opts || {};
+    private getLastDisplayedEventIndex(opts: IEventIndexOpts = {}): number | null {
         const ignoreOwn = opts.ignoreOwn || false;
         const allowPartial = opts.allowPartial || false;
 
-        const messagePanel = this._messagePanel.current;
+        const messagePanel = this.messagePanel.current;
         if (!messagePanel) return null;
 
-        const messagePanelNode = ReactDOM.findDOMNode(messagePanel);
+        const messagePanelNode = ReactDOM.findDOMNode(messagePanel) as HTMLElement;
         if (!messagePanelNode) return null; // sometimes this happens for fresh rooms/post-sync
         const wrapperRect = messagePanelNode.getBoundingClientRect();
         const myUserId = MatrixClientPeg.get().credentials.userId;
@@ -1284,8 +1367,9 @@ class TimelinePanel extends React.Component {
             }
 
             const shouldIgnore = !!ev.status || // local echo
-                (ignoreOwn && ev.sender && ev.sender.userId == myUserId);   // own message
-            const isWithoutTile = !haveTileForEvent(ev) || shouldHideEvent(ev);
+                (ignoreOwn && ev.getSender() === myUserId); // own message
+            const isWithoutTile = !haveTileForEvent(ev, this.context?.showHiddenEventsInTimeline) ||
+                shouldHideEvent(ev, this.context);
 
             if (isWithoutTile || !node) {
                 // don't start counting if the event should be ignored,
@@ -1319,7 +1403,7 @@ class TimelinePanel extends React.Component {
      *                                    SDK.
      * @return {String} the event ID
      */
-    _getCurrentReadReceipt(ignoreSynthesized) {
+    private getCurrentReadReceipt(ignoreSynthesized = false): string {
         const client = MatrixClientPeg.get();
         // the client can be null on logout
         if (client == null) {
@@ -1330,7 +1414,7 @@ class TimelinePanel extends React.Component {
         return this.props.timelineSet.room.getEventReadUpTo(myUserId, ignoreSynthesized);
     }
 
-    _setReadMarker(eventId, eventTs, inhibitSetState) {
+    private setReadMarker(eventId: string, eventTs: number, inhibitSetState = false): void {
         const roomId = this.props.timelineSet.room.roomId;
 
         // don't update the state (and cause a re-render) if there is
@@ -1355,7 +1439,7 @@ class TimelinePanel extends React.Component {
         }, this.props.onReadMarkerUpdated);
     }
 
-    _shouldPaginate() {
+    private shouldPaginate(): boolean {
         // don't try to paginate while events in the timeline are
         // still being decrypted. We don't render events while they're
         // being decrypted, so they don't take up space in the timeline.
@@ -1366,12 +1450,13 @@ class TimelinePanel extends React.Component {
         });
     }
 
-    getRelationsForEvent = (...args) => this.props.timelineSet.getRelationsForEvent(...args);
+    private getRelationsForEvent = (
+        eventId: string,
+        relationType: RelationType,
+        eventType: EventType | string,
+    ) => this.props.timelineSet.getRelationsForEvent(eventId, relationType, eventType);
 
     render() {
-        const MessagePanel = sdk.getComponent("structures.MessagePanel");
-        const Loader = sdk.getComponent("elements.Spinner");
-
         // just show a spinner while the timeline loads.
         //
         // put it in a div of the right class (mx_RoomView_messagePanel) so
@@ -1386,7 +1471,7 @@ class TimelinePanel extends React.Component {
         if (this.state.timelineLoading) {
             return (
                 <div className="mx_RoomView_messagePanelSpinner">
-                    <Loader />
+                    <Spinner />
                 </div>
             );
         }
@@ -1394,7 +1479,7 @@ class TimelinePanel extends React.Component {
         if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {
             return (
                 <div className={this.props.className + " mx_RoomView_messageListWrapper"}>
-                    <div className="mx_RoomView_empty">{this.props.empty}</div>
+                    <div className="mx_RoomView_empty">{ this.props.empty }</div>
                 </div>
             );
         }
@@ -1407,7 +1492,7 @@ class TimelinePanel extends React.Component {
         // forwards, otherwise if somebody hits the bottom of the loaded
         // events when viewing historical messages, we get stuck in a loop
         // of paginating our way through the entire history of the room.
-        const stickyBottom = !this._timelineWindow.canPaginate(EventTimeline.FORWARDS);
+        const stickyBottom = !this.timelineWindow.canPaginate(EventTimeline.FORWARDS);
 
         // If the state is PREPARED or CATCHUP, we're still waiting for the js-sdk to sync with
         // the HS and fetch the latest events, so we are effectively forward paginating.
@@ -1420,7 +1505,7 @@ class TimelinePanel extends React.Component {
             : this.state.events;
         return (
             <MessagePanel
-                ref={this._messagePanel}
+                ref={this.messagePanel}
                 room={this.props.timelineSet.room}
                 permalinkCreator={this.props.permalinkCreator}
                 hidden={this.props.hidden}
@@ -1439,16 +1524,21 @@ class TimelinePanel extends React.Component {
                 onUserScroll={this.props.onUserScroll}
                 onFillRequest={this.onMessageListFillRequest}
                 onUnfillRequest={this.onMessageListUnfillRequest}
-                isTwelveHour={this.state.isTwelveHour}
-                alwaysShowTimestamps={this.state.alwaysShowTimestamps}
+                isTwelveHour={this.context?.showTwelveHourTimestamps ?? this.state.isTwelveHour}
+                alwaysShowTimestamps={
+                    this.props.alwaysShowTimestamps ??
+                    this.context?.alwaysShowTimestamps ??
+                    this.state.alwaysShowTimestamps
+                }
                 className={this.props.className}
                 tileShape={this.props.tileShape}
                 resizeNotifier={this.props.resizeNotifier}
                 getRelationsForEvent={this.getRelationsForEvent}
-                editState={this.state.editState}
+                editState={this.props.editState}
                 showReactions={this.props.showReactions}
                 layout={this.props.layout}
                 enableFlair={SettingsStore.getValue(UIFeature.Flair)}
+                hideThreadedMessages={this.props.hideThreadedMessages}
             />
         );
     }
diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index 273c8a079f..0b0e871975 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 import * as React from "react";
-import ToastStore, {IToast} from "../../stores/ToastStore";
+import ToastStore, { IToast } from "../../stores/ToastStore";
 import classNames from "classnames";
-import {replaceableComponent} from "../../utils/replaceableComponent";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IState {
     toasts: IToast<any>[];
@@ -37,14 +37,14 @@ export default class ToastContainer extends React.Component<{}, IState> {
         // toasts may dismiss themselves in their didMount if they find
         // they're already irrelevant by the time they're mounted, and
         // our own componentDidMount is too late.
-        ToastStore.sharedInstance().on('update', this._onToastStoreUpdate);
+        ToastStore.sharedInstance().on('update', this.onToastStoreUpdate);
     }
 
     componentWillUnmount() {
-        ToastStore.sharedInstance().removeListener('update', this._onToastStoreUpdate);
+        ToastStore.sharedInstance().removeListener('update', this.onToastStoreUpdate);
     }
 
-    _onToastStoreUpdate = () => {
+    private onToastStoreUpdate = () => {
         this.setState({
             toasts: ToastStore.sharedInstance().getToasts(),
             countSeen: ToastStore.sharedInstance().getCountSeen(),
@@ -58,28 +58,39 @@ export default class ToastContainer extends React.Component<{}, IState> {
         let containerClasses;
         if (totalCount !== 0) {
             const topToast = this.state.toasts[0];
-            const {title, icon, key, component, className, props} = topToast;
-            const toastClasses = classNames("mx_Toast_toast", {
+            const { title, icon, key, component, className, bodyClassName, props } = topToast;
+            const bodyClasses = classNames("mx_Toast_body", bodyClassName);
+            const toastClasses = classNames("mx_Toast_toast", className, {
                 "mx_Toast_hasIcon": icon,
                 [`mx_Toast_icon_${icon}`]: icon,
-            }, className);
-
-            let countIndicator;
-            if (isStacked || this.state.countSeen > 0) {
-                countIndicator = ` (${this.state.countSeen + 1}/${this.state.countSeen + totalCount})`;
-            }
-
+            });
             const toastProps = Object.assign({}, props, {
                 key,
                 toastKey: key,
             });
-            toast = (<div className={toastClasses}>
-                <div className="mx_Toast_title">
-                    <h2>{title}</h2>
-                    <span>{countIndicator}</span>
+            const content = React.createElement(component, toastProps);
+
+            let countIndicator;
+            if (title && isStacked || this.state.countSeen > 0) {
+                countIndicator = ` (${this.state.countSeen + 1}/${this.state.countSeen + totalCount})`;
+            }
+
+            let titleElement;
+            if (title) {
+                titleElement = (
+                    <div className="mx_Toast_title">
+                        <h2>{ title }</h2>
+                        <span>{ countIndicator }</span>
+                    </div>
+                );
+            }
+
+            toast = (
+                <div className={toastClasses}>
+                    { titleElement }
+                    <div className={bodyClasses}>{ content }</div>
                 </div>
-                <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
-            </div>);
+            );
 
             containerClasses = classNames("mx_ToastContainer", {
                 "mx_ToastContainer_stacked": isStacked,
@@ -88,7 +99,7 @@ export default class ToastContainer extends React.Component<{}, IState> {
         return toast
             ? (
                 <div className={containerClasses} role="alert">
-                    {toast}
+                    { toast }
                 </div>
             )
             : null;
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index e19e312f58..6ee53da5d1 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -25,7 +25,8 @@ 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 interface IProps {
     room: Room;
@@ -38,6 +39,8 @@ interface IState {
 
 @replaceableComponent("structures.UploadBar")
 export default class UploadBar extends React.Component<IProps, IState> {
+    static contextType = MatrixClientContext;
+
     private dispatcherRef: string;
     private mounted: boolean;
 
@@ -47,7 +50,7 @@ export default class UploadBar extends React.Component<IProps, IState> {
         // Set initial state to any available upload in this room - we might be mounting
         // earlier than the first progress event, so should show something relevant.
         const uploadsHere = this.getUploadsInRoom();
-        this.state = {currentUpload: uploadsHere[0], uploadsHere};
+        this.state = { currentUpload: uploadsHere[0], uploadsHere };
     }
 
     componentDidMount() {
@@ -74,7 +77,7 @@ export default class UploadBar extends React.Component<IProps, IState> {
             case Action.UploadFailed: {
                 if (!this.mounted) return;
                 const uploadsHere = this.getUploadsInRoom();
-                this.setState({currentUpload: uploadsHere[0], uploadsHere});
+                this.setState({ currentUpload: uploadsHere[0], uploadsHere });
                 break;
             }
         }
@@ -82,7 +85,7 @@ export default class UploadBar extends React.Component<IProps, IState> {
 
     private onCancelClick = (ev) => {
         ev.preventDefault();
-        ContentMessages.sharedInstance().cancelUpload(this.state.currentUpload.promise);
+        ContentMessages.sharedInstance().cancelUpload(this.state.currentUpload.promise, this.context);
     };
 
     render() {
@@ -101,7 +104,7 @@ export default class UploadBar extends React.Component<IProps, IState> {
         const uploadSize = filesize(this.state.currentUpload.total);
         return (
             <div className="mx_UploadBar">
-                <div className="mx_UploadBar_filename">{uploadText} ({uploadSize})</div>
+                <div className="mx_UploadBar_filename">{ uploadText } ({ uploadSize })</div>
                 <AccessibleButton onClick={this.onCancelClick} className='mx_UploadBar_cancel' />
                 <ProgressBar value={this.state.currentUpload.loaded} max={this.state.currentUpload.total} />
             </div>
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index fb4829f879..646fc32b59 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -26,14 +26,14 @@ 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 { UserTab } from "../views/dialogs/UserSettingsDialog";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import FeedbackDialog from "../views/dialogs/FeedbackDialog";
 import Modal from "../../Modal";
 import LogoutDialog from "../views/dialogs/LogoutDialog";
 import SettingsStore from "../../settings/SettingsStore";
-import {getCustomTheme} from "../../theme";
-import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
+import { getCustomTheme } from "../../theme";
+import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
 import SdkConfig from "../../SdkConfig";
 import { getHomePageUrl } from "../../utils/pages";
 import { OwnProfileStore } from "../../stores/OwnProfileStore";
@@ -56,9 +56,10 @@ 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
 import InlineSpinner from "../views/elements/InlineSpinner";
 import TooltipButton from "../views/elements/TooltipButton";
+import { logger } from "matrix-js-sdk/src/logger";
 interface IProps {
     isMinimized: boolean;
 }
@@ -90,7 +91,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         };
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
-        if (SettingsStore.getValue("feature_spaces")) {
+        if (SpaceStore.spacesEnabled) {
             SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
         }
 
@@ -115,7 +116,7 @@ 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")) {
+        if (SpaceStore.spacesEnabled) {
             SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
         }
         MatrixClientPeg.get().removeListener("Room", this.onRoom);
@@ -123,7 +124,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
     private onRoom = (room: Room): void => {
         this.removePendingJoinRoom(room.roomId);
-    }
+    };
 
     private onTagStoreUpdate = () => {
         this.forceUpdate(); // we don't have anything useful in state to update
@@ -152,14 +153,14 @@ export default class UserMenu extends React.Component<IProps, IState> {
     };
 
     private onThemeChanged = () => {
-        this.setState({isDarkTheme: this.isUserOnDarkTheme()});
+        this.setState({ isDarkTheme: this.isUserOnDarkTheme() });
     };
 
     private onAction = (ev: ActionPayload) => {
         switch (ev.action) {
             case Action.ToggleUserMenu:
                 if (this.state.contextMenuPosition) {
-                    this.setState({contextMenuPosition: null});
+                    this.setState({ contextMenuPosition: null });
                 } else {
                     if (this.buttonRef.current) this.buttonRef.current.click();
                 }
@@ -185,7 +186,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (this.state.pendingRoomJoin.delete(roomId)) {
             this.setState({
                 pendingRoomJoin: new Set<string>(this.state.pendingRoomJoin),
-            })
+            });
         }
     }
 
@@ -193,7 +194,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
         const target = ev.target as HTMLButtonElement;
-        this.setState({contextMenuPosition: target.getBoundingClientRect()});
+        this.setState({ contextMenuPosition: target.getBoundingClientRect() });
     };
 
     private onContextMenu = (ev: React.MouseEvent) => {
@@ -210,7 +211,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
     };
 
     private onCloseMenu = () => {
-        this.setState({contextMenuPosition: null});
+        this.setState({ contextMenuPosition: null });
     };
 
     private onSwitchThemeClick = (ev: React.MouseEvent) => {
@@ -228,9 +229,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
 
-        const payload: OpenToTabPayload = {action: Action.ViewUserSettings, initialTabId: tabId};
+        const payload: OpenToTabPayload = { action: Action.ViewUserSettings, initialTabId: tabId };
         defaultDispatcher.dispatch(payload);
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onShowArchived = (ev: ButtonEvent) => {
@@ -239,7 +240,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
         // TODO: Archived room view: https://github.com/vector-im/element-web/issues/14038
         // Note: You'll need to uncomment the button too.
-        console.log("TODO: Show archived rooms");
+        logger.log("TODO: Show archived rooms");
     };
 
     private onProvideFeedback = (ev: ButtonEvent) => {
@@ -247,7 +248,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         ev.stopPropagation();
 
         Modal.createTrackedDialog('Feedback Dialog', '', FeedbackDialog);
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onSignOutClick = async (ev: ButtonEvent) => {
@@ -257,30 +258,30 @@ export default class UserMenu extends React.Component<IProps, IState> {
         const cli = MatrixClientPeg.get();
         if (!cli || !cli.isCryptoEnabled() || !(await cli.exportRoomKeys())?.length) {
             // log out without user prompt if they have no local megolm sessions
-            dis.dispatch({action: 'logout'});
+            dis.dispatch({ action: 'logout' });
         } else {
             Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
         }
 
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onSignInClick = () => {
         dis.dispatch({ action: 'start_login' });
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onRegisterClick = () => {
         dis.dispatch({ action: 'start_registration' });
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onHomeClick = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
-        defaultDispatcher.dispatch({action: 'view_home_page'});
-        this.setState({contextMenuPosition: null}); // also close the menu
+        defaultDispatcher.dispatch({ action: 'view_home_page' });
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onCommunitySettingsClick = (ev: ButtonEvent) => {
@@ -290,7 +291,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         Modal.createTrackedDialog('Edit Community', '', EditCommunityPrototypeDialog, {
             communityId: CommunityPrototypeStore.instance.getSelectedCommunityId(),
         });
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onCommunityMembersClick = (ev: ButtonEvent) => {
@@ -307,7 +308,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 action: 'view_room',
                 room_id: chat.roomId,
             }, true);
-            dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.RoomMemberList});
+            dis.dispatch({ action: Action.SetRightPanelPhase, phase: RightPanelPhases.RoomMemberList });
         } else {
             // "This should never happen" clauses go here for the prototype.
             Modal.createTrackedDialog('Failed to find general chat', '', ErrorDialog, {
@@ -315,7 +316,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 description: _t("Failed to find the general chat for this community"),
             });
         }
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onCommunityInviteClick = (ev: ButtonEvent) => {
@@ -323,7 +324,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         ev.stopPropagation();
 
         showCommunityInviteDialog(CommunityPrototypeStore.instance.getSelectedCommunityId());
-        this.setState({contextMenuPosition: null}); // also close the menu
+        this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
     private onDndToggle = (ev) => {
@@ -342,22 +343,22 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (MatrixClientPeg.get().isGuest()) {
             topSection = (
                 <div className="mx_UserMenu_contextMenu_header mx_UserMenu_contextMenu_guestPrompts">
-                    {_t("Got an account? <a>Sign in</a>", {}, {
+                    { _t("Got an account? <a>Sign in</a>", {}, {
                         a: sub => (
                             <AccessibleButton kind="link" onClick={this.onSignInClick}>
-                                {sub}
+                                { sub }
                             </AccessibleButton>
                         ),
-                    })}
-                    {_t("New here? <a>Create an account</a>", {}, {
+                    }) }
+                    { _t("New here? <a>Create an account</a>", {}, {
                         a: sub => (
                             <AccessibleButton kind="link" onClick={this.onRegisterClick}>
-                                {sub}
+                                { sub }
                             </AccessibleButton>
                         ),
-                    })}
+                    }) }
                 </div>
-            )
+            );
         } else if (hostSignupConfig) {
             if (hostSignupConfig && hostSignupConfig.url) {
                 // If hostSignup.domains is set to a non-empty array, only show
@@ -366,9 +367,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 const mxDomain = MatrixClientPeg.get().getDomain();
                 const validDomains = hostSignupDomains.filter(d => (d === mxDomain || mxDomain.endsWith(`.${d}`)));
                 if (!hostSignupConfig.domains || validDomains.length > 0) {
-                    topSection = <div onClick={this.onCloseMenu}>
-                        <HostSignupAction />
-                    </div>;
+                    topSection = <HostSignupAction onClick={this.onCloseMenu} />;
                 }
             }
         }
@@ -396,37 +395,37 @@ export default class UserMenu extends React.Component<IProps, IState> {
         let primaryHeader = (
             <div className="mx_UserMenu_contextMenu_name">
                 <span className="mx_UserMenu_contextMenu_displayName">
-                    {OwnProfileStore.instance.displayName}
+                    { OwnProfileStore.instance.displayName }
                 </span>
                 <span className="mx_UserMenu_contextMenu_userId">
-                    {MatrixClientPeg.get().getUserId()}
+                    { MatrixClientPeg.get().getUserId() }
                 </span>
             </div>
         );
         let primaryOptionList = (
             <React.Fragment>
                 <IconizedContextMenuOptionList>
-                    {homeButton}
+                    { homeButton }
                     <IconizedContextMenuOption
                         iconClassName="mx_UserMenu_iconBell"
                         label={_t("Notification settings")}
-                        onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}
+                        onClick={(e) => this.onSettingsOpen(e, UserTab.Notifications)}
                     />
                     <IconizedContextMenuOption
                         iconClassName="mx_UserMenu_iconLock"
                         label={_t("Security & privacy")}
-                        onClick={(e) => this.onSettingsOpen(e, USER_SECURITY_TAB)}
+                        onClick={(e) => this.onSettingsOpen(e, UserTab.Security)}
                     />
                     <IconizedContextMenuOption
                         iconClassName="mx_UserMenu_iconSettings"
                         label={_t("All settings")}
                         onClick={(e) => this.onSettingsOpen(e, null)}
                     />
-                    {/* <IconizedContextMenuOption
+                    { /* <IconizedContextMenuOption
                         iconClassName="mx_UserMenu_iconArchive"
                         label={_t("Archived rooms")}
                         onClick={this.onShowArchived}
-                    /> */}
+                    /> */ }
                     { feedbackButton }
                 </IconizedContextMenuOptionList>
                 <IconizedContextMenuOptionList red>
@@ -445,7 +444,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
             primaryHeader = (
                 <div className="mx_UserMenu_contextMenu_name">
                     <span className="mx_UserMenu_contextMenu_displayName">
-                        {prototypeCommunityName}
+                        { prototypeCommunityName }
                     </span>
                 </div>
             );
@@ -472,13 +471,13 @@ export default class UserMenu extends React.Component<IProps, IState> {
             }
             primaryOptionList = (
                 <IconizedContextMenuOptionList>
-                    {settingsOption}
+                    { settingsOption }
                     <IconizedContextMenuOption
                         iconClassName="mx_UserMenu_iconMembers"
                         label={_t("Members")}
                         onClick={this.onCommunityMembersClick}
                     />
-                    {inviteOption}
+                    { inviteOption }
                 </IconizedContextMenuOptionList>
             );
             secondarySection = (
@@ -487,10 +486,10 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     <div className="mx_UserMenu_contextMenu_header">
                         <div className="mx_UserMenu_contextMenu_name">
                             <span className="mx_UserMenu_contextMenu_displayName">
-                                {OwnProfileStore.instance.displayName}
+                                { OwnProfileStore.instance.displayName }
                             </span>
                             <span className="mx_UserMenu_contextMenu_userId">
-                                {MatrixClientPeg.get().getUserId()}
+                                { MatrixClientPeg.get().getUserId() }
                             </span>
                         </div>
                     </div>
@@ -511,7 +510,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                         />
                     </IconizedContextMenuOptionList>
                 </React.Fragment>
-            )
+            );
         } else if (MatrixClientPeg.get().isGuest()) {
             primaryOptionList = (
                 <React.Fragment>
@@ -542,7 +541,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
             className={classes}
         >
             <div className="mx_UserMenu_contextMenu_header">
-                {primaryHeader}
+                { primaryHeader }
                 <AccessibleTooltipButton
                     className="mx_UserMenu_contextMenu_themeButton"
                     onClick={this.onSwitchThemeClick}
@@ -555,9 +554,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     />
                 </AccessibleTooltipButton>
             </div>
-            {topSection}
-            {primaryOptionList}
-            {secondarySection}
+            { topSection }
+            { primaryOptionList }
+            { secondarySection }
         </IconizedContextMenu>;
     };
 
@@ -572,27 +571,27 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
         let isPrototype = false;
         let menuName = _t("User menu");
-        let name = <span className="mx_UserMenu_userName">{displayName}</span>;
+        let name = <span className="mx_UserMenu_userName">{ displayName }</span>;
         let buttons = (
             <span className="mx_UserMenu_headerButtons">
-                {/* masked image in CSS */}
+                { /* masked image in CSS */ }
             </span>
         );
         let dnd;
         if (this.state.selectedSpace) {
             name = (
                 <div className="mx_UserMenu_doubleName">
-                    <span className="mx_UserMenu_userName">{displayName}</span>
+                    <span className="mx_UserMenu_userName">{ displayName }</span>
                     <RoomName room={this.state.selectedSpace}>
-                        {(roomName) => <span className="mx_UserMenu_subUserName">{roomName}</span>}
+                        { (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>
-                    <span className="mx_UserMenu_subUserName">{displayName}</span>
+                    <span className="mx_UserMenu_userName">{ prototypeCommunityName }</span>
+                    <span className="mx_UserMenu_subUserName">{ displayName }</span>
                 </div>
             );
             menuName = _t("Community and user menu");
@@ -600,8 +599,8 @@ export default class UserMenu extends React.Component<IProps, IState> {
         } else if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
             name = (
                 <div className="mx_UserMenu_doubleName">
-                    <span className="mx_UserMenu_userName">{_t("Home")}</span>
-                    <span className="mx_UserMenu_subUserName">{displayName}</span>
+                    <span className="mx_UserMenu_userName">{ _t("Home") }</span>
+                    <span className="mx_UserMenu_subUserName">{ displayName }</span>
                 </div>
             );
             isPrototype = true;
@@ -649,20 +648,20 @@ export default class UserMenu extends React.Component<IProps, IState> {
                                 className="mx_UserMenu_userAvatar"
                             />
                         </span>
-                        {name}
-                        {this.state.pendingRoomJoin.size > 0 && (
+                        { name }
+                        { this.state.pendingRoomJoin.size > 0 && (
                             <InlineSpinner>
                                 <TooltipButton helpText={_t(
                                     "Currently joining %(count)s rooms",
                                     { count: this.state.pendingRoomJoin.size },
                                 )} />
                             </InlineSpinner>
-                        )}
-                        {dnd}
-                        {buttons}
+                        ) }
+                        { dnd }
+                        { buttons }
                     </div>
                 </ContextMenuButton>
-                {this.renderContextMenu()}
+                { this.renderContextMenu() }
             </React.Fragment>
         );
     }
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.tsx
similarity index 61%
rename from src/components/structures/UserView.js
rename to src/components/structures/UserView.tsx
index 6b472783bb..32168e8449 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.tsx
@@ -16,73 +16,78 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
-import {MatrixClientPeg} from "../../MatrixClientPeg";
-import * as sdk from "../../index";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
 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";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import ErrorDialog from "../views/dialogs/ErrorDialog";
+import MainSplit from "./MainSplit";
+import RightPanel from "./RightPanel";
+import Spinner from "../views/elements/Spinner";
+import ResizeNotifier from "../../utils/ResizeNotifier";
+
+interface IProps {
+    userId?: string;
+    resizeNotifier: ResizeNotifier;
+}
+
+interface IState {
+    loading: boolean;
+    member?: RoomMember;
+}
 
 @replaceableComponent("structures.UserView")
-export default class UserView extends React.Component {
-    static get propTypes() {
-        return {
-            userId: PropTypes.string,
+export default class UserView extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+        this.state = {
+            loading: true,
         };
     }
 
-    constructor(props) {
-        super(props);
-        this.state = {};
-    }
-
-    componentDidMount() {
+    public componentDidMount(): void {
         if (this.props.userId) {
-            this._loadProfileInfo();
+            this.loadProfileInfo();
         }
     }
 
-    componentDidUpdate(prevProps) {
+    public componentDidUpdate(prevProps: IProps): void {
         // XXX: We shouldn't need to null check the userId here, but we declare
         // it as optional and MatrixChat sometimes fires in a way which results
         // in an NPE when we try to update the profile info.
         if (prevProps.userId !== this.props.userId && this.props.userId) {
-            this._loadProfileInfo();
+            this.loadProfileInfo();
         }
     }
 
-    async _loadProfileInfo() {
+    private async loadProfileInfo(): Promise<void> {
         const cli = MatrixClientPeg.get();
-        this.setState({loading: true});
+        this.setState({ loading: true });
         let profileInfo;
         try {
             profileInfo = await cli.getProfileInfo(this.props.userId);
         } catch (err) {
-            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
             Modal.createTrackedDialog(_t('Could not load user profile'), '', ErrorDialog, {
                 title: _t('Could not load user profile'),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
             });
-            this.setState({loading: false});
+            this.setState({ loading: false });
             return;
         }
-        const fakeEvent = new MatrixEvent({type: "m.room.member", content: profileInfo});
+        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});
+        this.setState({ member, loading: false });
     }
 
-    render() {
+    public render(): JSX.Element {
         if (this.state.loading) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             return <Spinner />;
         } else if (this.state.member) {
-            const RightPanel = sdk.getComponent('structures.RightPanel');
-            const MainSplit = sdk.getComponent('structures.MainSplit');
-            const panel = <RightPanel user={this.state.member} />;
+            const panel = <RightPanel member={this.state.member} resizeNotifier={this.props.resizeNotifier} />;
             return (<MainSplit panel={panel} resizeNotifier={this.props.resizeNotifier}>
                 <HomePage />
             </MainSplit>);
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.tsx
similarity index 77%
rename from src/components/structures/ViewSource.js
rename to src/components/structures/ViewSource.tsx
index 6fe99dd464..20bbece755 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.tsx
@@ -17,24 +17,28 @@ limitations under the License.
 */
 
 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";
 import { canEditContent } from "../../utils/EventUtils";
 import { MatrixClientPeg } from '../../MatrixClientPeg';
 import { replaceableComponent } from "../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IDialogProps } from "../views/dialogs/IDialogProps";
+import BaseDialog from "../views/dialogs/BaseDialog";
+
+interface IProps extends IDialogProps {
+    mxEvent: MatrixEvent; // the MatrixEvent associated with the context menu
+}
+
+interface IState {
+    isEditing: boolean;
+}
 
 @replaceableComponent("structures.ViewSource")
-export default class ViewSource extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-        mxEvent: PropTypes.object.isRequired, // the MatrixEvent associated with the context menu
-    };
-
-    constructor(props) {
+export default class ViewSource extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -42,20 +46,21 @@ export default class ViewSource extends React.Component {
         };
     }
 
-    onBack() {
+    private onBack(): void {
         // TODO: refresh the "Event ID:" modal header
         this.setState({ isEditing: false });
     }
 
-    onEdit() {
+    private onEdit(): void {
         this.setState({ isEditing: true });
     }
 
     // returns the dialog body for viewing the event source
-    viewSourceContent() {
+    private viewSourceContent(): JSX.Element {
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
         const isEncrypted = mxEvent.isEncrypted();
-        const decryptedEventSource = mxEvent._clearEvent; // FIXME: _clearEvent is private
+        // @ts-ignore
+        const decryptedEventSource = mxEvent.clearEvent; // FIXME: clearEvent is private
         const originalEventSource = mxEvent.event;
 
         if (isEncrypted) {
@@ -63,30 +68,30 @@ 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(decryptedEventSource, 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>
+                            <span className="mx_ViewSource_heading">{ _t("Original event source") }</span>
                         </summary>
-                        <SyntaxHighlight className="json">{JSON.stringify(originalEventSource, null, 2)}</SyntaxHighlight>
+                        <SyntaxHighlight className="json">{ JSON.stringify(originalEventSource, null, 2) }</SyntaxHighlight>
                     </details>
                 </>
             );
         } else {
             return (
                 <>
-                    <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
-                    <SyntaxHighlight className="json">{JSON.stringify(originalEventSource, null, 2)}</SyntaxHighlight>
+                    <div className="mx_ViewSource_heading">{ _t("Original event source") }</div>
+                    <SyntaxHighlight className="json">{ JSON.stringify(originalEventSource, null, 2) }</SyntaxHighlight>
                 </>
             );
         }
     }
 
     // returns the id of the initial message, not the id of the previous edit
-    getBaseEventId() {
+    private getBaseEventId(): string {
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
         const isEncrypted = mxEvent.isEncrypted();
         const baseMxEvent = this.props.mxEvent;
@@ -100,7 +105,7 @@ export default class ViewSource extends React.Component {
     }
 
     // returns the SendCustomEvent component prefilled with the correct details
-    editSourceContent() {
+    private editSourceContent(): JSX.Element {
         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();
@@ -110,7 +115,7 @@ export default class ViewSource extends React.Component {
         if (isStateEvent) {
             return (
                 <MatrixClientContext.Consumer>
-                    {(cli) => (
+                    { (cli) => (
                         <SendCustomEvent
                             room={cli.getRoom(roomId)}
                             forceStateEvent={true}
@@ -121,7 +126,7 @@ export default class ViewSource extends React.Component {
                                 stateKey: mxEvent.getStateKey(),
                             }}
                         />
-                    )}
+                    ) }
                 </MatrixClientContext.Consumer>
             );
         } else {
@@ -142,7 +147,7 @@ export default class ViewSource extends React.Component {
             };
             return (
                 <MatrixClientContext.Consumer>
-                    {(cli) => (
+                    { (cli) => (
                         <SendCustomEvent
                             room={cli.getRoom(roomId)}
                             forceStateEvent={false}
@@ -153,20 +158,19 @@ export default class ViewSource extends React.Component {
                                 evContent: JSON.stringify(newContent, null, "\t"),
                             }}
                         />
-                    )}
+                    ) }
                 </MatrixClientContext.Consumer>
             );
         }
     }
 
-    canSendStateEvent(mxEvent) {
+    private canSendStateEvent(mxEvent: MatrixEvent): boolean {
         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");
+    public render(): JSX.Element {
         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;
@@ -176,16 +180,16 @@ export default class ViewSource extends React.Component {
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>
-                    <div>Room ID: {roomId}</div>
-                    <div>Event ID: {eventId}</div>
+                    <div>Room ID: { roomId }</div>
+                    <div>Event ID: { eventId }</div>
                     <div className="mx_ViewSource_separator" />
-                    {isEditing ? this.editSourceContent() : this.viewSourceContent()}
+                    { isEditing ? this.editSourceContent() : this.viewSourceContent() }
                 </div>
-                {!isEditing && canEdit && (
+                { !isEditing && canEdit && (
                     <div className="mx_Dialog_buttons">
-                        <button onClick={() => this.onEdit()}>{_t("Edit")}</button>
+                        <button onClick={() => this.onEdit()}>{ _t("Edit") }</button>
                     </div>
-                )}
+                ) }
             </BaseDialog>
         );
     }
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.tsx
similarity index 68%
rename from src/components/structures/auth/CompleteSecurity.js
rename to src/components/structures/auth/CompleteSecurity.tsx
index 49fcf20415..8c3d5e80a0 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.tsx
@@ -15,64 +15,60 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import {
-    SetupEncryptionStore,
-    PHASE_LOADING,
-    PHASE_INTRO,
-    PHASE_BUSY,
-    PHASE_DONE,
-    PHASE_CONFIRM_SKIP,
-} from '../../../stores/SetupEncryptionStore';
+import { SetupEncryptionStore, Phase } from '../../../stores/SetupEncryptionStore';
 import SetupEncryptionBody from "./SetupEncryptionBody";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    onFinished: () => void;
+}
+
+interface IState {
+    phase: Phase;
+}
 
 @replaceableComponent("structures.auth.CompleteSecurity")
-export default class CompleteSecurity extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    constructor() {
-        super();
+export default class CompleteSecurity extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
         const store = SetupEncryptionStore.sharedInstance();
-        store.on("update", this._onStoreUpdate);
+        store.on("update", this.onStoreUpdate);
         store.start();
-        this.state = {phase: store.phase};
+        this.state = { phase: store.phase };
     }
 
-    _onStoreUpdate = () => {
+    private onStoreUpdate = (): void => {
         const store = SetupEncryptionStore.sharedInstance();
-        this.setState({phase: store.phase});
+        this.setState({ phase: store.phase });
     };
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const store = SetupEncryptionStore.sharedInstance();
-        store.off("update", this._onStoreUpdate);
+        store.off("update", this.onStoreUpdate);
         store.stop();
     }
 
-    render() {
+    public render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
         const CompleteSecurityBody = sdk.getComponent("auth.CompleteSecurityBody");
-        const {phase} = this.state;
+        const { phase } = this.state;
         let icon;
         let title;
 
-        if (phase === PHASE_LOADING) {
+        if (phase === Phase.Loading) {
             return null;
-        } else if (phase === PHASE_INTRO) {
+        } else if (phase === Phase.Intro) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Verify this login");
-        } else if (phase === PHASE_DONE) {
+        } else if (phase === Phase.Done) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
-        } else if (phase === PHASE_CONFIRM_SKIP) {
+        } else if (phase === Phase.ConfirmSkip) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Are you sure?");
-        } else if (phase === PHASE_BUSY) {
+        } else if (phase === Phase.Busy) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Verify this login");
         } else {
@@ -83,8 +79,8 @@ export default class CompleteSecurity extends React.Component {
             <AuthPage>
                 <CompleteSecurityBody>
                     <h2 className="mx_CompleteSecurity_header">
-                        {icon}
-                        {title}
+                        { icon }
+                        { title }
                     </h2>
                     <div className="mx_CompleteSecurity_body">
                         <SetupEncryptionBody onFinished={this.props.onFinished} />
diff --git a/src/components/structures/auth/E2eSetup.js b/src/components/structures/auth/E2eSetup.tsx
similarity index 80%
rename from src/components/structures/auth/E2eSetup.js
rename to src/components/structures/auth/E2eSetup.tsx
index 4e51ae828c..93cb92664f 100644
--- a/src/components/structures/auth/E2eSetup.js
+++ b/src/components/structures/auth/E2eSetup.tsx
@@ -15,20 +15,19 @@ limitations under the License.
 */
 
 import React from 'react';
-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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    onFinished: () => void;
+    accountPassword?: string;
+    tokenLogin?: boolean;
+}
 
 @replaceableComponent("structures.auth.E2eSetup")
-export default class E2eSetup extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-        accountPassword: PropTypes.string,
-        tokenLogin: PropTypes.bool,
-    };
-
+export default class E2eSetup extends React.Component<IProps> {
     render() {
         return (
             <AuthPage>
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.tsx
similarity index 70%
rename from src/components/structures/auth/ForgotPassword.js
rename to src/components/structures/auth/ForgotPassword.tsx
index 6188fdb5e4..24b47bfa03 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.tsx
@@ -17,41 +17,65 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t, _td } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from "../../../Modal";
 import PasswordReset from "../../../PasswordReset";
-import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import classNames from 'classnames';
 import AuthPage from "../../views/auth/AuthPage";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import ServerPicker from "../../views/elements/ServerPicker";
 import PassphraseField from '../../views/auth/PassphraseField';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PASSWORD_MIN_SCORE } from '../../views/auth/RegistrationForm';
 
-// Phases
-// Show the forgot password inputs
-const PHASE_FORGOT = 1;
-// Email is in the process of being sent
-const PHASE_SENDING_EMAIL = 2;
-// Email has been sent
-const PHASE_EMAIL_SENT = 3;
-// User has clicked the link in email and completed reset
-const PHASE_DONE = 4;
+import { IValidationResult } from "../../views/elements/Validation";
+import InlineSpinner from '../../views/elements/InlineSpinner';
+
+enum Phase {
+    // Show the forgot password inputs
+    Forgot = 1,
+    // Email is in the process of being sent
+    SendingEmail = 2,
+    // Email has been sent
+    EmailSent = 3,
+    // User has clicked the link in email and completed reset
+    Done = 4,
+}
+
+interface IProps {
+    serverConfig: ValidatedServerConfig;
+    onServerConfigChange: (serverConfig: ValidatedServerConfig) => void;
+    onLoginClick?: () => void;
+    onComplete: () => void;
+}
+
+interface IState {
+    phase: Phase;
+    email: string;
+    password: string;
+    password2: string;
+    errorText: string;
+
+    // We perform liveliness checks later, but for now suppress the errors.
+    // We also track the server dead errors independently of the regular errors so
+    // that we can render it differently, and override any other error the user may
+    // be seeing.
+    serverIsAlive: boolean;
+    serverErrorIsFatal: boolean;
+    serverDeadError: string;
+
+    passwordFieldValid: boolean;
+    currentHttpRequest?: Promise<any>;
+}
 
 @replaceableComponent("structures.auth.ForgotPassword")
-export default class ForgotPassword extends React.Component {
-    static propTypes = {
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-        onServerConfigChange: PropTypes.func.isRequired,
-        onLoginClick: PropTypes.func,
-        onComplete: PropTypes.func.isRequired,
-    };
+export default class ForgotPassword extends React.Component<IProps, IState> {
+    private reset: PasswordReset;
 
-    state = {
-        phase: PHASE_FORGOT,
+    state: IState = {
+        phase: Phase.Forgot,
         email: "",
         password: "",
         password2: "",
@@ -64,30 +88,31 @@ export default class ForgotPassword extends React.Component {
         serverIsAlive: true,
         serverErrorIsFatal: false,
         serverDeadError: "",
+        passwordFieldValid: false,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         CountlyAnalytics.instance.track("onboarding_forgot_password_begin");
     }
 
-    componentDidMount() {
+    public componentDidMount() {
         this.reset = null;
-        this._checkServerLiveliness(this.props.serverConfig);
+        this.checkServerLiveliness(this.props.serverConfig);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(newProps) {
+    // eslint-disable-next-line
+    public UNSAFE_componentWillReceiveProps(newProps: IProps): void {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
         // Do a liveliness check on the new URLs
-        this._checkServerLiveliness(newProps.serverConfig);
+        this.checkServerLiveliness(newProps.serverConfig);
     }
 
-    async _checkServerLiveliness(serverConfig) {
+    private async checkServerLiveliness(serverConfig): Promise<void> {
         try {
             await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
                 serverConfig.hsUrl,
@@ -98,46 +123,49 @@ export default class ForgotPassword extends React.Component {
                 serverIsAlive: true,
             });
         } catch (e) {
-            this.setState(AutoDiscoveryUtils.authComponentStateForError(e, "forgot_password"));
+            this.setState(AutoDiscoveryUtils.authComponentStateForError(e, "forgot_password") as IState);
         }
     }
 
-    submitPasswordReset(email, password) {
+    public submitPasswordReset(email: string, password: string): void {
         this.setState({
-            phase: PHASE_SENDING_EMAIL,
+            phase: Phase.SendingEmail,
         });
         this.reset = new PasswordReset(this.props.serverConfig.hsUrl, this.props.serverConfig.isUrl);
         this.reset.resetPassword(email, password).then(() => {
             this.setState({
-                phase: PHASE_EMAIL_SENT,
+                phase: Phase.EmailSent,
             });
         }, (err) => {
             this.showErrorDialog(_t('Failed to send email') + ": " + err.message);
             this.setState({
-                phase: PHASE_FORGOT,
+                phase: Phase.Forgot,
             });
         });
     }
 
-    onVerify = async ev => {
+    private onVerify = async (ev: React.MouseEvent): Promise<void> => {
         ev.preventDefault();
         if (!this.reset) {
             console.error("onVerify called before submitPasswordReset!");
             return;
         }
+        if (this.state.currentHttpRequest) return;
+
         try {
-            await this.reset.checkEmailLinkClicked();
-            this.setState({ phase: PHASE_DONE });
+            await this.handleHttpRequest(this.reset.checkEmailLinkClicked());
+            this.setState({ phase: Phase.Done });
         } catch (err) {
             this.showErrorDialog(err.message);
         }
     };
 
-    onSubmitForm = async ev => {
+    private onSubmitForm = async (ev: React.FormEvent): Promise<void> => {
         ev.preventDefault();
+        if (this.state.currentHttpRequest) return;
 
         // refresh the server errors, just in case the server came back online
-        await this._checkServerLiveliness(this.props.serverConfig);
+        await this.handleHttpRequest(this.checkServerLiveliness(this.props.serverConfig));
 
         await this['password_field'].validate({ allowEmpty: false });
 
@@ -172,32 +200,43 @@ export default class ForgotPassword extends React.Component {
         }
     };
 
-    onInputChanged = (stateKey, ev) => {
+    private onInputChanged = (stateKey: string, ev: React.FormEvent<HTMLInputElement>) => {
         this.setState({
-            [stateKey]: ev.target.value,
-        });
+            [stateKey]: ev.currentTarget.value,
+        } as any);
     };
 
-    onLoginClick = ev => {
+    private onLoginClick = (ev: React.MouseEvent): void => {
         ev.preventDefault();
         ev.stopPropagation();
         this.props.onLoginClick();
     };
 
-    showErrorDialog(body, title) {
+    public showErrorDialog(description: string, title?: string) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Forgot Password Error', '', ErrorDialog, {
-            title: title,
-            description: body,
+            title,
+            description,
         });
     }
 
-    onPasswordValidate(result) {
+    private onPasswordValidate(result: IValidationResult) {
         this.setState({
             passwordFieldValid: result.valid,
         });
     }
 
+    private handleHttpRequest<T = unknown>(request: Promise<T>): Promise<T> {
+        this.setState({
+            currentHttpRequest: request,
+        });
+        return request.finally(() => {
+            this.setState({
+                currentHttpRequest: undefined,
+            });
+        });
+    }
+
     renderForgot() {
         const Field = sdk.getComponent('elements.Field');
 
@@ -216,14 +255,14 @@ export default class ForgotPassword extends React.Component {
             });
             serverDeadSection = (
                 <div className={classes}>
-                    {this.state.serverDeadError}
+                    { this.state.serverDeadError }
                 </div>
             );
         }
 
         return <div>
-            {errorText}
-            {serverDeadSection}
+            { errorText }
+            { serverDeadSection }
             <ServerPicker
                 serverConfig={this.props.serverConfig}
                 onServerConfigChange={this.props.onServerConfigChange}
@@ -266,10 +305,10 @@ export default class ForgotPassword extends React.Component {
                         autoComplete="new-password"
                     />
                 </div>
-                <span>{_t(
+                <span>{ _t(
                     'A verification email will be sent to your inbox to confirm ' +
                     'setting your new password.',
-                )}</span>
+                ) }</span>
                 <input
                     className="mx_Login_submit"
                     type="submit"
@@ -277,7 +316,7 @@ export default class ForgotPassword extends React.Component {
                 />
             </form>
             <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
-                {_t('Sign in instead')}
+                { _t('Sign in instead') }
             </a>
         </div>;
     }
@@ -289,23 +328,32 @@ export default class ForgotPassword extends React.Component {
 
     renderEmailSent() {
         return <div>
-            {_t("An email has been sent to %(emailAddress)s. Once you've followed the " +
-                "link it contains, click below.", { emailAddress: this.state.email })}
+            { _t("An email has been sent to %(emailAddress)s. Once you've followed the " +
+                "link it contains, click below.", { emailAddress: this.state.email }) }
             <br />
-            <input className="mx_Login_submit" type="button" onClick={this.onVerify}
+            <input
+                className="mx_Login_submit"
+                type="button"
+                onClick={this.onVerify}
                 value={_t('I have verified my email address')} />
+            { this.state.currentHttpRequest && (
+                <div className="mx_Login_spinner"><InlineSpinner w={64} h={64} /></div>)
+            }
         </div>;
     }
 
     renderDone() {
         return <div>
-            <p>{_t("Your password has been reset.")}</p>
-            <p>{_t(
+            <p>{ _t("Your password has been reset.") }</p>
+            <p>{ _t(
                 "You have been logged out of all sessions and will no longer receive " +
                 "push notifications. To re-enable notifications, sign in again on each " +
                 "device.",
-            )}</p>
-            <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
+            ) }</p>
+            <input
+                className="mx_Login_submit"
+                type="button"
+                onClick={this.props.onComplete}
                 value={_t('Return to login screen')} />
         </div>;
     }
@@ -316,18 +364,20 @@ export default class ForgotPassword extends React.Component {
 
         let resetPasswordJsx;
         switch (this.state.phase) {
-            case PHASE_FORGOT:
+            case Phase.Forgot:
                 resetPasswordJsx = this.renderForgot();
                 break;
-            case PHASE_SENDING_EMAIL:
+            case Phase.SendingEmail:
                 resetPasswordJsx = this.renderSendingEmail();
                 break;
-            case PHASE_EMAIL_SENT:
+            case Phase.EmailSent:
                 resetPasswordJsx = this.renderEmailSent();
                 break;
-            case PHASE_DONE:
+            case Phase.Done:
                 resetPasswordJsx = this.renderDone();
                 break;
+            default:
+                resetPasswordJsx = <div className="mx_Login_spinner"><InlineSpinner w={64} h={64} /></div>;
         }
 
         return (
@@ -335,7 +385,7 @@ export default class ForgotPassword extends React.Component {
                 <AuthHeader />
                 <AuthBody>
                     <h2> { _t('Set a new password') } </h2>
-                    {resetPasswordJsx}
+                    { resetPasswordJsx }
                 </AuthBody>
             </AuthPage>
         );
diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index d34582b0c3..c8f208476b 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -14,28 +14,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactNode} from 'react';
-import {MatrixError} from "matrix-js-sdk/src/http-api";
+import React, { ReactNode } from 'react';
+import { MatrixError } from "matrix-js-sdk/src/http-api";
 
-import {_t, _td} from '../../../languageHandler';
-import * as sdk from '../../../index';
-import Login, {ISSOFlow, LoginFlow} from '../../../Login';
+import { _t, _td } from '../../../languageHandler';
+import Login, { ISSOFlow, LoginFlow } from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
-import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
 import AuthPage from "../../views/auth/AuthPage";
 import PlatformPeg from '../../../PlatformPeg';
 import SettingsStore from "../../../settings/SettingsStore";
-import {UIFeature} from "../../../settings/UIFeature";
+import { UIFeature } from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {IMatrixClientCreds} from "../../../MatrixClientPeg";
+import { IMatrixClientCreds } from "../../../MatrixClientPeg";
 import PasswordLogin from "../../views/auth/PasswordLogin";
 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AuthBody from "../../views/auth/AuthBody";
+import AuthHeader from "../../views/auth/AuthHeader";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // 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.
@@ -143,7 +146,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillMount() {
         this.initLoginLogic(this.props.serverConfig);
     }
@@ -153,7 +156,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
@@ -166,7 +169,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
 
     onPasswordLogin = async (username, phoneCountry, phoneNumber, password) => {
         if (!this.state.serverIsAlive) {
-            this.setState({busy: true});
+            this.setState({ busy: true });
             // Do a quick liveliness check on the URLs
             let aliveAgain = true;
             try {
@@ -174,7 +177,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                     this.props.serverConfig.hsUrl,
                     this.props.serverConfig.isUrl,
                 );
-                this.setState({serverIsAlive: true, errorText: ""});
+                this.setState({ serverIsAlive: true, errorText: "" });
             } catch (e) {
                 const componentState = AutoDiscoveryUtils.authComponentStateForError(e);
                 this.setState({
@@ -201,7 +204,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
         this.loginLogic.loginViaPassword(
             username, phoneCountry, phoneNumber, password,
         ).then((data) => {
-            this.setState({serverIsAlive: true}); // it must be, we logged in.
+            this.setState({ serverIsAlive: true }); // it must be, we logged in.
             this.props.onLoggedIn(data, password);
         }, (error) => {
             if (this.unmounted) {
@@ -238,8 +241,8 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                 );
                 errorText = (
                     <div>
-                        <div>{errorTop}</div>
-                        <div className="mx_Login_smallError">{errorDetail}</div>
+                        <div>{ errorTop }</div>
+                        <div className="mx_Login_smallError">{ errorDetail }</div>
                     </div>
                 );
             } else if (error.httpStatus === 401 || error.httpStatus === 403) {
@@ -250,10 +253,10 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                         <div>
                             <div>{ _t('Incorrect username and/or password.') }</div>
                             <div className="mx_Login_smallError">
-                                {_t(
+                                { _t(
                                     'Please note you are logging into the %(hs)s server, not matrix.org.',
-                                    {hs: this.props.serverConfig.hsName},
-                                )}
+                                    { hs: this.props.serverConfig.hsName },
+                                ) }
                             </div>
                         </div>
                     );
@@ -363,7 +366,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
         }
     };
 
-    private async initLoginLogic({hsUrl, isUrl}: ValidatedServerConfig) {
+    private async initLoginLogic({ hsUrl, isUrl }: ValidatedServerConfig) {
         let isDefaultServer = false;
         if (this.props.serverConfig.isDefault
             && hsUrl === this.props.serverConfig.hsUrl
@@ -437,7 +440,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
         // technically the flow can have multiple steps, but no one does this
         // for login and loginLogic doesn't support it so we can ignore it.
         if (!this.stepRendererMap[flow.type]) {
-            console.log("Skipping flow", flow, "due to unsupported login type", flow.type);
+            logger.log("Skipping flow", flow, "due to unsupported login type", flow.type);
             return false;
         }
         return true;
@@ -462,7 +465,9 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                         "Either use HTTPS or <a>enable unsafe scripts</a>.", {},
                     {
                         'a': (sub) => {
-                            return <a target="_blank" rel="noreferrer noopener"
+                            return <a
+                                target="_blank"
+                                rel="noreferrer noopener"
                                 href="https://www.google.com/search?&q=enable%20unsafe%20scripts"
                             >
                                 { sub }
@@ -501,9 +506,9 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
         return <React.Fragment>
             { flows.map(flow => {
                 const stepRenderer = this.stepRendererMap[flow.type];
-                return <React.Fragment key={flow.type}>{ stepRenderer() }</React.Fragment>
+                return <React.Fragment key={flow.type}>{ stepRenderer() }</React.Fragment>;
             }) }
-        </React.Fragment>
+        </React.Fragment>;
     }
 
     private renderPasswordStep = () => {
@@ -541,8 +546,6 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
     };
 
     render() {
-        const AuthHeader = sdk.getComponent("auth.AuthHeader");
-        const AuthBody = sdk.getComponent("auth.AuthBody");
         const loader = this.isBusy() && !this.state.busyLoggingIn ?
             <div className="mx_Login_loader"><Spinner /></div> : null;
 
@@ -566,7 +569,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
             });
             serverDeadSection = (
                 <div className={classes}>
-                    {this.state.serverDeadError}
+                    { this.state.serverDeadError }
                 </div>
             );
         }
@@ -579,15 +582,15 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                     { this.props.isSyncing ? _t("Syncing...") : _t("Signing In...") }
                 </div>
                 { this.props.isSyncing && <div className="mx_AuthBody_paddedFooter_subtitle">
-                    {_t("If you've joined lots of rooms, this might take a while")}
+                    { _t("If you've joined lots of rooms, this might take a while") }
                 </div> }
             </div>;
         } else if (SettingsStore.getValue(UIFeature.Registration)) {
             footer = (
                 <span className="mx_AuthBody_changeFlow">
-                    {_t("New? <a>Create account</a>", {}, {
+                    { _t("New? <a>Create account</a>", {}, {
                         a: sub => <a onClick={this.onTryRegisterClick} href="#">{ sub }</a>,
-                    })}
+                    }) }
                 </span>
             );
         }
@@ -597,8 +600,8 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                 <AuthHeader disableLanguageSelector={this.props.isSyncing || this.state.busyLoggingIn} />
                 <AuthBody>
                     <h2>
-                        {_t('Sign in')}
-                        {loader}
+                        { _t('Sign in') }
+                        { loader }
                     </h2>
                     { errorTextSection }
                     { serverDeadSection }
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 6feb1e34f7..4cffed4348 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -14,23 +14,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {createClient} from 'matrix-js-sdk/src/matrix';
-import React, {ReactNode} from 'react';
-import {MatrixClient} from "matrix-js-sdk/src/client";
+import { createClient } from 'matrix-js-sdk/src/matrix';
+import React, { ReactNode } from 'react';
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
-import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
-import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
 import * as Lifecycle from '../../../Lifecycle';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { IMatrixClientCreds, MatrixClientPeg } from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
-import Login, {ISSOFlow} from "../../../Login";
+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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RegistrationForm from '../../views/auth/RegistrationForm';
+import AccessibleButton from '../../views/elements/AccessibleButton';
+import AuthBody from "../../views/auth/AuthBody";
+import AuthHeader from "../../views/auth/AuthHeader";
+import InteractiveAuth from "../InteractiveAuth";
+import Spinner from "../../views/elements/Spinner";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IProps {
     serverConfig: ValidatedServerConfig;
@@ -47,13 +54,7 @@ interface IProps {
     // - The user's password, if available and applicable (may be cached in memory
     //   for a short time so the user is not required to re-enter their password
     //   for operations like uploading cross-signing keys).
-    onLoggedIn(params: {
-        userId: string;
-        deviceId: string
-        homeserverUrl: string;
-        identityServerUrl?: string;
-        accessToken: string;
-    }, password: string): void;
+    onLoggedIn(params: IMatrixClientCreds, password: string): void;
     makeRegistrationUrl(params: {
         /* eslint-disable camelcase */
         client_secret: string;
@@ -131,7 +132,7 @@ export default class Registration extends React.Component<IProps, IState> {
             serverDeadError: "",
         };
 
-        const {hsUrl, isUrl} = this.props.serverConfig;
+        const { hsUrl, isUrl } = this.props.serverConfig;
         this.loginLogic = new Login(hsUrl, isUrl, null, {
             defaultDeviceDisplayName: "Element login check", // We shouldn't ever be used
         });
@@ -142,7 +143,7 @@ export default class Registration extends React.Component<IProps, IState> {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
@@ -180,7 +181,7 @@ export default class Registration extends React.Component<IProps, IState> {
             }
         }
 
-        const {hsUrl, isUrl} = serverConfig;
+        const { hsUrl, isUrl } = serverConfig;
         const cli = createClient({
             baseUrl: hsUrl,
             idBaseUrl: isUrl,
@@ -216,7 +217,7 @@ export default class Registration extends React.Component<IProps, IState> {
             if (!this.state.doingUIAuth) {
                 await this.makeRegisterRequest(null);
                 // This should never succeed since we specified no auth object.
-                console.log("Expecting 401 from register request but got success!");
+                logger.log("Expecting 401 from register request but got success!");
             }
         } catch (e) {
             if (e.httpStatus === 401) {
@@ -230,7 +231,7 @@ export default class Registration extends React.Component<IProps, IState> {
                 // the user off to the login page to figure their account out.
                 if (ssoFlow) {
                     // Redirect to login page - server probably expects SSO only
-                    dis.dispatch({action: 'start_login'});
+                    dis.dispatch({ action: 'start_login' });
                 } else {
                     this.setState({
                         serverErrorIsFatal: true, // fatal because user cannot continue on this server
@@ -240,13 +241,13 @@ export default class Registration extends React.Component<IProps, IState> {
                     });
                 }
             } else {
-                console.log("Unable to query for supported registration methods.", e);
+                logger.log("Unable to query for supported registration methods.", e);
                 showGenericError(e);
             }
         }
     }
 
-    private onFormSubmit = formVals => {
+    private onFormSubmit = async (formVals): Promise<void> => {
         this.setState({
             errorText: "",
             busy: true,
@@ -267,9 +268,9 @@ export default class Registration extends React.Component<IProps, IState> {
                 session_id: sessionId,
             }),
         );
-    }
+    };
 
-    private onUIAuthFinished = async (success, response, extra) => {
+    private onUIAuthFinished = async (success: boolean, response: any) => {
         if (!success) {
             let msg = response.message || response.toString();
             // can we give a better error message?
@@ -291,8 +292,8 @@ export default class Registration extends React.Component<IProps, IState> {
                     },
                 );
                 msg = <div>
-                    <p>{errorTop}</p>
-                    <p>{errorDetail}</p>
+                    <p>{ errorTop }</p>
+                    <p>{ errorDetail }</p>
                 </div>;
             } else if (response.required_stages && response.required_stages.indexOf('m.login.msisdn') > -1) {
                 let msisdnAvailable = false;
@@ -331,7 +332,7 @@ export default class Registration extends React.Component<IProps, IState> {
         // the user had a separate guest session they didn't actually mean to replace.
         const [sessionOwner, sessionIsGuest] = await Lifecycle.getStoredSessionOwner();
         if (sessionOwner && !sessionIsGuest && sessionOwner !== response.userId) {
-            console.log(
+            logger.log(
                 `Found a session for ${sessionOwner} but ${response.userId} has just registered.`,
             );
             newState.differentLoggedInUserId = sessionOwner;
@@ -367,7 +368,7 @@ export default class Registration extends React.Component<IProps, IState> {
                     const emailPusher = pushers[i];
                     emailPusher.data = { brand: this.props.brand };
                     matrixClient.setPusher(emailPusher).then(() => {
-                        console.log("Set email branding to " + this.props.brand);
+                        logger.log("Set email branding to " + this.props.brand);
                     }, (error) => {
                         console.error("Couldn't set email branding: " + error);
                     });
@@ -432,7 +433,7 @@ export default class Registration extends React.Component<IProps, IState> {
     private onLoginClickWithCheck = async ev => {
         ev.preventDefault();
 
-        const sessionLoaded = await Lifecycle.loadSession({ignoreGuest: true});
+        const sessionLoaded = await Lifecycle.loadSession({ ignoreGuest: true });
         if (!sessionLoaded) {
             // ok fine, there's still no session: really go to the login page
             this.props.onLoginClick();
@@ -442,10 +443,6 @@ export default class Registration extends React.Component<IProps, IState> {
     };
 
     private renderRegisterComponent() {
-        const InteractiveAuth = sdk.getComponent('structures.InteractiveAuth');
-        const Spinner = sdk.getComponent('elements.Spinner');
-        const RegistrationForm = sdk.getComponent('auth.RegistrationForm');
-
         if (this.state.matrixClient && this.state.doingUIAuth) {
             return <InteractiveAuth
                 matrixClient={this.state.matrixClient}
@@ -487,7 +484,13 @@ export default class Registration extends React.Component<IProps, IState> {
                         fragmentAfterLogin={this.props.fragmentAfterLogin}
                     />
                     <h3 className="mx_AuthBody_centered">
-                        { _t("%(ssoButtons)s Or %(usernamePassword)s", { ssoButtons: "", usernamePassword: ""}).trim() }
+                        { _t(
+                            "%(ssoButtons)s Or %(usernamePassword)s",
+                            {
+                                ssoButtons: "",
+                                usernamePassword: "",
+                            },
+                        ).trim() }
                     </h3>
                 </React.Fragment>;
             }
@@ -510,10 +513,6 @@ export default class Registration extends React.Component<IProps, IState> {
     }
 
     render() {
-        const AuthHeader = sdk.getComponent('auth.AuthHeader');
-        const AuthBody = sdk.getComponent("auth.AuthBody");
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
         let errorText;
         const err = this.state.errorText;
         if (err) {
@@ -529,15 +528,15 @@ export default class Registration extends React.Component<IProps, IState> {
             });
             serverDeadSection = (
                 <div className={classes}>
-                    {this.state.serverDeadError}
+                    { this.state.serverDeadError }
                 </div>
             );
         }
 
         const signIn = <span className="mx_AuthBody_changeFlow">
-            {_t("Already have an account? <a>Sign in here</a>", {}, {
+            { _t("Already have an account? <a>Sign in here</a>", {}, {
                 a: sub => <a onClick={this.onLoginClick} href="#">{ sub }</a>,
-            })}
+            }) }
         </span>;
 
         // Only show the 'go back' button if you're not looking at the form
@@ -553,43 +552,47 @@ export default class Registration extends React.Component<IProps, IState> {
             let regDoneText;
             if (this.state.differentLoggedInUserId) {
                 regDoneText = <div>
-                    <p>{_t(
+                    <p>{ _t(
                         "Your new account (%(newAccountId)s) is registered, but you're already " +
                         "logged into a different account (%(loggedInUserId)s).", {
                             newAccountId: this.state.registeredUsername,
                             loggedInUserId: this.state.differentLoggedInUserId,
                         },
-                    )}</p>
-                    <p><AccessibleButton element="span" className="mx_linkButton" onClick={async event => {
-                        const sessionLoaded = await this.onLoginClickWithCheck(event);
-                        if (sessionLoaded) {
-                            dis.dispatch({action: "view_welcome_page"});
-                        }
-                    }}>
-                        {_t("Continue with previous account")}
+                    ) }</p>
+                    <p><AccessibleButton
+                        element="span"
+                        className="mx_linkButton"
+                        onClick={async event => {
+                            const sessionLoaded = await this.onLoginClickWithCheck(event);
+                            if (sessionLoaded) {
+                                dis.dispatch({ action: "view_welcome_page" });
+                            }
+                        }}
+                    >
+                        { _t("Continue with previous account") }
                     </AccessibleButton></p>
                 </div>;
             } else if (this.state.formVals.password) {
                 // We're the client that started the registration
-                regDoneText = <h3>{_t(
+                regDoneText = <h3>{ _t(
                     "<a>Log in</a> to your new account.", {},
                     {
-                        a: (sub) => <a href="#/login" onClick={this.onLoginClickWithCheck}>{sub}</a>,
+                        a: (sub) => <a href="#/login" onClick={this.onLoginClickWithCheck}>{ sub }</a>,
                     },
-                )}</h3>;
+                ) }</h3>;
             } else {
                 // We're not the original client: the user probably got to us by clicking the
                 // email validation link. We can't offer a 'go straight to your account' link
                 // as we don't have the original creds.
-                regDoneText = <h3>{_t(
+                regDoneText = <h3>{ _t(
                     "You can now close this window or <a>log in</a> to your new account.", {},
                     {
-                        a: (sub) => <a href="#/login" onClick={this.onLoginClickWithCheck}>{sub}</a>,
+                        a: (sub) => <a href="#/login" onClick={this.onLoginClickWithCheck}>{ sub }</a>,
                     },
-                )}</h3>;
+                ) }</h3>;
             }
             body = <div>
-                <h2>{_t("Registration Successful")}</h2>
+                <h2>{ _t("Registration Successful") }</h2>
                 { regDoneText }
             </div>;
         } else {
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.tsx
similarity index 69%
rename from src/components/structures/auth/SetupEncryptionBody.js
rename to src/components/structures/auth/SetupEncryptionBody.tsx
index 803df19d00..87d74a5a79 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.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.
@@ -15,41 +15,45 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';
-import * as sdk from '../../../index';
-import {
-    SetupEncryptionStore,
-    PHASE_LOADING,
-    PHASE_INTRO,
-    PHASE_BUSY,
-    PHASE_DONE,
-    PHASE_CONFIRM_SKIP,
-    PHASE_FINISHED,
-} from '../../../stores/SetupEncryptionStore';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { SetupEncryptionStore, Phase } from '../../../stores/SetupEncryptionStore';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/crypto/api';
+import EncryptionPanel from "../../views/right_panel/EncryptionPanel";
+import AccessibleButton from '../../views/elements/AccessibleButton';
+import Spinner from '../../views/elements/Spinner';
+import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
-function keyHasPassphrase(keyInfo) {
-    return (
+import { logger } from "matrix-js-sdk/src/logger";
+
+function keyHasPassphrase(keyInfo: ISecretStorageKeyInfo): boolean {
+    return Boolean(
         keyInfo.passphrase &&
         keyInfo.passphrase.salt &&
-        keyInfo.passphrase.iterations
+        keyInfo.passphrase.iterations,
     );
 }
 
-@replaceableComponent("structures.auth.SetupEncryptionBody")
-export default class SetupEncryptionBody extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
+interface IProps {
+    onFinished: (boolean) => void;
+}
 
-    constructor() {
-        super();
+interface IState {
+    phase: Phase;
+    verificationRequest: VerificationRequest;
+    backupInfo: IKeyBackupInfo;
+}
+
+@replaceableComponent("structures.auth.SetupEncryptionBody")
+export default class SetupEncryptionBody extends React.Component<IProps, IState> {
+    constructor(props) {
+        super(props);
         const store = SetupEncryptionStore.sharedInstance();
-        store.on("update", this._onStoreUpdate);
+        store.on("update", this.onStoreUpdate);
         store.start();
         this.state = {
             phase: store.phase,
@@ -61,10 +65,10 @@ export default class SetupEncryptionBody extends React.Component {
         };
     }
 
-    _onStoreUpdate = () => {
+    private onStoreUpdate = () => {
         const store = SetupEncryptionStore.sharedInstance();
-        if (store.phase === PHASE_FINISHED) {
-            this.props.onFinished();
+        if (store.phase === Phase.Finished) {
+            this.props.onFinished(true);
             return;
         }
         this.setState({
@@ -74,18 +78,18 @@ export default class SetupEncryptionBody extends React.Component {
         });
     };
 
-    componentWillUnmount() {
+    public componentWillUnmount() {
         const store = SetupEncryptionStore.sharedInstance();
-        store.off("update", this._onStoreUpdate);
+        store.off("update", this.onStoreUpdate);
         store.stop();
     }
 
-    _onUsePassphraseClick = async () => {
+    private onUsePassphraseClick = async () => {
         const store = SetupEncryptionStore.sharedInstance();
         store.usePassPhrase();
-    }
+    };
 
-    _onVerifyClick = () => {
+    private onVerifyClick = () => {
         const cli = MatrixClientPeg.get();
         const userId = cli.getUserId();
         const requestPromise = cli.requestVerification(userId);
@@ -99,44 +103,46 @@ export default class SetupEncryptionBody extends React.Component {
                 request.cancel();
             },
         });
-    }
+    };
 
-    onSkipClick = () => {
+    private onSkipClick = () => {
         const store = SetupEncryptionStore.sharedInstance();
         store.skip();
-    }
+    };
 
-    onSkipConfirmClick = () => {
+    private onSkipConfirmClick = () => {
         const store = SetupEncryptionStore.sharedInstance();
         store.skipConfirm();
-    }
+    };
 
-    onSkipBackClick = () => {
+    private onSkipBackClick = () => {
         const store = SetupEncryptionStore.sharedInstance();
         store.returnAfterSkip();
-    }
+    };
 
-    onDoneClick = () => {
+    private onDoneClick = () => {
         const store = SetupEncryptionStore.sharedInstance();
         store.done();
-    }
+    };
 
-    render() {
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    private onEncryptionPanelClose = () => {
+        this.props.onFinished(false);
+    };
 
+    public render() {
         const {
             phase,
         } = this.state;
 
         if (this.state.verificationRequest) {
-            const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
             return <EncryptionPanel
                 layout="dialog"
                 verificationRequest={this.state.verificationRequest}
-                onClose={this.props.onFinished}
+                onClose={this.onEncryptionPanelClose}
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
+                isRoomEncrypted={false}
             />;
-        } else if (phase === PHASE_INTRO) {
+        } else if (phase === Phase.Intro) {
             const store = SetupEncryptionStore.sharedInstance();
             let recoveryKeyPrompt;
             if (store.keyInfo && keyHasPassphrase(store.keyInfo)) {
@@ -147,88 +153,87 @@ export default class SetupEncryptionBody extends React.Component {
 
             let useRecoveryKeyButton;
             if (recoveryKeyPrompt) {
-                useRecoveryKeyButton = <AccessibleButton kind="link" onClick={this._onUsePassphraseClick}>
-                    {recoveryKeyPrompt}
+                useRecoveryKeyButton = <AccessibleButton kind="link" onClick={this.onUsePassphraseClick}>
+                    { recoveryKeyPrompt }
                 </AccessibleButton>;
             }
 
             let verifyButton;
             if (store.hasDevicesToVerifyAgainst) {
-                verifyButton = <AccessibleButton kind="primary" onClick={this._onVerifyClick}>
+                verifyButton = <AccessibleButton kind="primary" onClick={this.onVerifyClick}>
                     { _t("Use another login") }
                 </AccessibleButton>;
             }
 
             return (
                 <div>
-                    <p>{_t(
+                    <p>{ _t(
                         "Verify your identity to access encrypted messages and prove your identity to others.",
-                    )}</p>
+                    ) }</p>
 
                     <div className="mx_CompleteSecurity_actionRow">
-                        {verifyButton}
-                        {useRecoveryKeyButton}
+                        { verifyButton }
+                        { useRecoveryKeyButton }
                         <AccessibleButton kind="danger" onClick={this.onSkipClick}>
-                            {_t("Skip")}
+                            { _t("Skip") }
                         </AccessibleButton>
                     </div>
                 </div>
             );
-        } else if (phase === PHASE_DONE) {
+        } else if (phase === Phase.Done) {
             let message;
             if (this.state.backupInfo) {
-                message = <p>{_t(
+                message = <p>{ _t(
                     "Your new session is now verified. It has access to your " +
                     "encrypted messages, and other users will see it as trusted.",
-                )}</p>;
+                ) }</p>;
             } else {
-                message = <p>{_t(
+                message = <p>{ _t(
                     "Your new session is now verified. Other users will see it as trusted.",
-                )}</p>;
+                ) }</p>;
             }
             return (
                 <div>
                     <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified" />
-                    {message}
+                    { message }
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton
                             kind="primary"
                             onClick={this.onDoneClick}
                         >
-                            {_t("Done")}
+                            { _t("Done") }
                         </AccessibleButton>
                     </div>
                 </div>
             );
-        } else if (phase === PHASE_CONFIRM_SKIP) {
+        } else if (phase === Phase.ConfirmSkip) {
             return (
                 <div>
-                    <p>{_t(
+                    <p>{ _t(
                         "Without verifying, you won’t have access to all your messages " +
                         "and may appear as untrusted to others.",
-                    )}</p>
+                    ) }</p>
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton
                             className="warning"
                             kind="secondary"
                             onClick={this.onSkipConfirmClick}
                         >
-                            {_t("Skip")}
+                            { _t("Skip") }
                         </AccessibleButton>
                         <AccessibleButton
                             kind="danger"
                             onClick={this.onSkipBackClick}
                         >
-                            {_t("Go Back")}
+                            { _t("Go Back") }
                         </AccessibleButton>
                     </div>
                 </div>
             );
-        } else if (phase === PHASE_BUSY || phase === PHASE_LOADING) {
-            const Spinner = sdk.getComponent('views.elements.Spinner');
+        } else if (phase === Phase.Busy || phase === Phase.Loading) {
             return <Spinner />;
         } else {
-            console.log(`SetupEncryptionBody: Unknown phase ${phase}`);
+            logger.log(`SetupEncryptionBody: Unknown phase ${phase}`);
         }
     }
 }
diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx
index fa9207efdd..a943f47e66 100644
--- a/src/components/structures/auth/SoftLogout.tsx
+++ b/src/components/structures/auth/SoftLogout.tsx
@@ -15,17 +15,24 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from '../../../languageHandler';
-import * as sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
 import * as Lifecycle from '../../../Lifecycle';
 import Modal from '../../../Modal';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {ISSOFlow, LoginFlow, sendLoginRequest} from "../../../Login";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { ISSOFlow, LoginFlow, sendLoginRequest } from "../../../Login";
 import AuthPage from "../../views/auth/AuthPage";
-import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY} from "../../../BasePlatform";
+import { SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY } from "../../../BasePlatform";
 import SSOButtons from "../../views/elements/SSOButtons";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import ConfirmWipeDeviceDialog from '../../views/dialogs/ConfirmWipeDeviceDialog';
+import Field from '../../views/elements/Field';
+import AccessibleButton from '../../views/elements/AccessibleButton';
+import Spinner from "../../views/elements/Spinner";
+import AuthHeader from "../../views/auth/AuthHeader";
+import AuthBody from "../../views/auth/AuthBody";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const LOGIN_VIEW = {
     LOADING: 1,
@@ -49,7 +56,7 @@ interface IProps {
     fragmentAfterLogin?: string;
 
     // Called when the SSO login completes
-    onTokenLoginCompleted: () => void,
+    onTokenLoginCompleted: () => void;
 }
 
 interface IState {
@@ -79,7 +86,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
     componentDidMount(): void {
         // We've ended up here when we don't need to - navigate to login
         if (!Lifecycle.isSoftLogout()) {
-            dis.dispatch({action: "start_login"});
+            dis.dispatch({ action: "start_login" });
             return;
         }
 
@@ -94,12 +101,11 @@ export default class SoftLogout extends React.Component<IProps, IState> {
     }
 
     onClearAll = () => {
-        const ConfirmWipeDeviceDialog = sdk.getComponent('dialogs.ConfirmWipeDeviceDialog');
         Modal.createTrackedDialog('Clear Data', 'Soft Logout', ConfirmWipeDeviceDialog, {
             onFinished: (wipeData) => {
                 if (!wipeData) return;
 
-                console.log("Clearing data from soft-logged-out session");
+                logger.log("Clearing data from soft-logged-out session");
                 Lifecycle.logout();
             },
         });
@@ -109,7 +115,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
         const queryParams = this.props.realQueryParams;
         const hasAllParams = queryParams && queryParams['loginToken'];
         if (hasAllParams) {
-            this.setState({loginView: LOGIN_VIEW.LOADING});
+            this.setState({ loginView: LOGIN_VIEW.LOADING });
             this.trySsoLogin();
             return;
         }
@@ -125,18 +131,18 @@ export default class SoftLogout extends React.Component<IProps, IState> {
     }
 
     onPasswordChange = (ev) => {
-        this.setState({password: ev.target.value});
+        this.setState({ password: ev.target.value });
     };
 
     onForgotPassword = () => {
-        dis.dispatch({action: 'start_password_recovery'});
+        dis.dispatch({ action: 'start_password_recovery' });
     };
 
     onPasswordLogin = async (ev) => {
         ev.preventDefault();
         ev.stopPropagation();
 
-        this.setState({busy: true});
+        this.setState({ busy: true });
 
         const hsUrl = MatrixClientPeg.get().getHomeserverUrl();
         const isUrl = MatrixClientPeg.get().getIdentityServerUrl();
@@ -168,12 +174,12 @@ export default class SoftLogout extends React.Component<IProps, IState> {
 
         Lifecycle.hydrateSession(credentials).catch((e) => {
             console.error(e);
-            this.setState({busy: false, errorText: _t("Failed to re-authenticate")});
+            this.setState({ busy: false, errorText: _t("Failed to re-authenticate") });
         });
     };
 
     async trySsoLogin() {
-        this.setState({busy: true});
+        this.setState({ busy: true });
 
         const hsUrl = localStorage.getItem(SSO_HOMESERVER_URL_KEY);
         const isUrl = localStorage.getItem(SSO_ID_SERVER_URL_KEY) || MatrixClientPeg.get().getIdentityServerUrl();
@@ -188,7 +194,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             credentials = await sendLoginRequest(hsUrl, isUrl, loginType, loginParams);
         } catch (e) {
             console.error(e);
-            this.setState({busy: false, loginView: LOGIN_VIEW.UNSUPPORTED});
+            this.setState({ busy: false, loginView: LOGIN_VIEW.UNSUPPORTED });
             return;
         }
 
@@ -196,13 +202,12 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             if (this.props.onTokenLoginCompleted) this.props.onTokenLoginCompleted();
         }).catch((e) => {
             console.error(e);
-            this.setState({busy: false, loginView: LOGIN_VIEW.UNSUPPORTED});
+            this.setState({ busy: false, loginView: LOGIN_VIEW.UNSUPPORTED });
         });
     }
 
     private renderSignInSection() {
         if (this.state.loginView === LOGIN_VIEW.LOADING) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             return <Spinner />;
         }
 
@@ -214,12 +219,9 @@ export default class SoftLogout extends React.Component<IProps, IState> {
         }
 
         if (this.state.loginView === LOGIN_VIEW.PASSWORD) {
-            const Field = sdk.getComponent("elements.Field");
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
             let error = null;
             if (this.state.errorText) {
-                error = <span className='mx_Login_error'>{this.state.errorText}</span>;
+                error = <span className='mx_Login_error'>{ this.state.errorText }</span>;
             }
 
             if (!introText) {
@@ -228,8 +230,8 @@ export default class SoftLogout extends React.Component<IProps, IState> {
 
             return (
                 <form onSubmit={this.onPasswordLogin}>
-                    <p>{introText}</p>
-                    {error}
+                    <p>{ introText }</p>
+                    { error }
                     <Field
                         type="password"
                         label={_t("Password")}
@@ -243,10 +245,10 @@ export default class SoftLogout extends React.Component<IProps, IState> {
                         type="submit"
                         disabled={this.state.busy}
                     >
-                        {_t("Sign In")}
+                        { _t("Sign In") }
                     </AccessibleButton>
                     <AccessibleButton onClick={this.onForgotPassword} kind="link">
-                        {_t("Forgotten your password?")}
+                        { _t("Forgotten your password?") }
                     </AccessibleButton>
                 </form>
             );
@@ -262,7 +264,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
 
             return (
                 <div>
-                    <p>{introText}</p>
+                    <p>{ introText }</p>
                     <SSOButtons
                         matrixClient={MatrixClientPeg.get()}
                         flow={flow}
@@ -277,43 +279,39 @@ export default class SoftLogout extends React.Component<IProps, IState> {
         // Default: assume unsupported/error
         return (
             <p>
-                {_t(
+                { _t(
                     "You cannot sign in to your account. Please contact your " +
                     "homeserver admin for more information.",
-                )}
+                ) }
             </p>
         );
     }
 
     render() {
-        const AuthHeader = sdk.getComponent("auth.AuthHeader");
-        const AuthBody = sdk.getComponent("auth.AuthBody");
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
         return (
             <AuthPage>
                 <AuthHeader />
                 <AuthBody>
                     <h2>
-                        {_t("You're signed out")}
+                        { _t("You're signed out") }
                     </h2>
 
-                    <h3>{_t("Sign in")}</h3>
+                    <h3>{ _t("Sign in") }</h3>
                     <div>
-                        {this.renderSignInSection()}
+                        { this.renderSignInSection() }
                     </div>
 
-                    <h3>{_t("Clear personal data")}</h3>
+                    <h3>{ _t("Clear personal data") }</h3>
                     <p>
-                        {_t(
+                        { _t(
                             "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.",
-                        )}
+                        ) }
                     </p>
                     <div>
                         <AccessibleButton onClick={this.onClearAll} kind="danger">
-                            {_t("Clear all data")}
+                            { _t("Clear all data") }
                         </AccessibleButton>
                     </div>
                 </AuthBody>
diff --git a/src/components/views/audio_messages/AudioPlayer.tsx b/src/components/views/audio_messages/AudioPlayer.tsx
new file mode 100644
index 0000000000..b83f89fe5b
--- /dev/null
+++ b/src/components/views/audio_messages/AudioPlayer.tsx
@@ -0,0 +1,93 @@
+/*
+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, { createRef, ReactNode, RefObject } from "react";
+import PlayPauseButton from "./PlayPauseButton";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { formatBytes } from "../../../utils/FormattingUtils";
+import DurationClock from "./DurationClock";
+import { Key } from "../../../Keyboard";
+import { _t } from "../../../languageHandler";
+import SeekBar from "./SeekBar";
+import PlaybackClock from "./PlaybackClock";
+import AudioPlayerBase from "./AudioPlayerBase";
+
+@replaceableComponent("views.audio_messages.AudioPlayer")
+export default class AudioPlayer extends AudioPlayerBase {
+    private playPauseRef: RefObject<PlayPauseButton> = createRef();
+    private seekRef: RefObject<SeekBar> = createRef();
+
+    private onKeyDown = (ev: React.KeyboardEvent) => {
+        // stopPropagation() prevents the FocusComposer catch-all from triggering,
+        // but we need to do it on key down instead of press (even though the user
+        // interaction is typically on press).
+        if (ev.key === Key.SPACE) {
+            ev.stopPropagation();
+            this.playPauseRef.current?.toggleState();
+        } else if (ev.key === Key.ARROW_LEFT) {
+            ev.stopPropagation();
+            this.seekRef.current?.left();
+        } else if (ev.key === Key.ARROW_RIGHT) {
+            ev.stopPropagation();
+            this.seekRef.current?.right();
+        }
+    };
+
+    protected renderFileSize(): string {
+        const bytes = this.props.playback.sizeBytes;
+        if (!bytes) return null;
+
+        // Not translated here - we're just presenting the data which should already
+        // be translated if needed.
+        return `(${formatBytes(bytes)})`;
+    }
+
+    protected renderComponent(): ReactNode {
+        // tabIndex=0 to ensure that the whole component becomes a tab stop, where we handle keyboard
+        // events for accessibility
+        return (
+            <div className='mx_MediaBody mx_AudioPlayer_container' tabIndex={0} onKeyDown={this.onKeyDown}>
+                <div className='mx_AudioPlayer_primaryContainer'>
+                    <PlayPauseButton
+                        playback={this.props.playback}
+                        playbackPhase={this.state.playbackPhase}
+                        tabIndex={-1} // prevent tabbing into the button
+                        ref={this.playPauseRef}
+                    />
+                    <div className='mx_AudioPlayer_mediaInfo'>
+                        <span className='mx_AudioPlayer_mediaName'>
+                            { this.props.mediaName || _t("Unnamed audio") }
+                        </span>
+                        <div className='mx_AudioPlayer_byline'>
+                            <DurationClock playback={this.props.playback} />
+                            &nbsp; { /* easiest way to introduce a gap between the components */ }
+                            { this.renderFileSize() }
+                        </div>
+                    </div>
+                </div>
+                <div className='mx_AudioPlayer_seek'>
+                    <SeekBar
+                        playback={this.props.playback}
+                        tabIndex={-1} // prevent tabbing into the bar
+                        playbackPhase={this.state.playbackPhase}
+                        ref={this.seekRef}
+                    />
+                    <PlaybackClock playback={this.props.playback} defaultDisplaySeconds={0} />
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/voice_messages/RecordingPlayback.tsx b/src/components/views/audio_messages/AudioPlayerBase.tsx
similarity index 57%
rename from src/components/views/voice_messages/RecordingPlayback.tsx
rename to src/components/views/audio_messages/AudioPlayerBase.tsx
index 776997cec2..d8fc9d507f 100644
--- a/src/components/views/voice_messages/RecordingPlayback.tsx
+++ b/src/components/views/audio_messages/AudioPlayerBase.tsx
@@ -14,24 +14,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Playback, PlaybackState} from "../../../voice/Playback";
-import React, {ReactNode} from "react";
-import {UPDATE_EVENT} from "../../../stores/AsyncStore";
-import PlaybackWaveform from "./PlaybackWaveform";
-import PlayPauseButton from "./PlayPauseButton";
-import PlaybackClock from "./PlaybackClock";
+import { Playback, PlaybackState } from "../../../audio/Playback";
+import { TileShape } from "../rooms/EventTile";
+import React, { ReactNode } from "react";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { _t } from "../../../languageHandler";
 
 interface IProps {
     // Playback instance to render. Cannot change during component lifecycle: create
     // an all-new component instead.
     playback: Playback;
+
+    mediaName?: string;
+    tileShape?: TileShape;
 }
 
 interface IState {
     playbackPhase: PlaybackState;
+    error?: boolean;
 }
 
-export default class RecordingPlayback extends React.PureComponent<IProps, IState> {
+@replaceableComponent("views.audio_messages.AudioPlayerBase")
+export default abstract class AudioPlayerBase extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
@@ -44,19 +49,22 @@ export default class RecordingPlayback extends React.PureComponent<IProps, IStat
 
         // Don't wait for the promise to complete - it will emit a progress update when it
         // is done, and it's not meant to take long anyhow.
-        // noinspection JSIgnoredPromiseFromCall
-        this.props.playback.prepare();
+        this.props.playback.prepare().catch(e => {
+            console.error("Error processing audio file:", e);
+            this.setState({ error: true });
+        });
     }
 
     private onPlaybackUpdate = (ev: PlaybackState) => {
-        this.setState({playbackPhase: ev});
+        this.setState({ playbackPhase: ev });
     };
 
+    protected abstract renderComponent(): ReactNode;
+
     public render(): ReactNode {
-        return <div className='mx_VoiceMessagePrimaryContainer'>
-            <PlayPauseButton playback={this.props.playback} playbackPhase={this.state.playbackPhase} />
-            <PlaybackClock playback={this.props.playback} />
-            <PlaybackWaveform playback={this.props.playback} />
-        </div>
+        return <>
+            { this.renderComponent() }
+            { this.state.error && <div className="text-warning">{ _t("Error downloading audio") }</div> }
+        </>;
     }
 }
diff --git a/src/components/views/voice_messages/Clock.tsx b/src/components/views/audio_messages/Clock.tsx
similarity index 62%
rename from src/components/views/voice_messages/Clock.tsx
rename to src/components/views/audio_messages/Clock.tsx
index 23e6762c52..69244cc5ad 100644
--- a/src/components/views/voice_messages/Clock.tsx
+++ b/src/components/views/audio_messages/Clock.tsx
@@ -15,34 +15,30 @@ limitations under the License.
 */
 
 import React from "react";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { formatSeconds } from "../../../DateUtils";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-interface IProps {
+export interface IProps {
     seconds: number;
 }
 
-interface IState {
-}
-
 /**
  * Simply converts seconds into minutes and seconds. Note that hours will not be
  * displayed, making it possible to see "82:29".
  */
-@replaceableComponent("views.voice_messages.Clock")
-export default class Clock extends React.Component<IProps, IState> {
+@replaceableComponent("views.audio_messages.Clock")
+export default class Clock extends React.Component<IProps> {
     public constructor(props) {
         super(props);
     }
 
-    shouldComponentUpdate(nextProps: Readonly<IProps>, nextState: Readonly<IState>, nextContext: any): boolean {
+    shouldComponentUpdate(nextProps: Readonly<IProps>): boolean {
         const currentFloor = Math.floor(this.props.seconds);
         const nextFloor = Math.floor(nextProps.seconds);
         return currentFloor !== nextFloor;
     }
 
     public render() {
-        const minutes = Math.floor(this.props.seconds / 60).toFixed(0).padStart(2, '0');
-        const seconds = Math.floor(this.props.seconds % 60).toFixed(0).padStart(2, '0'); // hide millis
-        return <span className='mx_Clock'>{minutes}:{seconds}</span>;
+        return <span className='mx_Clock'>{ formatSeconds(this.props.seconds) }</span>;
     }
 }
diff --git a/src/components/views/audio_messages/DurationClock.tsx b/src/components/views/audio_messages/DurationClock.tsx
new file mode 100644
index 0000000000..15bc6c98a4
--- /dev/null
+++ b/src/components/views/audio_messages/DurationClock.tsx
@@ -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.
+*/
+
+import React from "react";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Clock from "./Clock";
+import { Playback } from "../../../audio/Playback";
+
+interface IProps {
+    playback: Playback;
+}
+
+interface IState {
+    durationSeconds: number;
+}
+
+/**
+ * A clock which shows a clip's maximum duration.
+ */
+@replaceableComponent("views.audio_messages.DurationClock")
+export default class DurationClock extends React.PureComponent<IProps, IState> {
+    public constructor(props) {
+        super(props);
+
+        this.state = {
+            // we track the duration on state because we won't really know what the clip duration
+            // is until the first time update, and as a PureComponent we are trying to dedupe state
+            // updates as much as possible. This is just the easiest way to avoid a forceUpdate() or
+            // member property to track "did we get a duration".
+            durationSeconds: this.props.playback.clockInfo.durationSeconds,
+        };
+        this.props.playback.clockInfo.liveData.onUpdate(this.onTimeUpdate);
+    }
+
+    private onTimeUpdate = (time: number[]) => {
+        this.setState({ durationSeconds: time[1] });
+    };
+
+    public render() {
+        return <Clock seconds={this.state.durationSeconds} />;
+    }
+}
diff --git a/src/components/views/voice_messages/LiveRecordingClock.tsx b/src/components/views/audio_messages/LiveRecordingClock.tsx
similarity index 52%
rename from src/components/views/voice_messages/LiveRecordingClock.tsx
rename to src/components/views/audio_messages/LiveRecordingClock.tsx
index b82539eb16..e7330efc1d 100644
--- a/src/components/views/voice_messages/LiveRecordingClock.tsx
+++ b/src/components/views/audio_messages/LiveRecordingClock.tsx
@@ -15,9 +15,10 @@ limitations under the License.
 */
 
 import React from "react";
-import {IRecordingUpdate, VoiceRecording} from "../../../voice/VoiceRecording";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { IRecordingUpdate, VoiceRecording } from "../../../audio/VoiceRecording";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
+import { MarkedExecution } from "../../../utils/MarkedExecution";
 
 interface IProps {
     recorder: VoiceRecording;
@@ -30,18 +31,33 @@ interface IState {
 /**
  * A clock for a live recording.
  */
-@replaceableComponent("views.voice_messages.LiveRecordingClock")
+@replaceableComponent("views.audio_messages.LiveRecordingClock")
 export default class LiveRecordingClock extends React.PureComponent<IProps, IState> {
-    public constructor(props) {
-        super(props);
+    private seconds = 0;
+    private scheduledUpdate = new MarkedExecution(
+        () => this.updateClock(),
+        () => requestAnimationFrame(() => this.scheduledUpdate.trigger()),
+    );
 
-        this.state = {seconds: 0};
-        this.props.recorder.liveData.onUpdate(this.onRecordingUpdate);
+    constructor(props) {
+        super(props);
+        this.state = {
+            seconds: 0,
+        };
     }
 
-    private onRecordingUpdate = (update: IRecordingUpdate) => {
-        this.setState({seconds: update.timeSeconds});
-    };
+    componentDidMount() {
+        this.props.recorder.liveData.onUpdate((update: IRecordingUpdate) => {
+            this.seconds = update.timeSeconds;
+            this.scheduledUpdate.mark();
+        });
+    }
+
+    private updateClock() {
+        this.setState({
+            seconds: this.seconds,
+        });
+    }
 
     public render() {
         return <Clock seconds={this.state.seconds} />;
diff --git a/src/components/views/audio_messages/LiveRecordingWaveform.tsx b/src/components/views/audio_messages/LiveRecordingWaveform.tsx
new file mode 100644
index 0000000000..73e18626fe
--- /dev/null
+++ b/src/components/views/audio_messages/LiveRecordingWaveform.tsx
@@ -0,0 +1,69 @@
+/*
+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 from "react";
+import { IRecordingUpdate, RECORDING_PLAYBACK_SAMPLES, VoiceRecording } from "../../../audio/VoiceRecording";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { arrayFastResample, arraySeed } from "../../../utils/arrays";
+import Waveform from "./Waveform";
+import { MarkedExecution } from "../../../utils/MarkedExecution";
+
+interface IProps {
+    recorder: VoiceRecording;
+}
+
+interface IState {
+    waveform: number[];
+}
+
+/**
+ * A waveform which shows the waveform of a live recording
+ */
+@replaceableComponent("views.audio_messages.LiveRecordingWaveform")
+export default class LiveRecordingWaveform extends React.PureComponent<IProps, IState> {
+    public static defaultProps = {
+        progress: 1,
+    };
+
+    private waveform: number[] = [];
+    private scheduledUpdate = new MarkedExecution(
+        () => this.updateWaveform(),
+        () => requestAnimationFrame(() => this.scheduledUpdate.trigger()),
+    );
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            waveform: arraySeed(0, RECORDING_PLAYBACK_SAMPLES),
+        };
+    }
+
+    componentDidMount() {
+        this.props.recorder.liveData.onUpdate((update: IRecordingUpdate) => {
+            // The incoming data is between zero and one, so we don't need to clamp/rescale it.
+            this.waveform = arrayFastResample(Array.from(update.waveform), RECORDING_PLAYBACK_SAMPLES);
+            this.scheduledUpdate.mark();
+        });
+    }
+
+    private updateWaveform() {
+        this.setState({ waveform: this.waveform });
+    }
+
+    public render() {
+        return <Waveform relHeights={this.state.waveform} />;
+    }
+}
diff --git a/src/components/views/voice_messages/PlayPauseButton.tsx b/src/components/views/audio_messages/PlayPauseButton.tsx
similarity index 67%
rename from src/components/views/voice_messages/PlayPauseButton.tsx
rename to src/components/views/audio_messages/PlayPauseButton.tsx
index 1f87eb012d..de2822cc39 100644
--- a/src/components/views/voice_messages/PlayPauseButton.tsx
+++ b/src/components/views/audio_messages/PlayPauseButton.tsx
@@ -14,14 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactNode} from "react";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import React, { ReactNode } from "react";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import {_t} from "../../../languageHandler";
-import {Playback, PlaybackState} from "../../../voice/Playback";
+import { _t } from "../../../languageHandler";
+import { Playback, PlaybackState } from "../../../audio/Playback";
 import classNames from "classnames";
 
-interface IProps {
+// omitted props are handled by render function
+interface IProps extends Omit<React.ComponentProps<typeof AccessibleTooltipButton>, "title" | "onClick" | "disabled"> {
     // Playback instance to manipulate. Cannot change during the component lifecycle.
     playback: Playback;
 
@@ -33,19 +34,25 @@ interface IProps {
  * Displays a play/pause button (activating the play/pause function of the recorder)
  * to be displayed in reference to a recording.
  */
-@replaceableComponent("views.voice_messages.PlayPauseButton")
+@replaceableComponent("views.audio_messages.PlayPauseButton")
 export default class PlayPauseButton extends React.PureComponent<IProps> {
     public constructor(props) {
         super(props);
     }
 
-    private onClick = async () => {
-        await this.props.playback.toggle();
+    private onClick = () => {
+        // noinspection JSIgnoredPromiseFromCall
+        this.toggleState();
     };
 
+    public async toggleState() {
+        await this.props.playback.toggle();
+    }
+
     public render(): ReactNode {
-        const isPlaying = this.props.playback.isPlaying;
-        const isDisabled = this.props.playbackPhase === PlaybackState.Decoding;
+        const { playback, playbackPhase, ...restProps } = this.props;
+        const isPlaying = playback.isPlaying;
+        const isDisabled = playbackPhase === PlaybackState.Decoding;
         const classes = classNames('mx_PlayPauseButton', {
             'mx_PlayPauseButton_play': !isPlaying,
             'mx_PlayPauseButton_pause': isPlaying,
@@ -56,6 +63,7 @@ export default class PlayPauseButton extends React.PureComponent<IProps> {
             title={isPlaying ? _t("Pause") : _t("Play")}
             onClick={this.onClick}
             disabled={isDisabled}
+            {...restProps}
         />;
     }
 }
diff --git a/src/components/views/voice_messages/PlaybackClock.tsx b/src/components/views/audio_messages/PlaybackClock.tsx
similarity index 73%
rename from src/components/views/voice_messages/PlaybackClock.tsx
rename to src/components/views/audio_messages/PlaybackClock.tsx
index 2e8ec9a3e7..affb025d86 100644
--- a/src/components/views/voice_messages/PlaybackClock.tsx
+++ b/src/components/views/audio_messages/PlaybackClock.tsx
@@ -15,13 +15,18 @@ limitations under the License.
 */
 
 import React from "react";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
-import {Playback, PlaybackState} from "../../../voice/Playback";
-import {UPDATE_EVENT} from "../../../stores/AsyncStore";
+import { Playback, PlaybackState } from "../../../audio/Playback";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 
 interface IProps {
     playback: Playback;
+
+    // The default number of seconds to show when the playback has completed or
+    // has not started. Not used during playback, even when paused. Defaults to
+    // clip duration length.
+    defaultDisplaySeconds?: number;
 }
 
 interface IState {
@@ -33,7 +38,7 @@ interface IState {
 /**
  * A clock for a playback of a recording.
  */
-@replaceableComponent("views.voice_messages.PlaybackClock")
+@replaceableComponent("views.audio_messages.PlaybackClock")
 export default class PlaybackClock extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);
@@ -54,17 +59,21 @@ export default class PlaybackClock extends React.PureComponent<IProps, IState> {
     private onPlaybackUpdate = (ev: PlaybackState) => {
         // Convert Decoding -> Stopped because we don't care about the distinction here
         if (ev === PlaybackState.Decoding) ev = PlaybackState.Stopped;
-        this.setState({playbackPhase: ev});
+        this.setState({ playbackPhase: ev });
     };
 
     private onTimeUpdate = (time: number[]) => {
-        this.setState({seconds: time[0], durationSeconds: time[1]});
+        this.setState({ seconds: time[0], durationSeconds: time[1] });
     };
 
     public render() {
         let seconds = this.state.seconds;
         if (this.state.playbackPhase === PlaybackState.Stopped) {
-            seconds = this.state.durationSeconds;
+            if (Number.isFinite(this.props.defaultDisplaySeconds)) {
+                seconds = this.props.defaultDisplaySeconds;
+            } else {
+                seconds = this.state.durationSeconds;
+            }
         }
         return <Clock seconds={seconds} />;
     }
diff --git a/src/components/views/voice_messages/PlaybackWaveform.tsx b/src/components/views/audio_messages/PlaybackWaveform.tsx
similarity index 81%
rename from src/components/views/voice_messages/PlaybackWaveform.tsx
rename to src/components/views/audio_messages/PlaybackWaveform.tsx
index 2e9f163f5e..96fd3f5ae2 100644
--- a/src/components/views/voice_messages/PlaybackWaveform.tsx
+++ b/src/components/views/audio_messages/PlaybackWaveform.tsx
@@ -15,11 +15,11 @@ limitations under the License.
 */
 
 import React from "react";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {arraySeed, arrayTrimFill} from "../../../utils/arrays";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { arraySeed, arrayTrimFill } from "../../../utils/arrays";
 import Waveform from "./Waveform";
-import {Playback, PLAYBACK_WAVEFORM_SAMPLES} from "../../../voice/Playback";
-import {percentageOf} from "../../../utils/numbers";
+import { Playback, PLAYBACK_WAVEFORM_SAMPLES } from "../../../audio/Playback";
+import { percentageOf } from "../../../utils/numbers";
 
 interface IProps {
     playback: Playback;
@@ -33,7 +33,7 @@ interface IState {
 /**
  * A waveform which shows the waveform of a previously recorded recording
  */
-@replaceableComponent("views.voice_messages.PlaybackWaveform")
+@replaceableComponent("views.audio_messages.PlaybackWaveform")
 export default class PlaybackWaveform extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);
@@ -53,13 +53,13 @@ export default class PlaybackWaveform extends React.PureComponent<IProps, IState
     }
 
     private onWaveformUpdate = (waveform: number[]) => {
-        this.setState({heights: this.toHeights(waveform)});
+        this.setState({ heights: this.toHeights(waveform) });
     };
 
     private onTimeUpdate = (time: number[]) => {
         // Track percentages to a general precision to avoid over-waking the component.
         const progress = Number(percentageOf(time[0], 0, time[1]).toFixed(3));
-        this.setState({progress});
+        this.setState({ progress });
     };
 
     public render() {
diff --git a/src/components/views/audio_messages/RecordingPlayback.tsx b/src/components/views/audio_messages/RecordingPlayback.tsx
new file mode 100644
index 0000000000..e3f612c9b6
--- /dev/null
+++ b/src/components/views/audio_messages/RecordingPlayback.tsx
@@ -0,0 +1,43 @@
+/*
+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, { ReactNode } from "react";
+import PlayPauseButton from "./PlayPauseButton";
+import PlaybackClock from "./PlaybackClock";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { TileShape } from "../rooms/EventTile";
+import PlaybackWaveform from "./PlaybackWaveform";
+import AudioPlayerBase from "./AudioPlayerBase";
+
+@replaceableComponent("views.audio_messages.RecordingPlayback")
+export default class RecordingPlayback extends AudioPlayerBase {
+    private get isWaveformable(): boolean {
+        return this.props.tileShape !== TileShape.Notif
+            && this.props.tileShape !== TileShape.FileGrid
+            && this.props.tileShape !== TileShape.Pinned;
+    }
+
+    protected renderComponent(): ReactNode {
+        const shapeClass = !this.isWaveformable ? 'mx_VoiceMessagePrimaryContainer_noWaveform' : '';
+        return (
+            <div className={'mx_MediaBody mx_VoiceMessagePrimaryContainer ' + shapeClass}>
+                <PlayPauseButton playback={this.props.playback} playbackPhase={this.state.playbackPhase} />
+                <PlaybackClock playback={this.props.playback} />
+                { this.isWaveformable && <PlaybackWaveform playback={this.props.playback} /> }
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/audio_messages/SeekBar.tsx b/src/components/views/audio_messages/SeekBar.tsx
new file mode 100644
index 0000000000..f0c03bb032
--- /dev/null
+++ b/src/components/views/audio_messages/SeekBar.tsx
@@ -0,0 +1,112 @@
+/*
+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 { Playback, PlaybackState } from "../../../audio/Playback";
+import React, { ChangeEvent, CSSProperties, ReactNode } from "react";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MarkedExecution } from "../../../utils/MarkedExecution";
+import { percentageOf } from "../../../utils/numbers";
+
+interface IProps {
+    // Playback instance to render. Cannot change during component lifecycle: create
+    // an all-new component instead.
+    playback: Playback;
+
+    // Tab index for the underlying component. Useful if the seek bar is in a managed state.
+    // Defaults to zero.
+    tabIndex?: number;
+
+    playbackPhase: PlaybackState;
+}
+
+interface IState {
+    percentage: number;
+}
+
+interface ISeekCSS extends CSSProperties {
+    '--fillTo': number;
+}
+
+const ARROW_SKIP_SECONDS = 5; // arbitrary
+
+@replaceableComponent("views.audio_messages.SeekBar")
+export default class SeekBar extends React.PureComponent<IProps, IState> {
+    // We use an animation frame request to avoid overly spamming prop updates, even if we aren't
+    // really using anything demanding on the CSS front.
+
+    private animationFrameFn = new MarkedExecution(
+        () => this.doUpdate(),
+        () => requestAnimationFrame(() => this.animationFrameFn.trigger()));
+
+    public static defaultProps = {
+        tabIndex: 0,
+    };
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            percentage: 0,
+        };
+
+        // We don't need to de-register: the class handles this for us internally
+        this.props.playback.clockInfo.liveData.onUpdate(() => this.animationFrameFn.mark());
+    }
+
+    private doUpdate() {
+        this.setState({
+            percentage: percentageOf(
+                this.props.playback.clockInfo.timeSeconds,
+                0,
+                this.props.playback.clockInfo.durationSeconds),
+        });
+    }
+
+    public left() {
+        // noinspection JSIgnoredPromiseFromCall
+        this.props.playback.skipTo(this.props.playback.clockInfo.timeSeconds - ARROW_SKIP_SECONDS);
+    }
+
+    public right() {
+        // noinspection JSIgnoredPromiseFromCall
+        this.props.playback.skipTo(this.props.playback.clockInfo.timeSeconds + ARROW_SKIP_SECONDS);
+    }
+
+    private onChange = (ev: ChangeEvent<HTMLInputElement>) => {
+        // Thankfully, onChange is only called when the user changes the value, not when we
+        // change the value on the component. We can use this as a reliable "skip to X" function.
+        //
+        // noinspection JSIgnoredPromiseFromCall
+        this.props.playback.skipTo(Number(ev.target.value) * this.props.playback.clockInfo.durationSeconds);
+    };
+
+    public render(): ReactNode {
+        // We use a range input to avoid having to re-invent accessibility handling on
+        // a custom set of divs.
+        return <input
+            type="range"
+            className='mx_SeekBar'
+            tabIndex={this.props.tabIndex}
+            onChange={this.onChange}
+            min={0}
+            max={1}
+            value={this.state.percentage}
+            step={0.001}
+            style={{ '--fillTo': this.state.percentage } as ISeekCSS}
+            disabled={this.props.playbackPhase === PlaybackState.Decoding}
+        />;
+    }
+}
diff --git a/src/components/views/voice_messages/Waveform.tsx b/src/components/views/audio_messages/Waveform.tsx
similarity index 75%
rename from src/components/views/voice_messages/Waveform.tsx
rename to src/components/views/audio_messages/Waveform.tsx
index 840a5a12b3..4e44abdf46 100644
--- a/src/components/views/voice_messages/Waveform.tsx
+++ b/src/components/views/audio_messages/Waveform.tsx
@@ -15,8 +15,13 @@ limitations under the License.
 */
 
 import React from "react";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import classNames from "classnames";
+import { CSSProperties } from "react";
+
+interface WaveformCSSProperties extends CSSProperties {
+    '--barHeight': number;
+}
 
 interface IProps {
     relHeights: number[]; // relative heights (0-1)
@@ -34,27 +39,29 @@ interface IState {
  * For CSS purposes, a mx_Waveform_bar_100pct class is added when the bar should be
  * "filled", as a demonstration of the progress property.
  */
-@replaceableComponent("views.voice_messages.Waveform")
+@replaceableComponent("views.audio_messages.Waveform")
 export default class Waveform extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         progress: 1,
     };
 
-    public constructor(props) {
-        super(props);
-    }
-
     public render() {
         return <div className='mx_Waveform'>
-            {this.props.relHeights.map((h, i) => {
+            { this.props.relHeights.map((h, i) => {
                 const progress = this.props.progress;
                 const isCompleteBar = (i / this.props.relHeights.length) <= progress && progress > 0;
                 const classes = classNames({
                     'mx_Waveform_bar': true,
                     'mx_Waveform_bar_100pct': isCompleteBar,
                 });
-                return <span key={i} style={{height: (h * 100) + '%'}} className={classes} />;
-            })}
+                return <span
+                    key={i}
+                    style={{
+                        "--barHeight": h,
+                    } as WaveformCSSProperties}
+                    className={classes}
+                />;
+            }) }
         </div>;
     }
 }
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.tsx
similarity index 87%
rename from src/components/views/auth/AuthBody.js
rename to src/components/views/auth/AuthBody.tsx
index 2cb72b5e1d..3543a573d7 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.tsx
@@ -15,11 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.auth.AuthBody")
 export default class AuthBody extends React.PureComponent {
-    render() {
+    public render(): React.ReactNode {
         return <div className="mx_AuthBody">
             { this.props.children }
         </div>;
diff --git a/src/components/views/auth/AuthFooter.js b/src/components/views/auth/AuthFooter.tsx
similarity index 90%
rename from src/components/views/auth/AuthFooter.js
rename to src/components/views/auth/AuthFooter.tsx
index f167e16283..00bced8c39 100644
--- a/src/components/views/auth/AuthFooter.js
+++ b/src/components/views/auth/AuthFooter.tsx
@@ -18,11 +18,11 @@ limitations under the License.
 
 import { _t } from '../../../languageHandler';
 import React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.auth.AuthFooter")
 export default class AuthFooter extends React.Component {
-    render() {
+    public render(): React.ReactNode {
         return (
             <div className="mx_AuthFooter">
                 <a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t("powered by Matrix") }</a>
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.tsx
similarity index 66%
rename from src/components/views/auth/AuthHeader.js
rename to src/components/views/auth/AuthHeader.tsx
index 323299b3a8..cab7da1468 100644
--- a/src/components/views/auth/AuthHeader.js
+++ b/src/components/views/auth/AuthHeader.tsx
@@ -16,20 +16,17 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AuthHeaderLogo from "./AuthHeaderLogo";
+import LanguageSelector from "./LanguageSelector";
+
+interface IProps {
+    disableLanguageSelector?: boolean;
+}
 
 @replaceableComponent("views.auth.AuthHeader")
-export default class AuthHeader extends React.Component {
-    static propTypes = {
-        disableLanguageSelector: PropTypes.bool,
-    };
-
-    render() {
-        const AuthHeaderLogo = sdk.getComponent('auth.AuthHeaderLogo');
-        const LanguageSelector = sdk.getComponent('views.auth.LanguageSelector');
-
+export default class AuthHeader extends React.Component<IProps> {
+    public render(): React.ReactNode {
         return (
             <div className="mx_AuthHeader">
                 <AuthHeaderLogo />
diff --git a/src/components/views/auth/AuthHeaderLogo.js b/src/components/views/auth/AuthHeaderLogo.tsx
similarity index 87%
rename from src/components/views/auth/AuthHeaderLogo.js
rename to src/components/views/auth/AuthHeaderLogo.tsx
index b4e04799bb..b6724793a5 100644
--- a/src/components/views/auth/AuthHeaderLogo.js
+++ b/src/components/views/auth/AuthHeaderLogo.tsx
@@ -15,11 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.auth.AuthHeaderLogo")
 export default class AuthHeaderLogo extends React.PureComponent {
-    render() {
+    public render(): React.ReactNode {
         return <div className="mx_AuthHeaderLogo">
             Matrix
         </div>;
diff --git a/src/components/views/auth/AuthPage.js b/src/components/views/auth/AuthPage.tsx
similarity index 80%
rename from src/components/views/auth/AuthPage.js
rename to src/components/views/auth/AuthPage.tsx
index 82f7270121..c402d5b699 100644
--- a/src/components/views/auth/AuthPage.js
+++ b/src/components/views/auth/AuthPage.tsx
@@ -17,18 +17,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AuthFooter from "./AuthFooter";
 
 @replaceableComponent("views.auth.AuthPage")
 export default class AuthPage extends React.PureComponent {
-    render() {
-        const AuthFooter = sdk.getComponent('auth.AuthFooter');
-
+    public render(): React.ReactNode {
         return (
             <div className="mx_AuthPage">
                 <div className="mx_AuthPage_modal">
-                    {this.props.children}
+                    { this.props.children }
                 </div>
                 <AuthFooter />
             </div>
diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.tsx
similarity index 61%
rename from src/components/views/auth/CaptchaForm.js
rename to src/components/views/auth/CaptchaForm.tsx
index 50de24d403..db0e07e046 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.tsx
@@ -14,67 +14,77 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef } from 'react';
 import { _t } from '../../../languageHandler';
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const DIV_ID = 'mx_recaptcha';
 
+interface ICaptchaFormProps {
+    sitePublicKey: string;
+    onCaptchaResponse: (response: string) => void;
+}
+
+interface ICaptchaFormState {
+    errorText?: string;
+
+}
+
 /**
  * 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,
-
-        // called with the captcha response
-        onCaptchaResponse: PropTypes.func,
-    };
-
+export default class CaptchaForm extends React.Component<ICaptchaFormProps, ICaptchaFormState> {
     static defaultProps = {
         onCaptchaResponse: () => {},
     };
 
-    constructor(props) {
+    private captchaWidgetId?: string;
+    private recaptchaContainer = createRef<HTMLDivElement>();
+
+    constructor(props: ICaptchaFormProps) {
         super(props);
 
         this.state = {
-            errorText: null,
+            errorText: undefined,
         };
 
-        this._captchaWidgetId = null;
-
-        this._recaptchaContainer = createRef();
-
         CountlyAnalytics.instance.track("onboarding_grecaptcha_begin");
     }
 
     componentDidMount() {
         // Just putting a script tag into the returned jsx doesn't work, annoyingly,
         // so we do this instead.
-        if (global.grecaptcha) {
+        if (this.isRecaptchaReady()) {
             // already loaded
-            this._onCaptchaLoaded();
+            this.onCaptchaLoaded();
         } else {
-            console.log("Loading recaptcha script...");
-            window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded();};
+            logger.log("Loading recaptcha script...");
+            window.mxOnRecaptchaLoaded = () => { this.onCaptchaLoaded(); };
             const scriptTag = document.createElement('script');
             scriptTag.setAttribute(
-                'src', `https://www.recaptcha.net/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit`,
+                'src', `https://www.recaptcha.net/recaptcha/api.js?onload=mxOnRecaptchaLoaded&render=explicit`,
             );
-            this._recaptchaContainer.current.appendChild(scriptTag);
+            this.recaptchaContainer.current.appendChild(scriptTag);
         }
     }
 
     componentWillUnmount() {
-        this._resetRecaptcha();
+        this.resetRecaptcha();
     }
 
-    _renderRecaptcha(divId) {
-        if (!global.grecaptcha) {
+    // Borrowed directly from: https://github.com/codeep/react-recaptcha-google/commit/e118fa5670fa268426969323b2e7fe77698376ba
+    private isRecaptchaReady(): boolean {
+        return typeof window !== "undefined" &&
+            typeof global.grecaptcha !== "undefined" &&
+            typeof global.grecaptcha.render === 'function';
+    }
+
+    private renderRecaptcha(divId: string) {
+        if (!this.isRecaptchaReady()) {
             console.error("grecaptcha not loaded!");
             throw new Error("Recaptcha did not load successfully");
         }
@@ -84,26 +94,26 @@ export default class CaptchaForm extends React.Component {
             console.error("No public key for recaptcha!");
             throw new Error(
                 "This server has not supplied enough information for Recaptcha "
-                    + "authentication");
+                + "authentication");
         }
 
         console.info("Rendering to %s", divId);
-        this._captchaWidgetId = global.grecaptcha.render(divId, {
+        this.captchaWidgetId = global.grecaptcha.render(divId, {
             sitekey: publicKey,
             callback: this.props.onCaptchaResponse,
         });
     }
 
-    _resetRecaptcha() {
-        if (this._captchaWidgetId !== null) {
-            global.grecaptcha.reset(this._captchaWidgetId);
+    private resetRecaptcha() {
+        if (this.captchaWidgetId) {
+            global?.grecaptcha?.reset(this.captchaWidgetId);
         }
     }
 
-    _onCaptchaLoaded() {
-        console.log("Loaded recaptcha script.");
+    private onCaptchaLoaded() {
+        logger.log("Loaded recaptcha script.");
         try {
-            this._renderRecaptcha(DIV_ID);
+            this.renderRecaptcha(DIV_ID);
             // clear error if re-rendered
             this.setState({
                 errorText: null,
@@ -128,10 +138,10 @@ export default class CaptchaForm extends React.Component {
         }
 
         return (
-            <div ref={this._recaptchaContainer}>
-                <p>{_t(
+            <div ref={this.recaptchaContainer}>
+                <p>{ _t(
                     "This homeserver would like to make sure you are not a robot.",
-                )}</p>
+                ) }</p>
                 <div id={DIV_ID} />
                 { error }
             </div>
diff --git a/src/components/views/auth/CompleteSecurityBody.js b/src/components/views/auth/CompleteSecurityBody.tsx
similarity index 88%
rename from src/components/views/auth/CompleteSecurityBody.js
rename to src/components/views/auth/CompleteSecurityBody.tsx
index 6647bb1200..8f6affb64e 100644
--- a/src/components/views/auth/CompleteSecurityBody.js
+++ b/src/components/views/auth/CompleteSecurityBody.tsx
@@ -15,11 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.auth.CompleteSecurityBody")
 export default class CompleteSecurityBody extends React.PureComponent {
-    render() {
+    public render(): React.ReactNode {
         return <div className="mx_CompleteSecurityBody">
             { this.props.children }
         </div>;
diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.tsx
similarity index 74%
rename from src/components/views/auth/CountryDropdown.js
rename to src/components/views/auth/CountryDropdown.tsx
index e21f112865..eb5b27be9d 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.tsx
@@ -15,21 +15,19 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
-import * as sdk from '../../../index';
-
-import {COUNTRIES, getEmojiFlag} from '../../../phonenumber';
+import { COUNTRIES, getEmojiFlag, PhoneNumberCountryDefinition } from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
 import { _t } from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Dropdown from "../elements/Dropdown";
 
 const COUNTRIES_BY_ISO2 = {};
 for (const c of COUNTRIES) {
     COUNTRIES_BY_ISO2[c.iso2] = c;
 }
 
-function countryMatchesSearchQuery(query, country) {
+function countryMatchesSearchQuery(query: string, country: PhoneNumberCountryDefinition): boolean {
     // Remove '+' if present (when searching for a prefix)
     if (query[0] === '+') {
         query = query.slice(1);
@@ -41,15 +39,26 @@ function countryMatchesSearchQuery(query, country) {
     return false;
 }
 
-@replaceableComponent("views.auth.CountryDropdown")
-export default class CountryDropdown extends React.Component {
-    constructor(props) {
-        super(props);
-        this._onSearchChange = this._onSearchChange.bind(this);
-        this._onOptionChange = this._onOptionChange.bind(this);
-        this._getShortOption = this._getShortOption.bind(this);
+interface IProps {
+    value?: string;
+    onOptionChange: (country: PhoneNumberCountryDefinition) => void;
+    isSmall: boolean; // if isSmall, show +44 in the selected value
+    showPrefix: boolean;
+    className?: string;
+    disabled?: boolean;
+}
 
-        let defaultCountry = COUNTRIES[0];
+interface IState {
+    searchQuery: string;
+    defaultCountry: PhoneNumberCountryDefinition;
+}
+
+@replaceableComponent("views.auth.CountryDropdown")
+export default class CountryDropdown extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        let defaultCountry: PhoneNumberCountryDefinition = COUNTRIES[0];
         const defaultCountryCode = SdkConfig.get()["defaultCountryCode"];
         if (defaultCountryCode) {
             const country = COUNTRIES.find(c => c.iso2 === defaultCountryCode.toUpperCase());
@@ -62,7 +71,7 @@ export default class CountryDropdown extends React.Component {
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         if (!this.props.value) {
             // If no value is given, we start with the default
             // country selected, but our parent component
@@ -71,21 +80,21 @@ export default class CountryDropdown extends React.Component {
         }
     }
 
-    _onSearchChange(search) {
+    private onSearchChange = (search: string): void => {
         this.setState({
             searchQuery: search,
         });
-    }
+    };
 
-    _onOptionChange(iso2) {
+    private onOptionChange = (iso2: string): void => {
         this.props.onOptionChange(COUNTRIES_BY_ISO2[iso2]);
-    }
+    };
 
-    _flagImgForIso2(iso2) {
+    private flagImgForIso2(iso2: string): React.ReactNode {
         return <div className="mx_Dropdown_option_emoji">{ getEmojiFlag(iso2) }</div>;
     }
 
-    _getShortOption(iso2) {
+    private getShortOption = (iso2: string): React.ReactNode => {
         if (!this.props.isSmall) {
             return undefined;
         }
@@ -94,14 +103,12 @@ export default class CountryDropdown extends React.Component {
             countryPrefix = '+' + COUNTRIES_BY_ISO2[iso2].prefix;
         }
         return <span className="mx_CountryDropdown_shortOption">
-            { this._flagImgForIso2(iso2) }
+            { this.flagImgForIso2(iso2) }
             { countryPrefix }
         </span>;
-    }
-
-    render() {
-        const Dropdown = sdk.getComponent('elements.Dropdown');
+    };
 
+    public render(): React.ReactNode {
         let displayedCountries;
         if (this.state.searchQuery) {
             displayedCountries = COUNTRIES.filter(
@@ -124,7 +131,7 @@ export default class CountryDropdown extends React.Component {
 
         const options = displayedCountries.map((country) => {
             return <div className="mx_CountryDropdown_option" key={country.iso2}>
-                { this._flagImgForIso2(country.iso2) }
+                { this.flagImgForIso2(country.iso2) }
                 { _t(country.name) } (+{ country.prefix })
             </div>;
         });
@@ -136,10 +143,10 @@ export default class CountryDropdown extends React.Component {
         return <Dropdown
             id="mx_CountryDropdown"
             className={this.props.className + " mx_CountryDropdown"}
-            onOptionChange={this._onOptionChange}
-            onSearchChange={this._onSearchChange}
+            onOptionChange={this.onOptionChange}
+            onSearchChange={this.onSearchChange}
             menuWidth={298}
-            getShortOption={this._getShortOption}
+            getShortOption={this.getShortOption}
             value={value}
             searchEnabled={true}
             disabled={this.props.disabled}
@@ -149,13 +156,3 @@ export default class CountryDropdown extends React.Component {
         </Dropdown>;
     }
 }
-
-CountryDropdown.propTypes = {
-    className: PropTypes.string,
-    isSmall: PropTypes.bool,
-    // if isSmall, show +44 in the selected value
-    showPrefix: PropTypes.bool,
-    onOptionChange: PropTypes.func.isRequired,
-    value: PropTypes.string,
-    disabled: PropTypes.bool,
-};
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
index e819e1e59c..5544810a03 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
@@ -17,15 +17,19 @@ limitations under the License.
 import React, { ChangeEvent, createRef, FormEvent, MouseEvent } from 'react';
 import classNames from 'classnames';
 import { MatrixClient } from "matrix-js-sdk/src/client";
+import { AuthType, IAuthDict, IInputs, IStageStatus } from 'matrix-js-sdk/src/interactive-auth';
 
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import Spinner from "../elements/Spinner";
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { LocalisedPolicy, Policies } from '../../../Terms';
+import Field from '../elements/Field';
+import CaptchaForm from "./CaptchaForm";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 /* This file contains a collection of components which are used by the
  * InteractiveAuth to prompt the user to enter the information needed
@@ -40,7 +44,7 @@ import { LocalisedPolicy, Policies } from '../../../Terms';
  *                         one HS whilst beign a guest on another).
  * loginType:              the login type of the auth stage being attempted
  * authSessionId:          session id from the server
- * clientSecret:           The client secret in use for ID server auth sessions
+ * clientSecret:           The client secret in use for identity server auth sessions
  * stageParams:            params from the server for the stage being attempted
  * errorText:              error message from a previous attempt to authenticate
  * submitAuthDict:         a function which will be called with the new auth dict
@@ -53,8 +57,8 @@ import { LocalisedPolicy, Policies } from '../../../Terms';
  *                         Defined keys for stages are:
  *                             m.login.email.identity:
  *                              * emailSid: string representing the sid of the active
- *                                          verification session from the ID server, or
- *                                          null if no session is active.
+ *                                          verification session from the identity server,
+ *                                          or null if no session is active.
  * fail:                   a function which should be called with an error object if an
  *                         error occurred during the auth stage. This will cause the auth
  *                         session to be failed and the process to go back to the start.
@@ -73,33 +77,6 @@ import { LocalisedPolicy, Policies } from '../../../Terms';
  *    focus: set the input focus appropriately in the form.
  */
 
-enum AuthType {
-    Password = "m.login.password",
-    Recaptcha = "m.login.recaptcha",
-    Terms = "m.login.terms",
-    Email = "m.login.email.identity",
-    Msisdn = "m.login.msisdn",
-    Sso = "m.login.sso",
-    SsoUnstable = "org.matrix.login.sso",
-}
-
-/* eslint-disable camelcase */
-interface IAuthDict {
-    type?: AuthType;
-    // TODO: Remove `user` once servers support proper UIA
-    // See https://github.com/vector-im/element-web/issues/10312
-    user?: string;
-    identifier?: any;
-    password?: string;
-    response?: string;
-    // TODO: Remove `threepid_creds` once servers support proper UIA
-    // See https://github.com/vector-im/element-web/issues/10312
-    // See https://github.com/matrix-org/matrix-doc/issues/2220
-    threepid_creds?: any;
-    threepidCreds?: any;
-}
-/* eslint-enable camelcase */
-
 export const DEFAULT_PHASE = 0;
 
 interface IAuthEntryProps {
@@ -164,8 +141,7 @@ export class PasswordAuthEntry extends React.Component<IAuthEntryProps, IPasswor
 
         let submitButtonOrSpinner;
         if (this.props.busy) {
-            const Loader = sdk.getComponent("elements.Spinner");
-            submitButtonOrSpinner = <Loader />;
+            submitButtonOrSpinner = <Spinner />;
         } else {
             submitButtonOrSpinner = (
                 <input type="submit"
@@ -185,8 +161,6 @@ export class PasswordAuthEntry extends React.Component<IAuthEntryProps, IPasswor
             );
         }
 
-        const Field = sdk.getComponent('elements.Field');
-
         return (
             <div>
                 <p>{ _t("Confirm your identity by entering your account password below.") }</p>
@@ -236,13 +210,11 @@ export class RecaptchaAuthEntry extends React.Component<IRecaptchaAuthEntryProps
 
     render() {
         if (this.props.busy) {
-            const Loader = sdk.getComponent("elements.Spinner");
-            return <Loader />;
+            return <Spinner />;
         }
 
         let errorText = this.props.errorText;
 
-        const CaptchaForm = sdk.getComponent("views.auth.CaptchaForm");
         let sitePublicKey;
         if (!this.props.stageParams || !this.props.stageParams.public_key) {
             errorText = _t(
@@ -354,7 +326,6 @@ export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITerms
         CountlyAnalytics.instance.track("onboarding_terms_begin");
     }
 
-
     componentDidMount() {
         this.props.onPhaseChange(DEFAULT_PHASE);
     }
@@ -371,7 +342,7 @@ export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITerms
 
             newToggles[policy.id] = checked;
         }
-        this.setState({"toggledPolicies": newToggles});
+        this.setState({ "toggledPolicies": newToggles });
     }
 
     private trySubmit = () => {
@@ -382,17 +353,16 @@ export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITerms
         }
 
         if (allChecked) {
-            this.props.submitAuthDict({type: AuthType.Terms});
+            this.props.submitAuthDict({ type: AuthType.Terms });
             CountlyAnalytics.instance.track("onboarding_terms_complete");
         } else {
-            this.setState({errorText: _t("Please review and accept all of the homeserver's policies")});
+            this.setState({ errorText: _t("Please review and accept all of the homeserver's policies") });
         }
     };
 
     render() {
         if (this.props.busy) {
-            const Loader = sdk.getComponent("elements.Spinner");
-            return <Loader />;
+            return <Spinner />;
         }
 
         const checkboxes = [];
@@ -422,13 +392,15 @@ export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITerms
         let submitButton;
         if (this.props.showContinue !== false) {
             // XXX: button classes
-            submitButton = <button className="mx_InteractiveAuthEntryComponents_termsSubmit mx_GeneralButton"
-                onClick={this.trySubmit} disabled={!allChecked}>{_t("Accept")}</button>;
+            submitButton = <button
+                className="mx_InteractiveAuthEntryComponents_termsSubmit mx_GeneralButton"
+                onClick={this.trySubmit}
+                disabled={!allChecked}>{ _t("Accept") }</button>;
         }
 
         return (
             <div>
-                <p>{_t("Please review and accept the policies of this homeserver:")}</p>
+                <p>{ _t("Please review and accept the policies of this homeserver:") }</p>
                 { checkboxes }
                 { errorSection }
                 { submitButton }
@@ -518,11 +490,11 @@ export class MsisdnAuthEntry extends React.Component<IMsisdnAuthEntryProps, IMsi
     componentDidMount() {
         this.props.onPhaseChange(DEFAULT_PHASE);
 
-        this.setState({requestingToken: true});
+        this.setState({ requestingToken: true });
         this.requestMsisdnToken().catch((e) => {
             this.props.fail(e);
         }).finally(() => {
-            this.setState({requestingToken: false});
+            this.setState({ requestingToken: false });
         });
     }
 
@@ -585,14 +557,13 @@ export class MsisdnAuthEntry extends React.Component<IMsisdnAuthEntryProps, IMsi
             }
         } catch (e) {
             this.props.fail(e);
-            console.log("Failed to submit msisdn token");
+            logger.log("Failed to submit msisdn token");
         }
     };
 
     render() {
         if (this.state.requestingToken) {
-            const Loader = sdk.getComponent("elements.Spinner");
-            return <Loader />;
+            return <Spinner />;
         } else {
             const enableSubmit = Boolean(this.state.token);
             const submitClasses = classNames({
@@ -620,15 +591,17 @@ export class MsisdnAuthEntry extends React.Component<IMsisdnAuthEntryProps, IMsi
                                 className="mx_InteractiveAuthEntryComponents_msisdnEntry"
                                 value={this.state.token}
                                 onChange={this.onTokenChange}
-                                aria-label={ _t("Code")}
+                                aria-label={_t("Code")}
                             />
                             <br />
-                            <input type="submit" value={_t("Submit")}
+                            <input
+                                type="submit"
+                                value={_t("Submit")}
                                 className={submitClasses}
                                 disabled={!enableSubmit}
                             />
                         </form>
-                        {errorSection}
+                        { errorSection }
                     </div>
                 </div>
             );
@@ -710,7 +683,7 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
         // context.
 
         this.popupWindow = window.open(this.ssoUrl, "_blank");
-        this.setState({phase: SSOAuthEntry.PHASE_POSTAUTH});
+        this.setState({ phase: SSOAuthEntry.PHASE_POSTAUTH });
         this.props.onPhaseChange(SSOAuthEntry.PHASE_POSTAUTH);
     };
 
@@ -724,21 +697,21 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
             <AccessibleButton
                 onClick={this.props.onCancel}
                 kind={this.props.continueKind ? (this.props.continueKind + '_outline') : 'primary_outline'}
-            >{_t("Cancel")}</AccessibleButton>
+            >{ _t("Cancel") }</AccessibleButton>
         );
         if (this.state.phase === SSOAuthEntry.PHASE_PREAUTH) {
             continueButton = (
                 <AccessibleButton
                     onClick={this.onStartAuthClick}
                     kind={this.props.continueKind || 'primary'}
-                >{this.props.continueText || _t("Single Sign On")}</AccessibleButton>
+                >{ this.props.continueText || _t("Single Sign On") }</AccessibleButton>
             );
         } else {
             continueButton = (
                 <AccessibleButton
                     onClick={this.onConfirmClick}
                     kind={this.props.continueKind || 'primary'}
-                >{this.props.continueText || _t("Confirm")}</AccessibleButton>
+                >{ this.props.continueText || _t("Confirm") }</AccessibleButton>
             );
         }
 
@@ -760,8 +733,8 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
         return <React.Fragment>
             { errorSection }
             <div className="mx_InteractiveAuthEntryComponents_sso_buttons">
-                {cancelButton}
-                {continueButton}
+                { cancelButton }
+                { continueButton }
             </div>
         </React.Fragment>;
     }
@@ -832,13 +805,32 @@ export class FallbackAuthEntry extends React.Component<IAuthEntryProps> {
                 <a href="" ref={this.fallbackButton} onClick={this.onShowFallbackClick}>{
                     _t("Start authentication")
                 }</a>
-                {errorSection}
+                { errorSection }
             </div>
         );
     }
 }
 
-export default function getEntryComponentForLoginType(loginType: AuthType): typeof React.Component {
+export interface IStageComponentProps extends IAuthEntryProps {
+    clientSecret?: string;
+    stageParams?: Record<string, any>;
+    inputs?: IInputs;
+    stageState?: IStageStatus;
+    showContinue?: boolean;
+    continueText?: string;
+    continueKind?: string;
+    fail?(e: Error): void;
+    setEmailSid?(sid: string): void;
+    onCancel?(): void;
+}
+
+export interface IStageComponent extends React.ComponentClass<React.PropsWithRef<IStageComponentProps>> {
+    tryContinue?(): void;
+    attemptFailed?(): void;
+    focus?(): void;
+}
+
+export default function getEntryComponentForLoginType(loginType: AuthType): IStageComponent {
     switch (loginType) {
         case AuthType.Password:
             return PasswordAuthEntry;
diff --git a/src/components/views/auth/LanguageSelector.js b/src/components/views/auth/LanguageSelector.tsx
similarity index 76%
rename from src/components/views/auth/LanguageSelector.js
rename to src/components/views/auth/LanguageSelector.tsx
index 0738ee43e4..c26b4797f3 100644
--- a/src/components/views/auth/LanguageSelector.js
+++ b/src/components/views/auth/LanguageSelector.tsx
@@ -15,24 +15,26 @@ limitations under the License.
 */
 
 import SdkConfig from "../../../SdkConfig";
-import {getCurrentLanguage} from "../../../languageHandler";
+import { getCurrentLanguage } from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 import PlatformPeg from "../../../PlatformPeg";
-import * as sdk from '../../../index';
 import React from 'react';
-import {SettingLevel} from "../../../settings/SettingLevel";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import LanguageDropdown from "../elements/LanguageDropdown";
 
-function onChange(newLang) {
+function onChange(newLang: string): void {
     if (getCurrentLanguage() !== newLang) {
         SettingsStore.setValue("language", null, SettingLevel.DEVICE, newLang);
         PlatformPeg.get().reload();
     }
 }
 
-export default function LanguageSelector({disabled}) {
-    if (SdkConfig.get()['disable_login_language_selector']) return <div />;
+interface IProps {
+    disabled?: boolean;
+}
 
-    const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
+export default function LanguageSelector({ disabled }: IProps): JSX.Element {
+    if (SdkConfig.get()['disable_login_language_selector']) return <div />;
     return <LanguageDropdown
         className="mx_AuthBody_language"
         onOptionChange={onChange}
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index 274c244b2a..bab7e59d2a 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {PureComponent, RefCallback, RefObject} from "react";
+import React, { PureComponent, RefCallback, RefObject } from "react";
 import classNames from "classnames";
 import zxcvbn from "zxcvbn";
 
 import SdkConfig from "../../../SdkConfig";
-import withValidation, {IFieldState, IValidationResult} from "../elements/Validation";
-import {_t, _td} from "../../../languageHandler";
-import Field, {IInputProps} from "../elements/Field";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+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;
diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx
index 2a42804a61..587d7f2453 100644
--- a/src/components/views/auth/PasswordLogin.tsx
+++ b/src/components/views/auth/PasswordLogin.tsx
@@ -19,14 +19,14 @@ import classNames from 'classnames';
 
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import AccessibleButton from "../elements/AccessibleButton";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import withValidation from "../elements/Validation";
 import * as Email from "../../../email";
 import Field from "../elements/Field";
 import CountryDropdown from "./CountryDropdown";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -52,8 +52,8 @@ interface IProps {
 
 interface IState {
     fieldValid: Partial<Record<LoginField, boolean>>;
-    loginType: LoginField.Email | LoginField.MatrixId | LoginField.Phone,
-    password: "",
+    loginType: LoginField.Email | LoginField.MatrixId | LoginField.Phone;
+    password: "";
 }
 
 enum LoginField {
@@ -166,7 +166,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
     };
 
     private onPasswordChanged = ev => {
-        this.setState({password: ev.target.value});
+        this.setState({ password: ev.target.value });
     };
 
     private async verifyFieldsBeforeSubmit() {
@@ -322,7 +322,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
         const result = await this.validatePasswordRules(fieldState);
         this.markFieldValid(LoginField.Password, result.valid);
         return result;
-    }
+    };
 
     private renderLoginField(loginType: IState["loginType"], autoFocus: boolean) {
         const classes = {
@@ -416,7 +416,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
                 kind="link"
                 onClick={this.onForgotPasswordClick}
             >
-                {_t("Forgot password?")}
+                { _t("Forgot password?") }
             </AccessibleButton>;
         }
 
@@ -441,16 +441,16 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
                         disabled={this.props.disableSubmit}
                     >
                         <option key={LoginField.MatrixId} value={LoginField.MatrixId}>
-                            {_t('Username')}
+                            { _t('Username') }
                         </option>
                         <option
                             key={LoginField.Email}
                             value={LoginField.Email}
                         >
-                            {_t('Email address')}
+                            { _t('Email address') }
                         </option>
                         <option key={LoginField.Password} value={LoginField.Password}>
-                            {_t('Phone')}
+                            { _t('Phone') }
                         </option>
                     </Field>
                 </div>
@@ -460,8 +460,8 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
         return (
             <div>
                 <form onSubmit={this.onSubmitForm}>
-                    {loginType}
-                    {loginField}
+                    { loginType }
+                    { loginField }
                     <Field
                         className={pwFieldClass}
                         type="password"
@@ -474,7 +474,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
                         onValidate={this.onPasswordValidate}
                         ref={field => this[LoginField.Password] = field}
                     />
-                    {forgotPasswordJsx}
+                    { forgotPasswordJsx }
                     { !this.props.busy && <input className="mx_Login_submit"
                         type="submit"
                         value={_t('Sign in')}
diff --git a/src/components/views/auth/RegistrationForm.tsx b/src/components/views/auth/RegistrationForm.tsx
index 8f0a293a3c..8a0fb34f3c 100644
--- a/src/components/views/auth/RegistrationForm.tsx
+++ b/src/components/views/auth/RegistrationForm.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 
 import React from 'react';
 
-import * as sdk from '../../../index';
 import * as Email from '../../../email';
 import { looksValid as phoneNumberLooksValid } from '../../../phonenumber';
 import Modal from '../../../Modal';
@@ -25,12 +24,13 @@ import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import { SAFE_LOCALPART_REGEX } from '../../../Registration';
 import withValidation from '../elements/Validation';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import PassphraseField from "./PassphraseField";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import Field from '../elements/Field';
 import RegistrationEmailPromptDialog from '../dialogs/RegistrationEmailPromptDialog';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import CountryDropdown from "./CountryDropdown";
 
 enum RegistrationField {
     Email = "field_email",
@@ -471,7 +471,6 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
         if (!this.showPhoneNumber()) {
             return null;
         }
-        const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown');
         const phoneLabel = this.authStepIsRequired('m.login.msisdn') ?
             _t("Phone") :
             _t("Phone (optional)");
@@ -538,15 +537,15 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
             <div>
                 <form onSubmit={this.onSubmit}>
                     <div className="mx_AuthBody_fieldRow">
-                        {this.renderUsername()}
+                        { this.renderUsername() }
                     </div>
                     <div className="mx_AuthBody_fieldRow">
-                        {this.renderPassword()}
-                        {this.renderPasswordConfirm()}
+                        { this.renderPassword() }
+                        { this.renderPasswordConfirm() }
                     </div>
                     <div className="mx_AuthBody_fieldRow">
-                        {this.renderEmail()}
-                        {this.renderPhoneNumber()}
+                        { this.renderEmail() }
+                        { this.renderPhoneNumber() }
                     </div>
                     { emailHelperText }
                     { registerButton }
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.tsx
similarity index 76%
rename from src/components/views/auth/Welcome.js
rename to src/components/views/auth/Welcome.tsx
index fca66fcf9b..0e12025fbd 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.tsx
@@ -17,29 +17,34 @@ limitations under the License.
 import React from 'react';
 import classNames from "classnames";
 
-import * as sdk from '../../../index';
+import * as sdk from "../../../index";
 import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
-import {_td} from "../../../languageHandler";
+import { _td } from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
-import {UIFeature} from "../../../settings/UIFeature";
+import { UIFeature } from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import LanguageSelector from "./LanguageSelector";
 
 // translatable strings for Welcome pages
 _td("Sign in with SSO");
 
+interface IProps {
+
+}
+
 @replaceableComponent("views.auth.Welcome")
-export default class Welcome extends React.PureComponent {
-    constructor(props) {
+export default class Welcome extends React.PureComponent<IProps> {
+    constructor(props: IProps) {
         super(props);
 
         CountlyAnalytics.instance.track("onboarding_welcome");
     }
 
-    render() {
-        const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
-        const LanguageSelector = sdk.getComponent('auth.LanguageSelector');
+    public render(): React.ReactNode {
+        // FIXME: Using an import will result in wrench-element-tests failures
+        const EmbeddedPage = sdk.getComponent("structures.EmbeddedPage");
 
         const pagesConfig = SdkConfig.get().embeddedPages;
         let pageUrl = null;
diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
index 8ce05e0a55..6aaef29854 100644
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -17,15 +17,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useContext, useEffect, useState} from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import classNames from 'classnames';
+import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
+
 import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
+import RoomContext from "../../../contexts/RoomContext";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import {toPx} from "../../../utils/units";
-import {ResizeMethod} from "../../../Avatar";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
+import { toPx } from "../../../utils/units";
 import { _t } from '../../../languageHandler';
 
 interface IProps {
@@ -44,12 +46,12 @@ interface IProps {
     className?: string;
 }
 
-const calculateUrls = (url, urls) => {
+const calculateUrls = (url, urls, lowBandwidth) => {
     // work out the full set of urls to try to load. This is formed like so:
     // imageUrls: [ props.url, ...props.urls ]
 
     let _urls = [];
-    if (!SettingsStore.getValue("lowBandwidth")) {
+    if (!lowBandwidth) {
         _urls = urls || [];
 
         if (url) {
@@ -62,8 +64,14 @@ const calculateUrls = (url, urls) => {
     return Array.from(new Set(_urls));
 };
 
-const useImageUrl = ({url, urls}): [string, () => void] => {
-    const [imageUrls, setUrls] = useState<string[]>(calculateUrls(url, urls));
+const useImageUrl = ({ url, urls }): [string, () => void] => {
+    // Since this is a hot code path and the settings store can be slow, we
+    // use the cached lowBandwidth value from the room context if it exists
+    const roomContext = useContext(RoomContext);
+    const lowBandwidth = roomContext ?
+        roomContext.lowBandwidth : SettingsStore.getValue("lowBandwidth");
+
+    const [imageUrls, setUrls] = useState<string[]>(calculateUrls(url, urls, lowBandwidth));
     const [urlsIndex, setIndex] = useState<number>(0);
 
     const onError = useCallback(() => {
@@ -71,7 +79,7 @@ const useImageUrl = ({url, urls}): [string, () => void] => {
     }, []);
 
     useEffect(() => {
-        setUrls(calculateUrls(url, urls));
+        setUrls(calculateUrls(url, urls, lowBandwidth));
         setIndex(0);
     }, [url, JSON.stringify(urls)]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -107,7 +115,7 @@ const BaseAvatar = (props: IProps) => {
         ...otherProps
     } = props;
 
-    const [imageUrl, onError] = useImageUrl({url, urls});
+    const [imageUrl, onError] = useImageUrl({ url, urls });
 
     if (!imageUrl && defaultToInitialLetter) {
         const initialLetter = AvatarLogic.getInitialLetter(name);
@@ -179,7 +187,8 @@ const BaseAvatar = (props: IProps) => {
                     width: toPx(width),
                     height: toPx(height),
                 }}
-                title={title} alt={_t("Avatar")}
+                title={title}
+                alt={_t("Avatar")}
                 inputRef={inputRef}
                 {...otherProps} />
         );
@@ -193,7 +202,8 @@ const BaseAvatar = (props: IProps) => {
                     width: toPx(width),
                     height: toPx(height),
                 }}
-                title={title} alt=""
+                title={title}
+                alt=""
                 ref={inputRef}
                 {...otherProps} />
         );
diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx
index 42aef24086..99f2b70efc 100644
--- a/src/components/views/avatars/DecoratedRoomAvatar.tsx
+++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx
@@ -24,19 +24,20 @@ import RoomAvatar from "./RoomAvatar";
 import NotificationBadge from '../rooms/NotificationBadge';
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
 import { NotificationState } from "../../../stores/notifications/NotificationState";
-import {isPresenceEnabled} from "../../../utils/presence";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {_t} from "../../../languageHandler";
+import { isPresenceEnabled } from "../../../utils/presence";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { _t } from "../../../languageHandler";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IOOBData } from "../../../stores/ThreepidInviteStore";
 
 interface IProps {
     room: Room;
     avatarSize: number;
     displayBadge?: boolean;
     forceCount?: boolean;
-    oobData?: object;
+    oobData?: IOOBData;
     viewAvatarOnClick?: boolean;
 }
 
@@ -121,7 +122,7 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
         if (ev.getType() === 'm.room.join_rules' || ev.getType() === 'm.room.member') {
             const newIcon = this.calculateIcon();
             if (newIcon !== this.state.icon) {
-                this.setState({icon: newIcon});
+                this.setState({ icon: newIcon });
             }
         }
     };
@@ -130,7 +131,7 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
         if (this.isUnmounted) return;
 
         const newIcon = this.getPresenceIcon();
-        if (newIcon !== this.state.icon) this.setState({icon: newIcon});
+        if (newIcon !== this.state.icon) this.setState({ icon: newIcon });
     };
 
     private getPresenceIcon(): Icon {
@@ -204,8 +205,8 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
                 oobData={this.props.oobData}
                 viewAvatarOnClick={this.props.viewAvatarOnClick}
             />
-            {icon}
-            {badge}
+            { icon }
+            { badge }
         </div>;
     }
 }
diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
index 3734ba9504..5df58555c4 100644
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -15,10 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
+import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
+
 import BaseAvatar from './BaseAvatar';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
-import {ResizeMethod} from "../../../Avatar";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 export interface IProps {
         groupId?: string;
@@ -51,7 +52,7 @@ export default class GroupAvatar extends React.Component<IProps> {
         // extract the props we use from props so we can pass any others through
         // should consider adding this as a global rule in js-sdk?
         /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
-        const {groupId, groupAvatarUrl, groupName, ...otherProps} = this.props;
+        const { groupId, groupAvatarUrl, groupName, ...otherProps } = this.props;
 
         return (
             <BaseAvatar
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 3205ca372c..001df16d40 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -16,14 +16,14 @@ limitations under the License.
 */
 
 import React from 'react';
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
 
 import dis from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
+import { Action } from "../../../dispatcher/actions";
 import BaseAvatar from "./BaseAvatar";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
-import {ResizeMethod} from "../../../Avatar";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
     member: RoomMember;
@@ -33,9 +33,10 @@ interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" |
     resizeMethod?: ResizeMethod;
     // The onClick to give the avatar
     onClick?: React.MouseEventHandler;
-    // Whether the onClick of the avatar should be overriden to dispatch `Action.ViewUser`
+    // Whether the onClick of the avatar should be overridden to dispatch `Action.ViewUser`
     viewUserOnClick?: boolean;
     title?: string;
+    style?: any;
 }
 
 interface IState {
@@ -89,7 +90,7 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
     }
 
     render() {
-        let {member, fallbackUserId, onClick, viewUserOnClick, ...otherProps} = this.props;
+        let { member, fallbackUserId, onClick, viewUserOnClick, ...otherProps } = this.props;
         const userId = member ? member.userId : fallbackUserId;
 
         if (viewUserOnClick) {
@@ -102,8 +103,12 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
         }
 
         return (
-            <BaseAvatar {...otherProps} name={this.state.name} title={this.state.title}
-                idName={userId} url={this.state.imageUrl} onClick={onClick} />
+            <BaseAvatar {...otherProps}
+                name={this.state.name}
+                title={this.state.title}
+                idName={userId}
+                url={this.state.imageUrl}
+                onClick={onClick} />
         );
     }
 }
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.tsx
similarity index 71%
rename from src/components/views/avatars/MemberStatusMessageAvatar.js
rename to src/components/views/avatars/MemberStatusMessageAvatar.tsx
index acf190f17f..8c703b3b32 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.tsx
@@ -14,44 +14,49 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {_t} from "../../../languageHandler";
+import React, { createRef } from 'react';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { _t } from "../../../languageHandler";
 import MemberAvatar from '../avatars/MemberAvatar';
 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";
+import { ChevronFace, ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { ResizeMethod } from "matrix-js-sdk/src/@types/partials";
+
+interface IProps {
+    member: RoomMember;
+    width?: number;
+    height?: number;
+    resizeMethod?: ResizeMethod;
+}
+
+interface IState {
+    hasStatus: boolean;
+    menuDisplayed: boolean;
+}
 
 @replaceableComponent("views.avatars.MemberStatusMessageAvatar")
-export default class MemberStatusMessageAvatar extends React.Component {
-    static propTypes = {
-        member: PropTypes.object.isRequired,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        resizeMethod: PropTypes.string,
-    };
-
-    static defaultProps = {
+export default class MemberStatusMessageAvatar extends React.Component<IProps, IState> {
+    public static defaultProps: Partial<IProps> = {
         width: 40,
         height: 40,
         resizeMethod: 'crop',
     };
+    private button = createRef<HTMLDivElement>();
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
             hasStatus: this.hasStatus,
             menuDisplayed: false,
         };
-
-        this._button = createRef();
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         if (this.props.member.userId !== MatrixClientPeg.get().getUserId()) {
             throw new Error("Cannot use MemberStatusMessageAvatar on anyone but the logged in user");
         }
@@ -62,44 +67,44 @@ export default class MemberStatusMessageAvatar extends React.Component {
         if (!user) {
             return;
         }
-        user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+        user.on("User._unstable_statusMessage", this.onStatusMessageCommitted);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const { user } = this.props.member;
         if (!user) {
             return;
         }
         user.removeListener(
             "User._unstable_statusMessage",
-            this._onStatusMessageCommitted,
+            this.onStatusMessageCommitted,
         );
     }
 
-    get hasStatus() {
+    private get hasStatus(): boolean {
         const { user } = this.props.member;
         if (!user) {
             return false;
         }
-        return !!user._unstable_statusMessage;
+        return !!user.unstable_statusMessage;
     }
 
-    _onStatusMessageCommitted = () => {
+    private onStatusMessageCommitted = (): void => {
         // The `User` object has observed a status message change.
         this.setState({
             hasStatus: this.hasStatus,
         });
     };
 
-    openMenu = () => {
+    private openMenu = (): void => {
         this.setState({ menuDisplayed: true });
     };
 
-    closeMenu = () => {
+    private closeMenu = (): void => {
         this.setState({ menuDisplayed: false });
     };
 
-    render() {
+    public render(): JSX.Element {
         const avatar = <MemberAvatar
             member={this.props.member}
             width={this.props.width}
@@ -118,7 +123,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
 
         let contextMenu;
         if (this.state.menuDisplayed) {
-            const elementRect = this._button.current.getBoundingClientRect();
+            const elementRect = this.button.current.getBoundingClientRect();
 
             const chevronWidth = 16; // See .mx_ContextualMenu_chevron_bottom
             const chevronMargin = 1; // Add some spacing away from target
@@ -126,13 +131,13 @@ export default class MemberStatusMessageAvatar extends React.Component {
             contextMenu = (
                 <ContextMenu
                     chevronOffset={(elementRect.width - chevronWidth) / 2}
-                    chevronFace="bottom"
+                    chevronFace={ChevronFace.Bottom}
                     left={elementRect.left + window.pageXOffset}
                     top={elementRect.top + window.pageYOffset - chevronMargin}
                     menuWidth={226}
                     onFinished={this.closeMenu}
                 >
-                    <StatusMessageContextMenu user={this.props.member.user} onFinished={this.closeMenu} />
+                    <StatusMessageContextMenu user={this.props.member.user} />
                 </ContextMenu>
             );
         }
@@ -140,12 +145,12 @@ export default class MemberStatusMessageAvatar extends React.Component {
         return <React.Fragment>
             <ContextMenuButton
                 className={classes}
-                inputRef={this._button}
+                inputRef={this.button}
                 onClick={this.openMenu}
                 isExpanded={this.state.menuDisplayed}
                 label={_t("User Status")}
             >
-                {avatar}
+                { avatar }
             </ContextMenuButton>
 
             { contextMenu }
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index 4693d907ba..f285222f7b 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -13,29 +13,35 @@ WITHOUT 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, {ComponentProps} from 'react';
-import Room from 'matrix-js-sdk/src/models/room';
+
+import React, { ComponentProps } from 'react';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
+import classNames from "classnames";
 
 import BaseAvatar from './BaseAvatar';
 import ImageView from '../elements/ImageView';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import * as Avatar from '../../../Avatar';
-import {ResizeMethod} from "../../../Avatar";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import { IOOBData } from '../../../stores/ThreepidInviteStore';
 
 interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick"> {
     // Room may be left unset here, but if it is,
     // oobData.avatarUrl should be set (else there
     // would be nowhere to get the avatar from)
     room?: Room;
-    // TODO: type when js-sdk has types
-    oobData?: any;
+    oobData?: IOOBData & {
+        roomId?: string;
+    };
     width?: number;
     height?: number;
     resizeMethod?: ResizeMethod;
     viewAvatarOnClick?: boolean;
+    className?: string;
     onClick?(): void;
 }
 
@@ -128,14 +134,21 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
     };
 
     public render() {
-        const {room, oobData, viewAvatarOnClick, onClick, ...otherProps} = this.props;
+        const { room, oobData, viewAvatarOnClick, onClick, className, ...otherProps } = this.props;
 
         const roomName = room ? room.name : oobData.name;
+        // If the room is a DM, we use the other user's ID for the color hash
+        // in order to match the room avatar with their avatar
+        const idName = room ? (DMRoomMap.shared().getUserIdForRoomId(room.roomId) ?? room.roomId) : oobData.roomId;
 
         return (
-            <BaseAvatar {...otherProps}
+            <BaseAvatar
+                {...otherProps}
+                className={classNames(className, {
+                    mx_RoomAvatar_isSpaceRoom: room?.isSpaceRoom(),
+                })}
                 name={roomName}
-                idName={room ? room.roomId : null}
+                idName={idName}
                 urls={this.state.urls}
                 onClick={viewAvatarOnClick && this.state.urls[0] ? this.onRoomAvatarClick : onClick}
             />
diff --git a/src/components/views/avatars/WidgetAvatar.tsx b/src/components/views/avatars/WidgetAvatar.tsx
index cca158269e..264f1f3956 100644
--- a/src/components/views/avatars/WidgetAvatar.tsx
+++ b/src/components/views/avatars/WidgetAvatar.tsx
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ComponentProps} from 'react';
+import React, { ComponentProps } from 'react';
 import classNames from 'classnames';
 
-import {IApp} from "../../../stores/WidgetStore";
-import BaseAvatar, {BaseAvatarType} from "./BaseAvatar";
-import {mediaFromMxc} from "../../../customisations/Media";
+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;
@@ -49,7 +49,7 @@ const WidgetAvatar: React.FC<IProps> = ({ app, className, width = 20, height = 2
             width={width}
             height={height}
         />
-    )
+    );
 };
 
 export default WidgetAvatar;
diff --git a/src/components/views/beta/BetaCard.tsx b/src/components/views/beta/BetaCard.tsx
index 821c448f4f..c2ba869ab4 100644
--- a/src/components/views/beta/BetaCard.tsx
+++ b/src/components/views/beta/BetaCard.tsx
@@ -17,14 +17,17 @@ limitations under the License.
 import React from "react";
 import classNames from "classnames";
 
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import SettingsStore from "../../../settings/SettingsStore";
-import {SettingLevel} from "../../../settings/SettingLevel";
+import { SettingLevel } from "../../../settings/SettingLevel";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import Modal from "../../../Modal";
 import BetaFeedbackDialog from "../dialogs/BetaFeedbackDialog";
 import SdkConfig from "../../../SdkConfig";
+import SettingsFlag from "../elements/SettingsFlag";
+
+// XXX: Keep this around for re-use in future Betas
 
 interface IProps {
     title?: string;
@@ -66,7 +69,7 @@ const BetaCard = ({ title: titleOverride, featureId }: IProps) => {
     const info = SettingsStore.getBetaInfo(featureId);
     if (!info) return null; // Beta is invalid/disabled
 
-    const { title, caption, disclaimer, image, feedbackLabel, feedbackSubheading } = info;
+    const { title, caption, disclaimer, image, feedbackLabel, feedbackSubheading, extraSettings } = info;
     const value = SettingsStore.getValue(featureId);
 
     let feedbackButton;
@@ -82,26 +85,33 @@ const BetaCard = ({ title: titleOverride, featureId }: IProps) => {
     }
 
     return <div className="mx_BetaCard">
-        <div>
-            <h3 className="mx_BetaCard_title">
-                { titleOverride || _t(title) }
-                <BetaPill />
-            </h3>
-            <span className="mx_BetaCard_caption">{ _t(caption) }</span>
+        <div className="mx_BetaCard_columns">
             <div>
-                { feedbackButton }
-                <AccessibleButton
-                    onClick={() => SettingsStore.setValue(featureId, null, SettingLevel.DEVICE, !value)}
-                    kind={feedbackButton ? "primary_outline" : "primary"}
-                >
-                    { value ? _t("Leave the beta") : _t("Join the beta") }
-                </AccessibleButton>
+                <h3 className="mx_BetaCard_title">
+                    { titleOverride || _t(title) }
+                    <BetaPill />
+                </h3>
+                <span className="mx_BetaCard_caption">{ _t(caption) }</span>
+                <div className="mx_BetaCard_buttons">
+                    { feedbackButton }
+                    <AccessibleButton
+                        onClick={() => SettingsStore.setValue(featureId, null, SettingLevel.DEVICE, !value)}
+                        kind={feedbackButton ? "primary_outline" : "primary"}
+                    >
+                        { value ? _t("Leave the beta") : _t("Join the beta") }
+                    </AccessibleButton>
+                </div>
+                { disclaimer && <div className="mx_BetaCard_disclaimer">
+                    { disclaimer(value) }
+                </div> }
             </div>
-            { disclaimer && <div className="mx_BetaCard_disclaimer">
-                { disclaimer(value) }
-            </div> }
+            <img src={image} alt="" />
         </div>
-        <img src={image} alt="" />
+        { extraSettings && value && <div className="mx_BetaCard_relatedSettings">
+            { extraSettings.map(key => (
+                <SettingsFlag key={key} name={key} level={SettingLevel.DEVICE} />
+            )) }
+        </div> }
     </div>;
 };
 
diff --git a/src/components/views/context_menus/CallContextMenu.tsx b/src/components/views/context_menus/CallContextMenu.tsx
index 97473059a6..a61cdeedd3 100644
--- a/src/components/views/context_menus/CallContextMenu.tsx
+++ b/src/components/views/context_menus/CallContextMenu.tsx
@@ -22,7 +22,7 @@ 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
@@ -42,21 +42,21 @@ export default class CallContextMenu extends React.Component<IProps> {
     onHoldClick = () => {
         this.props.call.setRemoteOnHold(true);
         this.props.onFinished();
-    }
+    };
 
     onUnholdClick = () => {
         CallHandler.sharedInstance().setActiveCallRoomId(this.props.call.roomId);
 
         this.props.onFinished();
-    }
+    };
 
     onTransferClick = () => {
         Modal.createTrackedDialog(
-            'Transfer Call', '', InviteDialog, {kind: KIND_CALL_TRANSFER, call: this.props.call},
-            /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
+            'Transfer Call', '', InviteDialog, { kind: KIND_CALL_TRANSFER, call: this.props.call },
+            /*className=*/"mx_InviteDialog_transferWrapper", /*isPriority=*/false, /*isStatic=*/true,
         );
         this.props.onFinished();
-    }
+    };
 
     render() {
         const holdUnholdCaption = this.props.call.isRemoteOnHold() ? _t("Resume") : _t("Hold");
@@ -65,15 +65,15 @@ export default class CallContextMenu extends React.Component<IProps> {
         let transferItem;
         if (this.props.call.opponentCanBeTransferred()) {
             transferItem = <MenuItem className="mx_CallContextMenu_item" onClick={this.onTransferClick}>
-                {_t("Transfer")}
+                { _t("Transfer") }
             </MenuItem>;
         }
 
         return <ContextMenu {...this.props}>
             <MenuItem className="mx_CallContextMenu_item" onClick={handler}>
-                {holdUnholdCaption}
+                { holdUnholdCaption }
             </MenuItem>
-            {transferItem}
+            { transferItem }
         </ContextMenu>;
     }
 }
diff --git a/src/components/views/context_menus/DialpadContextMenu.tsx b/src/components/views/context_menus/DialpadContextMenu.tsx
index 17abce0c61..01c7c6c1d8 100644
--- a/src/components/views/context_menus/DialpadContextMenu.tsx
+++ b/src/components/views/context_menus/DialpadContextMenu.tsx
@@ -14,12 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import { _t } from '../../../languageHandler';
+import * as React from "react";
+import { createRef } from "react";
+import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 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";
+import Field from "../elements/Field";
+import DialPad from '../voip/DialPad';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
@@ -31,30 +33,62 @@ interface IState {
 
 @replaceableComponent("views.context_menus.DialpadContextMenu")
 export default class DialpadContextMenu extends React.Component<IProps, IState> {
+    private numberEntryFieldRef: React.RefObject<Field> = createRef();
+
     constructor(props) {
         super(props);
 
         this.state = {
             value: '',
-        }
+        };
     }
 
-    onDigitPress = (digit) => {
+    onDigitPress = (digit: string, ev: ButtonEvent) => {
         this.props.call.sendDtmfDigit(digit);
-        this.setState({value: this.state.value + digit});
-    }
+        this.setState({ value: this.state.value + digit });
+
+        // Keep the number field focused so that keyboard entry is still available
+        // However, don't focus if this wasn't the result of directly clicking on the button,
+        // i.e someone using keyboard navigation.
+        if (ev.type === "click") {
+            this.numberEntryFieldRef.current?.focus();
+        }
+    };
+
+    onCancelClick = () => {
+        this.props.onFinished();
+    };
+
+    onKeyDown = (ev) => {
+        // Prevent Backspace and Delete keys from functioning in the entry field
+        if (ev.code === "Backspace" || ev.code === "Delete") {
+            ev.preventDefault();
+        }
+    };
+
+    onChange = (ev) => {
+        this.setState({ value: ev.target.value });
+    };
 
     render() {
         return <ContextMenu {...this.props}>
-            <div className="mx_DialPadContextMenu_header">
+            <div className="mx_DialPadContextMenuWrapper">
                 <div>
-                    <span className="mx_DialPadContextMenu_title">{_t("Dial pad")}</span>
+                    <AccessibleButton className="mx_DialPadContextMenu_cancel" onClick={this.onCancelClick} />
+                </div>
+                <div className="mx_DialPadContextMenu_header">
+                    <Field
+                        ref={this.numberEntryFieldRef}
+                        className="mx_DialPadContextMenu_dialled"
+                        value={this.state.value}
+                        autoFocus={true}
+                        onKeyDown={this.onKeyDown}
+                        onChange={this.onChange}
+                    />
+                </div>
+                <div className="mx_DialPadContextMenu_dialPad">
+                    <DialPad onDigitPress={this.onDigitPress} hasDial={false} />
                 </div>
-                <div className="mx_DialPadContextMenu_dialled">{this.state.value}</div>
-            </div>
-            <div className="mx_DialPadContextMenu_horizSep" />
-            <div className="mx_DialPadContextMenu_dialPad">
-                <Dialpad onDigitPress={this.onDigitPress} hasDialAndDelete={false} />
             </div>
         </ContextMenu>;
     }
diff --git a/src/components/views/context_menus/GenericElementContextMenu.js b/src/components/views/context_menus/GenericElementContextMenu.tsx
similarity index 63%
rename from src/components/views/context_menus/GenericElementContextMenu.js
rename to src/components/views/context_menus/GenericElementContextMenu.tsx
index e04e3f7695..a0a8c89b37 100644
--- a/src/components/views/context_menus/GenericElementContextMenu.js
+++ b/src/components/views/context_menus/GenericElementContextMenu.tsx
@@ -15,46 +15,41 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-/*
+interface IProps {
+    element: React.ReactNode;
+    // Function to be called when the parent window is resized
+    // This can be used to reposition or close the menu on resize and
+    // ensure that it is not displayed in a stale position.
+    onResize?: () => void;
+}
+
+/**
  * This component can be used to display generic HTML content in a contextual
  * menu.
  */
-
-
 @replaceableComponent("views.context_menus.GenericElementContextMenu")
-export default class GenericElementContextMenu extends React.Component {
-    static propTypes = {
-        element: PropTypes.element.isRequired,
-        // Function to be called when the parent window is resized
-        // This can be used to reposition or close the menu on resize and
-        // ensure that it is not displayed in a stale position.
-        onResize: PropTypes.func,
-    };
-
-    constructor(props) {
+export default class GenericElementContextMenu extends React.Component<IProps> {
+    constructor(props: IProps) {
         super(props);
-        this.resize = this.resize.bind(this);
     }
 
-    componentDidMount() {
-        this.resize = this.resize.bind(this);
+    public componentDidMount(): void {
         window.addEventListener("resize", this.resize);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         window.removeEventListener("resize", this.resize);
     }
 
-    resize() {
+    private resize = (): void => {
         if (this.props.onResize) {
             this.props.onResize();
         }
-    }
+    };
 
-    render() {
+    public render(): JSX.Element {
         return <div>{ this.props.element }</div>;
     }
 }
diff --git a/src/components/views/context_menus/GenericTextContextMenu.js b/src/components/views/context_menus/GenericTextContextMenu.tsx
similarity index 79%
rename from src/components/views/context_menus/GenericTextContextMenu.js
rename to src/components/views/context_menus/GenericTextContextMenu.tsx
index 3d3add006f..3ca158dd02 100644
--- a/src/components/views/context_menus/GenericTextContextMenu.js
+++ b/src/components/views/context_menus/GenericTextContextMenu.tsx
@@ -15,16 +15,15 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    message: string;
+}
 
 @replaceableComponent("views.context_menus.GenericTextContextMenu")
-export default class GenericTextContextMenu extends React.Component {
-    static propTypes = {
-        message: PropTypes.string.isRequired,
-    };
-
-    render() {
+export default class GenericTextContextMenu extends React.Component<IProps> {
+    public render(): JSX.Element {
         return <div>{ this.props.message }</div>;
     }
 }
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 15078326b3..1529723ac8 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -20,10 +20,10 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import {Group} from 'matrix-js-sdk/src/models/group';
+import { Group } from 'matrix-js-sdk/src/models/group';
 import GroupStore from "../../../stores/GroupStore";
-import {MenuItem} from "../../structures/ContextMenu";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MenuItem } from "../../structures/ContextMenu";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.context_menus.GroupInviteTileContextMenu")
 export default class GroupInviteTileContextMenu extends React.Component {
diff --git a/src/components/views/context_menus/IconizedContextMenu.tsx b/src/components/views/context_menus/IconizedContextMenu.tsx
index a3fb00a9f4..571b0b39bf 100644
--- a/src/components/views/context_menus/IconizedContextMenu.tsx
+++ b/src/components/views/context_menus/IconizedContextMenu.tsx
@@ -64,8 +64,8 @@ export const IconizedContextMenuRadio: React.FC<IRadioProps> = ({
         label={label}
     >
         <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />
-        <span className="mx_IconizedContextMenu_label">{label}</span>
-        {active && <span className="mx_IconizedContextMenu_icon mx_IconizedContextMenu_checked" />}
+        <span className="mx_IconizedContextMenu_label">{ label }</span>
+        { active && <span className="mx_IconizedContextMenu_icon mx_IconizedContextMenu_checked" /> }
     </MenuItemRadio>;
 };
 
@@ -85,30 +85,34 @@ export const IconizedContextMenuCheckbox: React.FC<ICheckboxProps> = ({
         label={label}
     >
         <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />
-        <span className="mx_IconizedContextMenu_label">{label}</span>
-        {active && <span className="mx_IconizedContextMenu_icon mx_IconizedContextMenu_checked" />}
+        <span className="mx_IconizedContextMenu_label">{ label }</span>
+        <span className={classNames("mx_IconizedContextMenu_icon", {
+            mx_IconizedContextMenu_checked: active,
+            mx_IconizedContextMenu_unchecked: !active,
+        })} />
     </MenuItemCheckbox>;
 };
 
-export const IconizedContextMenuOption: React.FC<IOptionProps> = ({label, iconClassName, ...props}) => {
+export const IconizedContextMenuOption: React.FC<IOptionProps> = ({ label, iconClassName, children, ...props }) => {
     return <MenuItem {...props} label={label}>
         { iconClassName && <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} /> }
-        <span className="mx_IconizedContextMenu_label">{label}</span>
+        <span className="mx_IconizedContextMenu_label">{ label }</span>
+        { children }
     </MenuItem>;
 };
 
-export const IconizedContextMenuOptionList: React.FC<IOptionListProps> = ({first, red, className, children}) => {
+export const IconizedContextMenuOptionList: React.FC<IOptionListProps> = ({ first, red, className, children }) => {
     const classes = classNames("mx_IconizedContextMenu_optionList", className, {
         mx_IconizedContextMenu_optionList_notFirst: !first,
         mx_IconizedContextMenu_optionList_red: red,
     });
 
     return <div className={classes}>
-        {children}
+        { children }
     </div>;
 };
 
-const IconizedContextMenu: React.FC<IProps> = ({className, children, compact, ...props}) => {
+const IconizedContextMenu: React.FC<IProps> = ({ className, children, compact, ...props }) => {
     const classes = classNames("mx_IconizedContextMenu", className, {
         mx_IconizedContextMenu_compact: compact,
     });
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
deleted file mode 100644
index 594b98b1f5..0000000000
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2015, 2016, 2018, 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.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT 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 { EventStatus } from 'matrix-js-sdk/src/models/event';
-
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher/dispatcher';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import Modal from '../../../Modal';
-import Resend from '../../../Resend';
-import SettingsStore from '../../../settings/SettingsStore';
-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";
-import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard";
-
-export 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 */
-        mxEvent: PropTypes.object.isRequired,
-
-        /* an optional EventTileOps implementation that can be used to unhide preview widgets */
-        eventTileOps: PropTypes.object,
-
-        /* an optional function to be called when the user clicks collapse thread, if not provided hide button */
-        collapseReplyThread: PropTypes.func,
-
-        /* callback called when the menu is dismissed */
-        onFinished: PropTypes.func,
-
-        /* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
-        onCloseDialog: PropTypes.func,
-    };
-
-    state = {
-        canRedact: false,
-        canPin: false,
-    };
-
-    componentDidMount() {
-        MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkPermissions);
-        this._checkPermissions();
-    }
-
-    componentWillUnmount() {
-        const cli = MatrixClientPeg.get();
-        if (cli) {
-            cli.removeListener('RoomMember.powerLevel', this._checkPermissions);
-        }
-    }
-
-    _checkPermissions = () => {
-        const cli = MatrixClientPeg.get();
-        const room = cli.getRoom(this.props.mxEvent.getRoomId());
-
-        // We explicitly decline to show the redact option on ACL events as it has a potential
-        // to obliterate the room - https://github.com/matrix-org/synapse/issues/4042
-        // Similarly for encryption events, since redacting them "breaks everything"
-        const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId)
-            && this.props.mxEvent.getType() !== EventType.RoomServerAcl
-            && this.props.mxEvent.getType() !== EventType.RoomEncryption;
-        let canPin = room.currentState.mayClientSendStateEvent(EventType.RoomPinnedEvents, cli);
-
-        // HACK: Intentionally say we can't pin if the user doesn't want to use the functionality
-        if (!SettingsStore.getValue("feature_pinning")) canPin = false;
-
-        this.setState({canRedact, canPin});
-    };
-
-    _isPinned() {
-        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
-        const pinnedEvent = room.currentState.getStateEvents(EventType.RoomPinnedEvents, '');
-        if (!pinnedEvent) return false;
-        const content = pinnedEvent.getContent();
-        return content.pinned && Array.isArray(content.pinned) && content.pinned.includes(this.props.mxEvent.getId());
-    }
-
-    onResendReactionsClick = () => {
-        for (const reaction of this._getUnsentReactions()) {
-            Resend.resend(reaction);
-        }
-        this.closeMenu();
-    };
-
-    onReportEventClick = () => {
-        const ReportEventDialog = sdk.getComponent("dialogs.ReportEventDialog");
-        Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
-            mxEvent: this.props.mxEvent,
-        }, 'mx_Dialog_reportEvent');
-        this.closeMenu();
-    };
-
-    onViewSourceClick = () => {
-        const ViewSource = sdk.getComponent('structures.ViewSource');
-        Modal.createTrackedDialog('View Event Source', '', ViewSource, {
-            mxEvent: this.props.mxEvent,
-        }, 'mx_Dialog_viewsource');
-        this.closeMenu();
-    };
-
-    onRedactClick = () => {
-        const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
-        Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, {
-            onFinished: async (proceed, reason) => {
-                if (!proceed) return;
-
-                const cli = MatrixClientPeg.get();
-                try {
-                    if (this.props.onCloseDialog) this.props.onCloseDialog();
-                    await cli.redactEvent(
-                        this.props.mxEvent.getRoomId(),
-                        this.props.mxEvent.getId(),
-                        undefined,
-                        reason ? { reason } : {},
-                    );
-                } catch (e) {
-                    const code = e.errcode || e.statusCode;
-                    // only show the dialog if failing for something other than a network error
-                    // (e.g. no errcode or statusCode) as in that case the redactions end up in the
-                    // detached queue and we show the room status bar to allow retry
-                    if (typeof code !== "undefined") {
-                        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        // display error message stating you couldn't delete this.
-                        Modal.createTrackedDialog('You cannot delete this message', '', ErrorDialog, {
-                            title: _t('Error'),
-                            description: _t('You cannot delete this message. (%(code)s)', {code}),
-                        });
-                    }
-                }
-            },
-        }, 'mx_Dialog_confirmredact');
-        this.closeMenu();
-    };
-
-    onForwardClick = () => {
-        if (this.props.onCloseDialog) this.props.onCloseDialog();
-        dis.dispatch({
-            action: 'forward_event',
-            event: this.props.mxEvent,
-        });
-        this.closeMenu();
-    };
-
-    onPinClick = () => {
-        const cli = MatrixClientPeg.get();
-        const room = cli.getRoom(this.props.mxEvent.getRoomId());
-        const eventId = this.props.mxEvent.getId();
-
-        const pinnedIds = room?.currentState?.getStateEvents(EventType.RoomPinnedEvents, "")?.pinned || [];
-        if (pinnedIds.includes(eventId)) {
-            pinnedIds.splice(pinnedIds.indexOf(eventId), 1);
-        } else {
-            pinnedIds.push(eventId);
-            cli.setRoomAccountData(room.roomId, ReadPinsEventId, {
-                event_ids: [
-                    ...room.getAccountData(ReadPinsEventId)?.getContent()?.event_ids,
-                    eventId,
-                ],
-            });
-        }
-        cli.sendStateEvent(this.props.mxEvent.getRoomId(), EventType.RoomPinnedEvents, { pinned: pinnedIds }, "");
-        this.closeMenu();
-    };
-
-    closeMenu = () => {
-        if (this.props.onFinished) this.props.onFinished();
-    };
-
-    onUnhidePreviewClick = () => {
-        if (this.props.eventTileOps) {
-            this.props.eventTileOps.unhideWidget();
-        }
-        this.closeMenu();
-    };
-
-    onQuoteClick = () => {
-        dis.dispatch({
-            action: 'quote',
-            event: this.props.mxEvent,
-        });
-        this.closeMenu();
-    };
-
-    onPermalinkClick = (e: Event) => {
-        e.preventDefault();
-        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
-        Modal.createTrackedDialog('share room message dialog', '', ShareDialog, {
-            target: this.props.mxEvent,
-            permalinkCreator: this.props.permalinkCreator,
-        });
-        this.closeMenu();
-    };
-
-    onCollapseReplyThreadClick = () => {
-        this.props.collapseReplyThread();
-        this.closeMenu();
-    };
-
-    _getReactions(filter) {
-        const cli = MatrixClientPeg.get();
-        const room = cli.getRoom(this.props.mxEvent.getRoomId());
-        const eventId = this.props.mxEvent.getId();
-        return room.getPendingEvents().filter(e => {
-            const relation = e.getRelation();
-            return relation &&
-                relation.rel_type === "m.annotation" &&
-                relation.event_id === eventId &&
-                filter(e);
-        });
-    }
-
-    _getPendingReactions() {
-        return this._getReactions(e => canCancel(e.status));
-    }
-
-    _getUnsentReactions() {
-        return this._getReactions(e => e.status === EventStatus.NOT_SENT);
-    }
-
-    render() {
-        const cli = MatrixClientPeg.get();
-        const me = cli.getUserId();
-        const mxEvent = this.props.mxEvent;
-        const eventStatus = mxEvent.status;
-        const unsentReactionsCount = this._getUnsentReactions().length;
-        let resendReactionsButton;
-        let redactButton;
-        let forwardButton;
-        let pinButton;
-        let unhidePreviewButton;
-        let externalURLButton;
-        let quoteButton;
-        let collapseReplyThread;
-
-        // status is SENT before remote-echo, null after
-        const isSent = !eventStatus || eventStatus === EventStatus.SENT;
-        if (!mxEvent.isRedacted()) {
-            if (unsentReactionsCount !== 0) {
-                resendReactionsButton = (
-                    <MenuItem className="mx_MessageContextMenu_field" onClick={this.onResendReactionsClick}>
-                        { _t('Resend %(unsentCount)s reaction(s)', {unsentCount: unsentReactionsCount}) }
-                    </MenuItem>
-                );
-            }
-        }
-
-        if (isSent && this.state.canRedact) {
-            redactButton = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
-                    { _t('Remove') }
-                </MenuItem>
-            );
-        }
-
-        if (isContentActionable(mxEvent)) {
-            forwardButton = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onForwardClick}>
-                    { _t('Forward Message') }
-                </MenuItem>
-            );
-
-            if (this.state.canPin) {
-                pinButton = (
-                    <MenuItem className="mx_MessageContextMenu_field" onClick={this.onPinClick}>
-                        { this._isPinned() ? _t('Unpin Message') : _t('Pin Message') }
-                    </MenuItem>
-                );
-            }
-        }
-
-        const viewSourceButton = (
-            <MenuItem className="mx_MessageContextMenu_field" onClick={this.onViewSourceClick}>
-                { _t('View Source') }
-            </MenuItem>
-        );
-
-        if (this.props.eventTileOps) {
-            if (this.props.eventTileOps.isWidgetHidden()) {
-                unhidePreviewButton = (
-                    <MenuItem className="mx_MessageContextMenu_field" onClick={this.onUnhidePreviewClick}>
-                        { _t('Unhide Preview') }
-                    </MenuItem>
-                );
-            }
-        }
-
-        let permalink;
-        if (this.props.permalinkCreator) {
-            permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
-        }
-        // XXX: if we use room ID, we should also include a server where the event can be found (other than in the domain of the event ID)
-        const permalinkButton = (
-            <MenuItem
-                element="a"
-                className="mx_MessageContextMenu_field"
-                onClick={this.onPermalinkClick}
-                href={permalink}
-                target="_blank"
-                rel="noreferrer noopener"
-            >
-                { mxEvent.isRedacted() || mxEvent.getType() !== 'm.room.message'
-                    ? _t('Share Permalink') : _t('Share Message') }
-            </MenuItem>
-        );
-
-        if (this.props.eventTileOps) { // this event is rendered using TextualBody
-            quoteButton = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
-                    { _t('Quote') }
-                </MenuItem>
-            );
-        }
-
-        // Bridges can provide a 'external_url' to link back to the source.
-        if (
-            typeof(mxEvent.event.content.external_url) === "string" &&
-            isUrlPermitted(mxEvent.event.content.external_url)
-        ) {
-            externalURLButton = (
-                <MenuItem
-                    element="a"
-                    className="mx_MessageContextMenu_field"
-                    target="_blank"
-                    rel="noreferrer noopener"
-                    onClick={this.closeMenu}
-                    href={mxEvent.event.content.external_url}
-                >
-                    { _t('Source URL') }
-                </MenuItem>
-            );
-        }
-
-        if (this.props.collapseReplyThread) {
-            collapseReplyThread = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onCollapseReplyThreadClick}>
-                    { _t('Collapse Reply Thread') }
-                </MenuItem>
-            );
-        }
-
-        let reportEventButton;
-        if (mxEvent.getSender() !== me) {
-            reportEventButton = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onReportEventClick}>
-                    { _t('Report Content') }
-                </MenuItem>
-            );
-        }
-
-        return (
-            <div className="mx_MessageContextMenu">
-                { resendReactionsButton }
-                { redactButton }
-                { forwardButton }
-                { pinButton }
-                { viewSourceButton }
-                { unhidePreviewButton }
-                { permalinkButton }
-                { quoteButton }
-                { externalURLButton }
-                { collapseReplyThread }
-                { reportEventButton }
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
new file mode 100644
index 0000000000..22dd3ac438
--- /dev/null
+++ b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -0,0 +1,418 @@
+/*
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
+
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import dis from '../../../dispatcher/dispatcher';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+import Resend from '../../../Resend';
+import SettingsStore from '../../../settings/SettingsStore';
+import { isUrlPermitted } from '../../../HtmlUtils';
+import { isContentActionable } from '../../../utils/EventUtils';
+import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from './IconizedContextMenu';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard";
+import ForwardDialog from "../dialogs/ForwardDialog";
+import { Action } from "../../../dispatcher/actions";
+import ReportEventDialog from '../dialogs/ReportEventDialog';
+import ViewSource from '../../structures/ViewSource';
+import { createRedactEventDialog } from '../dialogs/ConfirmRedactDialog';
+import ShareDialog from '../dialogs/ShareDialog';
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { IPosition, ChevronFace } from '../../structures/ContextMenu';
+
+export function canCancel(eventStatus: EventStatus): boolean {
+    return eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT;
+}
+
+export interface IEventTileOps {
+    isWidgetHidden(): boolean;
+    unhideWidget(): void;
+}
+
+export interface IOperableEventTile {
+    getEventTileOps(): IEventTileOps;
+}
+
+interface IProps extends IPosition {
+    chevronFace: ChevronFace;
+    /* the MatrixEvent associated with the context menu */
+    mxEvent: MatrixEvent;
+    /* an optional EventTileOps implementation that can be used to unhide preview widgets */
+    eventTileOps?: IEventTileOps;
+    permalinkCreator?: RoomPermalinkCreator;
+    /* an optional function to be called when the user clicks collapse thread, if not provided hide button */
+    collapseReplyThread?(): void;
+    /* callback called when the menu is dismissed */
+    onFinished(): void;
+    /* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
+    onCloseDialog?(): void;
+}
+
+interface IState {
+    canRedact: boolean;
+    canPin: boolean;
+}
+
+@replaceableComponent("views.context_menus.MessageContextMenu")
+export default class MessageContextMenu extends React.Component<IProps, IState> {
+    state = {
+        canRedact: false,
+        canPin: false,
+    };
+
+    componentDidMount() {
+        MatrixClientPeg.get().on('RoomMember.powerLevel', this.checkPermissions);
+        this.checkPermissions();
+    }
+
+    componentWillUnmount() {
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener('RoomMember.powerLevel', this.checkPermissions);
+        }
+    }
+
+    private checkPermissions = (): void => {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(this.props.mxEvent.getRoomId());
+
+        // We explicitly decline to show the redact option on ACL events as it has a potential
+        // to obliterate the room - https://github.com/matrix-org/synapse/issues/4042
+        // Similarly for encryption events, since redacting them "breaks everything"
+        const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId)
+            && this.props.mxEvent.getType() !== EventType.RoomServerAcl
+            && this.props.mxEvent.getType() !== EventType.RoomEncryption;
+        let canPin = room.currentState.mayClientSendStateEvent(EventType.RoomPinnedEvents, cli);
+
+        // HACK: Intentionally say we can't pin if the user doesn't want to use the functionality
+        if (!SettingsStore.getValue("feature_pinning")) canPin = false;
+
+        this.setState({ canRedact, canPin });
+    };
+
+    private isPinned(): boolean {
+        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        const pinnedEvent = room.currentState.getStateEvents(EventType.RoomPinnedEvents, '');
+        if (!pinnedEvent) return false;
+        const content = pinnedEvent.getContent();
+        return content.pinned && Array.isArray(content.pinned) && content.pinned.includes(this.props.mxEvent.getId());
+    }
+
+    private onResendReactionsClick = (): void => {
+        for (const reaction of this.getUnsentReactions()) {
+            Resend.resend(reaction);
+        }
+        this.closeMenu();
+    };
+
+    private onReportEventClick = (): void => {
+        Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
+            mxEvent: this.props.mxEvent,
+        }, 'mx_Dialog_reportEvent');
+        this.closeMenu();
+    };
+
+    private onViewSourceClick = (): void => {
+        Modal.createTrackedDialog('View Event Source', '', ViewSource, {
+            mxEvent: this.props.mxEvent,
+        }, 'mx_Dialog_viewsource');
+        this.closeMenu();
+    };
+
+    private onRedactClick = (): void => {
+        const { mxEvent, onCloseDialog } = this.props;
+        createRedactEventDialog({
+            mxEvent,
+            onCloseDialog,
+        });
+        this.closeMenu();
+    };
+
+    private onForwardClick = (): void => {
+        Modal.createTrackedDialog('Forward Message', '', ForwardDialog, {
+            matrixClient: MatrixClientPeg.get(),
+            event: this.props.mxEvent,
+            permalinkCreator: this.props.permalinkCreator,
+        });
+        this.closeMenu();
+    };
+
+    private onPinClick = (): void => {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(this.props.mxEvent.getRoomId());
+        const eventId = this.props.mxEvent.getId();
+
+        const pinnedIds = room?.currentState?.getStateEvents(EventType.RoomPinnedEvents, "")?.getContent().pinned || [];
+        if (pinnedIds.includes(eventId)) {
+            pinnedIds.splice(pinnedIds.indexOf(eventId), 1);
+        } else {
+            pinnedIds.push(eventId);
+            cli.setRoomAccountData(room.roomId, ReadPinsEventId, {
+                event_ids: [
+                    ...(room.getAccountData(ReadPinsEventId)?.getContent()?.event_ids || []),
+                    eventId,
+                ],
+            });
+        }
+        cli.sendStateEvent(this.props.mxEvent.getRoomId(), EventType.RoomPinnedEvents, { pinned: pinnedIds }, "");
+        this.closeMenu();
+    };
+
+    private closeMenu = (): void => {
+        this.props.onFinished();
+    };
+
+    private onUnhidePreviewClick = (): void => {
+        this.props.eventTileOps?.unhideWidget();
+        this.closeMenu();
+    };
+
+    private onQuoteClick = (): void => {
+        dis.dispatch({
+            action: Action.ComposerInsert,
+            event: this.props.mxEvent,
+        });
+        this.closeMenu();
+    };
+
+    private onPermalinkClick = (e: React.MouseEvent): void => {
+        e.preventDefault();
+        Modal.createTrackedDialog('share room message dialog', '', ShareDialog, {
+            target: this.props.mxEvent,
+            permalinkCreator: this.props.permalinkCreator,
+        });
+        this.closeMenu();
+    };
+
+    private onCollapseReplyThreadClick = (): void => {
+        this.props.collapseReplyThread();
+        this.closeMenu();
+    };
+
+    private getReactions(filter: (e: MatrixEvent) => boolean): MatrixEvent[] {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(this.props.mxEvent.getRoomId());
+        const eventId = this.props.mxEvent.getId();
+        return room.getPendingEvents().filter(e => {
+            const relation = e.getRelation();
+            return relation?.rel_type === RelationType.Annotation && relation.event_id === eventId && filter(e);
+        });
+    }
+
+    private getPendingReactions(): MatrixEvent[] {
+        return this.getReactions(e => canCancel(e.status));
+    }
+
+    private getUnsentReactions(): MatrixEvent[] {
+        return this.getReactions(e => e.status === EventStatus.NOT_SENT);
+    }
+
+    render() {
+        const cli = MatrixClientPeg.get();
+        const me = cli.getUserId();
+        const mxEvent = this.props.mxEvent;
+        const eventStatus = mxEvent.status;
+        const unsentReactionsCount = this.getUnsentReactions().length;
+
+        let resendReactionsButton: JSX.Element;
+        let redactButton: JSX.Element;
+        let forwardButton: JSX.Element;
+        let pinButton: JSX.Element;
+        let unhidePreviewButton: JSX.Element;
+        let externalURLButton: JSX.Element;
+        let quoteButton: JSX.Element;
+        let collapseReplyThread: JSX.Element;
+        let redactItemList: JSX.Element;
+
+        // status is SENT before remote-echo, null after
+        const isSent = !eventStatus || eventStatus === EventStatus.SENT;
+        if (!mxEvent.isRedacted()) {
+            if (unsentReactionsCount !== 0) {
+                resendReactionsButton = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_MessageContextMenu_iconResend"
+                        label={_t('Resend %(unsentCount)s reaction(s)', { unsentCount: unsentReactionsCount })}
+                        onClick={this.onResendReactionsClick}
+                    />
+                );
+            }
+        }
+
+        if (isSent && this.state.canRedact) {
+            redactButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconRedact"
+                    label={_t("Remove")}
+                    onClick={this.onRedactClick}
+                />
+            );
+        }
+
+        if (isContentActionable(mxEvent)) {
+            forwardButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconForward"
+                    label={_t("Forward")}
+                    onClick={this.onForwardClick}
+                />
+            );
+
+            if (this.state.canPin) {
+                pinButton = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_MessageContextMenu_iconPin"
+                        label={this.isPinned() ? _t('Unpin') : _t('Pin')}
+                        onClick={this.onPinClick}
+                    />
+                );
+            }
+        }
+
+        const viewSourceButton = (
+            <IconizedContextMenuOption
+                iconClassName="mx_MessageContextMenu_iconSource"
+                label={_t("View source")}
+                onClick={this.onViewSourceClick}
+            />
+        );
+
+        if (this.props.eventTileOps) {
+            if (this.props.eventTileOps.isWidgetHidden()) {
+                unhidePreviewButton = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_MessageContextMenu_iconUnhidePreview"
+                        label={_t("Show preview")}
+                        onClick={this.onUnhidePreviewClick}
+                    />
+                );
+            }
+        }
+
+        let permalink;
+        if (this.props.permalinkCreator) {
+            permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
+        }
+        const permalinkButton = (
+            <IconizedContextMenuOption
+                iconClassName="mx_MessageContextMenu_iconPermalink"
+                onClick={this.onPermalinkClick}
+                label={_t('Share')}
+                element="a"
+                {
+                    // XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`
+                    ...{
+                        href: permalink,
+                        target: "_blank",
+                        rel: "noreferrer noopener",
+                    }
+                }
+            />
+        );
+
+        if (this.props.eventTileOps) { // this event is rendered using TextualBody
+            quoteButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconQuote"
+                    label={_t("Quote")}
+                    onClick={this.onQuoteClick}
+                />
+            );
+        }
+
+        // Bridges can provide a 'external_url' to link back to the source.
+        if (typeof (mxEvent.getContent().external_url) === "string" &&
+            isUrlPermitted(mxEvent.getContent().external_url)
+        ) {
+            externalURLButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconLink"
+                    onClick={this.closeMenu}
+                    label={_t('Source URL')}
+                    element="a"
+                    {
+                        // XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`
+                        ...{
+                            target: "_blank",
+                            rel: "noreferrer noopener",
+                            href: mxEvent.getContent().external_url,
+                        }
+                    }
+                />
+            );
+        }
+
+        if (this.props.collapseReplyThread) {
+            collapseReplyThread = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconCollapse"
+                    label={_t("Collapse reply thread")}
+                    onClick={this.onCollapseReplyThreadClick}
+                />
+            );
+        }
+
+        let reportEventButton: JSX.Element;
+        if (mxEvent.getSender() !== me) {
+            reportEventButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconReport"
+                    label={_t("Report")}
+                    onClick={this.onReportEventClick}
+                />
+            );
+        }
+
+        const commonItemsList = (
+            <IconizedContextMenuOptionList>
+                { quoteButton }
+                { forwardButton }
+                { pinButton }
+                { permalinkButton }
+                { reportEventButton }
+                { externalURLButton }
+                { unhidePreviewButton }
+                { viewSourceButton }
+                { resendReactionsButton }
+                { collapseReplyThread }
+            </IconizedContextMenuOptionList>
+        );
+
+        if (redactButton) {
+            redactItemList = (
+                <IconizedContextMenuOptionList red>
+                    { redactButton }
+                </IconizedContextMenuOptionList>
+            );
+        }
+
+        return (
+            <IconizedContextMenu
+                {...this.props}
+                className="mx_MessageContextMenu"
+                compact={true}
+            >
+                { commonItemsList }
+                { redactItemList }
+            </IconizedContextMenu>
+        );
+    }
+}
diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx
new file mode 100644
index 0000000000..28c35eef8f
--- /dev/null
+++ b/src/components/views/context_menus/SpaceContextMenu.tsx
@@ -0,0 +1,216 @@
+/*
+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 } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import {
+    IProps as IContextMenuProps,
+} from "../../structures/ContextMenu";
+import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from "./IconizedContextMenu";
+import { _t } from "../../../languageHandler";
+import {
+    leaveSpace,
+    shouldShowSpaceSettings,
+    showAddExistingRooms,
+    showCreateNewRoom,
+    showCreateNewSubspace,
+    showSpaceInvite,
+    showSpaceSettings,
+} from "../../../utils/space";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { ButtonEvent } from "../elements/AccessibleButton";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import RoomViewStore from "../../../stores/RoomViewStore";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { Action } from "../../../dispatcher/actions";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
+import { BetaPill } from "../beta/BetaCard";
+
+interface IProps extends IContextMenuProps {
+    space: Room;
+}
+
+const SpaceContextMenu = ({ space, onFinished, ...props }: IProps) => {
+    const cli = useContext(MatrixClientContext);
+    const userId = cli.getUserId();
+
+    let inviteOption;
+    if (space.getJoinRule() === "public" || space.canInvite(userId)) {
+        const onInviteClick = (ev: ButtonEvent) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+
+            showSpaceInvite(space);
+            onFinished();
+        };
+
+        inviteOption = (
+            <IconizedContextMenuOption
+                className="mx_SpacePanel_contextMenu_inviteButton"
+                iconClassName="mx_SpacePanel_iconInvite"
+                label={_t("Invite people")}
+                onClick={onInviteClick}
+            />
+        );
+    }
+
+    let settingsOption;
+    let leaveSection;
+    if (shouldShowSpaceSettings(space)) {
+        const onSettingsClick = (ev: ButtonEvent) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+
+            showSpaceSettings(space);
+            onFinished();
+        };
+
+        settingsOption = (
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconSettings"
+                label={_t("Settings")}
+                onClick={onSettingsClick}
+            />
+        );
+    } else {
+        const onLeaveClick = (ev: ButtonEvent) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+
+            leaveSpace(space);
+            onFinished();
+        };
+
+        leaveSection = <IconizedContextMenuOptionList red first>
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconLeave"
+                label={_t("Leave space")}
+                onClick={onLeaveClick}
+            />
+        </IconizedContextMenuOptionList>;
+    }
+
+    const canAddRooms = space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
+
+    let newRoomSection;
+    if (space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+        const onNewRoomClick = (ev: ButtonEvent) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+
+            showCreateNewRoom(space);
+            onFinished();
+        };
+
+        const onAddExistingRoomClick = (ev: ButtonEvent) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+
+            showAddExistingRooms(space);
+            onFinished();
+        };
+
+        const onNewSubspaceClick = (ev: ButtonEvent) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+
+            showCreateNewSubspace(space);
+            onFinished();
+        };
+
+        newRoomSection = <IconizedContextMenuOptionList first>
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconPlus"
+                label={_t("Create new room")}
+                onClick={onNewRoomClick}
+            />
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconHash"
+                label={_t("Add existing room")}
+                onClick={onAddExistingRoomClick}
+            />
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconPlus"
+                label={_t("Add space")}
+                onClick={onNewSubspaceClick}
+            >
+                <BetaPill />
+            </IconizedContextMenuOption>
+        </IconizedContextMenuOptionList>;
+    }
+
+    const onMembersClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (!RoomViewStore.getRoomId()) {
+            defaultDispatcher.dispatch({
+                action: "view_room",
+                room_id: space.roomId,
+            }, true);
+        }
+
+        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.SpaceMemberList,
+            refireParams: { space },
+        });
+        onFinished();
+    };
+
+    const onExploreRoomsClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        defaultDispatcher.dispatch({
+            action: "view_room",
+            room_id: space.roomId,
+        });
+        onFinished();
+    };
+
+    return <IconizedContextMenu
+        {...props}
+        onFinished={onFinished}
+        className="mx_SpacePanel_contextMenu"
+        compact
+    >
+        <div className="mx_SpacePanel_contextMenu_header">
+            { space.name }
+        </div>
+        <IconizedContextMenuOptionList first>
+            { inviteOption }
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconMembers"
+                label={_t("Members")}
+                onClick={onMembersClick}
+            />
+            { settingsOption }
+            <IconizedContextMenuOption
+                iconClassName="mx_SpacePanel_iconExplore"
+                label={canAddRooms ? _t("Manage & explore rooms") : _t("Explore rooms")}
+                onClick={onExploreRoomsClick}
+            />
+        </IconizedContextMenuOptionList>
+        { newRoomSection }
+        { leaveSection }
+    </IconizedContextMenu>;
+};
+
+export default SpaceContextMenu;
+
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.tsx
similarity index 53%
rename from src/components/views/context_menus/StatusMessageContextMenu.js
rename to src/components/views/context_menus/StatusMessageContextMenu.tsx
index 41f0e0ba61..954dc3f5c0 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.tsx
@@ -14,53 +14,59 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { ChangeEvent } from 'react';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import AccessibleButton from '../elements/AccessibleButton';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { User } from "matrix-js-sdk/src/models/user";
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+    // js-sdk User object. Not required because it might not exist.
+    user?: User;
+}
+
+interface IState {
+    message: string;
+    waiting: boolean;
+}
 
 @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.
-        user: PropTypes.object,
-    };
-
-    constructor(props) {
+export default class StatusMessageContextMenu extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
             message: this.comittedStatusMessage,
+            waiting: false,
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         const { user } = this.props;
         if (!user) {
             return;
         }
-        user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+        user.on("User._unstable_statusMessage", this.onStatusMessageCommitted);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const { user } = this.props;
         if (!user) {
             return;
         }
         user.removeListener(
             "User._unstable_statusMessage",
-            this._onStatusMessageCommitted,
+            this.onStatusMessageCommitted,
         );
     }
 
-    get comittedStatusMessage() {
-        return this.props.user ? this.props.user._unstable_statusMessage : "";
+    get comittedStatusMessage(): string {
+        return this.props.user ? this.props.user.unstable_statusMessage : "";
     }
 
-    _onStatusMessageCommitted = () => {
+    private onStatusMessageCommitted = (): void => {
         // The `User` object has observed a status message change.
         this.setState({
             message: this.comittedStatusMessage,
@@ -68,14 +74,14 @@ export default class StatusMessageContextMenu extends React.Component {
         });
     };
 
-    _onClearClick = (e) => {
+    private onClearClick = (): void=> {
         MatrixClientPeg.get()._unstable_setStatusMessage("");
         this.setState({
             waiting: true,
         });
     };
 
-    _onSubmit = (e) => {
+    private onSubmit = (e: ButtonEvent): void => {
         e.preventDefault();
         MatrixClientPeg.get()._unstable_setStatusMessage(this.state.message);
         this.setState({
@@ -83,55 +89,62 @@ export default class StatusMessageContextMenu extends React.Component {
         });
     };
 
-    _onStatusChange = (e) => {
+    private onStatusChange = (e: ChangeEvent): void => {
         // The input field's value was changed.
         this.setState({
-            message: e.target.value,
+            message: (e.target as HTMLInputElement).value,
         });
     };
 
-    render() {
-        const Spinner = sdk.getComponent('views.elements.Spinner');
-
+    public render(): JSX.Element {
         let actionButton;
         if (this.comittedStatusMessage) {
             if (this.state.message === this.comittedStatusMessage) {
                 actionButton = <AccessibleButton className="mx_StatusMessageContextMenu_clear"
-                    onClick={this._onClearClick}
+                    onClick={this.onClearClick}
                 >
-                    <span>{_t("Clear status")}</span>
+                    <span>{ _t("Clear status") }</span>
                 </AccessibleButton>;
             } else {
                 actionButton = <AccessibleButton className="mx_StatusMessageContextMenu_submit"
-                    onClick={this._onSubmit}
+                    onClick={this.onSubmit}
                 >
-                    <span>{_t("Update status")}</span>
+                    <span>{ _t("Update status") }</span>
                 </AccessibleButton>;
             }
         } else {
-            actionButton = <AccessibleButton className="mx_StatusMessageContextMenu_submit"
-                disabled={!this.state.message} onClick={this._onSubmit}
+            actionButton = <AccessibleButton
+                className="mx_StatusMessageContextMenu_submit"
+                disabled={!this.state.message}
+                onClick={this.onSubmit}
             >
-                <span>{_t("Set status")}</span>
+                <span>{ _t("Set status") }</span>
             </AccessibleButton>;
         }
 
         let spinner = null;
         if (this.state.waiting) {
-            spinner = <Spinner w="24" h="24" />;
+            spinner = <Spinner w={24} h={24} />;
         }
 
-        const form = <form className="mx_StatusMessageContextMenu_form"
-            autoComplete="off" onSubmit={this._onSubmit}
+        const form = <form
+            className="mx_StatusMessageContextMenu_form"
+            autoComplete="off"
+            onSubmit={this.onSubmit}
         >
-            <input type="text" className="mx_StatusMessageContextMenu_message"
-                key="message" placeholder={_t("Set a new status...")}
-                autoFocus={true} maxLength="60" value={this.state.message}
-                onChange={this._onStatusChange}
+            <input
+                type="text"
+                className="mx_StatusMessageContextMenu_message"
+                key="message"
+                placeholder={_t("Set a new status...")}
+                autoFocus={true}
+                maxLength={60}
+                value={this.state.message}
+                onChange={this.onStatusChange}
             />
             <div className="mx_StatusMessageContextMenu_actionContainer">
-                {actionButton}
-                {spinner}
+                { actionButton }
+                { spinner }
             </div>
         </form>;
 
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 8dea62690c..0c3c48a07f 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -20,49 +20,92 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
 import TagOrderActions from '../../../actions/TagOrderActions';
-import {MenuItem} from "../../structures/ContextMenu";
+import { MenuItem } from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
+import { createSpaceFromCommunity } from "../../../utils/space";
+import GroupStore from "../../../stores/GroupStore";
 
 @replaceableComponent("views.context_menus.TagTileContextMenu")
 export default class TagTileContextMenu extends React.Component {
     static propTypes = {
         tag: PropTypes.string.isRequired,
+        index: PropTypes.number.isRequired,
         /* callback called when the menu is dismissed */
         onFinished: PropTypes.func.isRequired,
     };
 
     static contextType = MatrixClientContext;
 
-    constructor() {
-        super();
-
-        this._onViewCommunityClick = this._onViewCommunityClick.bind(this);
-        this._onRemoveClick = this._onRemoveClick.bind(this);
-    }
-
-    _onViewCommunityClick() {
+    _onViewCommunityClick = () => {
         dis.dispatch({
             action: 'view_group',
             group_id: this.props.tag,
         });
         this.props.onFinished();
-    }
+    };
 
-    _onRemoveClick() {
+    _onRemoveClick = () => {
         dis.dispatch(TagOrderActions.removeTag(this.context, this.props.tag));
         this.props.onFinished();
-    }
+    };
+
+    _onCreateSpaceClick = () => {
+        createSpaceFromCommunity(this.context, this.props.tag);
+        this.props.onFinished();
+    };
+
+    _onMoveUp = () => {
+        dis.dispatch(TagOrderActions.moveTag(this.context, this.props.tag, this.props.index - 1));
+        this.props.onFinished();
+    };
+
+    _onMoveDown = () => {
+        dis.dispatch(TagOrderActions.moveTag(this.context, this.props.tag, this.props.index + 1));
+        this.props.onFinished();
+    };
 
     render() {
+        let moveUp;
+        let moveDown;
+        if (this.props.index > 0) {
+            moveUp = (
+                <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_moveUp" onClick={this._onMoveUp}>
+                    { _t("Move up") }
+                </MenuItem>
+            );
+        }
+        if (this.props.index < (GroupFilterOrderStore.getOrderedTags() || []).length - 1) {
+            moveDown = (
+                <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_moveDown" onClick={this._onMoveDown}>
+                    { _t("Move down") }
+                </MenuItem>
+            );
+        }
+
+        let createSpaceOption;
+        if (GroupStore.isUserPrivileged(this.props.tag)) {
+            createSpaceOption = <>
+                <hr className="mx_TagTileContextMenu_separator" role="separator" />
+                <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_createSpace" onClick={this._onCreateSpaceClick}>
+                    { _t("Create Space") }
+                </MenuItem>
+            </>;
+        }
+
         return <div>
             <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_viewCommunity" onClick={this._onViewCommunityClick}>
                 { _t('View Community') }
             </MenuItem>
+            { (moveUp || moveDown) ? <hr className="mx_TagTileContextMenu_separator" role="separator" /> : null }
+            { moveUp }
+            { moveDown }
             <hr className="mx_TagTileContextMenu_separator" role="separator" />
             <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_hideCommunity" onClick={this._onRemoveClick}>
-                { _t('Hide') }
+                { _t("Unpin") }
             </MenuItem>
+            { createSpaceOption }
         </div>;
     }
 }
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index 623fe04f2f..26d7b640a4 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -14,22 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext} from "react";
-import {MatrixCapabilities} from "matrix-widget-api";
+import React, { useContext } from "react";
+import { MatrixCapabilities } from "matrix-widget-api";
 
-import IconizedContextMenu, {IconizedContextMenuOption, IconizedContextMenuOptionList} from "./IconizedContextMenu";
-import {ChevronFace} from "../../structures/ContextMenu";
-import {_t} from "../../../languageHandler";
-import {IApp} from "../../../stores/WidgetStore";
+import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from "./IconizedContextMenu";
+import { ChevronFace } from "../../structures/ContextMenu";
+import { _t } from "../../../languageHandler";
+import { IApp } from "../../../stores/WidgetStore";
 import WidgetUtils from "../../../utils/WidgetUtils";
-import {WidgetMessagingStore} from "../../../stores/widgets/WidgetMessagingStore";
+import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
 import RoomContext from "../../../contexts/RoomContext";
 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 { WidgetType } from "../../../widgets/WidgetType";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import { getConfigLivestreamUrl, startJitsiAudioLivestream } from "../../../Livestream";
@@ -40,6 +40,8 @@ interface IProps extends React.ComponentProps<typeof IconizedContextMenu> {
     showUnpin?: boolean;
     // override delete handler
     onDeleteClick?(): void;
+    // override edit handler
+    onEditClick?(): void;
 }
 
 const WidgetContextMenu: React.FC<IProps> = ({
@@ -47,11 +49,12 @@ const WidgetContextMenu: React.FC<IProps> = ({
     app,
     userWidget,
     onDeleteClick,
+    onEditClick,
     showUnpin,
     ...props
 }) => {
     const cli = useContext(MatrixClientContext);
-    const {room, roomId} = useContext(RoomContext);
+    const { room, roomId } = useContext(RoomContext);
 
     const widgetMessaging = WidgetMessagingStore.instance.getMessagingForId(app.id);
     const canModify = userWidget || WidgetUtils.canUserModifyWidgets(roomId);
@@ -73,7 +76,8 @@ const WidgetContextMenu: React.FC<IProps> = ({
             onFinished();
         };
         streamAudioStreamButton = <IconizedContextMenuOption
-            onClick={onStreamAudioClick} label={_t("Start audio stream")}
+            onClick={onStreamAudioClick}
+            label={_t("Start audio stream")}
         />;
     }
 
@@ -89,12 +93,16 @@ const WidgetContextMenu: React.FC<IProps> = ({
 
     let editButton;
     if (canModify && WidgetUtils.isManagedByManager(app)) {
-        const onEditClick = () => {
-            WidgetUtils.editWidget(room, app);
+        const _onEditClick = () => {
+            if (onEditClick) {
+                onEditClick();
+            } else {
+                WidgetUtils.editWidget(room, app);
+            }
             onFinished();
         };
 
-        editButton = <IconizedContextMenuOption onClick={onEditClick} label={_t("Edit")} />;
+        editButton = <IconizedContextMenuOption onClick={_onEditClick} label={_t("Edit")} />;
     }
 
     let snapshotButton;
@@ -116,24 +124,29 @@ const WidgetContextMenu: React.FC<IProps> = ({
 
     let deleteButton;
     if (onDeleteClick || canModify) {
-        const onDeleteClickDefault = () => {
-            // Show delete confirmation dialog
-            Modal.createTrackedDialog('Delete Widget', '', QuestionDialog, {
-                title: _t("Delete Widget"),
-                description: _t(
-                    "Deleting a widget removes it for all users in this room." +
-                    " Are you sure you want to delete this widget?"),
-                button: _t("Delete widget"),
-                onFinished: (confirmed) => {
-                    if (!confirmed) return;
-                    WidgetUtils.setRoomWidget(roomId, app.id);
-                },
-            });
+        const _onDeleteClick = () => {
+            if (onDeleteClick) {
+                onDeleteClick();
+            } else {
+                // Show delete confirmation dialog
+                Modal.createTrackedDialog('Delete Widget', '', QuestionDialog, {
+                    title: _t("Delete Widget"),
+                    description: _t(
+                        "Deleting a widget removes it for all users in this room." +
+                        " Are you sure you want to delete this widget?"),
+                    button: _t("Delete widget"),
+                    onFinished: (confirmed) => {
+                        if (!confirmed) return;
+                        WidgetUtils.setRoomWidget(roomId, app.id);
+                    },
+                });
+            }
+
             onFinished();
         };
 
         deleteButton = <IconizedContextMenuOption
-            onClick={onDeleteClick || onDeleteClickDefault}
+            onClick={_onDeleteClick}
             label={userWidget ? _t("Remove") : _t("Remove for everyone")}
         />;
     }
diff --git a/src/components/views/dialogs/AddExistingSubspaceDialog.tsx b/src/components/views/dialogs/AddExistingSubspaceDialog.tsx
new file mode 100644
index 0000000000..7fef2c2d9d
--- /dev/null
+++ b/src/components/views/dialogs/AddExistingSubspaceDialog.tsx
@@ -0,0 +1,67 @@
+/*
+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 BaseDialog from "./BaseDialog";
+import AccessibleButton from "../elements/AccessibleButton";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { AddExistingToSpace, defaultSpacesRenderer, SubspaceSelector } from "./AddExistingToSpaceDialog";
+
+interface IProps {
+    space: Room;
+    onCreateSubspaceClick(): void;
+    onFinished(added?: boolean): void;
+}
+
+const AddExistingSubspaceDialog: React.FC<IProps> = ({ space, onCreateSubspaceClick, onFinished }) => {
+    const [selectedSpace, setSelectedSpace] = useState(space);
+
+    return <BaseDialog
+        title={(
+            <SubspaceSelector
+                title={_t("Add existing space")}
+                space={space}
+                value={selectedSpace}
+                onChange={setSelectedSpace}
+            />
+        )}
+        className="mx_AddExistingToSpaceDialog"
+        contentId="mx_AddExistingToSpace"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <MatrixClientContext.Provider value={space.client}>
+            <AddExistingToSpace
+                space={space}
+                onFinished={onFinished}
+                footerPrompt={<>
+                    <div>{ _t("Want to add a new space instead?") }</div>
+                    <AccessibleButton onClick={onCreateSubspaceClick} kind="link">
+                        { _t("Create a new space") }
+                    </AccessibleButton>
+                </>}
+                filterPlaceholder={_t("Search for spaces")}
+                spacesRenderer={defaultSpacesRenderer}
+            />
+        </MatrixClientContext.Provider>
+    </BaseDialog>;
+};
+
+export default AddExistingSubspaceDialog;
+
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index 822ffc2827..01a767bf14 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -14,39 +14,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactNode, useContext, useMemo, useState} from "react";
+import React, { ReactNode, useContext, useMemo, 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 { Room } from "matrix-js-sdk/src/models/room";
+import { sleep } from "matrix-js-sdk/src/utils";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 
-import {_t} from '../../../languageHandler';
-import {IDialogProps} from "./IDialogProps";
+import { _t } from '../../../languageHandler';
 import BaseDialog from "./BaseDialog";
 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 { getDisplayAliasForRoom } from "../../../Rooms";
 import AccessibleButton from "../elements/AccessibleButton";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {sleep} from "../../../utils/promise";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import {calculateRoomVia} from "../../../utils/permalinks/Permalinks";
+import { calculateRoomVia } from "../../../utils/permalinks/Permalinks";
 import StyledCheckbox from "../elements/StyledCheckbox";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {sortRooms} from "../../../stores/room-list/algorithms/tag-sorting/RecentAlgorithm";
+import { sortRooms } from "../../../stores/room-list/algorithms/tag-sorting/RecentAlgorithm";
 import ProgressBar from "../elements/ProgressBar";
-import {SpaceFeedbackPrompt} from "../../structures/SpaceRoomView";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import QueryMatcher from "../../../autocomplete/QueryMatcher";
+import TruncatedList from "../elements/TruncatedList";
+import EntityTile from "../rooms/EntityTile";
+import BaseAvatar from "../avatars/BaseAvatar";
 
-interface IProps extends IDialogProps {
-    matrixClient: MatrixClient;
+interface IProps {
     space: Room;
-    onCreateRoomClick(cli: MatrixClient, space: Room): void;
+    onCreateRoomClick(): void;
+    onAddSubspaceClick(): void;
+    onFinished(added?: boolean): void;
 }
 
-const Entry = ({ room, checked, onChange }) => {
+export const Entry = ({ room, checked, onChange }) => {
     return <label className="mx_AddExistingToSpace_entry">
         { room?.isSpaceRoom()
             ? <RoomAvatar room={room} height={32} width={32} />
@@ -64,14 +66,36 @@ const Entry = ({ room, checked, onChange }) => {
 interface IAddExistingToSpaceProps {
     space: Room;
     footerPrompt?: ReactNode;
+    filterPlaceholder: string;
     emptySelectionButton?: ReactNode;
     onFinished(added: boolean): void;
+    roomsRenderer?(
+        rooms: Room[],
+        selectedToAdd: Set<Room>,
+        onChange: undefined | ((checked: boolean, room: Room) => void),
+        truncateAt: number,
+        overflowTile: (overflowCount: number, totalCount: number) => JSX.Element,
+    ): ReactNode;
+    spacesRenderer?(
+        spaces: Room[],
+        selectedToAdd: Set<Room>,
+        onChange?: (checked: boolean, room: Room) => void,
+    ): ReactNode;
+    dmsRenderer?(
+        dms: Room[],
+        selectedToAdd: Set<Room>,
+        onChange?: (checked: boolean, room: Room) => void,
+    ): ReactNode;
 }
 
 export const AddExistingToSpace: React.FC<IAddExistingToSpaceProps> = ({
     space,
     footerPrompt,
     emptySelectionButton,
+    filterPlaceholder,
+    roomsRenderer,
+    dmsRenderer,
+    spacesRenderer,
     onFinished,
 }) => {
     const cli = useContext(MatrixClientContext);
@@ -195,7 +219,7 @@ export const AddExistingToSpace: React.FC<IAddExistingToSpaceProps> = ({
         </>;
     }
 
-    const onChange = !busy && !error ? (checked, room) => {
+    const onChange = !busy && !error ? (checked: boolean, room: Room) => {
         if (checked) {
             selectedToAdd.add(room);
         } else {
@@ -204,68 +228,52 @@ export const AddExistingToSpace: React.FC<IAddExistingToSpaceProps> = ({
         setSelectedToAdd(new Set(selectedToAdd));
     } : null;
 
+    const [truncateAt, setTruncateAt] = useState(20);
+    function overflowTile(overflowCount: number, totalCount: number): JSX.Element {
+        const text = _t("and %(count)s others...", { count: overflowCount });
+        return (
+            <EntityTile
+                className="mx_EntityTile_ellipsis"
+                avatarJsx={
+                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
+                }
+                name={text}
+                presenceState="online"
+                suppressOnHover={true}
+                onClick={() => setTruncateAt(totalCount)}
+            />
+        );
+    }
+
+    let noResults = true;
+    if ((roomsRenderer && rooms.length > 0) ||
+        (dmsRenderer && dms.length > 0) ||
+        (!roomsRenderer && !dmsRenderer && spacesRenderer && spaces.length > 0) // only count spaces when alone
+    ) {
+        noResults = false;
+    }
+
     return <div className="mx_AddExistingToSpace">
         <SearchBox
             className="mx_textinput_icon mx_textinput_search"
-            placeholder={ _t("Filter your rooms and spaces") }
+            placeholder={filterPlaceholder}
             onSearch={setQuery}
-            autoComplete={true}
             autoFocus={true}
         />
         <AutoHideScrollbar className="mx_AddExistingToSpace_content">
-            { rooms.length > 0 ? (
-                <div className="mx_AddExistingToSpace_section">
-                    <h3>{ _t("Rooms") }</h3>
-                    { rooms.map(room => {
-                        return <Entry
-                            key={room.roomId}
-                            room={room}
-                            checked={selectedToAdd.has(room)}
-                            onChange={onChange ? (checked) => {
-                                onChange(checked, room);
-                            } : null}
-                        />;
-                    }) }
-                </div>
+            { rooms.length > 0 && roomsRenderer ? (
+                roomsRenderer(rooms, selectedToAdd, onChange, truncateAt, overflowTile)
             ) : undefined }
 
-            { spaces.length > 0 ? (
-                <div className="mx_AddExistingToSpace_section mx_AddExistingToSpace_section_spaces">
-                    <h3>{ _t("Spaces") }</h3>
-                    <div className="mx_AddExistingToSpace_section_experimental">
-                        <div>{ _t("Feeling experimental?") }</div>
-                        <div>{ _t("You can add existing spaces to a space.") }</div>
-                    </div>
-                    { spaces.map(space => {
-                        return <Entry
-                            key={space.roomId}
-                            room={space}
-                            checked={selectedToAdd.has(space)}
-                            onChange={onChange ? (checked) => {
-                                onChange(checked, space);
-                            } : null}
-                        />;
-                    }) }
-                </div>
+            { spaces.length > 0 && spacesRenderer ? (
+                spacesRenderer(spaces, selectedToAdd, onChange)
             ) : null }
 
-            { dms.length > 0 ? (
-                <div className="mx_AddExistingToSpace_section">
-                    <h3>{ _t("Direct Messages") }</h3>
-                    { dms.map(room => {
-                        return <Entry
-                            key={room.roomId}
-                            room={room}
-                            checked={selectedToAdd.has(room)}
-                            onChange={onChange ? (checked) => {
-                                onChange(checked, room);
-                            } : null}
-                        />;
-                    }) }
-                </div>
+            { dms.length > 0 && dmsRenderer ? (
+                dmsRenderer(dms, selectedToAdd, onChange)
             ) : null }
 
-            { spaces.length + rooms.length + dms.length < 1 ? <span className="mx_AddExistingToSpace_noResults">
+            { noResults ? <span className="mx_AddExistingToSpace_noResults">
                 { _t("No results") }
             </span> : undefined }
         </AutoHideScrollbar>
@@ -276,69 +284,166 @@ export const AddExistingToSpace: React.FC<IAddExistingToSpaceProps> = ({
     </div>;
 };
 
-const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space, onCreateRoomClick, onFinished }) => {
-    const [selectedSpace, setSelectedSpace] = useState(space);
-    const existingSubspaces = SpaceStore.instance.getChildSpaces(space.roomId);
+export const defaultRoomsRenderer: IAddExistingToSpaceProps["roomsRenderer"] = (
+    rooms, selectedToAdd, onChange, truncateAt, overflowTile,
+) => (
+    <div className="mx_AddExistingToSpace_section">
+        <h3>{ _t("Rooms") }</h3>
+        <TruncatedList
+            truncateAt={truncateAt}
+            createOverflowElement={overflowTile}
+            getChildren={(start, end) => rooms.slice(start, end).map(room =>
+                <Entry
+                    key={room.roomId}
+                    room={room}
+                    checked={selectedToAdd.has(room)}
+                    onChange={onChange ? (checked: boolean) => {
+                        onChange(checked, room);
+                    } : null}
+                />,
+            )}
+            getChildCount={() => rooms.length}
+        />
+    </div>
+);
 
-    let spaceOptionSection;
-    if (existingSubspaces.length > 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>;
-        });
+export const defaultSpacesRenderer: IAddExistingToSpaceProps["spacesRenderer"] = (spaces, selectedToAdd, onChange) => (
+    <div className="mx_AddExistingToSpace_section">
+        { spaces.map(space => {
+            return <Entry
+                key={space.roomId}
+                room={space}
+                checked={selectedToAdd.has(space)}
+                onChange={onChange ? (checked) => {
+                    onChange(checked, space);
+                } : null}
+            />;
+        }) }
+    </div>
+);
 
-        spaceOptionSection = (
+export const defaultDmsRenderer: IAddExistingToSpaceProps["dmsRenderer"] = (dms, selectedToAdd, onChange) => (
+    <div className="mx_AddExistingToSpace_section">
+        <h3>{ _t("Direct Messages") }</h3>
+        { dms.map(room => {
+            return <Entry
+                key={room.roomId}
+                room={room}
+                checked={selectedToAdd.has(room)}
+                onChange={onChange ? (checked: boolean) => {
+                    onChange(checked, room);
+                } : null}
+            />;
+        }) }
+    </div>
+);
+
+interface ISubspaceSelectorProps {
+    title: string;
+    space: Room;
+    value: Room;
+    onChange(space: Room): void;
+}
+
+export const SubspaceSelector = ({ title, space, value, onChange }: ISubspaceSelectorProps) => {
+    const options = useMemo(() => {
+        return [space, ...SpaceStore.instance.getChildSpaces(space.roomId).filter(space => {
+            return space.currentState.maySendStateEvent(EventType.SpaceChild, space.client.credentials.userId);
+        })];
+    }, [space]);
+
+    let body;
+    if (options.length > 1) {
+        body = (
             <Dropdown
                 id="mx_SpaceSelectDropdown"
+                className="mx_SpaceSelectDropdown"
                 onOptionChange={(key: string) => {
-                    setSelectedSpace(existingSubspaces.find(space => space.roomId === key) || space);
+                    onChange(options.find(space => space.roomId === key) || space);
                 }}
-                value={selectedSpace.roomId}
+                value={value.roomId}
                 label={_t("Space selection")}
             >
-                { options }
+                { options.map((space) => {
+                    const classes = classNames({
+                        mx_SubspaceSelector_dropdownOptionActive: space === value,
+                    });
+                    return <div key={space.roomId} className={classes}>
+                        <RoomAvatar room={space} width={24} height={24} />
+                        { space.name || getDisplayAliasForRoom(space) || space.roomId }
+                    </div>;
+                }) }
             </Dropdown>
         );
     } else {
-        spaceOptionSection = <div className="mx_AddExistingToSpaceDialog_onlySpace">
-            { space.name || getDisplayAliasForRoom(space) || space.roomId }
-        </div>;
+        body = (
+            <div className="mx_SubspaceSelector_onlySpace">
+                { space.name || getDisplayAliasForRoom(space) || space.roomId }
+            </div>
+        );
     }
 
-    const title = <React.Fragment>
-        <RoomAvatar room={selectedSpace} height={40} width={40} />
+    return <div className="mx_SubspaceSelector">
+        <RoomAvatar room={value} height={40} width={40} />
         <div>
-            <h1>{ _t("Add existing rooms") }</h1>
-            { spaceOptionSection }
+            <h1>{ title }</h1>
+            { body }
         </div>
-    </React.Fragment>;
+    </div>;
+};
+
+const AddExistingToSpaceDialog: React.FC<IProps> = ({ space, onCreateRoomClick, onAddSubspaceClick, onFinished }) => {
+    const [selectedSpace, setSelectedSpace] = useState(space);
 
     return <BaseDialog
-        title={title}
+        title={(
+            <SubspaceSelector
+                title={_t("Add existing rooms")}
+                space={space}
+                value={selectedSpace}
+                onChange={setSelectedSpace}
+            />
+        )}
         className="mx_AddExistingToSpaceDialog"
         contentId="mx_AddExistingToSpace"
         onFinished={onFinished}
         fixedWidth={false}
     >
-        <MatrixClientContext.Provider value={cli}>
+        <MatrixClientContext.Provider value={space.client}>
             <AddExistingToSpace
                 space={space}
                 onFinished={onFinished}
                 footerPrompt={<>
                     <div>{ _t("Want to add a new room instead?") }</div>
-                    <AccessibleButton onClick={() => onCreateRoomClick(cli, space)} kind="link">
+                    <AccessibleButton
+                        kind="link"
+                        onClick={() => {
+                            onCreateRoomClick();
+                            onFinished();
+                        }}
+                    >
                         { _t("Create a new room") }
                     </AccessibleButton>
                 </>}
+                filterPlaceholder={_t("Search for rooms")}
+                roomsRenderer={defaultRoomsRenderer}
+                spacesRenderer={() => (
+                    <div className="mx_AddExistingToSpace_section">
+                        <h3>{ _t("Spaces") }</h3>
+                        <AccessibleButton
+                            kind="link"
+                            onClick={() => {
+                                onAddSubspaceClick();
+                                onFinished();
+                            }}
+                        >
+                            { _t("Adding spaces has moved.") }
+                        </AccessibleButton>
+                    </div>
+                )}
+                dmsRenderer={defaultDmsRenderer}
             />
         </MatrixClientContext.Provider>
-
-        <SpaceFeedbackPrompt onClick={() => onFinished(false)} />
     </BaseDialog>;
 };
 
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.tsx
similarity index 75%
rename from src/components/views/dialogs/AddressPickerDialog.js
rename to src/components/views/dialogs/AddressPickerDialog.tsx
index 929d688e47..6b239ee570 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.tsx
@@ -17,23 +17,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef } from 'react';
+import { sleep } from "matrix-js-sdk/src/utils";
 
 import { _t, _td } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
-import { addressTypes, getAddressType } from '../../../UserAddress.js';
+import { AddressType, addressTypes, getAddressType, IUserAddress } from '../../../UserAddress';
 import GroupStore from '../../../stores/GroupStore';
 import * as Email from '../../../email';
 import IdentityAuthClient from '../../../IdentityAuthClient';
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from '../../../utils/IdentityServerUtils';
 import { abbreviateUrl } from '../../../utils/UrlUtils';
-import {sleep} from "../../../utils/promise";
-import {Key} from "../../../Keyboard";
-import {Action} from "../../../dispatcher/actions";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Key } from "../../../Keyboard";
+import { Action } from "../../../dispatcher/actions";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AddressSelector from '../elements/AddressSelector';
+import AddressTile from '../elements/AddressTile';
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
 
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
@@ -44,29 +46,64 @@ const addressTypeName = {
     'email': _td("email address"),
 };
 
-@replaceableComponent("views.dialogs.AddressPickerDialog")
-export default class AddressPickerDialog extends React.Component {
-    static propTypes = {
-        title: PropTypes.string.isRequired,
-        description: PropTypes.node,
-        // Extra node inserted after picker input, dropdown and errors
-        extraNode: PropTypes.node,
-        value: PropTypes.string,
-        placeholder: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-        roomId: PropTypes.string,
-        button: PropTypes.string,
-        focus: PropTypes.bool,
-        validAddressTypes: PropTypes.arrayOf(PropTypes.oneOf(addressTypes)),
-        onFinished: PropTypes.func.isRequired,
-        groupId: PropTypes.string,
-        // The type of entity to search for. Default: 'user'.
-        pickerType: PropTypes.oneOf(['user', 'room']),
-        // Whether the current user should be included in the addresses returned. Only
-        // applicable when pickerType is `user`. Default: false.
-        includeSelf: PropTypes.bool,
-    };
+interface IResult {
+    user_id: string; // eslint-disable-line camelcase
+    room_id?: string; // eslint-disable-line camelcase
+    name?: string;
+    display_name?: string; // eslint-disable-line camelcase
+    avatar_url?: string;// eslint-disable-line camelcase
+}
 
-    static defaultProps = {
+interface IProps {
+    title: string;
+    description?: JSX.Element;
+    // Extra node inserted after picker input, dropdown and errors
+    extraNode?: JSX.Element;
+    value?: string;
+    placeholder?: ((validAddressTypes: any) => string) | string;
+    roomId?: string;
+    button?: string;
+    focus?: boolean;
+    validAddressTypes?: AddressType[];
+    onFinished: (success: boolean, list?: IUserAddress[]) => void;
+    groupId?: string;
+    // The type of entity to search for. Default: 'user'.
+    pickerType?: 'user' | 'room';
+    // Whether the current user should be included in the addresses returned. Only
+    // applicable when pickerType is `user`. Default: false.
+    includeSelf?: boolean;
+}
+
+interface IState {
+    // Whether to show an error message because of an invalid address
+    invalidAddressError: boolean;
+    // List of UserAddressType objects representing
+    // the list of addresses we're going to invite
+    selectedList: IUserAddress[];
+    // Whether a search is ongoing
+    busy: boolean;
+    // An error message generated during the user directory search
+    searchError: string;
+    // Whether the server supports the user_directory API
+    serverSupportsUserDirectory: boolean;
+    // The query being searched for
+    query: string;
+    // List of UserAddressType objects representing the set of
+    // auto-completion results for the current search query.
+    suggestedList: IUserAddress[];
+    // List of address types initialised from props, but may change while the
+    // dialog is open and represents the supported list of address types at this time.
+    validAddressTypes: AddressType[];
+}
+
+@replaceableComponent("views.dialogs.AddressPickerDialog")
+export default class AddressPickerDialog extends React.Component<IProps, IState> {
+    private textinput = createRef<HTMLTextAreaElement>();
+    private addressSelector = createRef<AddressSelector>();
+    private queryChangedDebouncer: number;
+    private cancelThreepidLookup: () => void;
+
+    static defaultProps: Partial<IProps> = {
         value: "",
         focus: true,
         validAddressTypes: addressTypes,
@@ -74,36 +111,23 @@ export default class AddressPickerDialog extends React.Component {
         includeSelf: false,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
-        this._textinput = createRef();
-
         let validAddressTypes = this.props.validAddressTypes;
         // Remove email from validAddressTypes if no IS is configured. It may be added at a later stage by the user
-        if (!MatrixClientPeg.get().getIdentityServerUrl() && validAddressTypes.includes("email")) {
-            validAddressTypes = validAddressTypes.filter(type => type !== "email");
+        if (!MatrixClientPeg.get().getIdentityServerUrl() && validAddressTypes.includes(AddressType.Email)) {
+            validAddressTypes = validAddressTypes.filter(type => type !== AddressType.Email);
         }
 
         this.state = {
-            // Whether to show an error message because of an invalid address
             invalidAddressError: false,
-            // List of UserAddressType objects representing
-            // the list of addresses we're going to invite
             selectedList: [],
-            // Whether a search is ongoing
             busy: false,
-            // An error message generated during the user directory search
             searchError: null,
-            // Whether the server supports the user_directory API
             serverSupportsUserDirectory: true,
-            // The query being searched for
             query: "",
-            // List of UserAddressType objects representing the set of
-            // auto-completion results for the current search query.
             suggestedList: [],
-            // List of address types initialised from props, but may change while the
-            // dialog is open and represents the supported list of address types at this time.
             validAddressTypes,
         };
     }
@@ -111,11 +135,11 @@ export default class AddressPickerDialog extends React.Component {
     componentDidMount() {
         if (this.props.focus) {
             // Set the cursor at the end of the text input
-            this._textinput.current.value = this.props.value;
+            this.textinput.current.value = this.props.value;
         }
     }
 
-    getPlaceholder() {
+    private getPlaceholder(): string {
         const { placeholder } = this.props;
         if (typeof placeholder === "string") {
             return placeholder;
@@ -124,23 +148,23 @@ export default class AddressPickerDialog extends React.Component {
         return placeholder(this.state.validAddressTypes);
     }
 
-    onButtonClick = () => {
+    private onButtonClick = (): void => {
         let selectedList = this.state.selectedList.slice();
         // Check the text input field to see if user has an unconverted address
         // If there is and it's valid add it to the local selectedList
-        if (this._textinput.current.value !== '') {
-            selectedList = this._addAddressesToList([this._textinput.current.value]);
+        if (this.textinput.current.value !== '') {
+            selectedList = this.addAddressesToList([this.textinput.current.value]);
             if (selectedList === null) return;
         }
         this.props.onFinished(true, selectedList);
     };
 
-    onCancel = () => {
+    private onCancel = (): void => {
         this.props.onFinished(false);
     };
 
-    onKeyDown = e => {
-        const textInput = this._textinput.current ? this._textinput.current.value : undefined;
+    private onKeyDown = (e: React.KeyboardEvent): void => {
+        const textInput = this.textinput.current ? this.textinput.current.value : undefined;
 
         if (e.key === Key.ESCAPE) {
             e.stopPropagation();
@@ -149,15 +173,15 @@ export default class AddressPickerDialog extends React.Component {
         } else if (e.key === Key.ARROW_UP) {
             e.stopPropagation();
             e.preventDefault();
-            if (this.addressSelector) this.addressSelector.moveSelectionUp();
+            if (this.addressSelector.current) this.addressSelector.current.moveSelectionUp();
         } else if (e.key === Key.ARROW_DOWN) {
             e.stopPropagation();
             e.preventDefault();
-            if (this.addressSelector) this.addressSelector.moveSelectionDown();
+            if (this.addressSelector.current) this.addressSelector.current.moveSelectionDown();
         } else if (this.state.suggestedList.length > 0 && [Key.COMMA, Key.ENTER, Key.TAB].includes(e.key)) {
             e.stopPropagation();
             e.preventDefault();
-            if (this.addressSelector) this.addressSelector.chooseSelection();
+            if (this.addressSelector.current) this.addressSelector.current.chooseSelection();
         } else if (textInput.length === 0 && this.state.selectedList.length && e.key === Key.BACKSPACE) {
             e.stopPropagation();
             e.preventDefault();
@@ -169,17 +193,17 @@ export default class AddressPickerDialog extends React.Component {
                 // if there's nothing in the input box, submit the form
                 this.onButtonClick();
             } else {
-                this._addAddressesToList([textInput]);
+                this.addAddressesToList([textInput]);
             }
         } else if (textInput && (e.key === Key.COMMA || e.key === Key.TAB)) {
             e.stopPropagation();
             e.preventDefault();
-            this._addAddressesToList([textInput]);
+            this.addAddressesToList([textInput]);
         }
     };
 
-    onQueryChanged = ev => {
-        const query = ev.target.value;
+    private onQueryChanged = (ev: React.ChangeEvent): void => {
+        const query = (ev.target as HTMLTextAreaElement).value;
         if (this.queryChangedDebouncer) {
             clearTimeout(this.queryChangedDebouncer);
         }
@@ -188,17 +212,17 @@ export default class AddressPickerDialog extends React.Component {
             this.queryChangedDebouncer = setTimeout(() => {
                 if (this.props.pickerType === 'user') {
                     if (this.props.groupId) {
-                        this._doNaiveGroupSearch(query);
+                        this.doNaiveGroupSearch(query);
                     } else if (this.state.serverSupportsUserDirectory) {
-                        this._doUserDirectorySearch(query);
+                        this.doUserDirectorySearch(query);
                     } else {
-                        this._doLocalSearch(query);
+                        this.doLocalSearch(query);
                     }
                 } else if (this.props.pickerType === 'room') {
                     if (this.props.groupId) {
-                        this._doNaiveGroupRoomSearch(query);
+                        this.doNaiveGroupRoomSearch(query);
                     } else {
-                        this._doRoomSearch(query);
+                        this.doRoomSearch(query);
                     }
                 } else {
                     console.error('Unknown pickerType', this.props.pickerType);
@@ -213,7 +237,7 @@ export default class AddressPickerDialog extends React.Component {
         }
     };
 
-    onDismissed = index => () => {
+    private onDismissed = (index: number) => () => {
         const selectedList = this.state.selectedList.slice();
         selectedList.splice(index, 1);
         this.setState({
@@ -221,25 +245,21 @@ export default class AddressPickerDialog extends React.Component {
             suggestedList: [],
             query: "",
         });
-        if (this._cancelThreepidLookup) this._cancelThreepidLookup();
+        if (this.cancelThreepidLookup) this.cancelThreepidLookup();
     };
 
-    onClick = index => () => {
-        this.onSelected(index);
-    };
-
-    onSelected = index => {
+    private onSelected = (index: number): void => {
         const selectedList = this.state.selectedList.slice();
-        selectedList.push(this._getFilteredSuggestions()[index]);
+        selectedList.push(this.getFilteredSuggestions()[index]);
         this.setState({
             selectedList,
             suggestedList: [],
             query: "",
         });
-        if (this._cancelThreepidLookup) this._cancelThreepidLookup();
+        if (this.cancelThreepidLookup) this.cancelThreepidLookup();
     };
 
-    _doNaiveGroupSearch(query) {
+    private doNaiveGroupSearch(query: string): void {
         const lowerCaseQuery = query.toLowerCase();
         this.setState({
             busy: true,
@@ -260,7 +280,7 @@ export default class AddressPickerDialog extends React.Component {
                     display_name: u.displayname,
                 });
             });
-            this._processResults(results, query);
+            this.processResults(results, query);
         }).catch((err) => {
             console.error('Error whilst searching group rooms: ', err);
             this.setState({
@@ -273,7 +293,7 @@ export default class AddressPickerDialog extends React.Component {
         });
     }
 
-    _doNaiveGroupRoomSearch(query) {
+    private doNaiveGroupRoomSearch(query: string): void {
         const lowerCaseQuery = query.toLowerCase();
         const results = [];
         GroupStore.getGroupRooms(this.props.groupId).forEach((r) => {
@@ -289,13 +309,13 @@ export default class AddressPickerDialog extends React.Component {
                 name: r.name || r.canonical_alias,
             });
         });
-        this._processResults(results, query);
+        this.processResults(results, query);
         this.setState({
             busy: false,
         });
     }
 
-    _doRoomSearch(query) {
+    private doRoomSearch(query: string): void {
         const lowerCaseQuery = query.toLowerCase();
         const rooms = MatrixClientPeg.get().getRooms();
         const results = [];
@@ -346,13 +366,13 @@ export default class AddressPickerDialog extends React.Component {
             return a.rank - b.rank;
         });
 
-        this._processResults(sortedResults, query);
+        this.processResults(sortedResults, query);
         this.setState({
             busy: false,
         });
     }
 
-    _doUserDirectorySearch(query) {
+    private doUserDirectorySearch(query: string): void {
         this.setState({
             busy: true,
             query,
@@ -366,7 +386,7 @@ export default class AddressPickerDialog extends React.Component {
             if (this.state.query !== query) {
                 return;
             }
-            this._processResults(resp.results, query);
+            this.processResults(resp.results, query);
         }).catch((err) => {
             console.error('Error whilst searching user directory: ', err);
             this.setState({
@@ -377,7 +397,7 @@ export default class AddressPickerDialog extends React.Component {
                     serverSupportsUserDirectory: false,
                 });
                 // Do a local search immediately
-                this._doLocalSearch(query);
+                this.doLocalSearch(query);
             }
         }).then(() => {
             this.setState({
@@ -386,7 +406,7 @@ export default class AddressPickerDialog extends React.Component {
         });
     }
 
-    _doLocalSearch(query) {
+    private doLocalSearch(query: string): void {
         this.setState({
             query,
             searchError: null,
@@ -407,10 +427,10 @@ export default class AddressPickerDialog extends React.Component {
                 avatar_url: user.avatarUrl,
             });
         });
-        this._processResults(results, query);
+        this.processResults(results, query);
     }
 
-    _processResults(results, query) {
+    private processResults(results: IResult[], query: string): void {
         const suggestedList = [];
         results.forEach((result) => {
             if (result.room_id) {
@@ -457,7 +477,7 @@ export default class AddressPickerDialog extends React.Component {
         const addrType = getAddressType(query);
         if (this.state.validAddressTypes.includes(addrType)) {
             if (addrType === 'email' && !Email.looksValid(query)) {
-                this.setState({searchError: _t("That doesn't look like a valid email address")});
+                this.setState({ searchError: _t("That doesn't look like a valid email address") });
                 return;
             }
             suggestedList.unshift({
@@ -465,27 +485,27 @@ export default class AddressPickerDialog extends React.Component {
                 address: query,
                 isKnown: false,
             });
-            if (this._cancelThreepidLookup) this._cancelThreepidLookup();
+            if (this.cancelThreepidLookup) this.cancelThreepidLookup();
             if (addrType === 'email') {
-                this._lookupThreepid(addrType, query);
+                this.lookupThreepid(addrType, query);
             }
         }
         this.setState({
             suggestedList,
             invalidAddressError: false,
         }, () => {
-            if (this.addressSelector) this.addressSelector.moveSelectionTop();
+            if (this.addressSelector.current) this.addressSelector.current.moveSelectionTop();
         });
     }
 
-    _addAddressesToList(addressTexts) {
+    private addAddressesToList(addressTexts: string[]): IUserAddress[] {
         const selectedList = this.state.selectedList.slice();
 
         let hasError = false;
         addressTexts.forEach((addressText) => {
             addressText = addressText.trim();
             const addrType = getAddressType(addressText);
-            const addrObj = {
+            const addrObj: IUserAddress = {
                 addressType: addrType,
                 address: addressText,
                 isKnown: false,
@@ -504,7 +524,6 @@ export default class AddressPickerDialog extends React.Component {
                 const room = MatrixClientPeg.get().getRoom(addrObj.address);
                 if (room) {
                     addrObj.displayName = room.name;
-                    addrObj.avatarMxc = room.avatarUrl;
                     addrObj.isKnown = true;
                 }
             }
@@ -518,17 +537,17 @@ export default class AddressPickerDialog extends React.Component {
             query: "",
             invalidAddressError: hasError ? true : this.state.invalidAddressError,
         });
-        if (this._cancelThreepidLookup) this._cancelThreepidLookup();
+        if (this.cancelThreepidLookup) this.cancelThreepidLookup();
         return hasError ? null : selectedList;
     }
 
-    async _lookupThreepid(medium, address) {
+    private async lookupThreepid(medium: AddressType, address: string): Promise<string> {
         let cancelled = false;
         // Note that we can't safely remove this after we're done
         // because we don't know that it's the same one, so we just
         // leave it: it's replacing the old one each time so it's
         // not like they leak.
-        this._cancelThreepidLookup = function() {
+        this.cancelThreepidLookup = function() {
             cancelled = true;
         };
 
@@ -570,29 +589,29 @@ export default class AddressPickerDialog extends React.Component {
         }
     }
 
-    _getFilteredSuggestions() {
+    private getFilteredSuggestions(): IUserAddress[] {
         // map addressType => set of addresses to avoid O(n*m) operation
         const selectedAddresses = {};
-        this.state.selectedList.forEach(({address, addressType}) => {
+        this.state.selectedList.forEach(({ address, addressType }) => {
             if (!selectedAddresses[addressType]) selectedAddresses[addressType] = new Set();
             selectedAddresses[addressType].add(address);
         });
 
         // Filter out any addresses in the above already selected addresses (matching both type and address)
-        return this.state.suggestedList.filter(({address, addressType}) => {
+        return this.state.suggestedList.filter(({ address, addressType }) => {
             return !(selectedAddresses[addressType] && selectedAddresses[addressType].has(address));
         });
     }
 
-    _onPaste = e => {
+    private onPaste = (e: React.ClipboardEvent): void => {
         // Prevent the text being pasted into the textarea
         e.preventDefault();
         const text = e.clipboardData.getData("text");
         // Process it as a list of addresses to add instead
-        this._addAddressesToList(text.split(/[\s,]+/));
+        this.addAddressesToList(text.split(/[\s,]+/));
     };
 
-    onUseDefaultIdentityServerClick = e => {
+    private onUseDefaultIdentityServerClick = (e: React.MouseEvent): void => {
         e.preventDefault();
 
         // Update the IS in account data. Actually using it may trigger terms.
@@ -601,33 +620,27 @@ export default class AddressPickerDialog extends React.Component {
 
         // Add email as a valid address type.
         const { validAddressTypes } = this.state;
-        validAddressTypes.push('email');
+        validAddressTypes.push(AddressType.Email);
         this.setState({ validAddressTypes });
     };
 
-    onManageSettingsClick = e => {
+    private onManageSettingsClick = (e: React.MouseEvent): void => {
         e.preventDefault();
         dis.fire(Action.ViewUserSettings);
         this.onCancel();
     };
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const AddressSelector = sdk.getComponent("elements.AddressSelector");
-        this.scrollElement = null;
-
         let inputLabel;
         if (this.props.description) {
             inputLabel = <div className="mx_AddressPickerDialog_label">
-                <label htmlFor="textinput">{this.props.description}</label>
+                <label htmlFor="textinput">{ this.props.description }</label>
             </div>;
         }
 
         const query = [];
         // create the invite list
         if (this.state.selectedList.length > 0) {
-            const AddressTile = sdk.getComponent("elements.AddressTile");
             for (let i = 0; i < this.state.selectedList.length; i++) {
                 query.push(
                     <AddressTile
@@ -644,19 +657,19 @@ export default class AddressPickerDialog extends React.Component {
         query.push(
             <textarea
                 key={this.state.selectedList.length}
-                onPaste={this._onPaste}
-                rows="1"
+                onPaste={this.onPaste}
+                rows={1}
                 id="textinput"
-                ref={this._textinput}
+                ref={this.textinput}
                 className="mx_AddressPickerDialog_input"
                 onChange={this.onQueryChanged}
                 placeholder={this.getPlaceholder()}
                 defaultValue={this.props.value}
-                autoFocus={this.props.focus}>
-            </textarea>,
+                autoFocus={this.props.focus}
+            />,
         );
 
-        const filteredSuggestedList = this._getFilteredSuggestions();
+        const filteredSuggestedList = this.getFilteredSuggestions();
 
         let error;
         let addressSelector;
@@ -675,7 +688,7 @@ export default class AddressPickerDialog extends React.Component {
             error = <div className="mx_AddressPickerDialog_error">{ _t("No results") }</div>;
         } else {
             addressSelector = (
-                <AddressSelector ref={(ref) => {this.addressSelector = ref;}}
+                <AddressSelector ref={this.addressSelector}
                     addressList={filteredSuggestedList}
                     showAddress={this.props.pickerType === 'user'}
                     onSelected={this.onSelected}
@@ -686,11 +699,11 @@ export default class AddressPickerDialog extends React.Component {
 
         let identityServer;
         // If picker cannot currently accept e-mail but should be able to
-        if (this.props.pickerType === 'user' && !this.state.validAddressTypes.includes('email')
-            && this.props.validAddressTypes.includes('email')) {
+        if (this.props.pickerType === 'user' && !this.state.validAddressTypes.includes(AddressType.Email)
+            && this.props.validAddressTypes.includes(AddressType.Email)) {
             const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
             if (defaultIdentityServerUrl) {
-                identityServer = <div className="mx_AddressPickerDialog_identityServer">{_t(
+                identityServer = <div className="mx_AddressPickerDialog_identityServer">{ _t(
                     "Use an identity server to invite by email. " +
                     "<default>Use the default (%(defaultIdentityServerName)s)</default> " +
                     "or manage in <settings>Settings</settings>.",
@@ -698,25 +711,29 @@ export default class AddressPickerDialog extends React.Component {
                         defaultIdentityServerName: abbreviateUrl(defaultIdentityServerUrl),
                     },
                     {
-                        default: sub => <a href="#" onClick={this.onUseDefaultIdentityServerClick}>{sub}</a>,
-                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{sub}</a>,
+                        default: sub => <a href="#" onClick={this.onUseDefaultIdentityServerClick}>{ sub }</a>,
+                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{ sub }</a>,
                     },
-                )}</div>;
+                ) }</div>;
             } else {
-                identityServer = <div className="mx_AddressPickerDialog_identityServer">{_t(
+                identityServer = <div className="mx_AddressPickerDialog_identityServer">{ _t(
                     "Use an identity server to invite by email. " +
                     "Manage in <settings>Settings</settings>.",
                     {}, {
-                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{sub}</a>,
+                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{ sub }</a>,
                     },
-                )}</div>;
+                ) }</div>;
             }
         }
 
         return (
-            <BaseDialog className="mx_AddressPickerDialog" onKeyDown={this.onKeyDown}
-                onFinished={this.props.onFinished} title={this.props.title}>
-                {inputLabel}
+            <BaseDialog
+                className="mx_AddressPickerDialog"
+                onKeyDown={this.onKeyDown}
+                onFinished={this.props.onFinished}
+                title={this.props.title}
+            >
+                { inputLabel }
                 <div className="mx_Dialog_content">
                     <div className="mx_AddressPickerDialog_inputContainer">{ query }</div>
                     { error }
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.tsx
similarity index 62%
rename from src/components/views/dialogs/AskInviteAnywayDialog.js
rename to src/components/views/dialogs/AskInviteAnywayDialog.tsx
index e6cd45ba6b..3ae82f1026 100644
--- a/src/components/views/dialogs/AskInviteAnywayDialog.js
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.tsx
@@ -15,65 +15,66 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
-import {SettingLevel} from "../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+
+interface IProps {
+    unknownProfileUsers: Array<{
+        userId: string;
+        errorText: string;
+    }>;
+    onInviteAnyways: () => void;
+    onGiveUp: () => void;
+    onFinished: (success: boolean) => void;
+}
 
 @replaceableComponent("views.dialogs.AskInviteAnywayDialog")
-export default class AskInviteAnywayDialog extends React.Component {
-    static propTypes = {
-        unknownProfileUsers: PropTypes.array.isRequired, // [ {userId, errorText}... ]
-        onInviteAnyways: PropTypes.func.isRequired,
-        onGiveUp: PropTypes.func.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _onInviteClicked = () => {
+export default class AskInviteAnywayDialog extends React.Component<IProps> {
+    private onInviteClicked = (): void => {
         this.props.onInviteAnyways();
         this.props.onFinished(true);
     };
 
-    _onInviteNeverWarnClicked = () => {
+    private onInviteNeverWarnClicked = (): void => {
         SettingsStore.setValue("promptBeforeInviteUnknownUsers", null, SettingLevel.ACCOUNT, false);
         this.props.onInviteAnyways();
         this.props.onFinished(true);
     };
 
-    _onGiveUpClicked = () => {
+    private onGiveUpClicked = (): void => {
         this.props.onGiveUp();
         this.props.onFinished(false);
     };
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
+    public render() {
         const errorList = this.props.unknownProfileUsers
-            .map(address => <li key={address.userId}>{address.userId}: {address.errorText}</li>);
+            .map(address => <li key={address.userId}>{ address.userId }: { address.errorText }</li>);
 
         return (
             <BaseDialog className='mx_RetryInvitesDialog'
-                onFinished={this._onGiveUpClicked}
+                onFinished={this.onGiveUpClicked}
                 title={_t('The following users may not exist')}
                 contentId='mx_Dialog_content'
             >
                 <div id='mx_Dialog_content'>
-                    <p>{_t("Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?")}</p>
+                    <p>{ _t("Unable to find profiles for the Matrix IDs listed below - " +
+                        "would you like to invite them anyway?") }</p>
                     <ul>
                         { errorList }
                     </ul>
                 </div>
 
                 <div className="mx_Dialog_buttons">
-                    <button onClick={this._onGiveUpClicked}>
+                    <button onClick={this.onGiveUpClicked}>
                         { _t('Close') }
                     </button>
-                    <button onClick={this._onInviteNeverWarnClicked}>
+                    <button onClick={this.onInviteNeverWarnClicked}>
                         { _t('Invite anyway and never warn me again') }
                     </button>
-                    <button onClick={this._onInviteClicked} autoFocus={true}>
+                    <button onClick={this.onInviteClicked} autoFocus={true}>
                         { _t('Invite anyway') }
                     </button>
                 </div>
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.tsx
similarity index 57%
rename from src/components/views/dialogs/BaseDialog.js
rename to src/components/views/dialogs/BaseDialog.tsx
index 0858e53e50..0af494f53e 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.tsx
@@ -18,15 +18,54 @@ limitations under the License.
 
 import React from 'react';
 import FocusLock from 'react-focus-lock';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import { Key } from '../../../Keyboard';
-import AccessibleButton from '../elements/AccessibleButton';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {
+    // Whether the dialog should have a 'close' button that will
+    // cause the dialog to be cancelled. This should only be set
+    // to false if there is nothing the app can sensibly do if the
+    // dialog is cancelled, eg. "We can't restore your session and
+    // the app cannot work". Default: true.
+    hasCancel?: boolean;
+
+    // called when a key is pressed
+    onKeyDown?: (e: KeyboardEvent | React.KeyboardEvent) => void;
+
+    // CSS class to apply to dialog div
+    className?: string;
+
+    // if true, dialog container is 60% of the viewport width. Otherwise,
+    // the container will have no fixed size, allowing its contents to
+    // determine its size. Default: true.
+    fixedWidth?: boolean;
+
+    // Title for the dialog.
+    title?: JSX.Element | string;
+
+    // Path to an icon to put in the header
+    headerImage?: string;
+
+    // children should be the content of the dialog
+    children?: React.ReactNode;
+
+    // Id of content element
+    // If provided, this is used to add a aria-describedby attribute
+    contentId?: string;
+
+    // optional additional class for the title element (basically anything that can be passed to classnames)
+    titleClass?: string | string[];
+
+    headerButton?: JSX.Element;
+}
 
 /*
  * Basic container for modal dialogs.
@@ -35,54 +74,10 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
  * dialog on escape.
  */
 @replaceableComponent("views.dialogs.BaseDialog")
-export default class BaseDialog extends React.Component {
-    static propTypes = {
-        // onFinished callback to call when Escape is pressed
-        // Take a boolean which is true if the dialog was dismissed
-        // with a positive / confirm action or false if it was
-        // cancelled (BaseDialog itself only calls this with false).
-        onFinished: PropTypes.func.isRequired,
+export default class BaseDialog extends React.Component<IProps> {
+    private matrixClient: MatrixClient;
 
-        // Whether the dialog should have a 'close' button that will
-        // cause the dialog to be cancelled. This should only be set
-        // to false if there is nothing the app can sensibly do if the
-        // dialog is cancelled, eg. "We can't restore your session and
-        // the app cannot work". Default: true.
-        hasCancel: PropTypes.bool,
-
-        // called when a key is pressed
-        onKeyDown: PropTypes.func,
-
-        // CSS class to apply to dialog div
-        className: PropTypes.string,
-
-        // if true, dialog container is 60% of the viewport width. Otherwise,
-        // the container will have no fixed size, allowing its contents to
-        // determine its size. Default: true.
-        fixedWidth: PropTypes.bool,
-
-        // Title for the dialog.
-        title: PropTypes.node.isRequired,
-
-        // Path to an icon to put in the header
-        headerImage: PropTypes.string,
-
-        // children should be the content of the dialog
-        children: PropTypes.node,
-
-        // Id of content element
-        // If provided, this is used to add a aria-describedby attribute
-        contentId: PropTypes.string,
-
-        // optional additional class for the title element (basically anything that can be passed to classnames)
-        titleClass: PropTypes.oneOfType([
-            PropTypes.string,
-            PropTypes.object,
-            PropTypes.arrayOf(PropTypes.string),
-        ]),
-    };
-
-    static defaultProps = {
+    public static defaultProps = {
         hasCancel: true,
         fixedWidth: true,
     };
@@ -90,10 +85,10 @@ export default class BaseDialog extends React.Component {
     constructor(props) {
         super(props);
 
-        this._matrixClient = MatrixClientPeg.get();
+        this.matrixClient = MatrixClientPeg.get();
     }
 
-    _onKeyDown = (e) => {
+    private onKeyDown = (e: KeyboardEvent | React.KeyboardEvent): void => {
         if (this.props.onKeyDown) {
             this.props.onKeyDown(e);
         }
@@ -104,31 +99,29 @@ export default class BaseDialog extends React.Component {
         }
     };
 
-    _onCancelClick = (e) => {
+    private onCancelClick = (e: ButtonEvent): void => {
         this.props.onFinished(false);
     };
 
-    render() {
+    public render(): JSX.Element {
         let cancelButton;
         if (this.props.hasCancel) {
             cancelButton = (
-                <AccessibleButton onClick={this._onCancelClick} className="mx_Dialog_cancelButton" aria-label={_t("Close dialog")} />
+                <AccessibleButton onClick={this.onCancelClick} className="mx_Dialog_cancelButton" aria-label={_t("Close dialog")} />
             );
         }
 
         let headerImage;
         if (this.props.headerImage) {
-            headerImage = <img className="mx_Dialog_titleImage" src={this.props.headerImage}
-                alt=""
-            />;
+            headerImage = <img className="mx_Dialog_titleImage" src={this.props.headerImage} alt="" />;
         }
 
         return (
-            <MatrixClientContext.Provider value={this._matrixClient}>
+            <MatrixClientContext.Provider value={this.matrixClient}>
                 <FocusLock
                     returnFocus={true}
                     lockProps={{
-                        onKeyDown: this._onKeyDown,
+                        onKeyDown: this.onKeyDown,
                         role: "dialog",
                         ["aria-labelledby"]: "mx_BaseDialog_title",
                         // This should point to a node describing the dialog.
@@ -149,7 +142,7 @@ export default class BaseDialog extends React.Component {
                         'mx_Dialog_headerWithCancel': !!cancelButton,
                     })}>
                         <div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
-                            {headerImage}
+                            { headerImage }
                             { this.props.title }
                         </div>
                         { this.props.headerButton }
diff --git a/src/components/views/dialogs/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index 1ae50dd66f..c5fba52b51 100644
--- a/src/components/views/dialogs/BetaFeedbackDialog.tsx
+++ b/src/components/views/dialogs/BetaFeedbackDialog.tsx
@@ -14,93 +14,48 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState} from "react";
+import React from "react";
 
-import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
-import Field from "../elements/Field";
-import SdkConfig from "../../../SdkConfig";
-import {IDialogProps} from "./IDialogProps";
+import { IDialogProps } from "./IDialogProps";
 import SettingsStore from "../../../settings/SettingsStore";
-import {submitFeedback} from "../../../rageshake/submit-rageshake";
-import StyledCheckbox from "../elements/StyledCheckbox";
-import Modal from "../../../Modal";
-import InfoDialog from "./InfoDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
-import {USER_LABS_TAB} from "./UserSettingsDialog";
+import { Action } from "../../../dispatcher/actions";
+import { UserTab } from "./UserSettingsDialog";
+import GenericFeatureFeedbackDialog from "./GenericFeatureFeedbackDialog";
+
+// XXX: Keep this around for re-use in future Betas
 
 interface IProps extends IDialogProps {
     featureId: string;
 }
 
-const BetaFeedbackDialog: React.FC<IProps> = ({featureId, onFinished}) => {
+const BetaFeedbackDialog: React.FC<IProps> = ({ featureId, onFinished }) => {
     const info = SettingsStore.getBetaInfo(featureId);
 
-    const [comment, setComment] = useState("");
-    const [canContact, setCanContact] = useState(false);
-
-    const sendFeedback = async (ok: boolean) => {
-        if (!ok) return onFinished(false);
-
-        submitFeedback(SdkConfig.get().bug_report_endpoint_url, info.feedbackLabel, comment, canContact);
-        onFinished(true);
-
-        Modal.createTrackedDialog("Beta Dialog Sent", featureId, InfoDialog, {
-            title: _t("Beta feedback"),
-            description: _t("Thank you for your feedback, we really appreciate it."),
-            button: _t("Done"),
-            hasCloseButton: false,
-            fixedWidth: false,
-        });
-    };
-
-    return (<QuestionDialog
-        className="mx_BetaFeedbackDialog"
-        hasCancelButton={true}
+    return <GenericFeatureFeedbackDialog
         title={_t("%(featureName)s beta feedback", { featureName: info.title })}
-        description={<React.Fragment>
-            <div className="mx_BetaFeedbackDialog_subheading">
-                { _t(info.feedbackSubheading) }
-                &nbsp;
-                { _t("Your platform and username will be noted to help us use your feedback as much as we can.")}
-
-                <AccessibleButton kind="link" onClick={() => {
-                    onFinished(false);
-                    defaultDispatcher.dispatch({
-                        action: Action.ViewUserSettings,
-                        initialTabId: USER_LABS_TAB,
-                    });
-                }}>
-                    { _t("To leave the beta, visit your settings.") }
-                </AccessibleButton>
-            </div>
-
-            <Field
-                id="feedbackComment"
-                label={_t("Feedback")}
-                type="text"
-                autoComplete="off"
-                value={comment}
-                element="textarea"
-                onChange={(ev) => {
-                    setComment(ev.target.value);
-                }}
-                autoFocus={true}
-            />
-
-            <StyledCheckbox
-                checked={canContact}
-                onClick={e => setCanContact((e.target as HTMLInputElement).checked)}
-            >
-                { _t("You may contact me if you have any follow up questions") }
-            </StyledCheckbox>
-        </React.Fragment>}
-        button={_t("Send feedback")}
-        buttonDisabled={!comment}
-        onFinished={sendFeedback}
-    />);
+        subheading={_t(info.feedbackSubheading)}
+        onFinished={onFinished}
+        rageshakeLabel={info.feedbackLabel}
+        rageshakeData={Object.fromEntries((SettingsStore.getBetaInfo(featureId)?.extraSettings || []).map(k => {
+            return SettingsStore.getValue(k);
+        }))}
+    >
+        <AccessibleButton
+            kind="link"
+            onClick={() => {
+                onFinished(false);
+                defaultDispatcher.dispatch({
+                    action: Action.ViewUserSettings,
+                    initialTabId: UserTab.Labs,
+                });
+            }}
+        >
+            { _t("To leave the beta, visit your settings.") }
+        </AccessibleButton>
+    </GenericFeatureFeedbackDialog>;
 };
 
 export default BetaFeedbackDialog;
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.tsx
similarity index 67%
rename from src/components/views/dialogs/BugReportDialog.js
rename to src/components/views/dialogs/BugReportDialog.tsx
index cbe0130649..38566cdf04 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.tsx
@@ -18,17 +18,41 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import sendBugReport, {downloadBugReport} from '../../../rageshake/submit-rageshake';
+import sendBugReport, { downloadBugReport } from '../../../rageshake/submit-rageshake';
 import AccessibleButton from "../elements/AccessibleButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import QuestionDialog from "./QuestionDialog";
+import BaseDialog from "./BaseDialog";
+import Field from '../elements/Field';
+import Spinner from "../elements/Spinner";
+import DialogButtons from "../elements/DialogButtons";
+import { sendSentryReport } from "../../../sentry";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+    initialText?: string;
+    label?: string;
+    error?: Error;
+}
+
+interface IState {
+    sendLogs: boolean;
+    busy: boolean;
+    err: string;
+    issueUrl: string;
+    text: string;
+    progress: string;
+    downloadBusy: boolean;
+    downloadProgress: string;
+}
 
 @replaceableComponent("views.dialogs.BugReportDialog")
-export default class BugReportDialog extends React.Component {
+export default class BugReportDialog extends React.Component<IProps, IState> {
+    private unmounted: boolean;
+
     constructor(props) {
         super(props);
         this.state = {
@@ -41,25 +65,18 @@ export default class BugReportDialog extends React.Component {
             downloadBusy: false,
             downloadProgress: null,
         };
-        this._unmounted = false;
-        this._onSubmit = this._onSubmit.bind(this);
-        this._onCancel = this._onCancel.bind(this);
-        this._onTextChange = this._onTextChange.bind(this);
-        this._onIssueUrlChange = this._onIssueUrlChange.bind(this);
-        this._onSendLogsChange = this._onSendLogsChange.bind(this);
-        this._sendProgressCallback = this._sendProgressCallback.bind(this);
-        this._downloadProgressCallback = this._downloadProgressCallback.bind(this);
+        this.unmounted = false;
     }
 
-    componentWillUnmount() {
-        this._unmounted = true;
+    public componentWillUnmount() {
+        this.unmounted = true;
     }
 
-    _onCancel(ev) {
+    private onCancel = (): void => {
         this.props.onFinished(false);
-    }
+    };
 
-    _onSubmit(ev) {
+    private onSubmit = (): void => {
         if ((!this.state.text || !this.state.text.trim()) && (!this.state.issueUrl || !this.state.issueUrl.trim())) {
             this.setState({
                 err: _t("Please tell us what went wrong or, better, create a GitHub issue that describes the problem."),
@@ -72,17 +89,16 @@ export default class BugReportDialog extends React.Component {
             (this.state.issueUrl.length > 0 ? this.state.issueUrl : 'No issue link given');
 
         this.setState({ busy: true, progress: null, err: null });
-        this._sendProgressCallback(_t("Preparing to send logs"));
+        this.sendProgressCallback(_t("Preparing to send logs"));
 
         sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
             userText,
             sendLogs: true,
-            progressCallback: this._sendProgressCallback,
+            progressCallback: this.sendProgressCallback,
             label: this.props.label,
         }).then(() => {
-            if (!this._unmounted) {
+            if (!this.unmounted) {
                 this.props.onFinished(false);
-                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 // N.B. first param is passed to piwik and so doesn't want i18n
                 Modal.createTrackedDialog('Bug report sent', '', QuestionDialog, {
                     title: _t('Logs sent'),
@@ -91,7 +107,7 @@ export default class BugReportDialog extends React.Component {
                 });
             }
         }, (err) => {
-            if (!this._unmounted) {
+            if (!this.unmounted) {
                 this.setState({
                     busy: false,
                     progress: null,
@@ -99,16 +115,18 @@ export default class BugReportDialog extends React.Component {
                 });
             }
         });
-    }
 
-    _onDownload = async (ev) => {
+        sendSentryReport(this.state.text, this.state.issueUrl, this.props.error);
+    };
+
+    private onDownload = async (): Promise<void> => {
         this.setState({ downloadBusy: true });
-        this._downloadProgressCallback(_t("Preparing to download logs"));
+        this.downloadProgressCallback(_t("Preparing to download logs"));
 
         try {
             await downloadBugReport({
                 sendLogs: true,
-                progressCallback: this._downloadProgressCallback,
+                progressCallback: this.downloadProgressCallback,
                 label: this.props.label,
             });
 
@@ -117,7 +135,7 @@ export default class BugReportDialog extends React.Component {
                 downloadProgress: null,
             });
         } catch (err) {
-            if (!this._unmounted) {
+            if (!this.unmounted) {
                 this.setState({
                     downloadBusy: false,
                     downloadProgress: _t("Failed to send logs: ") + `${err.message}`,
@@ -126,42 +144,33 @@ export default class BugReportDialog extends React.Component {
         }
     };
 
-    _onTextChange(ev) {
-        this.setState({ text: ev.target.value });
-    }
+    private onTextChange = (ev: React.FormEvent<HTMLTextAreaElement>): void => {
+        this.setState({ text: ev.currentTarget.value });
+    };
 
-    _onIssueUrlChange(ev) {
-        this.setState({ issueUrl: ev.target.value });
-    }
+    private onIssueUrlChange = (ev: React.FormEvent<HTMLInputElement>): void => {
+        this.setState({ issueUrl: ev.currentTarget.value });
+    };
 
-    _onSendLogsChange(ev) {
-        this.setState({ sendLogs: ev.target.checked });
-    }
-
-    _sendProgressCallback(progress) {
-        if (this._unmounted) {
+    private sendProgressCallback = (progress: string): void => {
+        if (this.unmounted) {
             return;
         }
-        this.setState({progress: progress});
-    }
+        this.setState({ progress });
+    };
 
-    _downloadProgressCallback(downloadProgress) {
-        if (this._unmounted) {
+    private downloadProgressCallback = (downloadProgress: string): void => {
+        if (this.unmounted) {
             return;
         }
         this.setState({ downloadProgress });
-    }
-
-    render() {
-        const Loader = sdk.getComponent("elements.Spinner");
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const Field = sdk.getComponent('elements.Field');
+    };
 
+    public render() {
         let error = null;
         if (this.state.err) {
             error = <div className="error">
-                {this.state.err}
+                { this.state.err }
             </div>;
         }
 
@@ -169,8 +178,8 @@ export default class BugReportDialog extends React.Component {
         if (this.state.busy) {
             progress = (
                 <div className="progress">
-                    <Loader />
-                    {this.state.progress} ...
+                    <Spinner />
+                    { this.state.progress } ...
                 </div>
             );
         }
@@ -183,7 +192,9 @@ export default class BugReportDialog extends React.Component {
         }
 
         return (
-            <BaseDialog className="mx_BugReportDialog" onFinished={this._onCancel}
+            <BaseDialog
+                className="mx_BugReportDialog"
+                onFinished={this.onCancel}
                 title={_t('Submit debug logs')}
                 contentId='mx_Dialog_content'
             >
@@ -193,8 +204,8 @@ export default class BugReportDialog extends React.Component {
                         { _t(
                             "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.",
+                            "have visited, which UI elements you last interacted with, " +
+                            "and the usernames of other users. They do not contain messages.",
                         ) }
                     </p>
                     <p><b>
@@ -204,7 +215,7 @@ export default class BugReportDialog extends React.Component {
                             {
                                 a: (sub) => <a
                                     target="_blank"
-                                    href="https://github.com/vector-im/element-web/issues/new"
+                                    href="https://github.com/vector-im/element-web/issues/new/choose"
                                 >
                                     { sub }
                                 </a>,
@@ -213,17 +224,17 @@ export default class BugReportDialog extends React.Component {
                     </b></p>
 
                     <div className="mx_BugReportDialog_download">
-                        <AccessibleButton onClick={this._onDownload} kind="link" disabled={this.state.downloadBusy}>
+                        <AccessibleButton onClick={this.onDownload} kind="link" disabled={this.state.downloadBusy}>
                             { _t("Download logs") }
                         </AccessibleButton>
-                        {this.state.downloadProgress && <span>{this.state.downloadProgress} ...</span>}
+                        { this.state.downloadProgress && <span>{ this.state.downloadProgress } ...</span> }
                     </div>
 
                     <Field
                         type="text"
                         className="mx_BugReportDialog_field_input"
                         label={_t("GitHub issue")}
-                        onChange={this._onIssueUrlChange}
+                        onChange={this.onIssueUrlChange}
                         value={this.state.issueUrl}
                         placeholder="https://github.com/vector-im/element-web/issues/..."
                     />
@@ -232,7 +243,7 @@ export default class BugReportDialog extends React.Component {
                         element="textarea"
                         label={_t("Notes")}
                         rows={5}
-                        onChange={this._onTextChange}
+                        onChange={this.onTextChange}
                         value={this.state.text}
                         placeholder={_t(
                             "If there is additional context that would help in " +
@@ -241,21 +252,16 @@ export default class BugReportDialog extends React.Component {
                             "please include those things here.",
                         )}
                     />
-                    {progress}
-                    {error}
+                    { progress }
+                    { error }
                 </div>
                 <DialogButtons primaryButton={_t("Send logs")}
-                    onPrimaryButtonClick={this._onSubmit}
+                    onPrimaryButtonClick={this.onSubmit}
                     focus={true}
-                    onCancel={this._onCancel}
+                    onCancel={this.onCancel}
                     disabled={this.state.busy}
                 />
             </BaseDialog>
         );
     }
 }
-
-BugReportDialog.propTypes = {
-    onFinished: PropTypes.func.isRequired,
-    initialText: PropTypes.string,
-};
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.tsx
similarity index 75%
rename from src/components/views/dialogs/ChangelogDialog.js
rename to src/components/views/dialogs/ChangelogDialog.tsx
index efbeba3977..de9e454401 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.tsx
@@ -16,21 +16,27 @@ Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import request from 'browser-request';
 import { _t } from '../../../languageHandler';
+import QuestionDialog from "./QuestionDialog";
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+    newVersion: string;
+    version: string;
+    onFinished: (success: boolean) => void;
+}
 
 const REPOS = ['vector-im/element-web', 'matrix-org/matrix-react-sdk', 'matrix-org/matrix-js-sdk'];
 
-export default class ChangelogDialog extends React.Component {
+export default class ChangelogDialog extends React.Component<IProps> {
     constructor(props) {
         super(props);
 
         this.state = {};
     }
 
-    componentDidMount() {
+    public componentDidMount() {
         const version = this.props.newVersion.split('-');
         const version2 = this.props.version.split('-');
         if (version == null || version2 == null) return;
@@ -44,25 +50,22 @@ export default class ChangelogDialog extends React.Component {
                     this.setState({ [REPOS[i]]: response.statusText });
                     return;
                 }
-                this.setState({[REPOS[i]]: JSON.parse(body).commits});
+                this.setState({ [REPOS[i]]: JSON.parse(body).commits });
             });
         }
     }
 
-    _elementsForCommit(commit) {
+    private elementsForCommit(commit): JSX.Element {
         return (
             <li key={commit.sha} className="mx_ChangelogDialog_li">
                 <a href={commit.html_url} target="_blank" rel="noreferrer noopener">
-                    {commit.commit.message.split('\n')[0]}
+                    { commit.commit.message.split('\n')[0] }
                 </a>
             </li>
         );
     }
 
-    render() {
-        const Spinner = sdk.getComponent('views.elements.Spinner');
-        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
-
+    public render() {
         const logs = REPOS.map(repo => {
             let content;
             if (this.state[repo] == null) {
@@ -72,23 +75,22 @@ export default class ChangelogDialog extends React.Component {
                     msg: this.state[repo],
                 });
             } else {
-                content = this.state[repo].map(this._elementsForCommit);
+                content = this.state[repo].map(this.elementsForCommit);
             }
             return (
                 <div key={repo}>
-                    <h2>{repo}</h2>
-                    <ul>{content}</ul>
+                    <h2>{ repo }</h2>
+                    <ul>{ content }</ul>
                 </div>
             );
         });
 
         const content = (
             <div className="mx_ChangelogDialog_content">
-                {this.props.version == null || this.props.newVersion == null ? <h2>{_t("Unavailable")}</h2> : logs}
+                { this.props.version == null || this.props.newVersion == null ? <h2>{ _t("Unavailable") }</h2> : logs }
             </div>
         );
 
-
         return (
             <QuestionDialog
                 title={_t("Changelog")}
@@ -99,9 +101,3 @@ export default class ChangelogDialog extends React.Component {
         );
     }
 }
-
-ChangelogDialog.propTypes = {
-    version: PropTypes.string.isRequired,
-    newVersion: PropTypes.string.isRequired,
-    onFinished: PropTypes.func.isRequired,
-};
diff --git a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx b/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
index 2635f95bb7..6a8773ce45 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 {inviteMultipleToRoom, showAnyInviteErrors} from "../../../RoomInvite";
+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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 interface IProps extends IDialogProps {
     roomId: string;
@@ -86,7 +86,7 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
         ev.preventDefault();
         ev.stopPropagation();
 
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             const targets = [...this.state.emailTargets, ...this.state.userTargets];
             const result = await inviteMultipleToRoom(this.props.roomId, targets);
@@ -95,10 +95,10 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
             if (success) {
                 this.props.onFinished(true);
             } else {
-                this.setState({busy: false});
+                this.setState({ busy: false });
             }
         } catch (e) {
-            this.setState({busy: false});
+            this.setState({ busy: false });
             console.error(e);
             Modal.createTrackedDialog('Failed to invite', '', ErrorDialog, {
                 title: _t("Failed to invite"),
@@ -114,7 +114,7 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
         } else {
             targets[index] = ev.target.value;
         }
-        this.setState({emailTargets: targets});
+        this.setState({ emailTargets: targets });
     };
 
     private onAddressBlur = (index: number) => {
@@ -122,12 +122,12 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
         if (index >= targets.length) return; // not important
         if (targets[index].trim() === "") {
             targets.splice(index, 1);
-            this.setState({emailTargets: targets});
+            this.setState({ emailTargets: targets });
         }
     };
 
     private onShowPeopleClick = () => {
-        this.setState({showPeople: !this.state.showPeople});
+        this.setState({ showPeople: !this.state.showPeople });
     };
 
     private setPersonToggle = (person: IPerson, selected: boolean) => {
@@ -137,7 +137,7 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
         } else if (!selected && targets.includes(person.userId)) {
             targets.splice(targets.indexOf(person.userId), 1);
         }
-        this.setState({userTargets: targets});
+        this.setState({ userTargets: targets });
     };
 
     private renderPerson(person: IPerson, key: any) {
@@ -156,8 +156,8 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
                     height={avatarSize}
                 />
                 <div className="mx_CommunityPrototypeInviteDialog_personIdentifiers">
-                    <span className="mx_CommunityPrototypeInviteDialog_personName">{person.user.name}</span>
-                    <span className="mx_CommunityPrototypeInviteDialog_personId">{person.userId}</span>
+                    <span className="mx_CommunityPrototypeInviteDialog_personName">{ person.user.name }</span>
+                    <span className="mx_CommunityPrototypeInviteDialog_personId">{ person.userId }</span>
                 </div>
                 <StyledCheckbox onChange={(e) => this.setPersonToggle(person, e.target.checked)} />
             </div>
@@ -165,7 +165,7 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
     }
 
     private onShowMorePeople = () => {
-        this.setState({numPeople: this.state.numPeople + 5}); // arbitrary increase
+        this.setState({ numPeople: this.state.numPeople + 5 }); // arbitrary increase
     };
 
     public render() {
@@ -187,7 +187,7 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
         emailAddresses.push((
             <Field
                 key={emailAddresses.length}
-                value={""}
+                value=""
                 onChange={(e) => this.onAddressChange(e, emailAddresses.length)}
                 label={emailAddresses.length > 0 ? _t("Add another email") : _t("Email address")}
                 placeholder={emailAddresses.length > 0 ? _t("Add another email") : _t("Email address")}
@@ -205,18 +205,21 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
                 people.push((
                     <AccessibleButton
                         onClick={this.onShowMorePeople}
-                        kind="link" key="more"
+                        kind="link"
+                        key="more"
                         className="mx_CommunityPrototypeInviteDialog_morePeople"
-                    >{_t("Show more")}</AccessibleButton>
+                    >
+                        { _t("Show more") }
+                    </AccessibleButton>
                 ));
             }
         }
         if (this.state.people.length > 0) {
             peopleIntro = (
                 <div className="mx_CommunityPrototypeInviteDialog_people">
-                    <span>{_t("People you know on %(brand)s", {brand: SdkConfig.get().brand})}</span>
+                    <span>{ _t("People you know on %(brand)s", { brand: SdkConfig.get().brand }) }</span>
                     <AccessibleButton onClick={this.onShowPeopleClick}>
-                        {this.state.showPeople ? _t("Hide") : _t("Show")}
+                        { this.state.showPeople ? _t("Hide") : _t("Show") }
                     </AccessibleButton>
                 </div>
             );
@@ -225,25 +228,28 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
         let buttonText = _t("Skip");
         const targetCount = this.state.userTargets.length + this.state.emailTargets.length;
         if (targetCount > 0) {
-            buttonText = _t("Send %(count)s invites", {count: targetCount});
+            buttonText = _t("Send %(count)s invites", { count: targetCount });
         }
 
         return (
             <BaseDialog
                 className="mx_CommunityPrototypeInviteDialog"
                 onFinished={this.props.onFinished}
-                title={_t("Invite people to join %(communityName)s", {communityName: this.props.communityName})}
+                title={_t("Invite people to join %(communityName)s", { communityName: this.props.communityName })}
             >
                 <form onSubmit={this.onSubmit}>
                     <div className="mx_Dialog_content">
-                        {emailAddresses}
-                        {peopleIntro}
-                        {people}
+                        { emailAddresses }
+                        { peopleIntro }
+                        { people }
                         <AccessibleButton
-                            kind="primary" onClick={this.onSubmit}
+                            kind="primary"
+                            onClick={this.onSubmit}
                             disabled={this.state.busy}
                             className="mx_CommunityPrototypeInviteDialog_primaryButton"
-                        >{buttonText}</AccessibleButton>
+                        >
+                            { buttonText }
+                        </AccessibleButton>
                     </div>
                 </form>
             </BaseDialog>
diff --git a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx
similarity index 79%
rename from src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
rename to src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx
index 37d5510756..d21fde329c 100644
--- a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx
@@ -15,9 +15,22 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import ConfirmRedactDialog from './ConfirmRedactDialog';
+import ErrorDialog from './ErrorDialog';
+import BaseDialog from "./BaseDialog";
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+    redact: () => Promise<void>;
+    onFinished: (success: boolean) => void;
+}
+
+interface IState {
+    isRedacting: boolean;
+    redactionErrorCode: string | number;
+}
 
 /*
  * A dialog for confirming a redaction.
@@ -32,7 +45,7 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
  * 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 {
+export default class ConfirmAndWaitRedactDialog extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);
         this.state = {
@@ -41,16 +54,16 @@ export default class ConfirmAndWaitRedactDialog extends React.PureComponent {
         };
     }
 
-    onParentFinished = async (proceed) => {
+    public onParentFinished = async (proceed: boolean): Promise<void> => {
         if (proceed) {
-            this.setState({isRedacting: true});
+            this.setState({ isRedacting: true });
             try {
                 await this.props.redact();
                 this.props.onFinished(true);
             } catch (error) {
                 const code = error.errcode || error.statusCode;
                 if (typeof code !== "undefined") {
-                    this.setState({redactionErrorCode: code});
+                    this.setState({ redactionErrorCode: code });
                 } else {
                     this.props.onFinished(true);
                 }
@@ -60,21 +73,18 @@ export default class ConfirmAndWaitRedactDialog extends React.PureComponent {
         }
     };
 
-    render() {
+    public render() {
         if (this.state.isRedacting) {
             if (this.state.redactionErrorCode) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 const code = this.state.redactionErrorCode;
                 return (
                     <ErrorDialog
                         onFinished={this.props.onFinished}
                         title={_t('Error')}
-                        description={_t('You cannot delete this message. (%(code)s)', {code})}
+                        description={_t('You cannot delete this message. (%(code)s)', { code })}
                     />
                 );
             } else {
-                const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
-                const Spinner = sdk.getComponent('elements.Spinner');
                 return (
                     <BaseDialog
                         onFinished={this.props.onFinished}
@@ -85,7 +95,6 @@ export default class ConfirmAndWaitRedactDialog extends React.PureComponent {
                 );
             }
         } else {
-            const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
             return <ConfirmRedactDialog onFinished={this.onParentFinished} />;
         }
     }
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.js b/src/components/views/dialogs/ConfirmRedactDialog.js
deleted file mode 100644
index bd63d3acc1..0000000000
--- a/src/components/views/dialogs/ConfirmRedactDialog.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import 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');
-        return (
-            <TextInputDialog onFinished={this.props.onFinished}
-                title={_t("Confirm Removal")}
-                description={
-                    _t("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.")}
-                placeholder={_t("Reason (optional)")}
-                focus
-                button={_t("Remove")}>
-            </TextInputDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.tsx b/src/components/views/dialogs/ConfirmRedactDialog.tsx
new file mode 100644
index 0000000000..74b3320fdf
--- /dev/null
+++ b/src/components/views/dialogs/ConfirmRedactDialog.tsx
@@ -0,0 +1,85 @@
+/*
+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 { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import React from 'react';
+import { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import Modal from '../../../Modal';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import ErrorDialog from './ErrorDialog';
+import TextInputDialog from "./TextInputDialog";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
+
+/*
+ * A dialog for confirming a redaction.
+ */
+@replaceableComponent("views.dialogs.ConfirmRedactDialog")
+export default class ConfirmRedactDialog extends React.Component<IProps> {
+    render() {
+        return (
+            <TextInputDialog onFinished={this.props.onFinished}
+                title={_t("Confirm Removal")}
+                description={
+                    _t("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.")}
+                placeholder={_t("Reason (optional)")}
+                focus
+                button={_t("Remove")}
+            />
+        );
+    }
+}
+
+export function createRedactEventDialog({
+    mxEvent,
+    onCloseDialog = () => {},
+}: {
+    mxEvent: MatrixEvent;
+    onCloseDialog?: () => void;
+}) {
+    Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, {
+        onFinished: async (proceed: boolean, reason?: string) => {
+            if (!proceed) return;
+
+            const cli = MatrixClientPeg.get();
+            try {
+                onCloseDialog?.();
+                await cli.redactEvent(
+                    mxEvent.getRoomId(),
+                    mxEvent.getId(),
+                    undefined,
+                    reason ? { reason } : {},
+                );
+            } catch (e) {
+                const code = e.errcode || e.statusCode;
+                // only show the dialog if failing for something other than a network error
+                // (e.g. no errcode or statusCode) as in that case the redactions end up in the
+                // detached queue and we show the room status bar to allow retry
+                if (typeof code !== "undefined") {
+                    // display error message stating you couldn't delete this.
+                    Modal.createTrackedDialog('You cannot delete this message', '', ErrorDialog, {
+                        title: _t('Error'),
+                        description: _t('You cannot delete this message. (%(code)s)', { code }),
+                    });
+                }
+            }
+        },
+    }, 'mx_Dialog_confirmredact');
+}
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.tsx
similarity index 66%
rename from src/components/views/dialogs/ConfirmUserActionDialog.js
rename to src/components/views/dialogs/ConfirmUserActionDialog.tsx
index 8059b9172a..7099556ac6 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.tsx
@@ -15,13 +15,34 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
-import * as sdk from '../../../index';
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import MemberAvatar from '../avatars/MemberAvatar';
+import BaseAvatar from '../avatars/BaseAvatar';
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps {
+    // matrix-js-sdk (room) member object. Supply either this or 'groupMember'
+    member: RoomMember;
+    // group member object. Supply either this or 'member'
+    groupMember: GroupMemberType;
+    // needed if a group member is specified
+    matrixClient?: MatrixClient;
+    action: string; // eg. 'Ban'
+    title: string; // eg. 'Ban this user?'
+
+    // Whether to display a text field for a reason
+    // If true, the second argument to onFinished will
+    // be the string entered.
+    askReason?: boolean;
+    danger?: boolean;
+    onFinished: (success: boolean, reason?: string) => void;
+}
 
 /*
  * A dialog for confirming an operation on another user.
@@ -32,58 +53,23 @@ import {mediaFromMxc} from "../../../customisations/Media";
  * 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'
-        member: PropTypes.object,
-        // group member object. Supply either this or 'member'
-        groupMember: GroupMemberType,
-        // needed if a group member is specified
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-        action: PropTypes.string.isRequired, // eg. 'Ban'
-        title: PropTypes.string.isRequired, // eg. 'Ban this user?'
-
-        // Whether to display a text field for a reason
-        // If true, the second argument to onFinished will
-        // be the string entered.
-        askReason: PropTypes.bool,
-        danger: PropTypes.bool,
-        onFinished: PropTypes.func.isRequired,
-    };
+export default class ConfirmUserActionDialog extends React.Component<IProps> {
+    private reasonField: React.RefObject<HTMLInputElement> = React.createRef();
 
     static defaultProps = {
         danger: false,
         askReason: false,
     };
 
-    constructor(props) {
-        super(props);
-
-        this._reasonField = null;
-    }
-
-    onOk = () => {
-        let reason;
-        if (this._reasonField) {
-            reason = this._reasonField.value;
-        }
-        this.props.onFinished(true, reason);
+    public onOk = (): void => {
+        this.props.onFinished(true, this.reasonField.current?.value);
     };
 
-    onCancel = () => {
+    public onCancel = (): void => {
         this.props.onFinished(false);
     };
 
-    _collectReasonField = e => {
-        this._reasonField = e;
-    };
-
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
-        const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
-
+    public render() {
         const confirmButtonClass = this.props.danger ? 'danger' : '';
 
         let reasonBox;
@@ -92,7 +78,7 @@ export default class ConfirmUserActionDialog extends React.Component {
                 <div>
                     <form onSubmit={this.onOk}>
                         <input className="mx_ConfirmUserActionDialog_reasonField"
-                            ref={this._collectReasonField}
+                            ref={this.reasonField}
                             placeholder={_t("Reason")}
                             autoFocus={true}
                         />
@@ -118,7 +104,9 @@ export default class ConfirmUserActionDialog extends React.Component {
         }
 
         return (
-            <BaseDialog className="mx_ConfirmUserActionDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_ConfirmUserActionDialog"
+                onFinished={this.props.onFinished}
                 title={this.props.title}
                 contentId='mx_Dialog_content'
             >
diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js b/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
similarity index 72%
rename from src/components/views/dialogs/ConfirmWipeDeviceDialog.js
rename to src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
index 333e1522f1..2577d5456d 100644
--- a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
+++ b/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
@@ -15,29 +15,26 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
-import * as sdk from "../../../index";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
 
 @replaceableComponent("views.dialogs.ConfirmWipeDeviceDialog")
-export default class ConfirmWipeDeviceDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _onConfirm = () => {
+export default class ConfirmWipeDeviceDialog extends React.Component<IProps> {
+    private onConfirm = (): void => {
         this.props.onFinished(true);
     };
 
-    _onDecline = () => {
+    private onDecline = (): void => {
         this.props.onFinished(false);
     };
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
         return (
             <BaseDialog
                 className='mx_ConfirmWipeDeviceDialog'
@@ -47,18 +44,18 @@ export default class ConfirmWipeDeviceDialog extends React.Component {
             >
                 <div className='mx_ConfirmWipeDeviceDialog_content'>
                     <p>
-                        {_t(
+                        { _t(
                             "Clearing all data from this session is permanent. Encrypted messages will be lost " +
                             "unless their keys have been backed up.",
-                        )}
+                        ) }
                     </p>
                 </div>
                 <DialogButtons
                     primaryButton={_t("Clear all data")}
-                    onPrimaryButtonClick={this._onConfirm}
+                    onPrimaryButtonClick={this.onConfirm}
                     primaryButtonClass="danger"
                     cancelButton={_t("Cancel")}
-                    onCancel={this._onDecline}
+                    onCancel={this.onDecline}
                 />
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx b/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
index 9b4484d661..ccac45fbcc 100644
--- a/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
+++ b/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
@@ -23,9 +23,9 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import InfoTooltip from "../elements/InfoTooltip";
 import dis from "../../../dispatcher/dispatcher";
-import {showCommunityRoomInviteDialog} from "../../../RoomInvite";
+import { showCommunityRoomInviteDialog } from "../../../RoomInvite";
 import GroupStore from "../../../stores/GroupStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
 }
@@ -58,7 +58,7 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
 
     private onNameChange = (ev: ChangeEvent<HTMLInputElement>) => {
         const localpart = (ev.target.value || "").toLowerCase().replace(/[^a-z0-9.\-_]/g, '-');
-        this.setState({name: ev.target.value, localpart});
+        this.setState({ name: ev.target.value, localpart });
     };
 
     private onSubmit = async (ev) => {
@@ -69,7 +69,7 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
 
         // We'll create the community now to see if it's taken, leaving it active in
         // the background for the user to look at while they invite people.
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             let avatarUrl = ''; // must be a string for synapse to accept it
             if (this.state.avatarFile) {
@@ -85,7 +85,7 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
             });
 
             // Ensure the tag gets selected now that we've created it
-            dis.dispatch({action: 'deselect_tags'}, true);
+            dis.dispatch({ action: 'deselect_tags' }, true);
             dis.dispatch({
                 action: 'select_tag',
                 tag: result.group_id,
@@ -123,13 +123,13 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
 
     private onAvatarChanged = (e: ChangeEvent<HTMLInputElement>) => {
         if (!e.target.files || !e.target.files.length) {
-            this.setState({avatarFile: null});
+            this.setState({ avatarFile: null });
         } else {
-            this.setState({busy: true});
+            this.setState({ busy: true });
             const file = e.target.files[0];
             const reader = new FileReader();
             reader.onload = (ev: ProgressEvent<FileReader>) => {
-                this.setState({avatarFile: file, busy: false, avatarPreview: ev.target.result as string});
+                this.setState({ avatarFile: file, busy: false, avatarPreview: ev.target.result as string });
             };
             reader.readAsDataURL(file);
         }
@@ -144,11 +144,11 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
         if (this.state.localpart) {
             communityId = (
                 <span className="mx_CreateCommunityPrototypeDialog_communityId">
-                    {_t("Community ID: +<localpart />:%(domain)s", {
+                    { _t("Community ID: +<localpart />:%(domain)s", {
                         domain: MatrixClientPeg.getHomeserverName(),
                     }, {
-                        localpart: () => <u>{this.state.localpart}</u>,
-                    })}
+                        localpart: () => <u>{ this.state.localpart }</u>,
+                    }) }
                     <InfoTooltip
                         tooltip={_t(
                             "Use this when referencing your community to others. The community ID " +
@@ -161,21 +161,21 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
 
         let helpText = (
             <span className="mx_CreateCommunityPrototypeDialog_subtext">
-                {_t("You can change this later if needed.")}
+                { _t("You can change this later if needed.") }
             </span>
         );
         if (this.state.error) {
             const classes = "mx_CreateCommunityPrototypeDialog_subtext mx_CreateCommunityPrototypeDialog_subtext_error";
             helpText = (
                 <span className={classes}>
-                    {this.state.error}
+                    { this.state.error }
                 </span>
             );
         }
 
         let preview = <img src={this.state.avatarPreview} className="mx_CreateCommunityPrototypeDialog_avatar" />;
         if (!this.state.avatarPreview) {
-            preview = <div className="mx_CreateCommunityPrototypeDialog_placeholderAvatar" />
+            preview = <div className="mx_CreateCommunityPrototypeDialog_placeholderAvatar" />;
         }
 
         return (
@@ -193,31 +193,33 @@ export default class CreateCommunityPrototypeDialog extends React.PureComponent<
                                 placeholder={_t("Enter name")}
                                 label={_t("Enter name")}
                             />
-                            {helpText}
+                            { helpText }
                             <span className="mx_CreateCommunityPrototypeDialog_subtext">
-                                {/*nbsp is to reserve the height of this element when there's nothing*/}
-                                &nbsp;{communityId}
+                                { /*nbsp is to reserve the height of this element when there's nothing*/ }
+                                &nbsp;{ communityId }
                             </span>
                             <AccessibleButton kind="primary" onClick={this.onSubmit} disabled={this.state.busy}>
-                                {_t("Create")}
+                                { _t("Create") }
                             </AccessibleButton>
                         </div>
                         <div className="mx_CreateCommunityPrototypeDialog_colAvatar">
                             <input
-                                type="file" style={{display: "none"}}
-                                ref={this.avatarUploadRef} accept="image/*"
+                                type="file"
+                                style={{ display: "none" }}
+                                ref={this.avatarUploadRef}
+                                accept="image/*"
                                 onChange={this.onAvatarChanged}
                             />
                             <AccessibleButton
                                 onClick={this.onChangeAvatar}
                                 className="mx_CreateCommunityPrototypeDialog_avatarContainer"
                             >
-                                {preview}
+                                { preview }
                             </AccessibleButton>
                             <div className="mx_CreateCommunityPrototypeDialog_tip">
-                                <b>{_t("Add image (optional)")}</b>
+                                <b>{ _t("Add image (optional)") }</b>
                                 <span>
-                                    {_t("An image will help people identify your community.")}
+                                    { _t("An image will help people identify your community.") }
                                 </span>
                             </div>
                         </div>
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.tsx
similarity index 71%
rename from src/components/views/dialogs/CreateGroupDialog.js
rename to src/components/views/dialogs/CreateGroupDialog.tsx
index e6c7a67aca..b1ea75d367 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.tsx
@@ -15,44 +15,52 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
+
+interface IState {
+    groupName: string;
+    groupId: string;
+    groupIdError: string;
+    creating: boolean;
+    createError: Error;
+}
 
 @replaceableComponent("views.dialogs.CreateGroupDialog")
-export default class CreateGroupDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    state = {
+export default class CreateGroupDialog extends React.Component<IProps, IState> {
+    public state = {
         groupName: '',
         groupId: '',
-        groupError: null,
+        groupIdError: '',
         creating: false,
         createError: null,
     };
 
-    _onGroupNameChange = e => {
+    private onGroupNameChange = (e: React.FormEvent<HTMLInputElement>): void => {
         this.setState({
-            groupName: e.target.value,
+            groupName: e.currentTarget.value,
         });
     };
 
-    _onGroupIdChange = e => {
+    private onGroupIdChange = (e: React.FormEvent<HTMLInputElement>): void => {
         this.setState({
-            groupId: e.target.value,
+            groupId: e.currentTarget.value,
         });
     };
 
-    _onGroupIdBlur = e => {
-        this._checkGroupId();
+    private onGroupIdBlur = (): void => {
+        this.checkGroupId();
     };
 
-    _checkGroupId(e) {
+    private checkGroupId() {
         let error = null;
         if (!this.state.groupId) {
             error = _t("Community IDs cannot be empty.");
@@ -67,16 +75,16 @@ export default class CreateGroupDialog extends React.Component {
         return error;
     }
 
-    _onFormSubmit = e => {
+    private onFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
         e.preventDefault();
 
-        if (this._checkGroupId()) return;
+        if (this.checkGroupId()) return;
 
-        const profile = {};
+        const profile: any = {};
         if (this.state.groupName !== '') {
             profile.name = this.state.groupName;
         }
-        this.setState({creating: true});
+        this.setState({ creating: true });
         MatrixClientPeg.get().createGroup({
             localpart: this.state.groupId,
             profile: profile,
@@ -88,20 +96,17 @@ export default class CreateGroupDialog extends React.Component {
             });
             this.props.onFinished(true);
         }).catch((e) => {
-            this.setState({createError: e});
+            this.setState({ createError: e });
         }).finally(() => {
-            this.setState({creating: false});
+            this.setState({ creating: false });
         });
     };
 
-    _onCancel = () => {
+    private onCancel = () => {
         this.props.onFinished(false);
     };
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Spinner = sdk.getComponent('elements.Spinner');
-
         if (this.state.creating) {
             return <Spinner />;
         }
@@ -118,20 +123,25 @@ export default class CreateGroupDialog extends React.Component {
         }
 
         return (
-            <BaseDialog className="mx_CreateGroupDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_CreateGroupDialog"
+                onFinished={this.props.onFinished}
                 title={_t('Create Community')}
             >
-                <form onSubmit={this._onFormSubmit}>
+                <form onSubmit={this.onFormSubmit}>
                     <div className="mx_Dialog_content">
                         <div className="mx_CreateGroupDialog_inputRow">
                             <div className="mx_CreateGroupDialog_label">
                                 <label htmlFor="groupname">{ _t('Community Name') }</label>
                             </div>
                             <div>
-                                <input id="groupname" className="mx_CreateGroupDialog_input"
-                                    autoFocus={true} size="64"
+                                <input
+                                    id="groupname"
+                                    className="mx_CreateGroupDialog_input"
+                                    autoFocus={true}
+                                    size={64}
                                     placeholder={_t('Example')}
-                                    onChange={this._onGroupNameChange}
+                                    onChange={this.onGroupNameChange}
                                     value={this.state.groupName}
                                 />
                             </div>
@@ -144,10 +154,10 @@ export default class CreateGroupDialog extends React.Component {
                                 <span className="mx_CreateGroupDialog_prefix">+</span>
                                 <input id="groupid"
                                     className="mx_CreateGroupDialog_input mx_CreateGroupDialog_input_hasPrefixAndSuffix"
-                                    size="32"
+                                    size={32}
                                     placeholder={_t('example')}
-                                    onChange={this._onGroupIdChange}
-                                    onBlur={this._onGroupIdBlur}
+                                    onChange={this.onGroupIdChange}
+                                    onBlur={this.onGroupIdBlur}
                                     value={this.state.groupId}
                                 />
                                 <span className="mx_CreateGroupDialog_suffix">
@@ -162,7 +172,7 @@ export default class CreateGroupDialog extends React.Component {
                     </div>
                     <div className="mx_Dialog_buttons">
                         <input type="submit" value={_t('Create')} className="mx_Dialog_primary" />
-                        <button onClick={this._onCancel}>
+                        <button onClick={this.onCancel}>
                             { _t("Cancel") }
                         </button>
                     </div>
diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
index cce6b6c34c..0da5f189bf 100644
--- a/src/components/views/dialogs/CreateRoomDialog.tsx
+++ b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -15,31 +15,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ChangeEvent, createRef, KeyboardEvent, SyntheticEvent} from "react";
-import {Room} from "matrix-js-sdk/src/models/room";
+import React, { ChangeEvent, createRef, KeyboardEvent, SyntheticEvent } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { JoinRule, Preset, Visibility } from "matrix-js-sdk/src/@types/partials";
 
 import SdkConfig from '../../../SdkConfig';
-import withValidation, {IFieldState} from '../elements/Validation';
-import {_t} from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {Key} from "../../../Keyboard";
-import {IOpts, Preset, privateShouldBeEncrypted, Visibility} from "../../../createRoom";
-import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import withValidation, { IFieldState } from '../elements/Validation';
+import { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { Key } from "../../../Keyboard";
+import { IOpts, privateShouldBeEncrypted } from "../../../createRoom";
+import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field from "../elements/Field";
 import RoomAliasField from "../elements/RoomAliasField";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import DialogButtons from "../elements/DialogButtons";
 import BaseDialog from "../dialogs/BaseDialog";
+import SpaceStore from "../../../stores/SpaceStore";
+import JoinRuleDropdown from "../elements/JoinRuleDropdown";
 
 interface IProps {
     defaultPublic?: boolean;
     defaultName?: string;
     parentSpace?: Room;
+    defaultEncrypted?: boolean;
     onFinished(proceed: boolean, opts?: IOpts): void;
 }
 
 interface IState {
+    joinRule: JoinRule;
     isPublic: boolean;
     isEncrypted: boolean;
     name: string;
@@ -53,16 +58,27 @@ interface IState {
 
 @replaceableComponent("views.dialogs.CreateRoomDialog")
 export default class CreateRoomDialog extends React.Component<IProps, IState> {
+    private readonly supportsRestricted: boolean;
     private nameField = createRef<Field>();
     private aliasField = createRef<RoomAliasField>();
 
     constructor(props) {
         super(props);
 
+        this.supportsRestricted = this.props.parentSpace && !!SpaceStore.instance.restrictedJoinRuleSupport?.preferred;
+
+        let joinRule = JoinRule.Invite;
+        if (this.props.defaultPublic) {
+            joinRule = JoinRule.Public;
+        } else if (this.supportsRestricted) {
+            joinRule = JoinRule.Restricted;
+        }
+
         const config = SdkConfig.get();
         this.state = {
             isPublic: this.props.defaultPublic || false,
-            isEncrypted: privateShouldBeEncrypted(),
+            isEncrypted: this.props.defaultEncrypted ?? privateShouldBeEncrypted(),
+            joinRule,
             name: this.props.defaultName || "",
             topic: "",
             alias: "",
@@ -72,7 +88,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             canChangeEncryption: true,
         };
 
-        MatrixClientPeg.get().doesServerForceEncryptionForPreset("private")
+        MatrixClientPeg.get().doesServerForceEncryptionForPreset(Preset.PrivateChat)
             .then(isForced => this.setState({ canChangeEncryption: !isForced }));
     }
 
@@ -80,13 +96,18 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         const opts: IOpts = {};
         const createOpts: IOpts["createOpts"] = opts.createOpts = {};
         createOpts.name = this.state.name;
-        if (this.state.isPublic) {
+
+        if (this.state.joinRule === JoinRule.Public) {
             createOpts.visibility = Visibility.Public;
             createOpts.preset = Preset.PublicChat;
             opts.guestAccess = false;
             const { alias } = this.state;
             createOpts.room_alias_name = alias.substr(1, alias.indexOf(":") - 1);
+        } else {
+            // If we cannot change encryption we pass `true` for safety, the server should automatically do this for us.
+            opts.encryption = this.state.canChangeEncryption ? this.state.isEncrypted : true;
         }
+
         if (this.state.topic) {
             createOpts.topic = this.state.topic;
         }
@@ -94,22 +115,13 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             createOpts.creation_content = { 'm.federate': false };
         }
 
-        if (!this.state.isPublic) {
-            if (this.state.canChangeEncryption) {
-                opts.encryption = this.state.isEncrypted;
-            } else {
-                // the server should automatically do this for us, but for safety
-                // we'll demand it too.
-                opts.encryption = true;
-            }
-        }
-
         if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
             opts.associatedWithCommunity = CommunityPrototypeStore.instance.getSelectedCommunityId();
         }
 
-        if (this.props.parentSpace) {
-            opts.parentSpace = this.props.parentSpace;
+        opts.parentSpace = this.props.parentSpace;
+        if (this.props.parentSpace && this.state.joinRule === JoinRule.Restricted) {
+            opts.joinRule = JoinRule.Restricted;
         }
 
         return opts;
@@ -136,9 +148,9 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         if (activeElement) {
             activeElement.blur();
         }
-        await this.nameField.current.validate({allowEmpty: false});
+        await this.nameField.current.validate({ allowEmpty: false });
         if (this.aliasField.current) {
-            await this.aliasField.current.validate({allowEmpty: false});
+            await this.aliasField.current.validate({ allowEmpty: false });
         }
         // Validation and state updates are async, so we need to wait for them to complete
         // first. Queue a `setState` callback and wait for it to resolve.
@@ -171,8 +183,8 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         this.setState({ topic: ev.target.value });
     };
 
-    private onPublicChange = (isPublic: boolean) => {
-        this.setState({ isPublic });
+    private onJoinRuleChange = (joinRule: JoinRule) => {
+        this.setState({ joinRule });
     };
 
     private onEncryptedChange = (isEncrypted: boolean) => {
@@ -193,7 +205,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
 
     private onNameValidate = async (fieldState: IFieldState) => {
         const result = await CreateRoomDialog.validateRoomName(fieldState);
-        this.setState({nameIsValid: result.valid});
+        this.setState({ nameIsValid: result.valid });
         return result;
     };
 
@@ -209,7 +221,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
 
     render() {
         let aliasField;
-        if (this.state.isPublic) {
+        if (this.state.joinRule === JoinRule.Public) {
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
@@ -223,19 +235,52 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             );
         }
 
-        let publicPrivateLabel = <p>{_t(
-            "Private rooms can be found and joined by invitation only. Public rooms can be " +
-            "found and joined by anyone.",
-        )}</p>;
+        let publicPrivateLabel: JSX.Element;
         if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
-            publicPrivateLabel = <p>{_t(
-                "Private rooms can be found and joined by invitation only. Public rooms can be " +
-                "found and joined by anyone in this community.",
-            )}</p>;
+            publicPrivateLabel = <p>
+                { _t(
+                    "Private rooms can be found and joined by invitation only. Public rooms can be " +
+                    "found and joined by anyone in this community.",
+                ) }
+            </p>;
+        } else if (this.state.joinRule === JoinRule.Restricted) {
+            publicPrivateLabel = <p>
+                { _t(
+                    "Everyone in <SpaceName/> will be able to find and join this room.", {}, {
+                        SpaceName: () => <b>{ this.props.parentSpace.name }</b>,
+                    },
+                ) }
+                &nbsp;
+                { _t("You can change this at any time from room settings.") }
+            </p>;
+        } else if (this.state.joinRule === JoinRule.Public && this.props.parentSpace) {
+            publicPrivateLabel = <p>
+                { _t(
+                    "Anyone will be able to find and join this room, not just members of <SpaceName/>.", {}, {
+                        SpaceName: () => <b>{ this.props.parentSpace.name }</b>,
+                    },
+                ) }
+                &nbsp;
+                { _t("You can change this at any time from room settings.") }
+            </p>;
+        } else if (this.state.joinRule === JoinRule.Public) {
+            publicPrivateLabel = <p>
+                { _t("Anyone will be able to find and join this room.") }
+                &nbsp;
+                { _t("You can change this at any time from room settings.") }
+            </p>;
+        } else if (this.state.joinRule === JoinRule.Invite) {
+            publicPrivateLabel = <p>
+                { _t(
+                    "Only people invited will be able to find and join this room.",
+                ) }
+                &nbsp;
+                { _t("You can change this at any time from room settings.") }
+            </p>;
         }
 
         let e2eeSection;
-        if (!this.state.isPublic) {
+        if (this.state.joinRule !== JoinRule.Public) {
             let microcopy;
             if (privateShouldBeEncrypted()) {
                 if (this.state.canChangeEncryption) {
@@ -249,7 +294,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             }
             e2eeSection = <React.Fragment>
                 <LabelledToggleSwitch
-                    label={ _t("Enable end-to-end encryption")}
+                    label={_t("Enable end-to-end encryption")}
                     onChange={this.onEncryptedChange}
                     value={this.state.isEncrypted}
                     className='mx_CreateRoomDialog_e2eSwitch' // for end-to-end tests
@@ -272,15 +317,16 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             );
         }
 
-        let title = this.state.isPublic ? _t('Create a public room') : _t('Create a private room');
+        let title = _t("Create a room");
         if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
             const name = CommunityPrototypeStore.instance.getSelectedCommunityName();
-            title = _t("Create a room in %(communityName)s", {communityName: name});
+            title = _t("Create a room in %(communityName)s", { communityName: name });
+        } else if (!this.props.parentSpace) {
+            title = this.state.joinRule === JoinRule.Public ? _t('Create a public room') : _t('Create a private room');
         }
+
         return (
-            <BaseDialog className="mx_CreateRoomDialog" onFinished={this.props.onFinished}
-                title={title}
-            >
+            <BaseDialog className="mx_CreateRoomDialog" onFinished={this.props.onFinished} title={title}>
                 <form onSubmit={this.onOk} onKeyDown={this.onKeyDown}>
                     <div className="mx_Dialog_content">
                         <Field
@@ -297,11 +343,16 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                             value={this.state.topic}
                             className="mx_CreateRoomDialog_topic"
                         />
-                        <LabelledToggleSwitch
-                            label={_t("Make this room public")}
-                            onChange={this.onPublicChange}
-                            value={this.state.isPublic}
+
+                        <JoinRuleDropdown
+                            label={_t("Room visibility")}
+                            labelInvite={_t("Private room (invite only)")}
+                            labelPublic={_t("Public room")}
+                            labelRestricted={this.supportsRestricted ? _t("Visible to space members") : undefined}
+                            value={this.state.joinRule}
+                            onChange={this.onJoinRuleChange}
                         />
+
                         { publicPrivateLabel }
                         { e2eeSection }
                         { aliasField }
@@ -312,12 +363,12 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                             <LabelledToggleSwitch
                                 label={_t(
                                     "Block anyone not part of %(serverName)s from ever joining this room.",
-                                    {serverName: MatrixClientPeg.getHomeserverName()},
+                                    { serverName: MatrixClientPeg.getHomeserverName() },
                                 )}
                                 onChange={this.onNoFederateChange}
                                 value={this.state.noFederate}
                             />
-                            <p>{federateLabel}</p>
+                            <p>{ federateLabel }</p>
                         </details>
                     </div>
                 </form>
diff --git a/src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx b/src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx
new file mode 100644
index 0000000000..e74082427f
--- /dev/null
+++ b/src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx
@@ -0,0 +1,340 @@
+/*
+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, { useEffect, useRef, useState } from "react";
+import { JoinRule } from "matrix-js-sdk/src/@types/partials";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
+
+import { _t } from '../../../languageHandler';
+import BaseDialog from "./BaseDialog";
+import AccessibleButton from "../elements/AccessibleButton";
+import { createSpace, SpaceCreateForm } from "../spaces/SpaceCreateMenu";
+import JoinRuleDropdown from "../elements/JoinRuleDropdown";
+import Field from "../elements/Field";
+import RoomAliasField from "../elements/RoomAliasField";
+import { GroupMember } from "../right_panel/UserInfo";
+import { parseMembersResponse, parseRoomsResponse } from "../../../stores/GroupStore";
+import { calculateRoomVia, makeRoomPermalink } from "../../../utils/permalinks/Permalinks";
+import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
+import Spinner from "../elements/Spinner";
+import { mediaFromMxc } from "../../../customisations/Media";
+import SpaceStore from "../../../stores/SpaceStore";
+import Modal from "../../../Modal";
+import InfoDialog from "./InfoDialog";
+import dis from "../../../dispatcher/dispatcher";
+import { Action } from "../../../dispatcher/actions";
+import { UserTab } from "./UserSettingsDialog";
+import TagOrderActions from "../../../actions/TagOrderActions";
+
+interface IProps {
+    matrixClient: MatrixClient;
+    groupId: string;
+    onFinished(spaceId?: string): void;
+}
+
+export const CreateEventField = "io.element.migrated_from_community";
+
+interface IGroupRoom {
+    displayname: string;
+    name?: string;
+    roomId: string;
+    canonicalAlias?: string;
+    avatarUrl?: string;
+    topic?: string;
+    numJoinedMembers?: number;
+    worldReadable?: boolean;
+    guestCanJoin?: boolean;
+    isPublic?: boolean;
+}
+
+/* eslint-disable camelcase */
+export interface IGroupSummary {
+    profile: {
+        avatar_url?: string;
+        is_openly_joinable?: boolean;
+        is_public?: boolean;
+        long_description: string;
+        name: string;
+        short_description: string;
+    };
+    rooms_section: {
+        rooms: unknown[];
+        categories: Record<string, unknown>;
+        total_room_count_estimate: number;
+    };
+    user: {
+        is_privileged: boolean;
+        is_public: boolean;
+        is_publicised: boolean;
+        membership: string;
+    };
+    users_section: {
+        users: unknown[];
+        roles: Record<string, unknown>;
+        total_user_count_estimate: number;
+    };
+}
+/* eslint-enable camelcase */
+
+const CreateSpaceFromCommunityDialog: React.FC<IProps> = ({ matrixClient: cli, groupId, onFinished }) => {
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string>(null);
+    const [busy, setBusy] = useState(false);
+
+    const [avatar, setAvatar] = useState<File>(null); // undefined means to remove avatar
+    const [name, setName] = useState("");
+    const spaceNameField = useRef<Field>();
+    const [alias, setAlias] = useState("#" + groupId.substring(1, groupId.indexOf(":")) + ":" + cli.getDomain());
+    const spaceAliasField = useRef<RoomAliasField>();
+    const [topic, setTopic] = useState("");
+    const [joinRule, setJoinRule] = useState<JoinRule>(JoinRule.Public);
+
+    const groupSummary = useAsyncMemo<IGroupSummary>(() => cli.getGroupSummary(groupId), [groupId]);
+    useEffect(() => {
+        if (groupSummary) {
+            setName(groupSummary.profile.name || "");
+            setTopic(groupSummary.profile.short_description || "");
+            setJoinRule(groupSummary.profile.is_openly_joinable ? JoinRule.Public : JoinRule.Invite);
+            setLoading(false);
+        }
+    }, [groupSummary]);
+
+    if (loading) {
+        return <Spinner />;
+    }
+
+    const onCreateSpaceClick = async (e) => {
+        e.preventDefault();
+        if (busy) return;
+
+        setError(null);
+        setBusy(true);
+
+        // require & validate the space name field
+        if (!(await spaceNameField.current.validate({ allowEmpty: false }))) {
+            setBusy(false);
+            spaceNameField.current.focus();
+            spaceNameField.current.validate({ allowEmpty: false, focused: true });
+            return;
+        }
+        // validate the space name alias field but do not require it
+        if (joinRule === JoinRule.Public && !(await spaceAliasField.current.validate({ allowEmpty: true }))) {
+            setBusy(false);
+            spaceAliasField.current.focus();
+            spaceAliasField.current.validate({ allowEmpty: true, focused: true });
+            return;
+        }
+
+        try {
+            const [rooms, members, invitedMembers] = await Promise.all([
+                cli.getGroupRooms(groupId).then(parseRoomsResponse) as Promise<IGroupRoom[]>,
+                cli.getGroupUsers(groupId).then(parseMembersResponse) as Promise<GroupMember[]>,
+                cli.getGroupInvitedUsers(groupId).then(parseMembersResponse) as Promise<GroupMember[]>,
+            ]);
+
+            const viaMap = new Map<string, string[]>();
+            for (const { roomId, canonicalAlias } of rooms) {
+                const room = cli.getRoom(roomId);
+                if (room) {
+                    viaMap.set(roomId, calculateRoomVia(room));
+                } else if (canonicalAlias) {
+                    try {
+                        const { servers } = await cli.getRoomIdForAlias(canonicalAlias);
+                        viaMap.set(roomId, servers);
+                    } catch (e) {
+                        console.warn("Failed to resolve alias during community migration", e);
+                    }
+                }
+
+                if (!viaMap.get(roomId)?.length) {
+                    // XXX: lets guess the via, this might end up being incorrect.
+                    const str = canonicalAlias || roomId;
+                    viaMap.set(roomId, [str.substring(1, str.indexOf(":"))]);
+                }
+            }
+
+            const spaceAvatar = avatar !== undefined ? avatar : groupSummary.profile.avatar_url;
+            const roomId = await createSpace(name, joinRule === JoinRule.Public, alias, topic, spaceAvatar, {
+                creation_content: {
+                    [CreateEventField]: groupId,
+                },
+                initial_state: rooms.map(({ roomId }) => ({
+                    type: EventType.SpaceChild,
+                    state_key: roomId,
+                    content: {
+                        via: viaMap.get(roomId) || [],
+                    },
+                })),
+                invite: [...members, ...invitedMembers].map(m => m.userId).filter(m => m !== cli.getUserId()),
+            }, {
+                andView: false,
+            });
+
+            // eagerly remove it from the community panel
+            dis.dispatch(TagOrderActions.removeTag(cli, groupId));
+
+            // don't bother awaiting this, as we don't hugely care if it fails
+            cli.setGroupProfile(groupId, {
+                ...groupSummary.profile,
+                long_description: `<a href="${makeRoomPermalink(roomId)}"><h1>` +
+                    _t("This community has been upgraded into a Space") + `</h1></a><br />`
+                    + groupSummary.profile.long_description,
+            } as IGroupSummary["profile"]).catch(e => {
+                console.warn("Failed to update community profile during migration", e);
+            });
+
+            onFinished(roomId);
+
+            const onSpaceClick = () => {
+                dis.dispatch({
+                    action: "view_room",
+                    room_id: roomId,
+                });
+            };
+
+            const onPreferencesClick = () => {
+                dis.dispatch({
+                    action: Action.ViewUserSettings,
+                    initialTabId: UserTab.Preferences,
+                });
+            };
+
+            let spacesDisabledCopy;
+            if (!SpaceStore.spacesEnabled) {
+                spacesDisabledCopy = _t("To view Spaces, hide communities in <a>Preferences</a>", {}, {
+                    a: sub => <AccessibleButton onClick={onPreferencesClick} kind="link">{ sub }</AccessibleButton>,
+                });
+            }
+
+            Modal.createDialog(InfoDialog, {
+                title: _t("Space created"),
+                description: <>
+                    <div className="mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark" />
+                    <p>
+                        { _t("<SpaceName/> has been made and everyone who was a part of the community has " +
+                            "been invited to it.", {}, {
+                            SpaceName: () => <AccessibleButton onClick={onSpaceClick} kind="link">
+                                { name }
+                            </AccessibleButton>,
+                        }) }
+                        &nbsp;
+                        { spacesDisabledCopy }
+                    </p>
+                    <p>
+                        { _t("To create a Space from another community, just pick the community in Preferences.") }
+                    </p>
+                </>,
+                button: _t("Preferences"),
+                onFinished: (openPreferences: boolean) => {
+                    if (openPreferences) {
+                        onPreferencesClick();
+                    }
+                },
+            }, "mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog");
+        } catch (e) {
+            console.error(e);
+            setError(e);
+        }
+
+        setBusy(false);
+    };
+
+    let footer;
+    if (error) {
+        footer = <>
+            <img src={require("../../../../res/img/element-icons/warning-badge.svg")} height="24" width="24" alt="" />
+
+            <span className="mx_CreateSpaceFromCommunityDialog_error">
+                <div className="mx_CreateSpaceFromCommunityDialog_errorHeading">{ _t("Failed to migrate community") }</div>
+                <div className="mx_CreateSpaceFromCommunityDialog_errorCaption">{ _t("Try again") }</div>
+            </span>
+
+            <AccessibleButton className="mx_CreateSpaceFromCommunityDialog_retryButton" onClick={onCreateSpaceClick}>
+                { _t("Retry") }
+            </AccessibleButton>
+        </>;
+    } else {
+        footer = <>
+            <AccessibleButton kind="primary_outline" disabled={busy} onClick={() => onFinished()}>
+                { _t("Cancel") }
+            </AccessibleButton>
+            <AccessibleButton kind="primary" disabled={busy} onClick={onCreateSpaceClick}>
+                { busy ? _t("Creating...") : _t("Create Space") }
+            </AccessibleButton>
+        </>;
+    }
+
+    return <BaseDialog
+        title={_t("Create Space from community")}
+        className="mx_CreateSpaceFromCommunityDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <div className="mx_CreateSpaceFromCommunityDialog_content">
+            <p>
+                { _t("A link to the Space will be put in your community description.") }
+                &nbsp;
+                { _t("All rooms will be added and all community members will be invited.") }
+            </p>
+            <p className="mx_CreateSpaceFromCommunityDialog_flairNotice">
+                { _t("Flair won't be available in Spaces for the foreseeable future.") }
+            </p>
+
+            <SpaceCreateForm
+                busy={busy}
+                onSubmit={onCreateSpaceClick}
+                avatarUrl={groupSummary.profile.avatar_url
+                    ? mediaFromMxc(groupSummary.profile.avatar_url).getThumbnailOfSourceHttp(80, 80, "crop")
+                    : undefined
+                }
+                setAvatar={setAvatar}
+                name={name}
+                setName={setName}
+                nameFieldRef={spaceNameField}
+                topic={topic}
+                setTopic={setTopic}
+                alias={alias}
+                setAlias={setAlias}
+                showAliasField={joinRule === JoinRule.Public}
+                aliasFieldRef={spaceAliasField}
+            >
+                <p>{ _t("This description will be shown to people when they view your space") }</p>
+                <JoinRuleDropdown
+                    label={_t("Space visibility")}
+                    labelInvite={_t("Private space (invite only)")}
+                    labelPublic={_t("Public space")}
+                    value={joinRule}
+                    onChange={setJoinRule}
+                />
+                <p>{ joinRule === JoinRule.Public
+                    ? _t("Open space for anyone, best for communities")
+                    : _t("Invite only, best for yourself or teams")
+                }</p>
+                { joinRule !== JoinRule.Public &&
+                    <div className="mx_CreateSpaceFromCommunityDialog_nonPublicSpacer" />
+                }
+            </SpaceCreateForm>
+        </div>
+
+        <div className="mx_CreateSpaceFromCommunityDialog_footer">
+            { footer }
+        </div>
+    </BaseDialog>;
+};
+
+export default CreateSpaceFromCommunityDialog;
+
diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx
new file mode 100644
index 0000000000..0d7facb476
--- /dev/null
+++ b/src/components/views/dialogs/CreateSubspaceDialog.tsx
@@ -0,0 +1,187 @@
+/*
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { JoinRule } from "matrix-js-sdk/src/@types/partials";
+
+import { _t } from '../../../languageHandler';
+import BaseDialog from "./BaseDialog";
+import AccessibleButton from "../elements/AccessibleButton";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { BetaPill } from "../beta/BetaCard";
+import Field from "../elements/Field";
+import RoomAliasField from "../elements/RoomAliasField";
+import SpaceStore from "../../../stores/SpaceStore";
+import { createSpace, SpaceCreateForm } from "../spaces/SpaceCreateMenu";
+import { SubspaceSelector } from "./AddExistingToSpaceDialog";
+import JoinRuleDropdown from "../elements/JoinRuleDropdown";
+
+interface IProps {
+    space: Room;
+    onAddExistingSpaceClick(): void;
+    onFinished(added?: boolean): void;
+}
+
+const CreateSubspaceDialog: React.FC<IProps> = ({ space, onAddExistingSpaceClick, onFinished }) => {
+    const [parentSpace, setParentSpace] = useState(space);
+
+    const [busy, setBusy] = useState<boolean>(false);
+    const [name, setName] = useState("");
+    const spaceNameField = useRef<Field>();
+    const [alias, setAlias] = useState("");
+    const spaceAliasField = useRef<RoomAliasField>();
+    const [avatar, setAvatar] = useState<File>(null);
+    const [topic, setTopic] = useState<string>("");
+
+    const supportsRestricted = !!SpaceStore.instance.restrictedJoinRuleSupport?.preferred;
+
+    const spaceJoinRule = space.getJoinRule();
+    let defaultJoinRule = JoinRule.Invite;
+    if (spaceJoinRule === JoinRule.Public) {
+        defaultJoinRule = JoinRule.Public;
+    } else if (supportsRestricted) {
+        defaultJoinRule = JoinRule.Restricted;
+    }
+    const [joinRule, setJoinRule] = useState<JoinRule>(defaultJoinRule);
+
+    const onCreateSubspaceClick = async (e) => {
+        e.preventDefault();
+        if (busy) return;
+
+        setBusy(true);
+        // require & validate the space name field
+        if (!(await spaceNameField.current.validate({ allowEmpty: false }))) {
+            spaceNameField.current.focus();
+            spaceNameField.current.validate({ allowEmpty: false, focused: true });
+            setBusy(false);
+            return;
+        }
+        // validate the space name alias field but do not require it
+        if (joinRule === JoinRule.Public && !(await spaceAliasField.current.validate({ allowEmpty: true }))) {
+            spaceAliasField.current.focus();
+            spaceAliasField.current.validate({ allowEmpty: true, focused: true });
+            setBusy(false);
+            return;
+        }
+
+        try {
+            await createSpace(name, joinRule === JoinRule.Public, alias, topic, avatar, {}, { parentSpace, joinRule });
+
+            onFinished(true);
+        } catch (e) {
+            console.error(e);
+        }
+    };
+
+    let joinRuleMicrocopy: JSX.Element;
+    if (joinRule === JoinRule.Restricted) {
+        joinRuleMicrocopy = <p>
+            { _t(
+                "Anyone in <SpaceName/> will be able to find and join.", {}, {
+                    SpaceName: () => <b>{ parentSpace.name }</b>,
+                },
+            ) }
+        </p>;
+    } else if (joinRule === JoinRule.Public) {
+        joinRuleMicrocopy = <p>
+            { _t(
+                "Anyone will be able to find and join this space, not just members of <SpaceName/>.", {}, {
+                    SpaceName: () => <b>{ parentSpace.name }</b>,
+                },
+            ) }
+        </p>;
+    } else if (joinRule === JoinRule.Invite) {
+        joinRuleMicrocopy = <p>
+            { _t("Only people invited will be able to find and join this space.") }
+        </p>;
+    }
+
+    return <BaseDialog
+        title={(
+            <SubspaceSelector
+                title={_t("Create a space")}
+                space={space}
+                value={parentSpace}
+                onChange={setParentSpace}
+            />
+        )}
+        className="mx_CreateSubspaceDialog"
+        contentId="mx_CreateSubspaceDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <MatrixClientContext.Provider value={space.client}>
+            <div className="mx_CreateSubspaceDialog_content">
+                <div className="mx_CreateSubspaceDialog_betaNotice">
+                    <BetaPill />
+                    { _t("Add a space to a space you manage.") }
+                </div>
+
+                <SpaceCreateForm
+                    busy={busy}
+                    onSubmit={onCreateSubspaceClick}
+                    setAvatar={setAvatar}
+                    name={name}
+                    setName={setName}
+                    nameFieldRef={spaceNameField}
+                    topic={topic}
+                    setTopic={setTopic}
+                    alias={alias}
+                    setAlias={setAlias}
+                    showAliasField={joinRule === JoinRule.Public}
+                    aliasFieldRef={spaceAliasField}
+                >
+                    <JoinRuleDropdown
+                        label={_t("Space visibility")}
+                        labelInvite={_t("Private space (invite only)")}
+                        labelPublic={_t("Public space")}
+                        labelRestricted={supportsRestricted ? _t("Visible to space members") : undefined}
+                        width={478}
+                        value={joinRule}
+                        onChange={setJoinRule}
+                    />
+                    { joinRuleMicrocopy }
+                </SpaceCreateForm>
+            </div>
+
+            <div className="mx_CreateSubspaceDialog_footer">
+                <div className="mx_CreateSubspaceDialog_footer_prompt">
+                    <div>{ _t("Want to add an existing space instead?") }</div>
+                    <AccessibleButton
+                        kind="link"
+                        onClick={() => {
+                            onAddExistingSpaceClick();
+                            onFinished();
+                        }}
+                    >
+                        { _t("Add existing space") }
+                    </AccessibleButton>
+                </div>
+
+                <AccessibleButton kind="primary_outline" disabled={busy} onClick={() => onFinished(false)}>
+                    { _t("Cancel") }
+                </AccessibleButton>
+                <AccessibleButton kind="primary" disabled={busy} onClick={onCreateSubspaceClick}>
+                    { busy ? _t("Adding...") : _t("Add") }
+                </AccessibleButton>
+            </div>
+        </MatrixClientContext.Provider>
+    </BaseDialog>;
+};
+
+export default CreateSubspaceDialog;
+
diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.tsx
similarity index 82%
rename from src/components/views/dialogs/CryptoStoreTooNewDialog.js
rename to src/components/views/dialogs/CryptoStoreTooNewDialog.tsx
index 6336c635e4..3bb78233ea 100644
--- a/src/components/views/dialogs/CryptoStoreTooNewDialog.js
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.tsx
@@ -16,17 +16,21 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import QuestionDialog from "./QuestionDialog";
+import { IDialogProps } from "./IDialogProps";
 
-export default (props) => {
+interface IProps extends IDialogProps {}
+
+const CryptoStoreTooNewDialog: React.FC<IProps> = (props: IProps) => {
     const brand = SdkConfig.get().brand;
 
     const _onLogoutClicked = () => {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Logout e2e db too new', '', QuestionDialog, {
             title: _t("Sign out"),
             description: _t(
@@ -39,8 +43,8 @@ export default (props) => {
             focus: false,
             onFinished: (doLogout) => {
                 if (doLogout) {
-                    dis.dispatch({action: 'logout'});
-                    props.onFinished();
+                    dis.dispatch({ action: 'logout' });
+                    props.onFinished(true);
                 }
             },
         });
@@ -54,8 +58,6 @@ export default (props) => {
             { brand },
         );
 
-    const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-    const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
     return (<BaseDialog className="mx_CryptoStoreTooNewDialog"
         contentId='mx_Dialog_content'
         title={_t("Incompatible Database")}
@@ -69,9 +71,11 @@ export default (props) => {
             hasCancel={false}
             onPrimaryButtonClick={props.onFinished}
         >
-            <button onClick={_onLogoutClicked} >
+            <button onClick={_onLogoutClicked}>
                 { _t('Sign out') }
             </button>
         </DialogButtons>
     </BaseDialog>);
 };
+
+export default CryptoStoreTooNewDialog;
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.tsx
similarity index 72%
rename from src/components/views/dialogs/DeactivateAccountDialog.js
rename to src/components/views/dialogs/DeactivateAccountDialog.tsx
index 4e52549d51..6548bd78fc 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.tsx
@@ -16,20 +16,37 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { AuthType, IAuthData } from 'matrix-js-sdk/src/interactive-auth';
 
-import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as Lifecycle from '../../../Lifecycle';
 import { _t } from '../../../languageHandler';
-import InteractiveAuth, {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
-import {DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
+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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
+
+interface IState {
+    shouldErase: boolean;
+    errStr: string;
+    authData: any; // for UIA
+    authEnabled: boolean; // see usages for information
+
+    // A few strings that are passed to InteractiveAuth for design or are displayed
+    // next to the InteractiveAuth component.
+    bodyText: string;
+    continueText: string;
+    continueKind: string;
+}
 
 @replaceableComponent("views.dialogs.DeactivateAccountDialog")
-export default class DeactivateAccountDialog extends React.Component {
+export default class DeactivateAccountDialog extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
 
@@ -46,10 +63,10 @@ export default class DeactivateAccountDialog extends React.Component {
             continueKind: null,
         };
 
-        this._initAuth(/* shouldErase= */false);
+        this.initAuth(/* shouldErase= */false);
     }
 
-    _onStagePhaseChange = (stage, phase) => {
+    private onStagePhaseChange = (stage: AuthType, phase: string): void => {
         const dialogAesthetics = {
             [SSOAuthEntry.PHASE_PREAUTH]: {
                 body: _t("Confirm your account deactivation by using Single Sign On to prove your identity."),
@@ -84,22 +101,25 @@ export default class DeactivateAccountDialog extends React.Component {
             if (phaseAesthetics && phaseAesthetics.continueText) continueText = phaseAesthetics.continueText;
             if (phaseAesthetics && phaseAesthetics.continueKind) continueKind = phaseAesthetics.continueKind;
         }
-        this.setState({bodyText, continueText, continueKind});
+        this.setState({ bodyText, continueText, continueKind });
     };
 
-    _onUIAuthFinished = (success, result, extra) => {
+    private onUIAuthFinished = (success: boolean, result: Error) => {
         if (success) return; // great! makeRequest() will be called too.
 
         if (result === ERROR_USER_CANCELLED) {
-            this._onCancel();
+            this.onCancel();
             return;
         }
 
-        console.error("Error during UI Auth:", {result, extra});
-        this.setState({errStr: _t("There was a problem communicating with the server. Please try again.")});
+        console.error("Error during UI Auth:", { result });
+        this.setState({ errStr: _t("There was a problem communicating with the server. Please try again.") });
     };
 
-    _onUIAuthComplete = (auth) => {
+    private onUIAuthComplete = (auth: IAuthData): void => {
+        // XXX: this should be returning a promise to maintain the state inside the state machine correct
+        // but given that a deactivation is followed by a local logout and all object instances being thrown away
+        // this isn't done.
         MatrixClientPeg.get().deactivateAccount(auth, this.state.shouldErase).then(r => {
             // Deactivation worked - logout & close this dialog
             Analytics.trackEvent('Account', 'Deactivate Account');
@@ -107,13 +127,13 @@ export default class DeactivateAccountDialog extends React.Component {
             this.props.onFinished(true);
         }).catch(e => {
             console.error(e);
-            this.setState({errStr: _t("There was a problem communicating with the server. Please try again.")});
+            this.setState({ errStr: _t("There was a problem communicating with the server. Please try again.") });
         });
     };
 
-    _onEraseFieldChange = (ev) => {
+    private onEraseFieldChange = (ev: React.FormEvent<HTMLInputElement>): void => {
         this.setState({
-            shouldErase: ev.target.checked,
+            shouldErase: ev.currentTarget.checked,
 
             // Disable the auth form because we're going to have to reinitialize the auth
             // information. We do this because we can't modify the parameters in the UIA
@@ -123,34 +143,32 @@ export default class DeactivateAccountDialog extends React.Component {
         });
 
         // As mentioned above, set up for auth again to get updated UIA session info
-        this._initAuth(/* shouldErase= */ev.target.checked);
+        this.initAuth(/* shouldErase= */ev.currentTarget.checked);
     };
 
-    _onCancel() {
+    private onCancel(): void {
         this.props.onFinished(false);
     }
 
-    _initAuth(shouldErase) {
+    private initAuth(shouldErase: boolean): void {
         MatrixClientPeg.get().deactivateAccount(null, shouldErase).then(r => {
             // If we got here, oops. The server didn't require any auth.
             // Our application lifecycle will catch the error and do the logout bits.
             // We'll try to log something in an vain attempt to record what happened (storage
             // is also obliterated on logout).
             console.warn("User's account got deactivated without confirmation: Server had no auth");
-            this.setState({errStr: _t("Server did not require any authentication")});
+            this.setState({ errStr: _t("Server did not require any authentication") });
         }).catch(e => {
             if (e && e.httpStatus === 401 && e.data) {
                 // Valid UIA response
-                this.setState({authData: e.data, authEnabled: true});
+                this.setState({ authData: e.data, authEnabled: true });
             } else {
-                this.setState({errStr: _t("Server did not return valid authentication information.")});
+                this.setState({ errStr: _t("Server did not return valid authentication information.") });
             }
         });
     }
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
+    public render() {
         let error = null;
         if (this.state.errStr) {
             error = <div className="error">
@@ -158,17 +176,19 @@ export default class DeactivateAccountDialog extends React.Component {
             </div>;
         }
 
-        let auth = <div>{_t("Loading...")}</div>;
+        let auth = <div>{ _t("Loading...") }</div>;
         if (this.state.authData && this.state.authEnabled) {
             auth = (
                 <div>
-                    {this.state.bodyText}
+                    { this.state.bodyText }
                     <InteractiveAuth
                         matrixClient={MatrixClientPeg.get()}
                         authData={this.state.authData}
-                        makeRequest={this._onUIAuthComplete}
-                        onAuthFinished={this._onUIAuthFinished}
-                        onStagePhaseChange={this._onStagePhaseChange}
+                        // XXX: onUIAuthComplete breaches the expected method contract, it gets away with it because it
+                        // knows the entire app is about to die as a result of the account deactivation.
+                        makeRequest={this.onUIAuthComplete as any}
+                        onAuthFinished={this.onUIAuthFinished}
+                        onStagePhaseChange={this.onStagePhaseChange}
                         continueText={this.state.continueText}
                         continueKind={this.state.continueKind}
                     />
@@ -214,20 +234,20 @@ export default class DeactivateAccountDialog extends React.Component {
                         <p>
                             <StyledCheckbox
                                 checked={this.state.shouldErase}
-                                onChange={this._onEraseFieldChange}
+                                onChange={this.onEraseFieldChange}
                             >
-                                {_t(
+                                { _t(
                                     "Please forget all messages I have sent when my account is deactivated " +
                                     "(<b>Warning:</b> this will cause future users to see an incomplete view " +
                                     "of conversations)",
                                     {},
                                     { b: (sub) => <b>{ sub }</b> },
-                                )}
+                                ) }
                             </StyledCheckbox>
                         </p>
 
-                        {error}
-                        {auth}
+                        { error }
+                        { auth }
                     </div>
 
                 </div>
@@ -235,7 +255,3 @@ export default class DeactivateAccountDialog extends React.Component {
         );
     }
 }
-
-DeactivateAccountDialog.propTypes = {
-    onFinished: PropTypes.func.isRequired,
-};
diff --git a/src/components/views/dialogs/DevtoolsDialog.tsx b/src/components/views/dialogs/DevtoolsDialog.tsx
index fdbf6a36fc..7f34b75055 100644
--- a/src/components/views/dialogs/DevtoolsDialog.tsx
+++ b/src/components/views/dialogs/DevtoolsDialog.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import React, { useState, useEffect, ChangeEvent, MouseEvent } from 'react';
-import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
@@ -42,6 +41,10 @@ import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { SettingLevel } from '../../../settings/SettingLevel';
+import BaseDialog from "./BaseDialog";
+import TruncatedList from "../elements/TruncatedList";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IGenericEditorProps {
     onBack: () => void;
@@ -62,13 +65,13 @@ abstract class GenericEditor<
         } else {
             this.props.onBack();
         }
-    }
+    };
 
     protected onChange = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
         // @ts-ignore: Unsure how to convince TS this is okay when the state
         // type can be extended.
-        this.setState({[e.target.id]: e.target.type === 'checkbox' ? e.target.checked : e.target.value});
-    }
+        this.setState({ [e.target.id]: e.target.type === 'checkbox' ? e.target.checked : e.target.value });
+    };
 
     protected abstract send();
 
@@ -119,7 +122,7 @@ export class SendCustomEvent extends GenericEditor<ISendCustomEventProps, ISendC
     constructor(props) {
         super(props);
 
-        const {eventType, stateKey, evContent} = Object.assign({
+        const { eventType, stateKey, evContent } = Object.assign({
             eventType: '',
             stateKey: '',
             evContent: '{\n\n}',
@@ -158,7 +161,7 @@ export class SendCustomEvent extends GenericEditor<ISendCustomEventProps, ISendC
             message = _t('Failed to send custom event.') + ' (' + e.toString() + ')';
         }
         this.setState({ message });
-    }
+    };
 
     render() {
         if (this.state.message) {
@@ -181,14 +184,23 @@ export class SendCustomEvent extends GenericEditor<ISendCustomEventProps, ISendC
 
                 <br />
 
-                <Field id="evContent" label={_t("Event Content")} type="text" className="mx_DevTools_textarea"
-                    autoComplete="off" value={this.state.evContent} onChange={this.onChange} element="textarea" />
+                <Field
+                    id="evContent"
+                    label={_t("Event Content")}
+                    type="text"
+                    className="mx_DevTools_textarea"
+                    autoComplete="off"
+                    value={this.state.evContent}
+                    onChange={this.onChange}
+                    element="textarea" />
             </div>
             <div className="mx_Dialog_buttons">
                 <button onClick={this.onBack}>{ _t('Back') }</button>
                 { !this.state.message && <button onClick={this.send}>{ _t('Send') }</button> }
-                { showTglFlip && <div style={{float: "right"}}>
-                    <input id="isStateEvent" className="mx_DevTools_tgl mx_DevTools_tgl-flip"
+                { showTglFlip && <div style={{ float: "right" }}>
+                    <input
+                        id="isStateEvent"
+                        className="mx_DevTools_tgl mx_DevTools_tgl-flip"
                         type="checkbox"
                         checked={this.state.isStateEvent}
                         onChange={this.onChange}
@@ -228,7 +240,7 @@ class SendAccountData extends GenericEditor<ISendAccountDataProps, ISendAccountD
     constructor(props) {
         super(props);
 
-        const {eventType, evContent} = Object.assign({
+        const { eventType, evContent } = Object.assign({
             eventType: '',
             evContent: '{\n\n}',
         }, this.props.inputs);
@@ -264,7 +276,7 @@ class SendAccountData extends GenericEditor<ISendAccountDataProps, ISendAccountD
             message = _t('Failed to send custom event.') + ' (' + e.toString() + ')';
         }
         this.setState({ message });
-    }
+    };
 
     render() {
         if (this.state.message) {
@@ -281,14 +293,24 @@ class SendAccountData extends GenericEditor<ISendAccountDataProps, ISendAccountD
                 { this.textInput('eventType', _t('Event Type')) }
                 <br />
 
-                <Field id="evContent" label={_t("Event Content")} type="text" className="mx_DevTools_textarea"
-                    autoComplete="off" value={this.state.evContent} onChange={this.onChange} element="textarea" />
+                <Field
+                    id="evContent"
+                    label={_t("Event Content")}
+                    type="text"
+                    className="mx_DevTools_textarea"
+                    autoComplete="off"
+                    value={this.state.evContent}
+                    onChange={this.onChange}
+                    element="textarea"
+                />
             </div>
             <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 && <div style={{float: "right"}}>
-                    <input id="isRoomAccountData" className="mx_DevTools_tgl mx_DevTools_tgl-flip"
+                { !this.state.message && <div style={{ float: "right" }}>
+                    <input
+                        id="isRoomAccountData"
+                        className="mx_DevTools_tgl mx_DevTools_tgl-flip"
                         type="checkbox"
                         checked={this.state.isRoomAccountData}
                         disabled={this.props.forceMode}
@@ -336,7 +358,7 @@ class FilteredList extends React.PureComponent<IFilteredListProps, IFilteredList
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line
         if (this.props.children === nextProps.children && this.props.query === nextProps.query) return;
         this.setState({
             filteredChildren: FilteredList.filterChildren(nextProps.children, nextProps.query),
@@ -369,13 +391,19 @@ class FilteredList extends React.PureComponent<IFilteredListProps, IFilteredList
     };
 
     render() {
-        const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return <div>
-            <Field label={_t('Filter results')} autoFocus={true} size={64}
-                type="text" autoComplete="off" value={this.props.query} onChange={this.onQuery}
+            <Field
+                label={_t('Filter results')}
+                autoFocus={true}
+                size={64}
+                type="text"
+                autoComplete="off"
+                value={this.props.query}
+                onChange={this.onQuery}
                 className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
                 // force re-render so that autoFocus is applied when this component is re-used
-                key={this.props.children[0] ? this.props.children[0].key : ''} />
+                key={this.props.children[0] ? this.props.children[0].key : ''}
+            />
 
             <TruncatedList getChildren={this.getChildren}
                 getChildCount={this.getChildCount}
@@ -442,28 +470,33 @@ class RoomStateExplorer extends React.PureComponent<IExplorerProps, IRoomStateEx
         } else {
             this.props.onBack();
         }
-    }
+    };
 
     private editEv = () => {
         this.setState({ editing: true });
-    }
+    };
 
     private onQueryEventType = (filterEventType: string) => {
         this.setState({ queryEventType: filterEventType });
-    }
+    };
 
     private onQueryStateKey = (filterStateKey: string) => {
         this.setState({ queryStateKey: filterStateKey });
-    }
+    };
 
     render() {
         if (this.state.event) {
             if (this.state.editing) {
-                return <SendCustomEvent room={this.props.room} forceStateEvent={true} onBack={this.onBack} inputs={{
-                    eventType: this.state.event.getType(),
-                    evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
-                    stateKey: this.state.event.getStateKey(),
-                }} />;
+                return <SendCustomEvent
+                    room={this.props.room}
+                    forceStateEvent={true}
+                    onBack={this.onBack}
+                    inputs={{
+                        eventType: this.state.event.getType(),
+                        evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
+                        stateKey: this.state.event.getStateKey(),
+                    }}
+                />;
             }
 
             return <div className="mx_ViewSource">
@@ -494,7 +527,7 @@ class RoomStateExplorer extends React.PureComponent<IExplorerProps, IRoomStateEx
                         }
 
                         return <button className={classes} key={eventType} onClick={onClickFn}>
-                            {eventType}
+                            { eventType }
                         </button>;
                     })
                 }
@@ -525,11 +558,11 @@ class RoomStateExplorer extends React.PureComponent<IExplorerProps, IRoomStateEx
 }
 
 interface IAccountDataExplorerState {
+    [inputId: string]: boolean | string | any;
     isRoomAccountData: boolean;
     event?: MatrixEvent;
     editing: boolean;
     queryEventType: string;
-    [inputId: string]: boolean | string;
 }
 
 class AccountDataExplorer extends React.PureComponent<IExplorerProps, IAccountDataExplorerState> {
@@ -570,19 +603,19 @@ class AccountDataExplorer extends React.PureComponent<IExplorerProps, IAccountDa
         } else {
             this.props.onBack();
         }
-    }
+    };
 
     private onChange = (e: ChangeEvent<HTMLInputElement>) => {
-        this.setState({[e.target.id]: e.target.type === 'checkbox' ? e.target.checked : e.target.value});
-    }
+        this.setState({ [e.target.id]: e.target.type === 'checkbox' ? e.target.checked : e.target.value });
+    };
 
     private editEv = () => {
         this.setState({ editing: true });
-    }
+    };
 
     private onQueryEventType = (queryEventType: string) => {
         this.setState({ queryEventType });
-    }
+    };
 
     render() {
         if (this.state.event) {
@@ -594,7 +627,9 @@ class AccountDataExplorer extends React.PureComponent<IExplorerProps, IAccountDa
                     inputs={{
                         eventType: this.state.event.getType(),
                         evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
-                    }} forceMode={true} />;
+                    }}
+                    forceMode={true}
+                />;
             }
 
             return <div className="mx_ViewSource">
@@ -630,8 +665,10 @@ class AccountDataExplorer extends React.PureComponent<IExplorerProps, IAccountDa
             </div>
             <div className="mx_Dialog_buttons">
                 <button onClick={this.onBack}>{ _t('Back') }</button>
-                <div style={{float: "right"}}>
-                    <input id="isRoomAccountData" className="mx_DevTools_tgl mx_DevTools_tgl-flip"
+                <div style={{ float: "right" }}>
+                    <input
+                        id="isRoomAccountData"
+                        className="mx_DevTools_tgl mx_DevTools_tgl-flip"
                         type="checkbox"
                         checked={this.state.isRoomAccountData}
                         onChange={this.onChange}
@@ -676,7 +713,7 @@ class ServersInRoomList extends React.PureComponent<IExplorerProps, IServersInRo
 
     private onQuery = (query: string) => {
         this.setState({ query });
-    }
+    };
 
     render() {
         return <div>
@@ -704,7 +741,7 @@ const PHASE_MAP = {
 const VerificationRequestExplorer: React.FC<{
     txnId: string;
     request: VerificationRequest;
-}> = ({txnId, request}) => {
+}> = ({ txnId, request }) => {
     const [, updateState] = useState();
     const [timeout, setRequestTimeout] = useState(request.timeout);
 
@@ -726,20 +763,20 @@ const VerificationRequestExplorer: React.FC<{
     return (<div className="mx_DevTools_VerificationRequest">
         <dl>
             <dt>Transaction</dt>
-            <dd>{txnId}</dd>
+            <dd>{ txnId }</dd>
             <dt>Phase</dt>
-            <dd>{PHASE_MAP[request.phase] || request.phase}</dd>
+            <dd>{ PHASE_MAP[request.phase] || request.phase }</dd>
             <dt>Timeout</dt>
-            <dd>{Math.floor(timeout / 1000)}</dd>
+            <dd>{ Math.floor(timeout / 1000) }</dd>
             <dt>Methods</dt>
-            <dd>{request.methods && request.methods.join(", ")}</dd>
+            <dd>{ request.methods && request.methods.join(", ") }</dd>
             <dt>requestingUserId</dt>
-            <dd>{request.requestingUserId}</dd>
+            <dd>{ request.requestingUserId }</dd>
             <dt>observeOnly</dt>
-            <dd>{JSON.stringify(request.observeOnly)}</dd>
+            <dd>{ JSON.stringify(request.observeOnly) }</dd>
         </dl>
     </div>);
-}
+};
 
 class VerificationExplorer extends React.PureComponent<IExplorerProps> {
     static getLabel() {
@@ -751,7 +788,7 @@ class VerificationExplorer extends React.PureComponent<IExplorerProps> {
 
     private onNewRequest = () => {
         this.forceUpdate();
-    }
+    };
 
     componentDidMount() {
         const cli = this.context;
@@ -766,17 +803,17 @@ class VerificationExplorer extends React.PureComponent<IExplorerProps> {
     render() {
         const cli = this.context;
         const room = this.props.room;
-        const inRoomChannel = cli.crypto._inRoomVerificationRequests;
+        const inRoomChannel = cli.crypto.inRoomVerificationRequests;
         const inRoomRequests = (inRoomChannel._requestsByRoomId || new Map()).get(room.roomId) || new Map();
 
         return (<div>
             <div className="mx_Dialog_content">
-                {Array.from(inRoomRequests.entries()).reverse().map(([txnId, request]) =>
+                { Array.from(inRoomRequests.entries()).reverse().map(([txnId, request]) =>
                     <VerificationRequestExplorer txnId={txnId} request={request} key={txnId} />,
-                )}
+                ) }
             </div>
             <div className="mx_Dialog_buttons">
-                <button onClick={this.props.onBack}>{_t("Back")}</button>
+                <button onClick={this.props.onBack}>{ _t("Back") }</button>
             </div>
         </div>);
     }
@@ -806,17 +843,17 @@ class WidgetExplorer extends React.Component<IExplorerProps, IWidgetExplorerStat
     };
 
     private onQueryChange = (query: string) => {
-        this.setState({query});
+        this.setState({ query });
     };
 
     private onEditWidget = (widget: IApp) => {
-        this.setState({editWidget: widget});
+        this.setState({ editWidget: widget });
     };
 
     private onBack = () => {
         const widgets = WidgetStore.instance.getApps(this.props.room.roomId);
         if (this.state.editWidget && widgets.includes(this.state.editWidget)) {
-            this.setState({editWidget: null});
+            this.setState({ editWidget: null });
         } else {
             this.props.onBack();
         }
@@ -844,9 +881,9 @@ class WidgetExplorer extends React.Component<IExplorerProps, IWidgetExplorerStat
             const stateEv = allState.find(ev => ev.getId() === editWidget.eventId);
             if (!stateEv) { // "should never happen"
                 return <div>
-                    {_t("There was an error finding this widget.")}
+                    { _t("There was an error finding this widget.") }
                     <div className="mx_Dialog_buttons">
-                        <button onClick={this.onBack}>{_t("Back")}</button>
+                        <button onClick={this.onBack}>{ _t("Back") }</button>
                     </div>
                 </div>;
             }
@@ -865,17 +902,17 @@ class WidgetExplorer extends React.Component<IExplorerProps, IWidgetExplorerStat
         return (<div>
             <div className="mx_Dialog_content">
                 <FilteredList query={this.state.query} onChange={this.onQueryChange}>
-                    {widgets.map(w => {
+                    { widgets.map(w => {
                         return <button
                             className='mx_DevTools_RoomStateExplorer_button'
                             key={w.url + w.eventId}
                             onClick={() => this.onEditWidget(w)}
-                        >{w.url}</button>;
-                    })}
+                        >{ w.url }</button>;
+                    }) }
                 </FilteredList>
             </div>
             <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>{_t("Back")}</button>
+                <button onClick={this.onBack}>{ _t("Back") }</button>
             </div>
         </div>);
     }
@@ -908,22 +945,22 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
     }
 
     private onQueryChange = (ev: ChangeEvent<HTMLInputElement>) => {
-        this.setState({query: ev.target.value});
+        this.setState({ query: ev.target.value });
     };
 
     private onExplValuesEdit = (ev: ChangeEvent<HTMLTextAreaElement>) => {
-        this.setState({explicitValues: ev.target.value});
+        this.setState({ explicitValues: ev.target.value });
     };
 
     private onExplRoomValuesEdit = (ev: ChangeEvent<HTMLTextAreaElement>) => {
-        this.setState({explicitRoomValues: ev.target.value});
+        this.setState({ explicitRoomValues: ev.target.value });
     };
 
     private onBack = () => {
         if (this.state.editSetting) {
-            this.setState({editSetting: null});
+            this.setState({ editSetting: null });
         } else if (this.state.viewSetting) {
-            this.setState({viewSetting: null});
+            this.setState({ viewSetting: null });
         } else {
             this.props.onBack();
         }
@@ -931,7 +968,7 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
 
     private onViewClick = (ev: MouseEvent, settingId: string) => {
         ev.preventDefault();
-        this.setState({viewSetting: settingId});
+        this.setState({ viewSetting: settingId });
     };
 
     private onEditClick = (ev: MouseEvent, settingId: string) => {
@@ -949,7 +986,7 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
             const parsedExplicit = JSON.parse(this.state.explicitValues);
             const parsedExplicitRoom = JSON.parse(this.state.explicitRoomValues);
             for (const level of Object.keys(parsedExplicit)) {
-                console.log(`[Devtools] Setting value of ${settingId} at ${level} from user input`);
+                logger.log(`[Devtools] Setting value of ${settingId} at ${level} from user input`);
                 try {
                     const val = parsedExplicit[level];
                     await SettingsStore.setValue(settingId, null, level as SettingLevel, val);
@@ -959,7 +996,7 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
             }
             const roomId = this.props.room.roomId;
             for (const level of Object.keys(parsedExplicit)) {
-                console.log(`[Devtools] Setting value of ${settingId} at ${level} in ${roomId} from user input`);
+                logger.log(`[Devtools] Setting value of ${settingId} at ${level} in ${roomId} from user input`);
                 try {
                     const val = parsedExplicitRoom[level];
                     await SettingsStore.setValue(settingId, roomId, level as SettingLevel, val);
@@ -1007,7 +1044,7 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
     private renderCanEditLevel(roomId: string, level: SettingLevel): React.ReactNode {
         const canEdit = SettingsStore.canSetValue(this.state.editSetting, roomId, level);
         const className = canEdit ? 'mx_DevTools_SettingsExplorer_mutable' : 'mx_DevTools_SettingsExplorer_immutable';
-        return <td className={className}><code>{canEdit.toString()}</code></td>;
+        return <td className={className}><code>{ canEdit.toString() }</code></td>;
     }
 
     render() {
@@ -1021,46 +1058,53 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
                 <div>
                     <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
                         <Field
-                            label={_t('Filter results')} autoFocus={true} size={64}
-                            type="text" autoComplete="off" value={this.state.query} onChange={this.onQueryChange}
+                            label={_t('Filter results')}
+                            autoFocus={true}
+                            size={64}
+                            type="text"
+                            autoComplete="off"
+                            value={this.state.query}
+                            onChange={this.onQueryChange}
                             className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
                         />
                         <table>
                             <thead>
                                 <tr>
-                                    <th>{_t("Setting ID")}</th>
-                                    <th>{_t("Value")}</th>
-                                    <th>{_t("Value in this room")}</th>
+                                    <th>{ _t("Setting ID") }</th>
+                                    <th>{ _t("Value") }</th>
+                                    <th>{ _t("Value in this room") }</th>
                                 </tr>
                             </thead>
                             <tbody>
-                                {allSettings.map(i => (
+                                { allSettings.map(i => (
                                     <tr key={i}>
                                         <td>
                                             <a href="" onClick={(e) => this.onViewClick(e, i)}>
-                                                <code>{i}</code>
+                                                <code>{ i }</code>
                                             </a>
-                                            <a href="" onClick={(e) => this.onEditClick(e, i)}
+                                            <a
+                                                href=""
+                                                onClick={(e) => this.onEditClick(e, i)}
                                                 className='mx_DevTools_SettingsExplorer_edit'
                                             >
                                             ✏
                                             </a>
                                         </td>
                                         <td>
-                                            <code>{this.renderSettingValue(SettingsStore.getValue(i))}</code>
+                                            <code>{ this.renderSettingValue(SettingsStore.getValue(i)) }</code>
                                         </td>
                                         <td>
                                             <code>
-                                                {this.renderSettingValue(SettingsStore.getValue(i, room.roomId))}
+                                                { this.renderSettingValue(SettingsStore.getValue(i, room.roomId)) }
                                             </code>
                                         </td>
                                     </tr>
-                                ))}
+                                )) }
                             </tbody>
                         </table>
                     </div>
                     <div className="mx_Dialog_buttons">
-                        <button onClick={this.onBack}>{_t("Back")}</button>
+                        <button onClick={this.onBack}>{ _t("Back") }</button>
                     </div>
                 </div>
             );
@@ -1068,62 +1112,70 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
             return (
                 <div>
                     <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
-                        <h3>{_t("Setting:")} <code>{this.state.editSetting}</code></h3>
+                        <h3>{ _t("Setting:") } <code>{ this.state.editSetting }</code></h3>
 
                         <div className='mx_DevTools_SettingsExplorer_warning'>
-                            <b>{_t("Caution:")}</b> {_t(
+                            <b>{ _t("Caution:") }</b> { _t(
                                 "This UI does NOT check the types of the values. Use at your own risk.",
-                            )}
+                            ) }
                         </div>
 
                         <div>
-                            {_t("Setting definition:")}
-                            <pre><code>{JSON.stringify(SETTINGS[this.state.editSetting], null, 4)}</code></pre>
+                            { _t("Setting definition:") }
+                            <pre><code>{ JSON.stringify(SETTINGS[this.state.editSetting], null, 4) }</code></pre>
                         </div>
 
                         <div>
                             <table>
                                 <thead>
                                     <tr>
-                                        <th>{_t("Level")}</th>
-                                        <th>{_t("Settable at global")}</th>
-                                        <th>{_t("Settable at room")}</th>
+                                        <th>{ _t("Level") }</th>
+                                        <th>{ _t("Settable at global") }</th>
+                                        <th>{ _t("Settable at room") }</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    {LEVEL_ORDER.map(lvl => (
+                                    { LEVEL_ORDER.map(lvl => (
                                         <tr key={lvl}>
-                                            <td><code>{lvl}</code></td>
-                                            {this.renderCanEditLevel(null, lvl)}
-                                            {this.renderCanEditLevel(room.roomId, lvl)}
+                                            <td><code>{ lvl }</code></td>
+                                            { this.renderCanEditLevel(null, lvl) }
+                                            { this.renderCanEditLevel(room.roomId, lvl) }
                                         </tr>
-                                    ))}
+                                    )) }
                                 </tbody>
                             </table>
                         </div>
 
                         <div>
                             <Field
-                                id="valExpl" label={_t("Values at explicit levels")} type="text"
-                                className="mx_DevTools_textarea" element="textarea"
-                                autoComplete="off" value={this.state.explicitValues}
+                                id="valExpl"
+                                label={_t("Values at explicit levels")}
+                                type="text"
+                                className="mx_DevTools_textarea"
+                                element="textarea"
+                                autoComplete="off"
+                                value={this.state.explicitValues}
                                 onChange={this.onExplValuesEdit}
                             />
                         </div>
 
                         <div>
                             <Field
-                                id="valExpl" label={_t("Values at explicit levels in this room")} type="text"
-                                className="mx_DevTools_textarea" element="textarea"
-                                autoComplete="off" value={this.state.explicitRoomValues}
+                                id="valExpl"
+                                label={_t("Values at explicit levels in this room")}
+                                type="text"
+                                className="mx_DevTools_textarea"
+                                element="textarea"
+                                autoComplete="off"
+                                value={this.state.explicitRoomValues}
                                 onChange={this.onExplRoomValuesEdit}
                             />
                         </div>
 
                     </div>
                     <div className="mx_Dialog_buttons">
-                        <button onClick={this.onSaveClick}>{_t("Save setting values")}</button>
-                        <button onClick={this.onBack}>{_t("Back")}</button>
+                        <button onClick={this.onSaveClick}>{ _t("Save setting values") }</button>
+                        <button onClick={this.onBack}>{ _t("Back") }</button>
                     </div>
                 </div>
             );
@@ -1131,39 +1183,39 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
             return (
                 <div>
                     <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
-                        <h3>{_t("Setting:")} <code>{this.state.viewSetting}</code></h3>
+                        <h3>{ _t("Setting:") } <code>{ this.state.viewSetting }</code></h3>
 
                         <div>
-                            {_t("Setting definition:")}
-                            <pre><code>{JSON.stringify(SETTINGS[this.state.viewSetting], null, 4)}</code></pre>
+                            { _t("Setting definition:") }
+                            <pre><code>{ JSON.stringify(SETTINGS[this.state.viewSetting], null, 4) }</code></pre>
                         </div>
 
                         <div>
-                            {_t("Value:")}&nbsp;
-                            <code>{this.renderSettingValue(
+                            { _t("Value:") }&nbsp;
+                            <code>{ this.renderSettingValue(
                                 SettingsStore.getValue(this.state.viewSetting),
-                            )}</code>
+                            ) }</code>
                         </div>
 
                         <div>
-                            {_t("Value in this room:")}&nbsp;
-                            <code>{this.renderSettingValue(
+                            { _t("Value in this room:") }&nbsp;
+                            <code>{ this.renderSettingValue(
                                 SettingsStore.getValue(this.state.viewSetting, room.roomId),
-                            )}</code>
+                            ) }</code>
                         </div>
 
                         <div>
-                            {_t("Values at explicit levels:")}
-                            <pre><code>{this.renderExplicitSettingValues(
+                            { _t("Values at explicit levels:") }
+                            <pre><code>{ this.renderExplicitSettingValues(
                                 this.state.viewSetting, null,
-                            )}</code></pre>
+                            ) }</code></pre>
                         </div>
 
                         <div>
-                            {_t("Values at explicit levels in this room:")}
-                            <pre><code>{this.renderExplicitSettingValues(
+                            { _t("Values at explicit levels in this room:") }
+                            <pre><code>{ this.renderExplicitSettingValues(
                                 this.state.viewSetting, room.roomId,
-                            )}</code></pre>
+                            ) }</code></pre>
                         </div>
 
                     </div>
@@ -1171,7 +1223,7 @@ class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExpl
                         <button onClick={(e) => this.onEditClick(e, this.state.viewSetting)}>{
                             _t("Edit Values")
                         }</button>
-                        <button onClick={this.onBack}>{_t("Back")}</button>
+                        <button onClick={this.onBack}>{ _t("Back") }</button>
                     </div>
                 </div>
             );
@@ -1221,23 +1273,23 @@ export default class DevtoolsDialog extends React.PureComponent<IProps, IState>
 
     private onBack = () => {
         this.setState({ mode: null });
-    }
+    };
 
     private onCancel = () => {
         this.props.onFinished(false);
-    }
+    };
 
     render() {
         let body;
 
         if (this.state.mode) {
             body = <MatrixClientContext.Consumer>
-                {(cli) => <React.Fragment>
+                { (cli) => <React.Fragment>
                     <div className="mx_DevTools_label_left">{ this.state.mode.getLabel() }</div>
                     <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
                     <div className="mx_DevTools_label_bottom" />
                     <this.state.mode onBack={this.onBack} room={cli.getRoom(this.props.roomId)} />
-                </React.Fragment>}
+                </React.Fragment> }
             </MatrixClientContext.Consumer>;
         } else {
             const classes = "mx_DevTools_RoomStateExplorer_button";
@@ -1261,7 +1313,6 @@ export default class DevtoolsDialog extends React.PureComponent<IProps, IState>
             </React.Fragment>;
         }
 
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title={_t('Developer Tools')}>
                 { body }
diff --git a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
index ee3696b427..a0e6046d71 100644
--- a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
+++ b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
@@ -23,8 +23,8 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import FlairStore from "../../../stores/FlairStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 interface IProps extends IDialogProps {
     communityId: string;
@@ -60,7 +60,7 @@ export default class EditCommunityPrototypeDialog extends React.PureComponent<IP
     }
 
     private onNameChange = (ev: ChangeEvent<HTMLInputElement>) => {
-        this.setState({name: ev.target.value});
+        this.setState({ name: ev.target.value });
     };
 
     private onSubmit = async (ev) => {
@@ -71,7 +71,7 @@ export default class EditCommunityPrototypeDialog extends React.PureComponent<IP
 
         // We'll create the community now to see if it's taken, leaving it active in
         // the background for the user to look at while they invite people.
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             let avatarUrl = this.state.currentAvatarUrl || ""; // must be a string for synapse to accept it
             if (this.state.avatarFile) {
@@ -99,13 +99,13 @@ export default class EditCommunityPrototypeDialog extends React.PureComponent<IP
 
     private onAvatarChanged = (e: ChangeEvent<HTMLInputElement>) => {
         if (!e.target.files || !e.target.files.length) {
-            this.setState({avatarFile: null});
+            this.setState({ avatarFile: null });
         } else {
-            this.setState({busy: true});
+            this.setState({ busy: true });
             const file = e.target.files[0];
             const reader = new FileReader();
             reader.onload = (ev: ProgressEvent<FileReader>) => {
-                this.setState({avatarFile: file, busy: false, avatarPreview: ev.target.result as string});
+                this.setState({ avatarFile: file, busy: false, avatarPreview: ev.target.result as string });
             };
             reader.readAsDataURL(file);
         }
@@ -122,7 +122,7 @@ export default class EditCommunityPrototypeDialog extends React.PureComponent<IP
                 const url = mediaFromMxc(this.state.currentAvatarUrl).srcHttp;
                 preview = <img src={url} className="mx_EditCommunityPrototypeDialog_avatar" />;
             } else {
-                preview = <div className="mx_EditCommunityPrototypeDialog_placeholderAvatar" />
+                preview = <div className="mx_EditCommunityPrototypeDialog_placeholderAvatar" />;
             }
         }
 
@@ -144,23 +144,25 @@ export default class EditCommunityPrototypeDialog extends React.PureComponent<IP
                         </div>
                         <div className="mx_EditCommunityPrototypeDialog_rowAvatar">
                             <input
-                                type="file" style={{display: "none"}}
-                                ref={this.avatarUploadRef} accept="image/*"
+                                type="file"
+                                style={{ display: "none" }}
+                                ref={this.avatarUploadRef}
+                                accept="image/*"
                                 onChange={this.onAvatarChanged}
                             />
                             <AccessibleButton
                                 onClick={this.onChangeAvatar}
                                 className="mx_EditCommunityPrototypeDialog_avatarContainer"
-                            >{preview}</AccessibleButton>
+                            >{ preview }</AccessibleButton>
                             <div className="mx_EditCommunityPrototypeDialog_tip">
-                                <b>{_t("Add image (optional)")}</b>
+                                <b>{ _t("Add image (optional)") }</b>
                                 <span>
-                                    {_t("An image will help people identify your community.")}
+                                    { _t("An image will help people identify your community.") }
                                 </span>
                             </div>
                         </div>
                         <AccessibleButton kind="primary" onClick={this.onSubmit} disabled={this.state.busy}>
-                            {_t("Save")}
+                            { _t("Save") }
                         </AccessibleButton>
                     </div>
                 </form>
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.tsx
similarity index 73%
rename from src/components/views/dialogs/ErrorDialog.js
rename to src/components/views/dialogs/ErrorDialog.tsx
index 5197c68b5a..56cd76237f 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.tsx
@@ -26,38 +26,37 @@ limitations under the License.
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+    title?: string;
+    description?: React.ReactNode;
+    button?: string;
+    focus?: boolean;
+    headerImage?: string;
+}
+
+interface IState {
+    onFinished: (success: boolean) => void;
+}
 
 @replaceableComponent("views.dialogs.ErrorDialog")
-export default class ErrorDialog extends React.Component {
-    static propTypes = {
-        title: PropTypes.string,
-        description: PropTypes.oneOfType([
-            PropTypes.element,
-            PropTypes.string,
-        ]),
-        button: PropTypes.string,
-        focus: PropTypes.bool,
-        onFinished: PropTypes.func.isRequired,
-        headerImage: PropTypes.string,
-    };
-
-    static defaultProps = {
+export default class ErrorDialog extends React.Component<IProps, IState> {
+    public static defaultProps = {
         focus: true,
         title: null,
         description: null,
         button: null,
     };
 
-    onClick = () => {
+    private onClick = () => {
         this.props.onFinished(true);
     };
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+    public render() {
         return (
             <BaseDialog
                 className="mx_ErrorDialog"
diff --git a/src/components/views/dialogs/ExportDialog.tsx b/src/components/views/dialogs/ExportDialog.tsx
new file mode 100644
index 0000000000..33a14887fb
--- /dev/null
+++ b/src/components/views/dialogs/ExportDialog.tsx
@@ -0,0 +1,397 @@
+/*
+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 { Room } from "matrix-js-sdk/src";
+import { _t } from "../../../languageHandler";
+import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import Field from "../elements/Field";
+import StyledRadioGroup from "../elements/StyledRadioGroup";
+import StyledCheckbox from "../elements/StyledCheckbox";
+import {
+    ExportFormat,
+    ExportType,
+    textForFormat,
+    textForType,
+} from "../../../utils/exportUtils/exportUtils";
+import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
+import HTMLExporter from "../../../utils/exportUtils/HtmlExport";
+import JSONExporter from "../../../utils/exportUtils/JSONExport";
+import PlainTextExporter from "../../../utils/exportUtils/PlainTextExport";
+import { useStateCallback } from "../../../hooks/useStateCallback";
+import Exporter from "../../../utils/exportUtils/Exporter";
+import Spinner from "../elements/Spinner";
+import InfoDialog from "./InfoDialog";
+
+interface IProps extends IDialogProps {
+    room: Room;
+}
+
+const ExportDialog: React.FC<IProps> = ({ room, onFinished }) => {
+    const [exportFormat, setExportFormat] = useState(ExportFormat.Html);
+    const [exportType, setExportType] = useState(ExportType.Timeline);
+    const [includeAttachments, setAttachments] = useState(false);
+    const [isExporting, setExporting] = useState(false);
+    const [numberOfMessages, setNumberOfMessages] = useState<number>(100);
+    const [sizeLimit, setSizeLimit] = useState<number | null>(8);
+    const sizeLimitRef = useRef<Field>();
+    const messageCountRef = useRef<Field>();
+    const [exportProgressText, setExportProgressText] = useState("Processing...");
+    const [displayCancel, setCancelWarning] = useState(false);
+    const [exportCancelled, setExportCancelled] = useState(false);
+    const [exportSuccessful, setExportSuccessful] = useState(false);
+    const [exporter, setExporter] = useStateCallback<Exporter>(
+        null,
+        async (exporter: Exporter) => {
+            await exporter?.export().then(() => {
+                if (!exportCancelled) setExportSuccessful(true);
+            });
+        },
+    );
+
+    const startExport = async () => {
+        const exportOptions = {
+            numberOfMessages,
+            attachmentsIncluded: includeAttachments,
+            maxSize: sizeLimit * 1024 * 1024,
+        };
+        switch (exportFormat) {
+            case ExportFormat.Html:
+                setExporter(
+                    new HTMLExporter(
+                        room,
+                        ExportType[exportType],
+                        exportOptions,
+                        setExportProgressText,
+                    ),
+                );
+                break;
+            case ExportFormat.Json:
+                setExporter(
+                    new JSONExporter(
+                        room,
+                        ExportType[exportType],
+                        exportOptions,
+                        setExportProgressText,
+                    ),
+                );
+                break;
+            case ExportFormat.PlainText:
+                setExporter(
+                    new PlainTextExporter(
+                        room,
+                        ExportType[exportType],
+                        exportOptions,
+                        setExportProgressText,
+                    ),
+                );
+                break;
+            default:
+                console.error("Unknown export format");
+                return;
+        }
+    };
+
+    const onExportClick = async () => {
+        const isValidSize = await sizeLimitRef.current.validate({
+            focused: false,
+        });
+        if (!isValidSize) {
+            sizeLimitRef.current.validate({ focused: true });
+            return;
+        }
+        if (exportType === ExportType.LastNMessages) {
+            const isValidNumberOfMessages =
+                await messageCountRef.current.validate({ focused: false });
+            if (!isValidNumberOfMessages) {
+                messageCountRef.current.validate({ focused: true });
+                return;
+            }
+        }
+        setExporting(true);
+        await startExport();
+    };
+
+    const validateSize = withValidation({
+        rules: [
+            {
+                key: "required",
+                test({ value, allowEmpty }) {
+                    return allowEmpty || !!value;
+                },
+                invalid: () => {
+                    const min = 1;
+                    const max = 10 ** 8;
+                    return _t("Enter a number between %(min)s and %(max)s", {
+                        min,
+                        max,
+                    });
+                },
+            }, {
+                key: "number",
+                test: ({ value }) => {
+                    const parsedSize = parseFloat(value);
+                    const min = 1;
+                    const max = 2000;
+                    return !(isNaN(parsedSize) || min > parsedSize || parsedSize > max);
+                },
+                invalid: () => {
+                    const min = 1;
+                    const max = 2000;
+                    return _t(
+                        "Size can only be a number between %(min)s MB and %(max)s MB",
+                        { min, max },
+                    );
+                },
+            },
+        ],
+    });
+
+    const onValidateSize = async (fieldState: IFieldState): Promise<IValidationResult> => {
+        const result = await validateSize(fieldState);
+        return result;
+    };
+
+    const validateNumberOfMessages = withValidation({
+        rules: [
+            {
+                key: "required",
+                test({ value, allowEmpty }) {
+                    return allowEmpty || !!value;
+                },
+                invalid: () => {
+                    const min = 1;
+                    const max = 10 ** 8;
+                    return _t("Enter a number between %(min)s and %(max)s", {
+                        min,
+                        max,
+                    });
+                },
+            }, {
+                key: "number",
+                test: ({ value }) => {
+                    const parsedSize = parseFloat(value);
+                    const min = 1;
+                    const max = 10 ** 8;
+                    if (isNaN(parsedSize)) return false;
+                    return !(min > parsedSize || parsedSize > max);
+                },
+                invalid: () => {
+                    const min = 1;
+                    const max = 10 ** 8;
+                    return _t(
+                        "Number of messages can only be a number between %(min)s and %(max)s",
+                        { min, max },
+                    );
+                },
+            },
+        ],
+    });
+
+    const onValidateNumberOfMessages = async (fieldState: IFieldState): Promise<IValidationResult> => {
+        const result = await validateNumberOfMessages(fieldState);
+        return result;
+    };
+
+    const onCancel = async () => {
+        if (isExporting) setCancelWarning(true);
+        else onFinished(false);
+    };
+
+    const confirmCanel = async () => {
+        await exporter?.cancelExport();
+        setExportCancelled(true);
+        setExporting(false);
+        setExporter(null);
+    };
+
+    const exportFormatOptions = Object.keys(ExportFormat).map((format) => ({
+        value: ExportFormat[format],
+        label: textForFormat(ExportFormat[format]),
+    }));
+
+    const exportTypeOptions = Object.keys(ExportType).map((type) => {
+        return (
+            <option key={type} value={ExportType[type]}>
+                { textForType(ExportType[type]) }
+            </option>
+        );
+    });
+
+    let messageCount = null;
+    if (exportType === ExportType.LastNMessages) {
+        messageCount = (
+            <Field
+                element="input"
+                type="number"
+                value={numberOfMessages.toString()}
+                ref={messageCountRef}
+                onValidate={onValidateNumberOfMessages}
+                label={_t("Number of messages")}
+                onChange={(e) => {
+                    setNumberOfMessages(parseInt(e.target.value));
+                }}
+            />
+        );
+    }
+
+    const sizePostFix = <span>{ _t("MB") }</span>;
+
+    if (exportCancelled) {
+        // Display successful cancellation message
+        return (
+            <InfoDialog
+                title={_t("Export Successful")}
+                description={_t("The export was cancelled successfully")}
+                hasCloseButton={true}
+                onFinished={onFinished}
+            />
+        );
+    } else if (exportSuccessful) {
+        // Display successful export message
+        return (
+            <InfoDialog
+                title={_t("Export Successful")}
+                description={_t(
+                    "Your export was successful. Find it in your Downloads folder.",
+                )}
+                hasCloseButton={true}
+                onFinished={onFinished}
+            />
+        );
+    } else if (displayCancel) {
+        // Display cancel warning
+        return (
+            <BaseDialog
+                title={_t("Warning")}
+                className="mx_ExportDialog"
+                contentId="mx_Dialog_content"
+                onFinished={onFinished}
+                fixedWidth={true}
+            >
+                <p>
+                    { _t(
+                        "Are you sure you want to stop exporting your data? If you do, you'll need to start over.",
+                    ) }
+                </p>
+                <DialogButtons
+                    primaryButton={_t("Stop")}
+                    primaryButtonClass="danger"
+                    hasCancel={true}
+                    cancelButton={_t("Continue")}
+                    onCancel={() => setCancelWarning(false)}
+                    onPrimaryButtonClick={confirmCanel}
+                />
+            </BaseDialog>
+        );
+    } else {
+        // Display export settings
+        return (
+            <BaseDialog
+                title={isExporting ? _t("Exporting your data") : _t("Export Chat")}
+                className={`mx_ExportDialog ${isExporting && "mx_ExportDialog_Exporting"}`}
+                contentId="mx_Dialog_content"
+                hasCancel={true}
+                onFinished={onFinished}
+                fixedWidth={true}
+            >
+                { !isExporting ? <p>
+                    { _t(
+                        "Select from the options below to export chats from your timeline",
+                    ) }
+                </p> : null }
+
+                <span className="mx_ExportDialog_subheading">
+                    { _t("Format") }
+                </span>
+
+                <div className="mx_ExportDialog_options">
+                    <StyledRadioGroup
+                        name="exportFormat"
+                        value={exportFormat}
+                        onChange={(key) => setExportFormat(ExportFormat[key])}
+                        definitions={exportFormatOptions}
+                    />
+
+                    <span className="mx_ExportDialog_subheading">
+                        { _t("Messages") }
+                    </span>
+
+                    <Field
+                        element="select"
+                        value={exportType}
+                        onChange={(e) => {
+                            setExportType(ExportType[e.target.value]);
+                        }}
+                    >
+                        { exportTypeOptions }
+                    </Field>
+                    { messageCount }
+
+                    <span className="mx_ExportDialog_subheading">
+                        { _t("Size Limit") }
+                    </span>
+
+                    <Field
+                        type="number"
+                        autoComplete="off"
+                        onValidate={onValidateSize}
+                        element="input"
+                        ref={sizeLimitRef}
+                        value={sizeLimit.toString()}
+                        postfixComponent={sizePostFix}
+                        onChange={(e) => setSizeLimit(parseInt(e.target.value))}
+                    />
+
+                    <StyledCheckbox
+                        checked={includeAttachments}
+                        onChange={(e) =>
+                            setAttachments(
+                                (e.target as HTMLInputElement).checked,
+                            )
+                        }
+                    >
+                        { _t("Include Attachments") }
+                    </StyledCheckbox>
+                </div>
+                { isExporting ? (
+                    <div className="mx_ExportDialog_progress">
+                        <Spinner w={24} h={24} />
+                        <p>
+                            { exportProgressText }
+                        </p>
+                        <DialogButtons
+                            primaryButton={_t("Cancel")}
+                            primaryButtonClass="danger"
+                            hasCancel={false}
+                            onPrimaryButtonClick={onCancel}
+                        />
+                    </div>
+                ) : (
+                    <DialogButtons
+                        primaryButton={_t("Export")}
+                        onPrimaryButtonClick={onExportClick}
+                        onCancel={() => onFinished(false)}
+                    />
+                ) }
+            </BaseDialog>
+        );
+    }
+};
+
+export default ExportDialog;
diff --git a/src/components/views/dialogs/FeedbackDialog.js b/src/components/views/dialogs/FeedbackDialog.tsx
similarity index 78%
rename from src/components/views/dialogs/FeedbackDialog.js
rename to src/components/views/dialogs/FeedbackDialog.tsx
index d80a935573..e7089283e4 100644
--- a/src/components/views/dialogs/FeedbackDialog.js
+++ b/src/components/views/dialogs/FeedbackDialog.tsx
@@ -14,36 +14,38 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState} from 'react';
+import React, { useState } from 'react';
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
 import AccessibleButton from "../elements/AccessibleButton";
-import CountlyAnalytics from "../../../CountlyAnalytics";
+import CountlyAnalytics, { Rating } from "../../../CountlyAnalytics";
 import SdkConfig from "../../../SdkConfig";
 import Modal from "../../../Modal";
 import BugReportDialog from "./BugReportDialog";
 import InfoDialog from "./InfoDialog";
 import StyledRadioGroup from "../elements/StyledRadioGroup";
+import { IDialogProps } from "./IDialogProps";
 
 const existingIssuesUrl = "https://github.com/vector-im/element-web/issues" +
     "?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
-const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
+const newIssueUrl = "https://github.com/vector-im/element-web/issues/new/choose";
 
+interface IProps extends IDialogProps {}
 
-export default (props) => {
-    const [rating, setRating] = useState("");
-    const [comment, setComment] = useState("");
+const FeedbackDialog: React.FC<IProps> = (props: IProps) => {
+    const [rating, setRating] = useState<Rating>();
+    const [comment, setComment] = useState<string>("");
 
-    const onDebugLogsLinkClick = () => {
+    const onDebugLogsLinkClick = (): void => {
         props.onFinished();
         Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {});
     };
 
     const hasFeedback = CountlyAnalytics.instance.canEnable();
-    const onFinished = (sendFeedback) => {
+    const onFinished = (sendFeedback: boolean): void => {
         if (hasFeedback && sendFeedback) {
-            CountlyAnalytics.instance.reportFeedback(parseInt(rating, 10), comment);
+            CountlyAnalytics.instance.reportFeedback(rating, comment);
             Modal.createTrackedDialog('Feedback sent', '', InfoDialog, {
                 title: _t('Feedback sent'),
                 description: _t('Thank you!'),
@@ -59,15 +61,15 @@ export default (props) => {
         countlyFeedbackSection = <React.Fragment>
             <hr />
             <div className="mx_FeedbackDialog_section mx_FeedbackDialog_rateApp">
-                <h3>{_t("Rate %(brand)s", { brand })}</h3>
+                <h3>{ _t("Rate %(brand)s", { brand }) }</h3>
 
-                <p>{_t("Tell us below how you feel about %(brand)s so far.", { brand })}</p>
-                <p>{_t("Please go into as much detail as you like, so we can track down the problem.")}</p>
+                <p>{ _t("Tell us below how you feel about %(brand)s so far.", { brand }) }</p>
+                <p>{ _t("Please go into as much detail as you like, so we can track down the problem.") }</p>
 
                 <StyledRadioGroup
                     name="feedbackRating"
-                    value={rating}
-                    onChange={setRating}
+                    value={String(rating)}
+                    onChange={(r) => setRating(parseInt(r, 10) as Rating)}
                     definitions={[
                         { value: "1", label: "😠" },
                         { value: "2", label: "😞" },
@@ -96,7 +98,7 @@ export default (props) => {
     let subheading;
     if (hasFeedback) {
         subheading = (
-            <h2>{_t("There are two ways you can provide feedback and help us improve %(brand)s.", { brand })}</h2>
+            <h2>{ _t("There are two ways you can provide feedback and help us improve %(brand)s.", { brand }) }</h2>
         );
     }
 
@@ -107,7 +109,7 @@ export default (props) => {
                 _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>
+                        <AccessibleButton kind="link" onClick={onDebugLogsLinkClick}>{ sub }</AccessibleButton>
                     ),
                 })
             }</p>
@@ -122,7 +124,7 @@ export default (props) => {
             { subheading }
 
             <div className="mx_FeedbackDialog_section mx_FeedbackDialog_reportBug">
-                <h3>{_t("Report a bug")}</h3>
+                <h3>{ _t("Report a bug") }</h3>
                 <p>{
                     _t("Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. " +
                         "No match? <newIssueLink>Start a new one</newIssueLink>.", {}, {
@@ -134,12 +136,14 @@ export default (props) => {
                         },
                     })
                 }</p>
-                {bugReports}
+                { bugReports }
             </div>
             { countlyFeedbackSection }
         </React.Fragment>}
         button={hasFeedback ? _t("Send feedback") : _t("Go back")}
-        buttonDisabled={hasFeedback && rating === ""}
+        buttonDisabled={hasFeedback && !rating}
         onFinished={onFinished}
     />);
 };
+
+export default FeedbackDialog;
diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx
new file mode 100644
index 0000000000..7f08a3eb58
--- /dev/null
+++ b/src/components/views/dialogs/ForwardDialog.tsx
@@ -0,0 +1,274 @@
+/*
+Copyright 2021 Robin Townsend <robin@robin.town>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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, useState, useEffect } from "react";
+import classnames from "classnames";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
+import { _t } from "../../../languageHandler";
+import dis from "../../../dispatcher/dispatcher";
+import { useSettingValue, useFeatureEnabled } from "../../../hooks/useSettings";
+import { UIFeature } from "../../../settings/UIFeature";
+import { Layout } from "../../../settings/Layout";
+import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import { avatarUrlForUser } from "../../../Avatar";
+import EventTile from "../rooms/EventTile";
+import SearchBox from "../../structures/SearchBox";
+import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
+import { Alignment } from '../elements/Tooltip';
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
+import NotificationBadge from "../rooms/NotificationBadge";
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { sortRooms } from "../../../stores/room-list/algorithms/tag-sorting/RecentAlgorithm";
+import QueryMatcher from "../../../autocomplete/QueryMatcher";
+import TruncatedList from "../elements/TruncatedList";
+import EntityTile from "../rooms/EntityTile";
+import BaseAvatar from "../avatars/BaseAvatar";
+import SpaceStore from "../../../stores/SpaceStore";
+
+const AVATAR_SIZE = 30;
+
+interface IProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    // The event to forward
+    event: MatrixEvent;
+    // We need a permalink creator for the source room to pass through to EventTile
+    // in case the event is a reply (even though the user can't get at the link)
+    permalinkCreator: RoomPermalinkCreator;
+}
+
+interface IEntryProps {
+    room: Room;
+    event: MatrixEvent;
+    matrixClient: MatrixClient;
+    onFinished(success: boolean): void;
+}
+
+enum SendState {
+    CanSend,
+    Sending,
+    Sent,
+    Failed,
+}
+
+const Entry: React.FC<IEntryProps> = ({ room, event, matrixClient: cli, onFinished }) => {
+    const [sendState, setSendState] = useState<SendState>(SendState.CanSend);
+
+    const jumpToRoom = () => {
+        dis.dispatch({
+            action: "view_room",
+            room_id: room.roomId,
+        });
+        onFinished(true);
+    };
+    const send = async () => {
+        setSendState(SendState.Sending);
+        try {
+            await cli.sendEvent(room.roomId, event.getType(), event.getContent());
+            setSendState(SendState.Sent);
+        } catch (e) {
+            setSendState(SendState.Failed);
+        }
+    };
+
+    let className;
+    let disabled = false;
+    let title;
+    let icon;
+    if (sendState === SendState.CanSend) {
+        className = "mx_ForwardList_canSend";
+        if (room.maySendMessage()) {
+            title = _t("Send");
+        } else {
+            disabled = true;
+            title = _t("You don't have permission to do this");
+        }
+    } else if (sendState === SendState.Sending) {
+        className = "mx_ForwardList_sending";
+        disabled = true;
+        title = _t("Sending");
+        icon = <div className="mx_ForwardList_sendIcon" aria-label={title} />;
+    } else if (sendState === SendState.Sent) {
+        className = "mx_ForwardList_sent";
+        disabled = true;
+        title = _t("Sent");
+        icon = <div className="mx_ForwardList_sendIcon" aria-label={title} />;
+    } else {
+        className = "mx_ForwardList_sendFailed";
+        disabled = true;
+        title = _t("Failed to send");
+        icon = <NotificationBadge
+            notification={StaticNotificationState.RED_EXCLAMATION}
+        />;
+    }
+
+    return <div className="mx_ForwardList_entry">
+        <AccessibleTooltipButton
+            className="mx_ForwardList_roomButton"
+            onClick={jumpToRoom}
+            title={_t("Open link")}
+            yOffset={-20}
+            alignment={Alignment.Top}
+        >
+            <DecoratedRoomAvatar room={room} avatarSize={32} />
+            <span className="mx_ForwardList_entry_name">{ room.name }</span>
+        </AccessibleTooltipButton>
+        <AccessibleTooltipButton
+            kind={sendState === SendState.Failed ? "danger_outline" : "primary_outline"}
+            className={`mx_ForwardList_sendButton ${className}`}
+            onClick={send}
+            disabled={disabled}
+            title={title}
+            yOffset={-20}
+            alignment={Alignment.Top}
+        >
+            <div className="mx_ForwardList_sendLabel">{ _t("Send") }</div>
+            { icon }
+        </AccessibleTooltipButton>
+    </div>;
+};
+
+const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCreator, onFinished }) => {
+    const userId = cli.getUserId();
+    const [profileInfo, setProfileInfo] = useState<any>({});
+    useEffect(() => {
+        cli.getProfileInfo(userId).then(info => setProfileInfo(info));
+    }, [cli, userId]);
+
+    // For the message preview we fake the sender as ourselves
+    const mockEvent = new MatrixEvent({
+        type: "m.room.message",
+        sender: userId,
+        content: event.getContent(),
+        unsigned: {
+            age: 97,
+        },
+        event_id: "$9999999999999999999999999999999999999999999",
+        room_id: event.getRoomId(),
+    });
+    mockEvent.sender = {
+        name: profileInfo.displayname || userId,
+        rawDisplayName: profileInfo.displayname,
+        userId,
+        getAvatarUrl: (..._) => {
+            return avatarUrlForUser(
+                { avatarUrl: profileInfo.avatar_url },
+                AVATAR_SIZE, AVATAR_SIZE, "crop",
+            );
+        },
+        getMxcAvatarUrl: () => profileInfo.avatar_url,
+    } as RoomMember;
+
+    const [query, setQuery] = useState("");
+    const lcQuery = query.toLowerCase();
+
+    const spacesEnabled = SpaceStore.spacesEnabled;
+    const flairEnabled = useFeatureEnabled(UIFeature.Flair);
+    const previewLayout = useSettingValue<Layout>("layout");
+
+    let rooms = useMemo(() => sortRooms(
+        cli.getVisibleRooms().filter(
+            room => room.getMyMembership() === "join" &&
+                !(spacesEnabled && room.isSpaceRoom()),
+        ),
+    ), [cli, spacesEnabled]);
+
+    if (lcQuery) {
+        rooms = new QueryMatcher<Room>(rooms, {
+            keys: ["name"],
+            funcs: [r => [r.getCanonicalAlias(), ...r.getAltAliases()].filter(Boolean)],
+            shouldMatchWordsOnly: false,
+        }).match(lcQuery);
+    }
+
+    const [truncateAt, setTruncateAt] = useState(20);
+    function overflowTile(overflowCount, totalCount) {
+        const text = _t("and %(count)s others...", { count: overflowCount });
+        return (
+            <EntityTile
+                className="mx_EntityTile_ellipsis"
+                avatarJsx={
+                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
+                }
+                name={text}
+                presenceState="online"
+                suppressOnHover={true}
+                onClick={() => setTruncateAt(totalCount)}
+            />
+        );
+    }
+
+    return <BaseDialog
+        title={_t("Forward message")}
+        className="mx_ForwardDialog"
+        contentId="mx_ForwardList"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <h3>{ _t("Message preview") }</h3>
+        <div className={classnames("mx_ForwardDialog_preview", {
+            "mx_IRCLayout": previewLayout == Layout.IRC,
+            "mx_GroupLayout": previewLayout == Layout.Group,
+        })}>
+            <EventTile
+                mxEvent={mockEvent}
+                layout={previewLayout}
+                enableFlair={flairEnabled}
+                permalinkCreator={permalinkCreator}
+                as="div"
+            />
+        </div>
+        <hr />
+        <div className="mx_ForwardList" id="mx_ForwardList">
+            <SearchBox
+                className="mx_textinput_icon mx_textinput_search"
+                placeholder={_t("Search for rooms or people")}
+                onSearch={setQuery}
+                autoFocus={true}
+            />
+            <AutoHideScrollbar className="mx_ForwardList_content">
+                { rooms.length > 0 ? (
+                    <div className="mx_ForwardList_results">
+                        <TruncatedList
+                            truncateAt={truncateAt}
+                            createOverflowElement={overflowTile}
+                            getChildren={(start, end) => rooms.slice(start, end).map(room =>
+                                <Entry
+                                    key={room.roomId}
+                                    room={room}
+                                    event={event}
+                                    matrixClient={cli}
+                                    onFinished={onFinished}
+                                />,
+                            )}
+                            getChildCount={() => rooms.length}
+                        />
+                    </div>
+                ) : <span className="mx_ForwardList_noResults">
+                    { _t("No results") }
+                </span> }
+            </AutoHideScrollbar>
+        </div>
+    </BaseDialog>;
+};
+
+export default ForwardDialog;
diff --git a/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx b/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
new file mode 100644
index 0000000000..d68569b126
--- /dev/null
+++ b/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
@@ -0,0 +1,101 @@
+/*
+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 QuestionDialog from './QuestionDialog';
+import { _t } from '../../../languageHandler';
+import Field from "../elements/Field";
+import SdkConfig from "../../../SdkConfig";
+import { IDialogProps } from "./IDialogProps";
+import { submitFeedback } from "../../../rageshake/submit-rageshake";
+import StyledCheckbox from "../elements/StyledCheckbox";
+import Modal from "../../../Modal";
+import InfoDialog from "./InfoDialog";
+
+interface IProps extends IDialogProps {
+    title: string;
+    subheading: string;
+    rageshakeLabel: string;
+    rageshakeData?: Record<string, string>;
+}
+
+const GenericFeatureFeedbackDialog: React.FC<IProps> = ({
+    title,
+    subheading,
+    children,
+    rageshakeLabel,
+    rageshakeData = {},
+    onFinished,
+}) => {
+    const [comment, setComment] = useState("");
+    const [canContact, setCanContact] = useState(false);
+
+    const sendFeedback = async (ok: boolean) => {
+        if (!ok) return onFinished(false);
+
+        submitFeedback(SdkConfig.get().bug_report_endpoint_url, rageshakeLabel, comment, canContact, rageshakeData);
+        onFinished(true);
+
+        Modal.createTrackedDialog("Feedback Sent", rageshakeLabel, InfoDialog, {
+            title,
+            description: _t("Thank you for your feedback, we really appreciate it."),
+            button: _t("Done"),
+            hasCloseButton: false,
+            fixedWidth: false,
+        });
+    };
+
+    return (<QuestionDialog
+        className="mx_GenericFeatureFeedbackDialog"
+        hasCancelButton={true}
+        title={title}
+        description={<React.Fragment>
+            <div className="mx_GenericFeatureFeedbackDialog_subheading">
+                { subheading }
+                &nbsp;
+                { _t("Your platform and username will be noted to help us use your feedback as much as we can.") }
+
+                { children }
+            </div>
+
+            <Field
+                id="feedbackComment"
+                label={_t("Feedback")}
+                type="text"
+                autoComplete="off"
+                value={comment}
+                element="textarea"
+                onChange={(ev) => {
+                    setComment(ev.target.value);
+                }}
+                autoFocus={true}
+            />
+
+            <StyledCheckbox
+                checked={canContact}
+                onChange={e => setCanContact((e.target as HTMLInputElement).checked)}
+            >
+                { _t("You may contact me if you have any follow up questions") }
+            </StyledCheckbox>
+        </React.Fragment>}
+        button={_t("Send feedback")}
+        buttonDisabled={!comment}
+        onFinished={sendFeedback}
+    />);
+};
+
+export default GenericFeatureFeedbackDialog;
diff --git a/src/components/views/dialogs/HostSignupDialog.tsx b/src/components/views/dialogs/HostSignupDialog.tsx
index c8bc907136..4b8b7f32f0 100644
--- a/src/components/views/dialogs/HostSignupDialog.tsx
+++ b/src/components/views/dialogs/HostSignupDialog.tsx
@@ -31,7 +31,7 @@ import {
     IPostmessageResponseData,
     PostmessageAction,
 } from "./HostSignupDialogTypes";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const HOST_SIGNUP_KEY = "host_signup";
 
@@ -86,7 +86,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
             case PostmessageAction.CloseDialog:
                 return this.closeDialog();
         }
-    }
+    };
 
     private maximizeDialog = () => {
         this.setState({
@@ -96,7 +96,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
         this.sendMessage({
             action: PostmessageAction.Maximize,
         });
-    }
+    };
 
     private minimizeDialog = () => {
         this.setState({
@@ -106,7 +106,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
         this.sendMessage({
             action: PostmessageAction.Minimize,
         });
-    }
+    };
 
     private closeDialog = async () => {
         window.removeEventListener("message", this.messageHandler);
@@ -114,7 +114,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
         PersistedElement.destroyElement("host_signup");
         // Finally clear the flag in
         return HostSignupStore.instance.setHostSignupActive(false);
-    }
+    };
 
     private onCloseClick = async () => {
         if (this.state.completed) {
@@ -137,16 +137,16 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                 },
             );
         }
-    }
+    };
 
     private sendMessage = (message: IPostmessageResponseData) => {
         this.iframeRef.current.contentWindow.postMessage(message, this.config.url);
-    }
+    };
 
     private async sendAccountDetails() {
         const openIdToken = await MatrixClientPeg.get().getOpenIdToken();
         if (!openIdToken || !openIdToken.access_token) {
-            console.warn("Failed to connect to homeserver for OpenID token.")
+            console.warn("Failed to connect to homeserver for OpenID token.");
             this.setState({
                 completed: true,
                 error: _t("Failed to connect to your homeserver. Please close this dialog and try again."),
@@ -171,38 +171,38 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
             return this.sendAccountDetails();
         }
         return this.closeDialog();
-    }
+    };
 
     private onAccountDetailsRequest = () => {
         const textComponent = (
             <>
                 <p>
-                    {_t("Continuing temporarily allows the %(hostSignupBrand)s setup process to access your " +
+                    { _t("Continuing temporarily allows the %(hostSignupBrand)s setup process to access your " +
                         "account to fetch verified email addresses. This data is not stored.", {
                         hostSignupBrand: this.config.brand,
-                    })}
+                    }) }
                 </p>
                 <p>
-                    {_t("Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.",
+                    { _t("Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.",
                         {},
                         {
                             cookiePolicyLink: () => (
                                 <a href={this.config.cookiePolicyUrl} target="_blank" rel="noreferrer noopener">
-                                    {_t("Cookie Policy")}
+                                    { _t("Cookie Policy") }
                                 </a>
                             ),
                             privacyPolicyLink: () => (
                                 <a href={this.config.privacyPolicyUrl} target="_blank" rel="noreferrer noopener">
-                                    {_t("Privacy Policy")}
+                                    { _t("Privacy Policy") }
                                 </a>
                             ),
                             termsOfServiceLink: () => (
                                 <a href={this.config.termsOfServiceUrl} target="_blank" rel="noreferrer noopener">
-                                    {_t("Terms of Service")}
+                                    { _t("Terms of Service") }
                                 </a>
                             ),
                         },
-                    )}
+                    ) }
                 </p>
             </>
         );
@@ -215,7 +215,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                 onFinished: this.onAccountDetailsDialogFinished,
             },
         );
-    }
+    };
 
     public componentDidMount() {
         window.addEventListener("message", this.messageHandler);
@@ -241,12 +241,12 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                                 },
                             )}
                         >
-                            {this.state.minimized &&
+                            { this.state.minimized &&
                                 <div className="mx_Dialog_header mx_Dialog_headerWithButton">
                                     <div className="mx_Dialog_title">
-                                        {_t("%(hostSignupBrand)s Setup", {
+                                        { _t("%(hostSignupBrand)s Setup", {
                                             hostSignupBrand: this.config.brand,
-                                        })}
+                                        }) }
                                     </div>
                                     <AccessibleButton
                                         className="mx_HostSignup_maximize_button"
@@ -256,7 +256,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                                     />
                                 </div>
                             }
-                            {!this.state.minimized &&
+                            { !this.state.minimized &&
                                 <div className="mx_Dialog_header mx_Dialog_headerWithCancel">
                                     <AccessibleButton
                                         onClick={this.minimizeDialog}
@@ -272,12 +272,12 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                                     />
                                 </div>
                             }
-                            {this.state.error &&
+                            { this.state.error &&
                                 <div>
-                                    {this.state.error}
+                                    { this.state.error }
                                 </div>
                             }
-                            {!this.state.error &&
+                            { !this.state.error &&
                                 <iframe
                                     src={this.config.url}
                                     ref={this.iframeRef}
diff --git a/src/components/views/dialogs/IDialogProps.ts b/src/components/views/dialogs/IDialogProps.ts
index 1027ca7607..b294fdafe1 100644
--- a/src/components/views/dialogs/IDialogProps.ts
+++ b/src/components/views/dialogs/IDialogProps.ts
@@ -15,5 +15,5 @@ limitations under the License.
 */
 
 export interface IDialogProps {
-    onFinished: (bool) => void;
+    onFinished(...args: any): void;
 }
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.tsx
similarity index 52%
rename from src/components/views/dialogs/IncomingSasDialog.js
rename to src/components/views/dialogs/IncomingSasDialog.tsx
index 5df02d7a6f..da766f495c 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.tsx
@@ -15,12 +15,22 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import VerificationComplete from "../verification/VerificationComplete";
+import VerificationCancelled from "../verification/VerificationCancelled";
+import BaseAvatar from "../avatars/BaseAvatar";
+import Spinner from "../elements/Spinner";
+import VerificationShowSas from "../verification/VerificationShowSas";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import { IDialogProps } from "./IDialogProps";
+import { IGeneratedSas, ISasEvent } from "matrix-js-sdk/src/crypto/verification/SAS";
+import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const PHASE_START = 0;
 const PHASE_SHOW_SAS = 1;
@@ -28,41 +38,56 @@ 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,
-    };
+interface IProps extends IDialogProps {
+    verifier: VerificationBase; // TODO types
+}
 
-    constructor(props) {
+interface IState {
+    phase: number;
+    sasVerified: boolean;
+    opponentProfile: {
+        // eslint-disable-next-line camelcase
+        avatar_url?: string;
+        displayname?: string;
+    };
+    opponentProfileError: Error;
+    sas: IGeneratedSas;
+}
+
+@replaceableComponent("views.dialogs.IncomingSasDialog")
+export default class IncomingSasDialog extends React.Component<IProps, IState> {
+    private showSasEvent: ISasEvent;
+
+    constructor(props: IProps) {
         super(props);
 
         let phase = PHASE_START;
-        if (this.props.verifier.cancelled) {
-            console.log("Verifier was cancelled in the background.");
+        if (this.props.verifier.hasBeenCancelled) {
+            logger.log("Verifier was cancelled in the background.");
             phase = PHASE_CANCELLED;
         }
 
-        this._showSasEvent = null;
+        this.showSasEvent = null;
         this.state = {
             phase: phase,
             sasVerified: false,
             opponentProfile: null,
             opponentProfileError: null,
+            sas: null,
         };
-        this.props.verifier.on('show_sas', this._onVerifierShowSas);
-        this.props.verifier.on('cancel', this._onVerifierCancel);
-        this._fetchOpponentProfile();
+        this.props.verifier.on('show_sas', this.onVerifierShowSas);
+        this.props.verifier.on('cancel', this.onVerifierCancel);
+        this.fetchOpponentProfile();
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         if (this.state.phase !== PHASE_CANCELLED && this.state.phase !== PHASE_VERIFIED) {
-            this.props.verifier.cancel('User cancel');
+            this.props.verifier.cancel(new Error('User cancel'));
         }
-        this.props.verifier.removeListener('show_sas', this._onVerifierShowSas);
+        this.props.verifier.removeListener('show_sas', this.onVerifierShowSas);
     }
 
-    async _fetchOpponentProfile() {
+    private async fetchOpponentProfile(): Promise<void> {
         try {
             const prof = await MatrixClientPeg.get().getProfileInfo(
                 this.props.verifier.userId,
@@ -77,53 +102,49 @@ export default class IncomingSasDialog extends React.Component {
         }
     }
 
-    _onFinished = () => {
+    private onFinished = (): void => {
         this.props.onFinished(this.state.phase === PHASE_VERIFIED);
-    }
+    };
 
-    _onCancelClick = () => {
+    private onCancelClick = (): void => {
         this.props.onFinished(this.state.phase === PHASE_VERIFIED);
-    }
+    };
 
-    _onContinueClick = () => {
-        this.setState({phase: PHASE_WAIT_FOR_PARTNER_TO_CONFIRM});
+    private onContinueClick = (): void => {
+        this.setState({ phase: PHASE_WAIT_FOR_PARTNER_TO_CONFIRM });
         this.props.verifier.verify().then(() => {
-            this.setState({phase: PHASE_VERIFIED});
+            this.setState({ phase: PHASE_VERIFIED });
         }).catch((e) => {
-            console.log("Verification failed", e);
+            logger.log("Verification failed", e);
         });
-    }
+    };
 
-    _onVerifierShowSas = (e) => {
-        this._showSasEvent = e;
+    private onVerifierShowSas = (e: ISasEvent): void => {
+        this.showSasEvent = e;
         this.setState({
             phase: PHASE_SHOW_SAS,
             sas: e.sas,
         });
-    }
+    };
 
-    _onVerifierCancel = (e) => {
+    private onVerifierCancel = (): void => {
         this.setState({
             phase: PHASE_CANCELLED,
         });
-    }
+    };
 
-    _onSasMatchesClick = () => {
-        this._showSasEvent.confirm();
+    private onSasMatchesClick = (): void => {
+        this.showSasEvent.confirm();
         this.setState({
             phase: PHASE_WAIT_FOR_PARTNER_TO_CONFIRM,
         });
-    }
+    };
 
-    _onVerifiedDoneClick = () => {
+    private onVerifiedDoneClick = (): void => {
         this.props.onFinished(true);
-    }
-
-    _renderPhaseStart() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const Spinner = sdk.getComponent("views.elements.Spinner");
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+    };
 
+    private renderPhaseStart(): JSX.Element {
         const isSelf = this.props.verifier.userId === MatrixClientPeg.get().getUserId();
 
         let profile;
@@ -133,125 +154,124 @@ export default class IncomingSasDialog extends React.Component {
                 ? mediaFromMxc(oppProfile.avatar_url).getSquareThumbnailHttp(48)
                 : null;
             profile = <div className="mx_IncomingSasDialog_opponentProfile">
-                <BaseAvatar name={oppProfile.displayname}
+                <BaseAvatar
+                    name={oppProfile.displayname}
                     idName={this.props.verifier.userId}
                     url={url}
-                    width={48} height={48} resizeMethod='crop'
+                    width={48}
+                    height={48}
+                    resizeMethod='crop'
                 />
-                <h2>{oppProfile.displayname}</h2>
+                <h2>{ oppProfile.displayname }</h2>
             </div>;
         } else if (this.state.opponentProfileError) {
             profile = <div>
-                <BaseAvatar name={this.props.verifier.userId.slice(1)}
+                <BaseAvatar
+                    name={this.props.verifier.userId.slice(1)}
                     idName={this.props.verifier.userId}
-                    width={48} height={48}
+                    width={48}
+                    height={48}
                 />
-                <h2>{this.props.verifier.userId}</h2>
+                <h2>{ this.props.verifier.userId }</h2>
             </div>;
         } else {
             profile = <Spinner />;
         }
 
         const userDetailText = [
-            <p key="p1">{_t(
+            <p key="p1">{ _t(
                 "Verify this user to mark them as trusted. " +
                 "Trusting users gives you extra peace of mind when using " +
                 "end-to-end encrypted messages.",
-            )}</p>,
-            <p key="p2">{_t(
+            ) }</p>,
+            <p key="p2">{ _t(
                 // NB. Below wording adjusted to singular 'session' until we have
                 // cross-signing
                 "Verifying this user will mark their session as trusted, and " +
                 "also mark your session as trusted to them.",
-            )}</p>,
+            ) }</p>,
         ];
 
         const selfDetailText = [
-            <p key="p1">{_t(
+            <p key="p1">{ _t(
                 "Verify this device to mark it as trusted. " +
                 "Trusting this device gives you and other users extra peace of mind when using " +
                 "end-to-end encrypted messages.",
-            )}</p>,
-            <p key="p2">{_t(
+            ) }</p>,
+            <p key="p2">{ _t(
                 "Verifying this device will mark it as trusted, and users who have verified with " +
                 "you will trust this device.",
-            )}</p>,
+            ) }</p>,
         ];
 
         return (
             <div>
-                {profile}
-                {isSelf ? selfDetailText : userDetailText}
+                { profile }
+                { isSelf ? selfDetailText : userDetailText }
                 <DialogButtons
                     primaryButton={_t('Continue')}
                     hasCancel={true}
-                    onPrimaryButtonClick={this._onContinueClick}
-                    onCancel={this._onCancelClick}
+                    onPrimaryButtonClick={this.onContinueClick}
+                    onCancel={this.onCancelClick}
                 />
             </div>
         );
     }
 
-    _renderPhaseShowSas() {
-        const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
+    private renderPhaseShowSas(): JSX.Element {
         return <VerificationShowSas
-            sas={this._showSasEvent.sas}
-            onCancel={this._onCancelClick}
-            onDone={this._onSasMatchesClick}
+            sas={this.showSasEvent.sas}
+            onCancel={this.onCancelClick}
+            onDone={this.onSasMatchesClick}
             isSelf={this.props.verifier.userId === MatrixClientPeg.get().getUserId()}
             inDialog={true}
         />;
     }
 
-    _renderPhaseWaitForPartnerToConfirm() {
-        const Spinner = sdk.getComponent("views.elements.Spinner");
-
+    private renderPhaseWaitForPartnerToConfirm(): JSX.Element {
         return (
             <div>
                 <Spinner />
-                <p>{_t("Waiting for partner to confirm...")}</p>
+                <p>{ _t("Waiting for partner to confirm...") }</p>
             </div>
         );
     }
 
-    _renderPhaseVerified() {
-        const VerificationComplete = sdk.getComponent('views.verification.VerificationComplete');
-        return <VerificationComplete onDone={this._onVerifiedDoneClick} />;
+    private renderPhaseVerified(): JSX.Element {
+        return <VerificationComplete onDone={this.onVerifiedDoneClick} />;
     }
 
-    _renderPhaseCancelled() {
-        const VerificationCancelled = sdk.getComponent('views.verification.VerificationCancelled');
-        return <VerificationCancelled onDone={this._onCancelClick} />;
+    private renderPhaseCancelled(): JSX.Element {
+        return <VerificationCancelled onDone={this.onCancelClick} />;
     }
 
-    render() {
+    public render(): JSX.Element {
         let body;
         switch (this.state.phase) {
             case PHASE_START:
-                body = this._renderPhaseStart();
+                body = this.renderPhaseStart();
                 break;
             case PHASE_SHOW_SAS:
-                body = this._renderPhaseShowSas();
+                body = this.renderPhaseShowSas();
                 break;
             case PHASE_WAIT_FOR_PARTNER_TO_CONFIRM:
-                body = this._renderPhaseWaitForPartnerToConfirm();
+                body = this.renderPhaseWaitForPartnerToConfirm();
                 break;
             case PHASE_VERIFIED:
-                body = this._renderPhaseVerified();
+                body = this.renderPhaseVerified();
                 break;
             case PHASE_CANCELLED:
-                body = this._renderPhaseCancelled();
+                body = this.renderPhaseCancelled();
                 break;
         }
 
-        const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
         return (
             <BaseDialog
                 title={_t("Incoming Verification Request")}
-                onFinished={this._onFinished}
+                onFinished={this.onFinished}
                 fixedWidth={false}
             >
-                {body}
+                { body }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.tsx
similarity index 74%
rename from src/components/views/dialogs/InfoDialog.js
rename to src/components/views/dialogs/InfoDialog.tsx
index 8207d334d3..9c74e08e98 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.tsx
@@ -1,7 +1,6 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd.
 Copyright 2019 Bastian Masanek, Noxware IT <matrix@noxware.de>
+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.
@@ -16,31 +15,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
+import React, { ReactNode, KeyboardEvent } from 'react';
 import classNames from "classnames";
 
-export default class InfoDialog extends React.Component {
-    static propTypes = {
-        className: PropTypes.string,
-        title: PropTypes.string,
-        description: PropTypes.node,
-        button: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
-        onFinished: PropTypes.func,
-        hasCloseButton: PropTypes.bool,
-        onKeyDown: PropTypes.func,
-        fixedWidth: PropTypes.bool,
-    };
+import { _t } from '../../../languageHandler';
+import * as sdk from '../../../index';
+import { IDialogProps } from "./IDialogProps";
 
+interface IProps extends IDialogProps {
+    title?: string;
+    description?: ReactNode;
+    className?: string;
+    button?: boolean | string;
+    hasCloseButton?: boolean;
+    fixedWidth?: boolean;
+    onKeyDown?(event: KeyboardEvent): void;
+}
+
+export default class InfoDialog extends React.Component<IProps> {
     static defaultProps = {
         title: '',
         description: '',
         hasCloseButton: false,
     };
 
-    onFinished = () => {
+    private onFinished = () => {
         this.props.onFinished();
     };
 
@@ -63,8 +62,7 @@ export default class InfoDialog extends React.Component {
                 { this.props.button !== false && <DialogButtons primaryButton={this.props.button || _t('OK')}
                     onPrimaryButtonClick={this.onFinished}
                     hasCancel={false}
-                >
-                </DialogButtons> }
+                /> }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
similarity index 64%
rename from src/components/views/dialogs/IntegrationsDisabledDialog.js
rename to src/components/views/dialogs/IntegrationsDisabledDialog.tsx
index dd7a51420e..7da4bb84b9 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.js
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
@@ -15,32 +15,28 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
-import * as sdk from "../../../index";
+import { _t } from "../../../languageHandler";
 import dis from '../../../dispatcher/dispatcher';
-import {Action} from "../../../dispatcher/actions";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Action } from "../../../dispatcher/actions";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {}
 
 @replaceableComponent("views.dialogs.IntegrationsDisabledDialog")
-export default class IntegrationsDisabledDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _onAcknowledgeClick = () => {
+export default class IntegrationsDisabledDialog extends React.Component<IProps> {
+    private onAcknowledgeClick = (): void => {
         this.props.onFinished();
     };
 
-    _onOpenSettingsClick = () => {
+    private onOpenSettingsClick = (): void => {
         this.props.onFinished();
         dis.fire(Action.ViewUserSettings);
     };
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
+    public render(): JSX.Element {
         return (
             <BaseDialog
                 className='mx_IntegrationsDisabledDialog'
@@ -49,13 +45,13 @@ export default class IntegrationsDisabledDialog extends React.Component {
                 title={_t("Integrations are disabled")}
             >
                 <div className='mx_IntegrationsDisabledDialog_content'>
-                    <p>{_t("Enable 'Manage Integrations' in Settings to do this.")}</p>
+                    <p>{ _t("Enable 'Manage Integrations' in Settings to do this.") }</p>
                 </div>
                 <DialogButtons
                     primaryButton={_t("Settings")}
-                    onPrimaryButtonClick={this._onOpenSettingsClick}
+                    onPrimaryButtonClick={this.onOpenSettingsClick}
                     cancelButton={_t("OK")}
-                    onCancel={this._onAcknowledgeClick}
+                    onCancel={this.onAcknowledgeClick}
                 />
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/IntegrationsImpossibleDialog.js b/src/components/views/dialogs/IntegrationsImpossibleDialog.tsx
similarity index 78%
rename from src/components/views/dialogs/IntegrationsImpossibleDialog.js
rename to src/components/views/dialogs/IntegrationsImpossibleDialog.tsx
index e14d40aaef..52e3a2fbb8 100644
--- a/src/components/views/dialogs/IntegrationsImpossibleDialog.js
+++ b/src/components/views/dialogs/IntegrationsImpossibleDialog.tsx
@@ -15,23 +15,21 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
 import * as sdk from "../../../index";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {}
 
 @replaceableComponent("views.dialogs.IntegrationsImpossibleDialog")
-export default class IntegrationsImpossibleDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _onAcknowledgeClick = () => {
+export default class IntegrationsImpossibleDialog extends React.Component<IProps> {
+    private onAcknowledgeClick = (): void => {
         this.props.onFinished();
     };
 
-    render() {
+    public render(): JSX.Element {
         const brand = SdkConfig.get().brand;
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
@@ -45,16 +43,16 @@ export default class IntegrationsImpossibleDialog extends React.Component {
             >
                 <div className='mx_IntegrationsImpossibleDialog_content'>
                     <p>
-                        {_t(
-                            "Your %(brand)s doesn't allow you to use an Integration Manager to do this. " +
+                        { _t(
+                            "Your %(brand)s doesn't allow you to use an integration manager to do this. " +
                             "Please contact an admin.",
                             { brand },
-                        )}
+                        ) }
                     </p>
                 </div>
                 <DialogButtons
                     primaryButton={_t("OK")}
-                    onPrimaryButtonClick={this._onAcknowledgeClick}
+                    onPrimaryButtonClick={this.onAcknowledgeClick}
                     hasCancel={false}
                 />
             </BaseDialog>
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.tsx
similarity index 59%
rename from src/components/views/dialogs/InteractiveAuthDialog.js
rename to src/components/views/dialogs/InteractiveAuthDialog.tsx
index 28a9bf673a..2ea97f91c3 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.tsx
@@ -17,69 +17,88 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
-import * as sdk from '../../../index';
 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";
+import InteractiveAuth, { ERROR_USER_CANCELLED } from "../../structures/InteractiveAuth";
+import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import BaseDialog from "./BaseDialog";
+import { IAuthData } from "matrix-js-sdk/src/interactive-auth";
+import { IDialogProps } from "./IDialogProps";
+
+interface IDialogAesthetics {
+    [x: string]: {
+        [x: number]: {
+            title: string;
+            body: string;
+            continueText: string;
+            continueKind: string;
+        };
+    };
+}
+
+interface IProps extends IDialogProps {
+    // matrix client to use for UI auth requests
+    matrixClient: MatrixClient;
+
+    // response from initial request. If not supplied, will do a request on
+    // mount.
+    authData?: IAuthData;
+
+    // callback
+    makeRequest: (auth: IAuthData) => Promise<IAuthData>;
+
+    // Optional title and body to show when not showing a particular stage
+    title?: string;
+    body?: string;
+
+    // Optional title and body pairs for particular stages and phases within
+    // those stages. Object structure/example is:
+    // {
+    //     "org.example.stage_type": {
+    //         1: {
+    //             "body": "This is a body for phase 1" of org.example.stage_type,
+    //             "title": "Title for phase 1 of org.example.stage_type"
+    //         },
+    //         2: {
+    //             "body": "This is a body for phase 2 of org.example.stage_type",
+    //             "title": "Title for phase 2 of org.example.stage_type"
+    //             "continueText": "Confirm identity with Example Auth",
+    //             "continueKind": "danger"
+    //         }
+    //     }
+    // }
+    //
+    // Default is defined in _getDefaultDialogAesthetics()
+    aestheticsForStagePhases?: IDialogAesthetics;
+}
+
+interface IState {
+    authError: Error;
+
+    // See _onUpdateStagePhase()
+    uiaStage: number | string;
+    uiaStagePhase: number | string;
+}
 
 @replaceableComponent("views.dialogs.InteractiveAuthDialog")
-export default class InteractiveAuthDialog extends React.Component {
-    static propTypes = {
-        // matrix client to use for UI auth requests
-        matrixClient: PropTypes.object.isRequired,
+export default class InteractiveAuthDialog extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
 
-        // response from initial request. If not supplied, will do a request on
-        // mount.
-        authData: PropTypes.shape({
-            flows: PropTypes.array,
-            params: PropTypes.object,
-            session: PropTypes.string,
-        }),
+        this.state = {
+            authError: null,
 
-        // callback
-        makeRequest: PropTypes.func.isRequired,
+            // See _onUpdateStagePhase()
+            uiaStage: null,
+            uiaStagePhase: null,
+        };
+    }
 
-        onFinished: PropTypes.func.isRequired,
-
-        // Optional title and body to show when not showing a particular stage
-        title: PropTypes.string,
-        body: PropTypes.string,
-
-        // Optional title and body pairs for particular stages and phases within
-        // those stages. Object structure/example is:
-        // {
-        //     "org.example.stage_type": {
-        //         1: {
-        //             "body": "This is a body for phase 1" of org.example.stage_type,
-        //             "title": "Title for phase 1 of org.example.stage_type"
-        //         },
-        //         2: {
-        //             "body": "This is a body for phase 2 of org.example.stage_type",
-        //             "title": "Title for phase 2 of org.example.stage_type"
-        //             "continueText": "Confirm identity with Example Auth",
-        //             "continueKind": "danger"
-        //         }
-        //     }
-        // }
-        //
-        // Default is defined in _getDefaultDialogAesthetics()
-        aestheticsForStagePhases: PropTypes.object,
-    };
-
-    state = {
-        authError: null,
-
-        // See _onUpdateStagePhase()
-        uiaStage: null,
-        uiaStagePhase: null,
-    };
-
-    _getDefaultDialogAesthetics() {
+    private getDefaultDialogAesthetics(): IDialogAesthetics {
         const ssoAesthetics = {
             [SSOAuthEntry.PHASE_PREAUTH]: {
                 title: _t("Use Single Sign On to continue"),
@@ -101,7 +120,7 @@ export default class InteractiveAuthDialog extends React.Component {
         };
     }
 
-    _onAuthFinished = (success, result) => {
+    private onAuthFinished = (success: boolean, result: Error): void => {
         if (success) {
             this.props.onFinished(true, result);
         } else {
@@ -115,19 +134,16 @@ export default class InteractiveAuthDialog extends React.Component {
         }
     };
 
-    _onUpdateStagePhase = (newStage, newPhase) => {
+    private onUpdateStagePhase = (newStage: string | number, newPhase: string | number): void => {
         // We copy the stage and stage phase params into state for title selection in render()
-        this.setState({uiaStage: newStage, uiaStagePhase: newPhase});
+        this.setState({ uiaStage: newStage, uiaStagePhase: newPhase });
     };
 
-    _onDismissClick = () => {
+    private onDismissClick = (): void => {
         this.props.onFinished(false);
     };
 
-    render() {
-        const InteractiveAuth = sdk.getComponent("structures.InteractiveAuth");
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
+    public render(): JSX.Element {
         // Let's pick a title, body, and other params text that we'll show to the user. The order
         // is most specific first, so stagePhase > our props > defaults.
 
@@ -135,7 +151,7 @@ export default class InteractiveAuthDialog extends React.Component {
         let body = this.state.authError ? null : this.props.body;
         let continueText = null;
         let continueKind = null;
-        const dialogAesthetics = this.props.aestheticsForStagePhases || this._getDefaultDialogAesthetics();
+        const dialogAesthetics = this.props.aestheticsForStagePhases || this.getDefaultDialogAesthetics();
         if (!this.state.authError && dialogAesthetics) {
             if (dialogAesthetics[this.state.uiaStage]) {
                 const aesthetics = dialogAesthetics[this.state.uiaStage][this.state.uiaStagePhase];
@@ -152,9 +168,9 @@ export default class InteractiveAuthDialog extends React.Component {
                 <div id='mx_Dialog_content'>
                     <div role="alert">{ this.state.authError.message || this.state.authError.toString() }</div>
                     <br />
-                    <AccessibleButton onClick={this._onDismissClick}
+                    <AccessibleButton onClick={this.onDismissClick}
                         className="mx_GeneralButton"
-                        autoFocus="true"
+                        autoFocus={true}
                     >
                         { _t("Dismiss") }
                     </AccessibleButton>
@@ -163,14 +179,13 @@ export default class InteractiveAuthDialog extends React.Component {
         } else {
             content = (
                 <div id='mx_Dialog_content'>
-                    {body}
+                    { body }
                     <InteractiveAuth
-                        ref={this._collectInteractiveAuth}
                         matrixClient={this.props.matrixClient}
                         authData={this.props.authData}
                         makeRequest={this.props.makeRequest}
-                        onAuthFinished={this._onAuthFinished}
-                        onStagePhaseChange={this._onUpdateStagePhase}
+                        onAuthFinished={this.onAuthFinished}
+                        onStagePhaseChange={this.onUpdateStagePhase}
                         continueText={continueText}
                         continueKind={continueKind}
                     />
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index b006205f11..c9ea1143de 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -14,63 +14,95 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import {_t, _td} from "../../../languageHandler";
-import * as sdk from "../../../index";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import React, { createRef } from 'react';
+import classNames from 'classnames';
+
+import { _t, _td } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { makeRoomPermalink, makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import SdkConfig from "../../../SdkConfig";
 import * as Email from "../../../email";
-import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils";
-import {abbreviateUrl} from "../../../utils/UrlUtils";
+import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from "../../../utils/IdentityServerUtils";
+import { abbreviateUrl } from "../../../utils/UrlUtils";
 import dis from "../../../dispatcher/dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
-import {humanizeTime} from "../../../utils/humanize";
+import { humanizeTime } from "../../../utils/humanize";
 import createRoom, {
-    canEncryptToAllUsers, ensureDMExists, findDMForUser, privateShouldBeEncrypted,
-    IInvite3PID,
+    canEncryptToAllUsers,
+    findDMForUser,
+    privateShouldBeEncrypted,
 } from "../../../createRoom";
-import {inviteMultipleToRoom, showCommunityInviteDialog} from "../../../RoomInvite";
-import {Key} from "../../../Keyboard";
-import {Action} from "../../../dispatcher/actions";
-import {DefaultTagID} from "../../../stores/room-list/models";
+import {
+    IInviteResult,
+    inviteMultipleToRoom,
+    showAnyInviteErrors,
+    showCommunityInviteDialog,
+} from "../../../RoomInvite";
+import { Key } from "../../../Keyboard";
+import { Action } from "../../../dispatcher/actions";
+import { DefaultTagID } from "../../../stores/room-list/models";
 import RoomListStore from "../../../stores/room-list/RoomListStore";
-import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
+import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import SettingsStore from "../../../settings/SettingsStore";
-import {UIFeature} from "../../../settings/UIFeature";
+import { UIFeature } from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {Room} from "matrix-js-sdk/src/models/room";
+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";
-import {getAddressType} from "../../../UserAddress";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import { getAddressType } from "../../../UserAddress";
 import BaseAvatar from '../avatars/BaseAvatar';
-import AccessibleButton from '../elements/AccessibleButton';
+import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
 import { compare } from '../../../utils/strings';
+import { IInvite3PID } from "matrix-js-sdk/src/@types/requests";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import { copyPlaintext, selectText } from "../../../utils/strings";
+import * as ContextMenu from "../../structures/ContextMenu";
+import { toRightOf } from "../../structures/ContextMenu";
+import GenericTextContextMenu from "../context_menus/GenericTextContextMenu";
+import { TransferCallPayload } from '../../../dispatcher/payloads/TransferCallPayload';
+import Field from '../elements/Field';
+import TabbedView, { Tab, TabLocation } from '../../structures/TabbedView';
+import Dialpad from '../voip/DialPad';
+import QuestionDialog from "./QuestionDialog";
+import Spinner from "../elements/Spinner";
+import BaseDialog from "./BaseDialog";
+import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
+import SpaceStore from "../../../stores/SpaceStore";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
 
 interface IRecentUser {
-    userId: string,
-    user: RoomMember,
-    lastActive: number,
+    userId: string;
+    user: RoomMember;
+    lastActive: number;
 }
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
+// NB. This dialog needs the 'mx_InviteDialog_transferWrapper' wrapper class to have the correct
+// padding on the bottom (because all modals have 24px padding on all sides), so this needs to
+// be passed when creating the modal
 export const KIND_CALL_TRANSFER = "call_transfer";
 
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
 
-// This is the interface that is expected by various components in this file. It is a bit
-// awkward because it also matches the RoomMember class from the js-sdk with some extra support
+enum TabId {
+    UserDirectory = 'users',
+    DialPad = 'dialpad',
+}
+
+// This is the interface that is expected by various components in the Invite Dialog and RoomInvite.
+// It is a bit awkward because it also matches the RoomMember class from the js-sdk with some extra support
 // for 3PIDs/email addresses.
-abstract class Member {
+export abstract class Member {
     /**
      * The display name of this Member. For users this should be their profile's display
      * name or user ID if none set. For 3PIDs this should be the 3PID address (email).
@@ -92,10 +124,11 @@ abstract class Member {
 
 class DirectoryMember extends Member {
     private readonly _userId: string;
-    private readonly displayName: string;
-    private readonly avatarUrl: string;
+    private readonly displayName?: string;
+    private readonly avatarUrl?: string;
 
-    constructor(userDirResult: {user_id: string, display_name: string, avatar_url: string}) {
+    // eslint-disable-next-line camelcase
+    constructor(userDirResult: { user_id: string, display_name?: string, avatar_url?: string }) {
         super();
         this._userId = userDirResult.user_id;
         this.displayName = userDirResult.display_name;
@@ -146,8 +179,8 @@ class ThreepidMember extends Member {
 }
 
 interface IDMUserTileProps {
-    member: RoomMember;
-    onRemove(member: RoomMember): void;
+    member: Member;
+    onRemove(member: Member): void;
 }
 
 class DMUserTile extends React.PureComponent<IDMUserTileProps> {
@@ -161,11 +194,13 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
 
     render() {
         const avatarSize = 20;
-        const avatar = this.props.member.isEmail
+        const avatar = (this.props.member as ThreepidMember).isEmail
             ? <img
                 className='mx_InviteDialog_userTile_avatar mx_InviteDialog_userTile_threepidAvatar'
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
-                width={avatarSize} height={avatarSize} />
+                width={avatarSize}
+                height={avatarSize}
+            />
             : <BaseAvatar
                 className='mx_InviteDialog_userTile_avatar'
                 url={this.props.member.getMxcAvatarUrl()
@@ -183,8 +218,11 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
                     className='mx_InviteDialog_userTile_remove'
                     onClick={this.onRemove}
                 >
-                    <img src={require("../../../../res/img/icon-pill-remove.svg")}
-                        alt={_t('Remove')} width={8} height={8}
+                    <img
+                        src={require("../../../../res/img/icon-pill-remove.svg")}
+                        alt={_t('Remove')}
+                        width={8}
+                        height={8}
                     />
                 </AccessibleButton>
             );
@@ -193,8 +231,8 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
         return (
             <span className='mx_InviteDialog_userTile'>
                 <span className='mx_InviteDialog_userTile_pill'>
-                    {avatar}
-                    <span className='mx_InviteDialog_userTile_name'>{this.props.member.name}</span>
+                    { avatar }
+                    <span className='mx_InviteDialog_userTile_name'>{ this.props.member.name }</span>
                 </span>
                 { closeButton }
             </span>
@@ -203,9 +241,9 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
 }
 
 interface IDMRoomTileProps {
-    member: RoomMember;
+    member: Member;
     lastActiveTs: number;
-    onToggle(member: RoomMember): void;
+    onToggle(member: Member): void;
     highlightWord: string;
     isSelected: boolean;
 }
@@ -236,20 +274,20 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
             // Push any text we missed (first bit/middle of text)
             if (ii > i) {
                 // Push any text we aren't highlighting (middle of text match, or beginning of text)
-                result.push(<span key={i + 'begin'}>{str.substring(i, ii)}</span>);
+                result.push(<span key={i + 'begin'}>{ str.substring(i, ii) }</span>);
             }
 
             i = ii; // copy over ii only if we have a match (to preserve i for end-of-text matching)
 
             // Highlight the word the user entered
             const substr = str.substring(i, filterStr.length + i);
-            result.push(<span className='mx_InviteDialog_roomTile_highlight' key={i + 'bold'}>{substr}</span>);
+            result.push(<span className='mx_InviteDialog_roomTile_highlight' key={i + 'bold'}>{ substr }</span>);
             i += substr.length;
         }
 
         // Push any text we missed (end of text)
         if (i < str.length) {
-            result.push(<span key={i + 'end'}>{str.substring(i)}</span>);
+            result.push(<span key={i + 'end'}>{ str.substring(i) }</span>);
         }
 
         return result;
@@ -259,14 +297,16 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
         let timestamp = null;
         if (this.props.lastActiveTs) {
             const humanTs = humanizeTime(this.props.lastActiveTs);
-            timestamp = <span className='mx_InviteDialog_roomTile_time'>{humanTs}</span>;
+            timestamp = <span className='mx_InviteDialog_roomTile_time'>{ humanTs }</span>;
         }
 
         const avatarSize = 36;
-        const avatar = this.props.member.isEmail
+        const avatar = (this.props.member as ThreepidMember).isEmail
             ? <img
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
-                width={avatarSize} height={avatarSize} />
+                width={avatarSize}
+                height={avatarSize}
+            />
             : <BaseAvatar
                 url={this.props.member.getMxcAvatarUrl()
                     ? mediaFromMxc(this.props.member.getMxcAvatarUrl()).getSquareThumbnailHttp(avatarSize)
@@ -286,23 +326,23 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
         // the browser from reloading the image source when the avatar remounts).
         const stackedAvatar = (
             <span className='mx_InviteDialog_roomTile_avatarStack'>
-                {avatar}
-                {checkmark}
+                { avatar }
+                { checkmark }
             </span>
         );
 
-        const caption = this.props.member.isEmail
+        const caption = (this.props.member as ThreepidMember).isEmail
             ? _t("Invite by email")
             : this.highlightName(this.props.member.userId);
 
         return (
             <div className='mx_InviteDialog_roomTile' onClick={this.onClick}>
-                {stackedAvatar}
+                { stackedAvatar }
                 <span className="mx_InviteDialog_roomTile_nameStack">
-                    <div className='mx_InviteDialog_roomTile_name'>{this.highlightName(this.props.member.name)}</div>
-                    <div className='mx_InviteDialog_roomTile_userId'>{caption}</div>
+                    <div className='mx_InviteDialog_roomTile_name'>{ this.highlightName(this.props.member.name) }</div>
+                    <div className='mx_InviteDialog_roomTile_userId'>{ caption }</div>
                 </span>
-                {timestamp}
+                { timestamp }
             </div>
         );
     }
@@ -314,20 +354,20 @@ interface IInviteDialogProps {
 
     // The kind of invite being performed. Assumed to be KIND_DM if
     // not provided.
-    kind: string,
+    kind: string;
 
     // The room ID this dialog is for. Only required for KIND_INVITE.
-    roomId: string,
+    roomId: string;
 
     // The call to transfer. Only required for KIND_CALL_TRANSFER.
-    call: MatrixCall,
+    call: MatrixCall;
 
     // Initial value to populate the filter with
-    initialText: string,
+    initialText: string;
 }
 
 interface IInviteDialogState {
-    targets: RoomMember[]; // array of Member objects (see interface above)
+    targets: Member[]; // array of Member objects (see interface above)
     filterText: string;
     recents: { user: Member, userId: string }[];
     numRecentsShown: number;
@@ -338,10 +378,12 @@ interface IInviteDialogState {
     canUseIdentityServer: boolean;
     tryingIdentityServer: boolean;
     consultFirst: boolean;
+    dialPadValue: string;
+    currentTabId: TabId;
 
     // These two flags are used for the 'Go' button to communicate what is going on.
-    busy: boolean,
-    errorText: string,
+    busy: boolean;
+    errorText: string;
 }
 
 @replaceableComponent("views.dialogs.InviteDialog")
@@ -351,8 +393,10 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         initialText: "",
     };
 
-    private debounceTimer: NodeJS.Timeout = null; // actually number because we're in the browser
+    private closeCopiedTooltip: () => void;
+    private debounceTimer: number = null; // actually number because we're in the browser
     private editorRef = createRef<HTMLInputElement>();
+    private numberEntryFieldRef: React.RefObject<Field> = createRef();
     private unmounted = false;
 
     constructor(props) {
@@ -388,6 +432,8 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             canUseIdentityServer: !!MatrixClientPeg.get().getIdentityServerUrl(),
             tryingIdentityServer: false,
             consultFirst: false,
+            dialPadValue: '',
+            currentTabId: TabId.UserDirectory,
 
             // These two flags are used for the 'Go' button to communicate what is going on.
             busy: false,
@@ -403,11 +449,14 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
     componentWillUnmount() {
         this.unmounted = true;
+        // if the Copied tooltip is open then get rid of it, there are ways to close the modal which wouldn't close
+        // the tooltip otherwise, such as pressing Escape or clicking X really quickly
+        if (this.closeCopiedTooltip) this.closeCopiedTooltip();
     }
 
     private onConsultFirstChange = (ev) => {
-        this.setState({consultFirst: ev.target.checked});
-    }
+        this.setState({ consultFirst: ev.target.checked });
+    };
 
     public static buildRecents(excludedTargetIds: Set<string>): IRecentUser[] {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
@@ -462,7 +511,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 continue;
             }
 
-            recents.push({userId, user: member, lastActive: lastEventTs});
+            recents.push({ userId, user: member, lastActive: lastEventTs });
         }
         if (!recents) console.warn("[Invite:Recents] No recents to suggest!");
 
@@ -570,7 +619,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             const scoreBoost = Math.max(1, inverseTime / (15 * 60 * 1000)); // 15min segments to keep scores sane
 
             let record = memberScores[userId];
-            if (!record) record = memberScores[userId] = {score: 0};
+            if (!record) record = memberScores[userId] = { score: 0 };
             record.member = member;
             record.score += scoreBoost;
         }
@@ -587,22 +636,13 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             return b.score - a.score;
         });
 
-        return members.map(m => ({userId: m.member.userId, user: m.member}));
+        return members.map(m => ({ userId: m.member.userId, user: m.member }));
     }
 
-    private shouldAbortAfterInviteError(result): boolean {
-        const failedUsers = Object.keys(result.states).filter(a => result.states[a] === 'error');
-        if (failedUsers.length > 0) {
-            console.log("Failed to invite users: ", result);
-            this.setState({
-                busy: false,
-                errorText: _t("Failed to invite the following users to chat: %(csvUsers)s", {
-                    csvUsers: failedUsers.join(", "),
-                }),
-            });
-            return true; // abort
-        }
-        return false;
+    private shouldAbortAfterInviteError(result: IInviteResult, room: Room): boolean {
+        this.setState({ busy: false });
+        const userMap = new Map<string, Member>(this.state.targets.map(member => [member.userId, member]));
+        return !showAnyInviteErrors(result.states, room, result.inviter, userMap);
     }
 
     private convertFilter(): Member[] {
@@ -612,18 +652,18 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         let newMember: Member;
         if (this.state.filterText.startsWith('@')) {
             // Assume mxid
-            newMember = new DirectoryMember({user_id: this.state.filterText, display_name: null, avatar_url: null});
+            newMember = new DirectoryMember({ user_id: this.state.filterText, display_name: null, avatar_url: null });
         } else if (SettingsStore.getValue(UIFeature.IdentityServer)) {
             // Assume email
             newMember = new ThreepidMember(this.state.filterText);
         }
         const newTargets = [...(this.state.targets || []), newMember];
-        this.setState({targets: newTargets, filterText: ''});
+        this.setState({ targets: newTargets, filterText: '' });
         return newTargets;
     }
 
     private startDm = async () => {
-        this.setState({busy: true});
+        this.setState({ busy: true });
         const client = MatrixClientPeg.get();
         const targets = this.convertFilter();
         const targetIds = targets.map(t => t.userId);
@@ -646,7 +686,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             return;
         }
 
-        const createRoomOptions = {inlineErrors: true} as any; // XXX: Type out `createRoomOptions`
+        const createRoomOptions = { inlineErrors: true } as any; // XXX: Type out `createRoomOptions`
 
         if (privateShouldBeEncrypted()) {
             // Check whether all users have uploaded device keys before.
@@ -685,7 +725,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                         return roomOptions;
                     },
                     { invite: [], invite_3pid: [] },
-                )
+                );
             }
 
             await createRoom(createRoomOptions);
@@ -701,7 +741,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
     private inviteUsers = async () => {
         const startTime = CountlyAnalytics.getTimestamp();
-        this.setState({busy: true});
+        this.setState({ busy: true });
         this.convertFilter();
         const targets = this.convertFilter();
         const targetIds = targets.map(t => t.userId);
@@ -718,9 +758,9 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         }
 
         try {
-            const result = await inviteMultipleToRoom(this.props.roomId, targetIds)
+            const result = await inviteMultipleToRoom(this.props.roomId, targetIds);
             CountlyAnalytics.instance.trackSendInvite(startTime, this.props.roomId, targetIds.length);
-            if (!this.shouldAbortAfterInviteError(result)) { // handles setting error message too
+            if (!this.shouldAbortAfterInviteError(result, room)) { // handles setting error message too
                 this.props.onFinished();
             }
 
@@ -737,7 +777,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                             invitedUsers.push(addr);
                         }
                     }
-                    console.log("Sharing history with", invitedUsers);
+                    logger.log("Sharing history with", invitedUsers);
                     cli.sendSharedHistoryKeys(
                         this.props.roomId, invitedUsers,
                     );
@@ -755,44 +795,32 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
     };
 
     private transferCall = async () => {
-        this.convertFilter();
-        const targets = this.convertFilter();
-        const targetIds = targets.map(t => t.userId);
-        if (targetIds.length > 1) {
-            this.setState({
-                errorText: _t("A call can only be transferred to a single user."),
-            });
-        }
-
-        if (this.state.consultFirst) {
-            const dmRoomId = await ensureDMExists(MatrixClientPeg.get(), targetIds[0]);
-
-            dis.dispatch({
-                action: 'place_call',
-                type: this.props.call.type,
-                room_id: dmRoomId,
-                transferee: this.props.call,
-            });
-            dis.dispatch({
-                action: 'view_room',
-                room_id: dmRoomId,
-                should_peek: false,
-                joining: false,
-            });
-            this.props.onFinished();
-        } else {
-            this.setState({busy: true});
-            try {
-                await this.props.call.transfer(targetIds[0]);
-                this.setState({busy: false});
-                this.props.onFinished();
-            } catch (e) {
+        if (this.state.currentTabId == TabId.UserDirectory) {
+            this.convertFilter();
+            const targets = this.convertFilter();
+            const targetIds = targets.map(t => t.userId);
+            if (targetIds.length > 1) {
                 this.setState({
-                    busy: false,
-                    errorText: _t("Failed to transfer call"),
+                    errorText: _t("A call can only be transferred to a single user."),
                 });
+                return;
             }
+
+            dis.dispatch({
+                action: Action.TransferCallToMatrixID,
+                call: this.props.call,
+                destination: targetIds[0],
+                consultFirst: this.state.consultFirst,
+            } as TransferCallPayload);
+        } else {
+            dis.dispatch({
+                action: Action.TransferCallToPhoneNumber,
+                call: this.props.call,
+                destination: this.state.dialPadValue,
+                consultFirst: this.state.consultFirst,
+            } as TransferCallPayload);
         }
+        this.props.onFinished();
     };
 
     private onKeyDown = (e) => {
@@ -814,8 +842,12 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         }
     };
 
+    private onCancel = () => {
+        this.props.onFinished([]);
+    };
+
     private updateSuggestions = async (term) => {
-        MatrixClientPeg.get().searchUserDirectory({term}).then(async r => {
+        MatrixClientPeg.get().searchUserDirectory({ term }).then(async r => {
             if (term !== this.state.filterText) {
                 // Discard the results - we were probably too slow on the server-side to make
                 // these results useful. This is a race we want to avoid because we could overwrite
@@ -863,14 +895,14 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         }).catch(e => {
             console.error("Error searching user directory:");
             console.error(e);
-            this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
+            this.setState({ serverResultsMixin: [] }); // clear results because it's moderately fatal
         });
 
         // Whenever we search the directory, also try to search the identity server. It's
         // all debounced the same anyways.
         if (!this.state.canUseIdentityServer) {
             // The user doesn't have an identity server set - warn them of that.
-            this.setState({tryingIdentityServer: true});
+            this.setState({ tryingIdentityServer: true });
             return;
         }
         if (term.indexOf('@') > 0 && Email.looksValid(term) && SettingsStore.getValue(UIFeature.IdentityServer)) {
@@ -878,7 +910,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             // to a real account.
             this.setState({
                 // per above: the userId is a lie here - it's just a regular identifier
-                threepidResultsMixin: [{user: new ThreepidMember(term), userId: term}],
+                threepidResultsMixin: [{ user: new ThreepidMember(term), userId: term }],
             });
             try {
                 const authClient = new IdentityAuthClient();
@@ -918,14 +950,14 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             } catch (e) {
                 console.error("Error searching identity server:");
                 console.error(e);
-                this.setState({threepidResultsMixin: []}); // clear results because it's moderately fatal
+                this.setState({ threepidResultsMixin: [] }); // clear results because it's moderately fatal
             }
         }
     };
 
     private updateFilter = (e) => {
         const term = e.target.value;
-        this.setState({filterText: term});
+        this.setState({ filterText: term });
 
         // Debounce server lookups to reduce spam. We don't clear the existing server
         // results because they might still be vaguely accurate, likewise for races which
@@ -939,25 +971,28 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
     };
 
     private showMoreRecents = () => {
-        this.setState({numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN});
+        this.setState({ numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN });
     };
 
     private showMoreSuggestions = () => {
-        this.setState({numSuggestionsShown: this.state.numSuggestionsShown + INCREMENT_ROOMS_SHOWN});
+        this.setState({ numSuggestionsShown: this.state.numSuggestionsShown + INCREMENT_ROOMS_SHOWN });
     };
 
     private toggleMember = (member: Member) => {
         if (!this.state.busy) {
             let filterText = this.state.filterText;
-            const targets = this.state.targets.map(t => t); // cheap clone for mutation
+            let targets = this.state.targets.map(t => t); // cheap clone for mutation
             const idx = targets.indexOf(member);
             if (idx >= 0) {
                 targets.splice(idx, 1);
             } else {
+                if (this.props.kind === KIND_CALL_TRANSFER && targets.length > 0) {
+                    targets = [];
+                }
                 targets.push(member);
                 filterText = ""; // clear the filter when the user accepts a suggestion
             }
-            this.setState({targets, filterText});
+            this.setState({ targets, filterText });
 
             if (this.editorRef && this.editorRef.current) {
                 this.editorRef.current.focus();
@@ -970,7 +1005,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         const idx = targets.indexOf(member);
         if (idx >= 0) {
             targets.splice(idx, 1);
-            this.setState({targets});
+            this.setState({ targets });
         }
 
         if (this.editorRef && this.editorRef.current) {
@@ -1035,18 +1070,17 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         if (this.unmounted) return;
 
         if (failed.length > 0) {
-            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
             Modal.createTrackedDialog('Invite Paste Fail', '', QuestionDialog, {
                 title: _t('Failed to find the following users'),
                 description: _t(
                     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
-                    {csvNames: failed.join(", ")},
+                    { csvNames: failed.join(", ") },
                 ),
                 button: _t('OK'),
             });
         }
 
-        this.setState({targets: [...this.state.targets, ...toAdd]});
+        this.setState({ targets: [...this.state.targets, ...toAdd] });
     };
 
     private onClickInputArea = (e) => {
@@ -1065,7 +1099,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         // Update the IS in account data. Actually using it may trigger terms.
         // eslint-disable-next-line react-hooks/rules-of-hooks
         useDefaultIdentityServer();
-        this.setState({canUseIdentityServer: true, tryingIdentityServer: false});
+        this.setState({ canUseIdentityServer: true, tryingIdentityServer: false });
     };
 
     private onManageSettingsClick = (e) => {
@@ -1089,7 +1123,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
         if (kind === 'suggestions' && CommunityPrototypeStore.instance.getSelectedCommunityId()) {
             const communityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
-            sectionSubname = _t("May include members not in %(communityName)s", {communityName});
+            sectionSubname = _t("May include members not in %(communityName)s", { communityName });
         }
 
         if (this.props.kind === KIND_INVITE) {
@@ -1128,8 +1162,8 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             if (sourceMembers.length === 0 && !hasAdditionalMembers) {
                 return (
                     <div className='mx_InviteDialog_section'>
-                        <h3>{sectionName}</h3>
-                        <p>{_t("No results")}</p>
+                        <h3>{ sectionName }</h3>
+                        <p>{ _t("No results") }</p>
                     </div>
                 );
             }
@@ -1147,12 +1181,11 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         const toRender = sourceMembers.slice(0, showNum);
         const hasMore = toRender.length < sourceMembers.length;
 
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         let showMore = null;
         if (hasMore) {
             showMore = (
                 <AccessibleButton onClick={showMoreFn} kind="link">
-                    {_t("Show more")}
+                    { _t("Show more") }
                 </AccessibleButton>
             );
         }
@@ -1169,15 +1202,20 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         ));
         return (
             <div className='mx_InviteDialog_section'>
-                <h3>{sectionName}</h3>
-                {sectionSubname ? <p className="mx_InviteDialog_subname">{sectionSubname}</p> : null}
-                {tiles}
-                {showMore}
+                <h3>{ sectionName }</h3>
+                { sectionSubname ? <p className="mx_InviteDialog_subname">{ sectionSubname }</p> : null }
+                { tiles }
+                { showMore }
             </div>
         );
     }
 
     private renderEditor() {
+        const hasPlaceholder = (
+            this.props.kind == KIND_CALL_TRANSFER &&
+            this.state.targets.length === 0 &&
+            this.state.filterText.length === 0
+        );
         const targets = this.state.targets.map(t => (
             <DMUserTile member={t} onRemove={!this.state.busy && this.removeMember} key={t.userId} />
         ));
@@ -1190,14 +1228,15 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 ref={this.editorRef}
                 onPaste={this.onPaste}
                 autoFocus={true}
-                disabled={this.state.busy}
+                disabled={this.state.busy || (this.props.kind == KIND_CALL_TRANSFER && this.state.targets.length > 0)}
                 autoComplete="off"
+                placeholder={hasPlaceholder ? _t("Search") : null}
             />
         );
         return (
             <div className='mx_InviteDialog_editor' onClick={this.onClickInputArea}>
-                {targets}
-                {input}
+                { targets }
+                { input }
             </div>
         );
     }
@@ -1212,7 +1251,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
         if (defaultIdentityServerUrl) {
             return (
-                <div className="mx_AddressPickerDialog_identityServer">{_t(
+                <div className="mx_AddressPickerDialog_identityServer">{ _t(
                     "Use an identity server to invite by email. " +
                     "<default>Use the default (%(defaultIdentityServerName)s)</default> " +
                     "or manage in <settings>Settings</settings>.",
@@ -1220,44 +1259,99 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                         defaultIdentityServerName: abbreviateUrl(defaultIdentityServerUrl),
                     },
                     {
-                        default: sub => <a href="#" onClick={this.onUseDefaultIdentityServerClick}>{sub}</a>,
-                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{sub}</a>,
+                        default: sub => <a href="#" onClick={this.onUseDefaultIdentityServerClick}>{ sub }</a>,
+                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{ sub }</a>,
                     },
-                )}</div>
+                ) }</div>
             );
         } else {
             return (
-                <div className="mx_AddressPickerDialog_identityServer">{_t(
+                <div className="mx_AddressPickerDialog_identityServer">{ _t(
                     "Use an identity server to invite by email. " +
                     "Manage in <settings>Settings</settings>.",
                     {}, {
-                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{sub}</a>,
+                        settings: sub => <a href="#" onClick={this.onManageSettingsClick}>{ sub }</a>,
                     },
-                )}</div>
+                ) }</div>
             );
         }
     }
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-        const Spinner = sdk.getComponent("elements.Spinner");
+    private onDialFormSubmit = ev => {
+        ev.preventDefault();
+        this.transferCall();
+    };
 
+    private onDialChange = ev => {
+        this.setState({ dialPadValue: ev.currentTarget.value });
+    };
+
+    private onDigitPress = (digit: string, ev: ButtonEvent) => {
+        this.setState({ dialPadValue: this.state.dialPadValue + digit });
+
+        // Keep the number field focused so that keyboard entry is still available
+        // However, don't focus if this wasn't the result of directly clicking on the button,
+        // i.e someone using keyboard navigation.
+        if (ev.type === "click") {
+            this.numberEntryFieldRef.current?.focus();
+        }
+    };
+
+    private onDeletePress = (ev: ButtonEvent) => {
+        if (this.state.dialPadValue.length === 0) return;
+        this.setState({ dialPadValue: this.state.dialPadValue.slice(0, -1) });
+
+        // Keep the number field focused so that keyboard entry is still available
+        // However, don't focus if this wasn't the result of directly clicking on the button,
+        // i.e someone using keyboard navigation.
+        if (ev.type === "click") {
+            this.numberEntryFieldRef.current?.focus();
+        }
+    };
+
+    private onTabChange = (tabId: TabId) => {
+        this.setState({ currentTabId: tabId });
+    };
+
+    private async onLinkClick(e) {
+        e.preventDefault();
+        selectText(e.target);
+    }
+
+    private onCopyClick = async e => {
+        e.preventDefault();
+        const target = e.target; // copy target before we go async and React throws it away
+
+        const successful = await copyPlaintext(makeUserPermalink(MatrixClientPeg.get().getUserId()));
+        const buttonRect = target.getBoundingClientRect();
+        const { close } = ContextMenu.createMenu(GenericTextContextMenu, {
+            ...toRightOf(buttonRect, 2),
+            message: successful ? _t("Copied!") : _t("Failed to copy"),
+        });
+        // Drop a reference to this close handler for componentWillUnmount
+        this.closeCopiedTooltip = target.onmouseleave = close;
+    };
+
+    render() {
         let spinner = null;
         if (this.state.busy) {
             spinner = <Spinner w={20} h={20} />;
         }
 
-
         let title;
         let helpText;
         let buttonText;
         let goButtonFn;
-        let consultSection;
+        let consultConnectSection;
+        let extraSection;
+        let footer;
         let keySharingWarning = <span />;
 
         const identityServersEnabled = SettingsStore.getValue(UIFeature.IdentityServer);
 
+        const hasSelection = this.state.targets.length > 0
+            || (this.state.filterText && this.state.filterText.includes('@'));
+
         const cli = MatrixClientPeg.get();
         const userId = cli.getUserId();
         if (this.props.kind === KIND_DM) {
@@ -1267,21 +1361,21 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 helpText = _t(
                     "Start a conversation with someone using their name, email address or username (like <userId/>).",
                     {},
-                    {userId: () => {
+                    { userId: () => {
                         return (
-                            <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>
+                            <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{ userId }</a>
                         );
-                    }},
+                    } },
                 );
             } else {
                 helpText = _t(
                     "Start a conversation with someone using their name or username (like <userId/>).",
                     {},
-                    {userId: () => {
+                    { userId: () => {
                         return (
-                            <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>
+                            <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{ userId }</a>
                         );
-                    }},
+                    } },
                 );
             }
 
@@ -1290,14 +1384,14 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 const inviteText = _t(
                     "This won't invite them to %(communityName)s. " +
                     "To invite someone to %(communityName)s, click <a>here</a>",
-                    {communityName}, {
+                    { communityName }, {
                         userId: () => {
                             return (
                                 <a
                                     href={makeUserPermalink(userId)}
                                     rel="noreferrer noopener"
                                     target="_blank"
-                                >{userId}</a>
+                                >{ userId }</a>
                             );
                         },
                         a: (sub) => {
@@ -1305,20 +1399,40 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                                 <AccessibleButton
                                     kind="link"
                                     onClick={this.onCommunityInviteClick}
-                                >{sub}</AccessibleButton>
+                                >{ sub }</AccessibleButton>
                             );
                         },
                     },
                 );
                 helpText = <React.Fragment>
-                    { helpText } {inviteText}
+                    { helpText } { inviteText }
                 </React.Fragment>;
             }
             buttonText = _t("Go");
             goButtonFn = this.startDm;
+            extraSection = <div className="mx_InviteDialog_section_hidden_suggestions_disclaimer">
+                <span>{ _t("Some suggestions may be hidden for privacy.") }</span>
+                <p>{ _t("If you can't see who you’re looking for, send them your invite link below.") }</p>
+            </div>;
+            const link = makeUserPermalink(MatrixClientPeg.get().getUserId());
+            footer = <div className="mx_InviteDialog_footer">
+                <h3>{ _t("Or send invite link") }</h3>
+                <div className="mx_InviteDialog_footer_link">
+                    <a href={link} onClick={this.onLinkClick}>
+                        { link }
+                    </a>
+                    <AccessibleTooltipButton
+                        title={_t("Copy")}
+                        onClick={this.onCopyClick}
+                        className="mx_InviteDialog_footer_link_copy"
+                    >
+                        <div />
+                    </AccessibleTooltipButton>
+                </div>
+            </div>;
         } else if (this.props.kind === KIND_INVITE) {
             const room = MatrixClientPeg.get()?.getRoom(this.props.roomId);
-            const isSpace = SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom();
+            const isSpace = SpaceStore.spacesEnabled && room?.isSpaceRoom();
             title = isSpace
                 ? _t("Invite to %(spaceName)s", {
                     spaceName: room.name || _t("Unnamed Space"),
@@ -1348,9 +1462,9 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
             helpText = _t(helpTextUntranslated, {}, {
                 userId: () =>
-                    <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>,
+                    <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>,
+                    <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{ sub }</a>,
             });
 
             buttonText = _t("Invite");
@@ -1368,58 +1482,143 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                         <p className='mx_InviteDialog_helpText'>
                             <img
                                 src={require("../../../../res/img/element-icons/info.svg")}
-                                width={14} height={14} />
-                            {" " + _t("Invited people will be able to read old messages.")}
+                                width={14}
+                                height={14} />
+                            { " " + _t("Invited people will be able to read old messages.") }
                         </p>;
                 }
             }
         } else if (this.props.kind === KIND_CALL_TRANSFER) {
             title = _t("Transfer");
-            buttonText = _t("Transfer");
-            goButtonFn = this.transferCall;
-            consultSection = <div>
+
+            consultConnectSection = <div className="mx_InviteDialog_transferConsultConnect">
                 <label>
                     <input type="checkbox" checked={this.state.consultFirst} onChange={this.onConsultFirstChange} />
-                    {_t("Consult first")}
+                    { _t("Consult first") }
                 </label>
+                <AccessibleButton
+                    kind="secondary"
+                    onClick={this.onCancel}
+                    className='mx_InviteDialog_transferConsultConnect_pushRight'
+                >
+                    { _t("Cancel") }
+                </AccessibleButton>
+                <AccessibleButton
+                    kind="primary"
+                    onClick={this.transferCall}
+                    className='mx_InviteDialog_transferButton'
+                    disabled={!hasSelection && this.state.dialPadValue === ''}
+                >
+                    { _t("Transfer") }
+                </AccessibleButton>
             </div>;
         } else {
             console.error("Unknown kind of InviteDialog: " + this.props.kind);
         }
 
-        const hasSelection = this.state.targets.length > 0
-            || (this.state.filterText && this.state.filterText.includes('@'));
+        const goButton = this.props.kind == KIND_CALL_TRANSFER ? null : <AccessibleButton
+            kind="primary"
+            onClick={goButtonFn}
+            className='mx_InviteDialog_goButton'
+            disabled={this.state.busy || !hasSelection}
+        >
+            { buttonText }
+        </AccessibleButton>;
+
+        const usersSection = <React.Fragment>
+            <p className='mx_InviteDialog_helpText'>{ helpText }</p>
+            <div className='mx_InviteDialog_addressBar'>
+                { this.renderEditor() }
+                <div className='mx_InviteDialog_buttonAndSpinner'>
+                    { goButton }
+                    { spinner }
+                </div>
+            </div>
+            { keySharingWarning }
+            { this.renderIdentityServerWarning() }
+            <div className='error'>{ this.state.errorText }</div>
+            <div className='mx_InviteDialog_userSections'>
+                { this.renderSection('recents') }
+                { this.renderSection('suggestions') }
+                { extraSection }
+            </div>
+            { footer }
+        </React.Fragment>;
+
+        let dialogContent;
+        if (this.props.kind === KIND_CALL_TRANSFER) {
+            const tabs = [];
+            tabs.push(new Tab(
+                TabId.UserDirectory, _td("User Directory"), 'mx_InviteDialog_userDirectoryIcon', usersSection,
+            ));
+
+            const backspaceButton = (
+                <DialPadBackspaceButton onBackspacePress={this.onDeletePress} />
+            );
+
+            // Only show the backspace button if the field has content
+            let dialPadField;
+            if (this.state.dialPadValue.length !== 0) {
+                dialPadField = <Field
+                    ref={this.numberEntryFieldRef}
+                    className="mx_InviteDialog_dialPadField"
+                    id="dialpad_number"
+                    value={this.state.dialPadValue}
+                    autoFocus={true}
+                    onChange={this.onDialChange}
+                    postfixComponent={backspaceButton}
+                />;
+            } else {
+                dialPadField = <Field
+                    ref={this.numberEntryFieldRef}
+                    className="mx_InviteDialog_dialPadField"
+                    id="dialpad_number"
+                    value={this.state.dialPadValue}
+                    autoFocus={true}
+                    onChange={this.onDialChange}
+                />;
+            }
+
+            const dialPadSection = <div className="mx_InviteDialog_dialPad">
+                <form onSubmit={this.onDialFormSubmit}>
+                    { dialPadField }
+                </form>
+                <Dialpad
+                    hasDial={false}
+                    onDigitPress={this.onDigitPress}
+                    onDeletePress={this.onDeletePress}
+                />
+            </div>;
+            tabs.push(new Tab(TabId.DialPad, _td("Dial pad"), 'mx_InviteDialog_dialPadIcon', dialPadSection));
+            dialogContent = <React.Fragment>
+                <TabbedView
+                    tabs={tabs}
+                    initialTabId={this.state.currentTabId}
+                    tabLocation={TabLocation.TOP}
+                    onChange={this.onTabChange}
+                />
+                { consultConnectSection }
+            </React.Fragment>;
+        } else {
+            dialogContent = <React.Fragment>
+                { usersSection }
+                { consultConnectSection }
+            </React.Fragment>;
+        }
+
         return (
             <BaseDialog
-                className='mx_InviteDialog'
+                className={classNames({
+                    mx_InviteDialog_transfer: this.props.kind === KIND_CALL_TRANSFER,
+                    mx_InviteDialog_other: this.props.kind !== KIND_CALL_TRANSFER,
+                    mx_InviteDialog_hasFooter: !!footer,
+                })}
                 hasCancel={true}
                 onFinished={this.props.onFinished}
                 title={title}
             >
                 <div className='mx_InviteDialog_content'>
-                    <p className='mx_InviteDialog_helpText'>{helpText}</p>
-                    <div className='mx_InviteDialog_addressBar'>
-                        {this.renderEditor()}
-                        <div className='mx_InviteDialog_buttonAndSpinner'>
-                            <AccessibleButton
-                                kind="primary"
-                                onClick={goButtonFn}
-                                className='mx_InviteDialog_goButton'
-                                disabled={this.state.busy || !hasSelection}
-                            >
-                                {buttonText}
-                            </AccessibleButton>
-                            {spinner}
-                        </div>
-                    </div>
-                    {keySharingWarning}
-                    {this.renderIdentityServerWarning()}
-                    <div className='error'>{this.state.errorText}</div>
-                    <div className='mx_InviteDialog_userSections'>
-                        {this.renderSection('recents')}
-                        {this.renderSection('suggestions')}
-                    </div>
-                    {consultSection}
+                    { dialogContent }
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js b/src/components/views/dialogs/KeySignatureUploadFailedDialog.tsx
similarity index 72%
rename from src/components/views/dialogs/KeySignatureUploadFailedDialog.js
rename to src/components/views/dialogs/KeySignatureUploadFailedDialog.tsx
index bcb4d4f9b9..28e4d1ca80 100644
--- a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
+++ b/src/components/views/dialogs/KeySignatureUploadFailedDialog.tsx
@@ -14,21 +14,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState, useCallback, useRef} from 'react';
-import * as sdk from '../../../index';
+import React, { useState, useCallback, useRef } from 'react';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import Spinner from "../elements/Spinner";
+import { IDialogProps } from "./IDialogProps";
 
-export default function KeySignatureUploadFailedDialog({
-        failures,
-        source,
-        continuation,
-        onFinished,
-}) {
+interface IProps extends IDialogProps {
+    failures: Record<string, Record<string, {
+        errcode: string;
+        error: string;
+    }>>;
+    source: string;
+    continuation: () => void;
+}
+
+const KeySignatureUploadFailedDialog: React.FC<IProps> = ({
+    failures,
+    source,
+    continuation,
+    onFinished,
+}) => {
     const RETRIES = 2;
-    const BaseDialog = sdk.getComponent('dialogs.BaseDialog');
-    const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-    const Spinner = sdk.getComponent('elements.Spinner');
     const [retry, setRetry] = useState(RETRIES);
     const [cancelled, setCancelled] = useState(false);
     const [retrying, setRetrying] = useState(false);
@@ -69,10 +78,10 @@ export default function KeySignatureUploadFailedDialog({
         const brand = SdkConfig.get().brand;
 
         body = (<div>
-            <p>{_t("%(brand)s encountered an error during upload of:", { brand })}</p>
-            <p>{reason}</p>
-            {retrying && <Spinner />}
-            <pre>{JSON.stringify(failures, null, 2)}</pre>
+            <p>{ _t("%(brand)s encountered an error during upload of:", { brand }) }</p>
+            <p>{ reason }</p>
+            { retrying && <Spinner /> }
+            <pre>{ JSON.stringify(failures, null, 2) }</pre>
             <DialogButtons
                 primaryButton='Retry'
                 hasCancel={true}
@@ -83,11 +92,11 @@ export default function KeySignatureUploadFailedDialog({
         </div>);
     } else {
         body = (<div>
-            {success ?
-                <span>{_t("Upload completed")}</span> :
+            { success ?
+                <span>{ _t("Upload completed") }</span> :
                 cancelled ?
-                    <span>{_t("Cancelled signature upload")}</span> :
-                    <span>{_t("Unable to upload")}</span>}
+                    <span>{ _t("Cancelled signature upload") }</span> :
+                    <span>{ _t("Unable to upload") }</span> }
             <DialogButtons
                 primaryButton={_t("OK")}
                 hasCancel={false}
@@ -104,7 +113,9 @@ export default function KeySignatureUploadFailedDialog({
             fixedWidth={false}
             onFinished={() => {}}
         >
-            {body}
+            { body }
         </BaseDialog>
     );
-}
+};
+
+export default KeySignatureUploadFailedDialog;
diff --git a/src/components/views/dialogs/LazyLoadingDisabledDialog.js b/src/components/views/dialogs/LazyLoadingDisabledDialog.tsx
similarity index 85%
rename from src/components/views/dialogs/LazyLoadingDisabledDialog.js
rename to src/components/views/dialogs/LazyLoadingDisabledDialog.tsx
index cae9510742..ec30123436 100644
--- a/src/components/views/dialogs/LazyLoadingDisabledDialog.js
+++ b/src/components/views/dialogs/LazyLoadingDisabledDialog.tsx
@@ -19,8 +19,13 @@ import React from 'react';
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
+import { IDialogProps } from "./IDialogProps";
 
-export default (props) => {
+interface IProps extends IDialogProps {
+    host: string;
+}
+
+const LazyLoadingDisabledDialog: React.FC<IProps> = (props) => {
     const brand = SdkConfig.get().brand;
     const description1 = _t(
         "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. " +
@@ -44,8 +49,10 @@ export default (props) => {
     return (<QuestionDialog
         hasCancelButton={false}
         title={_t("Incompatible local cache")}
-        description={<div><p>{description1}</p><p>{description2}</p></div>}
+        description={<div><p>{ description1 }</p><p>{ description2 }</p></div>}
         button={_t("Clear cache and resync")}
         onFinished={props.onFinished}
     />);
 };
+
+export default LazyLoadingDisabledDialog;
diff --git a/src/components/views/dialogs/LazyLoadingResyncDialog.js b/src/components/views/dialogs/LazyLoadingResyncDialog.tsx
similarity index 84%
rename from src/components/views/dialogs/LazyLoadingResyncDialog.js
rename to src/components/views/dialogs/LazyLoadingResyncDialog.tsx
index 378306dc2f..e6a505511c 100644
--- a/src/components/views/dialogs/LazyLoadingResyncDialog.js
+++ b/src/components/views/dialogs/LazyLoadingResyncDialog.tsx
@@ -19,8 +19,11 @@ import React from 'react';
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
+import { IDialogProps } from "./IDialogProps";
 
-export default (props) => {
+interface IProps extends IDialogProps {}
+
+const LazyLoadingResyncDialog: React.FC<IProps> = (props) => {
     const brand = SdkConfig.get().brand;
     const description =
         _t(
@@ -33,8 +36,10 @@ export default (props) => {
     return (<QuestionDialog
         hasCancelButton={false}
         title={_t("Updating %(brand)s", { brand })}
-        description={<div>{description}</div>}
+        description={<div>{ description }</div>}
         button={_t("OK")}
         onFinished={props.onFinished}
     />);
 };
+
+export default LazyLoadingResyncDialog;
diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx
new file mode 100644
index 0000000000..a6f2f1e5c4
--- /dev/null
+++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx
@@ -0,0 +1,203 @@
+/*
+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, { useEffect, useMemo, useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { JoinRule } from "matrix-js-sdk/src/@types/partials";
+
+import { _t } from '../../../languageHandler';
+import DialogButtons from "../elements/DialogButtons";
+import BaseDialog from "../dialogs/BaseDialog";
+import SpaceStore from "../../../stores/SpaceStore";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import { Entry } from "./AddExistingToSpaceDialog";
+import SearchBox from "../../structures/SearchBox";
+import QueryMatcher from "../../../autocomplete/QueryMatcher";
+import StyledRadioGroup from "../elements/StyledRadioGroup";
+
+enum RoomsToLeave {
+    All = "All",
+    Specific = "Specific",
+    None = "None",
+}
+
+const SpaceChildPicker = ({ filterPlaceholder, rooms, selected, onChange }) => {
+    const [query, setQuery] = useState("");
+    const lcQuery = query.toLowerCase().trim();
+
+    const filteredRooms = useMemo(() => {
+        if (!lcQuery) {
+            return rooms;
+        }
+
+        const matcher = new QueryMatcher<Room>(rooms, {
+            keys: ["name"],
+            funcs: [r => [r.getCanonicalAlias(), ...r.getAltAliases()].filter(Boolean)],
+            shouldMatchWordsOnly: false,
+        });
+
+        return matcher.match(lcQuery);
+    }, [rooms, lcQuery]);
+
+    return <div className="mx_LeaveSpaceDialog_section">
+        <SearchBox
+            className="mx_textinput_icon mx_textinput_search"
+            placeholder={filterPlaceholder}
+            onSearch={setQuery}
+            autoFocus={true}
+        />
+        <AutoHideScrollbar className="mx_LeaveSpaceDialog_content">
+            { filteredRooms.map(room => {
+                return <Entry
+                    key={room.roomId}
+                    room={room}
+                    checked={selected.has(room)}
+                    onChange={(checked) => {
+                        onChange(checked, room);
+                    }}
+                />;
+            }) }
+            { filteredRooms.length < 1 ? <span className="mx_LeaveSpaceDialog_noResults">
+                { _t("No results") }
+            </span> : undefined }
+        </AutoHideScrollbar>
+    </div>;
+};
+
+const LeaveRoomsPicker = ({ space, spaceChildren, roomsToLeave, setRoomsToLeave }) => {
+    const selected = useMemo(() => new Set(roomsToLeave), [roomsToLeave]);
+    const [state, setState] = useState<string>(RoomsToLeave.None);
+
+    useEffect(() => {
+        if (state === RoomsToLeave.All) {
+            setRoomsToLeave(spaceChildren);
+        } else {
+            setRoomsToLeave([]);
+        }
+    }, [setRoomsToLeave, state, spaceChildren]);
+
+    return <div className="mx_LeaveSpaceDialog_section">
+        <StyledRadioGroup
+            name="roomsToLeave"
+            value={state}
+            onChange={setState}
+            definitions={[
+                {
+                    value: RoomsToLeave.None,
+                    label: _t("Don't leave any rooms"),
+                }, {
+                    value: RoomsToLeave.All,
+                    label: _t("Leave all rooms"),
+                }, {
+                    value: RoomsToLeave.Specific,
+                    label: _t("Leave some rooms"),
+                },
+            ]}
+        />
+
+        { state === RoomsToLeave.Specific && (
+            <SpaceChildPicker
+                filterPlaceholder={_t("Search %(spaceName)s", { spaceName: space.name })}
+                rooms={spaceChildren}
+                selected={selected}
+                onChange={(selected: boolean, room: Room) => {
+                    if (selected) {
+                        setRoomsToLeave([room, ...roomsToLeave]);
+                    } else {
+                        setRoomsToLeave(roomsToLeave.filter(r => r !== room));
+                    }
+                }}
+            />
+        ) }
+    </div>;
+};
+
+interface IProps {
+    space: Room;
+    onFinished(leave: boolean, rooms?: Room[]): void;
+}
+
+const isOnlyAdmin = (room: Room): boolean => {
+    const userId = room.client.getUserId();
+    if (room.getMember(userId).powerLevelNorm !== 100) {
+        return false; // user is not an admin
+    }
+    return room.getJoinedMembers().every(member => {
+        // return true if every other member has a lower power level (we are highest)
+        return member.userId === userId || member.powerLevelNorm < 100;
+    });
+};
+
+const LeaveSpaceDialog: React.FC<IProps> = ({ space, onFinished }) => {
+    const spaceChildren = useMemo(() => SpaceStore.instance.getChildren(space.roomId), [space.roomId]);
+    const [roomsToLeave, setRoomsToLeave] = useState<Room[]>([]);
+
+    let rejoinWarning;
+    if (space.getJoinRule() !== JoinRule.Public) {
+        rejoinWarning = _t("You won't be able to rejoin unless you are re-invited.");
+    }
+
+    let onlyAdminWarning;
+    if (isOnlyAdmin(space)) {
+        onlyAdminWarning = _t("You're the only admin of this space. " +
+            "Leaving it will mean no one has control over it.");
+    } else {
+        const numChildrenOnlyAdminIn = roomsToLeave.filter(isOnlyAdmin).length;
+        if (numChildrenOnlyAdminIn > 0) {
+            onlyAdminWarning = _t("You're the only admin of some of the rooms or spaces you wish to leave. " +
+                "Leaving them will leave them without any admins.");
+        }
+    }
+
+    return <BaseDialog
+        title={_t("Leave %(spaceName)s", { spaceName: space.name })}
+        className="mx_LeaveSpaceDialog"
+        contentId="mx_LeaveSpaceDialog"
+        onFinished={() => onFinished(false)}
+        fixedWidth={false}
+    >
+        <div className="mx_Dialog_content" id="mx_LeaveSpaceDialog">
+            <p>
+                { _t("You are about to leave <spaceName/>.", {}, {
+                    spaceName: () => <b>{ space.name }</b>,
+                }) }
+                &nbsp;
+                { rejoinWarning }
+                { rejoinWarning && (<>&nbsp;</>) }
+                { spaceChildren.length > 0 && _t("Would you like to leave the rooms in this space?") }
+            </p>
+
+            { spaceChildren.length > 0 && <LeaveRoomsPicker
+                space={space}
+                spaceChildren={spaceChildren}
+                roomsToLeave={roomsToLeave}
+                setRoomsToLeave={setRoomsToLeave}
+            /> }
+
+            { onlyAdminWarning && <div className="mx_LeaveSpaceDialog_section_warning">
+                { onlyAdminWarning }
+            </div> }
+        </div>
+        <DialogButtons
+            primaryButton={_t("Leave space")}
+            onPrimaryButtonClick={() => onFinished(true, roomsToLeave)}
+            hasCancel={true}
+            onCancel={onFinished}
+        />
+    </BaseDialog>;
+};
+
+export default LeaveSpaceDialog;
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.tsx
similarity index 74%
rename from src/components/views/dialogs/LogoutDialog.js
rename to src/components/views/dialogs/LogoutDialog.tsx
index 7bced46d43..5ac3141269 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.tsx
@@ -16,27 +16,36 @@ limitations under the License.
 */
 
 import React from 'react';
+import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import RestoreKeyBackupDialog from './security/RestoreKeyBackupDialog';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
+
+interface IState {
+    shouldLoadBackupStatus: boolean;
+    loading: boolean;
+    backupInfo: IKeyBackupInfo;
+    error?: string;
+}
 
 @replaceableComponent("views.dialogs.LogoutDialog")
-export default class LogoutDialog extends React.Component {
-    defaultProps = {
+export default class LogoutDialog extends React.Component<IProps, IState> {
+    static defaultProps = {
         onFinished: function() {},
     };
 
-    constructor() {
-        super();
-        this._onSettingsLinkClick = this._onSettingsLinkClick.bind(this);
-        this._onExportE2eKeysClicked = this._onExportE2eKeysClicked.bind(this);
-        this._onFinished = this._onFinished.bind(this);
-        this._onSetRecoveryMethodClick = this._onSetRecoveryMethodClick.bind(this);
-        this._onLogoutConfirm = this._onLogoutConfirm.bind(this);
+    constructor(props) {
+        super(props);
 
         const cli = MatrixClientPeg.get();
         const shouldLoadBackupStatus = cli.isCryptoEnabled() && !cli.getKeyBackupEnabled();
@@ -49,11 +58,11 @@ export default class LogoutDialog extends React.Component {
         };
 
         if (shouldLoadBackupStatus) {
-            this._loadBackupStatus();
+            this.loadBackupStatus();
         }
     }
 
-    async _loadBackupStatus() {
+    private async loadBackupStatus() {
         try {
             const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
             this.setState({
@@ -61,7 +70,7 @@ export default class LogoutDialog extends React.Component {
                 backupInfo,
             });
         } catch (e) {
-            console.log("Unable to fetch key backup status", e);
+            logger.log("Unable to fetch key backup status", e);
             this.setState({
                 loading: false,
                 error: e,
@@ -69,29 +78,29 @@ export default class LogoutDialog extends React.Component {
         }
     }
 
-    _onSettingsLinkClick() {
+    private onSettingsLinkClick = (): void => {
         // close dialog
-        this.props.onFinished();
-    }
+        this.props.onFinished(true);
+    };
 
-    _onExportE2eKeysClicked() {
+    private onExportE2eKeysClicked = (): void => {
         Modal.createTrackedDialogAsync('Export E2E Keys', '',
             import('../../../async-components/views/dialogs/security/ExportE2eKeysDialog'),
             {
                 matrixClient: MatrixClientPeg.get(),
             },
         );
-    }
+    };
 
-    _onFinished(confirmed) {
+    private onFinished = (confirmed: boolean): void => {
         if (confirmed) {
-            dis.dispatch({action: 'logout'});
+            dis.dispatch({ action: 'logout' });
         }
         // close dialog
-        this.props.onFinished();
-    }
+        this.props.onFinished(confirmed);
+    };
 
-    _onSetRecoveryMethodClick() {
+    private onSetRecoveryMethodClick = (): void => {
         if (this.state.backupInfo) {
             // A key backup exists for this account, but the creating device is not
             // verified, so restore the backup which will give us the keys from it and
@@ -108,26 +117,26 @@ export default class LogoutDialog extends React.Component {
         }
 
         // close dialog
-        this.props.onFinished();
-    }
+        this.props.onFinished(true);
+    };
 
-    _onLogoutConfirm() {
-        dis.dispatch({action: 'logout'});
+    private onLogoutConfirm = (): void => {
+        dis.dispatch({ action: 'logout' });
 
         // close dialog
-        this.props.onFinished();
-    }
+        this.props.onFinished(true);
+    };
 
     render() {
         if (this.state.shouldLoadBackupStatus) {
             const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
             const description = <div>
-                <p>{_t(
+                <p>{ _t(
                     "Encrypted messages are secured with end-to-end encryption. " +
                     "Only you and the recipient(s) have the keys to read these messages.",
-                )}</p>
-                <p>{_t("Back up your keys before signing out to avoid losing them.")}</p>
+                ) }</p>
+                <p>{ _t("Back up your keys before signing out to avoid losing them.") }</p>
             </div>;
 
             let dialogContent;
@@ -152,17 +161,17 @@ export default class LogoutDialog extends React.Component {
                     </div>
                     <DialogButtons primaryButton={setupButtonCaption}
                         hasCancel={false}
-                        onPrimaryButtonClick={this._onSetRecoveryMethodClick}
+                        onPrimaryButtonClick={this.onSetRecoveryMethodClick}
                         focus={true}
                     >
-                        <button onClick={this._onLogoutConfirm}>
-                            {_t("I don't want my encrypted messages")}
+                        <button onClick={this.onLogoutConfirm}>
+                            { _t("I don't want my encrypted messages") }
                         </button>
                     </DialogButtons>
                     <details>
-                        <summary>{_t("Advanced")}</summary>
-                        <p><button onClick={this._onExportE2eKeysClicked}>
-                            {_t("Manually export keys")}
+                        <summary>{ _t("Advanced") }</summary>
+                        <p><button onClick={this.onExportE2eKeysClicked}>
+                            { _t("Manually export keys") }
                         </button></p>
                     </details>
                 </div>;
@@ -174,9 +183,9 @@ export default class LogoutDialog extends React.Component {
                 title={_t("You'll lose access to your encrypted messages")}
                 contentId='mx_Dialog_content'
                 hasCancel={true}
-                onFinished={this._onFinished}
+                onFinished={this.onFinished}
             >
-                {dialogContent}
+                { dialogContent }
             </BaseDialog>);
         } else {
             const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
@@ -187,7 +196,7 @@ export default class LogoutDialog extends React.Component {
                     "Are you sure you want to sign out?",
                 )}
                 button={_t("Sign out")}
-                onFinished={this._onFinished}
+                onFinished={this.onFinished}
             />);
         }
     }
diff --git a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx
new file mode 100644
index 0000000000..dd5c549bbe
--- /dev/null
+++ b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx
@@ -0,0 +1,191 @@
+/*
+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, useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { _t } from '../../../languageHandler';
+import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import SearchBox from "../../structures/SearchBox";
+import SpaceStore from "../../../stores/SpaceStore";
+import RoomAvatar from "../avatars/RoomAvatar";
+import AccessibleButton from "../elements/AccessibleButton";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import StyledCheckbox from "../elements/StyledCheckbox";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+
+interface IProps extends IDialogProps {
+    room: Room;
+    selected?: string[];
+}
+
+const Entry = ({ room, checked, onChange }) => {
+    const localRoom = room instanceof Room;
+
+    let description;
+    if (localRoom) {
+        description = _t("%(count)s members", { count: room.getJoinedMemberCount() });
+        const numChildRooms = SpaceStore.instance.getChildRooms(room.roomId).length;
+        if (numChildRooms > 0) {
+            description += " · " + _t("%(count)s rooms", { count: numChildRooms });
+        }
+    }
+
+    return <label className="mx_ManageRestrictedJoinRuleDialog_entry">
+        <div>
+            <div>
+                { localRoom
+                    ? <RoomAvatar room={room} height={20} width={20} />
+                    : <RoomAvatar oobData={room} height={20} width={20} />
+                }
+                <span className="mx_ManageRestrictedJoinRuleDialog_entry_name">{ room.name }</span>
+            </div>
+            { description && <div className="mx_ManageRestrictedJoinRuleDialog_entry_description">
+                { description }
+            </div> }
+        </div>
+        <StyledCheckbox
+            onChange={onChange ? (e) => onChange(e.target.checked) : null}
+            checked={checked}
+            disabled={!onChange}
+        />
+    </label>;
+};
+
+const ManageRestrictedJoinRuleDialog: React.FC<IProps> = ({ room, selected = [], onFinished }) => {
+    const cli = room.client;
+    const [newSelected, setNewSelected] = useState(new Set<string>(selected));
+    const [query, setQuery] = useState("");
+    const lcQuery = query.toLowerCase().trim();
+
+    const [spacesContainingRoom, otherEntries] = useMemo(() => {
+        const spaces = cli.getVisibleRooms().filter(r => r.getMyMembership() === "join" && r.isSpaceRoom());
+        return [
+            spaces.filter(r => SpaceStore.instance.getSpaceFilteredRoomIds(r).has(room.roomId)),
+            selected.map(roomId => {
+                const room = cli.getRoom(roomId);
+                if (!room) {
+                    return { roomId, name: roomId } as Room;
+                }
+                if (room.getMyMembership() !== "join" || !room.isSpaceRoom()) {
+                    return room;
+                }
+            }).filter(Boolean),
+        ];
+    }, [cli, selected, room.roomId]);
+
+    const [filteredSpacesContainingRooms, filteredOtherEntries] = useMemo(() => [
+        spacesContainingRoom.filter(r => r.name.toLowerCase().includes(lcQuery)),
+        otherEntries.filter(r => r.name.toLowerCase().includes(lcQuery)),
+    ], [spacesContainingRoom, otherEntries, lcQuery]);
+
+    const onChange = (checked: boolean, room: Room): void => {
+        if (checked) {
+            newSelected.add(room.roomId);
+        } else {
+            newSelected.delete(room.roomId);
+        }
+        setNewSelected(new Set(newSelected));
+    };
+
+    let inviteOnlyWarning;
+    if (newSelected.size < 1) {
+        inviteOnlyWarning = <div className="mx_ManageRestrictedJoinRuleDialog_section_info">
+            { _t("You're removing all spaces. Access will default to invite only") }
+        </div>;
+    }
+
+    return <BaseDialog
+        title={_t("Select spaces")}
+        className="mx_ManageRestrictedJoinRuleDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <p>
+            { _t("Decide which spaces can access this room. " +
+                "If a space is selected, its members can find and join <RoomName/>.", {}, {
+                RoomName: () => <b>{ room.name }</b>,
+            }) }
+        </p>
+        <MatrixClientContext.Provider value={cli}>
+            <SearchBox
+                className="mx_textinput_icon mx_textinput_search"
+                placeholder={_t("Search spaces")}
+                onSearch={setQuery}
+                autoFocus={true}
+            />
+            <AutoHideScrollbar className="mx_ManageRestrictedJoinRuleDialog_content">
+                { filteredSpacesContainingRooms.length > 0 ? (
+                    <div className="mx_ManageRestrictedJoinRuleDialog_section">
+                        <h3>{ _t("Spaces you know that contain this room") }</h3>
+                        { filteredSpacesContainingRooms.map(space => {
+                            return <Entry
+                                key={space.roomId}
+                                room={space}
+                                checked={newSelected.has(space.roomId)}
+                                onChange={(checked: boolean) => {
+                                    onChange(checked, space);
+                                }}
+                            />;
+                        }) }
+                    </div>
+                ) : undefined }
+
+                { filteredOtherEntries.length > 0 ? (
+                    <div className="mx_ManageRestrictedJoinRuleDialog_section">
+                        <h3>{ _t("Other spaces or rooms you might not know") }</h3>
+                        <div className="mx_ManageRestrictedJoinRuleDialog_section_info">
+                            <div>{ _t("These are likely ones other room admins are a part of.") }</div>
+                        </div>
+                        { filteredOtherEntries.map(space => {
+                            return <Entry
+                                key={space.roomId}
+                                room={space}
+                                checked={newSelected.has(space.roomId)}
+                                onChange={(checked: boolean) => {
+                                    onChange(checked, space);
+                                }}
+                            />;
+                        }) }
+                    </div>
+                ) : null }
+
+                { filteredSpacesContainingRooms.length + filteredOtherEntries.length < 1
+                    ? <span className="mx_ManageRestrictedJoinRuleDialog_noResults">
+                        { _t("No results") }
+                    </span>
+                    : undefined
+                }
+            </AutoHideScrollbar>
+
+            <div className="mx_ManageRestrictedJoinRuleDialog_footer">
+                { inviteOnlyWarning }
+                <div className="mx_ManageRestrictedJoinRuleDialog_footer_buttons">
+                    <AccessibleButton kind="primary_outline" onClick={() => onFinished()}>
+                        { _t("Cancel") }
+                    </AccessibleButton>
+                    <AccessibleButton kind="primary" onClick={() => onFinished(Array.from(newSelected))}>
+                        { _t("Confirm") }
+                    </AccessibleButton>
+                </div>
+            </div>
+        </MatrixClientContext.Provider>
+    </BaseDialog>;
+};
+
+export default ManageRestrictedJoinRuleDialog;
+
diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
similarity index 80%
rename from src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
rename to src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
index 3151edd796..88419d26b8 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
@@ -19,37 +19,31 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import QuestionDialog from "./QuestionDialog";
+import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {
+    userId: string;
+    device: DeviceInfo;
+}
 
 @replaceableComponent("views.dialogs.ManualDeviceKeyVerificationDialog")
-export default class ManualDeviceKeyVerificationDialog extends React.Component {
-    static propTypes = {
-        userId: PropTypes.string.isRequired,
-        device: PropTypes.object.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _onCancelClick = () => {
-        this.props.onFinished(false);
-    }
-
-    _onLegacyFinished = (confirm) => {
+export default class ManualDeviceKeyVerificationDialog extends React.Component<IProps> {
+    private onLegacyFinished = (confirm: boolean): void => {
         if (confirm) {
             MatrixClientPeg.get().setDeviceVerified(
                 this.props.userId, this.props.device.deviceId, true,
             );
         }
         this.props.onFinished(confirm);
-    }
-
-    render() {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+    };
 
+    public render(): JSX.Element {
         let text;
         if (MatrixClientPeg.get().getUserId() === this.props.userId) {
             text = _t("Confirm by comparing the following with the User Settings in your other session:");
@@ -81,7 +75,7 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
                 title={_t("Verify session")}
                 description={body}
                 button={_t("Verify session")}
-                onFinished={this._onLegacyFinished}
+                onFinished={this.onLegacyFinished}
             />
         );
     }
diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.js b/src/components/views/dialogs/MessageEditHistoryDialog.tsx
similarity index 71%
rename from src/components/views/dialogs/MessageEditHistoryDialog.js
rename to src/components/views/dialogs/MessageEditHistoryDialog.tsx
index beb11e70e4..7753eba199 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.js
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.tsx
@@ -15,21 +15,39 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
-import * as sdk from "../../../index";
-import {wantsDateSeparator} from '../../../DateUtils';
+import { wantsDateSeparator } from '../../../DateUtils';
 import SettingsStore from '../../../settings/SettingsStore';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import BaseDialog from "./BaseDialog";
+import ScrollPanel from "../../structures/ScrollPanel";
+import Spinner from "../elements/Spinner";
+import EditHistoryMessage from "../messages/EditHistoryMessage";
+import DateSeparator from "../messages/DateSeparator";
+import { IDialogProps } from "./IDialogProps";
+import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
+import { defer } from "matrix-js-sdk/src/utils";
+
+interface IProps extends IDialogProps {
+    mxEvent: MatrixEvent;
+}
+
+interface IState {
+    originalEvent: MatrixEvent;
+    error: {
+        errcode: string;
+    };
+    events: MatrixEvent[];
+    nextBatch: string;
+    isLoading: boolean;
+    isTwelveHour: boolean;
+}
 
 @replaceableComponent("views.dialogs.MessageEditHistoryDialog")
-export default class MessageEditHistoryDialog extends React.PureComponent {
-    static propTypes = {
-        mxEvent: PropTypes.object.isRequired,
-    };
-
-    constructor(props) {
+export default class MessageEditHistoryDialog extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
         this.state = {
             originalEvent: null,
@@ -41,33 +59,33 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
         };
     }
 
-    loadMoreEdits = async (backwards) => {
+    private loadMoreEdits = async (backwards?: boolean): Promise<boolean> => {
         if (backwards || (!this.state.nextBatch && !this.state.isLoading)) {
             // bail out on backwards as we only paginate in one direction
             return false;
         }
-        const opts = {from: this.state.nextBatch};
+        const opts = { from: this.state.nextBatch };
         const roomId = this.props.mxEvent.getRoomId();
         const eventId = this.props.mxEvent.getId();
         const client = MatrixClientPeg.get();
+
+        const { resolve, reject, promise } = defer<boolean>();
         let result;
-        let resolve;
-        let reject;
-        const promise = new Promise((_resolve, _reject) => {resolve = _resolve; reject = _reject;});
+
         try {
             result = await client.relations(
-                roomId, eventId, "m.replace", "m.room.message", opts);
+                roomId, eventId, RelationType.Replace, EventType.RoomMessage, opts);
         } catch (error) {
             // log if the server returned an error
             if (error.errcode) {
                 console.error("fetching /relations failed with error", error);
             }
-            this.setState({error}, () => reject(error));
+            this.setState({ error }, () => reject(error));
             return promise;
         }
 
         const newEvents = result.events;
-        this._locallyRedactEventsIfNeeded(newEvents);
+        this.locallyRedactEventsIfNeeded(newEvents);
         this.setState({
             originalEvent: this.state.originalEvent || result.originalEvent,
             events: this.state.events.concat(newEvents),
@@ -78,9 +96,9 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
             resolve(hasMoreResults);
         });
         return promise;
-    }
+    };
 
-    _locallyRedactEventsIfNeeded(newEvents) {
+    private locallyRedactEventsIfNeeded(newEvents: MatrixEvent[]): void {
         const roomId = this.props.mxEvent.getRoomId();
         const client = MatrixClientPeg.get();
         const room = client.getRoom(roomId);
@@ -95,13 +113,11 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
         }
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         this.loadMoreEdits();
     }
 
-    _renderEdits() {
-        const EditHistoryMessage = sdk.getComponent('messages.EditHistoryMessage');
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+    private renderEdits(): JSX.Element[] {
         const nodes = [];
         let lastEvent;
         let allEvents = this.state.events;
@@ -128,41 +144,38 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
         return nodes;
     }
 
-    render() {
+    public render(): JSX.Element {
         let content;
         if (this.state.error) {
-            const {error} = this.state;
+            const { error } = this.state;
             if (error.errcode === "M_UNRECOGNIZED") {
                 content = (<p className="mx_MessageEditHistoryDialog_error">
-                    {_t("Your homeserver doesn't seem to support this feature.")}
+                    { _t("Your homeserver doesn't seem to support this feature.") }
                 </p>);
             } else if (error.errcode) {
                 // some kind of error from the homeserver
                 content = (<p className="mx_MessageEditHistoryDialog_error">
-                    {_t("Something went wrong!")}
+                    { _t("Something went wrong!") }
                 </p>);
             } else {
                 content = (<p className="mx_MessageEditHistoryDialog_error">
-                    {_t("Cannot reach homeserver")}
+                    { _t("Cannot reach homeserver") }
                     <br />
-                    {_t("Ensure you have a stable internet connection, or get in touch with the server admin")}
+                    { _t("Ensure you have a stable internet connection, or get in touch with the server admin") }
                 </p>);
             }
         } else if (this.state.isLoading) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             content = <Spinner />;
         } else {
-            const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
             content = (<ScrollPanel
                 className="mx_MessageEditHistoryDialog_scrollPanel"
-                onFillRequest={ this.loadMoreEdits }
+                onFillRequest={this.loadMoreEdits}
                 stickyBottom={false}
                 startAtBottom={false}
             >
-                <ul className="mx_MessageEditHistoryDialog_edits mx_MessagePanel_alwaysShowTimestamps">{this._renderEdits()}</ul>
+                <ul className="mx_MessageEditHistoryDialog_edits">{ this.renderEdits() }</ul>
             </ScrollPanel>);
         }
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog
                 className='mx_MessageEditHistoryDialog'
@@ -170,7 +183,7 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
                 onFinished={this.props.onFinished}
                 title={_t("Message edits")}
             >
-                {content}
+                { content }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
index 0c474b160c..1bf7eb7307 100644
--- a/src/components/views/dialogs/ModalWidgetDialog.tsx
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -33,13 +33,13 @@ import {
     WidgetApiFromWidgetAction,
     WidgetKind,
 } from "matrix-widget-api";
-import {StopGapWidgetDriver} from "../../../stores/widgets/StopGapWidgetDriver";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {OwnProfileStore} from "../../../stores/OwnProfileStore";
+import { StopGapWidgetDriver } from "../../../stores/widgets/StopGapWidgetDriver";
+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";
-import {ELEMENT_CLIENT_ID} from "../../../identifiers";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ELEMENT_CLIENT_ID } from "../../../identifiers";
 import SettingsStore from "../../../settings/SettingsStore";
 
 interface IProps {
@@ -63,7 +63,8 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     private appFrame: React.RefObject<HTMLIFrameElement> = React.createRef();
 
     state: IState = {
-        disabledButtonIds: [],
+        disabledButtonIds: (this.props.widgetDefinition.buttons || []).filter(b => b.disabled)
+            .map(b => b.id),
     };
 
     constructor(props) {
@@ -80,7 +81,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     public componentDidMount() {
         const driver = new StopGapWidgetDriver( [], this.widget, WidgetKind.Modal);
         const messaging = new ClientWidgetApi(this.widget, this.appFrame.current, driver);
-        this.setState({messaging});
+        this.setState({ messaging });
     }
 
     public componentWillUnmount() {
@@ -101,14 +102,14 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
 
     private onWidgetClose = (ev: CustomEvent<IModalWidgetCloseRequest>) => {
         this.props.onFinished(true, ev.detail.data);
-    }
+    };
 
     private onButtonEnableToggle = (ev: CustomEvent<ISetModalButtonEnabledActionRequest>) => {
         ev.preventDefault();
         const isClose = ev.detail.data.button === BuiltInModalButtonID.Close;
         if (isClose || !this.possibleButtons.includes(ev.detail.data.button)) {
             return this.state.messaging.transport.reply(ev.detail, {
-                error: {message: "Invalid button"},
+                error: { message: "Invalid button" },
             } as IWidgetApiErrorResponseData);
         }
 
@@ -121,7 +122,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
             tempSet.add(ev.detail.data.button);
             buttonIds = Array.from(tempSet);
         }
-        this.setState({disabledButtonIds: buttonIds});
+        this.setState({ disabledButtonIds: buttonIds });
         this.state.messaging.transport.reply(ev.detail, {} as IWidgetApiAcknowledgeResponseData);
     };
 
@@ -159,7 +160,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
                         break;
                     case ModalButtonKind.Secondary:
                         kind = "primary_outline";
-                        break
+                        break;
                     case ModalButtonKind.Danger:
                         kind = "danger";
                         break;
@@ -190,9 +191,9 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
                     width="16"
                     alt=""
                 />
-                {_t("Data on this screen is shared with %(widgetDomain)s", {
+                { _t("Data on this screen is shared with %(widgetDomain)s", {
                     widgetDomain: parsed.hostname,
-                })}
+                }) }
             </div>
             <div>
                 <iframe
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
deleted file mode 100644
index 5172f29405..0000000000
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import Modal from '../../../Modal';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
-import VerificationRequestDialog from './VerificationRequestDialog';
-import BaseDialog from './BaseDialog';
-import DialogButtons from '../elements/DialogButtons';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import * as sdk from '../../../index';
-
-@replaceableComponent("views.dialogs.NewSessionReviewDialog")
-export default class NewSessionReviewDialog extends React.PureComponent {
-    static propTypes = {
-        userId: PropTypes.string.isRequired,
-        device: PropTypes.object.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    }
-
-    onCancelClick = () => {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        Modal.createTrackedDialog("Verification failed", "insecure", ErrorDialog, {
-            headerImage: require("../../../../res/img/e2e/warning.svg"),
-            title: _t("Your account is not secure"),
-            description: <div>
-                {_t("One of the following may be compromised:")}
-                <ul>
-                    <li>{_t("Your password")}</li>
-                    <li>{_t("Your homeserver")}</li>
-                    <li>{_t("This session, or the other session")}</li>
-                    <li>{_t("The internet connection either session is using")}</li>
-                </ul>
-                <div>
-                    {_t("We recommend you change your password and Security Key in Settings immediately")}
-                </div>
-            </div>,
-            onFinished: () => this.props.onFinished(false),
-        });
-    }
-
-    onContinueClick = () => {
-        const { userId, device } = this.props;
-        const cli = MatrixClientPeg.get();
-        const requestPromise = cli.requestVerification(
-            userId,
-            [device.deviceId],
-        );
-
-        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();
-            },
-        });
-    }
-
-    render() {
-        const { device } = this.props;
-
-        const icon = <span className="mx_NewSessionReviewDialog_headerIcon mx_E2EIcon_warning"></span>;
-        const titleText = _t("New session");
-
-        const title = <h2 className="mx_NewSessionReviewDialog_header">
-            {icon}
-            {titleText}
-        </h2>;
-
-        return (
-            <BaseDialog
-                title={title}
-                onFinished={this.props.onFinished}
-            >
-                <div className="mx_NewSessionReviewDialog_body">
-                    <p>{_t(
-                        "Use this session to verify your new one, " +
-                        "granting it access to encrypted messages:",
-                    )}</p>
-                    <div className="mx_NewSessionReviewDialog_deviceInfo">
-                        <div>
-                            <span className="mx_NewSessionReviewDialog_deviceName">
-                                {device.getDisplayName()}
-                            </span> <span className="mx_NewSessionReviewDialog_deviceID">
-                                ({device.deviceId})
-                            </span>
-                        </div>
-                    </div>
-                    <p>{_t(
-                        "If you didn’t sign in to this session, " +
-                        "your account may be compromised.",
-                    )}</p>
-                    <DialogButtons
-                        cancelButton={_t("This wasn't me")}
-                        cancelButtonClass="danger"
-                        primaryButton={_t("Continue")}
-                        onCancel={this.onCancelClick}
-                        onPrimaryButtonClick={this.onContinueClick}
-                    />
-                </div>
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.tsx
similarity index 76%
rename from src/components/views/dialogs/QuestionDialog.js
rename to src/components/views/dialogs/QuestionDialog.tsx
index 3d90236b08..aaddff34ed 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.tsx
@@ -16,29 +16,30 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from "classnames";
 
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import { IDialogProps } from "./IDialogProps";
 
-export default class QuestionDialog extends React.Component {
-    static propTypes = {
-        title: PropTypes.string,
-        description: PropTypes.node,
-        extraButtons: PropTypes.node,
-        button: PropTypes.string,
-        buttonDisabled: PropTypes.bool,
-        danger: PropTypes.bool,
-        focus: PropTypes.bool,
-        onFinished: PropTypes.func.isRequired,
-        headerImage: PropTypes.string,
-        quitOnly: PropTypes.bool, // quitOnly doesn't show the cancel button just the quit [x].
-        fixedWidth: PropTypes.bool,
-        className: PropTypes.string,
-    };
+interface IProps extends IDialogProps {
+    title?: string;
+    description?: React.ReactNode;
+    extraButtons?: React.ReactNode;
+    button?: string;
+    buttonDisabled?: boolean;
+    danger?: boolean;
+    focus?: boolean;
+    headerImage?: string;
+    quitOnly?: boolean; // quitOnly doesn't show the cancel button just the quit [x].
+    fixedWidth?: boolean;
+    className?: string;
+    hasCancelButton?: boolean;
+    cancelButton?: React.ReactNode;
+}
 
-    static defaultProps = {
+export default class QuestionDialog extends React.Component<IProps> {
+    public static defaultProps: Partial<IProps> = {
         title: "",
         description: "",
         extraButtons: null,
@@ -48,17 +49,19 @@ export default class QuestionDialog extends React.Component {
         quitOnly: false,
     };
 
-    onOk = () => {
+    private onOk = (): void => {
         this.props.onFinished(true);
     };
 
-    onCancel = () => {
+    private onCancel = (): void => {
         this.props.onFinished(false);
     };
 
-    render() {
+    public render(): JSX.Element {
+        // Converting these to imports breaks wrench tests
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
         let primaryButtonClass = "";
         if (this.props.danger) {
             primaryButtonClass = "danger";
diff --git a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
index 3f3ad215a5..804a1aec35 100644
--- a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
+++ b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
@@ -18,7 +18,7 @@ import * as React from "react";
 
 import { _t } from '../../../languageHandler';
 import { IDialogProps } from "./IDialogProps";
-import {useRef, useState} from "react";
+import { useRef, useState } from "react";
 import Field from "../elements/Field";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import withValidation from "../elements/Validation";
@@ -40,7 +40,7 @@ const validation = withValidation({
     ],
 });
 
-const RegistrationEmailPromptDialog: React.FC<IProps> = ({onFinished}) => {
+const RegistrationEmailPromptDialog: React.FC<IProps> = ({ onFinished }) => {
     const [email, setEmail] = useState("");
     const fieldRef = useRef<Field>();
 
@@ -67,10 +67,10 @@ const RegistrationEmailPromptDialog: React.FC<IProps> = ({onFinished}) => {
         fixedWidth={false}
     >
         <div className="mx_Dialog_content" id="mx_RegistrationEmailPromptDialog">
-            <p>{_t("Just a heads up, if you don't add an email and forget your password, you could " +
+            <p>{ _t("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>.", {}, {
-                b: sub => <b>{sub}</b>,
-            })}</p>
+                b: sub => <b>{ sub }</b>,
+            }) }</p>
             <form onSubmit={onSubmit}>
                 <Field
                     ref={fieldRef}
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
deleted file mode 100644
index 5454b97287..0000000000
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, {PureComponent} from 'react';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import PropTypes from "prop-types";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-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,
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            reason: "",
-            busy: false,
-            err: null,
-        };
-    }
-
-    _onReasonChange = ({target: {value: reason}}) => {
-        this.setState({ reason });
-    };
-
-    _onCancel = () => {
-        this.props.onFinished(false);
-    };
-
-    _onSubmit = async () => {
-        if (!this.state.reason || !this.state.reason.trim()) {
-            this.setState({
-                err: _t("Please fill why you're reporting."),
-            });
-            return;
-        }
-
-        this.setState({
-            busy: true,
-            err: null,
-        });
-
-        try {
-            const ev = this.props.mxEvent;
-            await MatrixClientPeg.get().reportEvent(ev.getRoomId(), ev.getId(), -100, this.state.reason.trim());
-            this.props.onFinished(true);
-        } catch (e) {
-            this.setState({
-                busy: false,
-                err: e.message,
-            });
-        }
-    };
-
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const Loader = sdk.getComponent('elements.Spinner');
-        const Field = sdk.getComponent('elements.Field');
-
-        let error = null;
-        if (this.state.err) {
-            error = <div className="error">
-                {this.state.err}
-            </div>;
-        }
-
-        let progress = null;
-        if (this.state.busy) {
-            progress = (
-                <div className="progress">
-                    <Loader />
-                </div>
-            );
-        }
-
-        const adminMessageMD =
-            SdkConfig.get().reportEvent &&
-            SdkConfig.get().reportEvent.adminMessageMD;
-        let adminMessage;
-        if (adminMessageMD) {
-            const html = new Markdown(adminMessageMD).toHTML({ externalLinks: true });
-            adminMessage = <p dangerouslySetInnerHTML={{ __html: html }} />;
-        }
-
-        return (
-            <BaseDialog
-                className="mx_BugReportDialog"
-                onFinished={this.props.onFinished}
-                title={_t('Report Content to Your Homeserver Administrator')}
-                contentId='mx_ReportEventDialog'
-            >
-                <div className="mx_ReportEventDialog" id="mx_ReportEventDialog">
-                    <p>
-                        {
-                            _t("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.")
-                        }
-                    </p>
-                    {adminMessage}
-                    <Field
-                        className="mx_ReportEventDialog_reason"
-                        element="textarea"
-                        label={_t("Reason")}
-                        rows={5}
-                        onChange={this._onReasonChange}
-                        value={this.state.reason}
-                        disabled={this.state.busy}
-                    />
-                    {progress}
-                    {error}
-                </div>
-                <DialogButtons
-                    primaryButton={_t("Send report")}
-                    onPrimaryButtonClick={this._onSubmit}
-                    focus={true}
-                    onCancel={this._onCancel}
-                    disabled={this.state.busy}
-                />
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/ReportEventDialog.tsx b/src/components/views/dialogs/ReportEventDialog.tsx
new file mode 100644
index 0000000000..25675ee7d2
--- /dev/null
+++ b/src/components/views/dialogs/ReportEventDialog.tsx
@@ -0,0 +1,442 @@
+/*
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { _t } from '../../../languageHandler';
+import { ensureDMExists } from "../../../createRoom";
+import { IDialogProps } from "./IDialogProps";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import SdkConfig from '../../../SdkConfig';
+import Markdown from '../../../Markdown';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import SettingsStore from "../../../settings/SettingsStore";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import Field from "../elements/Field";
+import Spinner from "../elements/Spinner";
+
+interface IProps extends IDialogProps {
+    mxEvent: MatrixEvent;
+}
+
+interface IState {
+    // A free-form text describing the abuse.
+    reason: string;
+    busy: boolean;
+    err?: string;
+    // If we know it, the nature of the abuse, as specified by MSC3215.
+    nature?: ExtendedNature;
+}
+
+const MODERATED_BY_STATE_EVENT_TYPE = [
+    "org.matrix.msc3215.room.moderation.moderated_by",
+    /**
+     * Unprefixed state event. Not ready for prime time.
+     *
+     * "m.room.moderation.moderated_by"
+     */
+];
+
+const ABUSE_EVENT_TYPE = "org.matrix.msc3215.abuse.report";
+
+// Standard abuse natures.
+enum Nature {
+    Disagreement = "org.matrix.msc3215.abuse.nature.disagreement",
+    Toxic = "org.matrix.msc3215.abuse.nature.toxic",
+    Illegal = "org.matrix.msc3215.abuse.nature.illegal",
+    Spam = "org.matrix.msc3215.abuse.nature.spam",
+    Other = "org.matrix.msc3215.abuse.nature.other",
+}
+
+enum NonStandardValue {
+    // Non-standard abuse nature.
+    // It should never leave the client - we use it to fallback to
+    // server-wide abuse reporting.
+    Admin = "non-standard.abuse.nature.admin"
+}
+
+type ExtendedNature = Nature | NonStandardValue;
+
+type Moderation = {
+    // The id of the moderation room.
+    moderationRoomId: string;
+    // The id of the bot in charge of forwarding abuse reports to the moderation room.
+    moderationBotUserId: string;
+};
+/*
+ * A dialog for reporting an event.
+ *
+ * The actual content of the dialog will depend on two things:
+ *
+ * 1. Is `feature_report_to_moderators` enabled?
+ * 2. Does the room support moderation as per MSC3215, i.e. is there
+ *    a well-formed state event `m.room.moderation.moderated_by`
+ *    /`org.matrix.msc3215.room.moderation.moderated_by`?
+ */
+@replaceableComponent("views.dialogs.ReportEventDialog")
+export default class ReportEventDialog extends React.Component<IProps, IState> {
+    // If the room supports moderation, the moderation information.
+    private moderation?: Moderation;
+
+    constructor(props: IProps) {
+        super(props);
+
+        let moderatedByRoomId = null;
+        let moderatedByUserId = null;
+
+        if (SettingsStore.getValue("feature_report_to_moderators")) {
+            // The client supports reporting to moderators.
+            // Does the room support it, too?
+
+            // Extract state events to determine whether we should display
+            const client = MatrixClientPeg.get();
+            const room = client.getRoom(props.mxEvent.getRoomId());
+
+            for (const stateEventType of MODERATED_BY_STATE_EVENT_TYPE) {
+                const stateEvent = room.currentState.getStateEvents(stateEventType, stateEventType);
+                if (!stateEvent) {
+                    continue;
+                }
+                if (Array.isArray(stateEvent)) {
+                    // Internal error.
+                    throw new TypeError(`getStateEvents(${stateEventType}, ${stateEventType}) ` +
+                        "should return at most one state event");
+                }
+                const event = stateEvent.event;
+                if (!("content" in event) || typeof event["content"] != "object") {
+                    // The room is improperly configured.
+                    // Display this debug message for the sake of moderators.
+                    console.debug("Moderation error", "state event", stateEventType,
+                        "should have an object field `content`, got", event);
+                    continue;
+                }
+                const content = event["content"];
+                if (!("room_id" in content) || typeof content["room_id"] != "string") {
+                    // The room is improperly configured.
+                    // Display this debug message for the sake of moderators.
+                    console.debug("Moderation error", "state event", stateEventType,
+                        "should have a string field `content.room_id`, got", event);
+                    continue;
+                }
+                if (!("user_id" in content) || typeof content["user_id"] != "string") {
+                    // The room is improperly configured.
+                    // Display this debug message for the sake of moderators.
+                    console.debug("Moderation error", "state event", stateEventType,
+                        "should have a string field `content.user_id`, got", event);
+                    continue;
+                }
+                moderatedByRoomId = content["room_id"];
+                moderatedByUserId = content["user_id"];
+            }
+
+            if (moderatedByRoomId && moderatedByUserId) {
+                // The room supports moderation.
+                this.moderation = {
+                    moderationRoomId: moderatedByRoomId,
+                    moderationBotUserId: moderatedByUserId,
+                };
+            }
+        }
+
+        this.state = {
+            // A free-form text describing the abuse.
+            reason: "",
+            busy: false,
+            err: null,
+            // If specified, the nature of the abuse, as specified by MSC3215.
+            nature: null,
+        };
+    }
+
+    // The user has written down a freeform description of the abuse.
+    private onReasonChange = ({ target: { value: reason } }): void => {
+        this.setState({ reason });
+    };
+
+    // The user has clicked on a nature.
+    private onNatureChosen = (e: React.FormEvent<HTMLInputElement>): void => {
+        this.setState({ nature: e.currentTarget.value as ExtendedNature });
+    };
+
+    // The user has clicked "cancel".
+    private onCancel = (): void => {
+        this.props.onFinished(false);
+    };
+
+    // The user has clicked "submit".
+    private onSubmit = async () => {
+        let reason = this.state.reason || "";
+        reason = reason.trim();
+        if (this.moderation) {
+            // This room supports moderation.
+            // We need a nature.
+            // If the nature is `NATURE.OTHER` or `NON_STANDARD_NATURE.ADMIN`, we also need a `reason`.
+            if (!this.state.nature ||
+                    ((this.state.nature == Nature.Other || this.state.nature == NonStandardValue.Admin)
+                        && !reason)
+            ) {
+                this.setState({
+                    err: _t("Please fill why you're reporting."),
+                });
+                return;
+            }
+        } else {
+            // This room does not support moderation.
+            // We need a `reason`.
+            if (!reason) {
+                this.setState({
+                    err: _t("Please fill why you're reporting."),
+                });
+                return;
+            }
+        }
+
+        this.setState({
+            busy: true,
+            err: null,
+        });
+
+        try {
+            const client = MatrixClientPeg.get();
+            const ev = this.props.mxEvent;
+            if (this.moderation && this.state.nature != NonStandardValue.Admin) {
+                const nature: Nature = this.state.nature;
+
+                // Report to moderators through to the dedicated bot,
+                // as configured in the room's state events.
+                const dmRoomId = await ensureDMExists(client, this.moderation.moderationBotUserId);
+                await client.sendEvent(dmRoomId, ABUSE_EVENT_TYPE, {
+                    event_id: ev.getId(),
+                    room_id: ev.getRoomId(),
+                    moderated_by_id: this.moderation.moderationRoomId,
+                    nature,
+                    reporter: client.getUserId(),
+                    comment: this.state.reason.trim(),
+                });
+            } else {
+                // Report to homeserver admin through the dedicated Matrix API.
+                await client.reportEvent(ev.getRoomId(), ev.getId(), -100, this.state.reason.trim());
+            }
+            this.props.onFinished(true);
+        } catch (e) {
+            this.setState({
+                busy: false,
+                err: e.message,
+            });
+        }
+    };
+
+    render() {
+        let error = null;
+        if (this.state.err) {
+            error = <div className="error">
+                { this.state.err }
+            </div>;
+        }
+
+        let progress = null;
+        if (this.state.busy) {
+            progress = (
+                <div className="progress">
+                    <Spinner />
+                </div>
+            );
+        }
+
+        const adminMessageMD =
+            SdkConfig.get().reportEvent &&
+            SdkConfig.get().reportEvent.adminMessageMD;
+        let adminMessage;
+        if (adminMessageMD) {
+            const html = new Markdown(adminMessageMD).toHTML({ externalLinks: true });
+            adminMessage = <p dangerouslySetInnerHTML={{ __html: html }} />;
+        }
+
+        if (this.moderation) {
+            // Display report-to-moderator dialog.
+            // We let the user pick a nature.
+            const client = MatrixClientPeg.get();
+            const homeServerName = SdkConfig.get()["validated_server_config"].hsName;
+            let subtitle;
+            switch (this.state.nature) {
+                case Nature.Disagreement:
+                    subtitle = _t("What this user is writing is wrong.\n" +
+                        "This will be reported to the room moderators.");
+                    break;
+                case Nature.Toxic:
+                    subtitle = _t("This user is displaying toxic behaviour, " +
+                        "for instance by insulting other users or sharing " +
+                        " adult-only content in a family-friendly room " +
+                        " or otherwise violating the rules of this room.\n" +
+                        "This will be reported to the room moderators.");
+                    break;
+                case Nature.Illegal:
+                    subtitle = _t("This user is displaying illegal behaviour, " +
+                        "for instance by doxing people or threatening violence.\n" +
+                        "This will be reported to the room moderators who may escalate this to legal authorities.");
+                    break;
+                case Nature.Spam:
+                    subtitle = _t("This user is spamming the room with ads, links to ads or to propaganda.\n" +
+                        "This will be reported to the room moderators.");
+                    break;
+                case NonStandardValue.Admin:
+                    if (client.isRoomEncrypted(this.props.mxEvent.getRoomId())) {
+                        subtitle = _t("This room is dedicated to illegal or toxic content " +
+                            "or the moderators fail to moderate illegal or toxic content.\n" +
+                            "This will be reported to the administrators of %(homeserver)s. " +
+                            "The administrators will NOT be able to read the encrypted content of this room.",
+                        { homeserver: homeServerName });
+                    } else {
+                        subtitle = _t("This room is dedicated to illegal or toxic content " +
+                            "or the moderators fail to moderate illegal or toxic content.\n" +
+                            " This will be reported to the administrators of %(homeserver)s.",
+                        { homeserver: homeServerName });
+                    }
+                    break;
+                case Nature.Other:
+                    subtitle = _t("Any other reason. Please describe the problem.\n" +
+                        "This will be reported to the room moderators.");
+                    break;
+                default:
+                    subtitle = _t("Please pick a nature and describe what makes this message abusive.");
+                    break;
+            }
+
+            return (
+                <BaseDialog
+                    className="mx_ReportEventDialog"
+                    onFinished={this.props.onFinished}
+                    title={_t('Report Content')}
+                    contentId='mx_ReportEventDialog'
+                >
+                    <div>
+                        <StyledRadioButton
+                            name="nature"
+                            value={Nature.Disagreement}
+                            checked={this.state.nature == Nature.Disagreement}
+                            onChange={this.onNatureChosen}
+                        >
+                            { _t('Disagree') }
+                        </StyledRadioButton>
+                        <StyledRadioButton
+                            name="nature"
+                            value={Nature.Toxic}
+                            checked={this.state.nature == Nature.Toxic}
+                            onChange={this.onNatureChosen}
+                        >
+                            { _t('Toxic Behaviour') }
+                        </StyledRadioButton>
+                        <StyledRadioButton
+                            name="nature"
+                            value={Nature.Illegal}
+                            checked={this.state.nature == Nature.Illegal}
+                            onChange={this.onNatureChosen}
+                        >
+                            { _t('Illegal Content') }
+                        </StyledRadioButton>
+                        <StyledRadioButton
+                            name="nature"
+                            value={Nature.Spam}
+                            checked={this.state.nature == Nature.Spam}
+                            onChange={this.onNatureChosen}
+                        >
+                            { _t('Spam or propaganda') }
+                        </StyledRadioButton>
+                        <StyledRadioButton
+                            name="nature"
+                            value={NonStandardValue.Admin}
+                            checked={this.state.nature == NonStandardValue.Admin}
+                            onChange={this.onNatureChosen}
+                        >
+                            { _t('Report the entire room') }
+                        </StyledRadioButton>
+                        <StyledRadioButton
+                            name="nature"
+                            value={Nature.Other}
+                            checked={this.state.nature == Nature.Other}
+                            onChange={this.onNatureChosen}
+                        >
+                            { _t('Other') }
+                        </StyledRadioButton>
+                        <p>
+                            { subtitle }
+                        </p>
+                        <Field
+                            className="mx_ReportEventDialog_reason"
+                            element="textarea"
+                            label={_t("Reason")}
+                            rows={5}
+                            onChange={this.onReasonChange}
+                            value={this.state.reason}
+                            disabled={this.state.busy}
+                        />
+                        { progress }
+                        { error }
+                    </div>
+                    <DialogButtons
+                        primaryButton={_t("Send report")}
+                        onPrimaryButtonClick={this.onSubmit}
+                        focus={true}
+                        onCancel={this.onCancel}
+                        disabled={this.state.busy}
+                    />
+                </BaseDialog>
+            );
+        }
+        // Report to homeserver admin.
+        // Currently, the API does not support natures.
+        return (
+            <BaseDialog
+                className="mx_ReportEventDialog"
+                onFinished={this.props.onFinished}
+                title={_t('Report Content to Your Homeserver Administrator')}
+                contentId='mx_ReportEventDialog'
+            >
+                <div className="mx_ReportEventDialog" id="mx_ReportEventDialog">
+                    <p>
+                        {
+                            _t("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.")
+                        }
+                    </p>
+                    { adminMessage }
+                    <Field
+                        className="mx_ReportEventDialog_reason"
+                        element="textarea"
+                        label={_t("Reason")}
+                        rows={5}
+                        onChange={this.onReasonChange}
+                        value={this.state.reason}
+                        disabled={this.state.busy}
+                    />
+                    { progress }
+                    { error }
+                </div>
+                <DialogButtons
+                    primaryButton={_t("Send report")}
+                    onPrimaryButtonClick={this.onSubmit}
+                    focus={true}
+                    onCancel={this.onCancel}
+                    disabled={this.state.busy}
+                />
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.tsx
similarity index 70%
rename from src/components/views/dialogs/RoomSettingsDialog.js
rename to src/components/views/dialogs/RoomSettingsDialog.tsx
index b6c4d42243..a73f0a595b 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.tsx
@@ -16,21 +16,20 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import TabbedView, {Tab} from "../../structures/TabbedView";
-import {_t, _td} from "../../../languageHandler";
+import TabbedView, { Tab } from "../../structures/TabbedView";
+import { _t, _td } from "../../../languageHandler";
 import AdvancedRoomSettingsTab from "../settings/tabs/room/AdvancedRoomSettingsTab";
 import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
 import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab";
 import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
 import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
 import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
-import * as sdk from "../../../index";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
-import {UIFeature} from "../../../settings/UIFeature";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { UIFeature } from "../../../settings/UIFeature";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
 
 export const ROOM_GENERAL_TAB = "ROOM_GENERAL_TAB";
 export const ROOM_SECURITY_TAB = "ROOM_SECURITY_TAB";
@@ -39,31 +38,36 @@ export const ROOM_NOTIFICATIONS_TAB = "ROOM_NOTIFICATIONS_TAB";
 export const ROOM_BRIDGES_TAB = "ROOM_BRIDGES_TAB";
 export const ROOM_ADVANCED_TAB = "ROOM_ADVANCED_TAB";
 
+interface IProps {
+    roomId: string;
+    onFinished: (success: boolean) => void;
+    initialTabId?: string;
+}
+
 @replaceableComponent("views.dialogs.RoomSettingsDialog")
-export default class RoomSettingsDialog extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    };
+export default class RoomSettingsDialog extends React.Component<IProps> {
+    private dispatcherRef: string;
 
-    componentDidMount() {
-        this._dispatcherRef = dis.register(this._onAction);
+    public componentDidMount() {
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
-    componentWillUnmount() {
-        if (this._dispatcherRef) dis.unregister(this._dispatcherRef);
+    public componentWillUnmount() {
+        if (this.dispatcherRef) {
+            dis.unregister(this.dispatcherRef);
+        }
     }
 
-    _onAction = (payload) => {
+    private onAction = (payload): void => {
         // When view changes below us, close the room settings
         // whilst the modal is open this can only be triggered when someone hits Leave Room
         if (payload.action === 'view_home_page') {
-            this.props.onFinished();
+            this.props.onFinished(true);
         }
     };
 
-    _getTabs() {
-        const tabs = [];
+    private getTabs(): Tab[] {
+        const tabs: Tab[] = [];
 
         tabs.push(new Tab(
             ROOM_GENERAL_TAB,
@@ -75,7 +79,10 @@ export default class RoomSettingsDialog extends React.Component {
             ROOM_SECURITY_TAB,
             _td("Security & Privacy"),
             "mx_RoomSettingsDialog_securityIcon",
-            <SecurityRoomSettingsTab roomId={this.props.roomId} />,
+            <SecurityRoomSettingsTab
+                roomId={this.props.roomId}
+                closeSettingsFn={() => this.props.onFinished(true)}
+            />,
         ));
         tabs.push(new Tab(
             ROOM_ROLES_TAB,
@@ -104,7 +111,10 @@ export default class RoomSettingsDialog extends React.Component {
                 ROOM_ADVANCED_TAB,
                 _td("Advanced"),
                 "mx_RoomSettingsDialog_warningIcon",
-                <AdvancedRoomSettingsTab roomId={this.props.roomId} closeSettingsFn={this.props.onFinished} />,
+                <AdvancedRoomSettingsTab
+                    roomId={this.props.roomId}
+                    closeSettingsFn={() => this.props.onFinished(true)}
+                />,
             ));
         }
 
@@ -112,18 +122,19 @@ export default class RoomSettingsDialog extends React.Component {
     }
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
         const roomName = MatrixClientPeg.get().getRoom(this.props.roomId).name;
         return (
             <BaseDialog
                 className='mx_RoomSettingsDialog'
                 hasCancel={true}
                 onFinished={this.props.onFinished}
-                title={_t("Room Settings - %(roomName)s", {roomName})}
+                title={_t("Room Settings - %(roomName)s", { roomName })}
             >
                 <div className='mx_SettingsDialog_content'>
-                    <TabbedView tabs={this._getTabs()} />
+                    <TabbedView
+                        tabs={this.getTabs()}
+                        initialTabId={this.props.initialTabId}
+                    />
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.js b/src/components/views/dialogs/RoomUpgradeDialog.tsx
similarity index 52%
rename from src/components/views/dialogs/RoomUpgradeDialog.js
rename to src/components/views/dialogs/RoomUpgradeDialog.tsx
index 8f9ed42ada..bcca0e3829 100644
--- a/src/components/views/dialogs/RoomUpgradeDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeDialog.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
+Copyright 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.
@@ -15,19 +15,29 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { Room } from "matrix-js-sdk/src/models/room";
+
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { upgradeRoom } from "../../../utils/RoomUpgrade";
+import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import ErrorDialog from './ErrorDialog';
+import DialogButtons from '../elements/DialogButtons';
+import Spinner from "../elements/Spinner";
+
+interface IProps extends IDialogProps {
+    room: Room;
+}
+
+interface IState {
+    busy: boolean;
+}
 
 @replaceableComponent("views.dialogs.RoomUpgradeDialog")
-export default class RoomUpgradeDialog extends React.Component {
-    static propTypes = {
-        room: PropTypes.object.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    };
+export default class RoomUpgradeDialog extends React.Component<IProps, IState> {
+    private targetVersion: string;
 
     state = {
         busy: true,
@@ -35,72 +45,66 @@ export default class RoomUpgradeDialog extends React.Component {
 
     async componentDidMount() {
         const recommended = await this.props.room.getRecommendedVersion();
-        this._targetVersion = recommended.version;
-        this.setState({busy: false});
+        this.targetVersion = recommended.version;
+        this.setState({ busy: false });
     }
 
-    _onCancelClick = () => {
+    private onCancelClick = (): void => {
         this.props.onFinished(false);
     };
 
-    _onUpgradeClick = () => {
-        this.setState({busy: true});
-        MatrixClientPeg.get().upgradeRoom(this.props.room.roomId, this._targetVersion).then(() => {
+    private onUpgradeClick = (): void => {
+        this.setState({ busy: true });
+        upgradeRoom(this.props.room, this.targetVersion, false, false).then(() => {
             this.props.onFinished(true);
         }).catch((err) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to upgrade room', '', ErrorDialog, {
                 title: _t("Failed to upgrade room"),
                 description: ((err && err.message) ? err.message : _t("The room upgrade could not be completed")),
             });
         }).finally(() => {
-            this.setState({busy: false});
+            this.setState({ busy: false });
         });
     };
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const Spinner = sdk.getComponent('views.elements.Spinner');
-
         let buttons;
         if (this.state.busy) {
             buttons = <Spinner />;
         } else {
             buttons = <DialogButtons
-                primaryButton={_t(
-                    'Upgrade this room to version %(version)s',
-                    {version: this._targetVersion},
-                )}
+                primaryButton={_t('Upgrade this room to version %(version)s', { version: this.targetVersion })}
                 primaryButtonClass="danger"
                 hasCancel={true}
-                onPrimaryButtonClick={this._onUpgradeClick}
-                focus={this.props.focus}
-                onCancel={this._onCancelClick}
+                onPrimaryButtonClick={this.onUpgradeClick}
+                onCancel={this.onCancelClick}
             />;
         }
 
         return (
-            <BaseDialog className="mx_RoomUpgradeDialog"
+            <BaseDialog
+                className="mx_RoomUpgradeDialog"
                 onFinished={this.props.onFinished}
                 title={_t("Upgrade Room Version")}
                 contentId='mx_Dialog_content'
                 hasCancel={true}
             >
                 <p>
-                    {_t(
+                    { _t(
                         "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:",
-                    )}
+                    ) }
                 </p>
                 <ol>
-                    <li>{_t("Create a new room with the same name, description and avatar")}</li>
-                    <li>{_t("Update any local room aliases to point to the new room")}</li>
-                    <li>{_t("Stop users from speaking in the old version of the room, and post a message advising users to move to the new room")}</li>
-                    <li>{_t("Put a link back to the old room at the start of the new room so people can see old messages")}</li>
+                    <li>{ _t("Create a new room with the same name, description and avatar") }</li>
+                    <li>{ _t("Update any local room aliases to point to the new room") }</li>
+                    <li>{ _t("Stop users from speaking in the old version of the room, " +
+                        "and post a message advising users to move to the new room") }</li>
+                    <li>{ _t("Put a link back to the old room at the start of the new room " +
+                        "so people can see old messages") }</li>
                 </ol>
-                {buttons}
+                { buttons }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
similarity index 53%
rename from src/components/views/dialogs/RoomUpgradeWarningDialog.js
rename to src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
index c6ef2c6ae2..a90f417959 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+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,86 +14,95 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
+import React, { ReactNode } from 'react';
+import { EventType } from 'matrix-js-sdk/src/@types/event';
+import { JoinRule } from 'matrix-js-sdk/src/@types/partials';
+
+import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
-import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IDialogProps } from "./IDialogProps";
+import BugReportDialog from './BugReportDialog';
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps extends IDialogProps {
+    roomId: string;
+    targetVersion: string;
+    description?: ReactNode;
+}
+
+interface IState {
+    inviteUsersToNewRoom: boolean;
+}
 
 @replaceableComponent("views.dialogs.RoomUpgradeWarningDialog")
-export default class RoomUpgradeWarningDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-        roomId: PropTypes.string.isRequired,
-        targetVersion: PropTypes.string.isRequired,
-    };
+export default class RoomUpgradeWarningDialog extends React.Component<IProps, IState> {
+    private readonly isPrivate: boolean;
+    private readonly currentVersion: string;
 
     constructor(props) {
         super(props);
 
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
-        const joinRules = room ? room.currentState.getStateEvents("m.room.join_rules", "") : null;
-        const isPrivate = joinRules ? joinRules.getContent()['join_rule'] !== 'public' : true;
+        const joinRules = room?.currentState.getStateEvents(EventType.RoomJoinRules, "");
+        this.isPrivate = joinRules?.getContent()['join_rule'] !== JoinRule.Public ?? true;
+        this.currentVersion = room?.getVersion() || "1";
+
         this.state = {
-            currentVersion: room ? room.getVersion() : "1",
-            isPrivate,
             inviteUsersToNewRoom: true,
         };
     }
 
-    _onContinue = () => {
-        this.props.onFinished({continue: true, invite: this.state.isPrivate && this.state.inviteUsersToNewRoom});
+    private onContinue = () => {
+        this.props.onFinished({ continue: true, invite: this.isPrivate && this.state.inviteUsersToNewRoom });
     };
 
-    _onCancel = () => {
-        this.props.onFinished({continue: false, invite: false});
+    private onCancel = () => {
+        this.props.onFinished({ continue: false, invite: false });
     };
 
-    _onInviteUsersToggle = (newVal) => {
-        this.setState({inviteUsersToNewRoom: newVal});
+    private onInviteUsersToggle = (inviteUsersToNewRoom: boolean) => {
+        this.setState({ inviteUsersToNewRoom });
     };
 
-    _openBugReportDialog = (e) => {
+    private openBugReportDialog = (e) => {
         e.preventDefault();
         e.stopPropagation();
 
-        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
         Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {});
     };
 
     render() {
         const brand = SdkConfig.get().brand;
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         let inviteToggle = null;
-        if (this.state.isPrivate) {
+        if (this.isPrivate) {
             inviteToggle = (
                 <LabelledToggleSwitch
                     value={this.state.inviteUsersToNewRoom}
-                    onChange={this._onInviteUsersToggle}
-                    label={_t("Automatically invite users")} />
+                    onChange={this.onInviteUsersToggle}
+                    label={_t("Automatically invite members from this room to the new one")} />
             );
         }
 
-        const title = this.state.isPrivate ? _t("Upgrade private room") : _t("Upgrade public room");
+        const title = this.isPrivate ? _t("Upgrade private room") : _t("Upgrade public room");
 
         let bugReports = (
             <p>
-                {_t(
+                { _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},
-                )}
+                    "having problems with your %(brand)s, please report a bug.", { brand },
+                ) }
             </p>
         );
         if (SdkConfig.get().bug_report_endpoint_url) {
             bugReports = (
                 <p>
-                    {_t(
+                    { _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>.",
                         {
@@ -101,10 +110,10 @@ export default class RoomUpgradeWarningDialog extends React.Component {
                         },
                         {
                             "a": (sub) => {
-                                return <a href='#' onClick={this._openBugReportDialog}>{sub}</a>;
+                                return <a href='#' onClick={this.openBugReportDialog}>{ sub }</a>;
                             },
                         },
-                    )}
+                    ) }
                 </p>
             );
         }
@@ -119,29 +128,37 @@ export default class RoomUpgradeWarningDialog extends React.Component {
             >
                 <div>
                     <p>
-                        {_t(
+                        { this.props.description || _t(
                             "Upgrading a room is an advanced action and is usually recommended when a room " +
                             "is unstable due to bugs, missing features or security vulnerabilities.",
-                        )}
+                        ) }
                     </p>
-                    {bugReports}
                     <p>
-                        {_t(
+                        { _t(
+                            "<b>Please note upgrading will make a new version of the room</b>. " +
+                            "All current messages will stay in this archived room.", {}, {
+                                b: sub => <b>{ sub }</b>,
+                            },
+                        ) }
+                    </p>
+                    { bugReports }
+                    <p>
+                        { _t(
                             "You'll upgrade this room from <oldVersion /> to <newVersion />.",
                             {},
                             {
-                                oldVersion: () => <code>{this.state.currentVersion}</code>,
-                                newVersion: () => <code>{this.props.targetVersion}</code>,
+                                oldVersion: () => <code>{ this.currentVersion }</code>,
+                                newVersion: () => <code>{ this.props.targetVersion }</code>,
                             },
-                        )}
+                        ) }
                     </p>
-                    {inviteToggle}
+                    { inviteToggle }
                 </div>
                 <DialogButtons
                     primaryButton={_t("Upgrade")}
-                    onPrimaryButtonClick={this._onContinue}
+                    onPrimaryButtonClick={this.onContinue}
                     cancelButton={_t("Cancel")}
-                    onCancel={this._onCancel}
+                    onCancel={this.onCancel}
                 />
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/ServerOfflineDialog.tsx b/src/components/views/dialogs/ServerOfflineDialog.tsx
index 52ff056907..ff24a1bad8 100644
--- a/src/components/views/dialogs/ServerOfflineDialog.tsx
+++ b/src/components/views/dialogs/ServerOfflineDialog.tsx
@@ -28,7 +28,7 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { IDialogProps } from "./IDialogProps";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
 }
@@ -54,7 +54,7 @@ export default class ServerOfflineDialog extends React.PureComponent<IProps> {
             const header = (
                 <div className="mx_ServerOfflineDialog_content_context_timeline_header">
                     <RoomAvatar width={24} height={24} room={c.room} />
-                    <span>{c.room.name}</span>
+                    <span>{ c.room.name }</span>
                 </div>
             );
             const entries = c.transactions
@@ -63,36 +63,36 @@ export default class ServerOfflineDialog extends React.PureComponent<IProps> {
                     let button = <Spinner w={19} h={19} />;
                     if (t.status === TransactionStatus.Error) {
                         button = (
-                            <AccessibleButton kind="link" onClick={() => t.run()}>{_t("Resend")}</AccessibleButton>
+                            <AccessibleButton kind="link" onClick={() => t.run()}>{ _t("Resend") }</AccessibleButton>
                         );
                     }
                     return (
                         <div className="mx_ServerOfflineDialog_content_context_txn" key={`txn-${j}`}>
                             <span className="mx_ServerOfflineDialog_content_context_txn_desc">
-                                {t.auditName}
+                                { t.auditName }
                             </span>
-                            {button}
+                            { button }
                         </div>
                     );
                 });
             return (
                 <div className="mx_ServerOfflineDialog_content_context" key={`context-${i}`}>
                     <div className="mx_ServerOfflineDialog_content_context_timestamp">
-                        {formatTime(c.firstFailedTime, SettingsStore.getValue("showTwelveHourTimestamps"))}
+                        { formatTime(c.firstFailedTime, SettingsStore.getValue("showTwelveHourTimestamps")) }
                     </div>
                     <div className="mx_ServerOfflineDialog_content_context_timeline">
-                        {header}
-                        {entries}
+                        { header }
+                        { entries }
                     </div>
                 </div>
-            )
+            );
         });
     }
 
     public render() {
         let timeline = this.renderTimeline().filter(c => !!c); // remove nulls for next check
         if (timeline.length === 0) {
-            timeline = [<div key={1}>{_t("You're all caught up.")}</div>];
+            timeline = [<div key={1}>{ _t("You're all caught up.") }</div>];
         }
 
         const serverName = MatrixClientPeg.getHomeserverName();
@@ -103,23 +103,23 @@ export default class ServerOfflineDialog extends React.PureComponent<IProps> {
             hasCancel={true}
         >
             <div className="mx_ServerOfflineDialog_content">
-                <p>{_t(
+                <p>{ _t(
                     "Your server isn't responding to some of your requests. " +
                     "Below are some of the most likely reasons.",
-                )}</p>
+                ) }</p>
                 <ul>
-                    <li>{_t("The server (%(serverName)s) took too long to respond.", {serverName})}</li>
-                    <li>{_t("Your firewall or anti-virus is blocking the request.")}</li>
-                    <li>{_t("A browser extension is preventing the request.")}</li>
-                    <li>{_t("The server is offline.")}</li>
-                    <li>{_t("The server has denied your request.")}</li>
-                    <li>{_t("Your area is experiencing difficulties connecting to the internet.")}</li>
-                    <li>{_t("A connection error occurred while trying to contact the server.")}</li>
-                    <li>{_t("The server is not configured to indicate what the problem is (CORS).")}</li>
+                    <li>{ _t("The server (%(serverName)s) took too long to respond.", { serverName }) }</li>
+                    <li>{ _t("Your firewall or anti-virus is blocking the request.") }</li>
+                    <li>{ _t("A browser extension is preventing the request.") }</li>
+                    <li>{ _t("The server is offline.") }</li>
+                    <li>{ _t("The server has denied your request.") }</li>
+                    <li>{ _t("Your area is experiencing difficulties connecting to the internet.") }</li>
+                    <li>{ _t("A connection error occurred while trying to contact the server.") }</li>
+                    <li>{ _t("The server is not configured to indicate what the problem is (CORS).") }</li>
                 </ul>
                 <hr />
-                <h2>{_t("Recent changes that have not yet been received")}</h2>
-                {timeline}
+                <h2>{ _t("Recent changes that have not yet been received") }</h2>
+                { timeline }
             </div>
         </BaseDialog>;
     }
diff --git a/src/components/views/dialogs/ServerPickerDialog.tsx b/src/components/views/dialogs/ServerPickerDialog.tsx
index 11fef9e75d..7a79791b3c 100644
--- a/src/components/views/dialogs/ServerPickerDialog.tsx
+++ b/src/components/views/dialogs/ServerPickerDialog.tsx
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from "react";
-import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
+import React, { createRef } from "react";
+import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
 
-import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import BaseDialog from './BaseDialog';
 import { _t } from '../../../languageHandler';
 import AccessibleButton from "../elements/AccessibleButton";
@@ -25,8 +25,8 @@ import SdkConfig from "../../../SdkConfig";
 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";
+import withValidation, { IFieldState } from "../elements/Validation";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     title?: string;
@@ -172,7 +172,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
         if (this.defaultServer.hsNameIsDifferent) {
             defaultServerName = (
                 <TextWithTooltip class="mx_Login_underlinedServerName" tooltip={this.defaultServer.hsUrl}>
-                    {this.defaultServer.hsName}
+                    { this.defaultServer.hsName }
                 </TextWithTooltip>
             );
         }
@@ -187,7 +187,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
         >
             <form className="mx_Dialog_content" id="mx_ServerPickerDialog" onSubmit={this.onSubmit}>
                 <p>
-                    {_t("We call the places where you can host your account ‘homeservers’.")} {text}
+                    { _t("We call the places where you can host your account ‘homeservers’.") } { text }
                 </p>
 
                 <StyledRadioButton
@@ -196,7 +196,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
                     checked={this.state.defaultChosen}
                     onChange={this.onDefaultChosen}
                 >
-                    {defaultServerName}
+                    { defaultServerName }
                 </StyledRadioButton>
 
                 <StyledRadioButton
@@ -205,13 +205,14 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
                     className="mx_ServerPickerDialog_otherHomeserverRadio"
                     checked={!this.state.defaultChosen}
                     onChange={this.onOtherChosen}
+                    childrenInLabel={false}
                 >
                     <Field
                         type="text"
                         className="mx_ServerPickerDialog_otherHomeserver"
                         label={_t("Other homeserver")}
                         onChange={this.onHomeserverChange}
-                        onClick={this.onOtherChosen}
+                        onFocus={this.onOtherChosen}
                         ref={this.fieldRef}
                         onValidate={this.onHomeserverValidate}
                         value={this.state.otherHomeserver}
@@ -221,16 +222,16 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
                     />
                 </StyledRadioButton>
                 <p>
-                    {_t("Use your preferred Matrix homeserver if you have one, or host your own.")}
+                    { _t("Use your preferred Matrix homeserver if you have one, or host your own.") }
                 </p>
 
                 <AccessibleButton className="mx_ServerPickerDialog_continue" kind="primary" onClick={this.onSubmit}>
-                    {_t("Continue")}
+                    { _t("Continue") }
                 </AccessibleButton>
 
-                <h4>{_t("Learn more")}</h4>
+                <h4>{ _t("Learn more") }</h4>
                 <a href="https://matrix.org/faq/#what-is-a-homeserver%3F" target="_blank" rel="noreferrer noopener">
-                    {_t("About homeservers")}
+                    { _t("About homeservers") }
                 </a>
             </form>
         </BaseDialog>;
diff --git a/src/components/views/dialogs/SeshatResetDialog.tsx b/src/components/views/dialogs/SeshatResetDialog.tsx
index 63654ca949..b89002c30f 100644
--- a/src/components/views/dialogs/SeshatResetDialog.tsx
+++ b/src/components/views/dialogs/SeshatResetDialog.tsx
@@ -15,13 +15,13 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
-import {IDialogProps} from "./IDialogProps";
+import { IDialogProps } from "./IDialogProps";
 
 @replaceableComponent("views.dialogs.SeshatResetDialog")
 export default class SeshatResetDialog extends React.PureComponent<IDialogProps> {
@@ -33,12 +33,12 @@ export default class SeshatResetDialog extends React.PureComponent<IDialogProps>
                 title={_t("Reset event store?")}>
                 <div>
                     <p>
-                        {_t("You most likely do not want to reset your event index store")}
+                        { _t("You most likely do not want to reset your event index store") }
                         <br />
-                        {_t("If you do, please note that none of your messages will be deleted, " +
+                        { _t("If you do, please note that none of your messages will be deleted, " +
                             "but the search experience might be degraded for a few moments " +
                             "whilst the index is recreated",
-                        )}
+                        ) }
                     </p>
                 </div>
                 <DialogButtons
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
similarity index 76%
rename from src/components/views/dialogs/SessionRestoreErrorDialog.js
rename to src/components/views/dialogs/SessionRestoreErrorDialog.tsx
index 43e73a2f83..b36dbf548e 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
@@ -17,27 +17,27 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import QuestionDialog from "./QuestionDialog";
+import BugReportDialog from "./BugReportDialog";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {
+    error: string;
+}
 
 @replaceableComponent("views.dialogs.SessionRestoreErrorDialog")
-export default class SessionRestoreErrorDialog extends React.Component {
-    static propTypes = {
-        error: PropTypes.string.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _sendBugReport = () => {
-        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
+export default class SessionRestoreErrorDialog extends React.Component<IProps> {
+    private sendBugReport = (): void => {
         Modal.createTrackedDialog('Session Restore Error', 'Send Bug Report Dialog', BugReportDialog, {});
     };
 
-    _onClearStorageClick = () => {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+    private onClearStorageClick = (): void => {
         Modal.createTrackedDialog('Session Restore Confirm Logout', '', QuestionDialog, {
             title: _t("Sign out"),
             description:
@@ -48,19 +48,17 @@ export default class SessionRestoreErrorDialog extends React.Component {
         });
     };
 
-    _onRefreshClick = () => {
+    private onRefreshClick = (): void => {
         // Is this likely to help? Probably not, but giving only one button
         // that clears your storage seems awful.
-        window.location.reload(true);
+        window.location.reload();
     };
 
-    render() {
+    public render(): JSX.Element {
         const brand = SdkConfig.get().brand;
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         const clearStorageButton = (
-            <button onClick={this._onClearStorageClick} className="danger">
+            <button onClick={this.onClearStorageClick} className="danger">
                 { _t("Clear Storage and Sign Out") }
             </button>
         );
@@ -68,7 +66,7 @@ export default class SessionRestoreErrorDialog extends React.Component {
         let dialogButtons;
         if (SdkConfig.get().bug_report_endpoint_url) {
             dialogButtons = <DialogButtons primaryButton={_t("Send Logs")}
-                onPrimaryButtonClick={this._sendBugReport}
+                onPrimaryButtonClick={this.sendBugReport}
                 focus={true}
                 hasCancel={false}
             >
@@ -76,7 +74,7 @@ export default class SessionRestoreErrorDialog extends React.Component {
             </DialogButtons>;
         } else {
             dialogButtons = <DialogButtons primaryButton={_t("Refresh")}
-                onPrimaryButtonClick={this._onRefreshClick}
+                onPrimaryButtonClick={this.onRefreshClick}
                 focus={true}
                 hasCancel={false}
             >
@@ -85,7 +83,9 @@ export default class SessionRestoreErrorDialog extends React.Component {
         }
 
         return (
-            <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_ErrorDialog"
+                onFinished={this.props.onFinished}
                 title={_t('Unable to restore session')}
                 contentId='mx_Dialog_content'
                 hasCancel={false}
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.tsx
similarity index 77%
rename from src/components/views/dialogs/SetEmailDialog.js
rename to src/components/views/dialogs/SetEmailDialog.tsx
index 0f8f410a6a..a8b8207f7d 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.tsx
@@ -16,14 +16,26 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import * as Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from "../elements/Spinner";
+import ErrorDialog from "./ErrorDialog";
+import QuestionDialog from "./QuestionDialog";
+import BaseDialog from "./BaseDialog";
+import EditableText from "../elements/EditableText";
+import { IDialogProps } from "./IDialogProps";
 
+interface IProps extends IDialogProps {
+    title: string;
+}
+
+interface IState {
+    emailAddress: string;
+    emailBusy: boolean;
+}
 
 /*
  * Prompt the user to set an email address.
@@ -31,26 +43,25 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
  * On success, `onFinished(true)` is called.
  */
 @replaceableComponent("views.dialogs.SetEmailDialog")
-export default class SetEmailDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
+export default class SetEmailDialog extends React.Component<IProps, IState> {
+    private addThreepid: AddThreepid;
 
-    state = {
-        emailAddress: '',
-        emailBusy: false,
-    };
+    constructor(props: IProps) {
+        super(props);
 
-    onEmailAddressChanged = value => {
+        this.state = {
+            emailAddress: '',
+            emailBusy: false,
+        };
+    }
+
+    private onEmailAddressChanged = (value: string): void => {
         this.setState({
             emailAddress: value,
         });
     };
 
-    onSubmit = () => {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-
+    private onSubmit = (): void => {
         const emailAddress = this.state.emailAddress;
         if (!Email.looksValid(emailAddress)) {
             Modal.createTrackedDialog('Invalid Email Address', '', ErrorDialog, {
@@ -59,8 +70,8 @@ export default class SetEmailDialog extends React.Component {
             });
             return;
         }
-        this._addThreepid = new AddThreepid();
-        this._addThreepid.addEmailAddress(emailAddress).then(() => {
+        this.addThreepid = new AddThreepid();
+        this.addThreepid.addEmailAddress(emailAddress).then(() => {
             Modal.createTrackedDialog('Verification Pending', '', QuestionDialog, {
                 title: _t("Verification Pending"),
                 description: _t(
@@ -71,35 +82,34 @@ export default class SetEmailDialog extends React.Component {
                 onFinished: this.onEmailDialogFinished,
             });
         }, (err) => {
-            this.setState({emailBusy: false});
+            this.setState({ emailBusy: false });
             console.error("Unable to add email address " + emailAddress + " " + err);
             Modal.createTrackedDialog('Unable to add email address', '', ErrorDialog, {
                 title: _t("Unable to add email address"),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
             });
         });
-        this.setState({emailBusy: true});
+        this.setState({ emailBusy: true });
     };
 
-    onCancelled = () => {
+    private onCancelled = (): void => {
         this.props.onFinished(false);
     };
 
-    onEmailDialogFinished = ok => {
+    private onEmailDialogFinished = (ok: boolean): void => {
         if (ok) {
             this.verifyEmailAddress();
         } else {
-            this.setState({emailBusy: false});
+            this.setState({ emailBusy: false });
         }
     };
 
-    verifyEmailAddress() {
-        this._addThreepid.checkEmailLinkClicked().then(() => {
+    private verifyEmailAddress(): void {
+        this.addThreepid.checkEmailLinkClicked().then(() => {
             this.props.onFinished(true);
         }, (err) => {
-            this.setState({emailBusy: false});
+            this.setState({ emailBusy: false });
             if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
-                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 const message = _t("Unable to verify email address.") + " " +
                     _t("Please check your email and click on the link it contains. Once this is done, click continue.");
                 Modal.createTrackedDialog('Verification Pending', '3pid Auth Failed', QuestionDialog, {
@@ -109,7 +119,6 @@ export default class SetEmailDialog extends React.Component {
                     onFinished: this.onEmailDialogFinished,
                 });
             } else {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Unable to verify email address: " + err);
                 Modal.createTrackedDialog('Unable to verify email address', '', ErrorDialog, {
                     title: _t("Unable to verify email address."),
@@ -119,15 +128,10 @@ export default class SetEmailDialog extends React.Component {
         });
     }
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Spinner = sdk.getComponent('elements.Spinner');
-        const EditableText = sdk.getComponent('elements.EditableText');
-
+    public render(): JSX.Element {
         const emailInput = this.state.emailBusy ? <Spinner /> : <EditableText
             initialValue={this.state.emailAddress}
             className="mx_SetEmailDialog_email_input"
-            autoFocus="true"
             placeholder={_t("Email address")}
             placeholderClassName="mx_SetEmailDialog_email_input_placeholder"
             blurToCancel={false}
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index df1206a4f0..80c0543c4e 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -17,24 +17,25 @@ limitations under the License.
 
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
-import {Room} from "matrix-js-sdk/src/models/room";
-import {User} from "matrix-js-sdk/src/models/user";
-import {Group} from "matrix-js-sdk/src/models/group";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import * as sdk from '../../../index';
+import { Room } from "matrix-js-sdk/src/models/room";
+import { User } from "matrix-js-sdk/src/models/user";
+import { Group } from "matrix-js-sdk/src/models/group";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from '../../../languageHandler';
 import QRCode from "../elements/QRCode";
-import {RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import { RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import * as ContextMenu from "../../structures/ContextMenu";
-import {toRightOf} from "../../structures/ContextMenu";
-import {copyPlaintext, selectText} from "../../../utils/strings";
+import { toRightOf } from "../../structures/ContextMenu";
+import { copyPlaintext, selectText } from "../../../utils/strings";
 import StyledCheckbox from '../elements/StyledCheckbox';
 import AccessibleTooltipButton from '../elements/AccessibleTooltipButton';
 import { IDialogProps } from "./IDialogProps";
 import SettingsStore from "../../../settings/SettingsStore";
-import {UIFeature} from "../../../settings/UIFeature";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { UIFeature } from "../../../settings/UIFeature";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import GenericTextContextMenu from "../context_menus/GenericTextContextMenu";
 
 const socials = [
     {
@@ -119,8 +120,7 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
 
         const successful = await copyPlaintext(this.getUrl());
         const buttonRect = target.getBoundingClientRect();
-        const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
-        const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
+        const { close } = ContextMenu.createMenu(GenericTextContextMenu, {
             ...toRightOf(buttonRect, 2),
             message: successful ? _t('Copied!') : _t('Failed to copy'),
         });
@@ -158,7 +158,7 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
             if (this.state.linkSpecificEvent) {
                 matrixToUrl = this.props.permalinkCreator.forEvent(this.props.target.getId());
             } else {
-                matrixToUrl = this.props.permalinkCreator.forRoom();
+                matrixToUrl = this.props.permalinkCreator.forShareableRoom();
             }
         }
         return matrixToUrl;
@@ -230,7 +230,6 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
             </>;
         }
 
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return <BaseDialog
             title={title}
             className='mx_ShareDialog'
diff --git a/src/components/views/dialogs/SlashCommandHelpDialog.js b/src/components/views/dialogs/SlashCommandHelpDialog.tsx
similarity index 73%
rename from src/components/views/dialogs/SlashCommandHelpDialog.js
rename to src/components/views/dialogs/SlashCommandHelpDialog.tsx
index 5b4148e939..ccb157f025 100644
--- a/src/components/views/dialogs/SlashCommandHelpDialog.js
+++ b/src/components/views/dialogs/SlashCommandHelpDialog.tsx
@@ -15,13 +15,14 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../languageHandler";
-import {CommandCategories, Commands} from "../../../SlashCommands";
-import * as sdk from "../../../index";
+import { _t } from "../../../languageHandler";
+import { CommandCategories, Commands } from "../../../SlashCommands";
+import { IDialogProps } from "./IDialogProps";
+import InfoDialog from "./InfoDialog";
 
-export default ({onFinished}) => {
-    const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
+interface IProps extends IDialogProps {}
 
+const SlashCommandHelpDialog: React.FC<IProps> = ({ onFinished }) => {
     const categories = {};
     Commands.forEach(cmd => {
         if (!cmd.isEnabled()) return;
@@ -35,16 +36,16 @@ export default ({onFinished}) => {
         const rows = [
             <tr key={"_category_" + category} className="mx_SlashCommandHelpDialog_headerRow">
                 <td colSpan={3}>
-                    <h2>{_t(category)}</h2>
+                    <h2>{ _t(category) }</h2>
                 </td>
             </tr>,
         ];
 
         categories[category].forEach(cmd => {
             rows.push(<tr key={cmd.command}>
-                <td><strong>{cmd.getCommand()}</strong></td>
-                <td>{cmd.args}</td>
-                <td>{cmd.description}</td>
+                <td><strong>{ cmd.getCommand() }</strong></td>
+                <td>{ cmd.args }</td>
+                <td>{ cmd.description }</td>
             </tr>);
         });
 
@@ -56,9 +57,11 @@ export default ({onFinished}) => {
         title={_t("Command Help")}
         description={<table>
             <tbody>
-                {body}
+                { body }
             </tbody>
         </table>}
         hasCloseButton={true}
         onFinished={onFinished} />;
 };
+
+export default SlashCommandHelpDialog;
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
index a135b6bc16..7abcb0eceb 100644
--- a/src/components/views/dialogs/SpaceSettingsDialog.tsx
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -14,24 +14,29 @@ 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 React, { useMemo } from 'react';
+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 { _t, _td } 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 Modal from "../../../Modal";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {useDispatcher} from "../../../hooks/useDispatcher";
-import {SpaceFeedbackPrompt} from "../../structures/SpaceRoomView";
+import { useDispatcher } from "../../../hooks/useDispatcher";
+import TabbedView, { Tab } from "../../structures/TabbedView";
+import SpaceSettingsGeneralTab from '../spaces/SpaceSettingsGeneralTab';
+import SpaceSettingsVisibilityTab from "../spaces/SpaceSettingsVisibilityTab";
+import SettingsStore from "../../../settings/SettingsStore";
+import { UIFeature } from "../../../settings/UIFeature";
+import AdvancedRoomSettingsTab from "../settings/tabs/room/AdvancedRoomSettingsTab";
+import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
+
+export enum SpaceSettingsTab {
+    General = "SPACE_GENERAL_TAB",
+    Visibility = "SPACE_VISIBILITY_TAB",
+    Roles = "SPACE_ROLES_TAB",
+    Advanced = "SPACE_ADVANCED_TAB",
+}
 
 interface IProps extends IDialogProps {
     matrixClient: MatrixClient;
@@ -39,69 +44,42 @@ interface IProps extends IDialogProps {
 }
 
 const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFinished }) => {
-    useDispatcher(defaultDispatcher, ({action, ...params}) => {
+    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) {
-            if (newAvatar) {
-                promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {
-                    url: await cli.uploadContent(newAvatar),
-                }, ""));
-            } else {
-                promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {}, ""));
-            }
-        }
-
-        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 Promise.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."));
-        }
-    };
+    const tabs = useMemo(() => {
+        return [
+            new Tab(
+                SpaceSettingsTab.General,
+                _td("General"),
+                "mx_SpaceSettingsDialog_generalIcon",
+                <SpaceSettingsGeneralTab matrixClient={cli} space={space} onFinished={onFinished} />,
+            ),
+            new Tab(
+                SpaceSettingsTab.Visibility,
+                _td("Visibility"),
+                "mx_SpaceSettingsDialog_visibilityIcon",
+                <SpaceSettingsVisibilityTab matrixClient={cli} space={space} closeSettingsFn={onFinished} />,
+            ),
+            new Tab(
+                SpaceSettingsTab.Roles,
+                _td("Roles & Permissions"),
+                "mx_RoomSettingsDialog_rolesIcon",
+                <RolesRoomSettingsTab roomId={space.roomId} />,
+            ),
+            SettingsStore.getValue(UIFeature.AdvancedSettings)
+                ? new Tab(
+                    SpaceSettingsTab.Advanced,
+                    _td("Advanced"),
+                    "mx_RoomSettingsDialog_warningIcon",
+                    <AdvancedRoomSettingsTab roomId={space.roomId} closeSettingsFn={onFinished} />,
+                )
+                : null,
+        ].filter(Boolean);
+    }, [cli, space, onFinished]);
 
     return <BaseDialog
         title={_t("Space settings")}
@@ -110,61 +88,14 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
         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> }
-
-            <SpaceFeedbackPrompt onClick={() => onFinished(false)} />
-
-            <SpaceBasicSettings
-                avatarUrl={avatarUrlForRoom(space, 80, 80, "crop")}
-                avatarDisabled={busy || !canSetAvatar}
-                setAvatar={setNewAvatar}
-                name={name}
-                nameDisabled={busy || !canSetName}
-                setName={setName}
-                topic={topic}
-                topicDisabled={busy || !canSetTopic}
-                setTopic={setTopic}
-            />
-
-            <div>
-                { _t("Make this space private") }
-                <ToggleSwitch
-                    checked={joinRule !== "public"}
-                    onChange={checked => setJoinRule(checked ? "invite" : "public")}
-                    disabled={!canSetJoinRule}
-                    aria-label={_t("Make this space private")}
-                />
-            </div>
-
-            <AccessibleButton
-                kind="danger"
-                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})}>
-                    { _t("View dev tools") }
-                </AccessibleButton>
-                <AccessibleButton onClick={onFinished} disabled={busy} kind="link">
-                    { _t("Cancel") }
-                </AccessibleButton>
-                <AccessibleButton onClick={onSave} disabled={busy} kind="primary">
-                    { busy ? _t("Saving...") : _t("Save Changes") }
-                </AccessibleButton>
-            </div>
+        <div
+            className="mx_SpaceSettingsDialog_content"
+            id="mx_SpaceSettingsDialog"
+            title={_t("Settings - %(spaceName)s", { spaceName: space.name })}
+        >
+            <TabbedView tabs={tabs} />
         </div>
     </BaseDialog>;
 };
 
 export default SpaceSettingsDialog;
-
diff --git a/src/components/views/dialogs/StorageEvictedDialog.js b/src/components/views/dialogs/StorageEvictedDialog.tsx
similarity index 70%
rename from src/components/views/dialogs/StorageEvictedDialog.js
rename to src/components/views/dialogs/StorageEvictedDialog.tsx
index 1e17ab1738..bdbbf815e6 100644
--- a/src/components/views/dialogs/StorageEvictedDialog.js
+++ b/src/components/views/dialogs/StorageEvictedDialog.tsx
@@ -15,63 +15,61 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import BugReportDialog from "./BugReportDialog";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps { }
 
 @replaceableComponent("views.dialogs.StorageEvictedDialog")
-export default class StorageEvictedDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _sendBugReport = ev => {
+export default class StorageEvictedDialog extends React.Component<IProps> {
+    private sendBugReport = (ev: React.MouseEvent): void => {
         ev.preventDefault();
-        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
         Modal.createTrackedDialog('Storage evicted', 'Send Bug Report Dialog', BugReportDialog, {});
     };
 
-    _onSignOutClick = () => {
+    private onSignOutClick = (): void => {
         this.props.onFinished(true);
     };
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
+    public render(): JSX.Element {
         let logRequest;
         if (SdkConfig.get().bug_report_endpoint_url) {
             logRequest = _t(
                 "To help us prevent this in future, please <a>send us logs</a>.",
                 {},
                 {
-                    a: text => <a href="#" onClick={this._sendBugReport}>{text}</a>,
+                    a: text => <a href="#" onClick={this.sendBugReport}>{ text }</a>,
                 },
             );
         }
 
         return (
-            <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_ErrorDialog"
+                onFinished={this.props.onFinished}
                 title={_t('Missing session data')}
                 contentId='mx_Dialog_content'
                 hasCancel={false}
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>
-                    <p>{_t(
+                    <p>{ _t(
                         "Some session data, including encrypted message keys, is " +
                         "missing. Sign out and sign in to fix this, restoring keys " +
                         "from backup.",
-                    )}</p>
-                    <p>{_t(
+                    ) }</p>
+                    <p>{ _t(
                         "Your browser likely removed this data when running low on " +
                         "disk space.",
-                    )} {logRequest}</p>
+                    ) } { logRequest }</p>
                 </div>
                 <DialogButtons primaryButton={_t("Sign out")}
-                    onPrimaryButtonClick={this._onSignOutClick}
+                    onPrimaryButtonClick={this.onSignOutClick}
                     focus={true}
                     hasCancel={false}
                 />
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js b/src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx
similarity index 73%
rename from src/components/views/dialogs/TabbedIntegrationManagerDialog.js
rename to src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx
index 618b0b4347..0f87b5c18d 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx
@@ -15,42 +15,47 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import {Room} from "matrix-js-sdk/src/models/room";
-import * as sdk from '../../../index';
-import {dialogTermsInteractionCallback, TermsNotSignedError} from "../../../Terms";
+import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { dialogTermsInteractionCallback, TermsNotSignedError } from "../../../Terms";
 import classNames from 'classnames';
 import * as ScalarMessaging from "../../../ScalarMessaging";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
+import ScalarAuthClient from "../../../ScalarAuthClient";
+import AccessibleButton from "../elements/AccessibleButton";
+import IntegrationManager from "../settings/IntegrationManager";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {
+    /**
+     * Optional room where the integration manager should be open to
+     */
+    room?: Room;
+
+    /**
+     * Optional screen to open on the integration manager
+     */
+    screen?: string;
+
+    /**
+     * Optional integration ID to open in the integration manager
+     */
+    integrationId?: string;
+}
+
+interface IState {
+    managers: IntegrationManagerInstance[];
+    busy: boolean;
+    currentIndex: number;
+    currentConnected: boolean;
+    currentLoading: boolean;
+    currentScalarClient: ScalarAuthClient;
+}
 
 @replaceableComponent("views.dialogs.TabbedIntegrationManagerDialog")
-export default class TabbedIntegrationManagerDialog extends React.Component {
-    static propTypes = {
-        /**
-         * Called with:
-         *     * success {bool} True if the user accepted any douments, false if cancelled
-         *     * agreedUrls {string[]} List of agreed URLs
-         */
-        onFinished: PropTypes.func.isRequired,
-
-        /**
-         * Optional room where the integration manager should be open to
-         */
-        room: PropTypes.instanceOf(Room),
-
-        /**
-         * Optional screen to open on the integration manager
-         */
-        screen: PropTypes.string,
-
-        /**
-         * Optional integration ID to open in the integration manager
-         */
-        integrationId: PropTypes.string,
-    };
-
-    constructor(props) {
+export default class TabbedIntegrationManagerDialog extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -63,11 +68,11 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
         };
     }
 
-    componentDidMount(): void {
+    public componentDidMount(): void {
         this.openManager(0, true);
     }
 
-    openManager = async (i: number, force = false) => {
+    private openManager = async (i: number, force = false): Promise<void> => {
         if (i === this.state.currentIndex && !force) return;
 
         const manager = this.state.managers[i];
@@ -120,8 +125,7 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
         }
     };
 
-    _renderTabs() {
-        const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
+    private renderTabs(): JSX.Element[] {
         return this.state.managers.map((m, i) => {
             const classes = classNames({
                 'mx_TabbedIntegrationManagerDialog_tab': true,
@@ -134,14 +138,13 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
                     key={`tab_${i}`}
                     disabled={this.state.busy}
                 >
-                    {m.name}
+                    { m.name }
                 </AccessibleButton>
             );
         });
     }
 
-    _renderTab() {
-        const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
+    public renderTab(): JSX.Element {
         let uiUrl = null;
         if (this.state.currentScalarClient) {
             uiUrl = this.state.currentScalarClient.getScalarInterfaceUrlForRoom(
@@ -151,7 +154,6 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
             );
         }
         return <IntegrationManager
-            configured={true}
             loading={this.state.currentLoading}
             connected={this.state.currentConnected}
             url={uiUrl}
@@ -159,14 +161,14 @@ export default class TabbedIntegrationManagerDialog extends React.Component {
         />;
     }
 
-    render() {
+    public render(): JSX.Element {
         return (
             <div className='mx_TabbedIntegrationManagerDialog_container'>
                 <div className='mx_TabbedIntegrationManagerDialog_tabs'>
-                    {this._renderTabs()}
+                    { this.renderTabs() }
                 </div>
                 <div className='mx_TabbedIntegrationManagerDialog_currentManager'>
-                    {this._renderTab()}
+                    { this.renderTab() }
                 </div>
             </div>
         );
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.tsx
similarity index 58%
rename from src/components/views/dialogs/TermsDialog.js
rename to src/components/views/dialogs/TermsDialog.tsx
index e8625ec6cb..6aba597aad 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.tsx
@@ -16,23 +16,23 @@ limitations under the License.
 
 import url from 'url';
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t, pickBestLanguage } from '../../../languageHandler';
 
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
+import DialogButtons from "../elements/DialogButtons";
+import BaseDialog from "./BaseDialog";
 
-class TermsCheckbox extends React.PureComponent {
-    static propTypes = {
-        onChange: PropTypes.func.isRequired,
-        url: PropTypes.string.isRequired,
-        checked: PropTypes.bool.isRequired,
-    }
+interface ITermsCheckboxProps {
+    onChange: (url: string, checked: boolean) => void;
+    url: string;
+    checked: boolean;
+}
 
-    onChange = (ev) => {
-        this.props.onChange(this.props.url, ev.target.checked);
-    }
+class TermsCheckbox extends React.PureComponent<ITermsCheckboxProps> {
+    private onChange = (ev: React.FormEvent<HTMLInputElement>): void => {
+        this.props.onChange(this.props.url, ev.currentTarget.checked);
+    };
 
     render() {
         return <input type="checkbox"
@@ -42,30 +42,34 @@ class TermsCheckbox extends React.PureComponent {
     }
 }
 
+interface ITermsDialogProps {
+    /**
+     * Array of [Service, policies] pairs, where policies is the response from the
+     * /terms endpoint for that service
+     */
+    policiesAndServicePairs: any[];
+
+    /**
+     * urls that the user has already agreed to
+     */
+    agreedUrls?: string[];
+
+    /**
+     * Called with:
+     *     * success {bool} True if the user accepted any douments, false if cancelled
+     *     * agreedUrls {string[]} List of agreed URLs
+     */
+    onFinished: (success: boolean, agreedUrls?: string[]) => void;
+}
+
+interface IState {
+    agreedUrls: any;
+}
+
 @replaceableComponent("views.dialogs.TermsDialog")
-export default class TermsDialog extends React.PureComponent {
-    static propTypes = {
-        /**
-         * Array of [Service, policies] pairs, where policies is the response from the
-         * /terms endpoint for that service
-         */
-        policiesAndServicePairs: PropTypes.array.isRequired,
-
-        /**
-         * urls that the user has already agreed to
-         */
-        agreedUrls: PropTypes.arrayOf(PropTypes.string),
-
-        /**
-         * Called with:
-         *     * success {bool} True if the user accepted any douments, false if cancelled
-         *     * agreedUrls {string[]} List of agreed URLs
-         */
-        onFinished: PropTypes.func.isRequired,
-    }
-
+export default class TermsDialog extends React.PureComponent<ITermsDialogProps, IState> {
     constructor(props) {
-        super();
+        super(props);
         this.state = {
             // url -> boolean
             agreedUrls: {},
@@ -75,48 +79,45 @@ export default class TermsDialog extends React.PureComponent {
         }
     }
 
-    _onCancelClick = () => {
+    private onCancelClick = (): void => {
         this.props.onFinished(false);
-    }
+    };
 
-    _onNextClick = () => {
+    private onNextClick = (): void => {
         this.props.onFinished(true, Object.keys(this.state.agreedUrls).filter((url) => this.state.agreedUrls[url]));
-    }
+    };
 
-    _nameForServiceType(serviceType, host) {
+    private nameForServiceType(serviceType: SERVICE_TYPES, host: string): JSX.Element {
         switch (serviceType) {
             case SERVICE_TYPES.IS:
-                return <div>{_t("Identity Server")}<br />({host})</div>;
+                return <div>{ _t("Identity server") }<br />({ host })</div>;
             case SERVICE_TYPES.IM:
-                return <div>{_t("Integration Manager")}<br />({host})</div>;
+                return <div>{ _t("Integration manager") }<br />({ host })</div>;
         }
     }
 
-    _summaryForServiceType(serviceType) {
+    private summaryForServiceType(serviceType: SERVICE_TYPES): JSX.Element {
         switch (serviceType) {
             case SERVICE_TYPES.IS:
                 return <div>
-                    {_t("Find others by phone or email")}
+                    { _t("Find others by phone or email") }
                     <br />
-                    {_t("Be found by phone or email")}
+                    { _t("Be found by phone or email") }
                 </div>;
             case SERVICE_TYPES.IM:
                 return <div>
-                    {_t("Use bots, bridges, widgets and sticker packs")}
+                    { _t("Use bots, bridges, widgets and sticker packs") }
                 </div>;
         }
     }
 
-    _onTermsCheckboxChange = (url, checked) => {
+    private onTermsCheckboxChange = (url: string, checked: boolean) => {
         this.setState({
             agreedUrls: Object.assign({}, this.state.agreedUrls, { [url]: checked }),
         });
-    }
-
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    };
 
+    public render() {
         const rows = [];
         for (const policiesAndService of this.props.policiesAndServicePairs) {
             const parsedBaseUrl = url.parse(policiesAndService.service.baseUrl);
@@ -128,21 +129,24 @@ export default class TermsDialog extends React.PureComponent {
                 let serviceName;
                 let summary;
                 if (i === 0) {
-                    serviceName = this._nameForServiceType(policiesAndService.service.serviceType, parsedBaseUrl.host);
-                    summary = this._summaryForServiceType(
+                    serviceName = this.nameForServiceType(policiesAndService.service.serviceType, parsedBaseUrl.host);
+                    summary = this.summaryForServiceType(
                         policiesAndService.service.serviceType,
                     );
                 }
 
                 rows.push(<tr key={termDoc[termsLang].url}>
-                    <td className="mx_TermsDialog_service">{serviceName}</td>
-                    <td className="mx_TermsDialog_summary">{summary}</td>
-                    <td>{termDoc[termsLang].name} <a rel="noreferrer noopener" target="_blank" href={termDoc[termsLang].url}>
-                        <span className="mx_TermsDialog_link" />
-                    </a></td>
+                    <td className="mx_TermsDialog_service">{ serviceName }</td>
+                    <td className="mx_TermsDialog_summary">{ summary }</td>
+                    <td>
+                        { termDoc[termsLang].name }
+                        <a rel="noreferrer noopener" target="_blank" href={termDoc[termsLang].url}>
+                            <span className="mx_TermsDialog_link" />
+                        </a>
+                    </td>
                     <td><TermsCheckbox
                         url={termDoc[termsLang].url}
-                        onChange={this._onTermsCheckboxChange}
+                        onChange={this.onTermsCheckboxChange}
                         checked={Boolean(this.state.agreedUrls[termDoc[termsLang].url])}
                     /></td>
                 </tr>);
@@ -176,29 +180,29 @@ export default class TermsDialog extends React.PureComponent {
         return (
             <BaseDialog
                 fixedWidth={false}
-                onFinished={this._onCancelClick}
+                onFinished={this.onCancelClick}
                 title={_t("Terms of Service")}
                 contentId='mx_Dialog_content'
                 hasCancel={false}
             >
                 <div id='mx_Dialog_content'>
-                    <p>{_t("To continue you need to accept the terms of this service.")}</p>
+                    <p>{ _t("To continue you need to accept the terms of this service.") }</p>
 
                     <table className="mx_TermsDialog_termsTable"><tbody>
                         <tr className="mx_TermsDialog_termsTableHeader">
-                            <th>{_t("Service")}</th>
-                            <th>{_t("Summary")}</th>
-                            <th>{_t("Document")}</th>
-                            <th>{_t("Accept")}</th>
+                            <th>{ _t("Service") }</th>
+                            <th>{ _t("Summary") }</th>
+                            <th>{ _t("Document") }</th>
+                            <th>{ _t("Accept") }</th>
                         </tr>
-                        {rows}
+                        { rows }
                     </tbody></table>
                 </div>
 
                 <DialogButtons primaryButton={_t('Next')}
                     hasCancel={true}
-                    onCancel={this._onCancelClick}
-                    onPrimaryButtonClick={this._onNextClick}
+                    onCancel={this.onCancelClick}
+                    onPrimaryButtonClick={this.onNextClick}
                     primaryDisabled={!enableSubmit}
                 />
             </BaseDialog>
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.tsx
similarity index 66%
rename from src/components/views/dialogs/TextInputDialog.js
rename to src/components/views/dialogs/TextInputDialog.tsx
index 97abd209c0..7a5887f053 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.tsx
@@ -14,33 +14,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
+import React, { ChangeEvent, createRef } from 'react';
 import Field from "../elements/Field";
 import { _t, _td } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IFieldState, IValidationResult } from "../elements/Validation";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {
+    title?: string;
+    description?: React.ReactNode;
+    value?: string;
+    placeholder?: string;
+    button?: string;
+    busyMessage?: string; // pass _td string
+    focus?: boolean;
+    hasCancel?: boolean;
+    validator?: (fieldState: IFieldState) => IValidationResult; // result of withValidation
+    fixedWidth?: boolean;
+}
+
+interface IState {
+    value: string;
+    busy: boolean;
+    valid: boolean;
+}
 
 @replaceableComponent("views.dialogs.TextInputDialog")
-export default class TextInputDialog extends React.Component {
-    static propTypes = {
-        title: PropTypes.string,
-        description: PropTypes.oneOfType([
-            PropTypes.element,
-            PropTypes.string,
-        ]),
-        value: PropTypes.string,
-        placeholder: PropTypes.string,
-        button: PropTypes.string,
-        busyMessage: PropTypes.string, // pass _td string
-        focus: PropTypes.bool,
-        onFinished: PropTypes.func.isRequired,
-        hasCancel: PropTypes.bool,
-        validator: PropTypes.func, // result of withValidation
-        fixedWidth: PropTypes.bool,
-    };
+export default class TextInputDialog extends React.Component<IProps, IState> {
+    private field = createRef<Field>();
 
-    static defaultProps = {
+    public static defaultProps = {
         title: "",
         value: "",
         description: "",
@@ -49,11 +55,9 @@ export default class TextInputDialog extends React.Component {
         hasCancel: true,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
-        this._field = createRef();
-
         this.state = {
             value: this.props.value,
             busy: false,
@@ -61,23 +65,23 @@ export default class TextInputDialog extends React.Component {
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         if (this.props.focus) {
             // Set the cursor at the end of the text input
             // this._field.current.value = this.props.value;
-            this._field.current.focus();
+            this.field.current.focus();
         }
     }
 
-    onOk = async ev => {
+    private onOk = async (ev: React.FormEvent): Promise<void> => {
         ev.preventDefault();
         if (this.props.validator) {
             this.setState({ busy: true });
-            await this._field.current.validate({ allowEmpty: false });
+            await this.field.current.validate({ allowEmpty: false });
 
-            if (!this._field.current.state.valid) {
-                this._field.current.focus();
-                this._field.current.validate({ allowEmpty: false, focused: true });
+            if (!this.field.current.state.valid) {
+                this.field.current.focus();
+                this.field.current.validate({ allowEmpty: false, focused: true });
                 this.setState({ busy: false });
                 return;
             }
@@ -85,17 +89,17 @@ export default class TextInputDialog extends React.Component {
         this.props.onFinished(true, this.state.value);
     };
 
-    onCancel = () => {
+    private onCancel = (): void => {
         this.props.onFinished(false);
     };
 
-    onChange = ev => {
+    private onChange = (ev: ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             value: ev.target.value,
         });
     };
 
-    onValidate = async fieldState => {
+    private onValidate = async (fieldState: IFieldState): Promise<IValidationResult> => {
         const result = await this.props.validator(fieldState);
         this.setState({
             valid: result.valid,
@@ -103,9 +107,7 @@ export default class TextInputDialog extends React.Component {
         return result;
     };
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    public render(): JSX.Element {
         return (
             <BaseDialog
                 className="mx_TextInputDialog"
@@ -121,13 +123,12 @@ export default class TextInputDialog extends React.Component {
                         <div>
                             <Field
                                 className="mx_TextInputDialog_input"
-                                ref={this._field}
+                                ref={this.field}
                                 type="text"
                                 label={this.props.placeholder}
                                 value={this.state.value}
                                 onChange={this.onChange}
                                 onValidate={this.props.validator ? this.onValidate : undefined}
-                                size="64"
                             />
                         </div>
                     </div>
diff --git a/src/components/views/dialogs/UntrustedDeviceDialog.tsx b/src/components/views/dialogs/UntrustedDeviceDialog.tsx
index da1492e30d..8c503e340d 100644
--- a/src/components/views/dialogs/UntrustedDeviceDialog.tsx
+++ b/src/components/views/dialogs/UntrustedDeviceDialog.tsx
@@ -19,7 +19,7 @@ import { User } from "matrix-js-sdk/src/models/user";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import E2EIcon from "../rooms/E2EIcon";
+import E2EIcon, { E2EState } from "../rooms/E2EIcon";
 import AccessibleButton from "../elements/AccessibleButton";
 import BaseDialog from "./BaseDialog";
 import { IDialogProps } from "./IDialogProps";
@@ -30,7 +30,7 @@ interface IProps extends IDialogProps {
     device: IDevice;
 }
 
-const UntrustedDeviceDialog: React.FC<IProps> = ({device, user, onFinished}) => {
+const UntrustedDeviceDialog: React.FC<IProps> = ({ device, user, onFinished }) => {
     let askToVerifyText;
     let newSessionText;
 
@@ -39,7 +39,7 @@ const UntrustedDeviceDialog: React.FC<IProps> = ({device, user, onFinished}) =>
         askToVerifyText = _t("Verify your other session using one of the options below.");
     } else {
         newSessionText = _t("%(name)s (%(userId)s) signed in to a new session without verifying it:",
-            {name: user.displayName, userId: user.userId});
+            { name: user.displayName, userId: user.userId });
         askToVerifyText = _t("Ask this user to verify their session, or manually verify it below.");
     }
 
@@ -47,14 +47,14 @@ const UntrustedDeviceDialog: React.FC<IProps> = ({device, user, onFinished}) =>
         onFinished={onFinished}
         className="mx_UntrustedDeviceDialog"
         title={<>
-            <E2EIcon status="warning" size={24} hideTooltip={true} />
-            { _t("Not Trusted")}
+            <E2EIcon status={E2EState.Warning} size={24} hideTooltip={true} />
+            { _t("Not Trusted") }
         </>}
     >
         <div className="mx_Dialog_content" id='mx_Dialog_content'>
-            <p>{newSessionText}</p>
-            <p>{device.getDisplayName()} ({device.deviceId})</p>
-            <p>{askToVerifyText}</p>
+            <p>{ newSessionText }</p>
+            <p>{ device.getDisplayName() } ({ device.deviceId })</p>
+            <p>{ askToVerifyText }</p>
         </div>
         <div className='mx_Dialog_buttons'>
             <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>
diff --git a/src/components/views/dialogs/UploadConfirmDialog.tsx b/src/components/views/dialogs/UploadConfirmDialog.tsx
index 7f6bcd27d1..508bb95e43 100644
--- a/src/components/views/dialogs/UploadConfirmDialog.tsx
+++ b/src/components/views/dialogs/UploadConfirmDialog.tsx
@@ -16,11 +16,12 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import filesize from "filesize";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getBlobSafeMimeType } from '../../../utils/blobs';
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
 
 interface IProps {
     file: File;
@@ -36,7 +37,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
 
     static defaultProps = {
         totalFiles: 1,
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -56,20 +57,17 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
 
     private onCancelClick = () => {
         this.props.onFinished(false);
-    }
+    };
 
     private onUploadClick = () => {
         this.props.onFinished(true);
-    }
+    };
 
     private onUploadAllClick = () => {
         this.props.onFinished(true, true);
-    }
+    };
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
         let title;
         if (this.props.totalFiles > 1 && this.props.currentIndex !== undefined) {
             title = _t(
@@ -88,7 +86,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
             preview = <div className="mx_UploadConfirmDialog_previewOuter">
                 <div className="mx_UploadConfirmDialog_previewInner">
                     <div><img className="mx_UploadConfirmDialog_imagePreview" src={this.objectUrl} /></div>
-                    <div>{this.props.file.name} ({filesize(this.props.file.size)})</div>
+                    <div>{ this.props.file.name } ({ filesize(this.props.file.size) })</div>
                 </div>
             </div>;
         } else {
@@ -97,7 +95,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
                     <img className="mx_UploadConfirmDialog_fileIcon"
                         src={require("../../../../res/img/feather-customised/files.svg")}
                     />
-                    {this.props.file.name} ({filesize(this.props.file.size)})
+                    { this.props.file.name } ({ filesize(this.props.file.size) })
                 </div>
             </div>;
         }
@@ -105,7 +103,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
         let uploadAllButton;
         if (this.props.currentIndex + 1 < this.props.totalFiles) {
             uploadAllButton = <button onClick={this.onUploadAllClick}>
-                {_t("Upload all")}
+                { _t("Upload all") }
             </button>;
         }
 
@@ -117,7 +115,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
                 contentId='mx_Dialog_content'
             >
                 <div id='mx_Dialog_content'>
-                    {preview}
+                    { preview }
                 </div>
 
                 <DialogButtons primaryButton={_t('Upload')}
@@ -125,7 +123,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
                     onPrimaryButtonClick={this.onUploadClick}
                     focus={true}
                 >
-                    {uploadAllButton}
+                    { uploadAllButton }
                 </DialogButtons>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/UploadFailureDialog.js b/src/components/views/dialogs/UploadFailureDialog.tsx
similarity index 74%
rename from src/components/views/dialogs/UploadFailureDialog.js
rename to src/components/views/dialogs/UploadFailureDialog.tsx
index d220d6c684..bb8d14e161 100644
--- a/src/components/views/dialogs/UploadFailureDialog.js
+++ b/src/components/views/dialogs/UploadFailureDialog.tsx
@@ -17,11 +17,18 @@ limitations under the License.
 import filesize from 'filesize';
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+import { IDialogProps } from "./IDialogProps";
+
+interface IProps extends IDialogProps {
+    badFiles: File[];
+    totalFiles: number;
+    contentMessages: ContentMessages;
+}
 
 /*
  * Tells the user about files we know cannot be uploaded before we even try uploading
@@ -29,26 +36,16 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
  * the size of the file.
  */
 @replaceableComponent("views.dialogs.UploadFailureDialog")
-export default class UploadFailureDialog extends React.Component {
-    static propTypes = {
-        badFiles: PropTypes.arrayOf(PropTypes.object).isRequired,
-        totalFiles: PropTypes.number.isRequired,
-        contentMessages: PropTypes.instanceOf(ContentMessages).isRequired,
-        onFinished: PropTypes.func.isRequired,
-    }
-
-    _onCancelClick = () => {
+export default class UploadFailureDialog extends React.Component<IProps> {
+    private onCancelClick = (): void => {
         this.props.onFinished(false);
-    }
+    };
 
-    _onUploadClick = () => {
+    private onUploadClick = (): void => {
         this.props.onFinished(true);
-    }
-
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    };
 
+    public render(): JSX.Element {
         let message;
         let preview;
         let buttons;
@@ -60,12 +57,12 @@ export default class UploadFailureDialog extends React.Component {
                     limit: filesize(this.props.contentMessages.getUploadLimit()),
                     sizeOfThisFile: filesize(this.props.badFiles[0].size),
                 }, {
-                    b: sub => <b>{sub}</b>,
+                    b: sub => <b>{ sub }</b>,
                 },
             );
             buttons = <DialogButtons primaryButton={_t('OK')}
                 hasCancel={false}
-                onPrimaryButtonClick={this._onCancelClick}
+                onPrimaryButtonClick={this.onCancelClick}
                 focus={true}
             />;
         } else if (this.props.totalFiles === this.props.badFiles.length) {
@@ -75,12 +72,12 @@ export default class UploadFailureDialog extends React.Component {
                 {
                     limit: filesize(this.props.contentMessages.getUploadLimit()),
                 }, {
-                    b: sub => <b>{sub}</b>,
+                    b: sub => <b>{ sub }</b>,
                 },
             );
             buttons = <DialogButtons primaryButton={_t('OK')}
                 hasCancel={false}
-                onPrimaryButtonClick={this._onCancelClick}
+                onPrimaryButtonClick={this.onCancelClick}
                 focus={true}
             />;
         } else {
@@ -90,32 +87,32 @@ export default class UploadFailureDialog extends React.Component {
                 {
                     limit: filesize(this.props.contentMessages.getUploadLimit()),
                 }, {
-                    b: sub => <b>{sub}</b>,
+                    b: sub => <b>{ sub }</b>,
                 },
             );
             const howManyOthers = this.props.totalFiles - this.props.badFiles.length;
             buttons = <DialogButtons
                 primaryButton={_t('Upload %(count)s other files', { count: howManyOthers })}
-                onPrimaryButtonClick={this._onUploadClick}
+                onPrimaryButtonClick={this.onUploadClick}
                 hasCancel={true}
                 cancelButton={_t("Cancel All")}
-                onCancel={this._onCancelClick}
+                onCancel={this.onCancelClick}
                 focus={true}
             />;
         }
 
         return (
             <BaseDialog className='mx_UploadFailureDialog'
-                onFinished={this._onCancelClick}
+                onFinished={this.onCancelClick}
                 title={_t("Upload Error")}
                 contentId='mx_Dialog_content'
             >
                 <div id='mx_Dialog_content'>
-                    {message}
-                    {preview}
+                    { message }
+                    { preview }
                 </div>
 
-                {buttons}
+                { buttons }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.tsx
similarity index 67%
rename from src/components/views/dialogs/UserSettingsDialog.js
rename to src/components/views/dialogs/UserSettingsDialog.tsx
index fe29b85aea..a848bf2773 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -16,11 +16,10 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import TabbedView, {Tab} from "../../structures/TabbedView";
-import {_t, _td} from "../../../languageHandler";
+import TabbedView, { Tab } from "../../structures/TabbedView";
+import { _t, _td } from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";
-import SettingsStore from "../../../settings/SettingsStore";
+import SettingsStore, { CallbackFn } from "../../../settings/SettingsStore";
 import LabsUserSettingsTab from "../settings/tabs/user/LabsUserSettingsTab";
 import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab";
 import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
@@ -29,90 +28,98 @@ import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSet
 import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab";
 import HelpUserSettingsTab from "../settings/tabs/user/HelpUserSettingsTab";
 import FlairUserSettingsTab from "../settings/tabs/user/FlairUserSettingsTab";
-import * 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";
+import { UIFeature } from "../../../settings/UIFeature";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseDialog from "./BaseDialog";
+import { IDialogProps } from "./IDialogProps";
 
-export const USER_GENERAL_TAB = "USER_GENERAL_TAB";
-export const USER_APPEARANCE_TAB = "USER_APPEARANCE_TAB";
-export const USER_FLAIR_TAB = "USER_FLAIR_TAB";
-export const USER_NOTIFICATIONS_TAB = "USER_NOTIFICATIONS_TAB";
-export const USER_PREFERENCES_TAB = "USER_PREFERENCES_TAB";
-export const USER_VOICE_TAB = "USER_VOICE_TAB";
-export const USER_SECURITY_TAB = "USER_SECURITY_TAB";
-export const USER_LABS_TAB = "USER_LABS_TAB";
-export const USER_MJOLNIR_TAB = "USER_MJOLNIR_TAB";
-export const USER_HELP_TAB = "USER_HELP_TAB";
+export enum UserTab {
+    General = "USER_GENERAL_TAB",
+    Appearance = "USER_APPEARANCE_TAB",
+    Flair = "USER_FLAIR_TAB",
+    Notifications = "USER_NOTIFICATIONS_TAB",
+    Preferences = "USER_PREFERENCES_TAB",
+    Voice = "USER_VOICE_TAB",
+    Security = "USER_SECURITY_TAB",
+    Labs = "USER_LABS_TAB",
+    Mjolnir = "USER_MJOLNIR_TAB",
+    Help = "USER_HELP_TAB",
+}
+
+interface IProps extends IDialogProps {
+    initialTabId?: string;
+}
+
+interface IState {
+    mjolnirEnabled: boolean;
+}
 
 @replaceableComponent("views.dialogs.UserSettingsDialog")
-export default class UserSettingsDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-        initialTabId: PropTypes.string,
-    };
+export default class UserSettingsDialog extends React.Component<IProps, IState> {
+    private mjolnirWatcher: string;
 
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
 
         this.state = {
             mjolnirEnabled: SettingsStore.getValue("feature_mjolnir"),
         };
     }
 
-    componentDidMount(): void {
-        this._mjolnirWatcher = SettingsStore.watchSetting("feature_mjolnir", null, this._mjolnirChanged.bind(this));
+    public componentDidMount(): void {
+        this.mjolnirWatcher = SettingsStore.watchSetting("feature_mjolnir", null, this.mjolnirChanged);
     }
 
-    componentWillUnmount(): void {
-        SettingsStore.unwatchSetting(this._mjolnirWatcher);
+    public componentWillUnmount(): void {
+        SettingsStore.unwatchSetting(this.mjolnirWatcher);
     }
 
-    _mjolnirChanged(settingName, roomId, atLevel, newValue) {
+    private mjolnirChanged: CallbackFn = (settingName, roomId, atLevel, newValue) => {
         // We can cheat because we know what levels a feature is tracked at, and how it is tracked
-        this.setState({mjolnirEnabled: newValue});
-    }
+        this.setState({ mjolnirEnabled: newValue });
+    };
 
-    _getTabs() {
+    private getTabs() {
         const tabs = [];
 
         tabs.push(new Tab(
-            USER_GENERAL_TAB,
+            UserTab.General,
             _td("General"),
             "mx_UserSettingsDialog_settingsIcon",
             <GeneralUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         tabs.push(new Tab(
-            USER_APPEARANCE_TAB,
+            UserTab.Appearance,
             _td("Appearance"),
             "mx_UserSettingsDialog_appearanceIcon",
             <AppearanceUserSettingsTab />,
         ));
         if (SettingsStore.getValue(UIFeature.Flair)) {
             tabs.push(new Tab(
-                USER_FLAIR_TAB,
+                UserTab.Flair,
                 _td("Flair"),
                 "mx_UserSettingsDialog_flairIcon",
                 <FlairUserSettingsTab />,
             ));
         }
         tabs.push(new Tab(
-            USER_NOTIFICATIONS_TAB,
+            UserTab.Notifications,
             _td("Notifications"),
             "mx_UserSettingsDialog_bellIcon",
             <NotificationUserSettingsTab />,
         ));
         tabs.push(new Tab(
-            USER_PREFERENCES_TAB,
+            UserTab.Preferences,
             _td("Preferences"),
             "mx_UserSettingsDialog_preferencesIcon",
-            <PreferencesUserSettingsTab />,
+            <PreferencesUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
 
         if (SettingsStore.getValue(UIFeature.Voip)) {
             tabs.push(new Tab(
-                USER_VOICE_TAB,
+                UserTab.Voice,
                 _td("Voice & Video"),
                 "mx_UserSettingsDialog_voiceIcon",
                 <VoiceUserSettingsTab />,
@@ -120,7 +127,7 @@ export default class UserSettingsDialog extends React.Component {
         }
 
         tabs.push(new Tab(
-            USER_SECURITY_TAB,
+            UserTab.Security,
             _td("Security & Privacy"),
             "mx_UserSettingsDialog_securityIcon",
             <SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
@@ -130,7 +137,7 @@ export default class UserSettingsDialog extends React.Component {
             || SettingsStore.getFeatureSettingNames().some(k => SettingsStore.getBetaInfo(k))
         ) {
             tabs.push(new Tab(
-                USER_LABS_TAB,
+                UserTab.Labs,
                 _td("Labs"),
                 "mx_UserSettingsDialog_labsIcon",
                 <LabsUserSettingsTab />,
@@ -138,25 +145,23 @@ export default class UserSettingsDialog extends React.Component {
         }
         if (this.state.mjolnirEnabled) {
             tabs.push(new Tab(
-                USER_MJOLNIR_TAB,
+                UserTab.Mjolnir,
                 _td("Ignored users"),
                 "mx_UserSettingsDialog_mjolnirIcon",
                 <MjolnirUserSettingsTab />,
             ));
         }
         tabs.push(new Tab(
-            USER_HELP_TAB,
+            UserTab.Help,
             _td("Help & About"),
             "mx_UserSettingsDialog_helpIcon",
-            <HelpUserSettingsTab closeSettingsFn={this.props.onFinished} />,
+            <HelpUserSettingsTab closeSettingsFn={() => this.props.onFinished(true)} />,
         ));
 
         return tabs;
     }
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
         return (
             <BaseDialog
                 className='mx_UserSettingsDialog'
@@ -165,7 +170,7 @@ export default class UserSettingsDialog extends React.Component {
                 title={_t("Settings")}
             >
                 <div className='mx_SettingsDialog_content'>
-                    <TabbedView tabs={this._getTabs()} initialTabId={this.props.initialTabId} />
+                    <TabbedView tabs={this.getTabs()} initialTabId={this.props.initialTabId} />
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.tsx
similarity index 63%
rename from src/components/views/dialogs/VerificationRequestDialog.js
rename to src/components/views/dialogs/VerificationRequestDialog.tsx
index 9281275e6a..65b7f71dbd 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.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.
@@ -15,36 +15,40 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import BaseDialog from "./BaseDialog";
+import EncryptionPanel from "../right_panel/EncryptionPanel";
+import { User } from 'matrix-js-sdk/src/models/user';
+
+interface IProps {
+    verificationRequest: VerificationRequest;
+    verificationRequestPromise: Promise<VerificationRequest>;
+    onFinished: () => void;
+    member: User;
+}
+
+interface IState {
+    verificationRequest: VerificationRequest;
+}
 
 @replaceableComponent("views.dialogs.VerificationRequestDialog")
-export default class VerificationRequestDialog extends React.Component {
-    static propTypes = {
-        verificationRequest: PropTypes.object,
-        verificationRequestPromise: PropTypes.object,
-        onFinished: PropTypes.func.isRequired,
-        member: PropTypes.string,
-    };
-
-    constructor(...args) {
-        super(...args);
-        this.state = {};
-        if (this.props.verificationRequest) {
-            this.state.verificationRequest = this.props.verificationRequest;
-        } else if (this.props.verificationRequestPromise) {
+export default class VerificationRequestDialog extends React.Component<IProps, IState> {
+    constructor(props) {
+        super(props);
+        this.state = {
+            verificationRequest: this.props.verificationRequest,
+        };
+        if (this.props.verificationRequestPromise) {
             this.props.verificationRequestPromise.then(r => {
-                this.setState({verificationRequest: r});
+                this.setState({ verificationRequest: r });
             });
         }
     }
 
     render() {
-        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
-        const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
         const request = this.state.verificationRequest;
         const otherUserId = request && request.otherUserId;
         const member = this.props.member ||
@@ -65,6 +69,7 @@ export default class VerificationRequestDialog extends React.Component {
                 verificationRequestPromise={this.props.verificationRequestPromise}
                 onClose={this.props.onFinished}
                 member={member}
+                isRoomEncrypted={false}
             />
         </BaseDialog>;
     }
diff --git a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
index 70fe7fe5e3..366adb887c 100644
--- a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
+++ b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.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.
@@ -20,6 +20,7 @@ import { _t } from "../../../languageHandler";
 import { IDialogProps } from "./IDialogProps";
 import {
     Capability,
+    isTimelineCapability,
     Widget,
     WidgetEventCapability,
     WidgetKind,
@@ -29,15 +30,8 @@ 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`) || "[]");
-}
-
-function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
-    localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
-}
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { lexicographicCompare } from "matrix-js-sdk/src/utils";
 
 interface IProps extends IDialogProps {
     requestedCapabilities: Set<Capability>;
@@ -77,11 +71,11 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
     private onToggle = (capability: Capability) => {
         const newStates = objectShallowClone(this.state.booleanStates);
         newStates[capability] = !newStates[capability];
-        this.setState({booleanStates: newStates});
+        this.setState({ booleanStates: newStates });
     };
 
     private onRememberSelectionChange = (newVal: boolean) => {
-        this.setState({rememberSelection: newVal});
+        this.setState({ rememberSelection: newVal });
     };
 
     private onSubmit = async (ev) => {
@@ -95,17 +89,27 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
     };
 
     private closeAndTryRemember(approved: Capability[]) {
-        if (this.state.rememberSelection) {
-            setRememberedCapabilitiesForWidget(this.props.widget, approved);
-        }
-        this.props.onFinished({approved});
+        this.props.onFinished({ approved, remember: this.state.rememberSelection });
     }
 
     public render() {
-        const checkboxRows = Object.entries(this.state.booleanStates).map(([cap, isChecked], i) => {
+        // We specifically order the timeline capabilities down to the bottom. The capability text
+        // generation cares strongly about this.
+        const orderedCapabilities = Object.entries(this.state.booleanStates).sort(([capA], [capB]) => {
+            const isTimelineA = isTimelineCapability(capA);
+            const isTimelineB = isTimelineCapability(capB);
+
+            if (!isTimelineA && !isTimelineB) return lexicographicCompare(capA, capB);
+            if (isTimelineA && !isTimelineB) return 1;
+            if (!isTimelineA && isTimelineB) return -1;
+            if (isTimelineA && isTimelineB) return lexicographicCompare(capA, capB);
+
+            return 0;
+        });
+        const checkboxRows = orderedCapabilities.map(([cap, isChecked], i) => {
             const text = CapabilityText.for(cap, this.props.widgetKind);
             const byline = text.byline
-                ? <span className="mx_WidgetCapabilitiesPromptDialog_byline">{text.byline}</span>
+                ? <span className="mx_WidgetCapabilitiesPromptDialog_byline">{ text.byline }</span>
                 : null;
 
             return (
@@ -113,8 +117,8 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
                     <StyledCheckbox
                         checked={isChecked}
                         onChange={() => this.onToggle(cap)}
-                    >{text.primary}</StyledCheckbox>
-                    {byline}
+                    >{ text.primary }</StyledCheckbox>
+                    { byline }
                 </div>
             );
         });
@@ -127,8 +131,8 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
             >
                 <form onSubmit={this.onSubmit}>
                     <div className="mx_Dialog_content">
-                        <div className="text-muted">{_t("This widget would like to:")}</div>
-                        {checkboxRows}
+                        <div className="text-muted">{ _t("This widget would like to:") }</div>
+                        { checkboxRows }
                         <DialogButtons
                             primaryButton={_t("Approve")}
                             cancelButton={_t("Decline All")}
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
similarity index 56%
rename from src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
rename to src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
index f77661c54e..81861c7f4d 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 Travis Ralston
+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.
@@ -15,42 +16,48 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
-import * as sdk from "../../../index";
+import { _t } from "../../../languageHandler";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import {Widget} from "matrix-widget-api";
-import {OIDCState, WidgetPermissionStore} from "../../../stores/widgets/WidgetPermissionStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Widget, WidgetKind } from "matrix-widget-api";
+import { OIDCState, WidgetPermissionStore } from "../../../stores/widgets/WidgetPermissionStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+interface IProps extends IDialogProps {
+    widget: Widget;
+    widgetKind: WidgetKind;
+    inRoomId?: string;
+}
+
+interface IState {
+    rememberSelection: boolean;
+}
 
 @replaceableComponent("views.dialogs.WidgetOpenIDPermissionsDialog")
-export default class WidgetOpenIDPermissionsDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-        widget: PropTypes.objectOf(Widget).isRequired,
-        widgetKind: PropTypes.string.isRequired, // WidgetKind from widget-api
-        inRoomId: PropTypes.string,
-    };
-
-    constructor() {
-        super();
+export default class WidgetOpenIDPermissionsDialog extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             rememberSelection: false,
         };
     }
 
-    _onAllow = () => {
-        this._onPermissionSelection(true);
+    private onAllow = (): void => {
+        this.onPermissionSelection(true);
     };
 
-    _onDeny = () => {
-        this._onPermissionSelection(false);
+    private onDeny = (): void => {
+        this.onPermissionSelection(false);
     };
 
-    _onPermissionSelection(allowed) {
+    private onPermissionSelection(allowed: boolean): void {
         if (this.state.rememberSelection) {
-            console.log(`Remembering ${this.props.widgetId} as allowed=${allowed} for OpenID`);
+            logger.log(`Remembering ${this.props.widget.id} as allowed=${allowed} for OpenID`);
 
             WidgetPermissionStore.instance.setOIDCState(
                 this.props.widget, this.props.widgetKind, this.props.inRoomId,
@@ -61,14 +68,11 @@ export default class WidgetOpenIDPermissionsDialog extends React.Component {
         this.props.onFinished(allowed);
     }
 
-    _onRememberSelectionChange = (newVal) => {
-        this.setState({rememberSelection: newVal});
+    private onRememberSelectionChange = (newVal: boolean): void => {
+        this.setState({ rememberSelection: newVal });
     };
 
-    render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
+    public render(): JSX.Element {
         return (
             <BaseDialog
                 className='mx_WidgetOpenIDPermissionsDialog'
@@ -78,22 +82,22 @@ export default class WidgetOpenIDPermissionsDialog extends React.Component {
             >
                 <div className='mx_WidgetOpenIDPermissionsDialog_content'>
                     <p>
-                        {_t("The widget will verify your user ID, but won't be able to perform actions for you:")}
+                        { _t("The widget will verify your user ID, but won't be able to perform actions for you:") }
                     </p>
                     <p className="text-muted">
-                        {/* cheap trim to just get the path */}
-                        {this.props.widget.templateUrl.split("?")[0].split("#")[0]}
+                        { /* cheap trim to just get the path */ }
+                        { this.props.widget.templateUrl.split("?")[0].split("#")[0] }
                     </p>
                 </div>
                 <DialogButtons
                     primaryButton={_t("Continue")}
-                    onPrimaryButtonClick={this._onAllow}
-                    onCancel={this._onDeny}
+                    onPrimaryButtonClick={this.onAllow}
+                    onCancel={this.onDeny}
                     additive={
                         <LabelledToggleSwitch
                             value={this.state.rememberSelection}
                             toggleInFront={true}
-                            onChange={this._onRememberSelectionChange}
+                            onChange={this.onRememberSelectionChange}
                             label={_t("Remember this")} />}
                 />
             </BaseDialog>
diff --git a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
index e09b39f4c7..de0a0e1f18 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {debounce} from "lodash";
+import { debounce } from "lodash";
 import classNames from 'classnames';
-import React, {ChangeEvent, FormEvent} from 'react';
-import {ISecretStorageKeyInfo} from "matrix-js-sdk/src";
+import React, { ChangeEvent, FormEvent } from 'react';
+import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
 
 import * as sdk from '../../../../index';
-import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import Field from '../../elements/Field';
 import AccessibleButton from '../../elements/AccessibleButton';
-import {_t} from '../../../../languageHandler';
-import {IDialogProps} from "../IDialogProps";
-import {accessSecretStorage} from "../../../../SecurityManager";
+import { _t } from '../../../../languageHandler';
+import { IDialogProps } from "../IDialogProps";
+import { accessSecretStorage } from "../../../../SecurityManager";
 import Modal from "../../../../Modal";
 
 // Maximum acceptable size of a key file. It's 59 characters including the spaces we encode,
@@ -75,7 +75,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
 
     private onCancel = () => {
         if (this.state.resetting) {
-            this.setState({resetting: false});
+            this.setState({ resetting: false });
         }
         this.props.onFinished(false);
     };
@@ -169,7 +169,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
 
     private onRecoveryKeyFileUploadClick = () => {
         this.fileUpload.current.click();
-    }
+    };
 
     private onPassPhraseNext = async (ev: FormEvent<HTMLFormElement>) => {
         ev.preventDefault();
@@ -210,7 +210,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
 
     private onResetAllClick = (ev: React.MouseEvent<HTMLAnchorElement>) => {
         ev.preventDefault();
-        this.setState({resetting: true});
+        this.setState({ resetting: true });
     };
 
     private onConfirmResetAllClick = async () => {
@@ -231,7 +231,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                     authUploadDeviceSigningKeys: async (makeRequest) => {
                         // XXX: Making this an import breaks the app.
                         const InteractiveAuthDialog = sdk.getComponent("views.dialogs.InteractiveAuthDialog");
-                        const {finished} = Modal.createTrackedDialog(
+                        const { finished } = Modal.createTrackedDialog(
                             'Cross-signing keys dialog', '', InteractiveAuthDialog,
                             {
                                 title: _t("Setting up keys"),
@@ -285,11 +285,12 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
 
         const resetButton = (
             <div className="mx_AccessSecretStorageDialog_reset">
-                {_t("Forgotten or lost all recovery methods? <a>Reset all</a>", null, {
+                { _t("Forgotten or lost all recovery methods? <a>Reset all</a>", null, {
                     a: (sub) => <a
-                        href="" onClick={this.onResetAllClick}
-                        className="mx_AccessSecretStorageDialog_reset_link">{sub}</a>,
-                })}
+                        href=""
+                        onClick={this.onResetAllClick}
+                        className="mx_AccessSecretStorageDialog_reset_link">{ sub }</a>,
+                }) }
             </div>
         );
 
@@ -300,9 +301,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
             title = _t("Reset everything");
             titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_resetBadge'];
             content = <div>
-                <p>{_t("Only do this if you have no other device to complete verification with.")}</p>
-                <p>{_t("If you reset everything, you will restart with no trusted sessions, no trusted users, and "
-                    + "might not be able to see past messages.")}</p>
+                <p>{ _t("Only do this if you have no other device to complete verification with.") }</p>
+                <p>{ _t("If you reset everything, you will restart with no trusted sessions, no trusted users, and "
+                    + "might not be able to see past messages.") }</p>
                 <DialogButtons
                     primaryButton={_t('Reset')}
                     onPrimaryButtonClick={this.onConfirmResetAllClick}
@@ -320,27 +321,27 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
             let keyStatus;
             if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
-                    {"\uD83D\uDC4E "}{_t(
+                    { "\uD83D\uDC4E " }{ _t(
                         "Unable to access secret storage. " +
                         "Please verify that you entered the correct Security Phrase.",
-                    )}
+                    ) }
                 </div>;
             } else {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus" />;
             }
 
             content = <div>
-                <p>{_t(
+                <p>{ _t(
                     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.", {},
                     {
                         button: s => <AccessibleButton className="mx_linkButton"
                             element="span"
                             onClick={this.onUseRecoveryKeyClick}
                         >
-                            {s}
+                            { s }
                         </AccessibleButton>,
                     },
-                )}</p>
+                ) }</p>
 
                 <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this.onPassPhraseNext}>
                     <input
@@ -353,7 +354,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                         autoComplete="new-password"
                         placeholder={_t("Security Phrase")}
                     />
-                    {keyStatus}
+                    { keyStatus }
                     <DialogButtons
                         primaryButton={_t('Continue')}
                         onPrimaryButtonClick={this.onPassPhraseNext}
@@ -375,11 +376,11 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                 'mx_AccessSecretStorageDialog_recoveryKeyFeedback_invalid': this.state.recoveryKeyCorrect === false,
             });
             const recoveryKeyFeedback = <div className={feedbackClasses}>
-                {this.getKeyValidationText()}
+                { this.getKeyValidationText() }
             </div>;
 
             content = <div>
-                <p>{_t("Use your Security Key to continue.")}</p>
+                <p>{ _t("Use your Security Key to continue.") }</p>
 
                 <form
                     className="mx_AccessSecretStorageDialog_primaryContainer"
@@ -399,7 +400,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                             />
                         </div>
                         <span className="mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText">
-                            {_t("or")}
+                            { _t("or") }
                         </span>
                         <div>
                             <input type="file"
@@ -408,11 +409,11 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                                 onChange={this.onRecoveryKeyFileChange}
                             />
                             <AccessibleButton kind="primary" onClick={this.onRecoveryKeyFileUploadClick}>
-                                {_t("Upload")}
+                                { _t("Upload") }
                             </AccessibleButton>
                         </div>
                     </div>
-                    {recoveryKeyFeedback}
+                    { recoveryKeyFeedback }
                     <DialogButtons
                         primaryButton={_t('Continue')}
                         onPrimaryButtonClick={this.onRecoveryKeyNext}
@@ -435,7 +436,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                 titleClass={titleClass}
             >
                 <div>
-                    {content}
+                    { content }
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
similarity index 73%
rename from src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js
rename to src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
index e71983b074..392598ca36 100644
--- a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js
+++ b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
@@ -15,29 +15,26 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../languageHandler";
-import * as sdk from "../../../../index";
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { _t } from "../../../../languageHandler";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+import BaseDialog from "../BaseDialog";
+import DialogButtons from "../../elements/DialogButtons";
+
+interface IProps {
+    onFinished: (success: boolean) => void;
+}
 
 @replaceableComponent("views.dialogs.security.ConfirmDestroyCrossSigningDialog")
-export default class ConfirmDestroyCrossSigningDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    _onConfirm = () => {
+export default class ConfirmDestroyCrossSigningDialog extends React.Component<IProps> {
+    private onConfirm = (): void => {
         this.props.onFinished(true);
     };
 
-    _onDecline = () => {
+    private onDecline = (): void => {
         this.props.onFinished(false);
     };
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
         return (
             <BaseDialog
                 className='mx_ConfirmDestroyCrossSigningDialog'
@@ -47,20 +44,20 @@ export default class ConfirmDestroyCrossSigningDialog extends React.Component {
             >
                 <div className='mx_ConfirmDestroyCrossSigningDialog_content'>
                     <p>
-                        {_t(
+                        { _t(
                             "Deleting cross-signing keys is permanent. " +
                             "Anyone you have verified with will see security alerts. " +
                             "You almost certainly don't want to do this, unless " +
                             "you've lost every device you can cross-sign from.",
-                        )}
+                        ) }
                     </p>
                 </div>
                 <DialogButtons
                     primaryButton={_t("Clear cross-signing keys")}
-                    onPrimaryButtonClick={this._onConfirm}
+                    onPrimaryButtonClick={this.onConfirm}
                     primaryButtonClass="danger"
                     cancelButton={_t("Cancel")}
-                    onCancel={this._onDecline}
+                    onCancel={this.onDecline}
                 />
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/security/CreateCrossSigningDialog.js b/src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
similarity index 80%
rename from src/components/views/dialogs/security/CreateCrossSigningDialog.js
rename to src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
index fedcc02f89..a62e77eb76 100644
--- a/src/components/views/dialogs/security/CreateCrossSigningDialog.js
+++ b/src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
@@ -16,7 +16,8 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { CrossSigningKeys } from 'matrix-js-sdk/src/client';
+
 import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
@@ -25,7 +26,21 @@ import DialogButtons from '../../elements/DialogButtons';
 import BaseDialog from '../BaseDialog';
 import Spinner from '../../elements/Spinner';
 import InteractiveAuthDialog from '../InteractiveAuthDialog';
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+interface IProps {
+    accountPassword?: string;
+    tokenLogin?: boolean;
+    onFinished?: (success: boolean) => void;
+}
+
+interface IState {
+    error: Error | null;
+    canUploadKeysWithPasswordOnly?: boolean;
+    accountPassword: string;
+}
 
 /*
  * Walks the user through the process of creating a cross-signing keys. In most
@@ -33,48 +48,41 @@ import {replaceableComponent} from "../../../../utils/replaceableComponent";
  * 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,
-        tokenLogin: PropTypes.bool,
-    };
-
-    constructor(props) {
+export default class CreateCrossSigningDialog extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
             error: null,
             // Does the server offer a UI auth flow with just m.login.password
             // for /keys/device_signing/upload?
-            canUploadKeysWithPasswordOnly: null,
-            accountPassword: props.accountPassword || "",
-        };
-
-        if (this.state.accountPassword) {
             // If we have an account password in memory, let's simplify and
             // assume it means password auth is also supported for device
             // signing key upload as well. This avoids hitting the server to
             // test auth flows, which may be slow under high load.
-            this.state.canUploadKeysWithPasswordOnly = true;
-        } else {
-            this._queryKeyUploadAuth();
+            canUploadKeysWithPasswordOnly: props.accountPassword ? true : null,
+            accountPassword: props.accountPassword || "",
+        };
+
+        if (!this.state.accountPassword) {
+            this.queryKeyUploadAuth();
         }
     }
 
-    componentDidMount() {
-        this._bootstrapCrossSigning();
+    public componentDidMount(): void {
+        this.bootstrapCrossSigning();
     }
 
-    async _queryKeyUploadAuth() {
+    private async queryKeyUploadAuth(): Promise<void> {
         try {
-            await MatrixClientPeg.get().uploadDeviceSigningKeys(null, {});
+            await MatrixClientPeg.get().uploadDeviceSigningKeys(null, {} as CrossSigningKeys);
             // We should never get here: the server should always require
             // UI auth to upload device signing keys. If we do, we upload
             // no keys which would be a no-op.
-            console.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
+            logger.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
         } catch (error) {
             if (!error.data || !error.data.flows) {
-                console.log("uploadDeviceSigningKeys advertised no flows!");
+                logger.log("uploadDeviceSigningKeys advertised no flows!");
                 return;
             }
             const canUploadKeysWithPasswordOnly = error.data.flows.some(f => {
@@ -86,7 +94,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent {
         }
     }
 
-    _doBootstrapUIAuth = async (makeRequest) => {
+    private doBootstrapUIAuth = async (makeRequest: (authData: any) => void): Promise<void> => {
         if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
             await makeRequest({
                 type: 'm.login.password',
@@ -135,9 +143,9 @@ export default class CreateCrossSigningDialog extends React.PureComponent {
                 throw new Error("Cross-signing key upload auth canceled");
             }
         }
-    }
+    };
 
-    _bootstrapCrossSigning = async () => {
+    private bootstrapCrossSigning = async (): Promise<void> => {
         this.setState({
             error: null,
         });
@@ -146,34 +154,34 @@ export default class CreateCrossSigningDialog extends React.PureComponent {
 
         try {
             await cli.bootstrapCrossSigning({
-                authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
+                authUploadDeviceSigningKeys: this.doBootstrapUIAuth,
             });
             this.props.onFinished(true);
         } catch (e) {
             if (this.props.tokenLogin) {
                 // ignore any failures, we are relying on grace period here
-                this.props.onFinished();
+                this.props.onFinished(false);
                 return;
             }
 
             this.setState({ error: e });
             console.error("Error bootstrapping cross-signing", e);
         }
-    }
+    };
 
-    _onCancel = () => {
+    private onCancel = (): void => {
         this.props.onFinished(false);
-    }
+    };
 
     render() {
         let content;
         if (this.state.error) {
             content = <div>
-                <p>{_t("Unable to set up keys")}</p>
+                <p>{ _t("Unable to set up keys") }</p>
                 <div className="mx_Dialog_buttons">
                     <DialogButtons primaryButton={_t('Retry')}
-                        onPrimaryButtonClick={this._bootstrapCrossSigning}
-                        onCancel={this._onCancel}
+                        onPrimaryButtonClick={this.bootstrapCrossSigning}
+                        onCancel={this.onCancel}
                     />
                 </div>
             </div>;
@@ -191,7 +199,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent {
                 fixedWidth={false}
             >
                 <div>
-                    {content}
+                    { content }
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.js b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
similarity index 67%
rename from src/components/views/dialogs/security/RestoreKeyBackupDialog.js
rename to src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
index 4ac15ab5a3..b651da5121 100644
--- a/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
@@ -16,30 +16,64 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../../index';
-import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../SecurityManager';
+import { IKeyBackupInfo, IKeyBackupRestoreResult } from "matrix-js-sdk/src/crypto/keybackup";
+import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
+import * as sdk from '../../../../index';
+import { IDialogProps } from "../IDialogProps";
+import { logger } from "matrix-js-sdk/src/logger";
 
-const RESTORE_TYPE_PASSPHRASE = 0;
-const RESTORE_TYPE_RECOVERYKEY = 1;
-const RESTORE_TYPE_SECRET_STORAGE = 2;
+enum RestoreType {
+    Passphrase = "passphrase",
+    RecoveryKey = "recovery_key",
+    SecretStorage = "secret_storage"
+}
+
+enum ProgressState {
+    PreFetch = "prefetch",
+    Fetch = "fetch",
+    LoadKeys = "load_keys",
+
+}
+
+interface IProps extends IDialogProps {
+    // if false, will close the dialog as soon as the restore completes succesfully
+    // default: true
+    showSummary?: boolean;
+    // If specified, gather the key from the user but then call the function with the backup
+    // key rather than actually (necessarily) restoring the backup.
+    keyCallback?: (key: Uint8Array) => void;
+}
+
+interface IState {
+    backupInfo: IKeyBackupInfo;
+    backupKeyStored: Record<string, ISecretStorageKeyInfo>;
+    loading: boolean;
+    loadError: string;
+    restoreError: {
+        errcode: string;
+    };
+    recoveryKey: string;
+    recoverInfo: IKeyBackupRestoreResult;
+    recoveryKeyValid: boolean;
+    forceRecoveryKey: boolean;
+    passPhrase: string;
+    restoreType: RestoreType;
+    progress: {
+        stage: ProgressState;
+        total?: number;
+        successes?: number;
+        failures?: number;
+    };
+}
 
 /*
  * Dialog for restoring e2e keys from a backup and the user's recovery key
  */
-export default class RestoreKeyBackupDialog extends React.PureComponent {
-    static propTypes = {
-        // if false, will close the dialog as soon as the restore completes succesfully
-        // default: true
-        showSummary: PropTypes.bool,
-        // If specified, gather the key from the user but then call the function with the backup
-        // key rather than actually (necessarily) restoring the backup.
-        keyCallback: PropTypes.func,
-    };
-
+export default class RestoreKeyBackupDialog extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         showSummary: true,
     };
@@ -58,58 +92,58 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             forceRecoveryKey: false,
             passPhrase: '',
             restoreType: null,
-            progress: { stage: "prefetch" },
+            progress: { stage: ProgressState.PreFetch },
         };
     }
 
-    componentDidMount() {
-        this._loadBackupStatus();
+    public componentDidMount(): void {
+        this.loadBackupStatus();
     }
 
-    _onCancel = () => {
+    private onCancel = (): void => {
         this.props.onFinished(false);
-    }
+    };
 
-    _onDone = () => {
+    private onDone = (): void => {
         this.props.onFinished(true);
-    }
+    };
 
-    _onUseRecoveryKeyClick = () => {
+    private onUseRecoveryKeyClick = (): void => {
         this.setState({
             forceRecoveryKey: true,
         });
-    }
+    };
 
-    _progressCallback = (data) => {
+    private progressCallback = (data): void => {
         this.setState({
             progress: data,
         });
-    }
+    };
 
-    _onResetRecoveryClick = () => {
+    private onResetRecoveryClick = (): void => {
         this.props.onFinished(false);
-        accessSecretStorage(() => {}, /* forceReset = */ true);
-    }
+        accessSecretStorage(async () => {}, /* forceReset = */ true);
+    };
 
-    _onRecoveryKeyChange = (e) => {
+    private onRecoveryKeyChange = (e): void => {
         this.setState({
             recoveryKey: e.target.value,
             recoveryKeyValid: MatrixClientPeg.get().isValidRecoveryKey(e.target.value),
         });
-    }
+    };
 
-    _onPassPhraseNext = async () => {
+    private onPassPhraseNext = async (): Promise<void> => {
         this.setState({
             loading: true,
             restoreError: null,
-            restoreType: RESTORE_TYPE_PASSPHRASE,
+            restoreType: RestoreType.Passphrase,
         });
         try {
             // We do still restore the key backup: we must ensure that the key backup key
             // is the right one and restoring it is currently the only way we can do this.
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithPassword(
                 this.state.passPhrase, undefined, undefined, this.state.backupInfo,
-                { progressCallback: this._progressCallback },
+                { progressCallback: this.progressCallback },
             );
             if (this.props.keyCallback) {
                 const key = await MatrixClientPeg.get().keyBackupKeyFromPassword(
@@ -127,26 +161,26 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 recoverInfo,
             });
         } catch (e) {
-            console.log("Error restoring backup", e);
+            logger.log("Error restoring backup", e);
             this.setState({
                 loading: false,
                 restoreError: e,
             });
         }
-    }
+    };
 
-    _onRecoveryKeyNext = async () => {
+    private onRecoveryKeyNext = async (): Promise<void> => {
         if (!this.state.recoveryKeyValid) return;
 
         this.setState({
             loading: true,
             restoreError: null,
-            restoreType: RESTORE_TYPE_RECOVERYKEY,
+            restoreType: RestoreType.RecoveryKey,
         });
         try {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithRecoveryKey(
                 this.state.recoveryKey, undefined, undefined, this.state.backupInfo,
-                { progressCallback: this._progressCallback },
+                { progressCallback: this.progressCallback },
             );
             if (this.props.keyCallback) {
                 const key = MatrixClientPeg.get().keyBackupKeyFromRecoveryKey(this.state.recoveryKey);
@@ -161,40 +195,39 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 recoverInfo,
             });
         } catch (e) {
-            console.log("Error restoring backup", e);
+            logger.log("Error restoring backup", e);
             this.setState({
                 loading: false,
                 restoreError: e,
             });
         }
-    }
+    };
 
-    _onPassPhraseChange = (e) => {
+    private onPassPhraseChange = (e): void => {
         this.setState({
             passPhrase: e.target.value,
         });
-    }
+    };
 
-    async _restoreWithSecretStorage() {
+    private async restoreWithSecretStorage(): Promise<void> {
         this.setState({
             loading: true,
             restoreError: null,
-            restoreType: RESTORE_TYPE_SECRET_STORAGE,
+            restoreType: RestoreType.SecretStorage,
         });
         try {
             // `accessSecretStorage` may prompt for storage access as needed.
-            const recoverInfo = await accessSecretStorage(async () => {
-                return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
+            await accessSecretStorage(async () => {
+                await MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
                     this.state.backupInfo, undefined, undefined,
-                    { progressCallback: this._progressCallback },
+                    { progressCallback: this.progressCallback },
                 );
             });
             this.setState({
                 loading: false,
-                recoverInfo,
             });
         } catch (e) {
-            console.log("Error restoring backup", e);
+            logger.log("Error restoring backup", e);
             this.setState({
                 restoreError: e,
                 loading: false,
@@ -202,26 +235,26 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         }
     }
 
-    async _restoreWithCachedKey(backupInfo) {
+    private async restoreWithCachedKey(backupInfo): Promise<boolean> {
         if (!backupInfo) return false;
         try {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithCache(
                 undefined, /* targetRoomId */
                 undefined, /* targetSessionId */
                 backupInfo,
-                { progressCallback: this._progressCallback },
+                { progressCallback: this.progressCallback },
             );
             this.setState({
                 recoverInfo,
             });
             return true;
         } catch (e) {
-            console.log("restoreWithCachedKey failed:", e);
+            logger.log("restoreWithCachedKey failed:", e);
             return false;
         }
     }
 
-    async _loadBackupStatus() {
+    private async loadBackupStatus(): Promise<void> {
         this.setState({
             loading: true,
             loadError: null,
@@ -230,15 +263,15 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const cli = MatrixClientPeg.get();
             const backupInfo = await cli.getKeyBackupVersion();
             const has4S = await cli.hasSecretStorageKey();
-            const backupKeyStored = has4S && await cli.isKeyBackupKeyStored();
+            const backupKeyStored = has4S && (await cli.isKeyBackupKeyStored());
             this.setState({
                 backupInfo,
                 backupKeyStored,
             });
 
-            const gotCache = await this._restoreWithCachedKey(backupInfo);
+            const gotCache = await this.restoreWithCachedKey(backupInfo);
             if (gotCache) {
-                console.log("RestoreKeyBackupDialog: found cached backup key");
+                logger.log("RestoreKeyBackupDialog: found cached backup key");
                 this.setState({
                     loading: false,
                 });
@@ -247,7 +280,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
 
             // If the backup key is stored, we can proceed directly to restore.
             if (backupKeyStored) {
-                return this._restoreWithSecretStorage();
+                return this.restoreWithSecretStorage();
             }
 
             this.setState({
@@ -255,7 +288,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 loading: false,
             });
         } catch (e) {
-            console.log("Error loading backup status", e);
+            logger.log("Error loading backup status", e);
             this.setState({
                 loadError: e,
                 loading: false,
@@ -263,7 +296,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         }
     }
 
-    render() {
+    public render(): JSX.Element {
+        // FIXME: Making these into imports will break tests
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const Spinner = sdk.getComponent("elements.Spinner");
 
@@ -279,16 +315,16 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         if (this.state.loading) {
             title = _t("Restoring keys from backup");
             let details;
-            if (this.state.progress.stage === "fetch") {
+            if (this.state.progress.stage === ProgressState.Fetch) {
                 details = _t("Fetching keys from server...");
-            } else if (this.state.progress.stage === "load_keys") {
+            } else if (this.state.progress.stage === ProgressState.LoadKeys) {
                 const { total, successes, failures } = this.state.progress;
                 details = _t("%(completed)s of %(total)s keys restored", { total, completed: successes + failures });
-            } else if (this.state.progress.stage === "prefetch") {
+            } else if (this.state.progress.stage === ProgressState.PreFetch) {
                 details = _t("Fetching keys from server...");
             }
             content = <div>
-                <div>{details}</div>
+                <div>{ details }</div>
                 <Spinner />
             </div>;
         } else if (this.state.loadError) {
@@ -296,21 +332,21 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             content = _t("Unable to load backup status");
         } else if (this.state.restoreError) {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
-                if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
+                if (this.state.restoreType === RestoreType.RecoveryKey) {
                     title = _t("Security Key mismatch");
                     content = <div>
-                        <p>{_t(
+                        <p>{ _t(
                             "Backup could not be decrypted with this Security Key: " +
                             "please verify that you entered the correct Security Key.",
-                        )}</p>
+                        ) }</p>
                     </div>;
                 } else {
                     title = _t("Incorrect Security Phrase");
                     content = <div>
-                        <p>{_t(
+                        <p>{ _t(
                             "Backup could not be decrypted with this Security Phrase: " +
                             "please verify that you entered the correct Security Phrase.",
-                        )}</p>
+                        ) }</p>
                     </div>;
                 }
             } else {
@@ -321,56 +357,53 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             title = _t("Error");
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             title = _t("Keys restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
-                failedToDecrypt = <p>{_t(
+                failedToDecrypt = <p>{ _t(
                     "Failed to decrypt %(failedCount)s sessions!",
-                    {failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported},
-                )}</p>;
+                    { failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported },
+                ) }</p>;
             }
             content = <div>
-                <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
-                {failedToDecrypt}
+                <p>{ _t("Successfully restored %(sessionCount)s keys", { sessionCount: this.state.recoverInfo.imported }) }</p>
+                { failedToDecrypt }
                 <DialogButtons primaryButton={_t('OK')}
-                    onPrimaryButtonClick={this._onDone}
+                    onPrimaryButtonClick={this.onDone}
                     hasCancel={false}
                     focus={true}
                 />
             </div>;
         } else if (backupHasPassphrase && !this.state.forceRecoveryKey) {
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
             title = _t("Enter Security Phrase");
             content = <div>
-                <p>{_t(
+                <p>{ _t(
                     "<b>Warning</b>: you should only set up key backup " +
                     "from a trusted computer.", {},
-                    { b: sub => <b>{sub}</b> },
-                )}</p>
-                <p>{_t(
+                    { b: sub => <b>{ sub }</b> },
+                ) }</p>
+                <p>{ _t(
                     "Access your secure message history and set up secure " +
                     "messaging by entering your Security Phrase.",
-                )}</p>
+                ) }</p>
 
                 <form className="mx_RestoreKeyBackupDialog_primaryContainer">
                     <input type="password"
                         className="mx_RestoreKeyBackupDialog_passPhraseInput"
-                        onChange={this._onPassPhraseChange}
+                        onChange={this.onPassPhraseChange}
                         value={this.state.passPhrase}
                         autoFocus={true}
                     />
                     <DialogButtons
                         primaryButton={_t('Next')}
-                        onPrimaryButtonClick={this._onPassPhraseNext}
+                        onPrimaryButtonClick={this.onPassPhraseNext}
                         primaryIsSubmit={true}
                         hasCancel={true}
-                        onCancel={this._onCancel}
+                        onCancel={this.onCancel}
                         focus={false}
                     />
                 </form>
-                {_t(
+                { _t(
                     "If you've forgotten your Security Phrase you can "+
                     "<button1>use your Security Key</button1> or " +
                     "<button2>set up new recovery options</button2>",
@@ -379,76 +412,74 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         button1: s => <AccessibleButton
                             className="mx_linkButton"
                             element="span"
-                            onClick={this._onUseRecoveryKeyClick}
+                            onClick={this.onUseRecoveryKeyClick}
                         >
-                            {s}
+                            { s }
                         </AccessibleButton>,
                         button2: s => <AccessibleButton
                             className="mx_linkButton"
                             element="span"
-                            onClick={this._onResetRecoveryClick}
+                            onClick={this.onResetRecoveryClick}
                         >
-                            {s}
+                            { s }
                         </AccessibleButton>,
-                    })}
+                    }) }
             </div>;
         } else {
             title = _t("Enter Security Key");
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
             let keyStatus;
             if (this.state.recoveryKey.length === 0) {
-                keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus"></div>;
+                keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus" />;
             } else if (this.state.recoveryKeyValid) {
                 keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus">
-                    {"\uD83D\uDC4D "}{_t("This looks like a valid Security Key!")}
+                    { "\uD83D\uDC4D " }{ _t("This looks like a valid Security Key!") }
                 </div>;
             } else {
                 keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus">
-                    {"\uD83D\uDC4E "}{_t("Not a valid Security Key")}
+                    { "\uD83D\uDC4E " }{ _t("Not a valid Security Key") }
                 </div>;
             }
 
             content = <div>
-                <p>{_t(
+                <p>{ _t(
                     "<b>Warning</b>: You should only set up key backup " +
                     "from a trusted computer.", {},
-                    { b: sub => <b>{sub}</b> },
-                )}</p>
-                <p>{_t(
+                    { b: sub => <b>{ sub }</b> },
+                ) }</p>
+                <p>{ _t(
                     "Access your secure message history and set up secure " +
                     "messaging by entering your Security Key.",
-                )}</p>
+                ) }</p>
 
                 <div className="mx_RestoreKeyBackupDialog_primaryContainer">
                     <input className="mx_RestoreKeyBackupDialog_recoveryKeyInput"
-                        onChange={this._onRecoveryKeyChange}
+                        onChange={this.onRecoveryKeyChange}
                         value={this.state.recoveryKey}
                         autoFocus={true}
                     />
-                    {keyStatus}
+                    { keyStatus }
                     <DialogButtons primaryButton={_t('Next')}
-                        onPrimaryButtonClick={this._onRecoveryKeyNext}
+                        onPrimaryButtonClick={this.onRecoveryKeyNext}
                         hasCancel={true}
-                        onCancel={this._onCancel}
+                        onCancel={this.onCancel}
                         focus={false}
                         primaryDisabled={!this.state.recoveryKeyValid}
                     />
                 </div>
-                {_t(
+                { _t(
                     "If you've forgotten your Security Key you can "+
                     "<button>set up new recovery options</button>",
                     {},
                     {
                         button: s => <AccessibleButton className="mx_linkButton"
                             element="span"
-                            onClick={this._onResetRecoveryClick}
+                            onClick={this.onResetRecoveryClick}
                         >
-                            {s}
+                            { s }
                         </AccessibleButton>,
                     },
-                )}
+                ) }
             </div>;
         }
 
@@ -458,7 +489,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 title={title}
             >
                 <div className='mx_RestoreKeyBackupDialog_content'>
-                    {content}
+                    { content }
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/security/SetupEncryptionDialog.js b/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
similarity index 62%
rename from src/components/views/dialogs/security/SetupEncryptionDialog.js
rename to src/components/views/dialogs/security/SetupEncryptionDialog.tsx
index 3c15ea9f1d..0323769536 100644
--- a/src/components/views/dialogs/security/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
@@ -15,47 +15,50 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import SetupEncryptionBody from '../../../structures/auth/SetupEncryptionBody';
 import BaseDialog from '../BaseDialog';
 import { _t } from '../../../../languageHandler';
-import { SetupEncryptionStore, PHASE_DONE } from '../../../../stores/SetupEncryptionStore';
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { SetupEncryptionStore, Phase } from '../../../../stores/SetupEncryptionStore';
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+import { IDialogProps } from "../IDialogProps";
 
-function iconFromPhase(phase) {
-    if (phase === PHASE_DONE) {
+function iconFromPhase(phase: Phase) {
+    if (phase === Phase.Done) {
         return require("../../../../../res/img/e2e/verified.svg");
     } else {
         return require("../../../../../res/img/e2e/warning.svg");
     }
 }
 
-@replaceableComponent("views.dialogs.security.SetupEncryptionDialog")
-export default class SetupEncryptionDialog extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func.isRequired,
-    };
+interface IProps extends IDialogProps {}
+interface IState {
+    icon: string;
+}
 
-    constructor() {
-        super();
+@replaceableComponent("views.dialogs.security.SetupEncryptionDialog")
+export default class SetupEncryptionDialog extends React.Component<IProps, IState> {
+    private store: SetupEncryptionStore;
+
+    constructor(props: IProps) {
+        super(props);
 
         this.store = SetupEncryptionStore.sharedInstance();
-        this.state = {icon: iconFromPhase(this.store.phase)};
+        this.state = { icon: iconFromPhase(this.store.phase) };
     }
 
-    componentDidMount() {
-        this.store.on("update", this._onStoreUpdate);
+    public componentDidMount() {
+        this.store.on("update", this.onStoreUpdate);
     }
 
-    componentWillUnmount() {
-        this.store.removeListener("update", this._onStoreUpdate);
+    public componentWillUnmount() {
+        this.store.removeListener("update", this.onStoreUpdate);
     }
 
-    _onStoreUpdate = () => {
-        this.setState({icon: iconFromPhase(this.store.phase)});
+    private onStoreUpdate = (): void => {
+        this.setState({ icon: iconFromPhase(this.store.phase) });
     };
 
-    render() {
+    public render() {
         return <BaseDialog
             headerImage={this.state.icon}
             onFinished={this.props.onFinished}
diff --git a/src/components/views/directory/NetworkDropdown.tsx b/src/components/views/directory/NetworkDropdown.tsx
index c805ee42e7..dbad2ca024 100644
--- a/src/components/views/directory/NetworkDropdown.tsx
+++ b/src/components/views/directory/NetworkDropdown.tsx
@@ -17,6 +17,7 @@ limitations under the License.
 
 import React, { useEffect, useState } from "react";
 import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { IProtocol } from "matrix-js-sdk/src/client";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { instanceForInstanceId } from '../../../utils/DirectoryUtils';
@@ -41,7 +42,8 @@ import QuestionDialog from "../dialogs/QuestionDialog";
 import UIStore from "../../../stores/UIStore";
 import { compare } from "../../../utils/strings";
 
-export const ALL_ROOMS = Symbol("ALL_ROOMS");
+// XXX: We would ideally use a symbol here but we can't since we save this value to localStorage
+export const ALL_ROOMS = "ALL_ROOMS";
 
 const SETTING_NAME = "room_directory_servers";
 
@@ -82,38 +84,13 @@ const validServer = withValidation<undefined, { error?: MatrixError }>({
     ],
 });
 
-/* eslint-disable camelcase */
-export interface IFieldType {
-    regexp: string;
-    placeholder: string;
-}
-
-export interface IInstance {
-    desc: string;
-    icon?: string;
-    fields: object;
-    network_id: string;
-    // XXX: this is undocumented but we rely on it.
-    // we inject a fake entry with a symbolic instance_id.
-    instance_id: string | symbol;
-}
-
-export interface IProtocol {
-    user_fields: string[];
-    location_fields: string[];
-    icon: string;
-    field_types: Record<string, IFieldType>;
-    instances: IInstance[];
-}
-/* eslint-enable camelcase */
-
 export type Protocols = Record<string, IProtocol>;
 
 interface IProps {
     protocols: Protocols;
     selectedServerName: string;
-    selectedInstanceId: string | symbol;
-    onOptionChange(server: string, instanceId?: string | symbol): void;
+    selectedInstanceId: string;
+    onOptionChange(server: string, instanceId?: string): void;
 }
 
 // This dropdown sources homeservers from three places:
@@ -171,7 +148,7 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
 
             const protocolsList = server === hsName ? Object.values(protocols) : [];
             if (protocolsList.length > 0) {
-                // add a fake protocol with the ALL_ROOMS symbol
+                // add a fake protocol with ALL_ROOMS
                 protocolsList.push({
                     instances: [{
                         fields: [],
@@ -186,10 +163,10 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
                 });
             }
 
-            protocolsList.forEach(({instances=[]}) => {
+            protocolsList.forEach(({ instances=[] }) => {
                 [...instances].sort((b, a) => {
                     return compare(a.desc, b.desc);
-                }).forEach(({desc, instance_id: instanceId}) => {
+                }).forEach(({ desc, instance_id: instanceId }) => {
                     entries.push(
                         <MenuItemRadio
                             key={String(instanceId)}
@@ -207,7 +184,7 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
             if (server === hsName) {
                 subtitle = (
                     <div className="mx_NetworkDropdown_server_subtitle">
-                        {_t("Your server")}
+                        { _t("Your server") }
                     </div>
                 );
             }
@@ -216,16 +193,20 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
             if (removableServers.has(server)) {
                 const onClick = async () => {
                     closeMenu();
-                    const {finished} = Modal.createTrackedDialog("Network Dropdown", "Remove server", QuestionDialog, {
-                        title: _t("Are you sure?"),
-                        description: _t("Are you sure you want to remove <b>%(serverName)s</b>", {
-                            serverName: server,
-                        }, {
-                            b: serverName => <b>{ serverName }</b>,
-                        }),
-                        button: _t("Remove"),
-                        fixedWidth: false,
-                    }, "mx_NetworkDropdown_dialog");
+                    const { finished } = Modal.createTrackedDialog(
+                        "Network Dropdown", "Remove server", QuestionDialog,
+                        {
+                            title: _t("Are you sure?"),
+                            description: _t("Are you sure you want to remove <b>%(serverName)s</b>", {
+                                serverName: server,
+                            }, {
+                                b: serverName => <b>{ serverName }</b>,
+                            }),
+                            button: _t("Remove"),
+                            fixedWidth: false,
+                        },
+                        "mx_NetworkDropdown_dialog",
+                    );
 
                     const [ok] = await finished;
                     if (!ok) return;
@@ -257,7 +238,7 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
                         label={_t("Matrix")}
                         className="mx_NetworkDropdown_server_network"
                     >
-                        {_t("Matrix")}
+                        { _t("Matrix") }
                     </MenuItemRadio>
                     { entries }
                 </MenuGroup>
@@ -289,9 +270,9 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
         const buttonRect = handle.current.getBoundingClientRect();
         content = <ContextMenu {...inPlaceOf(buttonRect)} onFinished={closeMenu}>
             <div className="mx_NetworkDropdown_menu">
-                {options}
+                { options }
                 <MenuItem className="mx_NetworkDropdown_server_add" label={undefined} onClick={onClick}>
-                    {_t("Add a new server...")}
+                    { _t("Add a new server...") }
                 </MenuItem>
             </div>
         </ContextMenu>;
@@ -314,15 +295,15 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
             isExpanded={menuDisplayed}
         >
             <span>
-                {currentValue}
+                { currentValue }
             </span> <span className="mx_NetworkDropdown_handle_server">
-                ({selectedServerName})
+                ({ selectedServerName })
             </span>
         </ContextMenuButton>;
     }
 
     return <div className="mx_NetworkDropdown" ref={handle}>
-        {content}
+        { content }
     </div>;
 };
 
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index e634057a21..75b6890112 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -14,12 +14,12 @@
  limitations under the License.
  */
 
-import React from 'react';
+import React, { ReactHTML } from 'react';
 
-import {Key} from '../../../Keyboard';
+import { Key } from '../../../Keyboard';
 import classnames from 'classnames';
 
-export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element>;
+export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element> | React.FormEvent<Element>;
 
 /**
  * children: React's magic prop. Represents all children given to the element.
@@ -29,7 +29,7 @@ export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Elemen
  */
 interface IProps extends React.InputHTMLAttributes<Element> {
     inputRef?: React.Ref<Element>;
-    element?: string;
+    element?: keyof ReactHTML;
     // The kind of button, similar to how Bootstrap works.
     // See available classes for AccessibleButton for options.
     kind?: string;
@@ -39,7 +39,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
     tabIndex?: number;
     disabled?: boolean;
     className?: string;
-    onClick(e?: ButtonEvent): void;
+    onClick(e?: ButtonEvent): void | Promise<void>;
 }
 
 interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
@@ -62,10 +62,14 @@ export default function AccessibleButton({
     disabled,
     inputRef,
     className,
+    onKeyDown,
+    onKeyUp,
     ...restProps
 }: IProps) {
     const newProps: IAccessibleButtonProps = restProps;
-    if (!disabled) {
+    if (disabled) {
+        newProps["aria-disabled"] = true;
+    } else {
         newProps.onClick = onClick;
         // We need to consume enter onKeyDown and space onKeyUp
         // otherwise we are risking also activating other keyboard focusable elements
@@ -83,6 +87,8 @@ export default function AccessibleButton({
             if (e.key === Key.SPACE) {
                 e.stopPropagation();
                 e.preventDefault();
+            } else {
+                onKeyDown?.(e);
             }
         };
         newProps.onKeyUp = (e) => {
@@ -94,6 +100,8 @@ export default function AccessibleButton({
             if (e.key === Key.ENTER) {
                 e.stopPropagation();
                 e.preventDefault();
+            } else {
+                onKeyUp?.(e);
             }
         };
     }
@@ -112,11 +120,11 @@ export default function AccessibleButton({
     );
 
     // React.createElement expects InputHTMLAttributes
-    return React.createElement(element, restProps, children);
+    return React.createElement(element, newProps, children);
 }
 
 AccessibleButton.defaultProps = {
-    element: 'div',
+    element: 'div' as keyof ReactHTML,
     role: 'button',
     tabIndex: 0,
 };
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index c98a7c3156..d2a4801a2d 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -19,15 +19,17 @@ import React from 'react';
 import classNames from 'classnames';
 
 import AccessibleButton from "./AccessibleButton";
-import Tooltip from './Tooltip';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import Tooltip, { Alignment } from './Tooltip';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface ITooltipProps extends React.ComponentProps<typeof AccessibleButton> {
     title: string;
     tooltip?: React.ReactNode;
+    label?: React.ReactNode;
     tooltipClassName?: string;
     forceHide?: boolean;
     yOffset?: number;
+    alignment?: Alignment;
 }
 
 interface IState {
@@ -66,13 +68,14 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
 
     render() {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const {title, tooltip, children, tooltipClassName, forceHide, yOffset, ...props} = this.props;
+        const { title, tooltip, children, tooltipClassName, forceHide, yOffset, alignment, ...props } = this.props;
 
         const tip = this.state.hover ? <Tooltip
             className="mx_AccessibleTooltipButton_container"
             tooltipClassName={classNames("mx_AccessibleTooltipButton_tooltip", tooltipClassName)}
             label={tooltip || title}
             yOffset={yOffset}
+            alignment={alignment}
         /> : null;
         return (
             <AccessibleButton
@@ -82,7 +85,8 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
                 aria-label={title}
             >
                 { children }
-                { tip }
+                { this.props.label }
+                { (tooltip || title) && tip }
             </AccessibleButton>
         );
     }
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.tsx
similarity index 56%
rename from src/components/views/elements/ActionButton.js
rename to src/components/views/elements/ActionButton.tsx
index 5013bcec0d..390e84be77 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.tsx
@@ -15,63 +15,67 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import AccessibleButton from './AccessibleButton';
 import dis from '../../../dispatcher/dispatcher';
-import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Tooltip from './Tooltip';
+
+interface IProps {
+    size?: string;
+    tooltip?: boolean;
+    action: string;
+    mouseOverAction?: string;
+    label: string;
+    iconPath?: string;
+    className?: string;
+    children?: JSX.Element;
+}
+
+interface IState {
+    showTooltip: boolean;
+}
 
 @replaceableComponent("views.elements.ActionButton")
-export default class ActionButton extends React.Component {
-    static propTypes = {
-        size: PropTypes.string,
-        tooltip: PropTypes.bool,
-        action: PropTypes.string.isRequired,
-        mouseOverAction: PropTypes.string,
-        label: PropTypes.string.isRequired,
-        iconPath: PropTypes.string,
-        className: PropTypes.string,
-        children: PropTypes.node,
-    };
-
-    static defaultProps = {
+export default class ActionButton extends React.Component<IProps, IState> {
+    static defaultProps: Partial<IProps> = {
         size: "25",
         tooltip: false,
     };
 
-    state = {
-        showTooltip: false,
-    };
+    constructor(props: IProps) {
+        super(props);
 
-    _onClick = (ev) => {
+        this.state = {
+            showTooltip: false,
+        };
+    }
+
+    private onClick = (ev: React.MouseEvent): void => {
         ev.stopPropagation();
         Analytics.trackEvent('Action Button', 'click', this.props.action);
-        dis.dispatch({action: this.props.action});
+        dis.dispatch({ action: this.props.action });
     };
 
-    _onMouseEnter = () => {
-        if (this.props.tooltip) this.setState({showTooltip: true});
+    private onMouseEnter = (): void => {
+        if (this.props.tooltip) this.setState({ showTooltip: true });
         if (this.props.mouseOverAction) {
-            dis.dispatch({action: this.props.mouseOverAction});
+            dis.dispatch({ action: this.props.mouseOverAction });
         }
     };
 
-    _onMouseLeave = () => {
-        this.setState({showTooltip: false});
+    private onMouseLeave = (): void => {
+        this.setState({ showTooltip: false });
     };
 
     render() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
         let tooltip;
         if (this.state.showTooltip) {
-            const Tooltip = sdk.getComponent("elements.Tooltip");
             tooltip = <Tooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
         }
 
         const icon = this.props.iconPath ?
-            (<TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />) :
+            (<img src={this.props.iconPath} width={this.props.size} height={this.props.size} />) :
             undefined;
 
         const classNames = ["mx_RoleButton"];
@@ -82,9 +86,9 @@ export default class ActionButton extends React.Component {
         return (
             <AccessibleButton
                 className={classNames.join(" ")}
-                onClick={this._onClick}
-                onMouseEnter={this._onMouseEnter}
-                onMouseLeave={this._onMouseLeave}
+                onClick={this.onClick}
+                onMouseEnter={this.onMouseEnter}
+                onMouseLeave={this.onMouseLeave}
                 aria-label={this.props.label}
             >
                 { icon }
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.tsx
similarity index 67%
rename from src/components/views/elements/AddressSelector.js
rename to src/components/views/elements/AddressSelector.tsx
index 33b2906870..eae82142da 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.tsx
@@ -15,30 +15,37 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
+import React, { createRef } from 'react';
 import classNames from 'classnames';
-import { UserAddressType } from '../../../UserAddress';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IUserAddress } from '../../../UserAddress';
+import AddressTile from './AddressTile';
+
+interface IProps {
+    onSelected: (index: number) => void;
+
+    // List of the addresses to display
+    addressList: IUserAddress[];
+    // Whether to show the address on the address tiles
+    showAddress?: boolean;
+    truncateAt: number;
+    selected?: number;
+
+    // Element to put as a header on top of the list
+    header?: JSX.Element;
+}
+
+interface IState {
+    selected: number;
+    hover: boolean;
+}
 
 @replaceableComponent("views.elements.AddressSelector")
-export default class AddressSelector extends React.Component {
-    static propTypes = {
-        onSelected: PropTypes.func.isRequired,
+export default class AddressSelector extends React.Component<IProps, IState> {
+    private scrollElement = createRef<HTMLDivElement>();
+    private addressListElement = createRef<HTMLDivElement>();
 
-        // List of the addresses to display
-        addressList: PropTypes.arrayOf(UserAddressType).isRequired,
-        // Whether to show the address on the address tiles
-        showAddress: PropTypes.bool,
-        truncateAt: PropTypes.number.isRequired,
-        selected: PropTypes.number,
-
-        // Element to put as a header on top of the list
-        header: PropTypes.node,
-    };
-
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -48,10 +55,10 @@ export default class AddressSelector extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(props) { // eslint-disable-line camelcase
+    UNSAFE_componentWillReceiveProps(props: IProps) { // eslint-disable-line
         // Make sure the selected item isn't outside the list bounds
         const selected = this.state.selected;
-        const maxSelected = this._maxSelected(props.addressList);
+        const maxSelected = this.maxSelected(props.addressList);
         if (selected > maxSelected) {
             this.setState({ selected: maxSelected });
         }
@@ -60,13 +67,13 @@ export default class AddressSelector extends React.Component {
     componentDidUpdate() {
         // As the user scrolls with the arrow keys keep the selected item
         // at the top of the window.
-        if (this.scrollElement && this.props.addressList.length > 0 && !this.state.hover) {
-            const elementHeight = this.addressListElement.getBoundingClientRect().height;
-            this.scrollElement.scrollTop = (this.state.selected * elementHeight) - elementHeight;
+        if (this.scrollElement.current && this.props.addressList.length > 0 && !this.state.hover) {
+            const elementHeight = this.addressListElement.current.getBoundingClientRect().height;
+            this.scrollElement.current.scrollTop = (this.state.selected * elementHeight) - elementHeight;
         }
     }
 
-    moveSelectionTop = () => {
+    public moveSelectionTop = (): void => {
         if (this.state.selected > 0) {
             this.setState({
                 selected: 0,
@@ -75,7 +82,7 @@ export default class AddressSelector extends React.Component {
         }
     };
 
-    moveSelectionUp = () => {
+    public moveSelectionUp = (): void => {
         if (this.state.selected > 0) {
             this.setState({
                 selected: this.state.selected - 1,
@@ -84,8 +91,8 @@ export default class AddressSelector extends React.Component {
         }
     };
 
-    moveSelectionDown = () => {
-        if (this.state.selected < this._maxSelected(this.props.addressList)) {
+    public moveSelectionDown = (): void => {
+        if (this.state.selected < this.maxSelected(this.props.addressList)) {
             this.setState({
                 selected: this.state.selected + 1,
                 hover: false,
@@ -93,26 +100,26 @@ export default class AddressSelector extends React.Component {
         }
     };
 
-    chooseSelection = () => {
+    public chooseSelection = (): void => {
         this.selectAddress(this.state.selected);
     };
 
-    onClick = index => {
+    private onClick = (index: number): void => {
         this.selectAddress(index);
     };
 
-    onMouseEnter = index => {
+    private onMouseEnter = (index: number): void => {
         this.setState({
             selected: index,
             hover: true,
         });
     };
 
-    onMouseLeave = () => {
+    private onMouseLeave = (): void => {
         this.setState({ hover: false });
     };
 
-    selectAddress = index => {
+    private selectAddress = (index: number): void => {
         // Only try to select an address if one exists
         if (this.props.addressList.length !== 0) {
             this.props.onSelected(index);
@@ -120,9 +127,8 @@ export default class AddressSelector extends React.Component {
         }
     };
 
-    createAddressListTiles() {
-        const AddressTile = sdk.getComponent("elements.AddressTile");
-        const maxSelected = this._maxSelected(this.props.addressList);
+    private createAddressListTiles(): JSX.Element[] {
+        const maxSelected = this.maxSelected(this.props.addressList);
         const addressList = [];
 
         // Only create the address elements if there are address
@@ -143,14 +149,12 @@ export default class AddressSelector extends React.Component {
                         onMouseEnter={this.onMouseEnter.bind(this, i)}
                         onMouseLeave={this.onMouseLeave}
                         key={this.props.addressList[i].addressType + "/" + this.props.addressList[i].address}
-                        ref={(ref) => { this.addressListElement = ref; }}
+                        ref={this.addressListElement}
                     >
                         <AddressTile
                             address={this.props.addressList[i]}
                             showAddress={this.props.showAddress}
                             justified={true}
-                            networkName="vector"
-                            networkUrl={require("../../../../res/img/search-icon-vector.svg")}
                         />
                     </div>,
                 );
@@ -159,7 +163,7 @@ export default class AddressSelector extends React.Component {
         return addressList;
     }
 
-    _maxSelected(list) {
+    private maxSelected(list: IUserAddress[]): number {
         const listSize = list.length === 0 ? 0 : list.length - 1;
         const maxSelected = listSize > (this.props.truncateAt - 1) ? (this.props.truncateAt - 1) : listSize;
         return maxSelected;
@@ -172,7 +176,7 @@ export default class AddressSelector extends React.Component {
         });
 
         return (
-            <div className={classes} ref={(ref) => {this.scrollElement = ref;}}>
+            <div className={classes} ref={this.scrollElement}>
                 { this.props.header }
                 { this.createAddressListTiles() }
             </div>
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.tsx
similarity index 78%
rename from src/components/views/elements/AddressTile.js
rename to src/components/views/elements/AddressTile.tsx
index df66d10a71..52c0d84ac2 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.tsx
@@ -16,24 +16,25 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
-import { UserAddressType } from '../../../UserAddress.js';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import { IUserAddress } from '../../../UserAddress';
+import BaseAvatar from '../avatars/BaseAvatar';
+import EmailUserIcon from "../../../../res/img/icon-email-user.svg";
+
+interface IProps {
+    address: IUserAddress;
+    canDismiss?: boolean;
+    onDismissed?: () => void;
+    justified?: boolean;
+    showAddress?: boolean;
+}
 
 @replaceableComponent("views.elements.AddressTile")
-export default class AddressTile extends React.Component {
-    static propTypes = {
-        address: UserAddressType.isRequired,
-        canDismiss: PropTypes.bool,
-        onDismissed: PropTypes.func,
-        justified: PropTypes.bool,
-    };
-
-    static defaultProps = {
+export default class AddressTile extends React.Component<IProps> {
+    static defaultProps: Partial<IProps> = {
         canDismiss: false,
         onDismissed: function() {}, // NOP
         justified: false,
@@ -49,12 +50,9 @@ export default class AddressTile extends React.Component {
         if (isMatrixAddress && address.avatarMxc) {
             imgUrls.push(mediaFromMxc(address.avatarMxc).getSquareThumbnailHttp(25));
         } else if (address.addressType === 'email') {
-            imgUrls.push(require("../../../../res/img/icon-email-user.svg"));
+            imgUrls.push(EmailUserIcon);
         }
 
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
         const nameClasses = classNames({
             "mx_AddressTile_name": true,
             "mx_AddressTile_justified": this.props.justified,
@@ -71,9 +69,10 @@ export default class AddressTile extends React.Component {
             info = (
                 <div className="mx_AddressTile_mx">
                     <div className={nameClasses}>{ name }</div>
-                    { this.props.showAddress ?
-                        <div className={idClasses}>{ address.address }</div> :
-                        <div />
+                    {
+                        this.props.showAddress
+                            ? <div className={idClasses}>{ address.address }</div>
+                            : <div />
                     }
                 </div>
             );
@@ -123,8 +122,8 @@ export default class AddressTile extends React.Component {
         let dismiss;
         if (this.props.canDismiss) {
             dismiss = (
-                <div className="mx_AddressTile_dismiss" onClick={this.props.onDismissed} >
-                    <TintableSvg src={require("../../../../res/img/icon-address-delete.svg")} width="9" height="9" />
+                <div className="mx_AddressTile_dismiss" onClick={this.props.onDismissed}>
+                    <img src={require("../../../../res/img/icon-address-delete.svg")} width="9" height="9" />
                 </div>
             );
         }
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.tsx
similarity index 68%
rename from src/components/views/elements/AppPermission.js
rename to src/components/views/elements/AppPermission.tsx
index 65e40ef19a..c0543eb363 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.tsx
@@ -17,30 +17,39 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import url from 'url';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import WidgetUtils from "../../../utils/WidgetUtils";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import MemberAvatar from '../avatars/MemberAvatar';
+import BaseAvatar from '../avatars/BaseAvatar';
+import AccessibleButton from './AccessibleButton';
+import TextWithTooltip from "./TextWithTooltip";
+
+interface IProps {
+    url: string;
+    creatorUserId: string;
+    roomId: string;
+    onPermissionGranted: () => void;
+    isRoomEncrypted?: boolean;
+}
+
+interface IState {
+    roomMember: RoomMember;
+    isWrapped: boolean;
+    widgetDomain: string;
+}
 
 @replaceableComponent("views.elements.AppPermission")
-export default class AppPermission extends React.Component {
-    static propTypes = {
-        url: PropTypes.string.isRequired,
-        creatorUserId: PropTypes.string.isRequired,
-        roomId: PropTypes.string.isRequired,
-        onPermissionGranted: PropTypes.func.isRequired,
-        isRoomEncrypted: PropTypes.bool,
-    };
-
-    static defaultProps = {
+export default class AppPermission extends React.Component<IProps, IState> {
+    static defaultProps: Partial<IProps> = {
         onPermissionGranted: () => {},
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         // The first step is to pick apart the widget so we can render information about it
@@ -53,18 +62,20 @@ export default class AppPermission extends React.Component {
 
         // Set all this into the initial state
         this.state = {
-            ...urlInfo,
+            widgetDomain: null,
+            isWrapped: null,
             roomMember,
+            ...urlInfo,
         };
     }
 
-    parseWidgetUrl() {
+    private parseWidgetUrl(): { isWrapped: boolean, widgetDomain: string } {
         const widgetUrl = url.parse(this.props.url);
         const params = new URLSearchParams(widgetUrl.search);
 
         // HACK: We're relying on the query params when we should be relying on the widget's `data`.
         // This is a workaround for Scalar.
-        if (WidgetUtils.isScalarUrl(widgetUrl) && params && params.get('url')) {
+        if (WidgetUtils.isScalarUrl(this.props.url) && params && params.get('url')) {
             const unwrappedUrl = url.parse(params.get('url'));
             return {
                 widgetDomain: unwrappedUrl.host || unwrappedUrl.hostname,
@@ -80,10 +91,6 @@ export default class AppPermission extends React.Component {
 
     render() {
         const brand = SdkConfig.get().brand;
-        const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
-        const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
-        const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
-        const TextWithTooltip = sdk.getComponent("views.elements.TextWithTooltip");
 
         const displayName = this.state.roomMember ? this.state.roomMember.name : this.props.creatorUserId;
         const userId = displayName === this.props.creatorUserId ? null : this.props.creatorUserId;
@@ -94,15 +101,15 @@ export default class AppPermission extends React.Component {
 
         const warningTooltipText = (
             <div>
-                {_t("Any of the following data may be shared:")}
+                { _t("Any of the following data may be shared:") }
                 <ul>
-                    <li>{_t("Your display name")}</li>
-                    <li>{_t("Your avatar URL")}</li>
-                    <li>{_t("Your user ID")}</li>
-                    <li>{_t("Your theme")}</li>
-                    <li>{_t("%(brand)s URL", { brand })}</li>
-                    <li>{_t("Room ID")}</li>
-                    <li>{_t("Widget ID")}</li>
+                    <li>{ _t("Your display name") }</li>
+                    <li>{ _t("Your avatar URL") }</li>
+                    <li>{ _t("Your user ID") }</li>
+                    <li>{ _t("Your theme") }</li>
+                    <li>{ _t("%(brand)s URL", { brand }) }</li>
+                    <li>{ _t("Room ID") }</li>
+                    <li>{ _t("Widget ID") }</li>
                 </ul>
             </div>
         );
@@ -114,32 +121,32 @@ export default class AppPermission extends React.Component {
 
         // Due to i18n limitations, we can't dedupe the code for variables in these two messages.
         const warning = this.state.isWrapped
-            ? _t("Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
-                {widgetDomain: this.state.widgetDomain}, {helpIcon: () => warningTooltip})
+            ? _t("Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.",
+                { widgetDomain: this.state.widgetDomain }, { helpIcon: () => warningTooltip })
             : _t("Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
-                {widgetDomain: this.state.widgetDomain}, {helpIcon: () => warningTooltip});
+                { widgetDomain: this.state.widgetDomain }, { helpIcon: () => warningTooltip });
 
         const encryptionWarning = this.props.isRoomEncrypted ? _t("Widgets do not use message encryption.") : null;
 
         return (
             <div className='mx_AppPermissionWarning'>
                 <div className='mx_AppPermissionWarning_row mx_AppPermissionWarning_bolder mx_AppPermissionWarning_smallText'>
-                    {_t("Widget added by")}
+                    { _t("Widget added by") }
                 </div>
                 <div className='mx_AppPermissionWarning_row'>
-                    {avatar}
-                    <h4 className='mx_AppPermissionWarning_bolder'>{displayName}</h4>
-                    <div className='mx_AppPermissionWarning_smallText'>{userId}</div>
+                    { avatar }
+                    <h4 className='mx_AppPermissionWarning_bolder'>{ displayName }</h4>
+                    <div className='mx_AppPermissionWarning_smallText'>{ userId }</div>
                 </div>
                 <div className='mx_AppPermissionWarning_row mx_AppPermissionWarning_smallText'>
-                    {warning}
+                    { warning }
                 </div>
                 <div className='mx_AppPermissionWarning_row mx_AppPermissionWarning_smallText'>
-                    {_t("This widget may use cookies.")}&nbsp;{encryptionWarning}
+                    { _t("This widget may use cookies.") }&nbsp;{ encryptionWarning }
                 </div>
                 <div className='mx_AppPermissionWarning_row'>
                     <AccessibleButton kind='primary_sm' onClick={this.props.onPermissionGranted}>
-                        {_t("Continue")}
+                        { _t("Continue") }
                     </AccessibleButton>
                 </div>
             </div>
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.tsx
similarity index 60%
rename from src/components/views/elements/AppTile.js
rename to src/components/views/elements/AppTile.tsx
index b898ad2ebc..3f4d75df27 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.tsx
@@ -18,9 +18,8 @@ limitations under the License.
 */
 
 import url from 'url';
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import React, { createRef } from 'react';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import AccessibleButton from './AccessibleButton';
 import { _t } from '../../../languageHandler';
 import AppPermission from './AppPermission';
@@ -30,37 +29,106 @@ import dis from '../../../dispatcher/dispatcher';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import SettingsStore from "../../../settings/SettingsStore";
-import {aboveLeftOf, ContextMenuButton} from "../../structures/ContextMenu";
-import PersistedElement, {getPersistKey} from "./PersistedElement";
-import {WidgetType} from "../../../widgets/WidgetType";
-import {StopGapWidget} from "../../../stores/widgets/StopGapWidget";
-import {ElementWidgetActions} from "../../../stores/widgets/ElementWidgetActions";
-import {MatrixCapabilities} from "matrix-widget-api";
+import { aboveLeftOf, ContextMenuButton } from "../../structures/ContextMenu";
+import PersistedElement, { getPersistKey } from "./PersistedElement";
+import { WidgetType } from "../../../widgets/WidgetType";
+import { StopGapWidget } from "../../../stores/widgets/StopGapWidget";
+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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { IApp } from "../../../stores/WidgetStore";
+
+interface IProps {
+    app: IApp;
+    // If room is not specified then it is an account level widget
+    // which bypasses permission prompts as it was added explicitly by that user
+    room: Room;
+    // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
+    // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
+    fullWidth?: boolean;
+    // Optional. If set, renders a smaller view of the widget
+    miniMode?: boolean;
+    // UserId of the current user
+    userId: string;
+    // UserId of the entity that added / modified the widget
+    creatorUserId: string;
+    waitForIframeLoad: boolean;
+    showMenubar?: boolean;
+    // Optional onEditClickHandler (overrides default behaviour)
+    onEditClick?: () => void;
+    // Optional onDeleteClickHandler (overrides default behaviour)
+    onDeleteClick?: () => void;
+    // Optionally hide the tile title
+    showTitle?: boolean;
+    // Optionally handle minimise button pointer events (default false)
+    handleMinimisePointerEvents?: boolean;
+    // Optionally hide the popout widget icon
+    showPopout?: boolean;
+    // Is this an instance of a user widget
+    userWidget: boolean;
+    // sets the pointer-events property on the iframe
+    pointerEvents?: string;
+    widgetPageTitle?: string;
+}
+
+interface IState {
+    initialising: boolean; // True while we are mangling the widget URL
+    // True while the iframe content is loading
+    loading: boolean;
+    // Assume that widget has permission to load if we are the user who
+    // added it to the room, or if explicitly granted by the user
+    hasPermissionToLoad: boolean;
+    error: Error;
+    menuDisplayed: boolean;
+    widgetPageTitle: string;
+}
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 @replaceableComponent("views.elements.AppTile")
-export default class AppTile extends React.Component {
-    constructor(props) {
+export default class AppTile extends React.Component<IProps, IState> {
+    public static defaultProps: Partial<IProps> = {
+        waitForIframeLoad: true,
+        showMenubar: true,
+        showTitle: true,
+        showPopout: true,
+        handleMinimisePointerEvents: false,
+        userWidget: false,
+        miniMode: false,
+    };
+
+    private contextMenuButton = createRef<any>();
+    private iframe: HTMLIFrameElement; // ref to the iframe (callback style)
+    private allowedWidgetsWatchRef: string;
+    private persistKey: string;
+    private sgWidget: StopGapWidget;
+    private dispatcherRef: string;
+
+    constructor(props: IProps) {
         super(props);
 
         // The key used for PersistedElement
-        this._persistKey = getPersistKey(this.props.app.id);
-        this._sgWidget = new StopGapWidget(this.props);
-        this._sgWidget.on("preparing", this._onWidgetPrepared);
-        this._sgWidget.on("ready", this._onWidgetReady);
-        this.iframe = null; // ref to the iframe (callback style)
+        this.persistKey = getPersistKey(this.props.app.id);
+        try {
+            this.sgWidget = new StopGapWidget(this.props);
+            this.sgWidget.on("preparing", this.onWidgetPrepared);
+            this.sgWidget.on("ready", this.onWidgetReady);
+        } catch (e) {
+            logger.log("Failed to construct widget", e);
+            this.sgWidget = null;
+        }
 
-        this.state = this._getNewState(props);
-        this._contextMenuButton = createRef();
+        this.state = this.getNewState(props);
 
-        this._allowedWidgetsWatchRef = SettingsStore.watchSetting("allowedWidgets", null, this.onAllowedWidgetsChange);
+        this.allowedWidgetsWatchRef = SettingsStore.watchSetting("allowedWidgets", null, this.onAllowedWidgetsChange);
     }
 
     // This is a function to make the impact of calling SettingsStore slightly less
-    hasPermissionToLoad = (props) => {
-        if (this._usingLocalWidget()) return true;
+    private hasPermissionToLoad = (props: IProps): boolean => {
+        if (this.usingLocalWidget()) return true;
         if (!props.room) return true; // user widgets always have permissions
 
         const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", props.room.roomId);
@@ -76,34 +144,34 @@ export default class AppTile extends React.Component {
      * @param  {Object} newProps The new properties of the component
      * @return {Object} Updated component state to be set with setState
      */
-    _getNewState(newProps) {
+    private getNewState(newProps: IProps): IState {
         return {
             initialising: true, // True while we are mangling the widget URL
             // True while the iframe content is loading
-            loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey),
+            loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this.persistKey),
             // Assume that widget has permission to load if we are the user who
             // added it to the room, or if explicitly granted by the user
             hasPermissionToLoad: this.hasPermissionToLoad(newProps),
             error: null,
-            widgetPageTitle: newProps.widgetPageTitle,
             menuDisplayed: false,
+            widgetPageTitle: this.props.widgetPageTitle,
         };
     }
 
-    onAllowedWidgetsChange = () => {
+    private onAllowedWidgetsChange = (): void => {
         const hasPermissionToLoad = this.hasPermissionToLoad(this.props);
 
         if (this.state.hasPermissionToLoad && !hasPermissionToLoad) {
             // Force the widget to be non-persistent (able to be deleted/forgotten)
-            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
-            PersistedElement.destroyElement(this._persistKey);
-            this._sgWidget.stop();
+            ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id);
+            PersistedElement.destroyElement(this.persistKey);
+            if (this.sgWidget) this.sgWidget.stop();
         }
 
         this.setState({ hasPermissionToLoad });
     };
 
-    isMixedContent() {
+    private isMixedContent(): boolean {
         const parentContentProtocol = window.location.protocol;
         const u = url.parse(this.props.app.url);
         const childContentProtocol = u.protocol;
@@ -115,64 +183,70 @@ export default class AppTile extends React.Component {
         return false;
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         // Only fetch IM token on mount if we're showing and have permission to load
-        if (this.state.hasPermissionToLoad) {
-            this._startWidget();
+        if (this.sgWidget && this.state.hasPermissionToLoad) {
+            this.startWidget();
         }
 
         // Widget action listeners
-        this.dispatcherRef = dis.register(this._onAction);
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         // Widget action listeners
         if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
 
         // if it's not remaining on screen, get rid of the PersistedElement container
-        if (!ActiveWidgetStore.getWidgetPersistence(this.props.app.id)) {
-            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
-            PersistedElement.destroyElement(this._persistKey);
+        if (!ActiveWidgetStore.instance.getWidgetPersistence(this.props.app.id)) {
+            ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id);
+            PersistedElement.destroyElement(this.persistKey);
         }
 
-        if (this._sgWidget) {
-            this._sgWidget.stop();
+        if (this.sgWidget) {
+            this.sgWidget.stop();
         }
 
-        SettingsStore.unwatchSetting(this._allowedWidgetsWatchRef);
+        SettingsStore.unwatchSetting(this.allowedWidgetsWatchRef);
     }
 
-    _resetWidget(newProps) {
-        if (this._sgWidget) {
-            this._sgWidget.stop();
+    private resetWidget(newProps: IProps): void {
+        if (this.sgWidget) {
+            this.sgWidget.stop();
+        }
+        try {
+            this.sgWidget = new StopGapWidget(newProps);
+            this.sgWidget.on("preparing", this.onWidgetPrepared);
+            this.sgWidget.on("ready", this.onWidgetReady);
+            this.startWidget();
+        } catch (e) {
+            logger.log("Failed to construct widget", e);
+            this.sgWidget = null;
         }
-        this._sgWidget = new StopGapWidget(newProps);
-        this._sgWidget.on("preparing", this._onWidgetPrepared);
-        this._sgWidget.on("ready", this._onWidgetReady);
-        this._startWidget();
     }
 
-    _startWidget() {
-        this._sgWidget.prepare().then(() => {
-            this.setState({initialising: false});
+    private startWidget(): void {
+        this.sgWidget.prepare().then(() => {
+            this.setState({ initialising: false });
         });
     }
 
-    _iframeRefChange = (ref) => {
+    private iframeRefChange = (ref: HTMLIFrameElement): void => {
         this.iframe = ref;
         if (ref) {
-            this._sgWidget.start(ref);
+            if (this.sgWidget) this.sgWidget.start(ref);
         } else {
-            this._resetWidget(this.props);
+            this.resetWidget(this.props);
         }
     };
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    public UNSAFE_componentWillReceiveProps(nextProps: IProps): void { // eslint-disable-line camelcase
         if (nextProps.app.url !== this.props.app.url) {
-            this._getNewState(nextProps);
+            this.getNewState(nextProps);
             if (this.state.hasPermissionToLoad) {
-                this._resetWidget(nextProps);
+                this.resetWidget(nextProps);
             }
         }
 
@@ -188,7 +262,7 @@ export default class AppTile extends React.Component {
      * @private
      * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
      */
-    async _endWidgetActions() { // widget migration dev note: async to maintain signature
+    private async endWidgetActions(): Promise<void> { // widget migration dev note: async to maintain signature
         // HACK: This is a really dirty way to ensure that Jitsi cleans up
         // its hold on the webcam. Without this, the widget holds a media
         // stream open, even after death. See https://github.com/vector-im/element-web/issues/7351
@@ -203,31 +277,33 @@ export default class AppTile extends React.Component {
         }
 
         if (WidgetType.JITSI.matches(this.props.app.type)) {
-            dis.dispatch({action: 'hangup_conference'});
+            dis.dispatch({ action: 'hangup_conference' });
         }
 
         // Delete the widget from the persisted store for good measure.
-        PersistedElement.destroyElement(this._persistKey);
+        PersistedElement.destroyElement(this.persistKey);
+        ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id);
 
-        this._sgWidget.stop({forceDestroy: true});
+        if (this.sgWidget) this.sgWidget.stop({ forceDestroy: true });
     }
 
-    _onWidgetPrepared = () => {
-        this.setState({loading: false});
+    private onWidgetPrepared = (): void => {
+        this.setState({ loading: false });
     };
 
-    _onWidgetReady = () => {
+    private onWidgetReady = (): void => {
         if (WidgetType.JITSI.matches(this.props.app.type)) {
-            this._sgWidget.widgetApi.transport.send(ElementWidgetActions.ClientReady, {});
+            this.sgWidget.widgetApi.transport.send(ElementWidgetActions.ClientReady, {});
         }
     };
 
-    _onAction = payload => {
+    private onAction = (payload): void => {
         if (payload.widgetId === this.props.app.id) {
             switch (payload.action) {
                 case 'm.sticker':
-                    if (this._sgWidget.widgetApi.hasCapability(MatrixCapabilities.StickerSending)) {
-                        dis.dispatch({action: 'post_sticker_message', data: payload.data});
+                    if (this.sgWidget.widgetApi.hasCapability(MatrixCapabilities.StickerSending)) {
+                        dis.dispatch({ action: 'post_sticker_message', data: payload.data });
+                        dis.dispatch({ action: 'stickerpicker_close' });
                     } else {
                         console.warn('Ignoring sticker message. Invalid capability');
                     }
@@ -236,24 +312,24 @@ export default class AppTile extends React.Component {
         }
     };
 
-    _grantWidgetPermission = () => {
+    private grantWidgetPermission = (): void => {
         const roomId = this.props.room.roomId;
         console.info("Granting permission for widget to load: " + this.props.app.eventId);
         const current = SettingsStore.getValue("allowedWidgets", roomId);
         current[this.props.app.eventId] = true;
         const level = SettingsStore.firstSupportedLevel("allowedWidgets");
         SettingsStore.setValue("allowedWidgets", roomId, level, current).then(() => {
-            this.setState({hasPermissionToLoad: true});
+            this.setState({ hasPermissionToLoad: true });
 
             // Fetch a token for the integration manager, now that we're allowed to
-            this._startWidget();
+            this.startWidget();
         }).catch(err => {
             console.error(err);
             // We don't really need to do anything about this - the user will just hit the button again.
         });
     };
 
-    formatAppTileName() {
+    private formatAppTileName(): string {
         let appTileName = "No name";
         if (this.props.app.name && this.props.app.name.trim()) {
             appTileName = this.props.app.name.trim();
@@ -266,11 +342,11 @@ export default class AppTile extends React.Component {
      * actual widget URL
      * @returns {bool} true If using a local version of the widget
      */
-    _usingLocalWidget() {
+    private usingLocalWidget(): boolean {
         return WidgetType.JITSI.matches(this.props.app.type);
     }
 
-    _getTileTitle() {
+    private getTileTitle(): JSX.Element {
         const name = this.formatAppTileName();
         const titleSpacer = <span>&nbsp;-&nbsp;</span>;
         let title = '';
@@ -288,33 +364,32 @@ export default class AppTile extends React.Component {
     }
 
     // TODO replace with full screen interactions
-    _onPopoutWidgetClick = () => {
+    private onPopoutWidgetClick = (): void => {
         // Ensure Jitsi conferences are closed on pop-out, to not confuse the user to join them
         // twice from the same computer, which Jitsi can have problems with (audio echo/gain-loop).
         if (WidgetType.JITSI.matches(this.props.app.type)) {
-            this._endWidgetActions().then(() => {
+            this.endWidgetActions().then(() => {
                 if (this.iframe) {
                     // Reload iframe
-                    this.iframe.src = this._sgWidget.embedUrl;
-                    this.setState({});
+                    this.iframe.src = this.sgWidget.embedUrl;
                 }
             });
         }
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
         // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
-            { target: '_blank', href: this._sgWidget.popoutUrl, rel: 'noreferrer noopener'}).click();
+            { target: '_blank', href: this.sgWidget.popoutUrl, rel: 'noreferrer noopener' }).click();
     };
 
-    _onContextMenuClick = () => {
+    private onContextMenuClick = (): void => {
         this.setState({ menuDisplayed: true });
     };
 
-    _closeContextMenu = () => {
+    private closeContextMenu = (): void => {
         this.setState({ menuDisplayed: false });
     };
 
-    render() {
+    public render(): JSX.Element {
         let appTileBody;
 
         // Note that there is advice saying allow-scripts shouldn't be used with allow-same-origin
@@ -322,7 +397,7 @@ export default class AppTile extends React.Component {
         // this would only be for content hosted on the same origin as the element client: anything
         // hosted on the same origin as the client will get the same access as if you clicked
         // a link to it.
-        const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox "+
+        const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox " +
             "allow-same-origin allow-scripts allow-presentation";
 
         // Additional iframe feature pemissions
@@ -340,7 +415,13 @@ export default class AppTile extends React.Component {
                 <Spinner message={_t("Loading...")} />
             </div>
         );
-        if (!this.state.hasPermissionToLoad) {
+        if (this.sgWidget === null) {
+            appTileBody = (
+                <div className={appTileBodyClass} style={appTileBodyStyles}>
+                    <AppWarning errorMsg={_t("Error loading Widget")} />
+                </div>
+            );
+        } else if (!this.state.hasPermissionToLoad) {
             // only possible for room widgets, can assert this.props.room here
             const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
             appTileBody = (
@@ -348,9 +429,9 @@ export default class AppTile extends React.Component {
                     <AppPermission
                         roomId={this.props.room.roomId}
                         creatorUserId={this.props.creatorUserId}
-                        url={this._sgWidget.embedUrl}
+                        url={this.sgWidget.embedUrl}
                         isRoomEncrypted={isEncrypted}
-                        onPermissionGranted={this._grantWidgetPermission}
+                        onPermissionGranted={this.grantWidgetPermission}
                     />
                 </div>
             );
@@ -364,7 +445,7 @@ export default class AppTile extends React.Component {
             if (this.isMixedContent()) {
                 appTileBody = (
                     <div className={appTileBodyClass} style={appTileBodyStyles}>
-                        <AppWarning errorMsg="Error - Mixed content" />
+                        <AppWarning errorMsg={_t("Error - Mixed content")} />
                     </div>
                 );
             } else {
@@ -373,8 +454,8 @@ export default class AppTile extends React.Component {
                         { this.state.loading && loadingElement }
                         <iframe
                             allow={iframeFeatures}
-                            ref={this._iframeRefChange}
-                            src={this._sgWidget.embedUrl}
+                            ref={this.iframeRefChange}
+                            src={this.sgWidget.embedUrl}
                             allowFullScreen={true}
                             sandbox={sandboxFlags}
                         />
@@ -390,8 +471,8 @@ export default class AppTile extends React.Component {
                     // Also wrap the PersistedElement in a div to fix the height, otherwise
                     // AppTile's border is in the wrong place
                     appTileBody = <div className="mx_AppTile_persistedWrapper">
-                        <PersistedElement persistKey={this._persistKey}>
-                            {appTileBody}
+                        <PersistedElement persistKey={this.persistKey}>
+                            { appTileBody }
                         </PersistedElement>
                     </div>;
                 }
@@ -400,11 +481,11 @@ export default class AppTile extends React.Component {
 
         let appTileClasses;
         if (this.props.miniMode) {
-            appTileClasses = {mx_AppTile_mini: true};
+            appTileClasses = { mx_AppTile_mini: true };
         } else if (this.props.fullWidth) {
-            appTileClasses = {mx_AppTileFullWidth: true};
+            appTileClasses = { mx_AppTileFullWidth: true };
         } else {
-            appTileClasses = {mx_AppTile: true};
+            appTileClasses = { mx_AppTile: true };
         }
         appTileClasses = classNames(appTileClasses);
 
@@ -412,11 +493,13 @@ export default class AppTile extends React.Component {
         if (this.state.menuDisplayed) {
             contextMenu = (
                 <RoomWidgetContextMenu
-                    {...aboveLeftOf(this._contextMenuButton.current.getBoundingClientRect(), null)}
+                    {...aboveLeftOf(this.contextMenuButton.current.getBoundingClientRect(), null)}
                     app={this.props.app}
-                    onFinished={this._closeContextMenu}
+                    onFinished={this.closeContextMenu}
                     showUnpin={!this.props.userWidget}
                     userWidget={this.props.userWidget}
+                    onEditClick={this.props.onEditClick}
+                    onDeleteClick={this.props.onDeleteClick}
                 />
             );
         }
@@ -424,25 +507,25 @@ export default class AppTile extends React.Component {
         return <React.Fragment>
             <div className={appTileClasses} id={this.props.app.id}>
                 { this.props.showMenubar &&
-                <div className="mx_AppTileMenuBar">
-                    <span className="mx_AppTileMenuBarTitle" style={{pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false)}}>
-                        { this.props.showTitle && this._getTileTitle() }
-                    </span>
-                    <span className="mx_AppTileMenuBarWidgets">
-                        { this.props.showPopout && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_popout"
-                            title={_t('Popout widget')}
-                            onClick={this._onPopoutWidgetClick}
-                        /> }
-                        { <ContextMenuButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_menu"
-                            label={_t("Options")}
-                            isExpanded={this.state.menuDisplayed}
-                            inputRef={this._contextMenuButton}
-                            onClick={this._onContextMenuClick}
-                        /> }
-                    </span>
-                </div> }
+                    <div className="mx_AppTileMenuBar">
+                        <span className="mx_AppTileMenuBarTitle" style={{ pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : "none") }}>
+                            { this.props.showTitle && this.getTileTitle() }
+                        </span>
+                        <span className="mx_AppTileMenuBarWidgets">
+                            { this.props.showPopout && <AccessibleButton
+                                className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_popout"
+                                title={_t('Popout widget')}
+                                onClick={this.onPopoutWidgetClick}
+                            /> }
+                            <ContextMenuButton
+                                className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_menu"
+                                label={_t("Options")}
+                                isExpanded={this.state.menuDisplayed}
+                                inputRef={this.contextMenuButton}
+                                onClick={this.onContextMenuClick}
+                            />
+                        </span>
+                    </div> }
                 { appTileBody }
             </div>
 
@@ -450,49 +533,3 @@ export default class AppTile extends React.Component {
         </React.Fragment>;
     }
 }
-
-AppTile.displayName = 'AppTile';
-
-AppTile.propTypes = {
-    app: PropTypes.object.isRequired,
-    // If room is not specified then it is an account level widget
-    // which bypasses permission prompts as it was added explicitly by that user
-    room: PropTypes.object,
-    // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
-    // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
-    fullWidth: PropTypes.bool,
-    // Optional. If set, renders a smaller view of the widget
-    miniMode: PropTypes.bool,
-    // UserId of the current user
-    userId: PropTypes.string.isRequired,
-    // UserId of the entity that added / modified the widget
-    creatorUserId: PropTypes.string,
-    waitForIframeLoad: PropTypes.bool,
-    showMenubar: PropTypes.bool,
-    // Optional onEditClickHandler (overrides default behaviour)
-    onEditClick: PropTypes.func,
-    // Optional onDeleteClickHandler (overrides default behaviour)
-    onDeleteClick: PropTypes.func,
-    // Optional onMinimiseClickHandler
-    onMinimiseClick: PropTypes.func,
-    // Optionally hide the tile title
-    showTitle: PropTypes.bool,
-    // Optionally handle minimise button pointer events (default false)
-    handleMinimisePointerEvents: PropTypes.bool,
-    // Optionally hide the popout widget icon
-    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 = {
-    waitForIframeLoad: true,
-    showMenubar: true,
-    showTitle: true,
-    showPopout: true,
-    handleMinimisePointerEvents: false,
-    userWidget: false,
-    miniMode: false,
-};
diff --git a/src/components/views/elements/AppWarning.js b/src/components/views/elements/AppWarning.tsx
similarity index 60%
rename from src/components/views/elements/AppWarning.js
rename to src/components/views/elements/AppWarning.tsx
index 517242dab5..bac486d4b8 100644
--- a/src/components/views/elements/AppWarning.js
+++ b/src/components/views/elements/AppWarning.tsx
@@ -1,24 +1,20 @@
-import React from 'react'; // eslint-disable-line no-unused-vars
-import PropTypes from 'prop-types';
+import React from 'react';
 
-const AppWarning = (props) => {
+interface IProps {
+    errorMsg?: string;
+}
+
+const AppWarning: React.FC<IProps> = (props) => {
     return (
         <div className='mx_AppPermissionWarning'>
             <div className='mx_AppPermissionWarningImage'>
                 <img src={require("../../../../res/img/warning.svg")} alt='' />
             </div>
             <div className='mx_AppPermissionWarningText'>
-                <span className='mx_AppPermissionWarningTextLabel'>{ props.errorMsg }</span>
+                <span className='mx_AppPermissionWarningTextLabel'>{ props.errorMsg || "Error" }</span>
             </div>
         </div>
     );
 };
 
-AppWarning.propTypes = {
-    errorMsg: PropTypes.string,
-};
-AppWarning.defaultProps = {
-    errorMsg: 'Error',
-};
-
 export default AppWarning;
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 67572d4508..97bae82e61 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -18,7 +18,6 @@ limitations under the License.
 import TagTile from './TagTile';
 
 import React from 'react';
-import { Draggable } from 'react-beautiful-dnd';
 import { ContextMenu, toRightOf, useContextMenu } from "../../structures/ContextMenu";
 import * as sdk from '../../../index';
 
@@ -31,32 +30,17 @@ export default function DNDTagTile(props) {
         const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
         contextMenu = (
             <ContextMenu {...toRightOf(elementRect)} onFinished={closeMenu}>
-                <TagTileContextMenu tag={props.tag} onFinished={closeMenu} />
+                <TagTileContextMenu tag={props.tag} onFinished={closeMenu} index={props.index} />
             </ContextMenu>
         );
     }
-    return <div>
-        <Draggable
-            key={props.tag}
-            draggableId={props.tag}
-            index={props.index}
-            type="draggable-TagTile"
-        >
-            {(provided, snapshot) => (
-                <div
-                    ref={provided.innerRef}
-                    {...provided.draggableProps}
-                    {...provided.dragHandleProps}
-                >
-                    <TagTile
-                        {...props}
-                        contextMenuButtonRef={handle}
-                        menuDisplayed={menuDisplayed}
-                        openMenu={openMenu}
-                    />
-                </div>
-            )}
-        </Draggable>
-        {contextMenu}
-    </div>;
+    return <>
+        <TagTile
+            {...props}
+            contextMenuButtonRef={handle}
+            menuDisplayed={menuDisplayed}
+            openMenu={openMenu}
+        />
+        { contextMenu }
+    </>;
 }
diff --git a/src/components/views/elements/DesktopBuildsNotice.tsx b/src/components/views/elements/DesktopBuildsNotice.tsx
index fd1c7848aa..f2441b83a4 100644
--- a/src/components/views/elements/DesktopBuildsNotice.tsx
+++ b/src/components/views/elements/DesktopBuildsNotice.tsx
@@ -14,10 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from "react";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
-import React from "react";
+import dis from "../../../dispatcher/dispatcher";
+import { Action } from "../../../dispatcher/actions";
+import { UserTab } from "../dialogs/UserSettingsDialog";
 
 export enum WarningKind {
     Files,
@@ -29,11 +32,27 @@ interface IProps {
     kind: WarningKind;
 }
 
-export default function DesktopBuildsNotice({isRoomEncrypted, kind}: IProps) {
+export default function DesktopBuildsNotice({ isRoomEncrypted, kind }: IProps) {
     if (!isRoomEncrypted) return null;
     if (EventIndexPeg.get()) return null;
 
-    const {desktopBuilds, brand} = SdkConfig.get();
+    if (EventIndexPeg.error) {
+        return <>
+            { _t("Message search initialisation failed, check <a>your settings</a> for more information", {}, {
+                a: sub => (<a onClick={(evt) => {
+                    evt.preventDefault();
+                    dis.dispatch({
+                        action: Action.ViewUserSettings,
+                        initialTabId: UserTab.Security,
+                    });
+                }}>
+                    { sub }
+                </a>),
+            }) }
+        </>;
+    }
+
+    const { desktopBuilds, brand } = SdkConfig.get();
 
     let text = null;
     let logo = null;
@@ -42,22 +61,22 @@ export default function DesktopBuildsNotice({isRoomEncrypted, kind}: IProps) {
         switch (kind) {
             case WarningKind.Files:
                 text = _t("Use the <a>Desktop app</a> to see all encrypted files", {}, {
-                    a: sub => (<a href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">{sub}</a>),
+                    a: sub => (<a href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">{ sub }</a>),
                 });
                 break;
             case WarningKind.Search:
                 text = _t("Use the <a>Desktop app</a> to search encrypted messages", {}, {
-                    a: sub => (<a href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">{sub}</a>),
+                    a: sub => (<a href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">{ sub }</a>),
                 });
                 break;
         }
     } else {
         switch (kind) {
             case WarningKind.Files:
-                text = _t("This version of %(brand)s does not support viewing some encrypted files", {brand});
+                text = _t("This version of %(brand)s does not support viewing some encrypted files", { brand });
                 break;
             case WarningKind.Search:
-                text = _t("This version of %(brand)s does not support searching encrypted messages", {brand});
+                text = _t("This version of %(brand)s does not support searching encrypted messages", { brand });
                 break;
         }
     }
@@ -70,8 +89,8 @@ export default function DesktopBuildsNotice({isRoomEncrypted, kind}: IProps) {
 
     return (
         <div className="mx_DesktopBuildsNotice">
-            {logo}
-            <span>{text}</span>
+            { logo }
+            <span>{ text }</span>
         </div>
     );
 }
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index 2d066a7ed7..034fc3d49c 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -16,73 +16,92 @@ limitations under the License.
 
 import React from 'react';
 import { _t } from '../../../languageHandler';
-import BaseDialog from "..//dialogs/BaseDialog"
+import BaseDialog from "..//dialogs/BaseDialog";
+import DialogButtons from "./DialogButtons";
+import classNames from 'classnames';
 import AccessibleButton from './AccessibleButton';
-import {getDesktopCapturerSources} from "matrix-js-sdk/src/webrtc/call";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import TabbedView, { Tab, TabLocation } from '../../structures/TabbedView';
 
-export interface DesktopCapturerSource {
-    id: string;
-    name: string;
-    thumbnailURL;
+export function getDesktopCapturerSources(): Promise<Array<DesktopCapturerSource>> {
+    const options: GetSourcesOptions = {
+        thumbnailSize: {
+            height: 176,
+            width: 312,
+        },
+        types: [
+            "screen",
+            "window",
+        ],
+    };
+    return window.electron.getDesktopCapturerSources(options);
 }
 
 export enum Tabs {
-    Screens = "screens",
-    Windows = "windows",
+    Screens = "screen",
+    Windows = "window",
 }
 
-export interface DesktopCapturerSourceIProps {
+export interface ExistingSourceIProps {
     source: DesktopCapturerSource;
     onSelect(source: DesktopCapturerSource): void;
+    selected: boolean;
 }
 
-export class ExistingSource extends React.Component<DesktopCapturerSourceIProps> {
-    constructor(props) {
+export class ExistingSource extends React.Component<ExistingSourceIProps> {
+    constructor(props: ExistingSourceIProps) {
         super(props);
     }
 
-    onClick = (ev) => {
+    private onClick = (): void => {
         this.props.onSelect(this.props.source);
-    }
+    };
 
     render() {
+        const thumbnailClasses = classNames({
+            mx_desktopCapturerSourcePicker_source_thumbnail: true,
+            mx_desktopCapturerSourcePicker_source_thumbnail_selected: this.props.selected,
+        });
+
         return (
             <AccessibleButton
-                className="mx_desktopCapturerSourcePicker_stream_button"
+                className="mx_desktopCapturerSourcePicker_source"
                 title={this.props.source.name}
-                onClick={this.onClick} >
+                onClick={this.onClick}
+            >
                 <img
-                    className="mx_desktopCapturerSourcePicker_stream_thumbnail"
+                    className={thumbnailClasses}
                     src={this.props.source.thumbnailURL}
                 />
-                <span className="mx_desktopCapturerSourcePicker_stream_name">{this.props.source.name}</span>
+                <span className="mx_desktopCapturerSourcePicker_source_name">{ this.props.source.name }</span>
             </AccessibleButton>
         );
     }
 }
 
-export interface DesktopCapturerSourcePickerIState {
+export interface PickerIState {
     selectedTab: Tabs;
     sources: Array<DesktopCapturerSource>;
+    selectedSource: DesktopCapturerSource | null;
 }
-export interface DesktopCapturerSourcePickerIProps {
-    onFinished(source: DesktopCapturerSource): void;
+export interface PickerIProps {
+    onFinished(sourceId: string): void;
 }
 
 @replaceableComponent("views.elements.DesktopCapturerSourcePicker")
 export default class DesktopCapturerSourcePicker extends React.Component<
-    DesktopCapturerSourcePickerIProps,
-    DesktopCapturerSourcePickerIState
-    > {
-    interval;
+    PickerIProps,
+    PickerIState
+> {
+    interval: number;
 
-    constructor(props) {
+    constructor(props: PickerIProps) {
         super(props);
 
         this.state = {
             selectedTab: Tabs.Screens,
             sources: [],
+            selectedSource: null,
         };
     }
 
@@ -106,69 +125,61 @@ export default class DesktopCapturerSourcePicker extends React.Component<
         clearInterval(this.interval);
     }
 
-    onSelect = (source) => {
-        this.props.onFinished(source);
-    }
+    private onSelect = (source: DesktopCapturerSource): void => {
+        this.setState({ selectedSource: source });
+    };
 
-    onScreensClick = (ev) => {
-        this.setState({selectedTab: Tabs.Screens});
-    }
+    private onShare = (): void => {
+        this.props.onFinished(this.state.selectedSource.id);
+    };
 
-    onWindowsClick = (ev) => {
-        this.setState({selectedTab: Tabs.Windows});
-    }
+    private onTabChange = (): void => {
+        this.setState({ selectedSource: null });
+    };
 
-    onCloseClick = (ev) => {
+    private onCloseClick = (): void => {
         this.props.onFinished(null);
+    };
+
+    private getTab(type: "screen" | "window", label: string): Tab {
+        const sources = this.state.sources.filter((source) => source.id.startsWith(type)).map((source) => {
+            return (
+                <ExistingSource
+                    selected={this.state.selectedSource?.id === source.id}
+                    source={source}
+                    onSelect={this.onSelect}
+                    key={source.id}
+                />
+            );
+        });
+
+        return new Tab(type, label, null, (
+            <div className="mx_desktopCapturerSourcePicker_tab">
+                { sources }
+            </div>
+        ));
     }
 
     render() {
-        let sources;
-        if (this.state.selectedTab === Tabs.Screens) {
-            sources = this.state.sources
-                .filter((source) => {
-                    return source.id.startsWith("screen");
-                })
-                .map((source) => {
-                    return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
-                });
-        } else {
-            sources = this.state.sources
-                .filter((source) => {
-                    return source.id.startsWith("window");
-                })
-                .map((source) => {
-                    return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
-                });
-        }
-
-        const buttonStyle = "mx_desktopCapturerSourcePicker_tabLabel";
-        const screensButtonStyle = buttonStyle + ((this.state.selectedTab === Tabs.Screens) ? "_selected" : "");
-        const windowsButtonStyle = buttonStyle + ((this.state.selectedTab === Tabs.Windows) ? "_selected" : "");
+        const tabs = [
+            this.getTab("screen", _t("Share entire screen")),
+            this.getTab("window", _t("Application window")),
+        ];
 
         return (
             <BaseDialog
                 className="mx_desktopCapturerSourcePicker"
                 onFinished={this.onCloseClick}
-                title={_t("Share your screen")}
+                title={_t("Share content")}
             >
-                <div className="mx_desktopCapturerSourcePicker_tabLabels">
-                    <AccessibleButton
-                        className={screensButtonStyle}
-                        onClick={this.onScreensClick}
-                    >
-                        {_t("Screens")}
-                    </AccessibleButton>
-                    <AccessibleButton
-                        className={windowsButtonStyle}
-                        onClick={this.onWindowsClick}
-                    >
-                        {_t("Windows")}
-                    </AccessibleButton>
-                </div>
-                <div className="mx_desktopCapturerSourcePicker_panel">
-                    { sources }
-                </div>
+                <TabbedView tabs={tabs} tabLocation={TabLocation.TOP} onChange={this.onTabChange} />
+                <DialogButtons
+                    primaryButton={_t("Share")}
+                    hasCancel={true}
+                    onCancel={this.onCloseClick}
+                    onPrimaryButtonClick={this.onShare}
+                    primaryDisabled={!this.state.selectedSource}
+                />
             </BaseDialog>
         );
     }
diff --git a/src/components/views/elements/DialPadBackspaceButton.tsx b/src/components/views/elements/DialPadBackspaceButton.tsx
new file mode 100644
index 0000000000..d64ced8239
--- /dev/null
+++ b/src/components/views/elements/DialPadBackspaceButton.tsx
@@ -0,0 +1,31 @@
+/*
+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 React from "react";
+import AccessibleButton, { ButtonEvent } from "./AccessibleButton";
+
+interface IProps {
+    // Callback for when the button is pressed
+    onBackspacePress: (ev: ButtonEvent) => void;
+}
+
+export default class DialPadBackspaceButton extends React.PureComponent<IProps> {
+    render() {
+        return <div className="mx_DialPadBackspaceButtonWrapper">
+            <AccessibleButton className="mx_DialPadBackspaceButton" onClick={this.props.onBackspacePress} />
+        </div>;
+    }
+}
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.tsx
similarity index 62%
rename from src/components/views/elements/DialogButtons.js
rename to src/components/views/elements/DialogButtons.tsx
index dcb1cee077..0dff64c0b4 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.tsx
@@ -17,60 +17,61 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    // The primary button which is styled differently and has default focus.
+    primaryButton: React.ReactNode;
+
+    // A node to insert into the cancel button instead of default "Cancel"
+    cancelButton?: React.ReactNode;
+
+    // If true, make the primary button a form submit button (input type="submit")
+    primaryIsSubmit?: boolean;
+
+    // onClick handler for the primary button.
+    onPrimaryButtonClick?: (ev: React.MouseEvent) => void;
+
+    // should there be a cancel button? default: true
+    hasCancel?: boolean;
+
+    // The class of the cancel button, only used if a cancel button is
+    // enabled
+    cancelButtonClass?: string;
+
+    // onClick handler for the cancel button.
+    onCancel?: (...args: any[]) => void;
+
+    focus?: boolean;
+
+    // disables the primary and cancel buttons
+    disabled?: boolean;
+
+    // disables only the primary button
+    primaryDisabled?: boolean;
+
+    // something to stick next to the buttons, optionally
+    additive?: React.ReactNode;
+
+    primaryButtonClass?: string;
+}
 
 /**
  * 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.
-        primaryButton: PropTypes.node.isRequired,
-
-        // A node to insert into the cancel button instead of default "Cancel"
-        cancelButton: PropTypes.node,
-
-        // If true, make the primary button a form submit button (input type="submit")
-        primaryIsSubmit: PropTypes.bool,
-
-        // onClick handler for the primary button.
-        onPrimaryButtonClick: PropTypes.func,
-
-        // should there be a cancel button? default: true
-        hasCancel: PropTypes.bool,
-
-        // The class of the cancel button, only used if a cancel button is
-        // enabled
-        cancelButtonClass: PropTypes.node,
-
-        // onClick handler for the cancel button.
-        onCancel: PropTypes.func,
-
-        focus: PropTypes.bool,
-
-        // disables the primary and cancel buttons
-        disabled: PropTypes.bool,
-
-        // disables only the primary button
-        primaryDisabled: PropTypes.bool,
-
-        // something to stick next to the buttons, optionally
-        additive: PropTypes.element,
-    };
-
-    static defaultProps = {
+export default class DialogButtons extends React.Component<IProps> {
+    public static defaultProps: Partial<IProps> = {
         hasCancel: true,
         disabled: false,
     };
 
-    _onCancelClick = () => {
-        this.props.onCancel();
+    private onCancelClick = (event: React.MouseEvent): void => {
+        this.props.onCancel(event);
     };
 
-    render() {
+    public render(): JSX.Element {
         let primaryButtonClassName = "mx_Dialog_primary";
         if (this.props.primaryButtonClass) {
             primaryButtonClassName += " " + this.props.primaryButtonClass;
@@ -82,7 +83,7 @@ export default class DialogButtons extends React.Component {
                 // important: the default type is 'submit' and this button comes before the
                 // primary in the DOM so will get form submissions unless we make it not a submit.
                 type="button"
-                onClick={this._onCancelClick}
+                onClick={this.onCancelClick}
                 className={this.props.cancelButtonClass}
                 disabled={this.props.disabled}
             >
@@ -92,7 +93,7 @@ export default class DialogButtons extends React.Component {
 
         let additive = null;
         if (this.props.additive) {
-            additive = <div className="mx_Dialog_buttons_additive">{this.props.additive}</div>;
+            additive = <div className="mx_Dialog_buttons_additive">{ this.props.additive }</div>;
         }
 
         return (
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.tsx
similarity index 57%
rename from src/components/views/elements/DirectorySearchBox.js
rename to src/components/views/elements/DirectorySearchBox.tsx
index 6447bb3cd8..07407af622 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.tsx
@@ -14,71 +14,73 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
+import React, { ChangeEvent, createRef } from 'react';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AccessibleButton from "./AccessibleButton";
+
+interface IProps {
+    className?: string;
+    onChange?: (value: string) => void;
+    onClear?: () => void;
+    onJoinClick?: (value: string) => void;
+    placeholder?: string;
+    showJoinButton?: boolean;
+    initialText?: string;
+}
+
+interface IState {
+    value: string;
+}
 
 @replaceableComponent("views.elements.DirectorySearchBox")
-export default class DirectorySearchBox extends React.Component {
-    constructor(props) {
-        super(props);
-        this._collectInput = this._collectInput.bind(this);
-        this._onClearClick = this._onClearClick.bind(this);
-        this._onChange = this._onChange.bind(this);
-        this._onKeyUp = this._onKeyUp.bind(this);
-        this._onJoinButtonClick = this._onJoinButtonClick.bind(this);
+export default class DirectorySearchBox extends React.Component<IProps, IState> {
+    private input = createRef<HTMLInputElement>();
 
-        this.input = null;
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             value: this.props.initialText || '',
         };
     }
 
-    _collectInput(e) {
-        this.input = e;
-    }
+    private onClearClick = (): void => {
+        this.setState({ value: '' });
 
-    _onClearClick() {
-        this.setState({value: ''});
-
-        if (this.input) {
-            this.input.focus();
+        if (this.input.current) {
+            this.input.current.focus();
 
             if (this.props.onClear) {
                 this.props.onClear();
             }
         }
-    }
+    };
 
-    _onChange(ev) {
-        if (!this.input) return;
-        this.setState({value: ev.target.value});
+    private onChange = (ev: ChangeEvent<HTMLInputElement>): void => {
+        if (!this.input.current) return;
+        this.setState({ value: ev.target.value });
 
         if (this.props.onChange) {
             this.props.onChange(ev.target.value);
         }
-    }
+    };
 
-    _onKeyUp(ev) {
+    private onKeyUp = (ev: React.KeyboardEvent): void => {
         if (ev.key == 'Enter' && this.props.showJoinButton) {
             if (this.props.onJoinClick) {
                 this.props.onJoinClick(this.state.value);
             }
         }
-    }
+    };
 
-    _onJoinButtonClick() {
+    private onJoinButtonClick = (): void => {
         if (this.props.onJoinClick) {
             this.props.onJoinClick(this.state.value);
         }
-    }
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+    };
 
+    public render(): JSX.Element {
         const searchboxClasses = {
             mx_DirectorySearchBox: true,
         };
@@ -87,8 +89,8 @@ export default class DirectorySearchBox extends React.Component {
         let joinButton;
         if (this.props.showJoinButton) {
             joinButton = <AccessibleButton className="mx_DirectorySearchBox_joinButton"
-                onClick={this._onJoinButtonClick}
-            >{_t("Join")}</AccessibleButton>;
+                onClick={this.onJoinButtonClick}
+            >{ _t("Join") }</AccessibleButton>;
         }
 
         return <div className={`mx_DirectorySearchBox ${this.props.className} mx_textinput`}>
@@ -97,24 +99,15 @@ export default class DirectorySearchBox extends React.Component {
                 name="dirsearch"
                 value={this.state.value}
                 className="mx_textinput_icon mx_textinput_search"
-                ref={this._collectInput}
-                onChange={this._onChange}
-                onKeyUp={this._onKeyUp}
+                ref={this.input}
+                onChange={this.onChange}
+                onKeyUp={this.onKeyUp}
                 placeholder={this.props.placeholder}
                 autoFocus
             />
             { joinButton }
-            <AccessibleButton className="mx_DirectorySearchBox_clear" onClick={this._onClearClick} />
+            <AccessibleButton className="mx_DirectorySearchBox_clear" onClick={this.onClearClick} />
         </div>;
     }
 }
 
-DirectorySearchBox.propTypes = {
-    className: PropTypes.string,
-    onChange: PropTypes.func,
-    onClear: PropTypes.func,
-    onJoinClick: PropTypes.func,
-    placeholder: PropTypes.string,
-    showJoinButton: PropTypes.bool,
-    initialText: PropTypes.string,
-};
diff --git a/src/components/views/elements/Draggable.tsx b/src/components/views/elements/Draggable.tsx
index 6032721a48..03dccadcb9 100644
--- a/src/components/views/elements/Draggable.tsx
+++ b/src/components/views/elements/Draggable.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     className: string;
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.tsx
similarity index 65%
rename from src/components/views/elements/Dropdown.js
rename to src/components/views/elements/Dropdown.tsx
index 981c0becc0..86e0822b11 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.tsx
@@ -1,7 +1,6 @@
 /*
-Copyright 2017 Vector Creations Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -16,34 +15,38 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { ChangeEvent, createRef, CSSProperties, ReactElement, ReactNode, Ref } from 'react';
 import classnames from 'classnames';
-import AccessibleButton from './AccessibleButton';
+
+import AccessibleButton, { ButtonEvent } from './AccessibleButton';
 import { _t } from '../../../languageHandler';
-import {Key} from "../../../Keyboard";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Key } from "../../../Keyboard";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-class MenuOption extends React.Component {
-    constructor(props) {
-        super(props);
-        this._onMouseEnter = this._onMouseEnter.bind(this);
-        this._onClick = this._onClick.bind(this);
-    }
+interface IMenuOptionProps {
+    children: ReactElement;
+    highlighted?: boolean;
+    dropdownKey: string;
+    id?: string;
+    inputRef?: Ref<HTMLDivElement>;
+    onClick(dropdownKey: string): void;
+    onMouseEnter(dropdownKey: string): void;
+}
 
+class MenuOption extends React.Component<IMenuOptionProps> {
     static defaultProps = {
         disabled: false,
     };
 
-    _onMouseEnter() {
+    private onMouseEnter = () => {
         this.props.onMouseEnter(this.props.dropdownKey);
-    }
+    };
 
-    _onClick(e) {
+    private onClick = (e: React.MouseEvent) => {
         e.preventDefault();
         e.stopPropagation();
         this.props.onClick(this.props.dropdownKey);
-    }
+    };
 
     render() {
         const optClasses = classnames({
@@ -54,8 +57,8 @@ class MenuOption extends React.Component {
         return <div
             id={this.props.id}
             className={optClasses}
-            onClick={this._onClick}
-            onMouseEnter={this._onMouseEnter}
+            onClick={this.onClick}
+            onMouseEnter={this.onMouseEnter}
             role="option"
             aria-selected={this.props.highlighted}
             ref={this.props.inputRef}
@@ -65,91 +68,97 @@ class MenuOption extends React.Component {
     }
 }
 
-MenuOption.propTypes = {
-    children: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.node),
-      PropTypes.node,
-    ]),
-    highlighted: PropTypes.bool,
-    dropdownKey: PropTypes.string,
-    onClick: PropTypes.func.isRequired,
-    onMouseEnter: PropTypes.func.isRequired,
-    inputRef: PropTypes.any,
-};
+interface IProps {
+    id: string;
+    // ARIA label
+    label: string;
+    value?: string;
+    className?: string;
+    children: ReactElement[];
+    // negative for consistency with HTML
+    disabled?: boolean;
+    // The width that the dropdown should be. If specified,
+    // the dropped-down part of the menu will be set to this
+    // width.
+    menuWidth?: number;
+    searchEnabled?: boolean;
+    // Called when the selected option changes
+    onOptionChange(dropdownKey: string): void;
+    // Called when the value of the search field changes
+    onSearchChange?(query: string): void;
+    // Function that, given the key of an option, returns
+    // a node representing that option to be displayed in the
+    // box itself as the currently-selected option (ie. as
+    // opposed to in the actual dropped-down part). If
+    // unspecified, the appropriate child element is used as
+    // in the dropped-down menu.
+    getShortOption?(value: string): ReactNode;
+}
+
+interface IState {
+    expanded: boolean;
+    highlightedOption: string | null;
+    searchQuery: string;
+}
 
 /*
  * Reusable dropdown select control, akin to react-select,
  * but somewhat simpler as react-select is 79KB of minified
  * javascript.
- *
- * TODO: Port NetworkDropdown to use this.
  */
 @replaceableComponent("views.elements.Dropdown")
-export default class Dropdown extends React.Component {
-    constructor(props) {
+export default class Dropdown extends React.Component<IProps, IState> {
+    private readonly buttonRef = createRef<HTMLDivElement>();
+    private dropdownRootElement: HTMLDivElement = null;
+    private ignoreEvent: MouseEvent = null;
+    private childrenByKey: Record<string, ReactNode> = {};
+
+    constructor(props: IProps) {
         super(props);
 
-        this.dropdownRootElement = null;
-        this.ignoreEvent = null;
+        this.reindexChildren(this.props.children);
 
-        this._onInputClick = this._onInputClick.bind(this);
-        this._onRootClick = this._onRootClick.bind(this);
-        this._onDocumentClick = this._onDocumentClick.bind(this);
-        this._onMenuOptionClick = this._onMenuOptionClick.bind(this);
-        this._onInputChange = this._onInputChange.bind(this);
-        this._collectRoot = this._collectRoot.bind(this);
-        this._collectInputTextBox = this._collectInputTextBox.bind(this);
-        this._setHighlightedOption = this._setHighlightedOption.bind(this);
-
-        this.inputTextBox = null;
-
-        this._reindexChildren(this.props.children);
-
-        const firstChild = React.Children.toArray(props.children)[0];
+        const firstChild = React.Children.toArray(props.children)[0] as ReactElement;
 
         this.state = {
             // True if the menu is dropped-down
             expanded: false,
             // The key of the highlighted option
             // (the option that would become selected if you pressed enter)
-            highlightedOption: firstChild ? firstChild.key : null,
+            highlightedOption: firstChild ? firstChild.key as string : null,
             // the current search query
             searchQuery: '',
         };
-    }
 
-    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
-        this._button = createRef();
         // Listen for all clicks on the document so we can close the
         // menu when the user clicks somewhere else
-        document.addEventListener('click', this._onDocumentClick, false);
+        document.addEventListener('click', this.onDocumentClick, false);
     }
 
     componentWillUnmount() {
-        document.removeEventListener('click', this._onDocumentClick, false);
+        document.removeEventListener('click', this.onDocumentClick, false);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line
         if (!nextProps.children || nextProps.children.length === 0) {
             return;
         }
-        this._reindexChildren(nextProps.children);
+        this.reindexChildren(nextProps.children);
         const firstChild = nextProps.children[0];
         this.setState({
             highlightedOption: firstChild ? firstChild.key : null,
         });
     }
 
-    _reindexChildren(children) {
+    private reindexChildren(children: ReactElement[]): void {
         this.childrenByKey = {};
         React.Children.forEach(children, (child) => {
             this.childrenByKey[child.key] = child;
         });
     }
 
-    _onDocumentClick(ev) {
+    private onDocumentClick = (ev: MouseEvent) => {
         // Close the dropdown if the user clicks anywhere that isn't
         // within our root element
         if (ev !== this.ignoreEvent) {
@@ -157,9 +166,9 @@ export default class Dropdown extends React.Component {
                 expanded: false,
             });
         }
-    }
+    };
 
-    _onRootClick(ev) {
+    private onRootClick = (ev: MouseEvent) => {
         // This captures any clicks that happen within our elements,
         // such that we can then ignore them when they're seen by the
         // click listener on the document handler, ie. not close the
@@ -167,9 +176,17 @@ export default class Dropdown extends React.Component {
         // NB. We can't just stopPropagation() because then the event
         // doesn't reach the React onClick().
         this.ignoreEvent = ev;
-    }
+    };
 
-    _onInputClick(ev) {
+    private onChevronClick = (ev: React.MouseEvent) => {
+        if (this.state.expanded) {
+            this.setState({ expanded: false });
+            ev.stopPropagation();
+            ev.preventDefault();
+        }
+    };
+
+    private onAccessibleButtonClick = (ev: ButtonEvent) => {
         if (this.props.disabled) return;
 
         if (!this.state.expanded) {
@@ -177,25 +194,29 @@ export default class Dropdown extends React.Component {
                 expanded: true,
             });
             ev.preventDefault();
+        } else if ((ev as React.KeyboardEvent).key === Key.ENTER) {
+            // the accessible button consumes enter onKeyDown for firing onClick, so handle it here
+            this.props.onOptionChange(this.state.highlightedOption);
+            this.close();
         }
-    }
+    };
 
-    _close() {
+    private close() {
         this.setState({
             expanded: false,
         });
         // their focus was on the input, its getting unmounted, move it to the button
-        if (this._button.current) {
-            this._button.current.focus();
+        if (this.buttonRef.current) {
+            this.buttonRef.current.focus();
         }
     }
 
-    _onMenuOptionClick(dropdownKey) {
-        this._close();
+    private onMenuOptionClick = (dropdownKey: string) => {
+        this.close();
         this.props.onOptionChange(dropdownKey);
-    }
+    };
 
-    _onInputKeyDown = (e) => {
+    private onKeyDown = (e: React.KeyboardEvent) => {
         let handled = true;
 
         // These keys don't generate keypress events and so needs to be on keyup
@@ -204,16 +225,16 @@ export default class Dropdown extends React.Component {
                 this.props.onOptionChange(this.state.highlightedOption);
                 // fallthrough
             case Key.ESCAPE:
-                this._close();
+                this.close();
                 break;
             case Key.ARROW_DOWN:
                 this.setState({
-                    highlightedOption: this._nextOption(this.state.highlightedOption),
+                    highlightedOption: this.nextOption(this.state.highlightedOption),
                 });
                 break;
             case Key.ARROW_UP:
                 this.setState({
-                    highlightedOption: this._prevOption(this.state.highlightedOption),
+                    highlightedOption: this.prevOption(this.state.highlightedOption),
                 });
                 break;
             default:
@@ -224,53 +245,46 @@ export default class Dropdown extends React.Component {
             e.preventDefault();
             e.stopPropagation();
         }
-    }
+    };
 
-    _onInputChange(e) {
+    private onInputChange = (e: ChangeEvent<HTMLInputElement>) => {
         this.setState({
-            searchQuery: e.target.value,
+            searchQuery: e.currentTarget.value,
         });
         if (this.props.onSearchChange) {
-            this.props.onSearchChange(e.target.value);
+            this.props.onSearchChange(e.currentTarget.value);
         }
-    }
+    };
 
-    _collectRoot(e) {
+    private collectRoot = (e: HTMLDivElement) => {
         if (this.dropdownRootElement) {
-            this.dropdownRootElement.removeEventListener(
-                'click', this._onRootClick, false,
-            );
+            this.dropdownRootElement.removeEventListener('click', this.onRootClick, false);
         }
         if (e) {
-            e.addEventListener('click', this._onRootClick, false);
+            e.addEventListener('click', this.onRootClick, false);
         }
         this.dropdownRootElement = e;
-    }
+    };
 
-    _collectInputTextBox(e) {
-        this.inputTextBox = e;
-        if (e) e.focus();
-    }
-
-    _setHighlightedOption(optionKey) {
+    private setHighlightedOption = (optionKey: string) => {
         this.setState({
             highlightedOption: optionKey,
         });
-    }
+    };
 
-    _nextOption(optionKey) {
+    private nextOption(optionKey: string): string {
         const keys = Object.keys(this.childrenByKey);
         const index = keys.indexOf(optionKey);
         return keys[(index + 1) % keys.length];
     }
 
-    _prevOption(optionKey) {
+    private prevOption(optionKey: string): string {
         const keys = Object.keys(this.childrenByKey);
         const index = keys.indexOf(optionKey);
-        return keys[(index - 1) % keys.length];
+        return keys[index <= 0 ? keys.length - 1 : (index - 1) % keys.length];
     }
 
-    _scrollIntoView(node) {
+    private scrollIntoView(node: Element) {
         if (node) {
             node.scrollIntoView({
                 block: "nearest",
@@ -279,18 +293,18 @@ export default class Dropdown extends React.Component {
         }
     }
 
-    _getMenuOptions() {
+    private getMenuOptions() {
         const options = React.Children.map(this.props.children, (child) => {
             const highlighted = this.state.highlightedOption === child.key;
             return (
                 <MenuOption
                     id={`${this.props.id}__${child.key}`}
                     key={child.key}
-                    dropdownKey={child.key}
+                    dropdownKey={child.key as string}
                     highlighted={highlighted}
-                    onMouseEnter={this._setHighlightedOption}
-                    onClick={this._onMenuOptionClick}
-                    inputRef={highlighted ? this._scrollIntoView : undefined}
+                    onMouseEnter={this.setHighlightedOption}
+                    onClick={this.onMenuOptionClick}
+                    inputRef={highlighted ? this.scrollIntoView : undefined}
                 >
                     { child }
                 </MenuOption>
@@ -307,7 +321,7 @@ export default class Dropdown extends React.Component {
     render() {
         let currentValue;
 
-        const menuStyle = {};
+        const menuStyle: CSSProperties = {};
         if (this.props.menuWidth) menuStyle.width = this.props.menuWidth;
 
         let menu;
@@ -316,10 +330,9 @@ export default class Dropdown extends React.Component {
                 currentValue = (
                     <input
                         type="text"
+                        autoFocus={true}
                         className="mx_Dropdown_option"
-                        ref={this._collectInputTextBox}
-                        onKeyDown={this._onInputKeyDown}
-                        onChange={this._onInputChange}
+                        onChange={this.onInputChange}
                         value={this.state.searchQuery}
                         role="combobox"
                         aria-autocomplete="list"
@@ -327,12 +340,13 @@ export default class Dropdown extends React.Component {
                         aria-owns={`${this.props.id}_listbox`}
                         aria-disabled={this.props.disabled}
                         aria-label={this.props.label}
+                        onKeyDown={this.onKeyDown}
                     />
                 );
             }
             menu = (
                 <div className="mx_Dropdown_menu" style={menuStyle} role="listbox" id={`${this.props.id}_listbox`}>
-                    { this._getMenuOptions() }
+                    { this.getMenuOptions() }
                 </div>
             );
         }
@@ -356,46 +370,22 @@ export default class Dropdown extends React.Component {
 
         // Note the menu sits inside the AccessibleButton div so it's anchored
         // to the input, but overflows below it. The root contains both.
-        return <div className={classnames(dropdownClasses)} ref={this._collectRoot}>
+        return <div className={classnames(dropdownClasses)} ref={this.collectRoot}>
             <AccessibleButton
                 className="mx_Dropdown_input mx_no_textinput"
-                onClick={this._onInputClick}
+                onClick={this.onAccessibleButtonClick}
                 aria-haspopup="listbox"
                 aria-expanded={this.state.expanded}
                 disabled={this.props.disabled}
-                inputRef={this._button}
+                inputRef={this.buttonRef}
                 aria-label={this.props.label}
                 aria-describedby={`${this.props.id}_value`}
+                onKeyDown={this.onKeyDown}
             >
                 { currentValue }
-                <span className="mx_Dropdown_arrow" />
+                <span onClick={this.onChevronClick} className="mx_Dropdown_arrow" />
                 { menu }
             </AccessibleButton>
         </div>;
     }
 }
-
-Dropdown.propTypes = {
-    id: PropTypes.string.isRequired,
-    // The width that the dropdown should be. If specified,
-    // the dropped-down part of the menu will be set to this
-    // width.
-    menuWidth: PropTypes.number,
-    // Called when the selected option changes
-    onOptionChange: PropTypes.func.isRequired,
-    // Called when the value of the search field changes
-    onSearchChange: PropTypes.func,
-    searchEnabled: PropTypes.bool,
-    // Function that, given the key of an option, returns
-    // a node representing that option to be displayed in the
-    // box itself as the currently-selected option (ie. as
-    // opposed to in the actual dropped-down part). If
-    // unspecified, the appropriate child element is used as
-    // in the dropped-down menu.
-    getShortOption: PropTypes.func,
-    value: PropTypes.string,
-    // negative for consistency with HTML
-    disabled: PropTypes.bool,
-    // ARIA label
-    label: PropTypes.string.isRequired,
-};
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
deleted file mode 100644
index d8ec5af278..0000000000
--- a/src/components/views/elements/EditableItemList.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-Copyright 2017, 2019 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from '../../../languageHandler';
-import Field from "./Field";
-import AccessibleButton from "./AccessibleButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-
-export class EditableItem extends React.Component {
-    static propTypes = {
-        index: PropTypes.number,
-        value: PropTypes.string,
-        onRemove: PropTypes.func,
-    };
-
-    constructor() {
-        super();
-
-        this.state = {
-            verifyRemove: false,
-        };
-    }
-
-    _onRemove = (e) => {
-        e.stopPropagation();
-        e.preventDefault();
-
-        this.setState({verifyRemove: true});
-    };
-
-    _onDontRemove = (e) => {
-        e.stopPropagation();
-        e.preventDefault();
-
-        this.setState({verifyRemove: false});
-    };
-
-    _onActuallyRemove = (e) => {
-        e.stopPropagation();
-        e.preventDefault();
-
-        if (this.props.onRemove) this.props.onRemove(this.props.index);
-        this.setState({verifyRemove: false});
-    };
-
-    render() {
-        if (this.state.verifyRemove) {
-            return (
-                <div className="mx_EditableItem">
-                    <span className="mx_EditableItem_promptText">
-                        {_t("Are you sure?")}
-                    </span>
-                    <AccessibleButton
-                        onClick={this._onActuallyRemove}
-                        kind="primary_sm"
-                        className="mx_EditableItem_confirmBtn"
-                    >
-                        {_t("Yes")}
-                    </AccessibleButton>
-                    <AccessibleButton
-                        onClick={this._onDontRemove}
-                        kind="danger_sm"
-                        className="mx_EditableItem_confirmBtn"
-                    >
-                        {_t("No")}
-                    </AccessibleButton>
-                </div>
-            );
-        }
-
-        return (
-            <div className="mx_EditableItem">
-                <div onClick={this._onRemove} className="mx_EditableItem_delete" title={_t("Remove")} role="button" />
-                <span className="mx_EditableItem_item">{this.props.value}</span>
-            </div>
-        );
-    }
-}
-
-@replaceableComponent("views.elements.EditableItemList")
-export default class EditableItemList extends React.Component {
-    static propTypes = {
-        id: PropTypes.string.isRequired,
-        items: PropTypes.arrayOf(PropTypes.string).isRequired,
-        itemsLabel: PropTypes.string,
-        noItemsLabel: PropTypes.string,
-        placeholder: PropTypes.string,
-        newItem: PropTypes.string,
-
-        onItemAdded: PropTypes.func,
-        onItemRemoved: PropTypes.func,
-        onNewItemChanged: PropTypes.func,
-
-        canEdit: PropTypes.bool,
-        canRemove: PropTypes.bool,
-    };
-
-    _onItemAdded = (e) => {
-        e.stopPropagation();
-        e.preventDefault();
-
-        if (this.props.onItemAdded) this.props.onItemAdded(this.props.newItem);
-    };
-
-    _onItemRemoved = (index) => {
-        if (this.props.onItemRemoved) this.props.onItemRemoved(index);
-    };
-
-    _onNewItemChanged = (e) => {
-        if (this.props.onNewItemChanged) this.props.onNewItemChanged(e.target.value);
-    };
-
-    _renderNewItemField() {
-        return (
-            <form
-                onSubmit={this._onItemAdded}
-                autoComplete="off"
-                noValidate={true}
-                className="mx_EditableItemList_newItem"
-            >
-                <Field label={this.props.placeholder} type="text"
-                    autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged}
-                    list={this.props.suggestionsListId} />
-                <AccessibleButton onClick={this._onItemAdded} kind="primary" type="submit" disabled={!this.props.newItem}>
-                    {_t("Add")}
-                </AccessibleButton>
-            </form>
-        );
-    }
-
-    render() {
-        const editableItems = this.props.items.map((item, index) => {
-            if (!this.props.canRemove) {
-                return <li key={item}>{item}</li>;
-            }
-
-            return <EditableItem
-                key={item}
-                index={index}
-                value={item}
-                onRemove={this._onItemRemoved}
-            />;
-        });
-
-        const editableItemsSection = this.props.canRemove ? editableItems : <ul>{editableItems}</ul>;
-        const label = this.props.items.length > 0 ? this.props.itemsLabel : this.props.noItemsLabel;
-
-        return (<div className="mx_EditableItemList">
-            <div className="mx_EditableItemList_label">
-                { label }
-            </div>
-            { editableItemsSection }
-            { this.props.canEdit ? this._renderNewItemField() : <div /> }
-        </div>);
-    }
-}
diff --git a/src/components/views/elements/EditableItemList.tsx b/src/components/views/elements/EditableItemList.tsx
new file mode 100644
index 0000000000..5d6e24ab27
--- /dev/null
+++ b/src/components/views/elements/EditableItemList.tsx
@@ -0,0 +1,182 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+
+import { _t } from '../../../languageHandler';
+import Field from "./Field";
+import AccessibleButton from "./AccessibleButton";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IItemProps {
+    index?: number;
+    value?: string;
+    onRemove?(index: number): void;
+}
+
+interface IItemState {
+    verifyRemove: boolean;
+}
+
+export class EditableItem extends React.Component<IItemProps, IItemState> {
+    public state = {
+        verifyRemove: false,
+    };
+
+    private onRemove = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        this.setState({ verifyRemove: true });
+    };
+
+    private onDontRemove = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        this.setState({ verifyRemove: false });
+    };
+
+    private onActuallyRemove = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        if (this.props.onRemove) this.props.onRemove(this.props.index);
+        this.setState({ verifyRemove: false });
+    };
+
+    render() {
+        if (this.state.verifyRemove) {
+            return (
+                <div className="mx_EditableItem">
+                    <span className="mx_EditableItem_promptText">
+                        { _t("Are you sure?") }
+                    </span>
+                    <AccessibleButton
+                        onClick={this.onActuallyRemove}
+                        kind="primary_sm"
+                        className="mx_EditableItem_confirmBtn"
+                    >
+                        { _t("Yes") }
+                    </AccessibleButton>
+                    <AccessibleButton
+                        onClick={this.onDontRemove}
+                        kind="danger_sm"
+                        className="mx_EditableItem_confirmBtn"
+                    >
+                        { _t("No") }
+                    </AccessibleButton>
+                </div>
+            );
+        }
+
+        return (
+            <div className="mx_EditableItem">
+                <div onClick={this.onRemove} className="mx_EditableItem_delete" title={_t("Remove")} role="button" />
+                <span className="mx_EditableItem_item">{ this.props.value }</span>
+            </div>
+        );
+    }
+}
+
+interface IProps {
+    id: string;
+    items: string[];
+    itemsLabel?: string;
+    noItemsLabel?: string;
+    placeholder?: string;
+    newItem?: string;
+    canEdit?: boolean;
+    canRemove?: boolean;
+    suggestionsListId?: string;
+    onItemAdded?(item: string): void;
+    onItemRemoved?(index: number): void;
+    onNewItemChanged?(item: string): void;
+}
+
+@replaceableComponent("views.elements.EditableItemList")
+export default class EditableItemList<P = {}> extends React.PureComponent<IProps & P> {
+    protected onItemAdded = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        if (this.props.onItemAdded) this.props.onItemAdded(this.props.newItem);
+    };
+
+    protected onItemRemoved = (index) => {
+        if (this.props.onItemRemoved) this.props.onItemRemoved(index);
+    };
+
+    protected onNewItemChanged = (e) => {
+        if (this.props.onNewItemChanged) this.props.onNewItemChanged(e.target.value);
+    };
+
+    protected renderNewItemField() {
+        return (
+            <form
+                onSubmit={this.onItemAdded}
+                autoComplete="off"
+                noValidate={true}
+                className="mx_EditableItemList_newItem"
+            >
+                <Field
+                    label={this.props.placeholder}
+                    type="text"
+                    autoComplete="off"
+                    value={this.props.newItem || ""}
+                    onChange={this.onNewItemChanged}
+                    list={this.props.suggestionsListId}
+                />
+                <AccessibleButton
+                    onClick={this.onItemAdded}
+                    kind="primary"
+                    type="submit"
+                    disabled={!this.props.newItem}
+                >
+                    { _t("Add") }
+                </AccessibleButton>
+            </form>
+        );
+    }
+
+    render() {
+        const editableItems = this.props.items.map((item, index) => {
+            if (!this.props.canRemove) {
+                return <li key={item}>{ item }</li>;
+            }
+
+            return <EditableItem
+                key={item}
+                index={index}
+                value={item}
+                onRemove={this.onItemRemoved}
+            />;
+        });
+
+        const editableItemsSection = this.props.canRemove ? editableItems : <ul>{ editableItems }</ul>;
+        const label = this.props.items.length > 0 ? this.props.itemsLabel : this.props.noItemsLabel;
+
+        return (
+            <div className="mx_EditableItemList">
+                <div className="mx_EditableItemList_label">
+                    { label }
+                </div>
+                { editableItemsSection }
+                { this.props.canEdit ? this.renderNewItemField() : <div /> }
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.tsx
similarity index 59%
rename from src/components/views/elements/EditableText.js
rename to src/components/views/elements/EditableText.tsx
index 7c38ac1777..b3ff8ee245 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.tsx
@@ -15,34 +15,43 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {Key} from "../../../Keyboard";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import React, { createRef } from 'react';
+import { Key } from "../../../Keyboard";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+enum Phases {
+    Display = "display",
+    Edit = "edit",
+}
+
+interface IProps {
+    onValueChanged?: (value: string, shouldSubmit: boolean) => void;
+    initialValue?: string;
+    label?: string;
+    placeholder?: string;
+    className?: string;
+    labelClassName?: string;
+    placeholderClassName?: string;
+    // Overrides blurToSubmit if true
+    blurToCancel?: boolean;
+    // Will cause onValueChanged(value, true) to fire on blur
+    blurToSubmit?: boolean;
+    editable?: boolean;
+}
+
+interface IState {
+    phase: Phases;
+}
 
 @replaceableComponent("views.elements.EditableText")
-export default class EditableText extends React.Component {
-    static propTypes = {
-        onValueChanged: PropTypes.func,
-        initialValue: PropTypes.string,
-        label: PropTypes.string,
-        placeholder: PropTypes.string,
-        className: PropTypes.string,
-        labelClassName: PropTypes.string,
-        placeholderClassName: PropTypes.string,
-        // Overrides blurToSubmit if true
-        blurToCancel: PropTypes.bool,
-        // Will cause onValueChanged(value, true) to fire on blur
-        blurToSubmit: PropTypes.bool,
-        editable: PropTypes.bool,
-    };
+export default class EditableText extends React.Component<IProps, IState> {
+    // we track value as an JS object field rather than in React state
+    // as React doesn't play nice with contentEditable.
+    public value = '';
+    private placeholder = false;
+    private editableDiv = createRef<HTMLDivElement>();
 
-    static Phases = {
-        Display: "display",
-        Edit: "edit",
-    };
-
-    static defaultProps = {
+    public static defaultProps: Partial<IProps> = {
         onValueChanged() {},
         initialValue: '',
         label: '',
@@ -53,81 +62,61 @@ export default class EditableText extends React.Component {
         blurToSubmit: false,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
-        // we track value as an JS object field rather than in React state
-        // as React doesn't play nice with contentEditable.
-        this.value = '';
-        this.placeholder = false;
-
-        this._editable_div = createRef();
+        this.state = {
+            phase: Phases.Display,
+        };
     }
 
-    state = {
-        phase: EditableText.Phases.Display,
-    };
-
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(nextProps) {
+    // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+    public UNSAFE_componentWillReceiveProps(nextProps: IProps): void {
         if (nextProps.initialValue !== this.props.initialValue) {
             this.value = nextProps.initialValue;
-            if (this._editable_div.current) {
+            if (this.editableDiv.current) {
                 this.showPlaceholder(!this.value);
             }
         }
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         this.value = this.props.initialValue;
-        if (this._editable_div.current) {
+        if (this.editableDiv.current) {
             this.showPlaceholder(!this.value);
         }
     }
 
-    showPlaceholder = show => {
+    private showPlaceholder = (show: boolean): void => {
         if (show) {
-            this._editable_div.current.textContent = this.props.placeholder;
-            this._editable_div.current.setAttribute("class", this.props.className
+            this.editableDiv.current.textContent = this.props.placeholder;
+            this.editableDiv.current.setAttribute("class", this.props.className
                 + " " + this.props.placeholderClassName);
             this.placeholder = true;
             this.value = '';
         } else {
-            this._editable_div.current.textContent = this.value;
-            this._editable_div.current.setAttribute("class", this.props.className);
+            this.editableDiv.current.textContent = this.value;
+            this.editableDiv.current.setAttribute("class", this.props.className);
             this.placeholder = false;
         }
     };
 
-    getValue = () => this.value;
-
-    setValue = value => {
-        this.value = value;
-        this.showPlaceholder(!this.value);
-    };
-
-    edit = () => {
+    private cancelEdit = (): void => {
         this.setState({
-            phase: EditableText.Phases.Edit,
-        });
-    };
-
-    cancelEdit = () => {
-        this.setState({
-            phase: EditableText.Phases.Display,
+            phase: Phases.Display,
         });
         this.value = this.props.initialValue;
         this.showPlaceholder(!this.value);
         this.onValueChanged(false);
-        this._editable_div.current.blur();
+        this.editableDiv.current.blur();
     };
 
-    onValueChanged = shouldSubmit => {
+    private onValueChanged = (shouldSubmit: boolean): void => {
         this.props.onValueChanged(this.value, shouldSubmit);
     };
 
-    onKeyDown = ev => {
+    private onKeyDown = (ev: React.KeyboardEvent<HTMLDivElement>): void => {
         // console.log("keyDown: textContent=" + ev.target.textContent + ", value=" + this.value + ", placeholder=" + this.placeholder);
 
         if (this.placeholder) {
@@ -142,13 +131,13 @@ export default class EditableText extends React.Component {
         // console.log("keyDown: textContent=" + ev.target.textContent + ", value=" + this.value + ", placeholder=" + this.placeholder);
     };
 
-    onKeyUp = ev => {
+    private onKeyUp = (ev: React.KeyboardEvent<HTMLDivElement>): void => {
         // console.log("keyUp: textContent=" + ev.target.textContent + ", value=" + this.value + ", placeholder=" + this.placeholder);
 
-        if (!ev.target.textContent) {
+        if (!(ev.target as HTMLDivElement).textContent) {
             this.showPlaceholder(true);
         } else if (!this.placeholder) {
-            this.value = ev.target.textContent;
+            this.value = (ev.target as HTMLDivElement).textContent;
         }
 
         if (ev.key === Key.ENTER) {
@@ -160,22 +149,22 @@ export default class EditableText extends React.Component {
         // console.log("keyUp: textContent=" + ev.target.textContent + ", value=" + this.value + ", placeholder=" + this.placeholder);
     };
 
-    onClickDiv = ev => {
+    private onClickDiv = (): void => {
         if (!this.props.editable) return;
 
         this.setState({
-            phase: EditableText.Phases.Edit,
+            phase: Phases.Edit,
         });
     };
 
-    onFocus = ev => {
+    private onFocus = (ev: React.FocusEvent<HTMLDivElement>): void => {
         //ev.target.setSelectionRange(0, ev.target.textContent.length);
 
         const node = ev.target.childNodes[0];
         if (node) {
             const range = document.createRange();
             range.setStart(node, 0);
-            range.setEnd(node, node.length);
+            range.setEnd(node, ev.target.childNodes.length);
 
             const sel = window.getSelection();
             sel.removeAllRanges();
@@ -183,11 +172,15 @@ export default class EditableText extends React.Component {
         }
     };
 
-    onFinish = (ev, shouldSubmit) => {
+    private onFinish = (
+        ev: React.KeyboardEvent<HTMLDivElement> | React.FocusEvent<HTMLDivElement>,
+        shouldSubmit?: boolean,
+    ): void => {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
-        const submit = (ev.key === Key.ENTER) || shouldSubmit;
+        const submit = ("key" in ev && ev.key === Key.ENTER) || shouldSubmit;
         this.setState({
-            phase: EditableText.Phases.Display,
+            phase: Phases.Display,
         }, () => {
             if (this.value !== this.props.initialValue) {
                 self.onValueChanged(submit);
@@ -195,7 +188,7 @@ export default class EditableText extends React.Component {
         });
     };
 
-    onBlur = ev => {
+    private onBlur = (ev: React.FocusEvent<HTMLDivElement>): void => {
         const sel = window.getSelection();
         sel.removeAllRanges();
 
@@ -208,11 +201,11 @@ export default class EditableText extends React.Component {
         this.showPlaceholder(!this.value);
     };
 
-    render() {
-        const {className, editable, initialValue, label, labelClassName} = this.props;
+    public render(): JSX.Element {
+        const { className, editable, initialValue, label, labelClassName } = this.props;
         let editableEl;
 
-        if (!editable || (this.state.phase === EditableText.Phases.Display &&
+        if (!editable || (this.state.phase === Phases.Display &&
             (label || labelClassName) && !this.value)
         ) {
             // show the label
@@ -222,7 +215,7 @@ export default class EditableText extends React.Component {
         } else {
             // show the content editable div, but manually manage its contents as react and contentEditable don't play nice together
             editableEl = <div
-                ref={this._editable_div}
+                ref={this.editableDiv}
                 contentEditable={true}
                 className={className}
                 onKeyDown={this.onKeyDown}
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.tsx
similarity index 60%
rename from src/components/views/elements/EditableTextContainer.js
rename to src/components/views/elements/EditableTextContainer.tsx
index e925220089..b4689b90db 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.tsx
@@ -15,9 +15,34 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from "./Spinner";
+import EditableText from "./EditableText";
+
+interface IProps {
+    /* callback to retrieve the initial value. */
+    getInitialValue?: () => Promise<string>;
+
+    /* initial value; used if getInitialValue is not given */
+    initialValue?: string;
+
+    /* placeholder text to use when the value is empty (and not being
+     * edited) */
+    placeholder?: string;
+
+    /* callback to update the value. Called with a single argument: the new
+     * value. */
+    onSubmit?: (value: string) => Promise<{} | void>;
+
+    /* should the input submit when focus is lost? */
+    blurToSubmit?: boolean;
+}
+
+interface IState {
+    busy: boolean;
+    errorString: string;
+    value: string;
+}
 
 /**
  * A component which wraps an EditableText, with a spinner while updates take
@@ -31,50 +56,51 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
  * taken from the 'initialValue' property.
  */
 @replaceableComponent("views.elements.EditableTextContainer")
-export default class EditableTextContainer extends React.Component {
-    constructor(props) {
+export default class EditableTextContainer extends React.Component<IProps, IState> {
+    private unmounted = false;
+    public static defaultProps: Partial<IProps> = {
+        initialValue: "",
+        placeholder: "",
+        blurToSubmit: false,
+        onSubmit: () => { return Promise.resolve(); },
+    };
+
+    constructor(props: IProps) {
         super(props);
 
-        this._unmounted = false;
         this.state = {
             busy: false,
             errorString: null,
             value: props.initialValue,
         };
-        this._onValueChanged = this._onValueChanged.bind(this);
     }
 
-    componentDidMount() {
-        if (this.props.getInitialValue === undefined) {
-            // use whatever was given in the initialValue property.
-            return;
+    public async componentDidMount(): Promise<void> {
+        // use whatever was given in the initialValue property.
+        if (this.props.getInitialValue === undefined) return;
+
+        this.setState({ busy: true });
+        try {
+            const initialValue = await this.props.getInitialValue();
+            if (this.unmounted) return;
+            this.setState({
+                busy: false,
+                value: initialValue,
+            });
+        } catch (error) {
+            if (this.unmounted) return;
+            this.setState({
+                errorString: error.toString(),
+                busy: false,
+            });
         }
-
-        this.setState({busy: true});
-
-        this.props.getInitialValue().then(
-            (result) => {
-                if (this._unmounted) { return; }
-                this.setState({
-                    busy: false,
-                    value: result,
-                });
-            },
-            (error) => {
-                if (this._unmounted) { return; }
-                this.setState({
-                    errorString: error.toString(),
-                    busy: false,
-                });
-            },
-        );
     }
 
-    componentWillUnmount() {
-        this._unmounted = true;
+    public componentWillUnmount(): void {
+        this.unmounted = true;
     }
 
-    _onValueChanged(value, shouldSubmit) {
+    private onValueChanged = (value: string, shouldSubmit: boolean): void => {
         if (!shouldSubmit) {
             return;
         }
@@ -86,38 +112,36 @@ export default class EditableTextContainer extends React.Component {
 
         this.props.onSubmit(value).then(
             () => {
-                if (this._unmounted) { return; }
+                if (this.unmounted) { return; }
                 this.setState({
                     busy: false,
                     value: value,
                 });
             },
             (error) => {
-                if (this._unmounted) { return; }
+                if (this.unmounted) { return; }
                 this.setState({
                     errorString: error.toString(),
                     busy: false,
                 });
             },
         );
-    }
+    };
 
-    render() {
+    public render(): JSX.Element {
         if (this.state.busy) {
-            const Loader = sdk.getComponent("elements.Spinner");
             return (
-                <Loader />
+                <Spinner />
             );
         } else if (this.state.errorString) {
             return (
                 <div className="error">{ this.state.errorString }</div>
             );
         } else {
-            const EditableText = sdk.getComponent('elements.EditableText');
             return (
                 <EditableText initialValue={this.state.value}
                     placeholder={this.props.placeholder}
-                    onValueChanged={this._onValueChanged}
+                    onValueChanged={this.onValueChanged}
                     blurToSubmit={this.props.blurToSubmit}
                 />
             );
@@ -125,29 +149,3 @@ export default class EditableTextContainer extends React.Component {
     }
 }
 
-EditableTextContainer.propTypes = {
-    /* callback to retrieve the initial value. */
-    getInitialValue: PropTypes.func,
-
-    /* initial value; used if getInitialValue is not given */
-    initialValue: PropTypes.string,
-
-    /* placeholder text to use when the value is empty (and not being
-     * edited) */
-    placeholder: PropTypes.string,
-
-    /* callback to update the value. Called with a single argument: the new
-     * value. */
-    onSubmit: PropTypes.func,
-
-    /* should the input submit when focus is lost? */
-    blurToSubmit: PropTypes.bool,
-};
-
-
-EditableTextContainer.defaultProps = {
-    initialValue: "",
-    placeholder: "",
-    blurToSubmit: false,
-    onSubmit: function(v) {return Promise.resolve(); },
-};
diff --git a/src/components/views/elements/EffectsOverlay.tsx b/src/components/views/elements/EffectsOverlay.tsx
index 00d9d147f1..9e6833696f 100644
--- a/src/components/views/elements/EffectsOverlay.tsx
+++ b/src/components/views/elements/EffectsOverlay.tsx
@@ -17,7 +17,7 @@
 import React, { FunctionComponent, useEffect, useRef } from 'react';
 import dis from '../../../dispatcher/dispatcher';
 import ICanvasEffect from '../../../effects/ICanvasEffect';
-import { CHAT_EFFECTS } from '../../../effects'
+import { CHAT_EFFECTS } from '../../../effects';
 import UIStore, { UI_EVENTS } from "../../../stores/UIStore";
 
 interface IProps {
@@ -32,7 +32,7 @@ const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {
         if (!name) return null;
         let effect: ICanvasEffect | null = effectsRef.current[name] || null;
         if (effect === null) {
-            const options = CHAT_EFFECTS.find((e) => e.command === name)?.options
+            const options = CHAT_EFFECTS.find((e) => e.command === name)?.options;
             try {
                 const { default: Effect } = await import(`../../../effects/${name}`);
                 effect = new Effect(options);
@@ -56,7 +56,7 @@ const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {
                 const effect = payload.action.substr(actionPrefix.length);
                 lazyLoadEffectModule(effect).then((module) => module?.start(canvasRef.current));
             }
-        }
+        };
         const dispatcherRef = dis.register(onAction);
         const canvas = canvasRef.current;
         canvas.height = UIStore.instance.windowHeight;
@@ -89,7 +89,7 @@ const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {
                 right: 0,
             }}
         />
-    )
-}
+    );
+};
 
 export default EffectsOverlay;
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.tsx
similarity index 68%
rename from src/components/views/elements/ErrorBoundary.js
rename to src/components/views/elements/ErrorBoundary.tsx
index 9037287f49..50ea7d9a56 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,21 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import * as sdk from '../../../index';
+import React, { ErrorInfo } from 'react';
+
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BugReportDialog from '../dialogs/BugReportDialog';
+import AccessibleButton from './AccessibleButton';
+
+interface IState {
+    error: Error;
+}
 
 /**
  * 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 {
+export default class ErrorBoundary extends React.PureComponent<{}, IState> {
     constructor(props) {
         super(props);
 
@@ -37,13 +43,13 @@ export default class ErrorBoundary extends React.PureComponent {
         };
     }
 
-    static getDerivedStateFromError(error) {
+    static getDerivedStateFromError(error: Error): Partial<IState> {
         // Side effects are not permitted here, so we only update the state so
         // that the next render shows an error message.
         return { error };
     }
 
-    componentDidCatch(error, { componentStack }) {
+    componentDidCatch(error: Error, { componentStack }: ErrorInfo): void {
         // Browser consoles are better at formatting output when native errors are passed
         // in their own `console.error` invocation.
         console.error(error);
@@ -53,7 +59,7 @@ export default class ErrorBoundary extends React.PureComponent {
         );
     }
 
-    _onClearCacheAndReload = () => {
+    private onClearCacheAndReload = (): void => {
         if (!PlatformPeg.get()) return;
 
         MatrixClientPeg.get().stopClient();
@@ -62,51 +68,48 @@ export default class ErrorBoundary extends React.PureComponent {
         });
     };
 
-    _onBugReport = () => {
-        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
-        if (!BugReportDialog) {
-            return;
-        }
+    private onBugReport = (): void => {
         Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {
             label: 'react-soft-crash',
+            error: this.state.error,
         });
     };
 
     render() {
         if (this.state.error) {
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
+            const newIssueUrl = "https://github.com/vector-im/element-web/issues/new/choose";
 
             let bugReportSection;
             if (SdkConfig.get().bug_report_endpoint_url) {
                 bugReportSection = <React.Fragment>
-                    <p>{_t(
+                    <p>{ _t(
                         "Please <newIssueLink>create a new issue</newIssueLink> " +
                         "on GitHub so that we can investigate this bug.", {}, {
                             newIssueLink: (sub) => {
                                 return <a target="_blank" rel="noreferrer noopener" href={newIssueUrl}>{ sub }</a>;
                             },
                         },
-                    )}</p>
-                    <p>{_t(
+                    ) }</p>
+                    <p>{ _t(
                         "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.",
-                    )}</p>
-                    <AccessibleButton onClick={this._onBugReport} kind='primary'>
-                        {_t("Submit debug logs")}
+                        "the rooms or groups you have visited, which UI elements you " +
+                        "last interacted with, and the usernames of other users. " +
+                        "They do not contain messages.",
+                    ) }</p>
+                    <AccessibleButton onClick={this.onBugReport} kind='primary'>
+                        { _t("Submit debug logs") }
                     </AccessibleButton>
                 </React.Fragment>;
             }
 
             return <div className="mx_ErrorBoundary">
                 <div className="mx_ErrorBoundary_body">
-                    <h1>{_t("Something went wrong!")}</h1>
+                    <h1>{ _t("Something went wrong!") }</h1>
                     { bugReportSection }
-                    <AccessibleButton onClick={this._onClearCacheAndReload} kind='danger'>
-                        {_t("Clear cache and reload")}
+                    <AccessibleButton onClick={this.onClearCacheAndReload} kind='danger'>
+                        { _t("Clear cache and reload") }
                     </AccessibleButton>
                 </div>
             </div>;
diff --git a/src/components/views/elements/EventListSummary.tsx b/src/components/views/elements/EventListSummary.tsx
index 1d3b6e8764..cbb0e17b42 100644
--- a/src/components/views/elements/EventListSummary.tsx
+++ b/src/components/views/elements/EventListSummary.tsx
@@ -14,14 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactChildren, useEffect} from 'react';
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import React, { ReactNode, useEffect } from 'react';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
 import MemberAvatar from '../avatars/MemberAvatar';
 import { _t } from '../../../languageHandler';
-import {useStateToggle} from "../../../hooks/useStateToggle";
+import { useStateToggle } from "../../../hooks/useStateToggle";
 import AccessibleButton from "./AccessibleButton";
+import { Layout } from '../../../settings/Layout';
 
 interface IProps {
     // An array of member events to summarise
@@ -29,15 +30,17 @@ interface IProps {
     // The minimum number of events needed to trigger summarisation
     threshold?: number;
     // Whether or not to begin with state.expanded=true
-    startExpanded?: boolean,
+    startExpanded?: boolean;
     // The list of room members for which to show avatars next to the summary
-    summaryMembers?: RoomMember[],
+    summaryMembers?: RoomMember[];
     // The text to show as the summary of this event list
-    summaryText?: string,
+    summaryText?: string | JSX.Element;
     // An array of EventTiles to render when expanded
-    children: ReactChildren,
+    children: ReactNode[];
     // Called when the event list expansion is toggled
     onToggle?(): void;
+    // The layout currently used
+    layout?: Layout;
 }
 
 const EventListSummary: React.FC<IProps> = ({
@@ -48,6 +51,7 @@ const EventListSummary: React.FC<IProps> = ({
     startExpanded,
     summaryMembers = [],
     summaryText,
+    layout,
 }) => {
     const [expanded, toggleExpanded] = useStateToggle(startExpanded);
 
@@ -63,9 +67,9 @@ const EventListSummary: React.FC<IProps> = ({
     // If we are only given few events then just pass them through
     if (events.length < threshold) {
         return (
-            <div className="mx_EventListSummary" data-scroll-tokens={eventIds}>
+            <li className="mx_EventListSummary" data-scroll-tokens={eventIds} data-expanded={true} data-layout={layout}>
                 { children }
-            </div>
+            </li>
         );
     }
 
@@ -92,7 +96,7 @@ const EventListSummary: React.FC<IProps> = ({
     }
 
     return (
-        <li className="mx_EventListSummary" data-scroll-tokens={eventIds}>
+        <li className="mx_EventListSummary" data-scroll-tokens={eventIds} data-expanded={expanded + ""} data-layout={layout}>
             <AccessibleButton className="mx_EventListSummary_toggle" onClick={toggleExpanded} aria-expanded={expanded}>
                 { expanded ? _t('collapse') : _t('expand') }
             </AccessibleButton>
@@ -101,4 +105,9 @@ const EventListSummary: React.FC<IProps> = ({
     );
 };
 
+EventListSummary.defaultProps = {
+    startExpanded: false,
+    layout: Layout.Group,
+};
+
 export default EventListSummary;
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index b15fbbed2b..a7ebf40c3a 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -17,13 +17,15 @@ limitations under the License.
 import React from 'react';
 import classnames from 'classnames';
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 
 import * as Avatar from '../../../Avatar';
 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";
+import { Layout } from "../../../settings/Layout";
+import { UIFeature } from "../../../settings/UIFeature";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from './Spinner';
 
 interface IProps {
     /**
@@ -44,7 +46,7 @@ interface IProps {
     /**
      * The ID of the displayed user
      */
-    userId: string;
+    userId?: string;
 
     /**
      * The display name of the displayed user
@@ -72,7 +74,7 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
         };
     }
 
-    private fakeEvent({message}: IState) {
+    private fakeEvent({ message }: IState) {
         // Fake it till we make it
         /* eslint-disable quote-props */
         const rawEvent = {
@@ -101,7 +103,8 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
 
         // Fake it more
         event.sender = {
-            name: this.props.displayName,
+            name: this.props.displayName || this.props.userId,
+            rawDisplayName: this.props.displayName,
             userId: this.props.userId,
             getAvatarUrl: (..._) => {
                 return Avatar.avatarUrlForUser(
@@ -110,24 +113,28 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
                 );
             },
             getMxcAvatarUrl: () => this.props.avatarUrl,
-        };
+        } as RoomMember;
 
         return event;
     }
 
     public render() {
-        const event = this.fakeEvent(this.state);
-
         const className = classnames(this.props.className, {
             "mx_IRCLayout": this.props.layout == Layout.IRC,
             "mx_GroupLayout": this.props.layout == Layout.Group,
+            "mx_EventTilePreview_loader": !this.props.userId,
         });
 
+        if (!this.props.userId) return <div className={className}><Spinner /></div>;
+
+        const event = this.fakeEvent(this.state);
+
         return <div className={className}>
             <EventTile
                 mxEvent={event}
                 layout={this.props.layout}
                 enableFlair={SettingsStore.getValue(UIFeature.Flair)}
+                as="div"
             />
         </div>;
     }
diff --git a/src/components/views/elements/FacePile.tsx b/src/components/views/elements/FacePile.tsx
index aeca2e844b..0c19a7a63a 100644
--- a/src/components/views/elements/FacePile.tsx
+++ b/src/components/views/elements/FacePile.tsx
@@ -78,7 +78,7 @@ const FacePile = ({ room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, .
         <TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip} tooltipProps={{ yOffset: 32 }}>
             { members.length > numShown ? <span className="mx_FacePile_face mx_FacePile_more" /> : null }
             { shownMembers.map(m =>
-                <MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" /> )}
+                <MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" /> ) }
         </TextWithTooltip>
         { onlyKnownUsers && <span className="mx_FacePile_summary">
             { _t("%(count)s people you know have already joined", { count: members.length }) }
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 59d9a11596..5713518eb8 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {InputHTMLAttributes, SelectHTMLAttributes, TextareaHTMLAttributes} from 'react';
+import React, { InputHTMLAttributes, SelectHTMLAttributes, TextareaHTMLAttributes } from 'react';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
-import {debounce} from "lodash";
-import {IFieldState, IValidationResult} from "./Validation";
+import { debounce } from "lodash";
+import { IFieldState, IValidationResult } from "./Validation";
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
@@ -29,6 +29,11 @@ function getId() {
     return `${BASE_ID}_${count++}`;
 }
 
+export interface IValidateOpts {
+    focused?: boolean;
+    allowEmpty?: boolean;
+}
+
 interface IProps {
     // The field's ID, which binds the input and label together. Immutable.
     id?: string;
@@ -180,7 +185,7 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         }
     };
 
-    public async validate({ focused, allowEmpty = true }: {focused?: boolean, allowEmpty?: boolean}) {
+    public async validate({ focused, allowEmpty = true }: IValidateOpts) {
         if (!this.props.onValidate) {
             return;
         }
@@ -217,7 +222,7 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
         const { element, prefixComponent, postfixComponent, className, onValidate, children,
             tooltipContent, forceValidity, tooltipClassName, list, validateOnBlur, validateOnChange, validateOnFocus,
-            ...inputProps} = this.props;
+            ...inputProps } = this.props;
 
         // Set some defaults for the <input> element
         const ref = input => this.input = input;
@@ -229,17 +234,17 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         inputProps.onBlur = this.onBlur;
 
         // Appease typescript's inference
-        const inputProps_ = {...inputProps, ref, list};
+        const inputProps_ = { ...inputProps, ref, list };
 
         const fieldInput = React.createElement(this.props.element, inputProps_, children);
 
         let prefixContainer = null;
         if (prefixComponent) {
-            prefixContainer = <span className="mx_Field_prefix">{prefixComponent}</span>;
+            prefixContainer = <span className="mx_Field_prefix">{ prefixComponent }</span>;
         }
         let postfixContainer = null;
         if (postfixComponent) {
-            postfixContainer = <span className="mx_Field_postfix">{postfixComponent}</span>;
+            postfixContainer = <span className="mx_Field_postfix">{ postfixComponent }</span>;
         }
 
         const hasValidationFlag = forceValidity !== null && forceValidity !== undefined;
@@ -255,6 +260,7 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         });
 
         // Handle displaying feedback on validity
+        // FIXME: Using an import will result in test failures
         const Tooltip = sdk.getComponent("elements.Tooltip");
         let fieldTooltip;
         if (tooltipContent || this.state.feedback) {
@@ -267,11 +273,11 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         }
 
         return <div className={fieldClasses}>
-            {prefixContainer}
-            {fieldInput}
-            <label htmlFor={this.id}>{this.props.label}</label>
-            {postfixContainer}
-            {fieldTooltip}
+            { prefixContainer }
+            { fieldInput }
+            <label htmlFor={this.id}>{ this.props.label }</label>
+            { postfixContainer }
+            { fieldTooltip }
         </div>;
     }
 }
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 23858b860d..873d65d5bd 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -19,9 +19,8 @@ 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";
-import {mediaFromMxc} from "../../../customisations/Media";
-
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 class FlairAvatar extends React.Component {
     constructor() {
diff --git a/src/components/views/elements/FormButton.js b/src/components/views/elements/FormButton.js
deleted file mode 100644
index f6b4c986f5..0000000000
--- a/src/components/views/elements/FormButton.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import AccessibleButton from "./AccessibleButton";
-
-export default function FormButton(props) {
-    const {className, label, kind, ...restProps} = props;
-    const newClassName = (className || "") + " mx_FormButton";
-    const allProps = Object.assign({}, restProps,
-        {className: newClassName, kind: kind || "primary", children: [label]});
-    return React.createElement(AccessibleButton, allProps);
-}
-
-FormButton.propTypes = AccessibleButton.propTypes;
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
index cd1ccf2fc4..13e8ae2ae2 100644
--- a/src/components/views/elements/IRCTimelineProfileResizer.tsx
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -16,9 +16,9 @@ limitations under the License.
 
 import React from 'react';
 import SettingsStore from "../../../settings/SettingsStore";
-import Draggable, {ILocationState} from './Draggable';
+import Draggable, { ILocationState } from './Draggable';
 import { SettingLevel } from "../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // Current room
diff --git a/src/components/views/elements/ImageView.tsx b/src/components/views/elements/ImageView.tsx
index df73e1a8cb..44ff6644d7 100644
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -19,20 +19,22 @@ limitations under the License.
 import React, { createRef } from 'react';
 import { _t } from '../../../languageHandler';
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
-import {Key} from "../../../Keyboard";
+import { Key } from "../../../Keyboard";
 import FocusLock from "react-focus-lock";
 import MemberAvatar from "../avatars/MemberAvatar";
-import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton";
+import { ContextMenuTooltipButton } from "../../../accessibility/context_menu/ContextMenuTooltipButton";
 import MessageContextMenu from "../context_menus/MessageContextMenu";
-import {aboveLeftOf, ContextMenu} from '../../structures/ContextMenu';
+import { aboveLeftOf } from '../../structures/ContextMenu';
 import MessageTimestamp from "../messages/MessageTimestamp";
 import SettingsStore from "../../../settings/SettingsStore";
-import {formatFullDate} from "../../../DateUtils";
+import { formatFullDate } from "../../../DateUtils";
 import dis from '../../../dispatcher/dispatcher';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks"
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {normalizeWheelEvent} from "../../../utils/Mouse";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { normalizeWheelEvent } from "../../../utils/Mouse";
+import { IDialogProps } from '../dialogs/IDialogProps';
+import UIStore from '../../../stores/UIStore';
 
 // Max scale to keep gaps around the image
 const MAX_SCALE = 0.95;
@@ -43,45 +45,70 @@ const ZOOM_COEFFICIENT = 0.0025;
 // If we have moved only this much we can zoom
 const ZOOM_DISTANCE = 10;
 
-interface IProps {
-    src: string, // the source of the image being displayed
-    name?: string, // the main title ('name') for the image
-    link?: string, // the link (if any) applied to the name of the image
-    width?: number, // width of the image src in pixels
-    height?: number, // height of the image src in pixels
-    fileSize?: number, // size of the image src in bytes
-    onFinished(): void, // callback when the lightbox is dismissed
+// Height of mx_ImageView_panel
+const getPanelHeight = (): number => {
+    const value = getComputedStyle(document.documentElement).getPropertyValue("--image-view-panel-height");
+    // Return the value as a number without the unit
+    return parseInt(value.slice(0, value.length - 2));
+};
+
+interface IProps extends IDialogProps {
+    src: string; // the source of the image being displayed
+    name?: string; // the main title ('name') for the image
+    link?: string; // the link (if any) applied to the name of the image
+    width?: number; // width of the image src in pixels
+    height?: number; // height of the image src in pixels
+    fileSize?: number; // size of the image src in bytes
 
     // the event (if any) that the Image is displaying. Used for event-specific stuff like
     // redactions, senders, timestamps etc.  Other descriptors are taken from the explicit
     // properties above, which let us use lightboxes to display images which aren't associated
     // with events.
-    mxEvent: MatrixEvent,
-    permalinkCreator: RoomPermalinkCreator,
+    mxEvent?: MatrixEvent;
+    permalinkCreator?: RoomPermalinkCreator;
+
+    thumbnailInfo?: {
+        positionX: number;
+        positionY: number;
+        width: number;
+        height: number;
+    };
 }
 
 interface IState {
-    zoom: number,
-    minZoom: number,
-    maxZoom: number,
-    rotation: number,
-    translationX: number,
-    translationY: number,
-    moving: boolean,
-    contextMenuDisplayed: boolean,
+    zoom: number;
+    minZoom: number;
+    maxZoom: number;
+    rotation: number;
+    translationX: number;
+    translationY: number;
+    moving: boolean;
+    contextMenuDisplayed: boolean;
 }
 
 @replaceableComponent("views.elements.ImageView")
 export default class ImageView extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
+
+        const { thumbnailInfo } = this.props;
+
         this.state = {
-            zoom: 0,
+            zoom: 0, // We default to 0 and override this in imageLoaded once we have naturalSize
             minZoom: MAX_SCALE,
             maxZoom: MAX_SCALE,
             rotation: 0,
-            translationX: 0,
-            translationY: 0,
+            translationX: (
+                thumbnailInfo?.positionX +
+                (thumbnailInfo?.width / 2) -
+                (UIStore.instance.windowWidth / 2)
+            ) ?? 0,
+            translationY: (
+                thumbnailInfo?.positionY +
+                (thumbnailInfo?.height / 2) -
+                (UIStore.instance.windowHeight / 2) -
+                (getPanelHeight() / 2)
+            ) ?? 0,
             moving: false,
             contextMenuDisplayed: false,
         };
@@ -95,33 +122,68 @@ export default class ImageView extends React.Component<IProps, IState> {
 
     private initX = 0;
     private initY = 0;
-    private lastX = 0;
-    private lastY = 0;
     private previousX = 0;
     private previousY = 0;
 
+    private animatingLoading = false;
+    private imageIsLoaded = false;
+
     componentDidMount() {
         // We have to use addEventListener() because the listener
         // needs to be passive in order to work with Chromium
         this.focusLock.current.addEventListener('wheel', this.onWheel, { passive: false });
         // We want to recalculate zoom whenever the window's size changes
-        window.addEventListener("resize", this.calculateZoom);
+        window.addEventListener("resize", this.recalculateZoom);
         // After the image loads for the first time we want to calculate the zoom
-        this.image.current.addEventListener("load", this.calculateZoom);
+        this.image.current.addEventListener("load", this.imageLoaded);
     }
 
     componentWillUnmount() {
         this.focusLock.current.removeEventListener('wheel', this.onWheel);
-        window.removeEventListener("resize", this.calculateZoom);
-        this.image.current.removeEventListener("load", this.calculateZoom);
+        window.removeEventListener("resize", this.recalculateZoom);
+        this.image.current.removeEventListener("load", this.imageLoaded);
     }
 
-    private calculateZoom = () => {
+    private imageLoaded = () => {
+        // First, we calculate the zoom, so that the image has the same size as
+        // the thumbnail
+        const { thumbnailInfo } = this.props;
+        if (thumbnailInfo?.width) {
+            this.setState({ zoom: thumbnailInfo.width / this.image.current.naturalWidth });
+        }
+
+        // Once the zoom is set, we the image is considered loaded and we can
+        // start animating it into the center of the screen
+        this.imageIsLoaded = true;
+        this.animatingLoading = true;
+        this.setZoomAndRotation();
+        this.setState({
+            translationX: 0,
+            translationY: 0,
+        });
+
+        // Once the position is set, there is no need to animate anymore
+        this.animatingLoading = false;
+    };
+
+    private recalculateZoom = () => {
+        this.setZoomAndRotation();
+    };
+
+    private setZoomAndRotation = (inputRotation?: number) => {
         const image = this.image.current;
         const imageWrapper = this.imageWrapper.current;
 
-        const zoomX = imageWrapper.clientWidth / image.naturalWidth;
-        const zoomY = imageWrapper.clientHeight / image.naturalHeight;
+        const rotation = inputRotation ?? this.state.rotation;
+
+        const imageIsNotFlipped = rotation % 180 === 0;
+
+        // If the image is rotated take it into account
+        const width = imageIsNotFlipped ? image.naturalWidth : image.naturalHeight;
+        const height = imageIsNotFlipped ? image.naturalHeight : image.naturalWidth;
+
+        const zoomX = imageWrapper.clientWidth / width;
+        const zoomY = imageWrapper.clientHeight / height;
 
         // If the image is smaller in both dimensions set its the zoom to 1 to
         // display it in its original size
@@ -130,6 +192,7 @@ export default class ImageView extends React.Component<IProps, IState> {
                 zoom: 1,
                 minZoom: 1,
                 maxZoom: 1,
+                rotation: rotation,
             });
             return;
         }
@@ -138,48 +201,91 @@ export default class ImageView extends React.Component<IProps, IState> {
         // image by default
         const minZoom = Math.min(zoomX, zoomY) * MAX_SCALE;
 
-        if (this.state.zoom <= this.state.minZoom) this.setState({zoom: minZoom});
+        // If zoom is smaller than minZoom don't go below that value
+        const zoom = (this.state.zoom <= this.state.minZoom) ? minZoom : this.state.zoom;
+
         this.setState({
             minZoom: minZoom,
             maxZoom: 1,
+            rotation: rotation,
+            zoom: zoom,
         });
+    };
+
+    private zoomDelta(delta: number, anchorX?: number, anchorY?: number) {
+        this.zoom(this.state.zoom + delta, anchorX, anchorY);
     }
 
-    private zoom(delta: number) {
-        const newZoom = this.state.zoom + delta;
+    private zoom(zoomLevel: number, anchorX?: number, anchorY?: number) {
+        const oldZoom = this.state.zoom;
+        const newZoom = Math.min(zoomLevel, this.state.maxZoom);
 
         if (newZoom <= this.state.minZoom) {
+            // Zoom out fully
             this.setState({
                 zoom: this.state.minZoom,
                 translationX: 0,
                 translationY: 0,
             });
-            return;
-        }
-        if (newZoom >= this.state.maxZoom) {
-            this.setState({zoom: this.state.maxZoom});
-            return;
-        }
+        } else if (typeof anchorX !== "number" && typeof anchorY !== "number") {
+            // Zoom relative to the center of the view
+            this.setState({
+                zoom: newZoom,
+                translationX: this.state.translationX * newZoom / oldZoom,
+                translationY: this.state.translationY * newZoom / oldZoom,
+            });
+        } else {
+            // Zoom relative to the given point on the image.
+            // First we need to figure out the offset of the anchor point
+            // relative to the center of the image, accounting for rotation.
+            let offsetX;
+            let offsetY;
+            // The modulo operator can return negative values for some
+            // rotations, so we have to do some extra work to normalize it
+            switch (((this.state.rotation % 360) + 360) % 360) {
+                case 0:
+                    offsetX = this.image.current.clientWidth / 2 - anchorX;
+                    offsetY = this.image.current.clientHeight / 2 - anchorY;
+                    break;
+                case 90:
+                    offsetX = anchorY - this.image.current.clientHeight / 2;
+                    offsetY = this.image.current.clientWidth / 2 - anchorX;
+                    break;
+                case 180:
+                    offsetX = anchorX - this.image.current.clientWidth / 2;
+                    offsetY = anchorY - this.image.current.clientHeight / 2;
+                    break;
+                case 270:
+                    offsetX = this.image.current.clientHeight / 2 - anchorY;
+                    offsetY = anchorX - this.image.current.clientWidth / 2;
+            }
 
-        this.setState({
-            zoom: newZoom,
-        });
+            // Apply the zoom and offset
+            this.setState({
+                zoom: newZoom,
+                translationX: this.state.translationX + (newZoom - oldZoom) * offsetX,
+                translationY: this.state.translationY + (newZoom - oldZoom) * offsetY,
+            });
+        }
     }
 
     private onWheel = (ev: WheelEvent) => {
-        ev.stopPropagation();
-        ev.preventDefault();
+        if (ev.target === this.image.current) {
+            ev.stopPropagation();
+            ev.preventDefault();
 
-        const {deltaY} = normalizeWheelEvent(ev);
-        this.zoom(-(deltaY * ZOOM_COEFFICIENT));
+            const { deltaY } = normalizeWheelEvent(ev);
+            // Zoom in on the point on the image targeted by the cursor
+            this.zoomDelta(-deltaY * ZOOM_COEFFICIENT, ev.offsetX, ev.offsetY);
+        }
     };
 
     private onZoomInClick = () => {
-        this.zoom(ZOOM_STEP);
+        this.zoomDelta(ZOOM_STEP);
     };
 
     private onZoomOutClick = () => {
-        this.zoom(-ZOOM_STEP);
+        this.zoomDelta(-ZOOM_STEP);
     };
 
     private onKeyDown = (ev: KeyboardEvent) => {
@@ -192,14 +298,12 @@ export default class ImageView extends React.Component<IProps, IState> {
 
     private onRotateCounterClockwiseClick = () => {
         const cur = this.state.rotation;
-        const rotationDegrees = cur - 90;
-        this.setState({ rotation: rotationDegrees });
+        this.setZoomAndRotation(cur - 90);
     };
 
     private onRotateClockwiseClick = () => {
         const cur = this.state.rotation;
-        const rotationDegrees = cur + 90;
-        this.setState({ rotation: rotationDegrees });
+        this.setZoomAndRotation(cur + 90);
     };
 
     private onDownloadClick = () => {
@@ -246,15 +350,15 @@ export default class ImageView extends React.Component<IProps, IState> {
 
         // Zoom in if we are completely zoomed out
         if (this.state.zoom === this.state.minZoom) {
-            this.setState({zoom: this.state.maxZoom});
+            this.zoom(this.state.maxZoom, ev.nativeEvent.offsetX, ev.nativeEvent.offsetY);
             return;
         }
 
-        this.setState({moving: true});
+        this.setState({ moving: true });
         this.previousX = this.state.translationX;
         this.previousY = this.state.translationY;
-        this.initX = ev.pageX - this.lastX;
-        this.initY = ev.pageY - this.lastY;
+        this.initX = ev.pageX - this.state.translationX;
+        this.initY = ev.pageY - this.state.translationY;
     };
 
     private onMoving = (ev: React.MouseEvent) => {
@@ -263,11 +367,9 @@ export default class ImageView extends React.Component<IProps, IState> {
 
         if (!this.state.moving) return;
 
-        this.lastX = ev.pageX - this.initX;
-        this.lastY = ev.pageY - this.initY;
         this.setState({
-            translationX: this.lastX,
-            translationY: this.lastY,
+            translationX: ev.pageX - this.initX,
+            translationY: ev.pageY - this.initY,
         });
     };
 
@@ -278,30 +380,24 @@ export default class ImageView extends React.Component<IProps, IState> {
             Math.abs(this.state.translationX - this.previousX) < ZOOM_DISTANCE &&
             Math.abs(this.state.translationY - this.previousY) < ZOOM_DISTANCE
         ) {
-            this.setState({
-                zoom: this.state.minZoom,
-                translationX: 0,
-                translationY: 0,
-            });
+            this.zoom(this.state.minZoom);
+            this.initX = 0;
+            this.initY = 0;
         }
-        this.setState({moving: false});
+        this.setState({ moving: false });
     };
 
     private renderContextMenu() {
         let contextMenu = null;
         if (this.state.contextMenuDisplayed) {
             contextMenu = (
-                <ContextMenu
+                <MessageContextMenu
                     {...aboveLeftOf(this.contextMenuButton.current.getBoundingClientRect())}
+                    mxEvent={this.props.mxEvent}
+                    permalinkCreator={this.props.permalinkCreator}
                     onFinished={this.onCloseContextMenu}
-                >
-                    <MessageContextMenu
-                        mxEvent={this.props.mxEvent}
-                        permalinkCreator={this.props.permalinkCreator}
-                        onFinished={this.onCloseContextMenu}
-                        onCloseDialog={this.props.onFinished}
-                    />
-                </ContextMenu>
+                    onCloseDialog={this.props.onFinished}
+                />
             );
         }
 
@@ -316,16 +412,17 @@ export default class ImageView extends React.Component<IProps, IState> {
         const showEventMeta = !!this.props.mxEvent;
         const zoomingDisabled = this.state.maxZoom === this.state.minZoom;
 
+        let transitionClassName;
+        if (this.animatingLoading) transitionClassName = "mx_ImageView_image_animatingLoading";
+        else if (this.state.moving || !this.imageIsLoaded) transitionClassName = "";
+        else transitionClassName = "mx_ImageView_image_animating";
+
         let cursor;
-        if (this.state.moving) {
-            cursor= "grabbing";
-        } else if (zoomingDisabled) {
-            cursor = "default";
-        } else if (this.state.zoom === this.state.minZoom) {
-            cursor = "zoom-in";
-        } else {
-            cursor = "zoom-out";
-        }
+        if (this.state.moving) cursor = "grabbing";
+        else if (zoomingDisabled) cursor = "default";
+        else if (this.state.zoom === this.state.minZoom) cursor = "zoom-in";
+        else cursor = "zoom-out";
+
         const rotationDegrees = this.state.rotation + "deg";
         const zoom = this.state.zoom;
         const translatePixelsX = this.state.translationX + "px";
@@ -336,7 +433,6 @@ export default class ImageView extends React.Component<IProps, IState> {
         // image causing it translate in the wrong direction.
         const style = {
             cursor: cursor,
-            transition: this.state.moving ? null : "transform 200ms ease 0s",
             transform: `translateX(${translatePixelsX})
                         translateY(${translatePixelsY})
                         scale(${zoom})
@@ -355,7 +451,7 @@ export default class ImageView extends React.Component<IProps, IState> {
             const senderName = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
             const sender = (
                 <div className="mx_ImageView_info_sender">
-                    {senderName}
+                    { senderName }
                 </div>
             );
             const messageTimestamp = (
@@ -375,17 +471,19 @@ export default class ImageView extends React.Component<IProps, IState> {
             const avatar = (
                 <MemberAvatar
                     member={mxEvent.sender}
-                    width={32} height={32}
+                    fallbackUserId={mxEvent.getSender()}
+                    width={32}
+                    height={32}
                     viewUserOnClick={true}
                 />
             );
 
             info = (
                 <div className="mx_ImageView_info_wrapper">
-                    {avatar}
+                    { avatar }
                     <div className="mx_ImageView_info">
-                        {sender}
-                        {messageTimestamp}
+                        { sender }
+                        { messageTimestamp }
                     </div>
                 </div>
             );
@@ -394,7 +492,7 @@ export default class ImageView extends React.Component<IProps, IState> {
             // an empty div here, since the panel uses space-between
             // and we want the same placement of elements
             info = (
-                <div></div>
+                <div />
             );
         }
 
@@ -418,15 +516,15 @@ export default class ImageView extends React.Component<IProps, IState> {
                 <AccessibleTooltipButton
                     className="mx_ImageView_button mx_ImageView_button_zoomOut"
                     title={_t("Zoom out")}
-                    onClick={this.onZoomOutClick}>
-                </AccessibleTooltipButton>
+                    onClick={this.onZoomOutClick}
+                />
             );
             zoomInButton = (
                 <AccessibleTooltipButton
                     className="mx_ImageView_button mx_ImageView_button_zoomIn"
                     title={_t("Zoom in")}
-                    onClick={ this.onZoomInClick }>
-                </AccessibleTooltipButton>
+                    onClick={this.onZoomInClick}
+                />
             );
         }
 
@@ -441,48 +539,50 @@ export default class ImageView extends React.Component<IProps, IState> {
                 ref={this.focusLock}
             >
                 <div className="mx_ImageView_panel">
-                    {info}
+                    { info }
                     <div className="mx_ImageView_toolbar">
+                        { zoomOutButton }
+                        { zoomInButton }
                         <AccessibleTooltipButton
                             className="mx_ImageView_button mx_ImageView_button_rotateCCW"
                             title={_t("Rotate Left")}
-                            onClick={ this.onRotateCounterClockwiseClick }>
-                        </AccessibleTooltipButton>
+                            onClick={this.onRotateCounterClockwiseClick}
+                        />
                         <AccessibleTooltipButton
                             className="mx_ImageView_button mx_ImageView_button_rotateCW"
                             title={_t("Rotate Right")}
-                            onClick={this.onRotateClockwiseClick}>
-                        </AccessibleTooltipButton>
-                        {zoomOutButton}
-                        {zoomInButton}
+                            onClick={this.onRotateClockwiseClick}
+                        />
                         <AccessibleTooltipButton
                             className="mx_ImageView_button mx_ImageView_button_download"
                             title={_t("Download")}
-                            onClick={ this.onDownloadClick }>
-                        </AccessibleTooltipButton>
-                        {contextMenuButton}
+                            onClick={this.onDownloadClick}
+                        />
+                        { contextMenuButton }
                         <AccessibleTooltipButton
                             className="mx_ImageView_button mx_ImageView_button_close"
                             title={_t("Close")}
-                            onClick={ this.props.onFinished }>
-                        </AccessibleTooltipButton>
-                        {this.renderContextMenu()}
+                            onClick={this.props.onFinished}
+                        />
+                        { this.renderContextMenu() }
                     </div>
                 </div>
                 <div
                     className="mx_ImageView_image_wrapper"
-                    ref={this.imageWrapper}>
+                    ref={this.imageWrapper}
+                    onMouseDown={this.props.onFinished}
+                    onMouseMove={this.onMoving}
+                    onMouseUp={this.onEndMoving}
+                    onMouseLeave={this.onEndMoving}
+                >
                     <img
                         src={this.props.src}
-                        title={this.props.name}
                         style={style}
+                        alt={this.props.name}
                         ref={this.image}
-                        className="mx_ImageView_image"
+                        className={`mx_ImageView_image ${transitionClassName}`}
                         draggable={true}
                         onMouseDown={this.onStartMoving}
-                        onMouseMove={this.onMoving}
-                        onMouseUp={this.onEndMoving}
-                        onMouseLeave={this.onEndMoving}
                     />
                 </div>
             </FocusLock>
diff --git a/src/components/views/elements/InfoTooltip.tsx b/src/components/views/elements/InfoTooltip.tsx
index d49090dbae..123e118965 100644
--- a/src/components/views/elements/InfoTooltip.tsx
+++ b/src/components/views/elements/InfoTooltip.tsx
@@ -18,13 +18,20 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 
-import Tooltip, {Alignment} from './Tooltip';
-import {_t} from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import Tooltip, { Alignment } from './Tooltip';
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+export enum InfoTooltipKind {
+    Info = "info",
+    Warning = "warning",
+}
 
 interface ITooltipProps {
     tooltip?: React.ReactNode;
+    className?: string;
     tooltipClassName?: string;
+    kind?: InfoTooltipKind;
 }
 
 interface IState {
@@ -53,8 +60,12 @@ export default class InfoTooltip extends React.PureComponent<ITooltipProps, ISta
     };
 
     render() {
-        const {tooltip, children, tooltipClassName} = this.props;
+        const { tooltip, children, tooltipClassName, className, kind } = this.props;
         const title = _t("Information");
+        const iconClassName = (
+            (kind !== InfoTooltipKind.Warning) ?
+                "mx_InfoTooltip_icon_info" : "mx_InfoTooltip_icon_warning"
+        );
 
         // Tooltip are forced on the right for a more natural feel to them on info icons
         const tip = this.state.hover ? <Tooltip
@@ -64,10 +75,14 @@ export default class InfoTooltip extends React.PureComponent<ITooltipProps, ISta
             alignment={Alignment.Right}
         /> : <div />;
         return (
-            <div onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className="mx_InfoTooltip">
-                <span className="mx_InfoTooltip_icon" aria-label={title} />
-                {children}
-                {tip}
+            <div
+                onMouseOver={this.onMouseOver}
+                onMouseLeave={this.onMouseLeave}
+                className={classNames("mx_InfoTooltip", className)}
+            >
+                <span className={classNames("mx_InfoTooltip_icon", iconClassName)} aria-label={title} />
+                { children }
+                { tip }
             </div>
         );
     }
diff --git a/src/components/views/elements/InlineSpinner.tsx b/src/components/views/elements/InlineSpinner.tsx
index b7d0829acd..e2cda2f28d 100644
--- a/src/components/views/elements/InlineSpinner.tsx
+++ b/src/components/views/elements/InlineSpinner.tsx
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import React from "react";
-import {_t} from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     w?: number;
@@ -29,17 +29,17 @@ export default class InlineSpinner extends React.PureComponent<IProps> {
     static defaultProps = {
         w: 16,
         h: 16,
-    }
+    };
 
     render() {
         return (
             <div className="mx_InlineSpinner">
                 <div
                     className="mx_InlineSpinner_icon mx_Spinner_icon"
-                    style={{width: this.props.w, height: this.props.h}}
+                    style={{ width: this.props.w, height: this.props.h }}
                     aria-label={_t("Loading...")}
                 >
-                    {this.props.children}
+                    { this.props.children }
                 </div>
             </div>
         );
diff --git a/src/components/views/elements/InviteReason.tsx b/src/components/views/elements/InviteReason.tsx
index ddce7552ed..865a5be747 100644
--- a/src/components/views/elements/InviteReason.tsx
+++ b/src/components/views/elements/InviteReason.tsx
@@ -16,11 +16,13 @@ limitations under the License.
 
 import classNames from "classnames";
 import React from "react";
+import { sanitizedHtmlNode } from "../../../HtmlUtils";
 import { _t } from "../../../languageHandler";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     reason: string;
+    htmlReason?: string;
 }
 
 interface IState {
@@ -42,7 +44,7 @@ export default class InviteReason extends React.PureComponent<IProps, IState> {
         this.setState({
             hidden: false,
         });
-    }
+    };
 
     render() {
         const classes = classNames({
@@ -51,11 +53,11 @@ export default class InviteReason extends React.PureComponent<IProps, IState> {
         });
 
         return <div className={classes}>
-            <div className="mx_InviteReason_reason">{this.props.reason}</div>
+            <div className="mx_InviteReason_reason">{ this.props.htmlReason ? sanitizedHtmlNode(this.props.htmlReason) : this.props.reason }</div>
             <div className="mx_InviteReason_view"
                 onClick={this.onViewClick}
             >
-                {_t("View message")}
+                { _t("View message") }
             </div>
         </div>;
     }
diff --git a/src/components/views/elements/JoinRuleDropdown.tsx b/src/components/views/elements/JoinRuleDropdown.tsx
new file mode 100644
index 0000000000..e2d9b6d872
--- /dev/null
+++ b/src/components/views/elements/JoinRuleDropdown.tsx
@@ -0,0 +1,68 @@
+/*
+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 from 'react';
+import { JoinRule } from 'matrix-js-sdk/src/@types/partials';
+
+import Dropdown from "./Dropdown";
+
+interface IProps {
+    value: JoinRule;
+    label: string;
+    width?: number;
+    labelInvite: string;
+    labelPublic: string;
+    labelRestricted?: string; // if omitted then this option will be hidden, e.g if unsupported
+    onChange(value: JoinRule): void;
+}
+
+const JoinRuleDropdown = ({
+    label,
+    labelInvite,
+    labelPublic,
+    labelRestricted,
+    value,
+    width = 448,
+    onChange,
+}: IProps) => {
+    const options = [
+        <div key={JoinRule.Invite} className="mx_JoinRuleDropdown_invite">
+            { labelInvite }
+        </div>,
+        <div key={JoinRule.Public} className="mx_JoinRuleDropdown_public">
+            { labelPublic }
+        </div>,
+    ];
+
+    if (labelRestricted) {
+        options.unshift(<div key={JoinRule.Restricted} className="mx_JoinRuleDropdown_restricted">
+            { labelRestricted }
+        </div>);
+    }
+
+    return <Dropdown
+        id="mx_JoinRuleDropdown"
+        className="mx_JoinRuleDropdown"
+        onOptionChange={onChange}
+        menuWidth={width}
+        value={value}
+        label={label}
+    >
+        { options }
+    </Dropdown>;
+};
+
+export default JoinRuleDropdown;
diff --git a/src/components/views/elements/LabelledToggleSwitch.js b/src/components/views/elements/LabelledToggleSwitch.tsx
similarity index 58%
rename from src/components/views/elements/LabelledToggleSwitch.js
rename to src/components/views/elements/LabelledToggleSwitch.tsx
index ef60eeed7b..24647df502 100644
--- a/src/components/views/elements/LabelledToggleSwitch.js
+++ b/src/components/views/elements/LabelledToggleSwitch.tsx
@@ -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,38 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from "prop-types";
+import React from "react";
+
 import ToggleSwitch from "./ToggleSwitch";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    // The value for the toggle switch
+    value: boolean;
+    // The translated label for the switch
+    label: string;
+    // Whether or not to disable the toggle switch
+    disabled?: boolean;
+    // True to put the toggle in front of the label
+    // Default false.
+    toggleInFront?: boolean;
+    // Additional class names to append to the switch. Optional.
+    className?: string;
+    // The function to call when the value changes
+    onChange(checked: boolean): void;
+}
 
 @replaceableComponent("views.elements.LabelledToggleSwitch")
-export default class LabelledToggleSwitch extends React.Component {
-    static propTypes = {
-        // The value for the toggle switch
-        value: PropTypes.bool.isRequired,
-
-        // The function to call when the value changes
-        onChange: PropTypes.func.isRequired,
-
-        // The translated label for the switch
-        label: PropTypes.string.isRequired,
-
-        // Whether or not to disable the toggle switch
-        disabled: PropTypes.bool,
-
-        // True to put the toggle in front of the label
-        // Default false.
-        toggleInFront: PropTypes.bool,
-
-        // Additional class names to append to the switch. Optional.
-        className: PropTypes.string,
-    };
-
+export default class LabelledToggleSwitch extends React.PureComponent<IProps> {
     render() {
         // This is a minimal version of a SettingsFlag
 
-        let firstPart = <span className="mx_SettingsFlag_label">{this.props.label}</span>;
+        let firstPart = <span className="mx_SettingsFlag_label">{ this.props.label }</span>;
         let secondPart = <ToggleSwitch
             checked={this.props.value}
             disabled={this.props.disabled}
@@ -62,8 +57,8 @@ export default class LabelledToggleSwitch extends React.Component {
         const classes = `mx_SettingsFlag ${this.props.className || ""}`;
         return (
             <div className={classes}>
-                {firstPart}
-                {secondPart}
+                { firstPart }
+                { secondPart }
             </div>
         );
     }
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.tsx
similarity index 81%
rename from src/components/views/elements/LanguageDropdown.js
rename to src/components/views/elements/LanguageDropdown.tsx
index 9420061a74..c6c52ee4e8 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.tsx
@@ -16,13 +16,13 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
-import * as sdk from '../../../index';
 import * as languageHandler from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from "./Spinner";
+import Dropdown from "./Dropdown";
 
 function languageMatchesSearchQuery(query, language) {
     if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
@@ -30,11 +30,22 @@ function languageMatchesSearchQuery(query, language) {
     return false;
 }
 
+interface IProps {
+    className?: string;
+    onOptionChange: (language: string) => void;
+    value?: string;
+    disabled?: boolean;
+}
+
+interface IState {
+    searchQuery: string;
+    langs: string[];
+}
+
 @replaceableComponent("views.elements.LanguageDropdown")
-export default class LanguageDropdown extends React.Component {
-    constructor(props) {
+export default class LanguageDropdown extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
-        this._onSearchChange = this._onSearchChange.bind(this);
 
         this.state = {
             searchQuery: '',
@@ -42,16 +53,16 @@ export default class LanguageDropdown extends React.Component {
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         languageHandler.getAllLanguagesFromJson().then((langs) => {
             langs.sort(function(a, b) {
                 if (a.label < b.label) return -1;
                 if (a.label > b.label) return 1;
                 return 0;
             });
-            this.setState({langs});
+            this.setState({ langs });
         }).catch(() => {
-            this.setState({langs: ['en']});
+            this.setState({ langs: ['en'] });
         });
 
         if (!this.props.value) {
@@ -63,20 +74,17 @@ export default class LanguageDropdown extends React.Component {
         }
     }
 
-    _onSearchChange(search) {
+    private onSearchChange = (search: string): void => {
         this.setState({
             searchQuery: search,
         });
-    }
+    };
 
-    render() {
+    public render(): JSX.Element {
         if (this.state.langs === null) {
-            const Spinner = sdk.getComponent('elements.Spinner');
             return <Spinner />;
         }
 
-        const Dropdown = sdk.getComponent('elements.Dropdown');
-
         let displayedLanguages;
         if (this.state.searchQuery) {
             displayedLanguages = this.state.langs.filter((lang) => {
@@ -107,7 +115,7 @@ export default class LanguageDropdown extends React.Component {
             id="mx_LanguageDropdown"
             className={this.props.className}
             onOptionChange={this.props.onOptionChange}
-            onSearchChange={this._onSearchChange}
+            onSearchChange={this.onSearchChange}
             searchEnabled={true}
             value={value}
             label={_t("Language Dropdown")}
@@ -118,8 +126,3 @@ export default class LanguageDropdown extends React.Component {
     }
 }
 
-LanguageDropdown.propTypes = {
-    className: PropTypes.string,
-    onOptionChange: PropTypes.func.isRequired,
-    value: PropTypes.string,
-};
diff --git a/src/components/views/elements/LazyRenderList.js b/src/components/views/elements/LazyRenderList.tsx
similarity index 71%
rename from src/components/views/elements/LazyRenderList.js
rename to src/components/views/elements/LazyRenderList.tsx
index f2c8148cd2..54c76f27a7 100644
--- a/src/components/views/elements/LazyRenderList.js
+++ b/src/components/views/elements/LazyRenderList.tsx
@@ -15,17 +15,16 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from 'prop-types';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 class ItemRange {
-    constructor(topCount, renderCount, bottomCount) {
-        this.topCount = topCount;
-        this.renderCount = renderCount;
-        this.bottomCount = bottomCount;
-    }
+    constructor(
+        public topCount: number,
+        public renderCount: number,
+        public bottomCount: number,
+    ) { }
 
-    contains(range) {
+    public contains(range: ItemRange): boolean {
         // don't contain empty ranges
         // as it will prevent clearing the list
         // once it is scrolled far enough out of view
@@ -36,7 +35,7 @@ class ItemRange {
             (range.topCount + range.renderCount) <= (this.topCount + this.renderCount);
     }
 
-    expand(amount) {
+    public expand(amount: number): ItemRange {
         // don't expand ranges that won't render anything
         if (this.renderCount === 0) {
             return this;
@@ -51,20 +50,55 @@ class ItemRange {
         );
     }
 
-    totalSize() {
+    public totalSize(): number {
         return this.topCount + this.renderCount + this.bottomCount;
     }
 }
 
+interface IProps<T> {
+    // height in pixels of the component returned by `renderItem`
+    itemHeight: number;
+    // function to turn an element of `items` into a react component
+    renderItem: (item: T) => JSX.Element;
+    // scrollTop of the viewport (minus the height of any content above this list like other `LazyRenderList`s)
+    scrollTop: number;
+    // the height of the viewport this content is scrolled in
+    height: number;
+    // all items for the list. These should not be react components, see `renderItem`.
+    items?: T[];
+    // the amount of items to scroll before causing a rerender,
+    // should typically be less than `overflowItems` unless applying
+    // margins in the parent component when using multiple LazyRenderList in one viewport.
+    // use 0 to only rerender when items will come into view.
+    overflowMargin?: number;
+    // the amount of items to add at the top and bottom to render,
+    // so not every scroll of causes a rerender.
+    overflowItems?: number;
+
+    element?: string;
+    className?: string;
+}
+
+interface IState {
+    renderRange: ItemRange;
+}
+
 @replaceableComponent("views.elements.LazyRenderList")
-export default class LazyRenderList extends React.Component {
-    constructor(props) {
+export default class LazyRenderList<T = any> extends React.Component<IProps<T>, IState> {
+    public static defaultProps: Partial<IProps<unknown>> = {
+        overflowItems: 20,
+        overflowMargin: 5,
+    };
+
+    constructor(props: IProps<T>) {
         super(props);
 
-        this.state = {};
+        this.state = {
+            renderRange: null,
+        };
     }
 
-    static getDerivedStateFromProps(props, state) {
+    public static getDerivedStateFromProps(props: IProps<unknown>, state: IState): Partial<IState> {
         const range = LazyRenderList.getVisibleRangeFromProps(props);
         const intersectRange = range.expand(props.overflowMargin);
         const renderRange = range.expand(props.overflowItems);
@@ -72,13 +106,13 @@ export default class LazyRenderList extends React.Component {
         // only update render Range if the list has shrunk/grown and we need to adjust padding OR
         // if the new range + overflowMargin isn't contained by the old anymore
         if (listHasChangedSize || !state.renderRange || !state.renderRange.contains(intersectRange)) {
-            return {renderRange};
+            return { renderRange };
         }
         return null;
     }
 
-    static getVisibleRangeFromProps(props) {
-        const {items, itemHeight, scrollTop, height} = props;
+    private static getVisibleRangeFromProps(props: IProps<unknown>): ItemRange {
+        const { items, itemHeight, scrollTop, height } = props;
         const length = items ? items.length : 0;
         const topCount = Math.min(Math.max(0, Math.floor(scrollTop / itemHeight)), length);
         const itemsAfterTop = length - topCount;
@@ -88,10 +122,10 @@ export default class LazyRenderList extends React.Component {
         return new ItemRange(topCount, renderCount, bottomCount);
     }
 
-    render() {
-        const {itemHeight, items, renderItem} = this.props;
-        const {renderRange} = this.state;
-        const {topCount, renderCount, bottomCount} = renderRange;
+    public render(): JSX.Element {
+        const { itemHeight, items, renderItem } = this.props;
+        const { renderRange } = this.state;
+        const { topCount, renderCount, bottomCount } = renderRange;
 
         const paddingTop = topCount * itemHeight;
         const paddingBottom = bottomCount * itemHeight;
@@ -102,35 +136,10 @@ export default class LazyRenderList extends React.Component {
 
         const element = this.props.element || "div";
         const elementProps = {
-            "style": {paddingTop: `${paddingTop}px`, paddingBottom: `${paddingBottom}px`},
+            "style": { paddingTop: `${paddingTop}px`, paddingBottom: `${paddingBottom}px` },
             "className": this.props.className,
         };
         return React.createElement(element, elementProps, renderedItems.map(renderItem));
     }
 }
 
-LazyRenderList.defaultProps = {
-    overflowItems: 20,
-    overflowMargin: 5,
-};
-
-LazyRenderList.propTypes = {
-    // height in pixels of the component returned by `renderItem`
-    itemHeight: PropTypes.number.isRequired,
-    // function to turn an element of `items` into a react component
-    renderItem: PropTypes.func.isRequired,
-    // scrollTop of the viewport (minus the height of any content above this list like other `LazyRenderList`s)
-    scrollTop: PropTypes.number.isRequired,
-    // the height of the viewport this content is scrolled in
-    height: PropTypes.number.isRequired,
-    // all items for the list. These should not be react components, see `renderItem`.
-    items: PropTypes.array,
-    // the amount of items to scroll before causing a rerender,
-    // should typically be less than `overflowItems` unless applying
-    // margins in the parent component when using multiple LazyRenderList in one viewport.
-    // use 0 to only rerender when items will come into view.
-    overflowMargin: PropTypes.number,
-    // the amount of items to add at the top and bottom to render,
-    // so not every scroll of causes a rerender.
-    overflowItems: PropTypes.number,
-};
diff --git a/src/components/views/elements/MemberEventListSummary.tsx b/src/components/views/elements/MemberEventListSummary.tsx
index 0290ef6d83..4eb0177fef 100644
--- a/src/components/views/elements/MemberEventListSummary.tsx
+++ b/src/components/views/elements/MemberEventListSummary.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactChildren } from 'react';
+import React, { ComponentProps } from 'react';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
@@ -24,23 +24,32 @@ import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import { isValid3pidInvite } from "../../../RoomInvite";
 import EventListSummary from "./EventListSummary";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import defaultDispatcher from '../../../dispatcher/dispatcher';
+import { RightPanelPhases } from '../../../stores/RightPanelStorePhases';
+import { Action } from '../../../dispatcher/actions';
+import { SetRightPanelPhasePayload } from '../../../dispatcher/payloads/SetRightPanelPhasePayload';
+import { jsxJoin } from '../../../utils/ReactUtils';
+import { EventType } from 'matrix-js-sdk/src/@types/event';
+import { Layout } from '../../../settings/Layout';
 
-interface IProps {
-    // An array of member events to summarise
-    events: MatrixEvent[];
+const onPinnedMessagesClick = (): void => {
+    defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.PinnedMessages,
+        allowClose: false,
+    });
+};
+
+const SENDER_AS_DISPLAY_NAME_EVENTS = [EventType.RoomServerAcl, EventType.RoomPinnedEvents];
+
+interface IProps extends Omit<ComponentProps<typeof EventListSummary>, "summaryText" | "summaryMembers"> {
     // The maximum number of names to show in either each summary e.g. 2 would result "A, B and 234 others left"
     summaryLength?: number;
     // The maximum number of avatars to display in the summary
     avatarsMaxLength?: number;
-    // The minimum number of events needed to trigger summarisation
-    threshold?: number,
-    // Whether or not to begin with state.expanded=true
-    startExpanded?: boolean,
-    // An array of EventTiles to render when expanded
-    children: ReactChildren;
-    // Called when the MELS expansion is toggled
-    onToggle?(): void,
+    // The currently selected layout
+    layout: Layout;
 }
 
 interface IUserEvents {
@@ -66,6 +75,8 @@ enum TransitionType {
     ChangedName = "changed_name",
     ChangedAvatar = "changed_avatar",
     NoChange = "no_change",
+    ServerAcl = "server_acl",
+    ChangedPins = "pinned_messages"
 }
 
 const SEP = ",";
@@ -76,6 +87,7 @@ export default class MemberEventListSummary extends React.Component<IProps> {
         summaryLength: 1,
         threshold: 3,
         avatarsMaxLength: 5,
+        layout: Layout.Group,
     };
 
     shouldComponentUpdate(nextProps) {
@@ -98,7 +110,10 @@ export default class MemberEventListSummary extends React.Component<IProps> {
      * `Object.keys(eventAggregates)`.
      * @returns {string} the textual summary of the aggregated events that occurred.
      */
-    private generateSummary(eventAggregates: Record<string, string[]>, orderedTransitionSequences: string[]) {
+    private generateSummary(
+        eventAggregates: Record<string, string[]>,
+        orderedTransitionSequences: string[],
+    ): string | JSX.Element {
         const summaries = orderedTransitionSequences.map((transitions) => {
             const userNames = eventAggregates[transitions];
             const nameList = this.renderNameList(userNames);
@@ -120,14 +135,14 @@ export default class MemberEventListSummary extends React.Component<IProps> {
 
             const desc = formatCommaSeparatedList(descs);
 
-            return _t('%(nameList)s %(transitionList)s', { nameList: nameList, transitionList: desc });
+            return _t('%(nameList)s %(transitionList)s', { nameList, transitionList: desc });
         });
 
         if (!summaries) {
             return null;
         }
 
-        return summaries.join(", ");
+        return jsxJoin(summaries, ", ");
     }
 
     /**
@@ -221,7 +236,11 @@ export default class MemberEventListSummary extends React.Component<IProps> {
      * @param {number} repeats the number of times the transition was repeated in a row.
      * @returns {string} the written Human Readable equivalent of the transition.
      */
-    private static getDescriptionForTransition(t: TransitionType, userCount: number, repeats: number) {
+    private static getDescriptionForTransition(
+        t: TransitionType,
+        userCount: number,
+        repeats: number,
+    ): string | JSX.Element {
         // The empty interpolations 'severalUsers' and 'oneUser'
         // are there only to show translators to non-English languages
         // that the verb is conjugated to plural or singular Subject.
@@ -298,12 +317,27 @@ export default class MemberEventListSummary extends React.Component<IProps> {
                     ? _t("%(severalUsers)smade no changes %(count)s times", { severalUsers: "", count: repeats })
                     : _t("%(oneUser)smade no changes %(count)s times", { oneUser: "", count: repeats });
                 break;
+            case "server_acl":
+                res = (userCount > 1)
+                    ? _t("%(severalUsers)schanged the server ACLs %(count)s times",
+                        { severalUsers: "", count: repeats })
+                    : _t("%(oneUser)schanged the server ACLs %(count)s times", { oneUser: "", count: repeats });
+                break;
+            case "pinned_messages":
+                res = (userCount > 1)
+                    ? _t("%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.",
+                        { severalUsers: "", count: repeats },
+                        { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> })
+                    : _t("%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.",
+                        { oneUser: "", count: repeats },
+                        { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> });
+                break;
         }
 
         return res;
     }
 
-    private static getTransitionSequence(events: MatrixEvent[]) {
+    private static getTransitionSequence(events: IUserEvents[]) {
         return events.map(MemberEventListSummary.getTransition);
     }
 
@@ -315,13 +349,19 @@ export default class MemberEventListSummary extends React.Component<IProps> {
      * @returns {string?} the transition type given to this event. This defaults to `null`
      * if a transition is not recognised.
      */
-    private static getTransition(e: MatrixEvent): TransitionType {
-        if (e.mxEvent.getType() === 'm.room.third_party_invite') {
+    private static getTransition(e: IUserEvents): TransitionType {
+        const type = e.mxEvent.getType();
+
+        if (type === EventType.RoomThirdPartyInvite) {
             // Handle 3pid invites the same as invites so they get bundled together
             if (!isValid3pidInvite(e.mxEvent)) {
                 return TransitionType.InviteWithdrawal;
             }
             return TransitionType.Invited;
+        } else if (type === EventType.RoomServerAcl) {
+            return TransitionType.ServerAcl;
+        } else if (type === EventType.RoomPinnedEvents) {
+            return TransitionType.ChangedPins;
         }
 
         switch (e.mxEvent.getContent().membership) {
@@ -410,19 +450,24 @@ export default class MemberEventListSummary extends React.Component<IProps> {
         // Object mapping user IDs to an array of IUserEvents
         const userEvents: Record<string, IUserEvents[]> = {};
         eventsToRender.forEach((e, index) => {
-            const userId = e.getStateKey();
+            const type = e.getType();
+            const userId = type === EventType.RoomServerAcl ? e.getSender() : e.getStateKey();
             // Initialise a user's events
             if (!userEvents[userId]) {
                 userEvents[userId] = [];
             }
 
-            if (e.target) {
+            if (SENDER_AS_DISPLAY_NAME_EVENTS.includes(type as EventType)) {
+                latestUserAvatarMember.set(userId, e.sender);
+            } else if (e.target) {
                 latestUserAvatarMember.set(userId, e.target);
             }
 
             let displayName = userId;
-            if (e.getType() === 'm.room.third_party_invite') {
+            if (type === EventType.RoomThirdPartyInvite) {
                 displayName = e.getContent().display_name;
+            } else if (SENDER_AS_DISPLAY_NAME_EVENTS.includes(type as EventType)) {
+                displayName = e.sender.name;
             } else if (e.target) {
                 displayName = e.target.name;
             }
@@ -448,6 +493,7 @@ export default class MemberEventListSummary extends React.Component<IProps> {
             startExpanded={this.props.startExpanded}
             children={this.props.children}
             summaryMembers={[...latestUserAvatarMember.values()]}
+            layout={this.props.layout}
             summaryText={this.generateSummary(aggregate.names, orderedTransitionSequences)} />;
     }
 }
diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx
index 32ef0d4da2..22ff4bf4b3 100644
--- a/src/components/views/elements/MiniAvatarUploader.tsx
+++ b/src/components/views/elements/MiniAvatarUploader.tsx
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext, useRef, useState} from 'react';
-import {EventType} from 'matrix-js-sdk/src/@types/event';
+import React, { useContext, useRef, useState } from 'react';
+import { EventType } from 'matrix-js-sdk/src/@types/event';
 import classNames from 'classnames';
 
 import AccessibleButton from "./AccessibleButton";
 import Spinner from "./Spinner";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {useTimeout} from "../../../hooks/useTimeout";
+import { useTimeout } from "../../../hooks/useTimeout";
 import Analytics from "../../../Analytics";
 import CountlyAnalytics from '../../../CountlyAnalytics';
 import RoomContext from "../../../contexts/RoomContext";
@@ -32,7 +32,7 @@ interface IProps {
     hasAvatar: boolean;
     noAvatarLabel?: string;
     hasAvatarLabel?: string;
-    setAvatarUrl(url: string): Promise<void>;
+    setAvatarUrl(url: string): Promise<unknown>;
 }
 
 const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAvatarLabel, setAvatarUrl, children }) => {
@@ -52,7 +52,7 @@ const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAva
 
     const label = (hasAvatar || busy) ? hasAvatarLabel : noAvatarLabel;
 
-    const {room} = useContext(RoomContext);
+    const { room } = useContext(RoomContext);
     const canSetAvatar = room?.currentState.maySendStateEvent(EventType.RoomAvatar, cli.getUserId());
     if (!canSetAvatar) return <React.Fragment>{ children }</React.Fragment>;
 
@@ -92,7 +92,7 @@ const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAva
             <div className="mx_MiniAvatarUploader_indicator">
                 { busy ?
                     <Spinner w={20} h={20} /> :
-                    <div className="mx_MiniAvatarUploader_cameraIcon"></div> }
+                    <div className="mx_MiniAvatarUploader_cameraIcon" /> }
             </div>
 
             <div className={classNames("mx_Tooltip", {
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.tsx
similarity index 65%
rename from src/components/views/elements/PersistedElement.js
rename to src/components/views/elements/PersistedElement.tsx
index 701c140a19..d013091803 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.tsx
@@ -16,25 +16,26 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import {throttle} from "lodash";
-import ResizeObserver from 'resize-observer-polyfill';
+import { throttle } from "lodash";
 
 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";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ActionPayload } from "../../../dispatcher/payloads";
+
+export const getPersistKey = (appId: string) => 'widget_' + appId;
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
 // pass in a custom control as the actual body.
 
-function getContainer(containerId) {
-    return document.getElementById(containerId);
+function getContainer(containerId: string): HTMLDivElement {
+    return document.getElementById(containerId) as HTMLDivElement;
 }
 
-function getOrCreateContainer(containerId) {
+function getOrCreateContainer(containerId: string): HTMLDivElement {
     let container = getContainer(containerId);
 
     if (!container) {
@@ -46,7 +47,19 @@ function getOrCreateContainer(containerId) {
     return container;
 }
 
-/*
+interface IProps {
+    // Unique identifier for this PersistedElement instance
+    // Any PersistedElements with the same persistKey will use
+    // the same DOM container.
+    persistKey: string;
+
+    // z-index for the element. Defaults to 9.
+    zIndex?: number;
+
+    style?: React.StyleHTMLAttributes<HTMLDivElement>;
+}
+
+/**
  * Class of component that renders its children in a separate ReactDOM virtual tree
  * in a container element appended to document.body.
  *
@@ -58,42 +71,33 @@ function getOrCreateContainer(containerId) {
  * 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
-        // Any PersistedElements with the same persistKey will use
-        // the same DOM container.
-        persistKey: PropTypes.string.isRequired,
+export default class PersistedElement extends React.Component<IProps> {
+    private resizeObserver: ResizeObserver;
+    private dispatcherRef: string;
+    private childContainer: HTMLDivElement;
+    private child: HTMLDivElement;
 
-        // z-index for the element. Defaults to 9.
-        zIndex: PropTypes.number,
-    };
+    constructor(props: IProps) {
+        super(props);
 
-    constructor() {
-        super();
-        this.collectChildContainer = this.collectChildContainer.bind(this);
-        this.collectChild = this.collectChild.bind(this);
-        this._repositionChild = this._repositionChild.bind(this);
-        this._onAction = this._onAction.bind(this);
-
-        this.resizeObserver = new ResizeObserver(this._repositionChild);
+        this.resizeObserver = new ResizeObserver(this.repositionChild);
         // Annoyingly, a resize observer is insufficient, since we also care
         // about when the element moves on the screen without changing its
         // dimensions. Doesn't look like there's a ResizeObserver equivalent
         // for this, so we bodge it by listening for document resize and
         // the timeline_resize action.
-        window.addEventListener('resize', this._repositionChild);
-        this._dispatcherRef = dis.register(this._onAction);
+        window.addEventListener('resize', this.repositionChild);
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
     /**
      * Removes the DOM elements created when a PersistedElement with the given
      * persistKey was mounted. The DOM elements will be re-added if another
-     * PeristedElement is mounted in the future.
+     * PersistedElement is mounted in the future.
      *
      * @param {string} persistKey Key used to uniquely identify this PersistedElement
      */
-    static destroyElement(persistKey) {
+    public static destroyElement(persistKey: string): void {
         const container = getContainer('mx_persistedElement_' + persistKey);
         if (container) {
             container.remove();
@@ -104,7 +108,7 @@ export default class PersistedElement extends React.Component {
         return Boolean(getContainer('mx_persistedElement_' + persistKey));
     }
 
-    collectChildContainer(ref) {
+    private collectChildContainer = (ref: HTMLDivElement): void => {
         if (this.childContainer) {
             this.resizeObserver.unobserve(this.childContainer);
         }
@@ -112,63 +116,63 @@ export default class PersistedElement extends React.Component {
         if (ref) {
             this.resizeObserver.observe(ref);
         }
-    }
+    };
 
-    collectChild(ref) {
+    private collectChild = (ref: HTMLDivElement): void => {
         this.child = ref;
         this.updateChild();
-    }
+    };
 
-    componentDidMount() {
+    public componentDidMount(): void {
         this.updateChild();
         this.renderApp();
     }
 
-    componentDidUpdate() {
+    public componentDidUpdate(): void {
         this.updateChild();
         this.renderApp();
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         this.updateChildVisibility(this.child, false);
         this.resizeObserver.disconnect();
-        window.removeEventListener('resize', this._repositionChild);
-        dis.unregister(this._dispatcherRef);
+        window.removeEventListener('resize', this.repositionChild);
+        dis.unregister(this.dispatcherRef);
     }
 
-    _onAction(payload) {
+    private onAction = (payload: ActionPayload): void => {
         if (payload.action === 'timeline_resize') {
-            this._repositionChild();
+            this.repositionChild();
         } else if (payload.action === 'logout') {
             PersistedElement.destroyElement(this.props.persistKey);
         }
-    }
+    };
 
-    _repositionChild() {
+    private repositionChild = (): void => {
         this.updateChildPosition(this.child, this.childContainer);
-    }
+    };
 
-    updateChild() {
+    private updateChild(): void {
         this.updateChildPosition(this.child, this.childContainer);
         this.updateChildVisibility(this.child, true);
     }
 
-    renderApp() {
+    private renderApp(): void {
         const content = <MatrixClientContext.Provider value={MatrixClientPeg.get()}>
             <div ref={this.collectChild} style={this.props.style}>
-                {this.props.children}
+                { this.props.children }
             </div>
         </MatrixClientContext.Provider>;
 
         ReactDOM.render(content, getOrCreateContainer('mx_persistedElement_'+this.props.persistKey));
     }
 
-    updateChildVisibility(child, visible) {
+    private updateChildVisibility(child: HTMLDivElement, visible: boolean): void {
         if (!child) return;
         child.style.display = visible ? 'block' : 'none';
     }
 
-    updateChildPosition = throttle((child, parent) => {
+    private updateChildPosition = throttle((child: HTMLDivElement, parent: HTMLDivElement): void => {
         if (!child || !parent) return;
 
         const parentRect = parent.getBoundingClientRect();
@@ -180,11 +184,10 @@ export default class PersistedElement extends React.Component {
             width: parentRect.width + 'px',
             height: parentRect.height + 'px',
         });
-    }, 100, {trailing: true, leading: true});
+    }, 100, { trailing: true, leading: true });
 
-    render() {
+    public render(): JSX.Element {
         return <div ref={this.collectChildContainer} />;
     }
 }
 
-export const getPersistKey = (appId: string) => 'widget_' + appId;
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.tsx
similarity index 57%
rename from src/components/views/elements/PersistentApp.js
rename to src/components/views/elements/PersistentApp.tsx
index 5df373e4fe..8d0751cc1d 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.tsx
@@ -17,61 +17,74 @@ limitations under the License.
 
 import React from 'react';
 import RoomViewStore from '../../../stores/RoomViewStore';
-import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
+import ActiveWidgetStore, { ActiveWidgetStoreEvent } from '../../../stores/ActiveWidgetStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { EventSubscription } from 'fbemitter';
+import AppTile from "./AppTile";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+interface IState {
+    roomId: string;
+    persistentWidgetId: string;
+}
 
 @replaceableComponent("views.elements.PersistentApp")
-export default class PersistentApp extends React.Component {
-    state = {
-        roomId: RoomViewStore.getRoomId(),
-        persistentWidgetId: ActiveWidgetStore.getPersistentWidgetId(),
-    };
+export default class PersistentApp extends React.Component<{}, IState> {
+    private roomStoreToken: EventSubscription;
 
-    componentDidMount() {
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
-        ActiveWidgetStore.on('update', this._onActiveWidgetStoreUpdate);
-        MatrixClientPeg.get().on("Room.myMembership", this._onMyMembership);
+    constructor() {
+        super({});
+
+        this.state = {
+            roomId: RoomViewStore.getRoomId(),
+            persistentWidgetId: ActiveWidgetStore.instance.getPersistentWidgetId(),
+        };
     }
 
-    componentWillUnmount() {
-        if (this._roomStoreToken) {
-            this._roomStoreToken.remove();
+    public componentDidMount(): void {
+        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Update, this.onActiveWidgetStoreUpdate);
+        MatrixClientPeg.get().on("Room.myMembership", this.onMyMembership);
+    }
+
+    public componentWillUnmount(): void {
+        if (this.roomStoreToken) {
+            this.roomStoreToken.remove();
         }
-        ActiveWidgetStore.removeListener('update', this._onActiveWidgetStoreUpdate);
+        ActiveWidgetStore.instance.removeListener(ActiveWidgetStoreEvent.Update, this.onActiveWidgetStoreUpdate);
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Room.myMembership", this._onMyMembership);
+            MatrixClientPeg.get().removeListener("Room.myMembership", this.onMyMembership);
         }
     }
 
-    _onRoomViewStoreUpdate = payload => {
+    private onRoomViewStoreUpdate = (): void => {
         if (RoomViewStore.getRoomId() === this.state.roomId) return;
         this.setState({
             roomId: RoomViewStore.getRoomId(),
         });
     };
 
-    _onActiveWidgetStoreUpdate = () => {
+    private onActiveWidgetStoreUpdate = (): void => {
         this.setState({
-            persistentWidgetId: ActiveWidgetStore.getPersistentWidgetId(),
+            persistentWidgetId: ActiveWidgetStore.instance.getPersistentWidgetId(),
         });
     };
 
-    _onMyMembership = async (room, membership) => {
-        const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(this.state.persistentWidgetId);
+    private onMyMembership = async (room: Room, membership: string): Promise<void> => {
+        const persistentWidgetInRoomId = ActiveWidgetStore.instance.getRoomId(this.state.persistentWidgetId);
         if (membership !== "join") {
             // we're not in the room anymore - delete
-            if (room.roomId === persistentWidgetInRoomId) {
-                ActiveWidgetStore.destroyPersistentWidget(this.state.persistentWidgetId);
+            if (room .roomId === persistentWidgetInRoomId) {
+                ActiveWidgetStore.instance.destroyPersistentWidget(this.state.persistentWidgetId);
             }
         }
     };
 
-    render() {
+    public render(): JSX.Element {
         if (this.state.persistentWidgetId) {
-            const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(this.state.persistentWidgetId);
+            const persistentWidgetInRoomId = ActiveWidgetStore.instance.getRoomId(this.state.persistentWidgetId);
 
             const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
 
@@ -83,13 +96,12 @@ export default class PersistentApp extends React.Component {
             if (this.state.roomId !== persistentWidgetInRoomId && myMembership === "join") {
                 // get the widget data
                 const appEvent = WidgetUtils.getRoomWidgets(persistentWidgetInRoom).find((ev) => {
-                    return ev.getStateKey() === ActiveWidgetStore.getPersistentWidgetId();
+                    return ev.getStateKey() === ActiveWidgetStore.instance.getPersistentWidgetId();
                 });
                 const app = WidgetUtils.makeAppConfig(
                     appEvent.getStateKey(), appEvent.getContent(), appEvent.getSender(),
                     persistentWidgetInRoomId, appEvent.getId(),
                 );
-                const AppTile = sdk.getComponent('elements.AppTile');
                 return <AppTile
                     key={app.id}
                     app={app}
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index ace41db39d..95d29fc9ae 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -20,14 +20,14 @@ import classNames from 'classnames';
 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 { MatrixClientPeg } from '../../../MatrixClientPeg';
 import FlairStore from "../../../stores/FlairStore";
-import {getPrimaryPermalinkEntity, parseAppLocalLink} from "../../../utils/permalinks/Permalinks";
+import { getPrimaryPermalinkEntity, parseAppLocalLink } from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {Action} from "../../../dispatcher/actions";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { Action } from "../../../dispatcher/actions";
+import { mediaFromMxc } from "../../../customisations/Media";
 import Tooltip from './Tooltip';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.elements.Pill")
 class Pill extends React.Component {
@@ -144,7 +144,7 @@ class Pill extends React.Component {
                 }
             }
         }
-        this.setState({resourceId, pillType, member, group, room});
+        this.setState({ resourceId, pillType, member, group, room });
     }
 
     componentDidMount() {
@@ -180,19 +180,20 @@ class Pill extends React.Component {
             member.rawDisplayName = resp.displayname;
             member.events.member = {
                 getContent: () => {
-                    return {avatar_url: resp.avatar_url};
+                    return { avatar_url: resp.avatar_url };
                 },
                 getDirectionalContent: function() {
                     return this.getContent();
                 },
             };
-            this.setState({member});
+            this.setState({ member });
         }).catch((err) => {
             console.error('Could not retrieve profile data for ' + userId + ':', err);
         });
     }
 
-    onUserPillClicked = () => {
+    onUserPillClicked = (e) => {
+        e.preventDefault();
         dis.dispatch({
             action: Action.ViewUser,
             member: this.state.member,
@@ -253,12 +254,15 @@ class Pill extends React.Component {
                 break;
             case Pill.TYPE_GROUP_MENTION: {
                 if (this.state.group) {
-                    const {avatarUrl, groupId, name} = this.state.group;
+                    const { avatarUrl, groupId, name } = this.state.group;
 
                     linkText = groupId;
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <BaseAvatar
-                            name={name || groupId} width={16} height={16} aria-hidden="true"
+                            name={name || groupId}
+                            width={16}
+                            height={16}
+                            aria-hidden="true"
                             url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(16) : null} />;
                     }
                     pillClass = 'mx_GroupPill';
@@ -273,7 +277,7 @@ class Pill extends React.Component {
         });
 
         if (this.state.pillType) {
-            const {yOffset} = this.props;
+            const { yOffset } = this.props;
 
             let tip;
             if (this.state.hover && resource) {
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.tsx
similarity index 51%
rename from src/components/views/elements/PowerSelector.js
rename to src/components/views/elements/PowerSelector.tsx
index a7a65425a3..a99812028e 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.tsx
@@ -15,40 +15,52 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import * as Roles from '../../../Roles';
 import { _t } from '../../../languageHandler';
 import Field from "./Field";
-import {Key} from "../../../Keyboard";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Key } from "../../../Keyboard";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+const CUSTOM_VALUE = "SELECT_VALUE_CUSTOM";
+
+interface IProps {
+    value: number;
+    // The maximum value that can be set with the power selector
+    maxValue: number;
+
+    // Default user power level for the room
+    usersDefault: number;
+
+    // should the user be able to change the value? false by default.
+    disabled?: boolean;
+    onChange?: (value: number, powerLevelKey: string) => void;
+
+    // Optional key to pass as the second argument to `onChange`
+    powerLevelKey?: string;
+
+    // The name to annotate the selector with
+    label?: string;
+}
+
+interface IState {
+    levelRoleMap: {};
+    // List of power levels to show in the drop-down
+    options: number[];
+
+    customValue: number;
+    selectValue: number | string;
+    custom?: boolean;
+    customLevel?: number;
+}
 
 @replaceableComponent("views.elements.PowerSelector")
-export default class PowerSelector extends React.Component {
-    static propTypes = {
-        value: PropTypes.number.isRequired,
-        // The maximum value that can be set with the power selector
-        maxValue: PropTypes.number.isRequired,
-
-        // Default user power level for the room
-        usersDefault: PropTypes.number.isRequired,
-
-        // should the user be able to change the value? false by default.
-        disabled: PropTypes.bool,
-        onChange: PropTypes.func,
-
-        // Optional key to pass as the second argument to `onChange`
-        powerLevelKey: PropTypes.string,
-
-        // The name to annotate the selector with
-        label: PropTypes.string,
-    }
-
-    static defaultProps = {
+export default class PowerSelector extends React.Component<IProps, IState> {
+    public static defaultProps: Partial<IProps> = {
         maxValue: Infinity,
         usersDefault: 0,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -62,26 +74,26 @@ export default class PowerSelector extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillMount() {
-        this._initStateFromProps(this.props);
+    // eslint-disable-next-line camelcase, @typescript-eslint/naming-convention
+    public UNSAFE_componentWillMount(): void {
+        this.initStateFromProps(this.props);
     }
 
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(newProps) {
-        this._initStateFromProps(newProps);
+    // eslint-disable-next-line camelcase, @typescript-eslint/naming-convention
+    public UNSAFE_componentWillReceiveProps(newProps: IProps): void {
+        this.initStateFromProps(newProps);
     }
 
-    _initStateFromProps(newProps) {
+    private initStateFromProps(newProps: IProps): void {
         // This needs to be done now because levelRoleMap has translated strings
         const levelRoleMap = Roles.levelRoleMap(newProps.usersDefault);
         const options = Object.keys(levelRoleMap).filter(level => {
             return (
                 level === undefined ||
-                level <= newProps.maxValue ||
-                level == newProps.value
+                parseInt(level) <= newProps.maxValue ||
+                parseInt(level) == newProps.value
             );
-        });
+        }).map(level => parseInt(level));
 
         const isCustom = levelRoleMap[newProps.value] === undefined;
 
@@ -90,32 +102,33 @@ export default class PowerSelector extends React.Component {
             options,
             custom: isCustom,
             customLevel: newProps.value,
-            selectValue: isCustom ? "SELECT_VALUE_CUSTOM" : newProps.value,
+            selectValue: isCustom ? CUSTOM_VALUE : newProps.value,
         });
     }
 
-    onSelectChange = event => {
-        const isCustom = event.target.value === "SELECT_VALUE_CUSTOM";
+    private onSelectChange = (event: React.ChangeEvent<HTMLSelectElement>): void => {
+        const isCustom = event.target.value === CUSTOM_VALUE;
         if (isCustom) {
-            this.setState({custom: true});
+            this.setState({ custom: true });
         } else {
-            this.props.onChange(event.target.value, this.props.powerLevelKey);
-            this.setState({selectValue: event.target.value});
+            const powerLevel = parseInt(event.target.value);
+            this.props.onChange(powerLevel, this.props.powerLevelKey);
+            this.setState({ selectValue: powerLevel });
         }
     };
 
-    onCustomChange = event => {
-        this.setState({customValue: event.target.value});
+    private onCustomChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
+        this.setState({ customValue: parseInt(event.target.value) });
     };
 
-    onCustomBlur = event => {
+    private onCustomBlur = (event: React.FocusEvent): void => {
         event.preventDefault();
         event.stopPropagation();
 
-        this.props.onChange(parseInt(this.state.customValue), this.props.powerLevelKey);
+        this.props.onChange(this.state.customValue, this.props.powerLevelKey);
     };
 
-    onCustomKeyDown = event => {
+    private onCustomKeyDown = (event: React.KeyboardEvent<HTMLInputElement>): void => {
         if (event.key === Key.ENTER) {
             event.preventDefault();
             event.stopPropagation();
@@ -125,17 +138,19 @@ export default class PowerSelector extends React.Component {
             // raising a dialog which causes a blur which causes a dialog which causes a blur and
             // so on. By not causing the onChange to be called here, we avoid the loop because we
             // handle the onBlur safely.
-            event.target.blur();
+            (event.target as HTMLInputElement).blur();
         }
     };
 
-    render() {
+    public render(): JSX.Element {
         let picker;
         const label = typeof this.props.label === "undefined" ? _t("Power level") : this.props.label;
         if (this.state.custom) {
             picker = (
-                <Field type="number"
-                    label={label} max={this.props.maxValue}
+                <Field
+                    type="number"
+                    label={label}
+                    max={this.props.maxValue}
                     onBlur={this.onCustomBlur}
                     onKeyDown={this.onCustomKeyDown}
                     onChange={this.onCustomChange}
@@ -145,23 +160,26 @@ export default class PowerSelector extends React.Component {
             );
         } else {
             // Each level must have a definition in this.state.levelRoleMap
-            let options = this.state.options.map((level) => {
+            const options = this.state.options.map((level) => {
                 return {
-                    value: level,
+                    value: String(level),
                     text: Roles.textualPowerLevel(level, this.props.usersDefault),
                 };
             });
-            options.push({ value: "SELECT_VALUE_CUSTOM", text: _t("Custom level") });
-            options = options.map((op) => {
+            options.push({ value: CUSTOM_VALUE, text: _t("Custom level") });
+            const optionsElements = options.map((op) => {
                 return <option value={op.value} key={op.value}>{ op.text }</option>;
             });
 
             picker = (
-                <Field element="select"
-                    label={label} onChange={this.onSelectChange}
-                    value={String(this.state.selectValue)} disabled={this.props.disabled}
+                <Field
+                    element="select"
+                    label={label}
+                    onChange={this.onSelectChange}
+                    value={String(this.state.selectValue)}
+                    disabled={this.props.disabled}
                 >
-                    {options}
+                    { optionsElements }
                 </Field>
             );
         }
diff --git a/src/components/views/elements/ProgressBar.tsx b/src/components/views/elements/ProgressBar.tsx
index 90832e5006..c4ff06e04e 100644
--- a/src/components/views/elements/ProgressBar.tsx
+++ b/src/components/views/elements/ProgressBar.tsx
@@ -21,7 +21,7 @@ interface IProps {
     max: number;
 }
 
-const ProgressBar: React.FC<IProps> = ({value, max}) => {
+const ProgressBar: React.FC<IProps> = ({ value, max }) => {
     return <progress className="mx_ProgressBar" max={max} value={value} />;
 };
 
diff --git a/src/components/views/elements/QRCode.tsx b/src/components/views/elements/QRCode.tsx
index 9ce3dc7202..50b12ae23d 100644
--- a/src/components/views/elements/QRCode.tsx
+++ b/src/components/views/elements/QRCode.tsx
@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 import * as React from "react";
-import {toDataURL, QRCodeSegment, QRCodeToDataURLOptions} from "qrcode";
+import { toDataURL, QRCodeSegment, QRCodeToDataURLOptions } from "qrcode";
 import classNames from "classnames";
 
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import Spinner from "./Spinner";
 
 interface IProps extends QRCodeToDataURLOptions {
@@ -30,11 +30,11 @@ const defaultOptions: QRCodeToDataURLOptions = {
     errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
 };
 
-const QRCode: React.FC<IProps> = ({data, className, ...options}) => {
+const QRCode: React.FC<IProps> = ({ data, className, ...options }) => {
     const [dataUri, setUri] = React.useState<string>(null);
     React.useEffect(() => {
         let cancelled = false;
-        toDataURL(data, {...defaultOptions, ...options}).then(uri => {
+        toDataURL(data, { ...defaultOptions, ...options }).then(uri => {
             if (cancelled) return;
             setUri(uri);
         });
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.tsx
similarity index 61%
rename from src/components/views/elements/ReplyThread.js
rename to src/components/views/elements/ReplyThread.tsx
index bbced5328f..b5e2d1191c 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.tsx
@@ -1,7 +1,6 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,69 +14,85 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 import React from 'react';
-import * as sdk from '../../../index';
-import {_t} from '../../../languageHandler';
-import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
-import {wantsDateSeparator} from '../../../DateUtils';
-import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
-import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { UNSTABLE_ELEMENT_REPLY_IN_THREAD } from "matrix-js-sdk/src/@types/event";
+import { makeUserPermalink, RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import SettingsStore from "../../../settings/SettingsStore";
-import {LayoutPropType} from "../../../settings/Layout";
+import { Layout } from "../../../settings/Layout";
 import escapeHtml from "escape-html";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {Action} from "../../../dispatcher/actions";
+import { getUserNameColorClass } from "../../../utils/FormattingUtils";
+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";
+import { PERMITTED_URL_SCHEMES } from "../../../HtmlUtils";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from './Spinner';
+import ReplyTile from "../rooms/ReplyTile";
+import Pill from './Pill';
+import { Room } from 'matrix-js-sdk/src/models/room';
+
+/**
+ * This number is based on the previous behavior - if we have message of height
+ * over 60px then we want to show button that will allow to expand it.
+ */
+const SHOW_EXPAND_QUOTE_PIXELS = 60;
+
+interface IProps {
+    // the latest event in this chain of replies
+    parentEv?: MatrixEvent;
+    // called when the ReplyThread contents has changed, including EventTiles thereof
+    onHeightChanged: () => void;
+    permalinkCreator: RoomPermalinkCreator;
+    // Specifies which layout to use.
+    layout?: Layout;
+    // Whether to always show a timestamp
+    alwaysShowTimestamps?: boolean;
+    forExport?: boolean;
+    isQuoteExpanded?: boolean;
+    setQuoteExpanded: (isExpanded: boolean) => void;
+}
+
+interface IState {
+    // The loaded events to be rendered as linear-replies
+    events: MatrixEvent[];
+    // The latest loaded event which has not yet been shown
+    loadedEv: MatrixEvent;
+    // Whether the component is still loading more events
+    loading: boolean;
+    // Whether as error was encountered fetching a replied to event.
+    err: boolean;
+}
 
 // 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
-        parentEv: PropTypes.instanceOf(MatrixEvent),
-        // called when the ReplyThread contents has changed, including EventTiles thereof
-        onHeightChanged: PropTypes.func.isRequired,
-        permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
-        // Specifies which layout to use.
-        layout: LayoutPropType,
-    };
-
+export default class ReplyThread extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
+    private unmounted = false;
+    private room: Room;
+    private blockquoteRef = React.createRef<HTMLElement>();
 
     constructor(props, context) {
         super(props, context);
 
         this.state = {
-            // The loaded events to be rendered as linear-replies
             events: [],
-
-            // The latest loaded event which has not yet been shown
             loadedEv: null,
-            // Whether the component is still loading more events
             loading: true,
-
-            // Whether as error was encountered fetching a replied to event.
             err: false,
         };
 
-        this.unmounted = false;
-        this.context.on("Event.replaced", this.onEventReplaced);
         this.room = this.context.getRoom(this.props.parentEv.getRoomId());
-        this.room.on("Room.redaction", this.onRoomRedaction);
-        this.room.on("Room.redactionCancelled", this.onRoomRedaction);
-
-        this.onQuoteClick = this.onQuoteClick.bind(this);
-        this.canCollapse = this.canCollapse.bind(this);
-        this.collapse = this.collapse.bind(this);
     }
 
-    static getParentEventId(ev) {
+    public static getParentEventId(ev: MatrixEvent): string | undefined {
         if (!ev || ev.isRedacted()) return;
 
         // XXX: For newer relations (annotations, replacements, etc.), we now
@@ -85,7 +100,13 @@ export default class ReplyThread extends React.Component {
         // could be used here for replies as well... However, the helper
         // currently assumes the relation has a `rel_type`, which older replies
         // do not, so this block is left as-is for now.
-        const mRelatesTo = ev.getWireContent()['m.relates_to'];
+        //
+        // We're prefer ev.getContent() over ev.getWireContent() to make sure
+        // we grab the latest edit with potentially new relations. But we also
+        // can't just rely on ev.getContent() by itself because historically we
+        // still show the reply from the original message even though the edit
+        // event does not include the relation reply.
+        const mRelatesTo = ev.getContent()['m.relates_to'] || ev.getWireContent()['m.relates_to'];
         if (mRelatesTo && mRelatesTo['m.in_reply_to']) {
             const mInReplyTo = mRelatesTo['m.in_reply_to'];
             if (mInReplyTo && mInReplyTo['event_id']) return mInReplyTo['event_id'];
@@ -93,7 +114,7 @@ export default class ReplyThread extends React.Component {
     }
 
     // Part of Replies fallback support
-    static stripPlainReply(body) {
+    public static stripPlainReply(body: string): string {
         // Removes lines beginning with `> ` until you reach one that doesn't.
         const lines = body.split('\n');
         while (lines.length && lines[0].startsWith('> ')) lines.shift();
@@ -103,7 +124,7 @@ export default class ReplyThread extends React.Component {
     }
 
     // Part of Replies fallback support
-    static stripHTMLReply(html) {
+    public static stripHTMLReply(html: string): string {
         // Sanitize the original HTML for inclusion in <mx-reply>.  We allow
         // any HTML, since the original sender could use special tags that we
         // don't recognize, but want to pass along to any recipients who do
@@ -125,10 +146,13 @@ export default class ReplyThread extends React.Component {
     }
 
     // Part of Replies fallback support
-    static getNestedReplyText(ev, permalinkCreator) {
+    public static getNestedReplyText(
+        ev: MatrixEvent,
+        permalinkCreator: RoomPermalinkCreator,
+    ): { body: string, html: string } | null {
         if (!ev) return null;
 
-        let {body, formatted_body: html} = ev.getContent();
+        let { body, formatted_body: html } = ev.getContent();
         if (this.getParentEventId(ev)) {
             if (body) body = this.stripPlainReply(body);
         }
@@ -198,75 +222,67 @@ export default class ReplyThread extends React.Component {
                 return null;
         }
 
-        return {body, html};
+        return { body, html };
     }
 
-    static makeReplyMixIn(ev) {
+    public static makeReplyMixIn(ev: MatrixEvent, replyInThread: boolean) {
         if (!ev) return {};
-        return {
+
+        const replyMixin = {
             'm.relates_to': {
                 'm.in_reply_to': {
                     'event_id': ev.getId(),
                 },
             },
         };
+
+        /**
+         * @experimental
+         * Rendering hint for threads, only attached if true to make
+         * sure that Element does not start sending that property for all events
+         */
+        if (replyInThread) {
+            const inReplyTo = replyMixin['m.relates_to']['m.in_reply_to'];
+            inReplyTo[UNSTABLE_ELEMENT_REPLY_IN_THREAD.name] = replyInThread;
+        }
+
+        return replyMixin;
     }
 
-    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, layout) {
-        if (!ReplyThread.getParentEventId(parentEv)) {
-            return null;
-        }
-        return <ReplyThread
-            parentEv={parentEv}
-            onHeightChanged={onHeightChanged}
-            ref={ref}
-            permalinkCreator={permalinkCreator}
-            layout={layout}
-        />;
+    public static hasThreadReply(event: MatrixEvent) {
+        return Boolean(ReplyThread.getParentEventId(event));
     }
 
     componentDidMount() {
         this.initialize();
+        this.trySetExpandableQuotes();
     }
 
     componentDidUpdate() {
         this.props.onHeightChanged();
+        this.trySetExpandableQuotes();
     }
 
     componentWillUnmount() {
         this.unmounted = true;
-        this.context.removeListener("Event.replaced", this.onEventReplaced);
-        if (this.room) {
-            this.room.removeListener("Room.redaction", this.onRoomRedaction);
-            this.room.removeListener("Room.redactionCancelled", this.onRoomRedaction);
+    }
+
+    private trySetExpandableQuotes() {
+        if (this.props.isQuoteExpanded === undefined && this.blockquoteRef.current) {
+            const el: HTMLElement | null = this.blockquoteRef.current.querySelector('.mx_EventTile_body');
+            if (el) {
+                const code: HTMLElement | null = el.querySelector('code');
+                const isCodeEllipsisShown = code ? code.offsetHeight >= SHOW_EXPAND_QUOTE_PIXELS : false;
+                const isElipsisShown = el.offsetHeight >= SHOW_EXPAND_QUOTE_PIXELS || isCodeEllipsisShown;
+                if (isElipsisShown) {
+                    this.props.setQuoteExpanded(false);
+                }
+            }
         }
     }
 
-    updateForEventId = (eventId) => {
-        if (this.state.events.some(event => event.getId() === eventId)) {
-            this.forceUpdate();
-        }
-    };
-
-    onEventReplaced = (ev) => {
-        if (this.unmounted) return;
-
-        // If one of the events we are rendering gets replaced, force a re-render
-        this.updateForEventId(ev.getId());
-    };
-
-    onRoomRedaction = (ev) => {
-        if (this.unmounted) return;
-
-        const eventId = ev.getAssociatedId();
-        if (!eventId) return;
-
-        // If one of the events we are rendering gets redacted, force a re-render
-        this.updateForEventId(eventId);
-    };
-
-    async initialize() {
-        const {parentEv} = this.props;
+    private async initialize(): Promise<void> {
+        const { parentEv } = this.props;
         // at time of making this component we checked that props.parentEv has a parentEventId
         const ev = await this.getEvent(ReplyThread.getParentEventId(parentEv));
 
@@ -280,11 +296,11 @@ export default class ReplyThread extends React.Component {
                 loading: false,
             });
         } else {
-            this.setState({err: true});
+            this.setState({ err: true });
         }
     }
 
-    async getNextEvent(ev) {
+    private async getNextEvent(ev: MatrixEvent): Promise<MatrixEvent> {
         try {
             const inReplyToEventId = ReplyThread.getParentEventId(ev);
             return await this.getEvent(inReplyToEventId);
@@ -293,7 +309,8 @@ export default class ReplyThread extends React.Component {
         }
     }
 
-    async getEvent(eventId) {
+    private async getEvent(eventId: string): Promise<MatrixEvent> {
+        if (!eventId) return null;
         const event = this.room.findEventById(eventId);
         if (event) return event;
 
@@ -309,15 +326,15 @@ export default class ReplyThread extends React.Component {
         return this.room.findEventById(eventId);
     }
 
-    canCollapse() {
+    public canCollapse = (): boolean => {
         return this.state.events.length > 1;
-    }
+    };
 
-    collapse() {
+    public collapse = (): void => {
         this.initialize();
-    }
+    };
 
-    async onQuoteClick() {
+    private onQuoteClick = async (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>): Promise<void> => {
         const events = [this.state.loadedEv, ...this.state.events];
 
         let loadedEv = null;
@@ -330,7 +347,11 @@ export default class ReplyThread extends React.Component {
             events,
         });
 
-        dis.fire(Action.FocusComposer);
+        dis.fire(Action.FocusSendMessageComposer);
+    };
+
+    private getReplyThreadColorClass(ev: MatrixEvent): string {
+        return getUserNameColorClass(ev.getSender()).replace("Username", "ReplyThread");
     }
 
     render() {
@@ -345,9 +366,8 @@ export default class ReplyThread extends React.Component {
             </blockquote>;
         } else if (this.state.loadedEv) {
             const ev = this.state.loadedEv;
-            const Pill = sdk.getComponent('elements.Pill');
             const room = this.context.getRoom(ev.getRoomId());
-            header = <blockquote className="mx_ReplyThread">
+            header = <blockquote className={`mx_ReplyThread ${this.getReplyThreadColorClass(ev)}`}>
                 {
                     _t('<a>In reply to</a> <pill>', {}, {
                         'a': (sub) => <a onClick={this.onQuoteClick} className="mx_ReplyThread_show">{ sub }</a>,
@@ -362,34 +382,41 @@ export default class ReplyThread extends React.Component {
                     })
                 }
             </blockquote>;
+        } else if (this.props.forExport) {
+            const eventId = ReplyThread.getParentEventId(this.props.parentEv);
+            header = <p className="mx_ReplyThread_Export">
+                { _t("In reply to <a>this message</a>",
+                    {},
+                    { a: (sub) => (
+                        <a className="mx_reply_anchor" href={`#${eventId}`} scroll-to={eventId}> { sub } </a>
+                    ),
+                    })
+                }
+            </p>;
         } else if (this.state.loading) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             header = <Spinner w={16} h={16} />;
         }
 
-        const EventTile = sdk.getComponent('views.rooms.EventTile');
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const { isQuoteExpanded } = this.props;
         const evTiles = this.state.events.map((ev) => {
-            let dateSep = null;
-
-            if (wantsDateSeparator(this.props.parentEv.getDate(), ev.getDate())) {
-                dateSep = <a href={this.props.url}><DateSeparator ts={ev.getTs()} /></a>;
-            }
-
-            return <blockquote className="mx_ReplyThread" key={ev.getId()}>
-                { dateSep }
-                <EventTile
-                    mxEvent={ev}
-                    tileShape="reply"
-                    onHeightChanged={this.props.onHeightChanged}
-                    permalinkCreator={this.props.permalinkCreator}
-                    isRedacted={ev.isRedacted()}
-                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
-                    layout={this.props.layout}
-                    enableFlair={SettingsStore.getValue(UIFeature.Flair)}
-                    replacingEventId={ev.replacingEventId()}
-                />
-            </blockquote>;
+            const classname = classNames({
+                'mx_ReplyThread': true,
+                [this.getReplyThreadColorClass(ev)]: true,
+                // We don't want to add the class if it's undefined, it should only be expanded/collapsed when it's true/false
+                'mx_ReplyThread--expanded': isQuoteExpanded === true,
+                // We don't want to add the class if it's undefined, it should only be expanded/collapsed when it's true/false
+                'mx_ReplyThread--collapsed': isQuoteExpanded === false,
+            });
+            return (
+                <blockquote ref={this.blockquoteRef} className={classname} key={ev.getId()}>
+                    <ReplyTile
+                        mxEvent={ev}
+                        onHeightChanged={this.props.onHeightChanged}
+                        permalinkCreator={this.props.permalinkCreator}
+                        toggleExpandedQuote={() => this.props.setQuoteExpanded(!this.props.isQuoteExpanded)}
+                    />
+                </blockquote>
+            );
         });
 
         return <div className="mx_ReplyThread_wrapper">
diff --git a/src/components/views/elements/ResizeHandle.js b/src/components/views/elements/ResizeHandle.tsx
similarity index 54%
rename from src/components/views/elements/ResizeHandle.js
rename to src/components/views/elements/ResizeHandle.tsx
index 578689b45c..5ca4cadb54 100644
--- a/src/components/views/elements/ResizeHandle.js
+++ b/src/components/views/elements/ResizeHandle.tsx
@@ -1,27 +1,27 @@
 
 import React from 'react'; // eslint-disable-line no-unused-vars
-import PropTypes from 'prop-types';
 
 //see src/resizer for the actual resizing code, this is just the DOM for the resize handle
-const ResizeHandle = (props) => {
+interface IResizeHandleProps {
+    vertical?: boolean;
+    reverse?: boolean;
+    id?: string;
+    passRef?: React.RefObject<HTMLDivElement>;
+}
+
+const ResizeHandle: React.FC<IResizeHandleProps> = ({ vertical, reverse, id, passRef }) => {
     const classNames = ['mx_ResizeHandle'];
-    if (props.vertical) {
+    if (vertical) {
         classNames.push('mx_ResizeHandle_vertical');
     } else {
         classNames.push('mx_ResizeHandle_horizontal');
     }
-    if (props.reverse) {
+    if (reverse) {
         classNames.push('mx_ResizeHandle_reverse');
     }
     return (
-        <div className={classNames.join(' ')} data-id={props.id}><div /></div>
+        <div ref={passRef} className={classNames.join(' ')} data-id={id}><div /></div>
     );
 };
 
-ResizeHandle.propTypes = {
-    vertical: PropTypes.bool,
-    reverse: PropTypes.bool,
-    id: PropTypes.string,
-};
-
 export default ResizeHandle;
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.tsx
similarity index 59%
rename from src/components/views/elements/RoomAliasField.js
rename to src/components/views/elements/RoomAliasField.tsx
index 813dd8b5cc..9c383989b1 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.tsx
@@ -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.
@@ -13,67 +13,83 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
+import React, { createRef, KeyboardEventHandler } from "react";
+
 import { _t } from '../../../languageHandler';
-import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import withValidation from './Validation';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Field, { IValidateOpts } from "./Field";
+
+interface IProps {
+    domain: string;
+    value: string;
+    label?: string;
+    placeholder?: string;
+    disabled?: boolean;
+    onKeyDown?: KeyboardEventHandler;
+    onChange?(value: string): void;
+}
+
+interface IState {
+    isValid: boolean;
+}
 
 // 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,
-        onChange: PropTypes.func,
-        value: PropTypes.string.isRequired,
-    };
+export default class RoomAliasField extends React.PureComponent<IProps, IState> {
+    private fieldRef = createRef<Field>();
 
-    constructor(props) {
-        super(props);
-        this.state = {isValid: true};
+    constructor(props, context) {
+        super(props, context);
+
+        this.state = {
+            isValid: true,
+        };
     }
 
-    _asFullAlias(localpart) {
+    private asFullAlias(localpart: string): string {
         return `#${localpart}:${this.props.domain}`;
     }
 
     render() {
-        const Field = sdk.getComponent('views.elements.Field');
         const poundSign = (<span>#</span>);
         const aliasPostfix = ":" + this.props.domain;
-        const domain = (<span title={aliasPostfix}>{aliasPostfix}</span>);
+        const domain = (<span title={aliasPostfix}>{ aliasPostfix }</span>);
         const maxlength = 255 - this.props.domain.length - 2;   // 2 for # and :
         return (
             <Field
-                label={_t("Room address")}
+                label={this.props.label || _t("Room address")}
                 className="mx_RoomAliasField"
                 prefixComponent={poundSign}
                 postfixComponent={domain}
-                ref={ref => this._fieldRef = ref}
-                onValidate={this._onValidate}
-                placeholder={_t("e.g. my-room")}
-                onChange={this._onChange}
+                ref={this.fieldRef}
+                onValidate={this.onValidate}
+                placeholder={this.props.placeholder || _t("e.g. my-room")}
+                onChange={this.onChange}
                 value={this.props.value.substring(1, this.props.value.length - this.props.domain.length - 1)}
                 maxLength={maxlength}
+                disabled={this.props.disabled}
+                autoComplete="off"
+                onKeyDown={this.props.onKeyDown}
             />
         );
     }
 
-    _onChange = (ev) => {
+    private onChange = (ev) => {
         if (this.props.onChange) {
-            this.props.onChange(this._asFullAlias(ev.target.value));
+            this.props.onChange(this.asFullAlias(ev.target.value));
         }
     };
 
-    _onValidate = async (fieldState) => {
-        const result = await this._validationRules(fieldState);
-        this.setState({isValid: result.valid});
+    private onValidate = async (fieldState) => {
+        const result = await this.validationRules(fieldState);
+        this.setState({ isValid: result.valid });
         return result;
     };
 
-    _validationRules = withValidation({
+    private validationRules = withValidation({
         rules: [
             {
                 key: "safeLocalpart",
@@ -81,7 +97,7 @@ export default class RoomAliasField extends React.PureComponent {
                     if (!value) {
                         return true;
                     }
-                    const fullAlias = this._asFullAlias(value);
+                    const fullAlias = this.asFullAlias(value);
                     // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
                     return !value.includes("#") && !value.includes(":") && !value.includes(",") &&
                         encodeURI(fullAlias) === fullAlias;
@@ -90,17 +106,17 @@ export default class RoomAliasField extends React.PureComponent {
             }, {
                 key: "required",
                 test: async ({ value, allowEmpty }) => allowEmpty || !!value,
-                invalid: () => _t("Please provide a room address"),
+                invalid: () => _t("Please provide an address"),
             }, {
                 key: "taken",
                 final: true,
-                test: async ({value}) => {
+                test: async ({ value }) => {
                     if (!value) {
                         return true;
                     }
                     const client = MatrixClientPeg.get();
                     try {
-                        await client.getRoomIdForAlias(this._asFullAlias(value));
+                        await client.getRoomIdForAlias(this.asFullAlias(value));
                         // we got a room id, so the alias is taken
                         return false;
                     } catch (err) {
@@ -116,15 +132,15 @@ export default class RoomAliasField extends React.PureComponent {
         ],
     });
 
-    get isValid() {
+    public get isValid() {
         return this.state.isValid;
     }
 
-    validate(options) {
-        return this._fieldRef.validate(options);
+    public validate(options: IValidateOpts) {
+        return this.fieldRef.current?.validate(options);
     }
 
-    focus() {
-        this._fieldRef.focus();
+    public focus() {
+        this.fieldRef.current?.focus();
     }
 }
diff --git a/src/components/views/elements/RoomName.tsx b/src/components/views/elements/RoomName.tsx
index 9178155d19..cdd83aedc2 100644
--- a/src/components/views/elements/RoomName.tsx
+++ b/src/components/views/elements/RoomName.tsx
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useEffect, useState} from "react";
-import {Room} from "matrix-js-sdk/src/models/room";
+import React, { useEffect, useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
 
 interface IProps {
     room: Room;
@@ -34,7 +34,7 @@ const RoomName = ({ room, children }: IProps): JSX.Element => {
     }, [room]);
 
     if (children) return children(name);
-    return name || "";
+    return <>{ name || "" }</>;
 };
 
 export default RoomName;
diff --git a/src/components/views/elements/RoomTopic.tsx b/src/components/views/elements/RoomTopic.tsx
index fe8aa5a83d..0526c2676c 100644
--- a/src/components/views/elements/RoomTopic.tsx
+++ b/src/components/views/elements/RoomTopic.tsx
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useEffect, useState} from "react";
-import {EventType} from "matrix-js-sdk/src/@types/event";
-import {Room} from "matrix-js-sdk/src/models/room";
+import React, { useEffect, useState } from "react";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import {linkifyElement} from "../../../HtmlUtils";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
+import { linkifyElement } from "../../../HtmlUtils";
 
 interface IProps {
     room?: Room;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index a531abdf83..68c58a3e56 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -17,14 +17,14 @@ limitations under the License.
 import React from "react";
 import { chunk } from "lodash";
 import classNames from "classnames";
-import {MatrixClient} from "matrix-js-sdk/src/client";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
 import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";
-import {_t} from "../../../languageHandler";
-import {IdentityProviderBrand, IIdentityProvider, ISSOFlow} from "../../../Login";
+import { _t } from "../../../languageHandler";
+import { IdentityProviderBrand, IIdentityProvider, ISSOFlow } from "../../../Login";
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 interface ISSOButtonProps extends Omit<IProps, "flow"> {
     idp: IIdentityProvider;
@@ -48,7 +48,7 @@ const getIcon = (brand: IdentityProviderBrand | string) => {
         default:
             return null;
     }
-}
+};
 
 const SSOButton: React.FC<ISSOButtonProps> = ({
     matrixClient,
@@ -111,7 +111,7 @@ interface IProps {
 
 const MAX_PER_ROW = 6;
 
-const SSOButtons: React.FC<IProps> = ({matrixClient, flow, loginType, fragmentAfterLogin, primary}) => {
+const SSOButtons: React.FC<IProps> = ({ matrixClient, flow, loginType, fragmentAfterLogin, primary }) => {
     const providers = flow.identity_providers || [];
     if (providers.length < 2) {
         return <div className="mx_SSOButtons">
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 9f06e2618c..5e6ef62504 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -17,8 +17,8 @@ limitations under the License.
 import React from 'react';
 
 import AccessibleButton from "./AccessibleButton";
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import {_t} from "../../../languageHandler";
+import { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
+import { _t } from "../../../languageHandler";
 import TextWithTooltip from "./TextWithTooltip";
 import SdkConfig from "../../../SdkConfig";
 import Modal from "../../../Modal";
@@ -63,31 +63,31 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
             });
         };
         editBtn = <AccessibleButton className="mx_ServerPicker_change" kind="link" onClick={onClick}>
-            {_t("Edit")}
+            { _t("Edit") }
         </AccessibleButton>;
     }
 
     let serverName: React.ReactNode = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
     if (serverConfig.hsNameIsDifferent) {
         serverName = <TextWithTooltip class="mx_Login_underlinedServerName" tooltip={serverConfig.hsUrl}>
-            {serverConfig.hsName}
+            { serverConfig.hsName }
         </TextWithTooltip>;
     }
 
     let desc;
     if (serverConfig.hsName === "matrix.org") {
         desc = <span className="mx_ServerPicker_desc">
-            {_t("Join millions for free on the largest public server")}
+            { _t("Join millions for free on the largest public server") }
         </span>;
     }
 
     return <div className="mx_ServerPicker">
-        <h3>{title || _t("Homeserver")}</h3>
+        <h3>{ title || _t("Homeserver") }</h3>
         <AccessibleButton className="mx_ServerPicker_help" onClick={onHelpClick} />
-        <span className="mx_ServerPicker_server">{serverName}</span>
+        <span className="mx_ServerPicker_server">{ serverName }</span>
         { editBtn }
         { desc }
-    </div>
-}
+    </div>;
+};
 
 export default ServerPicker;
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index 4f885ab47d..0847db801e 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -21,7 +21,7 @@ import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 import StyledCheckbox from "./StyledCheckbox";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The setting must be a boolean
@@ -77,9 +77,10 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
     public render() {
         const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
 
-        let label = this.props.label;
-        if (!label) label = SettingsStore.getDisplayName(this.props.name, this.props.level);
-        else label = _t(label);
+        const label = this.props.label
+            ? _t(this.props.label)
+            : SettingsStore.getDisplayName(this.props.name, this.props.level);
+        const description = SettingsStore.getDescription(this.props.name);
 
         if (this.props.useCheckbox) {
             return <StyledCheckbox
@@ -87,18 +88,21 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
                 onChange={this.checkBoxOnChange}
                 disabled={this.props.disabled || !canChange}
             >
-                {label}
+                { label }
             </StyledCheckbox>;
         } else {
             return (
                 <div className="mx_SettingsFlag">
-                    <span className="mx_SettingsFlag_label">{label}</span>
+                    <span className="mx_SettingsFlag_label">{ label }</span>
                     <ToggleSwitch
                         checked={this.state.value}
                         onChange={this.onChange}
                         disabled={this.props.disabled || !canChange}
                         aria-label={label}
                     />
+                    { description && <div className="mx_SettingsFlag_microcopy">
+                        { description }
+                    </div> }
                 </div>
             );
         }
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index b513f90460..df5776648e 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import * as React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // A callback for the selected value
@@ -86,8 +86,8 @@ export default class Slider extends React.Component<IProps> {
         if (!this.props.disabled) {
             const offset = this.offset(this.props.values, this.props.value);
             selection = <div className="mx_Slider_selection">
-                <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />
-                <hr style={{width: offset + "%"}} />
+                <div className="mx_Slider_selectionDot" style={{ left: "calc(-0.55em + " + offset + "%)" }} />
+                <hr style={{ width: offset + "%" }} />
             </div>;
         }
 
@@ -98,7 +98,7 @@ export default class Slider extends React.Component<IProps> {
                     { selection }
                 </div>
                 <div className="mx_Slider_dotContainer">
-                    {dots}
+                    { dots }
                 </div>
             </div>
         </div>;
@@ -139,7 +139,7 @@ class Dot extends React.PureComponent<IDotProps> {
             <div className={className} />
             <div className="mx_Slider_labelContainer">
                 <div className="mx_Slider_label">
-                    {this.props.label}
+                    { this.props.label }
                 </div>
             </div>
         </span>;
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 06e1efe415..972dac909a 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -16,12 +16,12 @@ limitations under the License.
 
 import React from 'react';
 
-import Dropdown from "../../views/elements/Dropdown"
-import * as sdk from '../../../index';
+import Dropdown from "../../views/elements/Dropdown";
 import PlatformPeg from "../../../PlatformPeg";
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from "./Spinner";
 
 function languageMatchesSearchQuery(query, language) {
     if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
@@ -30,14 +30,14 @@ function languageMatchesSearchQuery(query, language) {
 }
 
 interface SpellCheckLanguagesDropdownIProps {
-    className: string,
-    value: string,
-    onOptionChange(language: string),
+    className: string;
+    value: string;
+    onOptionChange(language: string);
 }
 
 interface SpellCheckLanguagesDropdownIState {
-    searchQuery: string,
-    languages: any,
+    searchQuery: string;
+    languages: any;
 }
 
 @replaceableComponent("views.elements.SpellCheckLanguagesDropdown")
@@ -45,7 +45,7 @@ export default class SpellCheckLanguagesDropdown extends React.Component<SpellCh
                                                                          SpellCheckLanguagesDropdownIState> {
     constructor(props) {
         super(props);
-        this._onSearchChange = this._onSearchChange.bind(this);
+        this.onSearchChange = this.onSearchChange.bind(this);
 
         this.state = {
             searchQuery: '',
@@ -67,24 +67,21 @@ export default class SpellCheckLanguagesDropdown extends React.Component<SpellCh
                     langs.push({
                         label: language,
                         value: language,
-                    })
-                })
-                this.setState({languages: langs});
+                    });
+                });
+                this.setState({ languages: langs });
             }).catch((e) => {
-                this.setState({languages: ['en']});
+                this.setState({ languages: ['en'] });
             });
         }
     }
 
-    _onSearchChange(search) {
-        this.setState({
-            searchQuery: search,
-        });
+    private onSearchChange(searchQuery: string) {
+        this.setState({ searchQuery });
     }
 
     render() {
         if (this.state.languages === null) {
-            const Spinner = sdk.getComponent('elements.Spinner');
             return <Spinner />;
         }
 
@@ -118,7 +115,7 @@ export default class SpellCheckLanguagesDropdown extends React.Component<SpellCh
             id="mx_LanguageDropdown"
             className={this.props.className}
             onOptionChange={this.props.onOptionChange}
-            onSearchChange={this._onSearchChange}
+            onSearchChange={this.onSearchChange}
             searchEnabled={true}
             value={value}
             label={_t("Language Dropdown")}>
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
deleted file mode 100644
index 3ad8444bd6..0000000000
--- a/src/components/views/elements/Spinner.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from "react";
-import PropTypes from "prop-types";
-import {_t} from "../../../languageHandler";
-
-const Spinner = ({w = 32, h = 32, message}) => (
-    <div className="mx_Spinner">
-        { message && <React.Fragment><div className="mx_Spinner_Msg">{ message }</div>&nbsp;</React.Fragment> }
-        <div
-            className="mx_Spinner_icon"
-            style={{width: w, height: h}}
-            aria-label={_t("Loading...")}
-        ></div>
-    </div>
-);
-
-Spinner.propTypes = {
-    w: PropTypes.number,
-    h: PropTypes.number,
-    message: PropTypes.node,
-};
-
-export default Spinner;
diff --git a/src/components/views/elements/Spinner.tsx b/src/components/views/elements/Spinner.tsx
new file mode 100644
index 0000000000..ee43a5bf0e
--- /dev/null
+++ b/src/components/views/elements/Spinner.tsx
@@ -0,0 +1,45 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { _t } from "../../../languageHandler";
+
+interface IProps {
+    w?: number;
+    h?: number;
+    message?: string;
+}
+
+export default class Spinner extends React.PureComponent<IProps> {
+    public static defaultProps: Partial<IProps> = {
+        w: 32,
+        h: 32,
+    };
+
+    public render() {
+        const { w, h, message } = this.props;
+        return (
+            <div className="mx_Spinner">
+                { message && <React.Fragment><div className="mx_Spinner_Msg">{ message }</div>&nbsp;</React.Fragment> }
+                <div
+                    className="mx_Spinner_icon"
+                    style={{ width: w, height: h }}
+                    aria-label={_t("Loading...")}
+                />
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/elements/Spoiler.js b/src/components/views/elements/Spoiler.tsx
similarity index 74%
rename from src/components/views/elements/Spoiler.js
rename to src/components/views/elements/Spoiler.tsx
index 33b4382a2c..4779a7d90e 100644
--- a/src/components/views/elements/Spoiler.js
+++ b/src/components/views/elements/Spoiler.tsx
@@ -15,35 +15,44 @@
  */
 
 import React from 'react';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    reason?: string;
+    contentHtml: string;
+}
+
+interface IState {
+    visible: boolean;
+}
 
 @replaceableComponent("views.elements.Spoiler")
-export default class Spoiler extends React.Component {
-    constructor(props) {
+export default class Spoiler extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
         this.state = {
             visible: false,
         };
     }
 
-    toggleVisible(e) {
+    private toggleVisible = (e: React.MouseEvent): void => {
         if (!this.state.visible) {
             // we are un-blurring, we don't want this click to propagate to potential child pills
             e.preventDefault();
             e.stopPropagation();
         }
         this.setState({ visible: !this.state.visible });
-    }
+    };
 
-    render() {
+    public render(): JSX.Element {
         const reason = this.props.reason ? (
-            <span className="mx_EventTile_spoiler_reason">{"(" + this.props.reason + ")"}</span>
+            <span className="mx_EventTile_spoiler_reason">{ "(" + this.props.reason + ")" }</span>
         ) : null;
         // react doesn't allow appending a DOM node as child.
         // as such, we pass the this.props.contentHtml instead and then set the raw
         // HTML content. This is secure as the contents have already been parsed previously
         return (
-            <span className={"mx_EventTile_spoiler" + (this.state.visible ? " visible" : "")} onClick={this.toggleVisible.bind(this)}>
+            <span className={"mx_EventTile_spoiler" + (this.state.visible ? " visible" : "")} onClick={this.toggleVisible}>
                 { reason }
                 &nbsp;
                 <span className="mx_EventTile_spoiler_content" dangerouslySetInnerHTML={{ __html: this.props.contentHtml }} />
diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx
index 2454d1336b..b609f7159e 100644
--- a/src/components/views/elements/StyledCheckbox.tsx
+++ b/src/components/views/elements/StyledCheckbox.tsx
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { randomString } from "matrix-js-sdk/src/randomstring";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
 }
@@ -44,7 +44,7 @@ export default class StyledCheckbox extends React.PureComponent<IProps, IState>
         return <span className={"mx_Checkbox " + className}>
             <input id={this.id} {...otherProps} type="checkbox" />
             <label htmlFor={this.id}>
-                {/* Using the div to center the image */}
+                { /* Using the div to center the image */ }
                 <div className="mx_Checkbox_background">
                     <img src={require("../../../../res/img/feather-customised/check.svg")} />
                 </div>
diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
index 835394e055..1b68274f39 100644
--- a/src/components/views/elements/StyledRadioButton.tsx
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -16,10 +16,14 @@ limitations under the License.
 
 import React from 'react';
 import classnames from 'classnames';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
     outlined?: boolean;
+    // If true (default), the children will be contained within a <label> element
+    // If false, they'll be in a div. Putting interactive components that have labels
+    // themselves in labels can cause strange bugs like https://github.com/vector-im/element-web/issues/18031
+    childrenInLabel?: boolean;
 }
 
 interface IState {
@@ -29,10 +33,11 @@ interface IState {
 export default class StyledRadioButton extends React.PureComponent<IProps, IState> {
     public static readonly defaultProps = {
         className: '',
+        childrenInLabel: true,
     };
 
     public render() {
-        const { children, className, disabled, outlined, ...otherProps } = this.props;
+        const { children, className, disabled, outlined, childrenInLabel, ...otherProps } = this.props;
         const _className = classnames(
             'mx_RadioButton',
             className,
@@ -42,12 +47,27 @@ export default class StyledRadioButton extends React.PureComponent<IProps, IStat
                 "mx_RadioButton_checked": this.props.checked,
                 "mx_RadioButton_outlined": outlined,
             });
-        return <label className={_className}>
+
+        const radioButton = <React.Fragment>
             <input type='radio' disabled={disabled} {...otherProps} />
-            {/* Used to render the radio button circle */}
+            { /* Used to render the radio button circle */ }
             <div><div /></div>
-            <div className="mx_RadioButton_content">{children}</div>
-            <div className="mx_RadioButton_spacer" />
-        </label>;
+        </React.Fragment>;
+
+        if (childrenInLabel) {
+            return <label className={_className}>
+                { radioButton }
+                <div className="mx_RadioButton_content">{ children }</div>
+                <div className="mx_RadioButton_spacer" />
+            </label>;
+        } else {
+            return <div className={_className}>
+                <label className="mx_RadioButton_innerLabel">
+                    { radioButton }
+                </label>
+                <div className="mx_RadioButton_content">{ children }</div>
+                <div className="mx_RadioButton_spacer" />
+            </div>;
+        }
     }
 }
diff --git a/src/components/views/elements/StyledRadioGroup.tsx b/src/components/views/elements/StyledRadioGroup.tsx
index 6b9e992f92..1c3f5c10cd 100644
--- a/src/components/views/elements/StyledRadioGroup.tsx
+++ b/src/components/views/elements/StyledRadioGroup.tsx
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { ReactNode } from "react";
 import classNames from "classnames";
 
 import StyledRadioButton from "./StyledRadioButton";
 
-interface IDefinition<T extends string> {
+export interface IDefinition<T extends string> {
     value: T;
     className?: string;
     disabled?: boolean;
-    label: React.ReactChild;
-    description?: React.ReactChild;
+    label: ReactNode;
+    description?: ReactNode;
     checked?: boolean; // If provided it will override the value comparison done in the group
 }
 
@@ -34,29 +34,38 @@ interface IProps<T extends string> {
     definitions: IDefinition<T>[];
     value?: T; // if not provided no options will be selected
     outlined?: boolean;
+    disabled?: boolean;
     onChange(newValue: T): void;
 }
 
-function StyledRadioGroup<T extends string>({name, definitions, value, className, outlined, onChange}: IProps<T>) {
+function StyledRadioGroup<T extends string>({
+    name,
+    definitions,
+    value,
+    className,
+    outlined,
+    disabled,
+    onChange,
+}: IProps<T>) {
     const _onChange = e => {
         onChange(e.target.value);
     };
 
     return <React.Fragment>
-        {definitions.map(d => <React.Fragment key={d.value}>
+        { definitions.map(d => <React.Fragment key={d.value}>
             <StyledRadioButton
                 className={classNames(className, d.className)}
                 onChange={_onChange}
                 checked={d.checked !== undefined ? d.checked : d.value === value}
                 name={name}
                 value={d.value}
-                disabled={d.disabled}
+                disabled={d.disabled ?? disabled}
                 outlined={outlined}
             >
-                {d.label}
+                { d.label }
             </StyledRadioButton>
-            {d.description}
-        </React.Fragment>)}
+            { d.description ? <span>{ d.description }</span> : null }
+        </React.Fragment>) }
     </React.Fragment>;
 }
 
diff --git a/src/components/views/elements/SyntaxHighlight.js b/src/components/views/elements/SyntaxHighlight.tsx
similarity index 66%
rename from src/components/views/elements/SyntaxHighlight.js
rename to src/components/views/elements/SyntaxHighlight.tsx
index f9874c5367..cd65cddfba 100644
--- a/src/components/views/elements/SyntaxHighlight.js
+++ b/src/components/views/elements/SyntaxHighlight.tsx
@@ -15,40 +15,40 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {highlightBlock} from 'highlight.js';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { highlightBlock } from 'highlight.js';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    className?: string;
+    children?: React.ReactNode;
+}
 
 @replaceableComponent("views.elements.SyntaxHighlight")
-export default class SyntaxHighlight extends React.Component {
-    static propTypes = {
-        className: PropTypes.string,
-        children: PropTypes.node,
-    };
+export default class SyntaxHighlight extends React.Component<IProps> {
+    private el: HTMLPreElement = null;
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
-
-        this._ref = this._ref.bind(this);
     }
 
     // componentDidUpdate used here for reusability
-    componentDidUpdate() {
-        if (this._el) highlightBlock(this._el);
+    public componentDidUpdate(): void {
+        if (this.el) highlightBlock(this.el);
     }
 
     // call componentDidUpdate because _ref is fired on initial render
     // which does not fire componentDidUpdate
-    _ref(el) {
-        this._el = el;
+    private ref = (el: HTMLPreElement): void => {
+        this.el = el;
         this.componentDidUpdate();
-    }
+    };
 
-    render() {
+    public render(): JSX.Element {
         const { className, children } = this.props;
 
-        return <pre className={`${className} mx_SyntaxHighlight`} ref={this._ref}>
+        return <pre className={`${className} mx_SyntaxHighlight`} ref={this.ref}>
             <code>{ children }</code>
         </pre>;
     }
 }
+
diff --git a/src/components/views/elements/TagComposer.tsx b/src/components/views/elements/TagComposer.tsx
new file mode 100644
index 0000000000..03f501f02c
--- /dev/null
+++ b/src/components/views/elements/TagComposer.tsx
@@ -0,0 +1,91 @@
+/*
+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, { ChangeEvent, FormEvent } from "react";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Field from "./Field";
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "./AccessibleButton";
+
+interface IProps {
+    tags: string[];
+    onAdd: (tag: string) => void;
+    onRemove: (tag: string) => void;
+    disabled?: boolean;
+    label?: string;
+    placeholder?: string;
+}
+
+interface IState {
+    newTag: string;
+}
+
+/**
+ * A simple, controlled, composer for entering string tags. Contains a simple
+ * input, add button, and per-tag remove button.
+ */
+@replaceableComponent("views.elements.TagComposer")
+export default class TagComposer extends React.PureComponent<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            newTag: "",
+        };
+    }
+
+    private onInputChange = (ev: ChangeEvent<HTMLInputElement>) => {
+        this.setState({ newTag: ev.target.value });
+    };
+
+    private onAdd = (ev: FormEvent) => {
+        ev.preventDefault();
+        if (!this.state.newTag) return;
+
+        this.props.onAdd(this.state.newTag);
+        this.setState({ newTag: "" });
+    };
+
+    private onRemove(tag: string) {
+        // We probably don't need to proxy this, but for
+        // sanity of `this` we'll do so anyways.
+        this.props.onRemove(tag);
+    }
+
+    public render() {
+        return <div className='mx_TagComposer'>
+            <form className='mx_TagComposer_input' onSubmit={this.onAdd}>
+                <Field
+                    value={this.state.newTag}
+                    onChange={this.onInputChange}
+                    label={this.props.label || _t("Keyword")}
+                    placeholder={this.props.placeholder || _t("New keyword")}
+                    disabled={this.props.disabled}
+                    autoComplete="off"
+                />
+                <AccessibleButton onClick={this.onAdd} kind='primary' disabled={this.props.disabled}>
+                    { _t("Add") }
+                </AccessibleButton>
+            </form>
+            <div className='mx_TagComposer_tags'>
+                { this.props.tags.map((t, i) => (<div className='mx_TagComposer_tag' key={i}>
+                    <span>{ t }</span>
+                    <AccessibleButton onClick={this.onRemove.bind(this, t)} disabled={this.props.disabled} />
+                </div>)) }
+            </div>
+        </div>;
+    }
+}
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 03d853babc..14a5ed8e6b 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -30,8 +30,8 @@ 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";
+import { mediaFromMxc } from "../../../customisations/Media";
+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:
@@ -152,7 +152,7 @@ export default class TagTile extends React.Component {
                 "mx_TagTile_badge": true,
                 "mx_TagTile_badgeHighlight": badge.highlight,
             });
-            badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badge.count)}</div>);
+            badgeElement = (<div className={badgeClasses}>{ FormattingUtils.formatCount(badge.count) }</div>);
         }
 
         const contextButton = this.state.hover || this.props.menuDisplayed ?
@@ -161,7 +161,7 @@ export default class TagTile extends React.Component {
                 onClick={this.openMenu}
                 inputRef={this.props.contextMenuButtonRef}
             >
-                {"\u00B7\u00B7\u00B7"}
+                { "\u00B7\u00B7\u00B7" }
             </AccessibleButton> : <div ref={this.props.contextMenuButtonRef} />;
 
         const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
@@ -184,8 +184,8 @@ export default class TagTile extends React.Component {
                     width={avatarSize}
                     height={avatarSize}
                 />
-                {contextButton}
-                {badgeElement}
+                { contextButton }
+                { badgeElement }
             </div>
         </AccessibleTooltipButton>;
     }
diff --git a/src/components/views/elements/TextWithTooltip.js b/src/components/views/elements/TextWithTooltip.tsx
similarity index 50%
rename from src/components/views/elements/TextWithTooltip.js
rename to src/components/views/elements/TextWithTooltip.tsx
index a6fc00fc2e..b7c2477158 100644
--- a/src/components/views/elements/TextWithTooltip.js
+++ b/src/components/views/elements/TextWithTooltip.tsx
@@ -15,48 +15,50 @@
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Tooltip from "./Tooltip";
+
+interface IProps {
+    class?: string;
+    tooltipClass?: string;
+    tooltip: React.ReactNode;
+    tooltipProps?: {};
+    onClick?: (ev?: React.MouseEvent) => void;
+}
+
+interface IState {
+    hover: boolean;
+}
 
 @replaceableComponent("views.elements.TextWithTooltip")
-export default class TextWithTooltip extends React.Component {
-    static propTypes = {
-        class: PropTypes.string,
-        tooltipClass: PropTypes.string,
-        tooltip: PropTypes.node.isRequired,
-        tooltipProps: PropTypes.object,
-    };
-
-    constructor() {
-        super();
+export default class TextWithTooltip extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             hover: false,
         };
     }
 
-    onMouseOver = () => {
-        this.setState({hover: true});
+    private onMouseOver = (): void => {
+        this.setState({ hover: true });
     };
 
-    onMouseLeave = () => {
-        this.setState({hover: false});
+    private onMouseLeave = (): void => {
+        this.setState({ hover: false });
     };
 
-    render() {
-        const Tooltip = sdk.getComponent("elements.Tooltip");
-
-        const {class: className, children, tooltip, tooltipClass, tooltipProps, ...props} = this.props;
+    public render(): JSX.Element {
+        const { class: className, children, tooltip, tooltipClass, tooltipProps, ...props } = this.props;
 
         return (
-            <span {...props} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className={className}>
-                {children}
-                {this.state.hover && <Tooltip
+            <span {...props} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} onClick={this.props.onClick} className={className}>
+                { children }
+                { this.state.hover && <Tooltip
                     {...tooltipProps}
                     label={tooltip}
                     tooltipClassName={tooltipClass}
-                    className={"mx_TextWithTooltip_tooltip"}
+                    className="mx_TextWithTooltip_tooltip"
                 /> }
             </span>
         );
diff --git a/src/components/views/elements/TintableSvg.js b/src/components/views/elements/TintableSvg.js
deleted file mode 100644
index 670f3e9bb9..0000000000
--- a/src/components/views/elements/TintableSvg.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright 2015 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT 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 Tinter from "../../../Tinter";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.elements.TintableSvg")
-class TintableSvg extends React.Component {
-    static propTypes = {
-        src: PropTypes.string.isRequired,
-        width: PropTypes.string.isRequired,
-        height: PropTypes.string.isRequired,
-        className: PropTypes.string,
-    };
-
-    // list of currently mounted TintableSvgs
-    static mounts = {};
-    static idSequence = 0;
-
-    componentDidMount() {
-        this.fixups = [];
-
-        this.id = TintableSvg.idSequence++;
-        TintableSvg.mounts[this.id] = this;
-    }
-
-    componentWillUnmount() {
-        delete TintableSvg.mounts[this.id];
-    }
-
-    tint = () => {
-        // TODO: only bother running this if the global tint settings have changed
-        // since we loaded!
-        Tinter.applySvgFixups(this.fixups);
-    };
-
-    onLoad = event => {
-        // console.log("TintableSvg.onLoad for " + this.props.src);
-        this.fixups = Tinter.calcSvgFixups([event.target]);
-        Tinter.applySvgFixups(this.fixups);
-    };
-
-    render() {
-        return (
-            <object className={"mx_TintableSvg " + (this.props.className ? this.props.className : "")}
-                type="image/svg+xml"
-                data={this.props.src}
-                width={this.props.width}
-                height={this.props.height}
-                onLoad={this.onLoad}
-                tabIndex="-1"
-            />
-        );
-    }
-}
-
-// Register with the Tinter so that we will be told if the tint changes
-Tinter.registerTintable(function() {
-    if (TintableSvg.mounts) {
-        Object.keys(TintableSvg.mounts).forEach((id) => {
-            TintableSvg.mounts[id].tint();
-        });
-    }
-});
-
-export default TintableSvg;
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index f05c45b3db..c439ef4f85 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from "react";
 import classNames from "classnames";
-import * as sdk from "../../../index";
+import AccessibleButton from "./AccessibleButton";
 
 interface IProps {
     // Whether or not this toggle is in the 'on' position.
@@ -31,7 +31,7 @@ interface IProps {
 }
 
 // Controlled Toggle Switch element, written with Accessibility in mind
-export default ({checked, disabled = false, onChange, ...props}: IProps) => {
+export default ({ checked, disabled = false, onChange, ...props }: IProps) => {
     const _onClick = () => {
         if (disabled) return;
         onChange(!checked);
@@ -43,7 +43,6 @@ export default ({checked, disabled = false, onChange, ...props}: IProps) => {
         "mx_ToggleSwitch_enabled": !disabled,
     });
 
-    const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
     return (
         <AccessibleButton {...props}
             className={classes}
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 0202c6b02f..c335684c05 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -17,11 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
-import React, {Component, CSSProperties} from 'react';
+import React, { Component, CSSProperties } from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
 
 const MIN_TOOLTIP_HEIGHT = 25;
@@ -167,8 +166,7 @@ export default class Tooltip extends React.Component<IProps> {
     public render() {
         // Render a placeholder
         return (
-            <div className={this.props.className}>
-            </div>
+            <div className={this.props.className} />
         );
     }
 }
diff --git a/src/components/views/elements/TooltipButton.tsx b/src/components/views/elements/TooltipButton.tsx
index 191018cc19..26e46c7da8 100644
--- a/src/components/views/elements/TooltipButton.tsx
+++ b/src/components/views/elements/TooltipButton.tsx
@@ -16,11 +16,11 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Tooltip from './Tooltip';
 
 interface IProps {
-    helpText: string;
+    helpText: React.ReactNode | string;
 }
 
 interface IState {
@@ -49,7 +49,6 @@ export default class TooltipButton extends React.Component<IProps, IState> {
     };
 
     render() {
-        const Tooltip = sdk.getComponent("elements.Tooltip");
         const tip = this.state.hover ? <Tooltip
             className="mx_TooltipButton_container"
             tooltipClassName="mx_TooltipButton_helpText"
diff --git a/src/components/views/elements/TruncatedList.js b/src/components/views/elements/TruncatedList.tsx
similarity index 61%
rename from src/components/views/elements/TruncatedList.js
rename to src/components/views/elements/TruncatedList.tsx
index 0509775545..403df4111e 100644
--- a/src/components/views/elements/TruncatedList.js
+++ b/src/components/views/elements/TruncatedList.tsx
@@ -16,41 +16,39 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    // The number of elements to show before truncating. If negative, no truncation is done.
+    truncateAt?: number;
+    // The className to apply to the wrapping div
+    className?: string;
+    // A function that returns the children to be rendered into the element.
+    // The start element is included, the end is not (as in `slice`).
+    // If omitted, the React child elements will be used. This parameter can be used
+    // to avoid creating unnecessary React elements.
+    getChildren?: (start: number, end: number) => Array<React.ReactNode>;
+    // A function that should return the total number of child element available.
+    // Required if getChildren is supplied.
+    getChildCount?: () => number;
+    // A function which will be invoked when an overflow element is required.
+    // This will be inserted after the children.
+    createOverflowElement?: (overflowCount: number, totalCount: number) => React.ReactNode;
+}
 
 @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.
-        truncateAt: PropTypes.number,
-        // The className to apply to the wrapping div
-        className: PropTypes.string,
-        // A function that returns the children to be rendered into the element.
-        // function getChildren(start: number, end: number): Array<React.Node>
-        // The start element is included, the end is not (as in `slice`).
-        // If omitted, the React child elements will be used. This parameter can be used
-        // to avoid creating unnecessary React elements.
-        getChildren: PropTypes.func,
-        // A function that should return the total number of child element available.
-        // Required if getChildren is supplied.
-        getChildCount: PropTypes.func,
-        // A function which will be invoked when an overflow element is required.
-        // This will be inserted after the children.
-        createOverflowElement: PropTypes.func,
-    };
-
+export default class TruncatedList extends React.Component<IProps> {
     static defaultProps ={
         truncateAt: 2,
         createOverflowElement(overflowCount, totalCount) {
             return (
-                <div>{ _t("And %(count)s more...", {count: overflowCount}) }</div>
+                <div>{ _t("And %(count)s more...", { count: overflowCount }) }</div>
             );
         },
     };
 
-    _getChildren(start, end) {
+    private getChildren(start: number, end: number): Array<React.ReactNode> {
         if (this.props.getChildren && this.props.getChildCount) {
             return this.props.getChildren(start, end);
         } else {
@@ -63,7 +61,7 @@ export default class TruncatedList extends React.Component {
         }
     }
 
-    _getChildCount() {
+    private getChildCount(): number {
         if (this.props.getChildren && this.props.getChildCount) {
             return this.props.getChildCount();
         } else {
@@ -73,10 +71,10 @@ export default class TruncatedList extends React.Component {
         }
     }
 
-    render() {
+    public render() {
         let overflowNode = null;
 
-        const totalChildren = this._getChildCount();
+        const totalChildren = this.getChildCount();
         let upperBound = totalChildren;
         if (this.props.truncateAt >= 0) {
             const overflowCount = totalChildren - this.props.truncateAt;
@@ -87,7 +85,7 @@ export default class TruncatedList extends React.Component {
                 upperBound = this.props.truncateAt;
             }
         }
-        const childNodes = this._getChildren(0, upperBound);
+        const childNodes = this.getChildren(0, upperBound);
 
         return (
             <div className={this.props.className}>
diff --git a/src/components/views/elements/UserTagTile.tsx b/src/components/views/elements/UserTagTile.tsx
index d3e07a0a34..4414ff31fd 100644
--- a/src/components/views/elements/UserTagTile.tsx
+++ b/src/components/views/elements/UserTagTile.tsx
@@ -21,7 +21,7 @@ import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
 import classNames from "classnames";
 import { _t } from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -52,7 +52,7 @@ export default class UserTagTile extends React.PureComponent<IProps, IState> {
 
     private onTagStoreUpdate = () => {
         const selected = GroupFilterOrderStore.getSelectedTags().length === 0;
-        this.setState({selected});
+        this.setState({ selected });
     };
 
     private onTileClick = (ev) => {
@@ -60,7 +60,7 @@ export default class UserTagTile extends React.PureComponent<IProps, IState> {
         ev.stopPropagation();
 
         // Deselect all tags
-        defaultDispatcher.dispatch({action: "deselect_tags"});
+        defaultDispatcher.dispatch({ action: "deselect_tags" });
     };
 
     public render() {
diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 1b0659ab9b..f887741ff7 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/* eslint-disable babel/no-invalid-this */
+/* eslint-disable @typescript-eslint/no-invalid-this */
 import React from "react";
 import classNames from "classnames";
 
@@ -147,16 +147,16 @@ export default function withValidation<T = undefined, D = void>({
         let details;
         if (results && results.length) {
             details = <ul className="mx_Validation_details">
-                {results.map(result => {
+                { results.map(result => {
                     const classes = classNames({
                         "mx_Validation_detail": true,
                         "mx_Validation_valid": result.valid,
                         "mx_Validation_invalid": !result.valid,
                     });
                     return <li key={result.key} className={classes}>
-                        {result.text}
+                        { result.text }
                     </li>;
-                })}
+                }) }
             </ul>;
         }
 
@@ -165,14 +165,14 @@ export default function withValidation<T = undefined, D = void>({
             // We're setting `this` to whichever component holds the validation
             // function. That allows rules to access the state of the component.
             const content = description.call(this, derivedData);
-            summary = <div className="mx_Validation_description">{content}</div>;
+            summary = <div className="mx_Validation_description">{ content }</div>;
         }
 
         let feedback;
         if (summary || details) {
             feedback = <div className="mx_Validation">
-                {summary}
-                {details}
+                { summary }
+                { details }
             </div>;
         }
 
diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.tsx
similarity index 73%
rename from src/components/views/elements/crypto/VerificationQRCode.js
rename to src/components/views/elements/crypto/VerificationQRCode.tsx
index 3bbfb004c6..be9ede59b1 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.tsx
@@ -15,20 +15,20 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import QRCode from "../QRCode";
+import { QRCodeData } from "matrix-js-sdk/src/crypto/verification/QRCode";
+
+interface IProps {
+    qrCodeData: QRCodeData;
+}
 
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
-export default class VerificationQRCode extends React.PureComponent {
-    static propTypes = {
-        qrCodeData: PropTypes.object.isRequired,
-    };
-
-    render() {
+export default class VerificationQRCode extends React.PureComponent<IProps> {
+    public render(): JSX.Element {
         return (
             <QRCode
-                data={[{data: this.props.qrCodeData.buffer, mode: 'byte'}]}
+                data={[{ data: this.props.qrCodeData.getBuffer(), mode: 'byte' }]}
                 className="mx_VerificationQRCode"
                 width={196} />
         );
diff --git a/src/components/views/emojipicker/Category.tsx b/src/components/views/emojipicker/Category.tsx
index 4c7852def3..395ff1cbc8 100644
--- a/src/components/views/emojipicker/Category.tsx
+++ b/src/components/views/emojipicker/Category.tsx
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {RefObject} from 'react';
+import React, { RefObject } from 'react';
 
 import { CATEGORY_HEADER_HEIGHT, EMOJI_HEIGHT, EMOJIS_PER_ROW } from "./EmojiPicker";
 import LazyRenderList from "../elements/LazyRenderList";
-import {DATA_BY_CATEGORY, IEmoji} from "../../../emoji";
+import { DATA_BY_CATEGORY, IEmoji } from "../../../emoji";
 import Emoji from './Emoji';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const OVERFLOW_ROWS = 3;
 
@@ -98,17 +98,19 @@ class Category extends React.PureComponent<IProps> {
                 aria-label={name}
             >
                 <h2 className="mx_EmojiPicker_category_label">
-                    {name}
+                    { name }
                 </h2>
                 <LazyRenderList
-                    element="ul" className="mx_EmojiPicker_list"
-                    itemHeight={EMOJI_HEIGHT} items={rows}
+                    element="ul"
+                    className="mx_EmojiPicker_list"
+                    itemHeight={EMOJI_HEIGHT}
+                    items={rows}
                     scrollTop={localScrollTop}
                     height={localHeight}
                     overflowItems={OVERFLOW_ROWS}
                     overflowMargin={0}
-                    renderItem={this.renderEmojiRow}>
-                </LazyRenderList>
+                    renderItem={this.renderEmojiRow}
+                />
             </section>
         );
     }
diff --git a/src/components/views/emojipicker/Emoji.tsx b/src/components/views/emojipicker/Emoji.tsx
index 5d7665ce98..48194ff7d7 100644
--- a/src/components/views/emojipicker/Emoji.tsx
+++ b/src/components/views/emojipicker/Emoji.tsx
@@ -17,9 +17,9 @@ limitations under the License.
 
 import React from 'react';
 
-import {MenuItem} from "../../structures/ContextMenu";
-import {IEmoji} from "../../../emoji";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MenuItem } from "../../structures/ContextMenu";
+import { IEmoji } from "../../../emoji";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     emoji: IEmoji;
@@ -44,7 +44,7 @@ class Emoji extends React.PureComponent<IProps> {
                 label={emoji.unicode}
             >
                 <div className={`mx_EmojiPicker_item ${isSelected ? 'mx_EmojiPicker_item_selected' : ''}`}>
-                    {emoji.unicode}
+                    { emoji.unicode }
                 </div>
             </MenuItem>
         );
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index 6d7b90c8a6..9cc995a140 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -19,21 +19,23 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import * as recent from '../../../emojipicker/recent';
-import {DATA_BY_CATEGORY, getEmojiFromUnicode, IEmoji} from "../../../emoji";
+import { DATA_BY_CATEGORY, getEmojiFromUnicode, IEmoji } from "../../../emoji";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import Header from "./Header";
 import Search from "./Search";
 import Preview from "./Preview";
 import QuickReactions from "./QuickReactions";
-import Category, {ICategory, CategoryKey} from "./Category";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import Category, { ICategory, CategoryKey } from "./Category";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 export const CATEGORY_HEADER_HEIGHT = 22;
 export const EMOJI_HEIGHT = 37;
 export const EMOJIS_PER_ROW = 8;
 
+const ZERO_WIDTH_JOINER = "\u200D";
+
 interface IProps {
-    selectedEmojis: Set<string>;
+    selectedEmojis?: Set<string>;
     showQuickReactions?: boolean;
     onChoose(unicode: string): boolean;
 }
@@ -171,16 +173,16 @@ class EmojiPicker extends React.Component<IProps, IState> {
     };
 
     private onChangeFilter = (filter: string) => {
-        filter = filter.toLowerCase(); // filter is case insensitive stored lower-case
+        const lcFilter = filter.toLowerCase().trim(); // filter is case insensitive
         for (const cat of this.categories) {
             let emojis;
             // If the new filter string includes the old filter string, we don't have to re-filter the whole dataset.
-            if (filter.includes(this.state.filter)) {
+            if (lcFilter.includes(this.state.filter)) {
                 emojis = this.memoizedDataByCategory[cat.id];
             } else {
                 emojis = cat.id === "recent" ? this.recentlyUsed : DATA_BY_CATEGORY[cat.id];
             }
-            emojis = emojis.filter(emoji => emoji.filterString.includes(filter));
+            emojis = emojis.filter(emoji => this.emojiMatchesFilter(emoji, lcFilter));
             this.memoizedDataByCategory[cat.id] = emojis;
             cat.enabled = emojis.length > 0;
             // The setState below doesn't re-render the header and we already have the refs for updateVisibility, so...
@@ -192,6 +194,13 @@ class EmojiPicker extends React.Component<IProps, IState> {
         setTimeout(this.updateVisibility, 0);
     };
 
+    private emojiMatchesFilter = (emoji: IEmoji, filter: string): boolean => {
+        return emoji.annotation.toLowerCase().includes(filter) ||
+            emoji.emoticon?.toLowerCase().includes(filter) ||
+            emoji.shortcodes.some(x => x.toLowerCase().includes(filter)) ||
+            emoji.unicode.split(ZERO_WIDTH_JOINER).includes(filter);
+    };
+
     private onEnterFilter = () => {
         const btn = this.bodyRef.current.querySelector<HTMLButtonElement>(".mx_EmojiPicker_item");
         if (btn) {
@@ -234,11 +243,11 @@ class EmojiPicker extends React.Component<IProps, IState> {
                     className="mx_EmojiPicker_body"
                     wrappedRef={ref => {
                         // @ts-ignore - AutoHideScrollbar should accept a RefObject or fall back to its own instead
-                        this.bodyRef.current = ref
+                        this.bodyRef.current = ref;
                     }}
                     onScroll={this.onScroll}
                 >
-                    {this.categories.map(category => {
+                    { this.categories.map(category => {
                         const emojis = this.memoizedDataByCategory[category.id];
                         const categoryElement = ((
                             <Category
@@ -258,9 +267,9 @@ class EmojiPicker extends React.Component<IProps, IState> {
                         const height = EmojiPicker.categoryHeightForEmojiCount(emojis.length);
                         heightBefore += height;
                         return categoryElement;
-                    })}
+                    }) }
                 </AutoHideScrollbar>
-                {this.state.previewEmoji || !this.props.showQuickReactions
+                { this.state.previewEmoji || !this.props.showQuickReactions
                     ? <Preview emoji={this.state.previewEmoji} />
                     : <QuickReactions onClick={this.onClickEmoji} selectedEmojis={this.props.selectedEmojis} /> }
             </div>
diff --git a/src/components/views/emojipicker/Header.tsx b/src/components/views/emojipicker/Header.tsx
index 693f86ad73..e4619dedf2 100644
--- a/src/components/views/emojipicker/Header.tsx
+++ b/src/components/views/emojipicker/Header.tsx
@@ -18,14 +18,14 @@ limitations under the License.
 import React from 'react';
 import classNames from "classnames";
 
-import {_t} from "../../../languageHandler";
-import {Key} from "../../../Keyboard";
-import {CategoryKey, ICategory} from "./Category";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+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
+    onAnchorClick(id: CategoryKey): void;
 }
 
 @replaceableComponent("views.emojipicker.Header")
@@ -89,7 +89,7 @@ class Header extends React.PureComponent<IProps> {
                 aria-label={_t("Categories")}
                 onKeyDown={this.onKeyDown}
             >
-                {this.props.categories.map(category => {
+                { this.props.categories.map(category => {
                     const classes = classNames(`mx_EmojiPicker_anchor mx_EmojiPicker_anchor_${category.id}`, {
                         mx_EmojiPicker_anchor_visible: category.visible,
                     });
@@ -106,7 +106,7 @@ class Header extends React.PureComponent<IProps> {
                         aria-selected={category.visible}
                         aria-controls={`mx_EmojiPicker_category_${category.id}`}
                     />;
-                })}
+                }) }
             </nav>
         );
     }
diff --git a/src/components/views/emojipicker/Preview.tsx b/src/components/views/emojipicker/Preview.tsx
index e0952ec73e..02b5669caf 100644
--- a/src/components/views/emojipicker/Preview.tsx
+++ b/src/components/views/emojipicker/Preview.tsx
@@ -17,8 +17,8 @@ limitations under the License.
 
 import React from 'react';
 
-import {IEmoji} from "../../../emoji";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { IEmoji } from "../../../emoji";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     emoji: IEmoji;
@@ -27,23 +27,19 @@ interface IProps {
 @replaceableComponent("views.emojipicker.Preview")
 class Preview extends React.PureComponent<IProps> {
     render() {
-        const {
-            unicode = "",
-            annotation = "",
-            shortcodes: [shortcode = ""],
-        } = this.props.emoji || {};
+        const { unicode, annotation, shortcodes: [shortcode] } = this.props.emoji;
 
         return (
             <div className="mx_EmojiPicker_footer mx_EmojiPicker_preview">
                 <div className="mx_EmojiPicker_preview_emoji">
-                    {unicode}
+                    { unicode }
                 </div>
                 <div className="mx_EmojiPicker_preview_text">
                     <div className="mx_EmojiPicker_name mx_EmojiPicker_preview_name">
-                        {annotation}
+                        { annotation }
                     </div>
                     <div className="mx_EmojiPicker_shortcode">
-                        {shortcode}
+                        { shortcode }
                     </div>
                 </div>
             </div>
diff --git a/src/components/views/emojipicker/QuickReactions.tsx b/src/components/views/emojipicker/QuickReactions.tsx
index a250aca458..cbd529a43c 100644
--- a/src/components/views/emojipicker/QuickReactions.tsx
+++ b/src/components/views/emojipicker/QuickReactions.tsx
@@ -18,9 +18,9 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import {getEmojiFromUnicode, IEmoji} from "../../../emoji";
+import { getEmojiFromUnicode, IEmoji } from "../../../emoji";
 import Emoji from "./Emoji";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 // We use the variation-selector Heart in Quick Reactions for some reason
 const QUICK_REACTIONS = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"].map(emoji => {
@@ -65,16 +65,16 @@ class QuickReactions extends React.Component<IProps, IState> {
         return (
             <section className="mx_EmojiPicker_footer mx_EmojiPicker_quick mx_EmojiPicker_category">
                 <h2 className="mx_EmojiPicker_quick_header mx_EmojiPicker_category_label">
-                    {!this.state.hover
+                    { !this.state.hover
                         ? _t("Quick Reactions")
                         : <React.Fragment>
-                            <span className="mx_EmojiPicker_name">{this.state.hover.annotation}</span>
-                            <span className="mx_EmojiPicker_shortcode">{this.state.hover.shortcodes[0]}</span>
+                            <span className="mx_EmojiPicker_name">{ this.state.hover.annotation }</span>
+                            <span className="mx_EmojiPicker_shortcode">{ this.state.hover.shortcodes[0] }</span>
                         </React.Fragment>
                     }
                 </h2>
                 <ul className="mx_EmojiPicker_list" aria-label={_t("Quick Reactions")}>
-                    {QUICK_REACTIONS.map(emoji => ((
+                    { QUICK_REACTIONS.map(emoji => ((
                         <Emoji
                             key={emoji.hexcode}
                             emoji={emoji}
@@ -83,7 +83,7 @@ class QuickReactions extends React.Component<IProps, IState> {
                             onMouseLeave={this.onMouseLeave}
                             selectedEmojis={this.props.selectedEmojis}
                         />
-                    )))}
+                    ))) }
                 </ul>
             </section>
         );
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx
index e86d183aba..e129b45c9a 100644
--- a/src/components/views/emojipicker/ReactionPicker.tsx
+++ b/src/components/views/emojipicker/ReactionPicker.tsx
@@ -16,12 +16,13 @@ limitations under the License.
 */
 
 import React from 'react';
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import EmojiPicker from "./EmojiPicker";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { Action } from '../../../dispatcher/actions';
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -93,6 +94,7 @@ class ReactionPicker extends React.Component<IProps, IState> {
                 this.props.mxEvent.getRoomId(),
                 myReactions[reaction],
             );
+            dis.dispatch({ action: Action.FocusAComposer });
             // Tell the emoji picker not to bump this in the more frequently used list.
             return false;
         } else {
@@ -103,7 +105,8 @@ class ReactionPicker extends React.Component<IProps, IState> {
                     "key": reaction,
                 },
             });
-            dis.dispatch({action: "message_sent"});
+            dis.dispatch({ action: "message_sent" });
+            dis.dispatch({ action: Action.FocusAComposer });
             return true;
         }
     };
diff --git a/src/components/views/emojipicker/Search.tsx b/src/components/views/emojipicker/Search.tsx
index abe3e026be..6ee8907373 100644
--- a/src/components/views/emojipicker/Search.tsx
+++ b/src/components/views/emojipicker/Search.tsx
@@ -18,8 +18,8 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import {Key} from "../../../Keyboard";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Key } from "../../../Keyboard";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     query: string;
@@ -69,7 +69,7 @@ class Search extends React.PureComponent<IProps> {
                     onKeyDown={this.onKeyDown}
                     ref={this.inputRef}
                 />
-                {rightButton}
+                { rightButton }
             </div>
         );
     }
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index bc0bf966f9..0ec0084162 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -20,19 +20,19 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
-import {_t} from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
+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";
-import {mediaFromMxc} from "../../../customisations/Media";
+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")
 export default class GroupInviteTile extends React.Component {
-    static propTypes: {
+    static propTypes = {
         group: PropTypes.object.isRequired,
     };
 
@@ -57,7 +57,7 @@ export default class GroupInviteTile extends React.Component {
     };
 
     onMouseEnter = () => {
-        const state = {hover: true};
+        const state = { hover: true };
         // Only allow non-guests to access the context menu
         if (!this.context.isGuest()) {
             state.badgeHover = true;
@@ -165,7 +165,7 @@ export default class GroupInviteTile extends React.Component {
 
         return <React.Fragment>
             <RovingTabIndexWrapper>
-                {({onFocus, isActive, ref}) =>
+                { ({ onFocus, isActive, ref }) =>
                     <AccessibleButton
                         onFocus={onFocus}
                         tabIndex={isActive ? 0 : -1}
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index fec90ce8e7..3204f82e82 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -23,10 +23,10 @@ import GroupStore from '../../../stores/GroupStore';
 import PropTypes from 'prop-types';
 import { showGroupInviteDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {Action} from "../../../dispatcher/actions";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Action } from "../../../dispatcher/actions";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 
@@ -86,10 +86,16 @@ export default class GroupMemberList extends React.Component {
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
         const text = _t("and %(count)s others...", { count: overflowCount });
         return (
-            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
-                <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
-            } name={text} presenceState="online" suppressOnHover={true}
-            onClick={this._showFullMemberList} />
+            <EntityTile
+                className="mx_EntityTile_ellipsis"
+                avatarJsx={
+                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
+                }
+                name={text}
+                presenceState="online"
+                suppressOnHover={true}
+                onClick={this._showFullMemberList}
+            />
         );
     };
 
@@ -152,7 +158,9 @@ export default class GroupMemberList extends React.Component {
             );
         });
 
-        return <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAt}
+        return <TruncatedList
+            className="mx_MemberList_wrapper"
+            truncateAt={this.state.truncateAt}
             createOverflowElement={this._createOverflowTile}
         >
             { memberTiles }
@@ -201,7 +209,7 @@ export default class GroupMemberList extends React.Component {
 
         const invited = (this.state.invitedMembers && this.state.invitedMembers.length > 0) ?
             <div className="mx_MemberList_invited">
-                <h2>{_t("Invited")}</h2>
+                <h2>{ _t("Invited") }</h2>
                 {
                     this.makeGroupMemberTiles(
                         this.state.searchQuery,
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index a436f2403e..301f57be23 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -22,8 +22,8 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 @replaceableComponent("views.groups.GroupMemberTile")
 export default class GroupMemberTile extends React.Component {
@@ -56,14 +56,19 @@ export default class GroupMemberTile extends React.Component {
                 aria-hidden="true"
                 name={this.props.member.displayname || this.props.member.userId}
                 idName={this.props.member.userId}
-                width={36} height={36}
+                width={36}
+                height={36}
                 url={avatarUrl}
             />
         );
 
         return (
-            <EntityTile name={name} avatarJsx={av} onClick={this.onClick}
-                suppressOnHover={true} presenceState="online"
+            <EntityTile
+                name={name}
+                avatarJsx={av}
+                onClick={this.onClick}
+                suppressOnHover={true}
+                presenceState="online"
                 powerStatus={this.props.member.isPrivileged ? EntityTile.POWER_STATUS_ADMIN : null}
             />
         );
diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
index c06d827550..4e17a9caa1 100644
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ b/src/components/views/groups/GroupPublicityToggle.js
@@ -19,7 +19,7 @@ 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.groups.GroupPublicityTile")
 export default class GroupPublicityToggle extends React.Component {
@@ -66,9 +66,7 @@ export default class GroupPublicityToggle extends React.Component {
     render() {
         const GroupTile = sdk.getComponent('groups.GroupTile');
         return <div className="mx_GroupPublicity_toggle">
-            <GroupTile groupId={this.props.groupId} showDescription={false}
-                avatarHeight={40} draggable={false}
-            />
+            <GroupTile groupId={this.props.groupId} showDescription={false} avatarHeight={40} />
             <ToggleSwitch checked={this.state.isGroupPublicised}
                 disabled={!this.state.ready || this.state.busy}
                 onChange={this._onPublicityToggle} />
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index c1d1adb0b3..d8f086700d 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -24,8 +24,8 @@ import { _t } from '../../../languageHandler';
 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 @replaceableComponent("views.groups.GroupRoomInfo")
 export default class GroupRoomInfo extends React.Component {
@@ -90,12 +90,12 @@ export default class GroupRoomInfo extends React.Component {
         e.stopPropagation();
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Confirm removal of group from room', '', QuestionDialog, {
-            title: _t("Are you sure you want to remove '%(roomName)s' from %(groupId)s?", {roomName, groupId}),
+            title: _t("Are you sure you want to remove '%(roomName)s' from %(groupId)s?", { roomName, groupId }),
             description: _t("Removing a room from the community will also remove it from the community page."),
             button: _t("Remove"),
             onFinished: (proceed) => {
                 if (!proceed) return;
-                this.setState({groupRoomRemoveLoading: true});
+                this.setState({ groupRoomRemoveLoading: true });
                 const groupId = this.props.groupId;
                 const roomId = this.props.groupRoomId;
                 GroupStore.removeRoomFromGroup(this.props.groupId, roomId).then(() => {
@@ -108,11 +108,11 @@ export default class GroupRoomInfo extends React.Component {
                     Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
                         title: _t("Failed to remove room from community"),
                         description: _t(
-                            "Failed to remove '%(roomName)s' from %(groupId)s", {groupId, roomName},
+                            "Failed to remove '%(roomName)s' from %(groupId)s", { groupId, roomName },
                         ),
                     });
                 }).finally(() => {
-                    this.setState({groupRoomRemoveLoading: false});
+                    this.setState({ groupRoomRemoveLoading: false });
                 });
             },
         });
@@ -139,7 +139,7 @@ export default class GroupRoomInfo extends React.Component {
                 title: _t("Something went wrong!"),
                 description: _t(
                     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.",
-                    {roomName, groupId},
+                    { roomName, groupId },
                 ),
             });
         }).finally(() => {
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 2921ac79ee..e3dbdddb4f 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const INITIAL_LOAD_NUM_ROOMS = 30;
 
@@ -76,10 +76,16 @@ export default class GroupRoomList extends React.Component {
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
         const text = _t("and %(count)s others...", { count: overflowCount });
         return (
-            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
-                <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
-            } name={text} presenceState="online" suppressOnHover={true}
-            onClick={this._showFullRoomList} />
+            <EntityTile
+                className="mx_EntityTile_ellipsis"
+                avatarJsx={
+                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
+                }
+                name={text}
+                presenceState="online"
+                suppressOnHover={true}
+                onClick={this._showFullRoomList}
+            />
         );
     };
 
@@ -142,7 +148,8 @@ export default class GroupRoomList extends React.Component {
         }
         const inputBox = (
             <input
-                className="mx_GroupRoomList_query mx_textinput" id="mx_GroupRoomList_query"
+                className="mx_GroupRoomList_query mx_textinput"
+                id="mx_GroupRoomList_query"
                 type="text"
                 onChange={this.onSearchQueryChanged}
                 value={this.state.searchQuery}
@@ -156,8 +163,11 @@ export default class GroupRoomList extends React.Component {
             <div className="mx_GroupRoomList" role="tabpanel">
                 { inviteButton }
                 <AutoHideScrollbar className="mx_GroupRoomList_joined mx_GroupRoomList_outerWrapper">
-                    <TruncatedList className="mx_GroupRoomList_wrapper" truncateAt={this.state.truncateAt}
-                        createOverflowElement={this._createOverflowTile}>
+                    <TruncatedList
+                        className="mx_GroupRoomList_wrapper"
+                        truncateAt={this.state.truncateAt}
+                        createOverflowElement={this._createOverflowTile}
+                    >
                         { this.makeGroupRoomTiles(this.state.searchQuery) }
                     </TruncatedList>
                 </AutoHideScrollbar>
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 7edfc1a376..7bbfaa93a8 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -20,8 +20,8 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 @replaceableComponent("views.groups.GroupRoomTile")
 class GroupRoomTile extends React.Component {
@@ -48,8 +48,10 @@ class GroupRoomTile extends React.Component {
             : null;
 
         const av = (
-            <BaseAvatar name={this.props.groupRoom.displayname}
-                width={36} height={36}
+            <BaseAvatar
+                name={this.props.groupRoom.displayname}
+                width={36}
+                height={36}
                 url={avatarUrl}
             />
         );
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 42a977fb79..21308ac056 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -16,15 +16,15 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Draggable, Droppable } from 'react-beautiful-dnd';
 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";
-import {mediaFromMxc} from "../../../customisations/Media";
-
-function nop() {}
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import { _t } from "../../../languageHandler";
+import TagOrderActions from "../../../actions/TagOrderActions";
+import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
 
 @replaceableComponent("views.groups.GroupTile")
 class GroupTile extends React.Component {
@@ -34,7 +34,6 @@ class GroupTile extends React.Component {
         showDescription: PropTypes.bool,
         // Height of the group avatar in pixels
         avatarHeight: PropTypes.number,
-        draggable: PropTypes.bool,
     };
 
     static contextType = MatrixClientContext;
@@ -42,7 +41,6 @@ class GroupTile extends React.Component {
     static defaultProps = {
         showDescription: true,
         avatarHeight: 50,
-        draggable: true,
     };
 
     state = {
@@ -51,13 +49,13 @@ class GroupTile extends React.Component {
 
     componentDidMount() {
         FlairStore.getGroupProfileCached(this.context, this.props.groupId).then((profile) => {
-            this.setState({profile});
+            this.setState({ profile });
         }).catch((err) => {
             console.error('Error whilst getting cached profile for GroupTile', err);
         });
     }
 
-    onMouseDown = e => {
+    onClick = e => {
         e.preventDefault();
         dis.dispatch({
             action: 'view_group',
@@ -65,6 +63,18 @@ class GroupTile extends React.Component {
         });
     };
 
+    onPinClick = e => {
+        e.preventDefault();
+        e.stopPropagation();
+        dis.dispatch(TagOrderActions.moveTag(this.context, this.props.groupId, 0));
+    };
+
+    onUnpinClick = e => {
+        e.preventDefault();
+        e.stopPropagation();
+        dis.dispatch(TagOrderActions.removeTag(this.context, this.props.groupId));
+    };
+
     render() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
@@ -78,7 +88,7 @@ class GroupTile extends React.Component {
             ? mediaFromMxc(profile.avatarUrl).getSquareThumbnailHttp(avatarHeight)
             : null;
 
-        let avatarElement = (
+        const avatarElement = (
             <div className="mx_GroupTile_avatar">
                 <BaseAvatar
                     name={name}
@@ -88,46 +98,21 @@ class GroupTile extends React.Component {
                     height={avatarHeight} />
             </div>
         );
-        if (this.props.draggable) {
-            const avatarClone = avatarElement;
-            avatarElement = (
-                <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
-                    { (droppableProvided, droppableSnapshot) => (
-                        <div ref={droppableProvided.innerRef}>
-                            <Draggable
-                                key={"GroupTile " + this.props.groupId}
-                                draggableId={"GroupTile " + this.props.groupId}
-                                index={this.props.groupId}
-                                type="draggable-TagTile"
-                            >
-                                { (provided, snapshot) => (
-                                    <div>
-                                        <div
-                                            ref={provided.innerRef}
-                                            {...provided.draggableProps}
-                                            {...provided.dragHandleProps}
-                                        >
-                                            {avatarClone}
-                                        </div>
-                                        { /* Instead of a blank placeholder, use a copy of the avatar itself. */ }
-                                        { provided.placeholder ? avatarClone : <div /> }
-                                    </div>
-                                ) }
-                            </Draggable>
-                        </div>
-                    ) }
-                </Droppable>
-            );
-        }
 
-        // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
-        // instead of onClick. Otherwise we experience https://github.com/vector-im/element-web/issues/6156
-        return <AccessibleButton className="mx_GroupTile" onMouseDown={this.onMouseDown} onClick={nop}>
+        return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
             { avatarElement }
             <div className="mx_GroupTile_profile">
                 <div className="mx_GroupTile_name">{ name }</div>
                 { descElement }
                 <div className="mx_GroupTile_groupId">{ this.props.groupId }</div>
+                { !(GroupFilterOrderStore.getOrderedTags() || []).includes(this.props.groupId)
+                    ? <AccessibleButton kind="link" onClick={this.onPinClick}>
+                        { _t("Pin") }
+                    </AccessibleButton>
+                    : <AccessibleButton kind="link" onClick={this.onUnpinClick}>
+                        { _t("Unpin") }
+                    </AccessibleButton>
+                }
             </div>
         </AccessibleButton>;
     }
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 5b537d7377..efb392c54f 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -18,7 +18,7 @@ import React from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.groups.GroupUserSettings")
 export default class GroupUserSettings extends React.Component {
@@ -31,10 +31,10 @@ export default class GroupUserSettings extends React.Component {
 
     componentDidMount() {
         this.context.getJoinedGroups().then((result) => {
-            this.setState({groups: result.groups || [], error: null});
+            this.setState({ groups: result.groups || [], error: null });
         }, (err) => {
             console.error(err);
-            this.setState({groups: null, error: err});
+            this.setState({ groups: null, error: err });
         });
     }
 
diff --git a/src/components/views/host_signup/HostSignupContainer.tsx b/src/components/views/host_signup/HostSignupContainer.tsx
index 6445454994..1b9f0c1e45 100644
--- a/src/components/views/host_signup/HostSignupContainer.tsx
+++ b/src/components/views/host_signup/HostSignupContainer.tsx
@@ -27,10 +27,10 @@ const HostSignupContainer = () => {
     });
 
     return <div className="mx_HostSignupContainer">
-        {isActive &&
+        { isActive &&
             <HostSignupDialog />
         }
     </div>;
 };
 
-export default HostSignupContainer
+export default HostSignupContainer;
diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx
new file mode 100644
index 0000000000..5f514b8390
--- /dev/null
+++ b/src/components/views/messages/CallEvent.tsx
@@ -0,0 +1,297 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from 'react';
+
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { _t } from '../../../languageHandler';
+import MemberAvatar from '../avatars/MemberAvatar';
+import CallEventGrouper, { CallEventGrouperEvent, CustomCallState } from '../../structures/CallEventGrouper';
+import AccessibleButton from '../elements/AccessibleButton';
+import { CallErrorCode, CallState } from 'matrix-js-sdk/src/webrtc/call';
+import InfoTooltip, { InfoTooltipKind } from '../elements/InfoTooltip';
+import classNames from 'classnames';
+import AccessibleTooltipButton from '../elements/AccessibleTooltipButton';
+import { formatCallTime } from "../../../DateUtils";
+import Clock from "../audio_messages/Clock";
+
+const MAX_NON_NARROW_WIDTH = 450 / 70 * 100;
+
+interface IProps {
+    mxEvent: MatrixEvent;
+    callEventGrouper: CallEventGrouper;
+}
+
+interface IState {
+    callState: CallState | CustomCallState;
+    silenced: boolean;
+    narrow: boolean;
+    length: number;
+}
+
+export default class CallEvent extends React.PureComponent<IProps, IState> {
+    private wrapperElement = createRef<HTMLDivElement>();
+    private resizeObserver: ResizeObserver;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            callState: this.props.callEventGrouper.state,
+            silenced: false,
+            narrow: false,
+            length: 0,
+        };
+    }
+
+    componentDidMount() {
+        this.props.callEventGrouper.addListener(CallEventGrouperEvent.StateChanged, this.onStateChanged);
+        this.props.callEventGrouper.addListener(CallEventGrouperEvent.SilencedChanged, this.onSilencedChanged);
+        this.props.callEventGrouper.addListener(CallEventGrouperEvent.LengthChanged, this.onLengthChanged);
+
+        this.resizeObserver = new ResizeObserver(this.resizeObserverCallback);
+        this.resizeObserver.observe(this.wrapperElement.current);
+    }
+
+    componentWillUnmount() {
+        this.props.callEventGrouper.removeListener(CallEventGrouperEvent.StateChanged, this.onStateChanged);
+        this.props.callEventGrouper.removeListener(CallEventGrouperEvent.SilencedChanged, this.onSilencedChanged);
+        this.props.callEventGrouper.removeListener(CallEventGrouperEvent.LengthChanged, this.onLengthChanged);
+
+        this.resizeObserver.disconnect();
+    }
+
+    private onLengthChanged = (length: number): void => {
+        this.setState({ length });
+    };
+
+    private resizeObserverCallback = (entries: ResizeObserverEntry[]): void => {
+        const wrapperElementEntry = entries.find((entry) => entry.target === this.wrapperElement.current);
+        if (!wrapperElementEntry) return;
+
+        this.setState({ narrow: wrapperElementEntry.contentRect.width < MAX_NON_NARROW_WIDTH });
+    };
+
+    private onSilencedChanged = (newState) => {
+        this.setState({ silenced: newState });
+    };
+
+    private onStateChanged = (newState: CallState) => {
+        this.setState({ callState: newState });
+    };
+
+    private renderCallBackButton(text: string): JSX.Element {
+        return (
+            <AccessibleButton
+                className="mx_CallEvent_content_button mx_CallEvent_content_button_callBack"
+                onClick={this.props.callEventGrouper.callBack}
+                kind="primary"
+            >
+                <span> { text } </span>
+            </AccessibleButton>
+        );
+    }
+
+    private renderSilenceIcon(): JSX.Element {
+        const silenceClass = classNames({
+            "mx_CallEvent_iconButton": true,
+            "mx_CallEvent_unSilence": this.state.silenced,
+            "mx_CallEvent_silence": !this.state.silenced,
+        });
+
+        return (
+            <AccessibleTooltipButton
+                className={silenceClass}
+                onClick={this.props.callEventGrouper.toggleSilenced}
+                title={this.state.silenced ? _t("Sound on") : _t("Silence call")}
+            />
+        );
+    }
+
+    private renderContent(state: CallState | CustomCallState): JSX.Element {
+        if (state === CallState.Ringing) {
+            let silenceIcon;
+            if (!this.state.narrow) {
+                silenceIcon = this.renderSilenceIcon();
+            }
+
+            return (
+                <div className="mx_CallEvent_content">
+                    { silenceIcon }
+                    <AccessibleButton
+                        className="mx_CallEvent_content_button mx_CallEvent_content_button_reject"
+                        onClick={this.props.callEventGrouper.rejectCall}
+                        kind="danger"
+                    >
+                        <span> { _t("Decline") } </span>
+                    </AccessibleButton>
+                    <AccessibleButton
+                        className="mx_CallEvent_content_button mx_CallEvent_content_button_answer"
+                        onClick={this.props.callEventGrouper.answerCall}
+                        kind="primary"
+                    >
+                        <span> { _t("Accept") } </span>
+                    </AccessibleButton>
+                </div>
+            );
+        }
+        if (state === CallState.Ended) {
+            const hangupReason = this.props.callEventGrouper.hangupReason;
+            const gotRejected = this.props.callEventGrouper.gotRejected;
+
+            if (gotRejected) {
+                return (
+                    <div className="mx_CallEvent_content">
+                        { _t("Call declined") }
+                        { this.renderCallBackButton(_t("Call back")) }
+                    </div>
+                );
+            } else if (([CallErrorCode.UserHangup, "user hangup"].includes(hangupReason) || !hangupReason)) {
+                // workaround for https://github.com/vector-im/element-web/issues/5178
+                // it seems Android randomly sets a reason of "user hangup" which is
+                // interpreted as an error code :(
+                // https://github.com/vector-im/riot-android/issues/2623
+                // Also the correct hangup code as of VoIP v1 (with underscore)
+                // Also, if we don't have a reason
+                const duration = this.props.callEventGrouper.duration;
+                let text = _t("Call ended");
+                if (duration) {
+                    text += " • " + formatCallTime(duration);
+                }
+                return (
+                    <div className="mx_CallEvent_content">
+                        { text }
+                    </div>
+                );
+            } else if (hangupReason === CallErrorCode.InviteTimeout) {
+                return (
+                    <div className="mx_CallEvent_content">
+                        { _t("No answer") }
+                        { this.renderCallBackButton(_t("Call back")) }
+                    </div>
+                );
+            }
+
+            let reason;
+            if (hangupReason === CallErrorCode.IceFailed) {
+                // We couldn't establish a connection at all
+                reason = _t("Could not connect media");
+            } else if (hangupReason === "ice_timeout") {
+                // We established a connection but it died
+                reason = _t("Connection failed");
+            } else if (hangupReason === CallErrorCode.NoUserMedia) {
+                // The other side couldn't open capture devices
+                reason = _t("Their device couldn't start the camera or microphone");
+            } else if (hangupReason === "unknown_error") {
+                // An error code the other side doesn't have a way to express
+                // (as opposed to an error code they gave but we don't know about,
+                // in which case we show the error code)
+                reason = _t("An unknown error occurred");
+            } else if (hangupReason === CallErrorCode.UserBusy) {
+                reason = _t("The user you called is busy.");
+            } else {
+                reason = _t('Unknown failure: %(reason)s', { reason: hangupReason });
+            }
+
+            return (
+                <div className="mx_CallEvent_content">
+                    <InfoTooltip
+                        tooltip={reason}
+                        className="mx_CallEvent_content_tooltip"
+                        kind={InfoTooltipKind.Warning}
+                    />
+                    { _t("Connection failed") }
+                    { this.renderCallBackButton(_t("Retry")) }
+                </div>
+            );
+        }
+        if (state === CallState.Connected) {
+            return (
+                <div className="mx_CallEvent_content">
+                    <Clock seconds={this.state.length} />
+                </div>
+            );
+        }
+        if (state === CallState.Connecting) {
+            return (
+                <div className="mx_CallEvent_content">
+                    { _t("Connecting") }
+                </div>
+            );
+        }
+        if (state === CustomCallState.Missed) {
+            return (
+                <div className="mx_CallEvent_content">
+                    { _t("Missed call") }
+                    { this.renderCallBackButton(_t("Call back")) }
+                </div>
+            );
+        }
+
+        return (
+            <div className="mx_CallEvent_content">
+                { _t("The call is in an unknown state!") }
+            </div>
+        );
+    }
+
+    render() {
+        const event = this.props.mxEvent;
+        const sender = event.sender ? event.sender.name : event.getSender();
+        const isVoice = this.props.callEventGrouper.isVoice;
+        const callType = isVoice ? _t("Voice call") : _t("Video call");
+        const callState = this.state.callState;
+        const hangupReason = this.props.callEventGrouper.hangupReason;
+        const content = this.renderContent(callState);
+        const className = classNames("mx_CallEvent", {
+            mx_CallEvent_voice: isVoice,
+            mx_CallEvent_video: !isVoice,
+            mx_CallEvent_narrow: this.state.narrow,
+            mx_CallEvent_missed: callState === CustomCallState.Missed,
+            mx_CallEvent_noAnswer: callState === CallState.Ended && hangupReason === CallErrorCode.InviteTimeout,
+            mx_CallEvent_rejected: callState === CallState.Ended && this.props.callEventGrouper.gotRejected,
+        });
+        let silenceIcon;
+        if (this.state.narrow && this.state.callState === CallState.Ringing) {
+            silenceIcon = this.renderSilenceIcon();
+        }
+
+        return (
+            <div className="mx_CallEvent_wrapper" ref={this.wrapperElement}>
+                <div className={className}>
+                    { silenceIcon }
+                    <div className="mx_CallEvent_info">
+                        <MemberAvatar
+                            member={event.sender}
+                            width={32}
+                            height={32}
+                        />
+                        <div className="mx_CallEvent_info_basic">
+                            <div className="mx_CallEvent_sender">
+                                { sender }
+                            </div>
+                            <div className="mx_CallEvent_type">
+                                <div className="mx_CallEvent_type_icon" />
+                                { callType }
+                            </div>
+                        </div>
+                    </div>
+                    { content }
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.tsx
similarity index 75%
rename from src/components/views/messages/DateSeparator.js
rename to src/components/views/messages/DateSeparator.tsx
index 82ce8dc4ae..d66fcbf118 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.tsx
@@ -1,6 +1,6 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
+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.
@@ -16,12 +16,12 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import {formatFullDateNoTime} from '../../../DateUtils';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-function getdaysArray() {
+import { _t } from '../../../languageHandler';
+import { formatFullDateNoTime } from '../../../DateUtils';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+function getDaysArray(): string[] {
     return [
         _t('Sunday'),
         _t('Monday'),
@@ -33,17 +33,22 @@ function getdaysArray() {
     ];
 }
 
-@replaceableComponent("views.messages.DateSeparator")
-export default class DateSeparator extends React.Component {
-    static propTypes = {
-        ts: PropTypes.number.isRequired,
-    };
+interface IProps {
+    ts: number;
+    forExport?: boolean;
+}
 
-    getLabel() {
+@replaceableComponent("views.messages.DateSeparator")
+export default class DateSeparator extends React.Component<IProps> {
+    private getLabel() {
         const date = new Date(this.props.ts);
+
+        // During the time the archive is being viewed, a specific day might not make sense, so we return the full date
+        if (this.props.forExport) return formatFullDateNoTime(date);
+
         const today = new Date();
         const yesterday = new Date();
-        const days = getdaysArray();
+        const days = getDaysArray();
         yesterday.setDate(today.getDate() - 1);
 
         if (date.toDateString() === today.toDateString()) {
diff --git a/src/components/views/messages/DownloadActionButton.tsx b/src/components/views/messages/DownloadActionButton.tsx
new file mode 100644
index 0000000000..6dc48b0936
--- /dev/null
+++ b/src/components/views/messages/DownloadActionButton.tsx
@@ -0,0 +1,97 @@
+/*
+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 { MatrixEvent } from "matrix-js-sdk/src";
+import { MediaEventHelper } from "../../../utils/MediaEventHelper";
+import React from "react";
+import { RovingAccessibleTooltipButton } from "../../../accessibility/RovingTabIndex";
+import Spinner from "../elements/Spinner";
+import classNames from "classnames";
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { FileDownloader } from "../../../utils/FileDownloader";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+
+    // XXX: It can take a cycle or two for the MessageActionBar to have all the props/setup
+    // required to get us a MediaEventHelper, so we use a getter function instead to prod for
+    // one.
+    mediaEventHelperGet: () => MediaEventHelper;
+}
+
+interface IState {
+    loading: boolean;
+    blob?: Blob;
+}
+
+@replaceableComponent("views.messages.DownloadActionButton")
+export default class DownloadActionButton extends React.PureComponent<IProps, IState> {
+    private downloader = new FileDownloader();
+
+    public constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            loading: false,
+        };
+    }
+
+    private onDownloadClick = async () => {
+        if (this.state.loading) return;
+
+        this.setState({ loading: true });
+
+        if (this.state.blob) {
+            // Cheat and trigger a download, again.
+            return this.doDownload();
+        }
+
+        const blob = await this.props.mediaEventHelperGet().sourceBlob.value;
+        this.setState({ blob });
+        await this.doDownload();
+    };
+
+    private async doDownload() {
+        await this.downloader.download({
+            blob: this.state.blob,
+            name: this.props.mediaEventHelperGet().fileName,
+        });
+        this.setState({ loading: false });
+    }
+
+    public render() {
+        let spinner: JSX.Element;
+        if (this.state.loading) {
+            spinner = <Spinner w={18} h={18} />;
+        }
+
+        const classes = classNames({
+            'mx_MessageActionBar_maskButton': true,
+            'mx_MessageActionBar_downloadButton': true,
+            'mx_MessageActionBar_downloadSpinnerButton': !!spinner,
+        });
+
+        return <RovingAccessibleTooltipButton
+            className={classes}
+            title={spinner ? _t("Decrypting") : _t("Download")}
+            onClick={this.onDownloadClick}
+            disabled={!!spinner}
+        >
+            { spinner }
+        </RovingAccessibleTooltipButton>;
+    }
+}
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.tsx
similarity index 62%
rename from src/components/views/messages/EditHistoryMessage.js
rename to src/components/views/messages/EditHistoryMessage.tsx
index dc4e0187d3..1abed87b76 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -14,122 +14,127 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef } from 'react';
 import * as HtmlUtils from '../../../HtmlUtils';
 import { editBodyDiffToHtml } from '../../../utils/MessageDiffUtils';
-import {formatTime} from '../../../DateUtils';
-import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
-import {pillifyLinks, unmountPills} from '../../../utils/pillify';
+import { formatTime } from '../../../DateUtils';
+import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { pillifyLinks, unmountPills } from '../../../utils/pillify';
 import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import classNames from 'classnames';
 import RedactedBody from "./RedactedBody";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AccessibleButton from "../elements/AccessibleButton";
+import ConfirmAndWaitRedactDialog from "../dialogs/ConfirmAndWaitRedactDialog";
+import ViewSource from "../../structures/ViewSource";
 
 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
-        mxEvent: PropTypes.instanceOf(MatrixEvent).isRequired,
-        previousEdit: PropTypes.instanceOf(MatrixEvent),
-        isBaseEvent: PropTypes.bool,
-    };
+interface IProps {
+    // the message event being edited
+    mxEvent: MatrixEvent;
+    previousEdit?: MatrixEvent;
+    isBaseEvent?: boolean;
+    isTwelveHour?: boolean;
+}
 
-    constructor(props) {
+interface IState {
+    canRedact: boolean;
+    sendStatus: EventStatus;
+}
+
+@replaceableComponent("views.messages.EditHistoryMessage")
+export default class EditHistoryMessage extends React.PureComponent<IProps, IState> {
+    private content = createRef<HTMLDivElement>();
+    private pills: Element[] = [];
+
+    constructor(props: IProps) {
         super(props);
+
         const cli = MatrixClientPeg.get();
-        const {userId} = cli.credentials;
+        const { userId } = cli.credentials;
         const event = this.props.mxEvent;
         const room = cli.getRoom(event.getRoomId());
         if (event.localRedactionEvent()) {
-            event.localRedactionEvent().on("status", this._onAssociatedStatusChanged);
+            event.localRedactionEvent().on("status", this.onAssociatedStatusChanged);
         }
         const canRedact = room.currentState.maySendRedactionForEvent(event, userId);
-        this.state = {canRedact, sendStatus: event.getAssociatedStatus()};
-
-        this._content = createRef();
-        this._pills = [];
+        this.state = { canRedact, sendStatus: event.getAssociatedStatus() };
     }
 
-    _onAssociatedStatusChanged = () => {
-        this.setState({sendStatus: this.props.mxEvent.getAssociatedStatus()});
+    private onAssociatedStatusChanged = (): void => {
+        this.setState({ sendStatus: this.props.mxEvent.getAssociatedStatus() });
     };
 
-    _onRedactClick = async () => {
+    private onRedactClick = async (): Promise<void> => {
         const event = this.props.mxEvent;
         const cli = MatrixClientPeg.get();
-        const ConfirmAndWaitRedactDialog = sdk.getComponent("dialogs.ConfirmAndWaitRedactDialog");
 
         Modal.createTrackedDialog('Confirm Redact Dialog', 'Edit history', ConfirmAndWaitRedactDialog, {
             redact: () => cli.redactEvent(event.getRoomId(), event.getId()),
         }, 'mx_Dialog_confirmredact');
     };
 
-    _onViewSourceClick = () => {
-        const ViewSource = sdk.getComponent('structures.ViewSource');
+    private onViewSourceClick = (): void => {
         Modal.createTrackedDialog('View Event Source', 'Edit history', ViewSource, {
             mxEvent: this.props.mxEvent,
         }, 'mx_Dialog_viewsource');
     };
 
-    pillifyLinks() {
+    private pillifyLinks(): void {
         // not present for redacted events
-        if (this._content.current) {
-            pillifyLinks(this._content.current.children, this.props.mxEvent, this._pills);
+        if (this.content.current) {
+            pillifyLinks(this.content.current.children, this.props.mxEvent, this.pills);
         }
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         this.pillifyLinks();
     }
 
-    componentWillUnmount() {
-        unmountPills(this._pills);
+    public componentWillUnmount(): void {
+        unmountPills(this.pills);
         const event = this.props.mxEvent;
         if (event.localRedactionEvent()) {
-            event.localRedactionEvent().off("status", this._onAssociatedStatusChanged);
+            event.localRedactionEvent().off("status", this.onAssociatedStatusChanged);
         }
     }
 
-    componentDidUpdate() {
+    public componentDidUpdate(): void {
         this.pillifyLinks();
     }
 
-    _renderActionBar() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+    private renderActionBar(): JSX.Element {
         // hide the button when already redacted
         let redactButton;
         if (!this.props.mxEvent.isRedacted() && !this.props.isBaseEvent && this.state.canRedact) {
             redactButton = (
-                <AccessibleButton onClick={this._onRedactClick}>
-                    {_t("Remove")}
+                <AccessibleButton onClick={this.onRedactClick}>
+                    { _t("Remove") }
                 </AccessibleButton>
             );
         }
         const viewSourceButton = (
-            <AccessibleButton onClick={this._onViewSourceClick}>
-                {_t("View Source")}
+            <AccessibleButton onClick={this.onViewSourceClick}>
+                { _t("View Source") }
             </AccessibleButton>
         );
         // disabled remove button when not allowed
         return (
             <div className="mx_MessageActionBar">
-                {redactButton}
-                {viewSourceButton}
+                { redactButton }
+                { viewSourceButton }
             </div>
         );
     }
 
-    render() {
-        const {mxEvent} = this.props;
+    public render(): JSX.Element {
+        const { mxEvent } = this.props;
         const content = getReplacedContent(mxEvent);
         let contentContainer;
         if (mxEvent.isRedacted()) {
@@ -139,18 +144,22 @@ export default class EditHistoryMessage extends React.PureComponent {
             if (this.props.previousEdit) {
                 contentElements = editBodyDiffToHtml(getReplacedContent(this.props.previousEdit), content);
             } else {
-                contentElements = HtmlUtils.bodyToHtml(content, null, {stripReplyFallback: true});
+                contentElements = HtmlUtils.bodyToHtml(
+                    content,
+                    null,
+                    { stripReplyFallback: true, returnString: false },
+                );
             }
             if (mxEvent.getContent().msgtype === "m.emote") {
                 const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
                 contentContainer = (
-                    <div className="mx_EventTile_content" ref={this._content}>*&nbsp;
+                    <div className="mx_EventTile_content" ref={this.content}>*&nbsp;
                         <span className="mx_MEmoteBody_sender">{ name }</span>
-                        &nbsp;{contentElements}
+                        &nbsp;{ contentElements }
                     </div>
                 );
             } else {
-                contentContainer = <div className="mx_EventTile_content" ref={this._content}>{contentElements}</div>;
+                contentContainer = <div className="mx_EventTile_content" ref={this.content}>{ contentElements }</div>;
             }
         }
 
@@ -165,9 +174,9 @@ export default class EditHistoryMessage extends React.PureComponent {
             <li>
                 <div className={classes}>
                     <div className="mx_EventTile_line">
-                        <span className="mx_MessageTimestamp">{timestamp}</span>
+                        <span className="mx_MessageTimestamp">{ timestamp }</span>
                         { contentContainer }
-                        { this._renderActionBar() }
+                        { this.renderActionBar() }
                     </div>
                 </div>
             </li>
diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
index 3af9c463c9..8f352610e0 100644
--- a/src/components/views/messages/EncryptionEvent.tsx
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -14,28 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {forwardRef, useContext} from 'react';
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import React, { forwardRef, useContext } from 'react';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IRoomEncryption } from "matrix-js-sdk/src/crypto/RoomList";
 
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import EventTileBubble from "./EventTileBubble";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import DMRoomMap from "../../../utils/DMRoomMap";
+import { objectHasDiff } from "../../../utils/objects";
 
 interface IProps {
     mxEvent: MatrixEvent;
 }
 
-const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({mxEvent}, ref) => {
+const ALGORITHM = "m.megolm.v1.aes-sha2";
+
+const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({ mxEvent }, ref) => {
     const cli = useContext(MatrixClientContext);
     const roomId = mxEvent.getRoomId();
     const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId);
 
-    if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
+    const prevContent = mxEvent.getPrevContent() as IRoomEncryption;
+    const content = mxEvent.getContent<IRoomEncryption>();
+
+    // if no change happened then skip rendering this, a shallow check is enough as all known fields are top-level.
+    if (!objectHasDiff(prevContent, content)) return null; // nop
+
+    if (content.algorithm === ALGORITHM && isRoomEncrypted) {
         let subtitle: string;
         const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId);
-        if (dmPartner) {
+        if (prevContent.algorithm === ALGORITHM) {
+            subtitle = _t("Some encryption parameters have been changed.");
+        } else if (dmPartner) {
             const displayName = cli?.getRoom(roomId)?.getMember(dmPartner)?.rawDisplayName || dmPartner;
             subtitle = _t("Messages here are end-to-end encrypted. " +
                 "Verify %(displayName)s in their profile - tap on their avatar.", { displayName });
@@ -49,7 +61,9 @@ const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({mxEvent}, ref) => {
             title={_t("Encryption enabled")}
             subtitle={subtitle}
         />;
-    } else if (isRoomEncrypted) {
+    }
+
+    if (isRoomEncrypted) {
         return <EventTileBubble
             className="mx_cryptoEvent mx_cryptoEvent_icon"
             title={_t("Encryption enabled")}
diff --git a/src/components/views/messages/EventTileBubble.tsx b/src/components/views/messages/EventTileBubble.tsx
index f797a97a3d..9fa3586ea5 100644
--- a/src/components/views/messages/EventTileBubble.tsx
+++ b/src/components/views/messages/EventTileBubble.tsx
@@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {forwardRef, ReactNode} from "react";
+import React, { forwardRef, ReactNode, ReactChildren } from "react";
 import classNames from "classnames";
 
 interface IProps {
     className: string;
     title: string;
     subtitle?: ReactNode;
+    children?: ReactChildren;
 }
 
 const EventTileBubble = forwardRef<HTMLDivElement, IProps>(({ className, title, subtitle, children }, ref) => {
diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts
new file mode 100644
index 0000000000..daa05c3b1a
--- /dev/null
+++ b/src/components/views/messages/IBodyProps.ts
@@ -0,0 +1,44 @@
+/*
+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 { MatrixEvent } from "matrix-js-sdk/src";
+import { TileShape } from "../rooms/EventTile";
+import { MediaEventHelper } from "../../../utils/MediaEventHelper";
+import EditorStateTransfer from "../../../utils/EditorStateTransfer";
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+
+export interface IBodyProps {
+    mxEvent: MatrixEvent;
+
+    /* a list of words to highlight */
+    highlights: string[];
+
+    /* link URL for the highlights */
+    highlightLink: string;
+
+    /* callback called when dynamic content in events are loaded */
+    onHeightChanged: () => void;
+
+    showUrlPreview?: boolean;
+    forExport?: boolean;
+    tileShape: TileShape;
+    maxImageHeight?: number;
+    replacingEventId?: string;
+    editState?: EditorStateTransfer;
+    onMessageAllowed: () => void; // TODO: Docs
+    permalinkCreator: RoomPermalinkCreator;
+    mediaEventHelper: MediaEventHelper;
+}
diff --git a/src/contexts/MatrixClientContext.ts b/src/components/views/messages/IMediaBody.ts
similarity index 63%
rename from src/contexts/MatrixClientContext.ts
rename to src/components/views/messages/IMediaBody.ts
index 7e8a92064d..27b5f24275 100644
--- a/src/contexts/MatrixClientContext.ts
+++ b/src/components/views/messages/IMediaBody.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { createContext } from "react";
-import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MediaEventHelper } from "../../../utils/MediaEventHelper";
 
-const MatrixClientContext = createContext<MatrixClient>(undefined);
-MatrixClientContext.displayName = "MatrixClientContext";
-export default MatrixClientContext;
+export interface IMediaBody {
+    getMediaHelper(): MediaEventHelper;
+}
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
deleted file mode 100644
index 0d5e449fc0..0000000000
--- a/src/components/views/messages/MAudioBody.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- Copyright 2016 OpenMarket Ltd
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import React from 'react';
-import MFileBody from './MFileBody';
-
-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 {
-    constructor(props) {
-        super(props);
-        this.state = {
-            playing: false,
-            decryptedUrl: null,
-            decryptedBlob: null,
-            error: null,
-        };
-    }
-    onPlayToggle() {
-        this.setState({
-            playing: !this.state.playing,
-        });
-    }
-
-    _getContentUrl() {
-        const media = mediaFromContent(this.props.mxEvent.getContent());
-        if (media.isEncrypted) {
-            return this.state.decryptedUrl;
-        } else {
-            return media.srcHttp;
-        }
-    }
-
-    componentDidMount() {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            let decryptedBlob;
-            decryptFile(content.file).then(function(blob) {
-                decryptedBlob = blob;
-                return URL.createObjectURL(decryptedBlob);
-            }).then((url) => {
-                this.setState({
-                    decryptedUrl: url,
-                    decryptedBlob: decryptedBlob,
-                });
-            }, (err) => {
-                console.warn("Unable to decrypt attachment: ", err);
-                this.setState({
-                    error: err,
-                });
-            });
-        }
-    }
-
-    componentWillUnmount() {
-        if (this.state.decryptedUrl) {
-            URL.revokeObjectURL(this.state.decryptedUrl);
-        }
-    }
-
-    render() {
-        const content = this.props.mxEvent.getContent();
-
-        if (this.state.error !== null) {
-            return (
-                <span className="mx_MAudioBody">
-                    <img src={require("../../../../res/img/warning.svg")} width="16" height="16" />
-                    { _t("Error decrypting audio") }
-                </span>
-            );
-        }
-
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            // Need to decrypt the attachment
-            // The attachment is decrypted in componentDidMount.
-            // For now add an img tag with a 16x16 spinner.
-            // Not sure how tall the audio player is so not sure how tall it should actually be.
-            return (
-                <span className="mx_MAudioBody">
-                    <InlineSpinner />
-                </span>
-            );
-        }
-
-        const contentUrl = this._getContentUrl();
-
-        return (
-            <span className="mx_MAudioBody">
-                <audio src={contentUrl} controls />
-                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />
-            </span>
-        );
-    }
-}
diff --git a/src/components/views/messages/MAudioBody.tsx b/src/components/views/messages/MAudioBody.tsx
new file mode 100644
index 0000000000..3611435e55
--- /dev/null
+++ b/src/components/views/messages/MAudioBody.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 from "react";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { Playback } from "../../../audio/Playback";
+import InlineSpinner from '../elements/InlineSpinner';
+import { _t } from "../../../languageHandler";
+import AudioPlayer from "../audio_messages/AudioPlayer";
+import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent";
+import MFileBody from "./MFileBody";
+import { IBodyProps } from "./IBodyProps";
+import { PlaybackManager } from "../../../audio/PlaybackManager";
+import { isVoiceMessage } from "../../../utils/EventUtils";
+import { PlaybackQueue } from "../../../audio/PlaybackQueue";
+
+interface IState {
+    error?: Error;
+    playback?: Playback;
+}
+
+@replaceableComponent("views.messages.MAudioBody")
+export default class MAudioBody extends React.PureComponent<IBodyProps, IState> {
+    constructor(props: IBodyProps) {
+        super(props);
+
+        this.state = {};
+    }
+
+    public async componentDidMount() {
+        let buffer: ArrayBuffer;
+
+        try {
+            try {
+                const blob = await this.props.mediaEventHelper.sourceBlob.value;
+                buffer = await blob.arrayBuffer();
+            } catch (e) {
+                this.setState({ error: e });
+                console.warn("Unable to decrypt audio message", e);
+                return; // stop processing the audio file
+            }
+        } catch (e) {
+            this.setState({ error: e });
+            console.warn("Unable to decrypt/download audio message", e);
+            return; // stop processing the audio file
+        }
+
+        // We should have a buffer to work with now: let's set it up
+
+        // Note: we don't actually need a waveform to render an audio event, but voice messages do.
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
+        const waveform = content?.["org.matrix.msc1767.audio"]?.waveform?.map(p => p / 1024);
+
+        // We should have a buffer to work with now: let's set it up
+        const playback = PlaybackManager.instance.createPlaybackInstance(buffer, waveform);
+        playback.clockInfo.populatePlaceholdersFrom(this.props.mxEvent);
+        this.setState({ playback });
+
+        if (isVoiceMessage(this.props.mxEvent)) {
+            PlaybackQueue.forRoom(this.props.mxEvent.getRoomId()).unsortedEnqueue(this.props.mxEvent, playback);
+        }
+
+        // Note: the components later on will handle preparing the Playback class for us.
+    }
+
+    public componentWillUnmount() {
+        this.state.playback?.destroy();
+    }
+
+    public render() {
+        if (this.state.error) {
+            return (
+                <span className="mx_MAudioBody">
+                    <img src={require("../../../../res/img/warning.svg")} width="16" height="16" />
+                    { _t("Error processing audio message") }
+                </span>
+            );
+        }
+
+        if (this.props.forExport) {
+            const content = this.props.mxEvent.getContent();
+            // During export, the content url will point to the MSC, which will later point to a local url
+            const contentUrl = content.file?.url || content.url;
+            return (
+                <span className="mx_MAudioBody">
+                    <audio src={contentUrl} controls />
+                </span>
+            );
+        }
+
+        if (!this.state.playback) {
+            return (
+                <span className="mx_MAudioBody">
+                    <InlineSpinner />
+                </span>
+            );
+        }
+
+        // At this point we should have a playable state
+        return (
+            <span className="mx_MAudioBody">
+                <AudioPlayer playback={this.state.playback} mediaName={this.props.mxEvent.getContent().body} />
+                { this.props.tileShape && <MFileBody {...this.props} showGenericPlaceholder={false} /> }
+            </span>
+        );
+    }
+}
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
deleted file mode 100644
index 8f464e08bd..0000000000
--- a/src/components/views/messages/MFileBody.js
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-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.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import filesize from 'filesize';
-import { _t } from '../../../languageHandler';
-import {decryptFile} from '../../../utils/DecryptFile';
-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
-
-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);
-}
-
-// 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
-// client. Otherwise those scripts written by remote users can read
-// the access token and end-to-end keys that are in local storage.
-//
-// For attachments downloaded directly from the homeserver we can use
-// Content-Security-Policy headers to disable script execution.
-//
-// But attachments with end-to-end encryption are more difficult to handle.
-// We need to decrypt the attachment on the client and then display it.
-// To display the attachment we need to turn the decrypted bytes into a URL.
-//
-// There are two ways to turn bytes into URLs, data URL and blob URLs.
-// Data URLs aren't suitable for downloading a file because Chrome has a
-// 2MB limit on the size of URLs that can be viewed in the browser or
-// downloaded. This limit does not seem to apply when the url is used as
-// the source attribute of an image tag.
-//
-// Blob URLs are generated using window.URL.createObjectURL and unfortunately
-// for our purposes they inherit the origin of the page that created them.
-// This means that any scripts that run when the URL is viewed will be able
-// to access local storage.
-//
-// The easiest solution is to host the code that generates the blob URL on
-// a different domain to the client.
-// Another possibility is to generate the blob URL within a sandboxed iframe.
-// The downside of using a second domain is that it complicates hosting,
-// the downside of using a sandboxed iframe is that the browers are overly
-// restrictive in what you are allowed to do with the generated URL.
-
-/**
- * Get the current CSS style for a DOMElement.
- * @param {HTMLElement} element The element to get the current style of.
- * @return {string} The CSS style encoded as a string.
- */
-function computedStyle(element) {
-    if (!element) {
-        return "";
-    }
-    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
-        for (let i = 0; i < style.length; i++) {
-            cssText += style[i] + ":";
-            cssText += style.getPropertyValue(style[i]) + ";";
-        }
-    }
-    return cssText;
-}
-
-@replaceableComponent("views.messages.MFileBody")
-export default class MFileBody extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
-        /* already decrypted blob */
-        decryptedBlob: PropTypes.object,
-        /* called when the download link iframe is shown */
-        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) {
-        super(props);
-
-        this.state = {
-            decryptedBlob: (this.props.decryptedBlob ? this.props.decryptedBlob : null),
-        };
-
-        this._iframe = createRef();
-        this._dummyLink = createRef();
-    }
-
-    /**
-     * Extracts a human readable label for the file attachment to use as
-     * 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, 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
-            // file extension.
-            linkText = content.body;
-        }
-
-        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.
-            // The content.info also contains a MIME-type but we don't display
-            // it since it is "ugly", users generally aren't aware what it
-            // means and the type of the attachment can usually be inferrered
-            // from the file extension.
-            linkText += ' (' + filesize(content.info.size) + ')';
-        }
-        return linkText;
-    }
-
-    _getContentUrl() {
-        const media = mediaFromContent(this.props.mxEvent.getContent());
-        return media.srcHttp;
-    }
-
-    componentDidUpdate(prevProps, prevState) {
-        if (this.props.onHeightChanged && !prevState.decryptedBlob && this.state.decryptedBlob) {
-            this.props.onHeightChanged();
-        }
-    }
-
-    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 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
-                // Wait for the user to click on the link before downloading
-                // and decrypting the attachment.
-                let decrypting = false;
-                const decrypt = (e) => {
-                    if (decrypting) {
-                        return false;
-                    }
-                    decrypting = true;
-                    decryptFile(content.file).then((blob) => {
-                        this.setState({
-                            decryptedBlob: blob,
-                        });
-                    }).catch((err) => {
-                        console.warn("Unable to decrypt attachment: ", err);
-                        Modal.createTrackedDialog('Error decrypting attachment', '', ErrorDialog, {
-                            title: _t("Error"),
-                            description: _t("Error decrypting attachment"),
-                        });
-                    }).finally(() => {
-                        decrypting = false;
-                    });
-                };
-
-                // This button should actually Download because usercontent/ will try to click itself
-                // but it is not guaranteed between various browsers' settings.
-                return (
-                    <span className="mx_MFileBody">
-                        {placeholder}
-                        <div className="mx_MFileBody_download">
-                            <AccessibleButton onClick={decrypt}>
-                                { _t("Decrypt %(text)s", { text: text }) }
-                            </AccessibleButton>
-                        </div>
-                    </span>
-                );
-            }
-
-            // When the iframe loads we tell it to render a download link
-            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
-                    // will have the correct name when the user tries to download it.
-                    // We can't provide a Content-Disposition header like we would for HTTP.
-                    download: fileName,
-                    textContent: _t("Download %(text)s", { text: text }),
-                    // only auto-download if a user triggered this iframe explicitly
-                    auto: !this.props.decryptedBlob,
-                }, "*");
-            };
-
-            const url = "usercontent/"; // XXX: this path should probably be passed from the skin
-
-            // If the attachment is encrypted then put the link inside an iframe.
-            return (
-                <span className="mx_MFileBody">
-                    {placeholder}
-                    <div className="mx_MFileBody_download">
-                        <div style={{display: "none"}}>
-                            { /*
-                              * Add dummy copy of the "a" tag
-                              * We'll use it to learn how the download link
-                              * would have been styled if it was rendered inline.
-                              */ }
-                            <a ref={this._dummyLink} />
-                        </div>
-                        <iframe
-                            src={url}
-                            onLoad={onIframeLoad}
-                            ref={this._iframe}
-                            sandbox="allow-scripts allow-downloads allow-downloads-without-user-activation" />
-                    </div>
-                </span>
-            );
-        } else if (contentUrl) {
-            const downloadProps = {
-                target: "_blank",
-                rel: "noreferrer noopener",
-
-                // We set the href regardless of whether or not we intercept the download
-                // because we don't really want to convert the file to a blob eagerly, and
-                // still want "open in new tab" and "save link as" to work.
-                href: contentUrl,
-            };
-
-            // Blobs can only have up to 500mb, so if the file reports as being too large then
-            // we won't try and convert it. Likewise, if the file size is unknown then we'll assume
-            // it is too big. There is the risk of the reported file size and the actual file size
-            // being different, however the user shouldn't normally run into this problem.
-            const fileTooBig = typeof(fileSize) === 'number' ? fileSize > 524288000 : true;
-
-            if (["application/pdf"].includes(fileType) && !fileTooBig) {
-                // We want to force a download on this type, so use an onClick handler.
-                downloadProps["onClick"] = (e) => {
-                    console.log(`Downloading ${fileType} as blob (unencrypted)`);
-
-                    // Avoid letting the <a> do its thing
-                    e.preventDefault();
-                    e.stopPropagation();
-
-                    // Start a fetch for the download
-                    // Based upon https://stackoverflow.com/a/49500465
-                    fetch(contentUrl).then((response) => response.blob()).then((blob) => {
-                        const blobUrl = URL.createObjectURL(blob);
-
-                        // We have to create an anchor to download the file
-                        const tempAnchor = document.createElement('a');
-                        tempAnchor.download = fileName;
-                        tempAnchor.href = blobUrl;
-                        document.body.appendChild(tempAnchor); // for firefox: https://stackoverflow.com/a/32226068
-                        tempAnchor.click();
-                        tempAnchor.remove();
-                    });
-                };
-            } else {
-                // Else we are hoping the browser will do the right thing
-                downloadProps["download"] = fileName;
-            }
-
-            // If the attachment is not encrypted then we check whether we
-            // are being displayed in the room timeline or in a list of
-            // files in the right hand side of the screen.
-            if (this.props.tileShape === "file_grid") {
-                return (
-                    <span className="mx_MFileBody">
-                        {placeholder}
-                        <div className="mx_MFileBody_download">
-                            <a className="mx_MFileBody_downloadLink" {...downloadProps}>
-                                { fileName }
-                            </a>
-                            <div className="mx_MImageBody_size">
-                                { content.info && content.info.size ? filesize(content.info.size) : "" }
-                            </div>
-                        </div>
-                    </span>
-                );
-            } else {
-                return (
-                    <span className="mx_MFileBody">
-                        {placeholder}
-                        <div className="mx_MFileBody_download">
-                            <a {...downloadProps}>
-                                <span className="mx_MFileBody_download_icon" />
-                                { _t("Download %(text)s", { text: text }) }
-                            </a>
-                        </div>
-                    </span>
-                );
-            }
-        } 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/MFileBody.tsx b/src/components/views/messages/MFileBody.tsx
new file mode 100644
index 0000000000..80c6b16f0d
--- /dev/null
+++ b/src/components/views/messages/MFileBody.tsx
@@ -0,0 +1,345 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from 'react';
+import filesize from 'filesize';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+import AccessibleButton from "../elements/AccessibleButton";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromContent } from "../../../customisations/Media";
+import ErrorDialog from "../dialogs/ErrorDialog";
+import { TileShape } from "../rooms/EventTile";
+import { presentableTextForFile } from "../../../utils/FileUtils";
+import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent";
+import { IBodyProps } from "./IBodyProps";
+import { FileDownloader } from "../../../utils/FileDownloader";
+import TextWithTooltip from "../elements/TextWithTooltip";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+export let DOWNLOAD_ICON_URL; // cached copy of the download.svg asset for the sandboxed iframe later on
+
+async function cacheDownloadIcon() {
+    if (DOWNLOAD_ICON_URL) return; // cached already
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const svg = await fetch(require("../../../../res/img/download.svg")).then(r => r.text());
+    DOWNLOAD_ICON_URL = "data:image/svg+xml;base64," + window.btoa(svg);
+}
+
+// Cache the asset immediately
+// noinspection JSIgnoredPromiseFromCall
+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
+// client. Otherwise those scripts written by remote users can read
+// the access token and end-to-end keys that are in local storage.
+//
+// For attachments downloaded directly from the homeserver we can use
+// Content-Security-Policy headers to disable script execution.
+//
+// But attachments with end-to-end encryption are more difficult to handle.
+// We need to decrypt the attachment on the client and then display it.
+// To display the attachment we need to turn the decrypted bytes into a URL.
+//
+// There are two ways to turn bytes into URLs, data URL and blob URLs.
+// Data URLs aren't suitable for downloading a file because Chrome has a
+// 2MB limit on the size of URLs that can be viewed in the browser or
+// downloaded. This limit does not seem to apply when the url is used as
+// the source attribute of an image tag.
+//
+// Blob URLs are generated using window.URL.createObjectURL and unfortunately
+// for our purposes they inherit the origin of the page that created them.
+// This means that any scripts that run when the URL is viewed will be able
+// to access local storage.
+//
+// The easiest solution is to host the code that generates the blob URL on
+// a different domain to the client.
+// Another possibility is to generate the blob URL within a sandboxed iframe.
+// The downside of using a second domain is that it complicates hosting,
+// the downside of using a sandboxed iframe is that the browers are overly
+// restrictive in what you are allowed to do with the generated URL.
+
+/**
+ * Get the current CSS style for a DOMElement.
+ * @param {HTMLElement} element The element to get the current style of.
+ * @return {string} The CSS style encoded as a string.
+ */
+export function computedStyle(element: HTMLElement) {
+    if (!element) {
+        return "";
+    }
+    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
+        for (let i = 0; i < style.length; i++) {
+            cssText += style[i] + ":";
+            cssText += style.getPropertyValue(style[i]) + ";";
+        }
+    }
+    return cssText;
+}
+
+interface IProps extends IBodyProps {
+    /* whether or not to show the default placeholder for the file. Defaults to true. */
+    showGenericPlaceholder: boolean;
+}
+
+interface IState {
+    decryptedBlob?: Blob;
+}
+
+@replaceableComponent("views.messages.MFileBody")
+export default class MFileBody extends React.Component<IProps, IState> {
+    static defaultProps = {
+        showGenericPlaceholder: true,
+    };
+
+    private iframe: React.RefObject<HTMLIFrameElement> = createRef();
+    private dummyLink: React.RefObject<HTMLAnchorElement> = createRef();
+    private userDidClick = false;
+    private fileDownloader: FileDownloader = new FileDownloader(() => this.iframe.current);
+
+    public constructor(props: IProps) {
+        super(props);
+
+        this.state = {};
+    }
+
+    private getContentUrl(): string | null {
+        if (this.props.forExport) return null;
+        const media = mediaFromContent(this.props.mxEvent.getContent());
+        return media.srcHttp;
+    }
+    private get content(): IMediaEventContent {
+        return this.props.mxEvent.getContent<IMediaEventContent>();
+    }
+
+    private get fileName(): string {
+        return this.content.body && this.content.body.length > 0 ? this.content.body : _t("Attachment");
+    }
+
+    private get linkText(): string {
+        return presentableTextForFile(this.content);
+    }
+
+    private downloadFile(fileName: string, text: string) {
+        this.fileDownloader.download({
+            blob: this.state.decryptedBlob,
+            name: fileName,
+            autoDownload: this.userDidClick,
+            opts: {
+                imgSrc: DOWNLOAD_ICON_URL,
+                imgStyle: null,
+                style: computedStyle(this.dummyLink.current),
+                textContent: _t("Download %(text)s", { text }),
+            },
+        });
+    }
+
+    public componentDidUpdate(prevProps, prevState) {
+        if (this.props.onHeightChanged && !prevState.decryptedBlob && this.state.decryptedBlob) {
+            this.props.onHeightChanged();
+        }
+    }
+
+    private decryptFile = async (): Promise<void> => {
+        if (this.state.decryptedBlob) {
+            return;
+        }
+        try {
+            this.userDidClick = true;
+            this.setState({
+                decryptedBlob: await this.props.mediaEventHelper.sourceBlob.value,
+            });
+        } catch (err) {
+            console.warn("Unable to decrypt attachment: ", err);
+            Modal.createTrackedDialog('Error decrypting attachment', '', ErrorDialog, {
+                title: _t("Error"),
+                description: _t("Error decrypting attachment"),
+            });
+        }
+    };
+
+    private onPlaceholderClick = async () => {
+        const mediaHelper = this.props.mediaEventHelper;
+        if (mediaHelper?.media.isEncrypted) {
+            await this.decryptFile();
+            this.downloadFile(this.fileName, this.linkText);
+        } else {
+            // As a button we're missing the `download` attribute for styling reasons, so
+            // download with the file downloader.
+            this.fileDownloader.download({
+                blob: await mediaHelper.sourceBlob.value,
+                name: this.fileName,
+            });
+        }
+    };
+
+    public render() {
+        const isEncrypted = this.props.mediaEventHelper?.media.isEncrypted;
+        const contentUrl = this.getContentUrl();
+        const fileSize = this.content.info ? this.content.info.size : null;
+        const fileType = this.content.info ? this.content.info.mimetype : "application/octet-stream";
+
+        let placeholder: React.ReactNode = null;
+        if (this.props.showGenericPlaceholder) {
+            placeholder = (
+                <AccessibleButton className="mx_MediaBody mx_MFileBody_info" onClick={this.onPlaceholderClick}>
+                    <span className="mx_MFileBody_info_icon" />
+                    <TextWithTooltip tooltip={presentableTextForFile(this.content, _t("Attachment"), true)}>
+                        <span className="mx_MFileBody_info_filename">
+                            { presentableTextForFile(this.content, _t("Attachment"), true, true) }
+                        </span>
+                    </TextWithTooltip>
+                </AccessibleButton>
+            );
+        }
+
+        if (this.props.forExport) {
+            const content = this.props.mxEvent.getContent();
+            // During export, the content url will point to the MSC, which will later point to a local url
+            return <span className="mx_MFileBody">
+                <a href={content.file?.url || content.url}>
+                    { placeholder }
+                </a>
+            </span>;
+        }
+
+        const showDownloadLink = this.props.tileShape || !this.props.showGenericPlaceholder;
+
+        if (isEncrypted) {
+            if (!this.state.decryptedBlob) {
+                // Need to decrypt the attachment
+                // Wait for the user to click on the link before downloading
+                // and decrypting the attachment.
+
+                // This button should actually Download because usercontent/ will try to click itself
+                // but it is not guaranteed between various browsers' settings.
+                return (
+                    <span className="mx_MFileBody">
+                        { placeholder }
+                        { showDownloadLink && <div className="mx_MFileBody_download">
+                            <AccessibleButton onClick={this.decryptFile}>
+                                { _t("Decrypt %(text)s", { text: this.linkText }) }
+                            </AccessibleButton>
+                        </div> }
+                    </span>
+                );
+            }
+
+            const url = "usercontent/"; // XXX: this path should probably be passed from the skin
+
+            // If the attachment is encrypted then put the link inside an iframe.
+            return (
+                <span className="mx_MFileBody">
+                    { placeholder }
+                    { showDownloadLink && <div className="mx_MFileBody_download">
+                        <div style={{ display: "none" }}>
+                            { /*
+                              * Add dummy copy of the "a" tag
+                              * We'll use it to learn how the download link
+                              * would have been styled if it was rendered inline.
+                              */ }
+                            <a ref={this.dummyLink} />
+                        </div>
+                        { /*
+                            TODO: Move iframe (and dummy link) into FileDownloader.
+                            We currently have it set up this way because of styles applied to the iframe
+                            itself which cannot be easily handled/overridden by the FileDownloader. In
+                            future, the download link may disappear entirely at which point it could also
+                            be suitable to just remove this bit of code.
+                         */ }
+                        <iframe
+                            src={url}
+                            onLoad={() => this.downloadFile(this.fileName, this.linkText)}
+                            ref={this.iframe}
+                            sandbox="allow-scripts allow-downloads allow-downloads-without-user-activation" />
+                    </div> }
+                </span>
+            );
+        } else if (contentUrl) {
+            const downloadProps = {
+                target: "_blank",
+                rel: "noreferrer noopener",
+
+                // We set the href regardless of whether or not we intercept the download
+                // because we don't really want to convert the file to a blob eagerly, and
+                // still want "open in new tab" and "save link as" to work.
+                href: contentUrl,
+            };
+
+            // Blobs can only have up to 500mb, so if the file reports as being too large then
+            // we won't try and convert it. Likewise, if the file size is unknown then we'll assume
+            // it is too big. There is the risk of the reported file size and the actual file size
+            // being different, however the user shouldn't normally run into this problem.
+            const fileTooBig = typeof(fileSize) === 'number' ? fileSize > 524288000 : true;
+
+            if (["application/pdf"].includes(fileType) && !fileTooBig) {
+                // We want to force a download on this type, so use an onClick handler.
+                downloadProps["onClick"] = (e) => {
+                    logger.log(`Downloading ${fileType} as blob (unencrypted)`);
+
+                    // Avoid letting the <a> do its thing
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    // Start a fetch for the download
+                    // Based upon https://stackoverflow.com/a/49500465
+                    this.props.mediaEventHelper.sourceBlob.value.then((blob) => {
+                        const blobUrl = URL.createObjectURL(blob);
+
+                        // We have to create an anchor to download the file
+                        const tempAnchor = document.createElement('a');
+                        tempAnchor.download = this.fileName;
+                        tempAnchor.href = blobUrl;
+                        document.body.appendChild(tempAnchor); // for firefox: https://stackoverflow.com/a/32226068
+                        tempAnchor.click();
+                        tempAnchor.remove();
+                    });
+                };
+            } else {
+                // Else we are hoping the browser will do the right thing
+                downloadProps["download"] = this.fileName;
+            }
+
+            return (
+                <span className="mx_MFileBody">
+                    { placeholder }
+                    { showDownloadLink && <div className="mx_MFileBody_download">
+                        <a {...downloadProps}>
+                            <span className="mx_MFileBody_download_icon" />
+                            { _t("Download %(text)s", { text: this.linkText }) }
+                        </a>
+                        { this.props.tileShape === TileShape.FileGrid && <div className="mx_MImageBody_size">
+                            { this.content.info && this.content.info.size ? filesize(this.content.info.size) : "" }
+                        </div> }
+                    </div> }
+                </span>
+            );
+        } else {
+            const extra = this.linkText ? (': ' + this.linkText) : '';
+            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.tsx
similarity index 51%
rename from src/components/views/messages/MImageBody.js
rename to src/components/views/messages/MImageBody.tsx
index 6505b1d66a..072e111c4b 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
 Copyright 2018, 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,49 +15,51 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { ComponentProps, createRef } from 'react';
+import { Blurhash } from "react-blurhash";
 
 import MFileBody from './MFileBody';
 import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { Media, mediaFromContent } from "../../../customisations/Media";
+import { BLURHASH_FIELD } from "../../../ContentMessages";
+import { IMediaEventContent } from '../../../customisations/models/IMediaEventContent';
+import ImageView from '../elements/ImageView';
+import { SyncState } from 'matrix-js-sdk/src/sync.api';
+import { IBodyProps } from "./IBodyProps";
+import classNames from 'classnames';
+import { CSSTransition, SwitchTransition } from 'react-transition-group';
+
+interface IState {
+    decryptedUrl?: string;
+    decryptedThumbnailUrl?: string;
+    decryptedBlob?: Blob;
+    error;
+    imgError: boolean;
+    imgLoaded: boolean;
+    loadedImageDimensions?: {
+        naturalWidth: number;
+        naturalHeight: number;
+    };
+    hover: boolean;
+    showImage: boolean;
+    placeholder: 'no-image' | 'blurhash';
+}
 
 @replaceableComponent("views.messages.MImageBody")
-export default class MImageBody extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
-
-        /* called when the image has loaded */
-        onHeightChanged: PropTypes.func.isRequired,
-
-        /* the maximum image height to use */
-        maxImageHeight: PropTypes.number,
-
-        /* the permalinkCreator */
-        permalinkCreator: PropTypes.object,
-    };
-
+export default class MImageBody extends React.Component<IBodyProps, IState> {
     static contextType = MatrixClientContext;
+    private unmounted = true;
+    private image = createRef<HTMLImageElement>();
+    private timeout?: number;
 
-    constructor(props) {
+    constructor(props: IBodyProps) {
         super(props);
 
-        this.onImageError = this.onImageError.bind(this);
-        this.onImageLoad = this.onImageLoad.bind(this);
-        this.onImageEnter = this.onImageEnter.bind(this);
-        this.onImageLeave = this.onImageLeave.bind(this);
-        this.onClientSync = this.onClientSync.bind(this);
-        this.onClick = this.onClick.bind(this);
-        this._isGif = this._isGif.bind(this);
-
         this.state = {
             decryptedUrl: null,
             decryptedThumbnailUrl: null,
@@ -69,13 +70,12 @@ export default class MImageBody extends React.Component {
             loadedImageDimensions: null,
             hover: false,
             showImage: SettingsStore.getValue("showImages"),
+            placeholder: 'no-image',
         };
-
-        this._image = createRef();
     }
 
     // FIXME: factor this out and apply it to MVideoBody and MAudioBody too!
-    onClientSync(syncState, prevState) {
+    private onClientSync = (syncState: SyncState, prevState: SyncState): void => {
         if (this.unmounted) return;
         // Consider the client reconnected if there is no error with syncing.
         // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
@@ -86,15 +86,15 @@ export default class MImageBody extends React.Component {
                 imgError: false,
             });
         }
-    }
+    };
 
-    showImage() {
+    protected showImage(): void {
         localStorage.setItem("mx_ShowImage_" + this.props.mxEvent.getId(), "true");
-        this.setState({showImage: true});
-        this._downloadImage();
+        this.setState({ showImage: true });
+        this.downloadImage();
     }
 
-    onClick(ev) {
+    protected onClick = (ev: React.MouseEvent): void => {
         if (ev.button === 0 && !ev.metaKey) {
             ev.preventDefault();
             if (!this.state.showImage) {
@@ -102,12 +102,11 @@ export default class MImageBody extends React.Component {
                 return;
             }
 
-            const content = this.props.mxEvent.getContent();
-            const httpUrl = this._getContentUrl();
-            const ImageView = sdk.getComponent("elements.ImageView");
-            const params = {
+            const content = this.props.mxEvent.getContent<IMediaEventContent>();
+            const httpUrl = this.getContentUrl();
+            const params: Omit<ComponentProps<typeof ImageView>, "onFinished"> = {
                 src: httpUrl,
-                name: content.body && content.body.length > 0 ? content.body : _t('Attachment'),
+                name: content.body?.length > 0 ? content.body : _t('Attachment'),
                 mxEvent: this.props.mxEvent,
                 permalinkCreator: this.props.permalinkCreator,
             };
@@ -118,69 +117,83 @@ export default class MImageBody extends React.Component {
                 params.fileSize = content.info.size;
             }
 
+            if (this.image.current) {
+                const clientRect = this.image.current.getBoundingClientRect();
+
+                params.thumbnailInfo = {
+                    width: clientRect.width,
+                    height: clientRect.height,
+                    positionX: clientRect.x,
+                    positionY: clientRect.y,
+                };
+            }
+
             Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
         }
-    }
+    };
 
-    _isGif() {
+    private isGif = (): boolean => {
         const content = this.props.mxEvent.getContent();
-        return (
-            content &&
-            content.info &&
-            content.info.mimetype === "image/gif"
-        );
-    }
+        return content.info?.mimetype === "image/gif";
+    };
 
-    onImageEnter(e) {
+    private onImageEnter = (e: React.MouseEvent<HTMLImageElement>): void => {
         this.setState({ hover: true });
 
-        if (!this.state.showImage || !this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
+        if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
             return;
         }
-        const imgElement = e.target;
-        imgElement.src = this._getContentUrl();
-    }
+        const imgElement = e.currentTarget;
+        imgElement.src = this.getContentUrl();
+    };
 
-    onImageLeave(e) {
+    private onImageLeave = (e: React.MouseEvent<HTMLImageElement>): void => {
         this.setState({ hover: false });
 
-        if (!this.state.showImage || !this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
+        if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
             return;
         }
-        const imgElement = e.target;
-        imgElement.src = this._getThumbUrl();
-    }
+        const imgElement = e.currentTarget;
+        imgElement.src = this.getThumbUrl();
+    };
 
-    onImageError() {
+    private onImageError = (): void => {
+        this.clearBlurhashTimeout();
         this.setState({
             imgError: true,
         });
-    }
+    };
 
-    onImageLoad() {
+    private onImageLoad = (): void => {
+        this.clearBlurhashTimeout();
         this.props.onHeightChanged();
 
         let loadedImageDimensions;
 
-        if (this._image.current) {
-            const { naturalWidth, naturalHeight } = this._image.current;
+        if (this.image.current) {
+            const { naturalWidth, naturalHeight } = this.image.current;
             // this is only used as a fallback in case content.info.w/h is missing
             loadedImageDimensions = { naturalWidth, naturalHeight };
         }
-
         this.setState({ imgLoaded: true, loadedImageDimensions });
-    }
+    };
 
-    _getContentUrl() {
-        const media = mediaFromContent(this.props.mxEvent.getContent());
-        if (media.isEncrypted) {
+    protected getContentUrl(): string {
+        const content: IMediaEventContent = this.props.mxEvent.getContent();
+        // During export, the content url will point to the MSC, which will later point to a local url
+        if (this.props.forExport) return content.url || content.file?.url;
+        if (this.media.isEncrypted) {
             return this.state.decryptedUrl;
         } else {
-            return media.srcHttp;
+            return this.media.srcHttp;
         }
     }
 
-    _getThumbUrl() {
+    private get media(): Media {
+        return mediaFromContent(this.props.mxEvent.getContent());
+    }
+
+    protected getThumbUrl(): string {
         // 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.
@@ -188,7 +201,7 @@ export default class MImageBody extends React.Component {
         const thumbWidth = 800;
         const thumbHeight = 600;
 
-        const content = this.props.mxEvent.getContent();
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
         const media = mediaFromContent(content);
 
         if (media.isEncrypted) {
@@ -216,7 +229,7 @@ export default class MImageBody extends React.Component {
             //   - If there's no sizing info in the event, default to thumbnail
             const info = content.info;
             if (
-                this._isGif() ||
+                this.isGif() ||
                 window.devicePixelRatio === 1.0 ||
                 (!info || !info.w || !info.h || !info.size)
             ) {
@@ -235,7 +248,7 @@ export default class MImageBody extends React.Component {
                     info.w > thumbWidth ||
                     info.h > thumbHeight
                 );
-                const isLargeFileSize = info.size > 1*1024*1024; // 1mb
+                const isLargeFileSize = info.size > 1 * 1024 * 1024; // 1mb
 
                 if (isLargeFileSize && isLargerThanThumbnail) {
                     // image is too large physically and bytewise to clutter our timeline so
@@ -251,38 +264,30 @@ export default class MImageBody extends React.Component {
         }
     }
 
-    _downloadImage() {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            let thumbnailPromise = Promise.resolve(null);
-            if (content.info && content.info.thumbnail_file) {
-                thumbnailPromise = decryptFile(
-                    content.info.thumbnail_file,
-                ).then(function(blob) {
-                    return URL.createObjectURL(blob);
+    private async downloadImage() {
+        if (this.props.mediaEventHelper.media.isEncrypted && this.state.decryptedUrl === null) {
+            try {
+                const thumbnailUrl = await this.props.mediaEventHelper.thumbnailUrl.value;
+                this.setState({
+                    decryptedUrl: await this.props.mediaEventHelper.sourceUrl.value,
+                    decryptedThumbnailUrl: thumbnailUrl,
+                    decryptedBlob: await this.props.mediaEventHelper.sourceBlob.value,
                 });
-            }
-            let decryptedBlob;
-            thumbnailPromise.then((thumbnailUrl) => {
-                return decryptFile(content.file).then(function(blob) {
-                    decryptedBlob = blob;
-                    return URL.createObjectURL(blob);
-                }).then((contentUrl) => {
-                    if (this.unmounted) return;
-                    this.setState({
-                        decryptedUrl: contentUrl,
-                        decryptedThumbnailUrl: thumbnailUrl,
-                        decryptedBlob: decryptedBlob,
-                    });
-                });
-            }).catch((err) => {
+            } catch (err) {
                 if (this.unmounted) return;
                 console.warn("Unable to decrypt attachment: ", err);
                 // Set a placeholder image when we can't decrypt the image.
                 this.setState({
                     error: err,
                 });
-            });
+            }
+        }
+    }
+
+    private clearBlurhashTimeout() {
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
         }
     }
 
@@ -294,38 +299,36 @@ export default class MImageBody extends React.Component {
             localStorage.getItem("mx_ShowImage_" + this.props.mxEvent.getId()) === "true";
 
         if (showImage) {
-            // Don't download anything becaue we don't want to display anything.
-            this._downloadImage();
-            this.setState({showImage: true});
+            // noinspection JSIgnoredPromiseFromCall
+            this.downloadImage();
+            this.setState({ showImage: true });
+        } // else don't download anything because we don't want to display anything.
+
+        // Add a 150ms timer for blurhash to first appear.
+        if (this.props.mxEvent.getContent().info?.[BLURHASH_FIELD]) {
+            this.clearBlurhashTimeout();
+            this.timeout = setTimeout(() => {
+                if (!this.state.imgLoaded || !this.state.imgError) {
+                    this.setState({
+                        placeholder: 'blurhash',
+                    });
+                }
+            }, 150);
         }
-
-        this._afterComponentDidMount();
-    }
-
-    // To be overridden by subclasses (e.g. MStickerBody) for further
-    // initialisation after componentDidMount
-    _afterComponentDidMount() {
     }
 
     componentWillUnmount() {
         this.unmounted = true;
         this.context.removeListener('sync', this.onClientSync);
-        this._afterComponentWillUnmount();
-
-        if (this.state.decryptedUrl) {
-            URL.revokeObjectURL(this.state.decryptedUrl);
-        }
-        if (this.state.decryptedThumbnailUrl) {
-            URL.revokeObjectURL(this.state.decryptedThumbnailUrl);
-        }
+        this.clearBlurhashTimeout();
     }
 
-    // To be overridden by subclasses (e.g. MStickerBody) for further
-    // cleanup after componentWillUnmount
-    _afterComponentWillUnmount() {
-    }
-
-    _messageContent(contentUrl, thumbUrl, content) {
+    protected messageContent(
+        contentUrl: string,
+        thumbUrl: string,
+        content: IMediaEventContent,
+        forcedHeight?: number,
+    ): JSX.Element {
         let infoWidth;
         let infoHeight;
 
@@ -333,7 +336,8 @@ export default class MImageBody extends React.Component {
             infoWidth = content.info.w;
             infoHeight = content.info.h;
         } else {
-            // Whilst the image loads, display nothing.
+            // Whilst the image loads, display nothing. We also don't display a blurhash image
+            // because we don't really know what size of image we'll end up with.
             //
             // Once loaded, use the loaded image dimensions stored in `loadedImageDimensions`.
             //
@@ -345,7 +349,10 @@ export default class MImageBody extends React.Component {
                     imageElement = <HiddenImagePlaceholder />;
                 } else {
                     imageElement = (
-                        <img style={{display: 'none'}} src={thumbUrl} ref={this._image}
+                        <img
+                            style={{ display: 'none' }}
+                            src={thumbUrl}
+                            ref={this.image}
                             alt={content.body}
                             onError={this.onImageError}
                             onLoad={this.onImageLoad}
@@ -359,7 +366,7 @@ export default class MImageBody extends React.Component {
         }
 
         // The maximum height of the thumbnail as it is rendered as an <img>
-        const maxHeight = Math.min(this.props.maxImageHeight || 600, infoHeight);
+        const maxHeight = forcedHeight || Math.min((this.props.maxImageHeight || 600), infoHeight);
         // The maximum width of the thumbnail, as dictated by its natural
         // maximum height.
         const maxWidth = infoWidth * maxHeight / infoHeight;
@@ -368,12 +375,8 @@ export default class MImageBody extends React.Component {
         let placeholder = null;
         let gifLabel = null;
 
-        // e2e image hasn't been decrypted yet
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            placeholder = <InlineSpinner w={32} h={32} />;
-        } else if (!this.state.imgLoaded) {
-            // Deliberately, getSpinner is left unimplemented here, MStickerBody overides
-            placeholder = this.getPlaceholder();
+        if (!this.props.forExport && !this.state.imgLoaded) {
+            placeholder = this.getPlaceholder(maxWidth, maxHeight);
         }
 
         let showPlaceholder = Boolean(placeholder);
@@ -383,41 +386,72 @@ export default class MImageBody extends React.Component {
             // which has the same width as the timeline
             // mx_MImageBody_thumbnail resizes img to exactly container size
             img = (
-                <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref={this._image}
-                    style={{ maxWidth: maxWidth + "px" }}
+                <img
+                    className="mx_MImageBody_thumbnail"
+                    src={thumbUrl}
+                    ref={this.image}
+                    // Force the image to be the full size of the container, even if the
+                    // pixel size is smaller. The problem here is that we don't know what
+                    // thumbnail size the HS is going to give us, but we have to commit to
+                    // a container size immediately and not change it when the image loads
+                    // or we'll get a scroll jump (or have to leave blank space).
+                    // This will obviously result in an upscaled image which will be a bit
+                    // blurry. The best fix would be for the HS to advertise what size thumbnails
+                    // it guarantees to produce.
+                    style={{ height: '100%' }}
                     alt={content.body}
                     onError={this.onImageError}
                     onLoad={this.onImageLoad}
                     onMouseEnter={this.onImageEnter}
-                    onMouseLeave={this.onImageLeave} />
+                    onMouseLeave={this.onImageLeave}
+                />
             );
         }
 
         if (!this.state.showImage) {
-            img = <HiddenImagePlaceholder style={{ maxWidth: maxWidth + "px" }} />;
-            showPlaceholder = false; // because we're hiding the image, so don't show the sticker icon.
+            img = <HiddenImagePlaceholder maxWidth={maxWidth} />;
+            showPlaceholder = false; // because we're hiding the image, so don't show the placeholder.
         }
 
-        if (this._isGif() && !SettingsStore.getValue("autoplayGifsAndVideos") && !this.state.hover) {
+        if (this.isGif() && !SettingsStore.getValue("autoplayGifs") && !this.state.hover) {
             gifLabel = <p className="mx_MImageBody_gifLabel">GIF</p>;
         }
 
-        const thumbnail = (
-            <div className="mx_MImageBody_thumbnail_container" style={{ maxHeight: maxHeight + "px" }} >
-                { /* Calculate aspect ratio, using %padding will size _container correctly */ }
-                <div style={{ paddingBottom: (100 * infoHeight / infoWidth) + '%' }} />
-                { showPlaceholder &&
-                    <div className="mx_MImageBody_thumbnail" style={{
-                        // Constrain width here so that spinner appears central to the loaded thumbnail
-                        maxWidth: infoWidth + "px",
-                    }}>
-                        <div className="mx_MImageBody_thumbnail_spinner">
-                            { placeholder }
-                        </div>
-                    </div>
-                }
+        const classes = classNames({
+            'mx_MImageBody_thumbnail': true,
+            'mx_MImageBody_thumbnail--blurhash': this.props.mxEvent.getContent().info?.[BLURHASH_FIELD],
+        });
 
-                <div style={{display: !showPlaceholder ? undefined : 'none'}}>
+        // This has incredibly broken types.
+        const C = CSSTransition as any;
+        const thumbnail = (
+            <div className="mx_MImageBody_thumbnail_container" style={{ maxHeight: maxHeight, maxWidth: maxWidth, aspectRatio: `${infoWidth}/${infoHeight}` }}>
+                <SwitchTransition mode="out-in">
+                    <C
+                        classNames="mx_rtg--fade"
+                        key={`img-${showPlaceholder}`}
+                        timeout={300}
+                    >
+                        { /* This weirdly looking div is necessary here, otherwise SwitchTransition fails */ }
+                        <div>
+                            { showPlaceholder && <div
+                                className={classes}
+                                style={{
+                                    // Constrain width here so that spinner appears central to the loaded thumbnail
+                                    maxWidth: `min(100%, ${infoWidth}px)`,
+                                    maxHeight: maxHeight,
+                                    aspectRatio: `${infoWidth}/${infoHeight}`,
+                                }}
+                            >
+                                { placeholder }
+                            </div> }
+                        </div>
+                    </C>
+                </SwitchTransition>
+
+                <div style={{
+                    height: '100%',
+                }}>
                     { img }
                     { gifLabel }
                 </div>
@@ -430,71 +464,89 @@ export default class MImageBody extends React.Component {
     }
 
     // Overidden by MStickerBody
-    wrapImage(contentUrl, children) {
-        return <a href={contentUrl} onClick={this.onClick}>
-            {children}
+    protected wrapImage(contentUrl: string, children: JSX.Element): JSX.Element {
+        return <a href={contentUrl} target={this.props.forExport ? "_blank" : undefined} onClick={this.onClick}>
+            { children }
         </a>;
     }
 
     // Overidden by MStickerBody
-    getPlaceholder() {
-        // MImageBody doesn't show a placeholder whilst the image loads, (but it could do)
+    protected getPlaceholder(width: number, height: number): JSX.Element {
+        const blurhash = this.props.mxEvent.getContent().info?.[BLURHASH_FIELD];
+
+        if (blurhash) {
+            if (this.state.placeholder === 'no-image') {
+                return <div className="mx_no-image-placeholder" style={{ width: width, height: height }} />;
+            } else if (this.state.placeholder === 'blurhash') {
+                return <Blurhash className="mx_Blurhash" hash={blurhash} width={width} height={height} />;
+            }
+        }
+        return (
+            <InlineSpinner w={32} h={32} />
+        );
+    }
+
+    // Overidden by MStickerBody
+    protected getTooltip(): JSX.Element {
         return null;
     }
 
     // Overidden by MStickerBody
-    getTooltip() {
-        return null;
-    }
-
-    // Overidden by MStickerBody
-    getFileBody() {
-        return <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />;
+    protected getFileBody(): string | JSX.Element {
+        if (this.props.forExport) return null;
+        // We only ever need the download bar if we're appearing outside of the timeline
+        if (this.props.tileShape) {
+            return <MFileBody {...this.props} showGenericPlaceholder={false} />;
+        }
     }
 
     render() {
-        const content = this.props.mxEvent.getContent();
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
 
         if (this.state.error !== null) {
             return (
-                <span className="mx_MImageBody">
+                <div className="mx_MImageBody">
                     <img src={require("../../../../res/img/warning.svg")} width="16" height="16" />
                     { _t("Error decrypting image") }
-                </span>
+                </div>
             );
         }
 
-        const contentUrl = this._getContentUrl();
+        const contentUrl = this.getContentUrl();
         let thumbUrl;
-        if (this._isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) {
+        if (this.props.forExport || (this.isGif() && SettingsStore.getValue("autoplayGifs"))) {
             thumbUrl = contentUrl;
         } else {
-            thumbUrl = this._getThumbUrl();
+            thumbUrl = this.getThumbUrl();
         }
 
-        const thumbnail = this._messageContent(contentUrl, thumbUrl, content);
+        const thumbnail = this.messageContent(contentUrl, thumbUrl, content);
         const fileBody = this.getFileBody();
 
-        return <span className="mx_MImageBody">
-            { thumbnail }
-            { fileBody }
-        </span>;
+        return (
+            <div className="mx_MImageBody">
+                { thumbnail }
+                { fileBody }
+            </div>
+        );
     }
 }
 
-export class HiddenImagePlaceholder extends React.PureComponent {
-    static propTypes = {
-        hover: PropTypes.bool,
-    };
+interface PlaceholderIProps {
+    hover?: boolean;
+    maxWidth?: number;
+}
 
+export class HiddenImagePlaceholder extends React.PureComponent<PlaceholderIProps> {
     render() {
+        const maxWidth = this.props.maxWidth ? this.props.maxWidth + "px" : null;
         let className = 'mx_HiddenImagePlaceholder';
         if (this.props.hover) className += ' mx_HiddenImagePlaceholder_hover';
         return (
-            <div className={className}>
+            <div className={className} style={{ maxWidth: `min(100%, ${maxWidth}px)` }}>
                 <div className='mx_HiddenImagePlaceholder_button'>
                     <span className='mx_HiddenImagePlaceholder_eye' />
-                    <span>{_t("Show image")}</span>
+                    <span>{ _t("Show image") }</span>
                 </div>
             </div>
         );
diff --git a/src/components/views/messages/MImageReplyBody.tsx b/src/components/views/messages/MImageReplyBody.tsx
new file mode 100644
index 0000000000..8d92920226
--- /dev/null
+++ b/src/components/views/messages/MImageReplyBody.tsx
@@ -0,0 +1,65 @@
+/*
+Copyright 2020-2021 Tulir Asokan <tulir@maunium.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 MImageBody from "./MImageBody";
+import { presentableTextForFile } from "../../../utils/FileUtils";
+import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent";
+import SenderProfile from "./SenderProfile";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { _t } from "../../../languageHandler";
+
+const FORCED_IMAGE_HEIGHT = 44;
+
+export default class MImageReplyBody extends MImageBody {
+    public onClick = (ev: React.MouseEvent): void => {
+        ev.preventDefault();
+    };
+
+    public wrapImage(contentUrl: string, children: JSX.Element): JSX.Element {
+        return children;
+    }
+
+    // Don't show "Download this_file.png ..."
+    public getFileBody(): string {
+        const sticker = this.props.mxEvent.getType() === EventType.Sticker;
+        return presentableTextForFile(this.props.mxEvent.getContent(), sticker ? _t("Sticker") : _t("Image"), !sticker);
+    }
+
+    render() {
+        if (this.state.error !== null) {
+            return super.render();
+        }
+
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
+
+        const contentUrl = this.getContentUrl();
+        const thumbnail = this.messageContent(contentUrl, this.getThumbUrl(), content, FORCED_IMAGE_HEIGHT);
+        const fileBody = this.getFileBody();
+        const sender = <SenderProfile
+            mxEvent={this.props.mxEvent}
+            enableFlair={false}
+        />;
+
+        return <div className="mx_MImageReplyBody">
+            { thumbnail }
+            <div className="mx_MImageReplyBody_info">
+                <div className="mx_MImageReplyBody_sender">{ sender }</div>
+                <div className="mx_MImageReplyBody_filename">{ fileBody }</div>
+            </div>
+        </div>;
+    }
+}
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 626efe1f36..aaf659d6d9 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -21,7 +21,7 @@ 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -52,20 +52,20 @@ export default class MJitsiWidgetEvent extends React.PureComponent<IProps> {
             // removed
             return <EventTileBubble
                 className="mx_MJitsiWidgetEvent"
-                title={_t('Video conference ended by %(senderName)s', {senderName})}
+                title={_t('Video conference ended by %(senderName)s', { senderName })}
             />;
         } else if (prevUrl) {
             // modified
             return <EventTileBubble
                 className="mx_MJitsiWidgetEvent"
-                title={_t('Video conference updated by %(senderName)s', {senderName})}
+                title={_t('Video conference updated by %(senderName)s', { senderName })}
                 subtitle={joinCopy}
             />;
         } else {
             // assume added
             return <EventTileBubble
                 className="mx_MJitsiWidgetEvent"
-                title={_t("Video conference started by %(senderName)s", {senderName})}
+                title={_t("Video conference started by %(senderName)s", { senderName })}
                 subtitle={joinCopy}
             />;
         }
diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.tsx
similarity index 64%
rename from src/components/views/messages/MKeyVerificationConclusion.js
rename to src/components/views/messages/MKeyVerificationConclusion.tsx
index c9489711aa..1ce39e1157 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.tsx
@@ -16,44 +16,50 @@ limitations under the License.
 
 import React from 'react';
 import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import {getNameForEventRoom, userLabelForEventRoom}
-    from '../../../utils/KeyVerificationStateObserver';
+import { getNameForEventRoom, userLabelForEventRoom } from '../../../utils/KeyVerificationStateObserver';
 import EventTileBubble from "./EventTileBubble";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+interface IProps {
+    /* the MatrixEvent to show */
+    mxEvent: MatrixEvent;
+}
 
 @replaceableComponent("views.messages.MKeyVerificationConclusion")
-export default class MKeyVerificationConclusion extends React.Component {
-    constructor(props) {
+export default class MKeyVerificationConclusion extends React.Component<IProps> {
+    constructor(props: IProps) {
         super(props);
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
-            request.on("change", this._onRequestChanged);
+            request.on("change", this.onRequestChanged);
         }
-        MatrixClientPeg.get().on("userTrustStatusChanged", this._onTrustChanged);
+        MatrixClientPeg.get().on("userTrustStatusChanged", this.onTrustChanged);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
-            request.off("change", this._onRequestChanged);
+            request.off("change", this.onRequestChanged);
         }
         const cli = MatrixClientPeg.get();
         if (cli) {
-            cli.removeListener("userTrustStatusChanged", this._onTrustChanged);
+            cli.removeListener("userTrustStatusChanged", this.onTrustChanged);
         }
     }
 
-    _onRequestChanged = () => {
+    private onRequestChanged = (): void => {
         this.forceUpdate();
     };
 
-    _onTrustChanged = (userId, status) => {
+    private onTrustChanged = (userId: string): void => {
         const { mxEvent } = this.props;
         const request = mxEvent.verificationRequest;
         if (!request || request.otherUserId !== userId) {
@@ -62,17 +68,17 @@ export default class MKeyVerificationConclusion extends React.Component {
         this.forceUpdate();
     };
 
-    _shouldRender(mxEvent, request) {
+    public static shouldRender(mxEvent: MatrixEvent, request: VerificationRequest): boolean {
         // normally should not happen
         if (!request) {
             return false;
         }
         // .cancel event that was sent after the verification finished, ignore
-        if (mxEvent.getType() === "m.key.verification.cancel" && !request.cancelled) {
+        if (mxEvent.getType() === EventType.KeyVerificationCancel && !request.cancelled) {
             return false;
         }
         // .done event that was sent after the verification cancelled, ignore
-        if (mxEvent.getType() === "m.key.verification.done" && !request.done) {
+        if (mxEvent.getType() === EventType.KeyVerificationDone && !request.done) {
             return false;
         }
 
@@ -89,11 +95,11 @@ export default class MKeyVerificationConclusion extends React.Component {
         return true;
     }
 
-    render() {
-        const {mxEvent} = this.props;
+    public render(): JSX.Element {
+        const { mxEvent } = this.props;
         const request = mxEvent.verificationRequest;
 
-        if (!this._shouldRender(mxEvent, request)) {
+        if (!MKeyVerificationConclusion.shouldRender(mxEvent, request)) {
             return null;
         }
 
@@ -103,15 +109,18 @@ export default class MKeyVerificationConclusion extends React.Component {
         let title;
 
         if (request.done) {
-            title = _t("You verified %(name)s", {name: getNameForEventRoom(request.otherUserId, mxEvent)});
+            title = _t(
+                "You verified %(name)s",
+                { name: getNameForEventRoom(request.otherUserId, mxEvent.getRoomId()) },
+            );
         } else if (request.cancelled) {
             const userId = request.cancellingUserId;
             if (userId === myUserId) {
                 title = _t("You cancelled verifying %(name)s",
-                    {name: getNameForEventRoom(request.otherUserId, mxEvent)});
+                    { name: getNameForEventRoom(request.otherUserId, mxEvent.getRoomId()) });
             } else {
                 title = _t("%(name)s cancelled verifying",
-                    {name: getNameForEventRoom(userId, mxEvent)});
+                    { name: getNameForEventRoom(userId, mxEvent.getRoomId()) });
             }
         }
 
@@ -129,8 +138,3 @@ export default class MKeyVerificationConclusion extends React.Component {
         return null;
     }
 }
-
-MKeyVerificationConclusion.propTypes = {
-    /* the MatrixEvent to show */
-    mxEvent: PropTypes.object.isRequired,
-};
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.tsx
similarity index 65%
rename from src/components/views/messages/MKeyVerificationRequest.js
rename to src/components/views/messages/MKeyVerificationRequest.tsx
index 988606a766..ce828beed0 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.tsx
@@ -15,58 +15,57 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
+import { MatrixEvent } from 'matrix-js-sdk/src';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import {getNameForEventRoom, userLabelForEventRoom}
+import { getNameForEventRoom, userLabelForEventRoom }
     from '../../../utils/KeyVerificationStateObserver';
 import dis from "../../../dispatcher/dispatcher";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
-import {Action} from "../../../dispatcher/actions";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
+import { Action } from "../../../dispatcher/actions";
 import EventTileBubble from "./EventTileBubble";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AccessibleButton from '../elements/AccessibleButton';
+
+interface IProps {
+    mxEvent: MatrixEvent;
+}
 
 @replaceableComponent("views.messages.MKeyVerificationRequest")
-export default class MKeyVerificationRequest extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {};
-    }
-
-    componentDidMount() {
+export default class MKeyVerificationRequest extends React.Component<IProps> {
+    public componentDidMount() {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
-            request.on("change", this._onRequestChanged);
+            request.on("change", this.onRequestChanged);
         }
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount() {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
-            request.off("change", this._onRequestChanged);
+            request.off("change", this.onRequestChanged);
         }
     }
 
-    _openRequest = () => {
-        const {verificationRequest} = this.props.mxEvent;
+    private openRequest = () => {
+        const { verificationRequest } = this.props.mxEvent;
         const member = MatrixClientPeg.get().getUser(verificationRequest.otherUserId);
         dis.dispatch({
             action: Action.SetRightPanelPhase,
             phase: RightPanelPhases.EncryptionPanel,
-            refireParams: {verificationRequest, member},
+            refireParams: { verificationRequest, member },
         });
     };
 
-    _onRequestChanged = () => {
+    private onRequestChanged = () => {
         this.forceUpdate();
     };
 
-    _onAcceptClicked = async () => {
+    private onAcceptClicked = async () => {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
-                this._openRequest();
+                this.openRequest();
                 await request.accept();
             } catch (err) {
                 console.error(err.message);
@@ -74,7 +73,7 @@ export default class MKeyVerificationRequest extends React.Component {
         }
     };
 
-    _onRejectClicked = async () => {
+    private onRejectClicked = async () => {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
@@ -85,20 +84,20 @@ export default class MKeyVerificationRequest extends React.Component {
         }
     };
 
-    _acceptedLabel(userId) {
+    private acceptedLabel(userId: string) {
         const client = MatrixClientPeg.get();
         const myUserId = client.getUserId();
         if (userId === myUserId) {
             return _t("You accepted");
         } else {
-            return _t("%(name)s accepted", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+            return _t("%(name)s accepted", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()) });
         }
     }
 
-    _cancelledLabel(userId) {
+    private cancelledLabel(userId: string) {
         const client = MatrixClientPeg.get();
         const myUserId = client.getUserId();
-        const {cancellationCode} = this.props.mxEvent.verificationRequest;
+        const { cancellationCode } = this.props.mxEvent.verificationRequest;
         const declined = cancellationCode === "m.user";
         if (userId === myUserId) {
             if (declined) {
@@ -108,18 +107,15 @@ export default class MKeyVerificationRequest extends React.Component {
             }
         } else {
             if (declined) {
-                return _t("%(name)s declined", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+                return _t("%(name)s declined", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()) });
             } else {
-                return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+                return _t("%(name)s cancelled", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()) });
             }
         }
     }
 
-    render() {
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-        const FormButton = sdk.getComponent("elements.FormButton");
-
-        const {mxEvent} = this.props;
+    public render() {
+        const { mxEvent } = this.props;
         const request = mxEvent.verificationRequest;
 
         if (!request || request.invalid) {
@@ -134,27 +130,31 @@ export default class MKeyVerificationRequest extends React.Component {
             let stateLabel;
             const accepted = request.ready || request.started || request.done;
             if (accepted) {
-                stateLabel = (<AccessibleButton onClick={this._openRequest}>
-                    {this._acceptedLabel(request.receivingUserId)}
+                stateLabel = (<AccessibleButton onClick={this.openRequest}>
+                    { this.acceptedLabel(request.receivingUserId) }
                 </AccessibleButton>);
             } else if (request.cancelled) {
-                stateLabel = this._cancelledLabel(request.cancellingUserId);
+                stateLabel = this.cancelledLabel(request.cancellingUserId);
             } else if (request.accepting) {
                 stateLabel = _t("Accepting …");
             } else if (request.declining) {
                 stateLabel = _t("Declining …");
             }
-            stateNode = (<div className="mx_cryptoEvent_state">{stateLabel}</div>);
+            stateNode = (<div className="mx_cryptoEvent_state">{ stateLabel }</div>);
         }
 
         if (!request.initiatedByMe) {
             const name = getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId());
-            title = _t("%(name)s wants to verify", {name});
+            title = _t("%(name)s wants to verify", { name });
             subtitle = userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId());
             if (request.canAccept) {
                 stateNode = (<div className="mx_cryptoEvent_buttons">
-                    <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
-                    <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
+                    <AccessibleButton kind="danger" onClick={this.onRejectClicked}>
+                        { _t("Decline") }
+                    </AccessibleButton>
+                    <AccessibleButton kind="primary" onClick={this.onAcceptClicked}>
+                        { _t("Accept") }
+                    </AccessibleButton>
                 </div>);
             }
         } else { // request sent by us
@@ -174,8 +174,3 @@ export default class MKeyVerificationRequest extends React.Component {
         return null;
     }
 }
-
-MKeyVerificationRequest.propTypes = {
-    /* the MatrixEvent to show */
-    mxEvent: PropTypes.object.isRequired,
-};
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.tsx
similarity index 70%
rename from src/components/views/messages/MStickerBody.js
rename to src/components/views/messages/MStickerBody.tsx
index 54eb7649b4..365426245d 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.tsx
@@ -17,21 +17,22 @@ limitations under the License.
 import React from 'react';
 import MImageBody from './MImageBody';
 import * as sdk from '../../../index';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { BLURHASH_FIELD } from "../../../ContentMessages";
 
 @replaceableComponent("views.messages.MStickerBody")
 export default class MStickerBody extends MImageBody {
     // Mostly empty to prevent default behaviour of MImageBody
-    onClick(ev) {
+    protected onClick = (ev: React.MouseEvent) => {
         ev.preventDefault();
         if (!this.state.showImage) {
             this.showImage();
         }
-    }
+    };
 
     // MStickerBody doesn't need a wrapping `<a href=...>`, but it does need extra padding
     // which is added by mx_MStickerBody_wrapper
-    wrapImage(contentUrl, children) {
+    protected wrapImage(contentUrl: string, children: React.ReactNode): JSX.Element {
         let onClick = null;
         if (!this.state.showImage) {
             onClick = this.onClick;
@@ -41,25 +42,25 @@ export default class MStickerBody extends MImageBody {
 
     // Placeholder to show in place of the sticker image if
     // img onLoad hasn't fired yet.
-    getPlaceholder() {
-        const TintableSVG = sdk.getComponent('elements.TintableSvg');
-        return <TintableSVG src={require("../../../../res/img/icons-show-stickers.svg")} width="75" height="75" />;
+    protected getPlaceholder(width: number, height: number): JSX.Element {
+        if (this.props.mxEvent.getContent().info?.[BLURHASH_FIELD]) return super.getPlaceholder(width, height);
+        return <img src={require("../../../../res/img/icons-show-stickers.svg")} width="75" height="75" />;
     }
 
     // Tooltip to show on mouse over
-    getTooltip() {
+    protected getTooltip(): JSX.Element {
         const content = this.props.mxEvent && this.props.mxEvent.getContent();
 
         if (!content || !content.body || !content.info || !content.info.w) return null;
 
         const Tooltip = sdk.getComponent('elements.Tooltip');
-        return <div style={{left: content.info.w + 'px'}} className="mx_MStickerBody_tooltip">
+        return <div style={{ left: content.info.w + 'px' }} className="mx_MStickerBody_tooltip">
             <Tooltip label={content.body} />
         </div>;
     }
 
     // Don't show "Download this_file.png ..."
-    getFileBody() {
+    protected getFileBody() {
         return null;
     }
 }
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 2efdce506e..d119662f8a 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 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.
@@ -16,45 +15,49 @@ limitations under the License.
 */
 
 import React from 'react';
-import MFileBody from './MFileBody';
-import { decryptFile } from '../../../utils/DecryptFile';
+import { decode } from "blurhash";
+
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import InlineSpinner from '../elements/InlineSpinner';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromContent} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromContent } from "../../../customisations/Media";
+import { BLURHASH_FIELD } from "../../../ContentMessages";
+import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent";
+import { IBodyProps } from "./IBodyProps";
+import MFileBody from "./MFileBody";
 
-interface IProps {
-    /* the MatrixEvent to show */
-    mxEvent: any;
-    /* called when the video has loaded */
-    onHeightChanged: () => void;
-}
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IState {
-    decryptedUrl: string|null,
-    decryptedThumbnailUrl: string|null,
-    decryptedBlob: Blob|null,
-    error: any|null,
-    fetchingData: boolean,
+    decryptedUrl?: string;
+    decryptedThumbnailUrl?: string;
+    decryptedBlob?: Blob;
+    error?: any;
+    fetchingData: boolean;
+    posterLoading: boolean;
+    blurhashUrl: string;
 }
 
 @replaceableComponent("views.messages.MVideoBody")
-export default class MVideoBody extends React.PureComponent<IProps, IState> {
+export default class MVideoBody extends React.PureComponent<IBodyProps, IState> {
     private videoRef = React.createRef<HTMLVideoElement>();
 
     constructor(props) {
         super(props);
+
         this.state = {
             fetchingData: false,
             decryptedUrl: null,
             decryptedThumbnailUrl: null,
             decryptedBlob: null,
             error: null,
-        }
+            posterLoading: false,
+            blurhashUrl: null,
+        };
     }
 
-    thumbScale(fullWidth: number, fullHeight: number, thumbWidth: number, thumbHeight: number) {
+    thumbScale(fullWidth: number, fullHeight: number, thumbWidth = 480, thumbHeight = 360) {
         if (!fullWidth || !fullHeight) {
             // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
             // log this because it's spammy
@@ -76,7 +79,10 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
     }
 
     private getContentUrl(): string|null {
-        const media = mediaFromContent(this.props.mxEvent.getContent());
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
+        // During export, the content url will point to the MSC, which will later point to a local url
+        if (this.props.forExport) return content.file?.url || content.url;
+        const media = mediaFromContent(content);
         if (media.isEncrypted) {
             return this.state.decryptedUrl;
         } else {
@@ -90,10 +96,16 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
     }
 
     private getThumbUrl(): string|null {
-        const content = this.props.mxEvent.getContent();
+        // there's no need of thumbnail when the content is local
+        if (this.props.forExport) return null;
+
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
         const media = mediaFromContent(content);
-        if (media.isEncrypted) {
+
+        if (media.isEncrypted && this.state.decryptedThumbnailUrl) {
             return this.state.decryptedThumbnailUrl;
+        } else if (this.state.posterLoading) {
+            return this.state.blurhashUrl;
         } else if (media.hasThumbnail) {
             return media.thumbnailHttp;
         } else {
@@ -101,32 +113,63 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         }
     }
 
+    private loadBlurhash() {
+        const info = this.props.mxEvent.getContent()?.info;
+        if (!info[BLURHASH_FIELD]) return;
+
+        const canvas = document.createElement("canvas");
+
+        let width = info.w;
+        let height = info.h;
+        const scale = this.thumbScale(info.w, info.h);
+        if (scale) {
+            width = Math.floor(info.w * scale);
+            height = Math.floor(info.h * scale);
+        }
+
+        canvas.width = width;
+        canvas.height = height;
+
+        const pixels = decode(info[BLURHASH_FIELD], width, height);
+        const ctx = canvas.getContext("2d");
+        const imgData = ctx.createImageData(width, height);
+        imgData.data.set(pixels);
+        ctx.putImageData(imgData, 0, 0);
+
+        this.setState({
+            blurhashUrl: canvas.toDataURL(),
+            posterLoading: true,
+        });
+
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
+        const media = mediaFromContent(content);
+        if (media.hasThumbnail) {
+            const image = new Image();
+            image.onload = () => {
+                this.setState({ posterLoading: false });
+            };
+            image.src = media.thumbnailHttp;
+        }
+    }
+
     async componentDidMount() {
-        const autoplay = SettingsStore.getValue("autoplayGifsAndVideos") as boolean;
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            let thumbnailPromise = Promise.resolve(null);
-            if (content.info && content.info.thumbnail_file) {
-                thumbnailPromise = decryptFile(
-                    content.info.thumbnail_file,
-                ).then(function(blob) {
-                    return URL.createObjectURL(blob);
-                });
-            }
+        const autoplay = SettingsStore.getValue("autoplayVideo") as boolean;
+        this.loadBlurhash();
+
+        if (this.props.mediaEventHelper.media.isEncrypted && this.state.decryptedUrl === null) {
             try {
-                const thumbnailUrl = await thumbnailPromise;
+                const thumbnailUrl = await this.props.mediaEventHelper.thumbnailUrl.value;
                 if (autoplay) {
-                    console.log("Preloading video");
-                    const decryptedBlob = await decryptFile(content.file);
-                    const contentUrl = URL.createObjectURL(decryptedBlob);
+                    logger.log("Preloading video");
                     this.setState({
-                        decryptedUrl: contentUrl,
+                        decryptedUrl: await this.props.mediaEventHelper.sourceUrl.value,
                         decryptedThumbnailUrl: thumbnailUrl,
-                        decryptedBlob: decryptedBlob,
+                        decryptedBlob: await this.props.mediaEventHelper.sourceBlob.value,
                     });
                     this.props.onHeightChanged();
                 } else {
-                    console.log("NOT preloading video");
+                    logger.log("NOT preloading video");
+                    const content = this.props.mxEvent.getContent<IMediaEventContent>();
                     this.setState({
                         // For Chrome and Electron, we need to set some non-empty `src` to
                         // enable the play button. Firefox does not seem to care either
@@ -146,15 +189,6 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         }
     }
 
-    componentWillUnmount() {
-        if (this.state.decryptedUrl) {
-            URL.revokeObjectURL(this.state.decryptedUrl);
-        }
-        if (this.state.decryptedThumbnailUrl) {
-            URL.revokeObjectURL(this.state.decryptedThumbnailUrl);
-        }
-    }
-
     private videoOnPlay = async () => {
         if (this.hasContentUrl() || this.state.fetchingData || this.state.error) {
             // We have the file, we are fetching the file, or there is an error.
@@ -164,29 +198,31 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
             // To stop subsequent download attempts
             fetchingData: true,
         });
-        const content = this.props.mxEvent.getContent();
-        if (!content.file) {
+        if (!this.props.mediaEventHelper.media.isEncrypted) {
             this.setState({
                 error: "No file given in content",
             });
             return;
         }
-        const decryptedBlob = await decryptFile(content.file);
-        const contentUrl = URL.createObjectURL(decryptedBlob);
         this.setState({
-            decryptedUrl: contentUrl,
-            decryptedBlob: decryptedBlob,
+            decryptedUrl: await this.props.mediaEventHelper.sourceUrl.value,
+            decryptedBlob: await this.props.mediaEventHelper.sourceBlob.value,
             fetchingData: false,
         }, () => {
             if (!this.videoRef.current) return;
             this.videoRef.current.play();
         });
         this.props.onHeightChanged();
-    }
+    };
+
+    private getFileBody = () => {
+        if (this.props.forExport) return null;
+        return this.props.tileShape && <MFileBody {...this.props} showGenericPlaceholder={false} />;
+    };
 
     render() {
         const content = this.props.mxEvent.getContent();
-        const autoplay = SettingsStore.getValue("autoplayGifsAndVideos");
+        const autoplay = SettingsStore.getValue("autoplayVideo");
 
         if (this.state.error !== null) {
             return (
@@ -197,8 +233,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
             );
         }
 
-        // Important: If we aren't autoplaying and we haven't decrypred it yet, show a video with a poster.
-        if (content.file !== undefined && this.state.decryptedUrl === null && autoplay) {
+        // Important: If we aren't autoplaying and we haven't decrypted it yet, show a video with a poster.
+        if (!this.props.forExport && content.file !== undefined && this.state.decryptedUrl === null && autoplay) {
             // Need to decrypt the attachment
             // The attachment is decrypted in componentDidMount.
             // For now add an img tag with a spinner.
@@ -218,7 +254,7 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         let poster = null;
         let preload = "metadata";
         if (content.info) {
-            const scale = this.thumbScale(content.info.w, content.info.h, 480, 360);
+            const scale = this.thumbScale(content.info.w, content.info.h);
             if (scale) {
                 width = Math.floor(content.info.w * scale);
                 height = Math.floor(content.info.h * scale);
@@ -229,6 +265,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
                 preload = "none";
             }
         }
+
+        const fileBody = this.getFileBody();
         return (
             <span className="mx_MVideoBody">
                 <video
@@ -244,9 +282,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
                     width={width}
                     poster={poster}
                     onPlay={this.videoOnPlay}
-                >
-                </video>
-                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />
+                />
+                { fileBody }
             </span>
         );
     }
diff --git a/src/components/views/messages/MVoiceMessageBody.tsx b/src/components/views/messages/MVoiceMessageBody.tsx
index d65de7697a..55b608cf2d 100644
--- a/src/components/views/messages/MVoiceMessageBody.tsx
+++ b/src/components/views/messages/MVoiceMessageBody.tsx
@@ -15,73 +15,18 @@ limitations under the License.
 */
 
 import React from "react";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {Playback} from "../../../voice/Playback";
-import MFileBody from "./MFileBody";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import InlineSpinner from '../elements/InlineSpinner';
-import {_t} from "../../../languageHandler";
-import {mediaFromContent} from "../../../customisations/Media";
-import {decryptFile} from "../../../utils/DecryptFile";
-import RecordingPlayback from "../voice_messages/RecordingPlayback";
-
-interface IProps {
-    mxEvent: MatrixEvent;
-}
-
-interface IState {
-    error?: Error;
-    playback?: Playback;
-    decryptedBlob?: Blob;
-}
+import { _t } from "../../../languageHandler";
+import RecordingPlayback from "../audio_messages/RecordingPlayback";
+import MAudioBody from "./MAudioBody";
+import MFileBody from "./MFileBody";
 
 @replaceableComponent("views.messages.MVoiceMessageBody")
-export default class MVoiceMessageBody extends React.PureComponent<IProps, IState> {
-    constructor(props: IProps) {
-        super(props);
-
-        this.state = {};
-    }
-
-    public async componentDidMount() {
-        let buffer: ArrayBuffer;
-        const content = this.props.mxEvent.getContent();
-        const media = mediaFromContent(content);
-        if (media.isEncrypted) {
-            try {
-                const blob = await decryptFile(content.file);
-                buffer = await blob.arrayBuffer();
-                this.setState({decryptedBlob: blob});
-            } catch (e) {
-                this.setState({error: e});
-                console.warn("Unable to decrypt voice message", e);
-                return; // stop processing the audio file
-            }
-        } else {
-            try {
-                buffer = await media.downloadSource().then(r => r.blob()).then(r => r.arrayBuffer());
-            } catch (e) {
-                this.setState({error: e});
-                console.warn("Unable to download voice message", e);
-                return; // stop processing the audio file
-            }
-        }
-
-        const waveform = content?.["org.matrix.msc1767.audio"]?.waveform?.map(p => p / 1024);
-
-        // We should have a buffer to work with now: let's set it up
-        const playback = new Playback(buffer, waveform);
-        this.setState({ playback });
-        // Note: the RecordingPlayback component will handle preparing the Playback class for us.
-    }
-
-    public componentWillUnmount() {
-        this.state.playback?.destroy();
-    }
-
+export default class MVoiceMessageBody extends MAudioBody {
+    // A voice message is an audio file but rendered in a special way.
     public render() {
         if (this.state.error) {
-            // TODO: @@TR: Verify error state
             return (
                 <span className="mx_MVoiceMessageBody">
                     <img src={require("../../../../res/img/warning.svg")} width="16" height="16" />
@@ -91,7 +36,6 @@ export default class MVoiceMessageBody extends React.PureComponent<IProps, IStat
         }
 
         if (!this.state.playback) {
-            // TODO: @@TR: Verify loading/decrypting state
             return (
                 <span className="mx_MVoiceMessageBody">
                     <InlineSpinner />
@@ -102,9 +46,9 @@ export default class MVoiceMessageBody extends React.PureComponent<IProps, IStat
         // At this point we should have a playable state
         return (
             <span className="mx_MVoiceMessageBody">
-                <RecordingPlayback playback={this.state.playback} />
-                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />
+                <RecordingPlayback playback={this.state.playback} tileShape={this.props.tileShape} />
+                { this.props.tileShape && <MFileBody {...this.props} showGenericPlaceholder={false} /> }
             </span>
-        )
+        );
     }
 }
diff --git a/src/components/views/messages/MVoiceOrAudioBody.tsx b/src/components/views/messages/MVoiceOrAudioBody.tsx
index 0cebcf3440..b4dce5d1aa 100644
--- a/src/components/views/messages/MVoiceOrAudioBody.tsx
+++ b/src/components/views/messages/MVoiceOrAudioBody.tsx
@@ -15,22 +15,16 @@ limitations under the License.
 */
 
 import React from "react";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import MAudioBody from "./MAudioBody";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import SettingsStore from "../../../settings/SettingsStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MVoiceMessageBody from "./MVoiceMessageBody";
-
-interface IProps {
-    mxEvent: MatrixEvent;
-}
+import { IBodyProps } from "./IBodyProps";
+import { isVoiceMessage } from "../../../utils/EventUtils";
 
 @replaceableComponent("views.messages.MVoiceOrAudioBody")
-export default class MVoiceOrAudioBody extends React.PureComponent<IProps> {
+export default class MVoiceOrAudioBody extends React.PureComponent<IBodyProps> {
     public render() {
-        const isVoiceMessage = !!this.props.mxEvent.getContent()['org.matrix.msc2516.voice'];
-        const voiceMessagesEnabled = SettingsStore.getValue("feature_voice_messages");
-        if (isVoiceMessage && voiceMessagesEnabled) {
+        if (!this.props.forExport && isVoiceMessage(this.props.mxEvent)) {
             return <MVoiceMessageBody {...this.props} />;
         } else {
             return <MAudioBody {...this.props} />;
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.tsx
similarity index 55%
rename from src/components/views/messages/MessageActionBar.js
rename to src/components/views/messages/MessageActionBar.tsx
index 37737519ce..7ee951a812 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -16,65 +16,88 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useEffect} from 'react';
-import PropTypes from 'prop-types';
-import { EventStatus } from 'matrix-js-sdk/src/models/event';
+import React, { useEffect } from 'react';
+import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import type { Relations } from 'matrix-js-sdk/src/models/relations';
 
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
-import {aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu} from '../../structures/ContextMenu';
+import { Action } from '../../../dispatcher/actions';
+import { RightPanelPhases } from '../../../stores/RightPanelStorePhases';
+import { aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu } from '../../structures/ContextMenu';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
-import RoomContext from "../../../contexts/RoomContext";
+import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import Toolbar from "../../../accessibility/Toolbar";
-import {RovingAccessibleTooltipButton, useRovingTabIndex} from "../../../accessibility/RovingTabIndex";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {canCancel} from "../context_menus/MessageContextMenu";
+import { RovingAccessibleTooltipButton, useRovingTabIndex } from "../../../accessibility/RovingTabIndex";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { canCancel } from "../context_menus/MessageContextMenu";
 import Resend from "../../../Resend";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { MediaEventHelper } from "../../../utils/MediaEventHelper";
+import DownloadActionButton from "./DownloadActionButton";
+import MessageContextMenu from "../context_menus/MessageContextMenu";
+import classNames from 'classnames';
 
-const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
-    const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
-    const [onFocus, isActive, ref] = useRovingTabIndex(button);
-    useEffect(() => {
-        onFocusChange(menuDisplayed);
-    }, [onFocusChange, menuDisplayed]);
+import SettingsStore from '../../../settings/SettingsStore';
+import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
+import ReplyThread from '../elements/ReplyThread';
 
-    let contextMenu;
-    if (menuDisplayed) {
-        const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
+interface IOptionsButtonProps {
+    mxEvent: MatrixEvent;
+    // TODO: Types
+    getTile: () => any | null;
+    getReplyThread: () => ReplyThread;
+    permalinkCreator: RoomPermalinkCreator;
+    onFocusChange: (menuDisplayed: boolean) => void;
+}
 
-        const tile = getTile && getTile();
-        const replyThread = getReplyThread && getReplyThread();
+const OptionsButton: React.FC<IOptionsButtonProps> =
+    ({ mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange }) => {
+        const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
+        const [onFocus, isActive, ref] = useRovingTabIndex(button);
+        useEffect(() => {
+            onFocusChange(menuDisplayed);
+        }, [onFocusChange, menuDisplayed]);
 
-        const buttonRect = button.current.getBoundingClientRect();
-        contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu}>
-            <MessageContextMenu
+        let contextMenu;
+        if (menuDisplayed) {
+            const tile = getTile && getTile();
+            const replyThread = getReplyThread && getReplyThread();
+
+            const buttonRect = button.current.getBoundingClientRect();
+            contextMenu = <MessageContextMenu
+                {...aboveLeftOf(buttonRect)}
                 mxEvent={mxEvent}
                 permalinkCreator={permalinkCreator}
                 eventTileOps={tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined}
                 collapseReplyThread={replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined}
                 onFinished={closeMenu}
+            />;
+        }
+
+        return <React.Fragment>
+            <ContextMenuTooltipButton
+                className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
+                title={_t("Options")}
+                onClick={openMenu}
+                isExpanded={menuDisplayed}
+                inputRef={ref}
+                onFocus={onFocus}
+                tabIndex={isActive ? 0 : -1}
             />
-        </ContextMenu>;
-    }
 
-    return <React.Fragment>
-        <ContextMenuTooltipButton
-            className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
-            title={_t("Options")}
-            onClick={openMenu}
-            isExpanded={menuDisplayed}
-            inputRef={ref}
-            onFocus={onFocus}
-            tabIndex={isActive ? 0 : -1}
-        />
+            { contextMenu }
+        </React.Fragment>;
+    };
 
-        { contextMenu }
-    </React.Fragment>;
-};
+interface IReactButtonProps {
+    mxEvent: MatrixEvent;
+    reactions: Relations;
+    onFocusChange: (menuDisplayed: boolean) => void;
+}
 
-const ReactButton = ({mxEvent, reactions, onFocusChange}) => {
+const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusChange }) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
     const [onFocus, isActive, ref] = useRovingTabIndex(button);
     useEffect(() => {
@@ -105,21 +128,23 @@ const ReactButton = ({mxEvent, reactions, onFocusChange}) => {
     </React.Fragment>;
 };
 
+interface IMessageActionBarProps {
+    mxEvent: MatrixEvent;
+    reactions?: Relations;
+    // TODO: Types
+    getTile: () => any | null;
+    getReplyThread: () => ReplyThread | undefined;
+    permalinkCreator?: RoomPermalinkCreator;
+    onFocusChange?: (menuDisplayed: boolean) => void;
+    toggleThreadExpanded: () => void;
+    isQuoteExpanded?: boolean;
+}
+
 @replaceableComponent("views.messages.MessageActionBar")
-export default class MessageActionBar extends React.PureComponent {
-    static propTypes = {
-        mxEvent: PropTypes.object.isRequired,
-        // The Relations model from the JS SDK for reactions to `mxEvent`
-        reactions: PropTypes.object,
-        permalinkCreator: PropTypes.object,
-        getTile: PropTypes.func,
-        getReplyThread: PropTypes.func,
-        onFocusChange: PropTypes.func,
-    };
+export default class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
+    public static contextType = RoomContext;
 
-    static contextType = RoomContext;
-
-    componentDidMount() {
+    public componentDidMount(): void {
         if (this.props.mxEvent.status && this.props.mxEvent.status !== EventStatus.SENT) {
             this.props.mxEvent.on("Event.status", this.onSent);
         }
@@ -133,46 +158,58 @@ export default class MessageActionBar extends React.PureComponent {
         this.props.mxEvent.on("Event.beforeRedaction", this.onBeforeRedaction);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         this.props.mxEvent.off("Event.status", this.onSent);
         this.props.mxEvent.off("Event.decrypted", this.onDecrypted);
         this.props.mxEvent.off("Event.beforeRedaction", this.onBeforeRedaction);
     }
 
-    onDecrypted = () => {
+    private onDecrypted = (): void => {
         // When an event decrypts, it is likely to change the set of available
         // actions, so we force an update to check again.
         this.forceUpdate();
     };
 
-    onBeforeRedaction = () => {
+    private onBeforeRedaction = (): void => {
         // When an event is redacted, we can't edit it so update the available actions.
         this.forceUpdate();
     };
 
-    onSent = () => {
+    private onSent = (): void => {
         // When an event is sent and echoed the possible actions change.
         this.forceUpdate();
     };
 
-    onFocusChange = (focused) => {
+    private onFocusChange = (focused: boolean): void => {
         if (!this.props.onFocusChange) {
             return;
         }
         this.props.onFocusChange(focused);
     };
 
-    onReplyClick = (ev) => {
+    private onReplyClick = (ev: React.MouseEvent): void => {
         dis.dispatch({
             action: 'reply_to_event',
             event: this.props.mxEvent,
         });
     };
 
-    onEditClick = (ev) => {
+    private onThreadClick = (): void => {
         dis.dispatch({
-            action: 'edit_event',
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.ThreadView,
+            allowClose: false,
+            refireParams: {
+                event: this.props.mxEvent,
+            },
+        });
+    };
+
+    private onEditClick = (ev: React.MouseEvent): void => {
+        dis.dispatch({
+            action: Action.EditEvent,
             event: this.props.mxEvent,
+            timelineRenderingType: this.context.timelineRenderingType,
         });
     };
 
@@ -185,7 +222,7 @@ export default class MessageActionBar extends React.PureComponent {
      * @param {Function} fn The execution function.
      * @param {Function} checkFn The test function.
      */
-    runActionOnFailedEv(fn, checkFn) {
+    private runActionOnFailedEv(fn: (ev: MatrixEvent) => void, checkFn?: (ev: MatrixEvent) => boolean): void {
         if (!checkFn) checkFn = () => true;
 
         const mxEvent = this.props.mxEvent;
@@ -200,18 +237,18 @@ export default class MessageActionBar extends React.PureComponent {
         }
     }
 
-    onResendClick = (ev) => {
+    private onResendClick = (ev: React.MouseEvent): void => {
         this.runActionOnFailedEv((tarEv) => Resend.resend(tarEv));
     };
 
-    onCancelClick = (ev) => {
+    private onCancelClick = (ev: React.MouseEvent): void => {
         this.runActionOnFailedEv(
             (tarEv) => Resend.removeFromQueue(tarEv),
             (testEv) => canCancel(testEv.status),
         );
     };
 
-    render() {
+    public render(): JSX.Element {
         const toolbarOpts = [];
         if (canEditContent(this.props.mxEvent)) {
             toolbarOpts.push(<RovingAccessibleTooltipButton
@@ -234,7 +271,7 @@ export default class MessageActionBar extends React.PureComponent {
         const editStatus = mxEvent.replacingEvent() && mxEvent.replacingEvent().status;
         const redactStatus = mxEvent.localRedactionEvent() && mxEvent.localRedactionEvent().status;
         const allowCancel = canCancel(mxEvent.status) || canCancel(editStatus) || canCancel(redactStatus);
-        const isFailed = [mxEvent.status, editStatus, redactStatus].includes("not_sent");
+        const isFailed = [mxEvent.status, editStatus, redactStatus].includes(EventStatus.NOT_SENT);
         if (allowCancel && isFailed) {
             // The resend button needs to appear ahead of the edit button, so insert to the
             // start of the opts
@@ -252,13 +289,23 @@ export default class MessageActionBar extends React.PureComponent {
                 // Like the resend button, the react and reply buttons need to appear before the edit.
                 // The only catch is we do the reply button first so that we can make sure the react
                 // button is the very first button without having to do length checks for `splice()`.
-                if (this.context.canReply) {
-                    toolbarOpts.splice(0, 0, <RovingAccessibleTooltipButton
-                        className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
-                        title={_t("Reply")}
-                        onClick={this.onReplyClick}
-                        key="reply"
-                    />);
+                if (this.context.canReply && this.context.timelineRenderingType === TimelineRenderingType.Room) {
+                    toolbarOpts.splice(0, 0, <>
+                        <RovingAccessibleTooltipButton
+                            className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
+                            title={_t("Reply")}
+                            onClick={this.onReplyClick}
+                            key="reply"
+                        />
+                        { SettingsStore.getValue("feature_thread") && (
+                            <RovingAccessibleTooltipButton
+                                className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
+                                title={_t("Thread")}
+                                onClick={this.onThreadClick}
+                                key="thread"
+                            />
+                        ) }
+                    </>);
                 }
                 if (this.context.canReact) {
                     toolbarOpts.splice(0, 0, <ReactButton
@@ -268,12 +315,35 @@ export default class MessageActionBar extends React.PureComponent {
                         key="react"
                     />);
                 }
+
+                // XXX: Assuming that the underlying tile will be a media event if it is eligible media.
+                if (MediaEventHelper.isEligible(this.props.mxEvent)) {
+                    toolbarOpts.splice(0, 0, <DownloadActionButton
+                        mxEvent={this.props.mxEvent}
+                        mediaEventHelperGet={() => this.props.getTile?.().getMediaHelper?.()}
+                        key="download"
+                    />);
+                }
             }
 
             if (allowCancel) {
                 toolbarOpts.push(cancelSendingButton);
             }
 
+            if (this.props.isQuoteExpanded !== undefined && ReplyThread.hasThreadReply(this.props.mxEvent)) {
+                const expandClassName = classNames({
+                    'mx_MessageActionBar_maskButton': true,
+                    'mx_MessageActionBar_expandMessageButton': !this.props.isQuoteExpanded,
+                    'mx_MessageActionBar_collapseMessageButton': this.props.isQuoteExpanded,
+                });
+                toolbarOpts.push(<RovingAccessibleTooltipButton
+                    className={expandClassName}
+                    title={this.props.isQuoteExpanded ? _t("Collapse quotes │ ⇧+click") : _t("Expand quotes │ ⇧+click")}
+                    onClick={this.props.toggleThreadExpanded}
+                    key="expand"
+                />);
+            }
+
             // The menu button should be last, so dump it there.
             toolbarOpts.push(<OptionsButton
                 mxEvent={this.props.mxEvent}
@@ -287,7 +357,7 @@ export default class MessageActionBar extends React.PureComponent {
 
         // aria-live=off to not have this read out automatically as navigating around timeline, gets repetitive.
         return <Toolbar className="mx_MessageActionBar" aria-label={_t("Message Actions")} aria-live="off">
-            {toolbarOpts}
+            { toolbarOpts }
         </Toolbar>;
     }
 }
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
deleted file mode 100644
index 78e0dc422d..0000000000
--- a/src/components/views/messages/MessageEvent.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-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 */
-        mxEvent: PropTypes.object.isRequired,
-
-        /* a list of words to highlight */
-        highlights: PropTypes.array,
-
-        /* link URL for the highlights */
-        highlightLink: PropTypes.string,
-
-        /* should show URL previews for this event */
-        showUrlPreview: PropTypes.bool,
-
-        /* callback called when dynamic content in events are loaded */
-        onHeightChanged: PropTypes.func,
-
-        /* the shape of the tile, used */
-        tileShape: PropTypes.string,
-
-        /* the maximum image height to use, if the event is an image */
-        maxImageHeight: PropTypes.number,
-
-        /* the permalinkCreator */
-        permalinkCreator: PropTypes.object,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this._body = createRef();
-    }
-
-    getEventTileOps = () => {
-        return this._body.current && this._body.current.getEventTileOps ? this._body.current.getEventTileOps() : null;
-    };
-
-    onTileUpdate = () => {
-        this.forceUpdate();
-    };
-
-    render() {
-        const bodyTypes = {
-            'm.text': sdk.getComponent('messages.TextualBody'),
-            'm.notice': sdk.getComponent('messages.TextualBody'),
-            'm.emote': sdk.getComponent('messages.TextualBody'),
-            'm.image': sdk.getComponent('messages.MImageBody'),
-            'm.file': sdk.getComponent('messages.MFileBody'),
-            'm.audio': sdk.getComponent('messages.MVoiceOrAudioBody'),
-            'm.video': sdk.getComponent('messages.MVideoBody'),
-        };
-        const evTypes = {
-            'm.sticker': sdk.getComponent('messages.MStickerBody'),
-        };
-
-        const content = this.props.mxEvent.getContent();
-        const type = this.props.mxEvent.getType();
-        const msgtype = content.msgtype;
-        let BodyType = RedactedBody;
-        if (!this.props.mxEvent.isRedacted()) {
-            // only resolve BodyType if event is not redacted
-            if (type && evTypes[type]) {
-                BodyType = evTypes[type];
-            } else if (msgtype && bodyTypes[msgtype]) {
-                BodyType = bodyTypes[msgtype];
-            } else if (content.url) {
-                // Fallback to MFileBody if there's a content URL
-                BodyType = bodyTypes['m.file'];
-            } else {
-                // Fallback to UnknownBody otherwise if not redacted
-                BodyType = UnknownBody;
-            }
-        }
-
-        if (SettingsStore.getValue("feature_mjolnir")) {
-            const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`;
-            const allowRender = localStorage.getItem(key) === "true";
-
-            if (!allowRender) {
-                const userDomain = this.props.mxEvent.getSender().split(':').slice(1).join(':');
-                const userBanned = Mjolnir.sharedInstance().isUserBanned(this.props.mxEvent.getSender());
-                const serverBanned = Mjolnir.sharedInstance().isServerBanned(userDomain);
-
-                if (userBanned || serverBanned) {
-                    BodyType = sdk.getComponent('messages.MjolnirBody');
-                }
-            }
-        }
-
-        return <BodyType
-            ref={this._body}
-            mxEvent={this.props.mxEvent}
-            highlights={this.props.highlights}
-            highlightLink={this.props.highlightLink}
-            showUrlPreview={this.props.showUrlPreview}
-            tileShape={this.props.tileShape}
-            maxImageHeight={this.props.maxImageHeight}
-            replacingEventId={this.props.replacingEventId}
-            editState={this.props.editState}
-            onHeightChanged={this.props.onHeightChanged}
-            onMessageAllowed={this.onTileUpdate}
-            permalinkCreator={this.props.permalinkCreator}
-        />;
-    }
-}
diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx
new file mode 100644
index 0000000000..b72e40d194
--- /dev/null
+++ b/src/components/views/messages/MessageEvent.tsx
@@ -0,0 +1,149 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from 'react';
+import * as sdk from '../../../index';
+import SettingsStore from "../../../settings/SettingsStore";
+import { Mjolnir } from "../../../mjolnir/Mjolnir";
+import RedactedBody from "./RedactedBody";
+import UnknownBody from "./UnknownBody";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IMediaBody } from "./IMediaBody";
+import { IOperableEventTile } from "../context_menus/MessageContextMenu";
+import { MediaEventHelper } from "../../../utils/MediaEventHelper";
+import { ReactAnyComponent } from "../../../@types/common";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import { IBodyProps } from "./IBodyProps";
+
+// onMessageAllowed is handled internally
+interface IProps extends Omit<IBodyProps, "onMessageAllowed"> {
+    /* overrides for the msgtype-specific components, used by ReplyTile to override file rendering */
+    overrideBodyTypes?: Record<string, React.Component>;
+    overrideEventTypes?: Record<string, React.Component>;
+}
+
+@replaceableComponent("views.messages.MessageEvent")
+export default class MessageEvent extends React.Component<IProps> implements IMediaBody, IOperableEventTile {
+    private body: React.RefObject<React.Component | IOperableEventTile> = createRef();
+    private mediaHelper: MediaEventHelper;
+
+    public constructor(props: IProps) {
+        super(props);
+
+        if (MediaEventHelper.isEligible(this.props.mxEvent)) {
+            this.mediaHelper = new MediaEventHelper(this.props.mxEvent);
+        }
+    }
+
+    public componentWillUnmount() {
+        this.mediaHelper?.destroy();
+    }
+
+    public componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (this.props.mxEvent !== prevProps.mxEvent && MediaEventHelper.isEligible(this.props.mxEvent)) {
+            this.mediaHelper?.destroy();
+            this.mediaHelper = new MediaEventHelper(this.props.mxEvent);
+        }
+    }
+
+    private get bodyTypes(): Record<string, React.Component> {
+        return {
+            [MsgType.Text]: sdk.getComponent('messages.TextualBody'),
+            [MsgType.Notice]: sdk.getComponent('messages.TextualBody'),
+            [MsgType.Emote]: sdk.getComponent('messages.TextualBody'),
+            [MsgType.Image]: sdk.getComponent('messages.MImageBody'),
+            [MsgType.File]: sdk.getComponent('messages.MFileBody'),
+            [MsgType.Audio]: sdk.getComponent('messages.MVoiceOrAudioBody'),
+            [MsgType.Video]: sdk.getComponent('messages.MVideoBody'),
+
+            ...(this.props.overrideBodyTypes || {}),
+        };
+    }
+
+    private get evTypes(): Record<string, React.Component> {
+        return {
+            [EventType.Sticker]: sdk.getComponent('messages.MStickerBody'),
+
+            ...(this.props.overrideEventTypes || {}),
+        };
+    }
+
+    public getEventTileOps = () => {
+        return (this.body.current as IOperableEventTile)?.getEventTileOps?.() || null;
+    };
+
+    public getMediaHelper() {
+        return this.mediaHelper;
+    }
+
+    private onTileUpdate = () => {
+        this.forceUpdate();
+    };
+
+    public render() {
+        const content = this.props.mxEvent.getContent();
+        const type = this.props.mxEvent.getType();
+        const msgtype = content.msgtype;
+        let BodyType: ReactAnyComponent = RedactedBody;
+        if (!this.props.mxEvent.isRedacted()) {
+            // only resolve BodyType if event is not redacted
+            if (type && this.evTypes[type]) {
+                BodyType = this.evTypes[type];
+            } else if (msgtype && this.bodyTypes[msgtype]) {
+                BodyType = this.bodyTypes[msgtype];
+            } else if (content.url) {
+                // Fallback to MFileBody if there's a content URL
+                BodyType = this.bodyTypes[MsgType.File];
+            } else {
+                // Fallback to UnknownBody otherwise if not redacted
+                BodyType = UnknownBody;
+            }
+        }
+
+        if (SettingsStore.getValue("feature_mjolnir")) {
+            const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`;
+            const allowRender = localStorage.getItem(key) === "true";
+
+            if (!allowRender) {
+                const userDomain = this.props.mxEvent.getSender().split(':').slice(1).join(':');
+                const userBanned = Mjolnir.sharedInstance().isUserBanned(this.props.mxEvent.getSender());
+                const serverBanned = Mjolnir.sharedInstance().isServerBanned(userDomain);
+
+                if (userBanned || serverBanned) {
+                    BodyType = sdk.getComponent('messages.MjolnirBody');
+                }
+            }
+        }
+
+        // @ts-ignore - this is a dynamic react component
+        return BodyType ? <BodyType
+            ref={this.body}
+            mxEvent={this.props.mxEvent}
+            highlights={this.props.highlights}
+            highlightLink={this.props.highlightLink}
+            showUrlPreview={this.props.showUrlPreview}
+            tileShape={this.props.tileShape}
+            forExport={this.props.forExport}
+            maxImageHeight={this.props.maxImageHeight}
+            replacingEventId={this.props.replacingEventId}
+            editState={this.props.editState}
+            onHeightChanged={this.props.onHeightChanged}
+            onMessageAllowed={this.onTileUpdate}
+            permalinkCreator={this.props.permalinkCreator}
+            mediaEventHelper={this.mediaHelper}
+        /> : null;
+    }
+}
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.tsx
similarity index 66%
rename from src/components/views/messages/MessageTimestamp.js
rename to src/components/views/messages/MessageTimestamp.tsx
index a7f350adcd..a657032c86 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.tsx
@@ -16,20 +16,19 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {formatFullDate, formatTime, formatFullTime} from '../../../DateUtils';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { formatFullDate, formatTime, formatFullTime } from '../../../DateUtils';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    ts: number;
+    showTwelveHour?: boolean;
+    showFullDate?: boolean;
+    showSeconds?: boolean;
+}
 
 @replaceableComponent("views.messages.MessageTimestamp")
-export default class MessageTimestamp extends React.Component {
-    static propTypes = {
-        ts: PropTypes.number.isRequired,
-        showTwelveHour: PropTypes.bool,
-        showFullDate: PropTypes.bool,
-        showSeconds: PropTypes.bool,
-    };
-
-    render() {
+export default class MessageTimestamp extends React.Component<IProps> {
+    public render() {
         const date = new Date(this.props.ts);
         let timestamp;
         if (this.props.showFullDate) {
@@ -41,8 +40,12 @@ export default class MessageTimestamp extends React.Component {
         }
 
         return (
-            <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)} aria-hidden={true}>
-                {timestamp}
+            <span
+                className="mx_MessageTimestamp"
+                title={formatFullDate(date, this.props.showTwelveHour)}
+                aria-hidden={true}
+            >
+                { timestamp }
             </span>
         );
     }
diff --git a/src/components/views/messages/MjolnirBody.js b/src/components/views/messages/MjolnirBody.tsx
similarity index 63%
rename from src/components/views/messages/MjolnirBody.js
rename to src/components/views/messages/MjolnirBody.tsx
index 4368fd936c..7e922a5715 100644
--- a/src/components/views/messages/MjolnirBody.js
+++ b/src/components/views/messages/MjolnirBody.tsx
@@ -15,22 +15,18 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { _t } from '../../../languageHandler';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+    onMessageAllowed: () => void;
+}
 
 @replaceableComponent("views.messages.MjolnirBody")
-export default class MjolnirBody extends React.Component {
-    static propTypes = {
-        mxEvent: PropTypes.object.isRequired,
-        onMessageAllowed: PropTypes.func.isRequired,
-    };
-
-    constructor() {
-        super();
-    }
-
-    _onAllowClick = (e) => {
+export default class MjolnirBody extends React.Component<IProps> {
+    private onAllowClick = (e: React.MouseEvent): void => {
         e.preventDefault();
         e.stopPropagation();
 
@@ -39,12 +35,12 @@ export default class MjolnirBody extends React.Component {
         this.props.onMessageAllowed();
     };
 
-    render() {
+    public render(): JSX.Element {
         return (
-            <div className='mx_MjolnirBody'><i>{_t(
+            <div className='mx_MjolnirBody'><i>{ _t(
                 "You have ignored this user, so their message is hidden. <a>Show anyways.</a>",
-                {}, {a: (sub) => <a href="#" onClick={this._onAllowClick}>{sub}</a>},
-            )}</i></div>
+                {}, { a: (sub) => <a href="#" onClick={this.onAllowClick}>{ sub }</a> },
+            ) }</i></div>
         );
     }
 }
diff --git a/src/components/views/messages/ReactionsRow.tsx b/src/components/views/messages/ReactionsRow.tsx
index 0180baa466..d4caf4ecf8 100644
--- a/src/components/views/messages/ReactionsRow.tsx
+++ b/src/components/views/messages/ReactionsRow.tsx
@@ -125,7 +125,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
     private onDecrypted = () => {
         // Decryption changes whether the event is actionable
         this.forceUpdate();
-    }
+    };
 
     private onReactionsChange = () => {
         // TODO: Call `onHeightChanged` as needed
@@ -136,7 +136,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
         // has changed (this is triggered by events for that purpose only) and
         // `PureComponent`s shallow state / props compare would otherwise filter this out.
         this.forceUpdate();
-    }
+    };
 
     private getMyReactions() {
         const reactions = this.props.reactions;
@@ -155,7 +155,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
         this.setState({
             showAll: true,
         });
-    }
+    };
 
     render() {
         const { mxEvent, reactions } = this.props;
@@ -199,7 +199,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
                 href="#"
                 onClick={this.onShowAllClick}
             >
-                {_t("Show all")}
+                { _t("Show all") }
             </a>;
         }
 
diff --git a/src/components/views/messages/ReactionsRowButton.tsx b/src/components/views/messages/ReactionsRowButton.tsx
index d163f1ad30..8934b2b98f 100644
--- a/src/components/views/messages/ReactionsRowButton.tsx
+++ b/src/components/views/messages/ReactionsRowButton.tsx
@@ -68,7 +68,7 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
                     "key": content,
                 },
             });
-            dis.dispatch({action: "message_sent"});
+            dis.dispatch({ action: "message_sent" });
         }
     };
 
@@ -79,13 +79,13 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
             tooltipRendered: true,
             tooltipVisible: true,
         });
-    }
+    };
 
     onMouseLeave = () => {
         this.setState({
             tooltipVisible: false,
         });
-    }
+    };
 
     render() {
         const { mxEvent, content, count, reactionEvents, myReactionEvent } = this.props;
@@ -106,31 +106,20 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
         }
 
         const room = this.context.getRoom(mxEvent.getRoomId());
-        let label;
+        let label: string;
         if (room) {
             const senders = [];
             for (const reactionEvent of reactionEvents) {
                 const member = room.getMember(reactionEvent.getSender());
-                const name = member ? member.name : reactionEvent.getSender();
-                senders.push(name);
+                senders.push(member?.name || reactionEvent.getSender());
+            }
+
+            const reactors = formatCommaSeparatedList(senders, 6);
+            if (content) {
+                label = _t("%(reactors)s reacted with %(content)s", { reactors, content });
+            } else {
+                label = reactors;
             }
-            label = _t(
-                "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
-                {
-                    content,
-                },
-                {
-                    reactors: () => {
-                        return formatCommaSeparatedList(senders, 6);
-                    },
-                    reactedWith: (sub) => {
-                        if (!content) {
-                            return null;
-                        }
-                        return sub;
-                    },
-                },
-            );
         }
         const isPeeking = room.getMyMembership() !== "join";
         return <AccessibleButton
@@ -142,12 +131,12 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
             onMouseLeave={this.onMouseLeave}
         >
             <span className="mx_ReactionsRowButton_content" aria-hidden="true">
-                {content}
+                { content }
             </span>
             <span className="mx_ReactionsRowButton_count" aria-hidden="true">
-                {count}
+                { count }
             </span>
-            {tooltip}
+            { tooltip }
         </AccessibleButton>;
     }
 }
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.tsx b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
index e60174530a..9c43c0df77 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.tsx
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
@@ -51,7 +51,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent<IProp
                 senders.push(name);
             }
             const shortName = unicodeToShortcode(content);
-            tooltipLabel = <div>{_t(
+            tooltipLabel = <div>{ _t(
                 "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
                 {
                     shortName,
@@ -59,7 +59,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent<IProp
                 {
                     reactors: () => {
                         return <div className="mx_Tooltip_title">
-                            {formatCommaSeparatedList(senders, 6)}
+                            { formatCommaSeparatedList(senders, 6) }
                         </div>;
                     },
                     reactedWith: (sub) => {
@@ -67,11 +67,11 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent<IProp
                             return null;
                         }
                         return <div className="mx_Tooltip_sub">
-                            {sub}
+                            { sub }
                         </div>;
                     },
                 },
-            )}</div>;
+            ) }</div>;
         }
 
         let tooltip;
diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
index 5f80460d03..9af4ebf1cb 100644
--- a/src/components/views/messages/RedactedBody.tsx
+++ b/src/components/views/messages/RedactedBody.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.
@@ -14,21 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext} from "react";
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import React, { useContext } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {formatFullDate} from "../../../DateUtils";
+import { formatFullDate } from "../../../DateUtils";
 import SettingsStore from "../../../settings/SettingsStore";
+import { IBodyProps } from "./IBodyProps";
 
 interface IProps {
     mxEvent: MatrixEvent;
 }
 
-const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
+const RedactedBody = React.forwardRef<any, IProps | IBodyProps>(({ mxEvent }, ref) => {
     const cli: MatrixClient = useContext(MatrixClientContext);
-
     let text = _t("Message deleted");
     const unsigned = mxEvent.getUnsigned();
     const redactedBecauseUserId = unsigned && unsigned.redacted_because && unsigned.redacted_because.sender;
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.tsx
similarity index 75%
rename from src/components/views/messages/RoomAvatarEvent.js
rename to src/components/views/messages/RoomAvatarEvent.tsx
index 41eada3193..12a8c88913 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.tsx
@@ -17,23 +17,24 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import RoomAvatar from "../avatars/RoomAvatar";
+import ImageView from "../elements/ImageView";
+
+interface IProps {
+    /* the MatrixEvent to show */
+    mxEvent: MatrixEvent;
+}
 
 @replaceableComponent("views.messages.RoomAvatarEvent")
-export default class RoomAvatarEvent extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
-    };
-
-    onAvatarClick = () => {
+export default class RoomAvatarEvent extends React.Component<IProps> {
+    private onAvatarClick = (): void => {
         const cli = MatrixClientPeg.get();
         const ev = this.props.mxEvent;
         const httpUrl = mediaFromMxc(ev.getContent().url).srcHttp;
@@ -44,7 +45,6 @@ export default class RoomAvatarEvent extends React.Component {
             roomName: room ? room.name : '',
         });
 
-        const ImageView = sdk.getComponent("elements.ImageView");
         const params = {
             src: httpUrl,
             name: text,
@@ -52,15 +52,14 @@ export default class RoomAvatarEvent extends React.Component {
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
     };
 
-    render() {
+    public render(): JSX.Element {
         const ev = this.props.mxEvent;
         const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-        const RoomAvatar = sdk.getComponent("avatars.RoomAvatar");
 
         if (!ev.getContent().url || ev.getContent().url.trim().length === 0) {
             return (
                 <div className="mx_TextualEvent">
-                    { _t('%(senderDisplayName)s removed the room avatar.', {senderDisplayName}) }
+                    { _t('%(senderDisplayName)s removed the room avatar.', { senderDisplayName }) }
                 </div>
             );
         }
@@ -78,8 +77,11 @@ export default class RoomAvatarEvent extends React.Component {
                     { senderDisplayName: senderDisplayName },
                     {
                         'img': () =>
-                            <AccessibleButton key="avatar" className="mx_RoomAvatarEvent_avatar"
-                                onClick={this.onAvatarClick}>
+                            <AccessibleButton
+                                key="avatar"
+                                className="mx_RoomAvatarEvent_avatar"
+                                onClick={this.onAvatarClick}
+                            >
                                 <RoomAvatar width={14} height={14} oobData={oobData} />
                             </AccessibleButton>,
                     })
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.tsx
similarity index 77%
rename from src/components/views/messages/RoomCreate.js
rename to src/components/views/messages/RoomCreate.tsx
index 3e02884c02..c846ba5632 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.tsx
@@ -16,23 +16,23 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import dis from '../../../dispatcher/dispatcher';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import EventTileBubble from "./EventTileBubble";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+interface IProps {
+    /* the MatrixEvent to show */
+    mxEvent: MatrixEvent;
+}
 
 @replaceableComponent("views.messages.RoomCreate")
-export default class RoomCreate extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
-    };
-
-    _onLinkClicked = e => {
+export default class RoomCreate extends React.Component<IProps> {
+    private onLinkClicked = (e: React.MouseEvent): void => {
         e.preventDefault();
 
         const predecessor = this.props.mxEvent.getContent()['predecessor'];
@@ -45,7 +45,7 @@ export default class RoomCreate extends React.Component {
         });
     };
 
-    render() {
+    public render(): JSX.Element {
         const predecessor = this.props.mxEvent.getContent()['predecessor'];
         if (predecessor === undefined) {
             return <div />; // We should never have been instantiated in this case
@@ -55,8 +55,8 @@ export default class RoomCreate extends React.Component {
         permalinkCreator.load();
         const predecessorPermalink = permalinkCreator.forEvent(predecessor['event_id']);
         const link = (
-            <a href={predecessorPermalink} onClick={this._onLinkClicked}>
-                {_t("Click here to see older messages.")}
+            <a href={predecessorPermalink} onClick={this.onLinkClicked}>
+                { _t("Click here to see older messages.") }
             </a>
         );
 
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.tsx
similarity index 55%
rename from src/components/views/messages/SenderProfile.js
rename to src/components/views/messages/SenderProfile.tsx
index 8f10954370..d4b74db6d0 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.tsx
@@ -15,23 +15,32 @@
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import Flair from '../elements/Flair.js';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MsgType } from "matrix-js-sdk/src/@types/event";
+
+import Flair from '../elements/Flair';
 import FlairStore from '../../../stores/FlairStore';
-import {getUserNameColorClass} from '../../../utils/FormattingUtils';
+import { getUserNameColorClass } from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+    onClick?(): void;
+    enableFlair: boolean;
+}
+
+interface IState {
+    userGroups;
+    relatedGroups;
+}
 
 @replaceableComponent("views.messages.SenderProfile")
-export default class SenderProfile extends React.Component {
-    static propTypes = {
-        mxEvent: PropTypes.object.isRequired, // event whose sender we're showing
-        onClick: PropTypes.func,
-    };
-
+export default class SenderProfile extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
+    private unmounted = false;
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
         const senderId = this.props.mxEvent.getSender();
 
@@ -40,15 +49,14 @@ export default class SenderProfile extends React.Component {
             relatedGroups: [],
         };
     }
+
     componentDidMount() {
-        this.unmounted = false;
-        this._updateRelatedGroups();
+        this.updateRelatedGroups();
 
         if (this.state.userGroups.length === 0) {
             this.getPublicisedGroups();
         }
 
-
         this.context.on('RoomState.events', this.onRoomStateEvents);
     }
 
@@ -57,35 +65,29 @@ export default class SenderProfile extends React.Component {
         this.context.removeListener('RoomState.events', this.onRoomStateEvents);
     }
 
-    async getPublicisedGroups() {
-        if (!this.unmounted) {
-            const userGroups = await FlairStore.getPublicisedGroupsCached(
-                this.context, this.props.mxEvent.getSender(),
-            );
-            this.setState({userGroups});
-        }
+    private async getPublicisedGroups() {
+        const userGroups = await FlairStore.getPublicisedGroupsCached(this.context, this.props.mxEvent.getSender());
+        if (this.unmounted) return;
+        this.setState({ userGroups });
     }
 
-    onRoomStateEvents = event => {
-        if (event.getType() === 'm.room.related_groups' &&
-            event.getRoomId() === this.props.mxEvent.getRoomId()
-        ) {
-            this._updateRelatedGroups();
+    private onRoomStateEvents = (event: MatrixEvent) => {
+        if (event.getType() === 'm.room.related_groups' && event.getRoomId() === this.props.mxEvent.getRoomId()) {
+            this.updateRelatedGroups();
         }
     };
 
-    _updateRelatedGroups() {
-        if (this.unmounted) return;
+    private updateRelatedGroups() {
         const room = this.context.getRoom(this.props.mxEvent.getRoomId());
         if (!room) return;
 
         const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
         this.setState({
-            relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [],
+            relatedGroups: relatedGroupsEvent?.getContent().groups || [],
         });
     }
 
-    _getDisplayedGroups(userGroups, relatedGroups) {
+    private getDisplayedGroups(userGroups?: string[], relatedGroups?: string[]) {
         let displayedGroups = userGroups || [];
         if (relatedGroups && relatedGroups.length > 0) {
             displayedGroups = relatedGroups.filter((groupId) => {
@@ -98,18 +100,30 @@ export default class SenderProfile extends React.Component {
     }
 
     render() {
-        const {mxEvent} = this.props;
+        const { mxEvent } = this.props;
         const colorClass = getUserNameColorClass(mxEvent.getSender());
-        const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
-        const {msgtype} = mxEvent.getContent();
+        const { msgtype } = mxEvent.getContent();
 
-        if (msgtype === 'm.emote') {
+        const disambiguate = mxEvent.sender?.disambiguate;
+        const displayName = mxEvent.sender?.rawDisplayName || mxEvent.getSender() || "";
+        const mxid = mxEvent.sender?.userId || mxEvent.getSender() || "";
+
+        if (msgtype === MsgType.Emote) {
             return null; // emote message must include the name so don't duplicate it
         }
 
-        let flair = null;
+        let mxidElement;
+        if (disambiguate) {
+            mxidElement = (
+                <span className="mx_SenderProfile_mxid">
+                    { mxid }
+                </span>
+            );
+        }
+
+        let flair;
         if (this.props.enableFlair) {
-            const displayedGroups = this._getDisplayedGroups(
+            const displayedGroups = this.getDisplayedGroups(
                 this.state.userGroups, this.state.relatedGroups,
             );
 
@@ -119,13 +133,12 @@ export default class SenderProfile extends React.Component {
             />;
         }
 
-        const nameElem = name || '';
-
         return (
-            <div className="mx_SenderProfile mx_SenderProfile_hover" dir="auto" onClick={this.props.onClick}>
-                <span className={`mx_SenderProfile_name ${colorClass}`}>
-                    { nameElem }
+            <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
+                <span className={`mx_SenderProfile_displayName ${colorClass}`}>
+                    { displayName }
                 </span>
+                { mxidElement }
                 { flair }
             </div>
         );
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.tsx
similarity index 72%
rename from src/components/views/messages/TextualBody.js
rename to src/components/views/messages/TextualBody.tsx
index 3adfea6ee6..63ff39721d 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
-Copyright 2019 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.
@@ -16,135 +14,131 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef, SyntheticEvent } from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
 import highlight from 'highlight.js';
+import { MsgType } from "matrix-js-sdk/src/@types/event";
+
 import * as HtmlUtils from '../../../HtmlUtils';
-import {formatDate} from '../../../DateUtils';
-import * as sdk from '../../../index';
+import { formatDate } from '../../../DateUtils';
 import Modal from '../../../Modal';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import * as ContextMenu from '../../structures/ContextMenu';
+import { toRightOf } from '../../structures/ContextMenu';
 import SettingsStore from "../../../settings/SettingsStore";
 import ReplyThread from "../elements/ReplyThread";
-import {pillifyLinks, unmountPills} from '../../../utils/pillify';
-import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
-import {toRightOf} from "../../structures/ContextMenu";
-import {copyPlaintext} from "../../../utils/strings";
+import { pillifyLinks, unmountPills } from '../../../utils/pillify';
+import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
+import { isPermalinkHost } from "../../../utils/permalinks/Permalinks";
+import { copyPlaintext } from "../../../utils/strings";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
+import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
+import { Action } from "../../../dispatcher/actions";
+import GenericTextContextMenu from "../context_menus/GenericTextContextMenu";
+import Spoiler from "../elements/Spoiler";
+import QuestionDialog from "../dialogs/QuestionDialog";
+import MessageEditHistoryDialog from "../dialogs/MessageEditHistoryDialog";
+import EditMessageComposer from '../rooms/EditMessageComposer';
+import LinkPreviewGroup from '../rooms/LinkPreviewGroup';
+import { IBodyProps } from "./IBodyProps";
+
+interface IState {
+    // the URLs (if any) to be previewed with a LinkPreviewWidget inside this TextualBody.
+    links: string[];
+
+    // track whether the preview widget is hidden
+    widgetHidden: boolean;
+}
 
 @replaceableComponent("views.messages.TextualBody")
-export default class TextualBody extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
+export default class TextualBody extends React.Component<IBodyProps, IState> {
+    private readonly contentRef = createRef<HTMLSpanElement>();
 
-        /* a list of words to highlight */
-        highlights: PropTypes.array,
-
-        /* link URL for the highlights */
-        highlightLink: PropTypes.string,
-
-        /* should show URL previews for this event */
-        showUrlPreview: PropTypes.bool,
-
-        /* callback for when our widget has loaded */
-        onHeightChanged: PropTypes.func,
-
-        /* the shape of the tile, used */
-        tileShape: PropTypes.string,
-    };
+    private unmounted = false;
+    private pills: Element[] = [];
 
     constructor(props) {
         super(props);
 
-        this._content = createRef();
-
         this.state = {
-            // the URLs (if any) to be previewed with a LinkPreviewWidget
-            // inside this TextualBody.
             links: [],
-
-            // track whether the preview widget is hidden
             widgetHidden: false,
         };
     }
 
     componentDidMount() {
-        this._unmounted = false;
-        this._pills = [];
         if (!this.props.editState) {
-            this._applyFormatting();
+            this.applyFormatting();
         }
     }
 
-    _applyFormatting() {
+    private applyFormatting(): void {
         const showLineNumbers = SettingsStore.getValue("showCodeLineNumbers");
-        this.activateSpoilers([this._content.current]);
+        this.activateSpoilers([this.contentRef.current]);
 
         // pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer
         // are still sent as plaintext URLs. If these are ever pillified in the composer,
         // we should be pillify them here by doing the linkifying BEFORE the pillifying.
-        pillifyLinks([this._content.current], this.props.mxEvent, this._pills);
-        HtmlUtils.linkifyElement(this._content.current);
+        pillifyLinks([this.contentRef.current], this.props.mxEvent, this.pills);
+        HtmlUtils.linkifyElement(this.contentRef.current);
         this.calculateUrlPreview();
 
         if (this.props.mxEvent.getContent().format === "org.matrix.custom.html") {
             // Handle expansion and add buttons
-            const pres = ReactDOM.findDOMNode(this).getElementsByTagName("pre");
+            const pres = (ReactDOM.findDOMNode(this) as Element).getElementsByTagName("pre");
             if (pres.length > 0) {
                 for (let i = 0; i < pres.length; i++) {
                     // If there already is a div wrapping the codeblock we want to skip this.
                     // This happens after the codeblock was edited.
-                    if (pres[i].parentNode.className == "mx_EventTile_pre_container") continue;
+                    if (pres[i].parentElement.className == "mx_EventTile_pre_container") continue;
                     // Add code element if it's missing since we depend on it
                     if (pres[i].getElementsByTagName("code").length == 0) {
-                        this._addCodeElement(pres[i]);
+                        this.addCodeElement(pres[i]);
                     }
                     // Wrap a div around <pre> so that the copy button can be correctly positioned
                     // when the <pre> overflows and is scrolled horizontally.
-                    const div = this._wrapInDiv(pres[i]);
-                    this._handleCodeBlockExpansion(pres[i]);
-                    this._addCodeExpansionButton(div, pres[i]);
-                    this._addCodeCopyButton(div);
+                    const div = this.wrapInDiv(pres[i]);
+                    this.handleCodeBlockExpansion(pres[i]);
+                    this.addCodeExpansionButton(div, pres[i]);
+                    this.addCodeCopyButton(div);
                     if (showLineNumbers) {
-                        this._addLineNumbers(pres[i]);
+                        this.addLineNumbers(pres[i]);
                     }
                 }
             }
             // Highlight code
-            const codes = ReactDOM.findDOMNode(this).getElementsByTagName("code");
+            const codes = (ReactDOM.findDOMNode(this) as Element).getElementsByTagName("code");
             if (codes.length > 0) {
                 // Do this asynchronously: parsing code takes time and we don't
                 // need to block the DOM update on it.
                 setTimeout(() => {
-                    if (this._unmounted) return;
+                    if (this.unmounted) return;
                     for (let i = 0; i < codes.length; i++) {
                         // If the code already has the hljs class we want to skip this.
                         // This happens after the codeblock was edited.
                         if (codes[i].className.includes("hljs")) continue;
-                        this._highlightCode(codes[i]);
+                        this.highlightCode(codes[i]);
                     }
                 }, 10);
             }
         }
     }
 
-    _addCodeElement(pre) {
+    private addCodeElement(pre: HTMLPreElement): void {
         const code = document.createElement("code");
         code.append(...pre.childNodes);
         pre.appendChild(code);
     }
 
-    _addCodeExpansionButton(div, pre) {
+    private addCodeExpansionButton(div: HTMLDivElement, pre: HTMLPreElement): void {
         // Calculate how many percent does the pre element take up.
         // If it's less than 30% we don't add the expansion button.
-        const percentageOfViewport = pre.offsetHeight / UIStore.instance.windowHeight * 100;
+        // We also round the number as it sometimes can be 29.99...
+        const percentageOfViewport = Math.round(pre.offsetHeight / UIStore.instance.windowHeight * 100);
+        // TODO: additionally show the button if it's an expanded quoted message
         if (percentageOfViewport < 30) return;
 
         const button = document.createElement("span");
@@ -173,7 +167,7 @@ export default class TextualBody extends React.Component {
         div.appendChild(button);
     }
 
-    _addCodeCopyButton(div) {
+    private addCodeCopyButton(div: HTMLDivElement): void {
         const button = document.createElement("span");
         button.className = "mx_EventTile_button mx_EventTile_copyButton ";
 
@@ -183,12 +177,11 @@ export default class TextualBody extends React.Component {
         if (expansionButtonExists.length > 0) button.className += "mx_EventTile_buttonBottom";
 
         button.onclick = async () => {
-            const copyCode = button.parentNode.getElementsByTagName("code")[0];
+            const copyCode = button.parentElement.getElementsByTagName("code")[0];
             const successful = await copyPlaintext(copyCode.textContent);
 
             const buttonRect = button.getBoundingClientRect();
-            const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
-            const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
+            const { close } = ContextMenu.createMenu(GenericTextContextMenu, {
                 ...toRightOf(buttonRect, 2),
                 message: successful ? _t('Copied!') : _t('Failed to copy'),
             });
@@ -198,7 +191,7 @@ export default class TextualBody extends React.Component {
         div.appendChild(button);
     }
 
-    _wrapInDiv(pre) {
+    private wrapInDiv(pre: HTMLPreElement): HTMLDivElement {
         const div = document.createElement("div");
         div.className = "mx_EventTile_pre_container";
 
@@ -210,13 +203,13 @@ export default class TextualBody extends React.Component {
         return div;
     }
 
-    _handleCodeBlockExpansion(pre) {
+    private handleCodeBlockExpansion(pre: HTMLPreElement): void {
         if (!SettingsStore.getValue("expandCodeByDefault")) {
             pre.className = "mx_EventTile_collapsedCodeBlock";
         }
     }
 
-    _addLineNumbers(pre) {
+    private addLineNumbers(pre: HTMLPreElement): void {
         // Calculate number of lines in pre
         const number = pre.innerHTML.replace(/\n(<\/code>)?$/, "").split(/\n/).length;
         pre.innerHTML = '<span class="mx_EventTile_lineNumbers"></span>' + pre.innerHTML + '<span></span>';
@@ -227,8 +220,12 @@ export default class TextualBody extends React.Component {
         }
     }
 
-    _highlightCode(code) {
-        if (SettingsStore.getValue("enableSyntaxHighlightLanguageDetection")) {
+    private highlightCode(code: HTMLElement): void {
+        // Auto-detect language only if enabled and only for codeblocks
+        if (
+            SettingsStore.getValue("enableSyntaxHighlightLanguageDetection") &&
+            code.parentElement instanceof HTMLPreElement
+        ) {
             highlight.highlightBlock(code);
         } else {
             // Only syntax highlight if there's a class starting with language-
@@ -247,14 +244,14 @@ export default class TextualBody extends React.Component {
             const stoppedEditing = prevProps.editState && !this.props.editState;
             const messageWasEdited = prevProps.replacingEventId !== this.props.replacingEventId;
             if (messageWasEdited || stoppedEditing) {
-                this._applyFormatting();
+                this.applyFormatting();
             }
         }
     }
 
     componentWillUnmount() {
-        this._unmounted = true;
-        unmountPills(this._pills);
+        this.unmounted = true;
+        unmountPills(this.pills);
     }
 
     shouldComponentUpdate(nextProps, nextState) {
@@ -271,26 +268,20 @@ export default class TextualBody extends React.Component {
                 nextState.widgetHidden !== this.state.widgetHidden);
     }
 
-    calculateUrlPreview() {
+    private calculateUrlPreview(): void {
         //console.info("calculateUrlPreview: ShowUrlPreview for %s is %s", this.props.mxEvent.getId(), this.props.showUrlPreview);
 
         if (this.props.showUrlPreview) {
             // pass only the first child which is the event tile otherwise this recurses on edited events
-            let links = this.findLinks([this._content.current]);
+            let links = this.findLinks([this.contentRef.current]);
             if (links.length) {
-                // de-duplicate the links after stripping hashes as they don't affect the preview
-                // using a set here maintains the order
-                links = Array.from(new Set(links.map(link => {
-                    const url = new URL(link);
-                    url.hash = "";
-                    return url.toString();
-                })));
-
+                // de-duplicate the links using a set here maintains the order
+                links = Array.from(new Set(links));
                 this.setState({ links });
 
                 // lazy-load the hidden state of the preview widget from localstorage
-                if (global.localStorage) {
-                    const hidden = global.localStorage.getItem("hide_preview_" + this.props.mxEvent.getId());
+                if (window.localStorage) {
+                    const hidden = !!window.localStorage.getItem("hide_preview_" + this.props.mxEvent.getId());
                     this.setState({ widgetHidden: hidden });
                 }
             } else if (this.state.links.length) {
@@ -299,19 +290,15 @@ export default class TextualBody extends React.Component {
         }
     }
 
-    activateSpoilers(nodes) {
+    private activateSpoilers(nodes: ArrayLike<Element>): void {
         let node = nodes[0];
         while (node) {
             if (node.tagName === "SPAN" && typeof node.getAttribute("data-mx-spoiler") === "string") {
                 const spoilerContainer = document.createElement('span');
 
                 const reason = node.getAttribute("data-mx-spoiler");
-                const Spoiler = sdk.getComponent('elements.Spoiler');
                 node.removeAttribute("data-mx-spoiler"); // we don't want to recurse
-                const spoiler = <Spoiler
-                    reason={reason}
-                    contentHtml={node.outerHTML}
-                />;
+                const spoiler = <Spoiler reason={reason} contentHtml={node.outerHTML} />;
 
                 ReactDOM.render(spoiler, spoilerContainer);
                 node.parentNode.replaceChild(spoilerContainer, node);
@@ -320,15 +307,15 @@ export default class TextualBody extends React.Component {
             }
 
             if (node.childNodes && node.childNodes.length) {
-                this.activateSpoilers(node.childNodes);
+                this.activateSpoilers(node.childNodes as NodeListOf<Element>);
             }
 
-            node = node.nextSibling;
+            node = node.nextSibling as Element;
         }
     }
 
-    findLinks(nodes) {
-        let links = [];
+    private findLinks(nodes: ArrayLike<Element>): string[] {
+        let links: string[] = [];
 
         for (let i = 0; i < nodes.length; i++) {
             const node = nodes[i];
@@ -346,7 +333,7 @@ export default class TextualBody extends React.Component {
         return links;
     }
 
-    isLinkPreviewable(node) {
+    private isLinkPreviewable(node: Element): boolean {
         // don't try to preview relative links
         if (!node.getAttribute("href").startsWith("http://") &&
             !node.getAttribute("href").startsWith("https://")) {
@@ -379,7 +366,7 @@ export default class TextualBody extends React.Component {
         }
     }
 
-    onCancelClick = event => {
+    private onCancelClick = (): void => {
         this.setState({ widgetHidden: true });
         // FIXME: persist this somewhere smarter than local storage
         if (global.localStorage) {
@@ -388,28 +375,28 @@ export default class TextualBody extends React.Component {
         this.forceUpdate();
     };
 
-    onEmoteSenderClick = event => {
+    private onEmoteSenderClick = (): void => {
         const mxEvent = this.props.mxEvent;
-        dis.dispatch({
-            action: 'insert_mention',
-            user_id: mxEvent.getSender(),
+        dis.dispatch<ComposerInsertPayload>({
+            action: Action.ComposerInsert,
+            userId: mxEvent.getSender(),
         });
     };
 
-    getEventTileOps = () => ({
+    public getEventTileOps = () => ({
         isWidgetHidden: () => {
             return this.state.widgetHidden;
         },
 
         unhideWidget: () => {
-            this.setState({widgetHidden: false});
+            this.setState({ widgetHidden: false });
             if (global.localStorage) {
                 global.localStorage.removeItem("hide_preview_" + this.props.mxEvent.getId());
             }
         },
     });
 
-    onStarterLinkClick = (starterLink, ev) => {
+    private onStarterLinkClick = (starterLink: string, ev: SyntheticEvent): void => {
         ev.preventDefault();
         // We need to add on our scalar token to the starter link, but we may not have one!
         // In addition, we can't fetch one on click and then go to it immediately as that
@@ -429,7 +416,6 @@ export default class TextualBody extends React.Component {
         const scalarClient = integrationManager.getScalarClient();
         scalarClient.connect().then(() => {
             const completeUrl = scalarClient.getStarterLink(starterLink);
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             const integrationsUrl = integrationManager.uiUrl;
             Modal.createTrackedDialog('Add an integration', '', QuestionDialog, {
                 title: _t("Add an Integration"),
@@ -456,56 +442,56 @@ export default class TextualBody extends React.Component {
         });
     };
 
-    _openHistoryDialog = async () => {
-        const MessageEditHistoryDialog = sdk.getComponent("views.dialogs.MessageEditHistoryDialog");
-        Modal.createDialog(MessageEditHistoryDialog, {mxEvent: this.props.mxEvent});
+    private openHistoryDialog = async (): Promise<void> => {
+        Modal.createDialog(MessageEditHistoryDialog, { mxEvent: this.props.mxEvent });
     };
 
-    _renderEditedMarker() {
+    private renderEditedMarker() {
         const date = this.props.mxEvent.replacingEventDate();
         const dateString = date && formatDate(date);
 
         const tooltip = <div>
             <div className="mx_Tooltip_title">
-                {_t("Edited at %(date)s", {date: dateString})}
+                { _t("Edited at %(date)s", { date: dateString }) }
             </div>
             <div className="mx_Tooltip_sub">
-                {_t("Click to view edits")}
+                { _t("Click to view edits") }
             </div>
         </div>;
 
         return (
             <AccessibleTooltipButton
                 className="mx_EventTile_edited"
-                onClick={this._openHistoryDialog}
-                title={_t("Edited at %(date)s. Click to view edits.", {date: dateString})}
+                onClick={this.openHistoryDialog}
+                title={_t("Edited at %(date)s. Click to view edits.", { date: dateString })}
                 tooltip={tooltip}
             >
-                <span>{`(${_t("edited")})`}</span>
+                <span>{ `(${_t("edited")})` }</span>
             </AccessibleTooltipButton>
         );
     }
 
     render() {
         if (this.props.editState) {
-            const EditMessageComposer = sdk.getComponent('rooms.EditMessageComposer');
             return <EditMessageComposer editState={this.props.editState} className="mx_EventTile_content" />;
         }
         const mxEvent = this.props.mxEvent;
         const content = mxEvent.getContent();
 
         // only strip reply if this is the original replying event, edits thereafter do not have the fallback
-        const stripReply = !mxEvent.replacingEvent() && ReplyThread.getParentEventId(mxEvent);
+        const stripReply = !mxEvent.replacingEvent() && !!ReplyThread.getParentEventId(mxEvent);
         let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
-            disableBigEmoji: content.msgtype === "m.emote" || !SettingsStore.getValue('TextualBody.enableBigEmoji'),
+            disableBigEmoji: content.msgtype === MsgType.Emote
+                || !SettingsStore.getValue<boolean>('TextualBody.enableBigEmoji'),
             // Part of Replies fallback support
             stripReplyFallback: stripReply,
-            ref: this._content,
+            ref: this.contentRef,
+            returnString: false,
         });
         if (this.props.replacingEventId) {
             body = <>
-                {body}
-                {this._renderEditedMarker()}
+                { body }
+                { this.renderEditedMarker() }
             </>;
         }
 
@@ -519,22 +505,18 @@ export default class TextualBody extends React.Component {
 
         let widgets;
         if (this.state.links.length && !this.state.widgetHidden && this.props.showUrlPreview) {
-            const LinkPreviewWidget = sdk.getComponent('rooms.LinkPreviewWidget');
-            widgets = this.state.links.map((link)=>{
-                return <LinkPreviewWidget
-                    key={link}
-                    link={link}
-                    mxEvent={this.props.mxEvent}
-                    onCancelClick={this.onCancelClick}
-                    onHeightChanged={this.props.onHeightChanged}
-                />;
-            });
+            widgets = <LinkPreviewGroup
+                links={this.state.links}
+                mxEvent={this.props.mxEvent}
+                onCancelClick={this.onCancelClick}
+                onHeightChanged={this.props.onHeightChanged}
+            />;
         }
 
         switch (content.msgtype) {
-            case "m.emote":
+            case MsgType.Emote:
                 return (
-                    <span className="mx_MEmoteBody mx_EventTile_content">
+                    <div className="mx_MEmoteBody mx_EventTile_content">
                         *&nbsp;
                         <span
                             className="mx_MEmoteBody_sender"
@@ -545,21 +527,21 @@ export default class TextualBody extends React.Component {
                         &nbsp;
                         { body }
                         { widgets }
-                    </span>
+                    </div>
                 );
-            case "m.notice":
+            case MsgType.Notice:
                 return (
-                    <span className="mx_MNoticeBody mx_EventTile_content">
+                    <div className="mx_MNoticeBody mx_EventTile_content">
                         { body }
                         { widgets }
-                    </span>
+                    </div>
                 );
             default: // including "m.text"
                 return (
-                    <span className="mx_MTextBody mx_EventTile_content">
+                    <div className="mx_MTextBody mx_EventTile_content">
                         { body }
                         { widgets }
-                    </span>
+                    </div>
                 );
         }
     }
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.tsx
similarity index 54%
rename from src/components/views/messages/TextualEvent.js
rename to src/components/views/messages/TextualEvent.tsx
index a020cc6c52..8fc116b5d0 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 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.
@@ -15,23 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import React from "react";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import RoomContext from "../../../contexts/RoomContext";
 import * as TextForEvent from "../../../TextForEvent";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+}
 
 @replaceableComponent("views.messages.TextualEvent")
-export default class TextualEvent extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
-    };
+export default class TextualEvent extends React.Component<IProps> {
+    static contextType = RoomContext;
 
-    render() {
-        const text = TextForEvent.textForEvent(this.props.mxEvent);
-        if (text == null || text.length === 0) return null;
-        return (
-            <div className="mx_TextualEvent">{ text }</div>
-        );
+    public render() {
+        const text = TextForEvent.textForEvent(this.props.mxEvent, true, this.context?.showHiddenEventsInTimeline);
+        if (!text) return null;
+        return <div className="mx_TextualEvent">{ text }</div>;
     }
 }
diff --git a/src/components/views/messages/TileErrorBoundary.js b/src/components/views/messages/TileErrorBoundary.tsx
similarity index 73%
rename from src/components/views/messages/TileErrorBoundary.js
rename to src/components/views/messages/TileErrorBoundary.tsx
index 0e9a7b6128..a15806ae0c 100644
--- a/src/components/views/messages/TileErrorBoundary.js
+++ b/src/components/views/messages/TileErrorBoundary.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.
@@ -16,14 +16,24 @@ limitations under the License.
 
 import React from 'react';
 import classNames from 'classnames';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BugReportDialog from '../dialogs/BugReportDialog';
+
+interface IProps {
+    mxEvent: MatrixEvent;
+}
+
+interface IState {
+    error: Error;
+}
 
 @replaceableComponent("views.messages.TileErrorBoundary")
-export default class TileErrorBoundary extends React.Component {
+export default class TileErrorBoundary extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
 
@@ -32,19 +42,16 @@ export default class TileErrorBoundary extends React.Component {
         };
     }
 
-    static getDerivedStateFromError(error) {
+    static getDerivedStateFromError(error: Error): Partial<IState> {
         // Side effects are not permitted here, so we only update the state so
         // that the next render shows an error message.
         return { error };
     }
 
-    _onBugReport = () => {
-        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
-        if (!BugReportDialog) {
-            return;
-        }
+    private onBugReport = (): void => {
         Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {
             label: 'react-soft-crash-tile',
+            error: this.state.error,
         });
     };
 
@@ -60,15 +67,15 @@ export default class TileErrorBoundary extends React.Component {
 
             let submitLogsButton;
             if (SdkConfig.get().bug_report_endpoint_url) {
-                submitLogsButton = <a onClick={this._onBugReport} href="#">
-                    {_t("Submit logs")}
+                submitLogsButton = <a onClick={this.onBugReport} href="#">
+                    { _t("Submit logs") }
                 </a>;
             }
 
             return (<div className={classNames(classes)}>
                 <div className="mx_EventTile_line">
                     <span>
-                        {_t("Can't load this message")}
+                        { _t("Can't load this message") }
                         { mxEvent && ` (${mxEvent.getType()})` }
                         { submitLogsButton }
                     </span>
diff --git a/src/components/views/messages/UnknownBody.js b/src/components/views/messages/UnknownBody.tsx
similarity index 72%
rename from src/components/views/messages/UnknownBody.js
rename to src/components/views/messages/UnknownBody.tsx
index 786facc340..b09afa54e9 100644
--- a/src/components/views/messages/UnknownBody.js
+++ b/src/components/views/messages/UnknownBody.tsx
@@ -15,13 +15,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {forwardRef} from "react";
+import React, { forwardRef } from "react";
+import { MatrixEvent } from "matrix-js-sdk/src";
 
-export default forwardRef(({mxEvent}, ref) => {
+interface IProps {
+    mxEvent: MatrixEvent;
+    children?: React.ReactNode;
+}
+
+export default forwardRef(({ mxEvent, children }: IProps, ref: React.RefObject<HTMLSpanElement>) => {
     const text = mxEvent.getContent().body;
     return (
         <span className="mx_UnknownBody" ref={ref}>
             { text }
+            { children }
         </span>
     );
 });
diff --git a/src/components/views/messages/ViewSourceEvent.js b/src/components/views/messages/ViewSourceEvent.tsx
similarity index 76%
rename from src/components/views/messages/ViewSourceEvent.js
rename to src/components/views/messages/ViewSourceEvent.tsx
index 2ec567c5ad..488f8de5df 100644
--- a/src/components/views/messages/ViewSourceEvent.js
+++ b/src/components/views/messages/ViewSourceEvent.tsx
@@ -15,18 +15,21 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { MatrixEvent } from 'matrix-js-sdk/src';
 import classNames from 'classnames';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
-@replaceableComponent("views.messages.ViewSourceEvent")
-export default class ViewSourceEvent extends React.PureComponent {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
-    };
+interface IProps {
+    mxEvent: MatrixEvent;
+}
 
+interface IState {
+    expanded: boolean;
+}
+
+@replaceableComponent("views.messages.ViewSourceEvent")
+export default class ViewSourceEvent extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);
 
@@ -35,8 +38,8 @@ export default class ViewSourceEvent extends React.PureComponent {
         };
     }
 
-    componentDidMount() {
-        const {mxEvent} = this.props;
+    public componentDidMount(): void {
+        const { mxEvent } = this.props;
 
         const client = MatrixClientPeg.get();
         client.decryptEventIfNeeded(mxEvent);
@@ -46,23 +49,23 @@ export default class ViewSourceEvent extends React.PureComponent {
         }
     }
 
-    onToggle = (ev) => {
+    private onToggle = (ev: React.MouseEvent) => {
         ev.preventDefault();
         const { expanded } = this.state;
         this.setState({
             expanded: !expanded,
         });
-    }
+    };
 
-    render() {
+    public render(): React.ReactNode {
         const { mxEvent } = this.props;
         const { expanded } = this.state;
 
         let content;
         if (expanded) {
-            content = <pre>{JSON.stringify(mxEvent, null, 4)}</pre>;
+            content = <pre>{ JSON.stringify(mxEvent, null, 4) }</pre>;
         } else {
-            content = <code>{`{ "type": ${mxEvent.getType()} }`}</code>;
+            content = <code>{ `{ "type": ${mxEvent.getType()} }` }</code>;
         }
 
         const classes = classNames("mx_ViewSourceEvent mx_EventTile_content", {
@@ -70,7 +73,7 @@ export default class ViewSourceEvent extends React.PureComponent {
         });
 
         return <span className={classes}>
-            {content}
+            { content }
             <a
                 className="mx_ViewSourceEvent_toggle"
                 href="#"
diff --git a/src/components/views/right_panel/BaseCard.tsx b/src/components/views/right_panel/BaseCard.tsx
index 09973809de..54bf6e769c 100644
--- a/src/components/views/right_panel/BaseCard.tsx
+++ b/src/components/views/right_panel/BaseCard.tsx
@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactNode} from 'react';
+import React, { ReactNode } from 'react';
 import classNames from 'classnames';
 
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
-import {Action} from "../../../dispatcher/actions";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { Action } from "../../../dispatcher/actions";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
 
 interface IProps {
     header?: ReactNode;
@@ -43,8 +43,8 @@ interface IGroupProps {
 
 export const Group: React.FC<IGroupProps> = ({ className, title, children }) => {
     return <div className={classNames("mx_BaseCard_Group", className)}>
-        <h1>{title}</h1>
-        {children}
+        <h1>{ title }</h1>
+        { children }
     </div>;
 };
 
diff --git a/src/components/views/right_panel/EncryptionInfo.tsx b/src/components/views/right_panel/EncryptionInfo.tsx
index aa51965ac6..34aeb8b88a 100644
--- a/src/components/views/right_panel/EncryptionInfo.tsx
+++ b/src/components/views/right_panel/EncryptionInfo.tsx
@@ -16,12 +16,13 @@ limitations under the License.
 
 import React from "react";
 
-import * as sdk from "../../../index";
-import {_t} from "../../../languageHandler";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { _t } from "../../../languageHandler";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { User } from "matrix-js-sdk/src/models/user";
+import AccessibleButton from "../elements/AccessibleButton";
+import Spinner from "../elements/Spinner";
 
-export const PendingActionSpinner = ({text}) => {
-    const Spinner = sdk.getComponent('elements.Spinner');
+export const PendingActionSpinner = ({ text }) => {
     return <div className="mx_EncryptionInfo_spinner">
         <Spinner />
         { text }
@@ -31,7 +32,7 @@ export const PendingActionSpinner = ({text}) => {
 interface IProps {
     waitingForOtherParty: boolean;
     waitingForNetwork: boolean;
-    member: RoomMember;
+    member: RoomMember | User;
     onStartVerification: () => Promise<void>;
     isRoomEncrypted: boolean;
     inDialog: boolean;
@@ -55,7 +56,7 @@ const EncryptionInfo: React.FC<IProps> = ({
                 text = _t("Accept on your other login…");
             } else {
                 text = _t("Waiting for %(displayName)s to accept…", {
-                    displayName: member.displayName || member.name || member.userId,
+                    displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
                 });
             }
         } else {
@@ -63,10 +64,9 @@ const EncryptionInfo: React.FC<IProps> = ({
         }
         content = <PendingActionSpinner text={text} />;
     } else {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         content = (
             <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={onStartVerification}>
-                {_t("Start Verification")}
+                { _t("Start Verification") }
             </AccessibleButton>
         );
     }
@@ -75,17 +75,17 @@ const EncryptionInfo: React.FC<IProps> = ({
     if (isRoomEncrypted) {
         description = (
             <div>
-                <p>{_t("Messages in this room are end-to-end encrypted.")}</p>
-                <p>{_t("Your messages are secured and only you and the recipient have " +
-                    "the unique keys to unlock them.")}</p>
+                <p>{ _t("Messages in this room are end-to-end encrypted.") }</p>
+                <p>{ _t("Your messages are secured and only you and the recipient have " +
+                    "the unique keys to unlock them.") }</p>
             </div>
         );
     } else {
         description = (
             <div>
-                <p>{_t("Messages in this room are not end-to-end encrypted.")}</p>
-                <p>{_t("In encrypted rooms, your messages are secured and only you and the recipient have " +
-                    "the unique keys to unlock them.")}</p>
+                <p>{ _t("Messages in this room are not end-to-end encrypted.") }</p>
+                <p>{ _t("In encrypted rooms, your messages are secured and only you and the recipient have " +
+                    "the unique keys to unlock them.") }</p>
             </div>
         );
     }
@@ -96,14 +96,14 @@ const EncryptionInfo: React.FC<IProps> = ({
 
     return <React.Fragment>
         <div className="mx_UserInfo_container">
-            <h3>{_t("Encryption")}</h3>
+            <h3>{ _t("Encryption") }</h3>
             { description }
         </div>
         <div className="mx_UserInfo_container">
-            <h3>{_t("Verify User")}</h3>
+            <h3>{ _t("Verify User") }</h3>
             <div>
-                <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
-                <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
+                <p>{ _t("For extra security, verify this user by checking a one-time code on both of your devices.") }</p>
+                <p>{ _t("To be secure, do this in person or use a trusted way to communicate.") }</p>
                 { content }
             </div>
         </div>
diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx
index c237a4ade6..8beb089b38 100644
--- a/src/components/views/right_panel/EncryptionPanel.tsx
+++ b/src/components/views/right_panel/EncryptionPanel.tsx
@@ -14,33 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useEffect, useState} from "react";
+import React, { useCallback, useEffect, useState } from "react";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { User } from "matrix-js-sdk/src/models/user";
+import { PHASE_REQUESTED, PHASE_UNSENT } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {ensureDMExists} from "../../../createRoom";
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { ensureDMExists } from "../../../createRoom";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import Modal from "../../../Modal";
-import {PHASE_REQUESTED, PHASE_UNSENT} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import * as sdk from "../../../index";
-import {_t} from "../../../languageHandler";
-import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import { Action } from "../../../dispatcher/actions";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
 
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
 interface IProps {
-    member: RoomMember;
+    member: RoomMember | User;
     onClose: () => void;
     verificationRequest: VerificationRequest;
-    verificationRequestPromise: Promise<VerificationRequest>;
+    verificationRequestPromise?: Promise<VerificationRequest>;
     layout: string;
-    inDialog: boolean;
     isRoomEncrypted: boolean;
 }
 
@@ -57,7 +57,7 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
     // state to show a spinner immediately after clicking "start verification",
     // before we have a request
     const [isRequesting, setRequesting] = useState(false);
-    const [phase, setPhase] = useState(request && request.phase);
+    const [phase, setPhase] = useState(request?.phase);
     useEffect(() => {
         setRequest(verificationRequest);
         if (verificationRequest) {
@@ -81,17 +81,18 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {
+            // FIXME: Using an import will result in test failures
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog("Verification failed", "insecure", ErrorDialog, {
                 headerImage: require("../../../../res/img/e2e/warning.svg"),
                 title: _t("Your messages are not secure"),
                 description: <div>
-                    {_t("One of the following may be compromised:")}
+                    { _t("One of the following may be compromised:") }
                     <ul>
-                        <li>{_t("Your homeserver")}</li>
-                        <li>{_t("The homeserver the user you’re verifying is connected to")}</li>
-                        <li>{_t("Yours, or the other users’ internet connection")}</li>
-                        <li>{_t("Yours, or the other users’ session")}</li>
+                        <li>{ _t("Your homeserver") }</li>
+                        <li>{ _t("The homeserver the user you’re verifying is connected to") }</li>
+                        <li>{ _t("Yours, or the other users’ internet connection") }</li>
+                        <li>{ _t("Yours, or the other users’ session") }</li>
                     </ul>
                 </div>,
                 onFinished: onClose,
diff --git a/src/components/views/right_panel/GroupHeaderButtons.tsx b/src/components/views/right_panel/GroupHeaderButtons.tsx
index 3c93cf6470..132a76e891 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.tsx
+++ b/src/components/views/right_panel/GroupHeaderButtons.tsx
@@ -48,7 +48,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
     protected onAction(payload: ActionPayload) {
         if (payload.action === Action.ViewUser) {
             if ((payload as ViewUserPayload).member) {
-                this.setPhase(RightPanelPhases.RoomMemberInfo, {member: payload.member});
+                this.setPhase(RightPanelPhases.RoomMemberInfo, { member: payload.member });
             } else {
                 this.setPhase(RightPanelPhases.GroupMemberList);
             }
@@ -57,14 +57,14 @@ export default class GroupHeaderButtons extends HeaderButtons {
         } else if (payload.action === "view_group_room") {
             this.setPhase(
                 RightPanelPhases.GroupRoomInfo,
-                {groupRoomId: payload.groupRoomId, groupId: payload.groupId},
+                { groupRoomId: payload.groupRoomId, groupId: payload.groupId },
             );
         } else if (payload.action === "view_group_room_list") {
             this.setPhase(RightPanelPhases.GroupRoomList);
         } else if (payload.action === "view_group_member_list") {
             this.setPhase(RightPanelPhases.GroupMemberList);
         } else if (payload.action === "view_group_user") {
-            this.setPhase(RightPanelPhases.GroupMemberInfo, {member: payload.member});
+            this.setPhase(RightPanelPhases.GroupMemberInfo, { member: payload.member });
         }
     }
 
diff --git a/src/components/views/right_panel/HeaderButton.tsx b/src/components/views/right_panel/HeaderButton.tsx
index cdf4f44e06..1625db3f55 100644
--- a/src/components/views/right_panel/HeaderButton.tsx
+++ b/src/components/views/right_panel/HeaderButton.tsx
@@ -48,7 +48,7 @@ export default class HeaderButton extends React.Component<IProps> {
 
     public render() {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const {isHighlighted, onClick, analytics, name, title, ...props} = this.props;
+        const { isHighlighted, onClick, analytics, name, title, ...props } = this.props;
 
         const classes = classNames({
             mx_RightPanel_headerButton: true,
diff --git a/src/components/views/right_panel/HeaderButtons.tsx b/src/components/views/right_panel/HeaderButtons.tsx
index 6d44a081d9..8d000a29fc 100644
--- a/src/components/views/right_panel/HeaderButtons.tsx
+++ b/src/components/views/right_panel/HeaderButtons.tsx
@@ -88,9 +88,9 @@ export default abstract class HeaderButtons<P = {}> extends React.Component<IPro
     private onRightPanelUpdate() {
         const rps = RightPanelStore.getSharedInstance();
         if (this.state.headerKind === HeaderKind.Room) {
-            this.setState({phase: rps.visibleRoomPanelPhase});
+            this.setState({ phase: rps.visibleRoomPanelPhase });
         } else if (this.state.headerKind === HeaderKind.Group) {
-            this.setState({phase: rps.visibleGroupPanelPhase});
+            this.setState({ phase: rps.visibleGroupPanelPhase });
         }
     }
 
@@ -99,7 +99,7 @@ export default abstract class HeaderButtons<P = {}> extends React.Component<IPro
 
     public render() {
         return <div className="mx_HeaderButtons">
-            {this.renderButtons()}
+            { this.renderButtons() }
         </div>;
     }
 }
diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx
index a3f1f2d9df..c82e5a3f80 100644
--- a/src/components/views/right_panel/PinnedMessagesCard.tsx
+++ b/src/components/views/right_panel/PinnedMessagesCard.tsx
@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useContext, useEffect, useState} from "react";
+import React, { useCallback, useContext, useEffect, useState } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { RoomState } from "matrix-js-sdk/src/models/room-state";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventType } from 'matrix-js-sdk/src/@types/event';
 
@@ -28,6 +27,7 @@ import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import PinningUtils from "../../../utils/PinningUtils";
 import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
 import PinnedEventTile from "../rooms/PinnedEventTile";
+import { useRoomState } from "../../../hooks/useRoomState";
 
 interface IProps {
     room: Room;
@@ -75,24 +75,6 @@ export const useReadPinnedEvents = (room: Room): Set<string> => {
     return readPinnedEvents;
 };
 
-const useRoomState = <T extends any>(room: Room, mapper: (state: RoomState) => T): T => {
-    const [value, setValue] = useState<T>(room ? mapper(room.currentState) : undefined);
-
-    const update = useCallback(() => {
-        if (!room) return;
-        setValue(mapper(room.currentState));
-    }, [room, mapper]);
-
-    useEventEmitter(room?.currentState, "RoomState.events", update);
-    useEffect(() => {
-        update();
-        return () => {
-            setValue(undefined);
-        };
-    }, [update]);
-    return value;
-};
-
 const PinnedMessagesCard = ({ room, onClose }: IProps) => {
     const cli = useContext(MatrixClientContext);
     const canUnpin = useRoomState(room, state => state.mayClientSendStateEvent(EventType.RoomPinnedEvents, cli));
@@ -155,12 +137,24 @@ const PinnedMessagesCard = ({ room, onClose }: IProps) => {
 
         // show them in reverse, with latest pinned at the top
         content = pinnedEvents.filter(Boolean).reverse().map(ev => (
-            <PinnedEventTile key={ev.getId()} room={room} event={ev} onUnpinClicked={onUnpinClicked} />
+            <PinnedEventTile key={ev.getId()} room={room} event={ev} onUnpinClicked={() => onUnpinClicked(ev)} />
         ));
     } else {
-        content = <div className="mx_RightPanel_empty mx_PinnedMessagesCard_empty">
-            <h2>{_t("You’re all caught up")}</h2>
-            <p>{_t("You have no visible notifications.")}</p>
+        content = <div className="mx_PinnedMessagesCard_empty">
+            <div>
+                { /* XXX: We reuse the classes for simplicity, but deliberately not the components for non-interactivity. */ }
+                <div className="mx_PinnedMessagesCard_MessageActionBar">
+                    <div className="mx_MessageActionBar_maskButton mx_MessageActionBar_reactButton" />
+                    <div className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton" />
+                    <div className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton" />
+                </div>
+
+                <h2>{ _t("Nothing pinned, yet") }</h2>
+                { _t("If you have permissions, open the menu on any message and select " +
+                    "<b>Pin</b> to stick them here.", {}, {
+                    b: sub => <b>{ sub }</b>,
+                }) }
+            </div>
         </div>;
     }
 
diff --git a/src/components/views/right_panel/RoomHeaderButtons.tsx b/src/components/views/right_panel/RoomHeaderButtons.tsx
index 54e18e4529..4d256bf4f4 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.tsx
+++ b/src/components/views/right_panel/RoomHeaderButtons.tsx
@@ -77,13 +77,13 @@ export default class RoomHeaderButtons extends HeaderButtons<IProps> {
     protected onAction(payload: ActionPayload) {
         if (payload.action === Action.ViewUser) {
             if (payload.member) {
-                this.setPhase(RightPanelPhases.RoomMemberInfo, {member: payload.member});
+                this.setPhase(RightPanelPhases.RoomMemberInfo, { member: payload.member });
             } else {
                 this.setPhase(RightPanelPhases.RoomMemberList);
             }
         } else if (payload.action === "view_3pid_invite") {
             if (payload.event) {
-                this.setPhase(RightPanelPhases.Room3pidMemberInfo, {event: payload.event});
+                this.setPhase(RightPanelPhases.Room3pidMemberInfo, { event: payload.event });
             } else {
                 this.setPhase(RightPanelPhases.RoomMemberList);
             }
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 937037f644..1fe556dde2 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useState, useEffect, useContext} from "react";
+import React, { useCallback, useState, useEffect, useContext } from "react";
 import classNames from "classnames";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useIsEncrypted } from '../../../hooks/useIsEncrypted';
@@ -25,28 +25,29 @@ import { _t } from '../../../languageHandler';
 import RoomAvatar from "../avatars/RoomAvatar";
 import AccessibleButton from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
-import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { Action } from "../../../dispatcher/actions";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
 import Modal from "../../../Modal";
 import ShareDialog from '../dialogs/ShareDialog';
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import WidgetUtils from "../../../utils/WidgetUtils";
-import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
+import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import WidgetAvatar from "../avatars/WidgetAvatar";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import WidgetStore, {IApp} from "../../../stores/WidgetStore";
+import WidgetStore, { IApp } from "../../../stores/WidgetStore";
 import { E2EStatus } from "../../../utils/ShieldUtils";
 import RoomContext from "../../../contexts/RoomContext";
-import {UIFeature} from "../../../settings/UIFeature";
-import {ChevronFace, ContextMenuTooltipButton, useContextMenu} from "../../structures/ContextMenu";
+import { UIFeature } from "../../../settings/UIFeature";
+import { ChevronFace, ContextMenuTooltipButton, useContextMenu } from "../../structures/ContextMenu";
 import WidgetContextMenu from "../context_menus/WidgetContextMenu";
-import {useRoomMemberCount} from "../../../hooks/useRoomMembers";
+import { useRoomMemberCount } from "../../../hooks/useRoomMembers";
 import { Container, MAX_PINNED, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import RoomName from "../elements/RoomName";
 import UIStore from "../../../stores/UIStore";
+import ExportDialog from "../dialogs/ExportDialog";
 
 interface IProps {
     room: Room;
@@ -148,7 +149,7 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
             yOffset={-48}
         >
             <WidgetAvatar app={app} />
-            <span>{name}</span>
+            <span>{ name }</span>
             { subtitle }
         </AccessibleTooltipButton>
 
@@ -220,6 +221,13 @@ const onRoomFilesClick = () => {
     });
 };
 
+const onRoomThreadsClick = () => {
+    defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.ThreadPanel,
+    });
+};
+
 const onRoomSettingsClick = () => {
     defaultDispatcher.dispatch({ action: "open_room_settings" });
 };
@@ -233,6 +241,12 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
         });
     };
 
+    const onRoomExportClick = async () => {
+        Modal.createTrackedDialog('export room dialog', '', ExportDialog, {
+            room,
+        });
+    };
+
     const isRoomEncrypted = useIsEncrypted(cli, room);
     const roomContext = useContext(RoomContext);
     const e2eStatus = roomContext.e2eStatus;
@@ -256,7 +270,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
                 <h2 title={name}>
                     { name }
                 </h2>
-            )}
+            ) }
         </RoomName>
         <div className="mx_RoomSummaryCard_alias" title={alias}>
             { alias }
@@ -268,16 +282,24 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
     return <BaseCard header={header} className="mx_RoomSummaryCard" onClose={onClose}>
         <Group title={_t("About")} className="mx_RoomSummaryCard_aboutGroup">
             <Button className="mx_RoomSummaryCard_icon_people" onClick={onRoomMembersClick}>
-                {_t("%(count)s people", { count: memberCount })}
+                { _t("%(count)s people", { count: memberCount }) }
             </Button>
             <Button className="mx_RoomSummaryCard_icon_files" onClick={onRoomFilesClick}>
-                {_t("Show files")}
+                { _t("Show files") }
             </Button>
+            <Button className="mx_RoomSummaryCard_icon_export" onClick={onRoomExportClick}>
+                { _t("Export chat") }
+            </Button>
+            { SettingsStore.getValue("feature_thread") && (
+                <Button className="mx_RoomSummaryCard_icon_threads" onClick={onRoomThreadsClick}>
+                    { _t("Show threads") }
+                </Button>
+            ) }
             <Button className="mx_RoomSummaryCard_icon_share" onClick={onShareRoomClick}>
-                {_t("Share room")}
+                { _t("Share room") }
             </Button>
             <Button className="mx_RoomSummaryCard_icon_settings" onClick={onRoomSettingsClick}>
-                {_t("Room settings")}
+                { _t("Room settings") }
             </Button>
         </Group>
 
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index d6c97f9cf2..3ac4088182 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -38,7 +38,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import RoomViewStore from "../../../stores/RoomViewStore";
 import MultiInviter from "../../../utils/MultiInviter";
 import GroupStore from "../../../stores/GroupStore";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import E2EIcon from "../rooms/E2EIcon";
 import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import { textualPowerLevel } from '../../../Roles';
@@ -48,7 +48,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 { UserTab } from "../dialogs/UserSettingsDialog";
 import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
 import BaseCard from "./BaseCard";
 import { E2EStatus } from "../../../utils/ShieldUtils";
@@ -68,6 +68,10 @@ import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
 import { mediaFromMxc } from "../../../customisations/Media";
 import UIStore from "../../../stores/UIStore";
+import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
+import SpaceStore from "../../../stores/SpaceStore";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 export interface IDevice {
     deviceId: string;
@@ -146,7 +150,7 @@ async function openDMForUser(matrixClient: MatrixClient, userId: string) {
 
 type SetUpdating = (updating: boolean) => void;
 
-function useHasCrossSigningKeys(cli: MatrixClient, member: RoomMember, canVerify: boolean, setUpdating: SetUpdating) {
+function useHasCrossSigningKeys(cli: MatrixClient, member: User, canVerify: boolean, setUpdating: SetUpdating) {
     return useAsyncMemo(async () => {
         if (!canVerify) {
             return undefined;
@@ -163,7 +167,7 @@ function useHasCrossSigningKeys(cli: MatrixClient, member: RoomMember, canVerify
     }, [cli, member, canVerify], undefined);
 }
 
-function DeviceItem({userId, device}: {userId: string, device: IDevice}) {
+function DeviceItem({ userId, device }: {userId: string, device: IDevice}) {
     const cli = useContext(MatrixClientContext);
     const isMe = userId === cli.getUserId();
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
@@ -201,13 +205,12 @@ function DeviceItem({userId, device}: {userId: string, device: IDevice}) {
     let trustedLabel = null;
     if (userTrust.isVerified()) trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
 
-
     if (isVerified) {
         return (
-            <div className={classes} title={device.deviceId} >
+            <div className={classes} title={device.deviceId}>
                 <div className={iconClasses} />
-                <div className="mx_UserInfo_device_name">{deviceName}</div>
-                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+                <div className="mx_UserInfo_device_name">{ deviceName }</div>
+                <div className="mx_UserInfo_device_trusted">{ trustedLabel }</div>
             </div>
         );
     } else {
@@ -218,14 +221,14 @@ function DeviceItem({userId, device}: {userId: string, device: IDevice}) {
                 onClick={onDeviceClick}
             >
                 <div className={iconClasses} />
-                <div className="mx_UserInfo_device_name">{deviceName}</div>
-                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+                <div className="mx_UserInfo_device_name">{ deviceName }</div>
+                <div className="mx_UserInfo_device_trusted">{ trustedLabel }</div>
             </AccessibleButton>
         );
     }
 }
 
-function DevicesSection({devices, userId, loading}: {devices: IDevice[], userId: string, loading: boolean}) {
+function DevicesSection({ devices, userId, loading }: {devices: IDevice[], userId: string, loading: boolean}) {
     const cli = useContext(MatrixClientContext);
     const userTrust = cli.checkUserTrust(userId);
 
@@ -236,7 +239,7 @@ function DevicesSection({devices, userId, loading}: {devices: IDevice[], userId:
         return <Spinner />;
     }
     if (devices === null) {
-        return <>{_t("Unable to load session list")}</>;
+        return <>{ _t("Unable to load session list") }</>;
     }
     const isMe = userId === cli.getUserId();
     const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));
@@ -265,12 +268,12 @@ function DevicesSection({devices, userId, loading}: {devices: IDevice[], userId:
                 unverifiedDevices.push(device);
             }
         }
-        expandCountCaption = _t("%(count)s verified sessions", {count: expandSectionDevices.length});
+        expandCountCaption = _t("%(count)s verified sessions", { count: expandSectionDevices.length });
         expandHideCaption = _t("Hide verified sessions");
         expandIconClasses += " mx_E2EIcon_verified";
     } else {
         expandSectionDevices = devices;
-        expandCountCaption = _t("%(count)s sessions", {count: devices.length});
+        expandCountCaption = _t("%(count)s sessions", { count: devices.length });
         expandHideCaption = _t("Hide sessions");
         expandIconClasses += " mx_E2EIcon_normal";
     }
@@ -281,14 +284,14 @@ function DevicesSection({devices, userId, loading}: {devices: IDevice[], userId:
             expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton"
                 onClick={() => setExpanded(false)}
             >
-                <div>{expandHideCaption}</div>
+                <div>{ expandHideCaption }</div>
             </AccessibleButton>);
         } else {
             expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton"
                 onClick={() => setExpanded(true)}
             >
                 <div className={expandIconClasses} />
-                <div>{expandCountCaption}</div>
+                <div>{ expandCountCaption }</div>
             </AccessibleButton>);
         }
     }
@@ -305,8 +308,8 @@ function DevicesSection({devices, userId, loading}: {devices: IDevice[], userId:
 
     return (
         <div className="mx_UserInfo_devices">
-            <div>{deviceList}</div>
-            <div>{expandButton}</div>
+            <div>{ deviceList }</div>
+            <div>{ expandButton }</div>
         </div>
     );
 }
@@ -316,7 +319,7 @@ const UserOptionsSection: React.FC<{
     isIgnored: boolean;
     canInvite: boolean;
     isSpace?: boolean;
-}> = ({member, isIgnored, canInvite, isSpace}) => {
+}> = ({ member, isIgnored, canInvite, isSpace }) => {
     const cli = useContext(MatrixClientContext);
 
     let ignoreButton = null;
@@ -350,7 +353,7 @@ const UserOptionsSection: React.FC<{
         ignoreButton = (
             <AccessibleButton
                 onClick={onIgnoreToggle}
-                className={classNames("mx_UserInfo_field", {mx_UserInfo_destructive: !isIgnored})}
+                className={classNames("mx_UserInfo_field", { mx_UserInfo_destructive: !isIgnored })}
             >
                 { isIgnored ? _t("Unignore") : _t("Ignore") }
             </AccessibleButton>
@@ -368,9 +371,9 @@ const UserOptionsSection: React.FC<{
             };
 
             const onInsertPillButton = function() {
-                dis.dispatch({
-                    action: 'insert_mention',
-                    user_id: member.userId,
+                dis.dispatch<ComposerInsertPayload>({
+                    action: Action.ComposerInsert,
+                    userId: member.userId,
                 });
             };
 
@@ -384,7 +387,7 @@ const UserOptionsSection: React.FC<{
             }
 
             insertPillButton = (
-                <AccessibleButton onClick={onInsertPillButton} className={"mx_UserInfo_field"}>
+                <AccessibleButton onClick={onInsertPillButton} className="mx_UserInfo_field">
                     { _t('Mention') }
                 </AccessibleButton>
             );
@@ -427,8 +430,8 @@ const UserOptionsSection: React.FC<{
     let directMessageButton;
     if (!isMe) {
         directMessageButton = (
-            <AccessibleButton onClick={() => openDMForUser(cli, member.userId)} className="mx_UserInfo_field">
-                { _t('Direct message') }
+            <AccessibleButton onClick={() => { openDMForUser(cli, member.userId); }} className="mx_UserInfo_field">
+                { _t("Message") }
             </AccessibleButton>
         );
     }
@@ -449,7 +452,7 @@ const UserOptionsSection: React.FC<{
 };
 
 const warnSelfDemote = async (isSpace: boolean) => {
-    const {finished} = Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
+    const { finished } = Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
         title: _t("Demote yourself?"),
         description:
             <div>
@@ -468,7 +471,7 @@ const warnSelfDemote = async (isSpace: boolean) => {
     return confirmed;
 };
 
-const GenericAdminToolsContainer: React.FC<{}> = ({children}) => {
+const GenericAdminToolsContainer: React.FC<{}> = ({ children }) => {
     return (
         <div className="mx_UserInfo_container">
             <h3>{ _t("Admin Tools") }</h3>
@@ -502,19 +505,15 @@ const isMuted = (member: RoomMember, powerLevelContent: IPowerLevelsContent) =>
     return member.powerLevel < levelToSend;
 };
 
+const getPowerLevels = room => room?.currentState?.getStateEvents(EventType.RoomPowerLevels, "")?.getContent() || {};
+
 export const useRoomPowerLevels = (cli: MatrixClient, room: Room) => {
-    const [powerLevels, setPowerLevels] = useState<IPowerLevelsContent>({});
+    const [powerLevels, setPowerLevels] = useState<IPowerLevelsContent>(getPowerLevels(room));
 
     const update = useCallback((ev?: MatrixEvent) => {
         if (!room) return;
         if (ev && ev.getType() !== EventType.RoomPowerLevels) return;
-
-        const event = room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
-        if (event) {
-            setPowerLevels(event.getContent());
-        } else {
-            setPowerLevels({});
-        }
+        setPowerLevels(getPowerLevels(room));
     }, [room]);
 
     useEventEmitter(cli, "RoomState.events", update);
@@ -533,14 +532,14 @@ interface IBaseProps {
     stopUpdating(): void;
 }
 
-const RoomKickButton: React.FC<IBaseProps> = ({member, startUpdating, stopUpdating}) => {
+const RoomKickButton: React.FC<IBaseProps> = ({ member, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
     // check if user can be kicked/disinvited
     if (member.membership !== "invite" && member.membership !== "join") return null;
 
     const onKick = async () => {
-        const {finished} = Modal.createTrackedDialog(
+        const { finished } = Modal.createTrackedDialog(
             'Confirm User Action Dialog',
             'onKick',
             ConfirmUserActionDialog,
@@ -560,7 +559,7 @@ const RoomKickButton: React.FC<IBaseProps> = ({member, startUpdating, stopUpdati
         cli.kick(member.roomId, member.userId, reason || undefined).then(() => {
             // NO-OP; rely on the m.room.member event coming down else we could
             // get out of sync if we force setState here!
-            console.log("Kick success");
+            logger.log("Kick success");
         }, function(err) {
             console.error("Kick error: " + err);
             Modal.createTrackedDialog('Failed to kick', '', ErrorDialog, {
@@ -578,11 +577,11 @@ const RoomKickButton: React.FC<IBaseProps> = ({member, startUpdating, stopUpdati
     </AccessibleButton>;
 };
 
-const RedactMessagesButton: React.FC<IBaseProps> = ({member}) => {
+const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
     const cli = useContext(MatrixClientContext);
 
     const onRedactAllMessages = async () => {
-        const {roomId, userId} = member;
+        const { roomId, userId } = member;
         const room = cli.getRoom(roomId);
         if (!room) {
             return;
@@ -610,23 +609,23 @@ const RedactMessagesButton: React.FC<IBaseProps> = ({member}) => {
 
         if (count === 0) {
             Modal.createTrackedDialog('No user messages found to remove', '', InfoDialog, {
-                title: _t("No recent messages by %(user)s found", {user}),
+                title: _t("No recent messages by %(user)s found", { user }),
                 description:
                     <div>
                         <p>{ _t("Try scrolling up in the timeline to see if there are any earlier ones.") }</p>
                     </div>,
             });
         } else {
-            const {finished} = Modal.createTrackedDialog('Remove recent messages by user', '', QuestionDialog, {
-                title: _t("Remove recent messages by %(user)s", {user}),
+            const { finished } = Modal.createTrackedDialog('Remove recent messages by user', '', QuestionDialog, {
+                title: _t("Remove recent messages by %(user)s", { user }),
                 description:
                     <div>
                         <p>{ _t("You are about to remove %(count)s messages by %(user)s. " +
-                            "This cannot be undone. Do you wish to continue?", {count, user}) }</p>
+                            "This cannot be undone. Do you wish to continue?", { count, user }) }</p>
                         <p>{ _t("For a large amount of messages, this might take some time. " +
                             "Please don't refresh your client in the meantime.") }</p>
                     </div>,
-                button: _t("Remove %(count)s messages", {count}),
+                button: _t("Remove %(count)s messages", { count }),
             });
 
             const [confirmed] = await finished;
@@ -657,11 +656,11 @@ const RedactMessagesButton: React.FC<IBaseProps> = ({member}) => {
     </AccessibleButton>;
 };
 
-const BanToggleButton: React.FC<IBaseProps> = ({member, startUpdating, stopUpdating}) => {
+const BanToggleButton: React.FC<IBaseProps> = ({ member, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
     const onBanOrUnban = async () => {
-        const {finished} = Modal.createTrackedDialog(
+        const { finished } = Modal.createTrackedDialog(
             'Confirm User Action Dialog',
             'onBanOrUnban',
             ConfirmUserActionDialog,
@@ -687,7 +686,7 @@ const BanToggleButton: React.FC<IBaseProps> = ({member, startUpdating, stopUpdat
         promise.then(() => {
             // NO-OP; rely on the m.room.member event coming down else we could
             // get out of sync if we force setState here!
-            console.log("Ban success");
+            logger.log("Ban success");
         }, function(err) {
             console.error("Ban error: " + err);
             Modal.createTrackedDialog('Failed to ban user', '', ErrorDialog, {
@@ -718,7 +717,7 @@ interface IBaseRoomProps extends IBaseProps {
     powerLevels: IPowerLevelsContent;
 }
 
-const MuteToggleButton: React.FC<IBaseRoomProps> = ({member, room, powerLevels, startUpdating, stopUpdating}) => {
+const MuteToggleButton: React.FC<IBaseRoomProps> = ({ member, room, powerLevels, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
     // Don't show the mute/unmute option if the user is not in the room
@@ -732,7 +731,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(SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom()))) return;
+                if (!(await warnSelfDemote(SpaceStore.spacesEnabled && room?.isSpaceRoom()))) return;
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
                 return;
@@ -760,7 +759,7 @@ const MuteToggleButton: React.FC<IBaseRoomProps> = ({member, room, powerLevels,
             cli.setPowerLevel(roomId, target, level, powerLevelEvent).then(() => {
                 // NO-OP; rely on the m.room.member event coming down else we could
                 // get out of sync if we force setState here!
-                console.log("Mute toggle success");
+                logger.log("Mute toggle success");
             }, function(err) {
                 console.error("Mute error: " + err);
                 Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, {
@@ -821,7 +820,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     if (canAffectUser && me.powerLevel >= kickPowerLevel) {
         kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
-    if (me.powerLevel >= redactPowerLevel && (!SettingsStore.getValue("feature_spaces") || !room.isSpaceRoom())) {
+    if (me.powerLevel >= redactPowerLevel && (!SpaceStore.spacesEnabled || !room.isSpaceRoom())) {
         redactButton = (
             <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
         );
@@ -829,7 +828,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     if (canAffectUser && me.powerLevel >= banPowerLevel) {
         banButton = <BanToggleButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
-    if (canAffectUser && me.powerLevel >= editPowerLevel) {
+    if (canAffectUser && me.powerLevel >= editPowerLevel && !room.isSpaceRoom()) {
         muteButton = (
             <MuteToggleButton
                 member={member}
@@ -854,7 +853,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     return <div />;
 };
 
-interface GroupMember {
+export interface GroupMember {
     userId: string;
     displayname?: string; // XXX: GroupMember objects are inconsistent :((
     avatarUrl?: string;
@@ -865,7 +864,7 @@ const GroupAdminToolsSection: React.FC<{
     groupMember: GroupMember;
     startUpdating(): void;
     stopUpdating(): void;
-}> = ({children, groupId, groupMember, startUpdating, stopUpdating}) => {
+}> = ({ children, groupId, groupMember, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
     const [isPrivileged, setIsPrivileged] = useState(false);
@@ -894,7 +893,7 @@ const GroupAdminToolsSection: React.FC<{
 
     if (isPrivileged) {
         const onKick = async () => {
-            const {finished} = Modal.createDialog(ConfirmUserActionDialog, {
+            const { finished } = Modal.createDialog(ConfirmUserActionDialog, {
                 matrixClient: cli,
                 groupMember,
                 action: isInvited ? _t('Disinvite') : _t('Remove from community'),
@@ -920,7 +919,7 @@ const GroupAdminToolsSection: React.FC<{
                         _t('Failed to withdraw invitation') :
                         _t('Failed to remove user from community'),
                 });
-                console.log(e);
+                logger.log(e);
             }).finally(() => {
                 stopUpdating();
             });
@@ -971,7 +970,7 @@ interface IRoomPermissions {
     canInvite: boolean;
 }
 
-function useRoomPermissions(cli: MatrixClient, room: Room, user: User): IRoomPermissions {
+function useRoomPermissions(cli: MatrixClient, room: Room, user: RoomMember): IRoomPermissions {
     const [roomPermissions, setRoomPermissions] = useState<IRoomPermissions>({
         // modifyLevelMax is the max PL we can set this user to, typically min(their PL, our PL) && canSetPL
         modifyLevelMax: -1,
@@ -1028,35 +1027,34 @@ function useRoomPermissions(cli: MatrixClient, room: Room, user: User): IRoomPer
 }
 
 const PowerLevelSection: React.FC<{
-    user: User;
+    user: RoomMember;
     room: Room;
     roomPermissions: IRoomPermissions;
     powerLevels: IPowerLevelsContent;
-}> = ({user, room, roomPermissions, powerLevels}) => {
+}> = ({ user, room, roomPermissions, powerLevels }) => {
     if (roomPermissions.canEdit) {
         return (<PowerLevelEditor user={user} room={room} roomPermissions={roomPermissions} />);
     } else {
         const powerLevelUsersDefault = powerLevels.users_default || 0;
-        const powerLevel = parseInt(user.powerLevel, 10);
+        const powerLevel = user.powerLevel;
         const role = textualPowerLevel(powerLevel, powerLevelUsersDefault);
         return (
             <div className="mx_UserInfo_profileField">
-                <div className="mx_UserInfo_roleDescription">{role}</div>
+                <div className="mx_UserInfo_roleDescription">{ role }</div>
             </div>
         );
     }
 };
 
 const PowerLevelEditor: React.FC<{
-    user: User;
+    user: RoomMember;
     room: Room;
     roomPermissions: IRoomPermissions;
-}> = ({user, room, roomPermissions}) => {
+}> = ({ user, room, roomPermissions }) => {
     const cli = useContext(MatrixClientContext);
 
-    const [selectedPowerLevel, setSelectedPowerLevel] = useState(parseInt(user.powerLevel, 10));
-    const onPowerChange = useCallback(async (powerLevelStr: string) => {
-        const powerLevel = parseInt(powerLevelStr, 10);
+    const [selectedPowerLevel, setSelectedPowerLevel] = useState(user.powerLevel);
+    const onPowerChange = useCallback(async (powerLevel: number) => {
         setSelectedPowerLevel(powerLevel);
 
         const applyPowerChange = (roomId, target, powerLevel, powerLevelEvent) => {
@@ -1064,7 +1062,7 @@ const PowerLevelEditor: React.FC<{
                 function() {
                     // NO-OP; rely on the m.room.member event coming down else we could
                     // get out of sync if we force setState here!
-                    console.log("Power change success");
+                    logger.log("Power change success");
                 }, function(err) {
                     console.error("Failed to change power level " + err);
                     Modal.createTrackedDialog('Failed to change power level', '', ErrorDialog, {
@@ -1084,7 +1082,7 @@ const PowerLevelEditor: React.FC<{
         const myUserId = cli.getUserId();
         const myPower = powerLevelEvent.getContent().users[myUserId];
         if (myPower && parseInt(myPower) === powerLevel) {
-            const {finished} = Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
+            const { finished } = Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
                 title: _t("Warning!"),
                 description:
                     <div>
@@ -1100,7 +1098,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(SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom()))) return;
+                if (!(await warnSelfDemote(SpaceStore.spacesEnabled && room?.isSpaceRoom()))) return;
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
             }
@@ -1201,7 +1199,7 @@ const BasicUserInfo: React.FC<{
     groupId: string;
     devices: IDevice[];
     isRoomEncrypted: boolean;
-}> = ({room, member, groupId, devices, isRoomEncrypted}) => {
+}> = ({ room, member, groupId, devices, isRoomEncrypted }) => {
     const cli = useContext(MatrixClientContext);
 
     const powerLevels = useRoomPowerLevels(cli, room);
@@ -1231,10 +1229,10 @@ const BasicUserInfo: React.FC<{
         setPendingUpdateCount(pendingUpdateCount - 1);
     }, [pendingUpdateCount]);
 
-    const roomPermissions = useRoomPermissions(cli, room, member);
+    const roomPermissions = useRoomPermissions(cli, room, member as RoomMember);
 
     const onSynapseDeactivate = useCallback(async () => {
-        const {finished} = Modal.createTrackedDialog('Synapse User Deactivation', '', QuestionDialog, {
+        const { finished } = Modal.createTrackedDialog('Synapse User Deactivation', '', QuestionDialog, {
             title: _t("Deactivate user?"),
             description:
                 <div>{ _t(
@@ -1270,17 +1268,33 @@ const BasicUserInfo: React.FC<{
     if (isSynapseAdmin && member.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`)) {
         synapseDeactivateButton = (
             <AccessibleButton onClick={onSynapseDeactivate} className="mx_UserInfo_field mx_UserInfo_destructive">
-                {_t("Deactivate user")}
+                { _t("Deactivate user") }
             </AccessibleButton>
         );
     }
 
+    let memberDetails;
     let adminToolsContainer;
-    if (room && member.roomId) {
+    if (room && (member as RoomMember).roomId) {
+        // hide the Roles section for DMs as it doesn't make sense there
+        if (!DMRoomMap.shared().getUserIdForRoomId((member as RoomMember).roomId)) {
+            memberDetails = <div className="mx_UserInfo_container">
+                <h3>{ _t("Role in <RoomName/>", {}, {
+                    RoomName: () => <b>{ room.name }</b>,
+                }) }</h3>
+                <PowerLevelSection
+                    powerLevels={powerLevels}
+                    user={member as RoomMember}
+                    room={room}
+                    roomPermissions={roomPermissions}
+                />
+            </div>;
+        }
+
         adminToolsContainer = (
             <RoomAdminToolsContainer
                 powerLevels={powerLevels}
-                member={member}
+                member={member as RoomMember}
                 room={room}
                 startUpdating={startUpdating}
                 stopUpdating={stopUpdating}>
@@ -1309,20 +1323,6 @@ const BasicUserInfo: React.FC<{
         spinner = <Spinner />;
     }
 
-    let memberDetails;
-    // hide the Roles section for DMs as it doesn't make sense there
-    if (room && member.roomId && !DMRoomMap.shared().getUserIdForRoomId(member.roomId)) {
-        memberDetails = <div className="mx_UserInfo_container">
-            <h3>{ _t("Role") }</h3>
-            <PowerLevelSection
-                powerLevels={powerLevels}
-                user={member}
-                room={room}
-                roomPermissions={roomPermissions}
-            />
-        </div>;
-    }
-
     // only display the devices list if our client supports E2E
     const cryptoEnabled = cli.isCryptoEnabled();
 
@@ -1330,10 +1330,10 @@ const BasicUserInfo: React.FC<{
     if (!isRoomEncrypted) {
         if (!cryptoEnabled) {
             text = _t("This client does not support end-to-end encryption.");
-        } else if (room && (!SettingsStore.getValue("feature_spaces") || !room.isSpaceRoom())) {
+        } else if (room && (!SpaceStore.spacesEnabled || !room.isSpaceRoom())) {
             text = _t("Messages in this room are not end-to-end encrypted.");
         }
-    } else if (!SettingsStore.getValue("feature_spaces") || !room.isSpaceRoom()) {
+    } else if (!SpaceStore.spacesEnabled || !room.isSpaceRoom()) {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
@@ -1349,22 +1349,24 @@ const BasicUserInfo: React.FC<{
     const setUpdating = (updating) => {
         setPendingUpdateCount(count => count + (updating ? 1 : -1));
     };
-    const hasCrossSigningKeys =
-        useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
+    const hasCrossSigningKeys = useHasCrossSigningKeys(cli, member as User, canVerify, setUpdating);
 
     const showDeviceListSpinner = devices === undefined;
     if (canVerify) {
         if (hasCrossSigningKeys !== undefined) {
             // Note: mx_UserInfo_verifyButton is for the end-to-end tests
             verifyButton = (
-                <AccessibleButton className="mx_UserInfo_field mx_UserInfo_verifyButton" onClick={() => {
-                    if (hasCrossSigningKeys) {
-                        verifyUser(member);
-                    } else {
-                        legacyVerifyUser(member);
-                    }
-                }}>
-                    {_t("Verify")}
+                <AccessibleButton
+                    className="mx_UserInfo_field mx_UserInfo_verifyButton"
+                    onClick={() => {
+                        if (hasCrossSigningKeys) {
+                            verifyUser(member as User);
+                        } else {
+                            legacyVerifyUser(member as User);
+                        }
+                    }}
+                >
+                    { _t("Verify") }
                 </AccessibleButton>
             );
         } else if (!showDeviceListSpinner) {
@@ -1378,15 +1380,18 @@ 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,
-                });
-            }}>
+            <AccessibleButton
+                className="mx_UserInfo_field"
+                onClick={() => {
+                    dis.dispatch({
+                        action: Action.ViewUserSettings,
+                        initialTabId: UserTab.Security,
+                    });
+                }}
+            >
                 { _t("Edit devices") }
             </AccessibleButton>
-        </p>)
+        </p>);
     }
 
     const securitySection = (
@@ -1409,8 +1414,8 @@ const BasicUserInfo: React.FC<{
         <UserOptionsSection
             canInvite={roomPermissions.canInvite}
             isIgnored={isIgnored}
-            member={member}
-            isSpace={SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom()}
+            member={member as RoomMember}
+            isSpace={SpaceStore.spacesEnabled && room?.isSpaceRoom()}
         />
 
         { adminToolsContainer }
@@ -1424,17 +1429,19 @@ type Member = User | RoomMember | GroupMember;
 const UserInfoHeader: React.FC<{
     member: Member;
     e2eStatus: E2EStatus;
-}> = ({member, e2eStatus}) => {
+}> = ({ member, e2eStatus }) => {
     const cli = useContext(MatrixClientContext);
 
     const onMemberAvatarClick = useCallback(() => {
-        const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
+        const avatarUrl = (member as RoomMember).getMxcAvatarUrl
+            ? (member as RoomMember).getMxcAvatarUrl()
+            : (member as User).avatarUrl;
         if (!avatarUrl) return;
 
         const httpUrl = mediaFromMxc(avatarUrl).srcHttp;
         const params = {
             src: httpUrl,
-            name: member.name,
+            name: (member as RoomMember).name || (member as User).displayName,
         };
 
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
@@ -1446,13 +1453,13 @@ const UserInfoHeader: React.FC<{
                 <div>
                     <MemberAvatar
                         key={member.userId} // to instantly blank the avatar when UserInfo changes members
-                        member={member}
+                        member={member as RoomMember}
                         width={2 * 0.3 * UIStore.instance.windowHeight} // 2x@30vh
                         height={2 * 0.3 * UIStore.instance.windowHeight} // 2x@30vh
                         resizeMethod="scale"
                         fallbackUserId={member.userId}
                         onClick={onMemberAvatarClick}
-                        urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
+                        urls={(member as User).avatarUrl ? [(member as User).avatarUrl] : undefined} />
                 </div>
             </div>
         </div>
@@ -1469,7 +1476,11 @@ const UserInfoHeader: React.FC<{
         presenceCurrentlyActive = member.user.currentlyActive;
 
         if (SettingsStore.getValue("feature_custom_status")) {
-            statusMessage = member.user._unstable_statusMessage;
+            if ((member as RoomMember).user) {
+                statusMessage = member.user.unstable_statusMessage;
+            } else {
+                statusMessage = (member as unknown as User).unstable_statusMessage;
+            }
         }
     }
 
@@ -1500,7 +1511,7 @@ const UserInfoHeader: React.FC<{
         e2eIcon = <E2EIcon size={18} status={e2eStatus} isUser={true} />;
     }
 
-    const displayName = member.rawDisplayName || member.displayname;
+    const displayName = (member as RoomMember).rawDisplayName || (member as GroupMember).displayname;
     return <React.Fragment>
         { avatarElement }
 
@@ -1516,8 +1527,8 @@ const UserInfoHeader: React.FC<{
                 </div>
                 <div>{ member.userId }</div>
                 <div className="mx_UserInfo_profileStatus">
-                    {presenceLabel}
-                    {statusLabel}
+                    { presenceLabel }
+                    { statusLabel }
                 </div>
             </div>
         </div>
@@ -1565,11 +1576,12 @@ const UserInfo: React.FC<IProps> = ({
     // We have no previousPhase for when viewing a UserInfo from a Group or without a Room at this time
     if (room && phase === RightPanelPhases.EncryptionPanel) {
         previousPhase = RightPanelPhases.RoomMemberInfo;
-        refireParams = {member: member};
+        refireParams = { member };
+    } else if (room?.isSpaceRoom() && SpaceStore.spacesEnabled) {
+        previousPhase = previousPhase = RightPanelPhases.SpaceMemberList;
+        refireParams = { space: room };
     } else if (room) {
-        previousPhase = previousPhase = SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()
-            ? RightPanelPhases.SpaceMemberList
-            : RightPanelPhases.RoomMemberList;
+        previousPhase = RightPanelPhases.RoomMemberList;
     }
 
     const onEncryptionPanelClose = () => {
@@ -1578,7 +1590,7 @@ const UserInfo: React.FC<IProps> = ({
             phase: previousPhase,
             refireParams: refireParams,
         });
-    }
+    };
 
     let content;
     switch (phase) {
@@ -1588,7 +1600,7 @@ const UserInfo: React.FC<IProps> = ({
             content = (
                 <BasicUserInfo
                     room={room}
-                    member={member}
+                    member={member as User}
                     groupId={groupId as string}
                     devices={devices}
                     isRoomEncrypted={isRoomEncrypted} />
@@ -1599,7 +1611,7 @@ const UserInfo: React.FC<IProps> = ({
             content = (
                 <EncryptionPanel
                     {...props as React.ComponentProps<typeof EncryptionPanel>}
-                    member={member}
+                    member={member as User | RoomMember}
                     onClose={onEncryptionPanelClose}
                     isRoomEncrypted={isRoomEncrypted}
                 />
@@ -1616,7 +1628,7 @@ const UserInfo: React.FC<IProps> = ({
     }
 
     let scopeHeader;
-    if (SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom()) {
+    if (SpaceStore.spacesEnabled && room?.isSpaceRoom()) {
         scopeHeader = <div className="mx_RightPanel_scopeHeader">
             <RoomAvatar room={room} height={32} width={32} />
             <RoomName room={room} />
diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx
index ac01c953b9..8ed56bb2c3 100644
--- a/src/components/views/right_panel/VerificationPanel.tsx
+++ b/src/components/views/right_panel/VerificationPanel.tsx
@@ -16,54 +16,40 @@ limitations under the License.
 
 import React from "react";
 
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import * as sdk from '../../../index';
-import {verificationMethods} from 'matrix-js-sdk/src/crypto';
-import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
-import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {ReciprocateQRCode} from "matrix-js-sdk/src/crypto/verification/QRCode";
-import {SAS} from "matrix-js-sdk/src/crypto/verification/SAS";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { verificationMethods } from 'matrix-js-sdk/src/crypto';
+import { SCAN_QR_CODE_METHOD } from "matrix-js-sdk/src/crypto/verification/QRCode";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { User } from "matrix-js-sdk/src/models/user";
+import { ReciprocateQRCode } from "matrix-js-sdk/src/crypto/verification/QRCode";
+import { SAS } from "matrix-js-sdk/src/crypto/verification/SAS";
 
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
-import E2EIcon from "../rooms/E2EIcon";
-import {
-    PHASE_READY,
-    PHASE_DONE,
-    PHASE_STARTED,
-    PHASE_CANCELLED,
-} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import E2EIcon, { E2EState } from "../rooms/E2EIcon";
+import { Phase } 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 {
-    PHASE_UNSENT,
-    PHASE_REQUESTED,
-    PHASE_READY,
-    PHASE_DONE,
-    PHASE_STARTED,
-    PHASE_CANCELLED,
-}
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AccessibleButton from "../elements/AccessibleButton";
+import VerificationShowSas from "../verification/VerificationShowSas";
 
 interface IProps {
     layout: string;
     request: VerificationRequest;
-    member: RoomMember;
-    phase: VerificationPhase;
+    member: RoomMember | User;
+    phase: Phase;
     onClose: () => void;
     isRoomEncrypted: boolean;
     inDialog: boolean;
-    key: number;
 }
 
 interface IState {
-    sasEvent?: SAS;
+    sasEvent?: SAS["sasEvent"];
     emojiButtonClicked?: boolean;
     reciprocateButtonClicked?: boolean;
-    reciprocateQREvent?: ReciprocateQRCode;
+    reciprocateQREvent?: ReciprocateQRCode["reciprocateQREvent"];
 }
 
 @replaceableComponent("views.right_panel.VerificationPanel")
@@ -77,19 +63,18 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     }
 
     private renderQRPhase() {
-        const {member, request} = this.props;
+        const { member, request } = this.props;
         const showSAS: boolean = request.otherPartySupportsMethod(verificationMethods.SAS);
         const showQR: boolean = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const brand = SdkConfig.get().brand;
 
         const noCommonMethodError: JSX.Element = !showSAS && !showQR ?
-            <p>{_t(
+            <p>{ _t(
                 "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 },
-            )}</p> :
+            ) }</p> :
             null;
 
         if (this.props.layout === 'dialog') {
@@ -99,31 +84,31 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
             if (showQR) {
                 qrBlockDialog =
                     <div className='mx_VerificationPanel_QRPhase_startOption'>
-                        <p>{_t("Scan this unique code")}</p>
+                        <p>{ _t("Scan this unique code") }</p>
                         <VerificationQRCode qrCodeData={request.qrCodeData} />
                     </div>;
             }
             if (showSAS) {
                 sasBlockDialog = <div className='mx_VerificationPanel_QRPhase_startOption'>
-                    <p>{_t("Compare unique emoji")}</p>
+                    <p>{ _t("Compare unique emoji") }</p>
                     <span className='mx_VerificationPanel_QRPhase_helpText'>
-                        {_t("Compare a unique set of emoji if you don't have a camera on either device")}
+                        { _t("Compare a unique set of emoji if you don't have a camera on either device") }
                     </span>
                     <AccessibleButton disabled={this.state.emojiButtonClicked} onClick={this.startSAS} kind='primary'>
-                        {_t("Start")}
+                        { _t("Start") }
                     </AccessibleButton>
                 </div>;
             }
             const or = qrBlockDialog && sasBlockDialog ?
-                <div className='mx_VerificationPanel_QRPhase_betweenText'>{_t("or")}</div> : null;
+                <div className='mx_VerificationPanel_QRPhase_betweenText'>{ _t("or") }</div> : null;
             return (
                 <div>
-                    {_t("Verify this session by completing one of the following:")}
+                    { _t("Verify this session by completing one of the following:") }
                     <div className='mx_VerificationPanel_QRPhase_startOptions'>
-                        {qrBlockDialog}
-                        {or}
-                        {sasBlockDialog}
-                        {noCommonMethodError}
+                        { qrBlockDialog }
+                        { or }
+                        { sasBlockDialog }
+                        { noCommonMethodError }
                     </div>
                 </div>
             );
@@ -132,10 +117,10 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
         let qrBlock: JSX.Element;
         if (showQR) {
             qrBlock = <div className="mx_UserInfo_container">
-                <h3>{_t("Verify by scanning")}</h3>
-                <p>{_t("Ask %(displayName)s to scan your code:", {
-                    displayName: member.displayName || member.name || member.userId,
-                })}</p>
+                <h3>{ _t("Verify by scanning") }</h3>
+                <p>{ _t("Ask %(displayName)s to scan your code:", {
+                    displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
+                }) }</p>
 
                 <div className="mx_VerificationPanel_qrCode">
                     <VerificationQRCode qrCodeData={request.qrCodeData} />
@@ -152,38 +137,38 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
 
             // Note: mx_VerificationPanel_verifyByEmojiButton is for the end-to-end tests
             sasBlock = <div className="mx_UserInfo_container">
-                <h3>{_t("Verify by emoji")}</h3>
-                <p>{sasLabel}</p>
+                <h3>{ _t("Verify by emoji") }</h3>
+                <p>{ sasLabel }</p>
                 <AccessibleButton
                     disabled={disabled}
                     kind="primary"
                     className="mx_UserInfo_wideButton mx_VerificationPanel_verifyByEmojiButton"
                     onClick={this.startSAS}
                 >
-                    {_t("Verify by emoji")}
+                    { _t("Verify by emoji") }
                 </AccessibleButton>
             </div>;
         }
 
         const noCommonMethodBlock = noCommonMethodError ?
-            <div className="mx_UserInfo_container">{noCommonMethodError}</div> :
+            <div className="mx_UserInfo_container">{ noCommonMethodError }</div> :
             null;
 
         // TODO: add way to open camera to scan a QR code
         return <React.Fragment>
-            {qrBlock}
-            {sasBlock}
-            {noCommonMethodBlock}
+            { qrBlock }
+            { sasBlock }
+            { noCommonMethodBlock }
         </React.Fragment>;
     }
 
     private onReciprocateYesClick = () => {
-        this.setState({reciprocateButtonClicked: true});
+        this.setState({ reciprocateButtonClicked: true });
         this.state.reciprocateQREvent.confirm();
     };
 
     private onReciprocateNoClick = () => {
-        this.setState({reciprocateButtonClicked: true});
+        this.setState({ reciprocateButtonClicked: true });
         this.state.reciprocateQREvent.cancel();
     };
 
@@ -193,51 +178,46 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     }
 
     private renderQRReciprocatePhase() {
-        const {member, request} = this.props;
-        let Button;
-        // a bit of a hack, but the FormButton should only be used in the right panel
-        // they should probably just be the same component with a css class applied to it?
-        if (this.props.inDialog) {
-            Button = sdk.getComponent("elements.AccessibleButton");
-        } else {
-            Button = sdk.getComponent("elements.FormButton");
-        }
+        const { member, request } = this.props;
         const description = request.isSelfVerification ?
             _t("Almost there! Is your other session showing the same shield?") :
             _t("Almost there! Is %(displayName)s showing the same shield?", {
-                displayName: member.displayName || member.name || member.userId,
+                displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
             });
         let body: JSX.Element;
         if (this.state.reciprocateQREvent) {
             // Element Web doesn't support scanning yet, so assume here we're the client being scanned.
-            //
-            // we're passing both a label and a child string to Button as
-            // FormButton and AccessibleButton expect this differently
             body = <React.Fragment>
-                <p>{description}</p>
-                <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
+                <p>{ description }</p>
+                <E2EIcon isUser={true} status={E2EState.Verified} size={128} hideTooltip={true} />
                 <div className="mx_VerificationPanel_reciprocateButtons">
-                    <Button
-                        label={_t("No")} kind="danger"
+                    <AccessibleButton
+                        kind="danger"
                         disabled={this.state.reciprocateButtonClicked}
-                        onClick={this.onReciprocateNoClick}>{_t("No")}</Button>
-                    <Button
-                        label={_t("Yes")} kind="primary"
+                        onClick={this.onReciprocateNoClick}
+                    >
+                        { _t("No") }
+                    </AccessibleButton>
+                    <AccessibleButton
+                        kind="primary"
                         disabled={this.state.reciprocateButtonClicked}
-                        onClick={this.onReciprocateYesClick}>{_t("Yes")}</Button>
+                        onClick={this.onReciprocateYesClick}
+                    >
+                        { _t("Yes") }
+                    </AccessibleButton>
                 </div>
             </React.Fragment>;
         } else {
             body = <p><Spinner /></p>;
         }
         return <div className="mx_UserInfo_container mx_VerificationPanel_reciprocate_section">
-            <h3>{_t("Verify by scanning")}</h3>
+            <h3>{ _t("Verify by scanning") }</h3>
             { body }
         </div>;
     }
 
     private renderVerifiedPhase() {
-        const {member, request} = this.props;
+        const { member, request } = this.props;
 
         let text: string;
         if (!request.isSelfVerification) {
@@ -264,28 +244,25 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
             }
         } else {
             description = _t("You've successfully verified %(displayName)s!", {
-                displayName: member.displayName || member.name || member.userId,
+                displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
             });
         }
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
-                <h3>{_t("Verified")}</h3>
-                <p>{description}</p>
-                <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
+                <h3>{ _t("Verified") }</h3>
+                <p>{ description }</p>
+                <E2EIcon isUser={true} status={E2EState.Verified} size={128} hideTooltip={true} />
                 { text ? <p>{ text }</p> : null }
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
-                    {_t("Got it")}
+                    { _t("Got it") }
                 </AccessibleButton>
             </div>
         );
     }
 
     private renderCancelledPhase() {
-        const {member, request} = this.props;
-
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const { member, request } = this.props;
 
         let startAgainInstruction: string;
         if (request.isSelfVerification) {
@@ -302,7 +279,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
                 text = _t("You cancelled verification on your other session.");
             } else {
                 text = _t("%(displayName)s cancelled verification.", {
-                    displayName: member.displayName || member.name || member.userId,
+                    displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
                 });
             }
             text = `${text} ${startAgainInstruction}`;
@@ -312,30 +289,29 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
 
         return (
             <div className="mx_UserInfo_container">
-                <h3>{_t("Verification cancelled")}</h3>
+                <h3>{ _t("Verification cancelled") }</h3>
                 <p>{ text }</p>
 
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
-                    {_t("Got it")}
+                    { _t("Got it") }
                 </AccessibleButton>
             </div>
         );
     }
 
     public render() {
-        const {member, phase, request} = this.props;
+        const { member, phase, request } = this.props;
 
-        const displayName = member.displayName || member.name || member.userId;
+        const displayName = (member as User).displayName || (member as RoomMember).name || member.userId;
 
         switch (phase) {
-            case PHASE_READY:
+            case Phase.Ready:
                 return this.renderQRPhase();
-            case PHASE_STARTED:
+            case Phase.Started:
                 switch (request.chosenMethod) {
                     case verificationMethods.RECIPROCATE_QR_CODE:
                         return this.renderQRReciprocatePhase();
                     case verificationMethods.SAS: {
-                        const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
                         const emojis = this.state.sasEvent ?
                             <VerificationShowSas
                                 displayName={displayName}
@@ -347,16 +323,16 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
                                 isSelf={request.isSelfVerification}
                             /> : <Spinner />;
                         return <div className="mx_UserInfo_container">
-                            <h3>{_t("Compare emoji")}</h3>
+                            <h3>{ _t("Compare emoji") }</h3>
                             { emojis }
                         </div>;
                     }
                     default:
                         return null;
                 }
-            case PHASE_DONE:
+            case Phase.Done:
                 return this.renderVerifiedPhase();
-            case PHASE_CANCELLED:
+            case Phase.Cancelled:
                 return this.renderCancelledPhase();
         }
         console.error("VerificationPanel unhandled phase:", phase);
@@ -364,7 +340,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     }
 
     private startSAS = async () => {
-        this.setState({emojiButtonClicked: true});
+        this.setState({ emojiButtonClicked: true });
         const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
         try {
             await verifier.verify();
@@ -382,15 +358,16 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     };
 
     private updateVerifierState = () => {
-        const {request} = this.props;
-        const {sasEvent, reciprocateQREvent} = request.verifier;
+        const { request } = this.props;
+        const sasEvent = (request.verifier as SAS).sasEvent;
+        const reciprocateQREvent = (request.verifier as ReciprocateQRCode).reciprocateQREvent;
         request.verifier.off('show_sas', this.updateVerifierState);
         request.verifier.off('show_reciprocate_qr', this.updateVerifierState);
-        this.setState({sasEvent, reciprocateQREvent});
+        this.setState({ sasEvent, reciprocateQREvent });
     };
 
     private onRequestChange = async () => {
-        const {request} = this.props;
+        const { request } = this.props;
         const hadVerifier = this.hasVerifier;
         this.hasVerifier = !!request.verifier;
         if (!hadVerifier && this.hasVerifier) {
@@ -407,17 +384,18 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
     };
 
     public componentDidMount() {
-        const {request} = this.props;
+        const { request } = this.props;
         request.on("change", this.onRequestChange);
         if (request.verifier) {
-            const {sasEvent, reciprocateQREvent} = request.verifier;
-            this.setState({sasEvent, reciprocateQREvent});
+            const sasEvent = (request.verifier as SAS).sasEvent;
+            const reciprocateQREvent = (request.verifier as ReciprocateQRCode).reciprocateQREvent;
+            this.setState({ sasEvent, reciprocateQREvent });
         }
         this.onRequestChange();
     }
 
     public componentWillUnmount() {
-        const {request} = this.props;
+        const { request } = this.props;
         if (request.verifier) {
             request.verifier.off('show_sas', this.updateVerifierState);
             request.verifier.off('show_reciprocate_qr', this.updateVerifierState);
diff --git a/src/components/views/right_panel/WidgetCard.tsx b/src/components/views/right_panel/WidgetCard.tsx
index d7493e0512..8ab73483df 100644
--- a/src/components/views/right_panel/WidgetCard.tsx
+++ b/src/components/views/right_panel/WidgetCard.tsx
@@ -97,7 +97,6 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
         <AppTile
             app={app}
             fullWidth
-            show
             showMenubar={false}
             room={room}
             userId={cli.getUserId()}
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.tsx
similarity index 67%
rename from src/components/views/room_settings/AliasSettings.js
rename to src/components/views/room_settings/AliasSettings.tsx
index 80e0099ab3..9ed49d362b 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2018, 2019 New Vector Ltd
+Copyright 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,59 +14,60 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React, { ChangeEvent, createRef } from "react";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 import EditableItemList from "../elements/EditableItemList";
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import * as sdk from "../../../index";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
+import Spinner from "../elements/Spinner";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import RoomPublishSetting from "./RoomPublishSetting";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RoomAliasField from "../elements/RoomAliasField";
 
-class EditableAliasesList extends EditableItemList {
-    constructor(props) {
-        super(props);
+interface IEditableAliasesListProps {
+    domain?: string;
+}
 
-        this._aliasField = createRef();
-    }
+class EditableAliasesList extends EditableItemList<IEditableAliasesListProps> {
+    private aliasField = createRef<RoomAliasField>();
 
-    _onAliasAdded = async () => {
-        await this._aliasField.current.validate({ allowEmpty: false });
+    private onAliasAdded = async () => {
+        await this.aliasField.current.validate({ allowEmpty: false });
 
-        if (this._aliasField.current.isValid) {
+        if (this.aliasField.current.isValid) {
             if (this.props.onItemAdded) this.props.onItemAdded(this.props.newItem);
             return;
         }
 
-        this._aliasField.current.focus();
-        this._aliasField.current.validate({ allowEmpty: false, focused: true });
+        this.aliasField.current.focus();
+        this.aliasField.current.validate({ allowEmpty: false, focused: true });
     };
 
-    _renderNewItemField() {
+    protected renderNewItemField() {
         // if we don't need the RoomAliasField,
-        // we don't need to overriden version of _renderNewItemField
+        // we don't need to overriden version of renderNewItemField
         if (!this.props.domain) {
-            return super._renderNewItemField();
+            return super.renderNewItemField();
         }
-        const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField');
-        const onChange = (alias) => this._onNewItemChanged({target: {value: alias}});
+        const onChange = (alias) => this.onNewItemChanged({ target: { value: alias } });
         return (
             <form
-                onSubmit={this._onAliasAdded}
+                onSubmit={this.onAliasAdded}
                 autoComplete="off"
                 noValidate={true}
                 className="mx_EditableItemList_newItem"
             >
                 <RoomAliasField
-                    ref={this._aliasField}
+                    ref={this.aliasField}
                     onChange={onChange}
                     value={this.props.newItem || ""}
                     domain={this.props.domain} />
-                <AccessibleButton onClick={this._onAliasAdded} kind="primary">
+                <AccessibleButton onClick={this.onAliasAdded} kind="primary">
                     { _t("Add") }
                 </AccessibleButton>
             </form>
@@ -75,19 +75,30 @@ class EditableAliasesList extends EditableItemList {
     }
 }
 
-@replaceableComponent("views.room_settings.AliasSettings")
-export default class AliasSettings extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-        canSetCanonicalAlias: PropTypes.bool.isRequired,
-        canSetAliases: PropTypes.bool.isRequired,
-        canonicalAliasEvent: PropTypes.object, // MatrixEvent
-    };
+interface IProps {
+    roomId: string;
+    canSetCanonicalAlias: boolean;
+    canSetAliases: boolean;
+    canonicalAliasEvent?: MatrixEvent;
+    hidePublishSetting?: boolean;
+}
 
+interface IState {
+    altAliases: string[];
+    localAliases: string[];
+    canonicalAlias?: string;
+    updatingCanonicalAlias: boolean;
+    localAliasesLoading: boolean;
+    detailsOpen: boolean;
+    newAlias?: string;
+    newAltAlias?: string;
+}
+
+@replaceableComponent("views.room_settings.AliasSettings")
+export default class AliasSettings extends React.Component<IProps, IState> {
     static defaultProps = {
         canSetAliases: false,
         canSetCanonicalAlias: false,
-        aliasEvents: [],
     };
 
     constructor(props) {
@@ -122,7 +133,7 @@ export default class AliasSettings extends React.Component {
         }
     }
 
-    async loadLocalAliases() {
+    private async loadLocalAliases() {
         this.setState({ localAliasesLoading: true });
         try {
             const cli = MatrixClientPeg.get();
@@ -134,12 +145,16 @@ export default class AliasSettings extends React.Component {
                 }
             }
             this.setState({ localAliases });
+
+            if (localAliases.length === 0) {
+                this.setState({ detailsOpen: true });
+            }
         } finally {
             this.setState({ localAliasesLoading: false });
         }
     }
 
-    changeCanonicalAlias(alias) {
+    private changeCanonicalAlias(alias: string) {
         if (!this.props.canSetCanonicalAlias) return;
 
         const oldAlias = this.state.canonicalAlias;
@@ -164,13 +179,13 @@ export default class AliasSettings extends React.Component {
                     "or a temporary failure occurred.",
                 ),
             });
-            this.setState({canonicalAlias: oldAlias});
+            this.setState({ canonicalAlias: oldAlias });
         }).finally(() => {
-            this.setState({updatingCanonicalAlias: false});
+            this.setState({ updatingCanonicalAlias: false });
         });
     }
 
-    changeAltAliases(altAliases) {
+    private changeAltAliases(altAliases: string[]) {
         if (!this.props.canSetCanonicalAlias) return;
 
         this.setState({
@@ -181,7 +196,7 @@ export default class AliasSettings extends React.Component {
         const eventContent = {};
 
         if (this.state.canonicalAlias) {
-            eventContent.alias = this.state.canonicalAlias;
+            eventContent["alias"] = this.state.canonicalAlias;
         }
         if (altAliases) {
             eventContent["alt_aliases"] = altAliases;
@@ -198,15 +213,15 @@ export default class AliasSettings extends React.Component {
                 ),
             });
         }).finally(() => {
-            this.setState({updatingCanonicalAlias: false});
+            this.setState({ updatingCanonicalAlias: false });
         });
     }
 
-    onNewAliasChanged = (value) => {
-        this.setState({newAlias: value});
+    private onNewAliasChanged = (value: string) => {
+        this.setState({ newAlias: value });
     };
 
-    onLocalAliasAdded = (alias) => {
+    private onLocalAliasAdded = (alias: string) => {
         if (!alias || alias.length === 0) return; // ignore attempts to create blank aliases
 
         const localDomain = MatrixClientPeg.get().getDomain();
@@ -232,13 +247,13 @@ export default class AliasSettings extends React.Component {
         });
     };
 
-    onLocalAliasDeleted = (index) => {
+    private onLocalAliasDeleted = (index: number) => {
         const alias = this.state.localAliases[index];
         // TODO: In future, we should probably be making sure that the alias actually belongs
         // to this room. See https://github.com/vector-im/element-web/issues/7353
         MatrixClientPeg.get().deleteAlias(alias).then(() => {
             const localAliases = this.state.localAliases.filter(a => a !== alias);
-            this.setState({localAliases});
+            this.setState({ localAliases });
 
             if (this.state.canonicalAlias === alias) {
                 this.changeCanonicalAlias(null);
@@ -261,7 +276,7 @@ export default class AliasSettings extends React.Component {
         });
     };
 
-    onLocalAliasesToggled = (event) => {
+    private onLocalAliasesToggled = (event: ChangeEvent<HTMLDetailsElement>) => {
         // expanded
         if (event.target.open) {
             // if local aliases haven't been preloaded yet at component mount
@@ -269,43 +284,45 @@ export default class AliasSettings extends React.Component {
                 this.loadLocalAliases();
             }
         }
-        this.setState({detailsOpen: event.target.open});
+        this.setState({ detailsOpen: event.currentTarget.open });
     };
 
-    onCanonicalAliasChange = (event) => {
+    private onCanonicalAliasChange = (event: ChangeEvent<HTMLSelectElement>) => {
         this.changeCanonicalAlias(event.target.value);
     };
 
-    onNewAltAliasChanged = (value) => {
-        this.setState({newAltAlias: value});
-    }
+    private onNewAltAliasChanged = (value: string) => {
+        this.setState({ newAltAlias: value });
+    };
 
-    onAltAliasAdded = (alias) => {
+    private onAltAliasAdded = (alias: string) => {
         const altAliases = this.state.altAliases.slice();
         if (!altAliases.some(a => a.trim() === alias.trim())) {
             altAliases.push(alias.trim());
             this.changeAltAliases(altAliases);
-            this.setState({newAltAlias: ""});
+            this.setState({ newAltAlias: "" });
         }
-    }
+    };
 
-    onAltAliasDeleted = (index) => {
+    private onAltAliasDeleted = (index: number) => {
         const altAliases = this.state.altAliases.slice();
         altAliases.splice(index, 1);
         this.changeAltAliases(altAliases);
+    };
+
+    private getAliases() {
+        return this.state.altAliases.concat(this.getLocalNonAltAliases());
     }
 
-    _getAliases() {
-        return this.state.altAliases.concat(this._getLocalNonAltAliases());
-    }
-
-    _getLocalNonAltAliases() {
-        const {altAliases} = this.state;
+    private getLocalNonAltAliases() {
+        const { altAliases } = this.state;
         return this.state.localAliases.filter(alias => !altAliases.includes(alias));
     }
 
     render() {
-        const localDomain = MatrixClientPeg.get().getDomain();
+        const cli = MatrixClientPeg.get();
+        const localDomain = cli.getDomain();
+        const isSpaceRoom = cli.getRoom(this.props.roomId)?.isSpaceRoom();
 
         let found = false;
         const canonicalValue = this.state.canonicalAlias || "";
@@ -320,7 +337,7 @@ export default class AliasSettings extends React.Component {
             >
                 <option value="" key="unset">{ _t('not specified') }</option>
                 {
-                    this._getAliases().map((alias, i) => {
+                    this.getAliases().map((alias, i) => {
                         if (alias === this.state.canonicalAlias) found = true;
                         return (
                             <option value={alias} key={i}>
@@ -331,7 +348,7 @@ export default class AliasSettings extends React.Component {
                 }
                 {
                     found || !this.state.canonicalAlias ? '' :
-                        <option value={ this.state.canonicalAlias } key='arbitrary'>
+                        <option value={this.state.canonicalAlias} key='arbitrary'>
                             { this.state.canonicalAlias }
                         </option>
                 }
@@ -340,12 +357,10 @@ export default class AliasSettings extends React.Component {
 
         let localAliasesList;
         if (this.state.localAliasesLoading) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             localAliasesList = <Spinner />;
         } else {
             localAliasesList = (<EditableAliasesList
                 id="roomAliases"
-                className={"mx_RoomSettings_localAliases"}
                 items={this.state.localAliases}
                 newItem={this.state.newAlias}
                 onNewItemChanged={this.onNewAliasChanged}
@@ -353,7 +368,9 @@ export default class AliasSettings extends React.Component {
                 canEdit={this.props.canSetAliases}
                 onItemAdded={this.onLocalAliasAdded}
                 onItemRemoved={this.onLocalAliasDeleted}
-                noItemsLabel={_t('This room has no local addresses')}
+                noItemsLabel={isSpaceRoom
+                    ? _t("This space has no local addresses")
+                    : _t("This room has no local addresses")}
                 placeholder={_t('Local address')}
                 domain={localDomain}
             />);
@@ -361,19 +378,28 @@ export default class AliasSettings extends React.Component {
 
         return (
             <div className='mx_AliasSettings'>
-                <span className='mx_SettingsTab_subheading'>{_t("Published Addresses")}</span>
-                <p>{_t("Published addresses can be used by anyone on any server to join your room. " +
-                    "To publish an address, it needs to be set as a local address first.")}</p>
-                {canonicalAliasSection}
-                <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
+                <span className='mx_SettingsTab_subheading'>{ _t("Published Addresses") }</span>
+                <p>
+                    { isSpaceRoom
+                        ? _t("Published addresses can be used by anyone on any server to join your space.")
+                        : _t("Published addresses can be used by anyone on any server to join your room.") }
+                    &nbsp;
+                    { _t("To publish an address, it needs to be set as a local address first.") }
+                </p>
+                { canonicalAliasSection }
+                { this.props.hidePublishSetting
+                    ? null
+                    : <RoomPublishSetting
+                        roomId={this.props.roomId}
+                        canSetCanonicalAlias={this.props.canSetCanonicalAlias}
+                    /> }
                 <datalist id="mx_AliasSettings_altRecommendations">
-                    {this._getLocalNonAltAliases().map(alias => {
+                    { this.getLocalNonAltAliases().map(alias => {
                         return <option value={alias} key={alias} />;
-                    })};
+                    }) };
                 </datalist>
                 <EditableAliasesList
                     id="roomAltAliases"
-                    className={"mx_RoomSettings_altAliases"}
                     items={this.state.altAliases}
                     newItem={this.state.newAltAlias}
                     onNewItemChanged={this.onNewAltAliasChanged}
@@ -386,11 +412,19 @@ export default class AliasSettings extends React.Component {
                     noItemsLabel={_t('No other published addresses yet, add one below')}
                     placeholder={_t('New published address (e.g. #alias:server)')}
                 />
-                <span className='mx_SettingsTab_subheading mx_AliasSettings_localAliasHeader'>{_t("Local Addresses")}</span>
-                <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
-                <details onToggle={this.onLocalAliasesToggled}>
-                    <summary>{ this.state.detailsOpen ? _t('Show less') : _t("Show more")}</summary>
-                    {localAliasesList}
+                <span className='mx_SettingsTab_subheading mx_AliasSettings_localAliasHeader'>
+                    { _t("Local Addresses") }
+                </span>
+                <p>
+                    { isSpaceRoom
+                        ? _t("Set addresses for this space so users can find this space " +
+                            "through your homeserver (%(localDomain)s)", { localDomain })
+                        : _t("Set addresses for this room so users can find this room " +
+                        "through your homeserver (%(localDomain)s)", { localDomain }) }
+                </p>
+                <details onToggle={this.onLocalAliasesToggled} open={this.state.detailsOpen}>
+                    <summary>{ this.state.detailsOpen ? _t('Show less') : _t("Show more") }</summary>
+                    { localAliasesList }
                 </details>
             </div>
         );
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index 272ecd1228..23b497398a 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -16,13 +16,13 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import ErrorDialog from "../dialogs/ErrorDialog";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const GROUP_ID_REGEX = /\+\S+:\S+/;
 
@@ -106,7 +106,7 @@ export default class RelatedGroupSettings extends React.Component {
             <EditableItemList
                 id="relatedGroups"
                 items={this.state.newGroupsList}
-                className={"mx_RelatedGroupSettings"}
+                className="mx_RelatedGroupSettings"
                 newItem={this.state.newGroupId}
                 canRemove={this.props.canSetRelatedGroups}
                 canEdit={this.props.canSetRelatedGroups}
@@ -116,7 +116,7 @@ export default class RelatedGroupSettings extends React.Component {
                 itemsLabel={_t('Showing flair for these communities:')}
                 noItemsLabel={_t('This room is not showing flair for any communities')}
                 placeholder={_t(
-                    'New community ID (e.g. +foo:%(localDomain)s)', {localDomain},
+                    'New community ID (e.g. +foo:%(localDomain)s)', { localDomain },
                 )}
             />
         </div>;
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.tsx
similarity index 68%
rename from src/components/views/room_settings/RoomProfileSettings.js
rename to src/components/views/room_settings/RoomProfileSettings.tsx
index b6885887b1..6533028e8c 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.tsx
@@ -14,28 +14,44 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import React, { createRef } from 'react';
+import { _t } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
-import * as sdk from "../../../index";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import AccessibleButton from "../elements/AccessibleButton";
+import AvatarSetting from "../settings/AvatarSetting";
+
+interface IProps {
+    roomId: string;
+}
+
+interface IState {
+    originalDisplayName: string;
+    displayName: string;
+    originalAvatarUrl: string;
+    avatarUrl: string;
+    avatarFile: File;
+    originalTopic: string;
+    topic: string;
+    enableProfileSave: boolean;
+    canSetName: boolean;
+    canSetTopic: boolean;
+    canSetAvatar: boolean;
+}
 
 // TODO: Merge with ProfileSettings?
 @replaceableComponent("views.room_settings.RoomProfileSettings")
-export default class RoomProfileSettings extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-    };
+export default class RoomProfileSettings extends React.Component<IProps, IState> {
+    private avatarUpload = createRef<HTMLInputElement>();
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         const client = MatrixClientPeg.get();
         const room = client.getRoom(props.roomId);
-        if (!room) throw new Error("Expected a room for ID: ", props.roomId);
+        if (!room) throw new Error(`Expected a room for ID: ${props.roomId}`);
 
         const avatarEvent = room.currentState.getStateEvents("m.room.avatar", "");
         let avatarUrl = avatarEvent && avatarEvent.getContent() ? avatarEvent.getContent()["url"] : null;
@@ -60,17 +76,15 @@ export default class RoomProfileSettings extends React.Component {
             canSetTopic: room.currentState.maySendStateEvent('m.room.topic', client.getUserId()),
             canSetAvatar: room.currentState.maySendStateEvent('m.room.avatar', client.getUserId()),
         };
-
-        this._avatarUpload = createRef();
     }
 
-    _uploadAvatar = () => {
-        this._avatarUpload.current.click();
+    private uploadAvatar = (): void => {
+        this.avatarUpload.current.click();
     };
 
-    _removeAvatar = () => {
+    private removeAvatar = (): void => {
         // clear file upload field so same file can be selected
-        this._avatarUpload.current.value = "";
+        this.avatarUpload.current.value = "";
         this.setState({
             avatarUrl: null,
             avatarFile: null,
@@ -78,7 +92,7 @@ export default class RoomProfileSettings extends React.Component {
         });
     };
 
-    _cancelProfileChanges = async (e) => {
+    private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
@@ -92,61 +106,72 @@ export default class RoomProfileSettings extends React.Component {
         });
     };
 
-    _saveProfile = async (e) => {
+    private saveProfile = async (e: React.FormEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
         if (!this.state.enableProfileSave) return;
-        this.setState({enableProfileSave: false});
+        this.setState({ enableProfileSave: false });
 
         const client = MatrixClientPeg.get();
-        const newState = {};
+
+        let originalDisplayName: string;
+        let avatarUrl: string;
+        let originalAvatarUrl: string;
+        let originalTopic: string;
+        let avatarFile: File;
 
         // 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, displayName);
-            newState.originalDisplayName = displayName;
-            newState.displayName = displayName;
+            originalDisplayName = displayName;
         }
 
         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 = mediaFromMxc(uri).getSquareThumbnailHttp(96);
-            newState.originalAvatarUrl = newState.avatarUrl;
-            newState.avatarFile = null;
+            await client.sendStateEvent(this.props.roomId, 'm.room.avatar', { url: uri }, '');
+            avatarUrl = mediaFromMxc(uri).getSquareThumbnailHttp(96);
+            originalAvatarUrl = avatarUrl;
+            avatarFile = null;
         } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
             await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {}, '');
         }
 
         if (this.state.originalTopic !== this.state.topic) {
             await client.setRoomTopic(this.props.roomId, this.state.topic);
-            newState.originalTopic = this.state.topic;
+            originalTopic = this.state.topic;
         }
 
-        this.setState(newState);
+        this.setState({
+            originalAvatarUrl,
+            avatarUrl,
+            originalDisplayName,
+            originalTopic,
+            displayName,
+            avatarFile,
+        });
     };
 
-    _onDisplayNameChanged = (e) => {
-        this.setState({displayName: e.target.value});
+    private onDisplayNameChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
+        this.setState({ displayName: e.target.value });
         if (this.state.originalDisplayName === e.target.value) {
-            this.setState({enableProfileSave: false});
+            this.setState({ enableProfileSave: false });
         } else {
-            this.setState({enableProfileSave: true});
+            this.setState({ enableProfileSave: true });
         }
     };
 
-    _onTopicChanged = (e) => {
-        this.setState({topic: e.target.value});
+    private onTopicChanged = (e: React.ChangeEvent<HTMLTextAreaElement>): void => {
+        this.setState({ topic: e.target.value });
         if (this.state.originalTopic === e.target.value) {
-            this.setState({enableProfileSave: false});
+            this.setState({ enableProfileSave: false });
         } else {
-            this.setState({enableProfileSave: true});
+            this.setState({ enableProfileSave: true });
         }
     };
 
-    _onAvatarChanged = (e) => {
+    private onAvatarChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
         if (!e.target.files || !e.target.files.length) {
             this.setState({
                 avatarUrl: this.state.originalAvatarUrl,
@@ -160,7 +185,7 @@ export default class RoomProfileSettings extends React.Component {
         const reader = new FileReader();
         reader.onload = (ev) => {
             this.setState({
-                avatarUrl: ev.target.result,
+                avatarUrl: String(ev.target.result),
                 avatarFile: file,
                 enableProfileSave: true,
             });
@@ -168,10 +193,7 @@ export default class RoomProfileSettings extends React.Component {
         reader.readAsDataURL(file);
     };
 
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const AvatarSetting = sdk.getComponent('settings.AvatarSetting');
-
+    public render(): JSX.Element {
         let profileSettingsButtons;
         if (
             this.state.canSetName ||
@@ -181,18 +203,18 @@ export default class RoomProfileSettings extends React.Component {
             profileSettingsButtons = (
                 <div className="mx_ProfileSettings_buttons">
                     <AccessibleButton
-                        onClick={this._cancelProfileChanges}
+                        onClick={this.cancelProfileChanges}
                         kind="link"
                         disabled={!this.state.enableProfileSave}
                     >
-                        {_t("Cancel")}
+                        { _t("Cancel") }
                     </AccessibleButton>
                     <AccessibleButton
-                        onClick={this._saveProfile}
+                        onClick={this.saveProfile}
                         kind="primary"
                         disabled={!this.state.enableProfileSave}
                     >
-                        {_t("Save")}
+                        { _t("Save") }
                     </AccessibleButton>
                 </div>
             );
@@ -200,16 +222,16 @@ export default class RoomProfileSettings extends React.Component {
 
         return (
             <form
-                onSubmit={this._saveProfile}
+                onSubmit={this.saveProfile}
                 autoComplete="off"
                 noValidate={true}
                 className="mx_ProfileSettings_profileForm"
             >
                 <input
                     type="file"
-                    ref={this._avatarUpload}
+                    ref={this.avatarUpload}
                     className="mx_ProfileSettings_avatarUpload"
-                    onChange={this._onAvatarChanged}
+                    onChange={this.onAvatarChanged}
                     accept="image/*"
                 />
                 <div className="mx_ProfileSettings_profile">
@@ -219,7 +241,7 @@ export default class RoomProfileSettings extends React.Component {
                             type="text"
                             value={this.state.displayName}
                             autoComplete="off"
-                            onChange={this._onDisplayNameChanged}
+                            onChange={this.onDisplayNameChanged}
                             disabled={!this.state.canSetName}
                         />
                         <Field
@@ -230,7 +252,7 @@ export default class RoomProfileSettings extends React.Component {
                             type="text"
                             value={this.state.topic}
                             autoComplete="off"
-                            onChange={this._onTopicChanged}
+                            onChange={this.onTopicChanged}
                             element="textarea"
                         />
                     </div>
@@ -238,8 +260,8 @@ export default class RoomProfileSettings extends React.Component {
                         avatarUrl={this.state.avatarUrl}
                         avatarName={this.state.displayName || this.props.roomId}
                         avatarAltText={_t("Room avatar")}
-                        uploadAvatar={this.state.canSetAvatar ? this._uploadAvatar : undefined}
-                        removeAvatar={this.state.canSetAvatar ? this._removeAvatar : undefined} />
+                        uploadAvatar={this.state.canSetAvatar ? this.uploadAvatar : undefined}
+                        removeAvatar={this.state.canSetAvatar ? this.removeAvatar : undefined} />
                 </div>
                 { profileSettingsButtons }
             </form>
diff --git a/src/components/views/room_settings/RoomPublishSetting.js b/src/components/views/room_settings/RoomPublishSetting.js
deleted file mode 100644
index 6cc3ce26ba..0000000000
--- a/src/components/views/room_settings/RoomPublishSetting.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import {_t} from "../../../languageHandler";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.room_settings.RoomPublishSetting")
-export default class RoomPublishSetting extends React.PureComponent {
-    constructor(props) {
-        super(props);
-        this.state = {isRoomPublished: false};
-    }
-
-    onRoomPublishChange = (e) => {
-        const valueBefore = this.state.isRoomPublished;
-        const newValue = !valueBefore;
-        this.setState({isRoomPublished: newValue});
-        const client = MatrixClientPeg.get();
-
-        client.setRoomDirectoryVisibility(
-            this.props.roomId,
-            newValue ? 'public' : 'private',
-        ).catch(() => {
-            // Roll back the local echo on the change
-            this.setState({isRoomPublished: valueBefore});
-        });
-    };
-
-    componentDidMount() {
-        const client = MatrixClientPeg.get();
-        client.getRoomDirectoryVisibility(this.props.roomId).then((result => {
-            this.setState({isRoomPublished: result.visibility === 'public'});
-        }));
-    }
-
-    render() {
-        const client = MatrixClientPeg.get();
-
-        return (<LabelledToggleSwitch value={this.state.isRoomPublished}
-            onChange={this.onRoomPublishChange}
-            disabled={!this.props.canSetCanonicalAlias}
-            label={_t("Publish this room to the public in %(domain)s's room directory?", {
-              domain: client.getDomain(),
-            })} />);
-    }
-}
diff --git a/src/components/views/room_settings/RoomPublishSetting.tsx b/src/components/views/room_settings/RoomPublishSetting.tsx
new file mode 100644
index 0000000000..1cc83dea9e
--- /dev/null
+++ b/src/components/views/room_settings/RoomPublishSetting.tsx
@@ -0,0 +1,86 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { Visibility } from "matrix-js-sdk/src/@types/partials";
+
+import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import { _t } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import DirectoryCustomisations from '../../../customisations/Directory';
+
+interface IProps {
+    roomId: string;
+    label?: string;
+    canSetCanonicalAlias?: boolean;
+}
+
+interface IState {
+    isRoomPublished: boolean;
+}
+
+@replaceableComponent("views.room_settings.RoomPublishSetting")
+export default class RoomPublishSetting extends React.PureComponent<IProps, IState> {
+    constructor(props, context) {
+        super(props, context);
+
+        this.state = {
+            isRoomPublished: false,
+        };
+    }
+
+    private onRoomPublishChange = (e) => {
+        const valueBefore = this.state.isRoomPublished;
+        const newValue = !valueBefore;
+        this.setState({ isRoomPublished: newValue });
+        const client = MatrixClientPeg.get();
+
+        client.setRoomDirectoryVisibility(
+            this.props.roomId,
+            newValue ? Visibility.Public : Visibility.Private,
+        ).catch(() => {
+            // Roll back the local echo on the change
+            this.setState({ isRoomPublished: valueBefore });
+        });
+    };
+
+    componentDidMount() {
+        const client = MatrixClientPeg.get();
+        client.getRoomDirectoryVisibility(this.props.roomId).then((result => {
+            this.setState({ isRoomPublished: result.visibility === 'public' });
+        }));
+    }
+
+    render() {
+        const client = MatrixClientPeg.get();
+
+        const enabled = (
+            DirectoryCustomisations.requireCanonicalAliasAccessToPublish?.() === false ||
+            this.props.canSetCanonicalAlias
+        );
+
+        return (
+            <LabelledToggleSwitch value={this.state.isRoomPublished}
+                onChange={this.onRoomPublishChange}
+                disabled={!enabled}
+                label={_t("Publish this room to the public in %(domain)s's room directory?", {
+                    domain: client.getDomain(),
+                })}
+            />
+        );
+    }
+}
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.tsx
similarity index 83%
rename from src/components/views/room_settings/UrlPreviewSettings.js
rename to src/components/views/room_settings/UrlPreviewSettings.tsx
index f797ffeb96..bb639b691a 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.tsx
@@ -18,30 +18,29 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from "../../../index";
 import { _t, _td } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import dis from "../../../dispatcher/dispatcher";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {Action} from "../../../dispatcher/actions";
-import {SettingLevel} from "../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { Action } from "../../../dispatcher/actions";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { Room } from "matrix-js-sdk/src/models/room";
+import SettingsFlag from "../elements/SettingsFlag";
+
+interface IProps {
+    room: Room;
+}
 
 @replaceableComponent("views.room_settings.UrlPreviewSettings")
-export default class UrlPreviewSettings extends React.Component {
-    static propTypes = {
-        room: PropTypes.object,
-    };
-
-    _onClickUserSettings = (e) => {
+export default class UrlPreviewSettings extends React.Component<IProps> {
+    private onClickUserSettings = (e: React.MouseEvent): void => {
         e.preventDefault();
         e.stopPropagation();
         dis.fire(Action.ViewUserSettings);
     };
 
-    render() {
-        const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
+    public render(): JSX.Element {
         const roomId = this.props.room.roomId;
         const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId);
 
@@ -54,18 +53,18 @@ export default class UrlPreviewSettings extends React.Component {
             if (accountEnabled) {
                 previewsForAccount = (
                     _t("You have <a>enabled</a> URL previews by default.", {}, {
-                        'a': (sub)=><a onClick={this._onClickUserSettings} href=''>{ sub }</a>,
+                        'a': (sub)=><a onClick={this.onClickUserSettings} href=''>{ sub }</a>,
                     })
                 );
             } else {
                 previewsForAccount = (
                     _t("You have <a>disabled</a> URL previews by default.", {}, {
-                        'a': (sub)=><a onClick={this._onClickUserSettings} href=''>{ sub }</a>,
+                        'a': (sub)=><a onClick={this.onClickUserSettings} href=''>{ sub }</a>,
                     })
                 );
             }
 
-            if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
+            if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, SettingLevel.ROOM)) {
                 previewsForRoom = (
                     <label>
                         <SettingsFlag
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.tsx
similarity index 72%
rename from src/components/views/rooms/AppsDrawer.js
rename to src/components/views/rooms/AppsDrawer.tsx
index 693ec8bc80..4c6b8db02e 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.tsx
@@ -16,9 +16,8 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {Resizable} from "re-resizable";
+import { Resizable } from "re-resizable";
 
 import AppTile from '../elements/AppTile';
 import dis from '../../../dispatcher/dispatcher';
@@ -26,78 +25,83 @@ import * as sdk from '../../../index';
 import * as ScalarMessaging from '../../../ScalarMessaging';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import WidgetEchoStore from "../../../stores/WidgetEchoStore";
-import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import SettingsStore from "../../../settings/SettingsStore";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
 import ResizeHandle from "../elements/ResizeHandle";
 import Resizer from "../../../resizer/resizer";
 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";
+import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
+import { clamp, percentageOf, percentageWithin } from "../../../utils/numbers";
+import { useStateCallback } from "../../../hooks/useStateCallback";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { IApp } from "../../../stores/WidgetStore";
+import { ActionPayload } from "../../../dispatcher/payloads";
+
+interface IProps {
+    userId: string;
+    room: Room;
+    resizeNotifier: ResizeNotifier;
+    showApps?: boolean; // Should apps be rendered
+    maxHeight: number;
+}
+
+interface IState {
+    apps: IApp[];
+    resizingVertical: boolean; // true when changing the height of the apps drawer
+    resizingHorizontal: boolean; // true when chagning the distribution of the width between widgets
+    resizing: boolean;
+}
 
 @replaceableComponent("views.rooms.AppsDrawer")
-export default class AppsDrawer extends React.Component {
-    static propTypes = {
-        userId: PropTypes.string.isRequired,
-        room: PropTypes.object.isRequired,
-        resizeNotifier: PropTypes.instanceOf(ResizeNotifier).isRequired,
-        showApps: PropTypes.bool, // Should apps be rendered
-    };
-
-    static defaultProps = {
+export default class AppsDrawer extends React.Component<IProps, IState> {
+    private resizeContainer: HTMLDivElement;
+    private resizer: Resizer;
+    private dispatcherRef: string;
+    public static defaultProps: Partial<IProps> = {
         showApps: true,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
         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
+            apps: this.getApps(),
+            resizingVertical: false,
+            resizingHorizontal: false,
+            resizing: false,
         };
 
-        this._resizeContainer = null;
-        this.resizer = this._createResizer();
+        this.resizer = this.createResizer();
 
         this.props.resizeNotifier.on("isResizing", this.onIsResizing);
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         ScalarMessaging.startListening();
-        WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(this.props.room), this._updateApps);
+        WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(this.props.room), this.updateApps);
         this.dispatcherRef = dis.register(this.onAction);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         ScalarMessaging.stopListening();
-        WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(this.props.room), this._updateApps);
+        WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(this.props.room), this.updateApps);
         if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
-        if (this._resizeContainer) {
+        if (this.resizeContainer) {
             this.resizer.detach();
         }
         this.props.resizeNotifier.off("isResizing", this.onIsResizing);
     }
 
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(newProps) {
-        // Room has changed probably, update apps
-        this._updateApps();
-    }
-
-    onIsResizing = (resizing) => {
+    private onIsResizing = (resizing: boolean): void => {
         // This one is the vertical, ie. change height of apps drawer
         this.setState({ resizingVertical: resizing });
         if (!resizing) {
-            this._relaxResizer();
+            this.relaxResizer();
         }
     };
 
-    _createResizer() {
+    private createResizer(): Resizer {
         // 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 = {
@@ -107,11 +111,11 @@ export default class AppsDrawer extends React.Component {
         };
         const collapseConfig = {
             onResizeStart: () => {
-                this._resizeContainer.classList.add("mx_AppsDrawer_resizing");
+                this.resizeContainer.classList.add("mx_AppsDrawer_resizing");
                 this.setState({ resizingHorizontal: true });
             },
             onResizeStop: () => {
-                this._resizeContainer.classList.remove("mx_AppsDrawer_resizing");
+                this.resizeContainer.classList.remove("mx_AppsDrawer_resizing");
                 WidgetLayoutStore.instance.setResizerDistributions(
                     this.props.room, Container.Top,
                     this.state.apps.slice(1).map((_, i) => this.resizer.forHandleAt(i).size),
@@ -120,13 +124,13 @@ export default class AppsDrawer extends React.Component {
             },
         };
         // pass a truthy container for now, we won't call attach until we update it
-        const resizer = new Resizer({}, PercentageDistributor, collapseConfig);
+        const resizer = new Resizer(null, PercentageDistributor, collapseConfig);
         resizer.setClassNames(classNames);
         return resizer;
     }
 
-    _collectResizer = (ref) => {
-        if (this._resizeContainer) {
+    private collectResizer = (ref: HTMLDivElement): void => {
+        if (this.resizeContainer) {
             this.resizer.detach();
         }
 
@@ -134,19 +138,22 @@ export default class AppsDrawer extends React.Component {
             this.resizer.container = ref;
             this.resizer.attach();
         }
-        this._resizeContainer = ref;
-        this._loadResizerPreferences();
+        this.resizeContainer = ref;
+        this.loadResizerPreferences();
     };
 
-    _getAppsHash = (apps) => apps.map(app => app.id).join("~");
+    private getAppsHash = (apps: IApp[]): string => apps.map(app => app.id).join("~");
 
-    componentDidUpdate(prevProps, prevState) {
-        if (this._getAppsHash(this.state.apps) !== this._getAppsHash(prevState.apps)) {
-            this._loadResizerPreferences();
+    public componentDidUpdate(prevProps: IProps, prevState: IState): void {
+        if (prevProps.userId !== this.props.userId || prevProps.room !== this.props.room) {
+            // Room has changed, update apps
+            this.updateApps();
+        } else if (this.getAppsHash(this.state.apps) !== this.getAppsHash(prevState.apps)) {
+            this.loadResizerPreferences();
         }
     }
 
-    _relaxResizer = () => {
+    private relaxResizer = (): void => {
         const distributors = this.resizer.getDistributors();
 
         // relax all items if they had any overconstrained flexboxes
@@ -154,7 +161,7 @@ export default class AppsDrawer extends React.Component {
         distributors.forEach(d => d.finish());
     };
 
-    _loadResizerPreferences = () => {
+    private loadResizerPreferences = (): void => {
         const distributions = WidgetLayoutStore.instance.getResizerDistributions(this.props.room, Container.Top);
         if (this.state.apps && (this.state.apps.length - 1) === distributions.length) {
             distributions.forEach((size, i) => {
@@ -172,11 +179,11 @@ export default class AppsDrawer extends React.Component {
         }
     };
 
-    isResizing() {
+    private isResizing(): boolean {
         return this.state.resizingVertical || this.state.resizingHorizontal;
     }
 
-    onAction = (action) => {
+    private onAction = (action: ActionPayload): void => {
         const hideWidgetKey = this.props.room.roomId + '_hide_widget_drawer';
         switch (action.action) {
             case 'appsDrawer':
@@ -194,23 +201,15 @@ export default class AppsDrawer extends React.Component {
         }
     };
 
-    _getApps = () => WidgetLayoutStore.instance.getContainerWidgets(this.props.room, Container.Top);
+    private getApps = (): IApp[] => WidgetLayoutStore.instance.getContainerWidgets(this.props.room, Container.Top);
 
-    _updateApps = () => {
+    private updateApps = (): void => {
         this.setState({
-            apps: this._getApps(),
+            apps: this.getApps(),
         });
     };
 
-    _launchManageIntegrations() {
-        if (SettingsStore.getValue("feature_many_integration_managers")) {
-            IntegrationManagers.sharedInstance().openAll();
-        } else {
-            IntegrationManagers.sharedInstance().getPrimaryManager().open(this.props.room, 'add_integ');
-        }
-    }
-
-    render() {
+    public render(): JSX.Element {
         if (!this.props.showApps) return <div />;
 
         const apps = this.state.apps.map((app, index, arr) => {
@@ -261,7 +260,7 @@ export default class AppsDrawer extends React.Component {
                     className="mx_AppsContainer_resizer"
                     resizeNotifier={this.props.resizeNotifier}
                 >
-                    <div className="mx_AppsContainer" ref={this._collectResizer}>
+                    <div className="mx_AppsContainer" ref={this.collectResizer}>
                         { apps.map((app, i) => {
                             if (i < 1) return app;
                             return <React.Fragment key={app.key}>
@@ -277,7 +276,18 @@ export default class AppsDrawer extends React.Component {
     }
 }
 
-const PersistentVResizer = ({
+interface IPersistentResizerProps {
+    room: Room;
+    minHeight: number;
+    maxHeight: number;
+    className: string;
+    handleWrapperClass: string;
+    handleClass: string;
+    resizeNotifier: ResizeNotifier;
+    children: React.ReactNode;
+}
+
+const PersistentVResizer: React.FC<IPersistentResizerProps> = ({
     room,
     minHeight,
     maxHeight,
@@ -307,7 +317,7 @@ const PersistentVResizer = ({
     });
 
     return <Resizable
-        size={{height: Math.min(height, maxHeight)}}
+        size={{ height: Math.min(height, maxHeight), width: undefined }}
         minHeight={minHeight}
         maxHeight={maxHeight}
         onResizeStart={() => {
@@ -321,9 +331,9 @@ const PersistentVResizer = ({
             resizeNotifier.stopResizing();
         }}
         handleWrapperClass={handleWrapperClass}
-        handleClasses={{bottom: handleClass}}
+        handleClasses={{ bottom: handleClass }}
         className={className}
-        enable={{bottom: true}}
+        enable={{ bottom: true }}
     >
         { children }
     </Resizable>;
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 7054741da4..34909baef1 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -15,17 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef, KeyboardEvent} from 'react';
+import React, { createRef, KeyboardEvent } from 'react';
 import classNames from 'classnames';
-import {flatMap} from "lodash";
-import {ICompletion, ISelectionRange, IProviderCompletions} from '../../../autocomplete/Autocompleter';
-import {Room} from 'matrix-js-sdk/src/models/room';
+import { flatMap } from "lodash";
+import { ICompletion, ISelectionRange, IProviderCompletions } from '../../../autocomplete/Autocompleter';
+import { Room } from 'matrix-js-sdk/src/models/room';
 
 import SettingsStore from "../../../settings/SettingsStore";
 import Autocompleter from '../../../autocomplete/Autocompleter';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-const COMPOSER_SELECTED = 0;
 const MAX_PROVIDER_MATCHES = 20;
 
 export const generateCompletionDomId = (number) => `mx_Autocomplete_Completion_${number}`;
@@ -34,9 +33,9 @@ interface IProps {
     // the query string for which to show autocomplete suggestions
     query: string;
     // method invoked with range and text content when completion is confirmed
-    onConfirm: (ICompletion) => void;
+    onConfirm: (completion: ICompletion) => void;
     // method invoked when selected (if any) completion changes
-    onSelectionChange?: (ICompletion, number) => void;
+    onSelectionChange?: (partIndex: number) => void;
     selection: ISelectionRange;
     // The room in which we're autocompleting
     room: Room;
@@ -55,7 +54,7 @@ interface IState {
 export default class Autocomplete extends React.PureComponent<IProps, IState> {
     autocompleter: Autocompleter;
     queryRequested: string;
-    debounceCompletionsRequest: NodeJS.Timeout;
+    debounceCompletionsRequest: number;
     private containerRef = createRef<HTMLDivElement>();
 
     constructor(props) {
@@ -71,7 +70,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
             completionList: [],
 
             // how far down the completion list we are (THIS IS 1-INDEXED!)
-            selectionOffset: COMPOSER_SELECTED,
+            selectionOffset: 1,
 
             // whether we should show completions if they're available
             shouldShowCompletions: true,
@@ -86,7 +85,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         this.applyNewProps();
     }
 
-    private applyNewProps(oldQuery?: string, oldRoom?: Room) {
+    private applyNewProps(oldQuery?: string, oldRoom?: Room): void {
         if (oldRoom && this.props.room.roomId !== oldRoom.roomId) {
             this.autocompleter.destroy();
             this.autocompleter = new Autocompleter(this.props.room);
@@ -104,7 +103,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         this.autocompleter.destroy();
     }
 
-    complete(query: string, selection: ISelectionRange) {
+    private complete(query: string, selection: ISelectionRange): Promise<void> {
         this.queryRequested = query;
         if (this.debounceCompletionsRequest) {
             clearTimeout(this.debounceCompletionsRequest);
@@ -115,7 +114,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
                 completions: [],
                 completionList: [],
                 // Reset selected completion
-                selectionOffset: COMPOSER_SELECTED,
+                selectionOffset: 1,
                 // Hide the autocomplete box
                 hide: true,
             });
@@ -135,7 +134,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         });
     }
 
-    processQuery(query: string, selection: ISelectionRange) {
+    private processQuery(query: string, selection: ISelectionRange): Promise<void> {
         return this.autocompleter.getCompletions(
             query, selection, this.state.forceComplete, MAX_PROVIDER_MATCHES,
         ).then((completions) => {
@@ -147,30 +146,35 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         });
     }
 
-    processCompletions(completions: IProviderCompletions[]) {
+    private processCompletions(completions: IProviderCompletions[]): void {
         const completionList = flatMap(completions, (provider) => provider.completions);
 
         // Reset selection when completion list becomes empty.
-        let selectionOffset = COMPOSER_SELECTED;
+        let selectionOffset = 1;
         if (completionList.length > 0) {
             /* If the currently selected completion is still in the completion list,
              try to find it and jump to it. If not, select composer.
              */
-            const currentSelection = this.state.selectionOffset === 0 ? null :
+            const currentSelection = this.state.selectionOffset <= 1 ? null :
                 this.state.completionList[this.state.selectionOffset - 1].completion;
             selectionOffset = completionList.findIndex(
                 (completion) => completion.completion === currentSelection);
             if (selectionOffset === -1) {
-                selectionOffset = COMPOSER_SELECTED;
+                selectionOffset = 1;
             } else {
                 selectionOffset++; // selectionOffset is 1-indexed!
             }
         }
 
-        let hide = this.state.hide;
+        let hide = true;
         // If `completion.command.command` is truthy, then a provider has matched with the query
         const anyMatches = completions.some((completion) => !!completion.command.command);
-        hide = !anyMatches;
+        if (anyMatches) {
+            hide = false;
+            if (this.props.onSelectionChange) {
+                this.props.onSelectionChange(selectionOffset - 1);
+            }
+        }
 
         this.setState({
             completions,
@@ -182,25 +186,25 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         });
     }
 
-    hasSelection(): boolean {
+    public hasSelection(): boolean {
         return this.countCompletions() > 0 && this.state.selectionOffset !== 0;
     }
 
-    countCompletions(): number {
+    public countCompletions(): number {
         return this.state.completionList.length;
     }
 
     // called from MessageComposerInput
-    moveSelection(delta: number) {
+    public moveSelection(delta: number): void {
         const completionCount = this.countCompletions();
         if (completionCount === 0) return; // there are no items to move the selection through
 
         // Note: selectionOffset 0 represents the unsubstituted text, while 1 means first pill selected
-        const index = (this.state.selectionOffset + delta + completionCount + 1) % (completionCount + 1);
-        this.setSelection(index);
+        const index = (this.state.selectionOffset + delta + completionCount - 1) % completionCount;
+        this.setSelection(1 + index);
     }
 
-    onEscape(e: KeyboardEvent): boolean {
+    public onEscape(e: KeyboardEvent): boolean {
         const completionCount = this.countCompletions();
         if (completionCount === 0) {
             // autocomplete is already empty, so don't preventDefault
@@ -213,16 +217,16 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         this.hide();
     }
 
-    hide = () => {
+    private hide = (): void => {
         this.setState({
             hide: true,
-            selectionOffset: 0,
+            selectionOffset: 1,
             completions: [],
             completionList: [],
         });
     };
 
-    forceComplete() {
+    public forceComplete(): Promise<number> {
         return new Promise((resolve) => {
             this.setState({
                 forceComplete: true,
@@ -235,8 +239,13 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         });
     }
 
-    onCompletionClicked = (selectionOffset: number): boolean => {
-        if (this.countCompletions() === 0 || selectionOffset === COMPOSER_SELECTED) {
+    public onConfirmCompletion = (): void => {
+        this.onCompletionClicked(this.state.selectionOffset);
+    };
+
+    private onCompletionClicked = (selectionOffset: number): boolean => {
+        const count = this.countCompletions();
+        if (count === 0 || selectionOffset < 1 || selectionOffset > count) {
             return false;
         }
 
@@ -246,10 +255,10 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         return true;
     };
 
-    setSelection(selectionOffset: number) {
-        this.setState({selectionOffset, hide: false});
+    private setSelection(selectionOffset: number): void {
+        this.setState({ selectionOffset, hide: false });
         if (this.props.onSelectionChange) {
-            this.props.onSelectionChange(this.state.completionList[selectionOffset - 1], selectionOffset - 1);
+            this.props.onSelectionChange(selectionOffset - 1);
         }
     }
 
@@ -273,7 +282,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         const renderedCompletions = this.state.completions.map((completionResult, i) => {
             const completions = completionResult.completions.map((completion, j) => {
                 const selected = position === this.state.selectionOffset;
-                const className = classNames('mx_Autocomplete_Completion', {selected});
+                const className = classNames('mx_Autocomplete_Completion', { selected });
                 const componentPosition = position;
                 position++;
 
@@ -291,9 +300,8 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
                 });
             });
 
-
             return completions.length > 0 ? (
-                <div key={i} className="mx_Autocomplete_ProviderSection">
+                <div key={i} className="mx_Autocomplete_ProviderSection" role="presentation">
                     <div className="mx_Autocomplete_provider_name">{ completionResult.provider.getName() }</div>
                     { completionResult.provider.renderCompletions(completions) }
                 </div>
@@ -301,7 +309,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         }).filter((completion) => !!completion);
 
         return !this.state.hide && renderedCompletions.length > 0 ? (
-            <div className="mx_Autocomplete" ref={this.containerRef}>
+            <div id="mx_Autocomplete" className="mx_Autocomplete" ref={this.containerRef} role="listbox">
                 { renderedCompletions }
             </div>
         ) : null;
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 6d2ae39059..7afa29624a 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -15,48 +15,38 @@ limitations under the License.
 */
 
 import React from 'react';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import { Room } from 'matrix-js-sdk/src/models/room'
-import dis from "../../../dispatcher/dispatcher";
+import { lexicographicCompare } from 'matrix-js-sdk/src/utils';
+import { Room } from 'matrix-js-sdk/src/models/room';
+
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import AppsDrawer from './AppsDrawer';
-import classNames from 'classnames';
-import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {UIFeature} from "../../../settings/UIFeature";
-import { ResizeNotifier } from "../../../utils/ResizeNotifier";
+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";
+import { objectHasDiff } from "../../../utils/objects";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { throttle } from 'lodash';
 
 interface IProps {
     // js-sdk room object
-    room: Room,
-    userId: string,
-    showApps: boolean, // Render apps
-
-    // maxHeight attribute for the aux panel and the video
-    // therein
-    maxHeight: number,
-
-    // a callback which is called when the content of the aux panel changes
-    // content in a way that is likely to make it change size.
-    onResize: () => void,
-    fullHeight: boolean,
-
-    resizeNotifier: ResizeNotifier,
+    room: Room;
+    userId: string;
+    showApps: boolean; // Render apps
+    resizeNotifier: ResizeNotifier;
 }
 
 interface Counter {
-    title: string,
-    value: number,
-    link: string,
-    severity: string,
-    stateKey: string,
+    title: string;
+    value: number;
+    link: string;
+    severity: string;
+    stateKey: string;
 }
 
 interface IState {
-    counters: Counter[],
+    counters: Counter[];
 }
 
 @replaceableComponent("views.rooms.AuxPanel")
@@ -69,19 +59,21 @@ export default class AuxPanel extends React.Component<IProps, IState> {
         super(props);
 
         this.state = {
-            counters: this._computeCounters(),
+            counters: this.computeCounters(),
         };
     }
 
     componentDidMount() {
         const cli = MatrixClientPeg.get();
-        cli.on("RoomState.events", this._rateLimitedUpdate);
+        if (SettingsStore.getValue("feature_state_counters")) {
+            cli.on("RoomState.events", this.rateLimitedUpdate);
+        }
     }
 
     componentWillUnmount() {
         const cli = MatrixClientPeg.get();
-        if (cli) {
-            cli.removeListener("RoomState.events", this._rateLimitedUpdate);
+        if (cli && SettingsStore.getValue("feature_state_counters")) {
+            cli.removeListener("RoomState.events", this.rateLimitedUpdate);
         }
     }
 
@@ -89,37 +81,16 @@ export default class AuxPanel extends React.Component<IProps, IState> {
         return objectHasDiff(this.props, nextProps) || objectHasDiff(this.state, nextState);
     }
 
-    componentDidUpdate(prevProps, prevState) {
-        // most changes are likely to cause a resize
-        if (this.props.onResize) {
-            this.props.onResize();
-        }
-    }
+    private rateLimitedUpdate = throttle(() => {
+        this.setState({ counters: this.computeCounters() });
+    }, 500, { leading: true, trailing: true });
 
-    onConferenceNotificationClick = (ev, type) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: type,
-            room_id: this.props.room.roomId,
-        });
-        ev.stopPropagation();
-        ev.preventDefault();
-    };
-
-    _rateLimitedUpdate = new RateLimitedFunc(() => {
-        if (SettingsStore.getValue("feature_state_counters")) {
-            this.setState({counters: this._computeCounters()});
-        }
-    }, 500);
-
-    _computeCounters() {
+    private computeCounters() {
         const counters = [];
 
         if (this.props.room && SettingsStore.getValue("feature_state_counters")) {
             const stateEvs = this.props.room.currentState.getStateEvents('re.jki.counter');
-            stateEvs.sort((a, b) => {
-                return a.getStateKey() < b.getStateKey();
-            });
+            stateEvs.sort((a, b) => lexicographicCompare(a.getStateKey(), b.getStateKey()));
 
             for (const ev of stateEvs) {
                 const title = ev.getContent().title;
@@ -137,7 +108,7 @@ export default class AuxPanel extends React.Component<IProps, IState> {
                         link,
                         severity,
                         stateKey,
-                    })
+                    });
                 }
             }
         }
@@ -149,7 +120,6 @@ export default class AuxPanel extends React.Component<IProps, IState> {
         const callView = (
             <CallViewForRoom
                 roomId={this.props.room.roomId}
-                maxVideoHeight={this.props.maxHeight}
                 resizeNotifier={this.props.resizeNotifier}
             />
         );
@@ -159,7 +129,6 @@ export default class AuxPanel extends React.Component<IProps, IState> {
             appsDrawer = <AppsDrawer
                 room={this.props.room}
                 userId={this.props.userId}
-                maxHeight={this.props.maxHeight}
                 showApps={this.props.showApps}
                 resizeNotifier={this.props.resizeNotifier}
             />;
@@ -190,9 +159,9 @@ export default class AuxPanel extends React.Component<IProps, IState> {
                     <span
                         className="m_RoomView_auxPanel_stateViews_span"
                         data-severity={severity}
-                        key={ "x-" + stateKey }
+                        key={"x-" + stateKey}
                     >
-                        {span}
+                        { span }
                     </span>
                 );
 
@@ -215,21 +184,12 @@ export default class AuxPanel extends React.Component<IProps, IState> {
             }
         }
 
-        const classes = classNames({
-            "mx_RoomView_auxPanel": true,
-            "mx_RoomView_auxPanel_fullHeight": this.props.fullHeight,
-        });
-        const style: React.CSSProperties = {};
-        if (!this.props.fullHeight) {
-            style.maxHeight = this.props.maxHeight;
-        }
-
         return (
-            <AutoHideScrollbar className={classes} style={style} >
+            <AutoHideScrollbar className="mx_RoomView_auxPanel">
                 { stateViews }
+                { this.props.children }
                 { appsDrawer }
                 { callView }
-                { this.props.children }
             </AutoHideScrollbar>
         );
     }
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index e83f066bd0..edf4f515d2 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -16,45 +15,55 @@ limitations under the License.
 */
 
 import classNames from 'classnames';
-import React, {createRef, ClipboardEvent} from 'react';
-import {Room} from 'matrix-js-sdk/src/models/room';
+import React, { createRef, ClipboardEvent } from 'react';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
 
 import EditorModel from '../../../editor/model';
 import HistoryManager from '../../../editor/history';
-import {Caret, setSelection} from '../../../editor/caret';
+import { Caret, setSelection } from '../../../editor/caret';
 import {
     formatRangeAsQuote,
     formatRangeAsCode,
     toggleInlineFormat,
     replaceRangeAndMoveCaret,
 } from '../../../editor/operations';
-import {getCaretOffsetAndText, getRangeForSelection} from '../../../editor/dom';
-import Autocomplete, {generateCompletionDomId} from '../rooms/Autocomplete';
-import {getAutoCompleteCreator} from '../../../editor/parts';
-import {parsePlainTextMessage} from '../../../editor/deserialize';
-import {renderModel} from '../../../editor/render';
+import { getCaretOffsetAndText, getRangeForSelection } from '../../../editor/dom';
+import Autocomplete, { generateCompletionDomId } from '../rooms/Autocomplete';
+import { getAutoCompleteCreator, Type } from '../../../editor/parts';
+import { parseEvent, parsePlainTextMessage } from '../../../editor/deserialize';
+import { renderModel } from '../../../editor/render';
 import TypingStore from "../../../stores/TypingStore";
 import SettingsStore from "../../../settings/SettingsStore";
-import {Key} from "../../../Keyboard";
-import {EMOTICON_TO_EMOJI} from "../../../emoji";
-import {CommandCategories, CommandMap, parseCommandString} from "../../../SlashCommands";
+import { Key } from "../../../Keyboard";
+import { EMOTICON_TO_EMOJI } from "../../../emoji";
+import { CommandCategories, CommandMap, parseCommandString } from "../../../SlashCommands";
 import Range from "../../../editor/range";
-import MessageComposerFormatBar from "./MessageComposerFormatBar";
+import MessageComposerFormatBar, { Formatting } from "./MessageComposerFormatBar";
 import DocumentOffset from "../../../editor/offset";
-import {IDiff} from "../../../editor/diff";
+import { IDiff } from "../../../editor/diff";
 import AutocompleteWrapperModel from "../../../editor/autocomplete";
 import DocumentPosition from "../../../editor/position";
-import {ICompletion} from "../../../autocomplete/Autocompleter";
+import { ICompletion } from "../../../autocomplete/Autocompleter";
 import { AutocompleteAction, getKeyBindingsManager, MessageComposerAction } from '../../../KeyBindingsManager';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+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$');
+const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s|:^$');
+export const REGEX_EMOTICON = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')$');
 
 const IS_MAC = navigator.platform.indexOf("Mac") !== -1;
 
-function ctrlShortcutLabel(key) {
+const SURROUND_WITH_CHARACTERS = ["\"", "_", "`", "'", "*", "~", "$"];
+const SURROUND_WITH_DOUBLE_CHARACTERS = new Map([
+    ["(", ")"],
+    ["[", "]"],
+    ["{", "}"],
+    ["<", ">"],
+]);
+
+function ctrlShortcutLabel(key: string): string {
     return (IS_MAC ? "⌘" : "Ctrl") + "+" + key;
 }
 
@@ -80,14 +89,6 @@ function selectionEquals(a: Partial<Selection>, b: Selection): boolean {
         a.type === b.type;
 }
 
-enum Formatting {
-    Bold = "bold",
-    Italics = "italics",
-    Strikethrough = "strikethrough",
-    Code = "code",
-    Quote = "quote",
-}
-
 interface IProps {
     model: EditorModel;
     room: Room;
@@ -106,13 +107,14 @@ interface IState {
     showVisualBell?: boolean;
     autoComplete?: AutocompleteWrapperModel;
     completionIndex?: number;
+    surroundWith: boolean;
 }
 
 @replaceableComponent("views.rooms.BasicMessageEditor")
 export default class BasicMessageEditor extends React.Component<IProps, IState> {
-    private editorRef = createRef<HTMLDivElement>();
+    public readonly editorRef = createRef<HTMLDivElement>();
     private autocompleteRef = createRef<Autocomplete>();
-    private formatBarRef = createRef<typeof MessageComposerFormatBar>();
+    private formatBarRef = createRef<MessageComposerFormatBar>();
 
     private modifiedFlag = false;
     private isIMEComposing = false;
@@ -124,12 +126,15 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
 
     private readonly emoticonSettingHandle: string;
     private readonly shouldShowPillAvatarSettingHandle: string;
+    private readonly surroundWithHandle: string;
     private readonly historyManager = new HistoryManager();
 
     constructor(props) {
         super(props);
         this.state = {
             showPillAvatar: SettingsStore.getValue("Pill.shouldShowPillAvatar"),
+            surroundWith: SettingsStore.getValue("MessageComposerInput.surroundWith"),
+            showVisualBell: false,
         };
 
         this.emoticonSettingHandle = SettingsStore.watchSetting('MessageComposerInput.autoReplaceEmoji', null,
@@ -137,6 +142,8 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         this.configureEmoticonAutoReplace();
         this.shouldShowPillAvatarSettingHandle = SettingsStore.watchSetting("Pill.shouldShowPillAvatar", null,
             this.configureShouldShowPillAvatar);
+        this.surroundWithHandle = SettingsStore.watchSetting("MessageComposerInput.surroundWith", null,
+            this.surroundWithSettingChanged);
     }
 
     public componentDidUpdate(prevProps: IProps) {
@@ -146,7 +153,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         const enabledChange = this.props.disabled !== prevProps.disabled;
         const placeholderChanged = this.props.placeholder !== prevProps.placeholder;
         if (this.props.placeholder && (placeholderChanged || enabledChange)) {
-            const {isEmpty} = this.props.model;
+            const { isEmpty } = this.props.model;
             if (isEmpty) {
                 this.showPlaceholder();
             } else {
@@ -155,8 +162,8 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         }
     }
 
-    private replaceEmoticon = (caretPosition: DocumentPosition) => {
-        const {model} = this.props;
+    public replaceEmoticon(caretPosition: DocumentPosition, regex: RegExp): number {
+        const { model } = this.props;
         const range = model.startRange(caretPosition);
         // expand range max 8 characters backwards from caretPosition,
         // as a space to look for an emoticon
@@ -164,30 +171,37 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         range.expandBackwardsWhile((index, offset) => {
             const part = model.parts[index];
             n -= 1;
-            return n >= 0 && (part.type === "plain" || part.type === "pill-candidate");
+            return n >= 0 && [Type.Plain, Type.PillCandidate, Type.Newline].includes(part.type);
         });
-        const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(range.text);
+        const emoticonMatch = regex.exec(range.text);
         if (emoticonMatch) {
             const query = emoticonMatch[1].replace("-", "");
             // try both exact match and lower-case, this means that xd won't match xD but :P will match :p
             const data = EMOTICON_TO_EMOJI.get(query) || EMOTICON_TO_EMOJI.get(query.toLowerCase());
 
             if (data) {
-                const {partCreator} = model;
-                const hasPrecedingSpace = emoticonMatch[0][0] === " ";
+                const { partCreator } = model;
+                const firstMatch = emoticonMatch[0];
+                const moveStart = firstMatch[0] === " " ? 1 : 0;
+
                 // we need the range to only comprise of the emoticon
                 // because we'll replace the whole range with an emoji,
                 // so move the start forward to the start of the emoticon.
                 // Take + 1 because index is reported without the possible preceding space.
-                range.moveStart(emoticonMatch.index + (hasPrecedingSpace ? 1 : 0));
+                range.moveStartForwards(emoticonMatch.index + moveStart);
+                // If the end is a trailing space/newline move end backwards, so that we don't replace it
+                if (["\n", " "].includes(firstMatch[firstMatch.length - 1])) {
+                    range.moveEndBackwards(1);
+                }
+
                 // this returns the amount of added/removed characters during the replace
                 // so the caret position can be adjusted.
-                return range.replace([partCreator.plain(data.unicode + " ")]);
+                return range.replace([partCreator.plain(data.unicode)]);
             }
         }
-    };
+    }
 
-    private updateEditorState = (selection: Caret, inputType?: string, diff?: IDiff) => {
+    private updateEditorState = (selection: Caret, inputType?: string, diff?: IDiff): void => {
         renderModel(this.editorRef.current, this.props.model);
         if (selection) { // set the caret/selection
             try {
@@ -199,7 +213,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
             const position = selection instanceof Range ? selection.end : selection;
             this.setLastCaretFromPosition(position);
         }
-        const {isEmpty} = this.props.model;
+        const { isEmpty } = this.props.model;
         if (this.props.placeholder) {
             if (isEmpty) {
                 this.showPlaceholder();
@@ -210,13 +224,17 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         if (isEmpty) {
             this.formatBarRef.current.hide();
         }
-        this.setState({autoComplete: this.props.model.autoComplete});
+        this.setState({
+            autoComplete: this.props.model.autoComplete,
+            // if a change is happening then clear the showVisualBell
+            showVisualBell: diff ? false : this.state.showVisualBell,
+        });
         this.historyManager.tryPush(this.props.model, selection, inputType, diff);
 
         let isTyping = !this.props.model.isEmpty;
         // If the user is entering a command, only consider them typing if it is one which sends a message into the room
         if (isTyping && this.props.model.parts[0].type === "command") {
-            const {cmd} = parseCommandString(this.props.model.parts[0].text);
+            const { cmd } = parseCommandString(this.props.model.parts[0].text);
             const command = CommandMap.get(cmd);
             if (!command || !command.isEnabled() || command.category !== CommandCategories.messages) {
                 isTyping = false;
@@ -229,25 +247,25 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         }
     };
 
-    private showPlaceholder() {
+    private showPlaceholder(): void {
         // escape single quotes
         const placeholder = this.props.placeholder.replace(/'/g, '\\\'');
         this.editorRef.current.style.setProperty("--placeholder", `'${placeholder}'`);
         this.editorRef.current.classList.add("mx_BasicMessageComposer_inputEmpty");
     }
 
-    private hidePlaceholder() {
+    private hidePlaceholder(): void {
         this.editorRef.current.classList.remove("mx_BasicMessageComposer_inputEmpty");
         this.editorRef.current.style.removeProperty("--placeholder");
     }
 
-    private onCompositionStart = () => {
+    private onCompositionStart = (): void => {
         this.isIMEComposing = true;
         // even if the model is empty, the composition text shouldn't be mixed with the placeholder
         this.hidePlaceholder();
     };
 
-    private onCompositionEnd = () => {
+    private onCompositionEnd = (): void => {
         this.isIMEComposing = false;
         // some browsers (Chrome) don't fire an input event after ending a composition,
         // so trigger a model update after the composition is done by calling the input handler.
@@ -262,26 +280,26 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         const isSafari = ua.includes('safari/') && !ua.includes('chrome/');
 
         if (isSafari) {
-            this.onInput({inputType: "insertCompositionText"});
+            this.onInput({ inputType: "insertCompositionText" });
         } else {
             Promise.resolve().then(() => {
-                this.onInput({inputType: "insertCompositionText"});
+                this.onInput({ inputType: "insertCompositionText" });
             });
         }
     };
 
-    isComposing(event: React.KeyboardEvent) {
+    public isComposing(event: React.KeyboardEvent): boolean {
         // checking the event.isComposing flag just in case any browser out there
         // emits events related to the composition after compositionend
         // has been fired
         return !!(this.isIMEComposing || (event.nativeEvent && event.nativeEvent.isComposing));
     }
 
-    private onCutCopy = (event: ClipboardEvent, type: string) => {
+    private onCutCopy = (event: ClipboardEvent, type: string): void => {
         const selection = document.getSelection();
         const text = selection.toString();
         if (text) {
-            const {model} = this.props;
+            const { model } = this.props;
             const range = getRangeForSelection(this.editorRef.current, model, selection);
             const selectedParts = range.parts.map(p => p.serialize());
             event.clipboardData.setData("application/x-element-composer", JSON.stringify(selectedParts));
@@ -295,23 +313,23 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         }
     };
 
-    private onCopy = (event: ClipboardEvent) => {
+    private onCopy = (event: ClipboardEvent): void => {
         this.onCutCopy(event, "copy");
     };
 
-    private onCut = (event: ClipboardEvent) => {
+    private onCut = (event: ClipboardEvent): void => {
         this.onCutCopy(event, "cut");
     };
 
-    private onPaste = (event: ClipboardEvent<HTMLDivElement>) => {
+    private onPaste = (event: ClipboardEvent<HTMLDivElement>): boolean => {
         event.preventDefault(); // we always handle the paste ourselves
         if (this.props.onPaste && this.props.onPaste(event, this.props.model)) {
             // to prevent double handling, allow props.onPaste to skip internal onPaste
             return true;
         }
 
-        const {model} = this.props;
-        const {partCreator} = model;
+        const { model } = this.props;
+        const { partCreator } = model;
         const partsText = event.clipboardData.getData("application/x-element-composer");
         let parts;
         if (partsText) {
@@ -327,20 +345,20 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         replaceRangeAndMoveCaret(range, parts);
     };
 
-    private onInput = (event: Partial<InputEvent>) => {
+    private onInput = (event: Partial<InputEvent>): void => {
         // ignore any input while doing IME compositions
         if (this.isIMEComposing) {
             return;
         }
         this.modifiedFlag = true;
         const sel = document.getSelection();
-        const {caret, text} = getCaretOffsetAndText(this.editorRef.current, sel);
+        const { caret, text } = getCaretOffsetAndText(this.editorRef.current, sel);
         this.props.model.update(text, event.inputType, caret);
     };
 
-    private insertText(textToInsert: string, inputType = "insertText") {
+    private insertText(textToInsert: string, inputType = "insertText"): void {
         const sel = document.getSelection();
-        const {caret, text} = getCaretOffsetAndText(this.editorRef.current, sel);
+        const { caret, text } = getCaretOffsetAndText(this.editorRef.current, sel);
         const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
         caret.offset += textToInsert.length;
         this.modifiedFlag = true;
@@ -352,14 +370,14 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
     // we don't need to. But if the user is navigating the caret without input
     // we need to recalculate it, to be able to know where to insert content after
     // losing focus
-    private setLastCaretFromPosition(position: DocumentPosition) {
-        const {model} = this.props;
+    private setLastCaretFromPosition(position: DocumentPosition): void {
+        const { model } = this.props;
         this._isCaretAtEnd = position.isAtEnd(model);
         this.lastCaret = position.asOffset(model);
         this.lastSelection = cloneSelection(document.getSelection());
     }
 
-    private refreshLastCaretIfNeeded() {
+    private refreshLastCaretIfNeeded(): DocumentOffset {
         // XXX: needed when going up and down in editing messages ... not sure why yet
         // because the editors should stop doing this when when blurred ...
         // maybe it's on focus and the _editorRef isn't available yet or something.
@@ -369,46 +387,46 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         const selection = document.getSelection();
         if (!this.lastSelection || !selectionEquals(this.lastSelection, selection)) {
             this.lastSelection = cloneSelection(selection);
-            const {caret, text} = getCaretOffsetAndText(this.editorRef.current, selection);
+            const { caret, text } = getCaretOffsetAndText(this.editorRef.current, selection);
             this.lastCaret = caret;
             this._isCaretAtEnd = caret.offset === text.length;
         }
         return this.lastCaret;
     }
 
-    clearUndoHistory() {
+    public clearUndoHistory(): void {
         this.historyManager.clear();
     }
 
-    getCaret() {
+    public getCaret(): DocumentOffset {
         return this.lastCaret;
     }
 
-    isSelectionCollapsed() {
+    public isSelectionCollapsed(): boolean {
         return !this.lastSelection || this.lastSelection.isCollapsed;
     }
 
-    isCaretAtStart() {
+    public isCaretAtStart(): boolean {
         return this.getCaret().offset === 0;
     }
 
-    isCaretAtEnd() {
+    public isCaretAtEnd(): boolean {
         return this._isCaretAtEnd;
     }
 
-    private onBlur = () => {
+    private onBlur = (): void => {
         document.removeEventListener("selectionchange", this.onSelectionChange);
     };
 
-    private onFocus = () => {
+    private onFocus = (): void => {
         document.addEventListener("selectionchange", this.onSelectionChange);
         // force to recalculate
         this.lastSelection = null;
         this.refreshLastCaretIfNeeded();
     };
 
-    private onSelectionChange = () => {
-        const {isEmpty} = this.props.model;
+    private onSelectionChange = (): void => {
+        const { isEmpty } = this.props.model;
 
         this.refreshLastCaretIfNeeded();
         const selection = document.getSelection();
@@ -426,9 +444,69 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         }
     };
 
-    private onKeyDown = (event: React.KeyboardEvent) => {
+    private onKeyDown = (event: React.KeyboardEvent): void => {
         const model = this.props.model;
         let handled = false;
+
+        if (this.state.surroundWith && document.getSelection().type !== "Caret") {
+            // This surrounds the selected text with a character. This is
+            // intentionally left out of the keybinding manager as the keybinds
+            // here shouldn't be changeable
+
+            const selectionRange = getRangeForSelection(
+                this.editorRef.current,
+                this.props.model,
+                document.getSelection(),
+            );
+            // trim the range as we want it to exclude leading/trailing spaces
+            selectionRange.trim();
+
+            if ([...SURROUND_WITH_DOUBLE_CHARACTERS.keys(), ...SURROUND_WITH_CHARACTERS].includes(event.key)) {
+                this.historyManager.ensureLastChangesPushed(this.props.model);
+                this.modifiedFlag = true;
+                toggleInlineFormat(selectionRange, event.key, SURROUND_WITH_DOUBLE_CHARACTERS.get(event.key));
+                handled = true;
+            }
+        }
+
+        const autocompleteAction = getKeyBindingsManager().getAutocompleteAction(event);
+        if (model.autoComplete?.hasCompletions()) {
+            const autoComplete = model.autoComplete;
+            switch (autocompleteAction) {
+                case AutocompleteAction.ForceComplete:
+                case AutocompleteAction.Complete:
+                    autoComplete.confirmCompletion();
+                    handled = true;
+                    break;
+                case AutocompleteAction.PrevSelection:
+                    autoComplete.selectPreviousSelection();
+                    handled = true;
+                    break;
+                case AutocompleteAction.NextSelection:
+                    autoComplete.selectNextSelection();
+                    handled = true;
+                    break;
+                case AutocompleteAction.Cancel:
+                    autoComplete.onEscape(event);
+                    handled = true;
+                    break;
+                default:
+                    return; // don't preventDefault on anything else
+            }
+        } else if (autocompleteAction === AutocompleteAction.ForceComplete && !this.state.showVisualBell) {
+            // there is no current autocomplete window, try to open it
+            this.tabCompleteName();
+            handled = true;
+        } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) {
+            this.formatBarRef.current.hide();
+        }
+
+        if (handled) {
+            event.preventDefault();
+            event.stopPropagation();
+            return;
+        }
+
         const action = getKeyBindingsManager().getMessageComposerAction(event);
         switch (action) {
             case MessageComposerAction.FormatBold:
@@ -445,7 +523,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                 break;
             case MessageComposerAction.EditRedo:
                 if (this.historyManager.canRedo()) {
-                    const {parts, caret} = this.historyManager.redo();
+                    const { parts, caret } = this.historyManager.redo();
                     // pass matching inputType so historyManager doesn't push echo
                     // when invoked from rerender callback.
                     model.reset(parts, caret, "historyRedo");
@@ -454,7 +532,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                 break;
             case MessageComposerAction.EditUndo:
                 if (this.historyManager.canUndo()) {
-                    const {parts, caret} = this.historyManager.undo(this.props.model);
+                    const { parts, caret } = this.historyManager.undo(this.props.model);
                     // pass matching inputType so historyManager doesn't push echo
                     // when invoked from rerender callback.
                     model.reset(parts, caret, "historyUndo");
@@ -480,63 +558,27 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                 handled = true;
                 break;
         }
-        if (handled) {
-            event.preventDefault();
-            event.stopPropagation();
-            return;
-        }
-
-        const autocompleteAction = getKeyBindingsManager().getAutocompleteAction(event);
-        if (model.autoComplete && model.autoComplete.hasCompletions()) {
-            const autoComplete = model.autoComplete;
-            switch (autocompleteAction) {
-                case AutocompleteAction.CompleteOrPrevSelection:
-                case AutocompleteAction.PrevSelection:
-                    autoComplete.selectPreviousSelection();
-                    handled = true;
-                    break;
-                case AutocompleteAction.CompleteOrNextSelection:
-                case AutocompleteAction.NextSelection:
-                    autoComplete.selectNextSelection();
-                    handled = true;
-                    break;
-                case AutocompleteAction.Cancel:
-                    autoComplete.onEscape(event);
-                    handled = true;
-                    break;
-                default:
-                    return; // don't preventDefault on anything else
-            }
-        } else if (autocompleteAction === AutocompleteAction.CompleteOrPrevSelection
-            || autocompleteAction === AutocompleteAction.CompleteOrNextSelection) {
-            // there is no current autocomplete window, try to open it
-            this.tabCompleteName();
-            handled = true;
-        } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) {
-            this.formatBarRef.current.hide();
-        }
-
         if (handled) {
             event.preventDefault();
             event.stopPropagation();
         }
     };
 
-    private async tabCompleteName() {
+    private async tabCompleteName(): Promise<void> {
         try {
-            await new Promise<void>(resolve => this.setState({showVisualBell: false}, resolve));
-            const {model} = this.props;
+            await new Promise<void>(resolve => this.setState({ showVisualBell: false }, resolve));
+            const { model } = this.props;
             const caret = this.getCaret();
             const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
             const range = model.startRange(position);
             range.expandBackwardsWhile((index, offset, part) => {
                 return part.text[offset] !== " " && part.text[offset] !== "+" && (
-                    part.type === "plain" ||
-                    part.type === "pill-candidate" ||
-                    part.type === "command"
+                    part.type === Type.Plain ||
+                    part.type === Type.PillCandidate ||
+                    part.type === Type.Command
                 );
             });
-            const {partCreator} = model;
+            const { partCreator } = model;
             // await for auto-complete to be open
             await model.transform(() => {
                 const addedLen = range.replace([partCreator.pillCandidate(range.text)]);
@@ -547,40 +589,50 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
             if (model.autoComplete) {
                 await model.autoComplete.startSelection();
                 if (!model.autoComplete.hasSelection()) {
-                    this.setState({showVisualBell: true});
+                    this.setState({ showVisualBell: true });
                     model.autoComplete.close();
                 }
+            } else {
+                this.setState({ showVisualBell: true });
             }
         } catch (err) {
             console.error(err);
         }
     }
 
-    isModified() {
+    public isModified(): boolean {
         return this.modifiedFlag;
     }
 
-    private onAutoCompleteConfirm = (completion: ICompletion) => {
+    private onAutoCompleteConfirm = (completion: ICompletion): void => {
         this.modifiedFlag = true;
         this.props.model.autoComplete.onComponentConfirm(completion);
     };
 
-    private onAutoCompleteSelectionChange = (completion: ICompletion, completionIndex: number) => {
+    private onAutoCompleteSelectionChange = (completionIndex: number): void => {
         this.modifiedFlag = true;
-        this.props.model.autoComplete.onComponentSelectionChange(completion);
-        this.setState({completionIndex});
+        this.setState({ completionIndex });
     };
 
-    private configureEmoticonAutoReplace = () => {
-        const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
-        this.props.model.setTransformCallback(shouldReplace ? this.replaceEmoticon : null);
+    private configureEmoticonAutoReplace = (): void => {
+        this.props.model.setTransformCallback(this.transform);
     };
 
-    private configureShouldShowPillAvatar = () => {
+    private configureShouldShowPillAvatar = (): void => {
         const showPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
         this.setState({ showPillAvatar });
     };
 
+    private surroundWithSettingChanged = () => {
+        const surroundWith = SettingsStore.getValue("MessageComposerInput.surroundWith");
+        this.setState({ surroundWith });
+    };
+
+    private transform = (documentPosition: DocumentPosition): void => {
+        const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
+        if (shouldReplace) this.replaceEmoticon(documentPosition, REGEX_EMOTICON_WHITESPACE);
+    };
+
     componentWillUnmount() {
         document.removeEventListener("selectionchange", this.onSelectionChange);
         this.editorRef.current.removeEventListener("input", this.onInput, true);
@@ -588,6 +640,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         this.editorRef.current.removeEventListener("compositionend", this.onCompositionEnd, true);
         SettingsStore.unwatchSetting(this.emoticonSettingHandle);
         SettingsStore.unwatchSetting(this.shouldShowPillAvatarSettingHandle);
+        SettingsStore.unwatchSetting(this.surroundWithHandle);
     }
 
     componentDidMount() {
@@ -598,7 +651,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         // not really, but we could not serialize the parts, and just change the autoCompleter
         partCreator.setAutoCompleteCreator(getAutoCompleteCreator(
             () => this.autocompleteRef.current,
-            query => new Promise(resolve => this.setState({query}, resolve)),
+            query => new Promise(resolve => this.setState({ query }, resolve)),
         ));
         // initial render of model
         this.updateEditorState(this.getInitialCaretPosition());
@@ -610,8 +663,8 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         this.editorRef.current.focus();
     }
 
-    private getInitialCaretPosition() {
-        let caretPosition;
+    private getInitialCaretPosition(): DocumentPosition {
+        let caretPosition: DocumentPosition;
         if (this.props.initialCaret) {
             // if restoring state from a previous editor,
             // restore caret position from the state
@@ -624,7 +677,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         return caretPosition;
     }
 
-    private onFormatAction = (action: Formatting) => {
+    private onFormatAction = (action: Formatting): void => {
         const range = getRangeForSelection(this.editorRef.current, this.props.model, document.getSelection());
         // trim the range as we want it to exclude leading/trailing spaces
         range.trim();
@@ -665,7 +718,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                     query={query}
                     onConfirm={this.onAutoCompleteConfirm}
                     onSelectionChange={this.onAutoCompleteSelectionChange}
-                    selection={{beginning: true, end: queryLen, start: queryLen}}
+                    selection={{ beginning: true, end: queryLen, start: queryLen }}
                     room={this.props.room}
                 />
             </div>);
@@ -679,19 +732,24 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         });
 
         const shortcuts = {
-            bold: ctrlShortcutLabel("B"),
-            italics: ctrlShortcutLabel("I"),
-            quote: ctrlShortcutLabel(">"),
+            [Formatting.Bold]: ctrlShortcutLabel("B"),
+            [Formatting.Italics]: ctrlShortcutLabel("I"),
+            [Formatting.Quote]: ctrlShortcutLabel(">"),
         };
 
-        const {completionIndex} = this.state;
+        const { completionIndex } = this.state;
+        const hasAutocomplete = Boolean(this.state.autoComplete);
+        let activeDescendant;
+        if (hasAutocomplete && completionIndex >= 0) {
+            activeDescendant = generateCompletionDomId(completionIndex);
+        }
 
         return (<div className={wrapperClasses}>
             { autoComplete }
             <MessageComposerFormatBar ref={this.formatBarRef} onAction={this.onFormatAction} shortcuts={shortcuts} />
             <div
                 className={classes}
-                contentEditable="true"
+                contentEditable={this.props.disabled ? null : true}
                 tabIndex={0}
                 onBlur={this.onBlur}
                 onFocus={this.onFocus}
@@ -703,17 +761,65 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                 aria-label={this.props.label}
                 role="textbox"
                 aria-multiline="true"
-                aria-autocomplete="both"
+                aria-autocomplete="list"
                 aria-haspopup="listbox"
-                aria-expanded={Boolean(this.state.autoComplete)}
-                aria-activedescendant={completionIndex >= 0 ? generateCompletionDomId(completionIndex) : undefined}
+                aria-expanded={hasAutocomplete}
+                aria-owns="mx_Autocomplete"
+                aria-activedescendant={activeDescendant}
                 dir="auto"
                 aria-disabled={this.props.disabled}
             />
         </div>);
     }
 
-    focus() {
+    public focus(): void {
         this.editorRef.current.focus();
     }
+
+    public insertMention(userId: string): void {
+        this.modifiedFlag = true;
+        const { model } = this.props;
+        const { partCreator } = model;
+        const member = this.props.room.getMember(userId);
+        const displayName = member ?
+            member.rawDisplayName : userId;
+        const caret = this.getCaret();
+        const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
+        // Insert suffix only if the caret is at the start of the composer
+        const parts = partCreator.createMentionParts(caret.offset === 0, displayName, userId);
+        model.transform(() => {
+            const addedLen = model.insert(parts, position);
+            return model.positionForOffset(caret.offset + addedLen, true);
+        });
+        // refocus on composer, as we just clicked "Mention"
+        this.focus();
+    }
+
+    public insertQuotedMessage(event: MatrixEvent): void {
+        this.modifiedFlag = true;
+        const { model } = this.props;
+        const { partCreator } = model;
+        const quoteParts = parseEvent(event, partCreator, { isQuotedMessage: true });
+        // add two newlines
+        quoteParts.push(partCreator.newline());
+        quoteParts.push(partCreator.newline());
+        model.transform(() => {
+            const addedLen = model.insert(quoteParts, model.positionForOffset(0));
+            return model.positionForOffset(addedLen, true);
+        });
+        // refocus on composer, as we just clicked "Quote"
+        this.focus();
+    }
+
+    public insertPlaintext(text: string): void {
+        this.modifiedFlag = true;
+        const { model } = this.props;
+        const { partCreator } = model;
+        const caret = this.getCaret();
+        const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
+        model.transform(() => {
+            const addedLen = model.insert([partCreator.plain(text)], position);
+            return model.positionForOffset(caret.offset + addedLen, true);
+        });
+    }
 }
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.tsx
similarity index 56%
rename from src/components/views/rooms/E2EIcon.js
rename to src/components/views/rooms/E2EIcon.tsx
index d7316f198d..1a6db4606c 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.tsx
@@ -15,42 +15,52 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState} from "react";
-import PropTypes from "prop-types";
+import React, { useState } from "react";
 import classNames from 'classnames';
 
-import {_t, _td} from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import AccessibleButton from "../elements/AccessibleButton";
 import Tooltip from "../elements/Tooltip";
+import { E2EStatus } from "../../../utils/ShieldUtils";
 
-export const E2E_STATE = {
-    VERIFIED: "verified",
-    WARNING: "warning",
-    UNKNOWN: "unknown",
-    NORMAL: "normal",
-    UNAUTHENTICATED: "unauthenticated",
+export enum E2EState {
+    Verified = "verified",
+    Warning = "warning",
+    Unknown = "unknown",
+    Normal = "normal",
+    Unauthenticated = "unauthenticated",
+}
+
+const crossSigningUserTitles: { [key in E2EState]?: string } = {
+    [E2EState.Warning]: _td("This user has not verified all of their sessions."),
+    [E2EState.Normal]: _td("You have not verified this user."),
+    [E2EState.Verified]: _td("You have verified this user. This user has verified all of their sessions."),
+};
+const crossSigningRoomTitles: { [key in E2EState]?: string } = {
+    [E2EState.Warning]: _td("Someone is using an unknown session"),
+    [E2EState.Normal]: _td("This room is end-to-end encrypted"),
+    [E2EState.Verified]: _td("Everyone in this room is verified"),
 };
 
-const crossSigningUserTitles = {
-    [E2E_STATE.WARNING]: _td("This user has not verified all of their sessions."),
-    [E2E_STATE.NORMAL]: _td("You have not verified this user."),
-    [E2E_STATE.VERIFIED]: _td("You have verified this user. This user has verified all of their sessions."),
-};
-const crossSigningRoomTitles = {
-    [E2E_STATE.WARNING]: _td("Someone is using an unknown session"),
-    [E2E_STATE.NORMAL]: _td("This room is end-to-end encrypted"),
-    [E2E_STATE.VERIFIED]: _td("Everyone in this room is verified"),
-};
+interface IProps {
+    isUser?: boolean;
+    status?: E2EState | E2EStatus;
+    className?: string;
+    size?: number;
+    onClick?: () => void;
+    hideTooltip?: boolean;
+    bordered?: boolean;
+}
 
-const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip, bordered}) => {
+const E2EIcon: React.FC<IProps> = ({ isUser, status, className, size, onClick, hideTooltip, bordered }) => {
     const [hover, setHover] = useState(false);
 
     const classes = classNames({
         mx_E2EIcon: true,
         mx_E2EIcon_bordered: bordered,
-        mx_E2EIcon_warning: status === E2E_STATE.WARNING,
-        mx_E2EIcon_normal: status === E2E_STATE.NORMAL,
-        mx_E2EIcon_verified: status === E2E_STATE.VERIFIED,
+        mx_E2EIcon_warning: status === E2EState.Warning,
+        mx_E2EIcon_normal: status === E2EState.Normal,
+        mx_E2EIcon_verified: status === E2EState.Verified,
     }, className);
 
     let e2eTitle;
@@ -62,7 +72,7 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip, bordere
 
     let style;
     if (size) {
-        style = {width: `${size}px`, height: `${size}px`};
+        style = { width: `${size}px`, height: `${size}px` };
     }
 
     const onMouseOver = () => setHover(true);
@@ -92,12 +102,4 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip, bordere
     </div>;
 };
 
-E2EIcon.propTypes = {
-    isUser: PropTypes.bool,
-    status: PropTypes.oneOf(Object.values(E2E_STATE)),
-    className: PropTypes.string,
-    size: PropTypes.number,
-    onClick: PropTypes.func,
-};
-
 export default E2EIcon;
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
deleted file mode 100644
index f0980af7ae..0000000000
--- a/src/components/views/rooms/EditMessageComposer.js
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
-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.
-*/
-import React from 'react';
-import * as sdk from '../../../index';
-import {_t, _td} from '../../../languageHandler';
-import PropTypes from 'prop-types';
-import dis from '../../../dispatcher/dispatcher';
-import EditorModel from '../../../editor/model';
-import {getCaretOffsetAndText} from '../../../editor/dom';
-import {htmlSerializeIfNeeded, textSerialize, containsEmote, stripEmoteCommand} from '../../../editor/serialize';
-import {findEditableEvent} from '../../../utils/EventUtils';
-import {parseEvent} from '../../../editor/deserialize';
-import {CommandPartCreator} from '../../../editor/parts';
-import EditorStateTransfer from '../../../utils/EditorStateTransfer';
-import classNames from 'classnames';
-import {EventStatus} from 'matrix-js-sdk/src/models/event';
-import BasicMessageComposer from "./BasicMessageComposer";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {CommandCategories, getCommand} from '../../../SlashCommands';
-import {Action} from "../../../dispatcher/actions";
-import CountlyAnalytics from "../../../CountlyAnalytics";
-import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import SendHistoryManager from '../../../SendHistoryManager';
-import Modal from '../../../Modal';
-
-function _isReply(mxEvent) {
-    const relatesTo = mxEvent.getContent()["m.relates_to"];
-    const isReply = !!(relatesTo && relatesTo["m.in_reply_to"]);
-    return isReply;
-}
-
-function getHtmlReplyFallback(mxEvent) {
-    const html = mxEvent.getContent().formatted_body;
-    if (!html) {
-        return "";
-    }
-    const rootNode = new DOMParser().parseFromString(html, "text/html").body;
-    const mxReply = rootNode.querySelector("mx-reply");
-    return (mxReply && mxReply.outerHTML) || "";
-}
-
-function getTextReplyFallback(mxEvent) {
-    const body = mxEvent.getContent().body;
-    const lines = body.split("\n").map(l => l.trim());
-    if (lines.length > 2 && lines[0].startsWith("> ") && lines[1].length === 0) {
-        return `${lines[0]}\n\n`;
-    }
-    return "";
-}
-
-function createEditContent(model, editedEvent) {
-    const isEmote = containsEmote(model);
-    if (isEmote) {
-        model = stripEmoteCommand(model);
-    }
-    const isReply = _isReply(editedEvent);
-    let plainPrefix = "";
-    let htmlPrefix = "";
-
-    if (isReply) {
-        plainPrefix = getTextReplyFallback(editedEvent);
-        htmlPrefix = getHtmlReplyFallback(editedEvent);
-    }
-
-    const body = textSerialize(model);
-
-    const newContent = {
-        "msgtype": isEmote ? "m.emote" : "m.text",
-        "body": body,
-    };
-    const contentBody = {
-        msgtype: newContent.msgtype,
-        body: `${plainPrefix} * ${body}`,
-    };
-
-    const formattedBody = htmlSerializeIfNeeded(model, {forceHTML: isReply});
-    if (formattedBody) {
-        newContent.format = "org.matrix.custom.html";
-        newContent.formatted_body = formattedBody;
-        contentBody.format = newContent.format;
-        contentBody.formatted_body = `${htmlPrefix} * ${formattedBody}`;
-    }
-
-    return Object.assign({
-        "m.new_content": newContent,
-        "m.relates_to": {
-            "rel_type": "m.replace",
-            "event_id": editedEvent.getId(),
-        },
-    }, contentBody);
-}
-
-@replaceableComponent("views.rooms.EditMessageComposer")
-export default class EditMessageComposer extends React.Component {
-    static propTypes = {
-        // the message event being edited
-        editState: PropTypes.instanceOf(EditorStateTransfer).isRequired,
-    };
-
-    static contextType = MatrixClientContext;
-
-    constructor(props, context) {
-        super(props, context);
-        this.model = null;
-        this._editorRef = null;
-
-        this.state = {
-            saveDisabled: true,
-        };
-        this._createEditorModel();
-        window.addEventListener("beforeunload", this._saveStoredEditorState);
-    }
-
-    _setEditorRef = ref => {
-        this._editorRef = ref;
-    };
-
-    _getRoom() {
-        return this.context.getRoom(this.props.editState.getEvent().getRoomId());
-    }
-
-    _onKeyDown = (event) => {
-        // ignore any keypress while doing IME compositions
-        if (this._editorRef.isComposing(event)) {
-            return;
-        }
-        const action = getKeyBindingsManager().getMessageComposerAction(event);
-        switch (action) {
-            case MessageComposerAction.Send:
-                this._sendEdit();
-                event.preventDefault();
-                break;
-            case MessageComposerAction.CancelEditing:
-                this._cancelEdit();
-                break;
-            case MessageComposerAction.EditPrevMessage: {
-                if (this._editorRef.isModified() || !this._editorRef.isCaretAtStart()) {
-                    return;
-                }
-                const previousEvent = findEditableEvent(this._getRoom(), false,
-                    this.props.editState.getEvent().getId());
-                if (previousEvent) {
-                    dis.dispatch({action: 'edit_event', event: previousEvent});
-                    event.preventDefault();
-                }
-                break;
-            }
-            case MessageComposerAction.EditNextMessage: {
-                if (this._editorRef.isModified() || !this._editorRef.isCaretAtEnd()) {
-                    return;
-                }
-                const nextEvent = findEditableEvent(this._getRoom(), true, this.props.editState.getEvent().getId());
-                if (nextEvent) {
-                    dis.dispatch({action: 'edit_event', event: nextEvent});
-                } else {
-                    this._clearStoredEditorState();
-                    dis.dispatch({action: 'edit_event', event: null});
-                    dis.fire(Action.FocusComposer);
-                }
-                event.preventDefault();
-                break;
-            }
-        }
-    }
-
-    get _editorRoomKey() {
-        return `mx_edit_room_${this._getRoom().roomId}`;
-    }
-
-    get _editorStateKey() {
-        return `mx_edit_state_${this.props.editState.getEvent().getId()}`;
-    }
-
-    _cancelEdit = () => {
-        this._clearStoredEditorState();
-        dis.dispatch({action: "edit_event", event: null});
-        dis.fire(Action.FocusComposer);
-    }
-
-    get _shouldSaveStoredEditorState() {
-        return localStorage.getItem(this._editorRoomKey) !== null;
-    }
-
-    _restoreStoredEditorState(partCreator) {
-        const json = localStorage.getItem(this._editorStateKey);
-        if (json) {
-            try {
-                const {parts: serializedParts} = JSON.parse(json);
-                const parts = serializedParts.map(p => partCreator.deserializePart(p));
-                return parts;
-            } catch (e) {
-                console.error("Error parsing editing state: ", e);
-            }
-        }
-    }
-
-    _clearStoredEditorState() {
-        localStorage.removeItem(this._editorRoomKey);
-        localStorage.removeItem(this._editorStateKey);
-    }
-
-    _clearPreviousEdit() {
-        if (localStorage.getItem(this._editorRoomKey)) {
-            localStorage.removeItem(`mx_edit_state_${localStorage.getItem(this._editorRoomKey)}`);
-        }
-    }
-
-    _saveStoredEditorState() {
-        const item = SendHistoryManager.createItem(this.model);
-        this._clearPreviousEdit();
-        localStorage.setItem(this._editorRoomKey, this.props.editState.getEvent().getId());
-        localStorage.setItem(this._editorStateKey, JSON.stringify(item));
-    }
-
-    _isSlashCommand() {
-        const parts = this.model.parts;
-        const firstPart = parts[0];
-        if (firstPart) {
-            if (firstPart.type === "command" && firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")) {
-                return true;
-            }
-
-            if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")
-                && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    _isContentModified(newContent) {
-        // if nothing has changed then bail
-        const oldContent = this.props.editState.getEvent().getContent();
-        if (!this._editorRef.isModified() ||
-            (oldContent["msgtype"] === newContent["msgtype"] && oldContent["body"] === newContent["body"] &&
-            oldContent["format"] === newContent["format"] &&
-            oldContent["formatted_body"] === newContent["formatted_body"])) {
-            return false;
-        }
-        return true;
-    }
-
-    _getSlashCommand() {
-        const commandText = this.model.parts.reduce((text, part) => {
-            // use mxid to textify user pills in a command
-            if (part.type === "user-pill") {
-                return text + part.resourceId;
-            }
-            return text + part.text;
-        }, "");
-        const {cmd, args} = getCommand(commandText);
-        return [cmd, args, commandText];
-    }
-
-    async _runSlashCommand(cmd, args, roomId) {
-        const result = cmd.run(roomId, args);
-        let messageContent;
-        let error = result.error;
-        if (result.promise) {
-            try {
-                if (cmd.category === CommandCategories.messages) {
-                    messageContent = await result.promise;
-                } else {
-                    await result.promise;
-                }
-            } catch (err) {
-                error = err;
-            }
-        }
-        if (error) {
-            console.error("Command failure: %s", error);
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            // assume the error is a server error when the command is async
-            const isServerError = !!result.promise;
-            const title = isServerError ? _td("Server error") : _td("Command error");
-
-            let errText;
-            if (typeof error === 'string') {
-                errText = error;
-            } else if (error.message) {
-                errText = error.message;
-            } else {
-                errText = _t("Server unavailable, overloaded, or something else went wrong.");
-            }
-
-            Modal.createTrackedDialog(title, '', ErrorDialog, {
-                title: _t(title),
-                description: errText,
-            });
-        } else {
-            console.log("Command success.");
-            if (messageContent) return messageContent;
-        }
-    }
-
-    _sendEdit = async () => {
-        const startTime = CountlyAnalytics.getTimestamp();
-        const editedEvent = this.props.editState.getEvent();
-        const editContent = createEditContent(this.model, editedEvent);
-        const newContent = editContent["m.new_content"];
-
-        let shouldSend = true;
-
-        // If content is modified then send an updated event into the room
-        if (this._isContentModified(newContent)) {
-            const roomId = editedEvent.getRoomId();
-            if (!containsEmote(this.model) && this._isSlashCommand()) {
-                const [cmd, args, commandText] = this._getSlashCommand();
-                if (cmd) {
-                    if (cmd.category === CommandCategories.messages) {
-                        editContent["m.new_content"] = await this._runSlashCommand(cmd, args, roomId);
-                    } else {
-                        this._runSlashCommand(cmd, args, roomId);
-                        shouldSend = false;
-                    }
-                } else {
-                    // ask the user if their unknown command should be sent as a message
-                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                    const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
-                        title: _t("Unknown Command"),
-                        description: <div>
-                            <p>
-                                { _t("Unrecognised command: %(commandText)s", {commandText}) }
-                            </p>
-                            <p>
-                                { _t("You can use <code>/help</code> to list available commands. " +
-                                    "Did you mean to send this as a message?", {}, {
-                                    code: t => <code>{ t }</code>,
-                                }) }
-                            </p>
-                            <p>
-                                { _t("Hint: Begin your message with <code>//</code> to start it with a slash.", {}, {
-                                    code: t => <code>{ t }</code>,
-                                }) }
-                            </p>
-                        </div>,
-                        button: _t('Send as message'),
-                    });
-                    const [sendAnyway] = await finished;
-                    // if !sendAnyway bail to let the user edit the composer and try again
-                    if (!sendAnyway) return;
-                }
-            }
-            if (shouldSend) {
-                this._cancelPreviousPendingEdit();
-                const prom = this.context.sendMessage(roomId, editContent);
-                this._clearStoredEditorState();
-                dis.dispatch({action: "message_sent"});
-                CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, true, false, editContent);
-            }
-        }
-
-        // close the event editing and focus composer
-        dis.dispatch({action: "edit_event", event: null});
-        dis.fire(Action.FocusComposer);
-    };
-
-    _cancelPreviousPendingEdit() {
-        const originalEvent = this.props.editState.getEvent();
-        const previousEdit = originalEvent.replacingEvent();
-        if (previousEdit && (
-            previousEdit.status === EventStatus.QUEUED ||
-            previousEdit.status === EventStatus.NOT_SENT
-        )) {
-            this.context.cancelPendingEvent(previousEdit);
-        }
-    }
-
-    componentWillUnmount() {
-        // store caret and serialized parts in the
-        // editorstate so it can be restored when the remote echo event tile gets rendered
-        // in case we're currently editing a pending event
-        const sel = document.getSelection();
-        let caret;
-        if (sel.focusNode) {
-            caret = getCaretOffsetAndText(this._editorRef, sel).caret;
-        }
-        const parts = this.model.serializeParts();
-        // if caret is undefined because for some reason there isn't a valid selection,
-        // then when mounting the editor again with the same editor state,
-        // it will set the cursor at the end.
-        this.props.editState.setEditorState(caret, parts);
-        window.removeEventListener("beforeunload", this._saveStoredEditorState);
-        if (this._shouldSaveStoredEditorState) {
-            this._saveStoredEditorState();
-        }
-    }
-
-    _createEditorModel() {
-        const {editState} = this.props;
-        const room = this._getRoom();
-        const partCreator = new CommandPartCreator(room, this.context);
-        let parts;
-        if (editState.hasEditorState()) {
-            // if restoring state from a previous editor,
-            // restore serialized parts from the state
-            parts = editState.getSerializedParts().map(p => partCreator.deserializePart(p));
-        } else {
-            //otherwise, either restore serialized parts from localStorage or parse the body of the event
-            parts = this._restoreStoredEditorState(partCreator) || parseEvent(editState.getEvent(), partCreator);
-        }
-        this.model = new EditorModel(parts, partCreator);
-        this._saveStoredEditorState();
-    }
-
-    _getInitialCaretPosition() {
-        const {editState} = this.props;
-        let caretPosition;
-        if (editState.hasEditorState() && editState.getCaret()) {
-            // if restoring state from a previous editor,
-            // restore caret position from the state
-            const caret = editState.getCaret();
-            caretPosition = this.model.positionForOffset(caret.offset, caret.atNodeEnd);
-        } else {
-            // otherwise, set it at the end
-            caretPosition = this.model.getPositionAtEnd();
-        }
-        return caretPosition;
-    }
-
-    _onChange = () => {
-        if (!this.state.saveDisabled || !this._editorRef || !this._editorRef.isModified()) {
-            return;
-        }
-
-        this.setState({
-            saveDisabled: false,
-        });
-    };
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (<div className={classNames("mx_EditMessageComposer", this.props.className)} onKeyDown={this._onKeyDown}>
-            <BasicMessageComposer
-                ref={this._setEditorRef}
-                model={this.model}
-                room={this._getRoom()}
-                initialCaret={this.props.editState.getCaret()}
-                label={_t("Edit message")}
-                onChange={this._onChange}
-            />
-            <div className="mx_EditMessageComposer_buttons">
-                <AccessibleButton kind="secondary" onClick={this._cancelEdit}>{_t("Cancel")}</AccessibleButton>
-                <AccessibleButton kind="primary" onClick={this._sendEdit} disabled={this.state.saveDisabled}>
-                    {_t("Save")}
-                </AccessibleButton>
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
new file mode 100644
index 0000000000..bc1ebe881c
--- /dev/null
+++ b/src/components/views/rooms/EditMessageComposer.tsx
@@ -0,0 +1,532 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef, KeyboardEvent } from 'react';
+import classNames from 'classnames';
+import { EventStatus, IContent, MatrixEvent } from 'matrix-js-sdk/src/models/event';
+
+import { _t, _td } from '../../../languageHandler';
+import dis from '../../../dispatcher/dispatcher';
+import EditorModel from '../../../editor/model';
+import { getCaretOffsetAndText } from '../../../editor/dom';
+import { htmlSerializeIfNeeded, textSerialize, containsEmote, stripEmoteCommand } from '../../../editor/serialize';
+import { findEditableEvent } from '../../../utils/EventUtils';
+import { parseEvent } from '../../../editor/deserialize';
+import { CommandPartCreator, Part, PartCreator, Type } from '../../../editor/parts';
+import EditorStateTransfer from '../../../utils/EditorStateTransfer';
+import BasicMessageComposer, { REGEX_EMOTICON } from "./BasicMessageComposer";
+import { Command, CommandCategories, getCommand } from '../../../SlashCommands';
+import { Action } from "../../../dispatcher/actions";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import { getKeyBindingsManager, MessageComposerAction } from '../../../KeyBindingsManager';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import SendHistoryManager from '../../../SendHistoryManager';
+import Modal from '../../../Modal';
+import { MsgType } from 'matrix-js-sdk/src/@types/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import ErrorDialog from "../dialogs/ErrorDialog";
+import QuestionDialog from "../dialogs/QuestionDialog";
+import { ActionPayload } from "../../../dispatcher/payloads";
+import AccessibleButton from '../elements/AccessibleButton';
+import { createRedactEventDialog } from '../dialogs/ConfirmRedactDialog';
+import SettingsStore from "../../../settings/SettingsStore";
+
+import { logger } from "matrix-js-sdk/src/logger";
+import { withMatrixClientHOC, MatrixClientProps } from '../../../contexts/MatrixClientContext';
+import RoomContext from '../../../contexts/RoomContext';
+
+function getHtmlReplyFallback(mxEvent: MatrixEvent): string {
+    const html = mxEvent.getContent().formatted_body;
+    if (!html) {
+        return "";
+    }
+    const rootNode = new DOMParser().parseFromString(html, "text/html").body;
+    const mxReply = rootNode.querySelector("mx-reply");
+    return (mxReply && mxReply.outerHTML) || "";
+}
+
+function getTextReplyFallback(mxEvent: MatrixEvent): string {
+    const body = mxEvent.getContent().body;
+    const lines = body.split("\n").map(l => l.trim());
+    if (lines.length > 2 && lines[0].startsWith("> ") && lines[1].length === 0) {
+        return `${lines[0]}\n\n`;
+    }
+    return "";
+}
+
+function createEditContent(model: EditorModel, editedEvent: MatrixEvent): IContent {
+    const isEmote = containsEmote(model);
+    if (isEmote) {
+        model = stripEmoteCommand(model);
+    }
+    const isReply = !!editedEvent.replyEventId;
+    let plainPrefix = "";
+    let htmlPrefix = "";
+
+    if (isReply) {
+        plainPrefix = getTextReplyFallback(editedEvent);
+        htmlPrefix = getHtmlReplyFallback(editedEvent);
+    }
+
+    const body = textSerialize(model);
+
+    const newContent: IContent = {
+        "msgtype": isEmote ? MsgType.Emote : MsgType.Text,
+        "body": body,
+    };
+    const contentBody: IContent = {
+        msgtype: newContent.msgtype,
+        body: `${plainPrefix} * ${body}`,
+    };
+
+    const formattedBody = htmlSerializeIfNeeded(model, { forceHTML: isReply });
+    if (formattedBody) {
+        newContent.format = "org.matrix.custom.html";
+        newContent.formatted_body = formattedBody;
+        contentBody.format = newContent.format;
+        contentBody.formatted_body = `${htmlPrefix} * ${formattedBody}`;
+    }
+
+    return Object.assign({
+        "m.new_content": newContent,
+        "m.relates_to": {
+            "rel_type": "m.replace",
+            "event_id": editedEvent.getId(),
+        },
+    }, contentBody);
+}
+
+interface IEditMessageComposerProps extends MatrixClientProps {
+    editState: EditorStateTransfer;
+    className?: string;
+}
+interface IState {
+    saveDisabled: boolean;
+}
+
+@replaceableComponent("views.rooms.EditMessageComposer")
+class EditMessageComposer extends React.Component<IEditMessageComposerProps, IState> {
+    static contextType = RoomContext;
+    context!: React.ContextType<typeof RoomContext>;
+
+    private readonly editorRef = createRef<BasicMessageComposer>();
+    private readonly dispatcherRef: string;
+    private model: EditorModel = null;
+
+    constructor(props: IEditMessageComposerProps, context: React.ContextType<typeof RoomContext>) {
+        super(props);
+        this.context = context; // otherwise React will only set it prior to render due to type def above
+
+        const isRestored = this.createEditorModel();
+        const ev = this.props.editState.getEvent();
+        this.state = {
+            saveDisabled: !isRestored || !this.isContentModified(createEditContent(this.model, ev)["m.new_content"]),
+        };
+
+        window.addEventListener("beforeunload", this.saveStoredEditorState);
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    private getRoom(): Room {
+        return this.props.mxClient.getRoom(this.props.editState.getEvent().getRoomId());
+    }
+
+    private onKeyDown = (event: KeyboardEvent): void => {
+        // ignore any keypress while doing IME compositions
+        if (this.editorRef.current?.isComposing(event)) {
+            return;
+        }
+        const action = getKeyBindingsManager().getMessageComposerAction(event);
+        switch (action) {
+            case MessageComposerAction.Send:
+                this.sendEdit();
+                event.preventDefault();
+                break;
+            case MessageComposerAction.CancelEditing:
+                this.cancelEdit();
+                break;
+            case MessageComposerAction.EditPrevMessage: {
+                if (this.editorRef.current?.isModified() || !this.editorRef.current?.isCaretAtStart()) {
+                    return;
+                }
+                const previousEvent = findEditableEvent({
+                    events: this.events,
+                    isForward: false,
+                    fromEventId: this.props.editState.getEvent().getId(),
+                });
+                if (previousEvent) {
+                    dis.dispatch({
+                        action: Action.EditEvent,
+                        event: previousEvent,
+                        timelineRenderingType: this.context.timelineRenderingType,
+                    });
+                    event.preventDefault();
+                }
+                break;
+            }
+            case MessageComposerAction.EditNextMessage: {
+                if (this.editorRef.current?.isModified() || !this.editorRef.current?.isCaretAtEnd()) {
+                    return;
+                }
+                const nextEvent = findEditableEvent({
+                    events: this.events,
+                    isForward: true,
+                    fromEventId: this.props.editState.getEvent().getId(),
+                });
+                if (nextEvent) {
+                    dis.dispatch({
+                        action: Action.EditEvent,
+                        event: nextEvent,
+                        timelineRenderingType: this.context.timelineRenderingType,
+                    });
+                } else {
+                    this.clearStoredEditorState();
+                    dis.dispatch({
+                        action: Action.EditEvent,
+                        event: null,
+                        timelineRenderingType: this.context.timelineRenderingType,
+                    });
+                    dis.fire(Action.FocusSendMessageComposer);
+                }
+                event.preventDefault();
+                break;
+            }
+        }
+    };
+
+    private get editorRoomKey(): string {
+        return `mx_edit_room_${this.getRoom().roomId}_${this.context.timelineRenderingType}`;
+    }
+
+    private get editorStateKey(): string {
+        return `mx_edit_state_${this.props.editState.getEvent().getId()}`;
+    }
+
+    private get events(): MatrixEvent[] {
+        const liveTimelineEvents = this.context.liveTimeline.getEvents();
+        const pendingEvents = this.getRoom().getPendingEvents();
+        const isInThread = Boolean(this.props.editState.getEvent().getThread());
+        return liveTimelineEvents.concat(isInThread ? [] : pendingEvents);
+    }
+
+    private cancelEdit = (): void => {
+        this.clearStoredEditorState();
+        dis.dispatch({
+            action: Action.EditEvent,
+            event: null,
+            timelineRenderingType: this.context.timelineRenderingType,
+        });
+        dis.fire(Action.FocusSendMessageComposer);
+    };
+
+    private get shouldSaveStoredEditorState(): boolean {
+        return localStorage.getItem(this.editorRoomKey) !== null;
+    }
+
+    private restoreStoredEditorState(partCreator: PartCreator): Part[] {
+        const json = localStorage.getItem(this.editorStateKey);
+        if (json) {
+            try {
+                const { parts: serializedParts } = JSON.parse(json);
+                const parts: Part[] = serializedParts.map(p => partCreator.deserializePart(p));
+                return parts;
+            } catch (e) {
+                console.error("Error parsing editing state: ", e);
+            }
+        }
+    }
+
+    private clearStoredEditorState(): void {
+        localStorage.removeItem(this.editorRoomKey);
+        localStorage.removeItem(this.editorStateKey);
+    }
+
+    private clearPreviousEdit(): void {
+        if (localStorage.getItem(this.editorRoomKey)) {
+            localStorage.removeItem(`mx_edit_state_${localStorage.getItem(this.editorRoomKey)}`);
+        }
+    }
+
+    private saveStoredEditorState = (): void => {
+        const item = SendHistoryManager.createItem(this.model);
+        this.clearPreviousEdit();
+        localStorage.setItem(this.editorRoomKey, this.props.editState.getEvent().getId());
+        localStorage.setItem(this.editorStateKey, JSON.stringify(item));
+    };
+
+    private isSlashCommand(): boolean {
+        const parts = this.model.parts;
+        const firstPart = parts[0];
+        if (firstPart) {
+            if (firstPart.type === Type.Command && firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")) {
+                return true;
+            }
+
+            if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")
+                && (firstPart.type === Type.Plain || firstPart.type === Type.PillCandidate)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private isContentModified(newContent: IContent): boolean {
+        // if nothing has changed then bail
+        const oldContent = this.props.editState.getEvent().getContent();
+        if (oldContent["msgtype"] === newContent["msgtype"] && oldContent["body"] === newContent["body"] &&
+            oldContent["format"] === newContent["format"] &&
+            oldContent["formatted_body"] === newContent["formatted_body"]) {
+            return false;
+        }
+        return true;
+    }
+
+    private getSlashCommand(): [Command, string, string] {
+        const commandText = this.model.parts.reduce((text, part) => {
+            // use mxid to textify user pills in a command
+            if (part.type === Type.UserPill) {
+                return text + part.resourceId;
+            }
+            return text + part.text;
+        }, "");
+        const { cmd, args } = getCommand(commandText);
+        return [cmd, args, commandText];
+    }
+
+    private async runSlashCommand(cmd: Command, args: string, roomId: string): Promise<void> {
+        const result = cmd.run(roomId, args);
+        let messageContent;
+        let error = result.error;
+        if (result.promise) {
+            try {
+                if (cmd.category === CommandCategories.messages) {
+                    messageContent = await result.promise;
+                } else {
+                    await result.promise;
+                }
+            } catch (err) {
+                error = err;
+            }
+        }
+        if (error) {
+            console.error("Command failure: %s", error);
+            // assume the error is a server error when the command is async
+            const isServerError = !!result.promise;
+            const title = isServerError ? _td("Server error") : _td("Command error");
+
+            let errText;
+            if (typeof error === 'string') {
+                errText = error;
+            } else if (error.message) {
+                errText = error.message;
+            } else {
+                errText = _t("Server unavailable, overloaded, or something else went wrong.");
+            }
+
+            Modal.createTrackedDialog(title, '', ErrorDialog, {
+                title: _t(title),
+                description: errText,
+            });
+        } else {
+            logger.log("Command success.");
+            if (messageContent) return messageContent;
+        }
+    }
+
+    private sendEdit = async (): Promise<void> => {
+        const startTime = CountlyAnalytics.getTimestamp();
+        const editedEvent = this.props.editState.getEvent();
+
+        // Replace emoticon at the end of the message
+        if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+            const caret = this.editorRef.current?.getCaret();
+            const position = this.model.positionForOffset(caret.offset, caret.atNodeEnd);
+            this.editorRef.current?.replaceEmoticon(position, REGEX_EMOTICON);
+        }
+
+        const editContent = createEditContent(this.model, editedEvent);
+        const newContent = editContent["m.new_content"];
+
+        let shouldSend = true;
+
+        if (newContent?.body === '') {
+            this.cancelPreviousPendingEdit();
+            createRedactEventDialog({
+                mxEvent: editedEvent,
+            });
+            return;
+        }
+
+        // If content is modified then send an updated event into the room
+        if (this.isContentModified(newContent)) {
+            const roomId = editedEvent.getRoomId();
+            if (!containsEmote(this.model) && this.isSlashCommand()) {
+                const [cmd, args, commandText] = this.getSlashCommand();
+                if (cmd) {
+                    if (cmd.category === CommandCategories.messages) {
+                        editContent["m.new_content"] = await this.runSlashCommand(cmd, args, roomId);
+                    } else {
+                        this.runSlashCommand(cmd, args, roomId);
+                        shouldSend = false;
+                    }
+                } else {
+                    // ask the user if their unknown command should be sent as a message
+                    const { finished } = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
+                        title: _t("Unknown Command"),
+                        description: <div>
+                            <p>
+                                { _t("Unrecognised command: %(commandText)s", { commandText }) }
+                            </p>
+                            <p>
+                                { _t("You can use <code>/help</code> to list available commands. " +
+                                    "Did you mean to send this as a message?", {}, {
+                                    code: t => <code>{ t }</code>,
+                                }) }
+                            </p>
+                            <p>
+                                { _t("Hint: Begin your message with <code>//</code> to start it with a slash.", {}, {
+                                    code: t => <code>{ t }</code>,
+                                }) }
+                            </p>
+                        </div>,
+                        button: _t('Send as message'),
+                    });
+                    const [sendAnyway] = await finished;
+                    // if !sendAnyway bail to let the user edit the composer and try again
+                    if (!sendAnyway) return;
+                }
+            }
+            if (shouldSend) {
+                this.cancelPreviousPendingEdit();
+                const prom = this.props.mxClient.sendMessage(roomId, editContent);
+                this.clearStoredEditorState();
+                dis.dispatch({ action: "message_sent" });
+                CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, true, false, editContent);
+            }
+        }
+
+        // close the event editing and focus composer
+        dis.dispatch({
+            action: Action.EditEvent,
+            event: null,
+            timelineRenderingType: this.context.timelineRenderingType,
+        });
+        dis.fire(Action.FocusSendMessageComposer);
+    };
+
+    private cancelPreviousPendingEdit(): void {
+        const originalEvent = this.props.editState.getEvent();
+        const previousEdit = originalEvent.replacingEvent();
+        if (previousEdit && (
+            previousEdit.status === EventStatus.QUEUED ||
+            previousEdit.status === EventStatus.NOT_SENT
+        )) {
+            this.props.mxClient.cancelPendingEvent(previousEdit);
+        }
+    }
+
+    componentWillUnmount() {
+        // store caret and serialized parts in the
+        // editorstate so it can be restored when the remote echo event tile gets rendered
+        // in case we're currently editing a pending event
+        const sel = document.getSelection();
+        let caret;
+        if (sel.focusNode) {
+            caret = getCaretOffsetAndText(this.editorRef.current?.editorRef.current, sel).caret;
+        }
+        const parts = this.model.serializeParts();
+        // if caret is undefined because for some reason there isn't a valid selection,
+        // then when mounting the editor again with the same editor state,
+        // it will set the cursor at the end.
+        this.props.editState.setEditorState(caret, parts);
+        window.removeEventListener("beforeunload", this.saveStoredEditorState);
+        if (this.shouldSaveStoredEditorState) {
+            this.saveStoredEditorState();
+        }
+        dis.unregister(this.dispatcherRef);
+    }
+
+    private createEditorModel(): boolean {
+        const { editState } = this.props;
+        const room = this.getRoom();
+        const partCreator = new CommandPartCreator(room, this.props.mxClient);
+
+        let parts;
+        let isRestored = false;
+        if (editState.hasEditorState()) {
+            // if restoring state from a previous editor,
+            // restore serialized parts from the state
+            parts = editState.getSerializedParts().map(p => partCreator.deserializePart(p));
+        } else {
+            // otherwise, either restore serialized parts from localStorage or parse the body of the event
+            const restoredParts = this.restoreStoredEditorState(partCreator);
+            parts = restoredParts || parseEvent(editState.getEvent(), partCreator);
+            isRestored = !!restoredParts;
+        }
+        this.model = new EditorModel(parts, partCreator);
+        this.saveStoredEditorState();
+
+        return isRestored;
+    }
+
+    private onChange = (): void => {
+        if (!this.state.saveDisabled || !this.editorRef.current?.isModified()) {
+            return;
+        }
+
+        this.setState({
+            saveDisabled: false,
+        });
+    };
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === "edit_composer_insert" && this.editorRef.current) {
+            if (payload.userId) {
+                this.editorRef.current?.insertMention(payload.userId);
+            } else if (payload.event) {
+                this.editorRef.current?.insertQuotedMessage(payload.event);
+            } else if (payload.text) {
+                this.editorRef.current?.insertPlaintext(payload.text);
+            }
+        } else if (payload.action === Action.FocusEditMessageComposer && this.editorRef.current) {
+            this.editorRef.current.focus();
+        }
+    };
+
+    render() {
+        return (<div className={classNames("mx_EditMessageComposer", this.props.className)} onKeyDown={this.onKeyDown}>
+            <BasicMessageComposer
+                ref={this.editorRef}
+                model={this.model}
+                room={this.getRoom()}
+                initialCaret={this.props.editState.getCaret()}
+                label={_t("Edit message")}
+                onChange={this.onChange}
+            />
+            <div className="mx_EditMessageComposer_buttons">
+                <AccessibleButton kind="secondary" onClick={this.cancelEdit}>
+                    { _t("Cancel") }
+                </AccessibleButton>
+                <AccessibleButton kind="primary" onClick={this.sendEdit} disabled={this.state.saveDisabled}>
+                    { _t("Save") }
+                </AccessibleButton>
+            </div>
+        </div>);
+    }
+}
+
+const EditMessageComposerWithMatrixClient = withMatrixClientHOC(EditMessageComposer);
+export default EditMessageComposerWithMatrixClient;
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.tsx
similarity index 69%
rename from src/components/views/rooms/EntityTile.js
rename to src/components/views/rooms/EntityTile.tsx
index a92d87643c..d7dd4b1092 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.tsx
@@ -17,13 +17,23 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
-import { _t } from '../../../languageHandler';
+import { _td } from '../../../languageHandler';
 import classNames from "classnames";
-import E2EIcon from './E2EIcon';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import E2EIcon, { E2EState } from './E2EIcon';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import BaseAvatar from '../avatars/BaseAvatar';
+import PresenceLabel from "./PresenceLabel";
+
+export enum PowerStatus {
+    Admin = "admin",
+    Moderator = "moderator",
+}
+
+const PowerLabel: Record<PowerStatus, string> = {
+    [PowerStatus.Admin]: _td("Admin"),
+    [PowerStatus.Moderator]: _td("Mod"),
+};
 
 const PRESENCE_CLASS = {
     "offline": "mx_EntityTile_offline",
@@ -31,14 +41,14 @@ const PRESENCE_CLASS = {
     "unavailable": "mx_EntityTile_unavailable",
 };
 
-function presenceClassForMember(presenceState, lastActiveAgo, showPresence) {
+function presenceClassForMember(presenceState: string, lastActiveAgo: number, showPresence: boolean): string {
     if (showPresence === false) {
         return 'mx_EntityTile_online_beenactive';
     }
 
     // offline is split into two categories depending on whether we have
     // a last_active_ago for them.
-    if (presenceState == 'offline') {
+    if (presenceState === 'offline') {
         if (lastActiveAgo) {
             return PRESENCE_CLASS['offline'] + '_beenactive';
         } else {
@@ -51,29 +61,32 @@ function presenceClassForMember(presenceState, lastActiveAgo, showPresence) {
     }
 }
 
-@replaceableComponent("views.rooms.EntityTile")
-class EntityTile extends React.Component {
-    static propTypes = {
-        name: PropTypes.string,
-        title: PropTypes.string,
-        avatarJsx: PropTypes.any, // <BaseAvatar />
-        className: PropTypes.string,
-        presenceState: PropTypes.string,
-        presenceLastActiveAgo: PropTypes.number,
-        presenceLastTs: PropTypes.number,
-        presenceCurrentlyActive: PropTypes.bool,
-        showInviteButton: PropTypes.bool,
-        shouldComponentUpdate: PropTypes.func,
-        onClick: PropTypes.func,
-        suppressOnHover: PropTypes.bool,
-        showPresence: PropTypes.bool,
-        subtextLabel: PropTypes.string,
-        e2eStatus: PropTypes.string,
-    };
+interface IProps {
+    name?: string;
+    title?: string;
+    avatarJsx?: JSX.Element; // <BaseAvatar />
+    className?: string;
+    presenceState?: string;
+    presenceLastActiveAgo?: number;
+    presenceLastTs?: number;
+    presenceCurrentlyActive?: boolean;
+    showInviteButton?: boolean;
+    onClick?(): void;
+    suppressOnHover?: boolean;
+    showPresence?: boolean;
+    subtextLabel?: string;
+    e2eStatus?: E2EState;
+    powerStatus?: PowerStatus;
+}
 
+interface IState {
+    hover: boolean;
+}
+
+@replaceableComponent("views.rooms.EntityTile")
+export default class EntityTile extends React.PureComponent<IProps, IState> {
     static defaultProps = {
-        shouldComponentUpdate: function(nextProps, nextState) { return true; },
-        onClick: function() {},
+        onClick: () => {},
         presenceState: "offline",
         presenceLastActiveAgo: 0,
         presenceLastTs: 0,
@@ -82,13 +95,12 @@ class EntityTile extends React.Component {
         showPresence: true,
     };
 
-    state = {
-        hover: false,
-    };
+    constructor(props: IProps) {
+        super(props);
 
-    shouldComponentUpdate(nextProps, nextState) {
-        if (this.state.hover !== nextState.hover) return true;
-        return this.props.shouldComponentUpdate(nextProps, nextState);
+        this.state = {
+            hover: false,
+        };
     }
 
     render() {
@@ -104,13 +116,12 @@ class EntityTile extends React.Component {
         mainClassNames[presenceClass] = true;
 
         let nameEl;
-        const {name} = this.props;
+        const { name } = this.props;
 
         if (!this.props.suppressOnHover) {
             const activeAgo = this.props.presenceLastActiveAgo ?
                 (Date.now() - (this.props.presenceLastTs - this.props.presenceLastActiveAgo)) : -1;
 
-            const PresenceLabel = sdk.getComponent("rooms.PresenceLabel");
             let presenceLabel = null;
             if (this.props.showPresence) {
                 presenceLabel = <PresenceLabel activeAgo={activeAgo}
@@ -118,23 +129,23 @@ class EntityTile extends React.Component {
                     presenceState={this.props.presenceState} />;
             }
             if (this.props.subtextLabel) {
-                presenceLabel = <span className="mx_EntityTile_subtext">{this.props.subtextLabel}</span>;
+                presenceLabel = <span className="mx_EntityTile_subtext">{ this.props.subtextLabel }</span>;
             }
             nameEl = (
                 <div className="mx_EntityTile_details">
                     <div className="mx_EntityTile_name" dir="auto">
                         { name }
                     </div>
-                    {presenceLabel}
+                    { presenceLabel }
                 </div>
             );
         } else if (this.props.subtextLabel) {
             nameEl = (
                 <div className="mx_EntityTile_details">
                     <div className="mx_EntityTile_name" dir="auto">
-                        {name}
+                        { name }
                     </div>
-                    <span className="mx_EntityTile_subtext">{this.props.subtextLabel}</span>
+                    <span className="mx_EntityTile_subtext">{ this.props.subtextLabel }</span>
                 </div>
             );
         } else {
@@ -155,11 +166,8 @@ class EntityTile extends React.Component {
         let powerLabel;
         const powerStatus = this.props.powerStatus;
         if (powerStatus) {
-            const powerText = {
-                [EntityTile.POWER_STATUS_MODERATOR]: _t("Mod"),
-                [EntityTile.POWER_STATUS_ADMIN]: _t("Admin"),
-            }[powerStatus];
-            powerLabel = <div className="mx_EntityTile_power">{powerText}</div>;
+            const powerText = PowerLabel[powerStatus];
+            powerLabel = <div className="mx_EntityTile_power">{ powerText }</div>;
         }
 
         let e2eIcon;
@@ -168,14 +176,12 @@ class EntityTile extends React.Component {
             e2eIcon = <E2EIcon status={e2eStatus} isUser={true} bordered={true} />;
         }
 
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-
         const av = this.props.avatarJsx ||
             <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
 
         // The wrapping div is required to make the magic mouse listener work, for some reason.
         return (
-            <div ref={(c) => this.container = c} >
+            <div>
                 <AccessibleButton
                     className={classNames(mainClassNames)}
                     title={this.props.title}
@@ -193,8 +199,3 @@ class EntityTile extends React.Component {
         );
     }
 }
-
-EntityTile.POWER_STATUS_MODERATOR = "moderator";
-EntityTile.POWER_STATUS_ADMIN = "admin";
-
-export default EntityTile;
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 8cec067c39..2f3173fa56 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -15,47 +15,57 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, { createRef } from 'react';
 import classNames from "classnames";
-
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { Thread, ThreadEvent } from 'matrix-js-sdk/src/models/thread';
 
 import ReplyThread from "../elements/ReplyThread";
 import { _t } from '../../../languageHandler';
-import * as TextForEvent from "../../../TextForEvent";
+import { hasText } from "../../../TextForEvent";
 import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';
-import SettingsStore from "../../../settings/SettingsStore";
-import {Layout} from "../../../settings/Layout";
-import {formatTime} from "../../../DateUtils";
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
+import { Layout } from "../../../settings/Layout";
+import { formatTime } from "../../../DateUtils";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { ALL_RULE_TYPES } from "../../../mjolnir/BanList";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {E2E_STATE} from "./E2EIcon";
-import {toRem} from "../../../utils/units";
-import {WidgetType} from "../../../widgets/WidgetType";
+import { E2EState } from "./E2EIcon";
+import { toRem } from "../../../utils/units";
+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";
+import { WIDGET_LAYOUT_EVENT_TYPE } from "../../../stores/widgets/WidgetLayoutStore";
+import { objectHasDiff } from "../../../utils/objects";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Tooltip from "../elements/Tooltip";
-import { EditorStateTransfer } from "../../../utils/EditorStateTransfer";
+import EditorStateTransfer from "../../../utils/EditorStateTransfer";
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
-import {StaticNotificationState} from "../../../stores/notifications/StaticNotificationState";
+import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
 import NotificationBadge from "./NotificationBadge";
+import CallEventGrouper from "../../structures/CallEventGrouper";
+import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
+import { Action } from '../../../dispatcher/actions';
+import MemberAvatar from '../avatars/MemberAvatar';
+import SenderProfile from '../messages/SenderProfile';
+import MessageTimestamp from '../messages/MessageTimestamp';
+import TooltipButton from '../elements/TooltipButton';
+import ReadReceiptMarker from "./ReadReceiptMarker";
+import MessageActionBar from "../messages/MessageActionBar";
+import ReactionsRow from '../messages/ReactionsRow';
+import { getEventDisplayInfo } from '../../../utils/EventUtils';
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
+import SettingsStore from "../../../settings/SettingsStore";
+import MKeyVerificationConclusion from "../messages/MKeyVerificationConclusion";
 
 const eventTileTypes = {
     [EventType.RoomMessage]: 'messages.MessageEvent',
     [EventType.Sticker]: 'messages.MessageEvent',
     [EventType.KeyVerificationCancel]: 'messages.MKeyVerificationConclusion',
     [EventType.KeyVerificationDone]: 'messages.MKeyVerificationConclusion',
-    [EventType.CallInvite]: 'messages.TextualEvent',
-    [EventType.CallAnswer]: 'messages.TextualEvent',
-    [EventType.CallHangup]: 'messages.TextualEvent',
-    [EventType.CallReject]: 'messages.TextualEvent',
+    [EventType.CallInvite]: 'messages.CallEvent',
 };
 
 const stateEventTileTypes = {
@@ -135,8 +145,7 @@ export function getHandlerTile(ev) {
     // XXX: This is extremely a hack. Possibly these components should have an interface for
     // declining to render?
     if (type === "m.key.verification.cancel" || type === "m.key.verification.done") {
-        const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
-        if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {
+        if (!MKeyVerificationConclusion.shouldRender(ev, ev.request)) {
             return;
         }
     }
@@ -162,8 +171,6 @@ export function getHandlerTile(ev) {
     return eventTileTypes[type];
 }
 
-const MAX_READ_AVATARS = 5;
-
 // Our component structure for EventTiles on the timeline is:
 //
 // .-EventTile------------------------------------------------.
@@ -175,12 +182,19 @@ const MAX_READ_AVATARS = 5;
 // |    '--------------------------------------'              |
 // '----------------------------------------------------------'
 
-interface IReadReceiptProps {
+export interface IReadReceiptProps {
     userId: string;
     roomMember: RoomMember;
     ts: number;
 }
 
+export enum TileShape {
+    Notif = "notif",
+    FileGrid = "file_grid",
+    Pinned = "pinned",
+    Thread = "thread",
+}
+
 interface IProps {
     // the MatrixEvent to show
     mxEvent: MatrixEvent;
@@ -230,6 +244,7 @@ interface IProps {
     // opaque readreceipt info for each userId; used by ReadReceiptMarker
     // to manage its animations. Should be an empty object when the room
     // first loads
+    // TODO: Proper typing for RR info
     readReceiptMap?: any;
 
     // A function which is used to check if the parent panel is being
@@ -247,7 +262,9 @@ interface IProps {
     // It could also be done by subclassing EventTile, but that'd be quite
     // boiilerplatey.  So just make the necessary render decisions conditional
     // for now.
-    tileShape?: 'notif' | 'file_grid' | 'reply' | 'reply_preview';
+    tileShape?: TileShape;
+
+    forExport?: boolean;
 
     // show twelve hour timestamps
     isTwelveHour?: boolean;
@@ -259,7 +276,7 @@ interface IProps {
     showReactions?: boolean;
 
     // which layout to use
-    layout: Layout;
+    layout?: Layout;
 
     // whether or not to show flair at all
     enableFlair?: boolean;
@@ -278,11 +295,20 @@ interface IProps {
     // Helper to build permalinks for the room
     permalinkCreator?: RoomPermalinkCreator;
 
+    // CallEventGrouper for this event
+    callEventGrouper?: CallEventGrouper;
+
     // Symbol of the root node
-    as?: string
+    as?: string;
 
     // whether or not to always show timestamps
-    alwaysShowTimestamps?: boolean
+    alwaysShowTimestamps?: boolean;
+
+    // whether or not to display the sender
+    hideSender?: boolean;
+
+    // whether or not to display thread info
+    showThreadInfo?: boolean;
 }
 
 interface IState {
@@ -299,19 +325,25 @@ interface IState {
     reactions: Relations;
 
     hover: boolean;
+    isQuoteExpanded?: boolean;
+    thread?: Thread;
 }
 
 @replaceableComponent("views.rooms.EventTile")
 export default class EventTile extends React.Component<IProps, IState> {
     private suppressReadReceiptAnimation: boolean;
     private isListeningForReceipts: boolean;
-    private ref: React.RefObject<unknown>;
-    private tile = React.createRef();
-    private replyThread = React.createRef();
+    // TODO: Types
+    private tile = React.createRef<unknown>();
+    private replyThread = React.createRef<ReplyThread>();
+
+    public readonly ref = createRef<HTMLElement>();
 
     static defaultProps = {
         // no-op function because onHeightChanged is optional yet some sub-components assume its existence
         onHeightChanged: function() {},
+        forExport: false,
+        layout: Layout.Group,
     };
 
     static contextType = MatrixClientContext;
@@ -333,6 +365,8 @@ export default class EventTile extends React.Component<IProps, IState> {
             reactions: this.getReactions(),
 
             hover: false,
+
+            thread: this.props.mxEvent?.getThread(),
         };
 
         // don't do RR animations until we are mounted
@@ -344,8 +378,6 @@ export default class EventTile extends React.Component<IProps, IState> {
         // 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;
-
-        this.ref = React.createRef();
     }
 
     /**
@@ -353,7 +385,7 @@ export default class EventTile extends React.Component<IProps, IState> {
      * or 'sent' receipt, for example.
      * @returns {boolean}
      */
-    private get isEligibleForSpecialReceipt() {
+    private get isEligibleForSpecialReceipt(): boolean {
         // 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;
@@ -376,7 +408,7 @@ export default class EventTile extends React.Component<IProps, IState> {
             EventType.RoomMessage,
             EventType.RoomMessageEncrypted,
         ];
-        if (!simpleSendableEvents.includes(this.props.mxEvent.getType())) return false;
+        if (!simpleSendableEvents.includes(this.props.mxEvent.getType() as EventType)) return false;
 
         // Default case
         return true;
@@ -416,7 +448,7 @@ export default class EventTile extends React.Component<IProps, IState> {
     }
 
     // TODO: [REACT-WARNING] Move into constructor
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillMount() {
         this.verifyEvent(this.props.mxEvent);
     }
@@ -424,21 +456,35 @@ export default class EventTile extends React.Component<IProps, IState> {
     componentDidMount() {
         this.suppressReadReceiptAnimation = false;
         const client = this.context;
-        client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        client.on("userTrustStatusChanged", this.onUserVerificationChanged);
-        this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
-        if (this.props.showReactions) {
-            this.props.mxEvent.on("Event.relationsCreated", this.onReactionsCreated);
+        if (!this.props.forExport) {
+            client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
+            client.on("userTrustStatusChanged", this.onUserVerificationChanged);
+            this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
+            if (this.props.showReactions) {
+                this.props.mxEvent.on("Event.relationsCreated", this.onReactionsCreated);
+            }
+
+            if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
+                client.on("Room.receipt", this.onRoomReceipt);
+                this.isListeningForReceipts = true;
+            }
         }
 
-        if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
-            client.on("Room.receipt", this.onRoomReceipt);
-            this.isListeningForReceipts = true;
+        if (SettingsStore.getValue("feature_thread")) {
+            this.props.mxEvent.once(ThreadEvent.Ready, this.updateThread);
+            this.props.mxEvent.on(ThreadEvent.Update, this.updateThread);
         }
     }
 
+    private updateThread = (thread) => {
+        this.setState({
+            thread,
+        });
+        this.forceUpdate();
+    };
+
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillReceiveProps(nextProps) {
         // re-check the sender verification as outgoing events progress through
         // the send process.
@@ -447,7 +493,7 @@ export default class EventTile extends React.Component<IProps, IState> {
         }
     }
 
-    shouldComponentUpdate(nextProps, nextState) {
+    shouldComponentUpdate(nextProps, nextState, nextContext) {
         if (objectHasDiff(this.state, nextState)) {
             return true;
         }
@@ -475,6 +521,43 @@ export default class EventTile extends React.Component<IProps, IState> {
         }
     }
 
+    private renderThreadInfo(): React.ReactNode {
+        if (!SettingsStore.getValue("feature_thread")) {
+            return null;
+        }
+
+        const thread = this.state.thread;
+        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        if (!thread || this.props.showThreadInfo === false || thread.length <= 1) {
+            return null;
+        }
+
+        const avatars = Array.from(thread.participants).map((mxId: string) => {
+            const member = room.getMember(mxId);
+            return <MemberAvatar key={member.userId} member={member} width={14} height={14} />;
+        });
+
+        return (
+            <div
+                className="mx_ThreadInfo"
+                onClick={() => {
+                    dis.dispatch({
+                        action: Action.SetRightPanelPhase,
+                        phase: RightPanelPhases.ThreadView,
+                        refireParams: {
+                            event: this.props.mxEvent,
+                        },
+                    });
+                }}
+            >
+                <span className="mx_EventListSummary_avatars">
+                    { avatars }
+                </span>
+                { thread.length - 1 } { thread.length === 2 ? 'reply' : 'replies' }
+            </div>
+        );
+    }
+
     private onRoomReceipt = (ev, room) => {
         // ignore events for other rooms
         const tileRoom = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
@@ -529,7 +612,7 @@ export default class EventTile extends React.Component<IProps, IState> {
         if (encryptionInfo.mismatchedSender) {
             // something definitely wrong is going on here
             this.setState({
-                verified: E2E_STATE.WARNING,
+                verified: E2EState.Warning,
             }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
@@ -537,7 +620,7 @@ export default class EventTile extends React.Component<IProps, IState> {
         if (!userTrust.isCrossSigningVerified()) {
             // user is not verified, so default to everything is normal
             this.setState({
-                verified: E2E_STATE.NORMAL,
+                verified: E2EState.Normal,
             }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
@@ -547,27 +630,27 @@ export default class EventTile extends React.Component<IProps, IState> {
         );
         if (!eventSenderTrust) {
             this.setState({
-                verified: E2E_STATE.UNKNOWN,
+                verified: E2EState.Unknown,
             }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
 
         if (!eventSenderTrust.isVerified()) {
             this.setState({
-                verified: E2E_STATE.WARNING,
+                verified: E2EState.Warning,
             }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
 
         if (!encryptionInfo.authenticated) {
             this.setState({
-                verified: E2E_STATE.UNAUTHENTICATED,
+                verified: E2EState.Unauthenticated,
             }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
 
         this.setState({
-            verified: E2E_STATE.VERIFIED,
+            verified: E2EState.Verified,
         }, this.props.onHeightChanged); // Decryption may have caused a change in size
     }
 
@@ -620,6 +703,7 @@ export default class EventTile extends React.Component<IProps, IState> {
     }
 
     shouldHighlight() {
+        if (this.props.forExport) return false;
         const actions = this.context.getPushActionsForEvent(this.props.mxEvent.replacingEvent() || this.props.mxEvent);
         if (!actions || !actions.tweaks) { return false; }
 
@@ -642,21 +726,31 @@ export default class EventTile extends React.Component<IProps, IState> {
             return <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
         }
 
+        const MAX_READ_AVATARS = this.props.layout == Layout.Bubble
+            ? 2
+            : 5;
+
         // return early if there are no read receipts
         if (!this.props.readReceipts || this.props.readReceipts.length === 0) {
-            return null;
+            // We currently must include `mx_EventTile_readAvatars` in the DOM
+            // of all events, as it is the positioned parent of the animated
+            // read receipts. We can't let it unmount when a receipt moves
+            // events, so for now we mount it for all events. Without it, the
+            // animation will start from the top of the timeline (because it
+            // lost its container).
+            // See also https://github.com/vector-im/element-web/issues/17561
+            return (
+                <div className="mx_EventTile_msgOption">
+                    <span className="mx_EventTile_readAvatars" />
+                </div>
+            );
         }
 
-        const ReadReceiptMarker = sdk.getComponent('rooms.ReadReceiptMarker');
         const avatars = [];
         const receiptOffset = 15;
         let left = 0;
 
-        const receipts = this.props.readReceipts || [];
-
-        if (receipts.length === 0) {
-            return null;
-        }
+        const receipts = this.props.readReceipts;
 
         for (let i = 0; i < receipts.length; ++i) {
             const receipt = receipts[i];
@@ -685,9 +779,12 @@ export default class EventTile extends React.Component<IProps, IState> {
 
             // add to the start so the most recent is on the end (ie. ends up rightmost)
             avatars.unshift(
-                <ReadReceiptMarker key={userId} member={receipt.roomMember}
+                <ReadReceiptMarker
+                    key={userId}
+                    member={receipt.roomMember}
                     fallbackUserId={userId}
-                    leftOffset={left} hidden={hidden}
+                    leftOffset={left}
+                    hidden={hidden}
                     readReceiptInfo={readReceiptInfo}
                     checkUnmounting={this.props.checkUnmounting}
                     suppressAnimation={this.suppressReadReceiptAnimation}
@@ -715,14 +812,14 @@ export default class EventTile extends React.Component<IProps, IState> {
                     { avatars }
                 </span>
             </div>
-        )
+        );
     }
 
-    onSenderProfileClick = event => {
+    onSenderProfileClick = () => {
         const mxEvent = this.props.mxEvent;
-        dis.dispatch({
-            action: 'insert_mention',
-            user_id: mxEvent.getSender(),
+        dis.dispatch<ComposerInsertPayload>({
+            action: Action.ComposerInsert,
+            userId: mxEvent.getSender(),
         });
     };
 
@@ -761,13 +858,13 @@ export default class EventTile extends React.Component<IProps, IState> {
 
         // event is encrypted, display padlock corresponding to whether or not it is verified
         if (ev.isEncrypted()) {
-            if (this.state.verified === E2E_STATE.NORMAL) {
+            if (this.state.verified === E2EState.Normal) {
                 return; // no icon if we've not even cross-signed the user
-            } else if (this.state.verified === E2E_STATE.VERIFIED) {
+            } else if (this.state.verified === E2EState.Verified) {
                 return; // no icon for verified
-            } else if (this.state.verified === E2E_STATE.UNAUTHENTICATED) {
+            } else if (this.state.verified === E2EState.Unauthenticated) {
                 return (<E2ePadlockUnauthenticated />);
-            } else if (this.state.verified === E2E_STATE.UNKNOWN) {
+            } else if (this.state.verified === E2EState.Unknown) {
                 return (<E2ePadlockUnknown />);
             } else {
                 return (<E2ePadlockUnverified />);
@@ -799,8 +896,8 @@ export default class EventTile extends React.Component<IProps, IState> {
             actionBarFocused: focused,
         });
     };
-
-    getTile = () => this.tile.current;
+    // TODO: Types
+    getTile: () => any | null = () => this.tile.current;
 
     getReplyThread = () => this.replyThread.current;
 
@@ -825,50 +922,34 @@ export default class EventTile extends React.Component<IProps, IState> {
         });
     };
 
+    private setQuoteExpanded = (expanded: boolean) => {
+        this.setState({
+            isQuoteExpanded: expanded,
+        });
+    };
     render() {
-        const MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
-        const SenderProfile = sdk.getComponent('messages.SenderProfile');
-        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+        const msgtype = this.props.mxEvent.getContent().msgtype;
+        const eventType = this.props.mxEvent.getType() as EventType;
+        const {
+            tileHandler,
+            isBubbleMessage,
+            isInfoMessage,
+            isLeftAlignedBubbleMessage,
+        } = getEventDisplayInfo(this.props.mxEvent);
+        const { isQuoteExpanded } = this.state;
 
-        //console.info("EventTile showUrlPreview for %s is %s", this.props.mxEvent.getId(), this.props.showUrlPreview);
-
-        const content = this.props.mxEvent.getContent();
-        const msgtype = content.msgtype;
-        const eventType = this.props.mxEvent.getType();
-
-        let tileHandler = getHandlerTile(this.props.mxEvent);
-
-        // Info messages are basically information about commands processed on a room
-        const isBubbleMessage = eventType.startsWith("m.key.verification") ||
-            (eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
-            (eventType === EventType.RoomCreate) ||
-            (eventType === EventType.RoomEncryption) ||
-            (tileHandler === "messages.MJitsiWidgetEvent");
-        let isInfoMessage = (
-            !isBubbleMessage && eventType !== EventType.RoomMessage &&
-            eventType !== EventType.Sticker && eventType !== EventType.RoomCreate
-        );
-
-        // If we're showing hidden events in the timeline, we should use the
-        // source tile when there's no regular tile for an event and also for
-        // replace relations (which otherwise would display as a confusing
-        // duplicate of the thing they are replacing).
-        if (SettingsStore.getValue("showHiddenEventsInTimeline") && !haveTileForEvent(this.props.mxEvent)) {
-            tileHandler = "messages.ViewSourceEvent";
-            // Reuse info message avatar and sender profile styling
-            isInfoMessage = true;
-        }
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
         if (!tileHandler) {
-            const {mxEvent} = this.props;
-            console.warn(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
+            const { mxEvent } = this.props;
+            console.warn(`Event type not supported: type:${eventType} isState:${mxEvent.isState()}`);
             return <div className="mx_EventTile mx_EventTile_info mx_MNoticeBody">
                 <div className="mx_EventTile_line">
                     { _t('This event could not be displayed') }
                 </div>
             </div>;
         }
+
         const EventTileType = sdk.getComponent(tileHandler);
 
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
@@ -878,24 +959,29 @@ export default class EventTile extends React.Component<IProps, IState> {
         const isEditing = !!this.props.editState;
         const classes = classNames({
             mx_EventTile_bubbleContainer: isBubbleMessage,
+            mx_EventTile_leftAlignedBubble: isLeftAlignedBubbleMessage,
             mx_EventTile: true,
             mx_EventTile_isEditing: isEditing,
             mx_EventTile_info: isInfoMessage,
             mx_EventTile_12hr: this.props.isTwelveHour,
             // Note: we keep the `sending` state class for tests, not for our styles
             mx_EventTile_sending: !isEditing && isSending,
-            mx_EventTile_highlight: this.props.tileShape === 'notif' ? false : this.shouldHighlight(),
+            mx_EventTile_highlight: this.props.tileShape === TileShape.Notif ? false : this.shouldHighlight(),
             mx_EventTile_selected: this.props.isSelectedEvent,
-            mx_EventTile_continuation: this.props.tileShape ? '' : this.props.continuation,
+            mx_EventTile_continuation: (
+                (this.props.tileShape ? '' : this.props.continuation) ||
+                eventType === EventType.CallInvite
+            ),
             mx_EventTile_last: this.props.last,
             mx_EventTile_lastInSection: this.props.lastInSection,
             mx_EventTile_contextual: this.props.contextual,
             mx_EventTile_actionBarFocused: this.state.actionBarFocused,
-            mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2E_STATE.VERIFIED,
-            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2E_STATE.WARNING,
-            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2E_STATE.UNKNOWN,
+            mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2EState.Verified,
+            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2EState.Warning,
+            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2EState.Unknown,
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
+            mx_EventTile_noSender: this.props.hideSender,
         });
 
         // If the tile is in the Sending state, don't speak the message.
@@ -906,12 +992,18 @@ export default class EventTile extends React.Component<IProps, IState> {
             permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
         }
 
+        // we can't use local echoes as scroll tokens, because their event IDs change.
+        // Local echos have a send "status".
+        const scrollToken = this.props.mxEvent.status
+            ? undefined
+            : this.props.mxEvent.getId();
+
         let avatar;
         let sender;
         let avatarSize;
         let needsSenderProfile;
 
-        if (this.props.tileShape === "notif") {
+        if (this.props.tileShape === TileShape.Notif) {
             avatarSize = 24;
             needsSenderProfile = true;
         } else if (tileHandler === 'messages.RoomCreate' || isBubbleMessage) {
@@ -925,8 +1017,11 @@ export default class EventTile extends React.Component<IProps, IState> {
         } else if (this.props.layout == Layout.IRC) {
             avatarSize = 14;
             needsSenderProfile = true;
-        } else if (this.props.continuation && this.props.tileShape !== "file_grid") {
-            // no avatar or sender profile for continuation messages
+        } else if (
+            (this.props.continuation && this.props.tileShape !== TileShape.FileGrid) ||
+            eventType === EventType.CallInvite
+        ) {
+            // no avatar or sender profile for continuation messages and call tiles
             avatarSize = 0;
             needsSenderProfile = false;
         } else {
@@ -946,16 +1041,18 @@ export default class EventTile extends React.Component<IProps, IState> {
             }
             avatar = (
                 <div className="mx_EventTile_avatar">
-                    <MemberAvatar member={member}
-                        width={avatarSize} height={avatarSize}
+                    <MemberAvatar
+                        member={member}
+                        width={avatarSize}
+                        height={avatarSize}
                         viewUserOnClick={true}
                     />
                 </div>
             );
         }
 
-        if (needsSenderProfile) {
-            if (!this.props.tileShape || this.props.tileShape === 'reply' || this.props.tileShape === 'reply_preview') {
+        if (needsSenderProfile && this.props.hideSender !== true) {
+            if (!this.props.tileShape) {
                 sender = <SenderProfile onClick={this.onSenderProfileClick}
                     mxEvent={this.props.mxEvent}
                     enableFlair={this.props.enableFlair}
@@ -965,17 +1062,24 @@ export default class EventTile extends React.Component<IProps, IState> {
             }
         }
 
-        const MessageActionBar = sdk.getComponent('messages.MessageActionBar');
-        const actionBar = !isEditing ? <MessageActionBar
+        const showMessageActionBar = !isEditing && !this.props.forExport;
+        const actionBar = showMessageActionBar ? <MessageActionBar
             mxEvent={this.props.mxEvent}
             reactions={this.state.reactions}
             permalinkCreator={this.props.permalinkCreator}
             getTile={this.getTile}
             getReplyThread={this.getReplyThread}
             onFocusChange={this.onActionBarFocusChange}
+            isQuoteExpanded={isQuoteExpanded}
+            toggleThreadExpanded={() => this.setQuoteExpanded(!isQuoteExpanded)}
         /> : undefined;
 
-        const showTimestamp = this.props.mxEvent.getTs() && (this.props.alwaysShowTimestamps || this.state.hover);
+        const showTimestamp = this.props.mxEvent.getTs()
+            && (this.props.alwaysShowTimestamps
+            || this.props.last
+            || this.state.hover
+            || this.state.actionBarFocused);
+
         const timestamp = showTimestamp ?
             <MessageTimestamp showTwelveHour={this.props.isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
 
@@ -1001,10 +1105,9 @@ export default class EventTile extends React.Component<IProps, IState> {
             _t(
                 '<requestLink>Re-request encryption keys</requestLink> from your other sessions.',
                 {},
-                {'requestLink': (sub) => <a onClick={this.onRequestKeysClick}>{ sub }</a>},
+                { 'requestLink': (sub) => <a onClick={this.onRequestKeysClick}>{ sub }</a> },
             );
 
-        const TooltipButton = sdk.getComponent('elements.TooltipButton');
         const keyRequestInfo = isEncryptionFailure && !isRedacted ?
             <div className="mx_EventTile_keyRequestInfo">
                 <span className="mx_EventTile_keyRequestInfo_text">
@@ -1015,7 +1118,6 @@ export default class EventTile extends React.Component<IProps, IState> {
 
         let reactionsRow;
         if (!isRedacted) {
-            const ReactionsRow = sdk.getComponent('messages.ReactionsRow');
             reactionsRow = <ReactionsRow
                 mxEvent={this.props.mxEvent}
                 reactions={this.state.reactions}
@@ -1043,125 +1145,149 @@ export default class EventTile extends React.Component<IProps, IState> {
         }
 
         switch (this.props.tileShape) {
-            case 'notif': {
+            case TileShape.Notif: {
                 const room = this.context.getRoom(this.props.mxEvent.getRoomId());
-                return (
-                    <div className={classes} aria-live={ariaLive} aria-atomic="true">
-                        <div className="mx_EventTile_roomName">
-                            <RoomAvatar room={room} width={28} height={28} />
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
-                                { room ? room.name : '' }
-                            </a>
-                        </div>
-                        <div className="mx_EventTile_senderDetails">
-                            { avatar }
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
-                                { sender }
-                                { timestamp }
-                            </a>
-                        </div>
-                        <div className="mx_EventTile_line">
-                            <EventTileType ref={this.tile}
-                                mxEvent={this.props.mxEvent}
-                                highlights={this.props.highlights}
-                                highlightLink={this.props.highlightLink}
-                                showUrlPreview={this.props.showUrlPreview}
-                                onHeightChanged={this.props.onHeightChanged}
-                            />
-                        </div>
-                    </div>
-                );
-            }
-            case 'file_grid': {
-                return (
-                    <div className={classes} aria-live={ariaLive} aria-atomic="true">
-                        <div className="mx_EventTile_line">
-                            <EventTileType ref={this.tile}
-                                mxEvent={this.props.mxEvent}
-                                highlights={this.props.highlights}
-                                highlightLink={this.props.highlightLink}
-                                showUrlPreview={this.props.showUrlPreview}
-                                tileShape={this.props.tileShape}
-                                onHeightChanged={this.props.onHeightChanged}
-                            />
-                        </div>
-                        <a
-                            className="mx_EventTile_senderDetailsLink"
-                            href={permalink}
-                            onClick={this.onPermalinkClicked}
-                        >
-                            <div className="mx_EventTile_senderDetails">
-                                { sender }
-                                { timestamp }
-                            </div>
+                return React.createElement(this.props.as || "li", {
+                    "className": classes,
+                    "aria-live": ariaLive,
+                    "aria-atomic": true,
+                    "data-scroll-tokens": scrollToken,
+                }, [
+                    <div className="mx_EventTile_roomName" key="mx_EventTile_roomName">
+                        <RoomAvatar room={room} width={28} height={28} />
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
+                            { room ? room.name : '' }
                         </a>
-                    </div>
-                );
+                    </div>,
+                    <div className="mx_EventTile_senderDetails" key="mx_EventTile_senderDetails">
+                        { avatar }
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
+                            { sender }
+                            { timestamp }
+                        </a>
+                    </div>,
+                    <div className="mx_EventTile_line" key="mx_EventTile_line">
+                        <EventTileType ref={this.tile}
+                            mxEvent={this.props.mxEvent}
+                            highlights={this.props.highlights}
+                            highlightLink={this.props.highlightLink}
+                            showUrlPreview={this.props.showUrlPreview}
+                            onHeightChanged={this.props.onHeightChanged}
+                            tileShape={this.props.tileShape}
+                            editState={this.props.editState}
+                        />
+                    </div>,
+                ]);
+            }
+            case TileShape.Thread: {
+                const room = this.context.getRoom(this.props.mxEvent.getRoomId());
+                return React.createElement(this.props.as || "li", {
+                    "className": classes,
+                    "aria-live": ariaLive,
+                    "aria-atomic": true,
+                    "data-scroll-tokens": scrollToken,
+                }, [
+                    <div className="mx_EventTile_roomName" key="mx_EventTile_roomName">
+                        <RoomAvatar room={room} width={28} height={28} />
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
+                            { room ? room.name : '' }
+                        </a>
+                    </div>,
+                    <div className="mx_EventTile_senderDetails" key="mx_EventTile_senderDetails">
+                        { avatar }
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
+                            { sender }
+                            { timestamp }
+                        </a>
+                    </div>,
+                    <div className="mx_EventTile_line" key="mx_EventTile_line">
+                        <EventTileType ref={this.tile}
+                            mxEvent={this.props.mxEvent}
+                            highlights={this.props.highlights}
+                            highlightLink={this.props.highlightLink}
+                            showUrlPreview={this.props.showUrlPreview}
+                            onHeightChanged={this.props.onHeightChanged}
+                            tileShape={this.props.tileShape}
+                            editState={this.props.editState}
+                        />
+                        { actionBar }
+                    </div>,
+                ]);
+            }
+            case TileShape.FileGrid: {
+                return React.createElement(this.props.as || "li", {
+                    "className": classes,
+                    "aria-live": ariaLive,
+                    "aria-atomic": true,
+                    "data-scroll-tokens": scrollToken,
+                }, [
+                    <div className="mx_EventTile_line" key="mx_EventTile_line">
+                        <EventTileType ref={this.tile}
+                            mxEvent={this.props.mxEvent}
+                            highlights={this.props.highlights}
+                            highlightLink={this.props.highlightLink}
+                            showUrlPreview={this.props.showUrlPreview}
+                            tileShape={this.props.tileShape}
+                            onHeightChanged={this.props.onHeightChanged}
+                            editState={this.props.editState}
+                        />
+                    </div>,
+                    <a
+                        className="mx_EventTile_senderDetailsLink"
+                        key="mx_EventTile_senderDetailsLink"
+                        href={permalink}
+                        onClick={this.onPermalinkClicked}
+                    >
+                        <div className="mx_EventTile_senderDetails">
+                            { sender }
+                            { timestamp }
+                        </div>
+                    </a>,
+                ]);
             }
 
-            case 'reply':
-            case 'reply_preview': {
-                let thread;
-                if (this.props.tileShape === 'reply_preview') {
-                    thread = ReplyThread.makeThread(
-                        this.props.mxEvent,
-                        this.props.onHeightChanged,
-                        this.props.permalinkCreator,
-                        this.replyThread,
-                    );
-                }
-                return (
-                    <div className={classes} aria-live={ariaLive} aria-atomic="true">
-                        { ircTimestamp }
-                        { avatar }
-                        { sender }
-                        { ircPadlock }
-                        <div className="mx_EventTile_reply">
-                            { groupTimestamp }
-                            { groupPadlock }
-                            { thread }
-                            <EventTileType ref={this.tile}
-                                mxEvent={this.props.mxEvent}
-                                highlights={this.props.highlights}
-                                highlightLink={this.props.highlightLink}
-                                onHeightChanged={this.props.onHeightChanged}
-                                replacingEventId={this.props.replacingEventId}
-                                showUrlPreview={false}
-                            />
-                        </div>
-                    </div>
-                );
-            }
             default: {
-                const thread = ReplyThread.makeThread(
-                    this.props.mxEvent,
-                    this.props.onHeightChanged,
-                    this.props.permalinkCreator,
-                    this.replyThread,
-                    this.props.layout,
-                );
+                const thread = haveTileForEvent(this.props.mxEvent) &&
+                    ReplyThread.hasThreadReply(this.props.mxEvent) ? (
+                        <ReplyThread
+                            parentEv={this.props.mxEvent}
+                            onHeightChanged={this.props.onHeightChanged}
+                            ref={this.replyThread}
+                            forExport={this.props.forExport}
+                            permalinkCreator={this.props.permalinkCreator}
+                            layout={this.props.layout}
+                            alwaysShowTimestamps={this.props.alwaysShowTimestamps || this.state.hover}
+                            isQuoteExpanded={isQuoteExpanded}
+                            setQuoteExpanded={this.setQuoteExpanded}
+                        />) : null;
+                const isOwnEvent = this.props.mxEvent?.sender?.userId === MatrixClientPeg.get().getUserId();
 
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
                 return (
-                    React.createElement(this.props.as || "div", {
+                    React.createElement(this.props.as || "li", {
                         "ref": this.ref,
                         "className": classes,
                         "tabIndex": -1,
                         "aria-live": ariaLive,
                         "aria-atomic": "true",
-                        "data-scroll-tokens": this.props["data-scroll-tokens"],
+                        "data-scroll-tokens": scrollToken,
+                        "data-layout": this.props.layout,
+                        "data-self": isOwnEvent,
+                        "data-has-reply": !!thread,
                         "onMouseEnter": () => this.setState({ hover: true }),
                         "onMouseLeave": () => this.setState({ hover: false }),
-                    }, [
-                        ircTimestamp,
-                        sender,
-                        ircPadlock,
+                    }, <>
+                        { ircTimestamp }
+                        { sender }
+                        { ircPadlock }
+                        { avatar }
                         <div className="mx_EventTile_line" key="mx_EventTile_line">
                             { groupTimestamp }
                             { groupPadlock }
                             { thread }
                             <EventTileType ref={this.tile}
                                 mxEvent={this.props.mxEvent}
+                                forExport={this.props.forExport}
                                 replacingEventId={this.props.replacingEventId}
                                 editState={this.props.editState}
                                 highlights={this.props.highlights}
@@ -1169,16 +1295,17 @@ export default class EventTile extends React.Component<IProps, IState> {
                                 showUrlPreview={this.props.showUrlPreview}
                                 permalinkCreator={this.props.permalinkCreator}
                                 onHeightChanged={this.props.onHeightChanged}
+                                callEventGrouper={this.props.callEventGrouper}
                             />
                             { keyRequestInfo }
-                            { reactionsRow }
                             { actionBar }
-                        </div>,
-                        msgOption,
-                        avatar,
-
-                    ])
-                )
+                            { this.props.layout === Layout.IRC && (reactionsRow) }
+                            { this.renderThreadInfo() }
+                        </div>
+                        { this.props.layout !== Layout.IRC && (reactionsRow) }
+                        { msgOption }
+                    </>)
+                );
             }
         }
     }
@@ -1186,11 +1313,11 @@ export default class EventTile extends React.Component<IProps, IState> {
 
 // XXX this'll eventually be dynamic based on the fields once we have extensible event types
 const messageTypes = ['m.room.message', 'm.sticker'];
-function isMessageEvent(ev) {
+function isMessageEvent(ev: MatrixEvent): boolean {
     return (messageTypes.includes(ev.getType()));
 }
 
-export function haveTileForEvent(e) {
+export function haveTileForEvent(e: MatrixEvent, showHiddenEvents?: boolean) {
     // Only messages have a tile (black-rectangle) if redacted
     if (e.isRedacted() && !isMessageEvent(e)) return false;
 
@@ -1200,7 +1327,7 @@ export function haveTileForEvent(e) {
     const handler = getHandlerTile(e);
     if (handler === undefined) return false;
     if (handler === 'messages.TextualEvent') {
-        return TextForEvent.textForEvent(e) !== '';
+        return hasText(e, showHiddenEvents);
     } else if (handler === 'messages.RoomCreate') {
         return Boolean(e.getContent()['predecessor']);
     } else {
@@ -1261,11 +1388,11 @@ class E2ePadlock extends React.Component<IE2ePadlockProps, IE2ePadlockState> {
     }
 
     onHoverStart = () => {
-        this.setState({hover: true});
+        this.setState({ hover: true });
     };
 
     onHoverEnd = () => {
-        this.setState({hover: false});
+        this.setState({ hover: false });
     };
 
     render() {
@@ -1280,7 +1407,7 @@ class E2ePadlock extends React.Component<IE2ePadlockProps, IE2ePadlockState> {
                 className={classes}
                 onMouseEnter={this.onHoverStart}
                 onMouseLeave={this.onHoverEnd}
-            >{tooltip}</div>
+            >{ tooltip }</div>
         );
     }
 }
@@ -1303,11 +1430,11 @@ class SentReceipt extends React.PureComponent<ISentReceiptProps, ISentReceiptSta
     }
 
     onHoverStart = () => {
-        this.setState({hover: true});
+        this.setState({ hover: true });
     };
 
     onHoverEnd = () => {
-        this.setState({hover: false});
+        this.setState({ hover: false });
     };
 
     render() {
@@ -1344,8 +1471,8 @@ class SentReceipt extends React.PureComponent<ISentReceiptProps, ISentReceiptSta
             <div className="mx_EventTile_msgOption">
                 <span className="mx_EventTile_readAvatars">
                     <span className={receiptClasses} onMouseEnter={this.onHoverStart} onMouseLeave={this.onHoverEnd}>
-                        {nonCssBadge}
-                        {tooltip}
+                        { nonCssBadge }
+                        { tooltip }
                     </span>
                 </span>
             </div>
diff --git a/src/components/views/rooms/ExtraTile.tsx b/src/components/views/rooms/ExtraTile.tsx
index 20d12955d5..e74dde3a0f 100644
--- a/src/components/views/rooms/ExtraTile.tsx
+++ b/src/components/views/rooms/ExtraTile.tsx
@@ -46,11 +46,11 @@ export default class ExtraTile extends React.Component<IProps, IState> {
     }
 
     private onTileMouseEnter = () => {
-        this.setState({hover: true});
+        this.setState({ hover: true });
     };
 
     private onTileMouseLeave = () => {
-        this.setState({hover: false});
+        this.setState({ hover: false });
     };
 
     public render(): React.ReactElement {
@@ -84,7 +84,7 @@ export default class ExtraTile extends React.Component<IProps, IState> {
         let nameContainer = (
             <div className="mx_RoomTile_nameContainer">
                 <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
-                    {name}
+                    { name }
                 </div>
             </div>
         );
@@ -106,11 +106,11 @@ export default class ExtraTile extends React.Component<IProps, IState> {
                     title={this.props.isMinimized ? name : undefined}
                 >
                     <div className="mx_RoomTile_avatarContainer">
-                        {this.props.avatar}
+                        { this.props.avatar }
                     </div>
-                    {nameContainer}
+                    { nameContainer }
                     <div className="mx_RoomTile_badgeContainer">
-                        {badge}
+                        { badge }
                     </div>
                 </Button>
             </React.Fragment>
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
deleted file mode 100644
index dd894c0dcf..0000000000
--- a/src/components/views/rooms/ForwardMessage.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright 2017 Vector Creations Ltd
- Copyright 2017 Michael Telatynski
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import {Key} from '../../../Keyboard';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.rooms.ForwardMessage")
-export default class ForwardMessage extends React.Component {
-    static propTypes = {
-        onCancelClick: PropTypes.func.isRequired,
-    };
-
-    componentDidMount() {
-        document.addEventListener('keydown', this._onKeyDown);
-    }
-
-    componentWillUnmount() {
-        document.removeEventListener('keydown', this._onKeyDown);
-    }
-
-    _onKeyDown = ev => {
-        switch (ev.key) {
-            case Key.ESCAPE:
-                this.props.onCancelClick();
-                break;
-        }
-    };
-
-    render() {
-        return (
-            <div className="mx_ForwardMessage">
-                <h1>{ _t('Please select the destination room for this message') }</h1>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/rooms/JumpToBottomButton.js b/src/components/views/rooms/JumpToBottomButton.tsx
similarity index 67%
rename from src/components/views/rooms/JumpToBottomButton.js
rename to src/components/views/rooms/JumpToBottomButton.tsx
index b6cefc1231..0b680d093d 100644
--- a/src/components/views/rooms/JumpToBottomButton.js
+++ b/src/components/views/rooms/JumpToBottomButton.tsx
@@ -14,24 +14,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from "react";
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 import classNames from 'classnames';
 
-export default (props) => {
+interface IProps {
+    numUnreadMessages: number;
+    highlight: boolean;
+    onScrollToBottomClick: (e: React.MouseEvent) => void;
+}
+
+const JumpToBottomButton: React.FC<IProps> = (props) => {
     const className = classNames({
         'mx_JumpToBottomButton': true,
         'mx_JumpToBottomButton_highlight': props.highlight,
     });
     let badge;
     if (props.numUnreadMessages) {
-        badge = (<div className="mx_JumpToBottomButton_badge">{props.numUnreadMessages}</div>);
+        badge = (<div className="mx_JumpToBottomButton_badge">{ props.numUnreadMessages }</div>);
     }
     return (<div className={className}>
-        <AccessibleButton className="mx_JumpToBottomButton_scrollDown"
+        <AccessibleButton
+            className="mx_JumpToBottomButton_scrollDown"
             title={_t("Scroll to most recent messages")}
-            onClick={props.onScrollToBottomClick}>
-        </AccessibleButton>
+            onClick={props.onScrollToBottomClick}
+        />
         { badge }
     </div>);
 };
+
+export default JumpToBottomButton;
diff --git a/src/components/views/rooms/LinkPreviewGroup.tsx b/src/components/views/rooms/LinkPreviewGroup.tsx
new file mode 100644
index 0000000000..eed13aff0f
--- /dev/null
+++ b/src/components/views/rooms/LinkPreviewGroup.tsx
@@ -0,0 +1,100 @@
+/*
+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, useEffect } from "react";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IPreviewUrlResponse, MatrixClient } from "matrix-js-sdk/src/client";
+
+import { useStateToggle } from "../../../hooks/useStateToggle";
+import LinkPreviewWidget from "./LinkPreviewWidget";
+import AccessibleButton from "../elements/AccessibleButton";
+import { _t } from "../../../languageHandler";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
+
+const INITIAL_NUM_PREVIEWS = 2;
+
+interface IProps {
+    links: string[]; // the URLs to be previewed
+    mxEvent: MatrixEvent; // the Event associated with the preview
+    onCancelClick(): void; // called when the preview's cancel ('hide') button is clicked
+    onHeightChanged(): void; // called when the preview's contents has loaded
+}
+
+const LinkPreviewGroup: React.FC<IProps> = ({ links, mxEvent, onCancelClick, onHeightChanged }) => {
+    const cli = useContext(MatrixClientContext);
+    const [expanded, toggleExpanded] = useStateToggle();
+
+    const ts = mxEvent.getTs();
+    const previews = useAsyncMemo<[string, IPreviewUrlResponse][]>(async () => {
+        return fetchPreviews(cli, links, ts);
+    }, [links, ts], []);
+
+    useEffect(() => {
+        onHeightChanged();
+    }, [onHeightChanged, expanded, previews]);
+
+    const showPreviews = expanded ? previews : previews.slice(0, INITIAL_NUM_PREVIEWS);
+
+    let toggleButton: JSX.Element;
+    if (previews.length > INITIAL_NUM_PREVIEWS) {
+        toggleButton = <AccessibleButton onClick={toggleExpanded}>
+            { expanded
+                ? _t("Collapse")
+                : _t("Show %(count)s other previews", { count: previews.length - showPreviews.length }) }
+        </AccessibleButton>;
+    }
+
+    return <div className="mx_LinkPreviewGroup">
+        { showPreviews.map(([link, preview], i) => (
+            <LinkPreviewWidget key={link} link={link} preview={preview} mxEvent={mxEvent}>
+                { i === 0 ? (
+                    <AccessibleButton
+                        className="mx_LinkPreviewGroup_hide"
+                        onClick={onCancelClick}
+                        aria-label={_t("Close preview")}
+                    >
+                        <img
+                            className="mx_filterFlipColor"
+                            alt=""
+                            role="presentation"
+                            src={require("../../../../res/img/cancel.svg")}
+                            width="18"
+                            height="18"
+                        />
+                    </AccessibleButton>
+                ): undefined }
+            </LinkPreviewWidget>
+        )) }
+        { toggleButton }
+    </div>;
+};
+
+const fetchPreviews = (cli: MatrixClient, links: string[], ts: number):
+        Promise<[string, IPreviewUrlResponse][]> => {
+    return Promise.all<[string, IPreviewUrlResponse] | void>(links.map(async link => {
+        try {
+            const preview = await cli.getUrlPreview(link, ts);
+            if (preview && Object.keys(preview).length > 0) {
+                return [link, preview];
+            }
+        } catch (error) {
+            console.error("Failed to get URL preview: " + error);
+        }
+    })).then(a => a.filter(Boolean)) as Promise<[string, IPreviewUrlResponse][]>;
+};
+
+export default LinkPreviewGroup;
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.tsx
similarity index 54%
rename from src/components/views/rooms/LinkPreviewWidget.js
rename to src/components/views/rooms/LinkPreviewWidget.tsx
index 904040a067..5e7154dc8a 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 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,79 +14,53 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { ComponentProps, createRef } from 'react';
 import { AllHtmlEntities } from 'html-entities';
-import {linkifyElement} from '../../../HtmlUtils';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { IPreviewUrlResponse } from 'matrix-js-sdk/src/client';
+
+import { linkifyElement } from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
-import { _t } from "../../../languageHandler";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import ImageView from '../elements/ImageView';
+
+interface IProps {
+    link: string;
+    preview: IPreviewUrlResponse;
+    mxEvent: MatrixEvent; // the Event associated with the preview
+}
 
 @replaceableComponent("views.rooms.LinkPreviewWidget")
-export default class LinkPreviewWidget extends React.Component {
-    static propTypes = {
-        link: PropTypes.string.isRequired, // the URL being previewed
-        mxEvent: PropTypes.object.isRequired, // the Event associated with the preview
-        onCancelClick: PropTypes.func, // called when the preview's cancel ('hide') button is clicked
-        onHeightChanged: PropTypes.func, // called when the preview's contents has loaded
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            preview: null,
-        };
-
-        this.unmounted = false;
-        MatrixClientPeg.get().getUrlPreview(this.props.link, this.props.mxEvent.getTs()).then((res)=>{
-            if (this.unmounted) {
-                return;
-            }
-            this.setState(
-                { preview: res },
-                this.props.onHeightChanged,
-            );
-        }, (error)=>{
-            console.error("Failed to get URL preview: " + error);
-        });
-
-        this._description = createRef();
-    }
+export default class LinkPreviewWidget extends React.Component<IProps> {
+    private readonly description = createRef<HTMLDivElement>();
+    private image = createRef<HTMLImageElement>();
 
     componentDidMount() {
-        if (this._description.current) {
-            linkifyElement(this._description.current);
+        if (this.description.current) {
+            linkifyElement(this.description.current);
         }
     }
 
     componentDidUpdate() {
-        if (this._description.current) {
-            linkifyElement(this._description.current);
+        if (this.description.current) {
+            linkifyElement(this.description.current);
         }
     }
 
-    componentWillUnmount() {
-        this.unmounted = true;
-    }
-
-    onImageClick = ev => {
-        const p = this.state.preview;
+    private onImageClick = ev => {
+        const p = this.props.preview;
         if (ev.button != 0 || ev.metaKey) return;
         ev.preventDefault();
-        const ImageView = sdk.getComponent("elements.ImageView");
 
         let src = p["og:image"];
         if (src && src.startsWith("mxc://")) {
             src = mediaFromMxc(src).srcHttp;
         }
 
-        const params = {
+        const params: Omit<ComponentProps<typeof ImageView>, "onFinished"> = {
             src: src,
             width: p["og:image:width"],
             height: p["og:image:height"],
@@ -96,11 +69,22 @@ export default class LinkPreviewWidget extends React.Component {
             link: this.props.link,
         };
 
+        if (this.image.current) {
+            const clientRect = this.image.current.getBoundingClientRect();
+
+            params.thumbnailInfo = {
+                width: clientRect.width,
+                height: clientRect.height,
+                positionX: clientRect.x,
+                positionY: clientRect.y,
+            };
+        }
+
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
     };
 
     render() {
-        const p = this.state.preview;
+        const p = this.props.preview;
         if (!p || Object.keys(p).length === 0) {
             return <div />;
         }
@@ -128,7 +112,7 @@ export default class LinkPreviewWidget extends React.Component {
         let img;
         if (image) {
             img = <div className="mx_LinkPreviewWidget_image" style={{ height: thumbHeight }}>
-                <img style={{ maxWidth: imageMaxWidth, maxHeight: imageMaxHeight }} src={image} onClick={this.onImageClick} />
+                <img ref={this.image} style={{ maxWidth: imageMaxWidth, maxHeight: imageMaxHeight }} src={image} onClick={this.onImageClick} />
             </div>;
         }
 
@@ -136,21 +120,21 @@ export default class LinkPreviewWidget extends React.Component {
         // opaque string. This does not allow any HTML to be injected into the DOM.
         const description = AllHtmlEntities.decode(p["og:description"] || "");
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_LinkPreviewWidget">
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
-                    <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a></div>
-                    <div className="mx_LinkPreviewWidget_siteName">{ p["og:site_name"] ? (" - " + p["og:site_name"]) : null }</div>
-                    <div className="mx_LinkPreviewWidget_description" ref={this._description}>
+                    <div className="mx_LinkPreviewWidget_title">
+                        <a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a>
+                        { p["og:site_name"] && <span className="mx_LinkPreviewWidget_siteName">
+                            { (" - " + p["og:site_name"]) }
+                        </span> }
+                    </div>
+                    <div className="mx_LinkPreviewWidget_description" ref={this.description}>
                         { description }
                     </div>
                 </div>
-                <AccessibleButton className="mx_LinkPreviewWidget_cancel" onClick={this.props.onCancelClick} aria-label={_t("Close preview")}>
-                    <img className="mx_filterFlipColor" alt="" role="presentation"
-                        src={require("../../../../res/img/cancel.svg")} width="18" height="18" />
-                </AccessibleButton>
+                { this.props.children }
             </div>
         );
     }
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.tsx
similarity index 58%
rename from src/components/views/rooms/MemberList.js
rename to src/components/views/rooms/MemberList.tsx
index cb50f0fff3..df4f2d21fa 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.tsx
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 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.
@@ -20,17 +21,31 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import dis from '../../../dispatcher/dispatcher';
-import {isValid3pidInvite} from "../../../RoomInvite";
-import rate_limited_func from "../../../ratelimitedfunc";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import * as sdk from "../../../index";
-import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
+import { isValid3pidInvite } from "../../../RoomInvite";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import BaseCard from "../right_panel/BaseCard";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsStore from "../../../settings/SettingsStore";
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import { RoomState } from 'matrix-js-sdk/src/models/room-state';
+import { User } from "matrix-js-sdk/src/models/user";
+import TruncatedList from '../elements/TruncatedList';
+import Spinner from "../elements/Spinner";
+import SearchBox from "../../structures/SearchBox";
+import AccessibleButton from '../elements/AccessibleButton';
+import EntityTile from "./EntityTile";
+import MemberTile from "./MemberTile";
+import BaseAvatar from '../avatars/BaseAvatar';
+import { throttle } from 'lodash';
+import SpaceStore from "../../../stores/SpaceStore";
+
+const getSearchQueryLSKey = (roomId: string) => `mx_MemberList_searchQuarry_${roomId}`;
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
@@ -40,41 +55,59 @@ const SHOW_MORE_INCREMENT = 100;
 // matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
 const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g;
 
+interface IProps {
+    roomId: string;
+    onClose(): void;
+}
+
+interface IState {
+    loading: boolean;
+    members: Array<RoomMember>;
+    filteredJoinedMembers: Array<RoomMember>;
+    filteredInvitedMembers: Array<RoomMember | MatrixEvent>;
+    canInvite: boolean;
+    truncateAtJoined: number;
+    truncateAtInvited: number;
+    searchQuery: string;
+}
+
 @replaceableComponent("views.rooms.MemberList")
-export default class MemberList extends React.Component {
+export default class MemberList extends React.Component<IProps, IState> {
+    private showPresence = true;
+    private mounted = false;
+    private collator: Intl.Collator;
+    private sortNames = new Map<RoomMember, string>(); // RoomMember -> sortName
+
     constructor(props) {
         super(props);
 
         const cli = MatrixClientPeg.get();
         if (cli.hasLazyLoadMembersEnabled()) {
             // show an empty list
-            this.state = this._getMembersState([]);
+            this.state = this.getMembersState([]);
         } else {
-            this.state = this._getMembersState(this.roomMembers());
+            this.state = this.getMembersState(this.roomMembers());
         }
 
         cli.on("Room", this.onRoom); // invites & joining after peek
         const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
         const hsUrl = MatrixClientPeg.get().baseUrl;
-        this._showPresence = true;
-        if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
-            this._showPresence = enablePresenceByHsUrl[hsUrl];
-        }
+        this.showPresence = enablePresenceByHsUrl?.[hsUrl] ?? true;
     }
 
-    // eslint-disable-next-line camelcase
+    // eslint-disable-next-line
     UNSAFE_componentWillMount() {
         const cli = MatrixClientPeg.get();
-        this._mounted = true;
+        this.mounted = true;
         if (cli.hasLazyLoadMembersEnabled()) {
-            this._showMembersAccordingToMembershipWithLL();
+            this.showMembersAccordingToMembershipWithLL();
             cli.on("Room.myMembership", this.onMyMembership);
         } else {
-            this._listenForMembersChanges();
+            this.listenForMembersChanges();
         }
     }
 
-    _listenForMembersChanges() {
+    private listenForMembersChanges(): void {
         const cli = MatrixClientPeg.get();
         cli.on("RoomState.members", this.onRoomStateMember);
         cli.on("RoomMember.name", this.onRoomMemberName);
@@ -89,7 +122,7 @@ export default class MemberList extends React.Component {
     }
 
     componentWillUnmount() {
-        this._mounted = false;
+        this.mounted = false;
         const cli = MatrixClientPeg.get();
         if (cli) {
             cli.removeListener("RoomState.members", this.onRoomStateMember);
@@ -103,7 +136,7 @@ export default class MemberList extends React.Component {
         }
 
         // cancel any pending calls to the rate_limited_funcs
-        this._updateList.cancelPendingCall();
+        this.updateList.cancel();
     }
 
     /**
@@ -111,118 +144,125 @@ export default class MemberList extends React.Component {
      * show a spinner and load the members if the user is joined,
      * or show the members available so far if the user is invited
      */
-    async _showMembersAccordingToMembershipWithLL() {
+    private async showMembersAccordingToMembershipWithLL(): Promise<void> {
         const cli = MatrixClientPeg.get();
         if (cli.hasLazyLoadMembersEnabled()) {
             const cli = MatrixClientPeg.get();
             const room = cli.getRoom(this.props.roomId);
             const membership = room && room.getMyMembership();
             if (membership === "join") {
-                this.setState({loading: true});
+                this.setState({ loading: true });
                 try {
                     await room.loadMembersIfNeeded();
                 } catch (ex) {/* already logged in RoomView */}
-                if (this._mounted) {
-                    this.setState(this._getMembersState(this.roomMembers()));
-                    this._listenForMembersChanges();
+                if (this.mounted) {
+                    this.setState(this.getMembersState(this.roomMembers()));
+                    this.listenForMembersChanges();
                 }
             } else {
                 // show the members we already have loaded
-                this.setState(this._getMembersState(this.roomMembers()));
+                this.setState(this.getMembersState(this.roomMembers()));
             }
         }
     }
 
-    get canInvite() {
+    private get canInvite(): boolean {
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.roomId);
         return room && room.canInvite(cli.getUserId());
     }
 
-    _getMembersState(members) {
-        // set the state after determining _showPresence to make sure it's
-        // taken into account while rerendering
+    private getMembersState(members: Array<RoomMember>): IState {
+        let searchQuery;
+        try {
+            searchQuery = window.localStorage.getItem(getSearchQueryLSKey(this.props.roomId));
+        } catch (error) {
+            console.warn("Failed to get last the MemberList search query", error);
+        }
+
+        // set the state after determining showPresence to make sure it's
+        // taken into account while rendering
         return {
             loading: false,
             members: members,
-            filteredJoinedMembers: this._filterMembers(members, 'join'),
-            filteredInvitedMembers: this._filterMembers(members, 'invite'),
+            filteredJoinedMembers: this.filterMembers(members, 'join', searchQuery),
+            filteredInvitedMembers: this.filterMembers(members, 'invite', searchQuery),
             canInvite: this.canInvite,
 
             // ideally we'd size this to the page height, but
             // in practice I find that a little constraining
             truncateAtJoined: INITIAL_LOAD_NUM_MEMBERS,
             truncateAtInvited: INITIAL_LOAD_NUM_INVITED,
-            searchQuery: "",
+            searchQuery: searchQuery ?? "",
         };
     }
 
-    onUserPresenceChange = (event, user) => {
+    private onUserPresenceChange = (event: MatrixEvent, user: User): void => {
         // Attach a SINGLE listener for global presence changes then locate the
         // member tile and re-render it. This is more efficient than every tile
         // ever attaching their own listener.
         const tile = this.refs[user.userId];
         // console.log(`Got presence update for ${user.userId}. hasTile=${!!tile}`);
         if (tile) {
-            this._updateList(); // reorder the membership list
+            this.updateList(); // reorder the membership list
         }
     };
 
-    onRoom = room => {
+    private onRoom = (room: Room): void => {
         if (room.roomId !== this.props.roomId) {
             return;
         }
         // We listen for room events because when we accept an invite
         // we need to wait till the room is fully populated with state
         // before refreshing the member list else we get a stale list.
-        this._showMembersAccordingToMembershipWithLL();
+        this.showMembersAccordingToMembershipWithLL();
     };
 
-    onMyMembership = (room, membership, oldMembership) => {
+    private onMyMembership = (room: Room, membership: string, oldMembership: string): void => {
         if (room.roomId === this.props.roomId && membership === "join") {
-            this._showMembersAccordingToMembershipWithLL();
+            this.showMembersAccordingToMembershipWithLL();
         }
     };
 
-    onRoomStateMember = (ev, state, member) => {
+    private onRoomStateMember = (ev: MatrixEvent, state: RoomState, member: RoomMember): void => {
         if (member.roomId !== this.props.roomId) {
             return;
         }
-        this._updateList();
+        this.updateList();
     };
 
-    onRoomMemberName = (ev, member) => {
+    private onRoomMemberName = (ev: MatrixEvent, member: RoomMember): void => {
         if (member.roomId !== this.props.roomId) {
             return;
         }
-        this._updateList();
+        this.updateList();
     };
 
-    onRoomStateEvent = (event, state) => {
+    private onRoomStateEvent = (event: MatrixEvent, state: RoomState): void => {
         if (event.getRoomId() === this.props.roomId &&
             event.getType() === "m.room.third_party_invite") {
-            this._updateList();
+            this.updateList();
         }
 
         if (this.canInvite !== this.state.canInvite) this.setState({ canInvite: this.canInvite });
     };
 
-    _updateList = rate_limited_func(() => {
-        this._updateListNow();
-    }, 500);
+    private updateList = throttle(() => {
+        this.updateListNow();
+    }, 500, { leading: true, trailing: true });
 
-    _updateListNow() {
-        // console.log("Updating memberlist");
-        const newState = {
+    private updateListNow(): void {
+        const members = this.roomMembers();
+
+        this.setState({
             loading: false,
-            members: this.roomMembers(),
-        };
-        newState.filteredJoinedMembers = this._filterMembers(newState.members, 'join', this.state.searchQuery);
-        newState.filteredInvitedMembers = this._filterMembers(newState.members, 'invite', this.state.searchQuery);
-        this.setState(newState);
+            members: members,
+            filteredJoinedMembers: this.filterMembers(members, 'join', this.state.searchQuery),
+            filteredInvitedMembers: this.filterMembers(members, 'invite', this.state.searchQuery),
+        });
     }
 
-    getMembersWithUser() {
+    private getMembersWithUser(): Array<RoomMember> {
         if (!this.props.roomId) return [];
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.roomId);
@@ -230,15 +270,18 @@ export default class MemberList extends React.Component {
 
         const allMembers = Object.values(room.currentState.members);
 
-        allMembers.forEach(function(member) {
+        allMembers.forEach((member) => {
             // work around a race where you might have a room member object
-            // before the user object exists.  This may or may not cause
+            // before the user object exists. This may or may not cause
             // https://github.com/vector-im/vector-web/issues/186
-            if (member.user === null) {
+            if (!member.user) {
                 member.user = cli.getUser(member.userId);
             }
 
-            member.sortName = (member.name[0] === '@' ? member.name.substr(1) : member.name).replace(SORT_REGEX, "");
+            this.sortNames.set(
+                member,
+                (member.name[0] === '@' ? member.name.substr(1) : member.name).replace(SORT_REGEX, ""),
+            );
 
             // XXX: this user may have no lastPresenceTs value!
             // the right solution here is to fix the race rather than leave it as 0
@@ -247,7 +290,7 @@ export default class MemberList extends React.Component {
         return allMembers;
     }
 
-    roomMembers() {
+    private roomMembers(): Array<RoomMember> {
         const allMembers = this.getMembersWithUser();
         const filteredAndSortedMembers = allMembers.filter((m) => {
             return (
@@ -255,57 +298,78 @@ export default class MemberList extends React.Component {
             );
         });
         const language = SettingsStore.getValue("language");
-        this.collator = new Intl.Collator(language, { sensitivity: 'base', usePunctuation: true });
+        this.collator = new Intl.Collator(language, { sensitivity: 'base', ignorePunctuation: false });
         filteredAndSortedMembers.sort(this.memberSort);
         return filteredAndSortedMembers;
     }
 
-    _createOverflowTileJoined = (overflowCount, totalCount) => {
-        return this._createOverflowTile(overflowCount, totalCount, this._showMoreJoinedMemberList);
+    private createOverflowTileJoined = (overflowCount: number, totalCount: number): JSX.Element => {
+        return this.createOverflowTile(overflowCount, totalCount, this.showMoreJoinedMemberList);
     };
 
-    _createOverflowTileInvited = (overflowCount, totalCount) => {
-        return this._createOverflowTile(overflowCount, totalCount, this._showMoreInvitedMemberList);
+    private createOverflowTileInvited = (overflowCount: number, totalCount: number): JSX.Element => {
+        return this.createOverflowTile(overflowCount, totalCount, this.showMoreInvitedMemberList);
     };
 
-    _createOverflowTile = (overflowCount, totalCount, onClick) => {
+    private createOverflowTile = (overflowCount: number, totalCount: number, onClick: () => void): JSX.Element=> {
         // For now we'll pretend this is any entity. It should probably be a separate tile.
-        const EntityTile = sdk.getComponent("rooms.EntityTile");
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
         const text = _t("and %(count)s others...", { count: overflowCount });
         return (
-            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
-                <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
-            } name={text} presenceState="online" suppressOnHover={true}
-            onClick={onClick} />
+            <EntityTile
+                className="mx_EntityTile_ellipsis"
+                avatarJsx={
+                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
+                }
+                name={text}
+                presenceState="online"
+                suppressOnHover={true}
+                onClick={onClick}
+            />
         );
     };
 
-    _showMoreJoinedMemberList = () => {
+    private showMoreJoinedMemberList = (): void => {
         this.setState({
             truncateAtJoined: this.state.truncateAtJoined + SHOW_MORE_INCREMENT,
         });
     };
 
-    _showMoreInvitedMemberList = () => {
+    private showMoreInvitedMemberList = (): void => {
         this.setState({
             truncateAtInvited: this.state.truncateAtInvited + SHOW_MORE_INCREMENT,
         });
     };
 
-    memberString(member) {
+    /**
+     * SHOULD ONLY BE USED BY TESTS
+     */
+    public memberString(member: RoomMember): string {
         if (!member) {
             return "(null)";
         } else {
             const u = member.user;
-            return "(" + member.name + ", " + member.powerLevel + ", " + (u ? u.lastActiveAgo : "<null>") + ", " + (u ? u.getLastActiveTs() : "<null>") + ", " + (u ? u.currentlyActive : "<null>") + ", " + (u ? u.presence : "<null>") + ")";
+            return (
+                "(" +
+                member.name +
+                ", " +
+                member.powerLevel +
+                ", " +
+                (u ? u.lastActiveAgo : "<null>") +
+                ", " +
+                (u ? u.getLastActiveTs() : "<null>") +
+                ", " +
+                (u ? u.currentlyActive : "<null>") +
+                ", " +
+                (u ? u.presence : "<null>") +
+                ")"
+            );
         }
     }
 
     // returns negative if a comes before b,
     // returns 0 if a and b are equivalent in ordering
     // returns positive if a comes after b.
-    memberSort = (memberA, memberB) => {
+    private memberSort = (memberA: RoomMember, memberB: RoomMember): number => {
         // order by presence, with "active now" first.
         // ...and then by power level
         // ...and then by last active
@@ -325,7 +389,7 @@ export default class MemberList extends React.Component {
         if (!userA && userB) return 1;
 
         // First by presence
-        if (this._showPresence) {
+        if (this.showPresence) {
             const convertPresence = (p) => p === 'unavailable' ? 'online' : p;
             const presenceIndex = p => {
                 const order = ['active', 'online', 'offline'];
@@ -349,31 +413,37 @@ export default class MemberList extends React.Component {
         }
 
         // Third by last active
-        if (this._showPresence && userA.getLastActiveTs() !== userB.getLastActiveTs()) {
+        if (this.showPresence && userA.getLastActiveTs() !== userB.getLastActiveTs()) {
             // console.log("Comparing on last active timestamp - returning");
             return userB.getLastActiveTs() - userA.getLastActiveTs();
         }
 
         // Fourth by name (alphabetical)
-        return this.collator.compare(memberA.sortName, memberB.sortName);
+        return this.collator.compare(this.sortNames.get(memberA), this.sortNames.get(memberB));
     };
 
-    onSearchQueryChanged = searchQuery => {
+    private onSearchQueryChanged = (searchQuery: string): void => {
+        try {
+            window.localStorage.setItem(getSearchQueryLSKey(this.props.roomId), searchQuery);
+        } catch (error) {
+            console.warn("Failed to set the last MemberList search query", error);
+        }
+
         this.setState({
             searchQuery,
-            filteredJoinedMembers: this._filterMembers(this.state.members, 'join', searchQuery),
-            filteredInvitedMembers: this._filterMembers(this.state.members, 'invite', searchQuery),
+            filteredJoinedMembers: this.filterMembers(this.state.members, 'join', searchQuery),
+            filteredInvitedMembers: this.filterMembers(this.state.members, 'invite', searchQuery),
         });
     };
 
-    _onPending3pidInviteClick = inviteEvent => {
+    private onPending3pidInviteClick = (inviteEvent: MatrixEvent): void => {
         dis.dispatch({
             action: 'view_3pid_invite',
             event: inviteEvent,
         });
     };
 
-    _filterMembers(members, membership, query) {
+    private filterMembers(members: Array<RoomMember>, membership: string, query?: string): Array<RoomMember> {
         return members.filter((m) => {
             if (query) {
                 query = query.toLowerCase();
@@ -389,7 +459,7 @@ export default class MemberList extends React.Component {
         });
     }
 
-    _getPending3PidInvites() {
+    private getPending3PidInvites(): Array<MatrixEvent> {
         // include 3pid invites (m.room.third_party_invite) state events.
         // The HS may have already converted these into m.room.member invites so
         // we shouldn't add them if the 3pid invite state key (token) is in the
@@ -409,42 +479,44 @@ export default class MemberList extends React.Component {
         }
     }
 
-    _makeMemberTiles(members) {
-        const MemberTile = sdk.getComponent("rooms.MemberTile");
-        const EntityTile = sdk.getComponent("rooms.EntityTile");
-
+    private makeMemberTiles(members: Array<RoomMember | MatrixEvent>) {
         return members.map((m) => {
-            if (m.userId) {
+            if (m instanceof RoomMember) {
                 // Is a Matrix invite
-                return <MemberTile key={m.userId} member={m} ref={m.userId} showPresence={this._showPresence} />;
+                return <MemberTile key={m.userId} member={m} ref={m.userId} showPresence={this.showPresence} />;
             } else {
                 // Is a 3pid invite
-                return <EntityTile key={m.getStateKey()} name={m.getContent().display_name} suppressOnHover={true}
-                    onClick={() => this._onPending3pidInviteClick(m)} />;
+                return <EntityTile
+                    key={m.getStateKey()}
+                    name={m.getContent().display_name}
+                    suppressOnHover={true}
+                    onClick={() => this.onPending3pidInviteClick(m)}
+                />;
             }
         });
     }
 
-    _getChildrenJoined = (start, end) => this._makeMemberTiles(this.state.filteredJoinedMembers.slice(start, end));
-
-    _getChildCountJoined = () => this.state.filteredJoinedMembers.length;
-
-    _getChildrenInvited = (start, end) => {
-        let targets = this.state.filteredInvitedMembers;
-        if (end > this.state.filteredInvitedMembers.length) {
-            targets = targets.concat(this._getPending3PidInvites());
-        }
-
-        return this._makeMemberTiles(targets.slice(start, end));
+    private getChildrenJoined = (start: number, end: number): Array<JSX.Element> => {
+        return this.makeMemberTiles(this.state.filteredJoinedMembers.slice(start, end));
     };
 
-    _getChildCountInvited = () => {
-        return this.state.filteredInvitedMembers.length + (this._getPending3PidInvites() || []).length;
-    }
+    private getChildCountJoined = (): number => this.state.filteredJoinedMembers.length;
+
+    private getChildrenInvited = (start: number, end: number): Array<JSX.Element> => {
+        let targets = this.state.filteredInvitedMembers;
+        if (end > this.state.filteredInvitedMembers.length) {
+            targets = targets.concat(this.getPending3PidInvites());
+        }
+
+        return this.makeMemberTiles(targets.slice(start, end));
+    };
+
+    private getChildCountInvited = (): number => {
+        return this.state.filteredInvitedMembers.length + (this.getPending3PidInvites() || []).length;
+    };
 
     render() {
         if (this.state.loading) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             return <BaseCard
                 className="mx_MemberList"
                 onClose={this.props.onClose}
@@ -454,9 +526,6 @@ export default class MemberList extends React.Component {
             </BaseCard>;
         }
 
-        const SearchBox = sdk.getComponent('structures.SearchBox');
-        const TruncatedList = sdk.getComponent("elements.TruncatedList");
-
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.roomId);
         let inviteButton;
@@ -466,39 +535,49 @@ 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 (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) {
+            } else if (SpaceStore.spacesEnabled && room.isSpaceRoom()) {
                 inviteButtonText = _t("Invite to this space");
             }
 
-            const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-            inviteButton =
-                <AccessibleButton className="mx_MemberList_invite" onClick={this.onInviteButtonClick} disabled={!this.state.canInvite}>
+            inviteButton = (
+                <AccessibleButton
+                    className="mx_MemberList_invite"
+                    onClick={this.onInviteButtonClick}
+                    disabled={!this.state.canInvite}
+                >
                     <span>{ inviteButtonText }</span>
-                </AccessibleButton>;
+                </AccessibleButton>
+            );
         }
 
         let invitedHeader;
         let invitedSection;
-        if (this._getChildCountInvited() > 0) {
+        if (this.getChildCountInvited() > 0) {
             invitedHeader = <h2>{ _t("Invited") }</h2>;
-            invitedSection = <TruncatedList className="mx_MemberList_section mx_MemberList_invited" truncateAt={this.state.truncateAtInvited}
-                createOverflowElement={this._createOverflowTileInvited}
-                getChildren={this._getChildrenInvited}
-                getChildCount={this._getChildCountInvited}
-            />;
+            invitedSection = (
+                <TruncatedList
+                    className="mx_MemberList_section mx_MemberList_invited"
+                    truncateAt={this.state.truncateAtInvited}
+                    createOverflowElement={this.createOverflowTileInvited}
+                    getChildren={this.getChildrenInvited}
+                    getChildCount={this.getChildCountInvited}
+                />
+            );
         }
 
         const footer = (
             <SearchBox
                 className="mx_MemberList_query mx_textinput_icon mx_textinput_search"
-                placeholder={ _t('Filter room members') }
-                onSearch={ this.onSearchQueryChanged } />
+                placeholder={_t('Filter room members')}
+                onSearch={this.onSearchQueryChanged}
+                initialValue={this.state.searchQuery}
+            />
         );
 
         let previousPhase = RightPanelPhases.RoomSummary;
         // We have no previousPhase for when viewing a MemberList from a Space
         let scopeHeader;
-        if (SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom()) {
+        if (SpaceStore.spacesEnabled && room?.isSpaceRoom()) {
             previousPhase = undefined;
             scopeHeader = <div className="mx_RightPanel_scopeHeader">
                 <RoomAvatar room={room} height={32} width={32} />
@@ -517,19 +596,21 @@ export default class MemberList extends React.Component {
             previousPhase={previousPhase}
         >
             <div className="mx_MemberList_wrapper">
-                <TruncatedList className="mx_MemberList_section mx_MemberList_joined" truncateAt={this.state.truncateAtJoined}
-                    createOverflowElement={this._createOverflowTileJoined}
-                    getChildren={this._getChildrenJoined}
-                    getChildCount={this._getChildCountJoined} />
+                <TruncatedList
+                    className="mx_MemberList_section mx_MemberList_joined"
+                    truncateAt={this.state.truncateAtJoined}
+                    createOverflowElement={this.createOverflowTileJoined}
+                    getChildren={this.getChildrenJoined}
+                    getChildCount={this.getChildCountJoined} />
                 { invitedHeader }
                 { invitedSection }
             </div>
         </BaseCard>;
     }
 
-    onInviteButtonClick = () => {
+    onInviteButtonClick = (): void => {
         if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({ action: 'require_registration' });
             return;
         }
 
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.tsx
similarity index 76%
rename from src/components/views/rooms/MemberTile.js
rename to src/components/views/rooms/MemberTile.tsx
index f8df7ed78f..ce571f78ad 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.tsx
@@ -17,20 +17,33 @@ limitations under the License.
 
 import SettingsStore from "../../../settings/SettingsStore";
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from "../../../index";
 import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import {Action} from "../../../dispatcher/actions";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Action } from "../../../dispatcher/actions";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
+import EntityTile, { PowerStatus } from "./EntityTile";
+import MemberAvatar from "./../avatars/MemberAvatar";
+
+interface IProps {
+    member: RoomMember;
+    showPresence?: boolean;
+}
+
+interface IState {
+    statusMessage: string;
+    isRoomEncrypted: boolean;
+    e2eStatus: string;
+}
 
 @replaceableComponent("views.rooms.MemberTile")
-export default class MemberTile extends React.Component {
-    static propTypes = {
-        member: PropTypes.any.isRequired, // RoomMember
-        showPresence: PropTypes.bool,
-    };
+export default class MemberTile extends React.Component<IProps, IState> {
+    private userLastModifiedTime: number;
+    private memberLastModifiedTime: number;
 
     static defaultProps = {
         showPresence: true,
@@ -52,7 +65,7 @@ export default class MemberTile extends React.Component {
         if (SettingsStore.getValue("feature_custom_status")) {
             const { user } = this.props.member;
             if (user) {
-                user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+                user.on("User._unstable_statusMessage", this.onStatusMessageCommitted);
             }
         }
 
@@ -80,7 +93,7 @@ export default class MemberTile extends React.Component {
         if (user) {
             user.removeListener(
                 "User._unstable_statusMessage",
-                this._onStatusMessageCommitted,
+                this.onStatusMessageCommitted,
             );
         }
 
@@ -91,8 +104,8 @@ export default class MemberTile extends React.Component {
         }
     }
 
-    onRoomStateEvents = ev => {
-        if (ev.getType() !== "m.room.encryption") return;
+    private onRoomStateEvents = (ev: MatrixEvent): void => {
+        if (ev.getType() !== EventType.RoomEncryption) return;
         const { roomId } = this.props.member;
         if (ev.getRoomId() !== roomId) return;
 
@@ -105,17 +118,17 @@ export default class MemberTile extends React.Component {
         this.updateE2EStatus();
     };
 
-    onUserTrustStatusChanged = (userId, trustStatus) => {
+    private onUserTrustStatusChanged = (userId: string, trustStatus: string): void => {
         if (userId !== this.props.member.userId) return;
         this.updateE2EStatus();
     };
 
-    onDeviceVerificationChanged = (userId, deviceId, deviceInfo) => {
+    private onDeviceVerificationChanged = (userId: string, deviceId: string, deviceInfo: DeviceInfo): void => {
         if (userId !== this.props.member.userId) return;
         this.updateE2EStatus();
     };
 
-    async updateE2EStatus() {
+    private async updateE2EStatus(): Promise<void> {
         const cli = MatrixClientPeg.get();
         const { userId } = this.props.member;
         const isMe = userId === cli.getUserId();
@@ -143,32 +156,32 @@ export default class MemberTile extends React.Component {
         });
     }
 
-    getStatusMessage() {
+    private getStatusMessage(): string {
         const { user } = this.props.member;
         if (!user) {
             return "";
         }
-        return user._unstable_statusMessage;
+        return user.unstable_statusMessage;
     }
 
-    _onStatusMessageCommitted = () => {
+    private onStatusMessageCommitted = (): void => {
         // The `User` object has observed a status message change.
         this.setState({
             statusMessage: this.getStatusMessage(),
         });
     };
 
-    shouldComponentUpdate(nextProps, nextState) {
+    shouldComponentUpdate(nextProps: IProps, nextState: IState): boolean {
         if (
-            this.member_last_modified_time === undefined ||
-            this.member_last_modified_time < nextProps.member.getLastModifiedTime()
+            this.memberLastModifiedTime === undefined ||
+            this.memberLastModifiedTime < nextProps.member.getLastModifiedTime()
         ) {
             return true;
         }
         if (
             nextProps.member.user &&
-            (this.user_last_modified_time === undefined ||
-            this.user_last_modified_time < nextProps.member.user.getLastModifiedTime())
+            (this.userLastModifiedTime === undefined ||
+            this.userLastModifiedTime < nextProps.member.user.getLastModifiedTime())
         ) {
             return true;
         }
@@ -181,18 +194,18 @@ export default class MemberTile extends React.Component {
         return false;
     }
 
-    onClick = e => {
+    private onClick = (): void => {
         dis.dispatch({
             action: Action.ViewUser,
             member: this.props.member,
         });
     };
 
-    _getDisplayName() {
+    private getDisplayName(): string {
         return this.props.member.name;
     }
 
-    getPowerLabel() {
+    private getPowerLabel(): string {
         return _t("%(userName)s (power %(powerLevelNumber)s)", {
             userName: this.props.member.userId,
             powerLevelNumber: this.props.member.powerLevel,
@@ -200,11 +213,8 @@ export default class MemberTile extends React.Component {
     }
 
     render() {
-        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-        const EntityTile = sdk.getComponent('rooms.EntityTile');
-
         const member = this.props.member;
-        const name = this._getDisplayName();
+        const name = this.getDisplayName();
         const presenceState = member.user ? member.user.presence : null;
 
         let statusMessage = null;
@@ -217,13 +227,13 @@ export default class MemberTile extends React.Component {
         );
 
         if (member.user) {
-            this.user_last_modified_time = member.user.getLastModifiedTime();
+            this.userLastModifiedTime = member.user.getLastModifiedTime();
         }
-        this.member_last_modified_time = member.getLastModifiedTime();
+        this.memberLastModifiedTime = member.getLastModifiedTime();
 
         const powerStatusMap = new Map([
-            [100, EntityTile.POWER_STATUS_ADMIN],
-            [50, EntityTile.POWER_STATUS_MODERATOR],
+            [100, PowerStatus.Admin],
+            [50, PowerStatus.Moderator],
         ]);
 
         // Find the nearest power level with a badge
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 3671069903..f14af69a6d 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -13,14 +13,13 @@ WITHOUT 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 React, { createRef } from 'react';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import dis from '../../../dispatcher/dispatcher';
 import { ActionPayload } from "../../../dispatcher/payloads";
 import Stickerpicker from './Stickerpicker';
@@ -28,26 +27,40 @@ import { makeRoomPermalink, RoomPermalinkCreator } from '../../../utils/permalin
 import ContentMessages from '../../../ContentMessages';
 import E2EIcon from './E2EIcon';
 import SettingsStore from "../../../settings/SettingsStore";
-import {aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu} from "../../structures/ContextMenu";
+import {
+    aboveLeftOf,
+    ContextMenu,
+    useContextMenu,
+    MenuItem,
+    AboveLeftOf,
+} from "../../structures/ContextMenu";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import ReplyPreview from "./ReplyPreview";
-import {UIFeature} from "../../../settings/UIFeature";
-import {UPDATE_EVENT} from "../../../stores/AsyncStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { UIFeature } from "../../../settings/UIFeature";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import VoiceRecordComposerTile from "./VoiceRecordComposerTile";
-import {VoiceRecordingStore} from "../../../stores/VoiceRecordingStore";
-import {RecordingState} from "../../../voice/VoiceRecording";
-import Tooltip, {Alignment} from "../elements/Tooltip";
+import { VoiceRecordingStore } from "../../../stores/VoiceRecordingStore";
+import { RecordingState } from "../../../audio/VoiceRecording";
+import Tooltip, { Alignment } from "../elements/Tooltip";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
 import { E2EStatus } from '../../../utils/ShieldUtils';
-import SendMessageComposer from "./SendMessageComposer";
+import SendMessageComposer, { SendMessageComposer as SendMessageComposerClass } from "./SendMessageComposer";
+import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
+import { Action } from "../../../dispatcher/actions";
+import EditorModel from "../../../editor/model";
+import EmojiPicker from '../emojipicker/EmojiPicker';
+import MemberStatusMessageAvatar from "../avatars/MemberStatusMessageAvatar";
+import UIStore, { UI_EVENTS } from '../../../stores/UIStore';
+
+let instanceCount = 0;
+const NARROW_MODE_BREAKPOINT = 500;
 
 interface IComposerAvatarProps {
-    me: object;
+    me: RoomMember;
 }
 
 function ComposerAvatar(props: IComposerAvatarProps) {
-    const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
     return <div className="mx_MessageComposer_avatar">
         <MemberStatusMessageAvatar member={props.me} width={24} height={24} />
     </div>;
@@ -55,6 +68,7 @@ function ComposerAvatar(props: IComposerAvatarProps) {
 
 interface ISendButtonProps {
     onClick: () => void;
+    title?: string; // defaults to something generic
 }
 
 function SendButton(props: ISendButtonProps) {
@@ -62,19 +76,24 @@ function SendButton(props: ISendButtonProps) {
         <AccessibleTooltipButton
             className="mx_MessageComposer_sendMessage"
             onClick={props.onClick}
-            title={_t('Send message')}
+            title={props.title ?? _t('Send message')}
         />
     );
 }
 
-const EmojiButton = ({addEmoji}) => {
+interface IEmojiButtonProps {
+    addEmoji: (unicode: string) => boolean;
+    menuPosition: any; // TODO: Types
+    narrowMode: boolean;
+}
+
+const EmojiButton: React.FC<IEmojiButtonProps> = ({ addEmoji, menuPosition, narrowMode }) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
 
     let contextMenu;
     if (menuDisplayed) {
-        const buttonRect = button.current.getBoundingClientRect();
-        const EmojiPicker = sdk.getComponent('emojipicker.EmojiPicker');
-        contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false}>
+        const position = menuPosition ?? aboveLeftOf(button.current.getBoundingClientRect());
+        contextMenu = <ContextMenu {...position} onFinished={closeMenu} managed={false}>
             <EmojiPicker onChoose={addEmoji} showQuickReactions={true} />
         </ContextMenu>;
     }
@@ -90,15 +109,12 @@ const EmojiButton = ({addEmoji}) => {
     // TODO: replace ContextMenuTooltipButton with a unified representation of
     // the header buttons and the right panel buttons
     return <React.Fragment>
-        <ContextMenuTooltipButton
+        <AccessibleTooltipButton
             className={className}
             onClick={openMenu}
-            isExpanded={menuDisplayed}
-            title={_t('Emoji picker')}
-            inputRef={button}
-        >
-
-        </ContextMenuTooltipButton>
+            title={!narrowMode && _t('Emoji picker')}
+            label={narrowMode && _t("Add emoji")}
+        />
 
         { contextMenu }
     </React.Fragment>;
@@ -130,11 +146,11 @@ class UploadButton extends React.Component<IUploadButtonProps> {
 
     private onUploadClick = () => {
         if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({ action: 'require_registration' });
             return;
         }
         this.uploadInput.current.click();
-    }
+    };
 
     private onUploadFileInputChange = (ev: React.ChangeEvent<HTMLInputElement>) => {
         if (ev.target.files.length === 0) return;
@@ -155,10 +171,10 @@ class UploadButton extends React.Component<IUploadButtonProps> {
         // to empty.
         // NB. we need to set 'value': the 'files' property is immutable.
         ev.target.value = '';
-    }
+    };
 
     render() {
-        const uploadInputStyle = {display: 'none'};
+        const uploadInputStyle = { display: 'none' };
         return (
             <AccessibleTooltipButton
                 className="mx_MessageComposer_button mx_MessageComposer_upload"
@@ -182,7 +198,10 @@ interface IProps {
     resizeNotifier: ResizeNotifier;
     permalinkCreator: RoomPermalinkCreator;
     replyToEvent?: MatrixEvent;
+    replyInThread?: boolean;
+    showReplyPreview?: boolean;
     e2eStatus?: E2EStatus;
+    compact?: boolean;
 }
 
 interface IState {
@@ -192,13 +211,24 @@ interface IState {
     haveRecording: boolean;
     recordingTimeLeftSeconds?: number;
     me?: RoomMember;
+    narrowMode?: boolean;
+    isMenuOpen: boolean;
+    showStickers: boolean;
 }
 
 @replaceableComponent("views.rooms.MessageComposer")
 export default class MessageComposer extends React.Component<IProps, IState> {
     private dispatcherRef: string;
-    private messageComposerInput: SendMessageComposer;
-    private voiceRecordingButton: VoiceRecordComposerTile;
+    private messageComposerInput = createRef<SendMessageComposerClass>();
+    private voiceRecordingButton = createRef<VoiceRecordComposerTile>();
+    private ref: React.RefObject<HTMLDivElement> = createRef();
+    private instanceId: number;
+
+    static defaultProps = {
+        replyInThread: false,
+        showReplyPreview: true,
+        compact: false,
+    };
 
     constructor(props) {
         super(props);
@@ -210,15 +240,32 @@ export default class MessageComposer extends React.Component<IProps, IState> {
             isComposerEmpty: true,
             haveRecording: false,
             recordingTimeLeftSeconds: null, // when set to a number, shows a toast
+            isMenuOpen: false,
+            showStickers: false,
         };
+
+        this.instanceId = instanceCount++;
     }
 
     componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
         this.waitForOwnMember();
+        UIStore.instance.trackElementDimensions(`MessageComposer${this.instanceId}`, this.ref.current);
+        UIStore.instance.on(`MessageComposer${this.instanceId}`, this.onResize);
     }
 
+    private onResize = (type: UI_EVENTS, entry: ResizeObserverEntry) => {
+        if (type === UI_EVENTS.Resize) {
+            const narrowMode = entry.contentRect.width <= NARROW_MODE_BREAKPOINT;
+            this.setState({
+                narrowMode,
+                isMenuOpen: !narrowMode ? false : this.state.isMenuOpen,
+                showStickers: false,
+            });
+        }
+    };
+
     private onAction = (payload: ActionPayload) => {
         if (payload.action === 'reply_to_event') {
             // add a timeout for the reply preview to be rendered, so
@@ -235,7 +282,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
         // if we have the member already, do that
         const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
         if (me) {
-            this.setState({me});
+            this.setState({ me });
             return;
         }
         // Otherwise, wait for member loading to finish and then update the member for the avatar.
@@ -243,7 +290,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
         // will return the promise for the existing operation
         this.props.room.loadMembersIfNeeded().then(() => {
             const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
-            this.setState({me});
+            this.setState({ me });
         });
     }
 
@@ -253,18 +300,20 @@ export default class MessageComposer extends React.Component<IProps, IState> {
         }
         VoiceRecordingStore.instance.off(UPDATE_EVENT, this.onVoiceStoreUpdate);
         dis.unregister(this.dispatcherRef);
+        UIStore.instance.stopTrackingElementDimensions(`MessageComposer${this.instanceId}`);
+        UIStore.instance.removeListener(`MessageComposer${this.instanceId}`, this.onResize);
     }
 
     private onRoomStateEvents = (ev, state) => {
         if (ev.getRoomId() !== this.props.room.roomId) return;
 
         if (ev.getType() === 'm.room.tombstone') {
-            this.setState({tombstone: this.getRoomTombstone()});
+            this.setState({ tombstone: this.getRoomTombstone() });
         }
         if (ev.getType() === 'm.room.power_levels') {
-            this.setState({canSendMessages: this.props.room.maySendMessage()});
+            this.setState({ canSendMessages: this.props.room.maySendMessage() });
         }
-    }
+    };
 
     private getRoomTombstone() {
         return this.props.room.currentState.getStateEvents('m.room.tombstone', '');
@@ -298,11 +347,15 @@ export default class MessageComposer extends React.Component<IProps, IState> {
                 viaServers: viaServers,
             },
         });
-    }
+    };
 
     private renderPlaceholderText = () => {
         if (this.props.replyToEvent) {
-            if (this.props.e2eStatus) {
+            if (this.props.replyInThread && this.props.e2eStatus) {
+                return _t('Reply to encrypted thread…');
+            } else if (this.props.replyInThread) {
+                return _t('Reply to thread…');
+            } else if (this.props.e2eStatus) {
                 return _t('Send an encrypted reply…');
             } else {
                 return _t('Send a reply…');
@@ -314,97 +367,176 @@ export default class MessageComposer extends React.Component<IProps, IState> {
                 return _t('Send a message…');
             }
         }
-    }
+    };
 
-    addEmoji(emoji) {
-        dis.dispatch({
-            action: "insert_emoji",
-            emoji,
+    private addEmoji(emoji: string): boolean {
+        dis.dispatch<ComposerInsertPayload>({
+            action: Action.ComposerInsert,
+            text: emoji,
         });
+        return true;
     }
 
-    sendMessage = async () => {
-        if (this.state.haveRecording && this.voiceRecordingButton) {
+    private sendMessage = async () => {
+        if (this.state.haveRecording && this.voiceRecordingButton.current) {
             // There shouldn't be any text message to send when a voice recording is active, so
             // just send out the voice recording.
-            await this.voiceRecordingButton.send();
+            await this.voiceRecordingButton.current?.send();
             return;
         }
 
-        // XXX: Private function access
-        this.messageComposerInput._sendMessage();
-    }
+        this.messageComposerInput.current?.sendMessage();
+    };
 
-    onChange = (model) => {
+    private onChange = (model: EditorModel) => {
         this.setState({
             isComposerEmpty: model.isEmpty,
         });
-    }
+    };
 
     private onVoiceStoreUpdate = () => {
         const recording = VoiceRecordingStore.instance.activeRecording;
-        this.setState({haveRecording: !!recording});
         if (recording) {
+            // Delay saying we have a recording until it is started, as we might not yet have A/V permissions
+            recording.on(RecordingState.Started, () => {
+                this.setState({ haveRecording: !!VoiceRecordingStore.instance.activeRecording });
+            });
             // We show a little heads up that the recording is about to automatically end soon. The 3s
             // display time is completely arbitrary. Note that we don't need to deregister the listener
             // because the recording instance will clean that up for us.
-            recording.on(RecordingState.EndingSoon, ({secondsLeft}) => {
-                this.setState({recordingTimeLeftSeconds: secondsLeft});
-                setTimeout(() => this.setState({recordingTimeLeftSeconds: null}), 3000);
+            recording.on(RecordingState.EndingSoon, ({ secondsLeft }) => {
+                this.setState({ recordingTimeLeftSeconds: secondsLeft });
+                setTimeout(() => this.setState({ recordingTimeLeftSeconds: null }), 3000);
             });
+        } else {
+            this.setState({ haveRecording: false });
         }
     };
 
+    private shouldShowStickerPicker = (): boolean => {
+        return SettingsStore.getValue(UIFeature.Widgets)
+        && SettingsStore.getValue("MessageComposerInput.showStickersButton")
+        && !this.state.haveRecording;
+    };
+
+    private showStickers = (showStickers: boolean) => {
+        this.setState({ showStickers });
+    };
+
+    private toggleButtonMenu = (): void => {
+        this.setState({
+            isMenuOpen: !this.state.isMenuOpen,
+        });
+    };
+
+    private renderButtons(menuPosition): JSX.Element | JSX.Element[] {
+        const buttons: JSX.Element[] = [];
+        if (!this.state.haveRecording) {
+            buttons.push(
+                <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
+            );
+            buttons.push(
+                <EmojiButton key="emoji_button" addEmoji={this.addEmoji} menuPosition={menuPosition} narrowMode={this.state.narrowMode} />,
+            );
+        }
+        if (this.shouldShowStickerPicker()) {
+            let title;
+            if (!this.state.narrowMode) {
+                title = this.state.showStickers ? _t("Hide Stickers") : _t("Show Stickers");
+            }
+
+            buttons.push(
+                <AccessibleTooltipButton
+                    id='stickersButton'
+                    key="controls_stickers"
+                    className="mx_MessageComposer_button mx_MessageComposer_stickers"
+                    onClick={() => this.showStickers(!this.state.showStickers)}
+                    title={title}
+                    label={this.state.narrowMode && _t("Send a sticker")}
+                />,
+            );
+        }
+        if (!this.state.haveRecording && !this.state.narrowMode) {
+            buttons.push(
+                <AccessibleTooltipButton
+                    className="mx_MessageComposer_button mx_MessageComposer_voiceMessage"
+                    onClick={() => this.voiceRecordingButton.current?.onRecordStartEndClick()}
+                    title={_t("Send voice message")}
+                />,
+            );
+        }
+
+        if (!this.state.narrowMode) {
+            return buttons;
+        } else {
+            const classnames = classNames({
+                mx_MessageComposer_button: true,
+                mx_MessageComposer_buttonMenu: true,
+                mx_MessageComposer_closeButtonMenu: this.state.isMenuOpen,
+            });
+
+            return <>
+                { buttons[0] }
+                <AccessibleTooltipButton
+                    className={classnames}
+                    onClick={this.toggleButtonMenu}
+                    title={_t("More options")}
+                    tooltip={false}
+                />
+                { this.state.isMenuOpen && (
+                    <ContextMenu
+                        onFinished={this.toggleButtonMenu}
+                        {...menuPosition}
+                        menuPaddingRight={10}
+                        menuPaddingTop={5}
+                        menuPaddingBottom={5}
+                        menuWidth={150}
+                        wrapperClassName="mx_MessageComposer_Menu"
+                    >
+                        { buttons.slice(1).map((button, index) => (
+                            <MenuItem className="mx_CallContextMenu_item" key={index} onClick={this.toggleButtonMenu}>
+                                { button }
+                            </MenuItem>
+                        )) }
+                    </ContextMenu>
+                ) }
+            </>;
+        }
+    }
+
     render() {
         const controls = [
-            this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
+            this.state.me && !this.props.compact ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
             this.props.e2eStatus ?
                 <E2EIcon key="e2eIcon" status={this.props.e2eStatus} className="mx_MessageComposer_e2eIcon" /> :
                 null,
         ];
 
-        if (!this.state.tombstone && this.state.canSendMessages) {
-            const SendMessageComposer = sdk.getComponent("rooms.SendMessageComposer");
+        let menuPosition: AboveLeftOf | undefined;
+        if (this.ref.current) {
+            const contentRect = this.ref.current.getBoundingClientRect();
+            menuPosition = aboveLeftOf(contentRect);
+        }
 
+        if (!this.state.tombstone && this.state.canSendMessages) {
             controls.push(
                 <SendMessageComposer
-                    ref={(c) => this.messageComposerInput = c}
+                    ref={this.messageComposerInput}
                     key="controls_input"
                     room={this.props.room}
                     placeholder={this.renderPlaceholderText()}
-                    resizeNotifier={this.props.resizeNotifier}
                     permalinkCreator={this.props.permalinkCreator}
+                    replyInThread={this.props.replyInThread}
                     replyToEvent={this.props.replyToEvent}
                     onChange={this.onChange}
                     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") &&
-                !this.state.haveRecording) {
-                controls.push(<Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />);
-            }
-
-            if (SettingsStore.getValue("feature_voice_messages")) {
-                controls.push(<VoiceRecordComposerTile
-                    key="controls_voice_record"
-                    ref={c => this.voiceRecordingButton = c}
-                    room={this.props.room} />);
-            }
-
-            if (!this.state.isComposerEmpty || this.state.haveRecording) {
-                controls.push(
-                    <SendButton key="controls_send" onClick={this.sendMessage} />,
-                );
-            }
+            controls.push(<VoiceRecordComposerTile
+                key="controls_voice_record"
+                ref={this.voiceRecordingButton}
+                room={this.props.room} />);
         } else if (this.state.tombstone) {
             const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
 
@@ -413,7 +545,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
                     className="mx_MessageComposer_roomReplaced_link"
                     onClick={this.onTombstoneClick}
                 >
-                    {_t("The conversation continues here.")}
+                    { _t("The conversation continues here.") }
                 </a>
             ) : '';
 
@@ -423,7 +555,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
                         src={require("../../../../res/img/room_replaced.svg")}
                     />
                     <span className="mx_MessageComposer_roomReplaced_header">
-                        {_t("This room has been replaced and is no longer active.")}
+                        { _t("This room has been replaced and is no longer active.") }
                     </span><br />
                     { continuesLink }
                 </div>
@@ -440,18 +572,44 @@ export default class MessageComposer extends React.Component<IProps, IState> {
         const secondsLeft = Math.round(this.state.recordingTimeLeftSeconds);
         if (secondsLeft) {
             recordingTooltip = <Tooltip
-                label={_t("%(seconds)ss left", {seconds: secondsLeft})}
-                alignment={Alignment.Top} yOffset={-50}
+                label={_t("%(seconds)ss left", { seconds: secondsLeft })}
+                alignment={Alignment.Top}
+                yOffset={-50}
             />;
         }
+        controls.push(
+            <Stickerpicker
+                room={this.props.room}
+                showStickers={this.state.showStickers}
+                setShowStickers={this.showStickers}
+                menuPosition={menuPosition} />,
+        );
+
+        const showSendButton = !this.state.isComposerEmpty || this.state.haveRecording;
+
+        const classes = classNames({
+            "mx_MessageComposer": true,
+            "mx_GroupLayout": true,
+            "mx_MessageComposer--compact": this.props.compact,
+        });
 
         return (
-            <div className="mx_MessageComposer mx_GroupLayout">
-                {recordingTooltip}
+            <div className={classes} ref={this.ref}>
+                { recordingTooltip }
                 <div className="mx_MessageComposer_wrapper">
-                    <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
+                    { this.props.showReplyPreview && (
+                        <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
+                    ) }
                     <div className="mx_MessageComposer_row">
                         { controls }
+                        { this.renderButtons(menuPosition) }
+                        { showSendButton && (
+                            <SendButton
+                                key="controls_send"
+                                onClick={this.sendMessage}
+                                title={this.state.haveRecording ? _t("Send voice message") : undefined}
+                            />
+                        ) }
                     </div>
                 </div>
             </div>
diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.tsx
similarity index 51%
rename from src/components/views/rooms/MessageComposerFormatBar.js
rename to src/components/views/rooms/MessageComposerFormatBar.tsx
index fc0f785b08..75bca8aac7 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.js
+++ b/src/components/views/rooms/MessageComposerFormatBar.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,72 +14,90 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
+import React, { createRef } from 'react';
 import classNames from 'classnames';
+
+import { _t } from '../../../languageHandler';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+export enum Formatting {
+    Bold = "bold",
+    Italics = "italics",
+    Strikethrough = "strikethrough",
+    Code = "code",
+    Quote = "quote",
+}
+
+interface IProps {
+    shortcuts: Partial<Record<Formatting, string>>;
+    onAction(action: Formatting): void;
+}
+
+interface IState {
+    visible: boolean;
+}
 
 @replaceableComponent("views.rooms.MessageComposerFormatBar")
-export default class MessageComposerFormatBar extends React.PureComponent {
-    static propTypes = {
-        onAction: PropTypes.func.isRequired,
-        shortcuts: PropTypes.object.isRequired,
-    };
+export default class MessageComposerFormatBar extends React.PureComponent<IProps, IState> {
+    private readonly formatBarRef = createRef<HTMLDivElement>();
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
-        this.state = {visible: false};
+        this.state = { visible: false };
     }
 
     render() {
         const classes = classNames("mx_MessageComposerFormatBar", {
             "mx_MessageComposerFormatBar_shown": this.state.visible,
         });
-        return (<div className={classes} ref={ref => this._formatBarRef = ref}>
-            <FormatButton label={_t("Bold")} onClick={() => this.props.onAction("bold")} icon="Bold" shortcut={this.props.shortcuts.bold} visible={this.state.visible} />
-            <FormatButton label={_t("Italics")} onClick={() => this.props.onAction("italics")} icon="Italic" shortcut={this.props.shortcuts.italics} visible={this.state.visible} />
-            <FormatButton label={_t("Strikethrough")} onClick={() => this.props.onAction("strikethrough")} icon="Strikethrough" visible={this.state.visible} />
-            <FormatButton label={_t("Code block")} onClick={() => this.props.onAction("code")} icon="Code" visible={this.state.visible} />
-            <FormatButton label={_t("Quote")} onClick={() => this.props.onAction("quote")} icon="Quote" shortcut={this.props.shortcuts.quote} visible={this.state.visible} />
+        return (<div className={classes} ref={this.formatBarRef}>
+            <FormatButton label={_t("Bold")} onClick={() => this.props.onAction(Formatting.Bold)} icon="Bold" shortcut={this.props.shortcuts.bold} visible={this.state.visible} />
+            <FormatButton label={_t("Italics")} onClick={() => this.props.onAction(Formatting.Italics)} icon="Italic" shortcut={this.props.shortcuts.italics} visible={this.state.visible} />
+            <FormatButton label={_t("Strikethrough")} onClick={() => this.props.onAction(Formatting.Strikethrough)} icon="Strikethrough" visible={this.state.visible} />
+            <FormatButton label={_t("Code block")} onClick={() => this.props.onAction(Formatting.Code)} icon="Code" visible={this.state.visible} />
+            <FormatButton label={_t("Quote")} onClick={() => this.props.onAction(Formatting.Quote)} icon="Quote" shortcut={this.props.shortcuts.quote} visible={this.state.visible} />
         </div>);
     }
 
-    showAt(selectionRect) {
-        this.setState({visible: true});
-        const parentRect = this._formatBarRef.parentElement.getBoundingClientRect();
-        this._formatBarRef.style.left = `${selectionRect.left - parentRect.left}px`;
+    public showAt(selectionRect: DOMRect): void {
+        if (!this.formatBarRef.current) return;
+
+        this.setState({ visible: true });
+        const parentRect = this.formatBarRef.current.parentElement.getBoundingClientRect();
+        this.formatBarRef.current.style.left = `${selectionRect.left - parentRect.left}px`;
         // 12 is half the height of the bar (e.g. to center it) and 16 is an offset that felt ok.
-        this._formatBarRef.style.top = `${selectionRect.top - parentRect.top - 16 - 12}px`;
+        this.formatBarRef.current.style.top = `${selectionRect.top - parentRect.top - 16 - 12}px`;
     }
 
-    hide() {
-        this.setState({visible: false});
+    public hide(): void {
+        this.setState({ visible: false });
     }
 }
 
-class FormatButton extends React.PureComponent {
-    static propTypes = {
-        label: PropTypes.string.isRequired,
-        onClick: PropTypes.func.isRequired,
-        icon: PropTypes.string.isRequired,
-        shortcut: PropTypes.string,
-        visible: PropTypes.bool,
-    };
+interface IFormatButtonProps {
+    label: string;
+    icon: string;
+    shortcut?: string;
+    visible?: boolean;
+    onClick(): void;
+}
 
+class FormatButton extends React.PureComponent<IFormatButtonProps> {
     render() {
         const className = `mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIcon${this.props.icon}`;
         let shortcut;
         if (this.props.shortcut) {
-            shortcut = <div className="mx_MessageComposerFormatBar_tooltipShortcut">{this.props.shortcut}</div>;
+            shortcut = <div className="mx_MessageComposerFormatBar_tooltipShortcut">
+                { this.props.shortcut }
+            </div>;
         }
         const tooltip = <div>
             <div className="mx_Tooltip_title">
-                {this.props.label}
+                { this.props.label }
             </div>
             <div className="mx_Tooltip_sub">
-                {shortcut}
+                { shortcut }
             </div>
         </div>;
 
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index 3f6054304d..8a96b8a9ba 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -14,26 +14,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext} from "react";
-import {EventType} from "matrix-js-sdk/src/@types/event";
+import React, { useContext } from "react";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { User } from "matrix-js-sdk/src/models/user";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import RoomContext from "../../../contexts/RoomContext";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
-import MiniAvatarUploader, {AVATAR_SIZE} from "../elements/MiniAvatarUploader";
+import MiniAvatarUploader, { AVATAR_SIZE } from "../elements/MiniAvatarUploader";
 import RoomAvatar from "../avatars/RoomAvatar";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload";
-import {Action} from "../../../dispatcher/actions";
+import { ViewUserPayload } from "../../../dispatcher/payloads/ViewUserPayload";
+import { Action } from "../../../dispatcher/actions";
 import dis from "../../../dispatcher/dispatcher";
 import SpaceStore from "../../../stores/SpaceStore";
-import {showSpaceInvite} from "../../../utils/space";
+import { showSpaceInvite } from "../../../utils/space";
+import { privateShouldBeEncrypted } from "../../../createRoom";
+import EventTileBubble from "../messages/EventTileBubble";
+import { ROOM_SECURITY_TAB } from "../dialogs/RoomSettingsDialog";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+
+function hasExpectedEncryptionSettings(matrixClient: MatrixClient, room: Room): boolean {
+    const isEncrypted: boolean = matrixClient.isRoomEncrypted(room.roomId);
+    const isPublic: boolean = room.getJoinRule() === "public";
+    return isPublic || !privateShouldBeEncrypted() || isEncrypted;
+}
 
 const NewRoomIntro = () => {
     const cli = useContext(MatrixClientContext);
-    const {room, roomId} = useContext(RoomContext);
+    const { room, roomId } = useContext(RoomContext);
 
     const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId);
     let body;
@@ -46,19 +59,24 @@ const NewRoomIntro = () => {
         const member = room?.getMember(dmPartner);
         const displayName = member?.rawDisplayName || dmPartner;
         body = <React.Fragment>
-            <RoomAvatar room={room} width={AVATAR_SIZE} height={AVATAR_SIZE} onClick={() => {
-                defaultDispatcher.dispatch<ViewUserPayload>({
-                    action: Action.ViewUser,
-                    // XXX: We should be using a real member object and not assuming what the receiver wants.
-                    member: member || {userId: dmPartner},
-                });
-            }} />
+            <RoomAvatar
+                room={room}
+                width={AVATAR_SIZE}
+                height={AVATAR_SIZE}
+                onClick={() => {
+                    defaultDispatcher.dispatch<ViewUserPayload>({
+                        action: Action.ViewUser,
+                        // XXX: We should be using a real member object and not assuming what the receiver wants.
+                        member: member || { userId: dmPartner } as User,
+                    });
+                }}
+            />
 
             <h2>{ room.name }</h2>
 
-            <p>{_t("This is the beginning of your direct message history with <displayName/>.", {}, {
+            <p>{ _t("This is the beginning of your direct message history with <displayName/>.", {}, {
                 displayName: () => <b>{ displayName }</b>,
-            })}</p>
+            }) }</p>
             { caption && <p>{ caption }</p> }
         </React.Fragment>;
     } else {
@@ -120,7 +138,7 @@ const NewRoomIntro = () => {
                         showSpaceInvite(parentSpace);
                     }}
                 >
-                    {_t("Invite to %(spaceName)s", { spaceName: parentSpace.name })}
+                    { _t("Invite to %(spaceName)s", { spaceName: parentSpace.name }) }
                 </AccessibleButton>
                 { room.canInvite(cli.getUserId()) && <AccessibleButton
                     className="mx_NewRoomIntro_inviteButton"
@@ -129,7 +147,7 @@ const NewRoomIntro = () => {
                         dis.dispatch({ action: "view_invite", roomId });
                     }}
                 >
-                    {_t("Invite to just this room")}
+                    { _t("Invite to just this room") }
                 </AccessibleButton> }
             </div>;
         } else if (room.canInvite(cli.getUserId())) {
@@ -141,7 +159,7 @@ const NewRoomIntro = () => {
                         dis.dispatch({ action: "view_invite", roomId });
                     }}
                 >
-                    {_t("Invite to this room")}
+                    { _t("Invite to this room") }
                 </AccessibleButton>
             </div>;
         }
@@ -158,15 +176,49 @@ const NewRoomIntro = () => {
 
             <h2>{ room.name }</h2>
 
-            <p>{createdText} {_t("This is the start of <roomName/>.", {}, {
+            <p>{ createdText } { _t("This is the start of <roomName/>.", {}, {
                 roomName: () => <b>{ room.name }</b>,
-            })}</p>
-            <p>{topicText}</p>
+            }) }</p>
+            <p>{ topicText }</p>
             { buttons }
         </React.Fragment>;
     }
 
+    function openRoomSettings(event) {
+        event.preventDefault();
+        dis.dispatch({
+            action: "open_room_settings",
+            initial_tab_id: ROOM_SECURITY_TAB,
+        });
+    }
+
+    const subText = _t(
+        "Your private messages are normally encrypted, but this room isn't. "+
+        "Usually this is due to an unsupported device or method being used, " +
+        "like email invites.",
+    );
+
+    let subButton;
+    if (room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, MatrixClientPeg.get())) {
+        subButton = (
+            <a onClick={openRoomSettings} href="#"> { _t("Enable encryption in settings.") }</a>
+        );
+    }
+
+    const subtitle = (
+        <span> { subText } { subButton } </span>
+    );
+
     return <div className="mx_NewRoomIntro">
+
+        { !hasExpectedEncryptionSettings(cli, room) && (
+            <EventTileBubble
+                className="mx_cryptoEvent mx_cryptoEvent_icon_warning"
+                title={_t("End-to-end encryption isn't enabled")}
+                subtitle={subtitle}
+            />
+        ) }
+
         { body }
     </div>;
 };
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 4b843bfc29..a97d51fc90 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -14,14 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { MouseEvent } from "react";
 import classNames from "classnames";
 import { formatCount } from "../../../utils/FormattingUtils";
 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Tooltip from "../elements/Tooltip";
+import { _t } from "../../../languageHandler";
+import { NotificationColor } from "../../../stores/notifications/NotificationColor";
 
 interface IProps {
     notification: NotificationState;
@@ -39,6 +42,7 @@ interface IProps {
 }
 
 interface IClickableProps extends IProps, React.InputHTMLAttributes<Element> {
+    showUnsentTooltip?: boolean;
     /**
      * If specified will return an AccessibleButton instead of a div.
      */
@@ -47,6 +51,7 @@ interface IClickableProps extends IProps, React.InputHTMLAttributes<Element> {
 
 interface IState {
     showCounts: boolean; // whether or not to show counts. Independent of props.forceCount
+    showTooltip: boolean;
 }
 
 @replaceableComponent("views.rooms.NotificationBadge")
@@ -59,6 +64,7 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
 
         this.state = {
             showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId),
+            showTooltip: false,
         };
 
         this.countWatcherRef = SettingsStore.watchSetting(
@@ -86,16 +92,29 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
     }
 
     private countPreferenceChanged = () => {
-        this.setState({showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId)});
+        this.setState({ showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId) });
     };
 
     private onNotificationUpdate = () => {
         this.forceUpdate(); // notification state changed - update
     };
 
+    private onMouseOver = (e: MouseEvent) => {
+        e.stopPropagation();
+        this.setState({
+            showTooltip: true,
+        });
+    };
+
+    private onMouseLeave = () => {
+        this.setState({
+            showTooltip: false,
+        });
+    };
+
     public render(): React.ReactElement {
         /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
-        const {notification, forceCount, roomId, onClick, ...props} = this.props;
+        const { notification, showUnsentTooltip, forceCount, roomId, onClick, ...props } = this.props;
 
         // Don't show a badge if we don't need to
         if (notification.isIdle) return null;
@@ -124,16 +143,31 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
         });
 
         if (onClick) {
+            let label: string;
+            let tooltip: JSX.Element;
+            if (showUnsentTooltip && this.state.showTooltip && notification.color === NotificationColor.Unsent) {
+                label = _t("Message didn't send. Click for info.");
+                tooltip = <Tooltip className="mx_RoleButton_tooltip" label={label} />;
+            }
+
             return (
-                <AccessibleButton {...props} className={classes} onClick={onClick}>
-                    <span className="mx_NotificationBadge_count">{symbol}</span>
+                <AccessibleButton
+                    aria-label={label}
+                    {...props}
+                    className={classes}
+                    onClick={onClick}
+                    onMouseOver={this.onMouseOver}
+                    onMouseLeave={this.onMouseLeave}
+                >
+                    <span className="mx_NotificationBadge_count">{ symbol }</span>
+                    { tooltip }
                 </AccessibleButton>
             );
         }
 
         return (
             <div className={classes}>
-                <span className="mx_NotificationBadge_count">{symbol}</span>
+                <span className="mx_NotificationBadge_count">{ symbol }</span>
             </div>
         );
     }
diff --git a/src/components/views/rooms/PinnedEventTile.tsx b/src/components/views/rooms/PinnedEventTile.tsx
index 774dea70c8..250efc1278 100644
--- a/src/components/views/rooms/PinnedEventTile.tsx
+++ b/src/components/views/rooms/PinnedEventTile.tsx
@@ -29,6 +29,7 @@ import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { getUserNameColorClass } from "../../../utils/FormattingUtils";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import { TileShape } from "./EventTile";
 
 interface IProps {
     room: Room;
@@ -84,9 +85,11 @@ export default class PinnedEventTile extends React.Component<IProps> {
             <div className="mx_PinnedEventTile_message">
                 <MessageEvent
                     mxEvent={this.props.event}
+                    // @ts-ignore - complaining that className is invalid when it's not
                     className="mx_PinnedEventTile_body"
                     maxImageHeight={150}
                     onHeightChanged={() => {}} // we need to give this, apparently
+                    tileShape={TileShape.Pinned}
                 />
             </div>
 
diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.tsx
similarity index 67%
rename from src/components/views/rooms/PresenceLabel.js
rename to src/components/views/rooms/PresenceLabel.tsx
index ca21afe63d..be324a8437 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.tsx
@@ -15,26 +15,23 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    // number of milliseconds ago this user was last active.
+    // zero = unknown
+    activeAgo?: number;
+    // if true, activeAgo is an approximation and "Now" should
+    // be shown instead
+    currentlyActive?: boolean;
+    // offline, online, etc
+    presenceState?: string;
+}
 
 @replaceableComponent("views.rooms.PresenceLabel")
-export default class PresenceLabel extends React.Component {
-    static propTypes = {
-        // number of milliseconds ago this user was last active.
-        // zero = unknown
-        activeAgo: PropTypes.number,
-
-        // if true, activeAgo is an approximation and "Now" should
-        // be shown instead
-        currentlyActive: PropTypes.bool,
-
-        // offline, online, etc
-        presenceState: PropTypes.string,
-    };
-
+export default class PresenceLabel extends React.Component<IProps> {
     static defaultProps = {
         activeAgo: -1,
         presenceState: null,
@@ -42,29 +39,29 @@ export default class PresenceLabel extends React.Component {
 
     // Return duration as a string using appropriate time units
     // XXX: This would be better handled using a culture-aware library, but we don't use one yet.
-    getDuration(time) {
+    private getDuration(time: number): string {
         if (!time) return;
-        const t = parseInt(time / 1000);
+        const t = Math.round(time / 1000);
         const s = t % 60;
-        const m = parseInt(t / 60) % 60;
-        const h = parseInt(t / (60 * 60)) % 24;
-        const d = parseInt(t / (60 * 60 * 24));
+        const m = Math.round(t / 60) % 60;
+        const h = Math.round(t / (60 * 60)) % 24;
+        const d = Math.round(t / (60 * 60 * 24));
         if (t < 60) {
             if (t < 0) {
-                return _t("%(duration)ss", {duration: 0});
+                return _t("%(duration)ss", { duration: 0 });
             }
-            return _t("%(duration)ss", {duration: s});
+            return _t("%(duration)ss", { duration: s });
         }
         if (t < 60 * 60) {
-            return _t("%(duration)sm", {duration: m});
+            return _t("%(duration)sm", { duration: m });
         }
         if (t < 24 * 60 * 60) {
-            return _t("%(duration)sh", {duration: h});
+            return _t("%(duration)sh", { duration: h });
         }
-        return _t("%(duration)sd", {duration: d});
+        return _t("%(duration)sd", { duration: d });
     }
 
-    getPrettyPresence(presence, activeAgo, currentlyActive) {
+    private getPrettyPresence(presence: string, activeAgo: number, currentlyActive: boolean): string {
         if (!currentlyActive && activeAgo !== undefined && activeAgo > 0) {
             const duration = this.getDuration(activeAgo);
             if (presence === "online") return _t("Online for %(duration)s", { duration: duration });
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.tsx
similarity index 63%
rename from src/components/views/rooms/ReadReceiptMarker.js
rename to src/components/views/rooms/ReadReceiptMarker.tsx
index 64f2c1160b..cfc535b23d 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.tsx
@@ -15,62 +15,75 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef, RefObject } from 'react';
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
 import { _t } from '../../../languageHandler';
-import {formatDate} from '../../../DateUtils';
+import { formatDate } from '../../../DateUtils';
 import NodeAnimator from "../../../NodeAnimator";
-import * as sdk from "../../../index";
-import {toPx} from "../../../utils/units";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { toPx } from "../../../utils/units";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+import MemberAvatar from '../avatars/MemberAvatar';
+
+interface IProps {
+    // the RoomMember to show the RR for
+    member?: RoomMember;
+    // userId to fallback the avatar to
+    // if the member hasn't been loaded yet
+    fallbackUserId: string;
+
+    // number of pixels to offset the avatar from the right of its parent;
+    // typically a negative value.
+    leftOffset?: number;
+
+    // true to hide the avatar (it will still be animated)
+    hidden?: boolean;
+
+    // don't animate this RR into position
+    suppressAnimation?: boolean;
+
+    // an opaque object for storing information about this user's RR in
+    // this room
+    // TODO: proper typing for RR info
+    readReceiptInfo: any;
+
+    // A function which is used to check if the parent panel is being
+    // unmounted, to avoid unnecessary work. Should return true if we
+    // are being unmounted.
+    checkUnmounting?: () => boolean;
+
+    // callback for clicks on this RR
+    onClick?: (e: React.MouseEvent) => void;
+
+    // Timestamp when the receipt was read
+    timestamp?: number;
+
+    // True to show twelve hour format, false otherwise
+    showTwelveHour?: boolean;
+}
+
+interface IState {
+    suppressDisplay: boolean;
+    startStyles?: IReadReceiptMarkerStyle[];
+}
+
+interface IReadReceiptMarkerStyle {
+    top: number;
+    left: number;
+}
 
 @replaceableComponent("views.rooms.ReadReceiptMarker")
-export default class ReadReceiptMarker extends React.PureComponent {
-    static propTypes = {
-        // the RoomMember to show the RR for
-        member: PropTypes.object,
-        // userId to fallback the avatar to
-        // if the member hasn't been loaded yet
-        fallbackUserId: PropTypes.string.isRequired,
-
-        // number of pixels to offset the avatar from the right of its parent;
-        // typically a negative value.
-        leftOffset: PropTypes.number,
-
-        // true to hide the avatar (it will still be animated)
-        hidden: PropTypes.bool,
-
-        // don't animate this RR into position
-        suppressAnimation: PropTypes.bool,
-
-        // an opaque object for storing information about this user's RR in
-        // this room
-        readReceiptInfo: PropTypes.object,
-
-        // A function which is used to check if the parent panel is being
-        // unmounted, to avoid unnecessary work. Should return true if we
-        // are being unmounted.
-        checkUnmounting: PropTypes.func,
-
-        // callback for clicks on this RR
-        onClick: PropTypes.func,
-
-        // Timestamp when the receipt was read
-        timestamp: PropTypes.number,
-
-        // True to show twelve hour format, false otherwise
-        showTwelveHour: PropTypes.bool,
-    };
+export default class ReadReceiptMarker extends React.PureComponent<IProps, IState> {
+    private avatar: React.RefObject<HTMLDivElement | HTMLImageElement | HTMLSpanElement> = createRef();
 
     static defaultProps = {
         leftOffset: 0,
     };
 
-    constructor(props) {
+    constructor(props: IProps) {
         super(props);
 
-        this._avatar = createRef();
-
         this.state = {
             // if we are going to animate the RR, we don't show it on first render,
             // and instead just add a placeholder to the DOM; once we've been
@@ -80,7 +93,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
         };
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         // before we remove the rr, store its location in the map, so that if
         // it reappears, it can be animated from the right place.
         const rrInfo = this.props.readReceiptInfo;
@@ -95,29 +108,29 @@ export default class ReadReceiptMarker extends React.PureComponent {
             return;
         }
 
-        const avatarNode = this._avatar.current;
+        const avatarNode = this.avatar.current;
         rrInfo.top = avatarNode.offsetTop;
         rrInfo.left = avatarNode.offsetLeft;
         rrInfo.parent = avatarNode.offsetParent;
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         if (!this.state.suppressDisplay) {
             // we've already done our display - nothing more to do.
             return;
         }
-        this._animateMarker();
+        this.animateMarker();
     }
 
-    componentDidUpdate(prevProps) {
+    public componentDidUpdate(prevProps: IProps): void {
         const differentLeftOffset = prevProps.leftOffset !== this.props.leftOffset;
         const visibilityChanged = prevProps.hidden !== this.props.hidden;
         if (differentLeftOffset || visibilityChanged) {
-            this._animateMarker();
+            this.animateMarker();
         }
     }
 
-    _animateMarker() {
+    private animateMarker(): void {
         // treat new RRs as though they were off the top of the screen
         let oldTop = -15;
 
@@ -126,7 +139,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
             oldTop = oldInfo.top + oldInfo.parent.getBoundingClientRect().top;
         }
 
-        const newElement = this._avatar.current;
+        const newElement = this.avatar.current;
         let startTopOffset;
         if (!newElement.offsetParent) {
             // this seems to happen sometimes for reasons I don't understand
@@ -145,7 +158,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
         if (oldInfo && oldInfo.left) {
             // start at the old height and in the old h pos
             startStyles.push({ top: startTopOffset+"px",
-                               left: toPx(oldInfo.left) });
+                left: toPx(oldInfo.left) });
         }
 
         startStyles.push({ top: startTopOffset+'px', left: '0' });
@@ -156,10 +169,9 @@ export default class ReadReceiptMarker extends React.PureComponent {
         });
     }
 
-    render() {
-        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+    public render(): JSX.Element {
         if (this.state.suppressDisplay) {
-            return <div ref={this._avatar} />;
+            return <div ref={this.avatar as RefObject<HTMLDivElement>} />;
         }
 
         const style = {
@@ -173,15 +185,15 @@ export default class ReadReceiptMarker extends React.PureComponent {
             if (!this.props.member || this.props.fallbackUserId === this.props.member.rawDisplayName) {
                 title = _t(
                     "Seen by %(userName)s at %(dateTime)s",
-                    {userName: this.props.fallbackUserId,
-                    dateTime: dateString},
+                    { userName: this.props.fallbackUserId,
+                        dateTime: dateString },
                 );
             } else {
                 title = _t(
                     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
-                    {displayName: this.props.member.rawDisplayName,
-                    userName: this.props.fallbackUserId,
-                    dateTime: dateString},
+                    { displayName: this.props.member.rawDisplayName,
+                        userName: this.props.fallbackUserId,
+                        dateTime: dateString },
                 );
             }
         }
@@ -192,11 +204,13 @@ export default class ReadReceiptMarker extends React.PureComponent {
                     member={this.props.member}
                     fallbackUserId={this.props.fallbackUserId}
                     aria-hidden="true"
-                    width={14} height={14} resizeMethod="crop"
+                    width={14}
+                    height={14}
+                    resizeMethod="crop"
                     style={style}
                     title={title}
                     onClick={this.props.onClick}
-                    inputRef={this._avatar}
+                    inputRef={this.avatar as RefObject<HTMLImageElement>}
                 />
             </NodeAnimator>
         );
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.tsx
similarity index 61%
rename from src/components/views/rooms/ReplyPreview.js
rename to src/components/views/rooms/ReplyPreview.tsx
index d7f8c74d73..41b3d2460c 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector 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.
@@ -16,14 +16,13 @@ limitations under the License.
 
 import React from 'react';
 import dis from '../../../dispatcher/dispatcher';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import RoomViewStore from '../../../stores/RoomViewStore';
-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";
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import ReplyTile from './ReplyTile';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { EventSubscription } from 'fbemitter';
 
 function cancelQuoting() {
     dis.dispatch({
@@ -32,47 +31,50 @@ function cancelQuoting() {
     });
 }
 
+interface IProps {
+    permalinkCreator: RoomPermalinkCreator;
+}
+
+interface IState {
+    event: MatrixEvent;
+}
+
 @replaceableComponent("views.rooms.ReplyPreview")
-export default class ReplyPreview extends React.Component {
-    static propTypes = {
-        permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
-    };
+export default class ReplyPreview extends React.Component<IProps, IState> {
+    private unmounted = false;
+    private readonly roomStoreToken: EventSubscription;
 
     constructor(props) {
         super(props);
-        this.unmounted = false;
 
         this.state = {
             event: RoomViewStore.getQuotingEvent(),
         };
 
-        this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
     }
 
     componentWillUnmount() {
         this.unmounted = true;
 
         // Remove RoomStore listener
-        if (this._roomStoreToken) {
-            this._roomStoreToken.remove();
+        if (this.roomStoreToken) {
+            this.roomStoreToken.remove();
         }
     }
 
-    _onRoomViewStoreUpdate() {
+    private onRoomViewStoreUpdate = (): void => {
         if (this.unmounted) return;
 
         const event = RoomViewStore.getQuotingEvent();
         if (this.state.event !== event) {
             this.setState({ event });
         }
-    }
+    };
 
     render() {
         if (!this.state.event) return null;
 
-        const EventTile = sdk.getComponent('rooms.EventTile');
-
         return <div className="mx_ReplyPreview">
             <div className="mx_ReplyPreview_section">
                 <div className="mx_ReplyPreview_header mx_ReplyPreview_title">
@@ -88,14 +90,12 @@ export default class ReplyPreview extends React.Component {
                     />
                 </div>
                 <div className="mx_ReplyPreview_clear" />
-                <EventTile
-                    last={true}
-                    tileShape="reply_preview"
-                    mxEvent={this.state.event}
-                    permalinkCreator={this.props.permalinkCreator}
-                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
-                    enableFlair={SettingsStore.getValue(UIFeature.Flair)}
-                />
+                <div className="mx_ReplyPreview_tile">
+                    <ReplyTile
+                        mxEvent={this.state.event}
+                        permalinkCreator={this.props.permalinkCreator}
+                    />
+                </div>
             </div>
         </div>;
     }
diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx
new file mode 100644
index 0000000000..01a9e2f18b
--- /dev/null
+++ b/src/components/views/rooms/ReplyTile.tsx
@@ -0,0 +1,174 @@
+/*
+Copyright 2020-2021 Tulir Asokan <tulir@maunium.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from 'react';
+import classNames from 'classnames';
+import { _t } from '../../../languageHandler';
+import dis from '../../../dispatcher/dispatcher';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
+import SenderProfile from "../messages/SenderProfile";
+import MImageReplyBody from "../messages/MImageReplyBody";
+import * as sdk from '../../../index';
+import { EventType, MsgType } from 'matrix-js-sdk/src/@types/event';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
+import { getEventDisplayInfo, isVoiceMessage } from '../../../utils/EventUtils';
+import MFileBody from "../messages/MFileBody";
+import MVoiceMessageBody from "../messages/MVoiceMessageBody";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+    permalinkCreator?: RoomPermalinkCreator;
+    highlights?: string[];
+    highlightLink?: string;
+    onHeightChanged?(): void;
+    toggleExpandedQuote?: () => void;
+}
+
+@replaceableComponent("views.rooms.ReplyTile")
+export default class ReplyTile extends React.PureComponent<IProps> {
+    private anchorElement = createRef<HTMLAnchorElement>();
+
+    static defaultProps = {
+        onHeightChanged: () => {},
+    };
+
+    componentDidMount() {
+        this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
+        this.props.mxEvent.on("Event.beforeRedaction", this.onEventRequiresUpdate);
+        this.props.mxEvent.on("Event.replaced", this.onEventRequiresUpdate);
+    }
+
+    componentWillUnmount() {
+        this.props.mxEvent.removeListener("Event.decrypted", this.onDecrypted);
+        this.props.mxEvent.removeListener("Event.beforeRedaction", this.onEventRequiresUpdate);
+        this.props.mxEvent.removeListener("Event.replaced", this.onEventRequiresUpdate);
+    }
+
+    private onDecrypted = (): void => {
+        this.forceUpdate();
+        if (this.props.onHeightChanged) {
+            this.props.onHeightChanged();
+        }
+    };
+
+    private onEventRequiresUpdate = (): void => {
+        // Force update when necessary - redactions and edits
+        this.forceUpdate();
+    };
+
+    private onClick = (e: React.MouseEvent): void => {
+        const clickTarget = e.target as HTMLElement;
+        // Following a link within a reply should not dispatch the `view_room` action
+        // so that the browser can direct the user to the correct location
+        // The exception being the link wrapping the reply
+        if (
+            clickTarget.tagName.toLowerCase() !== "a" ||
+            clickTarget.closest("a") === null ||
+            clickTarget === this.anchorElement.current
+        ) {
+            // This allows the permalink to be opened in a new tab/window or copied as
+            // matrix.to, but also for it to enable routing within Riot when clicked.
+            e.preventDefault();
+            // Expand thread on shift key
+            if (this.props.toggleExpandedQuote && e.shiftKey) {
+                this.props.toggleExpandedQuote();
+            } else {
+                dis.dispatch({
+                    action: 'view_room',
+                    event_id: this.props.mxEvent.getId(),
+                    highlighted: true,
+                    room_id: this.props.mxEvent.getRoomId(),
+                });
+            }
+        }
+    };
+
+    render() {
+        const mxEvent = this.props.mxEvent;
+        const msgType = mxEvent.getContent().msgtype;
+        const evType = mxEvent.getType() as EventType;
+
+        const { tileHandler, isInfoMessage } = getEventDisplayInfo(mxEvent);
+        // This shouldn't happen: the caller should check we support this type
+        // before trying to instantiate us
+        if (!tileHandler) {
+            const { mxEvent } = this.props;
+            console.warn(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
+            return <div className="mx_ReplyTile mx_ReplyTile_info mx_MNoticeBody">
+                { _t('This event could not be displayed') }
+            </div>;
+        }
+
+        const EventTileType = sdk.getComponent(tileHandler);
+
+        const classes = classNames("mx_ReplyTile", {
+            mx_ReplyTile_info: isInfoMessage && !mxEvent.isRedacted(),
+            mx_ReplyTile_audio: msgType === MsgType.Audio,
+            mx_ReplyTile_video: msgType === MsgType.Video,
+        });
+
+        let permalink = "#";
+        if (this.props.permalinkCreator) {
+            permalink = this.props.permalinkCreator.forEvent(mxEvent.getId());
+        }
+
+        let sender;
+        const needsSenderProfile = (
+            !isInfoMessage &&
+            msgType !== MsgType.Image &&
+            tileHandler !== EventType.RoomCreate &&
+            evType !== EventType.Sticker
+        );
+
+        if (needsSenderProfile) {
+            sender = <SenderProfile
+                mxEvent={mxEvent}
+                enableFlair={false}
+            />;
+        }
+
+        const msgtypeOverrides = {
+            [MsgType.Image]: MImageReplyBody,
+            // Override audio and video body with file body. We also hide the download/decrypt button using CSS
+            [MsgType.Audio]: isVoiceMessage(mxEvent) ? MVoiceMessageBody : MFileBody,
+            [MsgType.Video]: MFileBody,
+        };
+        const evOverrides = {
+            // Use MImageReplyBody so that the sticker isn't taking up a lot of space
+            [EventType.Sticker]: MImageReplyBody,
+        };
+
+        return (
+            <div className={classes}>
+                <a href={permalink} onClick={this.onClick} ref={this.anchorElement}>
+                    { sender }
+                    <EventTileType
+                        ref="tile"
+                        mxEvent={mxEvent}
+                        highlights={this.props.highlights}
+                        highlightLink={this.props.highlightLink}
+                        onHeightChanged={this.props.onHeightChanged}
+                        showUrlPreview={false}
+                        overrideBodyTypes={msgtypeOverrides}
+                        overrideEventTypes={evOverrides}
+                        replacingEventId={mxEvent.replacingEventId()}
+                        maxImageHeight={96} />
+                </a>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/rooms/RoomBreadcrumbs.tsx b/src/components/views/rooms/RoomBreadcrumbs.tsx
index 00f13209a2..a20c409a53 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs.tsx
@@ -71,13 +71,13 @@ export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState>
         // The second update, on the next available tick, causes the "enter" animation to start
         // again and this time we want to show the newest breadcrumb because it'll be hidden
         // off screen for the animation.
-        this.setState({doAnimation: false, skipFirst: true});
-        setTimeout(() => this.setState({doAnimation: true, skipFirst: false}), 0);
+        this.setState({ doAnimation: false, skipFirst: true });
+        setTimeout(() => this.setState({ doAnimation: true, skipFirst: false }), 0);
     };
 
     private viewRoom = (room: Room, index: number) => {
         Analytics.trackEvent("Breadcrumbs", "click_node", String(index));
-        defaultDispatcher.dispatch({action: "view_room", room_id: room.roomId});
+        defaultDispatcher.dispatch({ action: "view_room", room_id: room.roomId });
     };
 
     public render(): React.ReactElement {
@@ -87,7 +87,7 @@ export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState>
                     className="mx_RoomBreadcrumbs_crumb"
                     key={r.roomId}
                     onClick={() => this.viewRoom(r, i)}
-                    aria-label={_t("Room %(name)s", {name: r.name})}
+                    aria-label={_t("Room %(name)s", { name: r.name })}
                     title={r.name}
                     tooltipClassName="mx_RoomBreadcrumbs_Tooltip"
                 >
@@ -105,11 +105,13 @@ export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState>
             // NOTE: The CSSTransition timeout MUST match the timeout in our CSS!
             return (
                 <CSSTransition
-                    appear={true} in={this.state.doAnimation} timeout={640}
+                    appear={true}
+                    in={this.state.doAnimation}
+                    timeout={640}
                     classNames='mx_RoomBreadcrumbs'
                 >
                     <Toolbar className='mx_RoomBreadcrumbs' aria-label={_t("Recently visited rooms")}>
-                        {tiles.slice(this.state.skipFirst ? 1 : 0)}
+                        { tiles.slice(this.state.skipFirst ? 1 : 0) }
                     </Toolbar>
                 </CSSTransition>
             );
@@ -117,7 +119,7 @@ export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState>
             return (
                 <div className='mx_RoomBreadcrumbs'>
                     <div className="mx_RoomBreadcrumbs_placeholder">
-                        {_t("No recently visited rooms")}
+                        { _t("No recently visited rooms") }
                     </div>
                 </div>
             );
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.tsx
similarity index 73%
rename from src/components/views/rooms/RoomDetailList.js
rename to src/components/views/rooms/RoomDetailList.tsx
index be22cda199..869ab9e8f3 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.tsx
@@ -14,41 +14,38 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
 import React from 'react';
-import { _t } from '../../../languageHandler';
-import PropTypes from 'prop-types';
+import { Room } from 'matrix-js-sdk/src';
 import classNames from 'classnames';
+import dis from '../../../dispatcher/dispatcher';
+import { _t } from '../../../languageHandler';
 
-import {roomShape} from './RoomDetailRow';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RoomDetailRow from "./RoomDetailRow";
+
+interface IProps {
+    rooms?: Room[];
+    className?: string;
+}
 
 @replaceableComponent("views.rooms.RoomDetailList")
-export default class RoomDetailList extends React.Component {
-    static propTypes = {
-        rooms: PropTypes.arrayOf(roomShape),
-        className: PropTypes.string,
-    };
-
-    getRows() {
+export default class RoomDetailList extends React.Component<IProps> {
+    private getRows(): JSX.Element[] {
         if (!this.props.rooms) return [];
-
-        const RoomDetailRow = sdk.getComponent('rooms.RoomDetailRow');
         return this.props.rooms.map((room, index) => {
             return <RoomDetailRow key={index} room={room} onClick={this.onDetailsClick} />;
         });
     }
 
-    onDetailsClick = (ev, room) => {
+    private onDetailsClick = (ev: React.MouseEvent, room: Room): void => {
         dis.dispatch({
             action: 'view_room',
             room_id: room.roomId,
-            room_alias: room.canonicalAlias || (room.aliases || [])[0],
+            room_alias: room.getCanonicalAlias() || (room.getAltAliases() || [])[0],
         });
     };
 
-    render() {
+    public render(): JSX.Element {
         const rows = this.getRows();
         let rooms;
         if (rows.length === 0) {
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index ad073f3278..f4be44b1af 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector 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.
@@ -15,15 +15,16 @@ limitations under the License.
 */
 
 import * as sdk from '../../../index';
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import { _t } from '../../../languageHandler';
 import { linkifyElement } from '../../../HtmlUtils';
 import PropTypes from 'prop-types';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import { getDisplayAliasForAliasSet } from '../../../Rooms';
 
 export function getDisplayAliasForRoom(room) {
-    return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
+    return getDisplayAliasForAliasSet(room.canonicalAlias, room.aliases);
 }
 
 export const roomShape = PropTypes.shape({
@@ -104,8 +105,12 @@ export default class RoomDetailRow extends React.Component {
 
         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}
+                <BaseAvatar
+                    width={24}
+                    height={24}
+                    resizeMethod='crop'
+                    name={name}
+                    idName={name}
                     url={avatarUrl} />
             </td>
             <td className="mx_RoomDirectory_roomDescription">
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.tsx
similarity index 76%
rename from src/components/views/rooms/RoomHeader.js
rename to src/components/views/rooms/RoomHeader.tsx
index cb6bb0afca..d0e438bcda 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -16,13 +16,10 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import RateLimitedFunc from '../../../ratelimitedfunc';
 
-import { CancelButton } from './SimpleRoomHeader';
 import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
 import E2EIcon from './E2EIcon';
@@ -32,62 +29,76 @@ import RoomTopic from "../elements/RoomTopic";
 import RoomName from "../elements/RoomName";
 import { PlaceCallType } from "../../../CallHandler";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Modal from '../../../Modal';
+import InfoDialog from "../dialogs/InfoDialog";
+import { throttle } from 'lodash';
+import { MatrixEvent, Room, RoomState } from 'matrix-js-sdk/src';
+import { E2EStatus } from '../../../utils/ShieldUtils';
+import { IOOBData } from '../../../stores/ThreepidInviteStore';
+import { SearchScope } from './SearchBar';
+
+export interface ISearchInfo {
+    searchTerm: string;
+    searchScope: SearchScope;
+    searchCount: number;
+}
+
+interface IProps {
+    room: Room;
+    oobData?: IOOBData;
+    inRoom: boolean;
+    onSettingsClick: () => void;
+    onSearchClick: () => void;
+    onForgetClick: () => void;
+    onCallPlaced: (type: PlaceCallType) => void;
+    onAppsClick: () => void;
+    e2eStatus: E2EStatus;
+    appsShown: boolean;
+    searchInfo: ISearchInfo;
+}
 
 @replaceableComponent("views.rooms.RoomHeader")
-export default class RoomHeader extends React.Component {
-    static propTypes = {
-        room: PropTypes.object,
-        oobData: PropTypes.object,
-        inRoom: PropTypes.bool,
-        onSettingsClick: PropTypes.func,
-        onSearchClick: PropTypes.func,
-        onLeaveClick: PropTypes.func,
-        onCancelClick: PropTypes.func,
-        e2eStatus: PropTypes.string,
-        onAppsClick: PropTypes.func,
-        appsShown: PropTypes.bool,
-        onCallPlaced: PropTypes.func, // (PlaceCallType) => void;
-    };
-
+export default class RoomHeader extends React.Component<IProps> {
     static defaultProps = {
         editing: false,
         inRoom: false,
-        onCancelClick: null,
     };
 
-    componentDidMount() {
+    public componentDidMount() {
         const cli = MatrixClientPeg.get();
-        cli.on("RoomState.events", this._onRoomStateEvents);
+        cli.on("RoomState.events", this.onRoomStateEvents);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount() {
         const cli = MatrixClientPeg.get();
         if (cli) {
-            cli.removeListener("RoomState.events", this._onRoomStateEvents);
+            cli.removeListener("RoomState.events", this.onRoomStateEvents);
         }
     }
 
-    _onRoomStateEvents = (event, state) => {
+    private onRoomStateEvents = (event: MatrixEvent, state: RoomState) => {
         if (!this.props.room || event.getRoomId() !== this.props.room.roomId) {
             return;
         }
 
         // redisplay the room name, topic, etc.
-        this._rateLimitedUpdate();
+        this.rateLimitedUpdate();
     };
 
-    _rateLimitedUpdate = new RateLimitedFunc(function() {
-        /* eslint-disable babel/no-invalid-this */
+    private rateLimitedUpdate = throttle(() => {
         this.forceUpdate();
-    }, 500);
+    }, 500, { leading: true, trailing: true });
 
-    render() {
+    private displayInfoDialogAboutScreensharing() {
+        Modal.createDialog(InfoDialog, {
+            title: _t("Screen sharing is here!"),
+            description: _t("You can now share your screen by pressing the \"screen share\" " +
+            "button during a call. You can even do this in audio calls if both sides support it!"),
+        });
+    }
+
+    public render() {
         let searchStatus = null;
-        let cancelButton = null;
-
-        if (this.props.onCancelClick) {
-            cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
-        }
 
         // don't display the search count until the search completes and
         // gives us a valid (possibly zero) searchCount.
@@ -120,18 +131,18 @@ export default class RoomHeader extends React.Component {
         const name =
             <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
                 <RoomName room={this.props.room}>
-                    {(name) => {
+                    { (name) => {
                         const roomName = name || oobName;
                         return <div dir="auto" className={textClasses} title={roomName}>{ roomName }</div>;
-                    }}
+                    } }
                 </RoomName>
                 { searchStatus }
             </div>;
 
         const topicElement = <RoomTopic room={this.props.room}>
-            {(topic, ref) => <div className="mx_RoomHeader_topic" ref={ref} title={topic} dir="auto">
+            { (topic, ref) => <div className="mx_RoomHeader_topic" ref={ref} title={topic} dir="auto">
                 { topic }
-            </div>}
+            </div> }
         </RoomTopic>;
 
         let roomAvatar;
@@ -184,8 +195,8 @@ export default class RoomHeader extends React.Component {
             videoCallButton =
                 <AccessibleTooltipButton
                     className="mx_RoomHeader_button mx_RoomHeader_videoCallButton"
-                    onClick={(ev) => this.props.onCallPlaced(
-                        ev.shiftKey ? PlaceCallType.ScreenSharing : PlaceCallType.Video)}
+                    onClick={(ev: React.MouseEvent<Element>) => ev.shiftKey ?
+                        this.displayInfoDialogAboutScreensharing() : this.props.onCallPlaced(PlaceCallType.Video)}
                     title={_t("Video call")} />;
         }
 
@@ -207,7 +218,6 @@ export default class RoomHeader extends React.Component {
                     <div className="mx_RoomHeader_e2eIcon">{ e2eIcon }</div>
                     { name }
                     { topicElement }
-                    { cancelButton }
                     { rightRow }
                     <RoomHeaderButtons room={this.props.room} />
                 </div>
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 8b36341ed0..5ae2939c74 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -22,7 +22,7 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { _t, _td } from "../../../languageHandler";
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
-import { ResizeNotifier } from "../../../utils/ResizeNotifier";
+import ResizeNotifier from "../../../utils/ResizeNotifier";
 import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
 import RoomViewStore from "../../../stores/RoomViewStore";
 import { ITagMap } from "../../../stores/room-list/algorithms/models";
@@ -38,23 +38,23 @@ import { StaticNotificationState } from "../../../stores/notifications/StaticNot
 import { Action } from "../../../dispatcher/actions";
 import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
-import SettingsStore from "../../../settings/SettingsStore";
 import CustomRoomTagStore from "../../../stores/CustomRoomTagStore";
 import { arrayFastClone, arrayHasDiff } from "../../../utils/arrays";
 import { objectShallowClone, objectWithOnly } from "../../../utils/objects";
 import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../context_menus/IconizedContextMenu";
 import AccessibleButton from "../elements/AccessibleButton";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
-import CallHandler from "../../../CallHandler";
-import SpaceStore, {ISuggestedRoom, SUGGESTED_ROOMS} from "../../../stores/SpaceStore";
-import {showAddExistingRooms, showCreateNewRoom, showSpaceInvite} from "../../../utils/space";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import SpaceStore, { ISuggestedRoom, SUGGESTED_ROOMS } from "../../../stores/SpaceStore";
+import { showAddExistingRooms, showCreateNewRoom, showSpaceInvite } from "../../../utils/space";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RoomAvatar from "../avatars/RoomAvatar";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
     onFocus: (ev: React.FocusEvent) => void;
     onBlur: (ev: React.FocusEvent) => void;
+    onResize: () => void;
     onListCollapse?: (isExpanded: boolean) => void;
     resizeNotifier: ResizeNotifier;
     isMinimized: boolean;
@@ -68,7 +68,7 @@ interface IState {
     suggestedRooms: ISuggestedRoom[];
 }
 
-const TAG_ORDER: TagID[] = [
+export const TAG_ORDER: TagID[] = [
     DefaultTagID.Invite,
     DefaultTagID.Favourite,
     DefaultTagID.DM,
@@ -102,38 +102,6 @@ interface ITagAestheticsMap {
     [tagId: TagID]: ITagAesthetics;
 }
 
-// If we have no dialer support, we just show the create chat dialog
-const dmOnAddRoom = (dispatcher?: Dispatcher<ActionPayload>) => {
-    (dispatcher || defaultDispatcher).dispatch({action: 'view_create_chat'});
-};
-
-// If we have dialer support, show a context menu so the user can pick between
-// the dialer and the create chat dialog
-const dmAddRoomContextMenu = (onFinished: () => void) => {
-    return <IconizedContextMenuOptionList first>
-        <IconizedContextMenuOption
-            label={_t("Start a Conversation")}
-            iconClassName="mx_RoomList_iconPlus"
-            onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                onFinished();
-                defaultDispatcher.dispatch({action: "view_create_chat"});
-            }}
-        />
-        <IconizedContextMenuOption
-            label={_t("Open dial pad")}
-            iconClassName="mx_RoomList_iconDialpad"
-            onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                onFinished();
-                defaultDispatcher.fire(Action.OpenDialPad);
-            }}
-        />
-    </IconizedContextMenuOptionList>;
-};
-
 const TAG_AESTHETICS: ITagAestheticsMap = {
     [DefaultTagID.Invite]: {
         sectionLabel: _td("Invites"),
@@ -150,8 +118,9 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
         isInvite: false,
         defaultHidden: false,
         addRoomLabel: _td("Start chat"),
-        // Either onAddRoom or addRoomContextMenu are set depending on whether we
-        // have dialer support.
+        onAddRoom: (dispatcher?: Dispatcher<ActionPayload>) => {
+            (dispatcher || defaultDispatcher).dispatch({ action: 'view_create_chat' });
+        },
     },
     [DefaultTagID.Untagged]: {
         sectionLabel: _td("Rooms"),
@@ -171,7 +140,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
                             e.preventDefault();
                             e.stopPropagation();
                             onFinished();
-                            showCreateNewRoom(MatrixClientPeg.get(), SpaceStore.instance.activeSpace);
+                            showCreateNewRoom(SpaceStore.instance.activeSpace);
                         }}
                         disabled={!canAddRooms}
                         tooltip={canAddRooms ? undefined
@@ -184,7 +153,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
                             e.preventDefault();
                             e.stopPropagation();
                             onFinished();
-                            showAddExistingRooms(MatrixClientPeg.get(), SpaceStore.instance.activeSpace);
+                            showAddExistingRooms(SpaceStore.instance.activeSpace);
                         }}
                         disabled={!canAddRooms}
                         tooltip={canAddRooms ? undefined
@@ -211,7 +180,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
                         e.preventDefault();
                         e.stopPropagation();
                         onFinished();
-                        defaultDispatcher.dispatch({action: "view_create_room"});
+                        defaultDispatcher.dispatch({ action: "view_create_room" });
                     }}
                 />
                 <IconizedContextMenuOption
@@ -270,7 +239,6 @@ function customTagAesthetics(tagId: TagID): ITagAesthetics {
 export default class RoomList extends React.PureComponent<IProps, IState> {
     private dispatcherRef;
     private customTagStoreRef;
-    private tagAesthetics: ITagAestheticsMap;
     private roomStoreToken: fbEmitter.EventSubscription;
 
     constructor(props: IProps) {
@@ -281,10 +249,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
             suggestedRooms: SpaceStore.instance.suggestedRooms,
         };
-
-        // shallow-copy from the template as we need to make modifications to it
-        this.tagAesthetics = objectShallowClone(TAG_AESTHETICS);
-        this.updateDmAddRoomAction();
     }
 
     public componentDidMount(): void {
@@ -310,17 +274,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         });
     };
 
-    private updateDmAddRoomAction() {
-        const dmTagAesthetics = objectShallowClone(TAG_AESTHETICS[DefaultTagID.DM]);
-        if (CallHandler.sharedInstance().getSupportsPstnProtocol()) {
-            dmTagAesthetics.addRoomContextMenu = dmAddRoomContextMenu;
-        } else {
-            dmTagAesthetics.onAddRoom = dmOnAddRoom;
-        }
-
-        this.tagAesthetics[DefaultTagID.DM] = dmTagAesthetics;
-    }
-
     private onAction = (payload: ActionPayload) => {
         if (payload.action === Action.ViewRoomDelta) {
             const viewRoomDeltaPayload = payload as ViewRoomDeltaPayload;
@@ -334,7 +287,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 });
             }
         } else if (payload.action === Action.PstnSupportUpdated) {
-            this.updateDmAddRoomAction();
             this.updateLists();
         }
     };
@@ -368,11 +320,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
     private updateLists = () => {
         const newLists = RoomListStore.instance.orderedLists;
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log("new lists", newLists);
-        }
-
         const previousListIds = Object.keys(this.state.sublists);
         const newListIds = Object.keys(newLists).filter(t => {
             if (!isCustomTag(t)) return true; // always include non-custom tags
@@ -404,7 +351,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             const newSublists = objectWithOnly(newLists, newListIds);
             const sublists = objectShallowClone(newSublists, (k, v) => arrayFastClone(v));
 
-            this.setState({sublists, isNameFiltering});
+            this.setState({ sublists, isNameFiltering }, () => {
+                this.props.onResize();
+            });
         }
     };
 
@@ -463,6 +412,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     }
 
     private renderCommunityInvites(): ReactComponentElement<typeof ExtraTile>[] {
+        if (SpaceStore.spacesEnabled) return [];
         // 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 => {
@@ -473,7 +423,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                     groupId={g.groupId}
                     groupName={g.name}
                     groupAvatarUrl={g.avatarUrl}
-                    width={32} height={32} resizeMethod='crop'
+                    width={32}
+                    height={32}
+                    resizeMethod='crop'
                 />
             );
             const openGroup = () => {
@@ -520,7 +472,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
                 const aesthetics: ITagAesthetics = isCustomTag(orderedTagId)
                     ? customTagAesthetics(orderedTagId)
-                    : this.tagAesthetics[orderedTagId];
+                    : TAG_AESTHETICS[orderedTagId];
                 if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
 
                 // The cost of mounting/unmounting this component offsets the cost
@@ -540,7 +492,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                     resizeNotifier={this.props.resizeNotifier}
                     alwaysVisible={ALWAYS_VISIBLE_TAGS.includes(orderedTagId)}
                     onListCollapse={this.props.onListCollapse}
-                />
+                />;
             });
     }
 
@@ -552,13 +504,13 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         if (!this.props.isMinimized) {
             if (this.state.isNameFiltering) {
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
-                    <div>{_t("Can't see what you’re looking for?")}</div>
+                    <div>{ _t("Can't see what you’re looking for?") }</div>
                     <AccessibleButton
                         className="mx_RoomList_explorePrompt_startChat"
                         kind="link"
                         onClick={this.onStartChat}
                     >
-                        {_t("Start a new chat")}
+                        { _t("Start a new chat") }
                     </AccessibleButton>
                     <AccessibleButton
                         className="mx_RoomList_explorePrompt_explore"
@@ -571,43 +523,46 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             } else if (
                 this.props.activeSpace?.canInvite(userId) || this.props.activeSpace?.getMyMembership() === "join"
             ) {
+                const spaceName = this.props.activeSpace.name;
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
                     <div>{ _t("Quick actions") }</div>
-                    { this.props.activeSpace.canInvite(userId) && <AccessibleButton
+                    { this.props.activeSpace.canInvite(userId) && <AccessibleTooltipButton
                         className="mx_RoomList_explorePrompt_spaceInvite"
                         onClick={this.onSpaceInviteClick}
+                        title={_t("Invite to %(spaceName)s", { spaceName })}
                     >
-                        {_t("Invite people")}
-                    </AccessibleButton> }
-                    { this.props.activeSpace.getMyMembership() === "join" && <AccessibleButton
+                        { _t("Invite people") }
+                    </AccessibleTooltipButton> }
+                    { this.props.activeSpace.getMyMembership() === "join" && <AccessibleTooltipButton
                         className="mx_RoomList_explorePrompt_spaceExplore"
                         onClick={this.onExplore}
+                        title={_t("Explore %(spaceName)s", { spaceName })}
                     >
-                        {_t("Explore rooms")}
-                    </AccessibleButton> }
+                        { _t("Explore rooms") }
+                    </AccessibleTooltipButton> }
                 </div>;
             } else if (Object.values(this.state.sublists).some(list => list.length > 0)) {
-                const unfilteredLists = RoomListStore.instance.unfilteredLists
+                const unfilteredLists = RoomListStore.instance.unfilteredLists;
                 const unfilteredRooms = unfilteredLists[DefaultTagID.Untagged] || [];
                 const unfilteredHistorical = unfilteredLists[DefaultTagID.Archived] || [];
                 const unfilteredFavourite = unfilteredLists[DefaultTagID.Favourite] || [];
                 // show a prompt to join/create rooms if the user is in 0 rooms and no historical
-                if (unfilteredRooms.length < 1 && unfilteredHistorical < 1 && unfilteredFavourite < 1) {
+                if (unfilteredRooms.length < 1 && unfilteredHistorical.length < 1 && unfilteredFavourite.length < 1) {
                     explorePrompt = <div className="mx_RoomList_explorePrompt">
-                        <div>{_t("Use the + to make a new room or explore existing ones below")}</div>
+                        <div>{ _t("Use the + to make a new room or explore existing ones below") }</div>
                         <AccessibleButton
                             className="mx_RoomList_explorePrompt_startChat"
                             kind="link"
                             onClick={this.onStartChat}
                         >
-                            {_t("Start a new chat")}
+                            { _t("Start a new chat") }
                         </AccessibleButton>
                         <AccessibleButton
                             className="mx_RoomList_explorePrompt_explore"
                             kind="link"
                             onClick={this.onExplore}
                         >
-                            {_t("Explore all public rooms")}
+                            { _t("Explore all public rooms") }
                         </AccessibleButton>
                     </div>;
                 }
@@ -617,7 +572,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         const sublists = this.renderSublists();
         return (
             <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={this.props.onKeyDown}>
-                {({onKeyDownHandler}) => (
+                { ({ onKeyDownHandler }) => (
                     <div
                         onFocus={this.props.onFocus}
                         onBlur={this.props.onBlur}
@@ -626,10 +581,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                         role="tree"
                         aria-label={_t("Rooms")}
                     >
-                        {sublists}
-                        {explorePrompt}
+                        { sublists }
+                        { explorePrompt }
                     </div>
-                )}
+                ) }
             </RovingTabIndexProvider>
         );
     }
diff --git a/src/components/views/rooms/RoomListNumResults.tsx b/src/components/views/rooms/RoomListNumResults.tsx
index 19023e361c..95c8c6590f 100644
--- a/src/components/views/rooms/RoomListNumResults.tsx
+++ b/src/components/views/rooms/RoomListNumResults.tsx
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 
 import { _t } from "../../../languageHandler";
 import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import SpaceStore from "../../../stores/SpaceStore";
 
 interface IProps {
-    onVisibilityChange?: () => void
+    onVisibilityChange?: () => void;
 }
 
 const RoomListNumResults: React.FC<IProps> = ({ onVisibilityChange }) => {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.tsx
similarity index 70%
rename from src/components/views/rooms/RoomPreviewBar.js
rename to src/components/views/rooms/RoomPreviewBar.tsx
index 7f20451d6d..2acefc93d6 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.tsx
@@ -14,118 +14,135 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import React from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
+import { IJoinRuleEventContent, JoinRule } from "matrix-js-sdk/src/@types/partials";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
 import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import SdkConfig from "../../../SdkConfig";
 import IdentityAuthClient from '../../../IdentityAuthClient';
-import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
-import {UPDATE_EVENT} from "../../../stores/AsyncStore";
+import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import InviteReason from "../elements/InviteReason";
+import { IOOBData } from "../../../stores/ThreepidInviteStore";
+import Spinner from "../elements/Spinner";
+import AccessibleButton from "../elements/AccessibleButton";
 
-const MessageCase = Object.freeze({
-    NotLoggedIn: "NotLoggedIn",
-    Joining: "Joining",
-    Loading: "Loading",
-    Rejecting: "Rejecting",
-    Kicked: "Kicked",
-    Banned: "Banned",
-    OtherThreePIDError: "OtherThreePIDError",
-    InvitedEmailNotFoundInAccount: "InvitedEmailNotFoundInAccount",
-    InvitedEmailNoIdentityServer: "InvitedEmailNoIdentityServer",
-    InvitedEmailMismatch: "InvitedEmailMismatch",
-    Invite: "Invite",
-    ViewingRoom: "ViewingRoom",
-    RoomNotFound: "RoomNotFound",
-    OtherError: "OtherError",
-});
+const MemberEventHtmlReasonField = "io.element.html_reason";
+
+enum MessageCase {
+    NotLoggedIn = "NotLoggedIn",
+    Joining = "Joining",
+    Loading = "Loading",
+    Rejecting = "Rejecting",
+    Kicked = "Kicked",
+    Banned = "Banned",
+    OtherThreePIDError = "OtherThreePIDError",
+    InvitedEmailNotFoundInAccount = "InvitedEmailNotFoundInAccount",
+    InvitedEmailNoIdentityServer = "InvitedEmailNoIdentityServer",
+    InvitedEmailMismatch = "InvitedEmailMismatch",
+    Invite = "Invite",
+    ViewingRoom = "ViewingRoom",
+    RoomNotFound = "RoomNotFound",
+    OtherError = "OtherError",
+}
+
+interface IProps {
+    // if inviterName is specified, the preview bar will shown an invite to the room.
+    // You should also specify onRejectClick if specifying inviterName
+    inviterName?: string;
+
+    // If invited by 3rd party invite, the email address the invite was sent to
+    invitedEmail?: string;
+
+    // For third party invites, information passed about the room out-of-band
+    oobData?: IOOBData;
+
+    // For third party invites, a URL for a 3pid invite signing service
+    signUrl?: string;
+
+    // A standard client/server API error object. If supplied, indicates that the
+    // caller was unable to fetch details about the room for the given reason.
+    error?: MatrixError;
+
+    canPreview?: boolean;
+    previewLoading?: boolean;
+    room?: Room;
+
+    loading?: boolean;
+    joining?: boolean;
+    rejecting?: boolean;
+    // The alias that was used to access this room, if appropriate
+    // If given, this will be how the room is referred to (eg.
+    // in error messages).
+    roomAlias?: string;
+
+    onJoinClick?(): void;
+    onRejectClick?(): void;
+    onRejectAndIgnoreClick?(): void;
+    onForgetClick?(): void;
+}
+
+interface IState {
+    busy: boolean;
+    accountEmails?: string[];
+    invitedEmailMxid?: string;
+    threePidFetchError?: MatrixError;
+}
 
 @replaceableComponent("views.rooms.RoomPreviewBar")
-export default class RoomPreviewBar extends React.Component {
-    static propTypes = {
-        onJoinClick: PropTypes.func,
-        onRejectClick: PropTypes.func,
-        onRejectAndIgnoreClick: PropTypes.func,
-        onForgetClick: PropTypes.func,
-        // if inviterName is specified, the preview bar will shown an invite to the room.
-        // You should also specify onRejectClick if specifiying inviterName
-        inviterName: PropTypes.string,
-
-        // If invited by 3rd party invite, the email address the invite was sent to
-        invitedEmail: PropTypes.string,
-
-        // For third party invites, information passed about the room out-of-band
-        oobData: PropTypes.object,
-
-        // For third party invites, a URL for a 3pid invite signing service
-        signUrl: PropTypes.string,
-
-        // A standard client/server API error object. If supplied, indicates that the
-        // caller was unable to fetch details about the room for the given reason.
-        error: PropTypes.object,
-
-        canPreview: PropTypes.bool,
-        previewLoading: PropTypes.bool,
-        room: PropTypes.object,
-
-        // When a spinner is present, a spinnerState can be specified to indicate the
-        // purpose of the spinner.
-        spinner: PropTypes.bool,
-        spinnerState: PropTypes.oneOf(["joining"]),
-        loading: PropTypes.bool,
-        joining: PropTypes.bool,
-        rejecting: PropTypes.bool,
-        // The alias that was used to access this room, if appropriate
-        // If given, this will be how the room is referred to (eg.
-        // in error messages).
-        roomAlias: PropTypes.string,
-    };
-
+export default class RoomPreviewBar extends React.Component<IProps, IState> {
     static defaultProps = {
         onJoinClick() {},
     };
 
-    state = {
-        busy: false,
-    };
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            busy: false,
+        };
+    }
 
     componentDidMount() {
-        this._checkInvitedEmail();
-        CommunityPrototypeStore.instance.on(UPDATE_EVENT, this._onCommunityUpdate);
+        this.checkInvitedEmail();
+        CommunityPrototypeStore.instance.on(UPDATE_EVENT, this.onCommunityUpdate);
     }
 
     componentDidUpdate(prevProps, prevState) {
         if (this.props.invitedEmail !== prevProps.invitedEmail || this.props.inviterName !== prevProps.inviterName) {
-            this._checkInvitedEmail();
+            this.checkInvitedEmail();
         }
     }
 
     componentWillUnmount() {
-        CommunityPrototypeStore.instance.off(UPDATE_EVENT, this._onCommunityUpdate);
+        CommunityPrototypeStore.instance.off(UPDATE_EVENT, this.onCommunityUpdate);
     }
 
-    async _checkInvitedEmail() {
+    private async checkInvitedEmail() {
         // If this is an invite and we've been told what email address was
         // invited, fetch the user's account emails and discovery bindings so we
         // can check them against the email that was invited.
         if (this.props.inviterName && this.props.invitedEmail) {
-            this.setState({busy: true});
+            this.setState({ busy: true });
             try {
                 // Gather the account 3PIDs
                 const account3pids = await MatrixClientPeg.get().getThreePids();
                 this.setState({
-                    accountEmails: account3pids.threepids
-                        .filter(b => b.medium === 'email').map(b => b.address),
+                    accountEmails: account3pids.threepids.filter(b => b.medium === 'email').map(b => b.address),
                 });
                 // If we have an IS connected, use that to lookup the email and
                 // check the bound MXID.
                 if (!MatrixClientPeg.get().getIdentityServerUrl()) {
-                    this.setState({busy: false});
+                    this.setState({ busy: false });
                     return;
                 }
                 const authClient = new IdentityAuthClient();
@@ -136,29 +153,29 @@ export default class RoomPreviewBar extends React.Component {
                     undefined /* callback */,
                     identityAccessToken,
                 );
-                this.setState({invitedEmailMxid: result.mxid});
+                this.setState({ invitedEmailMxid: result.mxid });
             } catch (err) {
-                this.setState({threePidFetchError: err});
+                this.setState({ threePidFetchError: err });
             }
-            this.setState({busy: false});
+            this.setState({ busy: false });
         }
     }
 
-    _onCommunityUpdate = (roomId) => {
+    private onCommunityUpdate = (roomId: string): void => {
         if (this.props.room && this.props.room.roomId !== roomId) {
             return;
         }
         this.forceUpdate(); // we have nothing to update
     };
 
-    _getMessageCase() {
+    private getMessageCase(): MessageCase {
         const isGuest = MatrixClientPeg.get().isGuest();
 
         if (isGuest) {
             return MessageCase.NotLoggedIn;
         }
 
-        const myMember = this._getMyMember();
+        const myMember = this.getMyMember();
 
         if (myMember) {
             if (myMember.isKicked()) {
@@ -193,7 +210,7 @@ export default class RoomPreviewBar extends React.Component {
             }
             return MessageCase.Invite;
         } else if (this.props.error) {
-            if (this.props.error.errcode == 'M_NOT_FOUND') {
+            if ((this.props.error as MatrixError).errcode == 'M_NOT_FOUND') {
                 return MessageCase.RoomNotFound;
             } else {
                 return MessageCase.OtherError;
@@ -203,8 +220,8 @@ export default class RoomPreviewBar extends React.Component {
         }
     }
 
-    _getKickOrBanInfo() {
-        const myMember = this._getMyMember();
+    private getKickOrBanInfo(): { memberName?: string, reason?: string } {
+        const myMember = this.getMyMember();
         if (!myMember) {
             return {};
         }
@@ -214,27 +231,22 @@ export default class RoomPreviewBar extends React.Component {
         const memberName = kickerMember ?
             kickerMember.name : myMember.events.member.getSender();
         const reason = myMember.events.member.getContent().reason;
-        return {memberName, reason};
+        return { memberName, reason };
     }
 
-    _joinRule() {
-        const room = this.props.room;
-        if (room) {
-            const joinRules = room.currentState.getStateEvents('m.room.join_rules', '');
-            if (joinRules) {
-                return joinRules.getContent().join_rule;
-            }
-        }
+    private joinRule(): JoinRule {
+        return this.props.room?.currentState
+            .getStateEvents(EventType.RoomJoinRules, "")?.getContent<IJoinRuleEventContent>().join_rule;
     }
 
-    _communityProfile() {
+    private communityProfile(): { displayName?: string, avatarMxc?: string } {
         if (this.props.room) return CommunityPrototypeStore.instance.getInviteProfile(this.props.room.roomId);
-        return {displayName: null, avatarMxc: null};
+        return { displayName: null, avatarMxc: null };
     }
 
-    _roomName(atStart = false) {
+    private roomName(atStart = false): string {
         let name = this.props.room ? this.props.room.name : this.props.roomAlias;
-        const profile = this._communityProfile();
+        const profile = this.communityProfile();
         if (profile.displayName) name = profile.displayName;
         if (name) {
             return name;
@@ -245,15 +257,12 @@ export default class RoomPreviewBar extends React.Component {
         }
     }
 
-    _getMyMember() {
-        return (
-            this.props.room &&
-            this.props.room.getMember(MatrixClientPeg.get().getUserId())
-        );
+    private getMyMember(): RoomMember {
+        return this.props.room?.getMember(MatrixClientPeg.get().getUserId());
     }
 
-    _getInviteMember() {
-        const {room} = this.props;
+    private getInviteMember(): RoomMember {
+        const { room } = this.props;
         if (!room) {
             return;
         }
@@ -266,8 +275,8 @@ export default class RoomPreviewBar extends React.Component {
         return room.currentState.getMember(inviterUserId);
     }
 
-    _isDMInvite() {
-        const myMember = this._getMyMember();
+    private isDMInvite(): boolean {
+        const myMember = this.getMyMember();
         if (!myMember) {
             return false;
         }
@@ -276,7 +285,7 @@ export default class RoomPreviewBar extends React.Component {
         return memberContent.membership === "invite" && memberContent.is_direct;
     }
 
-    _makeScreenAfterLogin() {
+    private makeScreenAfterLogin(): { screen: string, params: Record<string, any> } {
         return {
             screen: 'room',
             params: {
@@ -289,18 +298,16 @@ export default class RoomPreviewBar extends React.Component {
         };
     }
 
-    onLoginClick = () => {
-        dis.dispatch({ action: 'start_login', screenAfterLogin: this._makeScreenAfterLogin() });
+    private onLoginClick = () => {
+        dis.dispatch({ action: 'start_login', screenAfterLogin: this.makeScreenAfterLogin() });
     };
 
-    onRegisterClick = () => {
-        dis.dispatch({ action: 'start_registration', screenAfterLogin: this._makeScreenAfterLogin() });
+    private onRegisterClick = () => {
+        dis.dispatch({ action: 'start_registration', screenAfterLogin: this.makeScreenAfterLogin() });
     };
 
     render() {
         const brand = SdkConfig.get().brand;
-        const Spinner = sdk.getComponent('elements.Spinner');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let showSpinner = false;
         let title;
@@ -313,10 +320,10 @@ export default class RoomPreviewBar extends React.Component {
         let footer;
         const extraComponents = [];
 
-        const messageCase = this._getMessageCase();
+        const messageCase = this.getMessageCase();
         switch (messageCase) {
             case MessageCase.Joining: {
-                title = _t("Joining room …");
+                title = this.props.oobData?.roomType === RoomType.Space ? _t("Joining space …") : _t("Joining room …");
                 showSpinner = true;
                 break;
             }
@@ -340,19 +347,19 @@ export default class RoomPreviewBar extends React.Component {
                     footer = (
                         <div>
                             <Spinner w={20} h={20} />
-                            {_t("Loading room preview")}
+                            { _t("Loading room preview") }
                         </div>
                     );
                 }
                 break;
             }
             case MessageCase.Kicked: {
-                const {memberName, reason} = this._getKickOrBanInfo();
+                const { memberName, reason } = this.getKickOrBanInfo();
                 title = _t("You were kicked from %(roomName)s by %(memberName)s",
-                    {memberName, roomName: this._roomName()});
-                subTitle = reason ? _t("Reason: %(reason)s", {reason}) : null;
+                    { memberName, roomName: this.roomName() });
+                subTitle = reason ? _t("Reason: %(reason)s", { reason }) : null;
 
-                if (this._joinRule() === "invite") {
+                if (this.joinRule() === "invite") {
                     primaryActionLabel = _t("Forget this room");
                     primaryActionHandler = this.props.onForgetClick;
                 } else {
@@ -364,22 +371,22 @@ export default class RoomPreviewBar extends React.Component {
                 break;
             }
             case MessageCase.Banned: {
-                const {memberName, reason} = this._getKickOrBanInfo();
+                const { memberName, reason } = this.getKickOrBanInfo();
                 title = _t("You were banned from %(roomName)s by %(memberName)s",
-                    {memberName, roomName: this._roomName()});
-                subTitle = reason ? _t("Reason: %(reason)s", {reason}) : null;
+                    { memberName, roomName: this.roomName() });
+                subTitle = reason ? _t("Reason: %(reason)s", { reason }) : null;
                 primaryActionLabel = _t("Forget this room");
                 primaryActionHandler = this.props.onForgetClick;
                 break;
             }
             case MessageCase.OtherThreePIDError: {
                 title = _t("Something went wrong with your invite to %(roomName)s",
-                    {roomName: this._roomName()});
-                const joinRule = this._joinRule();
+                    { roomName: this.roomName() });
+                const joinRule = this.joinRule();
                 const errCodeMessage = _t(
                     "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: this.state.threePidFetchError.errcode || _t("unknown error code")},
+                    { errcode: this.state.threePidFetchError.errcode || _t("unknown error code") },
                 );
                 switch (joinRule) {
                     case "invite":
@@ -408,7 +415,7 @@ export default class RoomPreviewBar extends React.Component {
                     "This invite to %(roomName)s was sent to %(email)s which is not " +
                     "associated with your account",
                     {
-                        roomName: this._roomName(),
+                        roomName: this.roomName(),
                         email: this.props.invitedEmail,
                     },
                 );
@@ -425,7 +432,7 @@ export default class RoomPreviewBar extends React.Component {
                 title = _t(
                     "This invite to %(roomName)s was sent to %(email)s",
                     {
-                        roomName: this._roomName(),
+                        roomName: this.roomName(),
                         email: this.props.invitedEmail,
                     },
                 );
@@ -441,7 +448,7 @@ export default class RoomPreviewBar extends React.Component {
                 title = _t(
                     "This invite to %(roomName)s was sent to %(email)s",
                     {
-                        roomName: this._roomName(),
+                        roomName: this.roomName(),
                         email: this.props.invitedEmail,
                     },
                 );
@@ -456,45 +463,49 @@ export default class RoomPreviewBar extends React.Component {
             case MessageCase.Invite: {
                 const RoomAvatar = sdk.getComponent("views.avatars.RoomAvatar");
                 const oobData = Object.assign({}, this.props.oobData, {
-                    avatarUrl: this._communityProfile().avatarMxc,
+                    avatarUrl: this.communityProfile().avatarMxc,
                 });
                 const avatar = <RoomAvatar room={this.props.room} oobData={oobData} />;
 
-                const inviteMember = this._getInviteMember();
+                const inviteMember = this.getInviteMember();
                 let inviterElement;
                 if (inviteMember) {
                     inviterElement = <span>
                         <span className="mx_RoomPreviewBar_inviter">
-                            {inviteMember.rawDisplayName}
-                        </span> ({inviteMember.userId})
+                            { inviteMember.rawDisplayName }
+                        </span> ({ inviteMember.userId })
                     </span>;
                 } else {
-                    inviterElement = (<span className="mx_RoomPreviewBar_inviter">{this.props.inviterName}</span>);
+                    inviterElement = (<span className="mx_RoomPreviewBar_inviter">{ this.props.inviterName }</span>);
                 }
 
-                const isDM = this._isDMInvite();
+                const isDM = this.isDMInvite();
                 if (isDM) {
                     title = _t("Do you want to chat with %(user)s?",
                         { user: inviteMember.name });
                     subTitle = [
                         avatar,
-                        _t("<userName/> wants to chat", {}, {userName: () => inviterElement}),
+                        _t("<userName/> wants to chat", {}, { userName: () => inviterElement }),
                     ];
                     primaryActionLabel = _t("Start chatting");
                 } else {
                     title = _t("Do you want to join %(roomName)s?",
-                        { roomName: this._roomName() });
+                        { roomName: this.roomName() });
                     subTitle = [
                         avatar,
-                        _t("<userName/> invited you", {}, {userName: () => inviterElement}),
+                        _t("<userName/> invited you", {}, { userName: () => inviterElement }),
                     ];
                     primaryActionLabel = _t("Accept");
                 }
 
                 const myUserId = MatrixClientPeg.get().getUserId();
-                const reason = this.props.room.currentState.getMember(myUserId).events.member.event.content.reason;
-                if (reason) {
-                    reasonElement = <InviteReason reason={reason} />;
+                const memberEventContent = this.props.room.currentState.getMember(myUserId).events.member.getContent();
+
+                if (memberEventContent.reason) {
+                    reasonElement = <InviteReason
+                        reason={memberEventContent.reason}
+                        htmlReason={memberEventContent[MemberEventHtmlReasonField]}
+                    />;
                 }
 
                 primaryActionHandler = this.props.onJoinClick;
@@ -513,22 +524,22 @@ export default class RoomPreviewBar extends React.Component {
             case MessageCase.ViewingRoom: {
                 if (this.props.canPreview) {
                     title = _t("You're previewing %(roomName)s. Want to join it?",
-                        {roomName: this._roomName()});
+                        { roomName: this.roomName() });
                 } else {
                     title = _t("%(roomName)s can't be previewed. Do you want to join it?",
-                        {roomName: this._roomName(true)});
+                        { roomName: this.roomName(true) });
                 }
                 primaryActionLabel = _t("Join the discussion");
                 primaryActionHandler = this.props.onJoinClick;
                 break;
             }
             case MessageCase.RoomNotFound: {
-                title = _t("%(roomName)s does not exist.", {roomName: this._roomName(true)});
+                title = _t("%(roomName)s does not exist.", { roomName: this.roomName(true) });
                 subTitle = _t("This room doesn't exist. Are you sure you're at the right place?");
                 break;
             }
             case MessageCase.OtherError: {
-                title = _t("%(roomName)s is not accessible at this time.", {roomName: this._roomName(true)});
+                title = _t("%(roomName)s is not accessible at this time.", { roomName: this.roomName(true) });
                 subTitle = [
                     _t("Try again later, or ask a room admin to check if you have access."),
                     _t(
@@ -536,8 +547,10 @@ export default class RoomPreviewBar extends React.Component {
                         "If you think you're seeing this message in error, please " +
                         "<issueLink>submit a bug report</issueLink>.",
                         { errcode: this.props.error.errcode },
-                        { issueLink: label => <a href="https://github.com/vector-im/element-web/issues/new/choose"
-                            target="_blank" rel="noreferrer noopener">{ label }</a> },
+                        { issueLink: label => <a
+                            href="https://github.com/vector-im/element-web/issues/new/choose"
+                            target="_blank"
+                            rel="noreferrer noopener">{ label }</a> },
                     ),
                 ];
                 break;
@@ -549,7 +562,7 @@ export default class RoomPreviewBar extends React.Component {
             if (!Array.isArray(subTitle)) {
                 subTitle = [subTitle];
             }
-            subTitleElements = subTitle.map((t, i) => <p key={`subTitle${i}`}>{t}</p>);
+            subTitleElements = subTitle.map((t, i) => <p key={`subTitle${i}`}>{ t }</p>);
         }
 
         let titleElement;
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index 0bb7381dbc..3c9f0ea65e 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -45,7 +45,7 @@ import { ActionPayload } from "../../../dispatcher/payloads";
 import { Enable, Resizable } from "re-resizable";
 import { Direction } from "re-resizable/lib/resizer";
 import { polyfillTouchEvent } from "../../../@types/polyfill";
-import { ResizeNotifier } from "../../../utils/ResizeNotifier";
+import ResizeNotifier from "../../../utils/ResizeNotifier";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
 import RoomListLayoutStore from "../../../stores/room-list/RoomListLayoutStore";
 import { arrayFastClone, arrayHasOrderChange } from "../../../utils/arrays";
@@ -54,7 +54,7 @@ import ExtraTile from "./ExtraTile";
 import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
 import IconizedContextMenu from "../context_menus/IconizedContextMenu";
 import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS
 const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS
@@ -128,7 +128,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
             rooms: arrayFastClone(RoomListStore.instance.orderedLists[this.props.tagId] || []),
         };
         // Why Object.assign() and not this.state.height? Because TypeScript says no.
-        this.state = Object.assign(this.state, {height: this.calculateInitialHeight()});
+        this.state = Object.assign(this.state, { height: this.calculateInitialHeight() });
     }
 
     private calculateInitialHeight() {
@@ -184,7 +184,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         // 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) {
-            this.setState({height: this.calculateInitialHeight()});
+            this.setState({ height: this.calculateInitialHeight() });
         }
     }
 
@@ -329,12 +329,12 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     ) => {
         const newHeight = this.heightAtStart + delta.height;
         this.applyHeightChange(newHeight);
-        this.setState({height: newHeight});
+        this.setState({ height: newHeight });
     };
 
     private onResizeStart = () => {
         this.heightAtStart = this.state.height;
-        this.setState({isResizing: true});
+        this.setState({ isResizing: true });
     };
 
     private onResizeStop = (
@@ -345,7 +345,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     ) => {
         const newHeight = this.heightAtStart + delta.height;
         this.applyHeightChange(newHeight);
-        this.setState({isResizing: false, height: newHeight});
+        this.setState({ isResizing: false, height: newHeight });
     };
 
     private onShowAllClick = () => {
@@ -353,7 +353,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         const numVisibleTiles = this.numVisibleTiles;
         const newHeight = this.layout.tilesToPixelsWithPadding(this.numTiles, this.padding);
         this.applyHeightChange(newHeight);
-        this.setState({height: newHeight}, () => {
+        this.setState({ height: newHeight }, () => {
             // focus the top-most new room
             this.focusRoomTile(numVisibleTiles);
         });
@@ -362,7 +362,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     private onShowLessClick = () => {
         const newHeight = this.layout.tilesToPixelsWithPadding(this.layout.defaultVisibleTiles, this.padding);
         this.applyHeightChange(newHeight);
-        this.setState({height: newHeight});
+        this.setState({ height: newHeight });
     };
 
     private focusRoomTile = (index: number) => {
@@ -378,7 +378,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
         const target = ev.target as HTMLButtonElement;
-        this.setState({contextMenuPosition: target.getBoundingClientRect()});
+        this.setState({ contextMenuPosition: target.getBoundingClientRect() });
     };
 
     private onContextMenu = (ev: React.MouseEvent) => {
@@ -397,21 +397,21 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
         const target = ev.target as HTMLButtonElement;
-        this.setState({addRoomContextMenuPosition: target.getBoundingClientRect()});
+        this.setState({ addRoomContextMenuPosition: target.getBoundingClientRect() });
     };
 
     private onCloseMenu = () => {
-        this.setState({contextMenuPosition: null});
+        this.setState({ contextMenuPosition: null });
     };
 
     private onCloseAddRoomMenu = () => {
-        this.setState({addRoomContextMenuPosition: null});
+        this.setState({ addRoomContextMenuPosition: null });
     };
 
-    private onUnreadFirstChanged = async () => {
+    private onUnreadFirstChanged = () => {
         const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
         const newAlgorithm = isUnreadFirst ? ListAlgorithm.Natural : ListAlgorithm.Importance;
-        await RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
+        RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
         this.forceUpdate(); // because if the sublist doesn't have any changes then we will miss the list order change
     };
 
@@ -454,14 +454,15 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         const sublist = possibleSticky.parentElement.parentElement;
         const list = sublist.parentElement.parentElement;
         // the scrollTop is capped at the height of the header in LeftPanel, the top header is always sticky
-        const isAtTop = list.scrollTop <= HEADER_HEIGHT;
-        const isAtBottom = list.scrollTop >= list.scrollHeight - list.offsetHeight;
+        const listScrollTop = Math.round(list.scrollTop);
+        const isAtTop = listScrollTop <= Math.round(HEADER_HEIGHT);
+        const isAtBottom = listScrollTop >= Math.round(list.scrollHeight - list.offsetHeight);
         const isStickyTop = possibleSticky.classList.contains('mx_RoomSublist_headerContainer_stickyTop');
         const isStickyBottom = possibleSticky.classList.contains('mx_RoomSublist_headerContainer_stickyBottom');
 
         if ((isStickyBottom && !isAtBottom) || (isStickyTop && !isAtTop)) {
             // is sticky - jump to list
-            sublist.scrollIntoView({behavior: 'smooth'});
+            sublist.scrollIntoView({ behavior: 'smooth' });
         } else {
             // on screen - toggle collapse
             const isExpanded = this.state.isExpanded;
@@ -469,7 +470,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
             // if the bottom list is collapsed then scroll it in so it doesn't expand off screen
             if (!isExpanded && isStickyBottom) {
                 setImmediate(() => {
-                    sublist.scrollIntoView({behavior: 'smooth'});
+                    sublist.scrollIntoView({ behavior: 'smooth' });
                 });
             }
         }
@@ -477,9 +478,9 @@ export default class RoomSublist extends React.Component<IProps, IState> {
 
     private toggleCollapsed = () => {
         this.layout.isCollapsed = this.state.isExpanded;
-        this.setState({isExpanded: !this.layout.isCollapsed});
+        this.setState({ isExpanded: !this.layout.isCollapsed });
         if (this.props.onListCollapse) {
-            this.props.onListCollapse(!this.layout.isCollapsed)
+            this.props.onListCollapse(!this.layout.isCollapsed);
         }
     };
 
@@ -573,20 +574,20 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                     <React.Fragment>
                         <hr />
                         <div>
-                            <div className='mx_RoomSublist_contextMenu_title'>{_t("Appearance")}</div>
+                            <div className='mx_RoomSublist_contextMenu_title'>{ _t("Appearance") }</div>
                             <StyledMenuItemCheckbox
                                 onClose={this.onCloseMenu}
                                 onChange={this.onUnreadFirstChanged}
                                 checked={isUnreadFirst}
                             >
-                                {_t("Show rooms with unread messages first")}
+                                { _t("Show rooms with unread messages first") }
                             </StyledMenuItemCheckbox>
                             <StyledMenuItemCheckbox
                                 onClose={this.onCloseMenu}
                                 onChange={this.onMessagePreviewChanged}
                                 checked={this.layout.showPreviews}
                             >
-                                {_t("Show previews of messages")}
+                                { _t("Show previews of messages") }
                             </StyledMenuItemCheckbox>
                         </div>
                     </React.Fragment>
@@ -602,14 +603,14 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                 >
                     <div className="mx_RoomSublist_contextMenu">
                         <div>
-                            <div className='mx_RoomSublist_contextMenu_title'>{_t("Sort by")}</div>
+                            <div className='mx_RoomSublist_contextMenu_title'>{ _t("Sort by") }</div>
                             <StyledMenuItemRadio
                                 onClose={this.onCloseMenu}
                                 onChange={() => this.onTagSortChanged(SortAlgorithm.Recent)}
                                 checked={!isAlphabetical}
                                 name={`mx_${this.props.tagId}_sortBy`}
                             >
-                                {_t("Activity")}
+                                { _t("Activity") }
                             </StyledMenuItemRadio>
                             <StyledMenuItemRadio
                                 onClose={this.onCloseMenu}
@@ -617,10 +618,10 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                                 checked={isAlphabetical}
                                 name={`mx_${this.props.tagId}_sortBy`}
                             >
-                                {_t("A-Z")}
+                                { _t("A-Z") }
                             </StyledMenuItemRadio>
                         </div>
-                        {otherSections}
+                        { otherSections }
                     </div>
                 </ContextMenu>
             );
@@ -633,7 +634,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                     onFinished={this.onCloseAddRoomMenu}
                     compact
                 >
-                    {this.props.addRoomContextMenu(this.onCloseAddRoomMenu)}
+                    { this.props.addRoomContextMenu(this.onCloseAddRoomMenu) }
                 </IconizedContextMenu>
             );
         }
@@ -646,7 +647,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                     title={_t("List options")}
                     isExpanded={!!this.state.contextMenuPosition}
                 />
-                {contextMenu}
+                { contextMenu }
             </React.Fragment>
         );
     }
@@ -654,7 +655,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     private renderHeader(): React.ReactElement {
         return (
             <RovingTabIndexWrapper inputRef={this.headerButton}>
-                {({onFocus, isActive, ref}) => {
+                { ({ onFocus, isActive, ref }) => {
                     const tabIndex = isActive ? 0 : -1;
 
                     let ariaLabel = _t("Jump to first unread room.");
@@ -669,6 +670,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                             onClick={this.onBadgeClick}
                             tabIndex={tabIndex}
                             aria-label={ariaLabel}
+                            showUnsentTooltip={true}
                         />
                     );
 
@@ -710,7 +712,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
 
                     const badgeContainer = (
                         <div className="mx_RoomSublist_badgeContainer">
-                            {badge}
+                            { badge }
                         </div>
                     );
 
@@ -745,17 +747,17 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                                     title={this.props.isMinimized ? this.props.label : undefined}
                                 >
                                     <span className={collapseClasses} />
-                                    <span>{this.props.label}</span>
+                                    <span>{ this.props.label }</span>
                                 </Button>
-                                {this.renderMenu()}
-                                {this.props.isMinimized ? null : badgeContainer}
-                                {this.props.isMinimized ? null : addRoomButton}
+                                { this.renderMenu() }
+                                { this.props.isMinimized ? null : badgeContainer }
+                                { this.props.isMinimized ? null : addRoomButton }
                             </div>
-                            {this.props.isMinimized ? badgeContainer : null}
-                            {this.props.isMinimized ? addRoomButton : null}
+                            { this.props.isMinimized ? badgeContainer : null }
+                            { this.props.isMinimized ? addRoomButton : null }
                         </div>
                     );
-                }}
+                } }
             </RovingTabIndexWrapper>
         );
     }
@@ -800,10 +802,10 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                 const nonPaddedHeight = this.state.height - RESIZE_HANDLE_HEIGHT - SHOW_N_BUTTON_HEIGHT;
                 const amountFullyShown = Math.floor(nonPaddedHeight / this.layout.tileHeight);
                 const numMissing = this.numTiles - amountFullyShown;
-                const label = _t("Show %(count)s more", {count: numMissing});
+                const label = _t("Show %(count)s more", { count: numMissing });
                 let showMoreText = (
                     <span className='mx_RoomSublist_showNButtonText'>
-                        {label}
+                        { label }
                     </span>
                 );
                 if (this.props.isMinimized) showMoreText = null;
@@ -815,9 +817,9 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                         aria-label={label}
                     >
                         <span className='mx_RoomSublist_showMoreButtonChevron mx_RoomSublist_showNButtonChevron'>
-                            {/* set by CSS masking */}
+                            { /* set by CSS masking */ }
                         </span>
-                        {showMoreText}
+                        { showMoreText }
                     </RovingAccessibleButton>
                 );
             } else if (this.numTiles > this.layout.defaultVisibleTiles) {
@@ -825,7 +827,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                 const label = _t("Show less");
                 let showLessText = (
                     <span className='mx_RoomSublist_showNButtonText'>
-                        {label}
+                        { label }
                     </span>
                 );
                 if (this.props.isMinimized) showLessText = null;
@@ -837,9 +839,9 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                         aria-label={label}
                     >
                         <span className='mx_RoomSublist_showLessButtonChevron mx_RoomSublist_showNButtonChevron'>
-                            {/* set by CSS masking */}
+                            { /* set by CSS masking */ }
                         </span>
-                        {showLessText}
+                        { showLessText }
                     </RovingAccessibleButton>
                 );
             }
@@ -878,21 +880,21 @@ export default class RoomSublist extends React.Component<IProps, IState> {
             content = (
                 <React.Fragment>
                     <Resizable
-                        size={{height: this.state.height} as any}
+                        size={{ height: this.state.height } as any}
                         minHeight={minTilesPx}
                         maxHeight={maxTilesPx}
                         onResizeStart={this.onResizeStart}
                         onResizeStop={this.onResizeStop}
                         onResize={this.onResize}
                         handleWrapperClass={handleWrapperClasses}
-                        handleClasses={{bottom: "mx_RoomSublist_resizerHandle"}}
+                        handleClasses={{ bottom: "mx_RoomSublist_resizerHandle" }}
                         className="mx_RoomSublist_resizeBox"
                         enable={handles}
                     >
                         <div className="mx_RoomSublist_tiles" ref={this.tilesRef}>
-                            {visibleTiles}
+                            { visibleTiles }
                         </div>
-                        {showNButton}
+                        { showNButton }
                     </Resizable>
                 </React.Fragment>
             );
@@ -908,8 +910,8 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                 aria-label={this.props.label}
                 onKeyDown={this.onKeyDown}
             >
-                {this.renderHeader()}
-                {content}
+                { this.renderHeader() }
+                { content }
             </div>
         );
     }
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index aae182eca4..dbefcbd333 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 
 import React, { createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import classNames from "classnames";
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
@@ -30,10 +29,9 @@ import { ChevronFace, ContextMenuTooltipButton } from "../../structures/ContextM
 import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import { MessagePreviewStore } from "../../../stores/room-list/MessagePreviewStore";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
-import { ALL_MESSAGES, ALL_MESSAGES_LOUD, MENTIONS_ONLY, MUTE } from "../../../RoomNotifs";
+import { RoomNotifState } from "../../../RoomNotifs";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import NotificationBadge from "./NotificationBadge";
-import { Volume } from "../../../RoomNotifsTypes";
 import RoomListStore from "../../../stores/room-list/RoomListStore";
 import RoomListActions from "../../../actions/RoomListActions";
 import { ActionPayload } from "../../../dispatcher/payloads";
@@ -51,8 +49,6 @@ import IconizedContextMenu, {
 } from "../context_menus/IconizedContextMenu";
 import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/CommunityPrototypeStore";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { getUnsentMessages } from "../../structures/RoomStatusBar";
-import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
 
 interface IProps {
     room: Room;
@@ -68,7 +64,6 @@ interface IState {
     notificationsMenuPosition: PartialDOMRect;
     generalMenuPosition: PartialDOMRect;
     messagePreview?: string;
-    hasUnsentEvents: boolean;
 }
 
 const messagePreviewId = (roomId: string) => `mx_RoomTile_messagePreview_${roomId}`;
@@ -78,7 +73,7 @@ const contextMenuBelow = (elementRect: PartialDOMRect) => {
     const left = elementRect.left + window.pageXOffset - 9;
     const top = elementRect.bottom + window.pageYOffset + 17;
     const chevronFace = ChevronFace.None;
-    return {left, top, chevronFace};
+    return { left, top, chevronFace };
 };
 
 @replaceableComponent("views.rooms.RoomTile")
@@ -95,7 +90,6 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
             notificationsMenuPosition: null,
             generalMenuPosition: null,
-            hasUnsentEvents: this.countUnsentEvents() > 0,
 
             // generatePreview() will return nothing if the user has previews disabled
             messagePreview: "",
@@ -106,23 +100,14 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         this.roomProps = EchoChamber.forRoom(this.props.room);
     }
 
-    private countUnsentEvents(): number {
-        return getUnsentMessages(this.props.room).length;
-    }
-
-    private onRoomNameUpdate = (room) => {
+    private onRoomNameUpdate = (room: Room) => {
         this.forceUpdate();
-    }
+    };
 
     private onNotificationUpdate = () => {
         this.forceUpdate(); // notification state changed - update
     };
 
-    private onLocalEchoUpdated = (ev: MatrixEvent, room: Room) => {
-        if (!room?.roomId === this.props.room.roomId) return;
-        this.setState({hasUnsentEvents: this.countUnsentEvents() > 0});
-    };
-
     private onRoomPropertyUpdate = (property: CachedRoomKey) => {
         if (property === CachedRoomKey.NotificationVolume) this.onNotificationUpdate();
         // else ignore - not important for this tile
@@ -178,12 +163,11 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         );
         this.notificationState.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
         this.roomProps.on(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
-        this.roomProps.on("Room.name", this.onRoomNameUpdate);
+        this.props.room?.on("Room.name", this.onRoomNameUpdate);
         CommunityPrototypeStore.instance.on(
             CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
             this.onCommunityUpdate,
         );
-        MatrixClientPeg.get().on("Room.localEchoUpdated", this.onLocalEchoUpdated);
     }
 
     public componentWillUnmount() {
@@ -208,7 +192,6 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
             this.onCommunityUpdate,
         );
-        MatrixClientPeg.get()?.removeListener("Room.localEchoUpdated", this.onLocalEchoUpdated);
     }
 
     private onAction = (payload: ActionPayload) => {
@@ -259,25 +242,25 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
     };
 
     private onActiveRoomUpdate = (isActive: boolean) => {
-        this.setState({selected: isActive});
+        this.setState({ selected: isActive });
     };
 
     private onNotificationsMenuOpenClick = (ev: React.MouseEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
         const target = ev.target as HTMLButtonElement;
-        this.setState({notificationsMenuPosition: target.getBoundingClientRect()});
+        this.setState({ notificationsMenuPosition: target.getBoundingClientRect() });
     };
 
     private onCloseNotificationsMenu = () => {
-        this.setState({notificationsMenuPosition: null});
+        this.setState({ notificationsMenuPosition: null });
     };
 
     private onGeneralMenuOpenClick = (ev: React.MouseEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
         const target = ev.target as HTMLButtonElement;
-        this.setState({generalMenuPosition: target.getBoundingClientRect()});
+        this.setState({ generalMenuPosition: target.getBoundingClientRect() });
     };
 
     private onContextMenu = (ev: React.MouseEvent) => {
@@ -295,7 +278,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
     };
 
     private onCloseGeneralMenu = () => {
-        this.setState({generalMenuPosition: null});
+        this.setState({ generalMenuPosition: null });
     };
 
     private onTagRoom = (ev: ButtonEvent, tagId: TagID) => {
@@ -316,12 +299,12 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                 0,
             ));
         } else {
-            console.warn(`Unexpected tag ${tagId} applied to ${this.props.room.room_id}`);
+            console.warn(`Unexpected tag ${tagId} applied to ${this.props.room.roomId}`);
         }
 
         if ((ev as React.KeyboardEvent).key === Key.ENTER) {
             // Implements https://www.w3.org/TR/wai-aria-practices/#keyboard-interaction-12
-            this.setState({generalMenuPosition: null}); // hide the menu
+            this.setState({ generalMenuPosition: null }); // hide the menu
         }
     };
 
@@ -333,7 +316,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             action: 'leave_room',
             room_id: this.props.room.roomId,
         });
-        this.setState({generalMenuPosition: null}); // hide the menu
+        this.setState({ generalMenuPosition: null }); // hide the menu
     };
 
     private onForgetRoomClick = (ev: ButtonEvent) => {
@@ -344,7 +327,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             action: 'forget_room',
             room_id: this.props.room.roomId,
         });
-        this.setState({generalMenuPosition: null}); // hide the menu
+        this.setState({ generalMenuPosition: null }); // hide the menu
     };
 
     private onOpenRoomSettings = (ev: ButtonEvent) => {
@@ -355,7 +338,18 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             action: 'open_room_settings',
             room_id: this.props.room.roomId,
         });
-        this.setState({generalMenuPosition: null}); // hide the menu
+        this.setState({ generalMenuPosition: null }); // hide the menu
+    };
+
+    private onCopyRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'copy_room',
+            room_id: this.props.room.roomId,
+        });
+        this.setState({ generalMenuPosition: null }); // hide the menu
     };
 
     private onInviteClick = (ev: ButtonEvent) => {
@@ -366,10 +360,10 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             action: 'view_invite',
             roomId: this.props.room.roomId,
         });
-        this.setState({generalMenuPosition: null}); // hide the menu
+        this.setState({ generalMenuPosition: null }); // hide the menu
     };
 
-    private async saveNotifState(ev: ButtonEvent, newState: Volume) {
+    private async saveNotifState(ev: ButtonEvent, newState: RoomNotifState) {
         ev.preventDefault();
         ev.stopPropagation();
         if (MatrixClientPeg.get().isGuest()) return;
@@ -379,14 +373,14 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         const key = (ev as React.KeyboardEvent).key;
         if (key === Key.ENTER) {
             // Implements https://www.w3.org/TR/wai-aria-practices/#keyboard-interaction-12
-            this.setState({notificationsMenuPosition: null}); // hide the menu
+            this.setState({ notificationsMenuPosition: null }); // hide the menu
         }
     }
 
-    private onClickAllNotifs = ev => this.saveNotifState(ev, ALL_MESSAGES);
-    private onClickAlertMe = ev => this.saveNotifState(ev, ALL_MESSAGES_LOUD);
-    private onClickMentions = ev => this.saveNotifState(ev, MENTIONS_ONLY);
-    private onClickMute = ev => this.saveNotifState(ev, MUTE);
+    private onClickAllNotifs = ev => this.saveNotifState(ev, RoomNotifState.AllMessages);
+    private onClickAlertMe = ev => this.saveNotifState(ev, RoomNotifState.AllMessagesLoud);
+    private onClickMentions = ev => this.saveNotifState(ev, RoomNotifState.MentionsOnly);
+    private onClickMute = ev => this.saveNotifState(ev, RoomNotifState.Mute);
 
     private renderNotificationsMenu(isActive: boolean): React.ReactElement {
         if (MatrixClientPeg.get().isGuest() || this.props.tag === DefaultTagID.Archived ||
@@ -409,25 +403,25 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                 <IconizedContextMenuOptionList first>
                     <IconizedContextMenuRadio
                         label={_t("Use default")}
-                        active={state === ALL_MESSAGES}
+                        active={state === RoomNotifState.AllMessages}
                         iconClassName="mx_RoomTile_iconBell"
                         onClick={this.onClickAllNotifs}
                     />
                     <IconizedContextMenuRadio
                         label={_t("All messages")}
-                        active={state === ALL_MESSAGES_LOUD}
+                        active={state === RoomNotifState.AllMessagesLoud}
                         iconClassName="mx_RoomTile_iconBellDot"
                         onClick={this.onClickAlertMe}
                     />
                     <IconizedContextMenuRadio
                         label={_t("Mentions & Keywords")}
-                        active={state === MENTIONS_ONLY}
+                        active={state === RoomNotifState.MentionsOnly}
                         iconClassName="mx_RoomTile_iconBellMentions"
                         onClick={this.onClickMentions}
                     />
                     <IconizedContextMenuRadio
                         label={_t("None")}
-                        active={state === MUTE}
+                        active={state === RoomNotifState.Mute}
                         iconClassName="mx_RoomTile_iconBellCrossed"
                         onClick={this.onClickMute}
                     />
@@ -437,14 +431,14 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
 
         const classes = classNames("mx_RoomTile_notificationsButton", {
             // Show bell icon for the default case too.
-            mx_RoomTile_iconBell: state === ALL_MESSAGES,
-            mx_RoomTile_iconBellDot: state === ALL_MESSAGES_LOUD,
-            mx_RoomTile_iconBellMentions: state === MENTIONS_ONLY,
-            mx_RoomTile_iconBellCrossed: state === MUTE,
+            mx_RoomTile_iconBell: state === RoomNotifState.AllMessages,
+            mx_RoomTile_iconBellDot: state === RoomNotifState.AllMessagesLoud,
+            mx_RoomTile_iconBellMentions: state === RoomNotifState.MentionsOnly,
+            mx_RoomTile_iconBellCrossed: state === RoomNotifState.Mute,
 
             // Only show the icon by default if the room is overridden to muted.
             // TODO: [FTUE Notifications] Probably need to detect global mute state
-            mx_RoomTile_notificationsButton_show: state === MUTE,
+            mx_RoomTile_notificationsButton_show: state === RoomNotifState.Mute,
         });
 
         return (
@@ -456,7 +450,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                     isExpanded={!!this.state.notificationsMenuPosition}
                     tabIndex={isActive ? 0 : -1}
                 />
-                {contextMenu}
+                { contextMenu }
             </React.Fragment>
         );
     }
@@ -510,13 +504,18 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                         label={lowPriorityLabel}
                         iconClassName="mx_RoomTile_iconArrowDown"
                     />
-                    {canInvite ? (
+                    { canInvite ? (
                         <IconizedContextMenuOption
                             onClick={this.onInviteClick}
                             label={_t("Invite People")}
                             iconClassName="mx_RoomTile_iconInvite"
                         />
-                    ) : null}
+                    ) : null }
+                    <IconizedContextMenuOption
+                        onClick={this.onCopyRoomClick}
+                        label={_t("Copy Room Link")}
+                        iconClassName="mx_RoomTile_iconCopyLink"
+                    />
                     <IconizedContextMenuOption
                         onClick={this.onOpenRoomSettings}
                         label={_t("Settings")}
@@ -541,7 +540,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                     title={_t("Room options")}
                     isExpanded={!!this.state.generalMenuPosition}
                 />
-                {contextMenu}
+                { contextMenu }
             </React.Fragment>
         );
     }
@@ -554,7 +553,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             'mx_RoomTile_minimized': this.props.isMinimized,
         });
 
-        let roomProfile: IRoomProfile = {displayName: null, avatarMxc: null};
+        let roomProfile: IRoomProfile = { displayName: null, avatarMxc: null };
         if (this.props.tag === DefaultTagID.Invite) {
             roomProfile = CommunityPrototypeStore.instance.getInviteProfile(this.props.room.roomId);
         }
@@ -567,34 +566,21 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             room={this.props.room}
             avatarSize={32}
             displayBadge={this.props.isMinimized}
-            oobData={({avatarUrl: roomProfile.avatarMxc})}
+            oobData={({ avatarUrl: roomProfile.avatarMxc })}
         />;
 
         let badge: React.ReactNode;
-        if (!this.props.isMinimized) {
+        if (!this.props.isMinimized && this.notificationState) {
             // aria-hidden because we summarise the unread count/highlight status in a manual aria-label below
-            if (this.state.hasUnsentEvents) {
-                // hardcode the badge to a danger state when there's unsent messages
-                badge = (
-                    <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
-                        <NotificationBadge
-                            notification={StaticNotificationState.RED_EXCLAMATION}
-                            forceCount={false}
-                            roomId={this.props.room.roomId}
-                        />
-                    </div>
-                );
-            } else if (this.notificationState) {
-                badge = (
-                    <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
-                        <NotificationBadge
-                            notification={this.notificationState}
-                            forceCount={false}
-                            roomId={this.props.room.roomId}
-                        />
-                    </div>
-                );
-            }
+            badge = (
+                <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
+                    <NotificationBadge
+                        notification={this.notificationState}
+                        forceCount={false}
+                        roomId={this.props.room.roomId}
+                    />
+                </div>
+            );
         }
 
         let messagePreview = null;
@@ -605,7 +591,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                     id={messagePreviewId(this.props.room.roomId)}
                     title={this.state.messagePreview}
                 >
-                    {this.state.messagePreview}
+                    { this.state.messagePreview }
                 </div>
             );
         }
@@ -619,9 +605,9 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         let nameContainer = (
             <div className="mx_RoomTile_nameContainer">
                 <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
-                    {name}
+                    { name }
                 </div>
-                {messagePreview}
+                { messagePreview }
             </div>
         );
         if (this.props.isMinimized) nameContainer = null;
@@ -659,7 +645,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper inputRef={this.roomTileRef}>
-                    {({onFocus, isActive, ref}) =>
+                    { ({ onFocus, isActive, ref }) =>
                         <Button
                             {...props}
                             onFocus={onFocus}
@@ -673,11 +659,11 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                             aria-selected={this.state.selected}
                             aria-describedby={ariaDescribedBy}
                         >
-                            {roomAvatar}
-                            {nameContainer}
-                            {badge}
-                            {this.renderGeneralMenu()}
-                            {this.renderNotificationsMenu(isActive)}
+                            { roomAvatar }
+                            { nameContainer }
+                            { badge }
+                            { this.renderGeneralMenu() }
+                            { this.renderNotificationsMenu(isActive) }
                         </Button>
                     }
                 </RovingTabIndexWrapper>
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
similarity index 61%
rename from src/components/views/rooms/RoomUpgradeWarningBar.js
rename to src/components/views/rooms/RoomUpgradeWarningBar.tsx
index a2d4f92d35..eb334ab825 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2020 New Vector Ltd
+Copyright 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.
@@ -15,41 +15,43 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { RoomState } from 'matrix-js-sdk/src/models/room-state';
+
 import Modal from '../../../Modal';
 
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RoomUpgradeDialog from '../dialogs/RoomUpgradeDialog';
+import AccessibleButton from '../elements/AccessibleButton';
+
+interface IProps {
+    room: Room;
+}
+
+interface IState {
+    upgraded?: boolean;
+}
 
 @replaceableComponent("views.rooms.RoomUpgradeWarningBar")
-export default class RoomUpgradeWarningBar extends React.Component {
-    static propTypes = {
-        room: PropTypes.object.isRequired,
-        recommendation: PropTypes.object.isRequired,
-    };
-
-    constructor(props) {
-        super(props);
-        this.state = {};
-    }
-
-    componentDidMount() {
+export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, IState> {
+    public componentDidMount(): void {
         const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
-        this.setState({upgraded: tombstone && tombstone.getContent().replacement_room});
+        this.setState({ upgraded: tombstone && tombstone.getContent().replacement_room });
 
-        MatrixClientPeg.get().on("RoomState.events", this._onStateEvents);
+        MatrixClientPeg.get().on("RoomState.events", this.onStateEvents);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const cli = MatrixClientPeg.get();
         if (cli) {
-            cli.removeListener("RoomState.events", this._onStateEvents);
+            cli.removeListener("RoomState.events", this.onStateEvents);
         }
     }
 
-    _onStateEvents = (event, state) => {
+    private onStateEvents = (event: MatrixEvent, state: RoomState): void => {
         if (!this.props.room || event.getRoomId() !== this.props.room.roomId) {
             return;
         }
@@ -57,41 +59,38 @@ export default class RoomUpgradeWarningBar extends React.Component {
         if (event.getType() !== "m.room.tombstone") return;
 
         const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
-        this.setState({upgraded: tombstone && tombstone.getContent().replacement_room});
+        this.setState({ upgraded: tombstone && tombstone.getContent().replacement_room });
     };
 
-    onUpgradeClick = () => {
-        const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
-        Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, {room: this.props.room});
+    private onUpgradeClick = (): void => {
+        Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, { room: this.props.room });
     };
 
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
+    public render(): JSX.Element {
         let doUpgradeWarnings = (
             <div>
                 <div className="mx_RoomUpgradeWarningBar_body">
                     <p>
-                        {_t(
+                        { _t(
                             "Upgrading this room will shut down the current instance of the room and create " +
                             "an upgraded room with the same name.",
-                        )}
+                        ) }
                     </p>
                     <p>
-                        {_t(
+                        { _t(
                             "<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": (sub) => <b>{sub}</b>,
-                                "i": (sub) => <i>{sub}</i>,
+                                "b": (sub) => <b>{ sub }</b>,
+                                "i": (sub) => <i>{ sub }</i>,
                             },
-                        )}
+                        ) }
                     </p>
                 </div>
                 <p className="mx_RoomUpgradeWarningBar_upgradelink">
                     <AccessibleButton onClick={this.onUpgradeClick}>
-                        {_t("Upgrade this room to the recommended room version")}
+                        { _t("Upgrade this room to the recommended room version") }
                     </AccessibleButton>
                 </p>
             </div>
@@ -101,7 +100,7 @@ export default class RoomUpgradeWarningBar extends React.Component {
             doUpgradeWarnings = (
                 <div className="mx_RoomUpgradeWarningBar_body">
                     <p>
-                        {_t("This room has already been upgraded.")}
+                        { _t("This room has already been upgraded.") }
                     </p>
                 </div>
             );
@@ -111,19 +110,19 @@ export default class RoomUpgradeWarningBar extends React.Component {
             <div className="mx_RoomUpgradeWarningBar">
                 <div className="mx_RoomUpgradeWarningBar_wrapped">
                     <div className="mx_RoomUpgradeWarningBar_header">
-                        {_t(
+                        { _t(
                             "This room is running room version <roomVersion />, which this homeserver has " +
                             "marked as <i>unstable</i>.",
                             {},
                             {
-                                "roomVersion": () => <code>{this.props.room.getVersion()}</code>,
-                                "i": (sub) => <i>{sub}</i>,
+                                "roomVersion": () => <code>{ this.props.room.getVersion() }</code>,
+                                "i": (sub) => <i>{ sub }</i>,
                             },
-                        )}
+                        ) }
                     </div>
-                    {doUpgradeWarnings}
+                    { doUpgradeWarnings }
                     <div className="mx_RoomUpgradeWarningBar_small">
-                        {_t("Only room administrators will see this warning")}
+                        { _t("Only room administrators will see this warning") }
                     </div>
                 </div>
             </div>
diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
deleted file mode 100644
index 029516c932..0000000000
--- a/src/components/views/rooms/SearchBar.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, {createRef} from 'react';
-import AccessibleButton from "../elements/AccessibleButton";
-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);
-
-        this._search_term = createRef();
-
-        this.state = {
-            scope: 'Room',
-        };
-    }
-
-    onThisRoomClick = () => {
-        this.setState({ scope: 'Room' }, () => this._searchIfQuery());
-    };
-
-    onAllRoomsClick = () => {
-        this.setState({ scope: 'All' }, () => this._searchIfQuery());
-    };
-
-    onSearchChange = (e) => {
-        switch (e.key) {
-            case Key.ENTER:
-                this.onSearch();
-                break;
-            case Key.ESCAPE:
-                this.props.onCancelClick();
-                break;
-        }
-    };
-
-    _searchIfQuery() {
-        if (this._search_term.current.value) {
-            this.onSearch();
-        }
-    }
-
-    onSearch = () => {
-        this.props.onSearch(this._search_term.current.value, this.state.scope);
-    };
-
-    render() {
-        const searchButtonClasses = classNames("mx_SearchBar_searchButton", {
-            mx_SearchBar_searching: this.props.searchInProgress,
-        });
-        const thisRoomClasses = classNames("mx_SearchBar_button", {
-            mx_SearchBar_unselected: this.state.scope !== 'Room',
-        });
-        const allRoomsClasses = classNames("mx_SearchBar_button", {
-            mx_SearchBar_unselected: this.state.scope !== 'All',
-        });
-
-        return (
-            <>
-                <div className="mx_SearchBar">
-                    <div className="mx_SearchBar_buttons" role="radiogroup">
-                        <AccessibleButton className={ thisRoomClasses } onClick={this.onThisRoomClick} aria-checked={this.state.scope === 'Room'} role="radio">
-                            {_t("This Room")}
-                        </AccessibleButton>
-                        <AccessibleButton className={ allRoomsClasses } onClick={this.onAllRoomsClick} aria-checked={this.state.scope === 'All'} role="radio">
-                            {_t("All Rooms")}
-                        </AccessibleButton>
-                    </div>
-                    <div className="mx_SearchBar_input mx_textinput">
-                        <input ref={this._search_term} type="text" autoFocus={true} placeholder={_t("Search…")} onKeyDown={this.onSearchChange} />
-                        <AccessibleButton className={ searchButtonClasses } onClick={this.onSearch} />
-                    </div>
-                    <AccessibleButton className="mx_SearchBar_cancel" onClick={this.props.onCancelClick} />
-                </div>
-                <DesktopBuildsNotice isRoomEncrypted={this.props.isRoomEncrypted} kind={WarningKind.Search} />
-            </>
-        );
-    }
-}
diff --git a/src/components/views/rooms/SearchBar.tsx b/src/components/views/rooms/SearchBar.tsx
new file mode 100644
index 0000000000..81d0402050
--- /dev/null
+++ b/src/components/views/rooms/SearchBar.tsx
@@ -0,0 +1,130 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef, RefObject } from 'react';
+import AccessibleButton from "../elements/AccessibleButton";
+import classNames from "classnames";
+import { _t } from '../../../languageHandler';
+import { Key } from "../../../Keyboard";
+import DesktopBuildsNotice, { WarningKind } from "../elements/DesktopBuildsNotice";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    onCancelClick: () => void;
+    onSearch: (query: string, scope: string) => void;
+    searchInProgress?: boolean;
+    isRoomEncrypted?: boolean;
+}
+
+interface IState {
+    scope: SearchScope;
+}
+
+export enum SearchScope {
+    Room = "Room",
+    All = "All",
+}
+
+@replaceableComponent("views.rooms.SearchBar")
+export default class SearchBar extends React.Component<IProps, IState> {
+    private searchTerm: RefObject<HTMLInputElement> = createRef();
+
+    constructor(props: IProps) {
+        super(props);
+        this.state = {
+            scope: SearchScope.Room,
+        };
+    }
+
+    private onThisRoomClick = () => {
+        this.setState({ scope: SearchScope.Room }, () => this.searchIfQuery());
+    };
+
+    private onAllRoomsClick = () => {
+        this.setState({ scope: SearchScope.All }, () => this.searchIfQuery());
+    };
+
+    private onSearchChange = (e: React.KeyboardEvent) => {
+        switch (e.key) {
+            case Key.ENTER:
+                this.onSearch();
+                break;
+            case Key.ESCAPE:
+                this.props.onCancelClick();
+                break;
+        }
+    };
+
+    private searchIfQuery(): void {
+        if (this.searchTerm.current.value) {
+            this.onSearch();
+        }
+    }
+
+    private onSearch = (): void => {
+        this.props.onSearch(this.searchTerm.current.value, this.state.scope);
+    };
+
+    public render() {
+        const searchButtonClasses = classNames("mx_SearchBar_searchButton", {
+            mx_SearchBar_searching: this.props.searchInProgress,
+        });
+        const thisRoomClasses = classNames("mx_SearchBar_button", {
+            mx_SearchBar_unselected: this.state.scope !== SearchScope.Room,
+        });
+        const allRoomsClasses = classNames("mx_SearchBar_button", {
+            mx_SearchBar_unselected: this.state.scope !== SearchScope.All,
+        });
+
+        return (
+            <>
+                <div className="mx_SearchBar">
+                    <div className="mx_SearchBar_buttons" role="radiogroup">
+                        <AccessibleButton
+                            className={thisRoomClasses}
+                            onClick={this.onThisRoomClick}
+                            aria-checked={this.state.scope === SearchScope.Room}
+                            role="radio"
+                        >
+                            { _t("This Room") }
+                        </AccessibleButton>
+                        <AccessibleButton
+                            className={allRoomsClasses}
+                            onClick={this.onAllRoomsClick}
+                            aria-checked={this.state.scope === SearchScope.All}
+                            role="radio"
+                        >
+                            { _t("All Rooms") }
+                        </AccessibleButton>
+                    </div>
+                    <div className="mx_SearchBar_input mx_textinput">
+                        <input
+                            ref={this.searchTerm}
+                            type="text"
+                            autoFocus={true}
+                            placeholder={_t("Search…")}
+                            onKeyDown={this.onSearchChange}
+                        />
+                        <AccessibleButton className={searchButtonClasses} onClick={this.onSearch} />
+                    </div>
+                    <AccessibleButton className="mx_SearchBar_cancel" onClick={this.props.onCancelClick} />
+                </div>
+                <DesktopBuildsNotice isRoomEncrypted={this.props.isRoomEncrypted} kind={WarningKind.Search} />
+            </>
+        );
+    }
+}
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.tsx
similarity index 51%
rename from src/components/views/rooms/SearchResultTile.js
rename to src/components/views/rooms/SearchResultTile.tsx
index dcfd633e76..c033855eb5 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.tsx
@@ -15,38 +15,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {haveTileForEvent} from "./EventTile";
+import React from "react";
+import { SearchResult } from "matrix-js-sdk/src/models/search-result";
+import RoomContext from "../../../contexts/RoomContext";
 import SettingsStore from "../../../settings/SettingsStore";
-import {UIFeature} from "../../../settings/UIFeature";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { UIFeature } from "../../../settings/UIFeature";
+import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import DateSeparator from "../messages/DateSeparator";
+import EventTile, { haveTileForEvent } from "./EventTile";
+
+interface IProps {
+    // a matrix-js-sdk SearchResult containing the details of this result
+    searchResult: SearchResult;
+    // a list of strings to be highlighted in the results
+    searchHighlights?: string[];
+    // href for the highlights in this result
+    resultLink?: string;
+    onHeightChanged?: () => void;
+    permalinkCreator?: RoomPermalinkCreator;
+}
 
 @replaceableComponent("views.rooms.SearchResultTile")
-export default class SearchResultTile extends React.Component {
-    static propTypes = {
-        // a matrix-js-sdk SearchResult containing the details of this result
-        searchResult: PropTypes.object.isRequired,
+export default class SearchResultTile extends React.Component<IProps> {
+    static contextType = RoomContext;
 
-        // a list of strings to be highlighted in the results
-        searchHighlights: PropTypes.array,
-
-        // href for the highlights in this result
-        resultLink: PropTypes.string,
-
-        onHeightChanged: PropTypes.func,
-    };
-
-    render() {
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
-        const EventTile = sdk.getComponent('rooms.EventTile');
+    public render() {
         const result = this.props.searchResult;
         const mxEv = result.context.getEvent();
         const eventId = mxEv.getId();
 
         const ts1 = mxEv.getTs();
         const ret = [<DateSeparator key={ts1 + "-search"} ts={ts1} />];
+        const layout = SettingsStore.getValue("layout");
+        const isTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
+        const alwaysShowTimestamps = SettingsStore.getValue("alwaysShowTimestamps");
+        const enableFlair = SettingsStore.getValue(UIFeature.Flair);
 
         const timeline = result.context.getTimeline();
         for (let j = 0; j < timeline.length; j++) {
@@ -56,25 +60,25 @@ export default class SearchResultTile extends React.Component {
             if (!contextual) {
                 highlights = this.props.searchHighlights;
             }
-            if (haveTileForEvent(ev)) {
-                ret.push((
+            if (haveTileForEvent(ev, this.context?.showHiddenEventsInTimeline)) {
+                ret.push(
                     <EventTile
                         key={`${eventId}+${j}`}
                         mxEvent={ev}
+                        layout={layout}
                         contextual={contextual}
                         highlights={highlights}
                         permalinkCreator={this.props.permalinkCreator}
                         highlightLink={this.props.resultLink}
                         onHeightChanged={this.props.onHeightChanged}
-                        isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
-                        enableFlair={SettingsStore.getValue(UIFeature.Flair)}
-                    />
-                ));
+                        isTwelveHour={isTwelveHour}
+                        alwaysShowTimestamps={alwaysShowTimestamps}
+                        enableFlair={enableFlair}
+                    />,
+                );
             }
         }
-        return (
-            <li data-scroll-tokens={eventId}>
-                { ret }
-            </li>);
+
+        return <li data-scroll-tokens={eventId}>{ ret }</li>;
     }
 }
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.tsx
similarity index 54%
rename from src/components/views/rooms/SendMessageComposer.js
rename to src/components/views/rooms/SendMessageComposer.tsx
index d60eba00ec..35a028aadc 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,49 +13,63 @@ WITHOUT 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 React, { ClipboardEvent, createRef, KeyboardEvent } from 'react';
+import EMOJI_REGEX from 'emojibase-regex';
+import { IContent, MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { DebouncedFunc, throttle } from 'lodash';
+import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import dis from '../../../dispatcher/dispatcher';
 import EditorModel from '../../../editor/model';
 import {
-    htmlSerializeIfNeeded,
-    textSerialize,
     containsEmote,
-    stripEmoteCommand,
-    unescapeMessage,
+    htmlSerializeIfNeeded,
     startsWith,
+    stripEmoteCommand,
     stripPrefix,
+    textSerialize,
+    unescapeMessage,
 } from '../../../editor/serialize';
-import {CommandPartCreator} from '../../../editor/parts';
-import BasicMessageComposer from "./BasicMessageComposer";
+import BasicMessageComposer, { REGEX_EMOTICON } from "./BasicMessageComposer";
+import { CommandPartCreator, Part, PartCreator, SerializedPart, Type } from '../../../editor/parts';
 import ReplyThread from "../elements/ReplyThread";
-import {parseEvent} from '../../../editor/deserialize';
-import {findEditableEvent} from '../../../utils/EventUtils';
+import { findEditableEvent } from '../../../utils/EventUtils';
 import SendHistoryManager from "../../../SendHistoryManager";
-import {CommandCategories, getCommand} from '../../../SlashCommands';
-import * as sdk from '../../../index';
+import { Command, CommandCategories, getCommand } from '../../../SlashCommands';
 import Modal from '../../../Modal';
-import {_t, _td} from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import RateLimitedFunc from '../../../ratelimitedfunc';
-import {Action} from "../../../dispatcher/actions";
-import {containsEmoji} from "../../../effects/utils";
-import {CHAT_EFFECTS} from '../../../effects';
+import { withMatrixClientHOC, MatrixClientProps } from "../../../contexts/MatrixClientContext";
+import { Action } from "../../../dispatcher/actions";
+import { containsEmoji } from "../../../effects/utils";
+import { CHAT_EFFECTS } from '../../../effects';
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import EMOJI_REGEX from 'emojibase-regex';
-import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { getKeyBindingsManager, MessageComposerAction } from '../../../KeyBindingsManager';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsStore from '../../../settings/SettingsStore';
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { Room } from 'matrix-js-sdk/src/models/room';
+import ErrorDialog from "../dialogs/ErrorDialog";
+import QuestionDialog from "../dialogs/QuestionDialog";
+import { ActionPayload } from "../../../dispatcher/payloads";
+import { decorateStartSendingTime, sendRoundTripMetric } from "../../../sendTimePerformanceMetrics";
+import RoomContext from '../../../contexts/RoomContext';
 
-function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
-    const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
+function addReplyToMessageContent(
+    content: IContent,
+    replyToEvent: MatrixEvent,
+    replyInThread: boolean,
+    permalinkCreator: RoomPermalinkCreator,
+): void {
+    const replyContent = ReplyThread.makeReplyMixIn(replyToEvent, replyInThread);
     Object.assign(content, replyContent);
 
     // Part of Replies fallback support - prepend the text we're sending
     // with the text we're replying to
-    const nestedReply = ReplyThread.getNestedReplyText(repliedToEvent, permalinkCreator);
+    const nestedReply = ReplyThread.getNestedReplyText(replyToEvent, permalinkCreator);
     if (nestedReply) {
         if (content.formatted_body) {
             content.formatted_body = nestedReply.html + content.formatted_body;
@@ -66,7 +79,12 @@ function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
 }
 
 // exported for tests
-export function createMessageContent(model, permalinkCreator, replyToEvent) {
+export function createMessageContent(
+    model: EditorModel,
+    replyToEvent: MatrixEvent,
+    replyInThread: boolean,
+    permalinkCreator: RoomPermalinkCreator,
+): IContent {
     const isEmote = containsEmote(model);
     if (isEmote) {
         model = stripEmoteCommand(model);
@@ -77,25 +95,25 @@ export function createMessageContent(model, permalinkCreator, replyToEvent) {
     model = unescapeMessage(model);
 
     const body = textSerialize(model);
-    const content = {
+    const content: IContent = {
         msgtype: isEmote ? "m.emote" : "m.text",
         body: body,
     };
-    const formattedBody = htmlSerializeIfNeeded(model, {forceHTML: !!replyToEvent});
+    const formattedBody = htmlSerializeIfNeeded(model, { forceHTML: !!replyToEvent });
     if (formattedBody) {
         content.format = "org.matrix.custom.html";
         content.formatted_body = formattedBody;
     }
 
     if (replyToEvent) {
-        addReplyToMessageContent(content, replyToEvent, permalinkCreator);
+        addReplyToMessageContent(content, replyToEvent, replyInThread, permalinkCreator);
     }
 
     return content;
 }
 
 // exported for tests
-export function isQuickReaction(model) {
+export function isQuickReaction(model: EditorModel): boolean {
     const parts = model.parts;
     if (parts.length == 0) return false;
     const text = textSerialize(model);
@@ -112,46 +130,60 @@ export function isQuickReaction(model) {
     return false;
 }
 
+interface ISendMessageComposerProps extends MatrixClientProps {
+    room: Room;
+    placeholder?: string;
+    permalinkCreator: RoomPermalinkCreator;
+    replyInThread?: boolean;
+    replyToEvent?: MatrixEvent;
+    disabled?: boolean;
+    onChange?(model: EditorModel): void;
+}
+
 @replaceableComponent("views.rooms.SendMessageComposer")
-export default class SendMessageComposer extends React.Component {
-    static propTypes = {
-        room: PropTypes.object.isRequired,
-        placeholder: PropTypes.string,
-        permalinkCreator: PropTypes.object.isRequired,
-        replyToEvent: PropTypes.object,
-        onChange: PropTypes.func,
-        disabled: PropTypes.bool,
-    };
+export class SendMessageComposer extends React.Component<ISendMessageComposerProps> {
+    static contextType = RoomContext;
+    private readonly prepareToEncrypt?: DebouncedFunc<() => void>;
+    private readonly editorRef = createRef<BasicMessageComposer>();
+    private model: EditorModel = null;
+    private currentlyComposedEditorState: SerializedPart[] = null;
+    private dispatcherRef: string;
+    private sendHistoryManager: SendHistoryManager;
 
-    static contextType = MatrixClientContext;
-
-    constructor(props, context) {
-        super(props, context);
-        this.model = null;
-        this._editorRef = null;
-        this.currentlyComposedEditorState = null;
-        if (this.context.isCryptoEnabled() && this.context.isRoomEncrypted(this.props.room.roomId)) {
-            this._prepareToEncrypt = new RateLimitedFunc(() => {
-                this.context.prepareToEncrypt(this.props.room);
-            }, 60000);
+    constructor(props: ISendMessageComposerProps, context: React.ContextType<typeof RoomContext>) {
+        super(props);
+        if (this.props.mxClient.isCryptoEnabled() && this.props.mxClient.isRoomEncrypted(this.props.room.roomId)) {
+            this.prepareToEncrypt = throttle(() => {
+                this.props.mxClient.prepareToEncrypt(this.props.room);
+            }, 60000, { leading: true, trailing: false });
         }
 
-        window.addEventListener("beforeunload", this._saveStoredEditorState);
+        window.addEventListener("beforeunload", this.saveStoredEditorState);
     }
 
-    _setEditorRef = ref => {
-        this._editorRef = ref;
-    };
+    public componentDidUpdate(prevProps: ISendMessageComposerProps): void {
+        const replyToEventChanged = this.props.replyInThread && (this.props.replyToEvent !== prevProps.replyToEvent);
+        if (replyToEventChanged) {
+            this.model.reset([]);
+        }
 
-    _onKeyDown = (event) => {
+        if (this.props.replyInThread && this.props.replyToEvent && (!prevProps.replyToEvent || replyToEventChanged)) {
+            const partCreator = new CommandPartCreator(this.props.room, this.props.mxClient);
+            const parts = this.restoreStoredEditorState(partCreator) || [];
+            this.model.reset(parts);
+            this.editorRef.current?.focus();
+        }
+    }
+
+    private onKeyDown = (event: KeyboardEvent): void => {
         // ignore any keypress while doing IME compositions
-        if (this._editorRef.isComposing(event)) {
+        if (this.editorRef.current?.isComposing(event)) {
             return;
         }
         const action = getKeyBindingsManager().getMessageComposerAction(event);
         switch (action) {
             case MessageComposerAction.Send:
-                this._sendMessage();
+                this.sendMessage();
                 event.preventDefault();
                 break;
             case MessageComposerAction.SelectPrevSendHistory:
@@ -166,14 +198,21 @@ export default class SendMessageComposer extends React.Component {
             }
             case MessageComposerAction.EditPrevMessage:
                 // selection must be collapsed and caret at start
-                if (this._editorRef.isSelectionCollapsed() && this._editorRef.isCaretAtStart()) {
-                    const editEvent = findEditableEvent(this.props.room, false);
+                if (this.editorRef.current?.isSelectionCollapsed() && this.editorRef.current?.isCaretAtStart()) {
+                    const events =
+                        this.context.liveTimeline.getEvents()
+                            .concat(this.props.replyInThread ? [] : this.props.room.getPendingEvents());
+                    const editEvent = findEditableEvent({
+                        events,
+                        isForward: false,
+                    });
                     if (editEvent) {
                         // We're selecting history, so prevent the key event from doing anything else
                         event.preventDefault();
                         dis.dispatch({
-                            action: 'edit_event',
+                            action: Action.EditEvent,
                             event: editEvent,
+                            timelineRenderingType: this.context.timelineRenderingType,
                         });
                     }
                 }
@@ -185,70 +224,71 @@ export default class SendMessageComposer extends React.Component {
                 });
                 break;
             default:
-                if (this._prepareToEncrypt) {
+                if (this.prepareToEncrypt) {
                     // This needs to be last!
-                    this._prepareToEncrypt();
+                    this.prepareToEncrypt();
                 }
         }
     };
 
     // we keep sent messages/commands in a separate history (separate from undo history)
     // so you can alt+up/down in them
-    selectSendHistory(up) {
+    private selectSendHistory(up: boolean): boolean {
         const delta = up ? -1 : 1;
         // True if we are not currently selecting history, but composing a message
         if (this.sendHistoryManager.currentIndex === this.sendHistoryManager.history.length) {
             // We can't go any further - there isn't any more history, so nop.
             if (!up) {
-                return;
+                return false;
             }
             this.currentlyComposedEditorState = this.model.serializeParts();
         } else if (this.sendHistoryManager.currentIndex + delta === this.sendHistoryManager.history.length) {
             // True when we return to the message being composed currently
             this.model.reset(this.currentlyComposedEditorState);
             this.sendHistoryManager.currentIndex = this.sendHistoryManager.history.length;
-            return;
+            return true;
         }
-        const {parts, replyEventId} = this.sendHistoryManager.getItem(delta);
+        const { parts, replyEventId } = this.sendHistoryManager.getItem(delta);
         dis.dispatch({
             action: 'reply_to_event',
             event: replyEventId ? this.props.room.findEventById(replyEventId) : null,
         });
         if (parts) {
             this.model.reset(parts);
-            this._editorRef.focus();
+            this.editorRef.current?.focus();
         }
+        return true;
     }
 
-    _isSlashCommand() {
+    private isSlashCommand(): boolean {
         const parts = this.model.parts;
         const firstPart = parts[0];
         if (firstPart) {
-            if (firstPart.type === "command" && firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")) {
+            if (firstPart.type === Type.Command && firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")) {
                 return true;
             }
             // be extra resilient when somehow the AutocompleteWrapperModel or
             // CommandPartCreator fails to insert a command part, so we don't send
             // a command as a message
             if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")
-                && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
+                && (firstPart.type === Type.Plain || firstPart.type === Type.PillCandidate)) {
                 return true;
             }
         }
         return false;
     }
 
-    _sendQuickReaction() {
-        const timeline = this.props.room.getLiveTimeline();
+    private sendQuickReaction(): void {
+        const timeline = this.context.liveTimeline();
         const events = timeline.getEvents();
         const reaction = this.model.parts[1].text;
         for (let i = events.length - 1; i >= 0; i--) {
-            if (events[i].getType() === "m.room.message") {
+            if (events[i].getType() === EventType.RoomMessage) {
                 let shouldReact = true;
                 const lastMessage = events[i];
                 const userId = MatrixClientPeg.get().getUserId();
                 const messageReactions = this.props.room.getUnfilteredTimelineSet()
-                    .getRelationsForEvent(lastMessage.getId(), "m.annotation", "m.reaction");
+                    .getRelationsForEvent(lastMessage.getId(), RelationType.Annotation, EventType.Reaction);
 
                 // if we have already sent this reaction, don't redact but don't re-send
                 if (messageReactions) {
@@ -259,21 +299,21 @@ export default class SendMessageComposer extends React.Component {
                     shouldReact = !myReactionKeys.includes(reaction);
                 }
                 if (shouldReact) {
-                    MatrixClientPeg.get().sendEvent(lastMessage.getRoomId(), "m.reaction", {
+                    MatrixClientPeg.get().sendEvent(lastMessage.getRoomId(), EventType.Reaction, {
                         "m.relates_to": {
-                            "rel_type": "m.annotation",
+                            "rel_type": RelationType.Annotation,
                             "event_id": lastMessage.getId(),
                             "key": reaction,
                         },
                     });
-                    dis.dispatch({action: "message_sent"});
+                    dis.dispatch({ action: "message_sent" });
                 }
                 break;
             }
         }
     }
 
-    _getSlashCommand() {
+    private getSlashCommand(): [Command, string, string] {
         const commandText = this.model.parts.reduce((text, part) => {
             // use mxid to textify user pills in a command
             if (part.type === "user-pill") {
@@ -281,11 +321,11 @@ export default class SendMessageComposer extends React.Component {
             }
             return text + part.text;
         }, "");
-        const {cmd, args} = getCommand(commandText);
+        const { cmd, args } = getCommand(commandText);
         return [cmd, args, commandText];
     }
 
-    async _runSlashCommand(cmd, args) {
+    private async runSlashCommand(cmd: Command, args: string): Promise<void> {
         const result = cmd.run(this.props.room.roomId, args);
         let messageContent;
         let error = result.error;
@@ -303,7 +343,6 @@ export default class SendMessageComposer extends React.Component {
         }
         if (error) {
             console.error("Command failure: %s", error);
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             // assume the error is a server error when the command is async
             const isServerError = !!result.promise;
             const title = isServerError ? _td("Server error") : _td("Command error");
@@ -322,40 +361,53 @@ export default class SendMessageComposer extends React.Component {
                 description: errText,
             });
         } else {
-            console.log("Command success.");
+            logger.log("Command success.");
             if (messageContent) return messageContent;
         }
     }
 
-    async _sendMessage() {
-        if (this.model.isEmpty) {
+    public async sendMessage(): Promise<void> {
+        const model = this.model;
+
+        if (model.isEmpty) {
             return;
         }
 
+        // Replace emoticon at the end of the message
+        if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+            const caret = this.editorRef.current?.getCaret();
+            const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
+            this.editorRef.current?.replaceEmoticon(position, REGEX_EMOTICON);
+        }
+
         const replyToEvent = this.props.replyToEvent;
         let shouldSend = true;
         let content;
 
-        if (!containsEmote(this.model) && this._isSlashCommand()) {
-            const [cmd, args, commandText] = this._getSlashCommand();
+        if (!containsEmote(model) && this.isSlashCommand()) {
+            const [cmd, args, commandText] = this.getSlashCommand();
             if (cmd) {
                 if (cmd.category === CommandCategories.messages) {
-                    content = await this._runSlashCommand(cmd, args);
+                    content = await this.runSlashCommand(cmd, args);
                     if (replyToEvent) {
-                        addReplyToMessageContent(content, replyToEvent, this.props.permalinkCreator);
+                        addReplyToMessageContent(
+                            content,
+                            replyToEvent,
+                            this.props.replyInThread,
+                            this.props.permalinkCreator,
+                        );
                     }
                 } else {
-                    this._runSlashCommand(cmd, args);
+                    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");
-                const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
+                const { finished } = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
                     title: _t("Unknown Command"),
                     description: <div>
                         <p>
-                            { _t("Unrecognised command: %(commandText)s", {commandText}) }
+                            { _t("Unrecognised command: %(commandText)s", { commandText }) }
                         </p>
                         <p>
                             { _t("You can use <code>/help</code> to list available commands. " +
@@ -377,21 +429,30 @@ export default class SendMessageComposer extends React.Component {
             }
         }
 
-        if (isQuickReaction(this.model)) {
+        if (isQuickReaction(model)) {
             shouldSend = false;
-            this._sendQuickReaction();
+            this.sendQuickReaction();
         }
 
         if (shouldSend) {
             const startTime = CountlyAnalytics.getTimestamp();
-            const {roomId} = this.props.room;
+            const { roomId } = this.props.room;
             if (!content) {
-                content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
+                content = createMessageContent(
+                    model,
+                    replyToEvent,
+                    this.props.replyInThread,
+                    this.props.permalinkCreator,
+                );
             }
             // don't bother sending an empty message
             if (!content.body.trim()) return;
 
-            const prom = this.context.sendMessage(roomId, content);
+            if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+                decorateStartSendingTime(content);
+            }
+
+            const prom = this.props.mxClient.sendMessage(roomId, content);
             if (replyToEvent) {
                 // Clear reply_to_event as we put the message into the queue
                 // if the send fails, retry will handle resending.
@@ -400,55 +461,69 @@ export default class SendMessageComposer extends React.Component {
                     event: null,
                 });
             }
-            dis.dispatch({action: "message_sent"});
+            dis.dispatch({ action: "message_sent" });
             CHAT_EFFECTS.forEach((effect) => {
                 if (containsEmoji(content, effect.emojis)) {
-                    dis.dispatch({action: `effects.${effect.command}`});
+                    dis.dispatch({ action: `effects.${effect.command}` });
                 }
             });
+            if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
+                prom.then(resp => {
+                    sendRoundTripMetric(this.props.mxClient, roomId, resp.event_id);
+                });
+            }
             CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, !!replyToEvent, content);
         }
 
-        this.sendHistoryManager.save(this.model, replyToEvent);
+        this.sendHistoryManager.save(model, replyToEvent);
         // clear composer
-        this.model.reset([]);
-        this._editorRef.clearUndoHistory();
-        this._editorRef.focus();
-        this._clearStoredEditorState();
+        model.reset([]);
+        this.editorRef.current?.clearUndoHistory();
+        this.editorRef.current?.focus();
+        this.clearStoredEditorState();
         if (SettingsStore.getValue("scrollToBottomOnMessageSent")) {
-            dis.dispatch({action: "scroll_to_bottom"});
+            dis.dispatch({ action: "scroll_to_bottom" });
         }
     }
 
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
-        window.removeEventListener("beforeunload", this._saveStoredEditorState);
-        this._saveStoredEditorState();
+        window.removeEventListener("beforeunload", this.saveStoredEditorState);
+        this.saveStoredEditorState();
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
-        const partCreator = new CommandPartCreator(this.props.room, this.context);
-        const parts = this._restoreStoredEditorState(partCreator) || [];
+    UNSAFE_componentWillMount() { // eslint-disable-line
+        const partCreator = new CommandPartCreator(this.props.room, this.props.mxClient);
+        const parts = this.restoreStoredEditorState(partCreator) || [];
         this.model = new EditorModel(parts, partCreator);
         this.dispatcherRef = dis.register(this.onAction);
         this.sendHistoryManager = new SendHistoryManager(this.props.room.roomId, 'mx_cider_history_');
     }
 
-    get _editorStateKey() {
-        return `mx_cider_state_${this.props.room.roomId}`;
+    private get editorStateKey() {
+        let key = `mx_cider_state_${this.props.room.roomId}`;
+        const thread = this.props.replyToEvent?.getThread();
+        if (thread) {
+            key += `_${thread.id}`;
+        }
+        return key;
     }
 
-    _clearStoredEditorState() {
-        localStorage.removeItem(this._editorStateKey);
+    private clearStoredEditorState(): void {
+        localStorage.removeItem(this.editorStateKey);
     }
 
-    _restoreStoredEditorState(partCreator) {
-        const json = localStorage.getItem(this._editorStateKey);
+    private restoreStoredEditorState(partCreator: PartCreator): Part[] {
+        if (this.props.replyInThread && !this.props.replyToEvent) {
+            return null;
+        }
+
+        const json = localStorage.getItem(this.editorStateKey);
         if (json) {
             try {
-                const {parts: serializedParts, replyEventId} = JSON.parse(json);
-                const parts = serializedParts.map(p => partCreator.deserializePart(p));
+                const { parts: serializedParts, replyEventId } = JSON.parse(json);
+                const parts: Part[] = serializedParts.map(p => partCreator.deserializePart(p));
                 if (replyEventId) {
                     dis.dispatch({
                         action: 'reply_to_event',
@@ -463,119 +538,80 @@ 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;
-    }
+    private shouldSaveStoredEditorState = (): boolean => {
+        return !this.model.isEmpty || !!this.props.replyToEvent;
+    };
 
-    _saveStoredEditorState = () => {
-        if (this._shouldSaveStoredEditorState()) {
+    private saveStoredEditorState = (): void => {
+        if (this.shouldSaveStoredEditorState()) {
             const item = SendHistoryManager.createItem(this.model, this.props.replyToEvent);
-            localStorage.setItem(this._editorStateKey, JSON.stringify(item));
+            localStorage.setItem(this.editorStateKey, JSON.stringify(item));
         } else {
-            this._clearStoredEditorState();
+            this.clearStoredEditorState();
         }
-    }
+    };
 
-    onAction = (payload) => {
+    private onAction = (payload: ActionPayload): void => {
         // don't let the user into the composer if it is disabled - all of these branches lead
         // to the cursor being in the composer
         if (this.props.disabled) return;
 
         switch (payload.action) {
             case 'reply_to_event':
-            case Action.FocusComposer:
-                this._editorRef && this._editorRef.focus();
+            case Action.FocusSendMessageComposer:
+                this.editorRef.current?.focus();
                 break;
-            case 'insert_mention':
-                this._insertMention(payload.user_id);
-                break;
-            case 'quote':
-                this._insertQuotedMessage(payload.event);
-                break;
-            case 'insert_emoji':
-                this._insertEmoji(payload.emoji);
+            case "send_composer_insert":
+                if (payload.userId) {
+                    this.editorRef.current?.insertMention(payload.userId);
+                } else if (payload.event) {
+                    this.editorRef.current?.insertQuotedMessage(payload.event);
+                } else if (payload.text) {
+                    this.editorRef.current?.insertPlaintext(payload.text);
+                }
                 break;
         }
     };
 
-    _insertMention(userId) {
-        const {model} = this;
-        const {partCreator} = model;
-        const member = this.props.room.getMember(userId);
-        const displayName = member ?
-            member.rawDisplayName : userId;
-        const caret = this._editorRef.getCaret();
-        const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
-        // Insert suffix only if the caret is at the start of the composer
-        const parts = partCreator.createMentionParts(caret.offset === 0, displayName, userId);
-        model.transform(() => {
-            const addedLen = model.insert(parts, position);
-            return model.positionForOffset(caret.offset + addedLen, true);
-        });
-        // refocus on composer, as we just clicked "Mention"
-        this._editorRef && this._editorRef.focus();
-    }
-
-    _insertQuotedMessage(event) {
-        const {model} = this;
-        const {partCreator} = model;
-        const quoteParts = parseEvent(event, partCreator, {isQuotedMessage: true});
-        // add two newlines
-        quoteParts.push(partCreator.newline());
-        quoteParts.push(partCreator.newline());
-        model.transform(() => {
-            const addedLen = model.insert(quoteParts, model.positionForOffset(0));
-            return model.positionForOffset(addedLen, true);
-        });
-        // refocus on composer, as we just clicked "Quote"
-        this._editorRef && this._editorRef.focus();
-    }
-
-    _insertEmoji = (emoji) => {
-        const {model} = this;
-        const {partCreator} = model;
-        const caret = this._editorRef.getCaret();
-        const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
-        model.transform(() => {
-            const addedLen = model.insert([partCreator.plain(emoji)], position);
-            return model.positionForOffset(caret.offset + addedLen, true);
-        });
-    };
-
-    _onPaste = (event) => {
-        const {clipboardData} = event;
-        // Prioritize text on the clipboard over files as Office on macOS puts a bitmap
-        // in the clipboard as well as the content being copied.
-        if (clipboardData.files.length && !clipboardData.types.some(t => t === "text/plain")) {
-            // This actually not so much for 'files' as such (at time of writing
-            // neither chrome nor firefox let you paste a plain file copied
-            // from Finder) but more images copied from a different website
-            // / word processor etc.
+    private onPaste = (event: ClipboardEvent<HTMLDivElement>): boolean => {
+        const { clipboardData } = event;
+        // Prioritize text on the clipboard over files if RTF is present as Office on macOS puts a bitmap
+        // in the clipboard as well as the content being copied. Modern versions of Office seem to not do this anymore.
+        // We check text/rtf instead of text/plain as when copy+pasting a file from Finder or Gnome Image Viewer
+        // it puts the filename in as text/plain which we want to ignore.
+        if (clipboardData.files.length && !clipboardData.types.includes("text/rtf")) {
             ContentMessages.sharedInstance().sendContentListToRoom(
-                Array.from(clipboardData.files), this.props.room.roomId, this.context,
+                Array.from(clipboardData.files), this.props.room.roomId, this.props.mxClient,
             );
             return true; // to skip internal onPaste handler
         }
-    }
+    };
 
-    onChange = () => {
+    private onChange = (): void => {
         if (this.props.onChange) this.props.onChange(this.model);
-    }
+    };
+
+    private focusComposer = (): void => {
+        this.editorRef.current?.focus();
+    };
 
     render() {
         return (
-            <div className="mx_SendMessageComposer" onClick={this.focusComposer} onKeyDown={this._onKeyDown}>
+            <div className="mx_SendMessageComposer" onClick={this.focusComposer} onKeyDown={this.onKeyDown}>
                 <BasicMessageComposer
                     onChange={this.onChange}
-                    ref={this._setEditorRef}
+                    ref={this.editorRef}
                     model={this.model}
                     room={this.props.room}
                     label={this.props.placeholder}
                     placeholder={this.props.placeholder}
-                    onPaste={this._onPaste}
+                    onPaste={this.onPaste}
                     disabled={this.props.disabled}
                 />
             </div>
         );
     }
 }
+
+const SendMessageComposerWithMatrixClient = withMatrixClientHOC(SendMessageComposer);
+export default SendMessageComposerWithMatrixClient;
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
deleted file mode 100644
index 9aedb38654..0000000000
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-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) {
-    const {onClick} = props;
-
-    return (
-        <AccessibleButton className='mx_RoomHeader_cancelButton' onClick={onClick}>
-            <img src={require("../../../../res/img/cancel.svg")} className='mx_filterFlipColor'
-                width="18" height="18" alt={_t("Cancel")} />
-        </AccessibleButton>
-    );
-}
-
-/*
- * 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,
-        onCancelClick: PropTypes.func,
-
-        // `src` to a TintableSvg. Optional.
-        icon: PropTypes.string,
-    };
-
-    render() {
-        let cancelButton;
-        let icon;
-        if (this.props.onCancelClick) {
-            cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
-        }
-        if (this.props.icon) {
-            const TintableSvg = sdk.getComponent('elements.TintableSvg');
-            icon = <TintableSvg
-                className="mx_RoomHeader_icon" src={this.props.icon}
-                width="25" height="25"
-            />;
-        }
-
-        return (
-            <div className="mx_RoomHeader mx_RoomHeader_wrapper" >
-                <div className="mx_RoomHeader_simpleHeader">
-                    { icon }
-                    { this.props.title }
-                    { cancelButton }
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/rooms/SimpleRoomHeader.tsx b/src/components/views/rooms/SimpleRoomHeader.tsx
new file mode 100644
index 0000000000..d6effaceb4
--- /dev/null
+++ b/src/components/views/rooms/SimpleRoomHeader.tsx
@@ -0,0 +1,52 @@
+/*
+Copyright 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    title?: string;
+    // `src` to an image. Optional.
+    icon?: string;
+}
+
+/*
+ * 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.PureComponent<IProps> {
+    public render(): JSX.Element {
+        let icon;
+        if (this.props.icon) {
+            icon = <img
+                className="mx_RoomHeader_icon"
+                src={this.props.icon}
+                width="25"
+                height="25"
+            />;
+        }
+
+        return (
+            <div className="mx_RoomHeader mx_RoomHeader_wrapper">
+                <div className="mx_RoomHeader_simpleHeader">
+                    { icon }
+                    { this.props.title }
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.tsx
similarity index 60%
rename from src/components/views/rooms/Stickerpicker.js
rename to src/components/views/rooms/Stickerpicker.tsx
index 3d2300b83c..7adddc7b9f 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.tsx
@@ -14,23 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
-import classNames from 'classnames';
-import {_t, _td} from '../../../languageHandler';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { _t, _td } from '../../../languageHandler';
 import AppTile from '../elements/AppTile';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
-import WidgetUtils from '../../../utils/WidgetUtils';
+import WidgetUtils, { IWidgetEvent } from '../../../utils/WidgetUtils';
 import PersistedElement from "../elements/PersistedElement";
-import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
+import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
-import {ContextMenu} from "../../structures/ContextMenu";
-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";
+import { ChevronFace, ContextMenu } from "../../structures/ContextMenu";
+import { WidgetType } from "../../../widgets/WidgetType";
+import { Action } from "../../../dispatcher/actions";
+import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ActionPayload } from '../../../dispatcher/payloads';
+import ScalarAuthClient from '../../../ScalarAuthClient';
+import GenericElementContextMenu from "../context_menus/GenericElementContextMenu";
+import { IApp } from "../../../stores/WidgetStore";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // 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.
@@ -39,29 +43,38 @@ const STICKERPICKER_Z_INDEX = 3500;
 // Key to store the widget's AppTile under in PersistedElement
 const PERSISTED_ELEMENT_KEY = "stickerPicker";
 
+interface IProps {
+    room: Room;
+    showStickers: boolean;
+    menuPosition?: any;
+    setShowStickers: (showStickers: boolean) => void;
+}
+
+interface IState {
+    imError: string;
+    stickerpickerX: number;
+    stickerpickerY: number;
+    stickerpickerChevronOffset?: number;
+    stickerpickerWidget: IWidgetEvent;
+    widgetId: string;
+}
+
 @replaceableComponent("views.rooms.Stickerpicker")
-export default class Stickerpicker extends React.PureComponent {
+export default class Stickerpicker extends React.PureComponent<IProps, IState> {
     static currentWidget;
 
-    constructor(props) {
+    private dispatcherRef: string;
+
+    private prevSentVisibility: boolean;
+
+    private popoverWidth = 300;
+    private popoverHeight = 300;
+    // This is loaded by _acquireScalarClient on an as-needed basis.
+    private scalarClient: ScalarAuthClient = null;
+
+    constructor(props: IProps) {
         super(props);
-        this._onShowStickersClick = this._onShowStickersClick.bind(this);
-        this._onHideStickersClick = this._onHideStickersClick.bind(this);
-        this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
-        this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
-        this._updateWidget = this._updateWidget.bind(this);
-        this._onWidgetAction = this._onWidgetAction.bind(this);
-        this._onResize = this._onResize.bind(this);
-        this._onFinished = this._onFinished.bind(this);
-
-        this.popoverWidth = 300;
-        this.popoverHeight = 300;
-
-        // This is loaded by _acquireScalarClient on an as-needed basis.
-        this.scalarClient = null;
-
         this.state = {
-            showStickers: false,
             imError: null,
             stickerpickerX: null,
             stickerpickerY: null,
@@ -70,7 +83,7 @@ export default class Stickerpicker extends React.PureComponent {
         };
     }
 
-    _acquireScalarClient() {
+    private acquireScalarClient(): Promise<void | ScalarAuthClient> {
         if (this.scalarClient) return Promise.resolve(this.scalarClient);
         // TODO: Pick the right manager for the widget
         if (IntegrationManagers.sharedInstance().hasManager()) {
@@ -79,20 +92,20 @@ export default class Stickerpicker extends React.PureComponent {
                 this.forceUpdate();
                 return this.scalarClient;
             }).catch((e) => {
-                this._imError(_td("Failed to connect to integration manager"), e);
+                this.imError(_td("Failed to connect to integration manager"), e);
             });
         } else {
             IntegrationManagers.sharedInstance().openNoManagerDialog();
         }
     }
 
-    async _removeStickerpickerWidgets() {
-        const scalarClient = await this._acquireScalarClient();
-        console.log('Removing Stickerpicker widgets');
+    private removeStickerpickerWidgets = async (): Promise<void> => {
+        const scalarClient = await this.acquireScalarClient();
+        logger.log('Removing Stickerpicker widgets');
         if (this.state.widgetId) {
             if (scalarClient) {
                 scalarClient.disableWidgetAssets(WidgetType.STICKERPICKER, this.state.widgetId).then(() => {
-                    console.log('Assets disabled');
+                    logger.log('Assets disabled');
                 }).catch((err) => {
                     console.error('Failed to disable assets');
                 });
@@ -103,54 +116,54 @@ export default class Stickerpicker extends React.PureComponent {
             console.warn('No widget ID specified, not disabling assets');
         }
 
-        this.setState({showStickers: false});
+        this.props.setShowStickers(false);
         WidgetUtils.removeStickerpickerWidgets().then(() => {
             this.forceUpdate();
         }).catch((e) => {
             console.error('Failed to remove sticker picker widget', e);
         });
-    }
+    };
 
-    componentDidMount() {
+    public componentDidMount(): void {
         // Close the sticker picker when the window resizes
-        window.addEventListener('resize', this._onResize);
+        window.addEventListener('resize', this.onResize);
 
-        this.dispatcherRef = dis.register(this._onWidgetAction);
+        this.dispatcherRef = dis.register(this.onWidgetAction);
 
         // Track updates to widget state in account data
-        MatrixClientPeg.get().on('accountData', this._updateWidget);
+        MatrixClientPeg.get().on('accountData', this.updateWidget);
 
         // Initialise widget state from current account data
-        this._updateWidget();
+        this.updateWidget();
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const client = MatrixClientPeg.get();
-        if (client) client.removeListener('accountData', this._updateWidget);
+        if (client) client.removeListener('accountData', this.updateWidget);
 
-        window.removeEventListener('resize', this._onResize);
+        window.removeEventListener('resize', this.onResize);
         if (this.dispatcherRef) {
             dis.unregister(this.dispatcherRef);
         }
     }
 
-    componentDidUpdate(prevProps, prevState) {
-        this._sendVisibilityToWidget(this.state.showStickers);
+    public componentDidUpdate(prevProps: IProps, prevState: IState): void {
+        this.sendVisibilityToWidget(this.props.showStickers);
     }
 
-    _imError(errorMsg, e) {
+    private imError(errorMsg: string, e: Error): void {
         console.error(errorMsg, e);
         this.setState({
-            showStickers: false,
             imError: _t(errorMsg),
         });
+        this.props.setShowStickers(false);
     }
 
-    _updateWidget() {
+    private updateWidget = (): void => {
         const stickerpickerWidget = WidgetUtils.getStickerpickerWidgets()[0];
         if (!stickerpickerWidget) {
             Stickerpicker.currentWidget = null;
-            this.setState({stickerpickerWidget: null, widgetId: null});
+            this.setState({ stickerpickerWidget: null, widgetId: null });
             return;
         }
 
@@ -175,27 +188,27 @@ export default class Stickerpicker extends React.PureComponent {
             stickerpickerWidget,
             widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
         });
-    }
+    };
 
-    _onWidgetAction(payload) {
+    private onWidgetAction = (payload: ActionPayload): void => {
         switch (payload.action) {
             case "user_widget_updated":
                 this.forceUpdate();
                 break;
             case "stickerpicker_close":
-                this.setState({showStickers: false});
+                this.props.setShowStickers(false);
                 break;
             case Action.AfterRightPanelPhaseChange:
             case "show_left_panel":
             case "hide_left_panel":
-                this.setState({showStickers: false});
+                this.props.setShowStickers(false);
                 break;
         }
-    }
+    };
 
-    _defaultStickerpickerContent() {
+    private defaultStickerpickerContent(): JSX.Element {
         return (
-            <AccessibleButton onClick={this._launchManageIntegrations}
+            <AccessibleButton onClick={this.launchManageIntegrations}
                 className='mx_Stickers_contentPlaceholder'>
                 <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
                 <p className='mx_Stickers_addLink'>{ _t("Add some now") }</p>
@@ -204,29 +217,29 @@ export default class Stickerpicker extends React.PureComponent {
         );
     }
 
-    _errorStickerpickerContent() {
+    private errorStickerpickerContent(): JSX.Element {
         return (
-            <div style={{"text-align": "center"}} className="error">
+            <div style={{ textAlign: "center" }} className="error">
                 <p> { this.state.imError } </p>
             </div>
         );
     }
 
-    _sendVisibilityToWidget(visible) {
+    private sendVisibilityToWidget(visible: boolean): void {
         if (!this.state.stickerpickerWidget) return;
         const messaging = WidgetMessagingStore.instance.getMessagingForId(this.state.stickerpickerWidget.id);
-        if (messaging && visible !== this._prevSentVisibility) {
+        if (messaging && visible !== this.prevSentVisibility) {
             messaging.updateVisibility(visible).catch(err => {
                 console.error("Error updating widget visibility: ", err);
             });
-            this._prevSentVisibility = visible;
+            this.prevSentVisibility = visible;
         }
     }
 
-    _getStickerpickerContent() {
-        // Handle Integration Manager errors
-        if (this.state._imError) {
-            return this._errorStickerpickerContent();
+    public getStickerpickerContent(): JSX.Element {
+        // Handle integration manager errors
+        if (this.state.imError) {
+            return this.errorStickerpickerContent();
         }
 
         // Stickers
@@ -239,20 +252,23 @@ export default class Stickerpicker extends React.PureComponent {
         // Use a separate ReactDOM tree to render the AppTile separately so that it persists and does
         // not unmount when we (a) close the sticker picker (b) switch rooms. It's properties are still
         // updated.
-        const PersistedElement = sdk.getComponent("elements.PersistedElement");
 
         // Load stickerpack content
         if (stickerpickerWidget && stickerpickerWidget.content && stickerpickerWidget.content.url) {
             // Set default name
-            stickerpickerWidget.content.name = stickerpickerWidget.name || _t("Stickerpack");
+            stickerpickerWidget.content.name = stickerpickerWidget.content.name || _t("Stickerpack");
 
             // FIXME: could this use the same code as other apps?
-            const stickerApp = {
+            const stickerApp: IApp = {
                 id: stickerpickerWidget.id,
                 url: stickerpickerWidget.content.url,
                 name: stickerpickerWidget.content.name,
                 type: stickerpickerWidget.content.type,
                 data: stickerpickerWidget.content.data,
+                roomId: stickerpickerWidget.content.roomId,
+                eventId: stickerpickerWidget.content.eventId,
+                avatar_url: stickerpickerWidget.content.avatar_url,
+                creatorUserId: stickerpickerWidget.content.creatorUserId,
             };
 
             stickersContent = (
@@ -275,12 +291,10 @@ export default class Stickerpicker extends React.PureComponent {
                                 creatorUserId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}
                                 waitForIframeLoad={true}
                                 showMenubar={true}
-                                onEditClick={this._launchManageIntegrations}
-                                onDeleteClick={this._removeStickerpickerWidgets}
+                                onEditClick={this.launchManageIntegrations}
+                                onDeleteClick={this.removeStickerpickerWidgets}
                                 showTitle={false}
-                                showCancel={false}
                                 showPopout={false}
-                                onMinimiseClick={this._onHideStickersClick}
                                 handleMinimisePointerEvents={true}
                                 userWidget={true}
                             />
@@ -290,7 +304,7 @@ export default class Stickerpicker extends React.PureComponent {
             );
         } else {
             // Default content to show if stickerpicker widget not added
-            stickersContent = this._defaultStickerpickerContent();
+            stickersContent = this.defaultStickerpickerContent();
         }
         return stickersContent;
     }
@@ -300,7 +314,7 @@ export default class Stickerpicker extends React.PureComponent {
      * Show the sticker picker overlay
      * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
      */
-    _onShowStickersClick(e) {
+    private onShowStickersClick = (e: React.MouseEvent<HTMLElement>): void => {
         if (!SettingsStore.getValue("integrationProvisioning")) {
             // Intercept this case and spawn a warning.
             return IntegrationManagers.sharedInstance().showDisabledDialog();
@@ -308,7 +322,7 @@ export default class Stickerpicker extends React.PureComponent {
 
         // XXX: Simplify by using a context menu that is positioned relative to the sticker picker button
 
-        const buttonRect = e.target.getBoundingClientRect();
+        const buttonRect = e.currentTarget.getBoundingClientRect();
 
         // The window X and Y offsets are to adjust position when zoomed in to page
         let x = buttonRect.right + window.pageXOffset - 41;
@@ -324,50 +338,40 @@ export default class Stickerpicker extends React.PureComponent {
         // Offset the chevron location, which is relative to the left of the context menu
         //  (10 = offset when context menu would not be displayed off viewport)
         //  (2 = context menu borders)
-        const stickerPickerChevronOffset = Math.max(10, 2 + window.pageXOffset + buttonRect.left - x);
+        const stickerpickerChevronOffset = Math.max(10, 2 + window.pageXOffset + buttonRect.left - x);
 
         const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
 
+        this.props.setShowStickers(true);
         this.setState({
-            showStickers: true,
-            stickerPickerX: x,
-            stickerPickerY: y,
-            stickerPickerChevronOffset,
+            stickerpickerX: x,
+            stickerpickerY: y,
+            stickerpickerChevronOffset,
         });
-    }
-
-    /**
-     * Trigger hiding of the sticker picker overlay
-     * @param  {Event} ev Event that triggered the function call
-     */
-    _onHideStickersClick(ev) {
-        if (this.state.showStickers) {
-            this.setState({showStickers: false});
-        }
-    }
+    };
 
     /**
      * Called when the window is resized
      */
-    _onResize() {
-        if (this.state.showStickers) {
-            this.setState({showStickers: false});
+    private onResize = (): void => {
+        if (this.props.showStickers) {
+            this.props.setShowStickers(false);
         }
-    }
+    };
 
     /**
      * The stickers picker was hidden
      */
-    _onFinished() {
-        if (this.state.showStickers) {
-            this.setState({showStickers: false});
+    private onFinished = (): void => {
+        if (this.props.showStickers) {
+            this.props.setShowStickers(false);
         }
-    }
+    };
 
     /**
      * Launch the integration manager on the stickers integration page
      */
-    _launchManageIntegrations() {
+    private launchManageIntegrations = (): void => {
         // TODO: Open the right integration manager for the widget
         if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll(
@@ -382,61 +386,26 @@ export default class Stickerpicker extends React.PureComponent {
                 this.state.widgetId,
             );
         }
-    }
+    };
 
-    render() {
-        let stickerPicker;
-        let stickersButton;
-        const className = classNames(
-            "mx_MessageComposer_button",
-            "mx_MessageComposer_stickers",
-            "mx_Stickers_hideStickers",
-            "mx_MessageComposer_button_highlight",
-        );
-        if (this.state.showStickers) {
-            // Show hide-stickers button
-            stickersButton =
-                <AccessibleButton
-                    id='stickersButton'
-                    key="controls_hide_stickers"
-                    className={className}
-                    onClick={this._onHideStickersClick}
-                    active={this.state.showStickers}
-                    title={_t("Hide Stickers")}
-                >
-                </AccessibleButton>;
+    public render(): JSX.Element {
+        if (!this.props.showStickers) return null;
 
-            const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
-            stickerPicker = <ContextMenu
-                chevronOffset={this.state.stickerPickerChevronOffset}
-                chevronFace="bottom"
-                left={this.state.stickerPickerX}
-                top={this.state.stickerPickerY}
-                menuWidth={this.popoverWidth}
-                menuHeight={this.popoverHeight}
-                onFinished={this._onFinished}
-                menuPaddingTop={0}
-                menuPaddingLeft={0}
-                menuPaddingRight={0}
-                zIndex={STICKERPICKER_Z_INDEX}
-            >
-                <GenericElementContextMenu element={this._getStickerpickerContent()} onResize={this._onFinished} />
-            </ContextMenu>;
-        } else {
-            // Show show-stickers button
-            stickersButton =
-                <AccessibleTooltipButton
-                    id='stickersButton'
-                    key="controls_show_stickers"
-                    className="mx_MessageComposer_button mx_MessageComposer_stickers"
-                    onClick={this._onShowStickersClick}
-                    title={_t("Show Stickers")}
-                >
-                </AccessibleTooltipButton>;
-        }
-        return <React.Fragment>
-            { stickersButton }
-            { stickerPicker }
-        </React.Fragment>;
+        return <ContextMenu
+            chevronOffset={this.state.stickerpickerChevronOffset}
+            chevronFace={ChevronFace.Bottom}
+            left={this.state.stickerpickerX}
+            top={this.state.stickerpickerY}
+            menuWidth={this.popoverWidth}
+            menuHeight={this.popoverHeight}
+            onFinished={this.onFinished}
+            menuPaddingTop={0}
+            menuPaddingLeft={0}
+            menuPaddingRight={0}
+            zIndex={STICKERPICKER_Z_INDEX}
+            {...this.props.menuPosition}
+        >
+            <GenericElementContextMenu element={this.getStickerpickerContent()} onResize={this.onFinished} />
+        </ContextMenu>;
     }
 }
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
index 792e6ac8f7..1590ce0871 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
@@ -15,18 +15,19 @@ limitations under the License.
 */
 
 import React from 'react';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {_t} from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
-import * as sdk from "../../../index";
 import Modal from "../../../Modal";
-import {isValid3pidInvite} from "../../../RoomInvite";
+import { isValid3pidInvite } from "../../../RoomInvite";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import SettingsStore from "../../../settings/SettingsStore";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import ErrorDialog from '../dialogs/ErrorDialog';
+import AccessibleButton from '../elements/AccessibleButton';
+import SpaceStore from "../../../stores/SpaceStore";
 
 interface IProps {
     event: MatrixEvent;
@@ -83,7 +84,7 @@ export default class ThirdPartyMemberInfo extends React.Component<IProps, IState
             const newDisplayName = ev.getContent().display_name;
             const isInvited = isValid3pidInvite(ev);
 
-            const newState = {invited: isInvited};
+            const newState = { invited: isInvited };
             if (newDisplayName) newState['displayName'] = newDisplayName;
             this.setState(newState);
         }
@@ -102,9 +103,8 @@ export default class ThirdPartyMemberInfo extends React.Component<IProps, IState
                 console.error(err);
 
                 // Revert echo because of error
-                this.setState({invited: true});
+                this.setState({ invited: true });
 
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Revoke 3pid invite failed', '', ErrorDialog, {
                     title: _t("Failed to revoke invite"),
                     description: _t(
@@ -115,20 +115,18 @@ export default class ThirdPartyMemberInfo extends React.Component<IProps, IState
             });
 
         // Local echo
-        this.setState({invited: false});
+        this.setState({ invited: false });
     };
 
     render() {
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-
         let adminTools = null;
         if (this.state.canKick && this.state.invited) {
             adminTools = (
                 <div className="mx_MemberInfo_container">
-                    <h3>{_t("Admin Tools")}</h3>
+                    <h3>{ _t("Admin Tools") }</h3>
                     <div className="mx_MemberInfo_buttons">
                         <AccessibleButton className="mx_MemberInfo_field" onClick={this.onKickClick}>
-                            {_t("Revoke invite")}
+                            { _t("Revoke invite") }
                         </AccessibleButton>
                     </div>
                 </div>
@@ -136,7 +134,7 @@ export default class ThirdPartyMemberInfo extends React.Component<IProps, IState
         }
 
         let scopeHeader;
-        if (SettingsStore.getValue("feature_spaces") && this.room.isSpaceRoom()) {
+        if (SpaceStore.spacesEnabled && this.room.isSpaceRoom()) {
             scopeHeader = <div className="mx_RightPanel_scopeHeader">
                 <RoomAvatar room={this.room} height={32} width={32} />
                 <RoomName room={this.room} />
@@ -152,16 +150,16 @@ export default class ThirdPartyMemberInfo extends React.Component<IProps, IState
                         onClick={this.onCancel}
                         title={_t('Close')}
                     />
-                    <h2>{this.state.displayName}</h2>
+                    <h2>{ this.state.displayName }</h2>
                 </div>
                 <div className="mx_MemberInfo_container">
                     <div className="mx_MemberInfo_profile">
                         <div className="mx_MemberInfo_profileField">
-                            {_t("Invited by %(sender)s", {sender: this.state.senderName})}
+                            { _t("Invited by %(sender)s", { sender: this.state.senderName }) }
                         </div>
                     </div>
                 </div>
-                {adminTools}
+                { adminTools }
             </div>
         );
     }
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.tsx
similarity index 56%
rename from src/components/views/rooms/TopUnreadMessagesBar.js
rename to src/components/views/rooms/TopUnreadMessagesBar.tsx
index cba99ac913..14f9a27f2d 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector Ltd
+Copyright 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.
@@ -17,29 +15,30 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    onScrollUpClick?: (e: React.MouseEvent) => void;
+    onCloseClick?: (e: React.MouseEvent) => void;
+}
 
 @replaceableComponent("views.rooms.TopUnreadMessagesBar")
-export default class TopUnreadMessagesBar extends React.Component {
-    static propTypes = {
-        onScrollUpClick: PropTypes.func,
-        onCloseClick: PropTypes.func,
-    };
-
-    render() {
+export default class TopUnreadMessagesBar extends React.PureComponent<IProps> {
+    public render(): JSX.Element {
         return (
             <div className="mx_TopUnreadMessagesBar">
-                <AccessibleButton className="mx_TopUnreadMessagesBar_scrollUp"
+                <AccessibleButton
+                    className="mx_TopUnreadMessagesBar_scrollUp"
                     title={_t('Jump to first unread message.')}
-                    onClick={this.props.onScrollUpClick}>
-                </AccessibleButton>
-                <AccessibleButton className="mx_TopUnreadMessagesBar_markAsRead"
+                    onClick={this.props.onScrollUpClick}
+                />
+                <AccessibleButton
+                    className="mx_TopUnreadMessagesBar_markAsRead"
                     title={_t('Mark all as read')}
-                    onClick={this.props.onCloseClick}>
-                </AccessibleButton>
+                    onClick={this.props.onCloseClick}
+                />
             </div>
         );
     }
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 2102071bf3..288d97fc50 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -15,22 +15,26 @@ limitations under the License.
 */
 
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import {_t} from "../../../languageHandler";
-import React, {ReactNode} from "react";
-import {RecordingState, VoiceRecording} from "../../../voice/VoiceRecording";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import classNames from "classnames";
-import LiveRecordingWaveform from "../voice_messages/LiveRecordingWaveform";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import LiveRecordingClock from "../voice_messages/LiveRecordingClock";
-import {VoiceRecordingStore} from "../../../stores/VoiceRecordingStore";
-import {UPDATE_EVENT} from "../../../stores/AsyncStore";
-import RecordingPlayback from "../voice_messages/RecordingPlayback";
-import {MsgType} from "matrix-js-sdk/src/@types/event";
+import { _t } from "../../../languageHandler";
+import React, { ReactNode } from "react";
+import { IUpload, RecordingState, VoiceRecording } from "../../../audio/VoiceRecording";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import LiveRecordingWaveform from "../audio_messages/LiveRecordingWaveform";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import LiveRecordingClock from "../audio_messages/LiveRecordingClock";
+import { VoiceRecordingStore } from "../../../stores/VoiceRecordingStore";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import RecordingPlayback from "../audio_messages/RecordingPlayback";
+import { MsgType } from "matrix-js-sdk/src/@types/event";
 import Modal from "../../../Modal";
 import ErrorDialog from "../dialogs/ErrorDialog";
-import CallMediaHandler from "../../../CallMediaHandler";
+import MediaDeviceHandler, { MediaDeviceKindEnum } from "../../../MediaDeviceHandler";
+import NotificationBadge from "./NotificationBadge";
+import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
+import { NotificationColor } from "../../../stores/notifications/NotificationColor";
+import InlineSpinner from "../elements/InlineSpinner";
+import { PlaybackManager } from "../../../audio/PlaybackManager";
 
 interface IProps {
     room: Room;
@@ -39,6 +43,7 @@ interface IProps {
 interface IState {
     recorder?: VoiceRecording;
     recordingPhase?: RecordingState;
+    didUploadFail?: boolean;
 }
 
 /**
@@ -65,38 +70,58 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         }
 
         await this.state.recorder.stop();
-        const mxc = await this.state.recorder.upload();
-        MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
-            "body": "Voice message",
-            //"msgtype": "org.matrix.msc2516.voice",
-            "msgtype": MsgType.Audio,
-            "url": mxc,
-            "info": {
-                duration: Math.round(this.state.recorder.durationSeconds * 1000),
-                mimetype: this.state.recorder.contentType,
-                size: this.state.recorder.contentLength,
-            },
 
-            // MSC1767 experiment
-            "org.matrix.msc1767.text": "Voice message",
-            "org.matrix.msc1767.file": {
-                url: mxc,
-                name: "Voice message.ogg",
-                mimetype: this.state.recorder.contentType,
-                size: this.state.recorder.contentLength,
-            },
-            "org.matrix.msc1767.audio": {
-                duration: Math.round(this.state.recorder.durationSeconds * 1000),
+        let upload: IUpload;
+        try {
+            upload = await this.state.recorder.upload(this.props.room.roomId);
+        } catch (e) {
+            console.error("Error uploading voice message:", e);
 
-                // Events can't have floats, so we try to maintain resolution by using 1024
-                // as a maximum value. The waveform contains values between zero and 1, so this
-                // should come out largely sane.
-                //
-                // We're expecting about one data point per second of audio.
-                waveform: this.state.recorder.getPlayback().waveform.map(v => Math.round(v * 1024)),
-            },
-            "org.matrix.msc2516.voice": {}, // No content, this is a rendering hint
-        });
+            // Flag error and move on. The recording phase will be reset by the upload function.
+            this.setState({ didUploadFail: true });
+
+            return; // don't dispose the recording: the user has a chance to re-upload
+        }
+
+        try {
+            // noinspection ES6MissingAwait - we don't care if it fails, it'll get queued.
+            MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
+                "body": "Voice message",
+                //"msgtype": "org.matrix.msc2516.voice",
+                "msgtype": MsgType.Audio,
+                "url": upload.mxc,
+                "file": upload.encrypted,
+                "info": {
+                    duration: Math.round(this.state.recorder.durationSeconds * 1000),
+                    mimetype: this.state.recorder.contentType,
+                    size: this.state.recorder.contentLength,
+                },
+
+                // MSC1767 + Ideals of MSC2516 as MSC3245
+                // https://github.com/matrix-org/matrix-doc/pull/3245
+                "org.matrix.msc1767.text": "Voice message",
+                "org.matrix.msc1767.file": {
+                    url: upload.mxc,
+                    file: upload.encrypted,
+                    name: "Voice message.ogg",
+                    mimetype: this.state.recorder.contentType,
+                    size: this.state.recorder.contentLength,
+                },
+                "org.matrix.msc1767.audio": {
+                    duration: Math.round(this.state.recorder.durationSeconds * 1000),
+
+                    // https://github.com/matrix-org/matrix-doc/pull/3246
+                    waveform: this.state.recorder.getPlayback().thumbnailWaveform.map(v => Math.round(v * 1024)),
+                },
+                "org.matrix.msc3245.voice": {}, // No content, this is a rendering hint
+            });
+        } catch (e) {
+            console.error("Error sending voice message:", e);
+
+            // Voice message should be in the timeline at this point, so let other things take care
+            // of error handling. We also shouldn't need the recording anymore, so fall through to
+            // disposal.
+        }
         await this.disposeRecording();
     }
 
@@ -104,14 +129,14 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         await VoiceRecordingStore.instance.disposeRecording();
 
         // Reset back to no recording, which means no phase (ie: restart component entirely)
-        this.setState({recorder: null, recordingPhase: null});
+        this.setState({ recorder: null, recordingPhase: null, didUploadFail: false });
     }
 
     private onCancel = async () => {
         await this.disposeRecording();
     };
 
-    private onRecordStartEndClick = async () => {
+    public onRecordStartEndClick = async () => {
         if (this.state.recorder) {
             await this.state.recorder.stop();
             return;
@@ -122,9 +147,9 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
             Modal.createTrackedDialog('Microphone Access Error', '', ErrorDialog, {
                 title: _t("Unable to access your microphone"),
                 description: <>
-                    <p>{_t(
+                    <p>{ _t(
                         "We were unable to access your microphone. Please check your browser settings and try again.",
-                    )}</p>
+                    ) }</p>
                 </>,
             });
         };
@@ -132,14 +157,14 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         // Do a sanity test to ensure we're about to grab a valid microphone reference. Things might
         // change between this and recording, but at least we will have tried.
         try {
-            const devices = await CallMediaHandler.getDevices();
-            if (!devices?.['audioinput']?.length) {
+            const devices = await MediaDeviceHandler.getDevices();
+            if (!devices?.[MediaDeviceKindEnum.AudioInput]?.length) {
                 Modal.createTrackedDialog('No Microphone Error', '', ErrorDialog, {
                     title: _t("No microphone found"),
                     description: <>
-                        <p>{_t(
+                        <p>{ _t(
                             "We didn't find a microphone on your device. Please check your settings and try again.",
-                        )}</p>
+                        ) }</p>
                     </>,
                 });
                 return;
@@ -152,16 +177,19 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         }
 
         try {
+            // stop any noises which might be happening
+            await PlaybackManager.instance.pauseAllExcept(null);
+
             const recorder = VoiceRecordingStore.instance.startRecording();
             await recorder.start();
 
             // We don't need to remove the listener: the recorder will clean that up for us.
             recorder.on(UPDATE_EVENT, (ev: RecordingState) => {
                 if (ev === RecordingState.EndingSoon) return; // ignore this state: it has no UI purpose here
-                this.setState({recordingPhase: ev});
+                this.setState({ recordingPhase: ev });
             });
 
-            this.setState({recorder, recordingPhase: RecordingState.Started});
+            this.setState({ recorder, recordingPhase: RecordingState.Started });
         } catch (e) {
             console.error("Error starting recording: ", e);
             accessError();
@@ -175,56 +203,67 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         if (!this.state.recorder) return null; // no recorder means we're not recording: no waveform
 
         if (this.state.recordingPhase !== RecordingState.Started) {
-            // TODO: @@ TR: Should we disable this during upload? What does a failed upload look like?
             return <RecordingPlayback playback={this.state.recorder.getPlayback()} />;
         }
 
         // only other UI is the recording-in-progress UI
-        return <div className="mx_VoiceMessagePrimaryContainer mx_VoiceRecordComposerTile_recording">
+        return <div className="mx_MediaBody mx_VoiceMessagePrimaryContainer mx_VoiceRecordComposerTile_recording">
             <LiveRecordingClock recorder={this.state.recorder} />
             <LiveRecordingWaveform recorder={this.state.recorder} />
         </div>;
     }
 
     public render(): ReactNode {
-        let recordingInfo;
-        let deleteButton;
-        if (!this.state.recordingPhase || this.state.recordingPhase === RecordingState.Started) {
-            const classes = classNames({
-                'mx_MessageComposer_button': !this.state.recorder,
-                'mx_MessageComposer_voiceMessage': !this.state.recorder,
-                'mx_VoiceRecordComposerTile_stop': this.state.recorder?.isRecording,
-            });
+        if (!this.state.recordingPhase) return null;
 
-            let tooltip = _t("Record a voice message");
+        let stopBtn;
+        let deleteButton;
+        if (this.state.recordingPhase === RecordingState.Started) {
+            let tooltip = _t("Send voice message");
             if (!!this.state.recorder) {
-                tooltip = _t("Stop the recording");
+                tooltip = _t("Stop recording");
             }
 
-            let stopOrRecordBtn = <AccessibleTooltipButton
-                className={classes}
+            stopBtn = <AccessibleTooltipButton
+                className="mx_VoiceRecordComposerTile_stop"
                 onClick={this.onRecordStartEndClick}
                 title={tooltip}
             />;
             if (this.state.recorder && !this.state.recorder?.isRecording) {
-                stopOrRecordBtn = null;
+                stopBtn = null;
             }
-
-            recordingInfo = stopOrRecordBtn;
         }
 
         if (this.state.recorder && this.state.recordingPhase !== RecordingState.Uploading) {
             deleteButton = <AccessibleTooltipButton
                 className='mx_VoiceRecordComposerTile_delete'
-                title={_t("Delete recording")}
+                title={_t("Delete")}
                 onClick={this.onCancel}
             />;
         }
 
+        let uploadIndicator;
+        if (this.state.recordingPhase === RecordingState.Uploading) {
+            uploadIndicator = <span className='mx_VoiceRecordComposerTile_uploadingState'>
+                <InlineSpinner w={16} h={16} />
+            </span>;
+        } else if (this.state.didUploadFail && this.state.recordingPhase === RecordingState.Ended) {
+            uploadIndicator = <span className='mx_VoiceRecordComposerTile_failedState'>
+                <span className='mx_VoiceRecordComposerTile_uploadState_badge'>
+                    { /* Need to stick the badge in a span to ensure it doesn't create a block component */ }
+                    <NotificationBadge
+                        notification={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+                    />
+                </span>
+                <span className='text-warning'>{ _t("Failed to send") }</span>
+            </span>;
+        }
+
         return (<>
-            {deleteButton}
-            {this.renderWaveformArea()}
-            {recordingInfo}
+            { uploadIndicator }
+            { deleteButton }
+            { stopBtn }
+            { this.renderWaveformArea() }
         </>);
     }
 }
diff --git a/src/components/views/rooms/WhoIsTypingTile.tsx b/src/components/views/rooms/WhoIsTypingTile.tsx
index 3a1d2051b4..65fbb6a7e0 100644
--- a/src/components/views/rooms/WhoIsTypingTile.tsx
+++ b/src/components/views/rooms/WhoIsTypingTile.tsx
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import Room from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
@@ -64,8 +64,8 @@ export default class WhoIsTypingTile extends React.Component<IProps, IState> {
     }
 
     componentDidUpdate(_, prevState) {
-        const wasVisible = this._isVisible(prevState);
-        const isVisible = this._isVisible(this.state);
+        const wasVisible = WhoIsTypingTile.isVisible(prevState);
+        const isVisible = WhoIsTypingTile.isVisible(this.state);
         if (this.props.onShown && !wasVisible && isVisible) {
             this.props.onShown();
         } else if (this.props.onHidden && wasVisible && !isVisible) {
@@ -83,12 +83,12 @@ export default class WhoIsTypingTile extends React.Component<IProps, IState> {
         Object.values(this.state.delayedStopTypingTimers).forEach((t) => (t as Timer).abort());
     }
 
-    private _isVisible(state: IState): boolean {
+    private static isVisible(state: IState): boolean {
         return state.usersTyping.length !== 0 || Object.keys(state.delayedStopTypingTimers).length !== 0;
     }
 
     public isVisible = (): boolean => {
-        return this._isVisible(this.state);
+        return WhoIsTypingTile.isVisible(this.state);
     };
 
     private onRoomTimeline = (event: MatrixEvent, room: Room): void => {
@@ -97,7 +97,7 @@ export default class WhoIsTypingTile extends React.Component<IProps, IState> {
             // remove user from usersTyping
             const usersTyping = this.state.usersTyping.filter((m) => m.userId !== userId);
             if (usersTyping.length !== this.state.usersTyping.length) {
-                this.setState({usersTyping});
+                this.setState({ usersTyping });
             }
             // abort timer if any
             this.abortUserTimer(userId);
@@ -163,7 +163,7 @@ export default class WhoIsTypingTile extends React.Component<IProps, IState> {
         if (timer) {
             const delayedStopTypingTimers = Object.assign({}, this.state.delayedStopTypingTimers);
             delete delayedStopTypingTimers[userId];
-            this.setState({delayedStopTypingTimers});
+            this.setState({ delayedStopTypingTimers });
         }
     }
 
diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.tsx
similarity index 78%
rename from src/components/views/settings/AvatarSetting.js
rename to src/components/views/settings/AvatarSetting.tsx
index 93b982467a..806d0adb73 100644
--- a/src/components/views/settings/AvatarSetting.js
+++ b/src/components/views/settings/AvatarSetting.tsx
@@ -14,13 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState} from "react";
-import PropTypes from "prop-types";
-import {_t} from "../../../languageHandler";
+import React, { useState } from "react";
+import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import classNames from "classnames";
 
-const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, removeAvatar}) => {
+interface IProps {
+    avatarUrl?: string;
+    avatarName: string; // name of user/room the avatar belongs to
+    uploadAvatar?: (e: React.MouseEvent) => void;
+    removeAvatar?: (e: React.MouseEvent) => void;
+    avatarAltText: string;
+}
+
+const AvatarSetting: React.FC<IProps> = ({ avatarUrl, avatarAltText, avatarName, uploadAvatar, removeAvatar }) => {
     const [isHovering, setIsHovering] = useState(false);
     const hoveringProps = {
         onMouseEnter: () => setIsHovering(true),
@@ -59,7 +66,7 @@ const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, remo
     let removeAvatarBtn;
     if (avatarUrl && removeAvatar) {
         removeAvatarBtn = <AccessibleButton onClick={removeAvatar} kind="link_sm">
-            {_t("Remove")}
+            { _t("Remove") }
         </AccessibleButton>;
     }
 
@@ -68,22 +75,14 @@ const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, remo
         "mx_AvatarSetting_avatar_hovering": isHovering && uploadAvatar,
     });
     return <div className={avatarClasses}>
-        {avatarElement}
+        { avatarElement }
         <div className="mx_AvatarSetting_hover">
             <div className="mx_AvatarSetting_hoverBg" />
-            <span>{_t("Upload")}</span>
+            <span>{ _t("Upload") }</span>
         </div>
-        {uploadAvatarBtn}
-        {removeAvatarBtn}
+        { uploadAvatarBtn }
+        { removeAvatarBtn }
     </div>;
 };
 
-AvatarSetting.propTypes = {
-    avatarUrl: PropTypes.string,
-    avatarName: PropTypes.string.isRequired, // name of user/room the avatar belongs to
-    uploadAvatar: PropTypes.func,
-    removeAvatar: PropTypes.func,
-    avatarAltText: PropTypes.string.isRequired,
-};
-
 export default AvatarSetting;
diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx
index 3565d1ba2e..5dd5ed9ba1 100644
--- a/src/components/views/settings/BridgeTile.tsx
+++ b/src/components/views/settings/BridgeTile.tsx
@@ -16,16 +16,16 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import Pill from "../elements/Pill";
-import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import { makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
 import SettingsStore from "../../../settings/SettingsStore";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
 
 interface IProps {
     ev: MatrixEvent;
@@ -69,7 +69,7 @@ export default class BridgeTile extends React.PureComponent<IProps> {
     static propTypes = {
         ev: PropTypes.object.isRequired,
         room: PropTypes.object.isRequired,
-    }
+    };
 
     render() {
         const content: IBridgeStateEvent = this.props.ev.getContent();
@@ -91,24 +91,24 @@ export default class BridgeTile extends React.PureComponent<IProps> {
 
         let creator = null;
         if (content.creator) {
-            creator = <li>{_t("This bridge was provisioned by <user />.", {}, {
+            creator = <li>{ _t("This bridge was provisioned by <user />.", {}, {
                 user: () => <Pill
                     type={Pill.TYPE_USER_MENTION}
                     room={this.props.room}
                     url={makeUserPermalink(content.creator)}
                     shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
                 />,
-            })}</li>;
+            }) }</li>;
         }
 
-        const bot = <li>{_t("This bridge is managed by <user />.", {}, {
+        const bot = <li>{ _t("This bridge is managed by <user />.", {}, {
             user: () => <Pill
                 type={Pill.TYPE_USER_MENTION}
                 room={this.props.room}
                 url={makeUserPermalink(content.bridgebot)}
                 shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
             />,
-        })}</li>;
+        }) }</li>;
 
         let networkIcon;
 
@@ -119,45 +119,47 @@ export default class BridgeTile extends React.PureComponent<IProps> {
                 width={48}
                 height={48}
                 resizeMethod='crop'
-                name={ protocolName }
-                idName={ protocolName }
-                url={ avatarUrl }
+                name={protocolName}
+                idName={protocolName}
+                url={avatarUrl}
             />;
         } else {
-            networkIcon = <div className="noProtocolIcon"></div>;
+            networkIcon = <div className="noProtocolIcon" />;
         }
         let networkItem = null;
         if (network) {
             const networkName = network.displayname || network.id;
-            let networkLink = <span>{networkName}</span>;
+            let networkLink = <span>{ networkName }</span>;
             if (typeof network.external_url === "string" && isUrlPermitted(network.external_url)) {
-                networkLink = <a href={network.external_url} target="_blank" rel="noreferrer noopener">{networkName}</a>
+                networkLink = (
+                    <a href={network.external_url} target="_blank" rel="noreferrer noopener">{ networkName }</a>
+                );
             }
             networkItem = _t("Workspace: <networkLink/>", {}, {
                 networkLink: () => networkLink,
             });
         }
 
-        let channelLink = <span>{channelName}</span>;
+        let channelLink = <span>{ channelName }</span>;
         if (typeof channel.external_url === "string" && isUrlPermitted(channel.external_url)) {
-            channelLink = <a href={channel.external_url} target="_blank" rel="noreferrer noopener">{channelName}</a>
+            channelLink = <a href={channel.external_url} target="_blank" rel="noreferrer noopener">{ channelName }</a>;
         }
 
         const id = this.props.ev.getId();
         return (<li key={id}>
             <div className="column-icon">
-                {networkIcon}
+                { networkIcon }
             </div>
             <div className="column-data">
-                <h3>{protocolName}</h3>
+                <h3>{ protocolName }</h3>
                 <p className="workspace-channel-details">
-                    {networkItem}
-                    <span className="channel">{_t("Channel: <channelLink/>", {}, {
+                    { networkItem }
+                    <span className="channel">{ _t("Channel: <channelLink/>", {}, {
                         channelLink: () => channelLink,
-                    })}</span>
+                    }) }</span>
                 </p>
                 <ul className="metadata">
-                    {creator} {bot}
+                    { creator } { bot }
                 </ul>
             </div>
         </li>);
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.tsx
similarity index 60%
rename from src/components/views/settings/ChangeAvatar.js
rename to src/components/views/settings/ChangeAvatar.tsx
index 6c73fa7f90..36178540f7 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+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.
@@ -15,54 +15,65 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import * as sdk from '../../../index';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import Spinner from '../elements/Spinner';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import RoomAvatar from '../avatars/RoomAvatar';
+import BaseAvatar from '../avatars/BaseAvatar';
+
+interface IProps {
+    initialAvatarUrl?: string;
+    room?: Room;
+    // if false, you need to call changeAvatar.onFileSelected yourself.
+    showUploadSection?: boolean;
+    width?: number;
+    height?: number;
+    className?: string;
+}
+
+interface IState {
+    avatarUrl?: string;
+    errorText?: string;
+    phase?: Phases;
+}
+
+enum Phases {
+    Display = "display",
+    Uploading = "uploading",
+    Error = "error",
+}
 
 @replaceableComponent("views.settings.ChangeAvatar")
-export default class ChangeAvatar extends React.Component {
-    static propTypes = {
-        initialAvatarUrl: PropTypes.string,
-        room: PropTypes.object,
-        // if false, you need to call changeAvatar.onFileSelected yourself.
-        showUploadSection: PropTypes.bool,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        className: PropTypes.string,
-    };
-
-    static Phases = {
-        Display: "display",
-        Uploading: "uploading",
-        Error: "error",
-    };
-
-    static defaultProps = {
+export default class ChangeAvatar extends React.Component<IProps, IState> {
+    public static defaultProps = {
         showUploadSection: true,
         className: "",
         width: 80,
         height: 80,
     };
 
-    constructor(props) {
+    private avatarSet = false;
+
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
             avatarUrl: this.props.initialAvatarUrl,
-            phase: ChangeAvatar.Phases.Display,
+            phase: Phases.Display,
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
+    // eslint-disable-next-line
+    public UNSAFE_componentWillReceiveProps(newProps: IProps): void {
         if (this.avatarSet) {
             // don't clobber what the user has just set
             return;
@@ -72,13 +83,13 @@ export default class ChangeAvatar extends React.Component {
         });
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
         }
     }
 
-    onRoomStateEvents = (ev) => {
+    private onRoomStateEvents = (ev: MatrixEvent) => {
         if (!this.props.room) {
             return;
         }
@@ -94,20 +105,19 @@ export default class ChangeAvatar extends React.Component {
         }
     };
 
-    setAvatarFromFile(file) {
+    private setAvatarFromFile(file: File): Promise<{}> {
         let newUrl = null;
 
         this.setState({
-            phase: ChangeAvatar.Phases.Uploading,
+            phase: Phases.Uploading,
         });
-        const self = this;
-        const httpPromise = MatrixClientPeg.get().uploadContent(file).then(function(url) {
+        const httpPromise = MatrixClientPeg.get().uploadContent(file).then((url) => {
             newUrl = url;
-            if (self.props.room) {
+            if (this.props.room) {
                 return MatrixClientPeg.get().sendStateEvent(
-                    self.props.room.roomId,
+                    this.props.room.roomId,
                     'm.room.avatar',
-                    {url: url},
+                    { url: url },
                     '',
                 );
             } else {
@@ -115,46 +125,53 @@ export default class ChangeAvatar extends React.Component {
             }
         });
 
-        httpPromise.then(function() {
-            self.setState({
-                phase: ChangeAvatar.Phases.Display,
+        httpPromise.then(() => {
+            this.setState({
+                phase: Phases.Display,
                 avatarUrl: mediaFromMxc(newUrl).srcHttp,
             });
-        }, function(error) {
-            self.setState({
-                phase: ChangeAvatar.Phases.Error,
+        }, () => {
+            this.setState({
+                phase: Phases.Error,
             });
-            self.onError(error);
+            this.onError();
         });
 
         return httpPromise;
     }
 
-    onFileSelected = (ev) => {
+    private onFileSelected = (ev: React.ChangeEvent<HTMLInputElement>) => {
         this.avatarSet = true;
         return this.setAvatarFromFile(ev.target.files[0]);
     };
 
-    onError = (error) => {
+    private onError = (): void => {
         this.setState({
             errorText: _t("Failed to upload profile picture!"),
         });
     };
 
-    render() {
+    public render(): JSX.Element {
         let avatarImg;
         // Having just set an avatar we just display that since it will take a little
         // time to propagate through to the RoomAvatar.
         if (this.props.room && !this.avatarSet) {
-            const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
             avatarImg = <RoomAvatar
-                room={this.props.room} width={this.props.width} height={this.props.height} resizeMethod='crop'
+                room={this.props.room}
+                width={this.props.width}
+                height={this.props.height}
+                resizeMethod='crop'
             />;
         } else {
-            const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
             // XXX: FIXME: once we track in the JS what our own displayname is(!) then use it here rather than ?
-            avatarImg = <BaseAvatar width={this.props.width} height={this.props.height} resizeMethod='crop'
-                name='?' idName={MatrixClientPeg.get().getUserIdLocalpart()} url={this.state.avatarUrl} />;
+            avatarImg = <BaseAvatar
+                width={this.props.width}
+                height={this.props.height}
+                resizeMethod='crop'
+                name='?'
+                idName={MatrixClientPeg.get().getUserIdLocalpart()}
+                url={this.state.avatarUrl}
+            />;
         }
 
         let uploadSection;
@@ -169,8 +186,8 @@ export default class ChangeAvatar extends React.Component {
         }
 
         switch (this.state.phase) {
-            case ChangeAvatar.Phases.Display:
-            case ChangeAvatar.Phases.Error:
+            case Phases.Display:
+            case Phases.Error:
                 return (
                     <div>
                         <div className={this.props.className}>
@@ -179,7 +196,7 @@ export default class ChangeAvatar extends React.Component {
                         { uploadSection }
                     </div>
                 );
-            case ChangeAvatar.Phases.Uploading:
+            case Phases.Uploading:
                 return (
                     <Spinner />
                 );
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.tsx
similarity index 66%
rename from src/components/views/settings/ChangeDisplayName.js
rename to src/components/views/settings/ChangeDisplayName.tsx
index cae4a22be9..9f0f813ec6 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019 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.
@@ -17,14 +15,14 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import EditableTextContainer from "../elements/EditableTextContainer";
 
 @replaceableComponent("views.settings.ChangeDisplayName")
 export default class ChangeDisplayName extends React.Component {
-    _getDisplayName = async () => {
+    private getDisplayName = async (): Promise<string> => {
         const cli = MatrixClientPeg.get();
         try {
             const res = await cli.getProfileInfo(cli.getUserId());
@@ -34,21 +32,20 @@ export default class ChangeDisplayName extends React.Component {
         }
     };
 
-    _changeDisplayName = (newDisplayname) => {
+    private changeDisplayName = (newDisplayname: string): Promise<{}> => {
         const cli = MatrixClientPeg.get();
-        return cli.setDisplayName(newDisplayname).catch(function(e) {
-            throw new Error("Failed to set display name", e);
+        return cli.setDisplayName(newDisplayname).catch(function() {
+            throw new Error("Failed to set display name");
         });
     };
 
-    render() {
-        const EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
+    public render(): JSX.Element {
         return (
             <EditableTextContainer
-                getInitialValue={this._getDisplayName}
+                getInitialValue={this.getDisplayName}
                 placeholder={_t("No display name")}
                 blurToSubmit={true}
-                onSubmit={this._changeDisplayName} />
+                onSubmit={this.changeDisplayName} />
         );
     }
 }
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.tsx
similarity index 74%
rename from src/components/views/settings/ChangePassword.js
rename to src/components/views/settings/ChangePassword.tsx
index 1f45bf61eb..4bde294aa4 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.tsx
@@ -17,78 +17,81 @@ limitations under the License.
 
 import Field from "../elements/Field";
 import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import AccessibleButton from '../elements/AccessibleButton';
 import Spinner from '../elements/Spinner';
-import withValidation from '../elements/Validation';
+import withValidation, { IFieldState, IValidationResult } from '../elements/Validation';
 import { _t } from '../../../languageHandler';
-import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import PassphraseField from "../auth/PassphraseField";
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PASSWORD_MIN_SCORE } from '../auth/RegistrationForm';
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import SetEmailDialog from "../dialogs/SetEmailDialog";
+import QuestionDialog from "../dialogs/QuestionDialog";
 
 const FIELD_OLD_PASSWORD = 'field_old_password';
 const FIELD_NEW_PASSWORD = 'field_new_password';
 const FIELD_NEW_PASSWORD_CONFIRM = 'field_new_password_confirm';
 
+enum Phase {
+    Edit = "edit",
+    Uploading = "uploading",
+    Error = "error",
+}
+
+interface IProps {
+    onFinished?: ({ didSetEmail: boolean }?) => void;
+    onError?: (error: {error: string}) => void;
+    rowClassName?: string;
+    buttonClassName?: string;
+    buttonKind?: string;
+    buttonLabel?: string;
+    confirm?: boolean;
+    // Whether to autoFocus the new password input
+    autoFocusNewPasswordInput?: boolean;
+    className?: string;
+    shouldAskForEmail?: boolean;
+}
+
+interface IState {
+    fieldValid: {};
+    phase: Phase;
+    oldPassword: string;
+    newPassword: string;
+    newPasswordConfirm: string;
+}
+
 @replaceableComponent("views.settings.ChangePassword")
-export default class ChangePassword extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func,
-        onError: PropTypes.func,
-        onCheckPassword: PropTypes.func,
-        rowClassName: PropTypes.string,
-        buttonClassName: PropTypes.string,
-        buttonKind: PropTypes.string,
-        buttonLabel: PropTypes.string,
-        confirm: PropTypes.bool,
-        // Whether to autoFocus the new password input
-        autoFocusNewPasswordInput: PropTypes.bool,
-    };
-
-    static Phases = {
-        Edit: "edit",
-        Uploading: "uploading",
-        Error: "error",
-    };
-
-    static defaultProps = {
+export default class ChangePassword extends React.Component<IProps, IState> {
+    public static defaultProps: Partial<IProps> = {
         onFinished() {},
         onError() {},
-        onCheckPassword(oldPass, newPass, confirmPass) {
-            if (newPass !== confirmPass) {
-                return {
-                    error: _t("New passwords don't match"),
-                };
-            } else if (!newPass || newPass.length === 0) {
-                return {
-                    error: _t("Passwords can't be empty"),
-                };
-            }
-        },
-        confirm: true,
-    }
 
-    state = {
-        fieldValid: {},
-        phase: ChangePassword.Phases.Edit,
-        oldPassword: "",
-        newPassword: "",
-        newPasswordConfirm: "",
+        confirm: true,
     };
 
-    changePassword(oldPassword, newPassword) {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            fieldValid: {},
+            phase: Phase.Edit,
+            oldPassword: "",
+            newPassword: "",
+            newPasswordConfirm: "",
+        };
+    }
+
+    private onChangePassword(oldPassword: string, newPassword: string): void {
         const cli = MatrixClientPeg.get();
 
         if (!this.props.confirm) {
-            this._changePassword(cli, oldPassword, newPassword);
+            this.changePassword(cli, oldPassword, newPassword);
             return;
         }
 
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Change Password', '', QuestionDialog, {
             title: _t("Warning!"),
             description:
@@ -99,7 +102,7 @@ export default class ChangePassword extends React.Component {
                         'and re-import them afterwards. ' +
                         'In future this will be improved.',
                     ) }
-                    {' '}
+                    { ' ' }
                     <a href="https://github.com/vector-im/element-web/issues/2671" target="_blank" rel="noreferrer noopener">
                         https://github.com/vector-im/element-web/issues/2671
                     </a>
@@ -109,20 +112,20 @@ export default class ChangePassword extends React.Component {
                 <button
                     key="exportRoomKeys"
                     className="mx_Dialog_primary"
-                    onClick={this._onExportE2eKeysClicked}
+                    onClick={this.onExportE2eKeysClicked}
                 >
                     { _t('Export E2E room keys') }
                 </button>,
             ],
             onFinished: (confirmed) => {
                 if (confirmed) {
-                    this._changePassword(cli, oldPassword, newPassword);
+                    this.changePassword(cli, oldPassword, newPassword);
                 }
             },
         });
     }
 
-    _changePassword(cli, oldPassword, newPassword) {
+    private changePassword(cli: MatrixClient, oldPassword: string, newPassword: string): void {
         const authDict = {
             type: 'm.login.password',
             identifier: {
@@ -136,12 +139,12 @@ export default class ChangePassword extends React.Component {
         };
 
         this.setState({
-            phase: ChangePassword.Phases.Uploading,
+            phase: Phase.Uploading,
         });
 
         cli.setPassword(authDict, newPassword).then(() => {
             if (this.props.shouldAskForEmail) {
-                return this._optionallySetEmail().then((confirmed) => {
+                return this.optionallySetEmail().then((confirmed) => {
                     this.props.onFinished({
                         didSetEmail: confirmed,
                     });
@@ -153,7 +156,7 @@ export default class ChangePassword extends React.Component {
             this.props.onError(err);
         }).finally(() => {
             this.setState({
-                phase: ChangePassword.Phases.Edit,
+                phase: Phase.Edit,
                 oldPassword: "",
                 newPassword: "",
                 newPasswordConfirm: "",
@@ -161,16 +164,27 @@ export default class ChangePassword extends React.Component {
         });
     }
 
-    _optionallySetEmail() {
+    private checkPassword(oldPass: string, newPass: string, confirmPass: string): {error: string} {
+        if (newPass !== confirmPass) {
+            return {
+                error: _t("New passwords don't match"),
+            };
+        } else if (!newPass || newPass.length === 0) {
+            return {
+                error: _t("Passwords can't be empty"),
+            };
+        }
+    }
+
+    private optionallySetEmail(): Promise<boolean> {
         // Ask for an email otherwise the user has no way to reset their password
-        const SetEmailDialog = sdk.getComponent("dialogs.SetEmailDialog");
         const modal = Modal.createTrackedDialog('Do you want to set an email address?', '', SetEmailDialog, {
             title: _t('Do you want to set an email address?'),
         });
         return modal.finished.then(([confirmed]) => confirmed);
     }
 
-    _onExportE2eKeysClicked = () => {
+    private onExportE2eKeysClicked = (): void => {
         Modal.createTrackedDialogAsync('Export E2E Keys', 'Change Password',
             import('../../../async-components/views/dialogs/security/ExportE2eKeysDialog'),
             {
@@ -179,7 +193,7 @@ export default class ChangePassword extends React.Component {
         );
     };
 
-    markFieldValid(fieldID, valid) {
+    private markFieldValid(fieldID: string, valid: boolean): void {
         const { fieldValid } = this.state;
         fieldValid[fieldID] = valid;
         this.setState({
@@ -187,19 +201,19 @@ export default class ChangePassword extends React.Component {
         });
     }
 
-    onChangeOldPassword = (ev) => {
+    private onChangeOldPassword = (ev: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             oldPassword: ev.target.value,
         });
     };
 
-    onOldPasswordValidate = async fieldState => {
+    private onOldPasswordValidate = async (fieldState: IFieldState): Promise<IValidationResult> => {
         const result = await this.validateOldPasswordRules(fieldState);
         this.markFieldValid(FIELD_OLD_PASSWORD, result.valid);
         return result;
     };
 
-    validateOldPasswordRules = withValidation({
+    private validateOldPasswordRules = withValidation({
         rules: [
             {
                 key: "required",
@@ -209,29 +223,29 @@ export default class ChangePassword extends React.Component {
         ],
     });
 
-    onChangeNewPassword = (ev) => {
+    private onChangeNewPassword = (ev: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             newPassword: ev.target.value,
         });
     };
 
-    onNewPasswordValidate = result => {
+    private onNewPasswordValidate = (result: IValidationResult): void => {
         this.markFieldValid(FIELD_NEW_PASSWORD, result.valid);
     };
 
-    onChangeNewPasswordConfirm = (ev) => {
+    private onChangeNewPasswordConfirm = (ev: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             newPasswordConfirm: ev.target.value,
         });
     };
 
-    onNewPasswordConfirmValidate = async fieldState => {
+    private onNewPasswordConfirmValidate = async (fieldState: IFieldState): Promise<IValidationResult> => {
         const result = await this.validatePasswordConfirmRules(fieldState);
         this.markFieldValid(FIELD_NEW_PASSWORD_CONFIRM, result.valid);
         return result;
     };
 
-    validatePasswordConfirmRules = withValidation({
+    private validatePasswordConfirmRules = withValidation<this>({
         rules: [
             {
                 key: "required",
@@ -248,7 +262,7 @@ export default class ChangePassword extends React.Component {
         ],
     });
 
-    onClickChange = async (ev) => {
+    private onClickChange = async (ev: React.MouseEvent | React.FormEvent): Promise<void> => {
         ev.preventDefault();
 
         const allFieldsValid = await this.verifyFieldsBeforeSubmit();
@@ -260,20 +274,20 @@ export default class ChangePassword extends React.Component {
         const oldPassword = this.state.oldPassword;
         const newPassword = this.state.newPassword;
         const confirmPassword = this.state.newPasswordConfirm;
-        const err = this.props.onCheckPassword(
+        const err = this.checkPassword(
             oldPassword, newPassword, confirmPassword,
         );
         if (err) {
             this.props.onError(err);
         } else {
-            this.changePassword(oldPassword, newPassword);
+            this.onChangePassword(oldPassword, newPassword);
         }
     };
 
-    async verifyFieldsBeforeSubmit() {
+    private async verifyFieldsBeforeSubmit(): Promise<boolean> {
         // Blur the active element if any, so we first run its blur validation,
         // which is less strict than the pass we're about to do below for all fields.
-        const activeElement = document.activeElement;
+        const activeElement = document.activeElement as HTMLElement;
         if (activeElement) {
             activeElement.blur();
         }
@@ -300,7 +314,7 @@ export default class ChangePassword extends React.Component {
 
         // Validation and state updates are async, so we need to wait for them to complete
         // first. Queue a `setState` callback and wait for it to resolve.
-        await new Promise(resolve => this.setState({}, resolve));
+        await new Promise<void>((resolve) => this.setState({}, resolve));
 
         if (this.allFieldsValid()) {
             return true;
@@ -319,7 +333,7 @@ export default class ChangePassword extends React.Component {
         return false;
     }
 
-    allFieldsValid() {
+    private allFieldsValid(): boolean {
         const keys = Object.keys(this.state.fieldValid);
         for (let i = 0; i < keys.length; ++i) {
             if (!this.state.fieldValid[keys[i]]) {
@@ -329,7 +343,7 @@ export default class ChangePassword extends React.Component {
         return true;
     }
 
-    findFirstInvalidField(fieldIDs) {
+    private findFirstInvalidField(fieldIDs: string[]): Field {
         for (const fieldID of fieldIDs) {
             if (!this.state.fieldValid[fieldID] && this[fieldID]) {
                 return this[fieldID];
@@ -338,12 +352,12 @@ export default class ChangePassword extends React.Component {
         return null;
     }
 
-    render() {
+    public render(): JSX.Element {
         const rowClassName = this.props.rowClassName;
         const buttonClassName = this.props.buttonClassName;
 
         switch (this.state.phase) {
-            case ChangePassword.Phases.Edit:
+            case Phase.Edit:
                 return (
                     <form className={this.props.className} onSubmit={this.onClickChange}>
                         <div className={rowClassName}>
@@ -385,7 +399,7 @@ export default class ChangePassword extends React.Component {
                         </AccessibleButton>
                     </form>
                 );
-            case ChangePassword.Phases.Uploading:
+            case Phase.Uploading:
                 return (
                     <div className="mx_Dialog_content">
                         <Spinner />
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.tsx
similarity index 58%
rename from src/components/views/settings/CrossSigningPanel.js
rename to src/components/views/settings/CrossSigningPanel.tsx
index 0cd1a64ada..9cba55e328 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.tsx
@@ -16,44 +16,49 @@ limitations under the License.
 
 import React from 'react';
 
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import Spinner from '../elements/Spinner';
 import InteractiveAuthDialog from '../dialogs/InteractiveAuthDialog';
 import ConfirmDestroyCrossSigningDialog from '../dialogs/security/ConfirmDestroyCrossSigningDialog';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from 'matrix-js-sdk/src';
+import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
+import { accessSecretStorage } from '../../../SecurityManager';
+
+interface IState {
+    error?: Error;
+    crossSigningPublicKeysOnDevice?: boolean;
+    crossSigningPrivateKeysInStorage?: boolean;
+    masterPrivateKeyCached?: boolean;
+    selfSigningPrivateKeyCached?: boolean;
+    userSigningPrivateKeyCached?: boolean;
+    homeserverSupportsCrossSigning?: boolean;
+    crossSigningReady?: boolean;
+}
 
 @replaceableComponent("views.settings.CrossSigningPanel")
-export default class CrossSigningPanel extends React.PureComponent {
+export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
+    private unmounted = false;
+
     constructor(props) {
         super(props);
 
-        this._unmounted = false;
-
-        this.state = {
-            error: null,
-            crossSigningPublicKeysOnDevice: null,
-            crossSigningPrivateKeysInStorage: null,
-            masterPrivateKeyCached: null,
-            selfSigningPrivateKeyCached: null,
-            userSigningPrivateKeyCached: null,
-            homeserverSupportsCrossSigning: null,
-            crossSigningReady: null,
-        };
+        this.state = {};
     }
 
-    componentDidMount() {
+    public componentDidMount() {
         const cli = MatrixClientPeg.get();
         cli.on("accountData", this.onAccountData);
         cli.on("userTrustStatusChanged", this.onStatusChanged);
         cli.on("crossSigning.keysChanged", this.onStatusChanged);
-        this._getUpdatedStatus();
+        this.getUpdatedStatus();
     }
 
-    componentWillUnmount() {
-        this._unmounted = true;
+    public componentWillUnmount() {
+        this.unmounted = true;
         const cli = MatrixClientPeg.get();
         if (!cli) return;
         cli.removeListener("accountData", this.onAccountData);
@@ -61,31 +66,40 @@ export default class CrossSigningPanel extends React.PureComponent {
         cli.removeListener("crossSigning.keysChanged", this.onStatusChanged);
     }
 
-    onAccountData = (event) => {
+    private onAccountData = (event: MatrixEvent): void => {
         const type = event.getType();
         if (type.startsWith("m.cross_signing") || type.startsWith("m.secret_storage")) {
-            this._getUpdatedStatus();
+            this.getUpdatedStatus();
         }
     };
 
-    _onBootstrapClick = () => {
-        this._bootstrapCrossSigning({ forceReset: false });
+    private onBootstrapClick = () => {
+        if (this.state.crossSigningPrivateKeysInStorage) {
+            Modal.createTrackedDialog(
+                "Verify session", "Verify session", SetupEncryptionDialog,
+                {}, null, /* priority = */ false, /* static = */ true,
+            );
+        } else {
+            // Trigger the flow to set up secure backup, which is what this will do when in
+            // the appropriate state.
+            accessSecretStorage();
+        }
     };
 
-    onStatusChanged = () => {
-        this._getUpdatedStatus();
+    private onStatusChanged = () => {
+        this.getUpdatedStatus();
     };
 
-    async _getUpdatedStatus() {
+    private async getUpdatedStatus(): Promise<void> {
         const cli = MatrixClientPeg.get();
         const pkCache = cli.getCrossSigningCacheCallbacks();
-        const crossSigning = cli.crypto._crossSigningInfo;
-        const secretStorage = cli.crypto._secretStorage;
-        const crossSigningPublicKeysOnDevice = crossSigning.getId();
-        const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
-        const masterPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("master"));
-        const selfSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"));
-        const userSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"));
+        const crossSigning = cli.crypto.crossSigningInfo;
+        const secretStorage = cli.crypto.secretStorage;
+        const crossSigningPublicKeysOnDevice = Boolean(crossSigning.getId());
+        const crossSigningPrivateKeysInStorage = Boolean(await crossSigning.isStoredInSecretStorage(secretStorage));
+        const masterPrivateKeyCached = !!(pkCache && (await pkCache.getCrossSigningKeyCache("master")));
+        const selfSigningPrivateKeyCached = !!(pkCache && (await pkCache.getCrossSigningKeyCache("self_signing")));
+        const userSigningPrivateKeyCached = !!(pkCache && (await pkCache.getCrossSigningKeyCache("user_signing")));
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
         const crossSigningReady = await cli.isCrossSigningReady();
@@ -110,8 +124,8 @@ export default class CrossSigningPanel extends React.PureComponent {
      * 3. All keys are loaded and there's nothing to do.
      * @param {bool} [forceReset] Bootstrap again even if keys already present
      */
-    _bootstrapCrossSigning = async ({ forceReset = false }) => {
-        this.setState({ error: null });
+    private bootstrapCrossSigning = async ({ forceReset = false }): Promise<void> => {
+        this.setState({ error: undefined });
         try {
             const cli = MatrixClientPeg.get();
             await cli.bootstrapCrossSigning({
@@ -135,20 +149,20 @@ export default class CrossSigningPanel extends React.PureComponent {
             this.setState({ error: e });
             console.error("Error bootstrapping cross-signing", e);
         }
-        if (this._unmounted) return;
-        this._getUpdatedStatus();
-    }
+        if (this.unmounted) return;
+        this.getUpdatedStatus();
+    };
 
-    _resetCrossSigning = () => {
+    private resetCrossSigning = (): void => {
         Modal.createDialog(ConfirmDestroyCrossSigningDialog, {
             onFinished: (act) => {
                 if (!act) return;
-                this._bootstrapCrossSigning({ forceReset: true });
+                this.bootstrapCrossSigning({ forceReset: true });
             },
         });
-    }
+    };
 
-    render() {
+    public render() {
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         const {
             error,
@@ -163,29 +177,33 @@ export default class CrossSigningPanel extends React.PureComponent {
 
         let errorSection;
         if (error) {
-            errorSection = <div className="error">{error.toString()}</div>;
+            errorSection = <div className="error">{ error.toString() }</div>;
         }
 
         let summarisedStatus;
         if (homeserverSupportsCrossSigning === undefined) {
             summarisedStatus = <Spinner />;
         } else if (!homeserverSupportsCrossSigning) {
-            summarisedStatus = <p>{_t(
+            summarisedStatus = <p>{ _t(
                 "Your homeserver does not support cross-signing.",
-            )}</p>;
-        } else if (crossSigningReady) {
-            summarisedStatus = <p>✅ {_t(
+            ) }</p>;
+        } else if (crossSigningReady && crossSigningPrivateKeysInStorage) {
+            summarisedStatus = <p>✅ { _t(
                 "Cross-signing is ready for use.",
-            )}</p>;
+            ) }</p>;
+        } else if (crossSigningReady && !crossSigningPrivateKeysInStorage) {
+            summarisedStatus = <p>⚠️ { _t(
+                "Cross-signing is ready but keys are not backed up.",
+            ) }</p>;
         } else if (crossSigningPrivateKeysInStorage) {
-            summarisedStatus = <p>{_t(
+            summarisedStatus = <p>{ _t(
                 "Your account has a cross-signing identity in secret storage, " +
                 "but it is not yet trusted by this session.",
-            )}</p>;
+            ) }</p>;
         } else {
-            summarisedStatus = <p>{_t(
+            summarisedStatus = <p>{ _t(
                 "Cross-signing is not set up.",
-            )}</p>;
+            ) }</p>;
         }
 
         const keysExistAnywhere = (
@@ -207,17 +225,21 @@ export default class CrossSigningPanel extends React.PureComponent {
 
         // TODO: determine how better to expose this to users in addition to prompts at login/toast
         if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
+            let buttonCaption = _t("Set up Secure Backup");
+            if (crossSigningPrivateKeysInStorage) {
+                buttonCaption = _t("Verify this session");
+            }
             actions.push(
-                <AccessibleButton key="setup" kind="primary" onClick={this._onBootstrapClick}>
-                    {_t("Set up")}
+                <AccessibleButton key="setup" kind="primary" onClick={this.onBootstrapClick}>
+                    { buttonCaption }
                 </AccessibleButton>,
             );
         }
 
         if (keysExistAnywhere) {
             actions.push(
-                <AccessibleButton key="reset" kind="danger" onClick={this._resetCrossSigning}>
-                    {_t("Reset")}
+                <AccessibleButton key="reset" kind="danger" onClick={this.resetCrossSigning}>
+                    { _t("Reset") }
                 </AccessibleButton>,
             );
         }
@@ -225,44 +247,44 @@ export default class CrossSigningPanel extends React.PureComponent {
         let actionRow;
         if (actions.length) {
             actionRow = <div className="mx_CrossSigningPanel_buttonRow">
-                {actions}
+                { actions }
             </div>;
         }
 
         return (
             <div>
-                {summarisedStatus}
+                { summarisedStatus }
                 <details>
-                    <summary>{_t("Advanced")}</summary>
+                    <summary>{ _t("Advanced") }</summary>
                     <table className="mx_CrossSigningPanel_statusList"><tbody>
                         <tr>
-                            <td>{_t("Cross-signing public keys:")}</td>
-                            <td>{crossSigningPublicKeysOnDevice ? _t("in memory") : _t("not found")}</td>
+                            <td>{ _t("Cross-signing public keys:") }</td>
+                            <td>{ crossSigningPublicKeysOnDevice ? _t("in memory") : _t("not found") }</td>
                         </tr>
                         <tr>
-                            <td>{_t("Cross-signing private keys:")}</td>
-                            <td>{crossSigningPrivateKeysInStorage ? _t("in secret storage") : _t("not found in storage")}</td>
+                            <td>{ _t("Cross-signing private keys:") }</td>
+                            <td>{ crossSigningPrivateKeysInStorage ? _t("in secret storage") : _t("not found in storage") }</td>
                         </tr>
                         <tr>
-                            <td>{_t("Master private key:")}</td>
-                            <td>{masterPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                            <td>{ _t("Master private key:") }</td>
+                            <td>{ masterPrivateKeyCached ? _t("cached locally") : _t("not found locally") }</td>
                         </tr>
                         <tr>
-                            <td>{_t("Self signing private key:")}</td>
-                            <td>{selfSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                            <td>{ _t("Self signing private key:") }</td>
+                            <td>{ selfSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally") }</td>
                         </tr>
                         <tr>
-                            <td>{_t("User signing private key:")}</td>
-                            <td>{userSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                            <td>{ _t("User signing private key:") }</td>
+                            <td>{ userSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally") }</td>
                         </tr>
                         <tr>
-                            <td>{_t("Homeserver feature support:")}</td>
-                            <td>{homeserverSupportsCrossSigning ? _t("exists") : _t("not found")}</td>
+                            <td>{ _t("Homeserver feature support:") }</td>
+                            <td>{ homeserverSupportsCrossSigning ? _t("exists") : _t("not found") }</td>
                         </tr>
                     </tbody></table>
                 </details>
-                {errorSection}
-                {actionRow}
+                { errorSection }
+                { actionRow }
             </div>
         );
     }
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.tsx
similarity index 71%
rename from src/components/views/settings/DevicesPanel.js
rename to src/components/views/settings/DevicesPanel.tsx
index b1ad605a37..9a1321619e 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 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,52 +15,58 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import { IMyDevice } from "matrix-js-sdk/src/client";
 
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import {SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import InteractiveAuthDialog from "../dialogs/InteractiveAuthDialog";
+import DevicesPanelEntry from "./DevicesPanelEntry";
+import Spinner from "../elements/Spinner";
+import AccessibleButton from "../elements/AccessibleButton";
+
+interface IProps {
+    className?: string;
+}
+
+interface IState {
+    devices: IMyDevice[];
+    deviceLoadError?: string;
+    selectedDevices: string[];
+    deleting?: boolean;
+}
 
 @replaceableComponent("views.settings.DevicesPanel")
-export default class DevicesPanel extends React.Component {
-    constructor(props) {
+export default class DevicesPanel extends React.Component<IProps, IState> {
+    private unmounted = false;
+
+    constructor(props: IProps) {
         super(props);
-
         this.state = {
-            devices: undefined,
-            deviceLoadError: undefined,
-
+            devices: [],
             selectedDevices: [],
-            deleting: false,
         };
-
-        this._unmounted = false;
-
-        this._renderDevice = this._renderDevice.bind(this);
-        this._onDeviceSelectionToggled = this._onDeviceSelectionToggled.bind(this);
-        this._onDeleteClick = this._onDeleteClick.bind(this);
     }
 
-    componentDidMount() {
-        this._loadDevices();
+    public componentDidMount(): void {
+        this.loadDevices();
     }
 
-    componentWillUnmount() {
-        this._unmounted = true;
+    public componentWillUnmount(): void {
+        this.unmounted = true;
     }
 
-    _loadDevices() {
+    private loadDevices(): void {
         MatrixClientPeg.get().getDevices().then(
             (resp) => {
-                if (this._unmounted) { return; }
-                this.setState({devices: resp.devices || []});
+                if (this.unmounted) { return; }
+                this.setState({ devices: resp.devices || [] });
             },
             (error) => {
-                if (this._unmounted) { return; }
+                if (this.unmounted) { return; }
                 let errtxt;
                 if (error.httpStatus == 404) {
                     // 404 probably means the HS doesn't yet support the API.
@@ -70,17 +75,16 @@ export default class DevicesPanel extends React.Component {
                     console.error("Error loading sessions:", error);
                     errtxt = _t("Unable to load session list");
                 }
-                this.setState({deviceLoadError: errtxt});
+                this.setState({ deviceLoadError: errtxt });
             },
         );
     }
 
-
     /*
      * compare two devices, sorting from most-recently-seen to least-recently-seen
      * (and then, for stability, by device id)
      */
-    _deviceCompare(a, b) {
+    private deviceCompare(a: IMyDevice, b: IMyDevice): number {
         // return < 0 if a comes before b, > 0 if a comes after b.
         const lastSeenDelta =
               (b.last_seen_ts || 0) - (a.last_seen_ts || 0);
@@ -92,8 +96,8 @@ export default class DevicesPanel extends React.Component {
         return (idA < idB) ? -1 : (idA > idB) ? 1 : 0;
     }
 
-    _onDeviceSelectionToggled(device) {
-        if (this._unmounted) { return; }
+    private onDeviceSelectionToggled = (device: IMyDevice): void => {
+        if (this.unmounted) { return; }
 
         const deviceId = device.device_id;
         this.setState((state, props) => {
@@ -107,24 +111,23 @@ export default class DevicesPanel extends React.Component {
                 selectedDevices.splice(i, 1);
             }
 
-            return {selectedDevices};
+            return { selectedDevices };
         });
-    }
+    };
 
-    _onDeleteClick() {
+    private onDeleteClick = (): void => {
         this.setState({
             deleting: true,
         });
 
-        this._makeDeleteRequest(null).catch((error) => {
-            if (this._unmounted) { return; }
+        this.makeDeleteRequest(null).catch((error) => {
+            if (this.unmounted) { return; }
             if (error.httpStatus !== 401 || !error.data || !error.data.flows) {
                 // doesn't look like an interactive-auth failure
                 throw error;
             }
 
             // pop up an interactive auth dialog
-            const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
             const numDevices = this.state.selectedDevices.length;
             const dialogAesthetics = {
@@ -141,7 +144,7 @@ export default class DevicesPanel extends React.Component {
                     body: _t("Click the button below to confirm deleting these sessions.", {
                         count: numDevices,
                     }),
-                    continueText: _t("Delete sessions", {count: numDevices}),
+                    continueText: _t("Delete sessions", { count: numDevices }),
                     continueKind: "danger",
                 },
             };
@@ -149,7 +152,7 @@ export default class DevicesPanel extends React.Component {
                 title: _t("Authentication"),
                 matrixClient: MatrixClientPeg.get(),
                 authData: error.data,
-                makeRequest: this._makeDeleteRequest.bind(this),
+                makeRequest: this.makeDeleteRequest.bind(this),
                 aestheticsForStagePhases: {
                     [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
                     [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
@@ -157,15 +160,16 @@ export default class DevicesPanel extends React.Component {
             });
         }).catch((e) => {
             console.error("Error deleting sessions", e);
-            if (this._unmounted) { return; }
+            if (this.unmounted) { return; }
         }).finally(() => {
             this.setState({
                 deleting: false,
             });
         });
-    }
+    };
 
-    _makeDeleteRequest(auth) {
+    // TODO: proper typing for auth
+    private makeDeleteRequest(auth?: any): Promise<any> {
         return MatrixClientPeg.get().deleteMultipleDevices(this.state.selectedDevices, auth).then(
             () => {
                 // Remove the deleted devices from `devices`, reset selection to []
@@ -179,20 +183,16 @@ export default class DevicesPanel extends React.Component {
         );
     }
 
-    _renderDevice(device) {
-        const DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
+    private renderDevice = (device: IMyDevice): JSX.Element => {
         return <DevicesPanelEntry
             key={device.device_id}
             device={device}
             selected={this.state.selectedDevices.includes(device.device_id)}
-            onDeviceToggled={this._onDeviceSelectionToggled}
+            onDeviceToggled={this.onDeviceSelectionToggled}
         />;
-    }
-
-    render() {
-        const Spinner = sdk.getComponent("elements.Spinner");
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    };
 
+    public render(): JSX.Element {
         if (this.state.deviceLoadError !== undefined) {
             const classes = classNames(this.props.className, "error");
             return (
@@ -205,16 +205,15 @@ export default class DevicesPanel extends React.Component {
         const devices = this.state.devices;
         if (devices === undefined) {
             // still loading
-            const classes = this.props.className;
-            return <Spinner className={classes} />;
+            return <Spinner />;
         }
 
-        devices.sort(this._deviceCompare);
+        devices.sort(this.deviceCompare);
 
         const deleteButton = this.state.deleting ?
             <Spinner w={22} h={22} /> :
-            <AccessibleButton onClick={this._onDeleteClick} kind="danger_sm">
-                { _t("Delete %(count)s sessions", {count: this.state.selectedDevices.length})}
+            <AccessibleButton onClick={this.onDeleteClick} kind="danger_sm">
+                { _t("Delete %(count)s sessions", { count: this.state.selectedDevices.length }) }
             </AccessibleButton>;
 
         const classes = classNames(this.props.className, "mx_DevicesPanel");
@@ -228,12 +227,8 @@ export default class DevicesPanel extends React.Component {
                         { this.state.selectedDevices.length > 0 ? deleteButton : null }
                     </div>
                 </div>
-                { devices.map(this._renderDevice) }
+                { devices.map(this.renderDevice) }
             </div>
         );
     }
 }
-
-DevicesPanel.propTypes = {
-    className: PropTypes.string,
-};
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.tsx
similarity index 68%
rename from src/components/views/settings/DevicesPanelEntry.js
rename to src/components/views/settings/DevicesPanelEntry.tsx
index 93d4c78476..d033bc41a9 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
+Copyright 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,30 +15,28 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { IMyDevice } from 'matrix-js-sdk/src/client';
 
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {formatDate} from '../../../DateUtils';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { formatDate } from '../../../DateUtils';
 import StyledCheckbox from '../elements/StyledCheckbox';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import EditableTextContainer from "../elements/EditableTextContainer";
+
+interface IProps {
+    device?: IMyDevice;
+    onDeviceToggled?: (device: IMyDevice) => void;
+    selected?: boolean;
+}
 
 @replaceableComponent("views.settings.DevicesPanelEntry")
-export default class DevicesPanelEntry extends React.Component {
-    constructor(props) {
-        super(props);
+export default class DevicesPanelEntry extends React.Component<IProps> {
+    public static defaultProps = {
+        onDeviceToggled: () => {},
+    };
 
-        this._unmounted = false;
-        this.onDeviceToggled = this.onDeviceToggled.bind(this);
-        this._onDisplayNameChanged = this._onDisplayNameChanged.bind(this);
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-    }
-
-    _onDisplayNameChanged(value) {
+    private onDisplayNameChanged = (value: string): Promise<{}> => {
         const device = this.props.device;
         return MatrixClientPeg.get().setDeviceDetails(device.device_id, {
             display_name: value,
@@ -46,15 +44,13 @@ export default class DevicesPanelEntry extends React.Component {
             console.error("Error setting session display name", e);
             throw new Error(_t("Failed to set display name"));
         });
-    }
+    };
 
-    onDeviceToggled() {
+    private onDeviceToggled = (): void => {
         this.props.onDeviceToggled(this.props.device);
-    }
-
-    render() {
-        const EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
+    };
 
+    public render(): JSX.Element {
         const device = this.props.device;
 
         let lastSeen = "";
@@ -76,7 +72,7 @@ export default class DevicesPanelEntry extends React.Component {
                 </div>
                 <div className="mx_DevicesPanel_deviceName">
                     <EditableTextContainer initialValue={device.display_name}
-                        onSubmit={this._onDisplayNameChanged}
+                        onSubmit={this.onDisplayNameChanged}
                         placeholder={device.device_id}
                     />
                 </div>
@@ -90,12 +86,3 @@ export default class DevicesPanelEntry extends React.Component {
         );
     }
 }
-
-DevicesPanelEntry.propTypes = {
-    device: PropTypes.object.isRequired,
-    onDeviceToggled: PropTypes.func,
-};
-
-DevicesPanelEntry.defaultProps = {
-    onDeviceToggled: function() {},
-};
diff --git a/src/components/views/settings/E2eAdvancedPanel.tsx b/src/components/views/settings/E2eAdvancedPanel.tsx
index a8764fa855..ebb778deb4 100644
--- a/src/components/views/settings/E2eAdvancedPanel.tsx
+++ b/src/components/views/settings/E2eAdvancedPanel.tsx
@@ -16,24 +16,23 @@ limitations under the License.
 
 import React from 'react';
 
-import * as sdk from '../../../index';
-import {_t} from "../../../languageHandler";
-import {SettingLevel} from "../../../settings/SettingLevel";
+import { _t } from "../../../languageHandler";
+import { SettingLevel } from "../../../settings/SettingLevel";
 import SettingsStore from "../../../settings/SettingsStore";
+import SettingsFlag from '../elements/SettingsFlag';
 
 const SETTING_MANUALLY_VERIFY_ALL_SESSIONS = "e2ee.manuallyVerifyAllSessions";
 
 const E2eAdvancedPanel = props => {
-    const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
     return <div className="mx_SettingsTab_section">
-        <span className="mx_SettingsTab_subheading">{_t("Encryption")}</span>
+        <span className="mx_SettingsTab_subheading">{ _t("Encryption") }</span>
 
         <SettingsFlag name={SETTING_MANUALLY_VERIFY_ALL_SESSIONS}
             level={SettingLevel.DEVICE}
         />
-        <div className="mx_E2eAdvancedPanel_settingLongDescription">{_t(
+        <div className="mx_E2eAdvancedPanel_settingLongDescription">{ _t(
             "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-        )}</div>
+        ) }</div>
     </div>;
 };
 
diff --git a/src/components/views/settings/EventIndexPanel.tsx b/src/components/views/settings/EventIndexPanel.tsx
index e693f45c5f..9966e38de8 100644
--- a/src/components/views/settings/EventIndexPanel.tsx
+++ b/src/components/views/settings/EventIndexPanel.tsx
@@ -18,15 +18,15 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import SdkConfig from "../../../SdkConfig";
-import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
-import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
+import { formatBytes, formatCountLong } from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
-import {SettingLevel} from "../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SeshatResetDialog from '../dialogs/SeshatResetDialog';
+import InlineSpinner from '../elements/InlineSpinner';
 
 interface IState {
     enabling: boolean;
@@ -118,7 +118,7 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
                 onFinished: () => {},
             }, null, /* priority = */ false, /* static = */ true,
         );
-    }
+    };
 
     private onEnable = async () => {
         this.setState({
@@ -130,7 +130,7 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
         await EventIndexPeg.get().startCrawler();
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, true);
         await this.updateState();
-    }
+    };
 
     private confirmEventStoreReset = () => {
         const { close } = Modal.createDialog(SeshatResetDialog, {
@@ -143,17 +143,16 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
                 }
             },
         });
-    }
+    };
 
     render() {
         let eventIndexingSettings = null;
-        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
         const brand = SdkConfig.get().brand;
 
         if (EventIndexPeg.get() !== null) {
             eventIndexingSettings = (
                 <div>
-                    <div className='mx_SettingsTab_subsectionText'>{_t(
+                    <div className='mx_SettingsTab_subsectionText'>{ _t(
                         "Securely cache encrypted messages locally for them " +
                         "to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
                         {
@@ -163,10 +162,10 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
                             count: this.state.roomCount,
                             rooms: formatCountLong(this.state.roomCount),
                         },
-                    )}</div>
+                    ) }</div>
                     <div>
                         <AccessibleButton kind="primary" onClick={this.onManage}>
-                            {_t("Manage")}
+                            { _t("Manage") }
                         </AccessibleButton>
                     </div>
                 </div>
@@ -174,16 +173,19 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
         } else if (!this.state.eventIndexingEnabled && EventIndexPeg.supportIsInstalled()) {
             eventIndexingSettings = (
                 <div>
-                    <div className='mx_SettingsTab_subsectionText'>{_t(
+                    <div className='mx_SettingsTab_subsectionText'>{ _t(
                         "Securely cache encrypted messages locally for them to " +
                         "appear in search results.",
-                    )}</div>
+                    ) }</div>
                     <div>
-                        <AccessibleButton kind="primary" disabled={this.state.enabling}
-                            onClick={this.onEnable}>
-                            {_t("Enable")}
+                        <AccessibleButton
+                            kind="primary"
+                            disabled={this.state.enabling}
+                            onClick={this.onEnable}
+                        >
+                            { _t("Enable") }
                         </AccessibleButton>
-                        {this.state.enabling ? <InlineSpinner /> : <div />}
+                        { this.state.enabling ? <InlineSpinner /> : <div /> }
                     </div>
                 </div>
             );
@@ -195,7 +197,7 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
             );
 
             eventIndexingSettings = (
-                <div className='mx_SettingsTab_subsectionText'>{_t(
+                <div className='mx_SettingsTab_subsectionText'>{ _t(
                     "%(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 " +
@@ -204,15 +206,17 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
                         brand,
                     },
                     {
-                        nativeLink: sub => <a href={nativeLink}
-                            target="_blank" rel="noreferrer noopener"
-                        >{sub}</a>,
+                        nativeLink: sub => <a
+                            href={nativeLink}
+                            target="_blank"
+                            rel="noreferrer noopener"
+                        >{ sub }</a>,
                     },
-                )}</div>
+                ) }</div>
             );
         } else if (!EventIndexPeg.platformHasSupport()) {
             eventIndexingSettings = (
-                <div className='mx_SettingsTab_subsectionText'>{_t(
+                <div className='mx_SettingsTab_subsectionText'>{ _t(
                     "%(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.",
@@ -220,34 +224,36 @@ export default class EventIndexPanel extends React.Component<{}, IState> {
                         brand,
                     },
                     {
-                        desktopLink: sub => <a href="https://element.io/get-started"
-                            target="_blank" rel="noreferrer noopener"
-                        >{sub}</a>,
+                        desktopLink: sub => <a
+                            href="https://element.io/get-started"
+                            target="_blank"
+                            rel="noreferrer noopener"
+                        >{ sub }</a>,
                     },
-                )}</div>
+                ) }</div>
             );
         } else {
             eventIndexingSettings = (
                 <div className='mx_SettingsTab_subsectionText'>
                     <p>
-                        {this.state.enabling
+                        { this.state.enabling
                             ? <InlineSpinner />
                             : _t("Message search initialisation failed")
                         }
                     </p>
-                    {EventIndexPeg.error && (
+                    { EventIndexPeg.error && (
                         <details>
-                            <summary>{_t("Advanced")}</summary>
+                            <summary>{ _t("Advanced") }</summary>
                             <code>
-                                {EventIndexPeg.error.message}
+                                { EventIndexPeg.error.message }
                             </code>
                             <p>
                                 <AccessibleButton key="delete" kind="danger" onClick={this.confirmEventStoreReset}>
-                                    {_t("Reset")}
+                                    { _t("Reset") }
                                 </AccessibleButton>
                             </p>
                         </details>
-                    )}
+                    ) }
                 </div>
             );
         }
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.tsx
similarity index 56%
rename from src/components/views/settings/IntegrationManager.js
rename to src/components/views/settings/IntegrationManager.tsx
index b058625139..0b880c019f 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 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.
@@ -16,53 +15,55 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
-import {Key} from "../../../Keyboard";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { Key } from "../../../Keyboard";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { ActionPayload } from '../../../dispatcher/payloads';
+import Spinner from "../elements/Spinner";
+
+interface IProps {
+    // false to display an error saying that we couldn't connect to the integration manager
+    connected: boolean;
+
+    // true to display a loading spinner
+    loading: boolean;
+
+    // The source URL to load
+    url?: string;
+
+    // callback when the manager is dismissed
+    onFinished: () => void;
+}
+
+interface IState {
+    errored: boolean;
+}
 
 @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
-        connected: PropTypes.bool.isRequired,
+export default class IntegrationManager extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
 
-        // true to display a loading spinner
-        loading: PropTypes.bool.isRequired,
-
-        // The source URL to load
-        url: PropTypes.string,
-
-        // callback when the manager is dismissed
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    static defaultProps = {
+    public static defaultProps = {
         connected: true,
         loading: false,
     };
 
-    constructor(props) {
-        super(props);
+    public state = {
+        errored: false,
+    };
 
-        this.state = {
-            errored: false,
-        };
-    }
-
-    componentDidMount() {
+    public componentDidMount(): void {
         this.dispatcherRef = dis.register(this.onAction);
         document.addEventListener("keydown", this.onKeyDown);
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         dis.unregister(this.dispatcherRef);
         document.removeEventListener("keydown", this.onKeyDown);
     }
 
-    onKeyDown = (ev) => {
+    private onKeyDown = (ev: KeyboardEvent): void => {
         if (ev.key === Key.ESCAPE) {
             ev.stopPropagation();
             ev.preventDefault();
@@ -70,22 +71,21 @@ export default class IntegrationManager extends React.Component {
         }
     };
 
-    onAction = (payload) => {
+    private onAction = (payload: ActionPayload): void => {
         if (payload.action === 'close_scalar') {
             this.props.onFinished();
         }
     };
 
-    onError = () => {
+    private onError = (): void => {
         this.setState({ errored: true });
     };
 
-    render() {
+    public render(): JSX.Element {
         if (this.props.loading) {
-            const Spinner = sdk.getComponent("elements.Spinner");
             return (
                 <div className='mx_IntegrationManager_loading'>
-                    <h3>{_t("Connecting to integration manager...")}</h3>
+                    <h3>{ _t("Connecting to integration manager...") }</h3>
                     <Spinner />
                 </div>
             );
@@ -94,8 +94,8 @@ export default class IntegrationManager extends React.Component {
         if (!this.props.connected || this.state.errored) {
             return (
                 <div className='mx_IntegrationManager_error'>
-                    <h3>{_t("Cannot connect to integration manager")}</h3>
-                    <p>{_t("The integration manager is offline or it cannot reach your homeserver.")}</p>
+                    <h3>{ _t("Cannot connect to integration manager") }</h3>
+                    <p>{ _t("The integration manager is offline or it cannot reach your homeserver.") }</p>
                 </div>
             );
         }
diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx
new file mode 100644
index 0000000000..76596103f5
--- /dev/null
+++ b/src/components/views/settings/JoinRuleSettings.tsx
@@ -0,0 +1,295 @@
+/*
+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 from "react";
+import { IJoinRuleEventContent, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import StyledRadioGroup, { IDefinition } from "../elements/StyledRadioGroup";
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import RoomAvatar from "../avatars/RoomAvatar";
+import SpaceStore from "../../../stores/SpaceStore";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import Modal from "../../../Modal";
+import ManageRestrictedJoinRuleDialog from "../dialogs/ManageRestrictedJoinRuleDialog";
+import RoomUpgradeWarningDialog from "../dialogs/RoomUpgradeWarningDialog";
+import QuestionDialog from "../dialogs/QuestionDialog";
+import { upgradeRoom } from "../../../utils/RoomUpgrade";
+import { arrayHasDiff } from "../../../utils/arrays";
+import { useLocalEcho } from "../../../hooks/useLocalEcho";
+import dis from "../../../dispatcher/dispatcher";
+import { ROOM_SECURITY_TAB } from "../dialogs/RoomSettingsDialog";
+
+interface IProps {
+    room: Room;
+    promptUpgrade?: boolean;
+    closeSettingsFn(): void;
+    onError(error: Error): void;
+    beforeChange?(joinRule: JoinRule): Promise<boolean>; // if returns false then aborts the change
+}
+
+const JoinRuleSettings = ({ room, promptUpgrade, onError, beforeChange, closeSettingsFn }: IProps) => {
+    const cli = room.client;
+
+    const restrictedRoomCapabilities = SpaceStore.instance.restrictedJoinRuleSupport;
+    const roomSupportsRestricted = Array.isArray(restrictedRoomCapabilities?.support)
+        && restrictedRoomCapabilities.support.includes(room.getVersion());
+    const preferredRestrictionVersion = !roomSupportsRestricted && promptUpgrade
+        ? restrictedRoomCapabilities?.preferred
+        : undefined;
+
+    const disabled = !room.currentState.mayClientSendStateEvent(EventType.RoomJoinRules, cli);
+
+    const [content, setContent] = useLocalEcho<IJoinRuleEventContent>(
+        () => room.currentState.getStateEvents(EventType.RoomJoinRules, "")?.getContent(),
+        content => cli.sendStateEvent(room.roomId, EventType.RoomJoinRules, content, ""),
+        onError,
+    );
+
+    const { join_rule: joinRule } = content;
+    const restrictedAllowRoomIds = joinRule === JoinRule.Restricted
+        ? content.allow.filter(o => o.type === RestrictedAllowType.RoomMembership).map(o => o.room_id)
+        : undefined;
+
+    const editRestrictedRoomIds = async (): Promise<string[] | undefined> => {
+        let selected = restrictedAllowRoomIds;
+        if (!selected?.length && SpaceStore.instance.activeSpace) {
+            selected = [SpaceStore.instance.activeSpace.roomId];
+        }
+
+        const matrixClient = MatrixClientPeg.get();
+        const { finished } = Modal.createTrackedDialog('Edit restricted', '', ManageRestrictedJoinRuleDialog, {
+            matrixClient,
+            room,
+            selected,
+        }, "mx_ManageRestrictedJoinRuleDialog_wrapper");
+
+        const [roomIds] = await finished;
+        return roomIds;
+    };
+
+    const definitions: IDefinition<JoinRule>[] = [{
+        value: JoinRule.Invite,
+        label: _t("Private (invite only)"),
+        description: _t("Only invited people can join."),
+        checked: joinRule === JoinRule.Invite || (joinRule === JoinRule.Restricted && !restrictedAllowRoomIds?.length),
+    }, {
+        value: JoinRule.Public,
+        label: _t("Public"),
+        description: _t("Anyone can find and join."),
+    }];
+
+    if (roomSupportsRestricted || preferredRestrictionVersion || joinRule === JoinRule.Restricted) {
+        let upgradeRequiredPill;
+        if (preferredRestrictionVersion) {
+            upgradeRequiredPill = <span className="mx_JoinRuleSettings_upgradeRequired">
+                { _t("Upgrade required") }
+            </span>;
+        }
+
+        let description;
+        if (joinRule === JoinRule.Restricted && restrictedAllowRoomIds?.length) {
+            // only show the first 4 spaces we know about, so that the UI doesn't grow out of proportion there are lots.
+            const shownSpaces = restrictedAllowRoomIds
+                .map(roomId => cli.getRoom(roomId))
+                .filter(room => room?.isSpaceRoom())
+                .slice(0, 4);
+
+            let moreText;
+            if (shownSpaces.length < restrictedAllowRoomIds.length) {
+                if (shownSpaces.length > 0) {
+                    moreText = _t("& %(count)s more", {
+                        count: restrictedAllowRoomIds.length - shownSpaces.length,
+                    });
+                } else {
+                    moreText = _t("Currently, %(count)s spaces have access", {
+                        count: restrictedAllowRoomIds.length,
+                    });
+                }
+            }
+
+            const onRestrictedRoomIdsChange = (newAllowRoomIds: string[]) => {
+                if (!arrayHasDiff(restrictedAllowRoomIds || [], newAllowRoomIds)) return;
+
+                if (!newAllowRoomIds.length) {
+                    setContent({
+                        join_rule: JoinRule.Invite,
+                    });
+                    return;
+                }
+
+                setContent({
+                    join_rule: JoinRule.Restricted,
+                    allow: newAllowRoomIds.map(roomId => ({
+                        "type": RestrictedAllowType.RoomMembership,
+                        "room_id": roomId,
+                    })),
+                });
+            };
+
+            const onEditRestrictedClick = async () => {
+                const restrictedAllowRoomIds = await editRestrictedRoomIds();
+                if (!Array.isArray(restrictedAllowRoomIds)) return;
+                if (restrictedAllowRoomIds.length > 0) {
+                    onRestrictedRoomIdsChange(restrictedAllowRoomIds);
+                } else {
+                    onChange(JoinRule.Invite);
+                }
+            };
+
+            description = <div>
+                <span>
+                    { _t("Anyone in a space can find and join. <a>Edit which spaces can access here.</a>", {}, {
+                        a: sub => <AccessibleButton
+                            disabled={disabled}
+                            onClick={onEditRestrictedClick}
+                            kind="link"
+                            className="mx_JoinRuleSettings_linkButton"
+                        >
+                            { sub }
+                        </AccessibleButton>,
+                    }) }
+                </span>
+
+                <div className="mx_JoinRuleSettings_spacesWithAccess">
+                    <h4>{ _t("Spaces with access") }</h4>
+                    { shownSpaces.map(room => {
+                        return <span key={room.roomId}>
+                            <RoomAvatar room={room} height={32} width={32} />
+                            { room.name }
+                        </span>;
+                    }) }
+                    { moreText && <span>{ moreText }</span> }
+                </div>
+            </div>;
+        } else if (SpaceStore.instance.activeSpace) {
+            description = _t("Anyone in <spaceName/> can find and join. You can select other spaces too.", {}, {
+                spaceName: () => <b>{ SpaceStore.instance.activeSpace.name }</b>,
+            });
+        } else {
+            description = _t("Anyone in a space can find and join. You can select multiple spaces.");
+        }
+
+        definitions.splice(1, 0, {
+            value: JoinRule.Restricted,
+            label: <>
+                { _t("Space members") }
+                { upgradeRequiredPill }
+            </>,
+            description,
+            // if there are 0 allowed spaces then render it as invite only instead
+            checked: joinRule === JoinRule.Restricted && !!restrictedAllowRoomIds?.length,
+        });
+    }
+
+    const onChange = async (joinRule: JoinRule) => {
+        const beforeJoinRule = content.join_rule;
+
+        let restrictedAllowRoomIds: string[];
+        if (joinRule === JoinRule.Restricted) {
+            if (beforeJoinRule === JoinRule.Restricted || roomSupportsRestricted) {
+                // Have the user pick which spaces to allow joins from
+                restrictedAllowRoomIds = await editRestrictedRoomIds();
+                if (!Array.isArray(restrictedAllowRoomIds)) return;
+            } else if (preferredRestrictionVersion) {
+                // Block this action on a room upgrade otherwise it'd make their room unjoinable
+                const targetVersion = preferredRestrictionVersion;
+
+                const modal = Modal.createTrackedDialog('Restricted join rule upgrade', '', RoomUpgradeWarningDialog, {
+                    roomId: room.roomId,
+                    targetVersion,
+                    description: _t("This upgrade will allow members of selected spaces " +
+                        "access to this room without an invite."),
+                });
+
+                const [resp] = await modal.finished;
+                if (!resp?.continue) return;
+
+                const userId = cli.getUserId();
+                const unableToUpdateSomeParents = Array.from(SpaceStore.instance.getKnownParents(room.roomId))
+                    .some(roomId => !cli.getRoom(roomId)?.currentState.maySendStateEvent(EventType.SpaceChild, userId));
+                if (unableToUpdateSomeParents) {
+                    const modal = Modal.createTrackedDialog<[boolean]>('Parent relink warning', '', QuestionDialog, {
+                        title: _t("Before you upgrade"),
+                        description: (
+                            <div>{ _t("This room is in some spaces you’re not an admin of. " +
+                                "In those spaces, the old room will still be shown, " +
+                                "but people will be prompted to join the new one.") }</div>
+                        ),
+                        hasCancelButton: true,
+                        button: _t("Upgrade anyway"),
+                        danger: true,
+                    });
+
+                    const [shouldUpgrade] = await modal.finished;
+                    if (!shouldUpgrade) return;
+                }
+
+                const roomId = await upgradeRoom(room, targetVersion, resp.invite, true, true, true);
+                closeSettingsFn();
+                // switch to the new room in the background
+                dis.dispatch({
+                    action: "view_room",
+                    room_id: roomId,
+                });
+                // open new settings on this tab
+                dis.dispatch({
+                    action: "open_room_settings",
+                    initial_tab_id: ROOM_SECURITY_TAB,
+                });
+
+                return;
+            }
+
+            // when setting to 0 allowed rooms/spaces set to invite only instead as per the note
+            if (!restrictedAllowRoomIds.length) {
+                joinRule = JoinRule.Invite;
+            }
+        }
+
+        if (beforeJoinRule === joinRule && !restrictedAllowRoomIds) return;
+        if (beforeChange && !(await beforeChange(joinRule))) return;
+
+        const newContent: IJoinRuleEventContent = {
+            join_rule: joinRule,
+        };
+
+        // pre-set the accepted spaces with the currently viewed one as per the microcopy
+        if (joinRule === JoinRule.Restricted) {
+            newContent.allow = restrictedAllowRoomIds.map(roomId => ({
+                "type": RestrictedAllowType.RoomMembership,
+                "room_id": roomId,
+            }));
+        }
+
+        setContent(newContent);
+    };
+
+    return (
+        <StyledRadioGroup
+            name="joinRule"
+            value={joinRule}
+            onChange={onChange}
+            definitions={definitions}
+            disabled={disabled}
+            className="mx_JoinRuleSettings_radioButton"
+        />
+    );
+};
+
+export default JoinRuleSettings;
diff --git a/src/components/views/settings/LayoutSwitcher.tsx b/src/components/views/settings/LayoutSwitcher.tsx
new file mode 100644
index 0000000000..ad8abd0033
--- /dev/null
+++ b/src/components/views/settings/LayoutSwitcher.tsx
@@ -0,0 +1,133 @@
+/*
+Copyright 2019 New Vector Ltd
+Copyright 2019 - 2021 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import classNames from "classnames";
+import SettingsStore from "../../../settings/SettingsStore";
+import EventTilePreview from "../elements/EventTilePreview";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import { _t } from "../../../languageHandler";
+import { Layout } from "../../../settings/Layout";
+import { SettingLevel } from "../../../settings/SettingLevel";
+
+interface IProps {
+    userId?: string;
+    displayName: string;
+    avatarUrl: string;
+    messagePreviewText: string;
+    onLayoutChanged?: (layout: Layout) => void;
+}
+
+interface IState {
+    layout: Layout;
+}
+
+export default class LayoutSwitcher extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            layout: SettingsStore.getValue("layout"),
+        };
+    }
+
+    private onLayoutChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
+        const layout = e.target.value as Layout;
+
+        this.setState({ layout: layout });
+        SettingsStore.setValue("layout", null, SettingLevel.DEVICE, layout);
+        this.props.onLayoutChanged(layout);
+    };
+
+    public render(): JSX.Element {
+        const ircClasses = classNames("mx_LayoutSwitcher_RadioButton", {
+            mx_LayoutSwitcher_RadioButton_selected: this.state.layout == Layout.IRC,
+        });
+        const groupClasses = classNames("mx_LayoutSwitcher_RadioButton", {
+            mx_LayoutSwitcher_RadioButton_selected: this.state.layout == Layout.Group,
+        });
+        const bubbleClasses = classNames("mx_LayoutSwitcher_RadioButton", {
+            mx_LayoutSwitcher_RadioButton_selected: this.state.layout === Layout.Bubble,
+        });
+
+        return (
+            <div className="mx_SettingsTab_section mx_LayoutSwitcher">
+                <span className="mx_SettingsTab_subheading">
+                    { _t("Message layout") }
+                </span>
+
+                <div className="mx_LayoutSwitcher_RadioButtons">
+                    <label className={ircClasses}>
+                        <EventTilePreview
+                            className="mx_LayoutSwitcher_RadioButton_preview"
+                            message={this.props.messagePreviewText}
+                            layout={Layout.IRC}
+                            userId={this.props.userId}
+                            displayName={this.props.displayName}
+                            avatarUrl={this.props.avatarUrl}
+                        />
+                        <StyledRadioButton
+                            name="layout"
+                            value={Layout.IRC}
+                            checked={this.state.layout === Layout.IRC}
+                            onChange={this.onLayoutChange}
+                        >
+                            { _t("IRC") }
+                        </StyledRadioButton>
+                    </label>
+                    <label className={groupClasses}>
+                        <EventTilePreview
+                            className="mx_LayoutSwitcher_RadioButton_preview"
+                            message={this.props.messagePreviewText}
+                            layout={Layout.Group}
+                            userId={this.props.userId}
+                            displayName={this.props.displayName}
+                            avatarUrl={this.props.avatarUrl}
+                        />
+                        <StyledRadioButton
+                            name="layout"
+                            value={Layout.Group}
+                            checked={this.state.layout == Layout.Group}
+                            onChange={this.onLayoutChange}
+                        >
+                            { _t("Modern") }
+                        </StyledRadioButton>
+                    </label>
+                    <label className={bubbleClasses}>
+                        <EventTilePreview
+                            className="mx_LayoutSwitcher_RadioButton_preview"
+                            message={this.props.messagePreviewText}
+                            layout={Layout.Bubble}
+                            userId={this.props.userId}
+                            displayName={this.props.displayName}
+                            avatarUrl={this.props.avatarUrl}
+                        />
+                        <StyledRadioButton
+                            name="layout"
+                            value={Layout.Bubble}
+                            checked={this.state.layout == Layout.Bubble}
+                            onChange={this.onLayoutChange}
+                        >
+                            { _t("Message bubbles") }
+                        </StyledRadioButton>
+                    </label>
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
deleted file mode 100644
index 5756536085..0000000000
--- a/src/components/views/settings/Notifications.js
+++ /dev/null
@@ -1,918 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import SettingsStore from '../../../settings/SettingsStore';
-import Modal from '../../../Modal';
-import {
-    NotificationUtils,
-    VectorPushRulesDefinitions,
-    PushRuleVectorState,
-    ContentRules,
-} from '../../../notifications';
-import SdkConfig from "../../../SdkConfig";
-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.
-
-// TODO: this component also does a lot of direct poking into this.state, which
-// is VERY NAUGHTY.
-
-
-/**
- * Rules that Vector used to set in order to override the actions of default rules.
- * These are used to port peoples existing overrides to match the current API.
- * These can be removed and forgotten once everyone has moved to the new client.
- */
-const LEGACY_RULES = {
-    "im.vector.rule.contains_display_name": ".m.rule.contains_display_name",
-    "im.vector.rule.room_one_to_one": ".m.rule.room_one_to_one",
-    "im.vector.rule.room_message": ".m.rule.message",
-    "im.vector.rule.invite_for_me": ".m.rule.invite_for_me",
-    "im.vector.rule.call": ".m.rule.call",
-    "im.vector.rule.notices": ".m.rule.suppress_notices",
-};
-
-function portLegacyActions(actions) {
-    const decoded = NotificationUtils.decodeActions(actions);
-    if (decoded !== null) {
-        return NotificationUtils.encodeActions(decoded);
-    } else {
-        // We don't recognise one of the actions here, so we don't try to
-        // canonicalise them.
-        return 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
-        DISPLAY: "DISPLAY", // The component is ready and display data
-        ERROR: "ERROR", // There was an error
-    };
-
-    state = {
-        phase: Notifications.phases.LOADING,
-        masterPushRule: undefined, // The master rule ('.m.rule.master')
-        vectorPushRules: [], // HS default push rules displayed in Vector UI
-        vectorContentRules: { // Keyword push rules displayed in Vector UI
-            vectorState: PushRuleVectorState.ON,
-            rules: [],
-        },
-        externalPushRules: [], // Push rules (except content rule) that have been defined outside Vector UI
-        externalContentRules: [], // Keyword push rules that have been defined outside Vector UI
-        threepids: [], // used for email notifications
-    };
-
-    componentDidMount() {
-        this._refreshFromServer();
-    }
-
-    onEnableNotificationsChange = (checked) => {
-        const self = this;
-        this.setState({
-            phase: Notifications.phases.LOADING,
-        });
-
-        MatrixClientPeg.get().setPushRuleEnabled(
-            'global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked,
-        ).then(function() {
-            self._refreshFromServer();
-        });
-    };
-
-    onEnableDesktopNotificationsChange = (checked) => {
-        SettingsStore.setValue(
-            "notificationsEnabled", null,
-            SettingLevel.DEVICE,
-            checked,
-        ).finally(() => {
-            this.forceUpdate();
-        });
-    };
-
-    onEnableDesktopNotificationBodyChange = (checked) => {
-        SettingsStore.setValue(
-            "notificationBodyEnabled", null,
-            SettingLevel.DEVICE,
-            checked,
-        ).finally(() => {
-            this.forceUpdate();
-        });
-    };
-
-    onEnableAudioNotificationsChange = (checked) => {
-        SettingsStore.setValue(
-            "audioNotificationsEnabled", null,
-            SettingLevel.DEVICE,
-            checked,
-        ).finally(() => {
-            this.forceUpdate();
-        });
-    };
-
-    /*
-     * Returns the email pusher (pusher of type 'email') for a given
-     * email address. Email pushers all have the same app ID, so since
-     * pushers are unique over (app ID, pushkey), there will be at most
-     * one such pusher.
-     */
-    getEmailPusher(pushers, address) {
-        if (pushers === undefined) {
-            return undefined;
-        }
-        for (let i = 0; i < pushers.length; ++i) {
-            if (pushers[i].kind === 'email' && pushers[i].pushkey === address) {
-                return pushers[i];
-            }
-        }
-        return undefined;
-    }
-
-    onEnableEmailNotificationsChange = (address, checked) => {
-        let emailPusherPromise;
-        if (checked) {
-            const data = {};
-            data['brand'] = SdkConfig.get().brand;
-            emailPusherPromise = MatrixClientPeg.get().setPusher({
-                kind: 'email',
-                app_id: 'm.email',
-                pushkey: address,
-                app_display_name: 'Email Notifications',
-                device_display_name: address,
-                lang: navigator.language,
-                data: data,
-                append: true, // We always append for email pushers since we don't want to stop other accounts notifying to the same email address
-            });
-        } else {
-            const emailPusher = this.getEmailPusher(this.state.pushers, address);
-            emailPusher.kind = null;
-            emailPusherPromise = MatrixClientPeg.get().setPusher(emailPusher);
-        }
-        emailPusherPromise.then(() => {
-            this._refreshFromServer();
-        }, (error) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Error saving email notification preferences', '', ErrorDialog, {
-                title: _t('Error saving email notification preferences'),
-                description: _t('An error occurred whilst saving your email notification preferences.'),
-            });
-        });
-    };
-
-    onNotifStateButtonClicked = (event) => {
-        // FIXME: use .bind() rather than className metadata here surely
-        const vectorRuleId = event.target.className.split("-")[0];
-        const newPushRuleVectorState = event.target.className.split("-")[1];
-
-        if ("_keywords" === vectorRuleId) {
-            this._setKeywordsPushRuleVectorState(newPushRuleVectorState);
-        } else {
-            const rule = this.getRule(vectorRuleId);
-            if (rule) {
-                this._setPushRuleVectorState(rule, newPushRuleVectorState);
-            }
-        }
-    };
-
-    onKeywordsClicked = (event) => {
-        // Compute the keywords list to display
-        let keywords = [];
-        for (const i in this.state.vectorContentRules.rules) {
-            const rule = this.state.vectorContentRules.rules[i];
-            keywords.push(rule.pattern);
-        }
-        if (keywords.length) {
-            // As keeping the order of per-word push rules hs side is a bit tricky to code,
-            // display the keywords in alphabetical order to the user
-            keywords.sort();
-
-            keywords = keywords.join(", ");
-        } else {
-            keywords = "";
-        }
-
-        const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
-        Modal.createTrackedDialog('Keywords Dialog', '', TextInputDialog, {
-            title: _t('Keywords'),
-            description: _t('Enter keywords separated by a comma:'),
-            button: _t('OK'),
-            value: keywords,
-            onFinished: (shouldLeave, newValue) => {
-                if (shouldLeave && newValue !== keywords) {
-                    let newKeywords = newValue.split(',');
-                    for (const i in newKeywords) {
-                        newKeywords[i] = newKeywords[i].trim();
-                    }
-
-                    // Remove duplicates and empty
-                    newKeywords = newKeywords.reduce(function(array, keyword) {
-                        if (keyword !== "" && array.indexOf(keyword) < 0) {
-                            array.push(keyword);
-                        }
-                        return array;
-                    }, []);
-
-                    this._setKeywords(newKeywords);
-                }
-            },
-        });
-    };
-
-    getRule(vectorRuleId) {
-        for (const i in this.state.vectorPushRules) {
-            const rule = this.state.vectorPushRules[i];
-            if (rule.vectorRuleId === vectorRuleId) {
-                return rule;
-            }
-        }
-    }
-
-    _setPushRuleVectorState(rule, newPushRuleVectorState) {
-        if (rule && rule.vectorState !== newPushRuleVectorState) {
-            this.setState({
-                phase: Notifications.phases.LOADING,
-            });
-
-            const self = this;
-            const cli = MatrixClientPeg.get();
-            const deferreds = [];
-            const ruleDefinition = VectorPushRulesDefinitions[rule.vectorRuleId];
-
-            if (rule.rule) {
-                const actions = ruleDefinition.vectorStateToActions[newPushRuleVectorState];
-
-                if (!actions) {
-                    // The new state corresponds to disabling the rule.
-                    deferreds.push(cli.setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, false));
-                } else {
-                    // The new state corresponds to enabling the rule and setting specific actions
-                    deferreds.push(this._updatePushRuleActions(rule.rule, actions, true));
-                }
-            }
-
-            Promise.all(deferreds).then(function() {
-                self._refreshFromServer();
-            }, function(error) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to change settings: " + error);
-                Modal.createTrackedDialog('Failed to change settings', '', ErrorDialog, {
-                    title: _t('Failed to change settings'),
-                    description: ((error && error.message) ? error.message : _t('Operation failed')),
-                    onFinished: self._refreshFromServer,
-                });
-            });
-        }
-    }
-
-    _setKeywordsPushRuleVectorState(newPushRuleVectorState) {
-        // Is there really a change?
-        if (this.state.vectorContentRules.vectorState === newPushRuleVectorState
-            || this.state.vectorContentRules.rules.length === 0) {
-            return;
-        }
-
-        const self = this;
-        const cli = MatrixClientPeg.get();
-
-        this.setState({
-            phase: Notifications.phases.LOADING,
-        });
-
-        // Update all rules in self.state.vectorContentRules
-        const deferreds = [];
-        for (const i in this.state.vectorContentRules.rules) {
-            const rule = this.state.vectorContentRules.rules[i];
-
-            let enabled; let actions;
-            switch (newPushRuleVectorState) {
-                case PushRuleVectorState.ON:
-                    if (rule.actions.length !== 1) {
-                        actions = PushRuleVectorState.actionsFor(PushRuleVectorState.ON);
-                    }
-
-                    if (this.state.vectorContentRules.vectorState === PushRuleVectorState.OFF) {
-                        enabled = true;
-                    }
-                    break;
-
-                case PushRuleVectorState.LOUD:
-                    if (rule.actions.length !== 3) {
-                        actions = PushRuleVectorState.actionsFor(PushRuleVectorState.LOUD);
-                    }
-
-                    if (this.state.vectorContentRules.vectorState === PushRuleVectorState.OFF) {
-                        enabled = true;
-                    }
-                    break;
-
-                case PushRuleVectorState.OFF:
-                    enabled = false;
-                    break;
-            }
-
-            if (actions) {
-                // Note that the workaround in _updatePushRuleActions will automatically
-                // enable the rule
-                deferreds.push(this._updatePushRuleActions(rule, actions, enabled));
-            } else if (enabled != undefined) {
-                deferreds.push(cli.setPushRuleEnabled('global', rule.kind, rule.rule_id, enabled));
-            }
-        }
-
-        Promise.all(deferreds).then(function(resps) {
-            self._refreshFromServer();
-        }, function(error) {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            console.error("Can't update user notification settings: " + error);
-            Modal.createTrackedDialog('Can\'t update user notifcation settings', '', ErrorDialog, {
-                title: _t('Can\'t update user notification settings'),
-                description: ((error && error.message) ? error.message : _t('Operation failed')),
-                onFinished: self._refreshFromServer,
-            });
-        });
-    }
-
-    _setKeywords(newKeywords) {
-        this.setState({
-            phase: Notifications.phases.LOADING,
-        });
-
-        const self = this;
-        const cli = MatrixClientPeg.get();
-        const removeDeferreds = [];
-
-        // Remove per-word push rules of keywords that are no more in the list
-        const vectorContentRulesPatterns = [];
-        for (const i in self.state.vectorContentRules.rules) {
-            const rule = self.state.vectorContentRules.rules[i];
-
-            vectorContentRulesPatterns.push(rule.pattern);
-
-            if (newKeywords.indexOf(rule.pattern) < 0) {
-                removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
-            }
-        }
-
-        // If the keyword is part of `externalContentRules`, remove the rule
-        // before recreating it in the right Vector path
-        for (const i in self.state.externalContentRules) {
-            const rule = self.state.externalContentRules[i];
-
-            if (newKeywords.indexOf(rule.pattern) >= 0) {
-                removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
-            }
-        }
-
-        const onError = function(error) {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            console.error("Failed to update keywords: " + error);
-            Modal.createTrackedDialog('Failed to update keywords', '', ErrorDialog, {
-                title: _t('Failed to update keywords'),
-                description: ((error && error.message) ? error.message : _t('Operation failed')),
-                onFinished: self._refreshFromServer,
-            });
-        };
-
-        // Then, add the new ones
-        Promise.all(removeDeferreds).then(function(resps) {
-            const deferreds = [];
-
-            let pushRuleVectorStateKind = self.state.vectorContentRules.vectorState;
-            if (pushRuleVectorStateKind === PushRuleVectorState.OFF) {
-                // When the current global keywords rule is OFF, we need to look at
-                // the flavor of rules in 'vectorContentRules' to apply the same actions
-                // when creating the new rule.
-                // Thus, this new rule will join the 'vectorContentRules' set.
-                if (self.state.vectorContentRules.rules.length) {
-                    pushRuleVectorStateKind = PushRuleVectorState.contentRuleVectorStateKind(
-                        self.state.vectorContentRules.rules[0],
-                    );
-                } else {
-                    // ON is default
-                    pushRuleVectorStateKind = PushRuleVectorState.ON;
-                }
-            }
-
-            for (const i in newKeywords) {
-                const keyword = newKeywords[i];
-
-                if (vectorContentRulesPatterns.indexOf(keyword) < 0) {
-                    if (self.state.vectorContentRules.vectorState !== PushRuleVectorState.OFF) {
-                        deferreds.push(cli.addPushRule('global', 'content', keyword, {
-                            actions: PushRuleVectorState.actionsFor(pushRuleVectorStateKind),
-                            pattern: keyword,
-                        }));
-                    } else {
-                        deferreds.push(self._addDisabledPushRule('global', 'content', keyword, {
-                           actions: PushRuleVectorState.actionsFor(pushRuleVectorStateKind),
-                           pattern: keyword,
-                        }));
-                    }
-                }
-            }
-
-            Promise.all(deferreds).then(function(resps) {
-                self._refreshFromServer();
-            }, onError);
-        }, onError);
-    }
-
-    // Create a push rule but disabled
-    _addDisabledPushRule(scope, kind, ruleId, body) {
-        const cli = MatrixClientPeg.get();
-        return cli.addPushRule(scope, kind, ruleId, body).then(() =>
-            cli.setPushRuleEnabled(scope, kind, ruleId, false),
-        );
-    }
-
-    // Check if any legacy im.vector rules need to be ported to the new API
-    // for overriding the actions of default rules.
-    _portRulesToNewAPI(rulesets) {
-        const needsUpdate = [];
-        const cli = MatrixClientPeg.get();
-
-        for (const kind in rulesets.global) {
-            const ruleset = rulesets.global[kind];
-            for (let i = 0; i < ruleset.length; ++i) {
-                const rule = ruleset[i];
-                if (rule.rule_id in LEGACY_RULES) {
-                    console.log("Porting legacy rule", rule);
-                    needsUpdate.push( function(kind, rule) {
-                        return cli.setPushRuleActions(
-                            'global', kind, LEGACY_RULES[rule.rule_id], portLegacyActions(rule.actions),
-                        ).then(() =>
-                            cli.deletePushRule('global', kind, rule.rule_id),
-                        ).catch( (e) => {
-                            console.warn(`Error when porting legacy rule: ${e}`);
-                        });
-                    }(kind, rule));
-                }
-            }
-        }
-
-        if (needsUpdate.length > 0) {
-            // If some of the rules need to be ported then wait for the porting
-            // to happen and then fetch the rules again.
-            return Promise.all(needsUpdate).then(() =>
-                cli.getPushRules(),
-            );
-        } else {
-            // Otherwise return the rules that we already have.
-            return rulesets;
-        }
-    }
-
-    _refreshFromServer = () => {
-        const self = this;
-        const pushRulesPromise = MatrixClientPeg.get().getPushRules().then(
-            self._portRulesToNewAPI,
-        ).then(function(rulesets) {
-            /// XXX seriously? wtf is this?
-            MatrixClientPeg.get().pushRules = rulesets;
-
-            // Get homeserver default rules and triage them by categories
-            const ruleCategories = {
-                // The master rule (all notifications disabling)
-                '.m.rule.master': 'master',
-
-                // The default push rules displayed by Vector UI
-                '.m.rule.contains_display_name': 'vector',
-                '.m.rule.contains_user_name': 'vector',
-                '.m.rule.roomnotif': 'vector',
-                '.m.rule.room_one_to_one': 'vector',
-                '.m.rule.encrypted_room_one_to_one': 'vector',
-                '.m.rule.message': 'vector',
-                '.m.rule.encrypted': 'vector',
-                '.m.rule.invite_for_me': 'vector',
-                //'.m.rule.member_event': 'vector',
-                '.m.rule.call': 'vector',
-                '.m.rule.suppress_notices': 'vector',
-                '.m.rule.tombstone': 'vector',
-
-                // Others go to others
-            };
-
-            // HS default rules
-            const defaultRules = {master: [], vector: {}, others: []};
-
-            for (const kind in rulesets.global) {
-                for (let i = 0; i < Object.keys(rulesets.global[kind]).length; ++i) {
-                    const r = rulesets.global[kind][i];
-                    const cat = ruleCategories[r.rule_id];
-                    r.kind = kind;
-
-                    if (r.rule_id[0] === '.') {
-                        if (cat === 'vector') {
-                            defaultRules.vector[r.rule_id] = r;
-                        } else if (cat === 'master') {
-                            defaultRules.master.push(r);
-                        } else {
-                            defaultRules['others'].push(r);
-                        }
-                    }
-                }
-            }
-
-            // Get the master rule if any defined by the hs
-            if (defaultRules.master.length > 0) {
-                self.state.masterPushRule = defaultRules.master[0];
-            }
-
-            // parse the keyword rules into our state
-            const contentRules = ContentRules.parseContentRules(rulesets);
-            self.state.vectorContentRules = {
-                vectorState: contentRules.vectorState,
-                rules: contentRules.rules,
-            };
-            self.state.externalContentRules = contentRules.externalRules;
-
-            // Build the rules displayed in the Vector UI matrix table
-            self.state.vectorPushRules = [];
-            self.state.externalPushRules = [];
-
-            const vectorRuleIds = [
-                '.m.rule.contains_display_name',
-                '.m.rule.contains_user_name',
-                '.m.rule.roomnotif',
-                '_keywords',
-                '.m.rule.room_one_to_one',
-                '.m.rule.encrypted_room_one_to_one',
-                '.m.rule.message',
-                '.m.rule.encrypted',
-                '.m.rule.invite_for_me',
-                //'im.vector.rule.member_event',
-                '.m.rule.call',
-                '.m.rule.suppress_notices',
-                '.m.rule.tombstone',
-            ];
-            for (const i in vectorRuleIds) {
-                const vectorRuleId = vectorRuleIds[i];
-
-                if (vectorRuleId === '_keywords') {
-                    // keywords needs a special handling
-                    // For Vector UI, this is a single global push rule but translated in Matrix,
-                    // it corresponds to all content push rules (stored in self.state.vectorContentRule)
-                    self.state.vectorPushRules.push({
-                        "vectorRuleId": "_keywords",
-                        "description": (
-                            <span>
-                                { _t('Messages containing <span>keywords</span>',
-                                    {},
-                                    { 'span': (sub) =>
-                                        <span className="mx_UserNotifSettings_keywords" onClick={ self.onKeywordsClicked }>{sub}</span>,
-                                    },
-                                )}
-                            </span>
-                        ),
-                        "vectorState": self.state.vectorContentRules.vectorState,
-                    });
-                } else {
-                    const ruleDefinition = VectorPushRulesDefinitions[vectorRuleId];
-                    const rule = defaultRules.vector[vectorRuleId];
-
-                    const vectorState = ruleDefinition.ruleToVectorState(rule);
-
-                    //console.log("Refreshing vectorPushRules for " + vectorRuleId +", "+ ruleDefinition.description +", " + rule +", " + vectorState);
-
-                    self.state.vectorPushRules.push({
-                        "vectorRuleId": vectorRuleId,
-                        "description": _t(ruleDefinition.description), // Text from VectorPushRulesDefinitions.js
-                        "rule": rule,
-                        "vectorState": vectorState,
-                    });
-
-                    // if there was a rule which we couldn't parse, add it to the external list
-                    if (rule && !vectorState) {
-                        rule.description = ruleDefinition.description;
-                        self.state.externalPushRules.push(rule);
-                    }
-                }
-            }
-
-            // Build the rules not managed by Vector UI
-            const otherRulesDescriptions = {
-                '.m.rule.message': _t('Notify for all other messages/rooms'),
-                '.m.rule.fallback': _t('Notify me for anything else'),
-            };
-
-            for (const i in defaultRules.others) {
-                const rule = defaultRules.others[i];
-                const ruleDescription = otherRulesDescriptions[rule.rule_id];
-
-                // Show enabled default rules that was modified by the user
-                if (ruleDescription && rule.enabled && !rule.default) {
-                    rule.description = ruleDescription;
-                    self.state.externalPushRules.push(rule);
-                }
-            }
-        });
-
-        const pushersPromise = MatrixClientPeg.get().getPushers().then(function(resp) {
-            self.setState({pushers: resp.pushers});
-        });
-
-        Promise.all([pushRulesPromise, pushersPromise]).then(function() {
-            self.setState({
-                phase: Notifications.phases.DISPLAY,
-            });
-        }, function(error) {
-            console.error(error);
-            self.setState({
-                phase: Notifications.phases.ERROR,
-            });
-        }).finally(() => {
-            // actually explicitly update our state  having been deep-manipulating it
-            self.setState({
-                masterPushRule: self.state.masterPushRule,
-                vectorContentRules: self.state.vectorContentRules,
-                vectorPushRules: self.state.vectorPushRules,
-                externalContentRules: self.state.externalContentRules,
-                externalPushRules: self.state.externalPushRules,
-            });
-        });
-
-        MatrixClientPeg.get().getThreePids().then((r) => this.setState({threepids: r.threepids}));
-    };
-
-    _onClearNotifications = () => {
-        const cli = MatrixClientPeg.get();
-
-        cli.getRooms().forEach(r => {
-            if (r.getUnreadNotificationCount() > 0) {
-                const events = r.getLiveTimeline().getEvents();
-                if (events.length) cli.sendReadReceipt(events.pop());
-            }
-        });
-    };
-
-    _updatePushRuleActions(rule, actions, enabled) {
-        const cli = MatrixClientPeg.get();
-
-        return cli.setPushRuleActions(
-            'global', rule.kind, rule.rule_id, actions,
-        ).then( function() {
-            // Then, if requested, enabled or disabled the rule
-            if (undefined != enabled) {
-                return cli.setPushRuleEnabled(
-                    'global', rule.kind, rule.rule_id, enabled,
-                );
-            }
-        });
-    }
-
-    renderNotifRulesTableRow(title, className, pushRuleVectorState) {
-        return (
-            <tr key={ className }>
-                <th>
-                    { title }
-                </th>
-
-                <th>
-                    <input className= {className + "-" + PushRuleVectorState.OFF}
-                        type="radio"
-                        checked={ pushRuleVectorState === PushRuleVectorState.OFF }
-                        onChange={ this.onNotifStateButtonClicked } />
-                </th>
-
-                <th>
-                    <input className= {className + "-" + PushRuleVectorState.ON}
-                        type="radio"
-                        checked={ pushRuleVectorState === PushRuleVectorState.ON }
-                        onChange={ this.onNotifStateButtonClicked } />
-                </th>
-
-                <th>
-                    <input className= {className + "-" + PushRuleVectorState.LOUD}
-                        type="radio"
-                        checked={ pushRuleVectorState === PushRuleVectorState.LOUD }
-                        onChange={ this.onNotifStateButtonClicked } />
-                </th>
-            </tr>
-        );
-    }
-
-    renderNotifRulesTableRows() {
-        const rows = [];
-        for (const i in this.state.vectorPushRules) {
-            const rule = this.state.vectorPushRules[i];
-            if (rule.rule === undefined && rule.vectorRuleId.startsWith(".m.")) {
-                console.warn(`Skipping render of rule ${rule.vectorRuleId} due to no underlying rule`);
-                continue;
-            }
-            //console.log("rendering: " + rule.description + ", " + rule.vectorRuleId + ", " + rule.vectorState);
-            rows.push(this.renderNotifRulesTableRow(rule.description, rule.vectorRuleId, rule.vectorState));
-        }
-        return rows;
-    }
-
-    hasEmailPusher(pushers, address) {
-        if (pushers === undefined) {
-            return false;
-        }
-        for (let i = 0; i < pushers.length; ++i) {
-            if (pushers[i].kind === 'email' && pushers[i].pushkey === address) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    emailNotificationsRow(address, label) {
-        return <LabelledToggleSwitch value={this.hasEmailPusher(this.state.pushers, address)}
-            onChange={this.onEnableEmailNotificationsChange.bind(this, address)}
-            label={label} key={`emailNotif_${label}`} />;
-    }
-
-    render() {
-        let spinner;
-        if (this.state.phase === Notifications.phases.LOADING) {
-            const Loader = sdk.getComponent("elements.Spinner");
-            spinner = <Loader />;
-        }
-
-        let masterPushRuleDiv;
-        if (this.state.masterPushRule) {
-            masterPushRuleDiv = <LabelledToggleSwitch value={!this.state.masterPushRule.enabled}
-                onChange={this.onEnableNotificationsChange}
-                label={_t('Enable notifications for this account')} />;
-        }
-
-        let clearNotificationsButton;
-        if (MatrixClientPeg.get().getRooms().some(r => r.getUnreadNotificationCount() > 0)) {
-            clearNotificationsButton = <AccessibleButton onClick={this._onClearNotifications} kind='danger'>
-                {_t("Clear notifications")}
-            </AccessibleButton>;
-        }
-
-        // When enabled, the master rule inhibits all existing rules
-        // So do not show all notification settings
-        if (this.state.masterPushRule && this.state.masterPushRule.enabled) {
-            return (
-                <div>
-                    {masterPushRuleDiv}
-
-                    <div className="mx_UserNotifSettings_notifTable">
-                        { _t('All notifications are currently disabled for all targets.') }
-                    </div>
-
-                    {clearNotificationsButton}
-                </div>
-            );
-        }
-
-        const emailThreepids = this.state.threepids.filter((tp) => tp.medium === "email");
-        let emailNotificationsRows;
-        if (emailThreepids.length > 0) {
-            emailNotificationsRows = emailThreepids.map((threePid) => this.emailNotificationsRow(
-                threePid.address, `${_t('Enable email notifications')} (${threePid.address})`,
-            ));
-        } else if (SettingsStore.getValue(UIFeature.ThirdPartyID)) {
-            emailNotificationsRows = <div>
-                { _t('Add an email address to configure email notifications') }
-            </div>;
-        }
-
-        // Build external push rules
-        const externalRules = [];
-        for (const i in this.state.externalPushRules) {
-            const rule = this.state.externalPushRules[i];
-            externalRules.push(<li>{ _t(rule.description) }</li>);
-        }
-
-        // Show keywords not displayed by the vector UI as a single external push rule
-        let externalKeywords = [];
-        for (const i in this.state.externalContentRules) {
-            const rule = this.state.externalContentRules[i];
-            externalKeywords.push(rule.pattern);
-        }
-        if (externalKeywords.length) {
-            externalKeywords = externalKeywords.join(", ");
-            externalRules.push(<li>
-                {_t('Notifications on the following keywords follow rules which can’t be displayed here:') }
-                { externalKeywords }
-            </li>);
-        }
-
-        let devicesSection;
-        if (this.state.pushers === undefined) {
-            devicesSection = <div className="error">{ _t('Unable to fetch notification target list') }</div>;
-        } else if (this.state.pushers.length === 0) {
-            devicesSection = null;
-        } else {
-            // TODO: It would be great to be able to delete pushers from here too,
-            // and this wouldn't be hard to add.
-            const rows = [];
-            for (let i = 0; i < this.state.pushers.length; ++i) {
-                rows.push(<tr key={ i }>
-                    <td>{this.state.pushers[i].app_display_name}</td>
-                    <td>{this.state.pushers[i].device_display_name}</td>
-                </tr>);
-            }
-            devicesSection = (<table className="mx_UserNotifSettings_devicesTable">
-                <tbody>
-                    {rows}
-                </tbody>
-            </table>);
-        }
-        if (devicesSection) {
-            devicesSection = (<div>
-                <h3>{ _t('Notification targets') }</h3>
-                { devicesSection }
-            </div>);
-        }
-
-        let advancedSettings;
-        if (externalRules.length) {
-            const brand = SdkConfig.get().brand;
-            advancedSettings = (
-                <div>
-                    <h3>{ _t('Advanced notification settings') }</h3>
-                    { _t('There are advanced notifications which are not shown here.') }<br />
-                    {_t(
-                        'You might have configured them in a client other than %(brand)s. ' +
-                        'You cannot tune them in %(brand)s but they still apply.',
-                        { brand },
-                    )}
-                    <ul>
-                        { externalRules }
-                    </ul>
-                </div>
-            );
-        }
-
-        return (
-            <div>
-
-                {masterPushRuleDiv}
-
-                <div className="mx_UserNotifSettings_notifTable">
-
-                    { spinner }
-
-                    <LabelledToggleSwitch value={SettingsStore.getValue("notificationsEnabled")}
-                        onChange={this.onEnableDesktopNotificationsChange}
-                        label={_t('Enable desktop notifications for this session')} />
-
-                    <LabelledToggleSwitch value={SettingsStore.getValue("notificationBodyEnabled")}
-                        onChange={this.onEnableDesktopNotificationBodyChange}
-                        label={_t('Show message in desktop notification')} />
-
-                    <LabelledToggleSwitch value={SettingsStore.getValue("audioNotificationsEnabled")}
-                        onChange={this.onEnableAudioNotificationsChange}
-                        label={_t('Enable audible notifications for this session')} />
-
-                    { emailNotificationsRows }
-
-                    <div className="mx_UserNotifSettings_pushRulesTableWrapper">
-                        <table className="mx_UserNotifSettings_pushRulesTable">
-                            <thead>
-                                <tr>
-                                    <th width="55%"></th>
-                                    <th width="15%">{ _t('Off') }</th>
-                                    <th width="15%">{ _t('On') }</th>
-                                    <th width="15%">{ _t('Noisy') }</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-
-                                { this.renderNotifRulesTableRows() }
-
-                            </tbody>
-                        </table>
-                    </div>
-
-                    { advancedSettings }
-
-                    { devicesSection }
-
-                    { clearNotificationsButton }
-                </div>
-
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/settings/Notifications.tsx b/src/components/views/settings/Notifications.tsx
new file mode 100644
index 0000000000..2f3f7abe4b
--- /dev/null
+++ b/src/components/views/settings/Notifications.tsx
@@ -0,0 +1,647 @@
+/*
+Copyright 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 Spinner from "../elements/Spinner";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { IAnnotatedPushRule, IPusher, PushRuleAction, PushRuleKind, RuleId } from "matrix-js-sdk/src/@types/PushRules";
+import {
+    ContentRules,
+    IContentRules,
+    PushRuleVectorState,
+    VectorPushRulesDefinitions,
+    VectorState,
+} from "../../../notifications";
+import { _t, TranslatedString } from "../../../languageHandler";
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import SettingsStore from "../../../settings/SettingsStore";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import Modal from "../../../Modal";
+import ErrorDialog from "../dialogs/ErrorDialog";
+import SdkConfig from "../../../SdkConfig";
+import AccessibleButton from "../elements/AccessibleButton";
+import TagComposer from "../elements/TagComposer";
+import { objectClone } from "../../../utils/objects";
+import { arrayDiff } from "../../../utils/arrays";
+
+// TODO: this "view" component still has far too much application logic in it,
+// which should be factored out to other files.
+
+enum Phase {
+    Loading = "loading",
+    Ready = "ready",
+    Persisting = "persisting", // technically a meta-state for Ready, but whatever
+    Error = "error",
+}
+
+enum RuleClass {
+    Master = "master",
+
+    // The vector sections map approximately to UI sections
+    VectorGlobal = "vector_global",
+    VectorMentions = "vector_mentions",
+    VectorOther = "vector_other",
+    Other = "other", // unknown rules, essentially
+}
+
+const KEYWORD_RULE_ID = "_keywords"; // used as a placeholder "Rule ID" throughout this component
+const KEYWORD_RULE_CATEGORY = RuleClass.VectorMentions;
+
+// This array doesn't care about categories: it's just used for a simple sort
+const RULE_DISPLAY_ORDER: string[] = [
+    // Global
+    RuleId.DM,
+    RuleId.EncryptedDM,
+    RuleId.Message,
+    RuleId.EncryptedMessage,
+
+    // Mentions
+    RuleId.ContainsDisplayName,
+    RuleId.ContainsUserName,
+    RuleId.AtRoomNotification,
+
+    // Other
+    RuleId.InviteToSelf,
+    RuleId.IncomingCall,
+    RuleId.SuppressNotices,
+    RuleId.Tombstone,
+];
+
+interface IVectorPushRule {
+    ruleId: RuleId | typeof KEYWORD_RULE_ID | string;
+    rule?: IAnnotatedPushRule;
+    description: TranslatedString | string;
+    vectorState: VectorState;
+}
+
+interface IProps {}
+
+interface IState {
+    phase: Phase;
+
+    // Optional stuff is required when `phase === Ready`
+    masterPushRule?: IAnnotatedPushRule;
+    vectorKeywordRuleInfo?: IContentRules;
+    vectorPushRules?: {
+        [category in RuleClass]?: IVectorPushRule[];
+    };
+    pushers?: IPusher[];
+    threepids?: IThreepid[];
+}
+
+export default class Notifications extends React.PureComponent<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            phase: Phase.Loading,
+        };
+    }
+
+    private get isInhibited(): boolean {
+        // Caution: The master rule's enabled state is inverted from expectation. When
+        // the master rule is *enabled* it means all other rules are *disabled* (or
+        // inhibited). Conversely, when the master rule is *disabled* then all other rules
+        // are *enabled* (or operate fine).
+        return this.state.masterPushRule?.enabled;
+    }
+
+    public componentDidMount() {
+        // noinspection JSIgnoredPromiseFromCall
+        this.refreshFromServer();
+    }
+
+    private async refreshFromServer() {
+        try {
+            const newState = (await Promise.all([
+                this.refreshRules(),
+                this.refreshPushers(),
+                this.refreshThreepids(),
+            ])).reduce((p, c) => Object.assign(c, p), {});
+
+            this.setState({
+                ...newState,
+                phase: Phase.Ready,
+            });
+        } catch (e) {
+            console.error("Error setting up notifications for settings: ", e);
+            this.setState({ phase: Phase.Error });
+        }
+    }
+
+    private async refreshRules(): Promise<Partial<IState>> {
+        const ruleSets = await MatrixClientPeg.get().getPushRules();
+
+        const categories = {
+            [RuleId.Master]: RuleClass.Master,
+
+            [RuleId.DM]: RuleClass.VectorGlobal,
+            [RuleId.EncryptedDM]: RuleClass.VectorGlobal,
+            [RuleId.Message]: RuleClass.VectorGlobal,
+            [RuleId.EncryptedMessage]: RuleClass.VectorGlobal,
+
+            [RuleId.ContainsDisplayName]: RuleClass.VectorMentions,
+            [RuleId.ContainsUserName]: RuleClass.VectorMentions,
+            [RuleId.AtRoomNotification]: RuleClass.VectorMentions,
+
+            [RuleId.InviteToSelf]: RuleClass.VectorOther,
+            [RuleId.IncomingCall]: RuleClass.VectorOther,
+            [RuleId.SuppressNotices]: RuleClass.VectorOther,
+            [RuleId.Tombstone]: RuleClass.VectorOther,
+
+            // Everything maps to a generic "other" (unknown rule)
+        };
+
+        const defaultRules: {
+            [k in RuleClass]: IAnnotatedPushRule[];
+        } = {
+            [RuleClass.Master]: [],
+            [RuleClass.VectorGlobal]: [],
+            [RuleClass.VectorMentions]: [],
+            [RuleClass.VectorOther]: [],
+            [RuleClass.Other]: [],
+        };
+
+        for (const k in ruleSets.global) {
+            // noinspection JSUnfilteredForInLoop
+            const kind = k as PushRuleKind;
+            for (const r of ruleSets.global[kind]) {
+                const rule: IAnnotatedPushRule = Object.assign(r, { kind });
+                const category = categories[rule.rule_id] ?? RuleClass.Other;
+
+                if (rule.rule_id[0] === '.') {
+                    defaultRules[category].push(rule);
+                }
+            }
+        }
+
+        const preparedNewState: Partial<IState> = {};
+        if (defaultRules.master.length > 0) {
+            preparedNewState.masterPushRule = defaultRules.master[0];
+        } else {
+            // XXX: Can this even happen? How do we safely recover?
+            throw new Error("Failed to locate a master push rule");
+        }
+
+        // Parse keyword rules
+        preparedNewState.vectorKeywordRuleInfo = ContentRules.parseContentRules(ruleSets);
+
+        // Prepare rendering for all of our known rules
+        preparedNewState.vectorPushRules = {};
+        const vectorCategories = [RuleClass.VectorGlobal, RuleClass.VectorMentions, RuleClass.VectorOther];
+        for (const category of vectorCategories) {
+            preparedNewState.vectorPushRules[category] = [];
+            for (const rule of defaultRules[category]) {
+                const definition = VectorPushRulesDefinitions[rule.rule_id];
+                const vectorState = definition.ruleToVectorState(rule);
+                preparedNewState.vectorPushRules[category].push({
+                    ruleId: rule.rule_id,
+                    rule, vectorState,
+                    description: _t(definition.description),
+                });
+            }
+
+            // Quickly sort the rules for display purposes
+            preparedNewState.vectorPushRules[category].sort((a, b) => {
+                let idxA = RULE_DISPLAY_ORDER.indexOf(a.ruleId);
+                let idxB = RULE_DISPLAY_ORDER.indexOf(b.ruleId);
+
+                // Assume unknown things go at the end
+                if (idxA < 0) idxA = RULE_DISPLAY_ORDER.length;
+                if (idxB < 0) idxB = RULE_DISPLAY_ORDER.length;
+
+                return idxA - idxB;
+            });
+
+            if (category === KEYWORD_RULE_CATEGORY) {
+                preparedNewState.vectorPushRules[category].push({
+                    ruleId: KEYWORD_RULE_ID,
+                    description: _t("Messages containing keywords"),
+                    vectorState: preparedNewState.vectorKeywordRuleInfo.vectorState,
+                });
+            }
+        }
+
+        return preparedNewState;
+    }
+
+    private refreshPushers(): Promise<Partial<IState>> {
+        return MatrixClientPeg.get().getPushers();
+    }
+
+    private refreshThreepids(): Promise<Partial<IState>> {
+        return MatrixClientPeg.get().getThreePids();
+    }
+
+    private showSaveError() {
+        Modal.createTrackedDialog('Error saving notification preferences', '', ErrorDialog, {
+            title: _t('Error saving notification preferences'),
+            description: _t('An error occurred whilst saving your notification preferences.'),
+        });
+    }
+
+    private onMasterRuleChanged = async (checked: boolean) => {
+        this.setState({ phase: Phase.Persisting });
+
+        try {
+            const masterRule = this.state.masterPushRule;
+            await MatrixClientPeg.get().setPushRuleEnabled('global', masterRule.kind, masterRule.rule_id, !checked);
+            await this.refreshFromServer();
+        } catch (e) {
+            this.setState({ phase: Phase.Error });
+            console.error("Error updating master push rule:", e);
+            this.showSaveError();
+        }
+    };
+
+    private onEmailNotificationsChanged = async (email: string, checked: boolean) => {
+        this.setState({ phase: Phase.Persisting });
+
+        try {
+            if (checked) {
+                await MatrixClientPeg.get().setPusher({
+                    kind: "email",
+                    app_id: "m.email",
+                    pushkey: email,
+                    app_display_name: "Email Notifications",
+                    device_display_name: email,
+                    lang: navigator.language,
+                    data: {
+                        brand: SdkConfig.get().brand,
+                    },
+
+                    // We always append for email pushers since we don't want to stop other
+                    // accounts notifying to the same email address
+                    append: true,
+                });
+            } else {
+                const pusher = this.state.pushers.find(p => p.kind === "email" && p.pushkey === email);
+                pusher.kind = null; // flag for delete
+                await MatrixClientPeg.get().setPusher(pusher);
+            }
+
+            await this.refreshFromServer();
+        } catch (e) {
+            this.setState({ phase: Phase.Error });
+            console.error("Error updating email pusher:", e);
+            this.showSaveError();
+        }
+    };
+
+    private onDesktopNotificationsChanged = async (checked: boolean) => {
+        await SettingsStore.setValue("notificationsEnabled", null, SettingLevel.DEVICE, checked);
+        this.forceUpdate(); // the toggle is controlled by SettingsStore#getValue()
+    };
+
+    private onDesktopShowBodyChanged = async (checked: boolean) => {
+        await SettingsStore.setValue("notificationBodyEnabled", null, SettingLevel.DEVICE, checked);
+        this.forceUpdate(); // the toggle is controlled by SettingsStore#getValue()
+    };
+
+    private onAudioNotificationsChanged = async (checked: boolean) => {
+        await SettingsStore.setValue("audioNotificationsEnabled", null, SettingLevel.DEVICE, checked);
+        this.forceUpdate(); // the toggle is controlled by SettingsStore#getValue()
+    };
+
+    private onRadioChecked = async (rule: IVectorPushRule, checkedState: VectorState) => {
+        this.setState({ phase: Phase.Persisting });
+
+        try {
+            const cli = MatrixClientPeg.get();
+            if (rule.ruleId === KEYWORD_RULE_ID) {
+                // Update all the keywords
+                for (const rule of this.state.vectorKeywordRuleInfo.rules) {
+                    let enabled: boolean;
+                    let actions: PushRuleAction[];
+                    if (checkedState === VectorState.On) {
+                        if (rule.actions.length !== 1) { // XXX: Magic number
+                            actions = PushRuleVectorState.actionsFor(checkedState);
+                        }
+                        if (this.state.vectorKeywordRuleInfo.vectorState === VectorState.Off) {
+                            enabled = true;
+                        }
+                    } else if (checkedState === VectorState.Loud) {
+                        if (rule.actions.length !== 3) { // XXX: Magic number
+                            actions = PushRuleVectorState.actionsFor(checkedState);
+                        }
+                        if (this.state.vectorKeywordRuleInfo.vectorState === VectorState.Off) {
+                            enabled = true;
+                        }
+                    } else {
+                        enabled = false;
+                    }
+
+                    if (actions) {
+                        await cli.setPushRuleActions('global', rule.kind, rule.rule_id, actions);
+                    }
+                    if (enabled !== undefined) {
+                        await cli.setPushRuleEnabled('global', rule.kind, rule.rule_id, enabled);
+                    }
+                }
+            } else {
+                const definition = VectorPushRulesDefinitions[rule.ruleId];
+                const actions = definition.vectorStateToActions[checkedState];
+                if (!actions) {
+                    await cli.setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, false);
+                } else {
+                    await cli.setPushRuleActions('global', rule.rule.kind, rule.rule.rule_id, actions);
+                    await cli.setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, true);
+                }
+            }
+
+            await this.refreshFromServer();
+        } catch (e) {
+            this.setState({ phase: Phase.Error });
+            console.error("Error updating push rule:", e);
+            this.showSaveError();
+        }
+    };
+
+    private onClearNotificationsClicked = () => {
+        MatrixClientPeg.get().getRooms().forEach(r => {
+            if (r.getUnreadNotificationCount() > 0) {
+                const events = r.getLiveTimeline().getEvents();
+                if (events.length) {
+                    // noinspection JSIgnoredPromiseFromCall
+                    MatrixClientPeg.get().sendReadReceipt(events[events.length - 1]);
+                }
+            }
+        });
+    };
+
+    private async setKeywords(keywords: string[], originalRules: IAnnotatedPushRule[]) {
+        try {
+            // De-duplicate and remove empties
+            keywords = Array.from(new Set(keywords)).filter(k => !!k);
+            const oldKeywords = Array.from(new Set(originalRules.map(r => r.pattern))).filter(k => !!k);
+
+            // Note: Technically because of the UI interaction (at the time of writing), the diff
+            // will only ever be +/-1 so we don't really have to worry about efficiently handling
+            // tons of keyword changes.
+
+            const diff = arrayDiff(oldKeywords, keywords);
+
+            for (const word of diff.removed) {
+                for (const rule of originalRules.filter(r => r.pattern === word)) {
+                    await MatrixClientPeg.get().deletePushRule('global', rule.kind, rule.rule_id);
+                }
+            }
+
+            let ruleVectorState = this.state.vectorKeywordRuleInfo.vectorState;
+            if (ruleVectorState === VectorState.Off) {
+                // When the current global keywords rule is OFF, we need to look at
+                // the flavor of existing rules to apply the same actions
+                // when creating the new rule.
+                if (originalRules.length) {
+                    ruleVectorState = PushRuleVectorState.contentRuleVectorStateKind(originalRules[0]);
+                } else {
+                    ruleVectorState = VectorState.On; // default
+                }
+            }
+            const kind = PushRuleKind.ContentSpecific;
+            for (const word of diff.added) {
+                await MatrixClientPeg.get().addPushRule('global', kind, word, {
+                    actions: PushRuleVectorState.actionsFor(ruleVectorState),
+                    pattern: word,
+                });
+                if (ruleVectorState === VectorState.Off) {
+                    await MatrixClientPeg.get().setPushRuleEnabled('global', kind, word, false);
+                }
+            }
+
+            await this.refreshFromServer();
+        } catch (e) {
+            this.setState({ phase: Phase.Error });
+            console.error("Error updating keyword push rules:", e);
+            this.showSaveError();
+        }
+    }
+
+    private onKeywordAdd = (keyword: string) => {
+        const originalRules = objectClone(this.state.vectorKeywordRuleInfo.rules);
+
+        // We add the keyword immediately as a sort of local echo effect
+        this.setState({
+            phase: Phase.Persisting,
+            vectorKeywordRuleInfo: {
+                ...this.state.vectorKeywordRuleInfo,
+                rules: [
+                    ...this.state.vectorKeywordRuleInfo.rules,
+
+                    // XXX: Horrible assumption that we don't need the remaining fields
+                    { pattern: keyword } as IAnnotatedPushRule,
+                ],
+            },
+        }, async () => {
+            await this.setKeywords(this.state.vectorKeywordRuleInfo.rules.map(r => r.pattern), originalRules);
+        });
+    };
+
+    private onKeywordRemove = (keyword: string) => {
+        const originalRules = objectClone(this.state.vectorKeywordRuleInfo.rules);
+
+        // We remove the keyword immediately as a sort of local echo effect
+        this.setState({
+            phase: Phase.Persisting,
+            vectorKeywordRuleInfo: {
+                ...this.state.vectorKeywordRuleInfo,
+                rules: this.state.vectorKeywordRuleInfo.rules.filter(r => r.pattern !== keyword),
+            },
+        }, async () => {
+            await this.setKeywords(this.state.vectorKeywordRuleInfo.rules.map(r => r.pattern), originalRules);
+        });
+    };
+
+    private renderTopSection() {
+        const masterSwitch = <LabelledToggleSwitch
+            value={!this.isInhibited}
+            label={_t("Enable for this account")}
+            onChange={this.onMasterRuleChanged}
+            disabled={this.state.phase === Phase.Persisting}
+        />;
+
+        // If all the rules are inhibited, don't show anything.
+        if (this.isInhibited) {
+            return masterSwitch;
+        }
+
+        const emailSwitches = (this.state.threepids || []).filter(t => t.medium === ThreepidMedium.Email)
+            .map(e => <LabelledToggleSwitch
+                key={e.address}
+                value={this.state.pushers.some(p => p.kind === "email" && p.pushkey === e.address)}
+                label={_t("Enable email notifications for %(email)s", { email: e.address })}
+                onChange={this.onEmailNotificationsChanged.bind(this, e.address)}
+                disabled={this.state.phase === Phase.Persisting}
+            />);
+
+        return <>
+            { masterSwitch }
+
+            <LabelledToggleSwitch
+                value={SettingsStore.getValue("notificationsEnabled")}
+                onChange={this.onDesktopNotificationsChanged}
+                label={_t('Enable desktop notifications for this session')}
+                disabled={this.state.phase === Phase.Persisting}
+            />
+
+            <LabelledToggleSwitch
+                value={SettingsStore.getValue("notificationBodyEnabled")}
+                onChange={this.onDesktopShowBodyChanged}
+                label={_t('Show message in desktop notification')}
+                disabled={this.state.phase === Phase.Persisting}
+            />
+
+            <LabelledToggleSwitch
+                value={SettingsStore.getValue("audioNotificationsEnabled")}
+                onChange={this.onAudioNotificationsChanged}
+                label={_t('Enable audible notifications for this session')}
+                disabled={this.state.phase === Phase.Persisting}
+            />
+
+            { emailSwitches }
+        </>;
+    }
+
+    private renderCategory(category: RuleClass) {
+        if (category !== RuleClass.VectorOther && this.isInhibited) {
+            return null; // nothing to show for the section
+        }
+
+        let clearNotifsButton: JSX.Element;
+        if (
+            category === RuleClass.VectorOther
+            && MatrixClientPeg.get().getRooms().some(r => r.getUnreadNotificationCount() > 0)
+        ) {
+            clearNotifsButton = <AccessibleButton
+                onClick={this.onClearNotificationsClicked}
+                kind='danger'
+                className='mx_UserNotifSettings_clearNotifsButton'
+            >{ _t("Clear notifications") }</AccessibleButton>;
+        }
+
+        if (category === RuleClass.VectorOther && this.isInhibited) {
+            // only render the utility buttons (if needed)
+            if (clearNotifsButton) {
+                return <div className='mx_UserNotifSettings_floatingSection'>
+                    <div>{ _t("Other") }</div>
+                    { clearNotifsButton }
+                </div>;
+            }
+            return null;
+        }
+
+        let keywordComposer: JSX.Element;
+        if (category === RuleClass.VectorMentions) {
+            keywordComposer = <TagComposer
+                tags={this.state.vectorKeywordRuleInfo?.rules.map(r => r.pattern)}
+                onAdd={this.onKeywordAdd}
+                onRemove={this.onKeywordRemove}
+                disabled={this.state.phase === Phase.Persisting}
+                label={_t("Keyword")}
+                placeholder={_t("New keyword")}
+            />;
+        }
+
+        const makeRadio = (r: IVectorPushRule, s: VectorState) => (
+            <StyledRadioButton
+                key={r.ruleId}
+                name={r.ruleId}
+                checked={r.vectorState === s}
+                onChange={this.onRadioChecked.bind(this, r, s)}
+                disabled={this.state.phase === Phase.Persisting}
+            />
+        );
+
+        const rows = this.state.vectorPushRules[category].map(r => <tr key={category + r.ruleId}>
+            <td>{ r.description }</td>
+            <td>{ makeRadio(r, VectorState.Off) }</td>
+            <td>{ makeRadio(r, VectorState.On) }</td>
+            <td>{ makeRadio(r, VectorState.Loud) }</td>
+        </tr>);
+
+        let sectionName: TranslatedString;
+        switch (category) {
+            case RuleClass.VectorGlobal:
+                sectionName = _t("Global");
+                break;
+            case RuleClass.VectorMentions:
+                sectionName = _t("Mentions & keywords");
+                break;
+            case RuleClass.VectorOther:
+                sectionName = _t("Other");
+                break;
+            default:
+                throw new Error("Developer error: Unnamed notifications section: " + category);
+        }
+
+        return <>
+            <table className='mx_UserNotifSettings_pushRulesTable'>
+                <thead>
+                    <tr>
+                        <th>{ sectionName }</th>
+                        <th>{ _t("Off") }</th>
+                        <th>{ _t("On") }</th>
+                        <th>{ _t("Noisy") }</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    { rows }
+                </tbody>
+            </table>
+            { clearNotifsButton }
+            { keywordComposer }
+        </>;
+    }
+
+    private renderTargets() {
+        if (this.isInhibited) return null; // no targets if there's no notifications
+
+        const rows = this.state.pushers.map(p => <tr key={p.kind+p.pushkey}>
+            <td>{ p.app_display_name }</td>
+            <td>{ p.device_display_name }</td>
+        </tr>);
+
+        if (!rows.length) return null; // no targets to show
+
+        return <div className='mx_UserNotifSettings_floatingSection'>
+            <div>{ _t("Notification targets") }</div>
+            <table>
+                <tbody>
+                    { rows }
+                </tbody>
+            </table>
+        </div>;
+    }
+
+    public render() {
+        if (this.state.phase === Phase.Loading) {
+            // Ends up default centered
+            return <Spinner />;
+        } else if (this.state.phase === Phase.Error) {
+            return <p>{ _t("There was an error loading your notification settings.") }</p>;
+        }
+
+        return <div className='mx_UserNotifSettings'>
+            { this.renderTopSection() }
+            { this.renderCategory(RuleClass.VectorGlobal) }
+            { this.renderCategory(RuleClass.VectorMentions) }
+            { this.renderCategory(RuleClass.VectorOther) }
+            { this.renderTargets() }
+        </div>;
+    }
+}
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.tsx
similarity index 69%
rename from src/components/views/settings/ProfileSettings.js
rename to src/components/views/settings/ProfileSettings.tsx
index 9ecf369eba..c675de9433 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.tsx
@@ -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,22 +14,37 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import {_t} from "../../../languageHandler";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import React, { createRef } from 'react';
+import { _t } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
 import { getHostingLink } from '../../../utils/HostingLink';
-import * as sdk from "../../../index";
-import {OwnProfileStore} from "../../../stores/OwnProfileStore";
+import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "../dialogs/ErrorDialog";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {mediaFromMxc} from "../../../customisations/Media";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { mediaFromMxc } from "../../../customisations/Media";
+import AccessibleButton from '../elements/AccessibleButton';
+import AvatarSetting from './AvatarSetting';
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+interface IState {
+    userId?: string;
+    originalDisplayName?: string;
+    displayName?: string;
+    originalAvatarUrl?: string;
+    avatarUrl?: string | ArrayBuffer;
+    avatarFile?: File;
+    enableProfileSave?: boolean;
+}
 
 @replaceableComponent("views.settings.ProfileSettings")
-export default class ProfileSettings extends React.Component {
-    constructor() {
-        super();
+export default class ProfileSettings extends React.Component<{}, IState> {
+    private avatarUpload: React.RefObject<HTMLInputElement> = createRef();
+
+    constructor(props: {}) {
+        super(props);
 
         const client = MatrixClientPeg.get();
         let avatarUrl = OwnProfileStore.instance.avatarMxc;
@@ -43,17 +58,15 @@ export default class ProfileSettings extends React.Component {
             avatarFile: null,
             enableProfileSave: false,
         };
-
-        this._avatarUpload = createRef();
     }
 
-    _uploadAvatar = () => {
-        this._avatarUpload.current.click();
+    private uploadAvatar = (): void => {
+        this.avatarUpload.current.click();
     };
 
-    _removeAvatar = () => {
+    private removeAvatar = (): void => {
         // clear file upload field so same file can be selected
-        this._avatarUpload.current.value = "";
+        this.avatarUpload.current.value = "";
         this.setState({
             avatarUrl: null,
             avatarFile: null,
@@ -61,7 +74,7 @@ export default class ProfileSettings extends React.Component {
         });
     };
 
-    _cancelProfileChanges = async (e) => {
+    private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
@@ -74,15 +87,15 @@ export default class ProfileSettings extends React.Component {
         });
     };
 
-    _saveProfile = async (e) => {
+    private saveProfile = async (e: React.FormEvent<HTMLFormElement>): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
         if (!this.state.enableProfileSave) return;
-        this.setState({enableProfileSave: false});
+        this.setState({ enableProfileSave: false });
 
         const client = MatrixClientPeg.get();
-        const newState = {};
+        const newState: IState = {};
 
         const displayName = this.state.displayName.trim();
         try {
@@ -93,7 +106,7 @@ export default class ProfileSettings extends React.Component {
             }
 
             if (this.state.avatarFile) {
-                console.log(
+                logger.log(
                     `Uploading new avatar, ${this.state.avatarFile.name} of type ${this.state.avatarFile.type},` +
                     ` (${this.state.avatarFile.size}) bytes`);
                 const uri = await client.uploadContent(this.state.avatarFile);
@@ -105,7 +118,7 @@ export default class ProfileSettings extends React.Component {
                 await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined
             }
         } catch (err) {
-            console.log("Failed to save profile", err);
+            logger.log("Failed to save profile", err);
             Modal.createTrackedDialog('Failed to save profile', '', ErrorDialog, {
                 title: _t("Failed to save your profile"),
                 description: ((err && err.message) ? err.message : _t("The operation could not be completed")),
@@ -115,14 +128,14 @@ export default class ProfileSettings extends React.Component {
         this.setState(newState);
     };
 
-    _onDisplayNameChanged = (e) => {
+    private onDisplayNameChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             displayName: e.target.value,
             enableProfileSave: true,
         });
     };
 
-    _onAvatarChanged = (e) => {
+    private onAvatarChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
         if (!e.target.files || !e.target.files.length) {
             this.setState({
                 avatarUrl: this.state.originalAvatarUrl,
@@ -144,73 +157,73 @@ export default class ProfileSettings extends React.Component {
         reader.readAsDataURL(file);
     };
 
-    render() {
+    public render(): JSX.Element {
         const hostingSignupLink = getHostingLink('user-settings');
         let hostingSignup = null;
         if (hostingSignupLink) {
             hostingSignup = <span className="mx_ProfileSettings_hostingSignup">
-                {_t(
+                { _t(
                     "<a>Upgrade</a> to your own domain", {},
                     {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{sub}</a>,
+                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{ sub }</a>,
                     },
-                )}
+                ) }
                 <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">
                     <img src={require("../../../../res/img/external-link.svg")} width="11" height="10" alt='' />
                 </a>
             </span>;
         }
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const AvatarSetting = sdk.getComponent('settings.AvatarSetting');
         return (
             <form
-                onSubmit={this._saveProfile}
+                onSubmit={this.saveProfile}
                 autoComplete="off"
                 noValidate={true}
                 className="mx_ProfileSettings_profileForm"
             >
                 <input
                     type="file"
-                    ref={this._avatarUpload} className="mx_ProfileSettings_avatarUpload"
-                    onChange={this._onAvatarChanged}
+                    ref={this.avatarUpload}
+                    className="mx_ProfileSettings_avatarUpload"
+                    onChange={this.onAvatarChanged}
                     accept="image/*"
                 />
                 <div className="mx_ProfileSettings_profile">
                     <div className="mx_ProfileSettings_controls">
-                        <span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
+                        <span className="mx_SettingsTab_subheading">{ _t("Profile") }</span>
                         <Field
                             label={_t("Display Name")}
-                            type="text" value={this.state.displayName}
+                            type="text"
+                            value={this.state.displayName}
                             autoComplete="off"
-                            onChange={this._onDisplayNameChanged}
+                            onChange={this.onDisplayNameChanged}
                         />
                         <p>
-                            {this.state.userId}
-                            {hostingSignup}
+                            { this.state.userId }
+                            { hostingSignup }
                         </p>
                     </div>
                     <AvatarSetting
-                        avatarUrl={this.state.avatarUrl}
+                        avatarUrl={this.state.avatarUrl?.toString()}
                         avatarName={this.state.displayName || this.state.userId}
                         avatarAltText={_t("Profile picture")}
-                        uploadAvatar={this._uploadAvatar}
-                        removeAvatar={this._removeAvatar} />
+                        uploadAvatar={this.uploadAvatar}
+                        removeAvatar={this.removeAvatar} />
                 </div>
                 <div className="mx_ProfileSettings_buttons">
                     <AccessibleButton
-                        onClick={this._cancelProfileChanges}
+                        onClick={this.cancelProfileChanges}
                         kind="link"
                         disabled={!this.state.enableProfileSave}
                     >
-                        {_t("Cancel")}
+                        { _t("Cancel") }
                     </AccessibleButton>
                     <AccessibleButton
-                        onClick={this._saveProfile}
+                        onClick={this.saveProfile}
                         kind="primary"
                         disabled={!this.state.enableProfileSave}
                     >
-                        {_t("Save")}
+                        { _t("Save") }
                     </AccessibleButton>
                 </div>
             </form>
diff --git a/src/components/views/settings/SecureBackupPanel.js b/src/components/views/settings/SecureBackupPanel.tsx
similarity index 73%
rename from src/components/views/settings/SecureBackupPanel.js
rename to src/components/views/settings/SecureBackupPanel.tsx
index 4f3eb0bdf6..44c5c44412 100644
--- a/src/components/views/settings/SecureBackupPanel.js
+++ b/src/components/views/settings/SecureBackupPanel.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import { isSecureBackupRequired } from '../../../utils/WellKnownUtils';
@@ -26,14 +26,32 @@ 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
+import { TrustInfo } from "matrix-js-sdk/src/crypto/backup";
+
+interface IState {
+    loading: boolean;
+    error: null;
+    backupKeyStored: boolean;
+    backupKeyCached: boolean;
+    backupKeyWellFormed: boolean;
+    secretStorageKeyInAccount: boolean;
+    secretStorageReady: boolean;
+    backupInfo: IKeyBackupInfo;
+    backupSigStatus: TrustInfo;
+    sessionsRemaining: number;
+}
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 @replaceableComponent("views.settings.SecureBackupPanel")
-export default class SecureBackupPanel extends React.PureComponent {
-    constructor(props) {
+export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
+    private unmounted = false;
+
+    constructor(props: {}) {
         super(props);
 
-        this._unmounted = false;
         this.state = {
             loading: true,
             error: null,
@@ -48,44 +66,44 @@ export default class SecureBackupPanel extends React.PureComponent {
         };
     }
 
-    componentDidMount() {
-        this._checkKeyBackupStatus();
+    public componentDidMount(): void {
+        this.checkKeyBackupStatus();
 
-        MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatus);
+        MatrixClientPeg.get().on('crypto.keyBackupStatus', this.onKeyBackupStatus);
         MatrixClientPeg.get().on(
             'crypto.keyBackupSessionsRemaining',
-            this._onKeyBackupSessionsRemaining,
+            this.onKeyBackupSessionsRemaining,
         );
     }
 
-    componentWillUnmount() {
-        this._unmounted = true;
+    public componentWillUnmount(): void {
+        this.unmounted = true;
 
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this._onKeyBackupStatus);
+            MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this.onKeyBackupStatus);
             MatrixClientPeg.get().removeListener(
                 'crypto.keyBackupSessionsRemaining',
-                this._onKeyBackupSessionsRemaining,
+                this.onKeyBackupSessionsRemaining,
             );
         }
     }
 
-    _onKeyBackupSessionsRemaining = (sessionsRemaining) => {
+    private onKeyBackupSessionsRemaining = (sessionsRemaining: number): void => {
         this.setState({
             sessionsRemaining,
         });
-    }
+    };
 
-    _onKeyBackupStatus = () => {
+    private onKeyBackupStatus = (): void => {
         // This just loads the current backup status rather than forcing
         // a re-check otherwise we risk causing infinite loops
-        this._loadBackupStatus();
-    }
+        this.loadBackupStatus();
+    };
 
-    async _checkKeyBackupStatus() {
-        this._getUpdatedDiagnostics();
+    private async checkKeyBackupStatus(): Promise<void> {
+        this.getUpdatedDiagnostics();
         try {
-            const {backupInfo, trustInfo} = await MatrixClientPeg.get().checkKeyBackup();
+            const { backupInfo, trustInfo } = await MatrixClientPeg.get().checkKeyBackup();
             this.setState({
                 loading: false,
                 error: null,
@@ -93,8 +111,8 @@ export default class SecureBackupPanel extends React.PureComponent {
                 backupSigStatus: trustInfo,
             });
         } catch (e) {
-            console.log("Unable to fetch check backup status", e);
-            if (this._unmounted) return;
+            logger.log("Unable to fetch check backup status", e);
+            if (this.unmounted) return;
             this.setState({
                 loading: false,
                 error: e,
@@ -104,13 +122,13 @@ export default class SecureBackupPanel extends React.PureComponent {
         }
     }
 
-    async _loadBackupStatus() {
+    private async loadBackupStatus(): Promise<void> {
         this.setState({ loading: true });
-        this._getUpdatedDiagnostics();
+        this.getUpdatedDiagnostics();
         try {
             const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
             const backupSigStatus = await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo);
-            if (this._unmounted) return;
+            if (this.unmounted) return;
             this.setState({
                 loading: false,
                 error: null,
@@ -118,8 +136,8 @@ export default class SecureBackupPanel extends React.PureComponent {
                 backupSigStatus,
             });
         } catch (e) {
-            console.log("Unable to fetch key backup status", e);
-            if (this._unmounted) return;
+            logger.log("Unable to fetch key backup status", e);
+            if (this.unmounted) return;
             this.setState({
                 loading: false,
                 error: e,
@@ -129,9 +147,9 @@ export default class SecureBackupPanel extends React.PureComponent {
         }
     }
 
-    async _getUpdatedDiagnostics() {
+    private async getUpdatedDiagnostics(): Promise<void> {
         const cli = MatrixClientPeg.get();
-        const secretStorage = cli.crypto._secretStorage;
+        const secretStorage = cli.crypto.secretStorage;
 
         const backupKeyStored = !!(await cli.isKeyBackupKeyStored());
         const backupKeyFromCache = await cli.crypto.getSessionBackupPrivateKey();
@@ -140,7 +158,7 @@ export default class SecureBackupPanel extends React.PureComponent {
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const secretStorageReady = await cli.isSecretStorageReady();
 
-        if (this._unmounted) return;
+        if (this.unmounted) return;
         this.setState({
             backupKeyStored,
             backupKeyCached,
@@ -150,18 +168,18 @@ export default class SecureBackupPanel extends React.PureComponent {
         });
     }
 
-    _startNewBackup = () => {
+    private startNewBackup = (): void => {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/security/CreateKeyBackupDialog'),
             {
                 onFinished: () => {
-                    this._loadBackupStatus();
+                    this.loadBackupStatus();
                 },
             }, null, /* priority = */ false, /* static = */ true,
         );
-    }
+    };
 
-    _deleteBackup = () => {
+    private deleteBackup = (): void => {
         Modal.createTrackedDialog('Delete Backup', '', QuestionDialog, {
             title: _t('Delete Backup'),
             description: _t(
@@ -172,35 +190,35 @@ export default class SecureBackupPanel extends React.PureComponent {
             danger: true,
             onFinished: (proceed) => {
                 if (!proceed) return;
-                this.setState({loading: true});
+                this.setState({ loading: true });
                 MatrixClientPeg.get().deleteKeyBackupVersion(this.state.backupInfo.version).then(() => {
-                    this._loadBackupStatus();
+                    this.loadBackupStatus();
                 });
             },
         });
-    }
+    };
 
-    _restoreBackup = async () => {
+    private restoreBackup = async (): Promise<void> => {
         Modal.createTrackedDialog(
             'Restore Backup', '', RestoreKeyBackupDialog, null, null,
             /* priority = */ false, /* static = */ true,
         );
-    }
+    };
 
-    _resetSecretStorage = async () => {
+    private resetSecretStorage = async (): Promise<void> => {
         this.setState({ error: null });
         try {
-            await accessSecretStorage(() => { }, /* forceReset = */ true);
+            await accessSecretStorage(async () => { }, /* forceReset = */ true);
         } catch (e) {
             console.error("Error resetting secret storage", e);
-            if (this._unmounted) return;
+            if (this.unmounted) return;
             this.setState({ error: e });
         }
-        if (this._unmounted) return;
-        this._loadBackupStatus();
-    }
+        if (this.unmounted) return;
+        this.loadBackupStatus();
+    };
 
-    render() {
+    public render(): JSX.Element {
         const {
             loading,
             error,
@@ -221,7 +239,7 @@ export default class SecureBackupPanel extends React.PureComponent {
         if (error) {
             statusDescription = (
                 <div className="error">
-                    {_t("Unable to load key backup status")}
+                    { _t("Unable to load key backup status") }
                 </div>
             );
         } else if (loading) {
@@ -230,19 +248,19 @@ export default class SecureBackupPanel extends React.PureComponent {
             let restoreButtonCaption = _t("Restore from Backup");
 
             if (MatrixClientPeg.get().getKeyBackupEnabled()) {
-                statusDescription = <p>✅ {_t("This session is backing up your keys. ")}</p>;
+                statusDescription = <p>✅ { _t("This session is backing up your keys. ") }</p>;
             } else {
                 statusDescription = <>
-                    <p>{_t(
+                    <p>{ _t(
                         "This session is <b>not backing up your keys</b>, " +
                         "but you do have an existing backup you can restore from " +
                         "and add to going forward.", {},
-                        {b: sub => <b>{sub}</b>},
-                    )}</p>
-                    <p>{_t(
+                        { b: sub => <b>{ sub }</b> },
+                    ) }</p>
+                    <p>{ _t(
                         "Connect this session to key backup before signing out to avoid " +
                         "losing any keys that may only be on this session.",
-                    )}</p>
+                    ) }</p>
                 </>;
                 restoreButtonCaption = _t("Connect this session to Key Backup");
             }
@@ -253,25 +271,25 @@ export default class SecureBackupPanel extends React.PureComponent {
                 uploadStatus = "";
             } else if (sessionsRemaining > 0) {
                 uploadStatus = <div>
-                    {_t("Backing up %(sessionsRemaining)s keys...", { sessionsRemaining })} <br />
+                    { _t("Backing up %(sessionsRemaining)s keys...", { sessionsRemaining }) } <br />
                 </div>;
             } else {
                 uploadStatus = <div>
-                    {_t("All keys backed up")} <br />
+                    { _t("All keys backed up") } <br />
                 </div>;
             }
 
-            let backupSigStatuses = backupSigStatus.sigs.map((sig, i) => {
+            let backupSigStatuses: React.ReactNode = backupSigStatus.sigs.map((sig, i) => {
                 const deviceName = sig.device ? (sig.device.getDisplayName() || sig.device.deviceId) : null;
                 const validity = sub =>
                     <span className={sig.valid ? 'mx_SecureBackupPanel_sigValid' : 'mx_SecureBackupPanel_sigInvalid'}>
-                        {sub}
+                        { sub }
                     </span>;
                 const verify = sub =>
                     <span className={sig.device && sig.deviceTrust.isVerified() ? 'mx_SecureBackupPanel_deviceVerified' : 'mx_SecureBackupPanel_deviceNotVerified'}>
-                        {sub}
+                        { sub }
                     </span>;
-                const device = sub => <span className="mx_SecureBackupPanel_deviceName">{deviceName}</span>;
+                const device = sub => <span className="mx_SecureBackupPanel_deviceName">{ deviceName }</span>;
                 const fromThisDevice = (
                     sig.device &&
                     sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key()
@@ -339,7 +357,7 @@ export default class SecureBackupPanel extends React.PureComponent {
                 }
 
                 return <div key={i}>
-                    {sigStatus}
+                    { sigStatus }
                 </div>;
             });
             if (backupSigStatus.sigs.length === 0) {
@@ -353,53 +371,53 @@ export default class SecureBackupPanel extends React.PureComponent {
 
             extraDetailsTableRows = <>
                 <tr>
-                    <td>{_t("Backup version:")}</td>
-                    <td>{backupInfo.version}</td>
+                    <td>{ _t("Backup version:") }</td>
+                    <td>{ backupInfo.version }</td>
                 </tr>
                 <tr>
-                    <td>{_t("Algorithm:")}</td>
-                    <td>{backupInfo.algorithm}</td>
+                    <td>{ _t("Algorithm:") }</td>
+                    <td>{ backupInfo.algorithm }</td>
                 </tr>
             </>;
 
             extraDetails = <>
-                {uploadStatus}
-                <div>{backupSigStatuses}</div>
-                <div>{trustedLocally}</div>
+                { uploadStatus }
+                <div>{ backupSigStatuses }</div>
+                <div>{ trustedLocally }</div>
             </>;
 
             actions.push(
-                <AccessibleButton key="restore" kind="primary" onClick={this._restoreBackup}>
-                    {restoreButtonCaption}
+                <AccessibleButton key="restore" kind="primary" onClick={this.restoreBackup}>
+                    { restoreButtonCaption }
                 </AccessibleButton>,
             );
 
             if (!isSecureBackupRequired()) {
                 actions.push(
-                    <AccessibleButton key="delete" kind="danger" onClick={this._deleteBackup}>
-                        {_t("Delete Backup")}
+                    <AccessibleButton key="delete" kind="danger" onClick={this.deleteBackup}>
+                        { _t("Delete Backup") }
                     </AccessibleButton>,
                 );
             }
         } else {
             statusDescription = <>
-                <p>{_t(
+                <p>{ _t(
                     "Your keys are <b>not being backed up from this session</b>.", {},
-                    {b: sub => <b>{sub}</b>},
-                )}</p>
-                <p>{_t("Back up your keys before signing out to avoid losing them.")}</p>
+                    { b: sub => <b>{ sub }</b> },
+                ) }</p>
+                <p>{ _t("Back up your keys before signing out to avoid losing them.") }</p>
             </>;
             actions.push(
-                <AccessibleButton key="setup" kind="primary" onClick={this._startNewBackup}>
-                    {_t("Set up")}
+                <AccessibleButton key="setup" kind="primary" onClick={this.startNewBackup}>
+                    { _t("Set up") }
                 </AccessibleButton>,
             );
         }
 
         if (secretStorageKeyInAccount) {
             actions.push(
-                <AccessibleButton key="reset" kind="danger" onClick={this._resetSecretStorage}>
-                    {_t("Reset")}
+                <AccessibleButton key="reset" kind="danger" onClick={this.resetSecretStorage}>
+                    { _t("Reset") }
                 </AccessibleButton>,
             );
         }
@@ -417,47 +435,47 @@ export default class SecureBackupPanel extends React.PureComponent {
         let actionRow;
         if (actions.length) {
             actionRow = <div className="mx_SecureBackupPanel_buttonRow">
-                {actions}
+                { actions }
             </div>;
         }
 
         return (
             <div>
-                <p>{_t(
+                <p>{ _t(
                     "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.",
-                )}</p>
-                {statusDescription}
+                ) }</p>
+                { statusDescription }
                 <details>
-                    <summary>{_t("Advanced")}</summary>
+                    <summary>{ _t("Advanced") }</summary>
                     <table className="mx_SecureBackupPanel_statusList"><tbody>
                         <tr>
-                            <td>{_t("Backup key stored:")}</td>
+                            <td>{ _t("Backup key stored:") }</td>
                             <td>{
                                 backupKeyStored === true ? _t("in secret storage") : _t("not stored")
                             }</td>
                         </tr>
                         <tr>
-                            <td>{_t("Backup key cached:")}</td>
+                            <td>{ _t("Backup key cached:") }</td>
                             <td>
-                                {backupKeyCached ? _t("cached locally") : _t("not found locally")}
-                                {backupKeyWellFormedText}
+                                { backupKeyCached ? _t("cached locally") : _t("not found locally") }
+                                { backupKeyWellFormedText }
                             </td>
                         </tr>
                         <tr>
-                            <td>{_t("Secret storage public key:")}</td>
-                            <td>{secretStorageKeyInAccount ? _t("in account data") : _t("not found")}</td>
+                            <td>{ _t("Secret storage public key:") }</td>
+                            <td>{ secretStorageKeyInAccount ? _t("in account data") : _t("not found") }</td>
                         </tr>
                         <tr>
-                            <td>{_t("Secret storage:")}</td>
-                            <td>{secretStorageReady ? _t("ready") : _t("not ready")}</td>
+                            <td>{ _t("Secret storage:") }</td>
+                            <td>{ secretStorageReady ? _t("ready") : _t("not ready") }</td>
                         </tr>
-                        {extraDetailsTableRows}
+                        { extraDetailsTableRows }
                     </tbody></table>
-                    {extraDetails}
+                    { extraDetails }
                 </details>
-                {actionRow}
+                { actionRow }
             </div>
         );
     }
diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx
index 05d1f83387..1f488f1e67 100644
--- a/src/components/views/settings/SetIdServer.tsx
+++ b/src/components/views/settings/SetIdServer.tsx
@@ -16,18 +16,21 @@ limitations under the License.
 
 import url from 'url';
 import React from 'react';
-import {_t} from "../../../languageHandler";
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { _t } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
 import dis from "../../../dispatcher/dispatcher";
 import { getThreepidsWithBindStatus } from '../../../boundThreepids';
 import IdentityAuthClient from "../../../IdentityAuthClient";
-import {abbreviateUrl, unabbreviateUrl} from "../../../utils/UrlUtils";
+import { abbreviateUrl, unabbreviateUrl } from "../../../utils/UrlUtils";
 import { getDefaultIdentityServerUrl, doesIdentityServerHaveTerms } from '../../../utils/IdentityServerUtils';
-import {timeout} from "../../../utils/promise";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { timeout } from "../../../utils/promise";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ActionPayload } from '../../../dispatcher/payloads';
+import InlineSpinner from '../elements/InlineSpinner';
+import AccessibleButton from '../elements/AccessibleButton';
+import Field from '../elements/Field';
+import QuestionDialog from "../dialogs/QuestionDialog";
 
 // We'll wait up to this long when checking for 3PID bindings on the IS.
 const REACHABILITY_TIMEOUT = 10000; // ms
@@ -41,7 +44,7 @@ const REACHABILITY_TIMEOUT = 10000; // ms
 async function checkIdentityServerUrl(u) {
     const parsedUrl = url.parse(u);
 
-    if (parsedUrl.protocol !== 'https:') return _t("Identity Server URL must be HTTPS");
+    if (parsedUrl.protocol !== 'https:') return _t("Identity server URL must be HTTPS");
 
     // XXX: duplicated logic from js-sdk but it's quite tied up in the validation logic in the
     // js-sdk so probably as easy to duplicate it than to separate it out so we can reuse it
@@ -50,17 +53,17 @@ async function checkIdentityServerUrl(u) {
         if (response.ok) {
             return null;
         } else if (response.status < 200 || response.status >= 300) {
-            return _t("Not a valid Identity Server (status code %(code)s)", {code: response.status});
+            return _t("Not a valid identity server (status code %(code)s)", { code: response.status });
         } else {
-            return _t("Could not connect to Identity Server");
+            return _t("Could not connect to identity server");
         }
     } catch (e) {
-        return _t("Could not connect to Identity Server");
+        return _t("Could not connect to identity server");
     }
 }
 
 interface IProps {
-    // Whether or not the ID server is missing terms. This affects the text
+    // Whether or not the identity server is missing terms. This affects the text
     // shown to the user.
     missingTerms: boolean;
 }
@@ -84,7 +87,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
 
         let defaultIdServer = '';
         if (!MatrixClientPeg.get().getIdentityServerUrl() && getDefaultIdentityServerUrl()) {
-            // If no ID server is configured but there's one in the config, prepopulate
+            // If no identity server is configured but there's one in the config, prepopulate
             // the field to help the user.
             defaultIdServer = abbreviateUrl(getDefaultIdentityServerUrl());
         }
@@ -109,7 +112,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
     }
 
     private onAction = (payload: ActionPayload) => {
-        // We react to changes in the ID server in the event the user is staring at this form
+        // We react to changes in the identity server in the event the user is staring at this form
         // when changing their identity server on another device.
         if (payload.action !== "id_server_changed") return;
 
@@ -121,18 +124,17 @@ export default class SetIdServer extends React.Component<IProps, IState> {
     private onIdentityServerChanged = (ev) => {
         const u = ev.target.value;
 
-        this.setState({idServer: u});
+        this.setState({ idServer: u });
     };
 
     private getTooltip = () => {
         if (this.state.checking) {
-            const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
             return <div>
                 <InlineSpinner />
                 { _t("Checking server") }
             </div>;
         } else if (this.state.error) {
-            return <span className='warning'>{this.state.error}</span>;
+            return <span className='warning'>{ this.state.error }</span>;
         } else {
             return null;
         }
@@ -159,14 +161,14 @@ export default class SetIdServer extends React.Component<IProps, IState> {
         e.preventDefault();
         const { idServer, currentClientIdServer } = this.state;
 
-        this.setState({busy: true, checking: true, error: null});
+        this.setState({ busy: true, checking: true, error: null });
 
         const fullUrl = unabbreviateUrl(idServer);
 
         let errStr = await checkIdentityServerUrl(fullUrl);
         if (!errStr) {
             try {
-                this.setState({checking: false}); // clear tooltip
+                this.setState({ checking: false }); // clear tooltip
 
                 // Test the identity server by trying to register with it. This
                 // may result in a terms of service prompt.
@@ -191,8 +193,8 @@ export default class SetIdServer extends React.Component<IProps, IState> {
                             "Disconnect from the identity server <current /> and " +
                             "connect to <new /> instead?", {},
                             {
-                                current: sub => <b>{abbreviateUrl(currentClientIdServer)}</b>,
-                                new: sub => <b>{abbreviateUrl(idServer)}</b>,
+                                current: sub => <b>{ abbreviateUrl(currentClientIdServer) }</b>,
+                                new: sub => <b>{ abbreviateUrl(idServer) }</b>,
                             },
                         ),
                         button: _t("Continue"),
@@ -217,16 +219,15 @@ export default class SetIdServer extends React.Component<IProps, IState> {
     };
 
     private showNoTermsWarning(fullUrl) {
-        const QuestionDialog = sdk.getComponent("views.dialogs.QuestionDialog");
         const { finished } = Modal.createTrackedDialog('No Terms Warning', '', QuestionDialog, {
             title: _t("Identity server has no terms of service"),
             description: (
                 <div>
                     <span className="warning">
-                        {_t("The identity server you have chosen does not have any terms of service.")}
+                        { _t("The identity server you have chosen does not have any terms of service.") }
                     </span>
                     <span>
-                        &nbsp;{_t("Only continue if you trust the owner of the server.")}
+                        &nbsp;{ _t("Only continue if you trust the owner of the server.") }
                     </span>
                 </div>
             ),
@@ -236,13 +237,13 @@ export default class SetIdServer extends React.Component<IProps, IState> {
     }
 
     private onDisconnectClicked = async () => {
-        this.setState({disconnectBusy: true});
+        this.setState({ disconnectBusy: true });
         try {
             const [confirmed] = await this.showServerChangeWarning({
                 title: _t("Disconnect identity server"),
                 unboundMessage: _t(
                     "Disconnect from the identity server <idserver />?", {},
-                    {idserver: sub => <b>{abbreviateUrl(this.state.currentClientIdServer)}</b>},
+                    { idserver: sub => <b>{ abbreviateUrl(this.state.currentClientIdServer) }</b> },
                 ),
                 button: _t("Disconnect"),
             });
@@ -250,7 +251,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
                 this.disconnectIdServer();
             }
         } finally {
-            this.setState({disconnectBusy: false});
+            this.setState({ disconnectBusy: false });
         }
     };
 
@@ -277,41 +278,41 @@ export default class SetIdServer extends React.Component<IProps, IState> {
         let message;
         let danger = false;
         const messageElements = {
-            idserver: sub => <b>{abbreviateUrl(currentClientIdServer)}</b>,
-            b: sub => <b>{sub}</b>,
+            idserver: sub => <b>{ abbreviateUrl(currentClientIdServer) }</b>,
+            b: sub => <b>{ sub }</b>,
         };
         if (!currentServerReachable) {
             message = <div>
-                <p>{_t(
+                <p>{ _t(
                     "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.",
                     {}, messageElements,
-                )}</p>
-                <p>{_t("You should:")}</p>
+                ) }</p>
+                <p>{ _t("You should:") }</p>
                 <ul>
-                    <li>{_t(
+                    <li>{ _t(
                         "check your browser plugins for anything that might block " +
                         "the identity server (such as Privacy Badger)",
-                    )}</li>
-                    <li>{_t("contact the administrators of identity server <idserver />", {}, {
+                    ) }</li>
+                    <li>{ _t("contact the administrators of identity server <idserver />", {}, {
                         idserver: messageElements.idserver,
-                    })}</li>
-                    <li>{_t("wait and try again later")}</li>
+                    }) }</li>
+                    <li>{ _t("wait and try again later") }</li>
                 </ul>
             </div>;
             danger = true;
             button = _t("Disconnect anyway");
         } else if (boundThreepids.length) {
             message = <div>
-                <p>{_t(
+                <p>{ _t(
                     "You are still <b>sharing your personal data</b> on the identity " +
                     "server <idserver />.", {}, messageElements,
-                )}</p>
-                <p>{_t(
+                ) }</p>
+                <p>{ _t(
                     "We recommend that you remove your email addresses and phone numbers " +
                     "from the identity server before disconnecting.",
-                )}</p>
+                ) }</p>
             </div>;
             danger = true;
             button = _t("Disconnect anyway");
@@ -319,7 +320,6 @@ export default class SetIdServer extends React.Component<IProps, IState> {
             message = unboundMessage;
         }
 
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const { finished } = Modal.createTrackedDialog('Identity Server Bound Warning', '', QuestionDialog, {
             title,
             description: message,
@@ -352,28 +352,26 @@ export default class SetIdServer extends React.Component<IProps, IState> {
     };
 
     render() {
-        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
-        const Field = sdk.getComponent('elements.Field');
         const idServerUrl = this.state.currentClientIdServer;
         let sectionTitle;
         let bodyText;
         if (idServerUrl) {
-            sectionTitle = _t("Identity Server (%(server)s)", { server: abbreviateUrl(idServerUrl) });
+            sectionTitle = _t("Identity server (%(server)s)", { server: abbreviateUrl(idServerUrl) });
             bodyText = _t(
                 "You are currently using <server></server> to discover and be discoverable by " +
                 "existing contacts you know. You can change your identity server below.",
                 {},
-                { server: sub => <b>{abbreviateUrl(idServerUrl)}</b> },
+                { server: sub => <b>{ abbreviateUrl(idServerUrl) }</b> },
             );
             if (this.props.missingTerms) {
                 bodyText = _t(
                     "If you don't want to use <server /> to discover and be discoverable by existing " +
                     "contacts you know, enter another identity server below.",
-                    {}, {server: sub => <b>{abbreviateUrl(idServerUrl)}</b>},
+                    {}, { server: sub => <b>{ abbreviateUrl(idServerUrl) }</b> },
                 );
             }
         } else {
-            sectionTitle = _t("Identity Server");
+            sectionTitle = _t("Identity server");
             bodyText = _t(
                 "You are not currently using an identity server. " +
                 "To discover and be discoverable by existing contacts you know, " +
@@ -398,13 +396,12 @@ export default class SetIdServer extends React.Component<IProps, IState> {
                 discoButtonContent = _t("Do not use an identity server");
             }
             if (this.state.disconnectBusy) {
-                const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
                 discoButtonContent = <InlineSpinner />;
             }
             discoSection = <div>
-                <span className="mx_SettingsTab_subsectionText">{discoBodyText}</span>
+                <span className="mx_SettingsTab_subsectionText">{ discoBodyText }</span>
                 <AccessibleButton onClick={this.onDisconnectClicked} kind="danger_sm">
-                    {discoButtonContent}
+                    { discoButtonContent }
                 </AccessibleButton>
             </div>;
         }
@@ -412,10 +409,10 @@ export default class SetIdServer extends React.Component<IProps, IState> {
         return (
             <form className="mx_SettingsTab_section mx_SetIdServer" onSubmit={this.checkIdServer}>
                 <span className="mx_SettingsTab_subheading">
-                    {sectionTitle}
+                    { sectionTitle }
                 </span>
                 <span className="mx_SettingsTab_subsectionText">
-                    {bodyText}
+                    { bodyText }
                 </span>
                 <Field
                     label={_t("Enter a new identity server")}
@@ -429,11 +426,13 @@ export default class SetIdServer extends React.Component<IProps, IState> {
                     disabled={this.state.busy}
                     forceValidity={this.state.error ? false : null}
                 />
-                <AccessibleButton type="submit" kind="primary_sm"
+                <AccessibleButton
+                    type="submit"
+                    kind="primary_sm"
                     onClick={this.checkIdServer}
                     disabled={!this.idServerChangeEnabled()}
-                >{_t("Change")}</AccessibleButton>
-                {discoSection}
+                >{ _t("Change") }</AccessibleButton>
+                { discoSection }
             </form>
         );
     }
diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.tsx
similarity index 66%
rename from src/components/views/settings/SetIntegrationManager.js
rename to src/components/views/settings/SetIntegrationManager.tsx
index 29cc5d7131..e083efae0e 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.tsx
@@ -15,17 +15,27 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../languageHandler";
-import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
+import { _t } from "../../../languageHandler";
+import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
+import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
 import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
-import {SettingLevel} from "../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+
+}
+
+interface IState {
+    currentManager: IntegrationManagerInstance;
+    provisioningEnabled: boolean;
+}
 
 @replaceableComponent("views.settings.SetIntegrationManager")
-export default class SetIntegrationManager extends React.Component {
-    constructor() {
-        super();
+export default class SetIntegrationManager extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
 
         const currentManager = IntegrationManagers.sharedInstance().getPrimaryManager();
 
@@ -35,18 +45,18 @@ export default class SetIntegrationManager extends React.Component {
         };
     }
 
-    onProvisioningToggled = () => {
+    private onProvisioningToggled = (): void => {
         const current = this.state.provisioningEnabled;
         SettingsStore.setValue("integrationProvisioning", null, SettingLevel.ACCOUNT, !current).catch(err => {
             console.error("Error changing integration manager provisioning");
             console.error(err);
 
-            this.setState({provisioningEnabled: current});
+            this.setState({ provisioningEnabled: current });
         });
-        this.setState({provisioningEnabled: !current});
+        this.setState({ provisioningEnabled: !current });
     };
 
-    render() {
+    public render(): React.ReactNode {
         const ToggleSwitch = sdk.getComponent("views.elements.ToggleSwitch");
 
         const currentManager = this.state.currentManager;
@@ -55,30 +65,30 @@ export default class SetIntegrationManager extends React.Component {
         if (currentManager) {
             managerName = `(${currentManager.name})`;
             bodyText = _t(
-                "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, " +
+                "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, " +
                 "and sticker packs.",
-                {serverName: currentManager.name},
-                { b: sub => <b>{sub}</b> },
+                { serverName: currentManager.name },
+                { b: sub => <b>{ sub }</b> },
             );
         } else {
-            bodyText = _t("Use an Integration Manager to manage bots, widgets, and sticker packs.");
+            bodyText = _t("Use an integration manager to manage bots, widgets, and sticker packs.");
         }
 
         return (
             <div className='mx_SetIntegrationManager'>
                 <div className="mx_SettingsTab_heading">
-                    <span>{_t("Manage integrations")}</span>
-                    <span className="mx_SettingsTab_subheading">{managerName}</span>
+                    <span>{ _t("Manage integrations") }</span>
+                    <span className="mx_SettingsTab_subheading">{ managerName }</span>
                     <ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
                 </div>
                 <span className="mx_SettingsTab_subsectionText">
-                    {bodyText}
+                    { bodyText }
                     <br />
                     <br />
-                    {_t(
-                        "Integration Managers receive configuration data, and can modify widgets, " +
+                    { _t(
+                        "Integration managers receive configuration data, and can modify widgets, " +
                         "send room invites, and set power levels on your behalf.",
-                    )}
+                    ) }
                 </span>
             </div>
         );
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index e5455c8c68..c653b272c8 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -17,25 +17,25 @@ limitations under the License.
 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";
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface ExistingSpellCheckLanguageIProps {
-    language: string,
-    onRemoved(language: string),
+    language: string;
+    onRemoved(language: string);
 }
 
 interface SpellCheckLanguagesIProps {
-    languages: Array<string>,
-    onLanguagesChange(languages: Array<string>),
+    languages: Array<string>;
+    onLanguagesChange(languages: Array<string>);
 }
 
 interface SpellCheckLanguagesIState {
-    newLanguage: string,
+    newLanguage: string;
 }
 
 export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellCheckLanguageIProps> {
-    _onRemove = (e) => {
+    private onRemove = (e) => {
         e.stopPropagation();
         e.preventDefault();
 
@@ -45,9 +45,9 @@ export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellChe
     render() {
         return (
             <div className="mx_ExistingSpellCheckLanguage">
-                <span className="mx_ExistingSpellCheckLanguage_language">{this.props.language}</span>
-                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
-                    {_t("Remove")}
+                <span className="mx_ExistingSpellCheckLanguage_language">{ this.props.language }</span>
+                <AccessibleButton onClick={this.onRemove} kind="danger_sm">
+                    { _t("Remove") }
                 </AccessibleButton>
             </div>
         );
@@ -60,15 +60,15 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
         super(props);
         this.state = {
             newLanguage: "",
-        }
+        };
     }
 
-    _onRemoved = (language) => {
+    private onRemoved = (language: string) => {
         const languages = this.props.languages.filter((e) => e !== language);
         this.props.onLanguagesChange(languages);
     };
 
-    _onAddClick = (e) => {
+    private onAddClick = (e) => {
         e.stopPropagation();
         e.preventDefault();
 
@@ -77,35 +77,35 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
         if (!language) return;
         if (this.props.languages.includes(language)) return;
 
-        this.props.languages.push(language)
+        this.props.languages.push(language);
         this.props.onLanguagesChange(this.props.languages);
     };
 
-    _onNewLanguageChange = (language: string) => {
+    private onNewLanguageChange = (language: string) => {
         if (this.state.newLanguage === language) return;
-        this.setState({newLanguage: language});
+        this.setState({ newLanguage: language });
     };
 
     render() {
         const existingSpellCheckLanguages = this.props.languages.map((e) => {
-            return <ExistingSpellCheckLanguage language={e} onRemoved={this._onRemoved} key={e} />;
+            return <ExistingSpellCheckLanguage language={e} onRemoved={this.onRemoved} key={e} />;
         });
 
         const addButton = (
-            <AccessibleButton onClick={this._onAddClick} kind="primary">
-                {_t("Add")}
+            <AccessibleButton onClick={this.onAddClick} kind="primary">
+                { _t("Add") }
             </AccessibleButton>
         );
 
         return (
             <div className="mx_SpellCheckLanguages">
-                {existingSpellCheckLanguages}
-                <form onSubmit={this._onAddClick} noValidate={true}>
+                { existingSpellCheckLanguages }
+                <form onSubmit={this.onAddClick} noValidate={true}>
                     <SpellCheckLanguagesDropdown
                         className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
                         value={this.state.newLanguage}
-                        onOptionChange={this._onNewLanguageChange} />
-                    {addButton}
+                        onOptionChange={this.onNewLanguageChange} />
+                    { addButton }
                 </form>
             </div>
         );
diff --git a/src/components/views/settings/UpdateCheckButton.tsx b/src/components/views/settings/UpdateCheckButton.tsx
index eb1b762423..9d88e079a7 100644
--- a/src/components/views/settings/UpdateCheckButton.tsx
+++ b/src/components/views/settings/UpdateCheckButton.tsx
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState} from "react";
+import React, { useState } from "react";
 
-import {UpdateCheckStatus} from "../../../BasePlatform";
+import { UpdateCheckStatus } from "../../../BasePlatform";
 import PlatformPeg from "../../../PlatformPeg";
-import {useDispatcher} from "../../../hooks/useDispatcher";
+import { useDispatcher } from "../../../hooks/useDispatcher";
 import dis from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
-import {_t} from "../../../languageHandler";
+import { Action } from "../../../dispatcher/actions";
+import { _t } from "../../../languageHandler";
 import InlineSpinner from "../../../components/views/elements/InlineSpinner";
 import AccessibleButton from "../../../components/views/elements/AccessibleButton";
-import {CheckUpdatesPayload} from "../../../dispatcher/payloads/CheckUpdatesPayload";
+import { CheckUpdatesPayload } from "../../../dispatcher/payloads/CheckUpdatesPayload";
 
 function installUpdate() {
     PlatformPeg.get().installUpdate();
@@ -42,7 +42,7 @@ function getStatusText(status: UpdateCheckStatus, errorDetail?: string) {
             return _t('Downloading update...');
         case UpdateCheckStatus.Ready:
             return _t("New version available. <a>Update now.</a>", {}, {
-                a: sub => <AccessibleButton kind="link" onClick={installUpdate}>{sub}</AccessibleButton>,
+                a: sub => <AccessibleButton kind="link" onClick={installUpdate}>{ sub }</AccessibleButton>,
             });
     }
 }
@@ -61,7 +61,7 @@ const UpdateCheckButton = () => {
         PlatformPeg.get().startUpdateCheck();
     };
 
-    useDispatcher(dis, ({action, ...params}) => {
+    useDispatcher(dis, ({ action, ...params }) => {
         if (action === Action.CheckUpdates) {
             setState(params as CheckUpdatesPayload);
         }
@@ -72,14 +72,14 @@ const UpdateCheckButton = () => {
     let suffix;
     if (state) {
         suffix = <span className="mx_UpdateCheckButton_summary">
-            {getStatusText(state.status, state.detail)}
-            {busy && <InlineSpinner />}
+            { getStatusText(state.status, state.detail) }
+            { busy && <InlineSpinner /> }
         </span>;
     }
 
     return <React.Fragment>
         <AccessibleButton onClick={onCheckForUpdateClick} kind="primary" disabled={busy}>
-            {_t("Check for update")}
+            { _t("Check for update") }
         </AccessibleButton>
         { suffix }
     </React.Fragment>;
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.tsx
similarity index 70%
rename from src/components/views/settings/account/EmailAddresses.js
rename to src/components/views/settings/account/EmailAddresses.tsx
index a36369cf88..df440ebde0 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.tsx
@@ -16,16 +16,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../MatrixClientPeg";
+import { _t } from "../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 import * as Email from "../../../../email";
 import AddThreepid from "../../../../AddThreepid";
-import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+import ErrorDialog from "../../dialogs/ErrorDialog";
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -39,42 +39,45 @@ places to communicate errors - these should be replaced with inline validation w
 that is available.
  */
 
-export class ExistingEmailAddress extends React.Component {
-    static propTypes = {
-        email: PropTypes.object.isRequired,
-        onRemoved: PropTypes.func.isRequired,
-    };
+interface IExistingEmailAddressProps {
+    email: IThreepid;
+    onRemoved: (emails: IThreepid) => void;
+}
 
-    constructor() {
-        super();
+interface IExistingEmailAddressState {
+    verifyRemove: boolean;
+}
+
+export class ExistingEmailAddress extends React.Component<IExistingEmailAddressProps, IExistingEmailAddressState> {
+    constructor(props: IExistingEmailAddressProps) {
+        super(props);
 
         this.state = {
             verifyRemove: false,
         };
     }
 
-    _onRemove = (e) => {
+    private onRemove = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
-        this.setState({verifyRemove: true});
+        this.setState({ verifyRemove: true });
     };
 
-    _onDontRemove = (e) => {
+    private onDontRemove = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
-        this.setState({verifyRemove: false});
+        this.setState({ verifyRemove: false });
     };
 
-    _onActuallyRemove = (e) => {
+    private onActuallyRemove = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
         MatrixClientPeg.get().deleteThreePid(this.props.email.medium, this.props.email.address).then(() => {
             return this.props.onRemoved(this.props.email);
         }).catch((err) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Unable to remove contact information: " + err);
             Modal.createTrackedDialog('Remove 3pid failed', '', ErrorDialog, {
                 title: _t("Unable to remove contact information"),
@@ -83,26 +86,26 @@ export class ExistingEmailAddress extends React.Component {
         });
     };
 
-    render() {
+    public render(): JSX.Element {
         if (this.state.verifyRemove) {
             return (
                 <div className="mx_ExistingEmailAddress">
                     <span className="mx_ExistingEmailAddress_promptText">
-                        {_t("Remove %(email)s?", {email: this.props.email.address} )}
+                        { _t("Remove %(email)s?", { email: this.props.email.address } ) }
                     </span>
                     <AccessibleButton
-                        onClick={this._onActuallyRemove}
+                        onClick={this.onActuallyRemove}
                         kind="danger_sm"
                         className="mx_ExistingEmailAddress_confirmBtn"
                     >
-                        {_t("Remove")}
+                        { _t("Remove") }
                     </AccessibleButton>
                     <AccessibleButton
-                        onClick={this._onDontRemove}
+                        onClick={this.onDontRemove}
                         kind="link_sm"
                         className="mx_ExistingEmailAddress_confirmBtn"
                     >
-                        {_t("Cancel")}
+                        { _t("Cancel") }
                     </AccessibleButton>
                 </div>
             );
@@ -110,23 +113,30 @@ export class ExistingEmailAddress extends React.Component {
 
         return (
             <div className="mx_ExistingEmailAddress">
-                <span className="mx_ExistingEmailAddress_email">{this.props.email.address}</span>
-                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
-                    {_t("Remove")}
+                <span className="mx_ExistingEmailAddress_email">{ this.props.email.address }</span>
+                <AccessibleButton onClick={this.onRemove} kind="danger_sm">
+                    { _t("Remove") }
                 </AccessibleButton>
             </div>
         );
     }
 }
 
-@replaceableComponent("views.settings.account.EmailAddresses")
-export default class EmailAddresses extends React.Component {
-    static propTypes = {
-        emails: PropTypes.array.isRequired,
-        onEmailsChange: PropTypes.func.isRequired,
-    }
+interface IProps {
+    emails: IThreepid[];
+    onEmailsChange: (emails: Partial<IThreepid>[]) => void;
+}
 
-    constructor(props) {
+interface IState {
+    verifying: boolean;
+    addTask: any; // FIXME: When AddThreepid is TSfied
+    continueDisabled: boolean;
+    newEmailAddress: string;
+}
+
+@replaceableComponent("views.settings.account.EmailAddresses")
+export default class EmailAddresses extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -137,24 +147,23 @@ export default class EmailAddresses extends React.Component {
         };
     }
 
-    _onRemoved = (address) => {
+    private onRemoved = (address): void => {
         const emails = this.props.emails.filter((e) => e !== address);
         this.props.onEmailsChange(emails);
     };
 
-    _onChangeNewEmailAddress = (e) => {
+    private onChangeNewEmailAddress = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             newEmailAddress: e.target.value,
         });
     };
 
-    _onAddClick = (e) => {
+    private onAddClick = (e: React.FormEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
         if (!this.state.newEmailAddress) return;
 
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const email = this.state.newEmailAddress;
 
         // TODO: Inline field validation
@@ -167,13 +176,13 @@ export default class EmailAddresses extends React.Component {
         }
 
         const task = new AddThreepid();
-        this.setState({verifying: true, continueDisabled: true, addTask: task});
+        this.setState({ verifying: true, continueDisabled: true, addTask: task });
 
         task.addEmailAddress(email).then(() => {
-            this.setState({continueDisabled: false});
+            this.setState({ continueDisabled: false });
         }).catch((err) => {
             console.error("Unable to add email address " + email + " " + err);
-            this.setState({verifying: false, continueDisabled: false, addTask: null});
+            this.setState({ verifying: false, continueDisabled: false, addTask: null });
             Modal.createTrackedDialog('Unable to add email address', '', ErrorDialog, {
                 title: _t("Unable to add email address"),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
@@ -181,18 +190,18 @@ export default class EmailAddresses extends React.Component {
         });
     };
 
-    _onContinueClick = (e) => {
+    private onContinueClick = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
-        this.setState({continueDisabled: true});
+        this.setState({ continueDisabled: true });
         this.state.addTask.checkEmailLinkClicked().then(([finished]) => {
             let newEmailAddress = this.state.newEmailAddress;
             if (finished) {
                 const email = this.state.newEmailAddress;
                 const emails = [
                     ...this.props.emails,
-                    { address: email, medium: "email" },
+                    { address: email, medium: ThreepidMedium.Email },
                 ];
                 this.props.onEmailsChange(emails);
                 newEmailAddress = "";
@@ -204,8 +213,7 @@ export default class EmailAddresses extends React.Component {
                 newEmailAddress,
             });
         }).catch((err) => {
-            this.setState({continueDisabled: false});
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            this.setState({ continueDisabled: false });
             if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
                 Modal.createTrackedDialog("Email hasn't been verified yet", "", ErrorDialog, {
                     title: _t("Your email address hasn't been verified yet"),
@@ -222,26 +230,26 @@ export default class EmailAddresses extends React.Component {
         });
     };
 
-    render() {
+    public render(): JSX.Element {
         const existingEmailElements = this.props.emails.map((e) => {
-            return <ExistingEmailAddress email={e} onRemoved={this._onRemoved} key={e.address} />;
+            return <ExistingEmailAddress email={e} onRemoved={this.onRemoved} key={e.address} />;
         });
 
         let addButton = (
-            <AccessibleButton onClick={this._onAddClick} kind="primary">
-                {_t("Add")}
+            <AccessibleButton onClick={this.onAddClick} kind="primary">
+                { _t("Add") }
             </AccessibleButton>
         );
         if (this.state.verifying) {
             addButton = (
                 <div>
-                    <div>{_t("We've sent you an email to verify your address. Please follow the instructions there and then click the button below.")}</div>
+                    <div>{ _t("We've sent you an email to verify your address. Please follow the instructions there and then click the button below.") }</div>
                     <AccessibleButton
-                        onClick={this._onContinueClick}
+                        onClick={this.onContinueClick}
                         kind="primary"
                         disabled={this.state.continueDisabled}
                     >
-                        {_t("Continue")}
+                        { _t("Continue") }
                     </AccessibleButton>
                 </div>
             );
@@ -249,9 +257,9 @@ export default class EmailAddresses extends React.Component {
 
         return (
             <div className="mx_EmailAddresses">
-                {existingEmailElements}
+                { existingEmailElements }
                 <form
-                    onSubmit={this._onAddClick}
+                    onSubmit={this.onAddClick}
                     autoComplete="off"
                     noValidate={true}
                     className="mx_EmailAddresses_new"
@@ -262,9 +270,9 @@ export default class EmailAddresses extends React.Component {
                         autoComplete="off"
                         disabled={this.state.verifying}
                         value={this.state.newEmailAddress}
-                        onChange={this._onChangeNewEmailAddress}
+                        onChange={this.onChangeNewEmailAddress}
                     />
-                    {addButton}
+                    { addButton }
                 </form>
             </div>
         );
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.tsx
similarity index 65%
rename from src/components/views/settings/account/PhoneNumbers.js
rename to src/components/views/settings/account/PhoneNumbers.tsx
index e154068128..e5cca72867 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.tsx
@@ -16,16 +16,17 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../MatrixClientPeg";
+import { _t } from "../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 import AddThreepid from "../../../../AddThreepid";
 import CountryDropdown from "../../auth/CountryDropdown";
-import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import ErrorDialog from "../../dialogs/ErrorDialog";
+import { PhoneNumberCountryDefinition } from "../../../../phonenumber";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -34,42 +35,45 @@ This is a copy/paste of EmailAddresses, mostly.
 
 // TODO: Combine EmailAddresses and PhoneNumbers to be 3pid agnostic
 
-export class ExistingPhoneNumber extends React.Component {
-    static propTypes = {
-        msisdn: PropTypes.object.isRequired,
-        onRemoved: PropTypes.func.isRequired,
-    };
+interface IExistingPhoneNumberProps {
+    msisdn: IThreepid;
+    onRemoved: (phoneNumber: IThreepid) => void;
+}
 
-    constructor() {
-        super();
+interface IExistingPhoneNumberState {
+    verifyRemove: boolean;
+}
+
+export class ExistingPhoneNumber extends React.Component<IExistingPhoneNumberProps, IExistingPhoneNumberState> {
+    constructor(props: IExistingPhoneNumberProps) {
+        super(props);
 
         this.state = {
             verifyRemove: false,
         };
     }
 
-    _onRemove = (e) => {
+    private onRemove = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
-        this.setState({verifyRemove: true});
+        this.setState({ verifyRemove: true });
     };
 
-    _onDontRemove = (e) => {
+    private onDontRemove = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
-        this.setState({verifyRemove: false});
+        this.setState({ verifyRemove: false });
     };
 
-    _onActuallyRemove = (e) => {
+    private onActuallyRemove = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
         MatrixClientPeg.get().deleteThreePid(this.props.msisdn.medium, this.props.msisdn.address).then(() => {
             return this.props.onRemoved(this.props.msisdn);
         }).catch((err) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Unable to remove contact information: " + err);
             Modal.createTrackedDialog('Remove 3pid failed', '', ErrorDialog, {
                 title: _t("Unable to remove contact information"),
@@ -78,26 +82,26 @@ export class ExistingPhoneNumber extends React.Component {
         });
     };
 
-    render() {
+    public render(): JSX.Element {
         if (this.state.verifyRemove) {
             return (
                 <div className="mx_ExistingPhoneNumber">
                     <span className="mx_ExistingPhoneNumber_promptText">
-                        {_t("Remove %(phone)s?", {phone: this.props.msisdn.address})}
+                        { _t("Remove %(phone)s?", { phone: this.props.msisdn.address }) }
                     </span>
                     <AccessibleButton
-                        onClick={this._onActuallyRemove}
+                        onClick={this.onActuallyRemove}
                         kind="danger_sm"
                         className="mx_ExistingPhoneNumber_confirmBtn"
                     >
-                        {_t("Remove")}
+                        { _t("Remove") }
                     </AccessibleButton>
                     <AccessibleButton
-                        onClick={this._onDontRemove}
+                        onClick={this.onDontRemove}
                         kind="link_sm"
                         className="mx_ExistingPhoneNumber_confirmBtn"
                     >
-                        {_t("Cancel")}
+                        { _t("Cancel") }
                     </AccessibleButton>
                 </div>
             );
@@ -105,28 +109,39 @@ export class ExistingPhoneNumber extends React.Component {
 
         return (
             <div className="mx_ExistingPhoneNumber">
-                <span className="mx_ExistingPhoneNumber_address">+{this.props.msisdn.address}</span>
-                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
-                    {_t("Remove")}
+                <span className="mx_ExistingPhoneNumber_address">+{ this.props.msisdn.address }</span>
+                <AccessibleButton onClick={this.onRemove} kind="danger_sm">
+                    { _t("Remove") }
                 </AccessibleButton>
             </div>
         );
     }
 }
 
-@replaceableComponent("views.settings.account.PhoneNumbers")
-export default class PhoneNumbers extends React.Component {
-    static propTypes = {
-        msisdns: PropTypes.array.isRequired,
-        onMsisdnsChange: PropTypes.func.isRequired,
-    }
+interface IProps {
+    msisdns: IThreepid[];
+    onMsisdnsChange: (phoneNumbers: Partial<IThreepid>[]) => void;
+}
 
-    constructor(props) {
+interface IState {
+    verifying: boolean;
+    verifyError: string;
+    verifyMsisdn: string;
+    addTask: any; // FIXME: When AddThreepid is TSfied
+    continueDisabled: boolean;
+    phoneCountry: string;
+    newPhoneNumber: string;
+    newPhoneNumberCode: string;
+}
+
+@replaceableComponent("views.settings.account.PhoneNumbers")
+export default class PhoneNumbers extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
             verifying: false,
-            verifyError: false,
+            verifyError: null,
             verifyMsisdn: "",
             addTask: null,
             continueDisabled: false,
@@ -136,41 +151,40 @@ export default class PhoneNumbers extends React.Component {
         };
     }
 
-    _onRemoved = (address) => {
+    private onRemoved = (address: IThreepid): void => {
         const msisdns = this.props.msisdns.filter((e) => e !== address);
         this.props.onMsisdnsChange(msisdns);
     };
 
-    _onChangeNewPhoneNumber = (e) => {
+    private onChangeNewPhoneNumber = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             newPhoneNumber: e.target.value,
         });
     };
 
-    _onChangeNewPhoneNumberCode = (e) => {
+    private onChangeNewPhoneNumberCode = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             newPhoneNumberCode: e.target.value,
         });
     };
 
-    _onAddClick = (e) => {
+    private onAddClick = (e: React.MouseEvent | React.FormEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
         if (!this.state.newPhoneNumber) return;
 
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const phoneNumber = this.state.newPhoneNumber;
         const phoneCountry = this.state.phoneCountry;
 
         const task = new AddThreepid();
-        this.setState({verifying: true, continueDisabled: true, addTask: task});
+        this.setState({ verifying: true, continueDisabled: true, addTask: task });
 
         task.addMsisdn(phoneCountry, phoneNumber).then((response) => {
-            this.setState({continueDisabled: false, verifyMsisdn: response.msisdn});
+            this.setState({ continueDisabled: false, verifyMsisdn: response.msisdn });
         }).catch((err) => {
             console.error("Unable to add phone number " + phoneNumber + " " + err);
-            this.setState({verifying: false, continueDisabled: false, addTask: null});
+            this.setState({ verifying: false, continueDisabled: false, addTask: null });
             Modal.createTrackedDialog('Add Phone Number Error', '', ErrorDialog, {
                 title: _t("Error"),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
@@ -178,11 +192,11 @@ export default class PhoneNumbers extends React.Component {
         });
     };
 
-    _onContinueClick = (e) => {
+    private onContinueClick = (e: React.MouseEvent | React.FormEvent): void => {
         e.stopPropagation();
         e.preventDefault();
 
-        this.setState({continueDisabled: true});
+        this.setState({ continueDisabled: true });
         const token = this.state.newPhoneNumberCode;
         const address = this.state.verifyMsisdn;
         this.state.addTask.haveMsisdnToken(token).then(([finished]) => {
@@ -190,7 +204,7 @@ export default class PhoneNumbers extends React.Component {
             if (finished) {
                 const msisdns = [
                     ...this.props.msisdns,
-                    { address, medium: "msisdn" },
+                    { address, medium: ThreepidMedium.Phone },
                 ];
                 this.props.onMsisdnsChange(msisdns);
                 newPhoneNumber = "";
@@ -205,32 +219,31 @@ export default class PhoneNumbers extends React.Component {
                 newPhoneNumberCode: "",
             });
         }).catch((err) => {
-            this.setState({continueDisabled: false});
+            this.setState({ continueDisabled: false });
             if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Unable to verify phone number: " + err);
                 Modal.createTrackedDialog('Unable to verify phone number', '', ErrorDialog, {
                     title: _t("Unable to verify phone number."),
                     description: ((err && err.message) ? err.message : _t("Operation failed")),
                 });
             } else {
-                this.setState({verifyError: _t("Incorrect verification code")});
+                this.setState({ verifyError: _t("Incorrect verification code") });
             }
         });
     };
 
-    _onCountryChanged = (e) => {
-        this.setState({phoneCountry: e.iso2});
+    private onCountryChanged = (country: PhoneNumberCountryDefinition): void => {
+        this.setState({ phoneCountry: country.iso2 });
     };
 
-    render() {
+    public render(): JSX.Element {
         const existingPhoneElements = this.props.msisdns.map((p) => {
-            return <ExistingPhoneNumber msisdn={p} onRemoved={this._onRemoved} key={p.address} />;
+            return <ExistingPhoneNumber msisdn={p} onRemoved={this.onRemoved} key={p.address} />;
         });
 
         let addVerifySection = (
-            <AccessibleButton onClick={this._onAddClick} kind="primary">
-                {_t("Add")}
+            <AccessibleButton onClick={this.onAddClick} kind="primary">
+                { _t("Add") }
             </AccessibleButton>
         );
         if (this.state.verifying) {
@@ -238,33 +251,33 @@ export default class PhoneNumbers extends React.Component {
             addVerifySection = (
                 <div>
                     <div>
-                        {_t("A text message has been sent to +%(msisdn)s. " +
-                            "Please enter the verification code it contains.", { msisdn: msisdn })}
+                        { _t("A text message has been sent to +%(msisdn)s. " +
+                            "Please enter the verification code it contains.", { msisdn: msisdn }) }
                         <br />
-                        {this.state.verifyError}
+                        { this.state.verifyError }
                     </div>
-                    <form onSubmit={this._onContinueClick} autoComplete="off" noValidate={true}>
+                    <form onSubmit={this.onContinueClick} autoComplete="off" noValidate={true}>
                         <Field
                             type="text"
                             label={_t("Verification code")}
                             autoComplete="off"
                             disabled={this.state.continueDisabled}
                             value={this.state.newPhoneNumberCode}
-                            onChange={this._onChangeNewPhoneNumberCode}
+                            onChange={this.onChangeNewPhoneNumberCode}
                         />
                         <AccessibleButton
-                            onClick={this._onContinueClick}
+                            onClick={this.onContinueClick}
                             kind="primary"
                             disabled={this.state.continueDisabled}
                         >
-                            {_t("Continue")}
+                            { _t("Continue") }
                         </AccessibleButton>
                     </form>
                 </div>
             );
         }
 
-        const phoneCountry = <CountryDropdown onOptionChange={this._onCountryChanged}
+        const phoneCountry = <CountryDropdown onOptionChange={this.onCountryChanged}
             className="mx_PhoneNumbers_country"
             value={this.state.phoneCountry}
             disabled={this.state.verifying}
@@ -274,8 +287,8 @@ export default class PhoneNumbers extends React.Component {
 
         return (
             <div className="mx_PhoneNumbers">
-                {existingPhoneElements}
-                <form onSubmit={this._onAddClick} autoComplete="off" noValidate={true} className="mx_PhoneNumbers_new">
+                { existingPhoneElements }
+                <form onSubmit={this.onAddClick} autoComplete="off" noValidate={true} className="mx_PhoneNumbers_new">
                     <div className="mx_PhoneNumbers_input">
                         <Field
                             type="text"
@@ -284,11 +297,11 @@ export default class PhoneNumbers extends React.Component {
                             disabled={this.state.verifying}
                             prefixComponent={phoneCountry}
                             value={this.state.newPhoneNumber}
-                            onChange={this._onChangeNewPhoneNumber}
+                            onChange={this.onChangeNewPhoneNumber}
                         />
                     </div>
                 </form>
-                {addVerifySection}
+                { addVerifySection }
             </div>
         );
     }
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.tsx
similarity index 81%
rename from src/components/views/settings/discovery/EmailAddresses.js
rename to src/components/views/settings/discovery/EmailAddresses.tsx
index b8d91aae2a..e1fe1ad1fd 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.tsx
@@ -16,14 +16,15 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { _t } from "../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../MatrixClientPeg";
-import * as sdk from '../../../../index';
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import ErrorDialog from "../../dialogs/ErrorDialog";
+import AccessibleButton from "../../elements/AccessibleButton";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -41,12 +42,19 @@ that is available.
 TODO: Reduce all the copying between account vs. discovery components.
 */
 
-export class EmailAddress extends React.Component {
-    static propTypes = {
-        email: PropTypes.object.isRequired,
-    };
+interface IEmailAddressProps {
+    email: IThreepid;
+}
 
-    constructor(props) {
+interface IEmailAddressState {
+    verifying: boolean;
+    addTask: any; // FIXME: When AddThreepid is TSfied
+    continueDisabled: boolean;
+    bound: boolean;
+}
+
+export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddressState> {
+    constructor(props: IEmailAddressProps) {
         super(props);
 
         const { bound } = props.email;
@@ -60,17 +68,17 @@ export class EmailAddress extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
+    // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+    public UNSAFE_componentWillReceiveProps(nextProps: IEmailAddressProps): void {
         const { bound } = nextProps.email;
         this.setState({ bound });
     }
 
-    async changeBinding({ bind, label, errorTitle }) {
+    private async changeBinding({ bind, label, errorTitle }): Promise<void> {
         if (!await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
             return this.changeBindingTangledAddBind({ bind, label, errorTitle });
         }
 
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const { medium, address } = this.props.email;
 
         try {
@@ -103,8 +111,7 @@ export class EmailAddress extends React.Component {
         }
     }
 
-    async changeBindingTangledAddBind({ bind, label, errorTitle }) {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+    private async changeBindingTangledAddBind({ bind, label, errorTitle }): Promise<void> {
         const { medium, address } = this.props.email;
 
         const task = new AddThreepid();
@@ -139,7 +146,7 @@ export class EmailAddress extends React.Component {
         }
     }
 
-    onRevokeClick = (e) => {
+    private onRevokeClick = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
         this.changeBinding({
@@ -147,9 +154,9 @@ export class EmailAddress extends React.Component {
             label: "revoke",
             errorTitle: _t("Unable to revoke sharing for email address"),
         });
-    }
+    };
 
-    onShareClick = (e) => {
+    private onShareClick = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
         this.changeBinding({
@@ -157,9 +164,9 @@ export class EmailAddress extends React.Component {
             label: "share",
             errorTitle: _t("Unable to share email address"),
         });
-    }
+    };
 
-    onContinueClick = async (e) => {
+    private onContinueClick = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
@@ -173,7 +180,6 @@ export class EmailAddress extends React.Component {
             });
         } catch (err) {
             this.setState({ continueDisabled: false });
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
                 Modal.createTrackedDialog("E-mail hasn't been verified yet", "", ErrorDialog, {
                     title: _t("Your email address hasn't been verified yet"),
@@ -188,24 +194,23 @@ export class EmailAddress extends React.Component {
                 });
             }
         }
-    }
+    };
 
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+    public render(): JSX.Element {
         const { address } = this.props.email;
         const { verifying, bound } = this.state;
 
         let status;
         if (verifying) {
             status = <span>
-                {_t("Verify the link in your inbox")}
+                { _t("Verify the link in your inbox") }
                 <AccessibleButton
                     className="mx_ExistingEmailAddress_confirmBtn"
                     kind="primary_sm"
                     onClick={this.onContinueClick}
                     disabled={this.state.continueDisabled}
                 >
-                    {_t("Complete")}
+                    { _t("Complete") }
                 </AccessibleButton>
             </span>;
         } else if (bound) {
@@ -214,7 +219,7 @@ export class EmailAddress extends React.Component {
                 kind="danger_sm"
                 onClick={this.onRevokeClick}
             >
-                {_t("Revoke")}
+                { _t("Revoke") }
             </AccessibleButton>;
         } else {
             status = <AccessibleButton
@@ -222,26 +227,25 @@ export class EmailAddress extends React.Component {
                 kind="primary_sm"
                 onClick={this.onShareClick}
             >
-                {_t("Share")}
+                { _t("Share") }
             </AccessibleButton>;
         }
 
         return (
             <div className="mx_ExistingEmailAddress">
-                <span className="mx_ExistingEmailAddress_email">{address}</span>
-                {status}
+                <span className="mx_ExistingEmailAddress_email">{ address }</span>
+                { status }
             </div>
         );
     }
 }
+interface IProps {
+    emails: IThreepid[];
+}
 
 @replaceableComponent("views.settings.discovery.EmailAddresses")
-export default class EmailAddresses extends React.Component {
-    static propTypes = {
-        emails: PropTypes.array.isRequired,
-    }
-
-    render() {
+export default class EmailAddresses extends React.Component<IProps> {
+    public render(): JSX.Element {
         let content;
         if (this.props.emails.length > 0) {
             content = this.props.emails.map((e) => {
@@ -249,13 +253,13 @@ export default class EmailAddresses extends React.Component {
             });
         } else {
             content = <span className="mx_SettingsTab_subsectionText">
-                {_t("Discovery options will appear once you have added an email above.")}
+                { _t("Discovery options will appear once you have added an email above.") }
             </span>;
         }
 
         return (
             <div className="mx_EmailAddresses">
-                {content}
+                { content }
             </div>
         );
     }
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.tsx
similarity index 78%
rename from src/components/views/settings/discovery/PhoneNumbers.js
rename to src/components/views/settings/discovery/PhoneNumbers.tsx
index 5cbcdfe47e..3abf1e3f6c 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.tsx
@@ -16,14 +16,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { _t } from "../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../MatrixClientPeg";
-import * as sdk from '../../../../index';
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
-import {replaceableComponent} from "../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../utils/replaceableComponent";
+import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import ErrorDialog from "../../dialogs/ErrorDialog";
+import Field from "../../elements/Field";
+import AccessibleButton from "../../elements/AccessibleButton";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -32,12 +34,21 @@ This is a copy/paste of EmailAddresses, mostly.
 
 // TODO: Combine EmailAddresses and PhoneNumbers to be 3pid agnostic
 
-export class PhoneNumber extends React.Component {
-    static propTypes = {
-        msisdn: PropTypes.object.isRequired,
-    };
+interface IPhoneNumberProps {
+    msisdn: IThreepid;
+}
 
-    constructor(props) {
+interface IPhoneNumberState {
+    verifying: boolean;
+    verificationCode: string;
+    addTask: any; // FIXME: When AddThreepid is TSfied
+    continueDisabled: boolean;
+    bound: boolean;
+    verifyError: string;
+}
+
+export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumberState> {
+    constructor(props: IPhoneNumberProps) {
         super(props);
 
         const { bound } = props.msisdn;
@@ -48,21 +59,22 @@ export class PhoneNumber extends React.Component {
             addTask: null,
             continueDisabled: false,
             bound,
+            verifyError: null,
         };
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
+    // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+    public UNSAFE_componentWillReceiveProps(nextProps: IPhoneNumberProps): void {
         const { bound } = nextProps.msisdn;
         this.setState({ bound });
     }
 
-    async changeBinding({ bind, label, errorTitle }) {
+    private async changeBinding({ bind, label, errorTitle }): Promise<void> {
         if (!await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
             return this.changeBindingTangledAddBind({ bind, label, errorTitle });
         }
 
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const { medium, address } = this.props.msisdn;
 
         try {
@@ -99,8 +111,7 @@ export class PhoneNumber extends React.Component {
         }
     }
 
-    async changeBindingTangledAddBind({ bind, label, errorTitle }) {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+    private async changeBindingTangledAddBind({ bind, label, errorTitle }): Promise<void> {
         const { medium, address } = this.props.msisdn;
 
         const task = new AddThreepid();
@@ -139,7 +150,7 @@ export class PhoneNumber extends React.Component {
         }
     }
 
-    onRevokeClick = (e) => {
+    private onRevokeClick = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
         this.changeBinding({
@@ -147,9 +158,9 @@ export class PhoneNumber extends React.Component {
             label: "revoke",
             errorTitle: _t("Unable to revoke sharing for phone number"),
         });
-    }
+    };
 
-    onShareClick = (e) => {
+    private onShareClick = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
         this.changeBinding({
@@ -157,15 +168,15 @@ export class PhoneNumber extends React.Component {
             label: "share",
             errorTitle: _t("Unable to share phone number"),
         });
-    }
+    };
 
-    onVerificationCodeChange = (e) => {
+    private onVerificationCodeChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({
             verificationCode: e.target.value,
         });
-    }
+    };
 
-    onContinueClick = async (e) => {
+    private onContinueClick = async (e: React.MouseEvent | React.FormEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
@@ -183,21 +194,18 @@ export class PhoneNumber extends React.Component {
         } catch (err) {
             this.setState({ continueDisabled: false });
             if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Unable to verify phone number: " + err);
                 Modal.createTrackedDialog('Unable to verify phone number', '', ErrorDialog, {
                     title: _t("Unable to verify phone number."),
                     description: ((err && err.message) ? err.message : _t("Operation failed")),
                 });
             } else {
-                this.setState({verifyError: _t("Incorrect verification code")});
+                this.setState({ verifyError: _t("Incorrect verification code") });
             }
         }
-    }
+    };
 
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const Field = sdk.getComponent('elements.Field');
+    public render(): JSX.Element {
         const { address } = this.props.msisdn;
         const { verifying, bound } = this.state;
 
@@ -205,9 +213,9 @@ export class PhoneNumber extends React.Component {
         if (verifying) {
             status = <span className="mx_ExistingPhoneNumber_verification">
                 <span>
-                    {_t("Please enter verification code sent via text.")}
+                    { _t("Please enter verification code sent via text.") }
                     <br />
-                    {this.state.verifyError}
+                    { this.state.verifyError }
                 </span>
                 <form onSubmit={this.onContinueClick} autoComplete="off" noValidate={true}>
                     <Field
@@ -226,7 +234,7 @@ export class PhoneNumber extends React.Component {
                 kind="danger_sm"
                 onClick={this.onRevokeClick}
             >
-                {_t("Revoke")}
+                { _t("Revoke") }
             </AccessibleButton>;
         } else {
             status = <AccessibleButton
@@ -234,26 +242,26 @@ export class PhoneNumber extends React.Component {
                 kind="primary_sm"
                 onClick={this.onShareClick}
             >
-                {_t("Share")}
+                { _t("Share") }
             </AccessibleButton>;
         }
 
         return (
             <div className="mx_ExistingPhoneNumber">
-                <span className="mx_ExistingPhoneNumber_address">+{address}</span>
-                {status}
+                <span className="mx_ExistingPhoneNumber_address">+{ address }</span>
+                { status }
             </div>
         );
     }
 }
 
-@replaceableComponent("views.settings.discovery.PhoneNumbers")
-export default class PhoneNumbers extends React.Component {
-    static propTypes = {
-        msisdns: PropTypes.array.isRequired,
-    }
+interface IProps {
+    msisdns: IThreepid[];
+}
 
-    render() {
+@replaceableComponent("views.settings.discovery.PhoneNumbers")
+export default class PhoneNumbers extends React.Component<IProps> {
+    public render(): JSX.Element {
         let content;
         if (this.props.msisdns.length > 0) {
             content = this.props.msisdns.map((e) => {
@@ -261,13 +269,13 @@ export default class PhoneNumbers extends React.Component {
             });
         } else {
             content = <span className="mx_SettingsTab_subsectionText">
-                {_t("Discovery options will appear once you have added a phone number above.")}
+                { _t("Discovery options will appear once you have added a phone number above.") }
             </span>;
         }
 
         return (
             <div className="mx_PhoneNumbers">
-                {content}
+                { content }
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
similarity index 58%
rename from src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
rename to src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
index 28aad65129..9322eab711 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
@@ -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.
@@ -15,68 +15,76 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import * as sdk from "../../../../..";
+import { EventType } from 'matrix-js-sdk/src/@types/event';
+
+import { _t } from "../../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
+import RoomUpgradeDialog from "../../../dialogs/RoomUpgradeDialog";
+import DevtoolsDialog from "../../../dialogs/DevtoolsDialog";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+
+interface IProps {
+    roomId: string;
+    closeSettingsFn(): void;
+}
+
+interface IRecommendedVersion {
+    version: string;
+    needsUpgrade: boolean;
+    urgent: boolean;
+}
+
+interface IState {
+    upgradeRecommendation?: IRecommendedVersion;
+    oldRoomId?: string;
+    oldEventId?: string;
+    upgraded?: boolean;
+}
 
 @replaceableComponent("views.settings.tabs.room.AdvancedRoomSettingsTab")
-export default class AdvancedRoomSettingsTab extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-        closeSettingsFn: PropTypes.func.isRequired,
-    };
-
-    constructor(props) {
-        super(props);
+export default class AdvancedRoomSettingsTab extends React.Component<IProps, IState> {
+    constructor(props, context) {
+        super(props, context);
 
         this.state = {
             // This is eventually set to the value of room.getRecommendedVersion()
             upgradeRecommendation: null,
         };
-    }
 
-    // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         // we handle lack of this object gracefully later, so don't worry about it failing here.
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
         room.getRecommendedVersion().then((v) => {
-            const tombstone = room.currentState.getStateEvents("m.room.tombstone", "");
+            const tombstone = room.currentState.getStateEvents(EventType.RoomTombstone, "");
 
-            const additionalStateChanges = {};
-            const createEvent = room.currentState.getStateEvents("m.room.create", "");
+            const additionalStateChanges: Partial<IState> = {};
+            const createEvent = room.currentState.getStateEvents(EventType.RoomCreate, "");
             const predecessor = createEvent ? createEvent.getContent().predecessor : null;
             if (predecessor && predecessor.room_id) {
-                additionalStateChanges['oldRoomId'] = predecessor.room_id;
-                additionalStateChanges['oldEventId'] = predecessor.event_id;
-                additionalStateChanges['hasPreviousRoom'] = true;
+                additionalStateChanges.oldRoomId = predecessor.room_id;
+                additionalStateChanges.oldEventId = predecessor.event_id;
             }
 
-
             this.setState({
-                upgraded: tombstone && tombstone.getContent().replacement_room,
+                upgraded: !!tombstone?.getContent().replacement_room,
                 upgradeRecommendation: v,
                 ...additionalStateChanges,
             });
         });
     }
 
-    _upgradeRoom = (e) => {
-        const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
+    private upgradeRoom = (e) => {
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
-        Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, {room: room});
+        Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, { room });
     };
 
-    _openDevtools = (e) => {
-        const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
-        Modal.createDialog(DevtoolsDialog, {roomId: this.props.roomId});
+    private openDevtools = (e) => {
+        Modal.createDialog(DevtoolsDialog, { roomId: this.props.roomId });
     };
 
-    _onOldRoomClicked = (e) => {
+    private onOldRoomClicked = (e) => {
         e.preventDefault();
         e.stopPropagation();
 
@@ -93,9 +101,9 @@ export default class AdvancedRoomSettingsTab extends React.Component {
         const room = client.getRoom(this.props.roomId);
 
         let unfederatableSection;
-        const createEvent = room.currentState.getStateEvents('m.room.create', '');
+        const createEvent = room.currentState.getStateEvents(EventType.RoomCreate, '');
         if (createEvent && createEvent.getContent()['m.federate'] === false) {
-            unfederatableSection = <div>{_t('This room is not accessible by remote Matrix servers')}</div>;
+            unfederatableSection = <div>{ _t('This room is not accessible by remote Matrix servers') }</div>;
         }
 
         let roomUpgradeButton;
@@ -103,59 +111,61 @@ export default class AdvancedRoomSettingsTab extends React.Component {
             roomUpgradeButton = (
                 <div>
                     <p className='mx_SettingsTab_warningText'>
-                        {_t(
+                        { _t(
                             "<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": (sub) => <b>{sub}</b>,
-                                "i": (sub) => <i>{sub}</i>,
+                                "b": (sub) => <b>{ sub }</b>,
+                                "i": (sub) => <i>{ sub }</i>,
                             },
-                        )}
+                        ) }
                     </p>
-                    <AccessibleButton onClick={this._upgradeRoom} kind='primary'>
-                        {_t("Upgrade this room to the recommended room version")}
+                    <AccessibleButton onClick={this.upgradeRoom} kind='primary'>
+                        { _t("Upgrade this room to the recommended room version") }
                     </AccessibleButton>
                 </div>
             );
         }
 
         let oldRoomLink;
-        if (this.state.hasPreviousRoom) {
+        if (this.state.oldRoomId) {
             let name = _t("this room");
             const room = MatrixClientPeg.get().getRoom(this.props.roomId);
             if (room && room.name) name = room.name;
             oldRoomLink = (
-                <AccessibleButton element='a' onClick={this._onOldRoomClicked}>
-                    {_t("View older messages in %(roomName)s.", {roomName: name})}
+                <AccessibleButton element='a' onClick={this.onOldRoomClicked}>
+                    { _t("View older messages in %(roomName)s.", { roomName: name }) }
                 </AccessibleButton>
             );
         }
 
         return (
             <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Advanced")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Advanced") }</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Room information")}</span>
+                    <span className='mx_SettingsTab_subheading'>
+                        { room?.isSpaceRoom() ? _t("Space information") : _t("Room information") }
+                    </span>
                     <div>
-                        <span>{_t("Internal room ID:")}</span>&nbsp;
-                        {this.props.roomId}
+                        <span>{ _t("Internal room ID:") }</span>&nbsp;
+                        { this.props.roomId }
                     </div>
-                    {unfederatableSection}
+                    { unfederatableSection }
                 </div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Room version")}</span>
+                    <span className='mx_SettingsTab_subheading'>{ _t("Room version") }</span>
                     <div>
-                        <span>{_t("Room version:")}</span>&nbsp;
-                        {room.getVersion()}
+                        <span>{ _t("Room version:") }</span>&nbsp;
+                        { room.getVersion() }
                     </div>
-                    {oldRoomLink}
-                    {roomUpgradeButton}
+                    { oldRoomLink }
+                    { roomUpgradeButton }
                 </div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Developer options")}</span>
-                    <AccessibleButton onClick={this._openDevtools} kind='primary'>
-                        {_t("Open Devtools")}
+                    <span className='mx_SettingsTab_subheading'>{ _t("Developer options") }</span>
+                    <AccessibleButton onClick={this.openDevtools} kind='primary'>
+                        { _t("Open Devtools") }
                     </AccessibleButton>
                 </div>
             </div>
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
index 8d886a191e..c8188250b1 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
@@ -15,13 +15,13 @@ limitations under the License.
 */
 
 import React from "react";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
-import {_t} from "../../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
+import { _t } from "../../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import BridgeTile from "../../BridgeTile";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -44,14 +44,11 @@ export default class BridgeSettingsTab extends React.Component<IProps> {
         return <BridgeTile key={event.getId()} room={room} ev={event} />;
     }
 
-    static getBridgeStateEvents(roomId: string) {
+    static getBridgeStateEvents(roomId: string): MatrixEvent[] {
         const client = MatrixClientPeg.get();
         const roomState = client.getRoom(roomId).currentState;
 
-        return BRIDGE_EVENT_TYPES.map(typeName => {
-            const events = roomState.events.get(typeName);
-            return events ? Array.from(events.values()) : [];
-        }).flat(1);
+        return BRIDGE_EVENT_TYPES.map(typeName => roomState.getStateEvents(typeName)).flat(1);
     }
 
     render() {
@@ -64,36 +61,36 @@ export default class BridgeSettingsTab extends React.Component<IProps> {
         let content: JSX.Element;
         if (bridgeEvents.length > 0) {
             content = <div>
-                <p>{_t(
+                <p>{ _t(
                     "This room is bridging messages to the following platforms. " +
                     "<a>Learn more.</a>", {},
                     {
                         // TODO: We don't have this link yet: this will prevent the translators
                         // having to re-translate the string when we do.
-                        a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noreferrer noopener">{sub}</a>,
+                        a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noreferrer noopener">{ sub }</a>,
                     },
-                )}</p>
+                ) }</p>
                 <ul className="mx_RoomSettingsDialog_BridgeList">
                     { bridgeEvents.map((event) => this.renderBridgeCard(event, room)) }
                 </ul>
             </div>;
         } else {
-            content = <p>{_t(
+            content = <p>{ _t(
                 "This room isn’t bridging messages to any platforms. " +
                 "<a>Learn more.</a>", {},
                 {
                     // TODO: We don't have this link yet: this will prevent the translators
                     // having to re-translate the string when we do.
-                    a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noreferrer noopener">{sub}</a>,
+                    a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noreferrer noopener">{ sub }</a>,
                 },
-            )}</p>;
+            ) }</p>;
         }
 
         return (
             <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Bridges")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Bridges") }</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    {content}
+                    { content }
                 </div>
             </div>
         );
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
similarity index 68%
rename from src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
rename to src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
index 139cfd5fbd..790e2999f5 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
@@ -15,58 +15,58 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../../languageHandler";
+import { _t } from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
-import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 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";
+import { UIFeature } from "../../../../../settings/UIFeature";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import UrlPreviewSettings from "../../../room_settings/UrlPreviewSettings";
+import RelatedGroupSettings from "../../../room_settings/RelatedGroupSettings";
+import AliasSettings from "../../../room_settings/AliasSettings";
+
+interface IProps {
+    roomId: string;
+}
+
+interface IState {
+    isRoomPublished: boolean;
+}
 
 @replaceableComponent("views.settings.tabs.room.GeneralRoomSettingsTab")
-export default class GeneralRoomSettingsTab extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-    };
+export default class GeneralRoomSettingsTab extends React.Component<IProps, IState> {
+    public static contextType = MatrixClientContext;
 
-    static contextType = MatrixClientContext;
-
-    constructor() {
-        super();
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             isRoomPublished: false, // loaded async
         };
     }
 
-    _onLeaveClick = () => {
+    private onLeaveClick = (): void => {
         dis.dispatch({
             action: 'leave_room',
             room_id: this.props.roomId,
         });
     };
 
-    render() {
-        const AliasSettings = sdk.getComponent("room_settings.AliasSettings");
-        const RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings");
-        const UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
-
+    public render(): JSX.Element {
         const client = this.context;
         const room = client.getRoom(this.props.roomId);
 
         const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this
         const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
         const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
-        const aliasEvents = room.currentState.getStateEvents("m.room.aliases");
 
         const canChangeGroups = room.currentState.mayClientSendStateEvent("m.room.related_groups", client);
         const groupsEvent = room.currentState.getStateEvents("m.room.related_groups", "");
 
         let urlPreviewSettings = <>
-            <span className='mx_SettingsTab_subheading'>{_t("URL Previews")}</span>
+            <span className='mx_SettingsTab_subheading'>{ _t("URL Previews") }</span>
             <div className='mx_SettingsTab_section'>
                 <UrlPreviewSettings room={room} />
             </div>
@@ -78,7 +78,7 @@ export default class GeneralRoomSettingsTab extends React.Component {
         let flairSection;
         if (SettingsStore.getValue(UIFeature.Flair)) {
             flairSection = <>
-                <span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Flair") }</span>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <RelatedGroupSettings
                         roomId={room.roomId}
@@ -91,24 +91,27 @@ export default class GeneralRoomSettingsTab extends React.Component {
 
         return (
             <div className="mx_SettingsTab mx_GeneralRoomSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("General")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("General") }</div>
                 <div className='mx_SettingsTab_section mx_GeneralRoomSettingsTab_profileSection'>
                     <RoomProfileSettings roomId={this.props.roomId} />
                 </div>
 
-                <div className="mx_SettingsTab_heading">{_t("Room Addresses")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Room Addresses") }</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <AliasSettings roomId={this.props.roomId}
-                        canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
-                        canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
+                    <AliasSettings
+                        roomId={this.props.roomId}
+                        canSetCanonicalAlias={canSetCanonical}
+                        canSetAliases={canSetAliases}
+                        canonicalAliasEvent={canonicalAliasEv}
+                    />
                 </div>
-                <div className="mx_SettingsTab_heading">{_t("Other")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Other") }</div>
                 { flairSection }
                 { urlPreviewSettings }
 
-                <span className='mx_SettingsTab_subheading'>{_t("Leave room")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Leave room") }</span>
                 <div className='mx_SettingsTab_section'>
-                    <AccessibleButton kind='danger' onClick={this._onLeaveClick}>
+                    <AccessibleButton kind='danger' onClick={this.onLeaveClick}>
                         { _t('Leave room') }
                     </AccessibleButton>
                 </div>
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
similarity index 66%
rename from src/components/views/settings/tabs/room/NotificationSettingsTab.js
rename to src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
index fa56fa2cb6..32453b5a25 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
@@ -14,26 +14,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
+import React, { createRef } from 'react';
+import { _t } from "../../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
-import {SettingLevel} from "../../../../../settings/SettingLevel";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+
+interface IProps {
+    roomId: string;
+}
+
+interface IState {
+    currentSound: string;
+    uploadedFile: File;
+}
 
 @replaceableComponent("views.settings.tabs.room.NotificationsSettingsTab")
-export default class NotificationsSettingsTab extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-    };
+export default class NotificationsSettingsTab extends React.Component<IProps, IState> {
+    private soundUpload = createRef<HTMLInputElement>();
 
-    _soundUpload = createRef();
-
-    constructor() {
-        super();
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             currentSound: "default",
@@ -42,22 +46,23 @@ export default class NotificationsSettingsTab extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
+    // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+    public UNSAFE_componentWillMount(): void {
         const soundData = Notifier.getSoundForRoom(this.props.roomId);
         if (!soundData) {
             return;
         }
-        this.setState({currentSound: soundData.name || soundData.url});
+        this.setState({ currentSound: soundData.name || soundData.url });
     }
 
-    async _triggerUploader(e) {
+    private triggerUploader = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
-        this._soundUpload.current.click();
-    }
+        this.soundUpload.current.click();
+    };
 
-    async _onSoundUploadChanged(e) {
+    private onSoundUploadChanged = (e: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
         if (!e.target.files || !e.target.files.length) {
             this.setState({
                 uploadedFile: null,
@@ -69,23 +74,23 @@ export default class NotificationsSettingsTab extends React.Component {
         this.setState({
             uploadedFile: file,
         });
-    }
+    };
 
-    async _onClickSaveSound(e) {
+    private onClickSaveSound = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
         try {
-            await this._saveSound();
+            await this.saveSound();
         } catch (ex) {
             console.error(
                 `Unable to save notification sound for ${this.props.roomId}`,
             );
             console.error(ex);
         }
-    }
+    };
 
-    async _saveSound() {
+    private async saveSound(): Promise<void> {
         if (!this.state.uploadedFile) {
             return;
         }
@@ -122,7 +127,7 @@ export default class NotificationsSettingsTab extends React.Component {
         });
     }
 
-    _clearSound(e) {
+    private clearSound = (e: React.MouseEvent): void => {
         e.stopPropagation();
         e.preventDefault();
         SettingsStore.setValue(
@@ -135,43 +140,43 @@ export default class NotificationsSettingsTab extends React.Component {
         this.setState({
             currentSound: "default",
         });
-    }
+    };
 
-    render() {
+    public render(): JSX.Element {
         let currentUploadedFile = null;
         if (this.state.uploadedFile) {
             currentUploadedFile = (
                 <div>
-                    <span>{_t("Uploaded sound")}: <code>{this.state.uploadedFile.name}</code></span>
+                    <span>{ _t("Uploaded sound") }: <code>{ this.state.uploadedFile.name }</code></span>
                 </div>
             );
         }
 
         return (
             <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Notifications")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Notifications") }</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Sounds")}</span>
+                    <span className='mx_SettingsTab_subheading'>{ _t("Sounds") }</span>
                     <div>
-                        <span>{_t("Notification sound")}: <code>{this.state.currentSound}</code></span><br />
-                        <AccessibleButton className="mx_NotificationSound_resetSound" disabled={this.state.currentSound == "default"} onClick={this._clearSound.bind(this)} kind="primary">
-                            {_t("Reset")}
+                        <span>{ _t("Notification sound") }: <code>{ this.state.currentSound }</code></span><br />
+                        <AccessibleButton className="mx_NotificationSound_resetSound" disabled={this.state.currentSound == "default"} onClick={this.clearSound} kind="primary">
+                            { _t("Reset") }
                         </AccessibleButton>
                     </div>
                     <div>
-                        <h3>{_t("Set a new custom sound")}</h3>
+                        <h3>{ _t("Set a new custom sound") }</h3>
                         <form autoComplete="off" noValidate={true}>
-                            <input ref={this._soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this._onSoundUploadChanged.bind(this)} accept="audio/*" />
+                            <input ref={this.soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this.onSoundUploadChanged} accept="audio/*" />
                         </form>
 
-                        {currentUploadedFile}
+                        { currentUploadedFile }
 
-                        <AccessibleButton className="mx_NotificationSound_browse" onClick={this._triggerUploader.bind(this)} kind="primary">
-                            {_t("Browse")}
+                        <AccessibleButton className="mx_NotificationSound_browse" onClick={this.triggerUploader} kind="primary">
+                            { _t("Browse") }
                         </AccessibleButton>
 
-                        <AccessibleButton className="mx_NotificationSound_save" disabled={this.state.uploadedFile == null} onClick={this._onClickSaveSound.bind(this)} kind="primary">
-                            {_t("Save")}
+                        <AccessibleButton className="mx_NotificationSound_save" disabled={this.state.uploadedFile == null} onClick={this.onClickSaveSound} kind="primary">
+                            { _t("Save") }
                         </AccessibleButton>
                         <br />
                     </div>
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
index 19ebe2a77e..f1179d38e5 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -15,48 +15,44 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t, _td} from "../../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import * as sdk from "../../../../..";
+import { _t, _td } from "../../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
-import {EventType} from "matrix-js-sdk/src/@types/event";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { RoomState } from "matrix-js-sdk/src/models/room-state";
 import { compare } from "../../../../../utils/strings";
+import ErrorDialog from '../../../dialogs/ErrorDialog';
+import PowerSelector from "../../../elements/PowerSelector";
 
-const plEventsToLabels = {
-    // These will be translated for us later.
-    [EventType.RoomAvatar]: _td("Change room avatar"),
-    [EventType.RoomName]: _td("Change room name"),
-    [EventType.RoomCanonicalAlias]: _td("Change main address for the room"),
-    [EventType.RoomHistoryVisibility]: _td("Change history visibility"),
-    [EventType.RoomPowerLevels]: _td("Change permissions"),
-    [EventType.RoomTopic]: _td("Change topic"),
-    [EventType.RoomTombstone]: _td("Upgrade the room"),
-    [EventType.RoomEncryption]: _td("Enable room encryption"),
-    [EventType.RoomServerAcl]: _td("Change server ACLs"),
+interface IEventShowOpts {
+    isState?: boolean;
+    hideForSpace?: boolean;
+}
 
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-    "im.vector.modular.widgets": _td("Modify widgets"),
-};
+interface IPowerLevelDescriptor {
+    desc: string;
+    defaultValue: number;
+    hideForSpace?: boolean;
+}
 
-const plEventsToShow = {
+const plEventsToShow: Record<string, IEventShowOpts> = {
     // If an event is listed here, it will be shown in the PL settings. Defaults will be calculated.
-    [EventType.RoomAvatar]: {isState: true},
-    [EventType.RoomName]: {isState: true},
-    [EventType.RoomCanonicalAlias]: {isState: true},
-    [EventType.RoomHistoryVisibility]: {isState: true},
-    [EventType.RoomPowerLevels]: {isState: true},
-    [EventType.RoomTopic]: {isState: true},
-    [EventType.RoomTombstone]: {isState: true},
-    [EventType.RoomEncryption]: {isState: true},
-    [EventType.RoomServerAcl]: {isState: true},
+    [EventType.RoomAvatar]: { isState: true },
+    [EventType.RoomName]: { isState: true },
+    [EventType.RoomCanonicalAlias]: { isState: true },
+    [EventType.RoomHistoryVisibility]: { isState: true, hideForSpace: true },
+    [EventType.RoomPowerLevels]: { isState: true },
+    [EventType.RoomTopic]: { isState: true },
+    [EventType.RoomTombstone]: { isState: true, hideForSpace: true },
+    [EventType.RoomEncryption]: { isState: true, hideForSpace: true },
+    [EventType.RoomServerAcl]: { isState: true, hideForSpace: true },
 
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-    "im.vector.modular.widgets": {isState: true},
+    "im.vector.modular.widgets": { isState: true, hideForSpace: true },
 };
 
 // parse a string as an integer; if the input is undefined, or cannot be parsed
@@ -76,7 +72,6 @@ interface IBannedUserProps {
 export class BannedUser extends React.Component<IBannedUserProps> {
     private onUnbanClick = (e) => {
         MatrixClientPeg.get().unban(this.props.member.roomId, this.props.member.userId).catch((err) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to unban: " + err);
             Modal.createTrackedDialog('Failed to unban', '', ErrorDialog, {
                 title: _t('Error'),
@@ -102,10 +97,10 @@ export class BannedUser extends React.Component<IBannedUserProps> {
         const userId = this.props.member.name === this.props.member.userId ? null : this.props.member.userId;
         return (
             <li>
-                {unbanButton}
-                <span title={_t("Banned by %(displayName)s", {displayName: this.props.by})}>
-                    <strong>{ this.props.member.name }</strong> {userId}
-                    {this.props.reason ? " " + _t('Reason') + ": " + this.props.reason : ""}
+                { unbanButton }
+                <span title={_t("Banned by %(displayName)s", { displayName: this.props.by })}>
+                    <strong>{ this.props.member.name }</strong> { userId }
+                    { this.props.reason ? " " + _t('Reason') + ": " + this.props.reason : "" }
                 </span>
             </li>
         );
@@ -142,10 +137,10 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
         }
     }
 
-    private onPowerLevelsChanged = (inputValue: string, powerLevelKey: string) => {
+    private onPowerLevelsChanged = (value: number, powerLevelKey: string) => {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
-        const plEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+        const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, '');
         let plContent = plEvent ? (plEvent.getContent() || {}) : {};
 
         // Clone the power levels just in case
@@ -153,8 +148,6 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
 
         const eventsLevelPrefix = "event_levels_";
 
-        const value = parseInt(inputValue);
-
         if (powerLevelKey.startsWith(eventsLevelPrefix)) {
             // deep copy "events" object, Object.assign itself won't deep copy
             plContent["events"] = Object.assign({}, plContent["events"] || {});
@@ -173,10 +166,9 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
             parentObj[keyPath[keyPath.length - 1]] = value;
         }
 
-        client.sendStateEvent(this.props.roomId, "m.room.power_levels", plContent).catch(e => {
+        client.sendStateEvent(this.props.roomId, EventType.RoomPowerLevels, plContent).catch(e => {
             console.error(e);
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Power level requirement change failed', '', ErrorDialog, {
                 title: _t('Error changing power level requirement'),
                 description: _t(
@@ -187,10 +179,10 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
         });
     };
 
-    private onUserPowerLevelChanged = (value: string, powerLevelKey: string) => {
+    private onUserPowerLevelChanged = (value: number, powerLevelKey: string) => {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
-        const plEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+        const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, '');
         let plContent = plEvent ? (plEvent.getContent() || {}) : {};
 
         // Clone the power levels just in case
@@ -200,10 +192,9 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
         if (!plContent['users']) plContent['users'] = {};
         plContent['users'][powerLevelKey] = value;
 
-        client.sendStateEvent(this.props.roomId, "m.room.power_levels", plContent).catch(e => {
+        client.sendStateEvent(this.props.roomId, EventType.RoomPowerLevels, plContent).catch(e => {
             console.error(e);
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Power level change failed', '', ErrorDialog, {
                 title: _t('Error changing power level'),
                 description: _t(
@@ -215,15 +206,33 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
     };
 
     render() {
-        const PowerSelector = sdk.getComponent('elements.PowerSelector');
-
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
-        const plEvent = room.currentState.getStateEvents('m.room.power_levels', '');
-        const plContent = plEvent ? (plEvent.getContent() || {}) : {};
-        const canChangeLevels = room.currentState.mayClientSendStateEvent('m.room.power_levels', client);
+        const isSpaceRoom = room.isSpaceRoom();
 
-        const powerLevelDescriptors = {
+        const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, '');
+        const plContent = plEvent ? (plEvent.getContent() || {}) : {};
+        const canChangeLevels = room.currentState.mayClientSendStateEvent(EventType.RoomPowerLevels, client);
+
+        const plEventsToLabels = {
+            // These will be translated for us later.
+            [EventType.RoomAvatar]: isSpaceRoom ? _td("Change space avatar") : _td("Change room avatar"),
+            [EventType.RoomName]: isSpaceRoom ? _td("Change space name") : _td("Change room name"),
+            [EventType.RoomCanonicalAlias]: isSpaceRoom
+                ? _td("Change main address for the space")
+                : _td("Change main address for the room"),
+            [EventType.RoomHistoryVisibility]: _td("Change history visibility"),
+            [EventType.RoomPowerLevels]: _td("Change permissions"),
+            [EventType.RoomTopic]: isSpaceRoom ? _td("Change description") : _td("Change topic"),
+            [EventType.RoomTombstone]: _td("Upgrade the room"),
+            [EventType.RoomEncryption]: _td("Enable room encryption"),
+            [EventType.RoomServerAcl]: _td("Change server ACLs"),
+
+            // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+            "im.vector.modular.widgets": isSpaceRoom ? null : _td("Modify widgets"),
+        };
+
+        const powerLevelDescriptors: Record<string, IPowerLevelDescriptor> = {
             "users_default": {
                 desc: _t('Default role'),
                 defaultValue: 0,
@@ -231,6 +240,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
             "events_default": {
                 desc: _t('Send messages'),
                 defaultValue: 0,
+                hideForSpace: true,
             },
             "invite": {
                 desc: _t('Invite users'),
@@ -251,10 +261,12 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
             "redact": {
                 desc: _t('Remove messages sent by others'),
                 defaultValue: 50,
+                hideForSpace: true,
             },
             "notifications.room": {
                 desc: _t('Notify everyone'),
                 defaultValue: 50,
+                hideForSpace: true,
             },
         };
 
@@ -277,13 +289,14 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
             parseIntWithDefault(plContent.events_default, powerLevelDescriptors.events_default.defaultValue),
         );
 
-        let privilegedUsersSection = <div>{_t('No users have specific privileges in this room')}</div>;
+        let privilegedUsersSection = <div>{ _t('No users have specific privileges in this room') }</div>;
         let mutedUsersSection;
         if (Object.keys(userLevels).length) {
             const privilegedUsers = [];
             const mutedUsers = [];
 
             Object.keys(userLevels).forEach((user) => {
+                if (!Number.isInteger(userLevels[user])) { return; }
                 const canChange = userLevels[user] < currentUserLevel && canChangeLevels;
                 if (userLevels[user] > defaultUserLevel) { // privileged
                     privilegedUsers.push(
@@ -323,14 +336,14 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
                 privilegedUsersSection =
                     <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                         <div className='mx_SettingsTab_subheading'>{ _t('Privileged Users') }</div>
-                        {privilegedUsers}
+                        { privilegedUsers }
                     </div>;
             }
             if (mutedUsers.length) {
                 mutedUsersSection =
                     <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                         <div className='mx_SettingsTab_subheading'>{ _t('Muted Users') }</div>
-                        {mutedUsers}
+                        { mutedUsers }
                     </div>;
             }
         }
@@ -343,24 +356,30 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <div className='mx_SettingsTab_subheading'>{ _t('Banned users') }</div>
                     <ul>
-                        {banned.map((member) => {
+                        { banned.map((member) => {
                             const banEvent = member.events.member.getContent();
                             const sender = room.getMember(member.events.member.getSender());
                             let bannedBy = member.events.member.getSender(); // start by falling back to mxid
                             if (sender) bannedBy = sender.name;
                             return (
-                                <BannedUser key={member.userId} canUnban={canBanUsers}
-                                    member={member} reason={banEvent.reason}
+                                <BannedUser
+                                    key={member.userId}
+                                    canUnban={canBanUsers}
+                                    member={member}
+                                    reason={banEvent.reason}
                                     by={bannedBy}
                                 />
                             );
-                        })}
+                        }) }
                     </ul>
                 </div>;
         }
 
         const powerSelectors = Object.keys(powerLevelDescriptors).map((key, index) => {
             const descriptor = powerLevelDescriptors[key];
+            if (isSpaceRoom && descriptor.hideForSpace) {
+                return null;
+            }
 
             const keyPath = key.split('.');
             let currentObj = plContent;
@@ -382,19 +401,23 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
                     onChange={this.onPowerLevelsChanged}
                 />
             </div>;
-        });
+        }).filter(Boolean);
 
         // hide the power level selector for enabling E2EE if it the room is already encrypted
         if (client.isRoomEncrypted(this.props.roomId)) {
-            delete eventsLevels["m.room.encryption"];
+            delete eventsLevels[EventType.RoomEncryption];
         }
 
         const eventPowerSelectors = Object.keys(eventsLevels).map((eventType, i) => {
+            if (isSpaceRoom && plEventsToShow[eventType].hideForSpace) {
+                return null;
+            }
+
             let label = plEventsToLabels[eventType];
             if (label) {
                 label = _t(label);
             } else {
-                label = _t("Send %(eventType)s events", {eventType});
+                label = _t("Send %(eventType)s events", { eventType });
             }
             return (
                 <div className="" key={eventType}>
@@ -408,19 +431,22 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
                     />
                 </div>
             );
-        });
+        }).filter(Boolean);
 
         return (
             <div className="mx_SettingsTab mx_RolesRoomSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Roles & Permissions")}</div>
-                {privilegedUsersSection}
-                {mutedUsersSection}
-                {bannedUsersSection}
+                <div className="mx_SettingsTab_heading">{ _t("Roles & Permissions") }</div>
+                { privilegedUsersSection }
+                { mutedUsersSection }
+                { bannedUsersSection }
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Permissions")}</span>
-                    <p>{_t('Select the roles required to change various parts of the room')}</p>
-                    {powerSelectors}
-                    {eventPowerSelectors}
+                    <span className='mx_SettingsTab_subheading'>{ _t("Permissions") }</span>
+                    <p>{ isSpaceRoom
+                        ? _t('Select the roles required to change various parts of the space')
+                        : _t('Select the roles required to change various parts of the room')
+                    }</p>
+                    { powerSelectors }
+                    { eventPowerSelectors }
                 </div>
             </div>
         );
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 02bbcfb751..d1c5bc8448 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -15,49 +15,39 @@ limitations under the License.
 */
 
 import React from 'react';
+import { GuestAccess, HistoryVisibility, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import {_t} from "../../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import * as sdk from "../../../../..";
+import { EventType } from 'matrix-js-sdk/src/@types/event';
+
+import { _t } from "../../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import Modal from "../../../../../Modal";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
 import StyledRadioGroup from '../../../elements/StyledRadioGroup';
-import {SettingLevel} from "../../../../../settings/SettingLevel";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
 import SettingsStore from "../../../../../settings/SettingsStore";
-import {UIFeature} from "../../../../../settings/UIFeature";
+import { UIFeature } from "../../../../../settings/UIFeature";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
-
-// Knock and private are reserved keywords which are not yet implemented.
-enum JoinRule {
-    Public = "public",
-    Knock = "knock",
-    Invite = "invite",
-    Private = "private",
-}
-
-enum GuestAccess {
-    CanJoin = "can_join",
-    Forbidden = "forbidden",
-}
-
-enum HistoryVisibility {
-    Invited = "invited",
-    Joined = "joined",
-    Shared = "shared",
-    WorldReadable = "world_readable",
-}
+import AccessibleButton from "../../../elements/AccessibleButton";
+import SettingsFlag from '../../../elements/SettingsFlag';
+import createRoom, { IOpts } from '../../../../../createRoom';
+import CreateRoomDialog from '../../../dialogs/CreateRoomDialog';
+import JoinRuleSettings from "../../JoinRuleSettings";
+import ErrorDialog from "../../../dialogs/ErrorDialog";
 
 interface IProps {
     roomId: string;
+    closeSettingsFn: () => void;
 }
 
 interface IState {
-    joinRule: JoinRule;
+    restrictedAllowRoomIds?: string[];
     guestAccess: GuestAccess;
     history: HistoryVisibility;
     hasAliases: boolean;
     encrypted: boolean;
+    showAdvancedSection: boolean;
 }
 
 @replaceableComponent("views.settings.tabs.room.SecurityRoomSettingsTab")
@@ -66,45 +56,53 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         super(props);
 
         this.state = {
-            joinRule: JoinRule.Invite,
-            guestAccess: GuestAccess.CanJoin,
+            guestAccess: GuestAccess.Forbidden,
             history: HistoryVisibility.Shared,
             hasAliases: false,
             encrypted: false,
+            showAdvancedSection: false,
         };
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    async UNSAFE_componentWillMount() { // eslint-disable-line camelcase
-        MatrixClientPeg.get().on("RoomState.events", this.onStateEvent);
+    UNSAFE_componentWillMount() { // eslint-disable-line
+        const cli = MatrixClientPeg.get();
+        cli.on("RoomState.events", this.onStateEvent);
 
-        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+        const room = cli.getRoom(this.props.roomId);
         const state = room.currentState;
 
-        const joinRule: JoinRule = this.pullContentPropertyFromEvent(
-            state.getStateEvents("m.room.join_rules", ""),
+        const joinRuleEvent = state.getStateEvents(EventType.RoomJoinRules, "");
+        const joinRule: JoinRule = this.pullContentPropertyFromEvent<JoinRule>(
+            joinRuleEvent,
             'join_rule',
             JoinRule.Invite,
         );
-        const guestAccess: GuestAccess = this.pullContentPropertyFromEvent(
-            state.getStateEvents("m.room.guest_access", ""),
+        const restrictedAllowRoomIds = joinRule === JoinRule.Restricted
+            ? joinRuleEvent?.getContent().allow
+                ?.filter(a => a.type === RestrictedAllowType.RoomMembership)
+                ?.map(a => a.room_id)
+            : undefined;
+
+        const guestAccess: GuestAccess = this.pullContentPropertyFromEvent<GuestAccess>(
+            state.getStateEvents(EventType.RoomGuestAccess, ""),
             'guest_access',
             GuestAccess.Forbidden,
         );
-        const history: HistoryVisibility = this.pullContentPropertyFromEvent(
-            state.getStateEvents("m.room.history_visibility", ""),
+        const history: HistoryVisibility = this.pullContentPropertyFromEvent<HistoryVisibility>(
+            state.getStateEvents(EventType.RoomHistoryVisibility, ""),
             'history_visibility',
             HistoryVisibility.Shared,
         );
+
         const encrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.roomId);
-        this.setState({joinRule, guestAccess, history, encrypted});
-        const hasAliases = await this.hasAliases();
-        this.setState({hasAliases});
+        this.setState({ restrictedAllowRoomIds, guestAccess, history, encrypted });
+
+        this.hasAliases().then(hasAliases => this.setState({ hasAliases }));
     }
 
     private pullContentPropertyFromEvent<T>(event: MatrixEvent, key: string, defaultValue: T): T {
-        if (!event || !event.getContent()) return defaultValue;
-        return event.getContent()[key] || defaultValue;
+        return event?.getContent()[key] || defaultValue;
     }
 
     componentWillUnmount() {
@@ -112,16 +110,49 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     }
 
     private onStateEvent = (e: MatrixEvent) => {
-        const refreshWhenTypes = [
-            'm.room.join_rules',
-            'm.room.guest_access',
-            'm.room.history_visibility',
-            'm.room.encryption',
+        const refreshWhenTypes: EventType[] = [
+            EventType.RoomJoinRules,
+            EventType.RoomGuestAccess,
+            EventType.RoomHistoryVisibility,
+            EventType.RoomEncryption,
         ];
-        if (refreshWhenTypes.includes(e.getType())) this.forceUpdate();
+        if (refreshWhenTypes.includes(e.getType() as EventType)) this.forceUpdate();
     };
 
-    private onEncryptionChange = (e: React.ChangeEvent) => {
+    private onEncryptionChange = async () => {
+        if (MatrixClientPeg.get().getRoom(this.props.roomId)?.getJoinRule() === JoinRule.Public) {
+            const dialog = Modal.createTrackedDialog('Confirm Public Encrypted Room', '', QuestionDialog, {
+                title: _t('Are you sure you want to add encryption to this public room?'),
+                description: <div>
+                    <p> { _t(
+                        "<b>It's not recommended to add encryption to public rooms.</b>" +
+                        "Anyone can find and join public rooms, so anyone can read messages in them. " +
+                        "You'll get none of the benefits of encryption, and you won't be able to turn it " +
+                        "off later. Encrypting messages in a public room will make receiving and sending " +
+                        "messages slower.",
+                        null,
+                        { "b": (sub) => <b>{ sub }</b> },
+                    ) } </p>
+                    <p> { _t(
+                        "To avoid these issues, create a <a>new encrypted room</a> for " +
+                        "the conversation you plan to have.",
+                        null,
+                        { "a": (sub) => <a
+                            className="mx_linkButton"
+                            onClick={() => {
+                                dialog.close();
+                                this.createNewRoom(false, true);
+                            }}> { sub } </a> },
+                    ) } </p>
+                </div>,
+
+            });
+
+            const { finished } = dialog;
+            const [confirm] = await finished;
+            if (!confirm) return;
+        }
+
         Modal.createTrackedDialog('Enable encryption', '', QuestionDialog, {
             title: _t('Enable encryption?'),
             description: _t(
@@ -130,106 +161,72 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                 "may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
                 {},
                 {
-                    a: sub => <a href="https://element.io/help#encryption"
-                        rel="noreferrer noopener" target="_blank"
-                    >{sub}</a>,
+                    a: sub => <a
+                        href="https://element.io/help#encryption"
+                        rel="noreferrer noopener"
+                        target="_blank"
+                    >{ sub }</a>,
                 },
             ),
             onFinished: (confirm) => {
                 if (!confirm) {
-                    this.setState({encrypted: false});
+                    this.setState({ encrypted: false });
                     return;
                 }
 
                 const beforeEncrypted = this.state.encrypted;
-                this.setState({encrypted: true});
+                this.setState({ encrypted: true });
                 MatrixClientPeg.get().sendStateEvent(
-                    this.props.roomId, "m.room.encryption",
+                    this.props.roomId, EventType.RoomEncryption,
                     { algorithm: "m.megolm.v1.aes-sha2" },
                 ).catch((e) => {
                     console.error(e);
-                    this.setState({encrypted: beforeEncrypted});
+                    this.setState({ encrypted: beforeEncrypted });
                 });
             },
         });
     };
 
-    private fixGuestAccess = (e: React.MouseEvent) => {
-        e.preventDefault();
-        e.stopPropagation();
-
-        const joinRule = JoinRule.Invite;
-        const guestAccess = GuestAccess.CanJoin;
-
-        const beforeJoinRule = this.state.joinRule;
+    private onGuestAccessChange = (allowed: boolean) => {
+        const guestAccess = allowed ? GuestAccess.CanJoin : GuestAccess.Forbidden;
         const beforeGuestAccess = this.state.guestAccess;
-        this.setState({joinRule, guestAccess});
+        if (beforeGuestAccess === guestAccess) return;
+
+        this.setState({ guestAccess });
 
         const client = MatrixClientPeg.get();
-        client.sendStateEvent(this.props.roomId, "m.room.join_rules", {join_rule: joinRule}, "").catch((e) => {
+        client.sendStateEvent(this.props.roomId, EventType.RoomGuestAccess, {
+            guest_access: guestAccess,
+        }, "").catch((e) => {
             console.error(e);
-            this.setState({joinRule: beforeJoinRule});
-        });
-        client.sendStateEvent(this.props.roomId, "m.room.guest_access", {guest_access: guestAccess}, "").catch((e) => {
-            console.error(e);
-            this.setState({guestAccess: beforeGuestAccess});
+            this.setState({ guestAccess: beforeGuestAccess });
         });
     };
 
-    private onRoomAccessRadioToggle = (roomAccess: string) => {
-        //                         join_rule
-        //                      INVITE  |  PUBLIC
-        //        ----------------------+----------------
-        // guest  CAN_JOIN   | inv_only | pub_with_guest
-        // access ----------------------+----------------
-        //        FORBIDDEN  | inv_only | pub_no_guest
-        //        ----------------------+----------------
-
-        // we always set guests can_join here as it makes no sense to have
-        // an invite-only room that guests can't join.  If you explicitly
-        // invite them, you clearly want them to join, whether they're a
-        // guest or not.  In practice, guest_access should probably have
-        // been implemented as part of the join_rules enum.
-        let joinRule = JoinRule.Invite;
-        let guestAccess = GuestAccess.CanJoin;
-
-        switch (roomAccess) {
-            case "invite_only":
-                // no change - use defaults above
-                break;
-            case "public_no_guests":
-                joinRule = JoinRule.Public;
-                guestAccess = GuestAccess.Forbidden;
-                break;
-            case "public_with_guests":
-                joinRule = JoinRule.Public;
-                guestAccess = GuestAccess.CanJoin;
-                break;
+    private createNewRoom = async (defaultPublic: boolean, defaultEncrypted: boolean) => {
+        const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
+            "Create Room",
+            "Create room after trying to make an E2EE room public",
+            CreateRoomDialog,
+            { defaultPublic, defaultEncrypted },
+        );
+        const [shouldCreate, opts] = await modal.finished;
+        if (shouldCreate) {
+            await createRoom(opts);
         }
-
-        const beforeJoinRule = this.state.joinRule;
-        const beforeGuestAccess = this.state.guestAccess;
-        this.setState({joinRule, guestAccess});
-
-        const client = MatrixClientPeg.get();
-        client.sendStateEvent(this.props.roomId, "m.room.join_rules", {join_rule: joinRule}, "").catch((e) => {
-            console.error(e);
-            this.setState({joinRule: beforeJoinRule});
-        });
-        client.sendStateEvent(this.props.roomId, "m.room.guest_access", {guest_access: guestAccess}, "").catch((e) => {
-            console.error(e);
-            this.setState({guestAccess: beforeGuestAccess});
-        });
+        return shouldCreate;
     };
 
     private onHistoryRadioToggle = (history: HistoryVisibility) => {
         const beforeHistory = this.state.history;
-        this.setState({history: history});
-        MatrixClientPeg.get().sendStateEvent(this.props.roomId, "m.room.history_visibility", {
+        if (beforeHistory === history) return;
+
+        this.setState({ history: history });
+        MatrixClientPeg.get().sendStateEvent(this.props.roomId, EventType.RoomHistoryVisibility, {
             history_visibility: history,
         }, "").catch((e) => {
             console.error(e);
-            this.setState({history: beforeHistory});
+            this.setState({ history: beforeHistory });
         });
     };
 
@@ -245,129 +242,166 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             return Array.isArray(localAliases) && localAliases.length !== 0;
         } else {
             const room = cli.getRoom(this.props.roomId);
-            const aliasEvents = room.currentState.getStateEvents("m.room.aliases") || [];
+            const aliasEvents = room.currentState.getStateEvents(EventType.RoomAliases) || [];
             const hasAliases = !!aliasEvents.find((ev) => (ev.getContent().aliases || []).length > 0);
             return hasAliases;
         }
     }
 
-    private renderRoomAccess() {
+    private renderJoinRule() {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
-        const joinRule = this.state.joinRule;
-        const guestAccess = this.state.guestAccess;
-
-        const canChangeAccess = room.currentState.mayClientSendStateEvent("m.room.join_rules", client)
-            && room.currentState.mayClientSendStateEvent("m.room.guest_access", client);
-
-        let guestWarning = null;
-        if (joinRule !== 'public' && guestAccess === 'forbidden') {
-            guestWarning = (
-                <div className='mx_SecurityRoomSettingsTab_warning'>
-                    <img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />
-                    <span>
-                        {_t("Guests cannot join this room even if explicitly invited.")}&nbsp;
-                        <a href="" onClick={this.fixGuestAccess}>{_t("Click here to fix")}</a>
-                    </span>
-                </div>
-            );
-        }
 
         let aliasWarning = null;
-        if (joinRule === 'public' && !this.state.hasAliases) {
+        if (room.getJoinRule() === JoinRule.Public && !this.state.hasAliases) {
             aliasWarning = (
                 <div className='mx_SecurityRoomSettingsTab_warning'>
                     <img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />
                     <span>
-                        {_t("To link to this room, please add an address.")}
+                        { _t("To link to this room, please add an address.") }
                     </span>
                 </div>
             );
         }
 
-        return (
-            <div>
-                {guestWarning}
-                {aliasWarning}
-                <StyledRadioGroup
-                    name="roomVis"
-                    value={joinRule}
-                    onChange={this.onRoomAccessRadioToggle}
-                    definitions={[
-                        {
-                            value: "invite_only",
-                            disabled: !canChangeAccess,
-                            label: _t('Only people who have been invited'),
-                            checked: joinRule !== "public",
-                        },
-                        {
-                            value: "public_no_guests",
-                            disabled: !canChangeAccess,
-                            label: _t('Anyone who knows the room\'s link, apart from guests'),
-                            checked: joinRule === "public" && guestAccess !== "can_join",
-                        },
-                        {
-                            value: "public_with_guests",
-                            disabled: !canChangeAccess,
-                            label: _t("Anyone who knows the room's link, including guests"),
-                            checked: joinRule === "public" && guestAccess === "can_join",
-                        },
-                    ]}
-                />
+        return <div className="mx_SecurityRoomSettingsTab_joinRule">
+            <div className="mx_SettingsTab_subsectionText">
+                <span>{ _t("Decide who can join %(roomName)s.", {
+                    roomName: room?.name,
+                }) }</span>
             </div>
-        );
+
+            { aliasWarning }
+
+            <JoinRuleSettings
+                room={room}
+                beforeChange={this.onBeforeJoinRuleChange}
+                onError={this.onJoinRuleChangeError}
+                closeSettingsFn={this.props.closeSettingsFn}
+                promptUpgrade={true}
+            />
+        </div>;
     }
 
+    private onJoinRuleChangeError = (error: Error) => {
+        Modal.createTrackedDialog('Room not found', '', ErrorDialog, {
+            title: _t("Failed to update the join rules"),
+            description: error.message ?? _t("Unknown failure"),
+        });
+    };
+
+    private onBeforeJoinRuleChange = async (joinRule: JoinRule): Promise<boolean> => {
+        if (this.state.encrypted && joinRule === JoinRule.Public) {
+            const dialog = Modal.createTrackedDialog('Confirm Public Encrypted Room', '', QuestionDialog, {
+                title: _t("Are you sure you want to make this encrypted room public?"),
+                description: <div>
+                    <p> { _t(
+                        "<b>It's not recommended to make encrypted rooms public.</b> " +
+                        "It will mean anyone can find and join the room, so anyone can read messages. " +
+                        "You'll get none of the benefits of encryption. Encrypting messages in a public " +
+                        "room will make receiving and sending messages slower.",
+                        null,
+                        { "b": (sub) => <b>{ sub }</b> },
+                    ) } </p>
+                    <p> { _t(
+                        "To avoid these issues, create a <a>new public room</a> for the conversation " +
+                        "you plan to have.",
+                        null,
+                        {
+                            "a": (sub) => <a
+                                className="mx_linkButton"
+                                onClick={() => {
+                                    dialog.close();
+                                    this.createNewRoom(true, false);
+                                }}> { sub } </a>,
+                        },
+                    ) } </p>
+                </div>,
+            });
+
+            const { finished } = dialog;
+            const [confirm] = await finished;
+            if (!confirm) return false;
+        }
+
+        return true;
+    };
+
     private renderHistory() {
         const client = MatrixClientPeg.get();
         const history = this.state.history;
         const state = client.getRoom(this.props.roomId).currentState;
-        const canChangeHistory = state.mayClientSendStateEvent('m.room.history_visibility', client);
+        const canChangeHistory = state.mayClientSendStateEvent(EventType.RoomHistoryVisibility, client);
+
+        const options = [
+            {
+                value: HistoryVisibility.Shared,
+                label: _t('Members only (since the point in time of selecting this option)'),
+            },
+            {
+                value: HistoryVisibility.Invited,
+                label: _t('Members only (since they were invited)'),
+            },
+            {
+                value: HistoryVisibility.Joined,
+                label: _t('Members only (since they joined)'),
+            },
+        ];
+
+        // World readable doesn't make sense for encrypted rooms
+        if (!this.state.encrypted || history === HistoryVisibility.WorldReadable) {
+            options.unshift({
+                value: HistoryVisibility.WorldReadable,
+                label: _t("Anyone"),
+            });
+        }
 
         return (
             <div>
                 <div>
-                    {_t('Changes to who can read history will only apply to future messages in this room. ' +
-                        'The visibility of existing history will be unchanged.')}
+                    { _t('Changes to who can read history will only apply to future messages in this room. ' +
+                        'The visibility of existing history will be unchanged.') }
                 </div>
                 <StyledRadioGroup
                     name="historyVis"
                     value={history}
                     onChange={this.onHistoryRadioToggle}
-                    definitions={[
-                        {
-                            value: HistoryVisibility.WorldReadable,
-                            disabled: !canChangeHistory,
-                            label: _t("Anyone"),
-                        },
-                        {
-                            value: HistoryVisibility.Shared,
-                            disabled: !canChangeHistory,
-                            label: _t('Members only (since the point in time of selecting this option)'),
-                        },
-                        {
-                            value: HistoryVisibility.Invited,
-                            disabled: !canChangeHistory,
-                            label: _t('Members only (since they were invited)'),
-                        },
-                        {
-                            value: HistoryVisibility.Joined,
-                            disabled: !canChangeHistory,
-                            label: _t('Members only (since they joined)'),
-                        },
-                    ]}
+                    disabled={!canChangeHistory}
+                    definitions={options}
                 />
             </div>
         );
     }
 
-    render() {
-        const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
+    private toggleAdvancedSection = () => {
+        this.setState({ showAdvancedSection: !this.state.showAdvancedSection });
+    };
 
+    private renderAdvanced() {
+        const client = MatrixClientPeg.get();
+        const guestAccess = this.state.guestAccess;
+        const state = client.getRoom(this.props.roomId).currentState;
+        const canSetGuestAccess = state.mayClientSendStateEvent(EventType.RoomGuestAccess, client);
+
+        return <div className="mx_SettingsTab_section">
+            <LabelledToggleSwitch
+                value={guestAccess === GuestAccess.CanJoin}
+                onChange={this.onGuestAccessChange}
+                disabled={!canSetGuestAccess}
+                label={_t("Enable guest access")}
+            />
+            <p>
+                { _t("People with supported clients will be able to join " +
+                    "the room without having a registered account.") }
+            </p>
+        </div>;
+    }
+
+    render() {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
         const isEncrypted = this.state.encrypted;
-        const hasEncryptionPermission = room.currentState.mayClientSendStateEvent("m.room.encryption", client);
+        const hasEncryptionPermission = room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, client);
         const canEnableEncryption = !isEncrypted && hasEncryptionPermission;
 
         let encryptionSettings = null;
@@ -381,38 +415,58 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         }
 
         let historySection = (<>
-            <span className='mx_SettingsTab_subheading'>{_t("Who can read history?")}</span>
+            <span className='mx_SettingsTab_subheading'>{ _t("Who can read history?") }</span>
             <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                {this.renderHistory()}
+                { this.renderHistory() }
             </div>
         </>);
         if (!SettingsStore.getValue(UIFeature.RoomHistorySettings)) {
             historySection = null;
         }
 
+        let advanced;
+        if (room.getJoinRule() === JoinRule.Public) {
+            advanced = (
+                <>
+                    <AccessibleButton
+                        onClick={this.toggleAdvancedSection}
+                        kind="link"
+                        className="mx_SettingsTab_showAdvanced"
+                    >
+                        { this.state.showAdvancedSection ? _t("Hide advanced") : _t("Show advanced") }
+                    </AccessibleButton>
+                    { this.state.showAdvancedSection && this.renderAdvanced() }
+                </>
+            );
+        }
+
         return (
             <div className="mx_SettingsTab mx_SecurityRoomSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Security & Privacy") }</div>
 
-                <span className='mx_SettingsTab_subheading'>{_t("Encryption")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Encryption") }</span>
                 <div className='mx_SettingsTab_section mx_SecurityRoomSettingsTab_encryptionSection'>
                     <div>
                         <div className='mx_SettingsTab_subsectionText'>
-                            <span>{_t("Once enabled, encryption cannot be disabled.")}</span>
+                            <span>{ _t("Once enabled, encryption cannot be disabled.") }</span>
                         </div>
-                        <LabelledToggleSwitch value={isEncrypted} onChange={this.onEncryptionChange}
-                            label={_t("Encrypted")} disabled={!canEnableEncryption}
+                        <LabelledToggleSwitch
+                            value={isEncrypted}
+                            onChange={this.onEncryptionChange}
+                            label={_t("Encrypted")}
+                            disabled={!canEnableEncryption}
                         />
                     </div>
-                    {encryptionSettings}
+                    { encryptionSettings }
                 </div>
 
-                <span className='mx_SettingsTab_subheading'>{_t("Who can access this room?")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Access") }</span>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    {this.renderRoomAccess()}
+                    { this.renderJoinRule() }
                 </div>
 
-                {historySection}
+                { advanced }
+                { historySection }
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 9e27ed968e..bc54a8155c 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+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.
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../../../languageHandler";
+import { _t } from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
 import { MatrixClientPeg } from '../../../../../MatrixClientPeg';
 import SettingsStore from "../../../../../settings/SettingsStore";
@@ -39,6 +39,7 @@ import { UIFeature } from "../../../../../settings/UIFeature";
 import { Layout } from "../../../../../settings/Layout";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { compare } from "../../../../../utils/strings";
+import LayoutSwitcher from "../../LayoutSwitcher";
 
 interface IProps {
 }
@@ -66,7 +67,7 @@ interface IState extends IThemeState {
     showAdvanced: boolean;
     layout: Layout;
     // User profile data for the message preview
-    userId: string;
+    userId?: string;
     displayName: string;
     avatarUrl: string;
 }
@@ -75,7 +76,8 @@ interface IState extends IThemeState {
 export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
     private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
 
-    private themeTimer: NodeJS.Timeout;
+    private themeTimer: number;
+    private unmounted = false;
 
     constructor(props: IProps) {
         super(props);
@@ -84,14 +86,14 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             fontSize: (SettingsStore.getValue("baseFontSize", null) + FontWatcher.SIZE_DIFF).toString(),
             ...this.calculateThemeState(),
             customThemeUrl: "",
-            customThemeMessage: {isError: false, text: ""},
+            customThemeMessage: { isError: false, text: "" },
             useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
             useSystemFont: SettingsStore.getValue("useSystemFont"),
             systemFont: SettingsStore.getValue("systemFont"),
             showAdvanced: false,
             layout: SettingsStore.getValue("layout"),
-            userId: "@erim:fink.fink",
-            displayName: "Erimayas Fink",
+            userId: null,
+            displayName: null,
             avatarUrl: null,
         };
     }
@@ -101,6 +103,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         const client = MatrixClientPeg.get();
         const userId = client.getUserId();
         const profileInfo = await client.getProfileInfo(userId);
+        if (this.unmounted) return;
 
         this.setState({
             userId,
@@ -109,6 +112,10 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         });
     }
 
+    componentWillUnmount() {
+        this.unmounted = true;
+    }
+
     private calculateThemeState(): IThemeState {
         // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
         // show the right values for things.
@@ -149,43 +156,43 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         // so remember what the value was before we tried to set it so we can revert
         const oldTheme: string = SettingsStore.getValue('theme');
         SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme).catch(() => {
-            dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme});
-            this.setState({theme: oldTheme});
+            dis.dispatch<RecheckThemePayload>({ action: Action.RecheckTheme });
+            this.setState({ theme: oldTheme });
         });
-        this.setState({theme: newTheme});
+        this.setState({ theme: newTheme });
         // The settings watcher doesn't fire until the echo comes back from the
         // server, so to make the theme change immediately we need to manually
         // do the dispatch now
         // XXX: The local echoed value appears to be unreliable, in particular
         // when settings custom themes(!) so adding forceTheme to override
         // the value from settings.
-        dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme, forceTheme: newTheme});
+        dis.dispatch<RecheckThemePayload>({ action: Action.RecheckTheme, forceTheme: newTheme });
     };
 
     private onUseSystemThemeChanged = (checked: boolean): void => {
-        this.setState({useSystemTheme: checked});
+        this.setState({ useSystemTheme: checked });
         SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, checked);
-        dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme});
+        dis.dispatch<RecheckThemePayload>({ action: Action.RecheckTheme });
     };
 
     private onFontSizeChanged = (size: number): void => {
-        this.setState({fontSize: size.toString()});
+        this.setState({ fontSize: size.toString() });
         SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, size - FontWatcher.SIZE_DIFF);
     };
 
-    private onValidateFontSize = async ({value}: Pick<IFieldState, "value">): Promise<IValidationResult> => {
+    private onValidateFontSize = async ({ value }: Pick<IFieldState, "value">): Promise<IValidationResult> => {
         const parsedSize = parseFloat(value);
         const min = FontWatcher.MIN_SIZE + FontWatcher.SIZE_DIFF;
         const max = FontWatcher.MAX_SIZE + FontWatcher.SIZE_DIFF;
 
         if (isNaN(parsedSize)) {
-            return {valid: false, feedback: _t("Size must be a number")};
+            return { valid: false, feedback: _t("Size must be a number") };
         }
 
         if (!(min <= parsedSize && parsedSize <= max)) {
             return {
                 valid: false,
-                feedback: _t('Custom font size can only be between %(min)s pt and %(max)s pt', {min, max}),
+                feedback: _t('Custom font size can only be between %(min)s pt and %(max)s pt', { min, max }),
             };
         }
 
@@ -196,7 +203,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             parseInt(value, 10) - FontWatcher.SIZE_DIFF,
         );
 
-        return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
+        return { valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', { min, max }) };
     };
 
     private onAddCustomTheme = async (): Promise<void> => {
@@ -213,37 +220,41 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             // XXX: need some schema for this
             const themeInfo = await r.json();
             if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
-                this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
+                this.setState({ customThemeMessage: { text: _t("Invalid theme schema."), isError: true } });
                 return;
             }
             currentThemes.push(themeInfo);
         } catch (e) {
             console.error(e);
-            this.setState({customThemeMessage: {text: _t("Error downloading theme information."), isError: true}});
+            this.setState({ customThemeMessage: { text: _t("Error downloading theme information."), isError: true } });
             return; // Don't continue on error
         }
 
         await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
-        this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
+        this.setState({ customThemeUrl: "", customThemeMessage: { text: _t("Theme added!"), isError: false } });
 
         this.themeTimer = setTimeout(() => {
-            this.setState({customThemeMessage: {text: "", isError: false}});
+            this.setState({ customThemeMessage: { text: "", isError: false } });
         }, 3000);
     };
 
     private onCustomThemeChange = (e: React.ChangeEvent<HTMLSelectElement | HTMLInputElement>): void => {
-        this.setState({customThemeUrl: e.target.value});
+        this.setState({ customThemeUrl: e.target.value });
+    };
+
+    private onLayoutChanged = (layout: Layout): void => {
+        this.setState({ layout: layout });
     };
 
     private onIRCLayoutChange = (enabled: boolean) => {
         if (enabled) {
-            this.setState({layout: Layout.IRC});
+            this.setState({ layout: Layout.IRC });
             SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
         } else {
-            this.setState({layout: Layout.Group});
+            this.setState({ layout: Layout.Group });
             SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.Group);
         }
-    }
+    };
 
     private renderThemeSection() {
         const themeWatcher = new ThemeWatcher();
@@ -254,7 +265,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                     checked={this.state.useSystemTheme}
                     onChange={(e) => this.onUseSystemThemeChanged(e.target.checked)}
                 >
-                    {SettingsStore.getDisplayName("use_system_theme")}
+                    { SettingsStore.getDisplayName("use_system_theme") }
                 </StyledCheckbox>
             </div>;
         }
@@ -264,9 +275,9 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             let messageElement = null;
             if (this.state.customThemeMessage.text) {
                 if (this.state.customThemeMessage.isError) {
-                    messageElement = <div className='text-error'>{this.state.customThemeMessage.text}</div>;
+                    messageElement = <div className='text-error'>{ this.state.customThemeMessage.text }</div>;
                 } else {
-                    messageElement = <div className='text-success'>{this.state.customThemeMessage.text}</div>;
+                    messageElement = <div className='text-success'>{ this.state.customThemeMessage.text }</div>;
                 }
             }
             customThemeForm = (
@@ -282,10 +293,13 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                         />
                         <AccessibleButton
                             onClick={this.onAddCustomTheme}
-                            type="submit" kind="primary_sm"
+                            type="submit"
+                            kind="primary_sm"
                             disabled={!this.state.customThemeUrl.trim()}
-                        >{_t("Add theme")}</AccessibleButton>
-                        {messageElement}
+                        >
+                            { _t("Add theme") }
+                        </AccessibleButton>
+                        { messageElement }
                     </form>
                 </div>
             );
@@ -293,15 +307,15 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
 
         // XXX: replace any type here
         const themes = Object.entries<any>(enumerateThemes())
-            .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
+            .map(p => ({ id: p[0], name: p[1] })); // convert pairs to objects for code readability
         const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
         const customThemes = themes.filter(p => !builtInThemes.includes(p))
             .sort((a, b) => compare(a.name, b.name));
         const orderedThemes = [...builtInThemes, ...customThemes];
         return (
             <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_themeSection">
-                <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
-                {systemThemeSection}
+                <span className="mx_SettingsTab_subheading">{ _t("Theme") }</span>
+                { systemThemeSection }
                 <div className="mx_ThemeSelectors">
                     <StyledRadioGroup
                         name="theme"
@@ -316,7 +330,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                         outlined
                     />
                 </div>
-                {customThemeForm}
+                { customThemeForm }
             </div>
         );
     }
@@ -324,7 +338,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
     private renderFontSection() {
         return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
 
-            <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
+            <span className="mx_SettingsTab_subheading">{ _t("Font size") }</span>
             <EventTilePreview
                 className="mx_AppearanceUserSettingsTab_fontSlider_preview"
                 message={this.MESSAGE_PREVIEW_TEXT}
@@ -348,7 +362,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             <SettingsFlag
                 name="useCustomFontSize"
                 level={SettingLevel.ACCOUNT}
-                onChange={(checked) => this.setState({useCustomFontSize: checked})}
+                onChange={(checked) => this.setState({ useCustomFontSize: checked })}
                 useCheckbox={true}
             />
 
@@ -360,7 +374,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                 value={this.state.fontSize.toString()}
                 id="font_size_field"
                 onValidate={this.onValidateFontSize}
-                onChange={(value) => this.setState({fontSize: value.target.value})}
+                onChange={(value) => this.setState({ fontSize: value.target.value })}
                 disabled={!this.state.useCustomFontSize}
                 className="mx_SettingsTab_customFontSizeField"
             />
@@ -373,9 +387,9 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         const brand = SdkConfig.get().brand;
         const toggle = <div
             className="mx_AppearanceUserSettingsTab_AdvancedToggle"
-            onClick={() => this.setState({showAdvanced: !this.state.showAdvanced})}
+            onClick={() => this.setState({ showAdvanced: !this.state.showAdvanced })}
         >
-            {this.state.showAdvanced ? _t("Hide advanced") : _t("Show advanced")}
+            { this.state.showAdvanced ? _t("Hide advanced") : _t("Show advanced") }
         </div>;
 
         let advanced: React.ReactNode;
@@ -390,20 +404,23 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                     name="useCompactLayout"
                     level={SettingLevel.DEVICE}
                     useCheckbox={true}
-                    disabled={this.state.layout == Layout.IRC}
+                    disabled={this.state.layout !== Layout.Group}
                 />
-                <StyledCheckbox
-                    checked={this.state.layout == Layout.IRC}
-                    onChange={(ev) => this.onIRCLayoutChange(ev.target.checked)}
-                >
-                    {_t("Enable experimental, compact IRC style layout")}
-                </StyledCheckbox>
+
+                { !SettingsStore.getValue("feature_new_layout_switcher") ?
+                    <StyledCheckbox
+                        checked={this.state.layout == Layout.IRC}
+                        onChange={(ev) => this.onIRCLayoutChange(ev.target.checked)}
+                    >
+                        { _t("Enable experimental, compact IRC style layout") }
+                    </StyledCheckbox> : null
+                }
 
                 <SettingsFlag
                     name="useSystemFont"
                     level={SettingLevel.DEVICE}
                     useCheckbox={true}
-                    onChange={(checked) => this.setState({useSystemFont: checked})}
+                    onChange={(checked) => this.setState({ useSystemFont: checked })}
                 />
                 <Field
                     className="mx_AppearanceUserSettingsTab_systemFont"
@@ -423,23 +440,37 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             </>;
         }
         return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_Advanced">
-            {toggle}
-            {advanced}
+            { toggle }
+            { advanced }
         </div>;
     }
 
     render() {
         const brand = SdkConfig.get().brand;
 
+        let layoutSection;
+        if (SettingsStore.getValue("feature_new_layout_switcher")) {
+            layoutSection = (
+                <LayoutSwitcher
+                    userId={this.state.userId}
+                    displayName={this.state.displayName}
+                    avatarUrl={this.state.avatarUrl}
+                    messagePreviewText={this.MESSAGE_PREVIEW_TEXT}
+                    onLayoutChanged={this.onLayoutChanged}
+                />
+            );
+        }
+
         return (
             <div className="mx_SettingsTab mx_AppearanceUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Customise your appearance")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Customise your appearance") }</div>
                 <div className="mx_SettingsTab_SubHeading">
-                    {_t("Appearance Settings only affect this %(brand)s session.", { brand })}
+                    { _t("Appearance Settings only affect this %(brand)s session.", { brand }) }
                 </div>
-                {this.renderThemeSection()}
-                {this.renderFontSection()}
-                {this.renderAdvancedSection()}
+                { this.renderThemeSection() }
+                { layoutSection }
+                { this.renderFontSection() }
+                { this.renderAdvancedSection() }
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
index 28e80f3030..180cb5df2c 100644
--- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
@@ -15,16 +15,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../../../languageHandler";
+import { _t } from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 
 @replaceableComponent("views.settings.tabs.user.FlairUserSettingsTab")
 export default class FlairUserSettingsTab extends React.Component {
     render() {
         return (
             <div className="mx_SettingsTab">
-                <span className="mx_SettingsTab_heading">{_t("Flair")}</span>
+                <span className="mx_SettingsTab_heading">{ _t("Flair") }</span>
                 <div className="mx_SettingsTab_section">
                     <GroupUserSettings />
                 </div>
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
similarity index 63%
rename from src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
rename to src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
index 5118414903..77b3ace22b 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../../../languageHandler";
+import { _t } from "../../../../../languageHandler";
 import ProfileSettings from "../../ProfileSettings";
 import * as languageHandler from "../../../../../languageHandler";
 import SettingsStore from "../../../../../settings/SettingsStore";
@@ -25,30 +25,63 @@ import LanguageDropdown from "../../../elements/LanguageDropdown";
 import SpellCheckSettings from "../../SpellCheckSettings";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
-import PropTypes from "prop-types";
 import PlatformPeg from "../../../../../PlatformPeg";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import * as sdk from "../../../../..";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
-import {Service, startTermsFlow} from "../../../../../Terms";
-import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
+import { Policies, Service, startTermsFlow } from "../../../../../Terms";
+import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
 import IdentityAuthClient from "../../../../../IdentityAuthClient";
-import {abbreviateUrl} from "../../../../../utils/UrlUtils";
+import { abbreviateUrl } from "../../../../../utils/UrlUtils";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
 import Spinner from "../../../elements/Spinner";
-import {SettingLevel} from "../../../../../settings/SettingLevel";
-import {UIFeature} from "../../../../../settings/UIFeature";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
+import { UIFeature } from "../../../../../settings/UIFeature";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import { ActionPayload } from "../../../../../dispatcher/payloads";
+import ErrorDialog from "../../../dialogs/ErrorDialog";
+import AccountPhoneNumbers from "../../account/PhoneNumbers";
+import AccountEmailAddresses from "../../account/EmailAddresses";
+import DiscoveryEmailAddresses from "../../discovery/EmailAddresses";
+import DiscoveryPhoneNumbers from "../../discovery/PhoneNumbers";
+import ChangePassword from "../../ChangePassword";
+import InlineTermsAgreement from "../../../terms/InlineTermsAgreement";
+import SetIdServer from "../../SetIdServer";
+import SetIntegrationManager from "../../SetIntegrationManager";
+
+interface IProps {
+    closeSettingsFn: () => void;
+}
+
+interface IState {
+    language: string;
+    spellCheckLanguages: string[];
+    haveIdServer: boolean;
+    serverSupportsSeparateAddAndBind: boolean;
+    idServerHasUnsignedTerms: boolean;
+    requiredPolicyInfo: {       // This object is passed along to a component for handling
+        hasTerms: boolean;
+        policiesAndServices: {
+            service: Service;
+            policies: Policies;
+        }[]; // From the startTermsFlow callback
+        agreedUrls: string[]; // From the startTermsFlow callback
+        resolve: (values: string[]) => void; // Promise resolve function for startTermsFlow callback
+    };
+    emails: IThreepid[];
+    msisdns: IThreepid[];
+    loading3pids: boolean; // whether or not the emails and msisdns have been loaded
+    canChangePassword: boolean;
+    idServerName: string;
+}
 
 @replaceableComponent("views.settings.tabs.user.GeneralUserSettingsTab")
-export default class GeneralUserSettingsTab extends React.Component {
-    static propTypes = {
-        closeSettingsFn: PropTypes.func.isRequired,
-    };
+export default class GeneralUserSettingsTab extends React.Component<IProps, IState> {
+    private readonly dispatcherRef: string;
 
-    constructor() {
-        super();
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
@@ -58,20 +91,23 @@ export default class GeneralUserSettingsTab extends React.Component {
             idServerHasUnsignedTerms: false,
             requiredPolicyInfo: {       // This object is passed along to a component for handling
                 hasTerms: false,
-                // policiesAndServices, // From the startTermsFlow callback
-                // agreedUrls,          // From the startTermsFlow callback
-                // resolve,             // Promise resolve function for startTermsFlow callback
+                policiesAndServices: null, // From the startTermsFlow callback
+                agreedUrls: null,          // From the startTermsFlow callback
+                resolve: null,             // Promise resolve function for startTermsFlow callback
             },
             emails: [],
             msisdns: [],
             loading3pids: true, // whether or not the emails and msisdns have been loaded
+            canChangePassword: false,
+            idServerName: null,
         };
 
-        this.dispatcherRef = dis.register(this._onAction);
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    async UNSAFE_componentWillMount() { // eslint-disable-line camelcase
+    // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+    public async UNSAFE_componentWillMount(): Promise<void> {
         const cli = MatrixClientPeg.get();
 
         const serverSupportsSeparateAddAndBind = await cli.doesServerSupportSeparateAddAndBind();
@@ -84,12 +120,12 @@ export default class GeneralUserSettingsTab extends React.Component {
         // the enabled flag value.
         const canChangePassword = !changePasswordCap || changePasswordCap['enabled'] !== false;
 
-        this.setState({serverSupportsSeparateAddAndBind, canChangePassword});
+        this.setState({ serverSupportsSeparateAddAndBind, canChangePassword });
 
-        this._getThreepidState();
+        this.getThreepidState();
     }
 
-    async componentDidMount() {
+    public async componentDidMount(): Promise<void> {
         const plaf = PlatformPeg.get();
         if (plaf) {
             this.setState({
@@ -98,30 +134,30 @@ export default class GeneralUserSettingsTab extends React.Component {
         }
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         dis.unregister(this.dispatcherRef);
     }
 
-    _onAction = (payload) => {
+    private onAction = (payload: ActionPayload): void => {
         if (payload.action === 'id_server_changed') {
-            this.setState({haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl())});
-            this._getThreepidState();
+            this.setState({ haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()) });
+            this.getThreepidState();
         }
     };
 
-    _onEmailsChange = (emails) => {
+    private onEmailsChange = (emails: IThreepid[]): void => {
         this.setState({ emails });
     };
 
-    _onMsisdnsChange = (msisdns) => {
+    private onMsisdnsChange = (msisdns: IThreepid[]): void => {
         this.setState({ msisdns });
     };
 
-    async _getThreepidState() {
+    private async getThreepidState(): Promise<void> {
         const cli = MatrixClientPeg.get();
 
         // Check to see if terms need accepting
-        this._checkTerms();
+        this.checkTerms();
 
         // Need to get 3PIDs generally for Account section and possibly also for
         // Discovery (assuming we have an IS and terms are agreed).
@@ -143,9 +179,9 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     }
 
-    async _checkTerms() {
+    private async checkTerms(): Promise<void> {
         if (!this.state.haveIdServer) {
-            this.setState({idServerHasUnsignedTerms: false});
+            this.setState({ idServerHasUnsignedTerms: false });
             return;
         }
 
@@ -176,6 +212,7 @@ export default class GeneralUserSettingsTab extends React.Component {
             this.setState({
                 requiredPolicyInfo: {
                     hasTerms: false,
+                    ...this.state.requiredPolicyInfo,
                 },
             });
         } catch (e) {
@@ -187,20 +224,20 @@ export default class GeneralUserSettingsTab extends React.Component {
         }
     }
 
-    _onLanguageChange = (newLanguage) => {
+    private onLanguageChange = (newLanguage: string): void => {
         if (this.state.language === newLanguage) return;
 
         SettingsStore.setValue("language", null, SettingLevel.DEVICE, newLanguage);
-        this.setState({language: newLanguage});
+        this.setState({ language: newLanguage });
         const platform = PlatformPeg.get();
         if (platform) {
-            platform.setLanguage(newLanguage);
+            platform.setLanguage([newLanguage]);
             platform.reload();
         }
     };
 
-    _onSpellCheckLanguagesChange = (languages) => {
-        this.setState({spellCheckLanguages: languages});
+    private onSpellCheckLanguagesChange = (languages: string[]): void => {
+        this.setState({ spellCheckLanguages: languages });
 
         const plaf = PlatformPeg.get();
         if (plaf) {
@@ -208,7 +245,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         }
     };
 
-    _onPasswordChangeError = (err) => {
+    private onPasswordChangeError = (err): void => {
         // TODO: Figure out a design that doesn't involve replacing the current dialog
         let errMsg = err.error || err.message || "";
         if (err.httpStatus === 403) {
@@ -216,7 +253,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         } else if (!errMsg) {
             errMsg += ` (HTTP status ${err.httpStatus})`;
         }
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         console.error("Failed to change password: " + errMsg);
         Modal.createTrackedDialog('Failed to change password', '', ErrorDialog, {
             title: _t("Error"),
@@ -224,9 +260,8 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     };
 
-    _onPasswordChanged = () => {
+    private onPasswordChanged = (): void => {
         // TODO: Figure out a design that doesn't involve replacing the current dialog
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Password changed', '', ErrorDialog, {
             title: _t("Success"),
             description: _t(
@@ -236,7 +271,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     };
 
-    _onDeactivateClicked = () => {
+    private onDeactivateClicked = (): void => {
         Modal.createTrackedDialog('Deactivate Account', '', DeactivateAccountDialog, {
             onFinished: (success) => {
                 if (success) this.props.closeSettingsFn();
@@ -244,7 +279,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     };
 
-    _renderProfileSection() {
+    private renderProfileSection(): JSX.Element {
         return (
             <div className="mx_SettingsTab_section">
                 <ProfileSettings />
@@ -252,18 +287,14 @@ export default class GeneralUserSettingsTab extends React.Component {
         );
     }
 
-    _renderAccountSection() {
-        const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
-        const EmailAddresses = sdk.getComponent("views.settings.account.EmailAddresses");
-        const PhoneNumbers = sdk.getComponent("views.settings.account.PhoneNumbers");
-
+    private renderAccountSection(): JSX.Element {
         let passwordChangeForm = (
             <ChangePassword
                 className="mx_GeneralUserSettingsTab_changePassword"
                 rowClassName=""
                 buttonKind="primary"
-                onError={this._onPasswordChangeError}
-                onFinished={this._onPasswordChanged} />
+                onError={this.onPasswordChangeError}
+                onFinished={this.onPasswordChanged} />
         );
 
         let threepidSection = null;
@@ -278,22 +309,22 @@ export default class GeneralUserSettingsTab extends React.Component {
         ) {
             const emails = this.state.loading3pids
                 ? <Spinner />
-                : <EmailAddresses
+                : <AccountEmailAddresses
                     emails={this.state.emails}
-                    onEmailsChange={this._onEmailsChange}
+                    onEmailsChange={this.onEmailsChange}
                 />;
             const msisdns = this.state.loading3pids
                 ? <Spinner />
-                : <PhoneNumbers
+                : <AccountPhoneNumbers
                     msisdns={this.state.msisdns}
-                    onMsisdnsChange={this._onMsisdnsChange}
+                    onMsisdnsChange={this.onMsisdnsChange}
                 />;
             threepidSection = <div>
-                <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-                {emails}
+                <span className="mx_SettingsTab_subheading">{ _t("Email addresses") }</span>
+                { emails }
 
-                <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-                {msisdns}
+                <span className="mx_SettingsTab_subheading">{ _t("Phone numbers") }</span>
+                { msisdns }
             </div>;
         } else if (this.state.serverSupportsSeparateAddAndBind === null) {
             threepidSection = <Spinner />;
@@ -308,53 +339,50 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         return (
             <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_accountSection">
-                <span className="mx_SettingsTab_subheading">{_t("Account")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Account") }</span>
                 <p className="mx_SettingsTab_subsectionText">
-                    {passwordChangeText}
+                    { passwordChangeText }
                 </p>
-                {passwordChangeForm}
-                {threepidSection}
+                { passwordChangeForm }
+                { threepidSection }
             </div>
         );
     }
 
-    _renderLanguageSection() {
+    private renderLanguageSection(): JSX.Element {
         // TODO: Convert to new-styled Field
         return (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Language and region")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Language and region") }</span>
                 <LanguageDropdown
                     className="mx_GeneralUserSettingsTab_languageInput"
-                    onOptionChange={this._onLanguageChange}
+                    onOptionChange={this.onLanguageChange}
                     value={this.state.language}
                 />
             </div>
         );
     }
 
-    _renderSpellCheckSection() {
+    private renderSpellCheckSection(): JSX.Element {
         return (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Spell check dictionaries")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Spell check dictionaries") }</span>
                 <SpellCheckSettings
                     languages={this.state.spellCheckLanguages}
-                    onLanguagesChange={this._onSpellCheckLanguagesChange}
+                    onLanguagesChange={this.onSpellCheckLanguagesChange}
                 />
             </div>
         );
     }
 
-    _renderDiscoverySection() {
-        const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
-
+    private renderDiscoverySection(): JSX.Element {
         if (this.state.requiredPolicyInfo.hasTerms) {
-            const InlineTermsAgreement = sdk.getComponent("views.terms.InlineTermsAgreement");
             const intro = <span className="mx_SettingsTab_subsectionText">
-                {_t(
+                { _t(
                     "Agree to the identity server (%(serverName)s) Terms of Service to " +
                     "allow yourself to be discoverable by email address or phone number.",
-                    {serverName: this.state.idServerName},
-                )}
+                    { serverName: this.state.idServerName },
+                ) }
             </span>;
             return (
                 <div>
@@ -364,55 +392,50 @@ export default class GeneralUserSettingsTab extends React.Component {
                         onFinished={this.state.requiredPolicyInfo.resolve}
                         introElement={intro}
                     />
-                    { /* has its own heading as it includes the current ID server */ }
+                    { /* has its own heading as it includes the current identity server */ }
                     <SetIdServer missingTerms={true} />
                 </div>
             );
         }
 
-        const EmailAddresses = sdk.getComponent("views.settings.discovery.EmailAddresses");
-        const PhoneNumbers = sdk.getComponent("views.settings.discovery.PhoneNumbers");
-
-        const emails = this.state.loading3pids ? <Spinner /> : <EmailAddresses emails={this.state.emails} />;
-        const msisdns = this.state.loading3pids ? <Spinner /> : <PhoneNumbers msisdns={this.state.msisdns} />;
+        const emails = this.state.loading3pids ? <Spinner /> : <DiscoveryEmailAddresses emails={this.state.emails} />;
+        const msisdns = this.state.loading3pids ? <Spinner /> : <DiscoveryPhoneNumbers msisdns={this.state.msisdns} />;
 
         const threepidSection = this.state.haveIdServer ? <div className='mx_GeneralUserSettingsTab_discovery'>
-            <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-            {emails}
+            <span className="mx_SettingsTab_subheading">{ _t("Email addresses") }</span>
+            { emails }
 
-            <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-            {msisdns}
+            <span className="mx_SettingsTab_subheading">{ _t("Phone numbers") }</span>
+            { msisdns }
         </div> : null;
 
         return (
             <div className="mx_SettingsTab_section">
-                {threepidSection}
-                { /* has its own heading as it includes the current ID server */ }
-                <SetIdServer />
+                { threepidSection }
+                { /* has its own heading as it includes the current identity server */ }
+                <SetIdServer missingTerms={false} />
             </div>
         );
     }
 
-    _renderManagementSection() {
+    private renderManagementSection(): JSX.Element {
         // TODO: Improve warning text for account deactivation
         return (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Account management")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Account management") }</span>
                 <span className="mx_SettingsTab_subsectionText">
-                    {_t("Deactivating your account is a permanent action - be careful!")}
+                    { _t("Deactivating your account is a permanent action - be careful!") }
                 </span>
-                <AccessibleButton onClick={this._onDeactivateClicked} kind="danger">
-                    {_t("Deactivate Account")}
+                <AccessibleButton onClick={this.onDeactivateClicked} kind="danger">
+                    { _t("Deactivate Account") }
                 </AccessibleButton>
             </div>
         );
     }
 
-    _renderIntegrationManagerSection() {
+    private renderIntegrationManagerSection(): JSX.Element {
         if (!SettingsStore.getValue(UIFeature.Widgets)) return null;
 
-        const SetIntegrationManager = sdk.getComponent("views.settings.SetIntegrationManager");
-
         return (
             <div className="mx_SettingsTab_section">
                 { /* has its own heading as it includes the current integration manager */ }
@@ -421,41 +444,45 @@ export default class GeneralUserSettingsTab extends React.Component {
         );
     }
 
-    render() {
+    public render(): JSX.Element {
         const plaf = PlatformPeg.get();
         const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck();
 
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
-            ? <img className='mx_GeneralUserSettingsTab_warningIcon'
+            ? <img
+                className='mx_GeneralUserSettingsTab_warningIcon'
                 src={require("../../../../../../res/img/feather-customised/warning-triangle.svg")}
-                width="18" height="18" alt={_t("Warning")} />
+                width="18"
+                height="18"
+                alt={_t("Warning")}
+            />
             : null;
 
         let accountManagementSection;
         if (SettingsStore.getValue(UIFeature.Deactivate)) {
             accountManagementSection = <>
-                <div className="mx_SettingsTab_heading">{_t("Deactivate account")}</div>
-                {this._renderManagementSection()}
+                <div className="mx_SettingsTab_heading">{ _t("Deactivate account") }</div>
+                { this.renderManagementSection() }
             </>;
         }
 
         let discoverySection;
         if (SettingsStore.getValue(UIFeature.IdentityServer)) {
             discoverySection = <>
-                <div className="mx_SettingsTab_heading">{discoWarning} {_t("Discovery")}</div>
-                {this._renderDiscoverySection()}
+                <div className="mx_SettingsTab_heading">{ discoWarning } { _t("Discovery") }</div>
+                { this.renderDiscoverySection() }
             </>;
         }
 
         return (
             <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("General")}</div>
-                {this._renderProfileSection()}
-                {this._renderAccountSection()}
-                {this._renderLanguageSection()}
-                {supportsMultiLanguageSpellCheck ? this._renderSpellCheckSection() : null}
+                <div className="mx_SettingsTab_heading">{ _t("General") }</div>
+                { this.renderProfileSection() }
+                { this.renderAccountSection() }
+                { this.renderLanguageSection() }
+                { supportsMultiLanguageSpellCheck ? this.renderSpellCheckSection() : null }
                 { discoverySection }
-                {this._renderIntegrationManagerSection() /* Has its own title */}
+                { this.renderIntegrationManagerSection() /* Has its own title */ }
                 { accountManagementSection }
             </div>
         );
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index 3fa0be478c..7c84cd8c65 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -15,14 +15,13 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t, getCurrentLanguage} from "../../../../../languageHandler";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import AccessibleButton from "../../../elements/AccessibleButton";
+import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton";
+import { _t, getCurrentLanguage } from "../../../../../languageHandler";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleTooltipButton from '../../../elements/AccessibleTooltipButton';
 import SdkConfig from "../../../../../SdkConfig";
 import createRoom from "../../../../../createRoom";
 import Modal from "../../../../../Modal";
-import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
 import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
 import UpdateCheckButton from "../../UpdateCheckButton";
@@ -30,9 +29,13 @@ import { replaceableComponent } from "../../../../../utils/replaceableComponent"
 import { copyPlaintext } from "../../../../../utils/strings";
 import * as ContextMenu from "../../../../structures/ContextMenu";
 import { toRightOf } from "../../../../structures/ContextMenu";
+import BugReportDialog from '../../../dialogs/BugReportDialog';
+import GenericTextContextMenu from "../../../context_menus/GenericTextContextMenu";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IProps {
-    closeSettingsFn: () => {};
+    closeSettingsFn: () => void;
 }
 
 interface IState {
@@ -54,10 +57,10 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
     }
 
     componentDidMount(): void {
-        PlatformPeg.get().getAppVersion().then((ver) => this.setState({appVersion: ver})).catch((e) => {
+        PlatformPeg.get().getAppVersion().then((ver) => this.setState({ appVersion: ver })).catch((e) => {
             console.error("Error getting vector version: ", e);
         });
-        PlatformPeg.get().canSelfUpdate().then((v) => this.setState({canUpdate: v})).catch((e) => {
+        PlatformPeg.get().canSelfUpdate().then((v) => this.setState({ canUpdate: v })).catch((e) => {
             console.error("Error getting self updatability: ", e);
         });
     }
@@ -68,12 +71,26 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         if (this.closeCopiedTooltip) this.closeCopiedTooltip();
     }
 
+    private getVersionInfo(): { appVersion: string, olmVersion: string } {
+        const brand = SdkConfig.get().brand;
+        const appVersion = this.state.appVersion || 'unknown';
+        const olmVersionTuple = MatrixClientPeg.get().olmVersion;
+        const olmVersion = olmVersionTuple
+            ? `${olmVersionTuple[0]}.${olmVersionTuple[1]}.${olmVersionTuple[2]}`
+            : '<not-enabled>';
+
+        return {
+            appVersion: `${_t("%(brand)s version:", { brand })} ${appVersion}`,
+            olmVersion: `${_t("Olm version:")} ${olmVersion}`,
+        };
+    }
+
     private onClearCacheAndReload = (e) => {
         if (!PlatformPeg.get()) return;
 
         // Dev note: please keep this log line, it's useful when troubleshooting a MatrixClient suddenly
         // stopping in the middle of the logs.
-        console.log("Clear cache & reload clicked");
+        logger.log("Clear cache & reload clicked");
         MatrixClientPeg.get().stopClient();
         MatrixClientPeg.get().store.deleteAllData().then(() => {
             PlatformPeg.get().reload();
@@ -81,10 +98,6 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
     };
 
     private onBugReport = (e) => {
-        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
-        if (!BugReportDialog) {
-            return;
-        }
         Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {});
     };
 
@@ -115,15 +128,15 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         const legalLinks = [];
         for (const tocEntry of SdkConfig.get().terms_and_conditions_links) {
             legalLinks.push(<div key={tocEntry.url}>
-                <a href={tocEntry.url} rel="noreferrer noopener" target="_blank">{tocEntry.text}</a>
+                <a href={tocEntry.url} rel="noreferrer noopener" target="_blank">{ tocEntry.text }</a>
             </div>);
         }
 
         return (
             <div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'>
-                <span className='mx_SettingsTab_subheading'>{_t("Legal")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Legal") }</span>
                 <div className='mx_SettingsTab_subsectionText'>
-                    {legalLinks}
+                    { legalLinks }
                 </div>
             </div>
         );
@@ -134,51 +147,70 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         // Also, &nbsp; is ugly but necessary.
         return (
             <div className='mx_SettingsTab_section'>
-                <span className='mx_SettingsTab_subheading'>{_t("Credits")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Credits") }</span>
                 <ul>
                     <li>
-                        The <a href="themes/element/img/backgrounds/lake.jpg" rel="noreferrer noopener"
-                            target="_blank">default cover photo</a> is ©&nbsp;
-                        <a href="https://www.flickr.com/golan" rel="noreferrer noopener"
-                            target="_blank">Jesús Roncero</a> used under the terms of&nbsp;
-                        <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noreferrer noopener"
-                            target="_blank">CC-BY-SA 4.0</a>.
+                        The <a href="themes/element/img/backgrounds/lake.jpg" rel="noreferrer noopener" target="_blank">
+                            default cover photo
+                        </a> is ©&nbsp;
+                        <a href="https://www.flickr.com/golan" rel="noreferrer noopener" target="_blank">
+                            Jesús Roncero
+                        </a> used under the terms of&nbsp;
+                        <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noreferrer noopener" target="_blank">
+                            CC-BY-SA 4.0
+                        </a>.
                     </li>
                     <li>
-                        The <a href="https://github.com/matrix-org/twemoji-colr" rel="noreferrer noopener"
-                            target="_blank">twemoji-colr</a> font is ©&nbsp;
-                        <a href="https://mozilla.org" rel="noreferrer noopener"
-                            target="_blank">Mozilla Foundation</a> used under the terms of&nbsp;
-                        <a href="http://www.apache.org/licenses/LICENSE-2.0" rel="noreferrer noopener"
-                            target="_blank">Apache 2.0</a>.
+                        The <a
+                            href="https://github.com/matrix-org/twemoji-colr"
+                            rel="noreferrer noopener"
+                            target="_blank"
+                        >
+                            twemoji-colr
+                        </a> font is ©&nbsp;
+                        <a href="https://mozilla.org" rel="noreferrer noopener" target="_blank">
+                            Mozilla Foundation
+                        </a> used under the terms of&nbsp;
+                        <a href="http://www.apache.org/licenses/LICENSE-2.0" rel="noreferrer noopener" target="_blank">Apache 2.0</a>.
                     </li>
                     <li>
-                        The <a href="https://twemoji.twitter.com/" rel="noreferrer noopener"
-                            target="_blank">Twemoji</a> emoji art is ©&nbsp;
-                        <a href="https://twemoji.twitter.com/" rel="noreferrer noopener"
-                            target="_blank">Twitter, Inc and other contributors</a> used under the terms of&nbsp;
-                        <a href="https://creativecommons.org/licenses/by/4.0/" rel="noreferrer noopener"
-                            target="_blank">CC-BY 4.0</a>.
+                        The <a href="https://twemoji.twitter.com/" rel="noreferrer noopener" target="_blank">
+                            Twemoji
+                        </a> emoji art is ©&nbsp;
+                        <a href="https://twemoji.twitter.com/" rel="noreferrer noopener" target="_blank">
+                            Twitter, Inc and other contributors
+                        </a> used under the terms of&nbsp;
+                        <a href="https://creativecommons.org/licenses/by/4.0/" rel="noreferrer noopener" target="_blank">
+                            CC-BY 4.0
+                        </a>.
                     </li>
                 </ul>
             </div>
         );
     }
 
-    onAccessTokenCopyClick = async (e) => {
+    private async copy(text: string, e: ButtonEvent) {
         e.preventDefault();
-        const target = e.target; // copy target before we go async and React throws it away
+        const target = e.target as HTMLDivElement; // copy target before we go async and React throws it away
 
-        const successful = await copyPlaintext(MatrixClientPeg.get().getAccessToken());
+        const successful = await copyPlaintext(text);
         const buttonRect = target.getBoundingClientRect();
-        const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
-        const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
+        const { close } = ContextMenu.createMenu(GenericTextContextMenu, {
             ...toRightOf(buttonRect, 2),
             message: successful ? _t('Copied!') : _t('Failed to copy'),
         });
         this.closeCopiedTooltip = target.onmouseleave = close;
     }
 
+    private onAccessTokenCopyClick = (e: ButtonEvent) => {
+        this.copy(MatrixClientPeg.get().getAccessToken(), e);
+    };
+
+    private onCopyVersionClicked = (e: ButtonEvent) => {
+        const { appVersion, olmVersion } = this.getVersionInfo();
+        this.copy(`${appVersion}\n${olmVersion}`, e);
+    };
+
     render() {
         const brand = SdkConfig.get().brand;
 
@@ -193,14 +225,14 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                     rel="noreferrer noopener"
                     target="_blank"
                 >
-                    {sub}
+                    { sub }
                 </a>,
             },
         );
         if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) {
             faqText = (
                 <div>
-                    {_t(
+                    { _t(
                         'For help with using %(brand)s, click <a>here</a> or start a chat with our ' +
                         'bot using the button below.',
                         {
@@ -212,24 +244,19 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                                 rel='noreferrer noopener'
                                 target='_blank'
                             >
-                                {sub}
+                                { sub }
                             </a>,
                         },
-                    )}
+                    ) }
                     <div>
                         <AccessibleButton onClick={this.onStartBotChat} kind='primary'>
-                            {_t("Chat with %(brand)s Bot", { brand })}
+                            { _t("Chat with %(brand)s Bot", { brand }) }
                         </AccessibleButton>
                     </div>
                 </div>
             );
         }
 
-        const appVersion = this.state.appVersion || 'unknown';
-
-        let olmVersion = MatrixClientPeg.get().olmVersion;
-        olmVersion = olmVersion ? `${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}` : '<not-enabled>';
-
         let updateButton = null;
         if (this.state.canUpdate) {
             updateButton = <UpdateCheckButton />;
@@ -239,79 +266,90 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         if (SdkConfig.get().bug_report_endpoint_url) {
             bugReportingSection = (
                 <div className="mx_SettingsTab_section">
-                    <span className='mx_SettingsTab_subheading'>{_t('Bug reporting')}</span>
+                    <span className='mx_SettingsTab_subheading'>{ _t('Bug reporting') }</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t(
+                        { _t(
                             "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 " +
+                            "the rooms or groups you have visited, which UI elements you " +
+                            "last interacted with, and the usernames of " +
                             "other users. They do not contain messages.",
-                        )}
+                        ) }
                         <div className='mx_HelpUserSettingsTab_debugButton'>
                             <AccessibleButton onClick={this.onBugReport} kind='primary'>
-                                {_t("Submit debug logs")}
+                                { _t("Submit debug logs") }
                             </AccessibleButton>
                         </div>
-                        {_t(
+                        { _t(
                             "To report a Matrix-related security issue, please read the Matrix.org " +
                             "<a>Security Disclosure Policy</a>.", {},
                             {
                                 a: sub => <a href="https://matrix.org/security-disclosure-policy/"
-                                    rel="noreferrer noopener" target="_blank"
-                                >{sub}</a>,
+                                    rel="noreferrer noopener"
+                                    target="_blank"
+                                >{ sub }</a>,
                             },
-                        )}
+                        ) }
                     </div>
                 </div>
             );
         }
 
+        const { appVersion, olmVersion } = this.getVersionInfo();
+
         return (
             <div className="mx_SettingsTab mx_HelpUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Help & About")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Help & About") }</div>
                 { bugReportingSection }
                 <div className='mx_SettingsTab_section'>
-                    <span className='mx_SettingsTab_subheading'>{_t("FAQ")}</span>
+                    <span className='mx_SettingsTab_subheading'>{ _t("FAQ") }</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {faqText}
+                        { faqText }
                     </div>
                     <AccessibleButton kind="primary" onClick={KeyboardShortcuts.toggleDialog}>
                         { _t("Keyboard Shortcuts") }
                     </AccessibleButton>
                 </div>
                 <div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Versions")}</span>
+                    <span className='mx_SettingsTab_subheading'>{ _t("Versions") }</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("%(brand)s version:", { brand })} {appVersion}<br />
-                        {_t("olm version:")} {olmVersion}<br />
-                        {updateButton}
+                        <div className="mx_HelpUserSettingsTab_copy">
+                            { appVersion }<br />
+                            { olmVersion }<br />
+                            <AccessibleTooltipButton
+                                title={_t("Copy")}
+                                onClick={this.onCopyVersionClicked}
+                                className="mx_HelpUserSettingsTab_copyButton"
+                            />
+                        </div>
+                        { updateButton }
                     </div>
                 </div>
-                {this.renderLegal()}
-                {this.renderCredits()}
+                { this.renderLegal() }
+                { this.renderCredits() }
                 <div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'>
-                    <span className='mx_SettingsTab_subheading'>{_t("Advanced")}</span>
+                    <span className='mx_SettingsTab_subheading'>{ _t("Advanced") }</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("Homeserver is")} <code>{MatrixClientPeg.get().getHomeserverUrl()}</code><br />
-                        {_t("Identity Server is")} <code>{MatrixClientPeg.get().getIdentityServerUrl()}</code><br />
+                        { _t("Homeserver is") } <code>{ MatrixClientPeg.get().getHomeserverUrl() }</code><br />
+                        { _t("Identity server is") } <code>{ MatrixClientPeg.get().getIdentityServerUrl() }</code><br />
                         <br />
                         <details>
-                            <summary>{_t("Access Token")}</summary><br />
-                            <b>{_t("Your access token gives full access to your account."
-                               + " Do not share it with anyone." )}</b>
-                            <div className="mx_HelpUserSettingsTab_accessToken">
-                                <code>{MatrixClientPeg.get().getAccessToken()}</code>
+                            <summary>{ _t("Access Token") }</summary><br />
+                            <b>{ _t("Your access token gives full access to your account."
+                               + " Do not share it with anyone." ) }</b>
+                            <div className="mx_HelpUserSettingsTab_copy">
+                                <code>{ MatrixClientPeg.get().getAccessToken() }</code>
                                 <AccessibleTooltipButton
                                     title={_t("Copy")}
                                     onClick={this.onAccessTokenCopyClick}
-                                    className="mx_HelpUserSettingsTab_accessToken_copy"
+                                    className="mx_HelpUserSettingsTab_copyButton"
                                 />
                             </div>
                         </details><br />
                         <div className='mx_HelpUserSettingsTab_debugButton'>
                             <AccessibleButton onClick={this.onClearCacheAndReload} kind='danger'>
-                                {_t("Clear cache and reload")}
+                                { _t("Clear cache and reload") }
                             </AccessibleButton>
                         </div>
                     </div>
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
similarity index 63%
rename from src/components/views/settings/tabs/user/LabsUserSettingsTab.js
rename to src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
index 98148b19e0..60461a114c 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
@@ -15,41 +15,53 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../../../languageHandler";
-import PropTypes from "prop-types";
+import { _t } from "../../../../../languageHandler";
 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";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import SdkConfig from "../../../../../SdkConfig";
 import BetaCard from "../../../beta/BetaCard";
+import SettingsFlag from '../../../elements/SettingsFlag';
+import { MatrixClientPeg } from '../../../../../MatrixClientPeg';
 
-export class LabsSettingToggle extends React.Component {
-    static propTypes = {
-        featureId: PropTypes.string.isRequired,
-    };
+interface ILabsSettingToggleProps {
+    featureId: string;
+}
 
-    _onChange = async (checked) => {
+export class LabsSettingToggle extends React.Component<ILabsSettingToggleProps> {
+    private onChange = async (checked: boolean): Promise<void> => {
         await SettingsStore.setValue(this.props.featureId, null, SettingLevel.DEVICE, checked);
         this.forceUpdate();
     };
 
-    render() {
+    public render(): JSX.Element {
         const label = SettingsStore.getDisplayName(this.props.featureId);
         const value = SettingsStore.getValue(this.props.featureId);
         const canChange = SettingsStore.canSetValue(this.props.featureId, null, SettingLevel.DEVICE);
-        return <LabelledToggleSwitch value={value} label={label} onChange={this._onChange} disabled={!canChange} />;
+        return <LabelledToggleSwitch value={value} label={label} onChange={this.onChange} disabled={!canChange} />;
     }
 }
 
+interface IState {
+    showHiddenReadReceipts: boolean;
+}
+
 @replaceableComponent("views.settings.tabs.user.LabsUserSettingsTab")
-export default class LabsUserSettingsTab extends React.Component {
-    constructor() {
-        super();
+export default class LabsUserSettingsTab extends React.Component<{}, IState> {
+    constructor(props: {}) {
+        super(props);
+
+        MatrixClientPeg.get().doesServerSupportUnstableFeature("org.matrix.msc2285").then((showHiddenReadReceipts) => {
+            this.setState({ showHiddenReadReceipts });
+        });
+
+        this.state = {
+            showHiddenReadReceipts: false,
+        };
     }
 
-    render() {
+    public render(): JSX.Element {
         const features = SettingsStore.getFeatureSettingNames();
         const [labs, betas] = features.reduce((arr, f) => {
             arr[SettingsStore.getBetaInfo(f) ? 1 : 0].push(f);
@@ -65,29 +77,38 @@ export default class LabsUserSettingsTab extends React.Component {
 
         let labsSection;
         if (SdkConfig.get()['showLabsSettings']) {
-            const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
             const flags = labs.map(f => <LabsSettingToggle featureId={f} key={f} />);
 
+            let hiddenReadReceipts;
+            if (this.state.showHiddenReadReceipts) {
+                hiddenReadReceipts = (
+                    <SettingsFlag name="feature_hidden_read_receipts" level={SettingLevel.DEVICE} />
+                );
+            }
+
             labsSection = <div className="mx_SettingsTab_section">
-                {flags}
+                { flags }
                 <SettingsFlag name="enableWidgetScreenshots" level={SettingLevel.ACCOUNT} />
                 <SettingsFlag name="showHiddenEventsInTimeline" level={SettingLevel.DEVICE} />
                 <SettingsFlag name="lowBandwidth" level={SettingLevel.DEVICE} />
-                <SettingsFlag name="advancedRoomListLogging" level={SettingLevel.DEVICE} />
+                { hiddenReadReceipts }
             </div>;
         }
 
         return (
             <div className="mx_SettingsTab mx_LabsUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Labs")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Labs") }</div>
                 <div className='mx_SettingsTab_subsectionText'>
                     {
                         _t('Feeling experimental? Labs are the best way to get things early, ' +
                             'test out new features and help shape them before they actually launch. ' +
                             '<a>Learn more</a>.', {}, {
                             'a': (sub) => {
-                                return <a href="https://github.com/vector-im/element-web/blob/develop/docs/labs.md"
-                                    rel='noreferrer noopener' target='_blank'>{sub}</a>;
+                                return <a
+                                    href="https://github.com/vector-im/element-web/blob/develop/docs/labs.md"
+                                    rel='noreferrer noopener'
+                                    target='_blank'
+                                >{ sub }</a>;
                             },
                         })
                     }
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
index 6997defea9..0653198aa0 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
@@ -15,15 +15,18 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../../../languageHandler";
+import { _t } from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
-import {Mjolnir} from "../../../../../mjolnir/Mjolnir";
-import {ListRule} from "../../../../../mjolnir/ListRule";
-import {BanList, RULE_SERVER, RULE_USER} from "../../../../../mjolnir/BanList";
+import { Mjolnir } from "../../../../../mjolnir/Mjolnir";
+import { ListRule } from "../../../../../mjolnir/ListRule";
+import { BanList, RULE_SERVER, RULE_USER } from "../../../../../mjolnir/BanList";
 import Modal from "../../../../../Modal";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import * as sdk from "../../../../../index";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import ErrorDialog from "../../../dialogs/ErrorDialog";
+import QuestionDialog from "../../../dialogs/QuestionDialog";
+import AccessibleButton from "../../../elements/AccessibleButton";
+import Field from "../../../elements/Field";
 
 interface IState {
     busy: boolean;
@@ -44,11 +47,11 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
     }
 
     private onPersonalRuleChanged = (e) => {
-        this.setState({newPersonalRule: e.target.value});
+        this.setState({ newPersonalRule: e.target.value });
     };
 
     private onNewListChanged = (e) => {
-        this.setState({newList: e.target.value});
+        this.setState({ newList: e.target.value });
     };
 
     private onAddPersonalRule = async (e) => {
@@ -60,21 +63,20 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
             kind = RULE_USER;
         }
 
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             const list = await Mjolnir.sharedInstance().getOrCreatePersonalList();
             await list.banEntity(kind, this.state.newPersonalRule, _t("Ignored/Blocked"));
-            this.setState({newPersonalRule: ""}); // this will also cause the new rule to be rendered
+            this.setState({ newPersonalRule: "" }); // this will also cause the new rule to be rendered
         } catch (e) {
             console.error(e);
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to add Mjolnir rule', '', ErrorDialog, {
                 title: _t('Error adding ignored user/server'),
                 description: _t('Something went wrong. Please try again or view your console for hints.'),
             });
         } finally {
-            this.setState({busy: false});
+            this.setState({ busy: false });
         }
     };
 
@@ -82,84 +84,79 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
         e.preventDefault();
         e.stopPropagation();
 
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             const room = await MatrixClientPeg.get().joinRoom(this.state.newList);
             await Mjolnir.sharedInstance().subscribeToList(room.roomId);
-            this.setState({newList: ""}); // this will also cause the new rule to be rendered
+            this.setState({ newList: "" }); // this will also cause the new rule to be rendered
         } catch (e) {
             console.error(e);
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to subscribe to Mjolnir list', '', ErrorDialog, {
                 title: _t('Error subscribing to list'),
                 description: _t('Please verify the room ID or address and try again.'),
             });
         } finally {
-            this.setState({busy: false});
+            this.setState({ busy: false });
         }
     };
 
     private async removePersonalRule(rule: ListRule) {
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             const list = Mjolnir.sharedInstance().getPersonalList();
             await list.unbanEntity(rule.kind, rule.entity);
         } catch (e) {
             console.error(e);
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to remove Mjolnir rule', '', ErrorDialog, {
                 title: _t('Error removing ignored user/server'),
                 description: _t('Something went wrong. Please try again or view your console for hints.'),
             });
         } finally {
-            this.setState({busy: false});
+            this.setState({ busy: false });
         }
     }
 
     private async unsubscribeFromList(list: BanList) {
-        this.setState({busy: true});
+        this.setState({ busy: true });
         try {
             await Mjolnir.sharedInstance().unsubscribeFromList(list.roomId);
             await MatrixClientPeg.get().leave(list.roomId);
         } catch (e) {
             console.error(e);
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to unsubscribe from Mjolnir list', '', ErrorDialog, {
                 title: _t('Error unsubscribing from list'),
                 description: _t('Please try again or view your console for hints.'),
             });
         } finally {
-            this.setState({busy: false});
+            this.setState({ busy: false });
         }
     }
 
     private viewListRules(list: BanList) {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-
         const room = MatrixClientPeg.get().getRoom(list.roomId);
         const name = room ? room.name : list.roomId;
 
         const renderRules = (rules: ListRule[]) => {
-            if (rules.length === 0) return <i>{_t("None")}</i>;
+            if (rules.length === 0) return <i>{ _t("None") }</i>;
 
             const tiles = [];
             for (const rule of rules) {
-                tiles.push(<li key={rule.kind + rule.entity}><code>{rule.entity}</code></li>);
+                tiles.push(<li key={rule.kind + rule.entity}><code>{ rule.entity }</code></li>);
             }
-            return <ul>{tiles}</ul>;
+            return <ul>{ tiles }</ul>;
         };
 
         Modal.createTrackedDialog('View Mjolnir list rules', '', QuestionDialog, {
-            title: _t("Ban list rules - %(roomName)s", {roomName: name}),
+            title: _t("Ban list rules - %(roomName)s", { roomName: name }),
             description: (
                 <div>
-                    <h3>{_t("Server rules")}</h3>
-                    {renderRules(list.serverRules)}
-                    <h3>{_t("User rules")}</h3>
-                    {renderRules(list.userRules)}
+                    <h3>{ _t("Server rules") }</h3>
+                    { renderRules(list.serverRules) }
+                    <h3>{ _t("User rules") }</h3>
+                    { renderRules(list.userRules) }
                 </div>
             ),
             button: _t("Close"),
@@ -168,11 +165,9 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
     }
 
     private renderPersonalBanListRules() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
         const list = Mjolnir.sharedInstance().getPersonalList();
         const rules = list ? [...list.userRules, ...list.serverRules] : [];
-        if (!list || rules.length <= 0) return <i>{_t("You have not ignored anyone.")}</i>;
+        if (!list || rules.length <= 0) return <i>{ _t("You have not ignored anyone.") }</i>;
 
         const tiles = [];
         for (const rule of rules) {
@@ -183,34 +178,32 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
                         onClick={() => this.removePersonalRule(rule)}
                         disabled={this.state.busy}
                     >
-                        {_t("Remove")}
+                        { _t("Remove") }
                     </AccessibleButton>&nbsp;
-                    <code>{rule.entity}</code>
+                    <code>{ rule.entity }</code>
                 </li>,
             );
         }
 
         return (
             <div>
-                <p>{_t("You are currently ignoring:")}</p>
-                <ul>{tiles}</ul>
+                <p>{ _t("You are currently ignoring:") }</p>
+                <ul>{ tiles }</ul>
             </div>
         );
     }
 
     private renderSubscribedBanLists() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
         const personalList = Mjolnir.sharedInstance().getPersonalList();
         const lists = Mjolnir.sharedInstance().lists.filter(b => {
             return personalList? personalList.roomId !== b.roomId : true;
         });
-        if (!lists || lists.length <= 0) return <i>{_t("You are not subscribed to any lists")}</i>;
+        if (!lists || lists.length <= 0) return <i>{ _t("You are not subscribed to any lists") }</i>;
 
         const tiles = [];
         for (const list of lists) {
             const room = MatrixClientPeg.get().getRoom(list.roomId);
-            const name = room ? <span>{room.name} (<code>{list.roomId}</code>)</span> : <code>list.roomId</code>;
+            const name = room ? <span>{ room.name } (<code>{ list.roomId }</code>)</span> : <code>list.roomId</code>;
             tiles.push(
                 <li key={list.roomId} className="mx_MjolnirUserSettingsTab_listItem">
                     <AccessibleButton
@@ -218,66 +211,64 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
                         onClick={() => this.unsubscribeFromList(list)}
                         disabled={this.state.busy}
                     >
-                        {_t("Unsubscribe")}
+                        { _t("Unsubscribe") }
                     </AccessibleButton>&nbsp;
                     <AccessibleButton
                         kind="primary_sm"
                         onClick={() => this.viewListRules(list)}
                         disabled={this.state.busy}
                     >
-                        {_t("View rules")}
+                        { _t("View rules") }
                     </AccessibleButton>&nbsp;
-                    {name}
+                    { name }
                 </li>,
             );
         }
 
         return (
             <div>
-                <p>{_t("You are currently subscribed to:")}</p>
-                <ul>{tiles}</ul>
+                <p>{ _t("You are currently subscribed to:") }</p>
+                <ul>{ tiles }</ul>
             </div>
         );
     }
 
     render() {
-        const Field = sdk.getComponent('elements.Field');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const brand = SdkConfig.get().brand;
 
         return (
             <div className="mx_SettingsTab mx_MjolnirUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Ignored users")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Ignored users") }</div>
                 <div className="mx_SettingsTab_section">
                     <div className='mx_SettingsTab_subsectionText'>
-                        <span className='warning'>{_t("⚠ These settings are meant for advanced users.")}</span><br />
+                        <span className='warning'>{ _t("⚠ These settings are meant for advanced users.") }</span><br />
                         <br />
-                        {_t(
+                        { _t(
                             "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 }, {code: (s) => <code>{s}</code>},
-                        )}<br />
+                            { brand }, { code: (s) => <code>{ s }</code> },
+                        ) }<br />
                         <br />
-                        {_t(
+                        { _t(
                             "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.",
-                        )}
+                        ) }
                     </div>
                 </div>
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Personal ban list")}</span>
+                    <span className="mx_SettingsTab_subheading">{ _t("Personal ban list") }</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t(
+                        { _t(
                             "Your personal ban list holds all the users/servers you personally don't " +
                             "want to see messages from. After ignoring your first user/server, a new room " +
                             "will show up in your room list named 'My Ban List' - stay in this room to keep " +
                             "the ban list in effect.",
-                        )}
+                        ) }
                     </div>
                     <div>
-                        {this.renderPersonalBanListRules()}
+                        { this.renderPersonalBanListRules() }
                     </div>
                     <div>
                         <form onSubmit={this.onAddPersonalRule} autoComplete="off">
@@ -294,22 +285,22 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
                                 onClick={this.onAddPersonalRule}
                                 disabled={this.state.busy}
                             >
-                                {_t("Ignore")}
+                                { _t("Ignore") }
                             </AccessibleButton>
                         </form>
                     </div>
                 </div>
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Subscribed lists")}</span>
+                    <span className="mx_SettingsTab_subheading">{ _t("Subscribed lists") }</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        <span className='warning'>{_t("Subscribing to a ban list will cause you to join it!")}</span>
+                        <span className='warning'>{ _t("Subscribing to a ban list will cause you to join it!") }</span>
                         &nbsp;
-                        <span>{_t(
+                        <span>{ _t(
                             "If this isn't what you want, please use a different tool to ignore users.",
-                        )}</span>
+                        ) }</span>
                     </div>
                     <div>
-                        {this.renderSubscribedBanLists()}
+                        { this.renderSubscribedBanLists() }
                     </div>
                     <div>
                         <form onSubmit={this.onSubscribeList} autoComplete="off">
@@ -325,7 +316,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
                                 onClick={this.onSubscribeList}
                                 disabled={this.state.busy}
                             >
-                                {_t("Subscribe")}
+                                { _t("Subscribe") }
                             </AccessibleButton>
                         </form>
                     </div>
diff --git a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
similarity index 70%
rename from src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
rename to src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
index 8a71d1bf15..5717813ae1 100644
--- a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
@@ -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.
@@ -15,21 +15,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import {_t} from "../../../../../languageHandler";
-import * as sdk from "../../../../../index";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { _t } from "../../../../../languageHandler";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import Notifications from "../../Notifications";
 
 @replaceableComponent("views.settings.tabs.user.NotificationUserSettingsTab")
 export default class NotificationUserSettingsTab extends React.Component {
-    constructor() {
-        super();
-    }
-
     render() {
-        const Notifications = sdk.getComponent("views.settings.Notifications");
         return (
             <div className="mx_SettingsTab mx_NotificationUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Notifications")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Notifications") }</div>
                 <div className="mx_SettingsTab_section mx_SettingsTab_subsectionText">
                     <Notifications />
                 </div>
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index f02c5c9ce0..8363935107 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -15,15 +15,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import {_t} from "../../../../../languageHandler";
+import React, { useContext, useEffect, useState } from 'react';
+import { EventType } from 'matrix-js-sdk/src/@types/event';
+
+import { _t } from "../../../../../languageHandler";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
-import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
-import {SettingLevel} from "../../../../../settings/SettingLevel";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import SettingsFlag from '../../../elements/SettingsFlag';
+import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
+import AccessibleButton from "../../../elements/AccessibleButton";
+import GroupAvatar from "../../../avatars/GroupAvatar";
+import dis from "../../../../../dispatcher/dispatcher";
+import GroupActions from "../../../../../actions/GroupActions";
+import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { useDispatcher } from "../../../../../hooks/useDispatcher";
+import { CreateEventField, IGroupSummary } from "../../../dialogs/CreateSpaceFromCommunityDialog";
+import { createSpaceFromCommunity } from "../../../../../utils/space";
+import Spinner from "../../../elements/Spinner";
+
+interface IProps {
+    closeSettingsFn(success: boolean): void;
+}
 
 interface IState {
     autoLaunch: boolean;
@@ -39,42 +55,138 @@ interface IState {
     readMarkerOutOfViewThresholdMs: string;
 }
 
+type Community = IGroupSummary & {
+    groupId: string;
+    spaceId?: string;
+};
+
+const CommunityMigrator = ({ onFinished }) => {
+    const cli = useContext(MatrixClientContext);
+    const [communities, setCommunities] = useState<Community[]>(null);
+    useEffect(() => {
+        dis.dispatch(GroupActions.fetchJoinedGroups(cli));
+    }, [cli]);
+    useDispatcher(dis, async payload => {
+        if (payload.action === "GroupActions.fetchJoinedGroups.success") {
+            const communities: Community[] = [];
+
+            const migratedSpaceMap = new Map(cli.getRooms().map(room => {
+                const createContent = room.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent();
+                if (createContent?.[CreateEventField]) {
+                    return [createContent[CreateEventField], room.roomId] as [string, string];
+                }
+            }).filter(Boolean));
+
+            for (const groupId of payload.result.groups) {
+                const summary = await cli.getGroupSummary(groupId) as IGroupSummary;
+                if (summary.user.is_privileged) {
+                    communities.push({
+                        ...summary,
+                        groupId,
+                        spaceId: migratedSpaceMap.get(groupId),
+                    });
+                }
+            }
+
+            setCommunities(communities);
+        }
+    });
+
+    if (!communities) {
+        return <Spinner />;
+    }
+
+    return <div className="mx_PreferencesUserSettingsTab_CommunityMigrator">
+        { communities.map(community => (
+            <div key={community.groupId}>
+                <GroupAvatar
+                    groupId={community.groupId}
+                    groupAvatarUrl={community.profile.avatar_url}
+                    groupName={community.profile.name}
+                    width={32}
+                    height={32}
+                />
+                { community.profile.name }
+                <AccessibleButton
+                    kind="primary_outline"
+                    onClick={() => {
+                        if (community.spaceId) {
+                            dis.dispatch({
+                                action: "view_room",
+                                room_id: community.spaceId,
+                            });
+                            onFinished();
+                        } else {
+                            createSpaceFromCommunity(cli, community.groupId).then(([spaceId]) => {
+                                if (spaceId) {
+                                    community.spaceId = spaceId;
+                                    setCommunities([...communities]); // force component re-render
+                                }
+                            });
+                        }
+                    }}
+                >
+                    { community.spaceId ? _t("Open Space") : _t("Create Space") }
+                </AccessibleButton>
+            </div>
+        )) }
+    </div>;
+};
+
 @replaceableComponent("views.settings.tabs.user.PreferencesUserSettingsTab")
-export default class PreferencesUserSettingsTab extends React.Component<{}, IState> {
+export default class PreferencesUserSettingsTab extends React.Component<IProps, IState> {
     static ROOM_LIST_SETTINGS = [
         'breadcrumbs',
     ];
 
+    static SPACES_SETTINGS = [
+        "Spaces.allRoomsInHome",
+    ];
+
+    static COMMUNITIES_SETTINGS = [
+        "showCommunitiesInsteadOfSpaces",
+    ];
+
+    static KEYBINDINGS_SETTINGS = [
+        'ctrlFForSearch',
+    ];
+
     static COMPOSER_SETTINGS = [
         'MessageComposerInput.autoReplaceEmoji',
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
         'MessageComposerInput.ctrlEnterToSend',
+        'MessageComposerInput.surroundWith',
         'MessageComposerInput.showStickersButton',
     ];
 
-    static TIMELINE_SETTINGS = [
-        'showTypingNotifications',
-        'autoplayGifsAndVideos',
-        'urlPreviewsEnabled',
-        'TextualBody.enableBigEmoji',
-        'showReadReceipts',
+    static TIME_SETTINGS = [
         'showTwelveHourTimestamps',
         'alwaysShowTimestamps',
-        'showRedactions',
+    ];
+    static CODE_BLOCKS_SETTINGS = [
         'enableSyntaxHighlightLanguageDetection',
         'expandCodeByDefault',
-        'scrollToBottomOnMessageSent',
         'showCodeLineNumbers',
-        'showJoinLeaves',
-        'showAvatarChanges',
-        'showDisplaynameChanges',
-        'showImages',
-        'showChatEffects',
-        'Pill.shouldShowPillAvatar',
-        'ctrlFForSearch',
     ];
-
+    static IMAGES_AND_VIDEOS_SETTINGS = [
+        'urlPreviewsEnabled',
+        'autoplayGifs',
+        'autoplayVideo',
+        'showImages',
+    ];
+    static TIMELINE_SETTINGS = [
+        'showTypingNotifications',
+        'showRedactions',
+        'showReadReceipts',
+        'showJoinLeaves',
+        'showDisplaynameChanges',
+        'showChatEffects',
+        'showAvatarChanges',
+        'Pill.shouldShowPillAvatar',
+        'TextualBody.enableBigEmoji',
+        'scrollToBottomOnMessageSent',
+    ];
     static GENERAL_SETTINGS = [
         'TagPanel.enableTagPanel',
         'promptBeforeInviteUnknownUsers',
@@ -121,7 +233,7 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
         const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar();
         let alwaysShowMenuBar = true;
         if (alwaysShowMenuBarSupported) {
-            alwaysShowMenuBar = !await platform.getAutoHideMenuBarEnabled();
+            alwaysShowMenuBar = !(await platform.getAutoHideMenuBarEnabled());
         }
 
         const minimizeToTraySupported = await platform.supportsMinimizeToTray();
@@ -143,40 +255,47 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
     }
 
     private onAutoLaunchChange = (checked: boolean) => {
-        PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
+        PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({ autoLaunch: checked }));
     };
 
     private onWarnBeforeExitChange = (checked: boolean) => {
-        PlatformPeg.get().setWarnBeforeExit(checked).then(() => this.setState({warnBeforeExit: checked}));
-    }
+        PlatformPeg.get().setWarnBeforeExit(checked).then(() => this.setState({ warnBeforeExit: checked }));
+    };
 
     private onAlwaysShowMenuBarChange = (checked: boolean) => {
-        PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({alwaysShowMenuBar: checked}));
+        PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({ alwaysShowMenuBar: checked }));
     };
 
     private onMinimizeToTrayChange = (checked: boolean) => {
-        PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({minimizeToTray: checked}));
+        PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({ minimizeToTray: checked }));
     };
 
     private onAutocompleteDelayChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        this.setState({autocompleteDelay: e.target.value});
+        this.setState({ autocompleteDelay: e.target.value });
         SettingsStore.setValue("autocompleteDelay", null, SettingLevel.DEVICE, e.target.value);
     };
 
     private onReadMarkerInViewThresholdMs = (e: React.ChangeEvent<HTMLInputElement>) => {
-        this.setState({readMarkerInViewThresholdMs: e.target.value});
+        this.setState({ readMarkerInViewThresholdMs: e.target.value });
         SettingsStore.setValue("readMarkerInViewThresholdMs", null, SettingLevel.DEVICE, e.target.value);
     };
 
     private onReadMarkerOutOfViewThresholdMs = (e: React.ChangeEvent<HTMLInputElement>) => {
-        this.setState({readMarkerOutOfViewThresholdMs: e.target.value});
+        this.setState({ readMarkerOutOfViewThresholdMs: e.target.value });
         SettingsStore.setValue("readMarkerOutOfViewThresholdMs", null, SettingLevel.DEVICE, e.target.value);
     };
 
-    private renderGroup(settingIds: string[]): React.ReactNodeArray {
-        const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
-        return settingIds.filter(SettingsStore.isEnabled).map(i => {
-            return <SettingsFlag key={i} name={i} level={SettingLevel.ACCOUNT} />;
+    private renderGroup(
+        settingIds: string[],
+        level = SettingLevel.ACCOUNT,
+        includeDisabled = false,
+    ): React.ReactNodeArray {
+        if (!includeDisabled) {
+            settingIds = settingIds.filter(SettingsStore.isEnabled);
+        }
+
+        return settingIds.map(i => {
+            return <SettingsFlag key={i} name={i} level={level} />;
         });
     }
 
@@ -215,30 +334,71 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
 
         return (
             <div className="mx_SettingsTab mx_PreferencesUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Preferences")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Preferences") }</div>
 
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Room list")}</span>
-                    {this.renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS)}
+                    <span className="mx_SettingsTab_subheading">{ _t("Room list") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS) }
                 </div>
 
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Composer")}</span>
-                    {this.renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS)}
+                    <span className="mx_SettingsTab_subheading">{ _t("Spaces") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.SPACES_SETTINGS, SettingLevel.ACCOUNT, true) }
                 </div>
 
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Timeline")}</span>
-                    {this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}
+                    <span className="mx_SettingsTab_subheading">{ _t("Communities") }</span>
+                    <p>{ _t("Communities have been archived to make way for Spaces but you can convert your " +
+                        "communities into Spaces below. Converting will ensure your conversations get the latest " +
+                        "features.") }</p>
+                    <details>
+                        <summary>{ _t("Show my Communities") }</summary>
+                        <p>{ _t("If a community isn't shown you may not have permission to convert it.") }</p>
+                        <CommunityMigrator onFinished={this.props.closeSettingsFn} />
+                    </details>
+                    { this.renderGroup(PreferencesUserSettingsTab.COMMUNITIES_SETTINGS, SettingLevel.DEVICE) }
                 </div>
 
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("General")}</span>
-                    {this.renderGroup(PreferencesUserSettingsTab.GENERAL_SETTINGS)}
-                    {minimizeToTrayOption}
-                    {autoHideMenuOption}
-                    {autoLaunchOption}
-                    {warnBeforeExitOption}
+                    <span className="mx_SettingsTab_subheading">{ _t("Keyboard shortcuts") }</span>
+                    <AccessibleButton className="mx_SettingsFlag" onClick={KeyboardShortcuts.toggleDialog}>
+                        { _t("To view all keyboard shortcuts, click here.") }
+                    </AccessibleButton>
+                    { this.renderGroup(PreferencesUserSettingsTab.KEYBINDINGS_SETTINGS) }
+                </div>
+
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{ _t("Displaying time") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.TIME_SETTINGS) }
+                </div>
+
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{ _t("Composer") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS) }
+                </div>
+
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{ _t("Code blocks") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.CODE_BLOCKS_SETTINGS) }
+                </div>
+
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{ _t("Images, GIFs and videos") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.IMAGES_AND_VIDEOS_SETTINGS) }
+                </div>
+
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{ _t("Timeline") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS) }
+                </div>
+
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{ _t("General") }</span>
+                    { this.renderGroup(PreferencesUserSettingsTab.GENERAL_SETTINGS) }
+                    { minimizeToTrayOption }
+                    { autoHideMenuOption }
+                    { autoLaunchOption }
+                    { warnBeforeExitOption }
                     <Field
                         label={_t('Autocomplete delay (ms)')}
                         type='number'
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
similarity index 62%
rename from src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
rename to src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
index 53ed511b0a..6aa45d05b6 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
@@ -16,42 +16,49 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../../../languageHandler";
+import { sleep } from "matrix-js-sdk/src/utils";
+
+import { _t } from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import * as FormattingUtils from "../../../../../utils/FormattingUtils";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Analytics from "../../../../../Analytics";
 import Modal from "../../../../../Modal";
-import * as sdk from "../../../../..";
-import {sleep} from "../../../../../utils/promise";
 import dis from "../../../../../dispatcher/dispatcher";
-import {privateShouldBeEncrypted} from "../../../../../createRoom";
-import {SettingLevel} from "../../../../../settings/SettingLevel";
+import { privateShouldBeEncrypted } from "../../../../../createRoom";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
 import SecureBackupPanel from "../../SecureBackupPanel";
 import SettingsStore from "../../../../../settings/SettingsStore";
-import {UIFeature} from "../../../../../settings/UIFeature";
-import {isE2eAdvancedPanelPossible} from "../../E2eAdvancedPanel";
+import { UIFeature } from "../../../../../settings/UIFeature";
+import E2eAdvancedPanel, { isE2eAdvancedPanelPossible } from "../../E2eAdvancedPanel";
 import CountlyAnalytics from "../../../../../CountlyAnalytics";
-import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
+import { ActionPayload } from "../../../../../dispatcher/payloads";
+import { Room } from "matrix-js-sdk/src/models/room";
+import DevicesPanel from "../../DevicesPanel";
+import SettingsFlag from "../../../elements/SettingsFlag";
+import CrossSigningPanel from "../../CrossSigningPanel";
+import EventIndexPanel from "../../EventIndexPanel";
+import InlineSpinner from "../../../elements/InlineSpinner";
 
-export class IgnoredUser extends React.Component {
-    static propTypes = {
-        userId: PropTypes.string.isRequired,
-        onUnignored: PropTypes.func.isRequired,
-        inProgress: PropTypes.bool.isRequired,
-    };
+interface IIgnoredUserProps {
+    userId: string;
+    onUnignored: (userId: string) => void;
+    inProgress: boolean;
+}
 
-    _onUnignoreClicked = (e) => {
+export class IgnoredUser extends React.Component<IIgnoredUserProps> {
+    private onUnignoreClicked = (): void => {
         this.props.onUnignored(this.props.userId);
     };
 
-    render() {
+    public render(): JSX.Element {
         const id = `mx_SecurityUserSettingsTab_ignoredUser_${this.props.userId}`;
         return (
             <div className='mx_SecurityUserSettingsTab_ignoredUser'>
-                <AccessibleButton onClick={this._onUnignoreClicked} kind='primary_sm' aria-describedby={id} disabled={this.props.inProgress}>
+                <AccessibleButton onClick={this.onUnignoreClicked} kind='primary_sm' aria-describedby={id} disabled={this.props.inProgress}>
                     { _t('Unignore') }
                 </AccessibleButton>
                 <span id={id}>{ this.props.userId }</span>
@@ -60,17 +67,26 @@ 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,
-    };
+interface IProps {
+    closeSettingsFn: () => void;
+}
 
-    constructor() {
-        super();
+interface IState {
+    ignoredUserIds: string[];
+    waitingUnignored: string[];
+    managingInvites: boolean;
+    invitedRoomAmt: number;
+}
+
+@replaceableComponent("views.settings.tabs.user.SecurityUserSettingsTab")
+export default class SecurityUserSettingsTab extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+
+    constructor(props: IProps) {
+        super(props);
 
         // Get number of rooms we're invited to
-        const invitedRooms = this._getInvitedRooms();
+        const invitedRooms = this.getInvitedRooms();
 
         this.state = {
             ignoredUserIds: MatrixClientPeg.get().getIgnoredUsers(),
@@ -78,88 +94,85 @@ export default class SecurityUserSettingsTab extends React.Component {
             managingInvites: false,
             invitedRoomAmt: invitedRooms.length,
         };
-
-        this._onAction = this._onAction.bind(this);
     }
 
-
-    _onAction({action}) {
+    private onAction = ({ action }: ActionPayload)=> {
         if (action === "ignore_state_changed") {
             const ignoredUserIds = MatrixClientPeg.get().getIgnoredUsers();
             const newWaitingUnignored = this.state.waitingUnignored.filter(e=> ignoredUserIds.includes(e));
-            this.setState({ignoredUserIds, waitingUnignored: newWaitingUnignored});
+            this.setState({ ignoredUserIds, waitingUnignored: newWaitingUnignored });
         }
+    };
+
+    public componentDidMount(): void {
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
-    componentDidMount() {
-        this.dispatcherRef = dis.register(this._onAction);
-    }
-
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         dis.unregister(this.dispatcherRef);
     }
 
-    _updateBlacklistDevicesFlag = (checked) => {
+    private updateBlacklistDevicesFlag = (checked): void => {
         MatrixClientPeg.get().setGlobalBlacklistUnverifiedDevices(checked);
     };
 
-    _updateAnalytics = (checked) => {
+    private updateAnalytics = (checked: boolean): void => {
         checked ? Analytics.enable() : Analytics.disable();
         CountlyAnalytics.instance.enable(/* anonymous = */ !checked);
+        PosthogAnalytics.instance.updateAnonymityFromSettings(MatrixClientPeg.get().getUserId());
     };
 
-    _onExportE2eKeysClicked = () => {
+    private onExportE2eKeysClicked = (): void => {
         Modal.createTrackedDialogAsync('Export E2E Keys', '',
             import('../../../../../async-components/views/dialogs/security/ExportE2eKeysDialog'),
-            {matrixClient: MatrixClientPeg.get()},
+            { matrixClient: MatrixClientPeg.get() },
         );
     };
 
-    _onImportE2eKeysClicked = () => {
+    private onImportE2eKeysClicked = (): void => {
         Modal.createTrackedDialogAsync('Import E2E Keys', '',
             import('../../../../../async-components/views/dialogs/security/ImportE2eKeysDialog'),
-            {matrixClient: MatrixClientPeg.get()},
+            { matrixClient: MatrixClientPeg.get() },
         );
     };
 
-    _onGoToUserProfileClick = () => {
+    private onGoToUserProfileClick = (): void => {
         dis.dispatch({
             action: 'view_user_info',
             userId: MatrixClientPeg.get().getUserId(),
         });
         this.props.closeSettingsFn();
-    }
+    };
 
-    _onUserUnignored = async (userId) => {
-        const {ignoredUserIds, waitingUnignored} = this.state;
+    private onUserUnignored = async (userId: string): Promise<void> => {
+        const { ignoredUserIds, waitingUnignored } = this.state;
         const currentlyIgnoredUserIds = ignoredUserIds.filter(e => !waitingUnignored.includes(e));
 
         const index = currentlyIgnoredUserIds.indexOf(userId);
         if (index !== -1) {
             currentlyIgnoredUserIds.splice(index, 1);
-            this.setState(({waitingUnignored}) => ({waitingUnignored: [...waitingUnignored, userId]}));
+            this.setState(({ waitingUnignored }) => ({ waitingUnignored: [...waitingUnignored, userId] }));
             MatrixClientPeg.get().setIgnoredUsers(currentlyIgnoredUserIds);
         }
     };
 
-    _getInvitedRooms = () => {
+    private getInvitedRooms = (): Room[] => {
         return MatrixClientPeg.get().getRooms().filter((r) => {
             return r.hasMembershipState(MatrixClientPeg.get().getUserId(), "invite");
         });
     };
 
-    _manageInvites = async (accept) => {
+    private manageInvites = async (accept: boolean): Promise<void> => {
         this.setState({
             managingInvites: true,
         });
 
         // Compile array of invitation room ids
-        const invitedRoomIds = this._getInvitedRooms().map((room) => {
+        const invitedRoomIds = this.getInvitedRooms().map((room) => {
             return room.roomId;
         });
 
         // Execute all acceptances/rejections sequentially
-        const self = this;
         const cli = MatrixClientPeg.get();
         const action = accept ? cli.joinRoom.bind(cli) : cli.leave.bind(cli);
         for (let i = 0; i < invitedRoomIds.length; i++) {
@@ -168,7 +181,7 @@ export default class SecurityUserSettingsTab extends React.Component {
             // Accept/reject invite
             await action(roomId).then(() => {
                 // No error, update invited rooms button
-                this.setState({invitedRoomAmt: self.state.invitedRoomAmt - 1});
+                this.setState({ invitedRoomAmt: this.state.invitedRoomAmt - 1 });
             }, async (e) => {
                 // Action failure
                 if (e.errcode === "M_LIMIT_EXCEEDED") {
@@ -190,17 +203,15 @@ export default class SecurityUserSettingsTab extends React.Component {
         });
     };
 
-    _onAcceptAllInvitesClicked = (ev) => {
-        this._manageInvites(true);
+    private onAcceptAllInvitesClicked = (): void => {
+        this.manageInvites(true);
     };
 
-    _onRejectAllInvitesClicked = (ev) => {
-        this._manageInvites(false);
+    private onRejectAllInvitesClicked = (): void => {
+        this.manageInvites(false);
     };
 
-    _renderCurrentDeviceInfo() {
-        const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
-
+    private renderCurrentDeviceInfo(): JSX.Element {
         const client = MatrixClientPeg.get();
         const deviceId = client.deviceId;
         let identityKey = client.getDeviceEd25519Key();
@@ -214,11 +225,11 @@ export default class SecurityUserSettingsTab extends React.Component {
         if (client.isCryptoEnabled()) {
             importExportButtons = (
                 <div className='mx_SecurityUserSettingsTab_importExportButtons'>
-                    <AccessibleButton kind='primary' onClick={this._onExportE2eKeysClicked}>
-                        {_t("Export E2E room keys")}
+                    <AccessibleButton kind='primary' onClick={this.onExportE2eKeysClicked}>
+                        { _t("Export E2E room keys") }
                     </AccessibleButton>
-                    <AccessibleButton kind='primary' onClick={this._onImportE2eKeysClicked}>
-                        {_t("Import E2E room keys")}
+                    <AccessibleButton kind='primary' onClick={this.onImportE2eKeysClicked}>
+                        { _t("Import E2E room keys") }
                     </AccessibleButton>
                 </div>
             );
@@ -229,31 +240,31 @@ export default class SecurityUserSettingsTab extends React.Component {
             noSendUnverifiedSetting = <SettingsFlag
                 name='blacklistUnverifiedDevices'
                 level={SettingLevel.DEVICE}
-                onChange={this._updateBlacklistDevicesFlag}
+                onChange={this.updateBlacklistDevicesFlag}
             />;
         }
 
         return (
             <div className='mx_SettingsTab_section'>
-                <span className='mx_SettingsTab_subheading'>{_t("Cryptography")}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t("Cryptography") }</span>
                 <ul className='mx_SettingsTab_subsectionText mx_SecurityUserSettingsTab_deviceInfo'>
                     <li>
-                        <label>{_t("Session ID:")}</label>
-                        <span><code>{deviceId}</code></span>
+                        <label>{ _t("Session ID:") }</label>
+                        <span><code>{ deviceId }</code></span>
                     </li>
                     <li>
-                        <label>{_t("Session key:")}</label>
-                        <span><code><b>{identityKey}</b></code></span>
+                        <label>{ _t("Session key:") }</label>
+                        <span><code><b>{ identityKey }</b></code></span>
                     </li>
                 </ul>
-                {importExportButtons}
-                {noSendUnverifiedSetting}
+                { importExportButtons }
+                { noSendUnverifiedSetting }
             </div>
         );
     }
 
-    _renderIgnoredUsers() {
-        const {waitingUnignored, ignoredUserIds} = this.state;
+    private renderIgnoredUsers(): JSX.Element {
+        const { waitingUnignored, ignoredUserIds } = this.state;
 
         const userIds = !ignoredUserIds?.length
             ? _t('You have no ignored users.')
@@ -261,7 +272,7 @@ export default class SecurityUserSettingsTab extends React.Component {
                 return (
                     <IgnoredUser
                         userId={u}
-                        onUnignored={this._onUserUnignored}
+                        onUnignored={this.onUserUnignored}
                         key={u}
                         inProgress={waitingUnignored.includes(u)}
                     />
@@ -270,46 +281,42 @@ export default class SecurityUserSettingsTab extends React.Component {
 
         return (
             <div className='mx_SettingsTab_section'>
-                <span className='mx_SettingsTab_subheading'>{_t('Ignored users')}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t('Ignored users') }</span>
                 <div className='mx_SettingsTab_subsectionText'>
-                    {userIds}
+                    { userIds }
                 </div>
             </div>
         );
     }
 
-    _renderManageInvites() {
+    private renderManageInvites(): JSX.Element {
         if (this.state.invitedRoomAmt === 0) {
             return null;
         }
 
-        const invitedRooms = this._getInvitedRooms();
-        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
-        const onClickAccept = this._onAcceptAllInvitesClicked.bind(this, invitedRooms);
-        const onClickReject = this._onRejectAllInvitesClicked.bind(this, invitedRooms);
+        const invitedRooms = this.getInvitedRooms();
+        const onClickAccept = this.onAcceptAllInvitesClicked.bind(this, invitedRooms);
+        const onClickReject = this.onRejectAllInvitesClicked.bind(this, invitedRooms);
         return (
             <div className='mx_SettingsTab_section mx_SecurityUserSettingsTab_bulkOptions'>
-                <span className='mx_SettingsTab_subheading'>{_t('Bulk options')}</span>
+                <span className='mx_SettingsTab_subheading'>{ _t('Bulk options') }</span>
                 <AccessibleButton onClick={onClickAccept} kind='primary' disabled={this.state.managingInvites}>
-                    {_t("Accept all %(invitedRooms)s invites", {invitedRooms: this.state.invitedRoomAmt})}
+                    { _t("Accept all %(invitedRooms)s invites", { invitedRooms: this.state.invitedRoomAmt }) }
                 </AccessibleButton>
                 <AccessibleButton onClick={onClickReject} kind='danger' disabled={this.state.managingInvites}>
-                    {_t("Reject all %(invitedRooms)s invites", {invitedRooms: this.state.invitedRoomAmt})}
+                    { _t("Reject all %(invitedRooms)s invites", { invitedRooms: this.state.invitedRoomAmt }) }
                 </AccessibleButton>
-                {this.state.managingInvites ? <InlineSpinner /> : <div />}
+                { this.state.managingInvites ? <InlineSpinner /> : <div /> }
             </div>
         );
     }
 
-    render() {
+    public render(): JSX.Element {
         const brand = SdkConfig.get().brand;
-        const DevicesPanel = sdk.getComponent('views.settings.DevicesPanel');
-        const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
-        const EventIndexPanel = sdk.getComponent('views.settings.EventIndexPanel');
 
         const secureBackup = (
             <div className='mx_SettingsTab_section'>
-                <span className="mx_SettingsTab_subheading">{_t("Secure Backup")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Secure Backup") }</span>
                 <div className='mx_SettingsTab_subsectionText'>
                     <SecureBackupPanel />
                 </div>
@@ -318,7 +325,7 @@ export default class SecurityUserSettingsTab extends React.Component {
 
         const eventIndex = (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Message search") }</span>
                 <EventIndexPanel />
             </div>
         );
@@ -327,10 +334,9 @@ export default class SecurityUserSettingsTab extends React.Component {
         // it's useful to have for testing the feature. If there's no interest
         // in having advanced details here once all flows are implemented, we
         // can remove this.
-        const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
         const crossSigning = (
             <div className='mx_SettingsTab_section'>
-                <span className="mx_SettingsTab_subheading">{_t("Cross-signing")}</span>
+                <span className="mx_SettingsTab_subheading">{ _t("Cross-signing") }</span>
                 <div className='mx_SettingsTab_subsectionText'>
                     <CrossSigningPanel />
                 </div>
@@ -348,40 +354,39 @@ export default class SecurityUserSettingsTab extends React.Component {
         let privacySection;
         if (Analytics.canEnable() || CountlyAnalytics.instance.canEnable()) {
             privacySection = <React.Fragment>
-                <div className="mx_SettingsTab_heading">{_t("Privacy")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Privacy") }</div>
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Analytics")}</span>
+                    <span className="mx_SettingsTab_subheading">{ _t("Analytics") }</span>
                     <div className="mx_SettingsTab_subsectionText">
-                        {_t(
+                        { _t(
                             "%(brand)s collects anonymous analytics to allow us to improve the application.",
                             { brand },
-                        )}
+                        ) }
                         &nbsp;
-                        {_t("Privacy is important to us, so we don't collect any personal or " +
-                            "identifiable data for our analytics.")}
+                        { _t("Privacy is important to us, so we don't collect any personal or " +
+                            "identifiable data for our analytics.") }
                         <AccessibleButton className="mx_SettingsTab_linkBtn" onClick={Analytics.showDetailsModal}>
-                            {_t("Learn more about how we use analytics.")}
+                            { _t("Learn more about how we use analytics.") }
                         </AccessibleButton>
                     </div>
-                    <SettingsFlag name="analyticsOptIn" level={SettingLevel.DEVICE} onChange={this._updateAnalytics} />
+                    <SettingsFlag name="analyticsOptIn" level={SettingLevel.DEVICE} onChange={this.updateAnalytics} />
                 </div>
             </React.Fragment>;
         }
 
-        const E2eAdvancedPanel = sdk.getComponent('views.settings.E2eAdvancedPanel');
         let advancedSection;
         if (SettingsStore.getValue(UIFeature.AdvancedSettings)) {
-            const ignoreUsersPanel = this._renderIgnoredUsers();
-            const invitesPanel = this._renderManageInvites();
+            const ignoreUsersPanel = this.renderIgnoredUsers();
+            const invitesPanel = this.renderManageInvites();
             const e2ePanel = isE2eAdvancedPanelPossible() ? <E2eAdvancedPanel /> : null;
             // only show the section if there's something to show
             if (ignoreUsersPanel || invitesPanel || e2ePanel) {
                 advancedSection = <>
-                    <div className="mx_SettingsTab_heading">{_t("Advanced")}</div>
+                    <div className="mx_SettingsTab_heading">{ _t("Advanced") }</div>
                     <div className="mx_SettingsTab_section">
-                        {ignoreUsersPanel}
-                        {invitesPanel}
-                        {e2ePanel}
+                        { ignoreUsersPanel }
+                        { invitesPanel }
+                        { e2ePanel }
                     </div>
                 </>;
             }
@@ -389,31 +394,31 @@ export default class SecurityUserSettingsTab extends React.Component {
 
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
-                {warning}
-                <div className="mx_SettingsTab_heading">{_t("Where you’re logged in")}</div>
+                { warning }
+                <div className="mx_SettingsTab_heading">{ _t("Where you’re logged in") }</div>
                 <div className="mx_SettingsTab_section">
                     <span>
-                        {_t(
+                        { _t(
                             "Manage the names of and sign out of your sessions below or " +
                             "<a>verify them in your User Profile</a>.", {},
                             {
-                                a: sub => <AccessibleButton kind="link" onClick={this._onGoToUserProfileClick}>
-                                    {sub}
+                                a: sub => <AccessibleButton kind="link" onClick={this.onGoToUserProfileClick}>
+                                    { sub }
                                 </AccessibleButton>,
                             },
-                        )}
+                        ) }
                     </span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("A session's public name is visible to people you communicate with")}
+                        { _t("A session's public name is visible to people you communicate with") }
                         <DevicesPanel />
                     </div>
                 </div>
-                <div className="mx_SettingsTab_heading">{_t("Encryption")}</div>
+                <div className="mx_SettingsTab_heading">{ _t("Encryption") }</div>
                 <div className="mx_SettingsTab_section">
-                    {secureBackup}
-                    {eventIndex}
-                    {crossSigning}
-                    {this._renderCurrentDeviceInfo()}
+                    { secureBackup }
+                    { eventIndex }
+                    { crossSigning }
+                    { this.renderCurrentDeviceInfo() }
                 </div>
                 { privacySection }
                 { advancedSection }
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
deleted file mode 100644
index 362059f8ed..0000000000
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import {_t} from "../../../../../languageHandler";
-import SdkConfig from "../../../../../SdkConfig";
-import CallMediaHandler from "../../../../../CallMediaHandler";
-import Field from "../../../elements/Field";
-import AccessibleButton from "../../../elements/AccessibleButton";
-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();
-
-        this.state = {
-            mediaDevices: false,
-            activeAudioOutput: null,
-            activeAudioInput: null,
-            activeVideoInput: null,
-        };
-    }
-
-    async componentDidMount() {
-        const canSeeDeviceLabels = await CallMediaHandler.hasAnyLabeledDevices();
-        if (canSeeDeviceLabels) {
-            this._refreshMediaDevices();
-        }
-    }
-
-    _refreshMediaDevices = async (stream) => {
-        this.setState({
-            mediaDevices: await CallMediaHandler.getDevices(),
-            activeAudioOutput: CallMediaHandler.getAudioOutput(),
-            activeAudioInput: CallMediaHandler.getAudioInput(),
-            activeVideoInput: CallMediaHandler.getVideoInput(),
-        });
-        if (stream) {
-            // kill stream (after we've enumerated the devices, otherwise we'd get empty labels again)
-            // so that we don't leave it lingering around with webcam enabled etc
-            // as here we called gUM to ask user for permission to their device names only
-            stream.getTracks().forEach((track) => track.stop());
-        }
-    };
-
-    _requestMediaPermissions = async () => {
-        let constraints;
-        let stream;
-        let error;
-        try {
-            constraints = {video: true, audio: true};
-            stream = await navigator.mediaDevices.getUserMedia(constraints);
-        } catch (err) {
-            // user likely doesn't have a webcam,
-            // we should still allow to select a microphone
-            if (err.name === "NotFoundError") {
-                constraints = { audio: true };
-                try {
-                    stream = await navigator.mediaDevices.getUserMedia(constraints);
-                } catch (err) {
-                    error = err;
-                }
-            } else {
-                error = err;
-            }
-        }
-        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, {
-                title: _t('No media permissions'),
-                description: _t(
-                    'You may need to manually permit %(brand)s to access your microphone/webcam',
-                    { brand },
-                ),
-            });
-        } else {
-            this._refreshMediaDevices(stream);
-        }
-    };
-
-    _setAudioOutput = (e) => {
-        CallMediaHandler.setAudioOutput(e.target.value);
-        this.setState({
-            activeAudioOutput: e.target.value,
-        });
-    };
-
-    _setAudioInput = (e) => {
-        CallMediaHandler.setAudioInput(e.target.value);
-        this.setState({
-            activeAudioInput: e.target.value,
-        });
-    };
-
-    _setVideoInput = (e) => {
-        CallMediaHandler.setVideoInput(e.target.value);
-        this.setState({
-            activeVideoInput: e.target.value,
-        });
-    };
-
-    _changeWebRtcMethod = (p2p) => {
-        MatrixClientPeg.get().setForceTURN(!p2p);
-    };
-
-    _changeFallbackICEServerAllowed = (allow) => {
-        MatrixClientPeg.get().setFallbackICEServerAllowed(allow);
-    };
-
-    _renderDeviceOptions(devices, category) {
-        return devices.map((d) => {
-            return (<option key={`${category}-${d.deviceId}`} value={d.deviceId}>{d.label}</option>);
-        });
-    }
-
-    render() {
-        const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
-
-        let requestButton = null;
-        let speakerDropdown = null;
-        let microphoneDropdown = null;
-        let webcamDropdown = null;
-        if (this.state.mediaDevices === false) {
-            requestButton = (
-                <div className='mx_VoiceUserSettingsTab_missingMediaPermissions'>
-                    <p>{_t("Missing media permissions, click the button below to request.")}</p>
-                    <AccessibleButton onClick={this._requestMediaPermissions} kind="primary">
-                        {_t("Request media permissions")}
-                    </AccessibleButton>
-                </div>
-            );
-        } else if (this.state.mediaDevices) {
-            speakerDropdown = <p>{ _t('No Audio Outputs detected') }</p>;
-            microphoneDropdown = <p>{ _t('No Microphones detected') }</p>;
-            webcamDropdown = <p>{ _t('No Webcams detected') }</p>;
-
-            const defaultOption = {
-                deviceId: '',
-                label: _t('Default Device'),
-            };
-            const getDefaultDevice = (devices) => {
-                // Note we're looking for a device with deviceId 'default' but adding a device
-                // with deviceId == the empty string: this is because Chrome gives us a device
-                // with deviceId 'default', so we're looking for this, not the one we are adding.
-                if (!devices.some((i) => i.deviceId === 'default')) {
-                    devices.unshift(defaultOption);
-                    return '';
-                } else {
-                    return 'default';
-                }
-            };
-
-            const audioOutputs = this.state.mediaDevices.audiooutput.slice(0);
-            if (audioOutputs.length > 0) {
-                const defaultDevice = getDefaultDevice(audioOutputs);
-                speakerDropdown = (
-                    <Field element="select" label={_t("Audio Output")}
-                        value={this.state.activeAudioOutput || defaultDevice}
-                        onChange={this._setAudioOutput}>
-                        {this._renderDeviceOptions(audioOutputs, 'audioOutput')}
-                    </Field>
-                );
-            }
-
-            const audioInputs = this.state.mediaDevices.audioinput.slice(0);
-            if (audioInputs.length > 0) {
-                const defaultDevice = getDefaultDevice(audioInputs);
-                microphoneDropdown = (
-                    <Field element="select" label={_t("Microphone")}
-                        value={this.state.activeAudioInput || defaultDevice}
-                        onChange={this._setAudioInput}>
-                        {this._renderDeviceOptions(audioInputs, 'audioInput')}
-                    </Field>
-                );
-            }
-
-            const videoInputs = this.state.mediaDevices.videoinput.slice(0);
-            if (videoInputs.length > 0) {
-                const defaultDevice = getDefaultDevice(videoInputs);
-                webcamDropdown = (
-                    <Field element="select" label={_t("Camera")}
-                        value={this.state.activeVideoInput || defaultDevice}
-                        onChange={this._setVideoInput}>
-                        {this._renderDeviceOptions(videoInputs, 'videoInput')}
-                    </Field>
-                );
-            }
-        }
-
-        return (
-            <div className="mx_SettingsTab mx_VoiceUserSettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Voice & Video")}</div>
-                <div className="mx_SettingsTab_section">
-                    {requestButton}
-                    {speakerDropdown}
-                    {microphoneDropdown}
-                    {webcamDropdown}
-                    <SettingsFlag name='VideoView.flipVideoHorizontally' level={SettingLevel.ACCOUNT} />
-                    <SettingsFlag
-                        name='webRtcAllowPeerToPeer'
-                        level={SettingLevel.DEVICE}
-                        onChange={this._changeWebRtcMethod}
-                    />
-                    <SettingsFlag
-                        name='fallbackICEServerAllowed'
-                        level={SettingLevel.DEVICE}
-                        onChange={this._changeFallbackICEServerAllowed}
-                    />
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
new file mode 100644
index 0000000000..1e196aa362
--- /dev/null
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
@@ -0,0 +1,208 @@
+/*
+Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { _t } from "../../../../../languageHandler";
+import SdkConfig from "../../../../../SdkConfig";
+import MediaDeviceHandler, { IMediaDevices, MediaDeviceKindEnum } from "../../../../../MediaDeviceHandler";
+import Field from "../../../elements/Field";
+import AccessibleButton from "../../../elements/AccessibleButton";
+import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
+import Modal from "../../../../../Modal";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
+import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import SettingsFlag from '../../../elements/SettingsFlag';
+import ErrorDialog from '../../../dialogs/ErrorDialog';
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+const getDefaultDevice = (devices: Array<Partial<MediaDeviceInfo>>) => {
+    // Note we're looking for a device with deviceId 'default' but adding a device
+    // with deviceId == the empty string: this is because Chrome gives us a device
+    // with deviceId 'default', so we're looking for this, not the one we are adding.
+    if (!devices.some((i) => i.deviceId === 'default')) {
+        devices.unshift({ deviceId: '', label: _t('Default Device') });
+        return '';
+    } else {
+        return 'default';
+    }
+};
+
+interface IState extends Record<MediaDeviceKindEnum, string> {
+    mediaDevices: IMediaDevices;
+}
+
+@replaceableComponent("views.settings.tabs.user.VoiceUserSettingsTab")
+export default class VoiceUserSettingsTab extends React.Component<{}, IState> {
+    constructor(props: {}) {
+        super(props);
+
+        this.state = {
+            mediaDevices: null,
+            [MediaDeviceKindEnum.AudioOutput]: null,
+            [MediaDeviceKindEnum.AudioInput]: null,
+            [MediaDeviceKindEnum.VideoInput]: null,
+        };
+    }
+
+    async componentDidMount() {
+        const canSeeDeviceLabels = await MediaDeviceHandler.hasAnyLabeledDevices();
+        if (canSeeDeviceLabels) {
+            this.refreshMediaDevices();
+        }
+    }
+
+    private refreshMediaDevices = async (stream?: MediaStream): Promise<void> => {
+        this.setState({
+            mediaDevices: await MediaDeviceHandler.getDevices(),
+            [MediaDeviceKindEnum.AudioOutput]: MediaDeviceHandler.getAudioOutput(),
+            [MediaDeviceKindEnum.AudioInput]: MediaDeviceHandler.getAudioInput(),
+            [MediaDeviceKindEnum.VideoInput]: MediaDeviceHandler.getVideoInput(),
+        });
+        if (stream) {
+            // kill stream (after we've enumerated the devices, otherwise we'd get empty labels again)
+            // so that we don't leave it lingering around with webcam enabled etc
+            // as here we called gUM to ask user for permission to their device names only
+            stream.getTracks().forEach((track) => track.stop());
+        }
+    };
+
+    private requestMediaPermissions = async (): Promise<void> => {
+        let constraints;
+        let stream;
+        let error;
+        try {
+            constraints = { video: true, audio: true };
+            stream = await navigator.mediaDevices.getUserMedia(constraints);
+        } catch (err) {
+            // user likely doesn't have a webcam,
+            // we should still allow to select a microphone
+            if (err.name === "NotFoundError") {
+                constraints = { audio: true };
+                try {
+                    stream = await navigator.mediaDevices.getUserMedia(constraints);
+                } catch (err) {
+                    error = err;
+                }
+            } else {
+                error = err;
+            }
+        }
+        if (error) {
+            logger.log("Failed to list userMedia devices", error);
+            const brand = SdkConfig.get().brand;
+            Modal.createTrackedDialog('No media permissions', '', ErrorDialog, {
+                title: _t('No media permissions'),
+                description: _t(
+                    'You may need to manually permit %(brand)s to access your microphone/webcam',
+                    { brand },
+                ),
+            });
+        } else {
+            this.refreshMediaDevices(stream);
+        }
+    };
+
+    private setDevice = (deviceId: string, kind: MediaDeviceKindEnum): void => {
+        MediaDeviceHandler.instance.setDevice(deviceId, kind);
+        this.setState<null>({ [kind]: deviceId });
+    };
+
+    private changeWebRtcMethod = (p2p: boolean): void => {
+        MatrixClientPeg.get().setForceTURN(!p2p);
+    };
+
+    private changeFallbackICEServerAllowed = (allow: boolean): void => {
+        MatrixClientPeg.get().setFallbackICEServerAllowed(allow);
+    };
+
+    private renderDeviceOptions(devices: Array<MediaDeviceInfo>, category: MediaDeviceKindEnum): Array<JSX.Element> {
+        return devices.map((d) => {
+            return (<option key={`${category}-${d.deviceId}`} value={d.deviceId}>{ d.label }</option>);
+        });
+    }
+
+    private renderDropdown(kind: MediaDeviceKindEnum, label: string): JSX.Element {
+        const devices = this.state.mediaDevices[kind].slice(0);
+        if (devices.length === 0) return null;
+
+        const defaultDevice = getDefaultDevice(devices);
+        return (
+            <Field
+                element="select"
+                label={label}
+                value={this.state[kind] || defaultDevice}
+                onChange={(e) => this.setDevice(e.target.value, kind)}
+            >
+                { this.renderDeviceOptions(devices, kind) }
+            </Field>
+        );
+    }
+
+    render() {
+        let requestButton = null;
+        let speakerDropdown = null;
+        let microphoneDropdown = null;
+        let webcamDropdown = null;
+        if (!this.state.mediaDevices) {
+            requestButton = (
+                <div className='mx_VoiceUserSettingsTab_missingMediaPermissions'>
+                    <p>{ _t("Missing media permissions, click the button below to request.") }</p>
+                    <AccessibleButton onClick={this.requestMediaPermissions} kind="primary">
+                        { _t("Request media permissions") }
+                    </AccessibleButton>
+                </div>
+            );
+        } else if (this.state.mediaDevices) {
+            speakerDropdown = (
+                this.renderDropdown(MediaDeviceKindEnum.AudioOutput, _t("Audio Output")) ||
+                <p>{ _t('No Audio Outputs detected') }</p>
+            );
+            microphoneDropdown = (
+                this.renderDropdown(MediaDeviceKindEnum.AudioInput, _t("Microphone")) ||
+                <p>{ _t('No Microphones detected') }</p>
+            );
+            webcamDropdown = (
+                this.renderDropdown(MediaDeviceKindEnum.VideoInput, _t("Camera")) ||
+                <p>{ _t('No Webcams detected') }</p>
+            );
+        }
+
+        return (
+            <div className="mx_SettingsTab mx_VoiceUserSettingsTab">
+                <div className="mx_SettingsTab_heading">{ _t("Voice & Video") }</div>
+                <div className="mx_SettingsTab_section">
+                    { requestButton }
+                    { speakerDropdown }
+                    { microphoneDropdown }
+                    { webcamDropdown }
+                    <SettingsFlag name='VideoView.flipVideoHorizontally' level={SettingLevel.ACCOUNT} />
+                    <SettingsFlag
+                        name='webRtcAllowPeerToPeer'
+                        level={SettingLevel.DEVICE}
+                        onChange={this.changeWebRtcMethod}
+                    />
+                    <SettingsFlag
+                        name='fallbackICEServerAllowed'
+                        level={SettingLevel.DEVICE}
+                        onChange={this.changeFallbackICEServerAllowed}
+                    />
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/spaces/SpaceBasicSettings.tsx b/src/components/views/spaces/SpaceBasicSettings.tsx
index ec40f7bed8..4f305edd8b 100644
--- a/src/components/views/spaces/SpaceBasicSettings.tsx
+++ b/src/components/views/spaces/SpaceBasicSettings.tsx
@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useRef, useState} from "react";
+import React, { useRef, useState } from "react";
 
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import Field from "../elements/Field";
 
 interface IProps {
     avatarUrl?: string;
     avatarDisabled?: boolean;
-    name?: string,
+    name?: string;
     nameDisabled?: boolean;
     topic?: string;
     topicDisabled?: boolean;
@@ -57,18 +57,27 @@ export const SpaceAvatar = ({
                     src={avatar}
                     alt=""
                 />
-                <AccessibleButton onClick={() => {
-                    avatarUploadRef.current.value = "";
-                    setAvatarDataUrl(undefined);
-                    setAvatar(undefined);
-                }} kind="link" className="mx_SpaceBasicSettings_avatar_remove">
+                <AccessibleButton
+                    onClick={() => {
+                        avatarUploadRef.current.value = "";
+                        setAvatarDataUrl(undefined);
+                        setAvatar(undefined);
+                    }}
+                    kind="link"
+                    className="mx_SpaceBasicSettings_avatar_remove"
+                    aria-label={_t("Delete avatar")}
+                >
                     { _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">
+                <AccessibleButton
+                    onClick={() => avatarUploadRef.current?.click()}
+                    kind="link"
+                    aria-label={_t("Upload avatar")}
+                >
                     { _t("Upload") }
                 </AccessibleButton>
             </React.Fragment>;
@@ -77,16 +86,21 @@ export const SpaceAvatar = ({
 
     return <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/*" />
+        <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>;
 };
 
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 0ebf511018..52f7786957 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -14,25 +14,64 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext, useRef, useState} from "react";
+import React, { ComponentProps, RefObject, SyntheticEvent, KeyboardEvent, useContext, useRef, useState } from "react";
 import classNames from "classnames";
-import {EventType, RoomType, RoomCreateTypeField} from "matrix-js-sdk/src/@types/event";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
 import FocusLock from "react-focus-lock";
+import { HistoryVisibility, Preset } from "matrix-js-sdk/src/@types/partials";
+import { ICreateRoomOpts } from "matrix-js-sdk/src/@types/requests";
 
-import {_t} from "../../../languageHandler";
+import { _t } from "../../../languageHandler";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import {ChevronFace, ContextMenu} from "../../structures/ContextMenu";
-import createRoom, {IStateEvent, Preset} from "../../../createRoom";
+import { ChevronFace, ContextMenu } from "../../structures/ContextMenu";
+import createRoom, { IOpts as ICreateOpts } from "../../../createRoom";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {SpaceAvatar} from "./SpaceBasicSettings";
+import SpaceBasicSettings, { SpaceAvatar } from "./SpaceBasicSettings";
 import AccessibleButton from "../elements/AccessibleButton";
-import {BetaPill} from "../beta/BetaCard";
-import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
-import {USER_LABS_TAB} from "../dialogs/UserSettingsDialog";
 import Field from "../elements/Field";
 import withValidation from "../elements/Validation";
-import {SpaceFeedbackPrompt} from "../../structures/SpaceRoomView";
+import RoomAliasField from "../elements/RoomAliasField";
+import SdkConfig from "../../../SdkConfig";
+import Modal from "../../../Modal";
+import GenericFeatureFeedbackDialog from "../dialogs/GenericFeatureFeedbackDialog";
+import SettingsStore from "../../../settings/SettingsStore";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import { Action } from "../../../dispatcher/actions";
+import { UserTab } from "../dialogs/UserSettingsDialog";
+import { Key } from "../../../Keyboard";
+
+export const createSpace = async (
+    name: string,
+    isPublic: boolean,
+    alias?: string,
+    topic?: string,
+    avatar?: string | File,
+    createOpts: Partial<ICreateRoomOpts> = {},
+    otherOpts: Partial<Omit<ICreateOpts, "createOpts">> = {},
+) => {
+    return createRoom({
+        createOpts: {
+            name,
+            preset: isPublic ? Preset.PublicChat : Preset.PrivateChat,
+            power_level_content_override: {
+                // Only allow Admins to write to the timeline to prevent hidden sync spam
+                events_default: 100,
+                invite: isPublic ? 0 : 50,
+            },
+            room_alias_name: isPublic && alias ? alias.substr(1, alias.indexOf(":") - 1) : undefined,
+            topic,
+            ...createOpts,
+        },
+        avatar,
+        roomType: RoomType.Space,
+        historyVisibility: isPublic ? HistoryVisibility.WorldReadable : HistoryVisibility.Invited,
+        spinner: false,
+        encryption: false,
+        andView: true,
+        inlineErrors: true,
+        ...otherOpts,
+    });
+};
 
 const SpaceCreateMenuType = ({ title, description, className, onClick }) => {
     return (
@@ -58,6 +97,123 @@ const spaceNameValidator = withValidation({
     ],
 });
 
+const nameToLocalpart = (name: string): string => {
+    return name.trim().toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9_-]+/gi, "");
+};
+
+// XXX: Temporary for the Spaces release only
+export const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
+    if (!SdkConfig.get().bug_report_endpoint_url) return null;
+
+    return <div className="mx_SpaceFeedbackPrompt">
+        <span className="mx_SpaceFeedbackPrompt_text">{ _t("Spaces are a new feature.") }</span>
+        <AccessibleButton
+            kind="link"
+            onClick={() => {
+                if (onClick) onClick();
+                Modal.createTrackedDialog("Spaces Feedback", "", GenericFeatureFeedbackDialog, {
+                    title: _t("Spaces feedback"),
+                    subheading: _t("Thank you for trying Spaces. " +
+                        "Your feedback will help inform the next versions."),
+                    rageshakeLabel: "spaces-feedback",
+                    rageshakeData: Object.fromEntries([
+                        "Spaces.allRoomsInHome",
+                    ].map(k => [k, SettingsStore.getValue(k)])),
+                });
+            }}
+        >
+            { _t("Give feedback.") }
+        </AccessibleButton>
+    </div>;
+};
+
+type BProps = Omit<ComponentProps<typeof SpaceBasicSettings>, "nameDisabled" | "topicDisabled" | "avatarDisabled">;
+interface ISpaceCreateFormProps extends BProps {
+    busy: boolean;
+    alias: string;
+    nameFieldRef: RefObject<Field>;
+    aliasFieldRef: RefObject<RoomAliasField>;
+    showAliasField?: boolean;
+    onSubmit(e: SyntheticEvent): void;
+    setAlias(alias: string): void;
+}
+
+export const SpaceCreateForm: React.FC<ISpaceCreateFormProps> = ({
+    busy,
+    onSubmit,
+    avatarUrl,
+    setAvatar,
+    name,
+    setName,
+    nameFieldRef,
+    alias,
+    aliasFieldRef,
+    setAlias,
+    showAliasField,
+    topic,
+    setTopic,
+    children,
+}) => {
+    const cli = useContext(MatrixClientContext);
+    const domain = cli.getDomain();
+
+    const onKeyDown = (ev: KeyboardEvent) => {
+        if (ev.key === Key.ENTER) {
+            onSubmit(ev);
+        }
+    };
+
+    return <form className="mx_SpaceBasicSettings" onSubmit={onSubmit}>
+        <SpaceAvatar avatarUrl={avatarUrl} setAvatar={setAvatar} avatarDisabled={busy} />
+
+        <Field
+            name="spaceName"
+            label={_t("Name")}
+            autoFocus={true}
+            value={name}
+            onChange={ev => {
+                const newName = ev.target.value;
+                if (!alias || alias === `#${nameToLocalpart(name)}:${domain}`) {
+                    setAlias(`#${nameToLocalpart(newName)}:${domain}`);
+                    aliasFieldRef.current?.validate({ allowEmpty: true });
+                }
+                setName(newName);
+            }}
+            onKeyDown={onKeyDown}
+            ref={nameFieldRef}
+            onValidate={spaceNameValidator}
+            disabled={busy}
+            autoComplete="off"
+        />
+
+        { showAliasField
+            ? <RoomAliasField
+                ref={aliasFieldRef}
+                onChange={setAlias}
+                domain={domain}
+                value={alias}
+                placeholder={name ? nameToLocalpart(name) : _t("e.g. my-space")}
+                label={_t("Address")}
+                disabled={busy}
+                onKeyDown={onKeyDown}
+            />
+            : null
+        }
+
+        <Field
+            name="spaceTopic"
+            element="textarea"
+            label={_t("Description")}
+            value={topic}
+            onChange={ev => setTopic(ev.target.value)}
+            rows={3}
+            disabled={busy}
+        />
+
+        { children }
+    </form>;
+};
+
 const SpaceCreateMenu = ({ onFinished }) => {
     const cli = useContext(MatrixClientContext);
     const [visibility, setVisibility] = useState<Visibility>(null);
@@ -65,6 +221,8 @@ const SpaceCreateMenu = ({ onFinished }) => {
 
     const [name, setName] = useState("");
     const spaceNameField = useRef<Field>();
+    const [alias, setAlias] = useState("");
+    const spaceAliasField = useRef<RoomAliasField>();
     const [avatar, setAvatar] = useState<File>(null);
     const [topic, setTopic] = useState<string>("");
 
@@ -74,57 +232,32 @@ const SpaceCreateMenu = ({ onFinished }) => {
 
         setBusy(true);
         // require & validate the space name field
-        if (!await spaceNameField.current.validate({ allowEmpty: false })) {
+        if (!(await spaceNameField.current.validate({ allowEmpty: false }))) {
             spaceNameField.current.focus();
             spaceNameField.current.validate({ allowEmpty: false, focused: true });
             setBusy(false);
             return;
         }
 
-        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 },
-            });
+        // validate the space alias field but do not require it
+        const aliasLocalpart = alias.substring(1, alias.length - cli.getDomain().length - 1);
+        if (visibility === Visibility.Public && aliasLocalpart &&
+            (await spaceAliasField.current.validate({ allowEmpty: true })) === false
+        ) {
+            spaceAliasField.current.focus();
+            spaceAliasField.current.validate({ allowEmpty: true, focused: true });
+            setBusy(false);
+            return;
         }
 
         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,
-                        ...Visibility.Public ? { invite: 0 } : {},
-                    },
-                },
-                spinner: false,
-                encryption: false,
-                andView: true,
-                inlineErrors: true,
-            });
+            await createSpace(
+                name,
+                visibility === Visibility.Public,
+                aliasLocalpart ? alias : undefined,
+                topic,
+                avatar,
+            );
 
             onFinished();
         } catch (e) {
@@ -134,10 +267,23 @@ const SpaceCreateMenu = ({ onFinished }) => {
 
     let body;
     if (visibility === null) {
+        const onCreateSpaceFromCommunityClick = () => {
+            defaultDispatcher.dispatch({
+                action: Action.ViewUserSettings,
+                initialTabId: UserTab.Preferences,
+            });
+            onFinished();
+        };
+
         body = <React.Fragment>
             <h2>{ _t("Create a space") }</h2>
-            <p>{ _t("Spaces are a new way to group rooms and people. " +
-                "To join an existing space you'll need an invite.") }</p>
+            <p>
+                { _t("Spaces are a new way to group rooms and people.") }
+                &nbsp;
+                { _t("What kind of Space do you want to create?") }
+                &nbsp;
+                { _t("You can change this later.") }
+            </p>
 
             <SpaceCreateMenuType
                 title={_t("Public")}
@@ -152,7 +298,15 @@ const SpaceCreateMenu = ({ onFinished }) => {
                 onClick={() => setVisibility(Visibility.Private)}
             />
 
-            <p>{ _t("You can change this later") }</p>
+            <p>
+                { _t("You can also make Spaces from <a>communities</a>.", {}, {
+                    a: sub => <AccessibleButton kind="link" onClick={onCreateSpaceFromCommunityClick}>
+                        { sub }
+                    </AccessibleButton>,
+                }) }
+                <br />
+                { _t("To join a space you'll need an invite.") }
+            </p>
 
             <SpaceFeedbackPrompt onClick={onFinished} />
         </React.Fragment>;
@@ -177,30 +331,20 @@ const SpaceCreateMenu = ({ onFinished }) => {
                 }
             </p>
 
-            <form className="mx_SpaceBasicSettings" onSubmit={onSpaceCreateClick}>
-                <SpaceAvatar setAvatar={setAvatar} avatarDisabled={busy} />
-
-                <Field
-                    name="spaceName"
-                    label={_t("Name")}
-                    autoFocus={true}
-                    value={name}
-                    onChange={ev => setName(ev.target.value)}
-                    ref={spaceNameField}
-                    onValidate={spaceNameValidator}
-                    disabled={busy}
-                />
-
-                <Field
-                    name="spaceTopic"
-                    element="textarea"
-                    label={_t("Description")}
-                    value={topic}
-                    onChange={ev => setTopic(ev.target.value)}
-                    rows={3}
-                    disabled={busy}
-                />
-            </form>
+            <SpaceCreateForm
+                busy={busy}
+                onSubmit={onSpaceCreateClick}
+                setAvatar={setAvatar}
+                name={name}
+                setName={setName}
+                nameFieldRef={spaceNameField}
+                topic={topic}
+                setTopic={setTopic}
+                alias={alias}
+                setAlias={setAlias}
+                showAliasField={visibility === Visibility.Public}
+                aliasFieldRef={spaceAliasField}
+            />
 
             <AccessibleButton kind="primary" onClick={onSpaceCreateClick} disabled={busy}>
                 { busy ? _t("Creating...") : _t("Create") }
@@ -218,16 +362,9 @@ const SpaceCreateMenu = ({ onFinished }) => {
         managed={false}
     >
         <FocusLock returnFocus={true}>
-            <BetaPill onClick={() => {
-                onFinished();
-                defaultDispatcher.dispatch({
-                    action: Action.ViewUserSettings,
-                    initialTabId: USER_LABS_TAB,
-                });
-            }} />
             { body }
         </FocusLock>
     </ContextMenu>;
-}
+};
 
 export default SpaceCreateMenu;
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index eb63b21f0e..67055d7418 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -14,118 +14,130 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useEffect, useState } from "react";
+import React, {
+    ComponentProps,
+    Dispatch,
+    ReactNode,
+    SetStateAction,
+    useEffect,
+    useLayoutEffect,
+    useRef,
+    useState,
+} from "react";
+import { DragDropContext, Draggable, Droppable } from "react-beautiful-dnd";
 import classNames from "classnames";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {_t} from "../../../languageHandler";
-import RoomAvatar from "../avatars/RoomAvatar";
-import {useContextMenu} from "../../structures/ContextMenu";
+import { _t } from "../../../languageHandler";
+import { useContextMenu } from "../../structures/ContextMenu";
 import SpaceCreateMenu from "./SpaceCreateMenu";
-import {SpaceItem} from "./SpaceTreeLevel";
+import { SpaceButton, SpaceItem } from "./SpaceTreeLevel";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import { useEventEmitterState } from "../../../hooks/useEventEmitter";
 import SpaceStore, {
+    HOME_SPACE,
+    UPDATE_HOME_BEHAVIOUR,
     UPDATE_INVITED_SPACES,
     UPDATE_SELECTED_SPACE,
     UPDATE_TOP_LEVEL_SPACES,
 } from "../../../stores/SpaceStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import NotificationBadge from "../rooms/NotificationBadge";
-import {
-    RovingAccessibleButton,
-    RovingAccessibleTooltipButton,
-    RovingTabIndexProvider,
-} from "../../../accessibility/RovingTabIndex";
-import {Key} from "../../../Keyboard";
-import {RoomNotificationStateStore} from "../../../stores/notifications/RoomNotificationStateStore";
-import {NotificationState} from "../../../stores/notifications/NotificationState";
-
-interface IButtonProps {
-    space?: Room;
-    className?: string;
-    selected?: boolean;
-    tooltip?: string;
-    notificationState?: NotificationState;
-    isNarrow?: boolean;
-    onClick(): void;
-}
-
-const SpaceButton: React.FC<IButtonProps> = ({
-    space,
-    className,
-    selected,
-    onClick,
-    tooltip,
-    notificationState,
-    isNarrow,
-    children,
-}) => {
-    const classes = classNames("mx_SpaceButton", className, {
-        mx_SpaceButton_active: selected,
-        mx_SpaceButton_narrow: isNarrow,
-    });
-
-    let avatar = <div className="mx_SpaceButton_avatarPlaceholder"><div className="mx_SpaceButton_icon" /></div>;
-    if (space) {
-        avatar = <RoomAvatar width={32} height={32} room={space} />;
-    }
-
-    let notifBadge;
-    if (notificationState) {
-        notifBadge = <div className="mx_SpacePanel_badgeContainer">
-            <NotificationBadge forceCount={false} notification={notificationState} />
-        </div>;
-    }
-
-    let button;
-    if (isNarrow) {
-        button = (
-            <RovingAccessibleTooltipButton className={classes} title={tooltip} onClick={onClick} role="treeitem">
-                <div className="mx_SpaceButton_selectionWrapper">
-                    { avatar }
-                    { notifBadge }
-                    { children }
-                </div>
-            </RovingAccessibleTooltipButton>
-        );
-    } else {
-        button = (
-            <RovingAccessibleButton className={classes} onClick={onClick} role="treeitem">
-                <div className="mx_SpaceButton_selectionWrapper">
-                    { avatar }
-                    <span className="mx_SpaceButton_name">{ tooltip }</span>
-                    { notifBadge }
-                    { children }
-                </div>
-            </RovingAccessibleButton>
-        );
-    }
-
-    return <li className={classNames({
-        "mx_SpaceItem": true,
-        "collapsed": isNarrow,
-    })}>
-        { button }
-    </li>;
-}
+import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
+import { Key } from "../../../Keyboard";
+import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+import SpaceContextMenu from "../context_menus/SpaceContextMenu";
+import IconizedContextMenu, {
+    IconizedContextMenuCheckbox,
+    IconizedContextMenuOptionList,
+} from "../context_menus/IconizedContextMenu";
+import SettingsStore from "../../../settings/SettingsStore";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import UIStore from "../../../stores/UIStore";
 
 const useSpaces = (): [Room[], Room[], Room | null] => {
-    const [invites, setInvites] = useState<Room[]>(SpaceStore.instance.invitedSpaces);
-    useEventEmitter(SpaceStore.instance, UPDATE_INVITED_SPACES, setInvites);
-    const [spaces, setSpaces] = useState<Room[]>(SpaceStore.instance.spacePanelSpaces);
-    useEventEmitter(SpaceStore.instance, UPDATE_TOP_LEVEL_SPACES, setSpaces);
-    const [activeSpace, setActiveSpace] = useState<Room>(SpaceStore.instance.activeSpace);
-    useEventEmitter(SpaceStore.instance, UPDATE_SELECTED_SPACE, setActiveSpace);
+    const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
+        return SpaceStore.instance.invitedSpaces;
+    });
+    const spaces = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_TOP_LEVEL_SPACES, () => {
+        return SpaceStore.instance.spacePanelSpaces;
+    });
+    const activeSpace = useEventEmitterState<Room>(SpaceStore.instance, UPDATE_SELECTED_SPACE, () => {
+        return SpaceStore.instance.activeSpace;
+    });
     return [invites, spaces, activeSpace];
 };
 
-const SpacePanel = () => {
+interface IInnerSpacePanelProps {
+    children?: ReactNode;
+    isPanelCollapsed: boolean;
+    setPanelCollapsed: Dispatch<SetStateAction<boolean>>;
+}
+
+const HomeButtonContextMenu = ({ onFinished, ...props }: ComponentProps<typeof SpaceContextMenu>) => {
+    const allRoomsInHome = useEventEmitterState(SpaceStore.instance, UPDATE_HOME_BEHAVIOUR, () => {
+        return SpaceStore.instance.allRoomsInHome;
+    });
+
+    return <IconizedContextMenu
+        {...props}
+        onFinished={onFinished}
+        className="mx_SpacePanel_contextMenu"
+        compact
+    >
+        <div className="mx_SpacePanel_contextMenu_header">
+            { _t("Home") }
+        </div>
+        <IconizedContextMenuOptionList first>
+            <IconizedContextMenuCheckbox
+                iconClassName="mx_SpacePanel_noIcon"
+                label={_t("Show all rooms")}
+                active={allRoomsInHome}
+                onClick={() => {
+                    SettingsStore.setValue("Spaces.allRoomsInHome", null, SettingLevel.ACCOUNT, !allRoomsInHome);
+                }}
+            />
+        </IconizedContextMenuOptionList>
+    </IconizedContextMenu>;
+};
+
+interface IHomeButtonProps {
+    selected: boolean;
+    isPanelCollapsed: boolean;
+}
+
+const HomeButton = ({ selected, isPanelCollapsed }: IHomeButtonProps) => {
+    const allRoomsInHome = useEventEmitterState(SpaceStore.instance, UPDATE_HOME_BEHAVIOUR, () => {
+        return SpaceStore.instance.allRoomsInHome;
+    });
+
+    return <li
+        className={classNames("mx_SpaceItem", {
+            "collapsed": isPanelCollapsed,
+        })}
+        role="treeitem"
+    >
+        <SpaceButton
+            className="mx_SpaceButton_home"
+            onClick={() => SpaceStore.instance.setActiveSpace(null)}
+            selected={selected}
+            label={allRoomsInHome ? _t("All rooms") : _t("Home")}
+            notificationState={allRoomsInHome
+                ? RoomNotificationStateStore.instance.globalState
+                : SpaceStore.instance.getNotificationState(HOME_SPACE)}
+            isNarrow={isPanelCollapsed}
+            ContextMenuComponent={HomeButtonContextMenu}
+            contextMenuTooltip={_t("Options")}
+        />
+    </li>;
+};
+
+const CreateSpaceButton = ({
+    isPanelCollapsed,
+    setPanelCollapsed,
+}: Pick<IInnerSpacePanelProps, "isPanelCollapsed" | "setPanelCollapsed">) => {
     // 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 [invites, spaces, activeSpace] = useSpaces();
-    const [isPanelCollapsed, setPanelCollapsed] = useState(true);
 
     useEffect(() => {
         if (!isPanelCollapsed && menuDisplayed) {
@@ -133,16 +145,92 @@ const SpacePanel = () => {
         }
     }, [isPanelCollapsed]); // eslint-disable-line react-hooks/exhaustive-deps
 
-    const newClasses = classNames("mx_SpaceButton_new", {
-        mx_SpaceButton_newCancel: menuDisplayed,
-    });
-
     let contextMenu = null;
     if (menuDisplayed) {
         contextMenu = <SpaceCreateMenu onFinished={closeMenu} />;
     }
 
+    const onNewClick = menuDisplayed ? closeMenu : () => {
+        // persist that the user has interacted with this, use it to dismiss the beta dot
+        localStorage.setItem("mx_seenSpaces", "1");
+        if (!isPanelCollapsed) setPanelCollapsed(true);
+        openMenu();
+    };
+
+    let betaDot: JSX.Element;
+    if (!localStorage.getItem("mx_seenSpaces") && !SpaceStore.instance.spacePanelSpaces.length) {
+        betaDot = <div className="mx_BetaDot" />;
+    }
+
+    return <li
+        className={classNames("mx_SpaceItem mx_SpaceItem_new", {
+            "collapsed": isPanelCollapsed,
+        })}
+        role="treeitem"
+    >
+        <SpaceButton
+            className={classNames("mx_SpaceButton_new", {
+                mx_SpaceButton_newCancel: menuDisplayed,
+            })}
+            label={menuDisplayed ? _t("Cancel") : _t("Create a space")}
+            onClick={onNewClick}
+            isNarrow={isPanelCollapsed}
+        />
+        { betaDot }
+
+        { contextMenu }
+    </li>;
+};
+
+// Optimisation based on https://github.com/atlassian/react-beautiful-dnd/blob/master/docs/api/droppable.md#recommended-droppable--performance-optimisation
+const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(({ children, isPanelCollapsed, setPanelCollapsed }) => {
+    const [invites, spaces, activeSpace] = useSpaces();
+    const activeSpaces = activeSpace ? [activeSpace] : [];
+
+    return <div className="mx_SpaceTreeLevel">
+        <HomeButton selected={!activeSpace} isPanelCollapsed={isPanelCollapsed} />
+        { invites.map(s => (
+            <SpaceItem
+                key={s.roomId}
+                space={s}
+                activeSpaces={activeSpaces}
+                isPanelCollapsed={isPanelCollapsed}
+                onExpand={() => setPanelCollapsed(false)}
+            />
+        )) }
+        { spaces.map((s, i) => (
+            <Draggable key={s.roomId} draggableId={s.roomId} index={i}>
+                { (provided, snapshot) => (
+                    <SpaceItem
+                        {...provided.draggableProps}
+                        dragHandleProps={provided.dragHandleProps}
+                        key={s.roomId}
+                        innerRef={provided.innerRef}
+                        className={snapshot.isDragging ? "mx_SpaceItem_dragging" : undefined}
+                        space={s}
+                        activeSpaces={activeSpaces}
+                        isPanelCollapsed={isPanelCollapsed}
+                        onExpand={() => setPanelCollapsed(false)}
+                    />
+                ) }
+            </Draggable>
+        )) }
+        { children }
+        <CreateSpaceButton isPanelCollapsed={isPanelCollapsed} setPanelCollapsed={setPanelCollapsed} />
+    </div>;
+});
+
+const SpacePanel = () => {
+    const [isPanelCollapsed, setPanelCollapsed] = useState(true);
+    const ref = useRef<HTMLUListElement>();
+    useLayoutEffect(() => {
+        UIStore.instance.trackElementDimensions("SpacePanel", ref.current);
+        return () => UIStore.instance.stopTrackingElementDimensions("SpacePanel");
+    }, []);
+
     const onKeyDown = (ev: React.KeyboardEvent) => {
+        if (ev.defaultPrevented) return;
+
         let handled = true;
 
         switch (ev.key) {
@@ -203,59 +291,49 @@ const SpacePanel = () => {
         }
     };
 
-    const activeSpaces = activeSpace ? [activeSpace] : [];
-    const expandCollapseButtonTitle = isPanelCollapsed ? _t("Expand space panel") : _t("Collapse space panel");
-    // TODO drag and drop for re-arranging order
-    return <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
-        {({onKeyDownHandler}) => (
-            <ul
-                className={classNames("mx_SpacePanel", { collapsed: isPanelCollapsed })}
-                onKeyDown={onKeyDownHandler}
-            >
-                <AutoHideScrollbar className="mx_SpacePanel_spaceTreeWrapper">
-                    <div className="mx_SpaceTreeLevel">
-                        <SpaceButton
-                            className="mx_SpaceButton_home"
-                            onClick={() => SpaceStore.instance.setActiveSpace(null)}
-                            selected={!activeSpace}
-                            tooltip={_t("All rooms")}
-                            notificationState={RoomNotificationStateStore.instance.globalState}
-                            isNarrow={isPanelCollapsed}
+    return (
+        <DragDropContext onDragEnd={result => {
+            if (!result.destination) return; // dropped outside the list
+            SpaceStore.instance.moveRootSpace(result.source.index, result.destination.index);
+        }}>
+            <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
+                { ({ onKeyDownHandler }) => (
+                    <ul
+                        className={classNames("mx_SpacePanel", { collapsed: isPanelCollapsed })}
+                        onKeyDown={onKeyDownHandler}
+                        role="tree"
+                        aria-label={_t("Spaces")}
+                        ref={ref}
+                    >
+                        <Droppable droppableId="top-level-spaces">
+                            { (provided, snapshot) => (
+                                <AutoHideScrollbar
+                                    {...provided.droppableProps}
+                                    wrappedRef={provided.innerRef}
+                                    className="mx_SpacePanel_spaceTreeWrapper"
+                                    style={snapshot.isDraggingOver ? {
+                                        pointerEvents: "none",
+                                    } : undefined}
+                                >
+                                    <InnerSpacePanel
+                                        isPanelCollapsed={isPanelCollapsed}
+                                        setPanelCollapsed={setPanelCollapsed}
+                                    >
+                                        { provided.placeholder }
+                                    </InnerSpacePanel>
+                                </AutoHideScrollbar>
+                            ) }
+                        </Droppable>
+                        <AccessibleTooltipButton
+                            className={classNames("mx_SpacePanel_toggleCollapse", { expanded: !isPanelCollapsed })}
+                            onClick={() => setPanelCollapsed(!isPanelCollapsed)}
+                            title={isPanelCollapsed ? _t("Expand space panel") : _t("Collapse space panel")}
                         />
-                        { invites.map(s => <SpaceItem
-                            key={s.roomId}
-                            space={s}
-                            activeSpaces={activeSpaces}
-                            isPanelCollapsed={isPanelCollapsed}
-                            onExpand={() => setPanelCollapsed(false)}
-                        />) }
-                        { spaces.map(s => <SpaceItem
-                            key={s.roomId}
-                            space={s}
-                            activeSpaces={activeSpaces}
-                            isPanelCollapsed={isPanelCollapsed}
-                            onExpand={() => setPanelCollapsed(false)}
-                        />) }
-                    </div>
-                    <SpaceButton
-                        className={newClasses}
-                        tooltip={menuDisplayed ? _t("Cancel") : _t("Create a space")}
-                        onClick={menuDisplayed ? closeMenu : () => {
-                            if (!isPanelCollapsed) setPanelCollapsed(true);
-                            openMenu();
-                        }}
-                        isNarrow={isPanelCollapsed}
-                    />
-                </AutoHideScrollbar>
-                <AccessibleTooltipButton
-                    className={classNames("mx_SpacePanel_toggleCollapse", {expanded: !isPanelCollapsed})}
-                    onClick={() => setPanelCollapsed(!isPanelCollapsed)}
-                    title={expandCollapseButtonTitle}
-                />
-                { contextMenu }
-            </ul>
-        )}
-    </RovingTabIndexProvider>
+                    </ul>
+                ) }
+            </RovingTabIndexProvider>
+        </DragDropContext>
+    );
 };
 
 export default SpacePanel;
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 207360c2c2..f8860ddd54 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -14,16 +14,16 @@ 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 React, { useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { sleep } from "matrix-js-sdk/src/utils";
 
-import {_t} from "../../../languageHandler";
+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 {showRoomInviteDialog} from "../../../RoomInvite";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { copyPlaintext } from "../../../utils/strings";
+import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { showRoomInviteDialog } from "../../../RoomInvite";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 interface IProps {
     space: Room;
@@ -39,7 +39,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
             onClick={async () => {
                 const permalinkCreator = new RoomPermalinkCreator(space);
                 permalinkCreator.load();
-                const success = await copyPlaintext(permalinkCreator.forRoom());
+                const success = await copyPlaintext(permalinkCreator.forShareableRoom());
                 const text = success ? _t("Copied!") : _t("Failed to copy");
                 setCopiedText(text);
                 await sleep(5000);
@@ -54,8 +54,8 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
         { space.canInvite(MatrixClientPeg.get()?.getUserId()) ? <AccessibleButton
             className="mx_SpacePublicShare_inviteButton"
             onClick={() => {
-                showRoomInviteDialog(space.roomId);
                 if (onFinished) onFinished();
+                showRoomInviteDialog(space.roomId);
             }}
         >
             <h3>{ _t("Invite people") }</h3>
diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
new file mode 100644
index 0000000000..595bdb2448
--- /dev/null
+++ b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
@@ -0,0 +1,137 @@
+/*
+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 AccessibleButton from "../elements/AccessibleButton";
+import SpaceBasicSettings from "./SpaceBasicSettings";
+import { avatarUrlForRoom } from "../../../Avatar";
+import { IDialogProps } from "../dialogs/IDialogProps";
+import { getTopic } from "../elements/RoomTopic";
+import { leaveSpace } from "../../../utils/space";
+
+interface IProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    space: Room;
+}
+
+const SpaceSettingsGeneralTab = ({ matrixClient: cli, space, onFinished }: IProps) => {
+    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 onCancel = () => {
+        setNewAvatar(null);
+        setName(space.name);
+        setTopic(currentTopic);
+    };
+
+    const onSave = async () => {
+        setBusy(true);
+        const promises = [];
+
+        if (avatarChanged) {
+            if (newAvatar) {
+                promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {
+                    url: await cli.uploadContent(newAvatar),
+                }, ""));
+            } else {
+                promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {}, ""));
+            }
+        }
+
+        if (nameChanged) {
+            promises.push(cli.setRoomName(space.roomId, name));
+        }
+
+        if (topicChanged) {
+            promises.push(cli.setRoomTopic(space.roomId, topic));
+        }
+
+        const results = await Promise.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 <div className="mx_SettingsTab">
+        <div className="mx_SettingsTab_heading">{ _t("General") }</div>
+
+        <div>{ _t("Edit settings relating to your space.") }</div>
+
+        { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+
+        <div className="mx_SettingsTab_section">
+            <SpaceBasicSettings
+                avatarUrl={avatarUrlForRoom(space, 80, 80, "crop")}
+                avatarDisabled={busy || !canSetAvatar}
+                setAvatar={setNewAvatar}
+                name={name}
+                nameDisabled={busy || !canSetName}
+                setName={setName}
+                topic={topic}
+                topicDisabled={busy || !canSetTopic}
+                setTopic={setTopic}
+            />
+
+            <AccessibleButton
+                onClick={onCancel}
+                disabled={busy || !(avatarChanged || nameChanged || topicChanged)}
+                kind="link"
+            >
+                { _t("Cancel") }
+            </AccessibleButton>
+            <AccessibleButton onClick={onSave} disabled={busy} kind="primary">
+                { busy ? _t("Saving...") : _t("Save Changes") }
+            </AccessibleButton>
+        </div>
+
+        <span className="mx_SettingsTab_subheading">{ _t("Leave Space") }</span>
+        <div className="mx_SettingsTab_section mx_SettingsTab_subsectionText">
+            <AccessibleButton
+                kind="danger"
+                onClick={() => {
+                    leaveSpace(space);
+                }}
+            >
+                { _t("Leave Space") }
+            </AccessibleButton>
+        </div>
+    </div>;
+};
+
+export default SpaceSettingsGeneralTab;
diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
new file mode 100644
index 0000000000..5b06e1fdba
--- /dev/null
+++ b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
@@ -0,0 +1,149 @@
+/*
+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 { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials";
+
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import AliasSettings from "../room_settings/AliasSettings";
+import { useStateToggle } from "../../../hooks/useStateToggle";
+import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import { useLocalEcho } from "../../../hooks/useLocalEcho";
+import JoinRuleSettings from "../settings/JoinRuleSettings";
+import { useRoomState } from "../../../hooks/useRoomState";
+
+interface IProps {
+    matrixClient: MatrixClient;
+    space: Room;
+    closeSettingsFn(): void;
+}
+
+const SpaceSettingsVisibilityTab = ({ matrixClient: cli, space, closeSettingsFn }: IProps) => {
+    const [error, setError] = useState("");
+
+    const userId = cli.getUserId();
+
+    const joinRule = useRoomState(space, state => state.getJoinRule());
+    const [guestAccessEnabled, setGuestAccessEnabled] = useLocalEcho<boolean>(
+        () => space.currentState.getStateEvents(EventType.RoomGuestAccess, "")
+            ?.getContent()?.guest_access === GuestAccess.CanJoin,
+        guestAccessEnabled => cli.sendStateEvent(space.roomId, EventType.RoomGuestAccess, {
+            guest_access: guestAccessEnabled ? GuestAccess.CanJoin : GuestAccess.Forbidden,
+        }, ""),
+        () => setError(_t("Failed to update the guest access of this space")),
+    );
+    const [historyVisibility, setHistoryVisibility] = useLocalEcho<HistoryVisibility>(
+        () => space.currentState.getStateEvents(EventType.RoomHistoryVisibility, "")
+            ?.getContent()?.history_visibility || HistoryVisibility.Shared,
+        historyVisibility => cli.sendStateEvent(space.roomId, EventType.RoomHistoryVisibility, {
+            history_visibility: historyVisibility,
+        }, ""),
+        () => setError(_t("Failed to update the history visibility of this space")),
+    );
+
+    const [showAdvancedSection, toggleAdvancedSection] = useStateToggle();
+
+    const canSetGuestAccess = space.currentState.maySendStateEvent(EventType.RoomGuestAccess, userId);
+    const canSetHistoryVisibility = space.currentState.maySendStateEvent(EventType.RoomHistoryVisibility, userId);
+    const canSetCanonical = space.currentState.mayClientSendStateEvent(EventType.RoomCanonicalAlias, cli);
+    const canonicalAliasEv = space.currentState.getStateEvents(EventType.RoomCanonicalAlias, "");
+
+    let advancedSection;
+    if (joinRule === JoinRule.Public) {
+        if (showAdvancedSection) {
+            advancedSection = <>
+                <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
+                    { _t("Hide advanced") }
+                </AccessibleButton>
+
+                <LabelledToggleSwitch
+                    value={guestAccessEnabled}
+                    onChange={setGuestAccessEnabled}
+                    disabled={!canSetGuestAccess}
+                    label={_t("Enable guest access")}
+                />
+                <p>
+                    { _t("Guests can join a space without having an account.") }
+                    <br />
+                    { _t("This may be useful for public spaces.") }
+                </p>
+            </>;
+        } else {
+            advancedSection = <>
+                <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
+                    { _t("Show advanced") }
+                </AccessibleButton>
+            </>;
+        }
+    }
+
+    let addressesSection;
+    if (space.getJoinRule() === JoinRule.Public) {
+        addressesSection = <>
+            <span className="mx_SettingsTab_subheading">{ _t("Address") }</span>
+            <div className="mx_SettingsTab_section mx_SettingsTab_subsectionText">
+                <AliasSettings
+                    roomId={space.roomId}
+                    canSetCanonicalAlias={canSetCanonical}
+                    canSetAliases={true}
+                    canonicalAliasEvent={canonicalAliasEv}
+                    hidePublishSetting={true}
+                />
+            </div>
+        </>;
+    }
+
+    return <div className="mx_SettingsTab">
+        <div className="mx_SettingsTab_heading">{ _t("Visibility") }</div>
+
+        { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+
+        <div className="mx_SettingsTab_section">
+            <div className="mx_SettingsTab_section_caption">
+                { _t("Decide who can view and join %(spaceName)s.", { spaceName: space.name }) }
+            </div>
+
+            <div>
+                <JoinRuleSettings
+                    room={space}
+                    onError={() => setError(_t("Failed to update the visibility of this space"))}
+                    closeSettingsFn={closeSettingsFn}
+                />
+            </div>
+
+            { advancedSection }
+
+            <LabelledToggleSwitch
+                value={historyVisibility === HistoryVisibility.WorldReadable}
+                onChange={(checked: boolean) => {
+                    setHistoryVisibility(checked ? HistoryVisibility.WorldReadable : HistoryVisibility.Shared);
+                }}
+                disabled={!canSetHistoryVisibility}
+                label={_t("Preview Space")}
+            />
+            <div>{ _t("Allow people to preview your space before they join.") }</div>
+            <b>{ _t("Recommended for public spaces.") }</b>
+        </div>
+
+        { addressesSection }
+    </div>;
+};
+
+export default SpaceSettingsVisibilityTab;
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index f34baf256b..df6c4c8149 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -14,58 +14,155 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, {
+    createRef,
+    MouseEvent,
+    InputHTMLAttributes,
+    LegacyRef,
+    ComponentProps,
+    ComponentType,
+} from "react";
 import classNames from "classnames";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import RoomAvatar from "../avatars/RoomAvatar";
 import SpaceStore from "../../../stores/SpaceStore";
 import SpaceTreeLevelLayoutStore from "../../../stores/SpaceTreeLevelLayoutStore";
 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,
-    showAddExistingRooms,
-    showCreateNewRoom,
-    showSpaceInvite,
-    showSpaceSettings,
-} from "../../../utils/space";
+import { _t } from "../../../languageHandler";
+import { ContextMenuTooltipButton } from "../../../accessibility/context_menu/ContextMenuTooltipButton";
+import { toRightOf, useContextMenu } from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import AccessibleButton, {ButtonEvent} from "../elements/AccessibleButton";
-import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {Action} from "../../../dispatcher/actions";
-import RoomViewStore from "../../../stores/RoomViewStore";
-import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
-import {EventType} from "matrix-js-sdk/src/@types/event";
-import {StaticNotificationState} from "../../../stores/notifications/StaticNotificationState";
-import {NotificationColor} from "../../../stores/notifications/NotificationColor";
+import AccessibleButton from "../elements/AccessibleButton";
+import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
+import { NotificationColor } from "../../../stores/notifications/NotificationColor";
+import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager";
+import { NotificationState } from "../../../stores/notifications/NotificationState";
+import SpaceContextMenu from "../context_menus/SpaceContextMenu";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import { DraggableProvidedDragHandleProps } from "react-beautiful-dnd";
+import { useRovingTabIndex } from "../../../accessibility/RovingTabIndex";
 
-interface IItemProps {
+interface IButtonProps extends Omit<ComponentProps<typeof AccessibleTooltipButton>, "title"> {
+    space?: Room;
+    className?: string;
+    selected?: boolean;
+    label: string;
+    contextMenuTooltip?: string;
+    notificationState?: NotificationState;
+    isNarrow?: boolean;
+    avatarSize?: number;
+    ContextMenuComponent?: ComponentType<ComponentProps<typeof SpaceContextMenu>>;
+    onClick(ev: MouseEvent): void;
+}
+
+export const SpaceButton: React.FC<IButtonProps> = ({
+    space,
+    className,
+    selected,
+    onClick,
+    label,
+    contextMenuTooltip,
+    notificationState,
+    avatarSize,
+    isNarrow,
+    children,
+    ContextMenuComponent,
+    ...props
+}) => {
+    const [menuDisplayed, ref, openMenu, closeMenu] = useContextMenu<HTMLElement>();
+    const [onFocus, isActive, handle] = useRovingTabIndex(ref);
+    const tabIndex = isActive ? 0 : -1;
+
+    let avatar = <div className="mx_SpaceButton_avatarPlaceholder"><div className="mx_SpaceButton_icon" /></div>;
+    if (space) {
+        avatar = <RoomAvatar width={avatarSize} height={avatarSize} room={space} />;
+    }
+
+    let notifBadge;
+    if (notificationState) {
+        let ariaLabel = _t("Jump to first unread room.");
+        if (space?.getMyMembership() === "invite") {
+            ariaLabel = _t("Jump to first invite.");
+        }
+
+        notifBadge = <div className="mx_SpacePanel_badgeContainer">
+            <NotificationBadge
+                onClick={() => SpaceStore.instance.setActiveRoomInSpace(space || null)}
+                forceCount={false}
+                notification={notificationState}
+                aria-label={ariaLabel}
+                tabIndex={tabIndex}
+                showUnsentTooltip={true}
+            />
+        </div>;
+    }
+
+    let contextMenu: JSX.Element;
+    if (menuDisplayed && ContextMenuComponent) {
+        contextMenu = <ContextMenuComponent
+            {...toRightOf(handle.current?.getBoundingClientRect(), 0)}
+            space={space}
+            onFinished={closeMenu}
+        />;
+    }
+
+    return (
+        <AccessibleTooltipButton
+            {...props}
+            className={classNames("mx_SpaceButton", className, {
+                mx_SpaceButton_active: selected,
+                mx_SpaceButton_hasMenuOpen: menuDisplayed,
+                mx_SpaceButton_narrow: isNarrow,
+            })}
+            title={label}
+            onClick={onClick}
+            onContextMenu={openMenu}
+            forceHide={!isNarrow || menuDisplayed}
+            inputRef={handle}
+            tabIndex={tabIndex}
+            onFocus={onFocus}
+        >
+            { children }
+            <div className="mx_SpaceButton_selectionWrapper">
+                { avatar }
+                { !isNarrow && <span className="mx_SpaceButton_name">{ label }</span> }
+                { notifBadge }
+
+                { ContextMenuComponent && <ContextMenuTooltipButton
+                    className="mx_SpaceButton_menuButton"
+                    onClick={openMenu}
+                    title={contextMenuTooltip}
+                    isExpanded={menuDisplayed}
+                /> }
+
+                { contextMenu }
+            </div>
+        </AccessibleTooltipButton>
+    );
+};
+
+interface IItemProps extends InputHTMLAttributes<HTMLLIElement> {
     space?: Room;
     activeSpaces: Room[];
     isNested?: boolean;
     isPanelCollapsed?: boolean;
     onExpand?: Function;
     parents?: Set<string>;
+    innerRef?: LegacyRef<HTMLLIElement>;
+    dragHandleProps?: DraggableProvidedDragHandleProps;
 }
 
 interface IItemState {
     collapsed: boolean;
-    contextMenuPosition: Pick<DOMRect, "right" | "top" | "height">;
+    childSpaces: Room[];
 }
 
 export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
     static contextType = MatrixClientContext;
 
+    private buttonRef = createRef<HTMLDivElement>();
+
     constructor(props) {
         super(props);
 
@@ -77,39 +174,84 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
 
         this.state = {
             collapsed: collapsed,
-            contextMenuPosition: null,
+            childSpaces: this.childSpaces,
         };
+
+        SpaceStore.instance.on(this.props.space.roomId, this.onSpaceUpdate);
     }
 
-    private toggleCollapse(evt) {
-        if (this.props.onExpand && this.state.collapsed) {
+    componentWillUnmount() {
+        SpaceStore.instance.off(this.props.space.roomId, this.onSpaceUpdate);
+    }
+
+    private onSpaceUpdate = () => {
+        this.setState({
+            childSpaces: this.childSpaces,
+        });
+    };
+
+    private get childSpaces() {
+        return SpaceStore.instance.getChildSpaces(this.props.space.roomId)
+            .filter(s => !this.props.parents?.has(s.roomId));
+    }
+
+    private get isCollapsed() {
+        return this.state.collapsed || this.props.isPanelCollapsed;
+    }
+
+    private toggleCollapse = evt => {
+        if (this.props.onExpand && this.isCollapsed) {
             this.props.onExpand();
         }
-        const newCollapsedState = !this.state.collapsed;
+        const newCollapsedState = !this.isCollapsed;
 
         SpaceTreeLevelLayoutStore.instance.setSpaceCollapsedState(
             this.props.space.roomId,
             this.props.parents,
             newCollapsedState,
         );
-        this.setState({collapsed: newCollapsedState});
+        this.setState({ collapsed: newCollapsedState });
         // don't bubble up so encapsulating button for space
         // doesn't get triggered
         evt.stopPropagation();
-    }
+    };
 
-    private onContextMenu = (ev: React.MouseEvent) => {
-        if (this.props.space.getMyMembership() !== "join") return;
-        ev.preventDefault();
-        ev.stopPropagation();
-        this.setState({
-            contextMenuPosition: {
-                right: ev.clientX,
-                top: ev.clientY,
-                height: 0,
-            },
-        });
-    }
+    private onKeyDown = (ev: React.KeyboardEvent) => {
+        let handled = true;
+        const action = getKeyBindingsManager().getRoomListAction(ev);
+        const hasChildren = this.state.childSpaces?.length;
+        switch (action) {
+            case RoomListAction.CollapseSection:
+                if (hasChildren && !this.isCollapsed) {
+                    this.toggleCollapse(ev);
+                } else {
+                    const parentItem = this.buttonRef?.current?.parentElement?.parentElement;
+                    const parentButton = parentItem?.previousElementSibling as HTMLElement;
+                    parentButton?.focus();
+                }
+                break;
+
+            case RoomListAction.ExpandSection:
+                if (hasChildren) {
+                    if (this.isCollapsed) {
+                        this.toggleCollapse(ev);
+                    } else {
+                        const childLevel = this.buttonRef?.current?.nextElementSibling;
+                        const firstSpaceItemChild = childLevel?.querySelector<HTMLLIElement>(".mx_SpaceItem");
+                        firstSpaceItemChild?.querySelector<HTMLDivElement>(".mx_SpaceButton")?.focus();
+                    }
+                }
+                break;
+
+            default:
+                handled = false;
+        }
+
+        if (handled) {
+            ev.stopPropagation();
+            ev.preventDefault();
+        }
+    };
 
     private onClick = (ev: React.MouseEvent) => {
         ev.preventDefault();
@@ -117,282 +259,74 @@ 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 onInviteClick = (ev: ButtonEvent) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        showSpaceInvite(this.props.space);
-        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 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();
-
-        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();
-
-        defaultDispatcher.dispatch({
-            action: "view_room",
-            room_id: this.props.space.roomId,
-        });
-        this.setState({contextMenuPosition: null}); // also close the menu
-    };
-
-    private renderContextMenu(): React.ReactElement {
-        if (this.props.space.getMyMembership() !== "join") return null;
-
-        let contextMenu = null;
-        if (this.state.contextMenuPosition) {
-            const userId = this.context.getUserId();
-
-            let inviteOption;
-            if (this.props.space.getJoinRule() === "public" || 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>;
-            }
-
-            const canAddRooms = this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
-
-            let newRoomSection;
-            if (this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
-                newRoomSection = <IconizedContextMenuOptionList first>
-                    <IconizedContextMenuOption
-                        iconClassName="mx_SpacePanel_iconPlus"
-                        label={_t("Create new room")}
-                        onClick={this.onNewRoomClick}
-                    />
-                    <IconizedContextMenuOption
-                        iconClassName="mx_SpacePanel_iconHash"
-                        label={_t("Add existing room")}
-                        onClick={this.onAddExistingRoomClick}
-                    />
-                </IconizedContextMenuOptionList>;
-            }
-
-            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_iconMembers"
-                        label={_t("Members")}
-                        onClick={this.onMembersClick}
-                    />
-                    { settingsOption }
-                    <IconizedContextMenuOption
-                        iconClassName="mx_SpacePanel_iconExplore"
-                        label={canAddRooms ? _t("Manage & explore rooms") : _t("Explore rooms")}
-                        onClick={this.onExploreRoomsClick}
-                    />
-                </IconizedContextMenuOptionList>
-                { newRoomSection }
-                { 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;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { space, activeSpaces, isNested, isPanelCollapsed, onExpand, parents, innerRef, dragHandleProps,
+            ...otherProps } = this.props;
 
-        const forceCollapsed = this.props.isPanelCollapsed;
-        const isNarrow = this.props.isPanelCollapsed;
-        const collapsed = this.state.collapsed || forceCollapsed;
+        const collapsed = this.isCollapsed;
 
-        const childSpaces = SpaceStore.instance.getChildSpaces(space.roomId)
-            .filter(s => !this.props.parents?.has(s.roomId));
-        const isActive = activeSpaces.includes(space);
-        const itemClasses = classNames({
+        const itemClasses = classNames(this.props.className, {
             "mx_SpaceItem": true,
-            "mx_SpaceItem_narrow": isNarrow,
+            "mx_SpaceItem_narrow": isPanelCollapsed,
             "collapsed": collapsed,
-            "hasSubSpaces": childSpaces && childSpaces.length,
+            "hasSubSpaces": this.state.childSpaces?.length,
         });
 
         const isInvite = space.getMyMembership() === "invite";
-        const classes = classNames("mx_SpaceButton", {
-            mx_SpaceButton_active: isActive,
-            mx_SpaceButton_hasMenuOpen: !!this.state.contextMenuPosition,
-            mx_SpaceButton_narrow: isNarrow,
-            mx_SpaceButton_invite: isInvite,
-        });
+
         const notificationState = isInvite
             ? StaticNotificationState.forSymbol("!", NotificationColor.Red)
             : SpaceStore.instance.getNotificationState(space.roomId);
 
+        const hasChildren = this.state.childSpaces?.length;
+
         let childItems;
-        if (childSpaces && !collapsed) {
+        if (hasChildren && !collapsed) {
             childItems = <SpaceTreeLevel
-                spaces={childSpaces}
+                spaces={this.state.childSpaces}
                 activeSpaces={activeSpaces}
                 isNested={true}
-                parents={new Set(this.props.parents).add(this.props.space.roomId)}
+                parents={new Set(parents).add(space.roomId)}
             />;
         }
 
-        let notifBadge;
-        if (notificationState) {
-            notifBadge = <div className="mx_SpacePanel_badgeContainer">
-                <NotificationBadge forceCount={false} notification={notificationState} />
-            </div>;
-        }
-
-        const avatarSize = isNested ? 24 : 32;
-
-        const toggleCollapseButton = childSpaces && childSpaces.length ?
+        const toggleCollapseButton = hasChildren ?
             <AccessibleButton
                 className="mx_SpaceButton_toggleCollapse"
-                onClick={evt => this.toggleCollapse(evt)}
+                onClick={this.toggleCollapse}
+                tabIndex={-1}
+                aria-label={collapsed ? _t("Expand") : _t("Collapse")}
             /> : null;
 
-        let button;
-        if (isNarrow) {
-            button = (
-                <RovingAccessibleTooltipButton
-                    className={classes}
-                    title={space.name}
-                    onClick={this.onClick}
-                    onContextMenu={this.onContextMenu}
-                    forceHide={!!this.state.contextMenuPosition}
-                    role="treeitem"
-                >
-                    { toggleCollapseButton }
-                    <div className="mx_SpaceButton_selectionWrapper">
-                        <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
-                        { notifBadge }
-                        { this.renderContextMenu() }
-                    </div>
-                </RovingAccessibleTooltipButton>
-            );
-        } else {
-            button = (
-                <RovingAccessibleButton
-                    className={classes}
-                    onClick={this.onClick}
-                    onContextMenu={this.onContextMenu}
-                    role="treeitem"
-                >
-                    { toggleCollapseButton }
-                    <div className="mx_SpaceButton_selectionWrapper">
-                        <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
-                        <span className="mx_SpaceButton_name">{ space.name }</span>
-                        { notifBadge }
-                        { this.renderContextMenu() }
-                    </div>
-                </RovingAccessibleButton>
-            );
-        }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { tabIndex, ...restDragHandleProps } = dragHandleProps || {};
 
         return (
-            <li className={itemClasses}>
-                { button }
+            <li
+                {...otherProps}
+                className={itemClasses}
+                ref={innerRef}
+                aria-expanded={hasChildren ? !collapsed : undefined}
+                role="treeitem"
+            >
+                <SpaceButton
+                    {...restDragHandleProps}
+                    space={space}
+                    className={isInvite ? "mx_SpaceButton_invite" : undefined}
+                    selected={activeSpaces.includes(space)}
+                    label={space.name}
+                    contextMenuTooltip={_t("Space options")}
+                    notificationState={notificationState}
+                    isNarrow={isPanelCollapsed}
+                    avatarSize={isNested ? 24 : 32}
+                    onClick={this.onClick}
+                    onKeyDown={this.onKeyDown}
+                    ContextMenuComponent={this.props.space.getMyMembership() === "join" ? SpaceContextMenu : undefined}
+                >
+                    { toggleCollapseButton }
+                </SpaceButton>
+
                 { childItems }
             </li>
         );
@@ -412,8 +346,8 @@ const SpaceTreeLevel: React.FC<ITreeLevelProps> = ({
     isNested,
     parents,
 }) => {
-    return <ul className="mx_SpaceTreeLevel">
-        {spaces.map(s => {
+    return <ul className="mx_SpaceTreeLevel" role="group">
+        { spaces.map(s => {
             return (<SpaceItem
                 key={s.roomId}
                 activeSpaces={activeSpaces}
@@ -421,8 +355,8 @@ const SpaceTreeLevel: React.FC<ITreeLevelProps> = ({
                 isNested={isNested}
                 parents={parents}
             />);
-        })}
+        }) }
     </ul>;
-}
+};
 
 export default SpaceTreeLevel;
diff --git a/src/components/views/terms/InlineTermsAgreement.js b/src/components/views/terms/InlineTermsAgreement.tsx
similarity index 69%
rename from src/components/views/terms/InlineTermsAgreement.js
rename to src/components/views/terms/InlineTermsAgreement.tsx
index 473a97642c..80ccf49ee9 100644
--- a/src/components/views/terms/InlineTermsAgreement.js
+++ b/src/components/views/terms/InlineTermsAgreement.tsx
@@ -15,39 +15,48 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
-import {_t, pickBestLanguage} from "../../../languageHandler";
+import { _t, pickBestLanguage } from "../../../languageHandler";
 import * as sdk from "../../..";
-import {objectClone} from "../../../utils/objects";
+import { objectClone } from "../../../utils/objects";
 import StyledCheckbox from "../elements/StyledCheckbox";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    policiesAndServicePairs: any[];
+    onFinished: (string) => void;
+    agreedUrls: string[]; // array of URLs the user has accepted
+    introElement: React.ReactNode;
+}
+
+interface IState {
+    policies: Policy[];
+    busy: boolean;
+}
+
+interface Policy {
+    checked: boolean;
+    url: string;
+    name: string;
+}
 
 @replaceableComponent("views.terms.InlineTermsAgreement")
-export default class InlineTermsAgreement extends React.Component {
-    static propTypes = {
-        policiesAndServicePairs: PropTypes.array.isRequired, // array of service/policy pairs
-        agreedUrls: PropTypes.array.isRequired, // array of URLs the user has accepted
-        onFinished: PropTypes.func.isRequired, // takes an argument of accepted URLs
-        introElement: PropTypes.node,
-    };
-
-    constructor() {
-        super();
-
+export default class InlineTermsAgreement extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
         this.state = {
             policies: [],
             busy: false,
         };
     }
 
-    componentDidMount() {
+    public componentDidMount(): void {
         // Build all the terms the user needs to accept
         const policies = []; // { checked, url, name }
         for (const servicePolicies of this.props.policiesAndServicePairs) {
             const availablePolicies = Object.values(servicePolicies.policies);
             for (const policy of availablePolicies) {
                 const language = pickBestLanguage(Object.keys(policy).filter(p => p !== 'version'));
-                const renderablePolicy = {
+                const renderablePolicy: Policy = {
                     checked: false,
                     url: policy[language].url,
                     name: policy[language].name,
@@ -56,24 +65,24 @@ export default class InlineTermsAgreement extends React.Component {
             }
         }
 
-        this.setState({policies});
+        this.setState({ policies });
     }
 
-    _togglePolicy = (index) => {
+    private togglePolicy = (index: number): void => {
         const policies = objectClone(this.state.policies);
         policies[index].checked = !policies[index].checked;
-        this.setState({policies});
+        this.setState({ policies });
     };
 
-    _onContinue = () => {
+    private onContinue = (): void => {
         const hasUnchecked = !!this.state.policies.some(p => !p.checked);
         if (hasUnchecked) return;
 
-        this.setState({busy: true});
+        this.setState({ busy: true });
         this.props.onFinished(this.state.policies.map(p => p.url));
     };
 
-    _renderCheckboxes() {
+    private renderCheckboxes(): React.ReactNode[] {
         const rendered = [];
         for (let i = 0; i < this.state.policies.length; i++) {
             const policy = this.state.policies[i];
@@ -82,7 +91,7 @@ export default class InlineTermsAgreement extends React.Component {
                     policyLink: () => {
                         return (
                             <a href={policy.url} rel='noreferrer noopener' target='_blank'>
-                                {policy.name}
+                                { policy.name }
                                 <span className='mx_InlineTermsAgreement_link' />
                             </a>
                         );
@@ -91,10 +100,10 @@ export default class InlineTermsAgreement extends React.Component {
             );
             rendered.push(
                 <div key={i} className='mx_InlineTermsAgreement_cbContainer'>
-                    <div>{introText}</div>
+                    <div>{ introText }</div>
                     <div className='mx_InlineTermsAgreement_checkbox'>
-                        <StyledCheckbox onChange={() => this._togglePolicy(i)} checked={policy.checked}>
-                            {_t("Accept")}
+                        <StyledCheckbox onChange={() => this.togglePolicy(i)} checked={policy.checked}>
+                            { _t("Accept") }
                         </StyledCheckbox>
                     </div>
                 </div>,
@@ -103,20 +112,20 @@ export default class InlineTermsAgreement extends React.Component {
         return rendered;
     }
 
-    render() {
+    public render(): React.ReactNode {
         const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
         const hasUnchecked = !!this.state.policies.some(p => !p.checked);
 
         return (
             <div>
-                {this.props.introElement}
-                {this._renderCheckboxes()}
+                { this.props.introElement }
+                { this.renderCheckboxes() }
                 <AccessibleButton
-                    onClick={this._onContinue}
+                    onClick={this.onContinue}
                     disabled={hasUnchecked || this.state.busy}
                     kind="primary_sm"
                 >
-                    {_t("Continue")}
+                    { _t("Continue") }
                 </AccessibleButton>
             </div>
         );
diff --git a/src/components/views/toasts/GenericExpiringToast.tsx b/src/components/views/toasts/GenericExpiringToast.tsx
index e63edd8e79..b8a720454e 100644
--- a/src/components/views/toasts/GenericExpiringToast.tsx
+++ b/src/components/views/toasts/GenericExpiringToast.tsx
@@ -18,7 +18,7 @@ import React from "react";
 
 import ToastStore from "../../../stores/ToastStore";
 import GenericToast, { IProps as IGenericToastProps } from "./GenericToast";
-import {useExpiringCounter} from "../../../hooks/useTimeout";
+import { useExpiringCounter } from "../../../hooks/useTimeout";
 
 interface IProps extends IGenericToastProps {
     toastKey: string;
diff --git a/src/components/views/toasts/GenericToast.tsx b/src/components/views/toasts/GenericToast.tsx
index 209babbf9d..4738e38c0d 100644
--- a/src/components/views/toasts/GenericToast.tsx
+++ b/src/components/views/toasts/GenericToast.tsx
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactNode} from "react";
+import React, { ReactNode } from "react";
+import AccessibleButton from "../elements/AccessibleButton";
 
-import FormButton from "../elements/FormButton";
-import {XOR} from "../../../@types/common";
+import { XOR } from "../../../@types/common";
 
 export interface IProps {
     description: ReactNode;
@@ -41,17 +41,21 @@ const GenericToast: React.FC<XOR<IPropsExtended, IProps>> = ({
     onReject,
 }) => {
     const detailContent = detail ? <div className="mx_Toast_detail">
-        {detail}
+        { detail }
     </div> : null;
 
     return <div>
         <div className="mx_Toast_description">
-            {description}
-            {detailContent}
+            { description }
+            { detailContent }
         </div>
         <div className="mx_Toast_buttons" aria-live="off">
-            {onReject && rejectLabel && <FormButton label={rejectLabel} kind="danger" onClick={onReject} /> }
-            <FormButton label={acceptLabel} onClick={onAccept} />
+            { onReject && rejectLabel && <AccessibleButton kind="danger_outline" onClick={onReject}>
+                { rejectLabel }
+            </AccessibleButton> }
+            <AccessibleButton onClick={onAccept} kind="primary">
+                { acceptLabel }
+            </AccessibleButton>
         </div>
     </div>;
 };
diff --git a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
index abf5b10692..9d69922678 100644
--- a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
+++ b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
@@ -19,7 +19,7 @@ import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import ServerOfflineDialog from "../dialogs/ServerOfflineDialog";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.toasts.NonUrgentEchoFailureToast")
 export default class NonUrgentEchoFailureToast extends React.PureComponent {
@@ -31,12 +31,12 @@ export default class NonUrgentEchoFailureToast extends React.PureComponent {
         return (
             <div className="mx_NonUrgentEchoFailureToast">
                 <span className="mx_NonUrgentEchoFailureToast_icon" />
-                {_t("Your server isn't responding to some <a>requests</a>.", {}, {
+                { _t("Your server isn't responding to some <a>requests</a>.", {}, {
                     'a': (sub) => (
-                        <AccessibleButton kind="link" onClick={this.openDialog}>{sub}</AccessibleButton>
+                        <AccessibleButton kind="link" onClick={this.openDialog}>{ sub }</AccessibleButton>
                     ),
-                })}
+                }) }
             </div>
-        )
+        );
     }
 }
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 56be23aa7e..63e23bfdef 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -16,20 +16,20 @@ limitations under the License.
 
 import React from "react";
 
-import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
-import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload"
-import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { userLabelForEventRoom } from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher/dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
 import GenericToast from "./GenericToast";
-import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import {DeviceInfo} from "matrix-js-sdk/src/crypto/deviceinfo";
-import {Action} from "../../../dispatcher/actions";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+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";
+import VerificationRequestDialog from "../dialogs/VerificationRequestDialog";
 
 interface IProps {
     toastKey: string;
@@ -44,31 +44,30 @@ interface IState {
 
 @replaceableComponent("views.toasts.VerificationRequestToast")
 export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
-    private intervalHandle: NodeJS.Timeout;
+    private intervalHandle: number;
 
     constructor(props) {
         super(props);
-        this.state = {counter: Math.ceil(props.request.timeout / 1000)};
+        this.state = { counter: Math.ceil(props.request.timeout / 1000) };
     }
 
     async componentDidMount() {
-        const {request} = this.props;
+        const { request } = this.props;
         if (request.timeout && request.timeout > 0) {
             this.intervalHandle = setInterval(() => {
-                let {counter} = this.state;
+                let { counter } = this.state;
                 counter = Math.max(0, counter - 1);
-                this.setState({counter});
+                this.setState({ counter });
             }, 1000);
         }
-        request.on("change", this._checkRequestIsPending);
+        request.on("change", this.checkRequestIsPending);
         // We should probably have a separate class managing the active verification toasts,
         // rather than monitoring this in the toast component itself, since we'll get problems
         // like the toasdt not going away when the verification is cancelled unless it's the
         // one on the top (ie. the one that's mounted).
         // As a quick & dirty fix, check the toast is still relevant when it mounts (this prevents
         // a toast hanging around after logging in if you did a verification as part of login).
-        this._checkRequestIsPending();
-
+        this.checkRequestIsPending();
 
         if (request.isSelfVerification) {
             const cli = MatrixClientPeg.get();
@@ -83,12 +82,12 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
 
     componentWillUnmount() {
         clearInterval(this.intervalHandle);
-        const {request} = this.props;
-        request.off("change", this._checkRequestIsPending);
+        const { request } = this.props;
+        request.off("change", this.checkRequestIsPending);
     }
 
-    _checkRequestIsPending = () => {
-        const {request} = this.props;
+    private checkRequestIsPending = () => {
+        const { request } = this.props;
         if (!request.canAccept) {
             ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         }
@@ -105,7 +104,7 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
 
     accept = async () => {
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
-        const {request} = this.props;
+        const { request } = this.props;
         // no room id for to_device requests
         const cli = MatrixClientPeg.get();
         try {
@@ -124,7 +123,6 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
                     },
                 });
             } else {
-                const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
                 Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
                     verificationRequest: request,
                     onFinished: () => {
@@ -139,7 +137,7 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
     };
 
     render() {
-        const {request} = this.props;
+        const { request } = this.props;
         let description;
         let detail;
         if (request.isSelfVerification) {
@@ -159,13 +157,13 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
                 const client = MatrixClientPeg.get();
                 const user = client.getUser(userId);
                 if (user && user.displayName) {
-                    description = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
+                    description = _t("%(name)s (%(userId)s)", { name: user.displayName, userId });
                 }
             }
         }
         const declineLabel = this.state.counter === 0 ?
             _t("Decline") :
-            _t("Decline (%(counter)s)", {counter: this.state.counter});
+            _t("Decline (%(counter)s)", { counter: this.state.counter });
 
         return <GenericToast
             description={description}
diff --git a/src/components/views/verification/VerificationCancelled.js b/src/components/views/verification/VerificationCancelled.tsx
similarity index 82%
rename from src/components/views/verification/VerificationCancelled.js
rename to src/components/views/verification/VerificationCancelled.tsx
index c57094d9b5..c8c068f5eb 100644
--- a/src/components/views/verification/VerificationCancelled.js
+++ b/src/components/views/verification/VerificationCancelled.tsx
@@ -15,23 +15,22 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    onDone: () => void;
+}
 
 @replaceableComponent("views.verification.VerificationCancelled")
-export default class VerificationCancelled extends React.Component {
-    static propTypes = {
-        onDone: PropTypes.func.isRequired,
-    }
-
-    render() {
+export default class VerificationCancelled extends React.Component<IProps> {
+    public render(): React.ReactNode {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            <p>{_t(
+            <p>{ _t(
                 "The other party cancelled the verification.",
-            )}</p>
+            ) }</p>
             <DialogButtons
                 primaryButton={_t('OK')}
                 hasCancel={false}
diff --git a/src/components/views/verification/VerificationComplete.js b/src/components/views/verification/VerificationComplete.tsx
similarity index 78%
rename from src/components/views/verification/VerificationComplete.js
rename to src/components/views/verification/VerificationComplete.tsx
index cf2a72591c..99cbab8d73 100644
--- a/src/components/views/verification/VerificationComplete.js
+++ b/src/components/views/verification/VerificationComplete.tsx
@@ -15,26 +15,25 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    onDone: () => void;
+}
 
 @replaceableComponent("views.verification.VerificationComplete")
-export default class VerificationComplete extends React.Component {
-    static propTypes = {
-        onDone: PropTypes.func.isRequired,
-    }
-
-    render() {
+export default class VerificationComplete extends React.Component<IProps> {
+    public render(): React.ReactNode {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            <h2>{_t("Verified!")}</h2>
-            <p>{_t("You've successfully verified this user.")}</p>
-            <p>{_t(
+            <h2>{ _t("Verified!") }</h2>
+            <p>{ _t("You've successfully verified this user.") }</p>
+            <p>{ _t(
                 "Secure messages with this user are end-to-end encrypted and not able to be " +
                 "read by third parties.",
-            )}</p>
+            ) }</p>
             <DialogButtons onPrimaryButtonClick={this.props.onDone}
                 primaryButton={_t("Got It")}
                 hasCancel={false}
diff --git a/src/components/views/verification/VerificationQREmojiOptions.js b/src/components/views/verification/VerificationQREmojiOptions.js
deleted file mode 100644
index 89b3a596d7..0000000000
--- a/src/components/views/verification/VerificationQREmojiOptions.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import AccessibleButton from "../elements/AccessibleButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import VerificationQRCode from "../elements/crypto/VerificationQRCode";
-import Spinner from "../elements/Spinner";
-import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
-
-@replaceableComponent("views.verification.VerificationQREmojiOptions")
-export default class VerificationQREmojiOptions extends React.Component {
-    static propTypes = {
-        request: PropTypes.object.isRequired,
-        onCancel: PropTypes.func.isRequired,
-        onStartEmoji: PropTypes.func.isRequired,
-    };
-
-    render() {
-        const {request} = this.props;
-        const showQR = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
-
-        let qrCode;
-        if (showQR) {
-            qrCode = <VerificationQRCode qrCodeData={request.qrCodeData} />;
-        } else {
-            qrCode = <div className='mx_VerificationQREmojiOptions_noQR'><Spinner /></div>;
-        }
-
-        return (
-            <div>
-                {_t("Verify this session by completing one of the following:")}
-                <div className='mx_IncomingSasDialog_startOptions'>
-                    <div className='mx_IncomingSasDialog_startOption'>
-                        <p>{_t("Scan this unique code")}</p>
-                        {qrCode}
-                    </div>
-                    <div className='mx_IncomingSasDialog_betweenText'>{_t("or")}</div>
-                    <div className='mx_IncomingSasDialog_startOption'>
-                        <p>{_t("Compare unique emoji")}</p>
-                        <span className='mx_IncomingSasDialog_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
-                        <AccessibleButton onClick={this.props.onStartEmoji} kind='primary'>
-                            {_t("Start")}
-                        </AccessibleButton>
-                    </div>
-                </div>
-                <AccessibleButton onClick={this.props.onCancel} kind='danger'>
-                    {_t("Cancel")}
-                </AccessibleButton>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.tsx
similarity index 82%
rename from src/components/views/verification/VerificationShowSas.js
rename to src/components/views/verification/VerificationShowSas.tsx
index 36f99b2140..2b9ea5da96 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.tsx
@@ -15,32 +15,38 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { IGeneratedSas } from "matrix-js-sdk/src/crypto/verification/SAS";
+import { DeviceInfo } from "matrix-js-sdk/src//crypto/deviceinfo";
 import { _t, _td } from '../../../languageHandler';
-import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
+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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    pending?: boolean;
+    displayName?: string; // required if pending is true
+    device?: DeviceInfo;
+    onDone: () => void;
+    onCancel: () => void;
+    sas: IGeneratedSas;
+    isSelf?: boolean;
+    inDialog?: boolean; // whether this component is being shown in a dialog and to use DialogButtons
+}
+
+interface IState {
+    pending: boolean;
+    cancelling?: boolean;
+}
 
 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,
-        displayName: PropTypes.string, // required if pending is true
-        device: PropTypes.object,
-        onDone: PropTypes.func.isRequired,
-        onCancel: PropTypes.func.isRequired,
-        sas: PropTypes.object.isRequired,
-        isSelf: PropTypes.bool,
-        inDialog: PropTypes.bool, // whether this component is being shown in a dialog and to use DialogButtons
-    };
-
-    constructor(props) {
+export default class VerificationShowSas extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
         this.state = {
@@ -48,19 +54,19 @@ export default class VerificationShowSas extends React.Component {
         };
     }
 
-    componentWillMount() {
+    public componentWillMount(): void {
         // As this component is also used before login (during complete security),
         // also make sure we have a working emoji font to display the SAS emojis here.
         // This is also done from LoggedInView.
         fixupColorFonts();
     }
 
-    onMatchClick = () => {
+    private onMatchClick = (): void => {
         this.setState({ pending: true });
         this.props.onDone();
     };
 
-    onDontMatchClick = () => {
+    private onDontMatchClick = (): void => {
         this.setState({ cancelling: true });
         this.props.onCancel();
     };
@@ -75,14 +81,14 @@ export default class VerificationShowSas extends React.Component {
                         { emoji[0] }
                     </div>
                     <div className="mx_VerificationShowSas_emojiSas_label">
-                        {_t(capFirst(emoji[1]))}
+                        { _t(capFirst(emoji[1])) }
                     </div>
                 </div>,
             );
             sasDisplay = <div className="mx_VerificationShowSas_emojiSas">
-                {emojiBlocks.slice(0, 4)}
+                { emojiBlocks.slice(0, 4) }
                 <div className="mx_VerificationShowSas_emojiSas_break" />
-                {emojiBlocks.slice(4)}
+                { emojiBlocks.slice(4) }
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
@@ -93,10 +99,10 @@ export default class VerificationShowSas extends React.Component {
                 );
         } else if (this.props.sas.decimal) {
             const numberBlocks = this.props.sas.decimal.map((num, i) => <span key={i}>
-                {num}
+                { num }
             </span>);
             sasDisplay = <div className="mx_VerificationShowSas_decimalSas">
-                {numberBlocks}
+                { numberBlocks }
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
@@ -107,9 +113,9 @@ export default class VerificationShowSas extends React.Component {
                 );
         } else {
             return <div>
-                {_t("Unable to find a supported verification method.")}
+                { _t("Unable to find a supported verification method.") }
                 <AccessibleButton kind="primary" onClick={this.props.onCancel} className="mx_UserInfo_wideButton">
-                    {_t('Cancel')}
+                    { _t('Cancel') }
                 </AccessibleButton>
             </div>;
         }
@@ -130,8 +136,8 @@ export default class VerificationShowSas extends React.Component {
                         text = _t("Waiting for your other session to verify…");
                     }
                 } else {
-                    const {displayName} = this.props;
-                    text = _t("Waiting for %(displayName)s to verify…", {displayName});
+                    const { displayName } = this.props;
+                    text = _t("Waiting for %(displayName)s to verify…", { displayName });
                 }
             } else {
                 text = _t("Cancelling…");
@@ -159,12 +165,12 @@ export default class VerificationShowSas extends React.Component {
         }
 
         return <div className="mx_VerificationShowSas">
-            <p>{sasCaption}</p>
-            {sasDisplay}
-            <p>{this.props.isSelf ?
+            <p>{ sasCaption }</p>
+            { sasDisplay }
+            <p>{ this.props.isSelf ?
                 "":
-                _t("To be secure, do this in person or use a trusted way to communicate.")}</p>
-            {confirm}
+                _t("To be secure, do this in person or use a trusted way to communicate.") }</p>
+            { confirm }
         </div>;
     }
 }
diff --git a/src/components/views/voice_messages/LiveRecordingWaveform.tsx b/src/components/views/voice_messages/LiveRecordingWaveform.tsx
deleted file mode 100644
index aab89f6ab1..0000000000
--- a/src/components/views/voice_messages/LiveRecordingWaveform.tsx
+++ /dev/null
@@ -1,60 +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.
-*/
-
-import React from "react";
-import {IRecordingUpdate, RECORDING_PLAYBACK_SAMPLES, VoiceRecording} from "../../../voice/VoiceRecording";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import {arrayFastResample, arraySeed} from "../../../utils/arrays";
-import {percentageOf} from "../../../utils/numbers";
-import Waveform from "./Waveform";
-
-interface IProps {
-    recorder: VoiceRecording;
-}
-
-interface IState {
-    heights: number[];
-}
-
-/**
- * A waveform which shows the waveform of a live recording
- */
-@replaceableComponent("views.voice_messages.LiveRecordingWaveform")
-export default class LiveRecordingWaveform extends React.PureComponent<IProps, IState> {
-    public constructor(props) {
-        super(props);
-
-        this.state = {heights: arraySeed(0, RECORDING_PLAYBACK_SAMPLES)};
-        this.props.recorder.liveData.onUpdate(this.onRecordingUpdate);
-    }
-
-    private onRecordingUpdate = (update: IRecordingUpdate) => {
-        // The waveform and the downsample target are pretty close, so we should be fine to
-        // do this, despite the docs on arrayFastResample.
-        const bars = arrayFastResample(Array.from(update.waveform), RECORDING_PLAYBACK_SAMPLES);
-        this.setState({
-            // The incoming data is between zero and one, but typically even screaming into a
-            // microphone won't send you over 0.6, so we artificially adjust the gain for the
-            // waveform. This results in a slightly more cinematic/animated waveform for the
-            // user.
-            heights: bars.map(b => percentageOf(b, 0, 0.50)),
-        });
-    };
-
-    public render() {
-        return <Waveform relHeights={this.state.heights} />;
-    }
-}
diff --git a/src/components/views/voip/AudioFeed.tsx b/src/components/views/voip/AudioFeed.tsx
index c78f0c0fc8..d6d1261343 100644
--- a/src/components/views/voip/AudioFeed.tsx
+++ b/src/components/views/voip/AudioFeed.tsx
@@ -14,32 +14,50 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import { CallFeed, CallFeedEvent } from 'matrix-js-sdk/src/webrtc/callFeed';
 import { logger } from 'matrix-js-sdk/src/logger';
-import CallMediaHandler from "../../../CallMediaHandler";
+import MediaDeviceHandler, { MediaDeviceHandlerEvent } from "../../../MediaDeviceHandler";
 
 interface IProps {
-    feed: CallFeed,
+    feed: CallFeed;
 }
 
-export default class AudioFeed extends React.Component<IProps> {
+interface IState {
+    audioMuted: boolean;
+}
+
+export default class AudioFeed extends React.Component<IProps, IState> {
     private element = createRef<HTMLAudioElement>();
 
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            audioMuted: this.props.feed.isAudioMuted(),
+        };
+    }
+
     componentDidMount() {
+        MediaDeviceHandler.instance.addListener(
+            MediaDeviceHandlerEvent.AudioOutputChanged,
+            this.onAudioOutputChanged,
+        );
         this.props.feed.addListener(CallFeedEvent.NewStream, this.onNewStream);
         this.playMedia();
     }
 
     componentWillUnmount() {
+        MediaDeviceHandler.instance.removeListener(
+            MediaDeviceHandlerEvent.AudioOutputChanged,
+            this.onAudioOutputChanged,
+        );
         this.props.feed.removeListener(CallFeedEvent.NewStream, this.onNewStream);
         this.stopMedia();
     }
 
-    private playMedia() {
+    private onAudioOutputChanged = (audioOutput: string) => {
         const element = this.element.current;
-        const audioOutput = CallMediaHandler.getAudioOutput();
-
         if (audioOutput) {
             try {
                 // This seems quite unreliable in Chrome, although I haven't yet managed to make a jsfiddle where
@@ -52,7 +70,12 @@ export default class AudioFeed extends React.Component<IProps> {
                 logger.warn("Couldn't set requested audio output device: using default", e);
             }
         }
+    };
 
+    private async playMedia() {
+        const element = this.element.current;
+        if (!element) return;
+        this.onAudioOutputChanged(MediaDeviceHandler.getAudioOutput());
         element.muted = false;
         element.srcObject = this.props.feed.stream;
         element.autoplay = true;
@@ -67,7 +90,7 @@ export default class AudioFeed extends React.Component<IProps> {
             // should serialise the ones that need to be serialised but then be able to interrupt
             // them with another load() which will cancel the pending one, but since we don't call
             // load() explicitly, it shouldn't be a problem. - Dave
-            element.play()
+            await element.load();
         } catch (e) {
             logger.info("Failed to play media element with feed", this.props.feed, e);
         }
@@ -75,6 +98,7 @@ export default class AudioFeed extends React.Component<IProps> {
 
     private stopMedia() {
         const element = this.element.current;
+        if (!element) return;
 
         element.pause();
         element.src = null;
@@ -86,10 +110,16 @@ export default class AudioFeed extends React.Component<IProps> {
     }
 
     private onNewStream = () => {
+        this.setState({
+            audioMuted: this.props.feed.isAudioMuted(),
+        });
         this.playMedia();
     };
 
     render() {
+        // Do not render the audio element if there is no audio track
+        if (this.state.audioMuted) return null;
+
         return (
             <audio ref={this.element} />
         );
diff --git a/src/components/views/voip/AudioFeedArrayForCall.tsx b/src/components/views/voip/AudioFeedArrayForCall.tsx
index bfe232d799..a7dd0283ff 100644
--- a/src/components/views/voip/AudioFeedArrayForCall.tsx
+++ b/src/components/views/voip/AudioFeedArrayForCall.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
-import AudioFeed from "./AudioFeed"
+import AudioFeed from "./AudioFeed";
 import { CallEvent, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
 
@@ -32,7 +32,7 @@ export default class AudioFeedArrayForCall extends React.Component<IProps, IStat
         super(props);
 
         this.state = {
-            feeds: [],
+            feeds: this.props.call.getRemoteFeeds(),
         };
     }
 
@@ -48,7 +48,7 @@ export default class AudioFeedArrayForCall extends React.Component<IProps, IStat
         this.setState({
             feeds: this.props.call.getRemoteFeeds(),
         });
-    }
+    };
 
     render() {
         return this.state.feeds.map((feed, i) => {
diff --git a/src/components/views/voip/CallContainer.tsx b/src/components/views/voip/CallContainer.tsx
index 9d0047fc54..41046b9952 100644
--- a/src/components/views/voip/CallContainer.tsx
+++ b/src/components/views/voip/CallContainer.tsx
@@ -1,5 +1,6 @@
 /*
 Copyright 2020 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.
@@ -15,9 +16,8 @@ limitations under the License.
 */
 
 import React from 'react';
-import IncomingCallBox from './IncomingCallBox';
 import CallPreview from './CallPreview';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
 
@@ -31,7 +31,6 @@ interface IState {
 export default class CallContainer extends React.PureComponent<IProps, IState> {
     public render() {
         return <div className="mx_CallContainer">
-            <IncomingCallBox />
             <CallPreview />
         </div>;
     }
diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
index 80fd64a820..266c34083e 100644
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@@ -26,7 +26,11 @@ 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";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { EventSubscription } from 'fbemitter';
+import PictureInPictureDragger from './PictureInPictureDragger';
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const SHOW_CALL_IN_STATES = [
     CallState.Connected,
@@ -76,7 +80,7 @@ function getPrimarySecondaryCalls(calls: MatrixCall[]): [MatrixCall, MatrixCall[
 
     if (secondaries.length > 1) {
         // We should never be in more than two calls so this shouldn't happen
-        console.log("Found more than 1 secondary call! Other calls will not be shown.");
+        logger.log("Found more than 1 secondary call! Other calls will not be shown.");
     }
 
     return [primary, secondaries];
@@ -88,7 +92,7 @@ function getPrimarySecondaryCalls(calls: MatrixCall[]): [MatrixCall, MatrixCall[
  */
 @replaceableComponent("views.voip.CallPreview")
 export default class CallPreview extends React.Component<IProps, IState> {
-    private roomStoreToken: any;
+    private roomStoreToken: EventSubscription;
     private dispatcherRef: string;
     private settingsWatcherRef: string;
 
@@ -125,7 +129,7 @@ export default class CallPreview extends React.Component<IProps, IState> {
         SettingsStore.unwatchSetting(this.settingsWatcherRef);
     }
 
-    private onRoomViewStoreUpdate = (payload) => {
+    private onRoomViewStoreUpdate = () => {
         if (RoomViewStore.getRoomId() === this.state.roomId) return;
 
         const roomId = RoomViewStore.getRoomId();
@@ -142,9 +146,10 @@ export default class CallPreview extends React.Component<IProps, IState> {
 
     private onAction = (payload: ActionPayload) => {
         switch (payload.action) {
-            // listen for call state changes to prod the render method, which
-            // may hide the global CallView if the call it is tracking is dead
             case 'call_state': {
+                // listen for call state changes to prod the render method, which
+                // may hide the global CallView if the call it is tracking is dead
+
                 this.updateCalls();
                 break;
             }
@@ -171,16 +176,28 @@ export default class CallPreview extends React.Component<IProps, IState> {
             primaryCall: primaryCall,
             secondaryCall: secondaryCalls[0],
         });
-    }
+    };
 
     public render() {
+        const pipMode = true;
         if (this.state.primaryCall) {
             return (
-                <CallView call={this.state.primaryCall} secondaryCall={this.state.secondaryCall} pipMode={true} />
+                <PictureInPictureDragger
+                    className="mx_CallPreview"
+                    draggable={pipMode}
+                >
+                    { ({ onStartMoving, onResize }) => <CallView
+                        onMouseDownOnHeader={onStartMoving}
+                        call={this.state.primaryCall}
+                        secondaryCall={this.state.secondaryCall}
+                        pipMode={pipMode}
+                        onResize={onResize}
+                    /> }
+                </PictureInPictureDragger>
+
             );
         }
 
         return <PersistentApp />;
     }
 }
-
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index c084dacaa8..11206602c7 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2021 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.
@@ -18,49 +19,59 @@ limitations under the License.
 import React, { createRef, CSSProperties } from 'react';
 import dis from '../../../dispatcher/dispatcher';
 import CallHandler from '../../../CallHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t, _td } from '../../../languageHandler';
 import VideoFeed from './VideoFeed';
 import RoomAvatar from "../avatars/RoomAvatar";
-import { CallState, CallType, MatrixCall, CallEvent } from 'matrix-js-sdk/src/webrtc/call';
+import { CallEvent, CallState, CallType, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import classNames from 'classnames';
 import AccessibleButton from '../elements/AccessibleButton';
-import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../../Keyboard';
-import {alwaysAboveLeftOf, alwaysAboveRightOf, ChevronFace, ContextMenuButton} from '../../structures/ContextMenu';
-import CallContextMenu from '../context_menus/CallContextMenu';
+import { isOnlyCtrlOrCmdKeyEvent, Key } from '../../../Keyboard';
 import { avatarUrlForMember } from '../../../Avatar';
-import DialpadContextMenu from '../context_menus/DialpadContextMenu';
 import { CallFeed } from 'matrix-js-sdk/src/webrtc/callFeed';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import DesktopCapturerSourcePicker from "../elements/DesktopCapturerSourcePicker";
+import Modal from '../../../Modal';
+import { SDPStreamMetadataPurpose } from 'matrix-js-sdk/src/webrtc/callEventTypes';
+import CallViewSidebar from './CallViewSidebar';
+import CallViewHeader from './CallView/CallViewHeader';
+import CallViewButtons from "./CallView/CallViewButtons";
 
 interface IProps {
-        // The call for us to display
-        call: MatrixCall,
+    // The call for us to display
+    call: MatrixCall;
 
-        // Another ongoing call to display information about
-        secondaryCall?: MatrixCall,
+    // Another ongoing call to display information about
+    secondaryCall?: MatrixCall;
 
-        // a callback which is called when the content in the CallView changes
-        // in a way that is likely to cause a resize.
-        onResize?: any;
+    // a callback which is called when the content in the CallView changes
+    // in a way that is likely to cause a resize.
+    onResize?: (event: Event) => void;
 
-        // Whether this call view is for picture-in-picture mode
-        // otherwise, it's the larger call view when viewing the room the call is in.
-        // This is sort of a proxy for a number of things but we currently have no
-        // need to control those things separately, so this is simpler.
-        pipMode?: boolean;
+    // Whether this call view is for picture-in-picture mode
+    // otherwise, it's the larger call view when viewing the room the call is in.
+    // This is sort of a proxy for a number of things but we currently have no
+    // need to control those things separately, so this is simpler.
+    pipMode?: boolean;
+
+    // Used for dragging the PiP CallView
+    onMouseDownOnHeader?: (event: React.MouseEvent<Element, MouseEvent>) => void;
 }
 
 interface IState {
-    isLocalOnHold: boolean,
-    isRemoteOnHold: boolean,
-    micMuted: boolean,
-    vidMuted: boolean,
-    callState: CallState,
-    controlsVisible: boolean,
-    showMoreMenu: boolean,
-    showDialpad: boolean,
-    feeds: CallFeed[],
+    isLocalOnHold: boolean;
+    isRemoteOnHold: boolean;
+    micMuted: boolean;
+    vidMuted: boolean;
+    screensharing: boolean;
+    callState: CallState;
+    controlsVisible: boolean;
+    hoveringControls: boolean;
+    showMoreMenu: boolean;
+    showDialpad: boolean;
+    primaryFeed: CallFeed;
+    secondaryFeeds: Array<CallFeed>;
+    sidebarShown: boolean;
 }
 
 function getFullScreenElement() {
@@ -91,33 +102,32 @@ function exitFullscreen() {
     if (exitMethod) exitMethod.call(document);
 }
 
-const CONTROLS_HIDE_DELAY = 1000;
-// Height of the header duplicated from CSS because we need to subtract it from our max
-// height to get the max height of the video
-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>();
-    private controlsHideTimer: number = null;
-    private dialpadButton = createRef<HTMLDivElement>();
-    private contextMenuButton = createRef<HTMLDivElement>();
+    private buttonsRef = createRef<CallViewButtons>();
 
     constructor(props: IProps) {
         super(props);
 
+        const { primary, secondary } = CallView.getOrderedFeeds(this.props.call.getFeeds());
+
         this.state = {
             isLocalOnHold: this.props.call.isLocalOnHold(),
             isRemoteOnHold: this.props.call.isRemoteOnHold(),
             micMuted: this.props.call.isMicrophoneMuted(),
             vidMuted: this.props.call.isLocalVideoMuted(),
+            screensharing: this.props.call.isScreensharing(),
             callState: this.props.call.state,
             controlsVisible: true,
+            hoveringControls: false,
             showMoreMenu: false,
             showDialpad: false,
-            feeds: this.props.call.getFeeds(),
-        }
+            primaryFeed: primary,
+            secondaryFeeds: secondary,
+            sidebarShown: true,
+        };
 
         this.updateCallListeners(null, this.props.call);
     }
@@ -137,7 +147,16 @@ export default class CallView extends React.Component<IProps, IState> {
         dis.unregister(this.dispatcherRef);
     }
 
-    public componentDidUpdate(prevProps) {
+    static getDerivedStateFromProps(props: IProps): Partial<IState> {
+        const { primary, secondary } = CallView.getOrderedFeeds(props.call.getFeeds());
+
+        return {
+            primaryFeed: primary,
+            secondaryFeeds: secondary,
+        };
+    }
+
+    public componentDidUpdate(prevProps: IProps): void {
         if (this.props.call === prevProps.call) return;
 
         this.setState({
@@ -191,7 +210,13 @@ export default class CallView extends React.Component<IProps, IState> {
     };
 
     private onFeedsChanged = (newFeeds: Array<CallFeed>) => {
-        this.setState({feeds: newFeeds});
+        const { primary, secondary } = CallView.getOrderedFeeds(newFeeds);
+        this.setState({
+            primaryFeed: primary,
+            secondaryFeeds: secondary,
+            micMuted: this.props.call.isMicrophoneMuted(),
+            vidMuted: this.props.call.isLocalVideoMuted(),
+        });
     };
 
     private onCallLocalHoldUnhold = () => {
@@ -208,113 +233,67 @@ export default class CallView extends React.Component<IProps, IState> {
         });
     };
 
-    private onFullscreenClick = () => {
-        dis.dispatch({
-            action: 'video_fullscreen',
-            fullscreen: true,
-        });
-    };
-
-    private onExpandClick = () => {
-        const userFacingRoomId = CallHandler.sharedInstance().roomIdForCall(this.props.call);
-        dis.dispatch({
-            action: 'view_room',
-            room_id: userFacingRoomId,
-        });
-    };
-
-    private onControlsHideTimer = () => {
-        this.controlsHideTimer = null;
-        this.setState({
-            controlsVisible: false,
-        });
-    }
-
     private onMouseMove = () => {
-        this.showControls();
+        this.buttonsRef.current?.showControls();
+    };
+
+    static getOrderedFeeds(feeds: Array<CallFeed>): { primary: CallFeed, secondary: Array<CallFeed> } {
+        let primary;
+
+        // Try to use a screensharing as primary, a remote one if possible
+        const screensharingFeeds = feeds.filter((feed) => feed.purpose === SDPStreamMetadataPurpose.Screenshare);
+        primary = screensharingFeeds.find((feed) => !feed.isLocal()) || screensharingFeeds[0];
+        // If we didn't find remote screen-sharing stream, try to find any remote stream
+        if (!primary) {
+            primary = feeds.find((feed) => !feed.isLocal());
+        }
+
+        const secondary = [...feeds];
+        // Remove the primary feed from the array
+        if (primary) secondary.splice(secondary.indexOf(primary), 1);
+        secondary.sort((a, b) => {
+            if (a.isLocal() && !b.isLocal()) return -1;
+            if (!a.isLocal() && b.isLocal()) return 1;
+            return 0;
+        });
+
+        return { primary, secondary };
     }
 
-    private showControls() {
-        if (this.state.showMoreMenu || this.state.showDialpad) return;
-
-        if (!this.state.controlsVisible) {
-            this.setState({
-                controlsVisible: true,
-            });
-        }
-        if (this.controlsHideTimer !== null) {
-            clearTimeout(this.controlsHideTimer);
-        }
-        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
-    }
-
-    private onDialpadClick = () => {
-        if (!this.state.showDialpad) {
-            if (this.controlsHideTimer) {
-                clearTimeout(this.controlsHideTimer);
-                this.controlsHideTimer = null;
-            }
-
-            this.setState({
-                showDialpad: true,
-                controlsVisible: true,
-            });
-        } else {
-            if (this.controlsHideTimer !== null) {
-                clearTimeout(this.controlsHideTimer);
-            }
-            this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
-
-            this.setState({
-                showDialpad: false,
-            });
-        }
-    }
-
-    private onMicMuteClick = () => {
+    private onMicMuteClick = async (): Promise<void> => {
         const newVal = !this.state.micMuted;
+        this.setState({ micMuted: await this.props.call.setMicrophoneMuted(newVal) });
+    };
 
-        this.props.call.setMicrophoneMuted(newVal);
-        this.setState({micMuted: newVal});
-    }
-
-    private onVidMuteClick = () => {
+    private onVidMuteClick = async (): Promise<void> => {
         const newVal = !this.state.vidMuted;
+        this.setState({ vidMuted: await this.props.call.setLocalVideoMuted(newVal) });
+    };
 
-        this.props.call.setLocalVideoMuted(newVal);
-        this.setState({vidMuted: newVal});
-    }
-
-    private onMoreClick = () => {
-        if (this.controlsHideTimer) {
-            clearTimeout(this.controlsHideTimer);
-            this.controlsHideTimer = null;
+    private onScreenshareClick = async (): Promise<void> => {
+        let isScreensharing;
+        if (this.state.screensharing) {
+            isScreensharing = await this.props.call.setScreensharingEnabled(false);
+        } else {
+            if (window.electron?.getDesktopCapturerSources) {
+                const { finished } = Modal.createDialog(DesktopCapturerSourcePicker);
+                const [source] = await finished;
+                isScreensharing = await this.props.call.setScreensharingEnabled(true, source);
+            } else {
+                isScreensharing = await this.props.call.setScreensharingEnabled(true);
+            }
         }
 
         this.setState({
-            showMoreMenu: true,
-            controlsVisible: true,
+            sidebarShown: true,
+            screensharing: isScreensharing,
         });
-    }
-
-    private closeDialpad = () => {
-        this.setState({
-            showDialpad: false,
-        });
-        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
-    }
-
-    private closeContextMenu = () => {
-        this.setState({
-            showMoreMenu: false,
-        });
-        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
-    }
+    };
 
     // we register global shortcuts here, they *must not conflict* with local shortcuts elsewhere or both will fire
     // Note that this assumes we always have a CallView on screen at any given time
     // CallHandler would probably be a better place for this
-    private onNativeKeyDown = ev => {
+    private onNativeKeyDown = (ev): void => {
         let handled = false;
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
 
@@ -323,7 +302,7 @@ export default class CallView extends React.Component<IProps, IState> {
                 if (ctrlCmdOnly) {
                     this.onMicMuteClick();
                     // show the controls to give feedback
-                    this.showControls();
+                    this.buttonsRef.current?.showControls();
                     handled = true;
                 }
                 break;
@@ -332,7 +311,7 @@ export default class CallView extends React.Component<IProps, IState> {
                 if (ctrlCmdOnly) {
                     this.onVidMuteClick();
                     // show the controls to give feedback
-                    this.showControls();
+                    this.buttonsRef.current?.showControls();
                     handled = true;
                 }
                 break;
@@ -344,31 +323,79 @@ export default class CallView extends React.Component<IProps, IState> {
         }
     };
 
-    private onRoomAvatarClick = () => {
-        const userFacingRoomId = CallHandler.sharedInstance().roomIdForCall(this.props.call);
-        dis.dispatch({
-            action: 'view_room',
-            room_id: userFacingRoomId,
-        });
-    }
-
-    private onSecondaryRoomAvatarClick = () => {
-        const userFacingRoomId = CallHandler.sharedInstance().roomIdForCall(this.props.secondaryCall);
-
-        dis.dispatch({
-            action: 'view_room',
-            room_id: userFacingRoomId,
-        });
-    }
-
-    private onCallResumeClick = () => {
+    private onCallResumeClick = (): void => {
         const userFacingRoomId = CallHandler.sharedInstance().roomIdForCall(this.props.call);
         CallHandler.sharedInstance().setActiveCallRoomId(userFacingRoomId);
-    }
+    };
 
-    private onTransferClick = () => {
+    private onTransferClick = (): void => {
         const transfereeCall = CallHandler.sharedInstance().getTransfereeForCallId(this.props.call.callId);
         this.props.call.transferToCall(transfereeCall);
+    };
+
+    private onHangupClick = (): void => {
+        dis.dispatch({
+            action: 'hangup',
+            room_id: CallHandler.sharedInstance().roomIdForCall(this.props.call),
+        });
+    };
+
+    private onToggleSidebar = (): void => {
+        this.setState({ sidebarShown: !this.state.sidebarShown });
+    };
+
+    private renderCallControls(): JSX.Element {
+        // We don't support call upgrades (yet) so hide the video mute button in voice calls
+        const vidMuteButtonShown = this.props.call.type === CallType.Video;
+        // Screensharing is possible, if we can send a second stream and
+        // identify it using SDPStreamMetadata or if we can replace the already
+        // existing usermedia track by a screensharing track. We also need to be
+        // connected to know the state of the other side
+        const screensharingButtonShown = (
+            (this.props.call.opponentSupportsSDPStreamMetadata() || this.props.call.type === CallType.Video) &&
+            this.props.call.state === CallState.Connected
+        );
+        // To show the sidebar we need secondary feeds, if we don't have them,
+        // we can hide this button. If we are in PiP, sidebar is also hidden, so
+        // we can hide the button too
+        const sidebarButtonShown = (
+            this.state.primaryFeed?.purpose === SDPStreamMetadataPurpose.Screenshare ||
+            this.props.call.isScreensharing()
+        );
+        // The dial pad & 'more' button actions are only relevant in a connected call
+        const contextMenuButtonShown = this.state.callState === CallState.Connected;
+        const dialpadButtonShown = (
+            this.state.callState === CallState.Connected &&
+            this.props.call.opponentSupportsDTMF()
+        );
+
+        return (
+            <CallViewButtons
+                ref={this.buttonsRef}
+                call={this.props.call}
+                pipMode={this.props.pipMode}
+                handlers={{
+                    onToggleSidebarClick: this.onToggleSidebar,
+                    onScreenshareClick: this.onScreenshareClick,
+                    onHangupClick: this.onHangupClick,
+                    onMicMuteClick: this.onMicMuteClick,
+                    onVidMuteClick: this.onVidMuteClick,
+                }}
+                buttonsState={{
+                    micMuted: this.state.micMuted,
+                    vidMuted: this.state.vidMuted,
+                    sidebarShown: this.state.sidebarShown,
+                    screensharing: this.state.screensharing,
+                }}
+                buttonsVisibility={{
+                    vidMute: vidMuteButtonShown,
+                    screensharing: screensharingButtonShown,
+                    sidebar: sidebarButtonShown,
+                    contextMenu: contextMenuButtonShown,
+                    dialpad: dialpadButtonShown,
+                }}
+            />
+        );
     }
 
     public render() {
@@ -377,120 +404,19 @@ export default class CallView extends React.Component<IProps, IState> {
         const secondaryCallRoomId = CallHandler.sharedInstance().roomIdForCall(this.props.secondaryCall);
         const callRoom = client.getRoom(callRoomId);
         const secCallRoom = this.props.secondaryCall ? client.getRoom(secondaryCallRoomId) : null;
-
-        let dialPad;
-        let contextMenu;
-
-        if (this.state.showDialpad) {
-            dialPad = <DialpadContextMenu
-                {...alwaysAboveRightOf(
-                    this.dialpadButton.current.getBoundingClientRect(),
-                    ChevronFace.None,
-                    CONTEXT_MENU_VPADDING,
-                )}
-                onFinished={this.closeDialpad}
-                call={this.props.call}
-            />;
-        }
-
-        if (this.state.showMoreMenu) {
-            contextMenu = <CallContextMenu
-                {...alwaysAboveLeftOf(
-                    this.contextMenuButton.current.getBoundingClientRect(),
-                    ChevronFace.None,
-                    CONTEXT_MENU_VPADDING,
-                )}
-                onFinished={this.closeContextMenu}
-                call={this.props.call}
-            />;
-        }
-
-        const micClasses = classNames({
-            mx_CallView_callControls_button: true,
-            mx_CallView_callControls_button_micOn: !this.state.micMuted,
-            mx_CallView_callControls_button_micOff: this.state.micMuted,
-        });
-
-        const vidClasses = classNames({
-            mx_CallView_callControls_button: true,
-            mx_CallView_callControls_button_vidOn: !this.state.vidMuted,
-            mx_CallView_callControls_button_vidOff: this.state.vidMuted,
-        });
-
-        // Put the other states of the mic/video icons in the document to make sure they're cached
-        // (otherwise the icon disappears briefly when toggled)
-        const micCacheClasses = classNames({
-            mx_CallView_callControls_button: true,
-            mx_CallView_callControls_button_micOn: this.state.micMuted,
-            mx_CallView_callControls_button_micOff: !this.state.micMuted,
-            mx_CallView_callControls_button_invisible: true,
-        });
-
-        const vidCacheClasses = classNames({
-            mx_CallView_callControls_button: true,
-            mx_CallView_callControls_button_vidOn: this.state.micMuted,
-            mx_CallView_callControls_button_vidOff: !this.state.micMuted,
-            mx_CallView_callControls_button_invisible: true,
-        });
-
-        const callControlsClasses = classNames({
-            mx_CallView_callControls: true,
-            mx_CallView_callControls_hidden: !this.state.controlsVisible,
-        });
-
-        const vidMuteButton = this.props.call.type === CallType.Video ? <AccessibleButton
-            className={vidClasses}
-            onClick={this.onVidMuteClick}
-        /> : null;
-
-        // The dial pad & 'more' button actions are only relevant in a connected call
-        // When not connected, we have to put something there to make the flexbox alignment correct
-        const dialpadButton = this.state.callState === CallState.Connected ? <ContextMenuButton
-            className="mx_CallView_callControls_button mx_CallView_callControls_dialpad"
-            inputRef={this.dialpadButton}
-            onClick={this.onDialpadClick}
-            isExpanded={this.state.showDialpad}
-        /> : <div className="mx_CallView_callControls_button mx_CallView_callControls_button_dialpad_hidden" />;
-
-        const contextMenuButton = this.state.callState === CallState.Connected ? <ContextMenuButton
-            className="mx_CallView_callControls_button mx_CallView_callControls_button_more"
-            onClick={this.onMoreClick}
-            inputRef={this.contextMenuButton}
-            isExpanded={this.state.showMoreMenu}
-        /> : <div className="mx_CallView_callControls_button mx_CallView_callControls_button_more_hidden" />;
-
-        // in the near future, the dial pad button will go on the left. For now, it's the nothing button
-        // because something needs to have margin-right: auto to make the alignment correct.
-        const callControls = <div className={callControlsClasses}>
-            {dialpadButton}
-            <AccessibleButton
-                className={micClasses}
-                onClick={this.onMicMuteClick}
-            />
-            <AccessibleButton
-                className="mx_CallView_callControls_button mx_CallView_callControls_button_hangup"
-                onClick={() => {
-                    dis.dispatch({
-                        action: 'hangup',
-                        room_id: callRoomId,
-                    });
-                }}
-            />
-            {vidMuteButton}
-            <div className={micCacheClasses} />
-            <div className={vidCacheClasses} />
-            {contextMenuButton}
-        </div>;
-
         const avatarSize = this.props.pipMode ? 76 : 160;
-
-        // The 'content' for the call, ie. the videos for a video call and profile picture
-        // for voice calls (fills the bg)
-        let contentView: React.ReactNode;
-
         const transfereeCall = CallHandler.sharedInstance().getTransfereeForCallId(this.props.call.callId);
         const isOnHold = this.state.isLocalOnHold || this.state.isRemoteOnHold;
+        const isScreensharing = this.props.call.isScreensharing();
+        const sidebarShown = this.state.sidebarShown;
+        const someoneIsScreensharing = this.props.call.getFeeds().some((feed) => {
+            return feed.purpose === SDPStreamMetadataPurpose.Screenshare;
+        });
+        const isVideoCall = this.props.call.type === CallType.Video;
+
+        let contentView: React.ReactNode;
         let holdTransferContent;
+
         if (transfereeCall) {
             const transferTargetRoom = MatrixClientPeg.get().getRoom(
                 CallHandler.sharedInstance().roomIdForCall(this.props.call),
@@ -503,16 +429,18 @@ export default class CallView extends React.Component<IProps, IState> {
             const transfereeName = transfereeRoom ? transfereeRoom.name : _t("unknown person");
 
             holdTransferContent = <div className="mx_CallView_holdTransferContent">
-                {_t(
+                { _t(
                     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>",
                     {
                         transferTarget: transferTargetName,
                         transferee: transfereeName,
                     },
                     {
-                        a: sub => <AccessibleButton kind="link" onClick={this.onTransferClick}>{sub}</AccessibleButton>,
+                        a: sub => <AccessibleButton kind="link" onClick={this.onTransferClick}>
+                            { sub }
+                        </AccessibleButton>,
                     },
-                )}
+                ) }
             </div>;
         } else if (isOnHold) {
             let onHoldText = null;
@@ -521,7 +449,7 @@ export default class CallView extends React.Component<IProps, IState> {
                     _td("You held the call <a>Switch</a>") : _td("You held the call <a>Resume</a>");
                 onHoldText = _t(holdString, {}, {
                     a: sub => <AccessibleButton kind="link" onClick={this.onCallResumeClick}>
-                        {sub}
+                        { sub }
                     </AccessibleButton>,
                 });
             } else if (this.state.isLocalOnHold) {
@@ -530,13 +458,29 @@ export default class CallView extends React.Component<IProps, IState> {
                 });
             }
             holdTransferContent = <div className="mx_CallView_holdTransferContent">
-                {onHoldText}
+                { onHoldText }
             </div>;
         }
 
+        let sidebar;
+        if (
+            !isOnHold &&
+            !transfereeCall &&
+            sidebarShown &&
+            (isVideoCall || someoneIsScreensharing)
+        ) {
+            sidebar = (
+                <CallViewSidebar
+                    feeds={this.state.secondaryFeeds}
+                    call={this.props.call}
+                    pipMode={this.props.pipMode}
+                />
+            );
+        }
+
         // This is a bit messy. I can't see a reason to have two onHold/transfer screens
         if (isOnHold || transfereeCall) {
-            if (this.props.call.type === CallType.Video) {
+            if (isVideoCall) {
                 const containerClasses = classNames({
                     mx_CallView_content: true,
                     mx_CallView_video: true,
@@ -545,7 +489,7 @@ export default class CallView extends React.Component<IProps, IState> {
                 let onHoldBackground = null;
                 const backgroundStyle: CSSProperties = {};
                 const backgroundAvatarUrl = avatarUrlForMember(
-                // is it worth getting the size of the div to pass here?
+                    // is it worth getting the size of the div to pass here?
                     this.props.call.getOpponentMember(), 1024, 1024, 'crop',
                 );
                 backgroundStyle.backgroundImage = 'url(' + backgroundAvatarUrl + ')';
@@ -553,9 +497,9 @@ export default class CallView extends React.Component<IProps, IState> {
 
                 contentView = (
                     <div className={containerClasses} ref={this.contentRef} onMouseMove={this.onMouseMove}>
-                        {onHoldBackground}
-                        {holdTransferContent}
-                        {callControls}
+                        { onHoldBackground }
+                        { holdTransferContent }
+                        { this.renderCallControls() }
                     </div>
                 );
             } else {
@@ -565,12 +509,12 @@ export default class CallView extends React.Component<IProps, IState> {
                     mx_CallView_voice_hold: isOnHold,
                 });
 
-                contentView =(
+                contentView = (
                     <div className={classes} onMouseMove={this.onMouseMove}>
                         <div className="mx_CallView_voice_avatarsContainer">
                             <div
                                 className="mx_CallView_voice_avatarContainer"
-                                style={{width: avatarSize, height: avatarSize}}
+                                style={{ width: avatarSize, height: avatarSize }}
                             >
                                 <RoomAvatar
                                     room={callRoom}
@@ -579,8 +523,8 @@ export default class CallView extends React.Component<IProps, IState> {
                                 />
                             </div>
                         </div>
-                        {holdTransferContent}
-                        {callControls}
+                        { holdTransferContent }
+                        { this.renderCallControls() }
                     </div>
                 );
             }
@@ -594,131 +538,89 @@ export default class CallView extends React.Component<IProps, IState> {
                 mx_CallView_voice: true,
             });
 
-            const feeds = this.props.call.getLocalFeeds().map((feed, i) => {
-                // Here we check to hide local audio feeds to achieve the same UI/UX
-                // as before. But once again this might be subject to change
-                if (feed.isVideoMuted()) return;
-                return (
-                    <VideoFeed
-                        key={i}
-                        feed={feed}
-                        call={this.props.call}
-                        pipMode={this.props.pipMode}
-                        onResize={this.props.onResize}
-                    />
-                );
-            });
-
             // Saying "Connecting" here isn't really true, but the best thing
             // I can come up with, but this might be subject to change as well
-            contentView = <div className={classes} onMouseMove={this.onMouseMove}>
-                {feeds}
-                <div className="mx_CallView_voice_avatarsContainer">
-                    <div className="mx_CallView_voice_avatarContainer" style={{width: avatarSize, height: avatarSize}}>
-                        <RoomAvatar
-                            room={callRoom}
-                            height={avatarSize}
-                            width={avatarSize}
-                        />
+            contentView = (
+                <div
+                    className={classes}
+                    onMouseMove={this.onMouseMove}
+                >
+                    { sidebar }
+                    <div className="mx_CallView_voice_avatarsContainer">
+                        <div
+                            className="mx_CallView_voice_avatarContainer"
+                            style={{ width: avatarSize, height: avatarSize }}
+                        >
+                            <RoomAvatar
+                                room={callRoom}
+                                height={avatarSize}
+                                width={avatarSize}
+                            />
+                        </div>
                     </div>
+                    <div className="mx_CallView_holdTransferContent">{ _t("Connecting") }</div>
+                    { this.renderCallControls() }
                 </div>
-                <div className="mx_CallView_holdTransferContent">{_t("Connecting")}</div>
-                {callControls}
-            </div>;
+            );
         } else {
             const containerClasses = classNames({
                 mx_CallView_content: true,
                 mx_CallView_video: true,
             });
 
-            // TODO: Later the CallView should probably be reworked to support
-            // any number of feeds but now we can always expect there to be two
-            // feeds. This is because the js-sdk ignores any new incoming streams
-            const feeds = this.state.feeds.map((feed, i) => {
-                // Here we check to hide local audio feeds to achieve the same UI/UX
-                // as before. But once again this might be subject to change
-                if (feed.isVideoMuted() && feed.isLocal()) return;
-                return (
+            let toast;
+            if (someoneIsScreensharing) {
+                const presentingClasses = classNames({
+                    mx_CallView_presenting: true,
+                    mx_CallView_presenting_hidden: !this.state.controlsVisible,
+                });
+                const sharerName = this.state.primaryFeed.getMember().name;
+                let text = isScreensharing
+                    ? _t("You are presenting")
+                    : _t('%(sharerName)s is presenting', { sharerName });
+                if (!this.state.sidebarShown && isVideoCall) {
+                    text += " • " + (this.props.call.isLocalVideoMuted()
+                        ? _t("Your camera is turned off")
+                        : _t("Your camera is still enabled"));
+                }
+
+                toast = (
+                    <div className={presentingClasses}>
+                        { text }
+                    </div>
+                );
+            }
+
+            contentView = (
+                <div
+                    className={containerClasses}
+                    ref={this.contentRef}
+                    onMouseMove={this.onMouseMove}
+                >
+                    { toast }
+                    { sidebar }
                     <VideoFeed
-                        key={i}
-                        feed={feed}
+                        feed={this.state.primaryFeed}
                         call={this.props.call}
                         pipMode={this.props.pipMode}
                         onResize={this.props.onResize}
+                        primary={true}
                     />
-                );
-            });
-
-            contentView = <div className={containerClasses} ref={this.contentRef} onMouseMove={this.onMouseMove}>
-                {feeds}
-                {callControls}
-            </div>;
-        }
-
-        const callTypeText = this.props.call.type === CallType.Video ? _t("Video Call") : _t("Voice Call");
-        let myClassName;
-
-        let fullScreenButton;
-        if (this.props.call.type === CallType.Video && !this.props.pipMode) {
-            fullScreenButton = <div className="mx_CallView_header_button mx_CallView_header_button_fullscreen"
-                onClick={this.onFullscreenClick} title={_t("Fill Screen")}
-            />;
-        }
-
-        let expandButton;
-        if (this.props.pipMode) {
-            expandButton = <div className="mx_CallView_header_button mx_CallView_header_button_expand"
-                onClick={this.onExpandClick} title={_t("Return to call")}
-            />;
-        }
-
-        const headerControls = <div className="mx_CallView_header_controls">
-            {fullScreenButton}
-            {expandButton}
-        </div>;
-
-        let header: React.ReactNode;
-        if (!this.props.pipMode) {
-            header = <div className="mx_CallView_header">
-                <div className="mx_CallView_header_phoneIcon"></div>
-                <span className="mx_CallView_header_callType">{callTypeText}</span>
-                {headerControls}
-            </div>;
-            myClassName = 'mx_CallView_large';
-        } else {
-            let secondaryCallInfo;
-            if (this.props.secondaryCall) {
-                secondaryCallInfo = <span className="mx_CallView_header_secondaryCallInfo">
-                    <AccessibleButton element='span' onClick={this.onSecondaryRoomAvatarClick}>
-                        <RoomAvatar room={secCallRoom} height={16} width={16} />
-                        <span className="mx_CallView_secondaryCall_roomName">
-                            {_t("%(name)s on hold", { name: secCallRoom.name })}
-                        </span>
-                    </AccessibleButton>
-                </span>;
-            }
-
-            header = <div className="mx_CallView_header">
-                <AccessibleButton onClick={this.onRoomAvatarClick}>
-                    <RoomAvatar room={callRoom} height={32} width={32} />
-                </AccessibleButton>
-                <div className="mx_CallView_header_callInfo">
-                    <div className="mx_CallView_header_roomName">{callRoom.name}</div>
-                    <div className="mx_CallView_header_callTypeSmall">
-                        {callTypeText}
-                        {secondaryCallInfo}
-                    </div>
+                    { this.renderCallControls() }
                 </div>
-                {headerControls}
-            </div>;
-            myClassName = 'mx_CallView_pip';
+            );
         }
 
+        const myClassName = this.props.pipMode ? 'mx_CallView_pip' : 'mx_CallView_large';
+
         return <div className={"mx_CallView " + myClassName}>
-            {header}
-            {contentView}
-            {dialPad}
-            {contextMenu}
+            <CallViewHeader
+                onPipMouseDown={this.props.onMouseDownOnHeader}
+                pipMode={this.props.pipMode}
+                type={this.props.call.type}
+                callRooms={[callRoom, secCallRoom]}
+            />
+            { contentView }
         </div>;
     }
 }
diff --git a/src/components/views/voip/CallView/CallViewButtons.tsx b/src/components/views/voip/CallView/CallViewButtons.tsx
new file mode 100644
index 0000000000..466311f421
--- /dev/null
+++ b/src/components/views/voip/CallView/CallViewButtons.tsx
@@ -0,0 +1,316 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 - 2021 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from "react";
+import classNames from "classnames";
+import AccessibleTooltipButton from "../../elements/AccessibleTooltipButton";
+import CallContextMenu from "../../context_menus/CallContextMenu";
+import DialpadContextMenu from "../../context_menus/DialpadContextMenu";
+import { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+import { Alignment } from "../../elements/Tooltip";
+import {
+    alwaysAboveLeftOf,
+    alwaysAboveRightOf,
+    ChevronFace,
+    ContextMenuTooltipButton,
+} from '../../../structures/ContextMenu';
+import { _t } from "../../../../languageHandler";
+
+// Height of the header duplicated from CSS because we need to subtract it from our max
+// height to get the max height of the video
+const CONTEXT_MENU_VPADDING = 8; // How far the context menu sits above the button (px)
+
+const TOOLTIP_Y_OFFSET = -24;
+
+const CONTROLS_HIDE_DELAY = 2000;
+
+interface IProps {
+    call: MatrixCall;
+    pipMode: boolean;
+    handlers: {
+        onHangupClick: () => void;
+        onScreenshareClick: () => void;
+        onToggleSidebarClick: () => void;
+        onMicMuteClick: () => void;
+        onVidMuteClick: () => void;
+    };
+    buttonsState: {
+        micMuted: boolean;
+        vidMuted: boolean;
+        sidebarShown: boolean;
+        screensharing: boolean;
+    };
+    buttonsVisibility: {
+        screensharing: boolean;
+        vidMute: boolean;
+        sidebar: boolean;
+        dialpad: boolean;
+        contextMenu: boolean;
+    };
+}
+
+interface IState {
+    visible: boolean;
+    showDialpad: boolean;
+    hoveringControls: boolean;
+    showMoreMenu: boolean;
+}
+
+export default class CallViewButtons extends React.Component<IProps, IState> {
+    private dialpadButton = createRef<HTMLDivElement>();
+    private contextMenuButton = createRef<HTMLDivElement>();
+    private controlsHideTimer: number = null;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            showDialpad: false,
+            hoveringControls: false,
+            showMoreMenu: false,
+            visible: true,
+        };
+    }
+
+    public componentDidMount(): void {
+        this.showControls();
+    }
+
+    public showControls(): void {
+        if (this.state.showMoreMenu || this.state.showDialpad) return;
+
+        if (!this.state.visible) {
+            this.setState({
+                visible: true,
+            });
+        }
+        if (this.controlsHideTimer !== null) {
+            clearTimeout(this.controlsHideTimer);
+        }
+        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
+    }
+
+    private onControlsHideTimer = (): void => {
+        if (this.state.hoveringControls || this.state.showDialpad || this.state.showMoreMenu) return;
+        this.controlsHideTimer = null;
+        this.setState({ visible: false });
+    };
+
+    private onMouseEnter = (): void => {
+        this.setState({ hoveringControls: true });
+    };
+
+    private onMouseLeave = (): void => {
+        this.setState({ hoveringControls: false });
+    };
+
+    private onDialpadClick = (): void => {
+        if (!this.state.showDialpad) {
+            this.setState({ showDialpad: true });
+            this.showControls();
+        } else {
+            this.setState({ showDialpad: false });
+        }
+    };
+
+    private onMoreClick = (): void => {
+        this.setState({ showMoreMenu: true });
+        this.showControls();
+    };
+
+    private closeDialpad = (): void => {
+        this.setState({ showDialpad: false });
+    };
+
+    private closeContextMenu = (): void => {
+        this.setState({ showMoreMenu: false });
+    };
+
+    public render(): JSX.Element {
+        const micClasses = classNames("mx_CallViewButtons_button", {
+            mx_CallViewButtons_button_micOn: !this.props.buttonsState.micMuted,
+            mx_CallViewButtons_button_micOff: this.props.buttonsState.micMuted,
+        });
+
+        const vidClasses = classNames("mx_CallViewButtons_button", {
+            mx_CallViewButtons_button_vidOn: !this.props.buttonsState.vidMuted,
+            mx_CallViewButtons_button_vidOff: this.props.buttonsState.vidMuted,
+        });
+
+        const screensharingClasses = classNames("mx_CallViewButtons_button", {
+            mx_CallViewButtons_button_screensharingOn: this.props.buttonsState.screensharing,
+            mx_CallViewButtons_button_screensharingOff: !this.props.buttonsState.screensharing,
+        });
+
+        const sidebarButtonClasses = classNames("mx_CallViewButtons_button", {
+            mx_CallViewButtons_button_sidebarOn: this.props.buttonsState.sidebarShown,
+            mx_CallViewButtons_button_sidebarOff: !this.props.buttonsState.sidebarShown,
+        });
+
+        // Put the other states of the mic/video icons in the document to make sure they're cached
+        // (otherwise the icon disappears briefly when toggled)
+        const micCacheClasses = classNames("mx_CallViewButtons_button", "mx_CallViewButtons_button_invisible", {
+            mx_CallViewButtons_button_micOn: this.props.buttonsState.micMuted,
+            mx_CallViewButtons_button_micOff: !this.props.buttonsState.micMuted,
+        });
+
+        const vidCacheClasses = classNames("mx_CallViewButtons_button", "mx_CallViewButtons_button_invisible", {
+            mx_CallViewButtons_button_vidOn: this.props.buttonsState.micMuted,
+            mx_CallViewButtons_button_vidOff: !this.props.buttonsState.micMuted,
+        });
+
+        const callControlsClasses = classNames("mx_CallViewButtons", {
+            mx_CallViewButtons_hidden: !this.state.visible,
+        });
+
+        let vidMuteButton;
+        if (this.props.buttonsVisibility.vidMute) {
+            vidMuteButton = (
+                <AccessibleTooltipButton
+                    className={vidClasses}
+                    onClick={this.props.handlers.onVidMuteClick}
+                    title={this.props.buttonsState.vidMuted ? _t("Start the camera") : _t("Stop the camera")}
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+            );
+        }
+
+        let screensharingButton;
+        if (this.props.buttonsVisibility.screensharing) {
+            screensharingButton = (
+                <AccessibleTooltipButton
+                    className={screensharingClasses}
+                    onClick={this.props.handlers.onScreenshareClick}
+                    title={this.props.buttonsState.screensharing
+                        ? _t("Stop sharing your screen")
+                        : _t("Start sharing your screen")
+                    }
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+            );
+        }
+
+        let sidebarButton;
+        if (this.props.buttonsVisibility.sidebar) {
+            sidebarButton = (
+                <AccessibleTooltipButton
+                    className={sidebarButtonClasses}
+                    onClick={this.props.handlers.onToggleSidebarClick}
+                    title={this.props.buttonsState.sidebarShown ? _t("Hide sidebar") : _t("Show sidebar")}
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+            );
+        }
+
+        let contextMenuButton;
+        if (this.props.buttonsVisibility.contextMenu) {
+            contextMenuButton = (
+                <ContextMenuTooltipButton
+                    className="mx_CallViewButtons_button mx_CallViewButtons_button_more"
+                    onClick={this.onMoreClick}
+                    inputRef={this.contextMenuButton}
+                    isExpanded={this.state.showMoreMenu}
+                    title={_t("More")}
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+            );
+        }
+        let dialpadButton;
+        if (this.props.buttonsVisibility.dialpad) {
+            dialpadButton = (
+                <ContextMenuTooltipButton
+                    className="mx_CallViewButtons_button mx_CallViewButtons_dialpad"
+                    inputRef={this.dialpadButton}
+                    onClick={this.onDialpadClick}
+                    isExpanded={this.state.showDialpad}
+                    title={_t("Dialpad")}
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+            );
+        }
+
+        let dialPad;
+        if (this.state.showDialpad) {
+            dialPad = <DialpadContextMenu
+                {...alwaysAboveRightOf(
+                    this.dialpadButton.current.getBoundingClientRect(),
+                    ChevronFace.None,
+                    CONTEXT_MENU_VPADDING,
+                )}
+                // We mount the context menus as a as a child typically in order to include the
+                // context menus when fullscreening the call content.
+                // However, this does not work as well when the call is embedded in a
+                // picture-in-picture frame. Thus, only mount as child when we are *not* in PiP.
+                mountAsChild={!this.props.pipMode}
+                onFinished={this.closeDialpad}
+                call={this.props.call}
+            />;
+        }
+
+        let contextMenu;
+        if (this.state.showMoreMenu) {
+            contextMenu = <CallContextMenu
+                {...alwaysAboveLeftOf(
+                    this.contextMenuButton.current.getBoundingClientRect(),
+                    ChevronFace.None,
+                    CONTEXT_MENU_VPADDING,
+                )}
+                mountAsChild={!this.props.pipMode}
+                onFinished={this.closeContextMenu}
+                call={this.props.call}
+            />;
+        }
+
+        return (
+            <div
+                className={callControlsClasses}
+                onMouseEnter={this.onMouseEnter}
+                onMouseLeave={this.onMouseLeave}
+            >
+                { dialPad }
+                { contextMenu }
+                { dialpadButton }
+                <AccessibleTooltipButton
+                    className={micClasses}
+                    onClick={this.props.handlers.onMicMuteClick}
+                    title={this.props.buttonsState.micMuted ? _t("Unmute the microphone") : _t("Mute the microphone")}
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+                { vidMuteButton }
+                <div className={micCacheClasses} />
+                <div className={vidCacheClasses} />
+                { screensharingButton }
+                { sidebarButton }
+                { contextMenuButton }
+                <AccessibleTooltipButton
+                    className="mx_CallViewButtons_button mx_CallViewButtons_button_hangup"
+                    onClick={this.props.handlers.onHangupClick}
+                    title={_t("Hangup")}
+                    alignment={Alignment.Top}
+                    yOffset={TOOLTIP_Y_OFFSET}
+                />
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/voip/CallView/CallViewHeader.tsx b/src/components/views/voip/CallView/CallViewHeader.tsx
new file mode 100644
index 0000000000..d9a49e5010
--- /dev/null
+++ b/src/components/views/voip/CallView/CallViewHeader.tsx
@@ -0,0 +1,135 @@
+/*
+Copyright 2021 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 { CallType } from 'matrix-js-sdk/src/webrtc/call';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import React from 'react';
+import { _t, _td } from '../../../../languageHandler';
+import RoomAvatar from '../../avatars/RoomAvatar';
+import AccessibleButton from '../../elements/AccessibleButton';
+import dis from '../../../../dispatcher/dispatcher';
+import classNames from 'classnames';
+import AccessibleTooltipButton from '../../elements/AccessibleTooltipButton';
+
+const callTypeTranslationByType: Record<CallType, string> = {
+    [CallType.Video]: _td("Video Call"),
+    [CallType.Voice]: _td("Voice Call"),
+};
+
+interface CallViewHeaderProps {
+    pipMode: boolean;
+    type: CallType;
+    callRooms?: Room[];
+    onPipMouseDown: (event: React.MouseEvent<Element, MouseEvent>) => void;
+}
+
+const onRoomAvatarClick = (roomId: string) => {
+    dis.dispatch({
+        action: 'view_room',
+        room_id: roomId,
+    });
+};
+
+const onFullscreenClick = () => {
+    dis.dispatch({
+        action: 'video_fullscreen',
+        fullscreen: true,
+    });
+};
+
+const onExpandClick = (roomId: string) => {
+    dis.dispatch({
+        action: 'view_room',
+        room_id: roomId,
+    });
+};
+
+type CallControlsProps = Pick<CallViewHeaderProps, 'pipMode' | 'type'> & {
+    roomId: string;
+};
+const CallViewHeaderControls: React.FC<CallControlsProps> = ({ pipMode = false, type, roomId }) => {
+    return <div className="mx_CallViewHeader_controls">
+        { !pipMode && <AccessibleTooltipButton
+            className="mx_CallViewHeader_button mx_CallViewHeader_button_fullscreen"
+            onClick={onFullscreenClick}
+            title={_t("Fill Screen")}
+        /> }
+        { pipMode && <AccessibleTooltipButton
+            className="mx_CallViewHeader_button mx_CallViewHeader_button_expand"
+            onClick={() => onExpandClick(roomId)}
+            title={_t("Return to call")}
+        /> }
+    </div>;
+};
+const SecondaryCallInfo: React.FC<{ callRoom: Room }> = ({ callRoom }) => {
+    return <span className="mx_CallViewHeader_secondaryCallInfo">
+        <AccessibleButton element='span' onClick={() => onRoomAvatarClick(callRoom.roomId)}>
+            <RoomAvatar room={callRoom} height={16} width={16} />
+            <span className="mx_CallView_secondaryCall_roomName">
+                { _t("%(name)s on hold", { name: callRoom.name }) }
+            </span>
+        </AccessibleButton>
+    </span>;
+};
+
+const CallTypeIcon: React.FC<{ type: CallType }> = ({ type }) => {
+    const classes = classNames({
+        'mx_CallViewHeader_callTypeIcon': true,
+        'mx_CallViewHeader_callTypeIcon_video': type === CallType.Video,
+        'mx_CallViewHeader_callTypeIcon_voice': type === CallType.Voice,
+    });
+    return <div className={classes} />;
+};
+
+const CallViewHeader: React.FC<CallViewHeaderProps> = ({
+    type,
+    pipMode = false,
+    callRooms = [],
+    onPipMouseDown,
+}) => {
+    const [callRoom, onHoldCallRoom] = callRooms;
+    const callTypeText = _t(callTypeTranslationByType[type]);
+    const callRoomName = callRoom.name;
+    const { roomId } = callRoom;
+
+    if (!pipMode) {
+        return <div className="mx_CallViewHeader">
+            <CallTypeIcon type={type} />
+            <span className="mx_CallViewHeader_callType">{ callTypeText }</span>
+            <CallViewHeaderControls roomId={roomId} pipMode={pipMode} type={type} />
+        </div>;
+    }
+    return (
+        <div
+            className="mx_CallViewHeader"
+            onMouseDown={onPipMouseDown}
+        >
+            <AccessibleButton onClick={() => onRoomAvatarClick(roomId)}>
+                <RoomAvatar room={callRoom} height={32} width={32} />
+            </AccessibleButton>
+            <div className="mx_CallViewHeader_callInfo">
+                <div className="mx_CallViewHeader_roomName">{ callRoomName }</div>
+                <div className="mx_CallViewHeader_callTypeSmall">
+                    { callTypeText }
+                    { onHoldCallRoom && <SecondaryCallInfo callRoom={onHoldCallRoom} /> }
+                </div>
+            </div>
+            <CallViewHeaderControls roomId={roomId} pipMode={pipMode} type={type} />
+        </div>
+    );
+};
+
+export default CallViewHeader;
diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx
index 0c785f758d..b0a6f17095 100644
--- a/src/components/views/voip/CallViewForRoom.tsx
+++ b/src/components/views/voip/CallViewForRoom.tsx
@@ -19,22 +19,19 @@ import React from 'react';
 import CallHandler, { CallHandlerEvent } from '../../../CallHandler';
 import CallView from './CallView';
 import dis from '../../../dispatcher/dispatcher';
-import {Resizable} from "re-resizable";
+import { Resizable } from "re-resizable";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // What room we should display the call for
-    roomId: string,
+    roomId: string;
 
-    // maxHeight style attribute for the video panel
-    maxVideoHeight?: number;
-
-    resizeNotifier: ResizeNotifier,
+    resizeNotifier: ResizeNotifier;
 }
 
 interface IState {
-    call: MatrixCall,
+    call: MatrixCall;
 }
 
 /*
@@ -74,7 +71,7 @@ export default class CallViewForRoom extends React.Component<IProps, IState> {
     private updateCall = () => {
         const newCall = this.getCall();
         if (newCall !== this.state.call) {
-            this.setState({call: newCall});
+            this.setState({ call: newCall });
         }
     };
 
@@ -99,14 +96,12 @@ export default class CallViewForRoom extends React.Component<IProps, IState> {
 
     public render() {
         if (!this.state.call) return null;
-        // We subtract 8 as it the margin-bottom of the mx_CallViewForRoom_ResizeWrapper
-        const maxHeight = this.props.maxVideoHeight - 8;
 
         return (
             <div className="mx_CallViewForRoom">
                 <Resizable
                     minHeight={380}
-                    maxHeight={maxHeight}
+                    maxHeight="80vh"
                     enable={{
                         top: false,
                         right: false,
@@ -121,7 +116,7 @@ export default class CallViewForRoom extends React.Component<IProps, IState> {
                     onResize={this.onResize}
                     onResizeStop={this.onResizeStop}
                     className="mx_CallViewForRoom_ResizeWrapper"
-                    handleClasses={{bottom: "mx_CallViewForRoom_ResizeHandle"}}
+                    handleClasses={{ bottom: "mx_CallViewForRoom_ResizeHandle" }}
                 >
                     <CallView
                         call={this.state.call}
diff --git a/src/components/views/voip/CallViewSidebar.tsx b/src/components/views/voip/CallViewSidebar.tsx
new file mode 100644
index 0000000000..a0cb25b3df
--- /dev/null
+++ b/src/components/views/voip/CallViewSidebar.tsx
@@ -0,0 +1,53 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
+import VideoFeed from "./VideoFeed";
+import classNames from "classnames";
+
+interface IProps {
+    feeds: Array<CallFeed>;
+    call: MatrixCall;
+    pipMode: boolean;
+}
+
+export default class CallViewSidebar extends React.Component<IProps> {
+    render() {
+        const feeds = this.props.feeds.map((feed) => {
+            return (
+                <VideoFeed
+                    key={feed.stream.id}
+                    feed={feed}
+                    call={this.props.call}
+                    primary={false}
+                    pipMode={this.props.pipMode}
+                />
+            );
+        });
+
+        const className = classNames("mx_CallViewSidebar", {
+            mx_CallViewSidebar_pipMode: this.props.pipMode,
+        });
+
+        return (
+            <div className={className}>
+                { feeds }
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/voip/DialPad.tsx b/src/components/views/voip/DialPad.tsx
index 68092fb0be..46584e0870 100644
--- a/src/components/views/voip/DialPad.tsx
+++ b/src/components/views/voip/DialPad.tsx
@@ -15,38 +15,38 @@ limitations under the License.
 */
 
 import * as React from "react";
-import AccessibleButton from "../elements/AccessibleButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const BUTTONS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'];
+const BUTTON_LETTERS = ['', 'ABC', 'DEF', 'GHI', 'JKL', 'MNO', 'PQRS', 'TUV', 'WXYZ', '', '+', ''];
 
 enum DialPadButtonKind {
     Digit,
-    Delete,
     Dial,
 }
 
 interface IButtonProps {
     kind: DialPadButtonKind;
     digit?: string;
-    onButtonPress: (string) => void;
+    digitSubtext?: string;
+    onButtonPress: (digit: string, ev: ButtonEvent) => void;
 }
 
 class DialPadButton extends React.PureComponent<IButtonProps> {
-    onClick = () => {
-        this.props.onButtonPress(this.props.digit);
-    }
+    onClick = (ev: ButtonEvent) => {
+        this.props.onButtonPress(this.props.digit, ev);
+    };
 
     render() {
         switch (this.props.kind) {
             case DialPadButtonKind.Digit:
                 return <AccessibleButton className="mx_DialPad_button" onClick={this.onClick}>
-                    {this.props.digit}
+                    { this.props.digit }
+                    <div className="mx_DialPad_buttonSubText">
+                        { this.props.digitSubtext }
+                    </div>
                 </AccessibleButton>;
-            case DialPadButtonKind.Delete:
-                return <AccessibleButton className="mx_DialPad_button mx_DialPad_deleteButton"
-                    onClick={this.onClick}
-                />;
             case DialPadButtonKind.Dial:
                 return <AccessibleButton className="mx_DialPad_button mx_DialPad_dialButton" onClick={this.onClick} />;
         }
@@ -54,10 +54,10 @@ class DialPadButton extends React.PureComponent<IButtonProps> {
 }
 
 interface IProps {
-    onDigitPress: (string) => void;
-    hasDialAndDelete: boolean;
-    onDeletePress?: (string) => void;
-    onDialPress?: (string) => void;
+    onDigitPress: (digit: string, ev: ButtonEvent) => void;
+    hasDial: boolean;
+    onDeletePress?: (ev: ButtonEvent) => void;
+    onDialPress?: () => void;
 }
 
 @replaceableComponent("views.voip.DialPad")
@@ -65,23 +65,28 @@ export default class Dialpad extends React.PureComponent<IProps> {
     render() {
         const buttonNodes = [];
 
-        for (const button of BUTTONS) {
-            buttonNodes.push(<DialPadButton key={button} kind={DialPadButtonKind.Digit}
-                digit={button} onButtonPress={this.props.onDigitPress}
+        for (let i = 0; i < BUTTONS.length; i++) {
+            const button = BUTTONS[i];
+            const digitSubtext = BUTTON_LETTERS[i];
+            buttonNodes.push(<DialPadButton
+                key={button}
+                kind={DialPadButtonKind.Digit}
+                digit={button}
+                digitSubtext={digitSubtext}
+                onButtonPress={this.props.onDigitPress}
             />);
         }
 
-        if (this.props.hasDialAndDelete) {
-            buttonNodes.push(<DialPadButton key="del" kind={DialPadButtonKind.Delete}
-                onButtonPress={this.props.onDeletePress}
-            />);
-            buttonNodes.push(<DialPadButton key="dial" kind={DialPadButtonKind.Dial}
+        if (this.props.hasDial) {
+            buttonNodes.push(<DialPadButton
+                key="dial"
+                kind={DialPadButtonKind.Dial}
                 onButtonPress={this.props.onDialPress}
             />);
         }
 
         return <div className="mx_DialPad">
-            {buttonNodes}
+            { buttonNodes }
         </div>;
     }
 }
diff --git a/src/components/views/voip/DialPadModal.tsx b/src/components/views/voip/DialPadModal.tsx
index 8c0af5e81a..4d69260565 100644
--- a/src/components/views/voip/DialPadModal.tsx
+++ b/src/components/views/voip/DialPadModal.tsx
@@ -15,14 +15,15 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { _t } from "../../../languageHandler";
-import AccessibleButton from "../elements/AccessibleButton";
+import { createRef } from "react";
+import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import Field from "../elements/Field";
 import DialPad from './DialPad';
 import dis from '../../../dispatcher/dispatcher';
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { DialNumberPayload } from "../../../dispatcher/payloads/DialNumberPayload";
 import { Action } from "../../../dispatcher/actions";
+import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
 
 interface IProps {
     onFinished: (boolean) => void;
@@ -34,34 +35,50 @@ interface IState {
 
 @replaceableComponent("views.voip.DialPadModal")
 export default class DialpadModal extends React.PureComponent<IProps, IState> {
+    private numberEntryFieldRef: React.RefObject<Field> = createRef();
+
     constructor(props) {
         super(props);
         this.state = {
             value: '',
-        }
+        };
     }
 
     onCancelClick = () => {
         this.props.onFinished(false);
-    }
+    };
 
     onChange = (ev) => {
-        this.setState({value: ev.target.value});
-    }
+        this.setState({ value: ev.target.value });
+    };
 
     onFormSubmit = (ev) => {
         ev.preventDefault();
         this.onDialPress();
-    }
+    };
 
-    onDigitPress = (digit) => {
-        this.setState({value: this.state.value + digit});
-    }
+    onDigitPress = (digit: string, ev: ButtonEvent) => {
+        this.setState({ value: this.state.value + digit });
 
-    onDeletePress = () => {
+        // Keep the number field focused so that keyboard entry is still available.
+        // However, don't focus if this wasn't the result of directly clicking on the button,
+        // i.e someone using keyboard navigation.
+        if (ev.type === "click") {
+            this.numberEntryFieldRef.current?.focus();
+        }
+    };
+
+    onDeletePress = (ev: ButtonEvent) => {
         if (this.state.value.length === 0) return;
-        this.setState({value: this.state.value.slice(0, -1)});
-    }
+        this.setState({ value: this.state.value.slice(0, -1) });
+
+        // Keep the number field focused so that keyboard entry is still available
+        // However, don't focus if this wasn't the result of directly clicking on the button,
+        // i.e someone using keyboard navigation.
+        if (ev.type === "click") {
+            this.numberEntryFieldRef.current?.focus();
+        }
+    };
 
     onDialPress = async () => {
         const payload: DialNumberPayload = {
@@ -71,25 +88,47 @@ export default class DialpadModal extends React.PureComponent<IProps, IState> {
         dis.dispatch(payload);
 
         this.props.onFinished(true);
-    }
+    };
 
     render() {
+        const backspaceButton = (
+            <DialPadBackspaceButton onBackspacePress={this.onDeletePress} />
+        );
+
+        // Only show the backspace button if the field has content
+        let dialPadField;
+        if (this.state.value.length !== 0) {
+            dialPadField = <Field
+                ref={this.numberEntryFieldRef}
+                className="mx_DialPadModal_field"
+                id="dialpad_number"
+                value={this.state.value}
+                autoFocus={true}
+                onChange={this.onChange}
+                postfixComponent={backspaceButton}
+            />;
+        } else {
+            dialPadField = <Field
+                ref={this.numberEntryFieldRef}
+                className="mx_DialPadModal_field"
+                id="dialpad_number"
+                value={this.state.value}
+                autoFocus={true}
+                onChange={this.onChange}
+            />;
+        }
+
         return <div className="mx_DialPadModal">
+            <div>
+                <AccessibleButton className="mx_DialPadModal_cancel" onClick={this.onCancelClick} />
+            </div>
             <div className="mx_DialPadModal_header">
-                <div>
-                    <span className="mx_DialPadModal_title">{_t("Dial pad")}</span>
-                    <AccessibleButton className="mx_DialPadModal_cancel" onClick={this.onCancelClick} />
-                </div>
                 <form onSubmit={this.onFormSubmit}>
-                    <Field className="mx_DialPadModal_field" id="dialpad_number"
-                        value={this.state.value} autoFocus={true}
-                        onChange={this.onChange}
-                    />
+                    { dialPadField }
                 </form>
             </div>
-            <div className="mx_DialPadModal_horizSep" />
             <div className="mx_DialPadModal_dialPad">
-                <DialPad hasDialAndDelete={true}
+                <DialPad hasDial={true}
                     onDigitPress={this.onDigitPress}
                     onDeletePress={this.onDeletePress}
                     onDialPress={this.onDialPress}
diff --git a/src/components/views/voip/IncomingCallBox.tsx b/src/components/views/voip/IncomingCallBox.tsx
deleted file mode 100644
index 2abdc0641d..0000000000
--- a/src/components/views/voip/IncomingCallBox.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT 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 {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher/dispatcher';
-import { _t } from '../../../languageHandler';
-import { ActionPayload } from '../../../dispatcher/payloads';
-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 {
-}
-
-interface IState {
-    incomingCall: any;
-}
-
-@replaceableComponent("views.voip.IncomingCallBox")
-export default class IncomingCallBox extends React.Component<IProps, IState> {
-    private dispatcherRef: string;
-
-    constructor(props: IProps) {
-        super(props);
-
-        this.dispatcherRef = dis.register(this.onAction);
-        this.state = {
-            incomingCall: null,
-        };
-    }
-
-    public componentWillUnmount() {
-        dis.unregister(this.dispatcherRef);
-    }
-
-    private onAction = (payload: ActionPayload) => {
-        switch (payload.action) {
-            case 'call_state': {
-                const call = CallHandler.sharedInstance().getCallForRoom(payload.room_id);
-                if (call && call.state === CallState.Ringing) {
-                    this.setState({
-                        incomingCall: call,
-                    });
-                } else {
-                    this.setState({
-                        incomingCall: null,
-                    });
-                }
-            }
-        }
-    };
-
-    private onAnswerClick: React.MouseEventHandler = (e) => {
-        e.stopPropagation();
-        dis.dispatch({
-            action: 'answer',
-            room_id: CallHandler.sharedInstance().roomIdForCall(this.state.incomingCall),
-        });
-    };
-
-    private onRejectClick: React.MouseEventHandler = (e) => {
-        e.stopPropagation();
-        dis.dispatch({
-            action: 'reject',
-            room_id: CallHandler.sharedInstance().roomIdForCall(this.state.incomingCall),
-        });
-    };
-
-    public render() {
-        if (!this.state.incomingCall) {
-            return null;
-        }
-
-        let room = null;
-        if (this.state.incomingCall) {
-            room = MatrixClientPeg.get().getRoom(CallHandler.sharedInstance().roomIdForCall(this.state.incomingCall));
-        }
-
-        const caller = room ? room.name : _t("Unknown caller");
-
-        let incomingCallText = null;
-        if (this.state.incomingCall) {
-            if (this.state.incomingCall.type === "voice") {
-                incomingCallText = _t("Incoming voice call");
-            } else if (this.state.incomingCall.type === "video") {
-                incomingCallText = _t("Incoming video call");
-            } else {
-                incomingCallText = _t("Incoming call");
-            }
-        }
-
-        return <div className="mx_IncomingCallBox">
-            <div className="mx_IncomingCallBox_CallerInfo">
-                <RoomAvatar
-                    room={room}
-                    height={32}
-                    width={32}
-                />
-                <div>
-                    <h1>{caller}</h1>
-                    <p>{incomingCallText}</p>
-                </div>
-            </div>
-            <div className="mx_IncomingCallBox_buttons">
-                <FormButton
-                    className={"mx_IncomingCallBox_decline"}
-                    onClick={this.onRejectClick}
-                    kind="danger"
-                    label={_t("Decline")}
-                />
-                <div className="mx_IncomingCallBox_spacer" />
-                <FormButton
-                    className={"mx_IncomingCallBox_accept"}
-                    onClick={this.onAnswerClick}
-                    kind="primary"
-                    label={_t("Accept")}
-                />
-            </div>
-        </div>;
-    }
-}
-
diff --git a/src/components/views/voip/PictureInPictureDragger.tsx b/src/components/views/voip/PictureInPictureDragger.tsx
new file mode 100644
index 0000000000..23a09b20d8
--- /dev/null
+++ b/src/components/views/voip/PictureInPictureDragger.tsx
@@ -0,0 +1,229 @@
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from 'react';
+import UIStore from '../../../stores/UIStore';
+import { lerp } from '../../../utils/AnimationUtils';
+import { MarkedExecution } from '../../../utils/MarkedExecution';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
+
+const PIP_VIEW_WIDTH = 336;
+const PIP_VIEW_HEIGHT = 232;
+
+const MOVING_AMT = 0.2;
+const SNAPPING_AMT = 0.1;
+
+const PADDING = {
+    top: 58,
+    bottom: 58,
+    left: 76,
+    right: 8,
+};
+
+interface IChildrenOptions {
+    onStartMoving: (event: React.MouseEvent<Element, MouseEvent>) => void;
+    onResize: (event: Event) => void;
+}
+
+interface IProps {
+    className?: string;
+    children: ({ onStartMoving, onResize }: IChildrenOptions) => React.ReactNode;
+    draggable: boolean;
+}
+
+interface IState {
+    // Position of the PictureInPictureDragger
+    translationX: number;
+    translationY: number;
+}
+
+/**
+ * PictureInPictureDragger 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.PictureInPictureDragger")
+export default class PictureInPictureDragger extends React.Component<IProps, IState> {
+    private callViewWrapper = createRef<HTMLDivElement>();
+    private initX = 0;
+    private initY = 0;
+    private desiredTranslationX = UIStore.instance.windowWidth - PADDING.right - PIP_VIEW_WIDTH;
+    private desiredTranslationY = UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_HEIGHT;
+    private moving = false;
+    private scheduledUpdate = new MarkedExecution(
+        () => this.animationCallback(),
+        () => requestAnimationFrame(() => this.scheduledUpdate.trigger()),
+    );
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            translationX: UIStore.instance.windowWidth - PADDING.right - PIP_VIEW_WIDTH,
+            translationY: UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_HEIGHT,
+        };
+    }
+
+    public componentDidMount() {
+        document.addEventListener("mousemove", this.onMoving);
+        document.addEventListener("mouseup", this.onEndMoving);
+        window.addEventListener("resize", this.onResize);
+    }
+
+    public componentWillUnmount() {
+        document.removeEventListener("mousemove", this.onMoving);
+        document.removeEventListener("mouseup", this.onEndMoving);
+        window.removeEventListener("resize", this.onResize);
+    }
+
+    private animationCallback = () => {
+        // If the PiP isn't being dragged and there is only a tiny difference in
+        // the desiredTranslation and translation, quit the animationCallback
+        // loop. If that is the case, it means the PiP has snapped into its
+        // position and there is nothing to do. Not doing this would cause an
+        // infinite loop
+        if (
+            !this.moving &&
+            Math.abs(this.state.translationX - this.desiredTranslationX) <= 1 &&
+            Math.abs(this.state.translationY - this.desiredTranslationY) <= 1
+        ) return;
+
+        const amt = this.moving ? MOVING_AMT : SNAPPING_AMT;
+        this.setState({
+            translationX: lerp(this.state.translationX, this.desiredTranslationX, amt),
+            translationY: lerp(this.state.translationY, this.desiredTranslationY, amt),
+        });
+        this.scheduledUpdate.mark();
+    };
+
+    private setTranslation(inTranslationX: number, inTranslationY: number) {
+        const width = this.callViewWrapper.current?.clientWidth || PIP_VIEW_WIDTH;
+        const height = this.callViewWrapper.current?.clientHeight || PIP_VIEW_HEIGHT;
+
+        // Avoid overflow on the x axis
+        if (inTranslationX + width >= UIStore.instance.windowWidth) {
+            this.desiredTranslationX = UIStore.instance.windowWidth - width;
+        } else if (inTranslationX <= 0) {
+            this.desiredTranslationX = 0;
+        } else {
+            this.desiredTranslationX = inTranslationX;
+        }
+
+        // Avoid overflow on the y axis
+        if (inTranslationY + height >= UIStore.instance.windowHeight) {
+            this.desiredTranslationY = UIStore.instance.windowHeight - height;
+        } else if (inTranslationY <= 0) {
+            this.desiredTranslationY = 0;
+        } else {
+            this.desiredTranslationY = inTranslationY;
+        }
+    }
+
+    private onResize = (): void => {
+        this.snap(false);
+    };
+
+    private snap = (animate = false) => {
+        const translationX = this.desiredTranslationX;
+        const translationY = this.desiredTranslationY;
+        // We subtract the PiP size from the window size in order to calculate
+        // the position to snap to from the PiP center and not its top-left
+        // corner
+        const windowWidth = (
+            UIStore.instance.windowWidth -
+            (this.callViewWrapper.current?.clientWidth || PIP_VIEW_WIDTH)
+        );
+        const windowHeight = (
+            UIStore.instance.windowHeight -
+            (this.callViewWrapper.current?.clientHeight || PIP_VIEW_HEIGHT)
+        );
+
+        if (translationX >= windowWidth / 2 && translationY >= windowHeight / 2) {
+            this.desiredTranslationX = windowWidth - PADDING.right;
+            this.desiredTranslationY = windowHeight - PADDING.bottom;
+        } else if (translationX >= windowWidth / 2 && translationY <= windowHeight / 2) {
+            this.desiredTranslationX = windowWidth - PADDING.right;
+            this.desiredTranslationY = PADDING.top;
+        } else if (translationX <= windowWidth / 2 && translationY >= windowHeight / 2) {
+            this.desiredTranslationX = PADDING.left;
+            this.desiredTranslationY = windowHeight - PADDING.bottom;
+        } else {
+            this.desiredTranslationX = PADDING.left;
+            this.desiredTranslationY = PADDING.top;
+        }
+
+        // We start animating here because we want the PiP to move when we're
+        // resizing the window
+        this.scheduledUpdate.mark();
+
+        if (animate) {
+            // We start animating here because we want the PiP to move when we're
+            // resizing the window
+            this.scheduledUpdate.mark();
+        } else {
+            this.setState({
+                translationX: this.desiredTranslationX,
+                translationY: this.desiredTranslationY,
+            });
+        }
+    };
+
+    private onStartMoving = (event: React.MouseEvent | MouseEvent) => {
+        event.preventDefault();
+        event.stopPropagation();
+
+        this.moving = true;
+        this.initX = event.pageX - this.desiredTranslationX;
+        this.initY = event.pageY - this.desiredTranslationY;
+        this.scheduledUpdate.mark();
+    };
+
+    private onMoving = (event: React.MouseEvent | MouseEvent) => {
+        if (!this.moving) return;
+
+        event.preventDefault();
+        event.stopPropagation();
+
+        this.setTranslation(event.pageX - this.initX, event.pageY - this.initY);
+    };
+
+    private onEndMoving = () => {
+        this.moving = false;
+        this.snap(true);
+    };
+
+    public render() {
+        const translatePixelsX = this.state.translationX + "px";
+        const translatePixelsY = this.state.translationY + "px";
+        const style = {
+            transform: `translateX(${translatePixelsX})
+                        translateY(${translatePixelsY})`,
+        };
+        return (
+            <div
+                className={this.props.className}
+                style={this.props.draggable ? style : undefined}
+                ref={this.callViewWrapper}
+            >
+                <>
+                    { this.props.children({
+                        onStartMoving: this.onStartMoving,
+                        onResize: this.onResize,
+                    }) }
+                </>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index d22fa055ce..13461c3591 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -16,17 +16,18 @@ limitations under the License.
 
 import classnames from 'classnames';
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
-import React, {createRef} from 'react';
+import React from 'react';
 import SettingsStore from "../../../settings/SettingsStore";
 import { CallFeed, CallFeedEvent } from 'matrix-js-sdk/src/webrtc/callFeed';
 import { logger } from 'matrix-js-sdk/src/logger';
-import MemberAvatar from "../avatars/MemberAvatar"
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import MemberAvatar from "../avatars/MemberAvatar";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { SDPStreamMetadataPurpose } from 'matrix-js-sdk/src/webrtc/callEventTypes';
 
 interface IProps {
-    call: MatrixCall,
+    call: MatrixCall;
 
-    feed: CallFeed,
+    feed: CallFeed;
 
     // Whether this call view is for picture-in-picture mode
     // otherwise, it's the larger call view when viewing the room the call is in.
@@ -36,17 +37,20 @@ interface IProps {
 
     // a callback which is called when the video element is resized
     // due to a change in video metadata
-    onResize?: (e: Event) => void,
+    onResize?: (e: Event) => void;
+
+    primary: boolean;
 }
 
 interface IState {
     audioMuted: boolean;
     videoMuted: boolean;
+    speaking: boolean;
 }
 
 @replaceableComponent("views.voip.VideoFeed")
-export default class VideoFeed extends React.Component<IProps, IState> {
-    private element = createRef<HTMLVideoElement>();
+export default class VideoFeed extends React.PureComponent<IProps, IState> {
+    private element: HTMLVideoElement;
 
     constructor(props: IProps) {
         super(props);
@@ -54,22 +58,72 @@ export default class VideoFeed extends React.Component<IProps, IState> {
         this.state = {
             audioMuted: this.props.feed.isAudioMuted(),
             videoMuted: this.props.feed.isVideoMuted(),
+            speaking: false,
         };
     }
 
     componentDidMount() {
-        this.props.feed.addListener(CallFeedEvent.NewStream, this.onNewStream);
+        this.updateFeed(null, this.props.feed);
         this.playMedia();
     }
 
     componentWillUnmount() {
-        this.props.feed.removeListener(CallFeedEvent.NewStream, this.onNewStream);
-        this.element.current?.removeEventListener('resize', this.onResize);
-        this.stopMedia();
+        this.updateFeed(this.props.feed, null);
     }
 
-    private playMedia() {
-        const element = this.element.current;
+    componentDidUpdate(prevProps: IProps, prevState: IState) {
+        this.updateFeed(prevProps.feed, this.props.feed);
+        // If the mutes state has changed, we try to playMedia()
+        if (
+            prevState.videoMuted !== this.state.videoMuted ||
+            prevProps.feed.stream !== this.props.feed.stream
+        ) {
+            this.playMedia();
+        }
+    }
+
+    static getDerivedStateFromProps(props: IProps) {
+        return {
+            audioMuted: props.feed.isAudioMuted(),
+            videoMuted: props.feed.isVideoMuted(),
+        };
+    }
+
+    private setElementRef = (element: HTMLVideoElement): void => {
+        if (!element) {
+            this.element?.removeEventListener('resize', this.onResize);
+            return;
+        }
+
+        this.element = element;
+        element.addEventListener('resize', this.onResize);
+    };
+
+    private updateFeed(oldFeed: CallFeed, newFeed: CallFeed) {
+        if (oldFeed === newFeed) return;
+
+        if (oldFeed) {
+            this.props.feed.removeListener(CallFeedEvent.NewStream, this.onNewStream);
+            this.props.feed.removeListener(CallFeedEvent.MuteStateChanged, this.onMuteStateChanged);
+            if (this.props.feed.purpose === SDPStreamMetadataPurpose.Usermedia) {
+                this.props.feed.removeListener(CallFeedEvent.Speaking, this.onSpeaking);
+                this.props.feed.measureVolumeActivity(false);
+            }
+            this.stopMedia();
+        }
+        if (newFeed) {
+            this.props.feed.addListener(CallFeedEvent.NewStream, this.onNewStream);
+            this.props.feed.addListener(CallFeedEvent.MuteStateChanged, this.onMuteStateChanged);
+            if (this.props.feed.purpose === SDPStreamMetadataPurpose.Usermedia) {
+                this.props.feed.addListener(CallFeedEvent.Speaking, this.onSpeaking);
+                this.props.feed.measureVolumeActivity(true);
+            }
+            this.playMedia();
+        }
+    }
+
+    private async playMedia() {
+        const element = this.element;
         if (!element) return;
         // We play audio in AudioFeed, not here
         element.muted = true;
@@ -85,14 +139,14 @@ export default class VideoFeed extends React.Component<IProps, IState> {
             // should serialise the ones that need to be serialised but then be able to interrupt
             // them with another load() which will cancel the pending one, but since we don't call
             // load() explicitly, it shouldn't be a problem. - Dave
-            element.play()
+            await element.play();
         } catch (e) {
             logger.info("Failed to play media element with feed", this.props.feed, e);
         }
     }
 
     private stopMedia() {
-        const element = this.element.current;
+        const element = this.element;
         if (!element) return;
 
         element.pause();
@@ -109,7 +163,17 @@ export default class VideoFeed extends React.Component<IProps, IState> {
             audioMuted: this.props.feed.isAudioMuted(),
             videoMuted: this.props.feed.isVideoMuted(),
         });
-        this.playMedia();
+    };
+
+    private onMuteStateChanged = () => {
+        this.setState({
+            audioMuted: this.props.feed.isAudioMuted(),
+            videoMuted: this.props.feed.isVideoMuted(),
+        });
+    };
+
+    private onSpeaking = (speaking: boolean): void => {
+        this.setState({ speaking });
     };
 
     private onResize = (e) => {
@@ -119,35 +183,60 @@ export default class VideoFeed extends React.Component<IProps, IState> {
     };
 
     render() {
-        const videoClasses = {
-            mx_VideoFeed: true,
-            mx_VideoFeed_local: this.props.feed.isLocal(),
-            mx_VideoFeed_remote: !this.props.feed.isLocal(),
+        const { pipMode, primary, feed } = this.props;
+
+        const wrapperClasses = classnames("mx_VideoFeed", {
             mx_VideoFeed_voice: this.state.videoMuted,
-            mx_VideoFeed_video: !this.state.videoMuted,
-            mx_VideoFeed_mirror: (
-                this.props.feed.isLocal() &&
-                SettingsStore.getValue('VideoView.flipVideoHorizontally')
-            ),
-        };
+            mx_VideoFeed_speaking: this.state.speaking,
+        });
+        const micIconClasses = classnames("mx_VideoFeed_mic", {
+            mx_VideoFeed_mic_muted: this.state.audioMuted,
+            mx_VideoFeed_mic_unmuted: !this.state.audioMuted,
+        });
 
-        if (this.state.videoMuted) {
-            const member = this.props.feed.getMember();
-            const avatarSize = this.props.pipMode ? 76 : 160;
-
-            return (
-                <div className={classnames(videoClasses)} >
-                    <MemberAvatar
-                        member={member}
-                        height={avatarSize}
-                        width={avatarSize}
-                    />
-                </div>
-            );
-        } else {
-            return (
-                <video className={classnames(videoClasses)} ref={this.element} />
+        let micIcon;
+        if (feed.purpose !== SDPStreamMetadataPurpose.Screenshare && !pipMode) {
+            micIcon = (
+                <div className={micIconClasses} />
             );
         }
+
+        let content;
+        if (this.state.videoMuted) {
+            const member = this.props.feed.getMember();
+
+            let avatarSize;
+            if (pipMode && primary) avatarSize = 76;
+            else if (pipMode && !primary) avatarSize = 16;
+            else if (!pipMode && primary) avatarSize = 160;
+            else; // TBD
+
+            content =(
+                <MemberAvatar
+                    member={member}
+                    height={avatarSize}
+                    width={avatarSize}
+                />
+            );
+        } else {
+            const videoClasses = classnames("mx_VideoFeed_video", {
+                mx_VideoFeed_video_mirror: (
+                    this.props.feed.isLocal() &&
+                    this.props.feed.purpose === SDPStreamMetadataPurpose.Usermedia &&
+                    SettingsStore.getValue('VideoView.flipVideoHorizontally')
+                ),
+            });
+
+            content= (
+                <video className={videoClasses} ref={this.setElementRef} />
+            );
+        }
+
+        return (
+            <div className={wrapperClasses}>
+                { micIcon }
+                { content }
+            </div>
+        );
     }
 }
diff --git a/src/contexts/MatrixClientContext.tsx b/src/contexts/MatrixClientContext.tsx
new file mode 100644
index 0000000000..292c1e34d8
--- /dev/null
+++ b/src/contexts/MatrixClientContext.tsx
@@ -0,0 +1,46 @@
+/*
+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, { ComponentClass, createContext, forwardRef, useContext } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+const MatrixClientContext = createContext<MatrixClient>(undefined);
+MatrixClientContext.displayName = "MatrixClientContext";
+export default MatrixClientContext;
+
+export interface MatrixClientProps {
+    mxClient: MatrixClient;
+}
+
+const matrixHOC = <ComposedComponentProps extends {}>(
+    ComposedComponent: ComponentClass<ComposedComponentProps>,
+) => {
+    type ComposedComponentInstance = InstanceType<typeof ComposedComponent>;
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+
+    const TypedComponent = ComposedComponent;
+
+    return forwardRef<ComposedComponentInstance, Omit<ComposedComponentProps, 'mxClient'>>(
+        (props, ref) => {
+            const client = useContext(MatrixClientContext);
+
+            // @ts-ignore
+            return <TypedComponent ref={ref} {...props} mxClient={client} />;
+        },
+    );
+};
+export const withMatrixClientHOC = matrixHOC;
diff --git a/src/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
index e925f8624b..a57c14d90f 100644
--- a/src/contexts/RoomContext.ts
+++ b/src/contexts/RoomContext.ts
@@ -16,10 +16,15 @@ limitations under the License.
 
 import { createContext } from "react";
 
-import { IState } from "../components/structures/RoomView";
+import { IRoomState } from "../components/structures/RoomView";
 import { Layout } from "../settings/Layout";
 
-const RoomContext = createContext<IState>({
+export enum TimelineRenderingType {
+    Room,
+    Thread
+}
+
+const RoomContext = createContext<IRoomState>({
     roomLoading: true,
     peekLoading: false,
     shouldPeek: true,
@@ -31,7 +36,6 @@ const RoomContext = createContext<IState>({
     canPeek: false,
     showApps: false,
     isPeeking: false,
-    showReadReceipts: true,
     showRightPanel: true,
     joining: false,
     atEndOfLiveTimeline: true,
@@ -41,8 +45,21 @@ const RoomContext = createContext<IState>({
     canReact: false,
     canReply: false,
     layout: Layout.Group,
+    lowBandwidth: false,
+    alwaysShowTimestamps: false,
+    showTwelveHourTimestamps: false,
+    readMarkerInViewThresholdMs: 3000,
+    readMarkerOutOfViewThresholdMs: 30000,
+    showHiddenEventsInTimeline: false,
+    showReadReceipts: true,
+    showRedactions: true,
+    showJoinLeaves: true,
+    showAvatarChanges: true,
+    showDisplaynameChanges: true,
     matrixClientIsReady: false,
     dragCounter: 0,
+    timelineRenderingType: TimelineRenderingType.Room,
+    liveTimeline: undefined,
 });
 RoomContext.displayName = "RoomContext";
 export default RoomContext;
diff --git a/src/createRoom.ts b/src/createRoom.ts
index c6507b1380..25e7257289 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -17,11 +17,19 @@ 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 { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { EventType, RoomCreateTypeField, RoomType } from "matrix-js-sdk/src/@types/event";
+import { ICreateRoomOpts } from "matrix-js-sdk/src/@types/requests";
+import {
+    HistoryVisibility,
+    JoinRule,
+    Preset,
+    RestrictedAllowType,
+    Visibility,
+} from "matrix-js-sdk/src/@types/partials";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
-import * as sdk from './index';
 import { _t } from './languageHandler';
 import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
@@ -34,67 +42,29 @@ import { isJoinedOrNearlyJoined } from "./utils/membership";
 import { VIRTUAL_ROOM_EVENT_TYPE } from "./CallHandler";
 import SpaceStore from "./stores/SpaceStore";
 import { makeSpaceParentEvent } from "./utils/space";
-import { Action } from "./dispatcher/actions"
+import { Action } from "./dispatcher/actions";
+import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+import Spinner from "./components/views/elements/Spinner";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
 
-// TODO move these interfaces over to js-sdk once it has been typescripted enough to accept them
-export enum Visibility {
-    Public = "public",
-    Private = "private",
-}
-
-export enum Preset {
-    PrivateChat = "private_chat",
-    TrustedPrivateChat = "trusted_private_chat",
-    PublicChat = "public_chat",
-}
-
-interface Invite3PID {
-    id_server: string;
-    id_access_token?: string; // this gets injected by the js-sdk
-    medium: string;
-    address: string;
-}
-
-export interface IStateEvent {
-    type: string;
-    state_key?: string; // defaults to an empty string
-    content: object;
-}
-
-interface ICreateOpts {
-    visibility?: Visibility;
-    room_alias_name?: string;
-    name?: string;
-    topic?: string;
-    invite?: string[];
-    invite_3pid?: Invite3PID[];
-    room_version?: string;
-    creation_content?: object;
-    initial_state?: IStateEvent[];
-    preset?: Preset;
-    is_direct?: boolean;
-    power_level_content_override?: object;
-}
-
 export interface IOpts {
     dmUserId?: string;
-    createOpts?: ICreateOpts;
+    createOpts?: ICreateRoomOpts;
     spinner?: boolean;
     guestAccess?: boolean;
     encryption?: boolean;
     inlineErrors?: boolean;
     andView?: boolean;
     associatedWithCommunity?: string;
+    avatar?: File | string; // will upload if given file, else mxcUrl is needed
+    roomType?: RoomType | string;
+    historyVisibility?: HistoryVisibility;
     parentSpace?: Room;
-}
-
-export interface IInvite3PID {
-    id_server: string,
-    medium: 'email',
-    address: string,
+    // contextually only makes sense if parentSpace is specified, if true then will be added to parentSpace as suggested
+    suggested?: boolean;
+    joinRule?: JoinRule;
 }
 
 /**
@@ -116,7 +86,7 @@ export interface IInvite3PID {
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
  */
-export default function createRoom(opts: IOpts): Promise<string | null> {
+export default async function createRoom(opts: IOpts): Promise<string | null> {
     opts = opts || {};
     if (opts.spinner === undefined) opts.spinner = true;
     if (opts.guestAccess === undefined) opts.guestAccess = true;
@@ -124,19 +94,16 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
 
     const startTime = CountlyAnalytics.getTimestamp();
 
-    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-    const Loader = sdk.getComponent("elements.Spinner");
-
     const client = MatrixClientPeg.get();
     if (client.isGuest()) {
-        dis.dispatch({action: 'require_registration'});
-        return Promise.resolve(null);
+        dis.dispatch({ action: 'require_registration' });
+        return null;
     }
 
     const defaultPreset = opts.dmUserId ? Preset.TrustedPrivateChat : Preset.PrivateChat;
 
     // set some defaults for the creation
-    const createOpts = opts.createOpts || {};
+    const createOpts: ICreateRoomOpts = opts.createOpts || {};
     createOpts.preset = createOpts.preset || defaultPreset;
     createOpts.visibility = createOpts.visibility || Visibility.Private;
     if (opts.dmUserId && createOpts.invite === undefined) {
@@ -156,6 +123,13 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
         createOpts.is_direct = true;
     }
 
+    if (opts.roomType) {
+        createOpts.creation_content = {
+            ...createOpts.creation_content,
+            [RoomCreateTypeField]: opts.roomType,
+        };
+    }
+
     // By default, view the room after creating it
     if (opts.andView === undefined) {
         opts.andView = true;
@@ -187,17 +161,62 @@ 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({
+        createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
+        if (!opts.historyVisibility) {
+            opts.historyVisibility = createOpts.preset === Preset.PublicChat
+                ? HistoryVisibility.WorldReadable
+                : HistoryVisibility.Invited;
+        }
+
+        if (opts.joinRule === JoinRule.Restricted) {
+            if (SpaceStore.instance.restrictedJoinRuleSupport?.preferred) {
+                createOpts.room_version = SpaceStore.instance.restrictedJoinRuleSupport.preferred;
+
+                createOpts.initial_state.push({
+                    type: EventType.RoomJoinRules,
+                    content: {
+                        "join_rule": JoinRule.Restricted,
+                        "allow": [{
+                            "type": RestrictedAllowType.RoomMembership,
+                            "room_id": opts.parentSpace.roomId,
+                        }],
+                    },
+                });
+            }
+        }
+    }
+
+    // we handle the restricted join rule in the parentSpace handling block above
+    if (opts.joinRule && opts.joinRule !== JoinRule.Restricted) {
+        createOpts.initial_state.push({
+            type: EventType.RoomJoinRules,
+            content: { join_rule: opts.joinRule },
+        });
+    }
+
+    if (opts.avatar) {
+        let url = opts.avatar;
+        if (opts.avatar instanceof File) {
+            url = await client.uploadContent(opts.avatar);
+        }
+
+        createOpts.initial_state.push({
+            type: EventType.RoomAvatar,
+            content: { url },
+        });
+    }
+
+    if (opts.historyVisibility) {
+        createOpts.initial_state.push({
             type: EventType.RoomHistoryVisibility,
             content: {
-                "history_visibility": opts.createOpts.preset === Preset.PublicChat ? "world_readable" : "invited",
+                "history_visibility": opts.historyVisibility,
             },
         });
     }
 
     let modal;
-    if (opts.spinner) modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
+    if (opts.spinner) modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
 
     let roomId;
     return client.createRoom(createOpts).finally(function() {
@@ -211,7 +230,7 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
         }
     }).then(() => {
         if (opts.parentSpace) {
-            return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], true);
+            return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], opts.suggested);
         }
         if (opts.associatedWithCommunity) {
             return GroupStore.addRoomToGroup(opts.associatedWithCommunity, roomId, false);
@@ -293,11 +312,11 @@ export function findDMForUser(client: MatrixClient, userId: string): Room {
  * NOTE: this assumes you've just created the room and there's not been an opportunity
  * for other code to run, so we shouldn't miss RoomState.newMember when it comes by.
  */
-export async function _waitForMember(client: MatrixClient, roomId: string, userId: string, opts = { timeout: 1500 }) {
+export async function waitForMember(client: MatrixClient, roomId: string, userId: string, opts = { timeout: 1500 }) {
     const { timeout } = opts;
     let handler;
     return new Promise((resolve) => {
-        handler = function(_event, _roomstate, member) {
+        handler = function(_, __, member: RoomMember) { // eslint-disable-line @typescript-eslint/naming-convention
             if (member.userId !== userId) return;
             if (member.roomId !== roomId) return;
             resolve(true);
@@ -369,8 +388,8 @@ export async function ensureDMExists(client: MatrixClient, userId: string): Prom
             encryption = await canEncryptToAllUsers(client, [userId]);
         }
 
-        roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
-        await _waitForMember(client, roomId, userId);
+        roomId = await createRoom({ encryption, dmUserId: userId, spinner: false, andView: false });
+        await waitForMember(client, roomId, userId);
     }
     return roomId;
 }
diff --git a/src/customisations/Alias.ts b/src/customisations/Alias.ts
new file mode 100644
index 0000000000..fcf6742193
--- /dev/null
+++ b/src/customisations/Alias.ts
@@ -0,0 +1,31 @@
+/*
+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.
+*/
+
+function getDisplayAliasForAliasSet(canonicalAlias: string, altAliases: string[]): string {
+    // E.g. prefer one of the aliases over another
+    return null;
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IAliasCustomisations {
+    getDisplayAliasForAliasSet?: typeof getDisplayAliasForAliasSet;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up `IAliasCustomisations`.
+export default {} as IAliasCustomisations;
diff --git a/src/customisations/Directory.ts b/src/customisations/Directory.ts
new file mode 100644
index 0000000000..7ed4706c7d
--- /dev/null
+++ b/src/customisations/Directory.ts
@@ -0,0 +1,31 @@
+/*
+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.
+*/
+
+function requireCanonicalAliasAccessToPublish(): boolean {
+    // Some environments may not care about this requirement and could return false
+    return true;
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IDirectoryCustomisations {
+    requireCanonicalAliasAccessToPublish?: typeof requireCanonicalAliasAccessToPublish;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up `IDirectoryCustomisations`.
+export default {} as IDirectoryCustomisations;
diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index f9d957b60c..ce8f88f6f1 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import {MatrixClientPeg} from "../MatrixClientPeg";
-import {IMediaEventContent, IPreparedMedia, prepEventContentAsMedia} from "./models/IMediaEventContent";
-import {ResizeMethod} from "../Avatar";
-import {MatrixClient} from "matrix-js-sdk/src/client";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { ResizeMethod } from "matrix-js-sdk/src/@types/partials";
+
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { IMediaEventContent, IPreparedMedia, prepEventContentAsMedia } from "./models/IMediaEventContent";
 
 // Populate this class with the details of your customisations when copying it.
 
@@ -74,6 +75,7 @@ export class Media {
      * The HTTP URL for the source media.
      */
     public get srcHttp(): string {
+        // eslint-disable-next-line no-restricted-properties
         return this.client.mxcUrlToHttp(this.srcMxc);
     }
 
@@ -83,6 +85,7 @@ export class Media {
      */
     public get thumbnailHttp(): string | undefined | null {
         if (!this.hasThumbnail) return null;
+        // eslint-disable-next-line no-restricted-properties
         return this.client.mxcUrlToHttp(this.thumbnailMxc);
     }
 
@@ -99,6 +102,7 @@ export class Media {
         // scale using the device pixel ratio to keep images clear
         width = Math.floor(width * window.devicePixelRatio);
         height = Math.floor(height * window.devicePixelRatio);
+        // eslint-disable-next-line no-restricted-properties
         return this.client.mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
     }
 
@@ -113,6 +117,7 @@ export class Media {
         // scale using the device pixel ratio to keep images clear
         width = Math.floor(width * window.devicePixelRatio);
         height = Math.floor(height * window.devicePixelRatio);
+        // eslint-disable-next-line no-restricted-properties
         return this.client.mxcUrlToHttp(this.srcMxc, width, height, mode);
     }
 
@@ -156,5 +161,5 @@ export function mediaFromContent(content: IMediaEventContent, client?: MatrixCli
  * @returns {Media} The media object.
  */
 export function mediaFromMxc(mxc: string, client?: MatrixClient): Media {
-    return mediaFromContent({url: mxc}, client);
+    return mediaFromContent({ url: mxc }, client);
 }
diff --git a/src/customisations/Security.ts b/src/customisations/Security.ts
index e215c5cb24..9083274aa5 100644
--- a/src/customisations/Security.ts
+++ b/src/customisations/Security.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { IMatrixClientCreds } from "../MatrixClientPeg";
 import { Kind as SetupEncryptionKind } from "../toasts/SetupEncryptionToast";
-import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/matrix';
+import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/crypto/api';
 
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 function examineLoginResponse(
@@ -69,11 +69,11 @@ function setupEncryptionNeeded(kind: SetupEncryptionKind): boolean {
 export interface ISecurityCustomisations {
     examineLoginResponse?: typeof examineLoginResponse;
     persistCredentials?: typeof persistCredentials;
-    createSecretStorageKey?: typeof createSecretStorageKey,
-    getSecretStorageKey?: typeof getSecretStorageKey,
-    catchAccessSecretStorageError?: typeof catchAccessSecretStorageError,
-    setupEncryptionNeeded?: typeof setupEncryptionNeeded,
-    getDehydrationKey?: typeof getDehydrationKey,
+    createSecretStorageKey?: typeof createSecretStorageKey;
+    getSecretStorageKey?: typeof getSecretStorageKey;
+    catchAccessSecretStorageError?: typeof catchAccessSecretStorageError;
+    setupEncryptionNeeded?: typeof setupEncryptionNeeded;
+    getDehydrationKey?: typeof getDehydrationKey;
 
     /**
      * When false, disables the post-login UI from showing. If there's
@@ -83,7 +83,7 @@ export interface ISecurityCustomisations {
      * encryption is set up some other way which would circumvent the default
      * UI, such as by presenting alternative UI.
      */
-    SHOW_ENCRYPTION_SETUP_UI?: boolean, // default true
+    SHOW_ENCRYPTION_SETUP_UI?: boolean; // default true
 }
 
 // A real customisation module will define and export one or more of the
diff --git a/src/customisations/WidgetVariables.ts b/src/customisations/WidgetVariables.ts
new file mode 100644
index 0000000000..db3a56436d
--- /dev/null
+++ b/src/customisations/WidgetVariables.ts
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+// Populate this class with the details of your customisations when copying it.
+import { ITemplateParams } from "matrix-widget-api";
+
+/**
+ * Provides a partial set of the variables needed to render any widget. If
+ * variables are missing or not provided then they will be filled with the
+ * application-determined defaults.
+ *
+ * This will not be called until after isReady() resolves.
+ * @returns {Partial<Omit<ITemplateParams, "widgetRoomId">>} The variables.
+ */
+function provideVariables(): Partial<Omit<ITemplateParams, "widgetRoomId">> {
+    return {};
+}
+
+/**
+ * Resolves to whether or not the customisation point is ready for variables
+ * to be provided. This will block widgets being rendered.
+ * @returns {Promise<boolean>} Resolves when ready.
+ */
+async function isReady(): Promise<void> {
+    return; // default no waiting
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IWidgetVariablesCustomisations {
+    provideVariables?: typeof provideVariables;
+
+    // If not provided, the app will assume that the customisation is always ready.
+    isReady?: typeof isReady;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up the interface above.
+export const WidgetVariableCustomisations: IWidgetVariablesCustomisations = {};
diff --git a/src/customisations/models/IMediaEventContent.ts b/src/customisations/models/IMediaEventContent.ts
index fb05d76a4d..a3e0231ebc 100644
--- a/src/customisations/models/IMediaEventContent.ts
+++ b/src/customisations/models/IMediaEventContent.ts
@@ -31,13 +31,26 @@ export interface IEncryptedFile {
     v: string;
 }
 
+export interface IMediaEventInfo {
+    thumbnail_url?: string; // eslint-disable-line camelcase
+    thumbnail_file?: IEncryptedFile; // eslint-disable-line camelcase
+    thumbnail_info?: { // eslint-disable-line camelcase
+        mimetype: string;
+        w?: number;
+        h?: number;
+        size?: number;
+    };
+    mimetype: string;
+    w?: number;
+    h?: number;
+    size?: number;
+}
+
 export interface IMediaEventContent {
+    body?: string;
     url?: string; // required on unencrypted media
     file?: IEncryptedFile; // required for *encrypted* media
-    info?: {
-        thumbnail_url?: string; // eslint-disable-line camelcase
-        thumbnail_file?: IEncryptedFile; // eslint-disable-line camelcase
-    };
+    info?: IMediaEventInfo;
 }
 
 export interface IPreparedMedia extends IMediaObject {
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 300eed2b98..796dbbeeb6 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -56,9 +56,21 @@ export enum Action {
     CheckUpdates = "check_updates",
 
     /**
-     * Focuses the user's cursor to the composer. No additional payload information required.
+     * Focuses the user's cursor to the send message composer. No additional payload information required.
      */
-    FocusComposer = "focus_composer",
+    FocusSendMessageComposer = "focus_send_message_composer",
+
+    /**
+     * Focuses the user's cursor to the edit message composer. No additional payload information required.
+     */
+    FocusEditMessageComposer = "focus_edit_message_composer",
+
+    /**
+     * Focuses the user's cursor to the edit message composer or send message
+     * composer based on the current edit state. No additional payload
+     * information required.
+     */
+    FocusAComposer = "focus_a_composer",
 
     /**
      * Opens the user menu (previously known as the top left menu). No additional payload information required.
@@ -106,6 +118,18 @@ export enum Action {
      */
     DialNumber = "dial_number",
 
+    /**
+     * Start a call transfer to a Matrix ID
+     * payload: TransferCallPayload
+     */
+    TransferCallToMatrixID = "transfer_call_to_matrix_id",
+
+    /**
+     * Start a call transfer to a phone number
+     * payload: TransferCallPayload
+     */
+    TransferCallToPhoneNumber = "transfer_call_to_phone_number",
+
     /**
      * Fired when CallHandler has checked for PSTN protocol support
      * payload: none
@@ -159,4 +183,31 @@ export enum Action {
      * Fired when joining a room failed
      */
     JoinRoomError = "join_room_error",
+
+    /**
+     * Inserts content into the active composer. Should be used with ComposerInsertPayload
+     */
+    ComposerInsert = "composer_insert",
+
+    /**
+     * Switches space. Should be used with SwitchSpacePayload.
+     */
+    SwitchSpace = "switch_space",
+
+    /**
+     * Signals to the visible space hierarchy that a change has occurred an that it should refresh.
+     */
+    UpdateSpaceHierarchy = "update_space_hierarchy",
+
+    /**
+     * Fires when a monitored setting is updated,
+     * see SettingsStore::monitorSetting for more details.
+     * Should be used with SettingUpdatedPayload.
+     */
+    SettingUpdated = "setting_updated",
+
+    /**
+     * Fires when a user starts to edit event (e.g. up arrow in compositor)
+     */
+    EditEvent = "edit_event",
 }
diff --git a/src/dispatcher/dispatcher.ts b/src/dispatcher/dispatcher.ts
index 8330e5cd19..4d8df1ecaa 100644
--- a/src/dispatcher/dispatcher.ts
+++ b/src/dispatcher/dispatcher.ts
@@ -60,7 +60,7 @@ export class MatrixDispatcher extends Dispatcher<ActionPayload> {
      * @see dispatch(action: ActionPayload, sync: boolean)
      */
     fire(action: Action, sync = false) {
-        this.dispatch({action}, sync);
+        this.dispatch({ action }, sync);
     }
 }
 
diff --git a/src/dispatcher/payloads/CheckUpdatesPayload.ts b/src/dispatcher/payloads/CheckUpdatesPayload.ts
index fa4fb3a538..66a4df0fd0 100644
--- a/src/dispatcher/payloads/CheckUpdatesPayload.ts
+++ b/src/dispatcher/payloads/CheckUpdatesPayload.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
-import {UpdateCheckStatus} from "../../BasePlatform";
+import { UpdateCheckStatus } from "../../BasePlatform";
 
 export interface CheckUpdatesPayload extends ActionPayload {
     action: Action.CheckUpdates;
diff --git a/src/dispatcher/payloads/ComposerInsertPayload.ts b/src/dispatcher/payloads/ComposerInsertPayload.ts
new file mode 100644
index 0000000000..ea5d8a0c53
--- /dev/null
+++ b/src/dispatcher/payloads/ComposerInsertPayload.ts
@@ -0,0 +1,42 @@
+/*
+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 { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+interface IBaseComposerInsertPayload extends ActionPayload {
+    action: Action.ComposerInsert;
+}
+
+interface IComposerInsertMentionPayload extends IBaseComposerInsertPayload {
+    userId: string;
+}
+
+interface IComposerInsertQuotePayload extends IBaseComposerInsertPayload {
+    event: MatrixEvent;
+}
+
+interface IComposerInsertPlaintextPayload extends IBaseComposerInsertPayload {
+    text: string;
+}
+
+export type ComposerInsertPayload =
+    IComposerInsertMentionPayload |
+    IComposerInsertQuotePayload |
+    IComposerInsertPlaintextPayload;
+
diff --git a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
index 430fad6145..ea997e4ed1 100644
--- a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
+++ b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
@@ -17,6 +17,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 { User } from "matrix-js-sdk/src/models/user";
 import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
@@ -26,10 +27,15 @@ export interface SetRightPanelPhasePayload extends ActionPayload {
 
     phase: RightPanelPhases;
     refireParams?: SetRightPanelPhaseRefireParams;
+
+    /**
+     * By default SetRightPanelPhase can close the panel, this allows overriding that behaviour
+     */
+    allowClose?: boolean;
 }
 
 export interface SetRightPanelPhaseRefireParams {
-    member?: RoomMember;
+    member?: RoomMember | User;
     verificationRequest?: VerificationRequest;
     groupId?: string;
     groupRoomId?: string;
diff --git a/src/dispatcher/payloads/SettingUpdatedPayload.ts b/src/dispatcher/payloads/SettingUpdatedPayload.ts
new file mode 100644
index 0000000000..8d457facfb
--- /dev/null
+++ b/src/dispatcher/payloads/SettingUpdatedPayload.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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import { SettingLevel } from "../../settings/SettingLevel";
+
+export interface SettingUpdatedPayload extends ActionPayload {
+    action: Action.SettingUpdated;
+
+    settingName: string;
+    roomId: string;
+    level: SettingLevel;
+    newValueAtLevel: SettingLevel;
+    newValue: any;
+}
diff --git a/src/dispatcher/payloads/SwitchSpacePayload.ts b/src/dispatcher/payloads/SwitchSpacePayload.ts
new file mode 100644
index 0000000000..04eb744334
--- /dev/null
+++ b/src/dispatcher/payloads/SwitchSpacePayload.ts
@@ -0,0 +1,27 @@
+/*
+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";
+
+export interface SwitchSpacePayload extends ActionPayload {
+    action: Action.SwitchSpace;
+
+    /**
+     * The number of the space to switch to, 1-indexed, 0 is Home.
+     */
+    num: number;
+}
diff --git a/src/dispatcher/payloads/TransferCallPayload.ts b/src/dispatcher/payloads/TransferCallPayload.ts
new file mode 100644
index 0000000000..38431bb0d6
--- /dev/null
+++ b/src/dispatcher/payloads/TransferCallPayload.ts
@@ -0,0 +1,33 @@
+/*
+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 { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+
+export interface TransferCallPayload extends ActionPayload {
+    action: Action.TransferCallToMatrixID | Action.TransferCallToPhoneNumber;
+    // The call to transfer
+    call: MatrixCall;
+    // Where to transfer the call. A Matrix ID if action == TransferCallToMatrixID
+    // and a phone number if action == TransferCallToPhoneNumber
+    destination: string;
+    // If true, puts the current call on hold and dials the transfer target, giving
+    // the user a button to complete the transfer when ready.
+    // If false, ends the call immediately and sends the user to the transfer
+    // destination
+    consultFirst: boolean;
+}
diff --git a/src/dispatcher/payloads/UploadPayload.ts b/src/dispatcher/payloads/UploadPayload.ts
index 40c2710dd6..023bd5403c 100644
--- a/src/dispatcher/payloads/UploadPayload.ts
+++ b/src/dispatcher/payloads/UploadPayload.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
-import {IUpload} from "../../models/IUpload";
+import { IUpload } from "../../models/IUpload";
 
 interface UploadPayload extends ActionPayload {
     /**
diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts
index c2838d0dbb..c4d73aea6a 100644
--- a/src/dispatcher/payloads/ViewUserPayload.ts
+++ b/src/dispatcher/payloads/ViewUserPayload.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { User } from "matrix-js-sdk/src/models/user";
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
 
@@ -25,5 +26,5 @@ export interface ViewUserPayload extends ActionPayload {
      * The member to view. May be null or falsy to indicate that no member
      * should be shown (hide whichever relevant components).
      */
-    member?: RoomMember;
+    member?: RoomMember | User;
 }
diff --git a/src/editor/autocomplete.ts b/src/editor/autocomplete.ts
index 240ed2d96b..10e1c60695 100644
--- a/src/editor/autocomplete.ts
+++ b/src/editor/autocomplete.ts
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {KeyboardEvent} from "react";
+import { KeyboardEvent } from "react";
 
-import {Part, CommandPartCreator, PartCreator} from "./parts";
+import { Part, CommandPartCreator, PartCreator } from "./parts";
 import DocumentPosition from "./position";
-import {ICompletion} from "../autocomplete/Autocompleter";
+import { ICompletion } from "../autocomplete/Autocompleter";
 import Autocomplete from "../components/views/rooms/Autocomplete";
 
 export interface ICallback {
@@ -32,7 +32,6 @@ export type GetAutocompleterComponent = () => Autocomplete;
 export type UpdateQuery = (test: string) => Promise<void>;
 
 export default class AutocompleteWrapperModel {
-    private queryPart: Part;
     private partIndex: number;
 
     constructor(
@@ -43,81 +42,61 @@ export default class AutocompleteWrapperModel {
     ) {
     }
 
-    public onEscape(e: KeyboardEvent) {
+    public onEscape(e: KeyboardEvent): void {
         this.getAutocompleterComponent().onEscape(e);
-        this.updateCallback({
-            replaceParts: [this.partCreator.plain(this.queryPart.text)],
-            close: true,
-        });
     }
 
-    public close() {
-        this.updateCallback({close: true});
+    public close(): void {
+        this.updateCallback({ close: true });
     }
 
-    public hasSelection() {
+    public hasSelection(): boolean {
         return this.getAutocompleterComponent().hasSelection();
     }
 
-    public hasCompletions() {
+    public hasCompletions(): boolean {
         const ac = this.getAutocompleterComponent();
         return ac && ac.countCompletions() > 0;
     }
 
-    public onEnter() {
-        this.updateCallback({close: true});
+    public async confirmCompletion(): Promise<void> {
+        await this.getAutocompleterComponent().onConfirmCompletion();
+        this.updateCallback({ close: true });
     }
 
     /**
      * If there is no current autocompletion, start one and move to the first selection.
      */
-    public async startSelection() {
+    public async startSelection(): Promise<void> {
         const acComponent = this.getAutocompleterComponent();
         if (acComponent.countCompletions() === 0) {
             // Force completions to show for the text currently entered
             await acComponent.forceComplete();
-            // Select the first item by moving "down"
-            await acComponent.moveSelection(+1);
         }
     }
 
-    public selectPreviousSelection() {
+    public selectPreviousSelection(): void {
         this.getAutocompleterComponent().moveSelection(-1);
     }
 
-    public selectNextSelection() {
+    public selectNextSelection(): void {
         this.getAutocompleterComponent().moveSelection(+1);
     }
 
-    public onPartUpdate(part: Part, pos: DocumentPosition) {
-        // cache the typed value and caret here
-        // so we can restore it in onComponentSelectionChange when the value is undefined (meaning it should be the typed text)
-        this.queryPart = part;
+    public onPartUpdate(part: Part, pos: DocumentPosition): Promise<void> {
         this.partIndex = pos.index;
         return this.updateQuery(part.text);
     }
 
-    public onComponentSelectionChange(completion: ICompletion) {
-        if (!completion) {
-            this.updateCallback({
-                replaceParts: [this.queryPart],
-            });
-        } else {
-            this.updateCallback({
-                replaceParts: this.partForCompletion(completion),
-            });
-        }
-    }
-
-    public onComponentConfirm(completion: ICompletion) {
+    public onComponentConfirm(completion: ICompletion): void {
         this.updateCallback({
             replaceParts: this.partForCompletion(completion),
             close: true,
         });
     }
 
-    private partForCompletion(completion: ICompletion) {
-        const {completionId} = completion;
+    private partForCompletion(completion: ICompletion): Part[] {
+        const { completionId } = completion;
         const text = completion.completion;
         switch (completion.type) {
             case "room":
diff --git a/src/editor/caret.ts b/src/editor/caret.ts
index cb4978caf4..2b5035b567 100644
--- a/src/editor/caret.ts
+++ b/src/editor/caret.ts
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {needsCaretNodeBefore, needsCaretNodeAfter} from "./render";
+import { needsCaretNodeBefore, needsCaretNodeAfter } from "./render";
 import Range from "./range";
 import EditorModel from "./model";
-import DocumentPosition, {IPosition} from "./position";
-import {Part} from "./parts";
+import DocumentPosition, { IPosition } from "./position";
+import { Part, Type } from "./parts";
 
 export type Caret = Range | DocumentPosition;
 
@@ -44,7 +44,7 @@ function setDocumentRangeSelection(editor: HTMLDivElement, model: EditorModel, r
 
 export function setCaretPosition(editor: HTMLDivElement, model: EditorModel, caretPosition: IPosition) {
     const range = document.createRange();
-    const {node, offset} = getNodeAndOffsetForPosition(editor, model, caretPosition);
+    const { node, offset } = getNodeAndOffsetForPosition(editor, model, caretPosition);
     range.setStart(node, offset);
     range.collapse(true);
 
@@ -68,7 +68,7 @@ export function setCaretPosition(editor: HTMLDivElement, model: EditorModel, car
 }
 
 function getNodeAndOffsetForPosition(editor: HTMLDivElement, model: EditorModel, position: IPosition) {
-    const {offset, lineIndex, nodeIndex} = getLineAndNodePosition(model, position);
+    const { offset, lineIndex, nodeIndex } = getLineAndNodePosition(model, position);
     const lineNode = editor.childNodes[lineIndex];
 
     let focusNode;
@@ -82,16 +82,16 @@ function getNodeAndOffsetForPosition(editor: HTMLDivElement, model: EditorModel,
             focusNode = focusNode.firstChild;
         }
     }
-    return {node: focusNode, offset};
+    return { node: focusNode, offset };
 }
 
 export function getLineAndNodePosition(model: EditorModel, caretPosition: IPosition) {
-    const {parts} = model;
+    const { parts } = model;
     const partIndex = caretPosition.index;
     const lineResult = findNodeInLineForPart(parts, partIndex);
-    const {lineIndex} = lineResult;
-    let {nodeIndex} = lineResult;
-    let {offset} = caretPosition;
+    const { lineIndex } = lineResult;
+    let { nodeIndex } = lineResult;
+    let { offset } = caretPosition;
     // we're at an empty line between a newline part
     // and another newline part or end/start of parts.
     // set offset to 0 so it gets set to the <br> inside the line container
@@ -99,9 +99,9 @@ export function getLineAndNodePosition(model: EditorModel, caretPosition: IPosit
         offset = 0;
     } else {
         // move caret out of uneditable part (into caret node, or empty line br) if needed
-        ({nodeIndex, offset} = moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset));
+        ({ nodeIndex, offset } = moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset));
     }
-    return {lineIndex, nodeIndex, offset};
+    return { lineIndex, nodeIndex, offset };
 }
 
 function findNodeInLineForPart(parts: Part[], partIndex: number) {
@@ -113,7 +113,7 @@ function findNodeInLineForPart(parts: Part[], partIndex: number) {
     // to find newline parts
     for (let i = 0; i <= partIndex; ++i) {
         const part = parts[i];
-        if (part.type === "newline") {
+        if (part.type === Type.Newline) {
             lineIndex += 1;
             nodeIndex = -1;
             prevPart = null;
@@ -128,7 +128,7 @@ function findNodeInLineForPart(parts: Part[], partIndex: number) {
             // and not an adjacent caret node
             if (i < partIndex) {
                 const nextPart = parts[i + 1];
-                const isLastOfLine = !nextPart || nextPart.type === "newline";
+                const isLastOfLine = !nextPart || nextPart.type === Type.Newline;
                 if (needsCaretNodeAfter(part, isLastOfLine)) {
                     nodeIndex += 1;
                 }
@@ -137,7 +137,7 @@ function findNodeInLineForPart(parts: Part[], partIndex: number) {
         }
     }
 
-    return {lineIndex, nodeIndex};
+    return { lineIndex, nodeIndex };
 }
 
 function moveOutOfUneditablePart(parts: Part[], partIndex: number, nodeIndex: number, offset: number) {
@@ -159,5 +159,5 @@ function moveOutOfUneditablePart(parts: Part[], partIndex: number, nodeIndex: nu
             offset = 0;
         }
     }
-    return {nodeIndex, offset};
+    return { nodeIndex, offset };
 }
diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index a0c4d74275..14be9f8a92 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -20,7 +20,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { walkDOMDepthFirst } from "./dom";
 import { checkBlockNode } from "../HtmlUtils";
 import { getPrimaryPermalinkEntity } from "../utils/permalinks/Permalinks";
-import { PartCreator } from "./parts";
+import { PartCreator, Type } from "./parts";
 import SdkConfig from "../SdkConfig";
 
 function parseAtRoomMentions(text: string, partCreator: PartCreator) {
@@ -42,7 +42,7 @@ function parseAtRoomMentions(text: string, partCreator: PartCreator) {
 }
 
 function parseLink(a: HTMLAnchorElement, partCreator: PartCreator) {
-    const {href} = a;
+    const { href } = a;
     const resourceId = getPrimaryPermalinkEntity(href); // The room/user ID
     const prefix = resourceId ? resourceId[0] : undefined; // First character of ID
     switch (prefix) {
@@ -121,6 +121,12 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
             return partCreator.plain(`\`${n.textContent}\``);
         case "DEL":
             return partCreator.plain(`<del>${n.textContent}</del>`);
+        case "SUB":
+            return partCreator.plain(`<sub>${n.textContent}</sub>`);
+        case "SUP":
+            return partCreator.plain(`<sup>${n.textContent}</sup>`);
+        case "U":
+            return partCreator.plain(`<u>${n.textContent}</u>`);
         case "LI": {
             const indent = "  ".repeat(state.listDepth - 1);
             if (n.parentElement.nodeName === "OL") {
@@ -200,7 +206,7 @@ function prefixQuoteLines(isFirstNode, parts, partCreator) {
         parts.splice(0, 0, partCreator.plain(QUOTE_LINE_PREFIX));
     }
     for (let i = 0; i < parts.length; i += 1) {
-        if (parts[i].type === "newline") {
+        if (parts[i].type === Type.Newline) {
             parts.splice(i + 1, 0, partCreator.plain(QUOTE_LINE_PREFIX));
             i += 1;
         }
@@ -297,7 +303,7 @@ export function parsePlainTextMessage(body: string, partCreator: PartCreator, is
     }, []);
 }
 
-export function parseEvent(event: MatrixEvent, partCreator: PartCreator, {isQuotedMessage = false} = {}) {
+export function parseEvent(event: MatrixEvent, partCreator: PartCreator, { isQuotedMessage = false } = {}) {
     const content = event.getContent();
     let parts;
     if (content.format === "org.matrix.custom.html") {
diff --git a/src/editor/diff.ts b/src/editor/diff.ts
index cda454306a..5cf94560ce 100644
--- a/src/editor/diff.ts
+++ b/src/editor/diff.ts
@@ -21,7 +21,7 @@ export interface IDiff {
     at?: number;
 }
 
-function firstDiff(a: string, b: string) {
+function firstDiff(a: string, b: string): number {
     const compareLen = Math.min(a.length, b.length);
     for (let i = 0; i < compareLen; ++i) {
         if (a[i] !== b[i]) {
@@ -35,9 +35,9 @@ function diffStringsAtEnd(oldStr: string, newStr: string): IDiff {
     const len = Math.min(oldStr.length, newStr.length);
     const startInCommon = oldStr.substr(0, len) === newStr.substr(0, len);
     if (startInCommon && oldStr.length > newStr.length) {
-        return {removed: oldStr.substr(len), at: len};
+        return { removed: oldStr.substr(len), at: len };
     } else if (startInCommon && oldStr.length < newStr.length) {
-        return {added: newStr.substr(len), at: len};
+        return { added: newStr.substr(len), at: len };
     } else {
         const commonStartLen = firstDiff(oldStr, newStr);
         return {
@@ -55,7 +55,7 @@ export function diffDeletion(oldStr: string, newStr: string): IDiff {
     }
     const firstDiffIdx = firstDiff(oldStr, newStr);
     const amount = oldStr.length - newStr.length;
-    return {at: firstDiffIdx, removed: oldStr.substr(firstDiffIdx, amount)};
+    return { at: firstDiffIdx, removed: oldStr.substr(firstDiffIdx, amount) };
 }
 
 /**
diff --git a/src/editor/dom.ts b/src/editor/dom.ts
index 1ca41553f4..6226f74acb 100644
--- a/src/editor/dom.ts
+++ b/src/editor/dom.ts
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {CARET_NODE_CHAR, isCaretNode} from "./render";
+import { CARET_NODE_CHAR, isCaretNode } from "./render";
 import DocumentOffset from "./offset";
 
 type Predicate = (node: Node) => boolean;
@@ -44,8 +44,8 @@ export function walkDOMDepthFirst(rootNode: Node, enterNodeCallback: Predicate,
 }
 
 export function getCaretOffsetAndText(editor: HTMLDivElement, sel: Selection) {
-    const {offset, text} = getSelectionOffsetAndText(editor, sel.focusNode, sel.focusOffset);
-    return {caret: offset, text};
+    const { offset, text } = getSelectionOffsetAndText(editor, sel.focusNode, sel.focusOffset);
+    return { caret: offset, text };
 }
 
 function tryReduceSelectionToTextNode(selectionNode: Node, selectionOffset: number) {
@@ -86,10 +86,10 @@ function tryReduceSelectionToTextNode(selectionNode: Node, selectionOffset: numb
 }
 
 function getSelectionOffsetAndText(editor: HTMLDivElement, selectionNode: Node, selectionOffset: number) {
-    const {node, characterOffset} = tryReduceSelectionToTextNode(selectionNode, selectionOffset);
-    const {text, offsetToNode} = getTextAndOffsetToNode(editor, node);
+    const { node, characterOffset } = tryReduceSelectionToTextNode(selectionNode, selectionOffset);
+    const { text, offsetToNode } = getTextAndOffsetToNode(editor, node);
     const offset = getCaret(node, offsetToNode, characterOffset);
-    return {offset, text};
+    return { offset, text };
 }
 
 // gets the caret position details, ignoring and adjusting to
@@ -163,7 +163,7 @@ function getTextAndOffsetToNode(editor: HTMLDivElement, selectionNode: Node) {
 
     walkDOMDepthFirst(editor, enterNodeCallback, leaveNodeCallback);
 
-    return {text, offsetToNode};
+    return { text, offsetToNode };
 }
 
 // get text value of text node, ignoring ZWS if it's a caret node
diff --git a/src/editor/history.ts b/src/editor/history.ts
index d2c96a3755..7764dbf682 100644
--- a/src/editor/history.ts
+++ b/src/editor/history.ts
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 import EditorModel from "./model";
-import {IDiff} from "./diff";
-import {SerializedPart} from "./parts";
-import {Caret} from "./caret";
+import { IDiff } from "./diff";
+import { SerializedPart } from "./parts";
+import { Caret } from "./caret";
 
 interface IHistory {
     parts: SerializedPart[];
@@ -36,7 +36,7 @@ export default class HistoryManager {
     private addedSinceLastPush = false;
     private removedSinceLastPush = false;
 
-    clear() {
+    public clear(): void {
         this.stack = [];
         this.newlyTypedCharCount = 0;
         this.currentIndex = -1;
@@ -92,7 +92,7 @@ export default class HistoryManager {
             this.stack.pop();
         }
         const parts = model.serializeParts();
-        this.stack.push({parts, caret});
+        this.stack.push({ parts, caret });
         this.currentIndex = this.stack.length - 1;
         this.lastCaret = null;
         this.changedSinceLastPush = false;
@@ -103,7 +103,7 @@ export default class HistoryManager {
     }
 
     // needs to persist parts and caret position
-    tryPush(model: EditorModel, caret: Caret, inputType: string, diff: IDiff) {
+    public tryPush(model: EditorModel, caret: Caret, inputType: string, diff: IDiff): boolean {
         // ignore state restoration echos.
         // these respect the inputType values of the input event,
         // but are actually passed in from MessageEditor calling model.reset()
@@ -121,22 +121,22 @@ export default class HistoryManager {
         return shouldPush;
     }
 
-    ensureLastChangesPushed(model: EditorModel) {
+    public ensureLastChangesPushed(model: EditorModel): void {
         if (this.changedSinceLastPush) {
             this.pushState(model, this.lastCaret);
         }
     }
 
-    canUndo() {
+    public canUndo(): boolean {
         return this.currentIndex >= 1 || this.changedSinceLastPush;
     }
 
-    canRedo() {
+    public canRedo(): boolean {
         return this.currentIndex < (this.stack.length - 1);
     }
 
     // returns state that should be applied to model
-    undo(model: EditorModel) {
+    public undo(model: EditorModel): IHistory {
         if (this.canUndo()) {
             this.ensureLastChangesPushed(model);
             this.currentIndex -= 1;
@@ -145,7 +145,7 @@ export default class HistoryManager {
     }
 
     // returns state that should be applied to model
-    redo() {
+    public redo(): IHistory {
         if (this.canRedo()) {
             this.changedSinceLastPush = false;
             this.currentIndex += 1;
diff --git a/src/editor/model.ts b/src/editor/model.ts
index f1b6f90957..212a7d17c0 100644
--- a/src/editor/model.ts
+++ b/src/editor/model.ts
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {diffAtCaret, diffDeletion, IDiff} from "./diff";
-import DocumentPosition, {IPosition} from "./position";
+import { diffAtCaret, diffDeletion, IDiff } from "./diff";
+import DocumentPosition, { IPosition } from "./position";
 import Range from "./range";
-import {SerializedPart, Part, PartCreator} from "./parts";
-import AutocompleteWrapperModel, {ICallback} from "./autocomplete";
+import { SerializedPart, Part, PartCreator } from "./parts";
+import AutocompleteWrapperModel, { ICallback } from "./autocomplete";
 import DocumentOffset from "./offset";
-import {Caret} from "./caret";
+import { Caret } from "./caret";
 
 /**
  * @callback ModelCallback
@@ -70,7 +70,7 @@ export default class EditorModel {
      * on the model that can span multiple parts. Also see `startRange()`.
      * @param {TransformCallback} transformCallback
      */
-    setTransformCallback(transformCallback: TransformCallback) {
+    public setTransformCallback(transformCallback: TransformCallback): void {
         this.transformCallback = transformCallback;
     }
 
@@ -78,23 +78,23 @@ export default class EditorModel {
      * Set a callback for rerendering the model after it has been updated.
      * @param {ModelCallback} updateCallback
      */
-    setUpdateCallback(updateCallback: UpdateCallback) {
+    public setUpdateCallback(updateCallback: UpdateCallback): void {
         this.updateCallback = updateCallback;
     }
 
-    get partCreator() {
+    public get partCreator(): PartCreator {
         return this._partCreator;
     }
 
-    get isEmpty() {
+    public get isEmpty(): boolean {
         return this._parts.reduce((len, part) => len + part.text.length, 0) === 0;
     }
 
-    clone() {
+    public clone(): EditorModel {
         return new EditorModel(this._parts, this._partCreator, this.updateCallback);
     }
 
-    private insertPart(index: number, part: Part) {
+    private insertPart(index: number, part: Part): void {
         this._parts.splice(index, 0, part);
         if (this.activePartIdx >= index) {
             ++this.activePartIdx;
@@ -104,7 +104,7 @@ export default class EditorModel {
         }
     }
 
-    private removePart(index: number) {
+    private removePart(index: number): void {
         this._parts.splice(index, 1);
         if (index === this.activePartIdx) {
             this.activePartIdx = null;
@@ -118,22 +118,22 @@ export default class EditorModel {
         }
     }
 
-    private replacePart(index: number, part: Part) {
+    private replacePart(index: number, part: Part): void {
         this._parts.splice(index, 1, part);
     }
 
-    get parts() {
+    public get parts(): Part[] {
         return this._parts;
     }
 
-    get autoComplete() {
+    public get autoComplete(): AutocompleteWrapperModel {
         if (this.activePartIdx === this.autoCompletePartIdx) {
             return this._autoComplete;
         }
         return null;
     }
 
-    getPositionAtEnd() {
+    public getPositionAtEnd(): DocumentPosition {
         if (this._parts.length) {
             const index = this._parts.length - 1;
             const part = this._parts[index];
@@ -144,11 +144,11 @@ export default class EditorModel {
         }
     }
 
-    serializeParts() {
+    public serializeParts(): SerializedPart[] {
         return this._parts.map(p => p.serialize());
     }
 
-    private diff(newValue: string, inputType: string, caret: DocumentOffset) {
+    private diff(newValue: string, inputType: string, caret: DocumentOffset): IDiff {
         const previousValue = this.parts.reduce((text, p) => text + p.text, "");
         // can't use caret position with drag and drop
         if (inputType === "deleteByDrag") {
@@ -158,7 +158,7 @@ export default class EditorModel {
         }
     }
 
-    reset(serializedParts: SerializedPart[], caret?: Caret, inputType?: string) {
+    public reset(serializedParts: SerializedPart[], caret?: Caret, inputType?: string): void {
         this._parts = serializedParts.map(p => this._partCreator.deserializePart(p));
         if (!caret) {
             caret = this.getPositionAtEnd();
@@ -180,7 +180,7 @@ export default class EditorModel {
      * @param {DocumentPosition} position the position to start inserting at
      * @return {Number} the amount of characters added
      */
-    insert(parts: Part[], position: IPosition) {
+    public insert(parts: Part[], position: IPosition): number {
         const insertIndex = this.splitAt(position);
         let newTextLength = 0;
         for (let i = 0; i < parts.length; ++i) {
@@ -191,7 +191,7 @@ export default class EditorModel {
         return newTextLength;
     }
 
-    update(newValue: string, inputType: string, caret: DocumentOffset) {
+    public update(newValue: string, inputType: string, caret: DocumentOffset): Promise<void> {
         const diff = this.diff(newValue, inputType, caret);
         const position = this.positionForOffset(diff.at, caret.atNodeEnd);
         let removedOffsetDecrease = 0;
@@ -220,8 +220,8 @@ export default class EditorModel {
         return Number.isFinite(result) ? result as number : 0;
     }
 
-    private setActivePart(pos: DocumentPosition, canOpenAutoComplete: boolean) {
-        const {index} = pos;
+    private setActivePart(pos: DocumentPosition, canOpenAutoComplete: boolean): Promise<void> {
+        const { index } = pos;
         const part = this._parts[index];
         if (part) {
             if (index !== this.activePartIdx) {
@@ -237,7 +237,7 @@ export default class EditorModel {
                     }
                 }
             }
-            // not _autoComplete, only there if active part is autocomplete part
+            // not autoComplete, only there if active part is autocomplete part
             if (this.autoComplete) {
                 return this.autoComplete.onPartUpdate(part, pos);
             }
@@ -250,7 +250,7 @@ export default class EditorModel {
         return Promise.resolve();
     }
 
-    private onAutoComplete = ({replaceParts, close}: ICallback) => {
+    private onAutoComplete = ({ replaceParts, close }: ICallback): void => {
         let pos;
         if (replaceParts) {
             this._parts.splice(this.autoCompletePartIdx, this.autoCompletePartCount, ...replaceParts);
@@ -270,7 +270,7 @@ export default class EditorModel {
         this.updateCallback(pos);
     };
 
-    private mergeAdjacentParts() {
+    private mergeAdjacentParts(): void {
         let prevPart;
         for (let i = 0; i < this._parts.length; ++i) {
             let part = this._parts[i];
@@ -294,8 +294,8 @@ export default class EditorModel {
      * @return {Number} how many characters before pos were also removed,
      * usually because of non-editable parts that can only be removed in their entirety.
      */
-    removeText(pos: IPosition, len: number) {
-        let {index, offset} = pos;
+    public removeText(pos: IPosition, len: number): number {
+        let { index, offset } = pos;
         let removedOffsetDecrease = 0;
         while (len > 0) {
             // part might be undefined here
@@ -329,7 +329,7 @@ export default class EditorModel {
     }
 
     // return part index where insertion will insert between at offset
-    private splitAt(pos: IPosition) {
+    private splitAt(pos: IPosition): number {
         if (pos.index === -1) {
             return 0;
         }
@@ -356,9 +356,9 @@ export default class EditorModel {
      * @return {Number} how far from position (in characters) the insertion ended.
      * This can be more than the length of `str` when crossing non-editable parts, which are skipped.
      */
-    private addText(pos: IPosition, str: string, inputType: string) {
-        let {index} = pos;
-        const {offset} = pos;
+    private addText(pos: IPosition, str: string, inputType: string): number {
+        let { index } = pos;
+        const { offset } = pos;
         let addLen = str.length;
         const part = this._parts[index];
         if (part) {
@@ -390,7 +390,7 @@ export default class EditorModel {
         return addLen;
     }
 
-    positionForOffset(totalOffset: number, atPartEnd: boolean) {
+    public positionForOffset(totalOffset: number, atPartEnd = false): DocumentPosition {
         let currentOffset = 0;
         const index = this._parts.findIndex(part => {
             const partLen = part.text.length;
@@ -416,11 +416,11 @@ export default class EditorModel {
      * @param {DocumentPosition?} positionB the other boundary of the range, optional
      * @return {Range}
      */
-    startRange(positionA: DocumentPosition, positionB = positionA) {
+    public startRange(positionA: DocumentPosition, positionB = positionA): Range {
         return new Range(this, positionA, positionB);
     }
 
-    replaceRange(startPosition: DocumentPosition, endPosition: DocumentPosition, parts: Part[]) {
+    public replaceRange(startPosition: DocumentPosition, endPosition: DocumentPosition, parts: Part[]): void {
         // convert end position to offset, so it is independent of how the document is split into parts
         // which we'll change when splitting up at the start position
         const endOffset = endPosition.asOffset(this);
@@ -445,9 +445,9 @@ export default class EditorModel {
      * @param {ManualTransformCallback} callback to run the transformations in
      * @return {Promise} a promise when auto-complete (if applicable) is done updating
      */
-    transform(callback: ManualTransformCallback) {
+    public transform(callback: ManualTransformCallback): Promise<void> {
         const pos = callback();
-        let acPromise = null;
+        let acPromise: Promise<void> = null;
         if (!(pos instanceof Range)) {
             acPromise = this.setActivePart(pos, true);
         } else {
diff --git a/src/editor/offset.ts b/src/editor/offset.ts
index 413a22c71b..2e6e0ffe21 100644
--- a/src/editor/offset.ts
+++ b/src/editor/offset.ts
@@ -15,16 +15,17 @@ limitations under the License.
 */
 
 import EditorModel from "./model";
+import DocumentPosition from "./position";
 
 export default class DocumentOffset {
     constructor(public offset: number, public readonly atNodeEnd: boolean) {
     }
 
-    asPosition(model: EditorModel) {
+    public asPosition(model: EditorModel): DocumentPosition {
         return model.positionForOffset(this.offset, this.atNodeEnd);
     }
 
-    add(delta: number, atNodeEnd = false) {
+    public add(delta: number, atNodeEnd = false): DocumentOffset {
         return new DocumentOffset(this.offset + delta, atNodeEnd);
     }
 }
diff --git a/src/editor/operations.ts b/src/editor/operations.ts
index 3f07139de3..2ff09ccce6 100644
--- a/src/editor/operations.ts
+++ b/src/editor/operations.ts
@@ -15,14 +15,14 @@ limitations under the License.
 */
 
 import Range from "./range";
-import {Part} from "./parts";
+import { Part, Type } from "./parts";
 
 /**
  * Some common queries and transformations on the editor model
  */
 
-export function replaceRangeAndExpandSelection(range: Range, newParts: Part[]) {
-    const {model} = range;
+export function replaceRangeAndExpandSelection(range: Range, newParts: Part[]): void {
+    const { model } = range;
     model.transform(() => {
         const oldLen = range.length;
         const addedLen = range.replace(newParts);
@@ -32,8 +32,8 @@ export function replaceRangeAndExpandSelection(range: Range, newParts: Part[]) {
     });
 }
 
-export function replaceRangeAndMoveCaret(range: Range, newParts: Part[]) {
-    const {model} = range;
+export function replaceRangeAndMoveCaret(range: Range, newParts: Part[]): void {
+    const { model } = range;
     model.transform(() => {
         const oldLen = range.length;
         const addedLen = range.replace(newParts);
@@ -43,29 +43,29 @@ export function replaceRangeAndMoveCaret(range: Range, newParts: Part[]) {
     });
 }
 
-export function rangeStartsAtBeginningOfLine(range: Range) {
-    const {model} = range;
+export function rangeStartsAtBeginningOfLine(range: Range): boolean {
+    const { model } = range;
     const startsWithPartial = range.start.offset !== 0;
     const isFirstPart = range.start.index === 0;
-    const previousIsNewline = !isFirstPart && model.parts[range.start.index - 1].type === "newline";
+    const previousIsNewline = !isFirstPart && model.parts[range.start.index - 1].type === Type.Newline;
     return !startsWithPartial && (isFirstPart || previousIsNewline);
 }
 
-export function rangeEndsAtEndOfLine(range: Range) {
-    const {model} = range;
+export function rangeEndsAtEndOfLine(range: Range): boolean {
+    const { model } = range;
     const lastPart = model.parts[range.end.index];
     const endsWithPartial = range.end.offset !== lastPart.text.length;
     const isLastPart = range.end.index === model.parts.length - 1;
-    const nextIsNewline = !isLastPart && model.parts[range.end.index + 1].type === "newline";
+    const nextIsNewline = !isLastPart && model.parts[range.end.index + 1].type === Type.Newline;
     return !endsWithPartial && (isLastPart || nextIsNewline);
 }
 
-export function formatRangeAsQuote(range: Range) {
-    const {model, parts} = range;
-    const {partCreator} = model;
+export function formatRangeAsQuote(range: Range): void {
+    const { model, parts } = range;
+    const { partCreator } = model;
     for (let i = 0; i < parts.length; ++i) {
         const part = parts[i];
-        if (part.type === "newline") {
+        if (part.type === Type.Newline) {
             parts.splice(i + 1, 0, partCreator.plain("> "));
         }
     }
@@ -81,10 +81,10 @@ export function formatRangeAsQuote(range: Range) {
     replaceRangeAndExpandSelection(range, parts);
 }
 
-export function formatRangeAsCode(range: Range) {
-    const {model, parts} = range;
-    const {partCreator} = model;
-    const needsBlock = parts.some(p => p.type === "newline");
+export function formatRangeAsCode(range: Range): void {
+    const { model, parts } = range;
+    const { partCreator } = model;
+    const needsBlock = parts.some(p => p.type === Type.Newline);
     if (needsBlock) {
         parts.unshift(partCreator.plain("```"), partCreator.newline());
         if (!rangeStartsAtBeginningOfLine(range)) {
@@ -105,11 +105,11 @@ export function formatRangeAsCode(range: Range) {
 
 // parts helper methods
 const isBlank = part => !part.text || !/\S/.test(part.text);
-const isNL = part => part.type === "newline";
+const isNL = part => part.type === Type.Newline;
 
-export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix) {
-    const {model, parts} = range;
-    const {partCreator} = model;
+export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix): void {
+    const { model, parts } = range;
+    const { partCreator } = model;
 
     // compute paragraph [start, end] indexes
     const paragraphIndexes = [];
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 6e3f35371d..277b4bb526 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import AutocompleteWrapperModel, {
     GetAutocompleterComponent,
@@ -25,6 +25,8 @@ import AutocompleteWrapperModel, {
     UpdateQuery,
 } from "./autocomplete";
 import * as Avatar from "../Avatar";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { Action } from "../dispatcher/actions";
 
 interface ISerializedPart {
     type: Type.Plain | Type.Newline | Type.Command | Type.PillCandidate;
@@ -39,7 +41,7 @@ interface ISerializedPillPart {
 
 export type SerializedPart = ISerializedPart | ISerializedPillPart;
 
-enum Type {
+export enum Type {
     Plain = "plain",
     Newline = "newline",
     Command = "command",
@@ -57,12 +59,12 @@ interface IBasePart {
     createAutoComplete(updateCallback: UpdateCallback): void;
 
     serialize(): SerializedPart;
-    remove(offset: number, len: number): string;
+    remove(offset: number, len: number): string | undefined;
     split(offset: number): IBasePart;
     validateAndInsert(offset: number, str: string, inputType: string): boolean;
-    appendUntilRejected(str: string, inputType: string): string;
-    updateDOMNode(node: Node);
-    canUpdateDOMNode(node: Node);
+    appendUntilRejected(str: string, inputType: string): string | undefined;
+    updateDOMNode(node: Node): void;
+    canUpdateDOMNode(node: Node): boolean;
     toDOMNode(): Node;
 }
 
@@ -85,19 +87,19 @@ abstract class BasePart {
         this._text = text;
     }
 
-    acceptsInsertion(chr: string, offset: number, inputType: string) {
+    protected acceptsInsertion(chr: string, offset: number, inputType: string): boolean {
         return true;
     }
 
-    acceptsRemoval(position: number, chr: string) {
+    protected acceptsRemoval(position: number, chr: string): boolean {
         return true;
     }
 
-    merge(part: Part) {
+    public merge(part: Part): boolean {
         return false;
     }
 
-    split(offset: number) {
+    public split(offset: number): IBasePart {
         const splitText = this.text.substr(offset);
         this._text = this.text.substr(0, offset);
         return new PlainPart(splitText);
@@ -105,7 +107,7 @@ abstract class BasePart {
 
     // removes len chars, or returns the plain text this part should be replaced with
     // if the part would become invalid if it removed everything.
-    remove(offset: number, len: number) {
+    public remove(offset: number, len: number): string | undefined {
         // validate
         const strWithRemoval = this.text.substr(0, offset) + this.text.substr(offset + len);
         for (let i = offset; i < (len + offset); ++i) {
@@ -118,7 +120,7 @@ abstract class BasePart {
     }
 
     // append str, returns the remaining string if a character was rejected.
-    appendUntilRejected(str: string, inputType: string) {
+    public appendUntilRejected(str: string, inputType: string): string | undefined {
         const offset = this.text.length;
         for (let i = 0; i < str.length; ++i) {
             const chr = str.charAt(i);
@@ -132,7 +134,7 @@ abstract class BasePart {
 
     // inserts str at offset if all the characters in str were accepted, otherwise don't do anything
     // return whether the str was accepted or not.
-    validateAndInsert(offset: number, str: string, inputType: string) {
+    public validateAndInsert(offset: number, str: string, inputType: string): boolean {
         for (let i = 0; i < str.length; ++i) {
             const chr = str.charAt(i);
             if (!this.acceptsInsertion(chr, offset + i, inputType)) {
@@ -145,42 +147,42 @@ abstract class BasePart {
         return true;
     }
 
-    createAutoComplete(updateCallback: UpdateCallback): void {}
+    public createAutoComplete(updateCallback: UpdateCallback): void {}
 
-    trim(len: number) {
+    protected trim(len: number): string {
         const remaining = this._text.substr(len);
         this._text = this._text.substr(0, len);
         return remaining;
     }
 
-    get text() {
+    public get text(): string {
         return this._text;
     }
 
-    abstract get type(): Type;
+    public abstract get type(): Type;
 
-    get canEdit() {
+    public get canEdit(): boolean {
         return true;
     }
 
-    toString() {
+    public toString(): string {
         return `${this.type}(${this.text})`;
     }
 
-    serialize(): SerializedPart {
+    public serialize(): SerializedPart {
         return {
             type: this.type as ISerializedPart["type"],
             text: this.text,
         };
     }
 
-    abstract updateDOMNode(node: Node);
-    abstract canUpdateDOMNode(node: Node);
-    abstract toDOMNode(): Node;
+    public abstract updateDOMNode(node: Node): void;
+    public abstract canUpdateDOMNode(node: Node): boolean;
+    public abstract toDOMNode(): Node;
 }
 
 abstract class PlainBasePart extends BasePart {
-    acceptsInsertion(chr: string, offset: number, inputType: string) {
+    protected acceptsInsertion(chr: string, offset: number, inputType: string): boolean {
         if (chr === "\n") {
             return false;
         }
@@ -203,11 +205,11 @@ abstract class PlainBasePart extends BasePart {
         return true;
     }
 
-    toDOMNode() {
+    public toDOMNode(): Node {
         return document.createTextNode(this.text);
     }
 
-    merge(part) {
+    public merge(part): boolean {
         if (part.type === this.type) {
             this._text = this.text + part.text;
             return true;
@@ -215,47 +217,49 @@ abstract class PlainBasePart extends BasePart {
         return false;
     }
 
-    updateDOMNode(node: Node) {
+    public updateDOMNode(node: Node): void {
         if (node.textContent !== this.text) {
             node.textContent = this.text;
         }
     }
 
-    canUpdateDOMNode(node: Node) {
+    public canUpdateDOMNode(node: Node): boolean {
         return node.nodeType === Node.TEXT_NODE;
     }
 }
 
 // exported for unit tests, should otherwise only be used through PartCreator
 export class PlainPart extends PlainBasePart implements IBasePart {
-    get type(): IBasePart["type"] {
+    public get type(): IBasePart["type"] {
         return Type.Plain;
     }
 }
 
-abstract class PillPart extends BasePart implements IPillPart {
+export abstract class PillPart extends BasePart implements IPillPart {
     constructor(public resourceId: string, label) {
         super(label);
     }
 
-    acceptsInsertion(chr: string) {
+    protected acceptsInsertion(chr: string): boolean {
         return chr !== " ";
     }
 
-    acceptsRemoval(position: number, chr: string) {
+    protected acceptsRemoval(position: number, chr: string): boolean {
         return position !== 0;  //if you remove initial # or @, pill should become plain
     }
 
-    toDOMNode() {
+    public toDOMNode(): Node {
         const container = document.createElement("span");
         container.setAttribute("spellcheck", "false");
+        container.setAttribute("contentEditable", "false");
+        container.onclick = this.onClick;
         container.className = this.className;
         container.appendChild(document.createTextNode(this.text));
         this.setAvatar(container);
         return container;
     }
 
-    updateDOMNode(node: HTMLElement) {
+    public updateDOMNode(node: HTMLElement): void {
         const textNode = node.childNodes[0];
         if (textNode.textContent !== this.text) {
             textNode.textContent = this.text;
@@ -263,10 +267,13 @@ abstract class PillPart extends BasePart implements IPillPart {
         if (node.className !== this.className) {
             node.className = this.className;
         }
+        if (node.onclick !== this.onClick) {
+            node.onclick = this.onClick;
+        }
         this.setAvatar(node);
     }
 
-    canUpdateDOMNode(node: HTMLElement) {
+    public canUpdateDOMNode(node: HTMLElement): boolean {
         return node.nodeType === Node.ELEMENT_NODE &&
                node.nodeName === "SPAN" &&
                node.childNodes.length === 1 &&
@@ -274,7 +281,7 @@ abstract class PillPart extends BasePart implements IPillPart {
     }
 
     // helper method for subclasses
-    _setAvatarVars(node: HTMLElement, avatarUrl: string, initialLetter: string) {
+    protected setAvatarVars(node: HTMLElement, avatarUrl: string, initialLetter: string): void {
         const avatarBackground = `url('${avatarUrl}')`;
         const avatarLetter = `'${initialLetter}'`;
         // check if the value is changing,
@@ -287,7 +294,7 @@ abstract class PillPart extends BasePart implements IPillPart {
         }
     }
 
-    serialize(): ISerializedPillPart {
+    public serialize(): ISerializedPillPart {
         return {
             type: this.type,
             text: this.text,
@@ -295,41 +302,43 @@ abstract class PillPart extends BasePart implements IPillPart {
         };
     }
 
-    get canEdit() {
+    public get canEdit(): boolean {
         return false;
     }
 
-    abstract get type(): IPillPart["type"];
+    public abstract get type(): IPillPart["type"];
 
-    abstract get className(): string;
+    protected abstract get className(): string;
 
-    abstract setAvatar(node: HTMLElement): void;
+    protected onClick?: () => void;
+
+    protected abstract setAvatar(node: HTMLElement): void;
 }
 
 class NewlinePart extends BasePart implements IBasePart {
-    acceptsInsertion(chr: string, offset: number) {
+    protected acceptsInsertion(chr: string, offset: number): boolean {
         return offset === 0 && chr === "\n";
     }
 
-    acceptsRemoval(position: number, chr: string) {
+    protected acceptsRemoval(position: number, chr: string): boolean {
         return true;
     }
 
-    toDOMNode() {
+    public toDOMNode(): Node {
         return document.createElement("br");
     }
 
-    merge() {
+    public merge(): boolean {
         return false;
     }
 
-    updateDOMNode() {}
+    public updateDOMNode(): void {}
 
-    canUpdateDOMNode(node: HTMLElement) {
+    public canUpdateDOMNode(node: HTMLElement): boolean {
         return node.tagName === "BR";
     }
 
-    get type(): IBasePart["type"] {
+    public get type(): IBasePart["type"] {
         return Type.Newline;
     }
 
@@ -337,7 +346,7 @@ class NewlinePart extends BasePart implements IBasePart {
     // rather than trying to append to it, which is what we want.
     // As a newline can also be only one character, it makes sense
     // as it can only be one character long. This caused #9741.
-    get canEdit() {
+    public get canEdit(): boolean {
         return false;
     }
 }
@@ -347,21 +356,21 @@ class RoomPillPart extends PillPart {
         super(resourceId, label);
     }
 
-    setAvatar(node: HTMLElement) {
+    protected setAvatar(node: HTMLElement): void {
         let initialLetter = "";
         let avatarUrl = Avatar.avatarUrlForRoom(this.room, 16, 16, "crop");
         if (!avatarUrl) {
             initialLetter = Avatar.getInitialLetter(this.room ? this.room.name : this.resourceId);
             avatarUrl = Avatar.defaultAvatarUrlForString(this.room ? this.room.roomId : this.resourceId);
         }
-        this._setAvatarVars(node, avatarUrl, initialLetter);
+        this.setAvatarVars(node, avatarUrl, initialLetter);
     }
 
-    get type(): IPillPart["type"] {
+    public get type(): IPillPart["type"] {
         return Type.RoomPill;
     }
 
-    get className() {
+    protected get className() {
         return "mx_RoomPill mx_Pill";
     }
 }
@@ -371,11 +380,11 @@ class AtRoomPillPart extends RoomPillPart {
         super(text, text, room);
     }
 
-    get type(): IPillPart["type"] {
+    public get type(): IPillPart["type"] {
         return Type.AtRoomPill;
     }
 
-    serialize(): ISerializedPillPart {
+    public serialize(): ISerializedPillPart {
         return {
             type: this.type,
             text: this.text,
@@ -388,7 +397,15 @@ class UserPillPart extends PillPart {
         super(userId, displayName);
     }
 
-    setAvatar(node: HTMLElement) {
+    public get type(): IPillPart["type"] {
+        return Type.UserPill;
+    }
+
+    protected get className() {
+        return "mx_UserPill mx_Pill";
+    }
+
+    protected setAvatar(node: HTMLElement): void {
         if (!this.member) {
             return;
         }
@@ -399,16 +416,15 @@ class UserPillPart extends PillPart {
         if (avatarUrl === defaultAvatarUrl) {
             initialLetter = Avatar.getInitialLetter(name);
         }
-        this._setAvatarVars(node, avatarUrl, initialLetter);
+        this.setAvatarVars(node, avatarUrl, initialLetter);
     }
 
-    get type(): IPillPart["type"] {
-        return Type.UserPill;
-    }
-
-    get className() {
-        return "mx_UserPill mx_Pill";
-    }
+    protected onClick = (): void => {
+        defaultDispatcher.dispatch({
+            action: Action.ViewUser,
+            member: this.member,
+        });
+    };
 }
 
 class PillCandidatePart extends PlainBasePart implements IPillCandidatePart {
@@ -416,11 +432,11 @@ class PillCandidatePart extends PlainBasePart implements IPillCandidatePart {
         super(text);
     }
 
-    createAutoComplete(updateCallback: UpdateCallback): AutocompleteWrapperModel {
+    public createAutoComplete(updateCallback: UpdateCallback): AutocompleteWrapperModel {
         return this.autoCompleteCreator.create(updateCallback);
     }
 
-    acceptsInsertion(chr: string, offset: number, inputType: string) {
+    protected acceptsInsertion(chr: string, offset: number, inputType: string): boolean {
         if (offset === 0) {
             return true;
         } else {
@@ -428,11 +444,11 @@ class PillCandidatePart extends PlainBasePart implements IPillCandidatePart {
         }
     }
 
-    merge() {
+    public merge(): boolean {
         return false;
     }
 
-    acceptsRemoval(position: number, chr: string) {
+    protected acceptsRemoval(position: number, chr: string): boolean {
         return true;
     }
 
@@ -463,17 +479,21 @@ interface IAutocompleteCreator {
 export class PartCreator {
     protected readonly autoCompleteCreator: IAutocompleteCreator;
 
-    constructor(private room: Room, private client: MatrixClient, autoCompleteCreator: AutoCompleteCreator = null) {
+    constructor(
+        private readonly room: Room,
+        private readonly client: MatrixClient,
+        autoCompleteCreator: AutoCompleteCreator = null,
+    ) {
         // pre-create the creator as an object even without callback so it can already be passed
         // to PillCandidatePart (e.g. while deserializing) and set later on
-        this.autoCompleteCreator = {create: autoCompleteCreator && autoCompleteCreator(this)};
+        this.autoCompleteCreator = { create: autoCompleteCreator?.(this) };
     }
 
-    setAutoCompleteCreator(autoCompleteCreator: AutoCompleteCreator) {
+    public setAutoCompleteCreator(autoCompleteCreator: AutoCompleteCreator): void {
         this.autoCompleteCreator.create = autoCompleteCreator(this);
     }
 
-    createPartForInput(input: string, partIndex: number, inputType?: string): Part {
+    public createPartForInput(input: string, partIndex: number, inputType?: string): Part {
         switch (input[0]) {
             case "#":
             case "@":
@@ -487,11 +507,11 @@ export class PartCreator {
         }
     }
 
-    createDefaultPart(text: string) {
+    public createDefaultPart(text: string): Part {
         return this.plain(text);
     }
 
-    deserializePart(part: SerializedPart): Part {
+    public deserializePart(part: SerializedPart): Part {
         switch (part.type) {
             case Type.Plain:
                 return this.plain(part.text);
@@ -508,19 +528,19 @@ export class PartCreator {
         }
     }
 
-    plain(text: string) {
+    public plain(text: string): PlainPart {
         return new PlainPart(text);
     }
 
-    newline() {
+    public newline(): NewlinePart {
         return new NewlinePart("\n");
     }
 
-    pillCandidate(text: string) {
+    public pillCandidate(text: string): PillCandidatePart {
         return new PillCandidatePart(text, this.autoCompleteCreator);
     }
 
-    roomPill(alias: string, roomId?: string) {
+    public roomPill(alias: string, roomId?: string): RoomPillPart {
         let room;
         if (roomId || alias[0] !== "#") {
             room = this.client.getRoom(roomId || alias);
@@ -533,16 +553,20 @@ export class PartCreator {
         return new RoomPillPart(alias, room ? room.name : alias, room);
     }
 
-    atRoomPill(text: string) {
+    public atRoomPill(text: string): AtRoomPillPart {
         return new AtRoomPillPart(text, this.room);
     }
 
-    userPill(displayName: string, userId: string) {
+    public userPill(displayName: string, userId: string): UserPillPart {
         const member = this.room.getMember(userId);
         return new UserPillPart(userId, displayName, member);
     }
 
-    createMentionParts(insertTrailingCharacter: boolean, displayName: string, userId: string) {
+    public createMentionParts(
+        insertTrailingCharacter: boolean,
+        displayName: string,
+        userId: string,
+    ): [UserPillPart, PlainPart] {
         const pill = this.userPill(displayName, userId);
         const postfix = this.plain(insertTrailingCharacter ? ": " : " ");
         return [pill, postfix];
@@ -552,7 +576,7 @@ export class PartCreator {
 // part creator that support auto complete for /commands,
 // used in SendMessageComposer
 export class CommandPartCreator extends PartCreator {
-    createPartForInput(text: string, partIndex: number) {
+    public createPartForInput(text: string, partIndex: number): Part {
         // at beginning and starts with /? create
         if (partIndex === 0 && text[0] === "/") {
             // text will be inserted by model, so pass empty string
@@ -562,12 +586,12 @@ export class CommandPartCreator extends PartCreator {
         }
     }
 
-    command(text: string) {
+    public command(text: string): CommandPart {
         return new CommandPart(text, this.autoCompleteCreator);
     }
 
-    deserializePart(part: Part): Part {
-        if (part.type === "command") {
+    public deserializePart(part: SerializedPart): Part {
+        if (part.type === Type.Command) {
             return this.command(part.text);
         } else {
             return super.deserializePart(part);
@@ -576,7 +600,7 @@ export class CommandPartCreator extends PartCreator {
 }
 
 class CommandPart extends PillCandidatePart {
-    get type(): IPillCandidatePart["type"] {
+    public get type(): IPillCandidatePart["type"] {
         return Type.Command;
     }
 }
diff --git a/src/editor/position.ts b/src/editor/position.ts
index 3f24581695..50dc283eb3 100644
--- a/src/editor/position.ts
+++ b/src/editor/position.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import DocumentOffset from "./offset";
 import EditorModel from "./model";
-import {Part} from "./parts";
+import { Part } from "./parts";
 
 export interface IPosition {
     index: number;
@@ -30,7 +30,7 @@ export default class DocumentPosition implements IPosition {
     constructor(public readonly index: number, public readonly offset: number) {
     }
 
-    compare(otherPos: DocumentPosition) {
+    public compare(otherPos: DocumentPosition): number {
         if (this.index === otherPos.index) {
             return this.offset - otherPos.offset;
         } else {
@@ -38,7 +38,7 @@ export default class DocumentPosition implements IPosition {
         }
     }
 
-    iteratePartsBetween(other: DocumentPosition, model: EditorModel, callback: Callback) {
+    public iteratePartsBetween(other: DocumentPosition, model: EditorModel, callback: Callback): void {
         if (this.index === -1 || other.index === -1) {
             return;
         }
@@ -57,13 +57,13 @@ export default class DocumentPosition implements IPosition {
         }
     }
 
-    forwardsWhile(model: EditorModel, predicate: Predicate) {
+    public forwardsWhile(model: EditorModel, predicate: Predicate): DocumentPosition {
         if (this.index === -1) {
             return this;
         }
 
-        let {index, offset} = this;
-        const {parts} = model;
+        let { index, offset } = this;
+        const { parts } = model;
         while (index < parts.length) {
             const part = parts[index];
             while (offset < part.text.length) {
@@ -82,12 +82,12 @@ export default class DocumentPosition implements IPosition {
         }
     }
 
-    backwardsWhile(model: EditorModel, predicate: Predicate) {
+    public backwardsWhile(model: EditorModel, predicate: Predicate): DocumentPosition {
         if (this.index === -1) {
             return this;
         }
 
-        let {index, offset} = this;
+        let { index, offset } = this;
         const parts = model.parts;
         while (index >= 0) {
             const part = parts[index];
@@ -107,7 +107,7 @@ export default class DocumentPosition implements IPosition {
         }
     }
 
-    asOffset(model: EditorModel) {
+    public asOffset(model: EditorModel): DocumentOffset {
         if (this.index === -1) {
             return new DocumentOffset(0, true);
         }
@@ -121,7 +121,7 @@ export default class DocumentPosition implements IPosition {
         return new DocumentOffset(offset, atEnd);
     }
 
-    isAtEnd(model: EditorModel) {
+    public isAtEnd(model: EditorModel): boolean {
         if (model.parts.length === 0) {
             return true;
         }
@@ -130,7 +130,7 @@ export default class DocumentPosition implements IPosition {
         return this.index === lastPartIdx && this.offset === lastPart.text.length;
     }
 
-    isAtStart() {
+    public isAtStart(): boolean {
         return this.index === 0 && this.offset === 0;
     }
 }
diff --git a/src/editor/range.ts b/src/editor/range.ts
index 838dfd8b98..4336a15130 100644
--- a/src/editor/range.ts
+++ b/src/editor/range.ts
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import EditorModel from "./model";
-import DocumentPosition, {Predicate} from "./position";
-import {Part} from "./parts";
+import DocumentPosition, { Predicate } from "./position";
+import { Part } from "./parts";
 
 const whitespacePredicate: Predicate = (index, offset, part) => {
     return part.text[offset].trim() === "";
@@ -32,23 +32,30 @@ export default class Range {
         this._end = bIsLarger ? positionB : positionA;
     }
 
-    moveStart(delta: number) {
+    public moveStartForwards(delta: number): void {
         this._start = this._start.forwardsWhile(this.model, () => {
             delta -= 1;
             return delta >= 0;
         });
     }
 
-    trim() {
+    public moveEndBackwards(delta: number): void {
+        this._end = this._end.backwardsWhile(this.model, () => {
+            delta -= 1;
+            return delta >= 0;
+        });
+    }
+
+    public trim(): void {
         this._start = this._start.forwardsWhile(this.model, whitespacePredicate);
         this._end = this._end.backwardsWhile(this.model, whitespacePredicate);
     }
 
-    expandBackwardsWhile(predicate: Predicate) {
+    public expandBackwardsWhile(predicate: Predicate): void {
         this._start = this._start.backwardsWhile(this.model, predicate);
     }
 
-    get text() {
+    public get text(): string {
         let text = "";
         this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             const t = part.text.substring(startIdx, endIdx);
@@ -63,7 +70,7 @@ export default class Range {
      * @param {Part[]} parts the parts to replace the range with
      * @return {Number} the net amount of characters added, can be negative.
      */
-    replace(parts: Part[]) {
+    public replace(parts: Part[]): number {
         const newLength = parts.reduce((sum, part) => sum + part.text.length, 0);
         let oldLength = 0;
         this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
@@ -77,8 +84,8 @@ export default class Range {
      * Returns a copy of the (partial) parts within the range.
      * For partial parts, only the text is adjusted to the part that intersects with the range.
      */
-    get parts() {
-        const parts = [];
+    public get parts(): Part[] {
+        const parts: Part[] = [];
         this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             const serializedPart = part.serialize();
             serializedPart.text = part.text.substring(startIdx, endIdx);
@@ -88,7 +95,7 @@ export default class Range {
         return parts;
     }
 
-    get length() {
+    public get length(): number {
         let len = 0;
         this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             len += endIdx - startIdx;
@@ -96,11 +103,11 @@ export default class Range {
         return len;
     }
 
-    get start() {
+    public get start(): DocumentPosition {
         return this._start;
     }
 
-    get end() {
+    public get end(): DocumentPosition {
         return this._end;
     }
 }
diff --git a/src/editor/render.ts b/src/editor/render.ts
index 8aa5c5dea9..d9997de855 100644
--- a/src/editor/render.ts
+++ b/src/editor/render.ts
@@ -15,19 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Part} from "./parts";
+import { Part, Type } from "./parts";
 import EditorModel from "./model";
 
-export function needsCaretNodeBefore(part: Part, prevPart: Part) {
-    const isFirst = !prevPart || prevPart.type === "newline";
+export function needsCaretNodeBefore(part: Part, prevPart: Part): boolean {
+    const isFirst = !prevPart || prevPart.type === Type.Newline;
     return !part.canEdit && (isFirst || !prevPart.canEdit);
 }
 
-export function needsCaretNodeAfter(part: Part, isLastOfLine: boolean) {
+export function needsCaretNodeAfter(part: Part, isLastOfLine: boolean): boolean {
     return !part.canEdit && isLastOfLine;
 }
 
-function insertAfter(node: HTMLElement, nodeToInsert: HTMLElement) {
+function insertAfter(node: HTMLElement, nodeToInsert: HTMLElement): void {
     const next = node.nextSibling;
     if (next) {
         node.parentElement.insertBefore(nodeToInsert, next);
@@ -44,25 +44,25 @@ export const CARET_NODE_CHAR = "\ufeff";
 // a caret node is a node that allows the caret to be placed
 // where otherwise it wouldn't be possible
 // (e.g. next to a pill span without adjacent text node)
-function createCaretNode() {
+function createCaretNode(): HTMLElement {
     const span = document.createElement("span");
     span.className = "caretNode";
     span.appendChild(document.createTextNode(CARET_NODE_CHAR));
     return span;
 }
 
-function updateCaretNode(node: HTMLElement) {
+function updateCaretNode(node: HTMLElement): void {
     // ensure the caret node contains only a zero-width space
     if (node.textContent !== CARET_NODE_CHAR) {
         node.textContent = CARET_NODE_CHAR;
     }
 }
 
-export function isCaretNode(node: HTMLElement) {
+export function isCaretNode(node: HTMLElement): boolean {
     return node && node.tagName === "SPAN" && node.className === "caretNode";
 }
 
-function removeNextSiblings(node: ChildNode) {
+function removeNextSiblings(node: ChildNode): void {
     if (!node) {
         return;
     }
@@ -74,7 +74,7 @@ function removeNextSiblings(node: ChildNode) {
     }
 }
 
-function removeChildren(parent: HTMLElement) {
+function removeChildren(parent: HTMLElement): void {
     const firstChild = parent.firstChild;
     if (firstChild) {
         removeNextSiblings(firstChild);
@@ -82,7 +82,7 @@ function removeChildren(parent: HTMLElement) {
     }
 }
 
-function reconcileLine(lineContainer: ChildNode, parts: Part[]) {
+function reconcileLine(lineContainer: ChildNode, parts: Part[]): void {
     let currentNode;
     let prevPart;
     const lastPart = parts[parts.length - 1];
@@ -131,13 +131,13 @@ function reconcileLine(lineContainer: ChildNode, parts: Part[]) {
     removeNextSiblings(currentNode);
 }
 
-function reconcileEmptyLine(lineContainer) {
+function reconcileEmptyLine(lineContainer: HTMLElement): void {
     // empty div needs to have a BR in it to give it height
     let foundBR = false;
     let partNode = lineContainer.firstChild;
     while (partNode) {
         const nextNode = partNode.nextSibling;
-        if (!foundBR && partNode.tagName === "BR") {
+        if (!foundBR && (partNode as HTMLElement).tagName === "BR") {
             foundBR = true;
         } else {
             partNode.remove();
@@ -149,9 +149,9 @@ function reconcileEmptyLine(lineContainer) {
     }
 }
 
-export function renderModel(editor: HTMLDivElement, model: EditorModel) {
+export function renderModel(editor: HTMLDivElement, model: EditorModel): void {
     const lines = model.parts.reduce((linesArr, part) => {
-        if (part.type === "newline") {
+        if (part.type === Type.Newline) {
             linesArr.push([]);
         } else {
             const lastLine = linesArr[linesArr.length - 1];
@@ -175,7 +175,7 @@ export function renderModel(editor: HTMLDivElement, model: EditorModel) {
         if (parts.length) {
             reconcileLine(lineContainer, parts);
         } else {
-            reconcileEmptyLine(lineContainer);
+            reconcileEmptyLine(lineContainer as HTMLElement);
         }
     });
     if (lines.length) {
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index cfdb36c7a8..9822046a0d 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -16,36 +16,37 @@ limitations under the License.
 */
 
 import Markdown from '../Markdown';
-import {makeGenericPermalink} from "../utils/permalinks/Permalinks";
+import { makeGenericPermalink } from "../utils/permalinks/Permalinks";
 import EditorModel from "./model";
 import { AllHtmlEntities } from 'html-entities';
 import SettingsStore from '../settings/SettingsStore';
 import SdkConfig from '../SdkConfig';
 import cheerio from 'cheerio';
+import { Type } from './parts';
 
-export function mdSerialize(model: EditorModel) {
+export function mdSerialize(model: EditorModel): string {
     return model.parts.reduce((html, part) => {
         switch (part.type) {
-            case "newline":
+            case Type.Newline:
                 return html + "\n";
-            case "plain":
-            case "command":
-            case "pill-candidate":
-            case "at-room-pill":
+            case Type.Plain:
+            case Type.Command:
+            case Type.PillCandidate:
+            case Type.AtRoomPill:
                 return html + part.text;
-            case "room-pill":
+            case Type.RoomPill:
                 // 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":
+            case Type.UserPill:
                 return html +
                     `[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
         }
     }, "");
 }
 
-export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} = {}) {
+export function htmlSerializeIfNeeded(model: EditorModel, { forceHTML = false } = {}): string {
     let md = mdSerialize(model);
     // copy of raw input to remove unwanted math later
     const orig = md;
@@ -142,9 +143,9 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
 
             // add fallback output for latex math, which should not be interpreted as markdown
             phtml('div, span').each(function(i, e) {
-                const tex = phtml(e).attr('data-mx-maths')
+                const tex = phtml(e).attr('data-mx-maths');
                 if (tex) {
-                    phtml(e).html(`<code>${tex}</code>`)
+                    phtml(e).html(`<code>${tex}</code>`);
                 }
             });
         }
@@ -156,62 +157,62 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
     }
 }
 
-export function textSerialize(model: EditorModel) {
+export function textSerialize(model: EditorModel): string {
     return model.parts.reduce((text, part) => {
         switch (part.type) {
-            case "newline":
+            case Type.Newline:
                 return text + "\n";
-            case "plain":
-            case "command":
-            case "pill-candidate":
-            case "at-room-pill":
+            case Type.Plain:
+            case Type.Command:
+            case Type.PillCandidate:
+            case Type.AtRoomPill:
                 return text + part.text;
-            case "room-pill":
+            case Type.RoomPill:
                 // 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":
+            case Type.UserPill:
                 return text + `${part.text}`;
         }
     }, "");
 }
 
-export function containsEmote(model: EditorModel) {
+export function containsEmote(model: EditorModel): boolean {
     return startsWith(model, "/me ", false);
 }
 
-export function startsWith(model: EditorModel, prefix: string, caseSensitive = true) {
+export function startsWith(model: EditorModel, prefix: string, caseSensitive = true): boolean {
     const firstPart = model.parts[0];
     // part type will be "plain" while editing,
     // and "command" while composing a message.
-    let text = firstPart && firstPart.text;
+    let text = firstPart?.text || '';
     if (!caseSensitive) {
         prefix = prefix.toLowerCase();
         text = text.toLowerCase();
     }
 
-    return firstPart && (firstPart.type === "plain" || firstPart.type === "command") && text.startsWith(prefix);
+    return firstPart && (firstPart.type === Type.Plain || firstPart.type === Type.Command) && text.startsWith(prefix);
 }
 
-export function stripEmoteCommand(model: EditorModel) {
+export function stripEmoteCommand(model: EditorModel): EditorModel {
     // trim "/me "
     return stripPrefix(model, "/me ");
 }
 
-export function stripPrefix(model: EditorModel, prefix: string) {
+export function stripPrefix(model: EditorModel, prefix: string): EditorModel {
     model = model.clone();
-    model.removeText({index: 0, offset: 0}, prefix.length);
+    model.removeText({ index: 0, offset: 0 }, prefix.length);
     return model;
 }
 
-export function unescapeMessage(model: EditorModel) {
-    const {parts} = model;
+export function unescapeMessage(model: EditorModel): EditorModel {
+    const { parts } = model;
     if (parts.length) {
         const firstPart = parts[0];
         // only unescape \/ to / at start of editor
-        if (firstPart.type === "plain" && firstPart.text.startsWith("\\/")) {
+        if (firstPart.type === Type.Plain && firstPart.text.startsWith("\\/")) {
             model = model.clone();
-            model.removeText({index: 0, offset: 0}, 1);
+            model.removeText({ index: 0, offset: 0 }, 1);
         }
     }
     return model;
diff --git a/src/effects/confetti/index.ts b/src/effects/confetti/index.ts
index 8c4b2d2616..ae2bb822c2 100644
--- a/src/effects/confetti/index.ts
+++ b/src/effects/confetti/index.ts
@@ -20,35 +20,35 @@ export type ConfettiOptions = {
     /**
      * max confetti count
      */
-    maxCount: number,
+    maxCount: number;
     /**
      * particle animation speed
      */
-    speed: number,
+    speed: number;
     /**
      * the confetti animation frame interval in milliseconds
      */
-    frameInterval: number,
+    frameInterval: number;
     /**
      * the alpha opacity of the confetti (between 0 and 1, where 1 is opaque and 0 is invisible)
      */
-    alpha: number,
+    alpha: number;
     /**
      * use gradient instead of solid particle color
      */
-    gradient: boolean,
-}
+    gradient: boolean;
+};
 
 type ConfettiParticle = {
-    color: string,
-    color2: string,
-    x: number,
-    y: number,
-    diameter: number,
-    tilt: number,
-    tiltAngleIncrement: number,
-    tiltAngle: number,
-}
+    color: string;
+    color2: string;
+    x: number;
+    y: number;
+    diameter: number;
+    tilt: number;
+    tiltAngleIncrement: number;
+    tiltAngle: number;
+};
 
 export const DefaultOptions: ConfettiOptions = {
     maxCount: 150,
@@ -62,7 +62,7 @@ export default class Confetti implements ICanvasEffect {
     private readonly options: ConfettiOptions;
 
     constructor(options: { [key: string]: any }) {
-        this.options = {...DefaultOptions, ...options};
+        this.options = { ...DefaultOptions, ...options };
     }
 
     private context: CanvasRenderingContext2D | null = null;
@@ -93,11 +93,11 @@ export default class Confetti implements ICanvasEffect {
         if (timeout) {
             window.setTimeout(this.stop, timeout);
         }
-    }
+    };
 
     public stop = async () => {
         this.isRunning = false;
-    }
+    };
 
     private resetParticle = (particle: ConfettiParticle, width: number, height: number): ConfettiParticle => {
         particle.color = this.colors[(Math.random() * this.colors.length) | 0] + (this.options.alpha + ')');
@@ -113,7 +113,7 @@ export default class Confetti implements ICanvasEffect {
         particle.tiltAngleIncrement = Math.random() * 0.07 + 0.05;
         particle.tiltAngle = Math.random() * Math.PI;
         return particle;
-    }
+    };
 
     private runAnimation = (): void => {
         if (!this.context || !this.context.canvas) {
@@ -132,8 +132,7 @@ export default class Confetti implements ICanvasEffect {
             }
             requestAnimationFrame(this.runAnimation);
         }
-    }
-
+    };
 
     private drawParticles = (context: CanvasRenderingContext2D): void => {
         if (!this.context || !this.context.canvas) {
@@ -158,7 +157,7 @@ export default class Confetti implements ICanvasEffect {
             context.lineTo(x2, y2);
             context.stroke();
         }
-    }
+    };
 
     private updateParticles = () => {
         if (!this.context || !this.context.canvas) {
@@ -187,5 +186,5 @@ export default class Confetti implements ICanvasEffect {
                 }
             }
         }
-    }
+    };
 }
diff --git a/src/effects/effect.ts b/src/effects/effect.ts
index 9011b07b61..fe194bbde3 100644
--- a/src/effects/effect.ts
+++ b/src/effects/effect.ts
@@ -40,4 +40,4 @@ export type Effect<TOptions extends { [key: string]: any }> = {
      * animation options
      */
     options: TOptions;
-}
+};
diff --git a/src/effects/fireworks/index.ts b/src/effects/fireworks/index.ts
index 96a27531af..2a0af8c4a0 100644
--- a/src/effects/fireworks/index.ts
+++ b/src/effects/fireworks/index.ts
@@ -26,7 +26,7 @@ export type FireworksOptions = {
      * gravity value that firework adds to shift from it's start position
      */
     gravity: number;
-}
+};
 
 type FireworksParticle = {
     /**
@@ -52,7 +52,7 @@ type FireworksParticle = {
      */
     w: number;
     h: number;
-}
+};
 
 export const DefaultOptions: FireworksOptions = {
     maxCount: 500,
@@ -63,7 +63,7 @@ export default class Fireworks implements ICanvasEffect {
     private readonly options: FireworksOptions;
 
     constructor(options: { [key: string]: any }) {
-        this.options = {...DefaultOptions, ...options};
+        this.options = { ...DefaultOptions, ...options };
     }
 
     private context: CanvasRenderingContext2D | null = null;
@@ -81,14 +81,14 @@ export default class Fireworks implements ICanvasEffect {
         if (timeout) {
             window.setTimeout(this.stop, timeout);
         }
-    }
+    };
 
     private updateWorld = () => {
         if (!this.isRunning && this.particles.length === 0) return;
         this.update();
         this.paint();
         this.supportsAnimationFrame.call(window, this.updateWorld);
-    }
+    };
 
     private update = () => {
         if (this.particles.length < this.options.maxCount && this.isRunning) {
@@ -101,7 +101,7 @@ export default class Fireworks implements ICanvasEffect {
             }
         }
         this.particles = alive;
-    }
+    };
 
     private paint = () => {
         if (!this.context || !this.context.canvas) return;
@@ -112,7 +112,7 @@ export default class Fireworks implements ICanvasEffect {
         for (let i=0; i<this.particles.length; i++) {
             this.drawParticle(this.particles[i]);
         }
-    }
+    };
 
     private createFirework = () => {
         if (!this.context || !this.context.canvas) return;
@@ -138,11 +138,11 @@ export default class Fireworks implements ICanvasEffect {
             }
             this.particles.push(particle);
         }
-    }
+    };
 
     public stop = async () => {
         this.isRunning = false;
-    }
+    };
 
     private drawParticle = (particle: FireworksParticle): void => {
         if (!this.context || !this.context.canvas) {
@@ -159,8 +159,7 @@ export default class Fireworks implements ICanvasEffect {
         this.context.closePath();
         this.context.fill();
         this.context.restore();
-    }
-
+    };
 
     private move = (particle: FireworksParticle) => {
         particle.x += particle.vx;
@@ -170,5 +169,5 @@ export default class Fireworks implements ICanvasEffect {
         return !(particle.x <= -particle.w || particle.x >= screen.width ||
             particle.y >= screen.height ||
             particle.alpha <= 0);
-    }
+    };
 }
diff --git a/src/effects/index.ts b/src/effects/index.ts
index 8ecb80020d..23864a5d90 100644
--- a/src/effects/index.ts
+++ b/src/effects/index.ts
@@ -75,4 +75,3 @@ export const CHAT_EFFECTS: Array<Effect<{ [key: string]: any }>> = [
     } as Effect<SpaceInvadersOptions>,
 ];
 
-
diff --git a/src/effects/snowfall/index.ts b/src/effects/snowfall/index.ts
index 2affb50405..141c016512 100644
--- a/src/effects/snowfall/index.ts
+++ b/src/effects/snowfall/index.ts
@@ -29,7 +29,7 @@ export type SnowfallOptions = {
      * The amount of drift (horizontal sway) to apply to the snowflakes. Each snowflake varies.
      */
     maxDrift: number;
-}
+};
 
 type Snowflake = {
     x: number;
@@ -38,7 +38,7 @@ type Snowflake = {
     diameter: number;
     maximumDrift: number;
     gravity: number;
-}
+};
 
 export const DefaultOptions: SnowfallOptions = {
     maxCount: 200,
@@ -52,7 +52,7 @@ export default class Snowfall implements ICanvasEffect {
     private readonly options: SnowfallOptions;
 
     constructor(options: { [key: string]: any }) {
-        this.options = {...DefaultOptions, ...options};
+        this.options = { ...DefaultOptions, ...options };
     }
 
     private context: CanvasRenderingContext2D | null = null;
@@ -76,11 +76,11 @@ export default class Snowfall implements ICanvasEffect {
         if (timeout) {
             window.setTimeout(this.stop, timeout);
         }
-    }
+    };
 
     public stop = async () => {
         this.isRunning = false;
-    }
+    };
 
     private resetParticle = (particle: Snowflake, width: number, height: number): Snowflake => {
         particle.x = Math.random() * width;
@@ -90,7 +90,7 @@ export default class Snowfall implements ICanvasEffect {
         particle.maximumDrift = (Math.random() * this.options.maxDrift) + 3.5;
         particle.gravity = this.options.gravity + (Math.random() * 6) + 4;
         return particle;
-    }
+    };
 
     private renderLoop = (): void => {
         if (!this.context || !this.context.canvas) {
diff --git a/src/effects/spaceinvaders/index.ts b/src/effects/spaceinvaders/index.ts
index 9520e8366a..21774a7c14 100644
--- a/src/effects/spaceinvaders/index.ts
+++ b/src/effects/spaceinvaders/index.ts
@@ -25,14 +25,14 @@ export type SpaceInvadersOptions = {
      * The amount of gravity to apply to the invaders
      */
     gravity: number;
-}
+};
 
 type Invader = {
     x: number;
     y: number;
     xCol: number;
     gravity: number;
-}
+};
 
 export const DefaultOptions: SpaceInvadersOptions = {
     maxCount: 50,
@@ -46,7 +46,7 @@ export default class SpaceInvaders implements ICanvasEffect {
     private readonly options: SpaceInvadersOptions;
 
     constructor(options: { [key: string]: any }) {
-        this.options = {...DefaultOptions, ...options};
+        this.options = { ...DefaultOptions, ...options };
     }
 
     private context: CanvasRenderingContext2D | null = null;
@@ -70,11 +70,11 @@ export default class SpaceInvaders implements ICanvasEffect {
         if (timeout) {
             window.setTimeout(this.stop, timeout);
         }
-    }
+    };
 
     public stop = async () => {
         this.isRunning = false;
-    }
+    };
 
     private resetParticle = (particle: Invader, width: number, height: number): Invader => {
         particle.x = Math.random() * width;
@@ -82,7 +82,7 @@ export default class SpaceInvaders implements ICanvasEffect {
         particle.xCol = particle.x;
         particle.gravity = this.options.gravity + (Math.random() * 6) + 4;
         return particle;
-    }
+    };
 
     private renderLoop = (): void => {
         if (!this.context || !this.context.canvas) {
diff --git a/src/effects/utils.ts b/src/effects/utils.ts
index c2b499b154..9f6d7a512e 100644
--- a/src/effects/utils.ts
+++ b/src/effects/utils.ts
@@ -21,4 +21,4 @@
  */
 export const containsEmoji = (content: { msgtype: string, body: string }, emojis: Array<string>): boolean => {
     return emojis.some((emoji) => content.body && content.body.includes(emoji));
-}
+};
diff --git a/src/emoji.ts b/src/emoji.ts
index 7caeb06d21..ee84583fc9 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -15,29 +15,36 @@ limitations under the License.
 */
 
 import EMOJIBASE from 'emojibase-data/en/compact.json';
+import SHORTCODES from 'emojibase-data/en/shortcodes/iamcal.json';
 
 export interface IEmoji {
     annotation: string;
-    group: number;
+    group?: number;
     hexcode: string;
-    order: number;
+    order?: number;
     shortcodes: string[];
-    tags: string[];
+    tags?: string[];
     unicode: string;
+    skins?: Omit<IEmoji, "shortcodes" | "tags">[]; // Currently unused
     emoticon?: string;
 }
 
-interface IEmojiWithFilterString extends IEmoji {
-    filterString?: string;
-}
-
 // The unicode is stored without the variant selector
-const UNICODE_TO_EMOJI = new Map<string, IEmojiWithFilterString>(); // not exported as gets for it are handled by getEmojiFromUnicode
-export const EMOTICON_TO_EMOJI = new Map<string, IEmojiWithFilterString>();
-export const SHORTCODE_TO_EMOJI = new Map<string, IEmojiWithFilterString>();
+const UNICODE_TO_EMOJI = new Map<string, IEmoji>(); // not exported as gets for it are handled by getEmojiFromUnicode
+export const EMOTICON_TO_EMOJI = new Map<string, IEmoji>();
 
 export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
+const isRegionalIndicator = (x: string): boolean => {
+    // First verify that the string is a single character. We use Array.from
+    // to make sure we count by characters, not UTF-8 code units.
+    return Array.from(x).length === 1 &&
+        // Next verify that the character is within the code point range for
+        // regional indicators.
+        // http://unicode.org/charts/PDF/Unicode-6.0/U60-1F100.pdf
+        x >= '\u{1f1e6}' && x <= '\u{1f1ff}';
+};
+
 const EMOJIBASE_GROUP_ID_TO_CATEGORY = [
     "people", // smileys
     "people", // actually people
@@ -62,17 +69,27 @@ export const DATA_BY_CATEGORY = {
     "flags": [],
 };
 
-const ZERO_WIDTH_JOINER = "\u200D";
-
 // Store various mappings from unicode/emoticon/shortcode to the Emoji objects
-EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
-    const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
+export const EMOJI: IEmoji[] = EMOJIBASE.map((emojiData: Omit<IEmoji, "shortcodes">) => {
+    // If there's ever a gap in shortcode coverage, we fudge it by
+    // filling it in with the emoji's CLDR annotation
+    const shortcodeData = SHORTCODES[emojiData.hexcode] ??
+        [emojiData.annotation.toLowerCase().replace(/ /g, "_")];
+
+    const emoji: IEmoji = {
+        ...emojiData,
+        // Homogenize shortcodes by ensuring that everything is an array
+        shortcodes: typeof shortcodeData === "string" ? [shortcodeData] : shortcodeData,
+    };
+
+    // We manually include regional indicators in the symbols group, since
+    // Emojibase intentionally leaves them uncategorized
+    const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group] ??
+        (isRegionalIndicator(emoji.unicode) ? "symbols" : null);
+
     if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
         DATA_BY_CATEGORY[categoryId].push(emoji);
     }
-    // This is used as the string to match the query against when filtering emojis
-    emoji.filterString = (`${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}\n` +
-        `${emoji.unicode.split(ZERO_WIDTH_JOINER).join("\n")}`).toLowerCase();
 
     // Add mapping from unicode to Emoji object
     // The 'unicode' field that we use in emojibase has either
@@ -88,12 +105,7 @@ EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
         EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji);
     }
 
-    if (emoji.shortcodes) {
-        // Add mapping from each shortcode to Emoji object
-        emoji.shortcodes.forEach(shortcode => {
-            SHORTCODE_TO_EMOJI.set(shortcode, emoji);
-        });
-    }
+    return emoji;
 });
 
 /**
@@ -107,5 +119,3 @@ EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
 function stripVariation(str) {
     return str.replace(/[\uFE00-\uFE0F]$/, "");
 }
-
-export const EMOJI: IEmoji[] = EMOJIBASE;
diff --git a/src/emojipicker/recent.ts b/src/emojipicker/recent.ts
index d86aad660d..84fbf34616 100644
--- a/src/emojipicker/recent.ts
+++ b/src/emojipicker/recent.ts
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import SettingsStore from "../settings/SettingsStore";
-import {orderBy} from "lodash";
+import { orderBy } from "lodash";
 import { SettingLevel } from "../settings/SettingLevel";
 
 interface ILegacyFormat {
diff --git a/src/hooks/useAccountData.ts b/src/hooks/useAccountData.ts
index fe71ed9ecd..6e2cd269ff 100644
--- a/src/hooks/useAccountData.ts
+++ b/src/hooks/useAccountData.ts
@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useCallback, useState} from "react";
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { useCallback, useState } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {useEventEmitter} from "./useEventEmitter";
+import { useEventEmitter } from "./useEventEmitter";
 
-const tryGetContent = (ev?: MatrixEvent) => ev ? ev.getContent() : undefined;
+const tryGetContent = <T extends {}>(ev?: MatrixEvent) => ev ? ev.getContent<T>() : undefined;
 
 // Hook to simplify listening to Matrix account data
 export const useAccountData = <T extends {}>(cli: MatrixClient, eventType: string) => {
-    const [value, setValue] = useState<T>(() => tryGetContent(cli.getAccountData(eventType)));
+    const [value, setValue] = useState<T>(() => tryGetContent<T>(cli.getAccountData(eventType)));
 
     const handler = useCallback((event) => {
         if (event.getType() !== eventType) return;
@@ -38,7 +38,7 @@ export const useAccountData = <T extends {}>(cli: MatrixClient, eventType: strin
 
 // Hook to simplify listening to Matrix room account data
 export const useRoomAccountData = <T extends {}>(room: Room, eventType: string) => {
-    const [value, setValue] = useState<T>(() => tryGetContent(room.getAccountData(eventType)));
+    const [value, setValue] = useState<T>(() => tryGetContent<T>(room.getAccountData(eventType)));
 
     const handler = useCallback((event) => {
         if (event.getType() !== eventType) return;
diff --git a/src/hooks/useDispatcher.ts b/src/hooks/useDispatcher.ts
index 004b15fcef..a8b36db2fd 100644
--- a/src/hooks/useDispatcher.ts
+++ b/src/hooks/useDispatcher.ts
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useEffect, useRef} from "react";
+import { useEffect, useRef } from "react";
 
-import {ActionPayload} from "../dispatcher/payloads";
-import {Dispatcher} from "flux";
+import { ActionPayload } from "../dispatcher/payloads";
+import { Dispatcher } from "flux";
 
 // Hook to simplify listening to flux dispatches
 export const useDispatcher = (dispatcher: Dispatcher<ActionPayload>, handler: (payload: ActionPayload) => void) => {
diff --git a/src/hooks/useEventEmitter.ts b/src/hooks/useEventEmitter.ts
index 6b5693ef95..693eebc0e3 100644
--- a/src/hooks/useEventEmitter.ts
+++ b/src/hooks/useEventEmitter.ts
@@ -14,13 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useRef, useEffect} from "react";
-import type {EventEmitter} from "events";
+import { useRef, useEffect, useState, useCallback } from "react";
+import type { EventEmitter } from "events";
 
 type Handler = (...args: any[]) => void;
 
 // Hook to wrap event emitter on and removeListener in hook lifecycle
-export const useEventEmitter = (emitter: EventEmitter, eventName: string | symbol, handler: Handler) => {
+export const useEventEmitter = (
+    emitter: EventEmitter | undefined,
+    eventName: string | symbol,
+    handler: Handler,
+) => {
     // Create a ref that stores handler
     const savedHandler = useRef(handler);
 
@@ -48,3 +52,18 @@ export const useEventEmitter = (emitter: EventEmitter, eventName: string | symbo
         [eventName, emitter], // Re-run if eventName or emitter changes
     );
 };
+
+type Mapper<T> = (...args: any[]) => T;
+
+export const useEventEmitterState = <T>(
+    emitter: EventEmitter | undefined,
+    eventName: string | symbol,
+    fn: Mapper<T>,
+): T => {
+    const [value, setValue] = useState<T>(fn());
+    const handler = useCallback((...args: any[]) => {
+        setValue(fn(...args));
+    }, [fn]);
+    useEventEmitter(emitter, eventName, handler);
+    return value;
+};
diff --git a/src/hooks/useIsEncrypted.ts b/src/hooks/useIsEncrypted.ts
index 79f3e539cd..ed8e7f3f50 100644
--- a/src/hooks/useIsEncrypted.ts
+++ b/src/hooks/useIsEncrypted.ts
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useCallback, useState} from "react";
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { useCallback, useState } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {useEventEmitter} from "./useEventEmitter";
+import { useEventEmitter } from "./useEventEmitter";
 
 // Hook to simplify watching whether a Matrix room is encrypted, returns undefined if room is undefined
 export function useIsEncrypted(cli: MatrixClient, room?: Room): boolean | undefined {
diff --git a/src/hooks/useLocalEcho.ts b/src/hooks/useLocalEcho.ts
new file mode 100644
index 0000000000..4b30fd2f00
--- /dev/null
+++ b/src/hooks/useLocalEcho.ts
@@ -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.
+*/
+
+import { useState } from "react";
+
+export const useLocalEcho = <T extends any>(
+    currentFactory: () => T,
+    setterFn: (value: T) => Promise<unknown>,
+    errorFn: (error: Error) => void,
+): [value: T, handler: (value: T) => void] => {
+    const [value, setValue] = useState(currentFactory);
+    const handler = async (value: T) => {
+        setValue(value);
+        try {
+            await setterFn(value);
+        } catch (e) {
+            setValue(currentFactory());
+            errorFn(e);
+        }
+    };
+
+    return [value, handler];
+};
diff --git a/src/hooks/useLocalStorageState.ts b/src/hooks/useLocalStorageState.ts
index 943db9ab4e..97b702d333 100644
--- a/src/hooks/useLocalStorageState.ts
+++ b/src/hooks/useLocalStorageState.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Dispatch, SetStateAction, useCallback, useEffect, useState} from "react";
+import { Dispatch, SetStateAction, useCallback, useEffect, useState } from "react";
 
 const getValue = <T>(key: string, initialValue: T): T => {
     try {
diff --git a/src/hooks/useRoomMembers.ts b/src/hooks/useRoomMembers.ts
index e25436045e..bd52913a86 100644
--- a/src/hooks/useRoomMembers.ts
+++ b/src/hooks/useRoomMembers.ts
@@ -14,19 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useState} from "react";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
-import {useEventEmitter} from "./useEventEmitter";
-import {throttle} from "lodash";
+import { useEventEmitter } from "./useEventEmitter";
+import { throttle } from "lodash";
 
 // Hook to simplify watching Matrix Room joined members
 export const useRoomMembers = (room: Room, throttleWait = 250) => {
     const [members, setMembers] = useState<RoomMember[]>(room.getJoinedMembers());
     useEventEmitter(room.currentState, "RoomState.members", throttle(() => {
         setMembers(room.getJoinedMembers());
-    }, throttleWait, {leading: true, trailing: true}));
+    }, throttleWait, { leading: true, trailing: true }));
     return members;
 };
 
@@ -35,6 +35,6 @@ export const useRoomMemberCount = (room: Room, throttleWait = 250) => {
     const [count, setCount] = useState<number>(room.getJoinedMemberCount());
     useEventEmitter(room.currentState, "RoomState.members", throttle(() => {
         setCount(room.getJoinedMemberCount());
-    }, throttleWait, {leading: true, trailing: true}));
+    }, throttleWait, { leading: true, trailing: true }));
     return count;
 };
diff --git a/src/hooks/useRoomState.ts b/src/hooks/useRoomState.ts
new file mode 100644
index 0000000000..89c94df10b
--- /dev/null
+++ b/src/hooks/useRoomState.ts
@@ -0,0 +1,46 @@
+/*
+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 { useCallback, useEffect, useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
+
+import { useEventEmitter } from "./useEventEmitter";
+
+type Mapper<T> = (roomState: RoomState) => T;
+const defaultMapper: Mapper<RoomState> = (roomState: RoomState) => roomState;
+
+// Hook to simplify watching Matrix Room state
+export const useRoomState = <T extends any = RoomState>(
+    room?: Room,
+    mapper: Mapper<T> = defaultMapper as Mapper<T>,
+): T => {
+    const [value, setValue] = useState<T>(room ? mapper(room.currentState) : undefined);
+
+    const update = useCallback(() => {
+        if (!room) return;
+        setValue(mapper(room.currentState));
+    }, [room, mapper]);
+
+    useEventEmitter(room?.currentState, "RoomState.events", update);
+    useEffect(() => {
+        update();
+        return () => {
+            setValue(undefined);
+        };
+    }, [update]);
+    return value;
+};
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 3aa38c44f4..e21c2cbfa8 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import SettingsStore from '../settings/SettingsStore';
 
 // Hook to fetch the value of a setting and dynamically update when it changes
@@ -35,8 +35,8 @@ export const useSettingValue = <T>(settingName: string, roomId: string = null, e
 };
 
 // Hook to fetch whether a feature is enabled and dynamically update when that changes
-export const useFeatureEnabled = (featureName: string, roomId: string = null) => {
-    const [enabled, setEnabled] = useState(SettingsStore.getValue(featureName, roomId));
+export const useFeatureEnabled = (featureName: string, roomId: string = null): boolean => {
+    const [enabled, setEnabled] = useState(SettingsStore.getValue<boolean>(featureName, roomId));
 
     useEffect(() => {
         const ref = SettingsStore.watchSetting(featureName, roomId, () => {
diff --git a/src/hooks/useStateArray.ts b/src/hooks/useStateArray.ts
index e8ff6efff0..0541ab2165 100644
--- a/src/hooks/useStateArray.ts
+++ b/src/hooks/useStateArray.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useState} from "react";
+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] => {
@@ -25,5 +25,5 @@ export const useStateArray = <T>(initialSize: number, initialState: T | T[]): [T
         const copy = [...data];
         copy[index] = value;
         return copy;
-    })]
+    })];
 };
diff --git a/src/hooks/useStateCallback.ts b/src/hooks/useStateCallback.ts
index f3993c1d32..1919179b86 100644
--- a/src/hooks/useStateCallback.ts
+++ b/src/hooks/useStateCallback.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Dispatch, SetStateAction, useState} from "react";
+import { Dispatch, SetStateAction, useState } from "react";
 
 // Hook to simplify interactions with a store-backed state values
 // Returns value and method to change the state value
diff --git a/src/hooks/useStateToggle.ts b/src/hooks/useStateToggle.ts
index b50a923234..7437067cf5 100644
--- a/src/hooks/useStateToggle.ts
+++ b/src/hooks/useStateToggle.ts
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Dispatch, SetStateAction, useState} from "react";
+import { Dispatch, SetStateAction, useState } from "react";
 
 // Hook to simplify toggling of a boolean state value
 // Returns value, method to toggle boolean value and method to set the boolean value
-export const useStateToggle = (initialValue: boolean): [boolean, () => void, Dispatch<SetStateAction<boolean>>] => {
+export const useStateToggle = (initialValue = false): [boolean, () => void, Dispatch<SetStateAction<boolean>>] => {
     const [value, setValue] = useState(initialValue);
     const toggleValue = () => {
         setValue(!value);
diff --git a/src/hooks/useTimeout.ts b/src/hooks/useTimeout.ts
index 911b7bc75d..07301a367a 100644
--- a/src/hooks/useTimeout.ts
+++ b/src/hooks/useTimeout.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useEffect, useRef, useState} from "react";
+import { useEffect, useRef, useState } from "react";
 
 type Handler = () => void;
 
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index cc63995e0f..52051b7fff 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1,12 +1,9 @@
 {
     "Continue": "واصِل",
-    "Username available": "اسم المستخدم متاح",
-    "Username not available": "الإسم المستخدم غير موجود",
     "Something went wrong!": "هناك خطأ ما!",
     "Cancel": "إلغاء",
     "Close": "إغلاق",
     "Create new room": "إنشاء غرفة جديدة",
-    "Custom Server Options": "الإعدادات الشخصية للخادوم",
     "Dismiss": "أهمِل",
     "Failed to change password. Is your password correct?": "فشلت عملية تعديل الكلمة السرية. هل كلمتك السرية صحيحة ؟",
     "Warning": "تنبيه",
@@ -26,36 +23,24 @@
     "Unavailable": "غير متوفر",
     "All Rooms": "كل الغُرف",
     "All messages": "كل الرسائل",
-    "All notifications are currently disabled for all targets.": "كل التنبيهات غير مفعلة حالياً للجميع.",
-    "Direct Chat": "دردشة مباشرة",
-    "Please set a password!": "يرجى تعيين كلمة مرور !",
-    "You have successfully set a password!": "تم تعيين كلمة السر بنجاح !",
-    "Can't update user notification settings": "لا يمكن تحديث إعدادات الإشعارات الخاصة بالمستخدم",
     "Explore Room State": "إكتشاف حالة الغرفة",
-    "All messages (noisy)": "كل الرسائل (صوت مرتفع)",
     "Update": "تحديث",
     "What's New": "آخِر المُستجدّات",
     "Toolbox": "علبة الأدوات",
     "Collecting logs": "تجميع السجلات",
     "No update available.": "لا يوجد هناك أي تحديث.",
-    "An error occurred whilst saving your email notification preferences.": "حدث خطأ ما أثناء عملية حفظ إعدادات الإشعارات عبر البريد الإلكتروني.",
     "Collecting app version information": "تجميع المعلومات حول نسخة التطبيق",
     "Changelog": "سِجل التغييرات",
     "Send Account Data": "إرسال بيانات الحساب",
     "Waiting for response from server": "في انتظار الرد مِن الخادوم",
     "Send logs": "إرسال السِجلات",
-    "Download this file": "تنزيل هذا الملف",
     "Thank you!": "شكرًا !",
-    "Advanced notification settings": "الإعدادات المتقدمة للإشعارات",
     "Call invitation": "دعوة لمحادثة",
     "Developer Tools": "أدوات التطوير",
     "Downloading update...": "عملية تنزيل التحديث جارية …",
     "State Key": "مفتاح الحالة",
     "Back": "العودة",
     "What's new?": "ما الجديد ؟",
-    "You have successfully set a password and an email address!": "لقد قمت بتعيين كلمة سرية و إدخال عنوان للبريد الإلكتروني بنجاح !",
-    "Cancel Sending": "إلغاء الإرسال",
-    "Set Password": "تعيين كلمة سرية",
     "Checking for an update...": "البحث عن تحديث …",
     "powered by Matrix": "مشغل بواسطة Matrix",
     "The platform you're on": "المنصة التي أنت عليها",
@@ -65,12 +50,12 @@
     "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": "أكّد",
     "Add 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.": "انقر الزر بالأسفل لتأكيد إضافة رقم الهاتف هذا.",
     "Add Phone Number": "أضِف رقم الهاتف",
     "Which officially provided instance you are using, if any": "السيرورة المقدّمة رسميًا التي تستعملها، لو وُجدت",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "فيما إذا كنت تستعمل %(brand)s على جهاز اللمس فيه هو طريقة الإدخال الرئيسة",
@@ -78,19 +63,14 @@
     "Whether you're using %(brand)s as an installed Progressive Web App": "ما إذا كنت تستعمل %(brand)s كتطبيق وِب تدرّجي",
     "Your user agent": "وكيل المستخدم الذي تستعمله",
     "Unable to load! Check your network connectivity and try again.": "تعذر التحميل! افحص اتصالك بالشبكة وأعِد المحاولة.",
-    "Call Timeout": "انتهت مهلة الاتصال",
     "Call failed due to misconfigured server": "فشل الاتصال بسبب سوء ضبط الخادوم",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "من فضلك اطلب من مسؤول الخادوم المنزل الذي تستعمله (<code>%(homeserverDomain)s</code>) أن يضبط خادوم TURN كي تعمل الاتصالات بنحوٍ يكون محط ثقة.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "أو يمكنك محاولة الخادوم العمومي <code>turn.matrix.org</code> إلا أنه لن يكون محطّ ثقة إذ سيُشارك عنوان IP لديك بذاك الخادوم. يمكنك أيضًا إدارة هذا من الإعدادات.",
     "Try using turn.matrix.org": "جرّب استعمال turn.matrix.org",
     "OK": "حسنًا",
-    "Unable to capture screen": "تعذر التقاط الشاشة",
     "Call Failed": "فشل الاتصال",
-    "You are already in a call.": "تُجري مكالمة الآن.",
     "VoIP is unsupported": "تقنية VoIP غير مدعومة",
     "You cannot place VoIP calls in this browser.": "لا يمكنك إجراء مكالمات VoIP عبر هذا المتصفح.",
-    "A call is currently being placed!": "يجري إجراء المكالمة!",
-    "A call is already in progress!": "تُجري مكالمة الآن فعلًا!",
     "Permission Required": "التصريح مطلوب",
     "You do not have permission to start a conference call in this room": "ينقصك تصريح بدء مكالمة جماعية في هذه الغرفة",
     "Replying With Files": "الرد مع ملفات",
@@ -127,9 +107,9 @@
     "PM": "م",
     "AM": "ص",
     "%(weekDayName)s %(time)s": "%(weekDayName)s ‏%(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s، ‏%(day)s %(monthName)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s، ‏%(day)s %(monthName)s %(fullYear)s ‏%(time)s",
     "Who would you like to add to this community?": "مَن تريد إضافته إلى هذا المجتمع؟",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "تحذير: كلّ من تُضيفه إلى أحد المجتمعات سيكون ظاهرًا لكل من يعرف معرّف المجتمع",
     "Invite new community members": "ادعُ أعضاء جدد إلى المجتمع",
@@ -155,10 +135,6 @@
     "Unable to enable Notifications": "تعذر تفعيل التنبيهات",
     "This email address was not found": "لم يوجد عنوان البريد الإلكتروني هذا",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "لا يظهر بأن عنوان بريدك مرتبط بمعرّف «ماترِكس» على الخادوم المنزل هذا.",
-    "Use your account to sign in to the latest version": "استخدم حسابك للدخول الى الاصدار الاخير",
-    "We’re excited to announce Riot is now Element": "نحن سعيدون باعلان ان Riot اصبح الان Element",
-    "Riot is now Element!": "Riot اصبح الان Element!",
-    "Learn More": "تعلم المزيد",
     "Sign In or Create Account": "لِج أو أنشِئ حسابًا",
     "Use your account or create a new one to continue.": "استعمل حسابك أو أنشِئ واحدًا جديدًا للمواصلة.",
     "Create Account": "أنشِئ حسابًا",
@@ -171,7 +147,6 @@
     "Failed to invite": "فشلت الدعوة",
     "Operation failed": "فشلت العملية",
     "Failed to invite users to the room:": "فشلت دعوة المستخدمين إلى الغرفة:",
-    "Failed to invite the following users to the %(roomName)s room:": "فشلت دعوة المستخدمين الآتية أسمائهم إلى غرفة %(roomName)s:",
     "You need to be logged in.": "عليك الولوج.",
     "You need to be able to invite users to do that.": "يجب أن تكون قادرًا على دعوة المستخدمين للقيام بذلك.",
     "Unable to create widget.": "غير قادر على إنشاء Widget.",
@@ -193,9 +168,6 @@
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "ادخل احد الرموز ¯\\_(ツ)_/¯ قبل نص الرسالة",
     "Sends a message as plain text, without interpreting it as markdown": "ارسال رسالة كنص، دون تفسيرها على انها معلمات",
     "Sends a message as html, without interpreting it as markdown": "ارسال رسالة بشكل HTML، دون تفسيرها على انها معلمات",
-    "Searches DuckDuckGo for results": "البحث في DuckDuckGo للحصول على نتائج",
-    "/ddg is not a command": "/ddg ليس امر",
-    "To use it, just wait for autocomplete results to load and tab through them.": "لاستخدامها، فقط انتظر حتى يكتمل تحميل النتائج والمرور عليها.",
     "Upgrades a room to a new version": "ترقية الغرفة الى الاصدار الجديد",
     "You do not have the required permissions to use this command.": "ليس لديك الأذونات المطلوبة لاستخدام هذا الأمر.",
     "Error upgrading room": "خطأ في ترقية الغرفة",
@@ -252,26 +224,6 @@
     "Sends a message to the given user": "يرسل رسالة الى المستخدم المعطى",
     "Displays action": "يعرض إجراءً",
     "Reason": "السبب",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s قبل دعوة %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s قبل الدعوة.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s طلب مكالمة VoIP جماعية.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s دعا %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s حظر %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s غير اسم العرض الخاص به الى %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s حدد اسم العرض:%(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ازال اسم العرض (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ازال صورة البروفايل الخاصة به.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s غير صورة البروفايل الخاصة به.",
-    "%(senderName)s set a profile picture.": "%(senderName)s غير صورة البروفايل الخاصة به.",
-    "%(senderName)s made no change.": "%(senderName)s لم يقم باية تعديلات.",
-    "VoIP conference started.": "بدأ اجتماع VoIP.",
-    "%(targetName)s joined the room.": "%(targetName)s انضم الى الغرفة.",
-    "VoIP conference finished.": "انتهى اجتماع VoIP.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s رفض الدعوة.",
-    "%(targetName)s left the room.": "%(targetName)s غادر الغرفة.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s الغى الحظر على %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s سحب دعوة %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s طرد %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s غير الموضوع الى \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ازال اسم الغرفة.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s غير اسم الغرفة من %(oldRoomName)s الى %(newRoomName)s.",
@@ -297,12 +249,6 @@
     "%(senderName)s changed the main and alternative addresses for this room.": "قام %(senderName)s بتعديل العناوين الرئيسية و البديلة لهذه الغرفة.",
     "%(senderName)s changed the addresses for this room.": "قام %(senderName)s بتعديل عناوين هذه الغرفة.",
     "Someone": "شخص ما",
-    "(not supported by this browser)": "(غير مدعوم في هذا المتصفح)",
-    "%(senderName)s answered the call.": "%(senderName)s رد على المكالمة.",
-    "(could not connect media)": "(غير قادر على الاتصال بالوسيط)",
-    "(no answer)": "(لايوجد رد)",
-    "(unknown failure: %(reason)s)": "(فشل غير معروف:%(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s انهى المكالمة.",
     "%(senderName)s placed a voice call.": "أجرى ⁨%(senderName)s⁩ مكالمة صوتية.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "أجرى %(senderName)s مكالمة صوتية. (غير متوافقة مع هذا المتصفح)",
     "%(senderName)s placed a video call.": "أجرى %(senderName)s مكالمة فيديو.",
@@ -325,11 +271,7 @@
     "e.g. <CurrentPageURL>": "مثال: <عنوان_الصفحة_الحالية>",
     "Your device resolution": "ميز الجهاز لديك",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "على الرغم من احتواء هذه الصفحة على معلومات تُحدّد الهويّة (مثل معرّف الغرفة والمستخدم والمجموعة) إلّا أن هذه البيانات تُحذف قبل إرسالها إلى الخادوم.",
-    "The remote side failed to pick up": "لم يردّ الطرف الآخر",
-    "Existing Call": "مكالمة جارية",
     "You cannot place a call with yourself.": "لا يمكنك الاتصال بنفسك.",
-    "Call in Progress": "إجراء المكالمة جارٍ",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "يرجى تثبيت <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(اسم المرسل)S إزالة القاعدة التي تحظر المستخدمين المتطابقين %(عام)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(اسم المرسل)s إزالة القاعدة التي تحظر الغرف المتطابقة %(عام)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(اسم المرسل)s إزالة القاعدة التي تحظر الغرف المتطابقة %(عام)s",
@@ -346,9 +288,9 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s قاعدة حظر محدثة التي طابقت %(oldGlob)s لتطابق %(newGlob)s من أجل %(reason)s",
     "Light": "ضوء",
     "Dark": "مظلم",
-    "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": "التحقق بشكل يدوي عبر نص",
@@ -365,15 +307,10 @@
     "Cannot reach identity server": "لا يمكن الوصول لهوية السيرفر",
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "يمكنك التسجيل , لكن بعض الميزات ستكون غير متوفرة حتى يتم التعرف على هوية السيرفر بشكل متصل . إن كنت ما تزال ترى هذا التحذير , تأكد من إعداداتك أو تواصل مع مدير السيرفر",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "يمكنك إعادة ضبط كلمة السر لكن بعض الميزات ستكون غير متوفرة حتى عودة السيرفر للإنترنت . إذا كنت لا تزال ترى هذا التحذير تأكد من إعداداتك أو تواصل مع مدير السيرفر",
-    "I understand the risks and wish to continue": "ادرك المخاطر وارغب في الاستمرار",
     "Language Dropdown": "قائمة اللغة المنسدلة",
     "Information": "المعلومات",
-    "Rotate clockwise": "أدر باتجاه عقارب الساعة",
     "Rotate Right": "أدر لليمين",
-    "Rotate counter-clockwise": "أدر عكس اتجاه عقارب الساعة",
     "Rotate Left": "أدر لليسار",
-    "Uploaded on %(date)s by %(user)s": "رفعه %(user)s في %(date)s",
-    "You cannot delete this image. (%(code)s)": "لا يمكنك حذف هذه الصورة. (%(code)s)",
     "expand": "توسيع",
     "collapse": "تضييق",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "الرجاء <newIssueLink> إنشاء إشكال جديد</newIssueLink> على GitHub حتى نتمكن من التحقيق في هذا الخطأ.",
@@ -388,7 +325,6 @@
     "Widget added by": "عنصر واجهة أضافه",
     "Widgets do not use message encryption.": "عناصر الواجهة لا تستخدم تشفير الرسائل.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "قد يؤدي استخدام هذه الأداة إلى مشاركة البيانات <helpIcon /> مع%(widgetDomain)s.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "قد يؤدي استخدام عنصر واجهة المستخدم هذا إلى مشاركة البيانات <helpIcon /> مع %(widgetDomain)s ومدير التكامل الخاص بك.",
     "Widget ID": "معرّف عنصر واجهة",
     "Room ID": "معرّف الغرفة",
     "%(brand)s URL": "رابط %(brand)s",
@@ -444,7 +380,6 @@
     "Message deleted by %(name)s": "حذف الرسالة %(name)s",
     "Message deleted": "حُذفت الرسالة",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>تفاعلو ب%(shortName)s</reactedWith>",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> تفاعلوا ب%(content)s</reactedWith>",
     "Reactions": "التفاعلات",
     "Show all": "أظهر الكل",
     "Error decrypting video": "تعذر فك تشفير الفيديو",
@@ -477,7 +412,6 @@
     "Message Actions": "إجراءات الرسائل",
     "Reply": "رد",
     "React": "تفاعل",
-    "Error decrypting audio": "تعذر فك تشفير الصوت",
     "The encryption used by this room isn't supported.": "التشفير الذي تستخدمه هذه الغرفة غير مدعوم.",
     "Encryption not enabled": "التشفير غير مفعل",
     "Ignored attempt to disable encryption": "تم تجاهل محاولة تعطيل التشفير",
@@ -512,7 +446,6 @@
     "New published address (e.g. #alias:server)": "عنوان منشور جديد (على سبيل المثال #alias:server)",
     "No other published addresses yet, add one below": "لا توجد عناوين أخرى منشورة بعد ، أضف واحدًا أدناه",
     "Other published addresses:": "عناوين منشورة أخرى:",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "يمكن لأي شخص استخدام العناوين المنشورة على أي خادم للانضمام إلى غرفتك. لنشر عنوان ، يجب تعيينه كعنوان محلي أولاً.",
     "Published Addresses": "العناوين المنشورة",
     "Local address": "العنوان المحلي",
     "This room has no local addresses": "هذه الغرفة ليس لها عناوين محلية",
@@ -661,11 +594,7 @@
     "%(duration)sh": "%(duration)sس",
     "%(duration)sm": "%(duration)sد",
     "%(duration)ss": "%(duration)sث",
-    "Jump to message": "انتقل إلى الرسالة",
-    "Unpin Message": "إلغاء تثبيت الرسالة",
-    "Pinned Messages": "الرسائل المثبتة",
     "Loading...": "جارٍ الحمل...",
-    "No pinned messages.": "لا رسائل مثبَّتة.",
     "This is the start of <roomName/>.": "هذه بداية <roomName/>.",
     "Add a photo, so people can easily spot your room.": "أضف صورة ، حتى يسهل على الناس تمييز غرفتك.",
     "You created this room.": "أنت أنشأت هذه الغرفة.",
@@ -701,7 +630,6 @@
     "and %(count)s others...|other": "و %(count)s أخر...",
     "Close preview": "إغلاق المعاينة",
     "Scroll to most recent messages": "انتقل إلى أحدث الرسائل",
-    "Please select the destination room for this message": "الرجاء تحديد الغرفة التي توجه لها هذه الرسالة",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "لا يمكن ضمان موثوقية هذه الرسالة المشفرة على هذا الجهاز.",
     "Encrypted by a deleted session": "مشفرة باتصال محذوف",
     "Unencrypted": "غير مشفر",
@@ -729,13 +657,8 @@
     "Error adding ignored user/server": "تعذر إضافة مستخدم/خادم مُتجاهَل",
     "Ignored/Blocked": "المُتجاهل/المحظور",
     "Labs": "معامل",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "خصص تجربتك مع ميزات المعامل التجريبية. <a> اعرف المزيد </a>.",
     "Clear cache and reload": "محو مخزن الجيب وإعادة التحميل",
-    "click to reveal": "انقر للكشف",
-    "Access Token:": "رمز الوصول:",
-    "Identity Server is": "خادم الهوية هو",
     "Homeserver is": "الخادم الوسيط هو",
-    "olm version:": "إصدار olm:",
     "%(brand)s version:": "إصدار %(brand)s:",
     "Versions": "الإصدارات",
     "Keyboard Shortcuts": "اختصارات لوحة المفاتيح",
@@ -743,7 +666,6 @@
     "Help & About": "المساعدة وعن البرنامج",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "للإبلاغ عن مشكلة أمنية متعلقة بMatrix ، يرجى قراءة <a>سياسة الإفصاح الأمني</a> في Matrix.org.",
     "Submit debug logs": "إرسال سجلات تصحيح الأخطاء",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "إذا قمت بإرسال خطأ عبر GitHub ، فيمكن أن تساعدنا سجلات تصحيح الأخطاء في تعقب المشكلة. تحتوي سجلات تصحيح الأخطاء على بيانات استخدام التطبيق بما في ذلك اسم المستخدم والمعرفات أو الأسماء المستعارة للغرف أو المجموعات التي زرتها وأسماء المستخدمين للمستخدمين الآخرين. لا تحتوي على رسائل.",
     "Bug reporting": "الإبلاغ عن مشاكل في البرنامج",
     "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> أو ابدأ محادثة مع برنامج الروبوت الخاص بنا باستخدام الزر أدناه.",
@@ -768,7 +690,6 @@
     "Customise your appearance": "تخصيص مظهرك",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "قم بتعيين اسم الخط المثبت على نظامك وسيحاول %(brand)s استخدامه.",
     "Modern": "حديث",
-    "Compact": "متراصّ",
     "Message layout": "مظهر الرسائل",
     "Theme": "المظهر",
     "Add theme": "إضافة مظهر",
@@ -783,20 +704,15 @@
     "New version available. <a>Update now.</a>": "ثمة إصدارٌ جديد. <a>حدّث الآن.</a>",
     "Check for update": "ابحث عن تحديث",
     "Error encountered (%(errorDetail)s).": "صودِفَ خطأ: (%(errorDetail)s).",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "يتلقى مديرو التكامل بيانات الضبط ، ويمكنهم تعديل عناصر واجهة المستخدم ، وإرسال دعوات الغرف ، وتعيين مستويات القوة نيابة عنك.",
     "Manage integrations": "إدارة التكاملات",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل لإدارة الروبوتات وعناصر الواجهة وحزم الملصقات.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل <b>(%(serverName)s)</b> لإدارة الروبوتات وعناصر الواجهة وحزم الملصقات.",
     "Change": "تغيير",
     "Enter a new identity server": "أدخل خادم هوية جديدًا",
     "Do not use an identity server": "لا تستخدم خادم هوية",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "استخدام خادم الهوية اختياري. إذا اخترت عدم استخدام خادم هوية ، فلن يتمكن المستخدمون الآخرون من اكتشافك ولن تتمكن من دعوة الآخرين عبر البريد الإلكتروني أو الهاتف.",
     "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.": "قطع الاتصال بخادم الهوية الخاص بك يعني أنك لن تكون قابلاً للاكتشاف من قبل المستخدمين الآخرين ولن تتمكن من دعوة الآخرين عبر البريد الإلكتروني أو الهاتف.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "أنت لا تستخدم حاليًا خادم هوية. لاكتشاف جهات الاتصال الحالية التي تعرفها وتكون قابلاً للاكتشاف ، أضف واحداً أدناه.",
-    "Identity Server": "خادم الهوية",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "إذا كنت لا تريد استخدام <server /> لاكتشاف جهات الاتصال الموجودة التي تعرفها وتكون قابلاً للاكتشاف ، فأدخل خادم هوية آخر أدناه.",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "أنت تستخدم حاليًا <server> </server> لاكتشاف جهات الاتصال الحالية التي تعرفها وتجعل نفسك قابلاً للاكتشاف. يمكنك تغيير خادم الهوية الخاص بك أدناه.",
-    "Identity Server (%(server)s)": "خادمة الهوية (%(server)s)",
     "Go back": "ارجع",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "نوصي بإزالة عناوين البريد الإلكتروني وأرقام الهواتف من خادم الهوية قبل قطع الاتصال.",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "لا زالت <b>بياناتك الشخصية مشاعة</b> على خادم الهوية <idserver />.",
@@ -814,9 +730,6 @@
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "انفصل عن خادم الهوية <current /> واتصل بآخر <new /> بدلاً منه؟",
     "Change identity server": "تغيير خادم الهوية",
     "Checking server": "فحص خادم",
-    "Could not connect to Identity Server": "تعذر الاتصال بخادم هوية",
-    "Not a valid Identity Server (status code %(code)s)": "خادم هوية مردود (رقم الحال %(code)s)",
-    "Identity Server URL must be HTTPS": "يجب أن يكون رابط (URL) خادم الهوية HTTPS",
     "not ready": "غير جاهز",
     "ready": "جاهز",
     "Secret storage:": "التخزين السري:",
@@ -825,7 +738,6 @@
     "Backup key cached:": "المفتاح الاحتياطي المحفوظ (في cache):",
     "Backup key stored:": "المفتاح الاختياطي المحفوظ:",
     "not stored": "لم يُحفظ",
-    "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.": "قم بعمل نسخة احتياطية من مفاتيح التشفير ببيانات حسابك في حالة فقد الوصول إلى اتصالاتك. ستأمَّن مفاتيحك باستخدام مفتاح استرداد فريد.",
     "unexpected type": "نوع غير متوقع",
     "well formed": "مشكل جيّداً",
     "Back up your keys before signing out to avoid losing them.": "أضف مفاتيحك للاحتياطي قبل تسجيل الخروج لتتجنب ضياعها.",
@@ -867,16 +779,8 @@
     "Enable audible notifications for this session": "تمكين الإشعارات الصوتية لهذا الاتصال",
     "Show message in desktop notification": "إظهار الرسالة في إشعارات سطح المكتب",
     "Enable desktop notifications for this session": "تمكين إشعارات سطح المكتب لهذا الاتصال",
-    "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.": "توجد إشعارات متقدمة لا تظهر هنا.",
     "Notification targets": "أهداف الإشعار",
-    "Unable to fetch notification target list": "تعذر جلب قائمة هدف الإشعار",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "تتبع الإشعارات بالكلمات المفتاحية التالية قواعد لا يمكن عرضها هنا:",
-    "Add an email address to configure email notifications": "أضف عنوان بريد إلكتروني لضبط إشعاراته",
-    "Enable email notifications": "تمكين إشعارات البريد الإلكتروني",
     "Clear notifications": "محو الإشعارات",
-    "Enable notifications for this account": "تمكين الإشعارات لهذا الحساب",
-    "Notify me for anything else": "أشعرني بأي شيء آخر",
     "You've successfully verified your device!": "لقد نجحت في التحقق من جهازك!",
     "In encrypted rooms, verify all users to ensure it’s secure.": "في الغرف المشفرة ، تحقق من جميع المستخدمين للتأكد من أنها آمنة.",
     "Verify all users in a room to ensure it's secure.": "تحقق من جميع المستخدمين في الغرفة للتأكد من أنها آمنة.",
@@ -891,7 +795,6 @@
     "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. جرب مع عميل مختلف.",
     "Security": "الأمان",
     "This client does not support end-to-end encryption.": "لا يدعم هذا العميل التشفير من طرف إلى طرف.",
-    "Role": "الدور",
     "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?": "سيؤدي إلغاء نشاط هذا المستخدم إلى تسجيل خروجهم ومنعهم من تسجيل الدخول مرة أخرى. بالإضافة إلى ذلك ، سيغادرون جميع الغرف التي يتواجدون فيها. لا يمكن التراجع عن هذا الإجراء. هل أنت متأكد أنك تريد إلغاء نشاط هذا المستخدم؟",
@@ -928,7 +831,6 @@
     "Demote": "تخفيض",
     "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 yourself?": "خفض مرتبة نفسك؟",
-    "Direct message": "رسالة مباشرة",
     "Share Link to User": "مشاركة رابط للمستخدم",
     "Mention": "إشارة",
     "Invite": "دعوة",
@@ -972,7 +874,6 @@
     "Start Verification": "ابدأ التحقق",
     "Accepting…": "جارٍ القبول …",
     "Waiting for %(displayName)s to accept…": "بانتظار %(displayName)s ليقبل …",
-    "Waiting for you to accept on your other session…": "في انتظار قبولك من اتصالك الآخر …",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "عندما يضع شخص ما عنوان URL في رسالته ، يمكن عرض معاينة عنوان URL لإعطاء مزيد من المعلومات حول هذا الرابط مثل العنوان والوصف وصورة من موقع الويب.",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "في الغرف المشفرة ، مثل هذه الغرفة ، يتم تعطيل معاينات URL أصلاً للتأكد من أن خادمك الوسيط (حيث يتم إنشاء المعاينات) لا يمكنه جمع معلومات حول الروابط التي تراها في هذه الغرفة.",
     "URL previews are disabled by default for participants in this room.": "معاينات URL معطلة بشكل أصلي للمشاركين في هذه الغرفة.",
@@ -989,13 +890,6 @@
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ليس معرف مجتمع صالحًا",
     "Invalid community ID": "معرف المجتمع غير صالح",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "تعذر تحديث flair لهذه الغرفة. قد لا يسمح الخادم بذلك أو حدث خطأ مؤقت.",
-    "Notify for all other messages/rooms": "أشعر لجميع الرسائل والغرف الأخرى",
-    "Messages containing <span>keywords</span>": "رسائل تتضمن <span>كلمات مفتاحية</span>",
-    "Failed to update keywords": "تعذر تحديث الكلمات المفتاحية",
-    "Failed to change settings": "تعذر تغيير الإعدادات",
-    "Enter keywords separated by a comma:": "أدخل كلماتٍ مفتاحية مع فاصلة بينها:",
-    "Keywords": "الكلمات المفتاحية",
-    "Error saving email notification preferences": "تعذر حفظ تفضيلات إشعار البريد الإلكتروني",
     "The integration manager is offline or it cannot reach your homeserver.": "مدري التكامل غير متصل بالإنرتنت أو لا يمكنه الوصول إلى خادمك الوسيط.",
     "Cannot connect to integration manager": "لا يمكن الاتصال بمدير التكامل",
     "Connecting to integration manager...": "جارٍ الاتصال بمدير التكامل ...",
@@ -1003,8 +897,6 @@
     "%(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 يفقد بعض المكونات المطلوبة لحفظ آمن محليًّا للرسائل المشفرة. إذا أدرت تجربة هذه الخاصية، فأنشئ %(brand)s على سطح المكتب مع <nativeLink>إضافة مكونات البحث</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "تخزين الرسائل المشفرة بشكل آمن (في cache) محليًا حتى تظهر في نتائج البحث.",
     "Manage": "إدارة",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "تخزين الرسائل المشفرة مؤقتًا بشكل آمن محليًا حتى تظهر في نتائج البحث ، باستخدام %(size)s لتخزين الرسائل من %(count)s غرفة.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "تخزين الرسائل المشفرة مؤقتًا بشكل آمن محليًا حتى تظهر في نتائج البحث ، باستخدام%(size)s لتخزين الرسائل من %(count)s غرف.",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "تحقق بشكل فردي من كل اتصال يستخدمه المستخدم لتمييزه أنه موثوق ، دون الوثوق بالأجهزة الموقعة بالتبادل.",
     "Encryption": "تشفير",
     "Failed to set display name": "تعذر تعيين الاسم الظاهر",
@@ -1040,7 +932,7 @@
     "Cross-signing is not set up.": "لم يتم إعداد التوقيع المتبادل.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "يحتوي حسابك على هوية توقيع متبادل في وحدة تخزين سرية ، لكن هذا الاتصال لم يثق به بعد.",
     "Cross-signing is ready for use.": "التوقيع المتبادل جاهز للاستخدام.",
-    "Your homeserver does not support cross-signing.": "خادمك الوسيط لا يدعم التوقيع المتبادل (cross-signing).",
+    "Your homeserver does not support cross-signing.": "خادوم المنزل الذي تستعمل لا يدعم التوقيع المتبادل (cross-signing).",
     "Change Password": "تغيير كلمة المرور",
     "Confirm password": "تأكيد كلمة المرور",
     "New Password": "كلمة مرور جديدة",
@@ -1056,12 +948,10 @@
     "Failed to upload profile picture!": "تعذَّر رفع صورة الملف الشخصي!",
     "Show more": "أظهر أكثر",
     "Show less": "أظهر أقل",
-    "Channel: %(channelName)s": "قناة: %(channelName)s",
     "This bridge is managed by <user />.": "هذا الجسر يديره <user />.",
     "Upload": "رفع",
     "Accept <policyLink /> to continue:": "قبول <policyLink /> للمتابعة:",
     "Decline (%(counter)s)": "رفض (%(counter)s)",
-    "From %(deviceName)s (%(deviceId)s)": "من %(deviceName)s (%(deviceId)s)",
     "Your server isn't responding to some <a>requests</a>.": "خادمك لا يتجاوب مع بعض <a>الطلبات</a>.",
     "Dog": "كلب",
     "To be secure, do this in person or use a trusted way to communicate.": "لتكون آمنًا ، افعل ذلك شخصيًا أو استخدم طريقة موثوقة للتواصل.",
@@ -1089,12 +979,7 @@
     "The other party cancelled the verification.": "ألغى الطرف الآخر التحقق.",
     "Accept": "قبول",
     "Decline": "رفض",
-    "Incoming call": "مكالمة واردة",
-    "Incoming video call": "مكالمة مرئية واردة",
-    "Incoming voice call": "مكالمة صوتية واردة",
     "Unknown caller": "متصل غير معروف",
-    "Call Paused": "أوقِفَ الاتصال",
-    "Active call": "مكالمة نشطة",
     "This is your list of users/servers you have blocked - don't leave the room!": "هذه قائمتك للمستخدمين / الخوادم التي حظرت - لا تغادر الغرفة!",
     "My Ban List": "قائمة الحظر",
     "When rooms are upgraded": "عند ترقية الغرف",
@@ -1115,23 +1000,19 @@
     "How fast should messages be downloaded.": "ما مدى سرعة تنزيل الرسائل.",
     "Enable message search in encrypted rooms": "تمكين البحث عن الرسائل في الغرف المشفرة",
     "Show previews/thumbnails for images": "إظهار المعاينات / الصور المصغرة للصور",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "إرسال إيصالات بالقراءة للرسائل (يتطلب التعطيل توافق الخادم الوسيط)",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "السماح بخادم مساعدة الاتصال الاحتياطي turn.matrix.org عندما لا يقدم خادمك واحدًا (سيتم مشاركة عنوان IP الخاص بك أثناء المكالمة)",
-    "Low bandwidth mode": "وضع النطاق الترددي المنخفض",
     "Show hidden events in timeline": "إظهار الأحداث المخفية في الجدول الزمني",
     "Show shortcuts to recently viewed rooms above the room list": "إظهار اختصارات للغرف التي تم عرضها مؤخرًا أعلى قائمة الغرف",
     "Show rooms with unread notifications first": "اعرض الغرف ذات الإشعارات غير المقروءة أولاً",
     "Order rooms by name": "ترتيب الغرف بالاسم",
     "Show developer tools": "عرض أدوات المطور",
     "Prompt before sending invites to potentially invalid matrix IDs": "أعلمني قبل إرسال دعوات لمعرِّفات قد لا تكون صحيحة",
-    "Room Colour": "لون الغرفة",
     "Enable URL previews by default for participants in this room": "تمكين معاينة الروابط أصلاً لأي مشارك في هذه الغرفة",
     "Enable URL previews for this room (only affects you)": "تمكين معاينة الروابط لهذه الغرفة (يؤثر عليك فقط)",
     "Enable inline URL previews by default": "تمكين معاينة الروابط أصلاً",
     "Never send encrypted messages to unverified sessions in this room from this session": "لا ترسل أبدًا رسائل مشفرة إلى اتصالات التي لم يتم التحقق منها في هذه الغرفة من هذا الاتصال",
     "Never send encrypted messages to unverified sessions from this session": "لا ترسل أبدًا رسائل مشفرة إلى اتصالات لم يتم التحقق منها من هذا الاتصال",
     "Send analytics data": "إرسال بيانات التحليلات",
-    "Allow Peer-to-Peer for 1:1 calls": "تمكين مكالمة القرين للقرين إذا كانت فردية (1:1)",
     "System font name": "اسم خط النظام",
     "Use a system font": "استخدام خط النظام",
     "Match system theme": "مطابقة ألوان النظام",
@@ -1142,7 +1023,6 @@
     "Enable big emoji in chat": "تفعيل الرموز التعبيرية الكبيرة في المحادثة",
     "Show avatars in user and room mentions": "إظهار الصورة الرمزية عند ذكر مستخدم أو غرفة",
     "Enable automatic language detection for syntax highlighting": "تمكين التعرف التلقائي للغة لتلوين الجمل",
-    "Autoplay GIFs and videos": "التشغيل التلقائي لملفات GIF ومقاطع الفيديو",
     "Always show message timestamps": "اعرض دائمًا الطوابع الزمنية للرسالة",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "عرض الطوابع الزمنية بتنسيق 12 ساعة (على سبيل المثال 2:30pm)",
     "Show read receipts sent by other users": "إظهار إيصالات القراءة المرسلة من قبل مستخدمين آخرين",
@@ -1155,18 +1035,15 @@
     "Use custom size": "استخدام حجم مخصص",
     "Font size": "حجم الخط",
     "Show info about bridges in room settings": "إظهار المعلومات حول الجسور في إعدادات الغرفة",
-    "Enable advanced debugging for the room list": "تفعيل التصحيح المتقدم لقائمة الغرف",
     "Offline encrypted messaging using dehydrated devices": "الرسائل المشفرة في وضع عدم الاتصال باستخدام أجهزة مجففة",
     "Show message previews for reactions in all rooms": "أظهر معاينات الرسائل للتفاعلات في كل الغرف",
     "Show message previews for reactions in DMs": "أظهر معاينات الرسائل للتفاعلات في المراسلة المباشرة",
     "Support adding custom themes": "دعم إضافة ألوان مخصصة",
     "Try out new ways to ignore people (experimental)": "جرب طرق أخرى لتجاهل الناس (تجريبي)",
-    "Multiple integration managers": "تعدد مدراء التكامل",
     "Render simple counters in room header": "إظهار عدّادات بسيطة في رأس الغرفة",
     "Group & filter rooms by custom tags (refresh to apply changes)": "جمع وتصفية الغرف حسب أوسمة مخصصة (حدّث لترى التغيرات)",
     "Custom user status messages": "تخصيص رسالة حالة المستخدم",
     "Message Pinning": "تثبيت الرسالة",
-    "New spinner design": "التصميم الجديد للدوَّار",
     "Change notification settings": "تغيير إعدادات الإشعار",
     "%(senderName)s is calling": "%(senderName)s يتصل",
     "Waiting for answer": "بانتظار الرد",
@@ -1187,7 +1064,6 @@
     "Guest": "ضيف",
     "New version of %(brand)s is available": "يتوفر إصدار جديد من %(brand)s",
     "Update %(brand)s": "حدّث: %(brand)s",
-    "Verify the new login accessing your account: %(name)s": "تحقق من تسجيل الدخول الجديد لحسابك: %(name)s",
     "New login. Was this you?": "تسجيل دخول جديد. هل كان ذاك أنت؟",
     "Other users may not trust it": "قد لا يثق به المستخدمون الآخرون",
     "This message cannot be decrypted": "لا يمكن فك تشفير هذه الرسالة",
@@ -1196,9 +1072,6 @@
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "إذا كانت اتصالاتك الأخرى لا تحتوي على مفتاح هذه الرسالة ، فلن تتمكن من فك تشفيرها.",
     "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.": "تم إرسال طلبك لمشاركة المفتاح - يرجى التحقق من اتصالاتك الأخرى في طلبات مشاركة المفتاح.",
-    "%(senderName)s uploaded a file": "%(senderName)s رفع ملفًّا",
-    "%(senderName)s sent a video": "%(senderName)s أرسل مرئيًّا",
-    "%(senderName)s sent an image": "%(senderName)s أرسل صورة",
     "This event could not be displayed": "تعذر عرض هذا الحدث",
     "Mod": "مشرف",
     "Edit message": "تعديل الرسالة",
@@ -1209,7 +1082,6 @@
     "You have not verified this user.": "أنت لم تتحقق من هذا المستخدم.",
     "This user has not verified all of their sessions.": "هذا المستخدم لم يتحقق من جميع اتصالاته.",
     "Drop file here to upload": "قم بإسقاط الملف هنا ليُرفَع",
-    "Drop File Here": "أسقط الملف هنا",
     "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؟",
@@ -1238,7 +1110,6 @@
     "Your email address hasn't been verified yet": "لم يتم التحقق من عنوان بريدك الإلكتروني حتى الآن",
     "Unable to share email address": "تعذرت مشاركة البريد الإلتكروني",
     "Unable to revoke sharing for email address": "تعذر إبطال مشاركة عنوان البريد الإلكتروني",
-    "Who can access this room?": "من يمكنه الوصول إلى هذه الغرفة؟",
     "Encrypted": "التشفير",
     "Once enabled, encryption cannot be disabled.": "لا يمكن تعطيل التشفير بعد تمكينه.",
     "Security & Privacy": "الأمان والخصوصية",
@@ -1248,12 +1119,8 @@
     "Members only (since the point in time of selecting this option)": "الأعضاء فقط (منذ اللحظة التي حدد فيها هذا الخيار)",
     "Anyone": "أي أحد",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "ستنطبق التغييرات على من يمكنه قراءة السجل على الرسائل المستقبلية في هذه الغرفة فقط. رؤية التاريخ الحالي لن تتغير.",
-    "Anyone who knows the room's link, including guests": "أي شخص يعرف رابط الغرفة بما في ذلك الضيوف",
-    "Anyone who knows the room's link, apart from guests": "أي شخص يعرف رابط الغرفة باستثناء الضيوف",
     "Only people who have been invited": "المدعوون فقط",
     "To link to this room, please add an address.": "للربط لهذه الغرفة ، يرجى إضافة عنوان.",
-    "Click here to fix": "انقر هنا للإصلاح",
-    "Guests cannot join this room even if explicitly invited.": "لا يمكن للضيوف الانضمام إلى هذه الغرفة حتى إذا تمت دعوتهم بعينهم.",
     "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>",
     "Enable encryption?": "تمكين التشفير؟",
     "Select the roles required to change various parts of the room": "حدد الأدوار المطلوبة لتغيير أجزاء مختلفة من الغرفة",
@@ -1372,11 +1239,8 @@
     "Don't miss a reply": "لا تفوت أي رد",
     "Later": "لاحقاً",
     "Review": "مراجعة",
-    "Verify all your sessions to ensure your account & messages are safe": "تحقق من جميع اتصالاتك للتأكد من أمان حسابك ورسائلك",
-    "Review where you’re logged in": "راجع أماكن تسجيل دخولك",
     "No": "لا",
-    "I want to help": "أريد أن أساعد",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "أرسل <UsageDataLink> بيانات استخدام مجهولة </ UseDataLink> والتي تساعدنا في تحسين %(brand)s. سيستخدم هذا <PolicyLink> ملف تعريف الارتباط </ PolicyLink>.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "أرسل <UsageDataLink>بيانات استخدام مجهولة</UsageDataLink> والتي تساعدنا في تحسين %(brand)s. سيستخدم هذا <PolicyLink>ملف تعريف الارتباط</PolicyLink>.",
     "Help us improve %(brand)s": "ساعدنا في تحسين %(brand)s",
     "Unknown App": "تطبيق غير معروف",
     "Short keyboard patterns are easy to guess": "من السهل تخمين أنماط قصيرة من لوحة المفاتيح",
@@ -1414,7 +1278,6 @@
     "United States": "الولايات المتحدة",
     "End conference": "إنهاء المؤتمر",
     "Answered Elsewhere": "أُجيب في مكان آخر",
-    "The other party declined the call.": "رفض الطرف الآخر المكالمة.",
     "Default Device": "الجهاز الاعتيادي",
     "Albania": "ألبانيا",
     "Afghanistan": "أفغانستان",
@@ -1422,7 +1285,6 @@
     "This will end the conference for everyone. Continue?": "هذا سينهي المؤتمر للجميع. استمر؟",
     "The call was answered on another device.": "تم الرد على المكالمة على جهاز آخر.",
     "The call could not be established": "تعذر إجراء المكالمة",
-    "Call Declined": "رُفض الاتصال",
     "See videos posted to your active room": "أظهر الفيديوهات المرسلة إلى هذه غرفتك النشطة",
     "See videos posted to this room": "أظهر الفيديوهات المرسلة إلى هذه الغرفة",
     "Send videos as you in your active room": "أرسل الفيديوهات بهويتك في غرفتك النشطة",
@@ -1474,10 +1336,6 @@
     "%(senderName)s created a rule banning users 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 declined the call.": "%(senderName)s رفض المكالمة.",
-    "(an error occurred)": "(حدث خطأ)",
-    "(their device couldn't start the camera / microphone)": "(تعذر على جهازهم بدء تشغيل الكاميرا / الميكروفون)",
-    "(connection failed)": "(فشل الاتصال)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 جميع الخوادم ممنوعة من المشاركة! لم يعد من الممكن استخدام هذه الغرفة.",
     "Takes the call in the current room off hold": "يوقف المكالمة في الغرفة الحالية",
     "Places the call in the current room on hold": "يضع المكالمة في الغرفة الحالية قيد الانتظار",
@@ -1485,9 +1343,7 @@
     "No other application is using the webcam": "لا يوجد تطبيق آخر يستخدم كاميرا الويب",
     "Permission is granted to use the webcam": "منح الإذن باستخدام كاميرا الويب",
     "A microphone and webcam are plugged in and set up correctly": "الميكروفون وكاميرا ويب موصولان ومعدان بشكل صحيح",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "فشلت المكالمة نظرًا لتعذر الوصول إلى كاميرا الويب أو الميكروفون. تحقق مما يلي:",
     "Unable to access webcam / microphone": "تعذر الوصول إلى كاميرا الويب / الميكروفون",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "فشلت المكالمة لأنه لا يمكن الوصول إلى ميكروفون. تحقق من توصيل الميكروفون وإعداده بشكل صحيح.",
     "Unable to access microphone": "تعذر الوصول إلى الميكروفون",
     "Cuba": "كوبا",
     "Croatia": "كرواتيا",
@@ -1550,7 +1406,150 @@
     "Already in call": "في مكالمة بالفعل",
     "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 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.": "فشلت المكالمة لعدم امكانية الوصل للميكروفون , تأكد من ان المكروفون متصل وتم اعداده بشكل صحيح.",
-    "Explore rooms": "استكشِف الغرف"
+    "Explore rooms": "استكشِف الغرف",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "قد يؤدي استخدام عنصر واجهة المستخدم هذا إلى مشاركة البيانات <helpIcon /> مع %(widgetDomain)s ومدير التكامل الخاص بك.",
+    "Identity server is": "خادم الهوية هو",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "يتلقى مديرو التكامل بيانات الضبط، ويمكنهم تعديل عناصر واجهة المستخدم، وإرسال دعوات الغرف، وتعيين مستويات القوة نيابة عنك.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل لإدارة البوتات وعناصر الواجهة وحزم الملصقات.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل <b>(%(serverName)s)</b> لإدارة البوتات وعناصر الواجهة وحزم الملصقات.",
+    "Identity server": "خادوم الهوية",
+    "Identity server (%(server)s)": "خادوم الهوية (%(server)s)",
+    "Could not connect to identity server": "تعذر الاتصال بخادوم الهوية",
+    "Not a valid identity server (status code %(code)s)": "ليس خادوم هوية صالح (رمز الحالة %(code)s)",
+    "Identity server URL must be HTTPS": "يجب أن يستعمل رابط (URL) خادوم الهوية ميفاق HTTPS",
+    "%(targetName)s rejected the invitation": "رفض %(targetName)s الدعوة",
+    "%(targetName)s joined the room": "انضم %(targetName)s إلى الغرفة",
+    "%(senderName)s made no change": "لم يقم %(senderName)s بأي تغيير",
+    "%(senderName)s set a profile picture": "قام %(senderName)s بتعيين صورة رمزية",
+    "%(senderName)s changed their profile picture": "%(senderName)s قام بتغيير صورته الرمزية",
+    "Paraguay": "باراغواي",
+    "Netherlands": "هولندا",
+    "Dismiss read marker and jump to bottom": "تجاهل علامة القراءة وانتقل إلى الأسفل",
+    "Scroll up/down in the timeline": "قم بالتمرير لأعلى/لأسفل في الجدول الزمني",
+    "Toggle video on/off": "تبديل تشغيل/إيقاف الفيديو",
+    "Toggle microphone mute": "تبديل كتم صوت الميكروفون",
+    "Cancel replying to a message": "إلغاء الرد على رسالة",
+    "Jump to start/end of the composer": "انتقل إلى بداية/نهاية المؤلف",
+    "Navigate recent messages to edit": "تصفح الرسائل الأخيرة لتحريرها",
+    "New line": "سطر جديد",
+    "[number]": "[رقم]",
+    "Greece": "اليونان",
+    "%(senderName)s removed their profile picture": "%(senderName)s أزال صورة ملفه الشخصي",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s أزال اسمه (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s قام بتعيين اسمه إلى %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s غير اسمه إلى %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s حظر %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s حظر %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s دعى %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s قبل دعوة",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s قبل الدعوة ل %(displayName)s",
+    "Converts the DM to a room": "تحويل المحادثة المباشرة إلى غرفة",
+    "Converts the room to a DM": "تحويل الغرفة إلى محادثة مباشرة",
+    "Some invites couldn't be sent": "تعذر إرسال بعض الدعوات",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "أرسلنا الآخرين، ولكن لم تتم دعوة الأشخاص أدناه إلى <RoomName/>",
+    "Zimbabwe": "زمبابوي",
+    "Yemen": "اليمن",
+    "Vietnam": "فيتنام",
+    "Venezuela": "فنزويلا",
+    "Uzbekistan": "أوزباكستان",
+    "United Arab Emirates": "الامارات العربية المتحدة",
+    "Ukraine": "اوكرانيا",
+    "Uganda": "اوغندا",
+    "Turkmenistan": "تركمانستان",
+    "Turkey": "تركيا",
+    "Tunisia": "تونس",
+    "Thailand": "تايلند",
+    "Tanzania": "تنزانيا",
+    "Tajikistan": "طاجاكستان",
+    "Taiwan": "تايوان",
+    "Syria": "سوريا",
+    "Sweden": "السويد",
+    "Sudan": "السودان",
+    "Sri Lanka": "سيريلانكا",
+    "Spain": "اسبانيا",
+    "South Sudan": "السودان الجنوبية",
+    "South Korea": "كوريا الجنوبية",
+    "South Africa": "جنوب افريقيا",
+    "Somalia": "الصومال",
+    "Slovakia": "سلوفاكيا",
+    "Singapore": "سنغافورة",
+    "Serbia": "صربيا",
+    "Senegal": "السنغال",
+    "Saudi Arabia": "المملكة العربية السعودية",
+    "Rwanda": "رواندا",
+    "Russia": "روسيا",
+    "Romania": "رومانيا",
+    "Qatar": "قطر",
+    "Portugal": "البرتغال",
+    "Poland": "بولاندا",
+    "Philippines": "الفلبين",
+    "Panama": "باناما",
+    "Palestine": "فلسطين",
+    "Pakistan": "باكستان",
+    "Oman": "عمان",
+    "Norway": "النرويج",
+    "North Korea": "كوريا الشمالية",
+    "Nigeria": "نيجيريا",
+    "Niger": "النيجر",
+    "Nicaragua": "نيكاراقوا",
+    "New Zealand": "نيوزلاندا",
+    "Nepal": "النيبال",
+    "Myanmar": "ماينمار",
+    "Mozambique": "موزمبيق",
+    "Morocco": "المغرب",
+    "Mongolia": "منغوليا",
+    "Mexico": "المكسيك",
+    "Mauritius": "موريشيوس",
+    "Mauritania": "موريتانيا",
+    "Malta": "مالطا",
+    "Mali": "مالي",
+    "Maldives": "جزر المالديف",
+    "Malaysia": "ماليزيا",
+    "Madagascar": "مدغشقر",
+    "Luxembourg": "لوكسمبرغ",
+    "Libya": "ليبيا",
+    "Liberia": "ليبريا",
+    "Lebanon": "لبنان",
+    "Latvia": "لاتفيا",
+    "Kuwait": "الكويت",
+    "Kenya": "كينيا",
+    "Kazakhstan": "كازاخستان",
+    "Jordan": "الأردن",
+    "Japan": "اليابان",
+    "Jamaica": "جامايكا",
+    "Italy": "ايطاليا",
+    "Israel": "فلسطين (اسرائيل المحتلة)",
+    "Ireland": "ايرلاندا",
+    "Iraq": "العراق",
+    "Iran": "ايران",
+    "Indonesia": "اندونيسيا",
+    "India": "الهند",
+    "Iceland": "ايسلاندا",
+    "Hungary": "هنقاريا",
+    "Hong Kong": "هونج كونج",
+    "Ghana": "غانا",
+    "Germany": "ألمانيا",
+    "Georgia": "جورجيا",
+    "France": "فرنسا",
+    "Finland": "فنلندا",
+    "Ethiopia": "اثيوبيا",
+    "Estonia": "استونيا",
+    "Eritrea": "إريتيريا",
+    "Egypt": "مصر",
+    "Ecuador": "الإكوادور",
+    "Denmark": "الدنمارك",
+    "Czech Republic": "جمهورية التشيك",
+    "Cyprus": "قبرص",
+    "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.": "تعذر الوصول إلى الخادم الرئيسي الخاص بك ولم يتمكن من تسجيل دخولك. يرجى المحاولة مرة أخرى. إذا استمر هذا ، يرجى الاتصال بمسؤول الخادم المنزلي الخاص بك.",
+    "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.": "لقد طلبنا من المتصفح أن يتذكر الخادم الرئيسي الذي تستخدمه للسماح لك بتسجيل الدخول، ولكن للأسف نسيه متصفحك. اذهب إلى صفحة تسجيل الدخول وحاول مرة أخرى.",
+    "Failed to transfer call": "فشل تحويل المكالمة",
+    "Transfer Failed": "فشل التحويل",
+    "Unable to transfer call": "غير قادر على تحويل المكالمة",
+    "There was an error looking up the phone number": "حدث خطأ أثناء البحث عن رقم الهاتف",
+    "Unable to look up phone number": "غير قادر على ايجاد رقم الهاتف",
+    "The user you called is busy.": "المستخدم الذي اتصلت به مشغول.",
+    "User Busy": "المستخدم مشغول"
 }
diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index 987cef73b2..751a4c1af1 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -1,7 +1,6 @@
 {
     "Collecting app version information": "Proqramın versiyası haqqında məlumatın yığılması",
     "Collecting logs": "Jurnalların bir yığım",
-    "Uploading report": "Hesabatın göndərilməsi",
     "Waiting for response from server": "Serverdən cavabın gözlənməsi",
     "Messages containing my display name": "Mənim adımı özündə saxlayan mesajlar",
     "Messages in one-to-one chats": "Fərdi çatlarda mesajlar",
@@ -9,20 +8,8 @@
     "When I'm invited to a room": "Nə vaxt ki, məni otağa dəvət edirlər",
     "Call invitation": "Dəvət zəngi",
     "Messages sent by bot": "Botla göndərilmiş mesajlar",
-    "Error saving email notification preferences": "Email üzrə xəbərdarlıqların qurmalarının saxlanılması səhv",
-    "An error occurred whilst saving your email notification preferences.": "Email üzrə bildirişin qurmalarının saxlanılması səhv yarandı.",
-    "Keywords": "Açar sözlər",
-    "Enter keywords separated by a comma:": "Vergül bölünmüş açar sözləri daxil edin:",
     "OK": "OK",
-    "Failed to change settings": "Qurmaları dəyişdirməyi bacarmadı",
     "Operation failed": "Əməliyyatın nasazlığı",
-    "Can't update user notification settings": "Bildirişin istifadəçi qurmalarını yeniləməyə müvəffəq olmur",
-    "Failed to update keywords": "Açar sözləri yeniləməyi bacarmadı",
-    "Messages containing <span>keywords</span>": "Müəyyən <span>açar sözləri</span> özündə saxlayan mesajlar",
-    "Notify for all other messages/rooms": "Bütün başqa mesajdan/otaqlardan xəbər vermək",
-    "Notify me for anything else": "Bütün qalan hadisələrdə xəbər vermək",
-    "Enable notifications for this account": "Bu hesab üçün xəbərdarlıqları qoşmaq",
-    "All notifications are currently disabled for all targets.": "Bütün qurğular üçün bütün bildirişlər kəsilmişdir.",
     "Failed to verify email address: make sure you clicked the link in the email": "Email-i yoxlamağı bacarmadı: əmin olun ki, siz məktubda istinaddakı ünvana keçdiniz",
     "The platform you're on": "İstifadə edilən platforma",
     "The version of %(brand)s": "%(brand)s versiyası",
@@ -35,10 +22,6 @@
     "Your device resolution": "Sizin cihazınızın qətnaməsi",
     "The information being sent to us to help make %(brand)s better includes:": "%(brand)s'i daha yaxşı etmək üçün bizə göndərilən məlumatlar daxildir:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Əgər bu səhifədə şəxsi xarakterin məlumatları rast gəlinirsə, məsələn otağın, istifadəçinin adının və ya qrupun adı, onlar serverə göndərilmədən əvvəl silinirlər.",
-    "Call Timeout": "Cavab yoxdur",
-    "Unable to capture screen": "Ekranın şəkilini etməyə müvəffəq olmur",
-    "Existing Call": "Cari çağırış",
-    "You are already in a call.": "Danışıq gedir.",
     "VoIP is unsupported": "Zənglər dəstəklənmir",
     "You cannot place VoIP calls in this browser.": "Zənglər bu brauzerdə dəstəklənmir.",
     "You cannot place a call with yourself.": "Siz özünə zəng vura bilmirsiniz.",
@@ -78,8 +61,6 @@
     "Missing room_id in request": "Sorğuda room_id yoxdur",
     "Missing user_id in request": "Sorğuda user_id yoxdur",
     "Usage": "İstifadə",
-    "/ddg is not a command": "/ddg — bu komanda deyil",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Bu funksiyadan istifadə etmək üçün, avto-əlavənin pəncərəsində nəticələrin yükləməsini gözləyin, sonra burulma üçün Tab-dan istifadə edin.",
     "Changes your display nickname": "Sizin təxəllüsünüz dəyişdirir",
     "Invites user with given id to current room": "Verilmiş ID-lə istifadəçini cari otağa dəvət edir",
     "Leave room": "Otağı tərk etmək",
@@ -94,26 +75,8 @@
     "Deops user with given id": "Verilmiş ID-lə istifadəçidən operatorun səlahiyyətlərini çıxardır",
     "Displays action": "Hərəkətlərin nümayişi",
     "Reason": "Səbəb",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s  %(displayName)s-dən dəvəti qəbul etdi.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s dəvəti qəbul etdi.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s-nı dəvət edir.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s  %(targetName)s-i blokladı.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s öz görünüş adını sildi (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s avatarını sildi.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s öz avatar-ı dəyişdirdi.",
-    "VoIP conference started.": "Konfrans-zəng başlandı.",
-    "%(targetName)s joined the room.": "%(targetName)s otağa girdi.",
-    "VoIP conference finished.": "Konfrans-zəng qurtarılmışdır.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s dəvəti rədd etdi.",
-    "%(targetName)s left the room.": "%(targetName)s otaqdan çıxdı.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s blokdan çıxardı.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s-nı qovdu.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s öz dəvətini sildi %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s otağın mövzusunu \"%(topic)s\" dəyişdirdi.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s otağın adını %(roomName)s dəyişdirdi.",
-    "(not supported by this browser)": "(bu brauzerlə dəstəklənmir)",
-    "%(senderName)s answered the call.": "%(senderName)s zəngə cavab verdi.",
-    "%(senderName)s ended the call.": "%(senderName)s zəng qurtardı.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s dəvət edilmiş iştirakçılar üçün danışıqların tarixini açdı.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s girmiş iştirakçılar üçün danışıqların tarixini açdı.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s iştirakçılar üçün danışıqların tarixini açdı.",
@@ -123,7 +86,6 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hüquqların səviyyələrini dəyişdirdi %(powerLevelDiffText)s.",
     "Failed to join room": "Otağa girməyi bacarmadı",
     "Always show message timestamps": "Həmişə mesajların göndərilməsi vaxtını göstərmək",
-    "Autoplay GIFs and videos": "GIF animasiyalarını və videolarını avtomatik olaraq oynayır",
     "Accept": "Qəbul etmək",
     "Error": "Səhv",
     "Incorrect verification code": "Təsdiq etmənin səhv kodu",
@@ -177,11 +139,7 @@
     "No users have specific privileges in this room": "Heç bir istifadəçi bu otaqda xüsusi hüquqlara malik deyil",
     "Banned users": "Bloklanmış istifadəçilər",
     "Favourite": "Seçilmiş",
-    "Click here to fix": "Düzəltmək üçün, buraya basın",
-    "Who can access this room?": "Kim bu otağa girə bilər?",
     "Only people who have been invited": "Yalnız dəvət edilmiş iştirakçılar",
-    "Anyone who knows the room's link, apart from guests": "Hamı, kimdə bu otağa istinad var, qonaqlardan başqa",
-    "Anyone who knows the room's link, including guests": "Hamı, kimdə bu otağa istinad var, qonaqlar daxil olmaqla",
     "Who can read history?": "Kim tarixi oxuya bilər?",
     "Permissions": "Girişin hüquqları",
     "Advanced": "Təfərrüatlar",
@@ -194,15 +152,12 @@
     "Sign in with": "Seçmək",
     "Register": "Qeydiyyatdan keçmək",
     "Remove": "Silmək",
-    "You are not receiving desktop notifications": "Siz sistem xəbərdarlıqlarını almırsınız",
     "What's New": "Nə dəyişdi",
     "Update": "Yeniləmək",
     "Create new room": "Otağı yaratmaq",
     "No results": "Nəticə yoxdur",
     "Home": "Başlanğıc",
-    "Manage Integrations": "İnteqrasiyaları idarə etmə",
     "%(items)s and %(lastItem)s": "%(items)s və %(lastItem)s",
-    "Room directory": "Otaqların kataloqu",
     "Start chat": "Çata başlamaq",
     "Create Room": "Otağı yaratmaq",
     "Deactivate Account": "Hesabı bağlamaq",
@@ -213,32 +168,19 @@
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Öz elektron poçtunu yoxlayın və olan istinadı basın. Bundan sonra düyməni Davam etməyə basın.",
     "Unable to add email address": "Email-i əlavə etməyə müvəffəq olmur",
     "Unable to verify email address.": "Email-i yoxlamağı bacarmadı.",
-    "Username not available": "İstifadəçi adı mövcud deyil",
-    "An error occurred: %(error_string)s": "Səhv baş verdi: %(error_string)s",
-    "Username available": "İstifadəçi adı mövcuddur",
     "Failed to change password. Is your password correct?": "Şifrəni əvəz etməyi bacarmadı. Siz cari şifrə düzgün daxil etdiniz?",
     "Reject invitation": "Dəvəti rədd etmək",
     "Are you sure you want to reject the invitation?": "Siz əminsiniz ki, siz dəvəti rədd etmək istəyirsiniz?",
     "Name": "Ad",
-    "There are no visible files in this room": "Bu otaqda görülən fayl yoxdur",
     "Featured Users:": "Seçilmiş istifadəçilər:",
     "Failed to reject invitation": "Dəvəti rədd etməyi bacarmadı",
-    "Failed to leave room": "Otaqdan çıxmağı bacarmadı",
     "For security, this session has been signed out. Please sign in again.": "Təhlükəsizliyin təmin olunması üçün sizin sessiyanız başa çatmışdır idi. Zəhmət olmasa, yenidən girin.",
     "Logout": "Çıxmaq",
-    "You have no visible notifications": "Görülən xəbərdarlıq yoxdur",
-    "Files": "Fayllar",
     "Notifications": "Xəbərdarlıqlar",
     "Connectivity to the server has been lost.": "Serverlə əlaqə itirilmişdir.",
     "Sent messages will be stored until your connection has returned.": "Hələ ki serverlə əlaqə bərpa olmayacaq, göndərilmiş mesajlar saxlanacaq.",
-    "Active call": "Aktiv çağırış",
     "No more results": "Daha çox nəticə yoxdur",
     "Failed to reject invite": "Dəvəti rədd etməyi bacarmadı",
-    "Fill screen": "Ekranı doldurmaq",
-    "Click to unmute video": "Klikləyin, videonu qoşmaq üçün",
-    "Click to mute video": "Klikləyin, videonu söndürmək üçün",
-    "Click to unmute audio": "Klikləyin, səsi qoşmaq üçün",
-    "Click to mute audio": "Klikləyin, səsi söndürmək üçün",
     "Failed to load timeline position": "Xronologiyadan nişanı yükləməyi bacarmadı",
     "Unable to remove contact information": "Əlaqə məlumatlarının silməyi bacarmadı",
     "<not supported>": "<dəstəklənmir>",
@@ -250,19 +192,13 @@
     "Email": "E-poçt",
     "Profile": "Profil",
     "Account": "Hesab",
-    "Access Token:": "Girişin token-i:",
-    "click to reveal": "açılış üçün basın",
     "Homeserver is": "Ev serveri bu",
-    "Identity Server is": "Eyniləşdirmənin serveri bu",
-    "olm version:": "Olm versiyası:",
     "Failed to send email": "Email göndərilməsinin səhvi",
     "A new password must be entered.": "Yeni parolu daxil edin.",
     "New passwords must match each other.": "Yeni şifrələr uyğun olmalıdır.",
     "I have verified my email address": "Mən öz email-i təsdiq etdim",
     "Return to login screen": "Girişin ekranına qayıtmaq",
     "Send Reset Email": "Şifrənizi sıfırlamaq üçün istinadla məktubu göndərmək",
-    "Set a display name:": "Görünüş adını daxil edin:",
-    "Upload an avatar:": "Avatar yüklə:",
     "This server does not support authentication with a phone number.": "Bu server telefon nömrəsinin köməyi ilə müəyyənləşdirilməni dəstəkləmir.",
     "Commands": "Komandalar",
     "Emoji": "Smaylar",
@@ -274,10 +210,6 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Çörək parçaları' funksiyadan istifadə edmiirsiniz (otaqlar siyahısından yuxarıdakı avatarlar)",
     "Analytics": "Analitik",
     "Call Failed": "Uğursuz zəng",
-    "The remote side failed to pick up": "Qarşı tərəf ala bilmədi",
-    "Call in Progress": "Zəng edir",
-    "A call is currently being placed!": "Hazırda zəng edilir!",
-    "A call is already in progress!": "Zəng artıq edilir!",
     "Permission Required": "İzn tələb olunur",
     "You do not have permission to start a conference call in this room": "Bu otaqda konfrans başlamaq üçün icazə yoxdur",
     "Replying With Files": "Dosyalarla cavab",
@@ -312,7 +244,6 @@
     "You are not in this room.": "Sən bu otaqda deyilsən.",
     "You do not have permission to do that in this room.": "Bu otaqda bunu etməyə icazəniz yoxdur.",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯ \\ _ (ツ) _ / ¯ işarəsini mesaja elavə edir.",
-    "Searches DuckDuckGo for results": "Nəticələr üçün DuckDuckGo-da axtarır",
     "Upgrades a room to a new version": "Bir otağı yeni bir versiyaya yüksəldir",
     "Changes your display nickname in the current room only": "Yalnız cari otaqda ekran ləqəbinizi dəyişdirir",
     "Changes your avatar in this current room only": "Avatarınızı yalnız bu cari otaqda dəyişir",
@@ -347,7 +278,6 @@
     "Only continue if you trust the owner of the server.": "Yalnız server sahibinə etibar etsəniz davam edin.",
     "Trust": "Etibar",
     "Custom (%(level)s)": "Xüsusi (%(level)s)",
-    "Failed to invite the following users to the %(roomName)s room:": "Aşağıdakı istifadəçiləri %(roomName)s otağına dəvət etmək alınmadı:",
     "Room %(roomId)s not visible": "Otaq %(roomId)s görünmür",
     "Messages": "Mesajlar",
     "Actions": "Tədbirlər",
@@ -363,11 +293,6 @@
     "Please supply a https:// or http:// widget URL": "Zəhmət olmasa https:// və ya http:// widget URL təmin edin",
     "Forces the current outbound group session in an encrypted room to be discarded": "Şifrəli bir otaqda mövcud qrup sessiyasını ləğv etməyə məcbur edir",
     "Displays list of commands with usages and descriptions": "İstifadə qaydaları və təsvirləri ilə komanda siyahısını göstərir",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konfrans istədi.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s göstərilən adlarını %(displayName)s olaraq dəyişdirdi.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s öz adlarını %(displayName)s olaraq təyin etdilər.",
-    "%(senderName)s set a profile picture.": "%(senderName)s profil şəkli təyin etdi.",
-    "%(senderName)s made no change.": "%(senderName)s dəyişiklik etməyib.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s otaq otağını sildi.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s bu otağı təkmilləşdirdi.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s linki olanlara otağı açıq etdi.",
@@ -379,9 +304,10 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Bu otaqda %(qruplar)s üçün %(senderDisplayName)s aktiv oldu.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Bu otaqda %(groups)s üçün %(senderDisplayName)s aktiv oldu.",
     "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir",
-    "Custom Server Options": "Fərdi Server Seçimləri",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Bu otaqda %(newGroups)s üçün aktiv və %(oldGroups)s üçün %(senderDisplayName)s deaktiv oldu.",
     "Create Account": "Hesab Aç",
     "Explore rooms": "Otaqları kəşf edin",
-    "Sign In": "Daxil ol"
+    "Sign In": "Daxil ol",
+    "Identity server is": "Eyniləşdirmənin serveri bu",
+    "Identity server": "Eyniləşdirmənin serveri"
 }
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 05e0baca4b..753967566c 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -1,61 +1,38 @@
 {
     "Couldn't find a matching Matrix room": "Не атрымалася знайсці адпаведны пакой Matrix",
-    "All messages (noisy)": "Усе паведамленні (гучна)",
     "Reject": "Адхіліць",
     "Failed to forget room %(errCode)s": "Не атрымалася забыць пакой %(errCode)s",
-    "Failed to update keywords": "Не атрымалася абнавіць ключавыя словы",
     "All messages": "Усе паведамленні",
-    "All notifications are currently disabled for all targets.": "Усе апавяшчэнні ў цяперашні час адключаныя для ўсіх мэтаў.",
     "Fetching third party location failed": "Не ўдалося атрымаць месцазнаходжанне трэцяга боку",
     "Guests can join": "Госці могуць далучыцца",
-    "Enable them now": "Уключыць іх зараз",
     "Notification targets": "Мэты апавяшчэння",
     "Failed to set direct chat tag": "Не ўдалося ўсталяваць тэг прамога чата",
-    "Failed to set Direct Message status of room": "Не ўдалося ўсталяваць статут прамога паведамлення пакою",
     "Favourite": "Улюбёнае",
     "Quote": "Цытата",
     "Dismiss": "Aдхіліць",
     "Remove from Directory": "Выдалiць з каталога",
-    "Cancel Sending": "Адмяніць адпраўку",
     "Failed to add tag %(tagName)s to room": "Не атрымалася дадаць %(tagName)s ў пакоі",
     "Close": "Зачыніць",
     "Notifications": "Апавяшчэнні",
     "Low Priority": "Нізкі прыярытэт",
     "%(brand)s does not know how to join a room on this network": "%(brand)s не ведае, як увайсці ў пакой у гэтай сетке",
     "Members": "Удзельнікі",
-    "Can't update user notification settings": "Немагчыма абнавіць налады апавяшчэнняў карыстальніка",
-    "Failed to change settings": "Не атрымалася змяніць налады",
     "Noisy": "Шумна",
     "Resend": "Паўторна",
     "On": "Уключыць",
     "remove %(name)s from the directory.": "выдаліць %(name)s з каталога.",
     "Off": "Выключыць",
     "Invite to this room": "Запрасіць у гэты пакой",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Апавяшчэнні па наступных ключавых словах прытрымліваюцца правілаў, якія не могуць быць адлюстраваны тут:",
-    "Mentions only": "Толькі згадкі",
     "Remove": "Выдалiць",
     "Failed to remove tag %(tagName)s from room": "Не ўдалося выдаліць %(tagName)s з пакоя",
     "Leave": "Пакінуць",
-    "Enable notifications for this account": "Ўключыць апавяшчэнні для гэтага ўліковага запісу",
     "Error": "Памылка",
     "No rooms to show": "Няма пакояў для паказу",
-    "Download this file": "Спампаваць гэты файл",
     "Operation failed": "Не атрымалася выканаць аперацыю",
-    "Forget": "Забыць",
     "Mute": "Без гуку",
-    "Error saving email notification preferences": "Памылка захавання налад апавяшчэнняў па электроннай пошце",
-    "Enter keywords separated by a comma:": "Калі ласка, увядзіце ключавыя словы, падзеленыя коскамі:",
     "powered by Matrix": "працуе на Matrix",
-    "Custom Server Options": "Карыстальніцкія параметры сервера",
     "Remove %(name)s from the directory?": "Выдаліць %(name)s з каталога?",
-    "Notify me for anything else": "Паведаміць мне што-небудзь яшчэ",
     "Source URL": "URL-адрас крыніцы",
-    "Enable email notifications": "Ўключыць паведамлення па электроннай пошце",
-    "Files": "Файлы",
-    "Keywords": "Ключавыя словы",
-    "Direct Chat": "Прамы чат",
-    "An error occurred whilst saving your email notification preferences.": "Адбылася памылка падчас захавання налады апавяшчэнняў па электроннай пошце.",
     "Room not found": "Пакой не знойдзены",
-    "Notify for all other messages/rooms": "Апавяшчаць для ўсіх іншых паведамленняў/пакояў",
     "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны"
 }
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 294d5a4979..7dadbf5ef1 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2,7 +2,6 @@
     "OK": "ОК",
     "Operation failed": "Операцията е неуспешна",
     "Search": "Търсене",
-    "Custom Server Options": "Потребителски опции за сървър",
     "Dismiss": "Затвори",
     "powered by Matrix": "базирано на Matrix",
     "Warning": "Предупреждение",
@@ -14,7 +13,6 @@
     "Edit": "Редактирай",
     "Continue": "Продължи",
     "Failed to change password. Is your password correct?": "Неуспешна промяна. Правилно ли сте въвели Вашата парола?",
-    "Unpin Message": "Откачи съобщението",
     "Sun": "нд.",
     "Mon": "пн.",
     "Tue": "вт.",
@@ -66,11 +64,9 @@
     "Analytics": "Статистика",
     "The information being sent to us to help make %(brand)s better includes:": "Информацията, която се изпраща за да ни помогне да подобрим %(brand)s включва:",
     "Call Failed": "Неуспешно повикване",
-    "You are already in a call.": "Вече сте в разговор.",
     "VoIP is unsupported": "Не се поддържа VoIP",
     "You cannot place VoIP calls in this browser.": "Не може да осъществите VoIP разговори в този браузър.",
     "You cannot place a call with yourself.": "Не може да осъществите разговор със себе си.",
-    "Existing Call": "Съществуващ разговор",
     "Warning!": "Внимание!",
     "Upload Failed": "Качването е неуспешно",
     "PM": "PM",
@@ -97,58 +93,28 @@
     "Moderator": "Модератор",
     "Admin": "Администратор",
     "Failed to invite": "Неуспешна покана",
-    "Failed to invite the following users to the %(roomName)s room:": "Следните потребителите не успяха да бъдат добавени в %(roomName)s:",
     "You need to be logged in.": "Трябва да влезете в профила си.",
     "You need to be able to invite users to do that.": "За да извършите това, трябва да имате право да добавяте потребители.",
     "Unable to create widget.": "Неуспешно създаване на приспособление.",
     "Failed to send request.": "Неуспешно изпращане на заявката.",
     "This room is not recognised.": "Стаята не е разпозната.",
     "Power level must be positive integer.": "Нивото на достъп трябва да бъде позитивно число.",
-    "Call Timeout": "Изтекло време за повикване",
-    "The remote side failed to pick up": "Отсрещната страна не успя да отговори",
-    "Unable to capture screen": "Неуспешно заснемане на екрана",
     "You are not in this room.": "Не сте в тази стая.",
     "You do not have permission to do that in this room.": "Нямате достъп да направите това в тази стая.",
     "Missing room_id in request": "Липсва room_id в заявката",
     "Room %(roomId)s not visible": "Стая %(roomId)s не е видима",
     "Missing user_id in request": "Липсва user_id в заявката",
-    "/ddg is not a command": "/ddg не е команда",
-    "To use it, just wait for autocomplete results to load and tab through them.": "За използване, изчакайте зареждането на списъка с предложения и изберете от него.",
     "Ignored user": "Игнориран потребител",
     "You are now ignoring %(userId)s": "Вече игнорирате %(userId)s",
     "Unignored user": "Неигнориран потребител",
     "You are no longer ignoring %(userId)s": "Вече не игнорирате %(userId)s",
     "Verified key": "Потвърден ключ",
     "Reason": "Причина",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s прие поканата.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP групов разговор.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име на %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s се преименува на %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s премахна своето име (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
-    "%(senderName)s set a profile picture.": "%(senderName)s зададе снимка на профила си.",
-    "VoIP conference started.": "Започна VoIP групов разговор.",
-    "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
-    "VoIP conference finished.": "Груповият разговор приключи.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s отхвърли поканата.",
-    "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s изгони %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s оттегли поканата си за %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s смени темата на \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s премахна името на стаята.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s промени името на стаята на %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s изпрати снимка.",
     "Someone": "Някой",
-    "(not supported by this browser)": "(не се поддържа от този браузър)",
-    "%(senderName)s answered the call.": "%(senderName)s отговори на повикването.",
-    "(no answer)": "(няма отговор)",
-    "(unknown failure: %(reason)s)": "(неизвестна грешка: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s прекрати обаждането.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.",
@@ -171,19 +137,12 @@
     "Message Pinning": "Функция за закачане на съобщения",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показване на времето в 12-часов формат (напр. 2:30pm)",
     "Always show message timestamps": "Винаги показвай часа на съобщението",
-    "Autoplay GIFs and videos": "Автоматично възпроизвеждане на GIF-файлове и видеа",
     "Enable automatic language detection for syntax highlighting": "Включване на автоматично разпознаване на език за подчертаване на синтаксиса",
     "Automatically replace plain text Emoji": "Автоматично откриване и заместване на емотикони в текста",
     "Mirror local video feed": "Показвай ми огледално моя видео образ",
     "Enable inline URL previews by default": "Включване по подразбиране на URL прегледи",
     "Enable URL previews for this room (only affects you)": "Включване на URL прегледи за тази стая (засяга само Вас)",
     "Enable URL previews by default for participants in this room": "Включване по подразбиране на URL прегледи за участници в тази стая",
-    "Room Colour": "Цвят на стая",
-    "Active call (%(roomName)s)": "Активен разговор (%(roomName)s)",
-    "unknown caller": "повикване от непознат",
-    "Incoming voice call from %(name)s": "Входящо гласово повикване от %(name)s",
-    "Incoming video call from %(name)s": "Входящо видео повикване от %(name)s",
-    "Incoming call from %(name)s": "Входящо повикване от %(name)s",
     "Decline": "Откажи",
     "Accept": "Приеми",
     "Incorrect verification code": "Неправилен код за потвърждение",
@@ -205,19 +164,8 @@
     "Authentication": "Автентикация",
     "Last seen": "Последно видян",
     "Failed to set display name": "Неуспешно задаване на име",
-    "Cannot add any more widgets": "Не могат да се добавят повече приспособления",
-    "The maximum permitted number of widgets have already been added to this room.": "Максимално разрешеният брой приспособления е вече добавен към тази стая.",
-    "Add a widget": "Добави приспособление",
-    "Drop File Here": "Пусни файла тук",
     "Drop file here to upload": "Пуснете файла тук, за да се качи",
-    " (unsupported)": " (не се поддържа)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Присъединете се с <voiceText>глас</voiceText> или с <videoText>видео</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Текущ групов разговор %(supportedText)s.",
-    "%(senderName)s sent an image": "%(senderName)s изпрати снимка",
-    "%(senderName)s sent a video": "%(senderName)s изпрати видео",
-    "%(senderName)s uploaded a file": "%(senderName)s качи файл",
     "Options": "Настройки",
-    "Please select the destination room for this message": "Моля, изберете стаята, в която искате да изпратите това съобщение",
     "Disinvite": "Отмени поканата",
     "Kick": "Изгони",
     "Disinvite this user?": "Отмени поканата към този потребител?",
@@ -255,9 +203,7 @@
     "Server error": "Сървърна грешка",
     "Server unavailable, overloaded, or something else went wrong.": "Сървърът е недостъпен, претоварен или нещо друго се обърка.",
     "Command error": "Грешка в командата",
-    "No pinned messages.": "Няма закачени съобщения.",
     "Loading...": "Зареждане...",
-    "Pinned Messages": "Закачени съобщения",
     "%(duration)ss": "%(duration)sсек",
     "%(duration)sm": "%(duration)sмин",
     "%(duration)sh": "%(duration)sч",
@@ -279,7 +225,6 @@
     "Settings": "Настройки",
     "Forget room": "Забрави стаята",
     "Failed to set direct chat tag": "Неуспешно означаване на директен чат",
-    "Community Invites": "Покани за общност",
     "Invites": "Покани",
     "Favourites": "Любими",
     "Low priority": "Нисък приоритет",
@@ -294,12 +239,7 @@
     "Banned users": "Блокирани потребители",
     "This room is not accessible by remote Matrix servers": "Тази стая не е достъпна за отдалечени Matrix сървъри",
     "Leave room": "Напусни стаята",
-    "Guests cannot join this room even if explicitly invited.": "Гости не могат да се присъединят към тази стая, дори изрично поканени.",
-    "Click here to fix": "Натиснете тук за поправяне",
-    "Who can access this room?": "Кой има достъп до тази стая?",
     "Only people who have been invited": "Само хора, които са били поканени",
-    "Anyone who knows the room's link, apart from guests": "Всеки, който знае адреса на стаята (освен гости)",
-    "Anyone who knows the room's link, including guests": "Всеки, който знае адреса на стаята (включително гости)",
     "Publish this room to the public in %(domain)s's room directory?": "Публично публикуване на тази стая в директорията на %(domain)s?",
     "Who can read history?": "Кой може да чете историята?",
     "Anyone": "Всеки",
@@ -308,7 +248,6 @@
     "Members only (since they joined)": "Само членове (от момента, в който са се присъединили)",
     "Permissions": "Разрешения",
     "Advanced": "Разширени",
-    "Add a topic": "Добавете тема",
     "Jump to first unread message.": "Отиди до първото непрочетено съобщение.",
     "not specified": "неопределен",
     "This room has no local addresses": "Тази стая няма локални адреси",
@@ -323,11 +262,9 @@
     "URL previews are enabled by default for participants in this room.": "URL прегледи са включени по подразбиране за участниците в тази стая.",
     "URL previews are disabled by default for participants in this room.": "URL прегледи са изключени по подразбиране за участниците в тази стая.",
     "URL Previews": "URL прегледи",
-    "Error decrypting audio": "Грешка при разшифроване на аудио файл",
     "Error decrypting attachment": "Грешка при разшифроване на прикачен файл",
     "Decrypt %(text)s": "Разшифровай %(text)s",
     "Download %(text)s": "Изтегли %(text)s",
-    "(could not connect media)": "(неуспешно свързване на медийните устройства)",
     "Usage": "Употреба",
     "Remove from community": "Премахни от общността",
     "Disinvite this user from community?": "Оттегляне на поканата към този потребител от общността?",
@@ -342,7 +279,6 @@
     "Create Community": "Създай общност",
     "Community Name": "Име на общност",
     "Community ID": "Идентификатор на общност",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML за страница на Вашата общност</h1>\n<p>\n    Използвайте дългото описание, за да въведете нови членове в общността, \n    или да разпространите важни <a href=\"foo\">връзки</a>\n</p>\n<p>\n    Можете дори да използвате 'img' тагове\n</p>\n",
     "Add rooms to the community summary": "Добавете стаи към обобщението на общността",
     "Add users to the community summary": "Добавете потребители към обобщението на общността",
     "Failed to update community": "Неуспешно обновяване на общността",
@@ -356,7 +292,6 @@
     "Community %(groupId)s not found": "Общност %(groupId)s не е намерена",
     "Create a new community": "Създаване на нова общност",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да групирате потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство в Matrix Вселената.",
-    "Jump to message": "Отиди до съобщението",
     "Jump to read receipt": "Отиди до потвърждението за прочитане",
     "Invalid file%(extra)s": "Невалиден файл%(extra)s",
     "Error decrypting image": "Грешка при разшифроване на снимка",
@@ -367,8 +302,6 @@
     "Copied!": "Копирано!",
     "Failed to copy": "Неуспешно копиране",
     "Add an Integration": "Добавяне на интеграция",
-    "An email has been sent to %(emailAddress)s": "Имейл беше изпратен на %(emailAddress)s",
-    "Please check your email to continue registration.": "Моля, проверете имейла си, за да продължите регистрацията.",
     "Token incorrect": "Неправителен тоукън",
     "A text message has been sent to %(msisdn)s": "Текстово съобщение беше изпратено на %(msisdn)s",
     "Please enter the code it contains:": "Моля, въведете кода, който то съдържа:",
@@ -376,7 +309,6 @@
     "Sign in with": "Влизане с",
     "Email address": "Имейл адрес",
     "Sign in": "Вход",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ако не посочите имейл адрес, няма да бъде възможно да възстановите Вашата парола. Сигурни ли сте?",
     "Failed to withdraw invitation": "Неуспешно оттегляне на поканата",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Сигурни ли сте, че искате да премахнете '%(roomName)s' от %(groupId)s?",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Неуспешно премахване на '%(roomName)s' от %(groupId)s",
@@ -388,17 +320,14 @@
     "Display your community flair in rooms configured to show it.": "Показване на значката на общността в стаи, конфигурирани да я показват.",
     "You're not currently a member of any communities.": "Към момента не сте член на нито една общност.",
     "Unknown Address": "Неизвестен адрес",
-    "Allow": "Позволи",
     "Delete Widget": "Изтриване на приспособление",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Изтриването на приспособление го премахва за всички потребители в тази стая. Сигурни ли сте, че искате да изтриете това приспособление?",
     "Delete widget": "Изтрий приспособлението",
-    "Minimize apps": "Минимизирай приложенията",
     "Create new room": "Създай нова стая",
     "I have verified my email address": "Потвърдих имейл адреса си",
     "No results": "Няма резултати",
     "Communities": "Общности",
     "Home": "Начална страница",
-    "Manage Integrations": "Управление на интеграциите",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sсе присъединиха %(count)s пъти",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sсе присъединиха",
@@ -454,13 +383,9 @@
     "collapse": "свий",
     "expand": "разшири",
     "Custom level": "Персонализирано ниво",
-    "Custom": "Персонализиран",
     "<a>In reply to</a> <pill>": "<a>В отговор на</a> <pill>",
-    "Room directory": "Директория със стаи",
     "Start chat": "Започни чат",
     "And %(count)s more...|other": "И %(count)s други...",
-    "ex. @bob:example.com": "напр. @bob:example.com",
-    "Add User": "Добави потребител",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Идентификатор на стаята",
     "email address": "имейл адрес",
@@ -490,18 +415,9 @@
     "Unable to remove contact information": "Неуспешно премахване на информацията за контакти",
     "This will allow you to reset your password and receive notifications.": "Това ще Ви позволи да възстановите Вашата парола и да получавате известия.",
     "Skip": "Пропусни",
-    "Username not available": "Потребителското име е заето",
-    "Username invalid: %(errMessage)s": "Невалидно потребителско име: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Възникна грешка: %(error_string)s",
-    "Username available": "Потребителското име не е заето",
-    "To get started, please pick a username!": "За да започнете, моля изберете потребителско име!",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Ако вече имате Matrix профил, можете да <a>влезете</a> с него.",
-    "Private Chat": "Личен чат",
-    "Public Chat": "Публичен чат",
     "Name": "Име",
     "You must <a>register</a> to use this functionality": "Трябва да се <a>регистрирате</a>, за да използвате тази функционалност",
     "You must join the room to see its files": "Трябва да се присъедините към стаята, за да видите файловете, които съдържа",
-    "There are no visible files in this room": "Няма видими файлове в тази стая",
     "Which rooms would you like to add to this summary?": "Кои стаи бихте искали да добавите в това обобщение?",
     "Add to summary": "Добави в обобщението",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Неуспешно добавяне на следните стаи в обобщението на %(groupId)s:",
@@ -525,24 +441,15 @@
     "Failed to reject invitation": "Неуспешно отхвърляне на поканата",
     "This room is not public. You will not be able to rejoin without an invite.": "Тази стая не е публична. Няма да можете да се присъедините отново без покана.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Сигурни ли сте, че искате да напуснете стаята '%(roomName)s'?",
-    "Failed to leave room": "Неуспешно напускане на стаята",
     "Old cryptography data detected": "Бяха открити стари криптографски данни",
     "Your Communities": "Вашите общности",
-    "Failed to fetch avatar URL": "Неуспешно изтегляне от адреса на аватара",
     "Signed Out": "Излязохте",
     "For security, this session has been signed out. Please sign in again.": "Поради мерки за сигурност, тази сесия е прекратена. Моля, влезте отново.",
     "Logout": "Излез",
     "Sign out": "Изход",
     "Error whilst fetching joined communities": "Грешка при извличането на общности, към които сте присъединени",
-    "You have no visible notifications": "Нямате видими известия",
-    "%(count)s of your messages have not been sent.|other": "Някои от Вашите съобщение не бяха изпратени.",
-    "%(count)s of your messages have not been sent.|one": "Вашето съобщение не беше изпратено.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Изпрати всички отново</resendText> или <cancelText>откажи всички</cancelText> сега. Също така може да изберете индивидуални съобщения, които да изпратите отново или да откажете.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Изпрати съобщението отново</resendText> или <cancelText>откажи съобщението</cancelText> сега.",
     "Connectivity to the server has been lost.": "Връзката със сървъра е изгубена.",
     "Sent messages will be stored until your connection has returned.": "Изпратените съобщения ще бъдат запаметени докато връзката Ви се възвърне.",
-    "Active call": "Активен разговор",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Няма никой друг тук! <inviteText>Поканете други</inviteText> или <nowarnText>изключете предупреждението, че стаята е празна</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Изглежда, че качвате файлове. Сигурни ли сте, че искате да затворите програмата?",
     "You seem to be in a call, are you sure you want to quit?": "Изглежда, че сте в разговор. Сигурни ли сте, че искате да излезете от програмата?",
     "Search failed": "Търсенето е неуспешно",
@@ -551,11 +458,6 @@
     "Room": "Стая",
     "Failed to reject invite": "Неуспешно отхвърляне на поканата",
     "Reject all %(invitedRooms)s invites": "Отхвърли всички %(invitedRooms)s покани",
-    "Fill screen": "Запълни екрана",
-    "Click to unmute video": "Натиснете, за да включите звука на видеото",
-    "Click to mute video": "Натиснете, за да заглушите видеото",
-    "Click to unmute audio": "Натиснете, за да включите звука",
-    "Click to mute audio": "Натиснете, за да заглушите звука",
     "Clear filter": "Изчисти филтър",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но нямате разрешение да разгледате въпросното съобщение.",
     "Failed to load timeline position": "Неуспешно зареждане на позицията в хронологията",
@@ -582,12 +484,8 @@
     "Email": "Имейл",
     "Profile": "Профил",
     "Account": "Акаунт",
-    "Access Token:": "Тоукън за достъп:",
-    "click to reveal": "натиснете за показване",
     "Homeserver is": "Home сървър:",
-    "Identity Server is": "Сървър за самоличност:",
     "%(brand)s version:": "Версия на %(brand)s:",
-    "olm version:": "Версия на olm:",
     "Failed to send email": "Неуспешно изпращане на имейл",
     "The email address linked to your account must be entered.": "Имейл адресът, свързан с профила Ви, трябва да бъде въведен.",
     "A new password must be entered.": "Трябва да бъде въведена нова парола.",
@@ -597,12 +495,8 @@
     "Send Reset Email": "Изпрати имейл за възстановяване на парола",
     "Incorrect username and/or password.": "Неправилно потребителско име и/или парола.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Моля, обърнете внимание, че влизате в %(hs)s сървър, а не в matrix.org.",
-    "The phone number entered looks invalid": "Въведеният телефонен номер изглежда невалиден",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага методи за влизане, които се поддържат от този клиент.",
-    "Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.",
     "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>.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или <a>включете функция небезопасни скриптове</a>.",
-    "Set a display name:": "Задаване на име:",
-    "Upload an avatar:": "Качване на профилна снимка:",
     "This server does not support authentication with a phone number.": "Този сървър не поддържа автентикация с телефонен номер.",
     "Displays action": "Показва действие",
     "Bans user with given id": "Блокира потребители с даден идентификатор",
@@ -611,11 +505,9 @@
     "Invites user with given id to current room": "Поканва потребител с даден идентификатор в текущата стая",
     "Kicks user with given id": "Изгонва потребителя с даден идентификатор",
     "Changes your display nickname": "Сменя Вашия псевдоним",
-    "Searches DuckDuckGo for results": "Търси в DuckDuckGo за резултати",
     "Ignores a user, hiding their messages from you": "Игнорира потребител, скривайки съобщенията му от Вас",
     "Stops ignoring a user, showing their messages going forward": "Спира игнорирането на потребител, показвайки съобщенията му занапред",
     "Commands": "Команди",
-    "Results from DuckDuckGo": "Резултати от DuckDuckGo",
     "Emoji": "Емотикони",
     "Notify the whole room": "Извести всички в стаята",
     "Room Notification": "Известие за стая",
@@ -634,7 +526,6 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "На път сте да бъдете отведени до друг сайт, където можете да удостоверите профила си за използване с %(integrationsUrl)s. Искате ли да продължите?",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Сигурни ли сте, че искате да премахнете (изтриете) това събитие? Забележете, че ако изтриете събитие за промяна на името на стая или тема, това може да обърне промяната.",
     "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.": "Ако преди сте използвали по-нова версия на %(brand)s, Вашата сесия може да не бъде съвместима с текущата версия. Затворете този прозорец и се върнете в по-новата версия.",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Това ще бъде името на профила Ви на <span></span> Home сървъра, или можете да изберете <a>друг сървър</a>.",
     "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.": "Засечени са данни от по-стара версия на %(brand)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.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка. Уверете се, че <a>SSL сертификатът на Home сървъра</a> е надежден и че някое разширение на браузъра не блокира заявките.",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате във файл ключовете за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова такива съобщения.",
@@ -642,10 +533,8 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето %(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.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
     "Key request sent.": "Заявката за ключ е изпратена.",
     "Code": "Код",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Ако сте изпратили грешка чрез GitHub, логовете за дебъгване могат да ни помогнат да проследим проблема. Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
     "Submit debug logs": "Изпрати логове за дебъгване",
     "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Видяно от %(displayName)s (%(userName)s) в %(dateTime)s",
@@ -662,38 +551,23 @@
     "Everyone": "Всеки",
     "Fetching third party location failed": "Неуспешно извличане на адреса на стаята от друга мрежа",
     "Send Account Data": "Изпращане на Account Data",
-    "All notifications are currently disabled for all targets.": "В момента известията са изключени за всички цели.",
-    "Uploading report": "Качване на доклада",
     "Sunday": "Неделя",
     "Notification targets": "Устройства, получаващи известия",
     "Today": "Днес",
-    "Files": "Файлове",
-    "You are not receiving desktop notifications": "Не получавате известия на работния плот",
     "Friday": "Петък",
     "Update": "Актуализиране",
-    "Unable to fetch notification target list": "Неуспешно извличане на списък с устройства получаващи известия",
     "On": "Вкл.",
     "Changelog": "Списък на промените",
     "Waiting for response from server": "Изчакване на отговор от сървъра",
-    "Uploaded on %(date)s by %(user)s": "Качено на %(date)s от %(user)s",
     "Send Custom Event": "Изпрати потребителско събитие",
-    "Advanced notification settings": "Разширени настройки за известяване",
     "Failed to send logs: ": "Неуспешно изпращане на логове: ",
-    "Forget": "Забрави",
-    "You cannot delete this image. (%(code)s)": "Не можете да изтриете тази снимка. (%(code)s)",
-    "Cancel Sending": "Откажи изпращането",
     "This Room": "В тази стая",
     "Resend": "Изпрати отново",
     "Room not found": "Стаята не е намерена",
     "Downloading update...": "Сваляне на нова версия...",
     "Messages in one-to-one chats": "Съобщения в индивидуални чатове",
     "Unavailable": "Не е наличен",
-    "View Decrypted Source": "Прегледай разшифрования източник",
-    "Failed to update keywords": "Грешка при обновяване на ключови думи",
     "remove %(name)s from the directory.": "премахване %(name)s от директорията.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Известия за следните ключови думи изпълняват правила, които не могат да бъдат показани тук:",
-    "Please set a password!": "Моля, въведете парола!",
-    "You have successfully set a password!": "Вие успешно зададохте парола!",
     "Explore Room State": "Преглед на състоянието на стаята",
     "Source URL": "URL на източника",
     "Messages sent by bot": "Съобщения изпратени от бот",
@@ -702,34 +576,21 @@
     "No update available.": "Няма нова версия.",
     "Noisy": "Шумно",
     "Collecting app version information": "Събиране на информация за версията на приложението",
-    "Enable notifications for this account": "Включване на известия за този профил",
     "Invite to this community": "Покани в тази общност",
     "Search…": "Търсене…",
-    "Messages containing <span>keywords</span>": "Съобщения, съдържащи <span>ключови думи</span>",
-    "Error saving email notification preferences": "Грешка при запазване на настройките за имейл известяване",
     "Tuesday": "Вторник",
-    "Enter keywords separated by a comma:": "Ключови думи разделени чрез запетая:",
-    "Forward Message": "Препрати съобщението",
-    "You have successfully set a password and an email address!": "Вие успешно зададохте парола и имейл адрес!",
     "Remove %(name)s from the directory?": "Премахване на %(name)s от директорията?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s използва много разширени браузър харектеристики, някои от които не са налични или са все още експериментални в настоящия Ви браузър.",
     "Developer Tools": "Инструменти за разработчика",
     "Preparing to send logs": "Подготовка за изпращане на логове",
     "Explore Account Data": "Преглед на данните от профила",
-    "All messages (noisy)": "Всички съобщения (шумно)",
     "Saturday": "Събота",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Ако си промените мнението, винаги може да зададете имейл адрес в настройки на потребителя.",
-    "Direct Chat": "Директен чат",
     "The server may be unavailable or overloaded": "Сървърът не е наличен или е претоварен",
     "Reject": "Отхвърли",
-    "Failed to set Direct Message status of room": "Неуспешно настройване на стаята като Директен чат",
     "Monday": "Понеделник",
     "Remove from Directory": "Премахни от директорията",
-    "Enable them now": "Включете ги сега",
     "Toolbox": "Инструменти",
     "Collecting logs": "Събиране на логове",
     "You must specify an event type!": "Трябва да укажате тип на събитието!",
-    "(HTTP status %(httpStatus)s)": "(HTTP статус %(httpStatus)s)",
     "All Rooms": "Във всички стаи",
     "Wednesday": "Сряда",
     "Quote": "Цитат",
@@ -740,53 +601,35 @@
     "State Key": "State ключ",
     "Failed to send custom event.": "Неуспешно изпращане на потребителско събитие.",
     "What's new?": "Какво ново?",
-    "Notify me for anything else": "Извести ме за всичко останало",
     "When I'm invited to a room": "Когато ме поканят в стая",
-    "Keywords": "Ключови думи",
-    "Can't update user notification settings": "Неуспешно обновяване на потребителски настройки за известяване",
-    "Notify for all other messages/rooms": "Извести ме за всички други съобщения/стаи",
     "Unable to look up room ID from server": "Стая с такъв идентификатор не е намерена на сървъра",
     "Couldn't find a matching Matrix room": "Не успяхме да намерим съответната Matrix стая",
     "Invite to this room": "Покани в тази стая",
     "You cannot delete this message. (%(code)s)": "Това съобщение не може да бъде изтрито. (%(code)s)",
     "Thursday": "Четвъртък",
-    "I understand the risks and wish to continue": "Разбирам рисковете и желая да продължа",
     "Logs sent": "Логовете са изпратени",
     "Back": "Назад",
     "Reply": "Отговори",
     "Show message in desktop notification": "Показване на съдържание в известията на работния плот",
-    "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.": "Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
-    "Unhide Preview": "Покажи отново прегледа",
     "Unable to join network": "Неуспешно присъединяване към мрежата",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "За жалост, Вашият браузър <b>не</b> може да пусне %(brand)s.",
     "Messages in group chats": "Съобщения в групови чатове",
     "Yesterday": "Вчера",
     "Error encountered (%(errorDetail)s).": "Възникна грешка (%(errorDetail)s).",
     "Event Type": "Вид на събитие",
     "Low Priority": "Нисък приоритет",
     "What's New": "Какво ново",
-    "Set Password": "Задаване на парола",
-    "An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.",
     "Off": "Изкл.",
     "%(brand)s does not know how to join a room on this network": "%(brand)s не знае как да се присъедини към стая от тази мрежа",
-    "Mentions only": "Само при споменаване",
-    "You can now return to your account after signing out, and sign in on other devices.": "Вече можете да се върнете в профила си след излизане от него и да влезете от други устройства.",
-    "Enable email notifications": "Активиране на имейл известия",
-    "Download this file": "Изтегли този файл",
-    "Pin Message": "Закачи съобщението",
-    "Failed to change settings": "Неуспешна промяна на настройки",
     "View Community": "Прегледай общността",
     "Event sent!": "Събитието е изпратено!",
     "View Source": "Прегледай източника",
     "Event Content": "Съдържание на събитието",
     "Thank you!": "Благодарим!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "С текущия Ви браузър, изглеждането и усещането на приложението може да бъде неточно, и някои или всички от функциите може да не функционират,работят......... Ако искате може да продължите така или иначе, но сте сами по отношение на евентуалните проблеми, които може да срещнете!",
     "Checking for an update...": "Проверяване за нова версия...",
     "Missing roomId.": "Липсва идентификатор на стая.",
     "Every page you use in the app": "Всяка използвана страница от приложението",
     "e.g. <CurrentPageURL>": "например: <CurrentPageURL>",
     "Your device resolution": "Разделителната способност на устройството Ви",
-    "Always show encryption icons": "Винаги показвай икони за шифроване",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не може да се зареди събитието, на което е отговорено. Или не съществува или нямате достъп да го видите.",
     "Popout widget": "Изкарай в нов прозорец",
     "Clear Storage and Sign Out": "Изчисти запазените данни и излез",
@@ -794,7 +637,6 @@
     "Refresh": "Опресни",
     "We encountered an error trying to restore your previous session.": "Възникна грешка при възстановяване на предишната Ви сесия.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Изчистване на запазените данни в браузъра може да поправи проблема, но ще Ви изкара от профила и ще направи шифрованите съобщения нечетими.",
-    "Collapse Reply Thread": "Свий отговорите",
     "Enable widget screenshots on supported widgets": "Включи скрийншоти за поддържащи ги приспособления",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
     "Send analytics data": "Изпращане на статистически данни",
@@ -817,26 +659,16 @@
     "Share Community": "Споделяне на общност",
     "Share Room Message": "Споделяне на съобщение от стая",
     "Link to selected message": "Създай връзка към избраното съобщение",
-    "COPY": "КОПИРАЙ",
-    "Share Message": "Сподели съобщението",
     "No Audio Outputs detected": "Не са открити аудио изходи",
     "Audio Output": "Аудио изходи",
-    "Call in Progress": "Тече разговор",
-    "A call is already in progress!": "В момента вече тече разговор!",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "В шифровани стаи като тази, по подразбиране URL прегледите са изключени, за да се подсигури че сървърът (където става генерирането на прегледите) не може да събира информация за връзките споделени в стаята.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Когато се сподели URL връзка в съобщение, може да бъде показан URL преглед даващ повече информация за връзката (заглавие, описание и картинка от уебсайта).",
-    "The email field must not be blank.": "Имейл полето не може да бъде празно.",
-    "The phone number field must not be blank.": "Полето за телефонен номер не може да е празно.",
-    "The password field must not be blank.": "Полето за парола не може да е празно.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с <consentLink>нашите правила и условия</consentLink>.",
     "Demote yourself?": "Понижете себе си?",
     "Demote": "Понижение",
     "This event could not be displayed": "Това събитие не може да бъде показано",
     "Permission Required": "Необходимо е разрешение",
-    "A call is currently being placed!": "В момента се осъществява разговор!",
     "You do not have permission to start a conference call in this room": "Нямате достъп да започнете конферентен разговор в тази стая",
-    "Failed to remove widget": "Неуспешно премахване на приспособление",
-    "An error ocurred whilst trying to remove the widget from the room": "Възникна грешка при премахването на приспособлението от стаята",
     "System Alerts": "Системни уведомления",
     "Only room administrators will see this warning": "Само администратори на стаята виждат това предупреждение",
     "Please <a>contact your service administrator</a> to continue using the service.": "Моля, <a>свържете се с администратора на услугата</a> за да продължите да я използвате.",
@@ -907,15 +739,11 @@
     "Names and surnames by themselves are easy to guess": "Имена и фамилии сами по себе си са лесни за отгатване",
     "Common names and surnames are easy to guess": "Често срещани имена и фамилии са лесни за отгатване",
     "Use a longer keyboard pattern with more turns": "Използвайте по-дълга клавиатурна последователност с повече разклонения",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Покажи напомняне за включване на Възстановяване на Защитени Съобщения в шифровани стаи",
     "Messages containing @room": "Съобщения съдържащи @room",
     "Encrypted messages in one-to-one chats": "Шифровани съобщения в 1-на-1 чатове",
     "Encrypted messages in group chats": "Шифровани съобщения в групови чатове",
     "Delete Backup": "Изтрий резервното копие",
     "Unable to load key backup status": "Неуспешно зареждане на състоянието на резервното копие на ключа",
-    "Backup version: ": "Версия на резервното копие: ",
-    "Algorithm: ": "Алгоритъм: ",
-    "Don't ask again": "Не питай пак",
     "Set up": "Настрой",
     "Please review and accept all of the homeserver's policies": "Моля прегледайте и приемете всички политики на сървъра",
     "Failed to load group members": "Неуспешно зареждане на членовете на групата",
@@ -923,17 +751,11 @@
     "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": "За да избегнете загубата на чат история, трябва да експортирате ключовете на стаята преди да излезете от профила си. Ще трябва да се върнете към по-новата версия на %(brand)s за да направите това",
     "Incompatible Database": "Несъвместима база данни",
     "Continue With Encryption Disabled": "Продължи с изключено шифроване",
-    "Checking...": "Проверяване...",
     "Unable to load backup status": "Неуспешно зареждане на състоянието на резервното копие",
     "Unable to restore backup": "Неуспешно възстановяване на резервно копие",
     "No backup found!": "Не е открито резервно копие!",
     "Failed to decrypt %(failedCount)s sessions!": "Неуспешно разшифроване на %(failedCount)s сесии!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Получете достъп до защитената история на съобщенията и настройте защитен чат, чрез въвеждане на паролата за възстановяване.",
     "Next": "Напред",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Ако сте забравили паролата за възстановяване, можете да <button1>използвате ключа за възстановяване</button1> или да <button2>настройте други варианти за възстановяване</button2>",
-    "This looks like a valid recovery key!": "Това изглежда като валиден ключ за възстановяване!",
-    "Not a valid recovery key": "Не е валиден ключ за възстановяване",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Получете достъп до защитената история на съобщенията и настройте защитен чат, чрез въвеждане на ключа за възстановяване.",
     "Invalid homeserver discovery response": "Невалиден отговор по време на откриването на конфигурацията за сървъра",
     "Invalid identity server discovery response": "Невалиден отговор по време на откриването на конфигурацията за сървъра за самоличност",
     "General failure": "Обща грешка",
@@ -949,8 +771,6 @@
     "Set up Secure Message Recovery": "Настрой Възстановяване на Защитени Съобщения",
     "Unable to create key backup": "Неуспешно създаване на резервно копие на ключа",
     "Retry": "Опитай пак",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Без настроено Възстановяване на Защитени Съобщения, ще загубите защитената история на съобщенията когато излезете от профила си.",
-    "If you don't want to set this up now, you can later in Settings.": "Ако не искате да настройвате това сега, може и по-късно от Настройки.",
     "Straight rows of keys are easy to guess": "Клавиши от прави редици са лесни за отгатване",
     "Short keyboard patterns are easy to guess": "Къси клавиатурни последователности са лесни за отгатване",
     "Custom user status messages": "Собствено статус съобщение",
@@ -999,7 +819,6 @@
     "Email Address": "Имейл адрес",
     "Backing up %(sessionsRemaining)s keys...": "Правене на резервно копие на %(sessionsRemaining)s ключа...",
     "All keys backed up": "Всички ключове са в резервното копие",
-    "Add an email address to configure email notifications": "Добавете имейл адрес за да конфигурирате уведомления по имейл",
     "Unable to verify phone number.": "Неуспешно потвърждение на телефонния номер.",
     "Verification code": "Код за потвърждение",
     "Phone Number": "Телефонен номер",
@@ -1039,7 +858,6 @@
     "Encrypted": "Шифровано",
     "Ignored users": "Игнорирани потребители",
     "Bulk options": "Масови действия",
-    "Key backup": "Резервно копие на ключовете",
     "Missing media permissions, click the button below to request.": "Липсва достъп до медийните устройства. Кликнете бутона по-долу за да поискате такъв.",
     "Request media permissions": "Поискай достъп до медийните устройства",
     "Voice & Video": "Глас и видео",
@@ -1051,37 +869,21 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Потвърди потребителя и го маркирай като доверен. Доверяването на потребители Ви дава допълнително спокойствие при използване на съобщения шифровани от край-до-край.",
     "Waiting for partner to confirm...": "Изчакване партньора да потвърди...",
     "Incoming Verification Request": "Входяща заявка за потвърждение",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "За да се избегнат дублиращи се проблеми, моля първо <existingIssuesLink>прегледайте съществуващите проблеми</existingIssuesLink> (и гласувайте с +1) или <newIssueLink>създайте нов проблем</newIssueLink>, ако не сте намерили съществуващ.",
-    "Report bugs & give feedback": "Съобщете за бъг и дайте обратна връзка",
     "Go back": "Върни се",
     "Update status": "Обнови статуса",
     "Set status": "Настрой статус",
-    "Your Modular server": "Вашият Modular сървър",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Въведете адреса на вашият Modular сървър. Той представлява или вашето собствено домейн име или поддомейн на <a>modular.im</a>.",
-    "Server Name": "Име на сървър",
-    "The username field must not be blank.": "Потребителското име не може да бъде празно.",
     "Username": "Потребителско име",
-    "Not sure of your password? <a>Set a new one</a>": "Не сте сигурни за паролата си? <a>Настройте нова</a>",
-    "Create your account": "Създайте акаунт",
     "Email (optional)": "Имейл (незадължително)",
     "Phone (optional)": "Телефон (незадължително)",
     "Confirm": "Потвърди",
-    "Other servers": "Други сървъри",
-    "Homeserver URL": "Адрес на Home сървър",
-    "Identity Server URL": "Адрес на сървър за самоличност",
-    "Free": "Безплатно",
     "Join millions for free on the largest public server": "Присъединете се безплатно към милиони други на най-големия публичен сървър",
-    "Premium": "Премиум",
-    "Premium hosting for organisations <a>Learn more</a>": "Премиум хостинг за организации <a>Научете повече</a>",
     "Other": "Други",
-    "Find other public servers or use a custom server": "Намерете други публични сървъри или използвайте собствен",
     "Guest": "Гост",
     "Sign in instead": "Влезте вместо това",
     "Set a new password": "Настрой нова парола",
     "Create account": "Създай акаунт",
     "Keep going...": "Продължавайте...",
     "Starting backup...": "Започване на резервното копие...",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Беше открита нова парола и ключ за Защитени Съобщения.",
     "Recovery Method Removed": "Методът за възстановяване беше премахнат",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ако не сте премахнали метода за възстановяване, е възможно нападател да се опитва да получи достъп до акаунта Ви. Променете паролата на акаунта и настройте нов метод за възстановяване веднага от Настройки.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Файлът '%(fileName)s' надхвърля ограничението за размер на файлове за този сървър",
@@ -1172,11 +974,6 @@
     "Restore from Backup": "Възстанови от резервно копие",
     "Back up your keys before signing out to avoid losing them.": "Направете резервно копие на ключовете преди изход от профила, за да не ги загубите.",
     "Start using Key Backup": "Включи резервни копия за ключовете",
-    "Never lose encrypted messages": "Никога не губете шифровани съобщения",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Съобщенията в тази стая са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключове за разчитането им.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Правете защитено резервно копие на ключовете, за да не ги загубите. <a>Научи повече.</a>",
-    "Not now": "Не сега",
-    "Don't ask me again": "Не ме питай пак",
     "I don't want my encrypted messages": "Не искам шифрованите съобщения",
     "Manually export keys": "Експортирай ключове ръчно",
     "You'll lose access to your encrypted messages": "Ще загубите достъп до шифрованите си съобщения",
@@ -1186,9 +983,7 @@
     "For maximum security, this should be different from your account password.": "За максимална сигурност, по-добре паролата да е различна от тази за акаунта Ви.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Прави се резервно копие на ключовете Ви (първото копие може да отнеме няколко минути).",
     "Success!": "Успешно!",
-    "Allow Peer-to-Peer for 1:1 calls": "Позволи използването на директна връзка (P2P) за 1:1 повиквания",
     "Credits": "Благодарности",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ако намерите бъг или желаете да дадете обратна връзка, уведомете ни в Github.",
     "Changes your display nickname in the current room only": "Променя името Ви в тази стая",
     "%(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.",
@@ -1200,12 +995,7 @@
     "Error updating flair": "Грешка при обновяването на значка",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Случи се грешка при обновяването на значките за тази стая. Може да не е позволено от сървъра, или да се е случила друга временна грешка.",
     "Room Settings - %(roomName)s": "Настройки на стая - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Потребителското име може да съдържа само малки букви, цифри и '=_-./'",
-    "Share Permalink": "Сподели Permalink",
-    "Sign in to your Matrix account on %(serverName)s": "Влизане във Вашия %(serverName)s Matrix акаунт",
-    "Create your Matrix account on %(serverName)s": "Създаване на Matrix акаунт в %(serverName)s",
     "Could not load user profile": "Неуспешно зареждане на потребителския профил",
-    "Your Matrix account on %(serverName)s": "Вашият Matrix акаунт в %(serverName)s",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Добавя ¯\\_(ツ)_/¯ в началото на съобщението",
     "User %(userId)s is already in the room": "Потребител %(userId)s вече е в стаята",
     "The user must be unbanned before they can be invited.": "Трябва да се махне блокирането на потребителя преди да може да бъде поканен пак.",
@@ -1224,14 +1014,12 @@
     "Change settings": "Промяна на настройките",
     "Kick users": "Изгонване на потребители",
     "Ban users": "Блокиране на потребители",
-    "Remove messages": "Премахване на съобщения",
     "Notify everyone": "Уведомяване на всички",
     "Send %(eventType)s events": "Изпрати %(eventType)s събития",
     "Select the roles required to change various parts of the room": "Изберете ролите необходими за промяна на различни части от стаята",
     "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>",
     "Power level": "Ниво на достъп",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Инсталирайте <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> за най-добра работа.",
     "Want more than a community? <a>Get your own server</a>": "Искате повече от общност? <a>Сдобийте се със собствен сървър</a>",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Дали използвате 'breadcrumbs' функцията (аватари над списъка със стаи)",
     "Replying With Files": "Отговаряне с файлове",
@@ -1249,9 +1037,6 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Поканата не можа да бъде оттеглена. Или има временен проблем със сървъра, или нямате достатъчно права за да оттеглите поканата.",
     "Revoke invite": "Оттегли поканата",
     "Invited by %(sender)s": "Поканен от %(sender)s",
-    "Maximize apps": "Максимизирай приложенията",
-    "Rotate counter-clockwise": "Завърти обратно на часовниковата стрелка",
-    "Rotate clockwise": "Завърти по часовниковата стрелка",
     "GitHub issue": "GitHub проблем",
     "Notes": "Бележки",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Моля включете допълнителни сведения, които ще помогнат за анализиране на проблема, като например: какво правихте когато възникна проблема, идентификатори на стаи, идентификатори на потребители и т.н.",
@@ -1270,10 +1055,7 @@
     "Upload %(count)s other files|one": "Качи %(count)s друг файл",
     "Cancel All": "Откажи всички",
     "Upload Error": "Грешка при качване",
-    "A widget would like to verify your identity": "Приспособление иска да потвърди идентичността Ви",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Приспособлението от адрес %(widgetUrl)s иска да потвърди идентичността Ви. Ако позволите това, приспособлението ще може да потвърди потребителския Ви идентификатор, без да може да извършва действия с него.",
     "Remember my selection for this widget": "Запомни избора ми за това приспособление",
-    "Deny": "Откажи",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s не успя да вземе списъка с протоколи от сървъра. Този сървър може да е прекалено стар за да поддържа чужди мрежи.",
     "%(brand)s failed to get the public room list.": "%(brand)s не успя да вземе списъка с публични стаи.",
     "The homeserver may be unavailable or overloaded.": "Сървърът може да не е наличен или претоварен.",
@@ -1315,7 +1097,6 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не може да бъде прегледана предварително. Желаете ли да се влезете?",
     "This room doesn't exist. Are you sure you're at the right place?": "Стаята не съществува. Сигурни ли сте, че сте на правилното място?",
     "Try again later, or ask a room admin to check if you have access.": "Опитайте отново по-късно или помолете администратора да провери дали имате достъп.",
-    "Low bandwidth mode": "Режим на ниска пропускливост",
     "Uploaded sound": "Качен звук",
     "Sounds": "Звуци",
     "Notification sound": "Звук за уведомление",
@@ -1330,8 +1111,6 @@
     "Rotate Right": "Завърти надясно",
     "Edit message": "Редактирай съобщението",
     "View Servers in Room": "Виж сървърите в стаята",
-    "Unable to validate homeserver/identity server": "Неуспешно потвърждение на сървъра",
-    "Sign in to your Matrix account on <underlinedServerName />": "Влезте с Matrix акаунт от <underlinedServerName />",
     "Use an email address to recover your account": "Използвайте имейл адрес за да възстановите акаунта си",
     "Enter email address (required on this homeserver)": "Въведете имейл адрес (задължително за този сървър)",
     "Doesn't look like a valid email address": "Не изглежда като валиден имейл адрес",
@@ -1341,13 +1120,9 @@
     "Passwords don't match": "Паролите не съвпадат",
     "Other users can invite you to rooms using your contact details": "Други потребители могат да Ви канят в стаи посредством данните за контакт",
     "Enter phone number (required on this homeserver)": "Въведете телефонен номер (задължително за този сървър)",
-    "Doesn't look like a valid phone number": "Не изглежда като валиден телефонен номер",
     "Enter username": "Въведете потребителско име",
     "Some characters not allowed": "Някои символи не са позволени",
-    "Create your Matrix account on <underlinedServerName />": "Създайте Matrix акаунт в <underlinedServerName />",
     "Add room": "Добави стая",
-    "Your profile": "Вашият профил",
-    "Your Matrix account on <underlinedServerName />": "Вашият Matrix акаунт в <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "Неуспешно автоматично откриване на конфигурацията за сървъра",
     "Invalid base_url for m.homeserver": "Невалиден base_url в m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver адресът не изглежда да е валиден Matrix сървър",
@@ -1372,7 +1147,6 @@
     "Edited at %(date)s. Click to view edits.": "Редактирано на %(date)s. Кликнете за да видите редакциите.",
     "Message edits": "Редакции на съобщение",
     "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:": "Обновяването на тази стая изисква затварянето на текущата и създаване на нова на нейно място. За да е най-удобно за членовете на стаята, ще:",
-    "%(senderName)s made no change.": "%(senderName)s не направи промяна.",
     "Loading room preview": "Зареждане на прегледа на стаята",
     "Show all": "Покажи всички",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sне направиха промени %(count)s пъти",
@@ -1384,9 +1158,7 @@
     "Removing…": "Премахване…",
     "Clear all data": "Изчисти всички данни",
     "Your homeserver doesn't seem to support this feature.": "Не изглежда сървърът ви да поддържа тази функция.",
-    "Resend edit": "Изпрати наново корекцията",
     "Resend %(unsentCount)s reaction(s)": "Изпрати наново %(unsentCount)s реакция(и)",
-    "Resend removal": "Изпрати наново премахването",
     "Failed to re-authenticate due to a homeserver problem": "Неуспешна повторна автентикация поради проблем със сървъра",
     "Failed to re-authenticate": "Неуспешна повторна автентикация",
     "Enter your password to sign in and regain access to your account.": "Въведете паролата си за да влезете и да възстановите достъп до профила.",
@@ -1395,7 +1167,6 @@
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Не можете да влезете в профила си. Свържете се с администратора на сървъра за повече информация.",
     "You're signed out": "Излязохте от профила",
     "Clear personal data": "Изчисти личните данни",
-    "Identity Server": "Сървър за самоличност",
     "Find others by phone or email": "Открийте други по телефон или имейл",
     "Be found by phone or email": "Бъдете открит по телефон или имейл",
     "Use bots, bridges, widgets and sticker packs": "Използвайте ботове, връзки с други мрежи, приспособления и стикери",
@@ -1413,9 +1184,6 @@
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Позволи ползването на помощен сървър turn.matrix.org когато сървъра не предложи собствен (IP адресът ви ще бъде споделен по време на разговор)",
     "ID": "Идентификатор",
     "Public Name": "Публично име",
-    "Identity Server URL must be HTTPS": "Адресът на сървъра за самоличност трябва да бъде HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Невалиден сървър за самоличност (статус код %(code)s)",
-    "Could not connect to Identity Server": "Неуспешна връзка със сървъра за самоличност",
     "Checking server": "Проверка на сървъра",
     "Identity server has no terms of service": "Сървъра за самоличност няма условия за ползване",
     "The identity server you have chosen does not have any terms of service.": "Избраният от вас сървър за самоличност няма условия за ползване на услугата.",
@@ -1423,12 +1191,10 @@
     "Terms of service not accepted or the identity server is invalid.": "Условията за ползване не бяха приети или сървъра за самоличност е невалиден.",
     "Disconnect from the identity server <idserver />?": "Прекъсване на връзката със сървър за самоличност <idserver />?",
     "Disconnect": "Прекъсни",
-    "Identity Server (%(server)s)": "Сървър за самоличност (%(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.": "В момента използвате <server></server> за да откривате и да бъдете открити от познати ваши контакти. Може да промените сървъра за самоличност по-долу.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "В момента не използвате сървър за самоличност. За да откривате и да бъдете открити от познати ваши контакти, добавете такъв по-долу.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Прекъсването на връзката със сървъра ви за самоличност означава че няма да можете да бъдете открити от други потребители или да каните хора по имейл или телефонен номер.",
     "Enter a new identity server": "Въведете нов сървър за самоличност",
-    "Integration Manager": "Мениджър на интеграции",
     "Discovery": "Откриване",
     "Deactivate account": "Деактивиране на акаунт",
     "Always show the window menu bar": "Винаги показвай менютата на прозореца",
@@ -1445,9 +1211,7 @@
     "Remove %(phone)s?": "Премахни %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Беше изпратено SMS съобщение към +%(msisdn)s. Въведете съдържащият се код за потвърждение.",
     "Command Help": "Помощ за команди",
-    "No identity server is configured: add one in server settings to reset your password.": "Не е конфигуриран сървър за самоличност: добавете такъв в настройки за сървъри за да може да възстановите паролата си.",
     "You do not have the required permissions to use this command.": "Нямате необходимите привилегии за да използвате тази команда.",
-    "Multiple integration managers": "Няколко мениджъра на интеграции",
     "Accept <policyLink /> to continue:": "Приемете <policyLink /> за да продължите:",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ако не искате да използвате <server /> за да откривате и да бъдете откриваеми от познати ваши контакти, въведете друг сървър за самоличност по-долу.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Използването на сървър за самоличност не е задължително. Ако не използвате такъв, няма да бъдете откриваеми от други потребители и няма да можете да ги каните по имейл или телефон.",
@@ -1472,10 +1236,6 @@
     "Share this email in Settings to receive invites directly in %(brand)s.": "Споделете този имейл в Настройки за да получавате покани директно в %(brand)s.",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Използвайте сървър за самоличност за да каните по имейл. <default>Използвайте сървъра за самоличност по подразбиране (%(defaultIdentityServerName)s)</default> или настройте друг в <settings>Настройки</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Използвайте сървър за самоличност за да каните по имейл. Управлявайте в <settings>Настройки</settings>.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Настройте имейл за възстановяване на профила. По желание, използвайте имейл или телефон за да бъдете откриваеми от сегашните ви контакти.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Настройте имейл за възстановяване на профила. По желание, използвайте имейл за да бъдете откриваеми от сегашните ви контакти.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Въведете собствен адрес на сървър <a>Какво значи това?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Въведете собствен адрес на сървър за самоличност <a>Какво значи това?</a>",
     "Change identity server": "Промени сървъра за самоличност",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Прекъсване на връзката със сървър за самоличност <current /> и свързване с <new />?",
     "Disconnect identity server": "Прекъсни връзката със сървъра за самоличност",
@@ -1495,19 +1255,16 @@
     "Italics": "Наклонено",
     "Strikethrough": "Задраскано",
     "Code block": "Блок с код",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Изпращай потвърждения за прочетени съобщения (изключването изисква сървър поддържащ това)",
     "Please fill why you're reporting.": "Въведете защо докладвате.",
     "Report Content to Your Homeserver Administrator": "Докладвай съдържание до администратора на сървъра",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Докладването на съобщението ще изпрати уникалният номер на събитието (event ID) до администратора на сървъра. Ако съобщенията в стаята са шифровани, администратора няма да може да прочете текста им или да види снимките или файловете.",
     "Send report": "Изпрати доклад",
     "Report Content": "Докладвай съдържание",
     "Filter": "Филтрирай",
-    "Filter rooms…": "Филтрирай стаите…",
     "Preview": "Прегледай",
     "View": "Виж",
     "Find a room…": "Намери стая…",
     "Find a room… (e.g. %(exampleRoom)s)": "Намери стая... (напр. %(exampleRoom)s)",
-    "Explore": "Открий стаи",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ако не намирате търсената стая, попитайте за покана или <a>Създайте нова стая</a>.",
     "Explore rooms": "Открий стаи",
     "Verify the link in your inbox": "Потвърдете линка във вашата пощенска кутия",
@@ -1517,14 +1274,11 @@
     "Changes the avatar of the current room": "Променя снимката на текущата стая",
     "e.g. my-room": "например my-room",
     "Please enter a name for the room": "Въведете име на стаята",
-    "This room is private, and can only be joined by invitation.": "Това е частна стая и присъединяването става само с покана.",
     "Create a public room": "Създай публична стая",
     "Create a private room": "Създай частна стая",
     "Topic (optional)": "Тема (незадължително)",
-    "Make this room public": "Направи стаята публична",
     "Hide advanced": "Скрий разширени настройки",
     "Show advanced": "Покажи разширени настройки",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Блокирай присъединяването на потребители от други Matrix сървъри в тази стая (Тази настройка не може да се промени по-късно!)",
     "Close dialog": "Затвори прозореца",
     "Add Email Address": "Добави имейл адрес",
     "Add Phone Number": "Добави телефонен номер",
@@ -1543,12 +1297,10 @@
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "На път сте да премахнете 1 съобщение от %(user)s. Това е необратимо. Искате ли да продължите?",
     "Remove %(count)s messages|one": "Премахни 1 съобщение",
     "Room %(name)s": "Стая %(name)s",
-    "Recent rooms": "Скорошни стаи",
     "%(count)s unread messages including mentions.|other": "%(count)s непрочетени съобщения, включително споменавания.",
     "%(count)s unread messages including mentions.|one": "1 непрочетено споменаване.",
     "%(count)s unread messages.|other": "%(count)s непрочетени съобщения.",
     "%(count)s unread messages.|one": "1 непрочетено съобщение.",
-    "Unread mentions.": "Непрочетени споменавания.",
     "Unread messages.": "Непрочетени съобщения.",
     "Failed to deactivate user": "Неуспешно деактивиране на потребител",
     "This client does not support end-to-end encryption.": "Този клиент не поддържа шифроване от край до край.",
@@ -1571,13 +1323,11 @@
     "To continue you need to accept the terms of this service.": "За да продължите, трябва да приемете условията за ползване.",
     "Document": "Документ",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Липсва публичния ключ за catcha в конфигурацията на сървъра. Съобщете това на администратора на сървъра.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Не е конфигуриран сървър за самоличност, така че не можете да добавите имейл адрес за възстановяване на паролата в бъдеще.",
     "%(creator)s created and configured the room.": "%(creator)s създаде и настрой стаята.",
     "Jump to first unread room.": "Отиди до първата непрочетена стая.",
     "Jump to first invite.": "Отиди до първата покана.",
     "Command Autocomplete": "Подсказка за команди",
     "Community Autocomplete": "Подсказка за общности",
-    "DuckDuckGo Results": "DuckDuckGo резултати",
     "Emoji Autocomplete": "Подсказка за емоджита",
     "Notification Autocomplete": "Подсказка за уведомления",
     "Room Autocomplete": "Подсказка за стаи",
@@ -1625,10 +1375,6 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до стаи отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до сървъри отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до неща отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
-    "The message you are trying to send is too large.": "Съобщението, което се опитвате да изпратите е прекалено голямо.",
-    "Cross-signing and secret storage are enabled.": "Кръстосано-подписване и секретно складиране са включени.",
-    "Cross-signing and secret storage are not yet set up.": "Кръстосаното-подписване и секретно складиране все още не са настроени.",
-    "Bootstrap cross-signing and secret storage": "Инициализирай кръстосано-подписване и секретно складиране",
     "Cross-signing public keys:": "Публични ключове за кръстосано-подписване:",
     "not found": "не са намерени",
     "Cross-signing private keys:": "Private ключове за кръстосано подписване:",
@@ -1639,12 +1385,7 @@
     "Backup has a <validity>valid</validity> signature from this user": "Резервното копие има <validity>валиден</validity> подпис за този потребител",
     "Backup has a <validity>invalid</validity> signature from this user": "Резервното копие има <validity>невалиден</validity> подпис за този потребител",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Резервното копие има подпис от <verify>непознат</verify> потребител с идентификатор %(deviceId)s",
-    "Backup key stored: ": "Резервният ключ е съхранен: ",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции <b>%(serverName)s</b> за управление на ботове, приспособления и стикери.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции за управление на ботове, приспособления и стикери.",
     "Manage integrations": "Управление на интеграциите",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Мениджърът на интеграции получава конфигурационни данни, може да модифицира приспособления, да изпраща покани за стаи и да настройва нива на достъп от ваше име.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Настройте изживяването си с експериментални функции. <a>Научи повече</a>.",
     "Ignored/Blocked": "Игнорирани/блокирани",
     "Error adding ignored user/server": "Грешка при добавяне на игнориран потребител/сървър",
     "Something went wrong. Please try again or view your console for hints.": "Нещо се обърка. Опитайте пак или вижте конзолата за информация какво не е наред.",
@@ -1685,14 +1426,11 @@
     "Hide verified sessions": "Скрий потвърдените сесии",
     "%(count)s verified sessions|other": "%(count)s потвърдени сесии",
     "%(count)s verified sessions|one": "1 потвърдена сесия",
-    "Direct message": "Директно съобщение",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> в%(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Съобщенията в тази стая са шифровани от край-до-край.",
     "Verify": "Потвърди",
     "Security": "Сигурност",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Игнорирали сте този потребител, така че съобщението им е скрито. <a>Покажи така или иначе.</a>",
     "Reactions": "Реакции",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> реагира с %(content)s</reactedWith>",
     "Any of the following data may be shared:": "Следните данни може да бъдат споделени:",
     "Your display name": "Вашето име",
     "Your avatar URL": "Адреса на профилната ви снимка",
@@ -1701,7 +1439,6 @@
     "%(brand)s URL": "%(brand)s URL адрес",
     "Room ID": "Идентификатор на стаята",
     "Widget ID": "Идентификатор на приспособлението",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s и с мениджъра на интеграции.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Приспособленията не използваш шифроване на съобщенията.",
     "Widget added by": "Приспособлението е добавено от",
@@ -1711,8 +1448,6 @@
     "Integrations are disabled": "Интеграциите са изключени",
     "Enable 'Manage Integrations' in Settings to do this.": "Включете 'Управление на интеграции' от настройките за направите това.",
     "Integrations not allowed": "Интеграциите не са разрешени",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Вашият %(brand)s не позволява да използвате мениджъра на интеграции за да направите това. Свържете се с администратор.",
-    "Automatically invite users": "Автоматично кани потребители",
     "Upgrade private room": "Обнови лична стая",
     "Upgrade public room": "Обнови публична стая",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Обновяването на стая е действие за напреднали и обикновено се препоръчва когато стаята е нестабилна поради бъгове, липсващи функции или проблеми със сигурността.",
@@ -1720,19 +1455,11 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Ще обновите стаята от <oldVersion /> до <newVersion />.",
     "Upgrade": "Обнови",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Внимание</b>: Трябва да настройвате резервно копие на ключове само от доверен компютър.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ако сте забравили ключа за възстановяване, може да <button>настройте нови опции за възстановяване</button>",
     "Notification settings": "Настройки на уведомленията",
-    "Help": "Помощ",
-    "Reload": "Презареди",
-    "Take picture": "Направи снимка",
     "Remove for everyone": "Премахни за всички",
-    "Remove for me": "Премахни за мен",
     "User Status": "Потребителски статус",
     "Country Dropdown": "Падащо меню за избор на държава",
     "Verification Request": "Заявка за потвърждение",
-    "Set up with a recovery key": "Настрой с ключ за възстановяване",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ключа за възстановяване беше <b>копиран в клиборд</b>, поставете го в:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Ключа за възстановяване е във вашата папка <b>Изтегляния</b>.",
     "Unable to set up secret storage": "Неуспешна настройка на секретно складиране",
     "Show info about bridges in room settings": "Показвай информация за връзки с други мрежи в настройките на стаята",
     "This bridge is managed by <user />.": "Тази връзка с друга мрежа се управлява от <user />.",
@@ -1746,7 +1473,6 @@
     "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 като инсталирано прогресивно уеб приложение (PWA)",
     "Your user agent": "Информация за браузъра ви",
-    "If you cancel now, you won't complete verifying the other user.": "Ако се откажете сега, няма да завършите верификацията на другия потребител.",
     "Use Single Sign On to continue": "Използвайте Single Sign On за да продължите",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Потвърдете добавянето на този имейл адрес като потвърдите идентичността си чрез Single Sign On.",
     "Single Sign On": "Single Sign On",
@@ -1755,12 +1481,10 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Потвърдете добавянето на този телефонен номер като докажете идентичността си чрез използване на Single Sign On.",
     "Confirm adding phone number": "Потвърдете добавянето на телефонен номер",
     "Click the button below to confirm adding this phone number.": "Кликнете бутона по-долу за да потвърдите добавянето на телефонния номер.",
-    "If you cancel now, you won't complete verifying your other session.": "Ако се откажете сега, няма да завършите потвърждаването на другата ви сесия.",
     "Cancel entering passphrase?": "Откажете въвеждането на парола?",
     "Setting up keys": "Настройка на ключове",
     "Verify this session": "Потвърди тази сесия",
     "Encryption upgrade available": "Има обновление на шифроването",
-    "Set up encryption": "Настрой шифроване",
     "Sign In or Create Account": "Влезте или Създайте профил",
     "Use your account or create a new one to continue.": "Използвайте профила си или създайте нов за да продължите.",
     "Create Account": "Създай профил",
@@ -1810,8 +1534,6 @@
     "Enable message search in encrypted rooms": "Включи търсенето на съобщения в шифровани стаи",
     "How fast should messages be downloaded.": "Колко бързо да се изтеглят съобщенията.",
     "Manually verify all remote sessions": "Ръчно потвърждаване на всички отдалечени сесии",
-    "If you cancel now, you won't complete your operation.": "Ако се откажете сега, няма да завършите операцията.",
-    "Review where you’re logged in": "Прегледайте откъде сте влезли в профила си",
     "New login. Was this you?": "Нов вход. Вие ли бяхте това?",
     "%(name)s is requesting verification": "%(name)s изпрати запитване за верификация",
     "Failed to set topic": "Неуспешно задаване на тема",
@@ -1836,17 +1558,12 @@
     "Lock": "Заключи",
     "Later": "По-късно",
     "Review": "Прегледай",
-    "Verify yourself & others to keep your chats safe": "Потвърдете себе си и останалите за да запазите чатовете си сигурни",
     "Other users may not trust it": "Други потребители може да не се доверят",
-    "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
     "This bridge was provisioned by <user />.": "Мостът е настроен от <user />.",
-    "Workspace: %(networkName)s": "Работна област: %(networkName)s",
-    "Channel: %(channelName)s": "Канал: %(channelName)s",
     "Show less": "Покажи по-малко",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Промяната на паролата в момента би нулирало всички ключове за шифроване-от-край-до-край, правейки историята на чата нечетима, освен ако първо не експортирате ключовете, а след промяната на паролата ги импортирате. В бъдеще, това ще бъде подобрено.",
     "Your homeserver does not support cross-signing.": "Сървърът ви не поддържа кръстосано-подписване.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Профилът ви има самоличност за кръстосано подписване в секретно складиране, но все още не е доверено от тази сесия.",
-    "Reset cross-signing and secret storage": "Нулирай кръстосаното-подписване и секретното складиране",
     "well formed": "коректен",
     "unexpected type": "непознат тип",
     "in memory": "в паметта",
@@ -1854,7 +1571,6 @@
     "cached locally": "кеширан локално",
     "not found locally": "ненамерен локално",
     "User signing private key:": "Частен ключ за подписване на потребители:",
-    "Session backup key:": "Ключ за резервно копие на сесията:",
     "Homeserver feature support:": "Поддържани функции от сървъра:",
     "exists": "съществува",
     "Your homeserver does not support session management.": "Сървърът ви не поддържа управление на сесии.",
@@ -1869,9 +1585,6 @@
     "Delete %(count)s sessions|other": "Изтрий %(count)s сесии",
     "Delete %(count)s sessions|one": "Изтрий %(count)s сесия",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Потвърждавай индивидуално всяка сесия на потребителите, маркирайки я като доверена и недоверявайки се на кръстосано-подписваните устройства.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Кеширай шифровани съобщения по сигурен начин, за да могат да се появяват в резултати от търсения, използвайки ",
-    " to store messages from ": " за складиране на съобщения от ",
-    "rooms.": "стаи.",
     "Manage": "Управление",
     "Securely cache encrypted messages locally for them to appear in search results.": "Кеширай шифровани съобщения локално по сигурен начин за да се появяват в резултати от търсения.",
     "Enable": "Включи",
@@ -1883,8 +1596,6 @@
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Резервното копие има подпис от <verify>непозната</verify> сесия с идентификатор %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "Резервното копие има <validity>валиден</validity> подпис от тази сесия",
     "Backup has an <validity>invalid</validity> signature from this session": "Резервното копие има <validity>невалиден</validity> подпис от тази сесия",
-    "Verify all your sessions to ensure your account & messages are safe": "Верифицирайте всички свой сесии за да подсигурите, че профила и съобщенията ви са защитени",
-    "Verify the new login accessing your account: %(name)s": "Верифицирайте новия вход достъпващ профила ви: %(name)s",
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>потвърдена</verify> сесия <device></device>",
     "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>непотвърдена</verify> сесия <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>потвърдена</verify> сесия <device></device>",
@@ -1924,7 +1635,6 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Поискай отново ключове за шифроване</requestLink> от другите сесии.",
     "Encrypted by an unverified session": "Шифровано от неверифицирана сесия",
     "Encrypted by a deleted session": "Шифровано от изтрита сесия",
-    "Invite only": "Само с покани",
     "Scroll to most recent messages": "Отиди до най-скорошните съобщения",
     "Send a reply…": "Изпрати отговор…",
     "Send a message…": "Изпрати съобщение…",
@@ -1938,13 +1648,11 @@
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Възникна грешка при обновяване на алтернативните адреси на стаята. Или не е позволено от сървъра или се е случила временна грешка.",
     "Local address": "Локален адрес",
     "Published Addresses": "Публикувани адреси",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Публикуваните адреси могат да бъдат използвани от всеки човек, на кой да е сървър, за присъединяване към стаята. За да публикувате адрес, първо трябва да е настроен като локален адрес.",
     "Other published addresses:": "Други публикувани адреси:",
     "No other published addresses yet, add one below": "Все още няма други публикувани адреси, добавете такъв по-долу",
     "New published address (e.g. #alias:server)": "Нов публикуван адрес (напр. #alias:server)",
     "Local Addresses": "Локални адреси",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Настройте адреси за тази стая, така че потребителите да могат да намерят стаята през вашия сървър (%(localDomain)s)",
-    "Waiting for you to accept on your other session…": "Изчаква се да приемете от другата ви сесия…",
     "Waiting for %(displayName)s to accept…": "Изчаква се %(displayName)s да приеме…",
     "Accepting…": "Приемане…",
     "Start Verification": "Започни верификация",
@@ -1984,7 +1692,6 @@
     "Verification cancelled": "Верификацията беше отказана",
     "Compare emoji": "Сравни емоджи",
     "Encryption enabled": "Шифроването е включено",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Съобщенията в тази стая са ширфовани от-край-до-край. Научете повече и верифицирайте този потребител от профила им.",
     "Encryption not enabled": "Шифроването не е включено",
     "The encryption used by this room isn't supported.": "Шифроването използвано от тази стая не се поддържа.",
     "You declined": "Отказахте",
@@ -2030,16 +1737,11 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Верифицирането на този потребител ще маркира сесията им като доверена при вас, както и вашата като доверена при тях.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Верифицирайте това устройство за да го маркирате като доверено. Доверявайки се на това устройство дава на вас и на другите потребители допълнително спокойствие при използването на от-край-до-край-шифровани съобщения.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Верифицирането на това устройство ще го маркира като доверено, а потребителите, които са потвърдили вас също ще се доверяват на него.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Неуспешно поканване на следните потребители в чата: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Не можахме да създадем директен чат. Проверете потребителите, които искате да поканите и опитайте пак.",
     "Something went wrong trying to invite the users.": "Нещо се обърка при опита да бъдат поканени потребителите.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Не можахме да поканим тези потребители. Проверете потребителите, които искате да поканите и опитайте пак.",
     "Recently Direct Messaged": "Скорошни директни чатове",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Започнете чат с някой посредством име, потребителско име (като <userId/>) или имейл адрес.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Поканете някой посредством име, потребителско име (като <userId/>), имейл адрес или като <a>споделите тази стая</a>.",
     "Opens chat with the given user": "Отваря чат с дадения потребител",
     "Sends a message to the given user": "Изпраща съобщение до дадения потребител",
-    "Font scaling": "Мащабиране на шрифта",
     "Font size": "Размер на шрифта",
     "IRC display name width": "Ширина на IRC името",
     "Waiting for your other session to verify…": "Изчакване другата сесията да потвърди…",
@@ -2047,7 +1749,6 @@
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Собствения размер на шрифта може да бъде единствено между %(min)s pt и %(max)s pt",
     "Use between %(min)s pt and %(max)s pt": "Изберете между %(min)s pt и %(max)s pt",
     "Appearance": "Изглед",
-    "Create room": "Създай стая",
     "You've successfully verified your device!": "Успешно потвърдихте устройството си!",
     "Message deleted": "Съобщението беше изтрито",
     "Message deleted by %(name)s": "Съобщението беше изтрито от %(name)s",
@@ -2068,34 +1769,15 @@
     "Confirm by comparing the following with the User Settings in your other session:": "Потвърдете чрез сравняване на следното с Потребителски Настройки в другата ви сесия:",
     "Confirm this user's session by comparing the following with their User Settings:": "Потвърдете сесията на този потребител чрез сравняване на следното с техните Потребителски Настройки:",
     "If they don't match, the security of your communication may be compromised.": "Ако няма съвпадение, сигурността на комуникацията ви може би е компрометирана.",
-    "Your account is not secure": "Профилът ви не е защитен",
-    "Your password": "Паролата ви",
-    "This session, or the other session": "Тази сесия или другата сесия",
-    "The internet connection either session is using": "Интернет връзката, която сесиите използват",
-    "We recommend you change your password and recovery key in Settings immediately": "Препоръчваме веднага да промените паролата и ключа за възстановяване от Настройки",
-    "New session": "Нова сесия",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Използвайте тази сесия за да потвърдите новата, давайки й достъп до шифрованите съобщения:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Ако не сте се вписвали в тази сесия, профила ви може би е бил компрометиран.",
-    "This wasn't me": "Не бях аз",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Това ще ви позволи да се върнете в профила си след излизането от него, както и да влизате от други сесии.",
-    "Verify other session": "Потвърди другата сесия",
-    "Enter recovery passphrase": "Въведете парола за възстановяване",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Неуспешен достъп до секретното складиране. Потвърдете, че сте въвели правилната парола за възстановяване.",
     "Room name or address": "Име на стая или адрес",
     "Joins room with given address": "Присъединява се към стая с дадения адрес",
     "Unrecognised room address:": "Неразпознат адрес на стая:",
     "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>бисквитка</PolicyLink>.",
-    "I want to help": "Искам да помогна",
     "Your homeserver has exceeded its user limit.": "Надвишен е лимитът за потребители на сървъра ви.",
     "Your homeserver has exceeded one of its resource limits.": "Беше надвишен някой от лимитите на сървъра.",
     "Contact your <a>server admin</a>.": "Свържете се със <a>сървърния администратор</a>.",
     "Ok": "Добре",
-    "Set password": "Настрой парола",
-    "To return to your account in future you need to set a password": "За да се върнете в профила си в бъдеще е необходимо да настройте парола",
-    "Restart": "Рестартирай",
-    "Upgrade your %(brand)s": "Обновете %(brand)s",
-    "A new version of %(brand)s is available!": "Налична е нова версия на %(brand)s!",
     "New version available. <a>Update now.</a>": "Налична е нова версия. <a>Обновете сега.</a>",
     "Please verify the room ID or address and try again.": "Проверете идентификатора или адреса на стаята и опитайте пак.",
     "Room ID or address of ban list": "Идентификатор или адрес на стая списък за блокиране",
@@ -2107,22 +1789,14 @@
     "Error removing address": "Грешка при премахването на адреса",
     "Categories": "Категории",
     "Room address": "Адрес на стаята",
-    "Please provide a room address": "Въведете адрес на стаята",
     "This address is available to use": "Адресът е наличен за ползване",
     "This address is already in use": "Адресът вече се използва",
-    "Set a room address to easily share your room with other people.": "Настройте адрес на стаята за да може лесно да я споделяте с други хора.",
     "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.": "Използвали сте и по-нова версия на %(brand)s от сегашната за тази сесия. За да използвате сегашната версия отново с шифроване от-край-до-край, ще е необходимо да излезете и да влезете отново.",
-    "Enter recovery key": "Въведете ключ за възстановяване",
     "Restoring keys from backup": "Възстановяване на ключове от резервно копие",
     "Fetching keys from server...": "Изтегляне на ключове от сървъра...",
     "%(completed)s of %(total)s keys restored": "%(completed)s от %(total)s ключа са възстановени",
-    "Recovery key mismatch": "Несъответствие в ключа за възстановяване",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Резервното копие не можа да бъде разшифровано с този ключ за възстановяване: проверете дали сте въвели правилния ключ за възстановяване.",
-    "Incorrect recovery passphrase": "Неправилна парола за възстановяване",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Резервното копие не можа да бъде разшифровано с тази парола за възстановяване: проверете дали сте въвели правилната парола за възстановяване.",
     "Keys restored": "Ключовете бяха възстановени",
     "Successfully restored %(sessionCount)s keys": "Успешно бяха възстановени %(sessionCount)s ключа",
-    "Address (optional)": "Адрес (незадължително)",
     "Confirm your identity by entering your account password below.": "Потвърдете самоличността си чрез въвеждане на паролата за профила по-долу.",
     "Sign in with SSO": "Влезте със SSO",
     "Welcome to %(appName)s": "Добре дошли в %(appName)s",
@@ -2130,7 +1804,6 @@
     "Send a Direct Message": "Изпрати директно съобщение",
     "Explore Public Rooms": "Разгледай публичните стаи",
     "Create a Group Chat": "Създай групов чат",
-    "Self-verification request": "Заявка за само-потвърждение",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Изтрий %(alias)s адреса на стаята и премахни %(name)s от директорията?",
     "delete the address.": "изтриване на адреса.",
     "Verify this login": "Потвърди тази сесия",
@@ -2149,12 +1822,8 @@
     "Syncing...": "Синхронизиране...",
     "Signing In...": "Влизане...",
     "If you've joined lots of rooms, this might take a while": "Това може да отнеме известно време, ако сте в много стаи",
-    "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:": "Това изисква най-новата версия на %(brand)s на другите ви устройства:",
-    "or another cross-signing capable Matrix client": "или друг Matrix клиент поддържащ кръстосано-подписване",
     "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.": "Новата ви сесия е потвърдена. Другите потребители ще я виждат като доверена.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Без да повишите сигурността на тази сесия, няма да имате достъп до шифрованите съобщения.",
     "Go Back": "Върни се",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Възвърнете достъп до профила си и до ключовете за шифроване съхранени в тази сесия. Без тях няма да можете да четете всички защитени съобщения в коя да е сесия.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Внимание: личните ви данни (включително ключове за шифроване) все още се съхраняват в тази сесия. Изчистете ги, ако сте приключили със сесията или искате да влезете в друг профил.",
@@ -2165,26 +1834,14 @@
     "Restore": "Възстанови",
     "You'll need to authenticate with the server to confirm the upgrade.": "Ще трябва да се автентикирате пред сървъра за да потвърдите обновяването.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Обновете тази сесия, за да може да потвърждава други сесии, давайки им достъп до шифрованите съобщения и маркирайки ги като доверени за другите потребители.",
-    "Enter a recovery passphrase": "Въведете парола за възстановяване",
-    "Great! This recovery passphrase looks strong enough.": "Чудесно! Тази парола за възстановяване изглежда достатъчно силна.",
     "Use a different passphrase?": "Използвай друга парола?",
-    "Enter your recovery passphrase a second time to confirm it.": "Въведете паролата за възстановяване още веднъж за да потвърдите.",
-    "Confirm your recovery passphrase": "Потвърдете паролата за възстановяване",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Ключа за възстановяване е допълнителна гаранция - може да го използвате вместо паролата за възстановяване за да възстановите достъп до шифрованите съобщения.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Направете копие на сигурно място, например password manager или сейф.",
-    "Your recovery key": "Ключът ви за възстановяване",
     "Copy": "Копирай",
     "Unable to query secret storage status": "Неуспешно допитване за състоянието на секретното складиране",
     "Upgrade your encryption": "Обновете шифроването",
-    "Make a copy of your recovery key": "Направете копие на ключа за възстановяване",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ще съхраним шифровано копие на ключовете ви на сървъра. Защитете резервното копие с парола за възстановяване.",
-    "Please enter your recovery passphrase a second time to confirm.": "Въведете паролата за възстановяване отново за да потвърдите.",
-    "Repeat your recovery passphrase...": "Повторете паролата си за възстановяване...",
     "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.": "Ако не настройте защитено възстановяване на съобщения, няма да можете да възстановите историята на шифрованите си съобщения при излизане от профила или при използване на друга сесия.",
-    "Secure your backup with a recovery passphrase": "Защитете профила си с парола за възстановяване",
     "Create key backup": "Създай резервно копие на ключовете",
     "This session is encrypting history using the new recovery method.": "Тази сесия шифрова историята използвайки новия метод за възстановяване.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Тази сесия установи, че паролата за възстановяване и ключа за сигурни съобщения са били премахнати.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ако сте направили това без да искате, може да настройте защитени съобщения за тази сесия, което ще зашифрова наново историята на съобщенията използвайки новия метод за възстановяване.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Ако е изключено, съобщения от шифровани стаи няма да се показват в резултатите от търсения.",
     "Disable": "Изключи",
@@ -2244,68 +1901,32 @@
     "Sort by": "Подреди по",
     "Activity": "Активност",
     "A-Z": "Азбучен ред",
-    "Unread rooms": "Непрочетени стаи",
     "Show %(count)s more|other": "Покажи още %(count)s",
     "Show %(count)s more|one": "Покажи още %(count)s",
     "Light": "Светла",
     "Dark": "Тъмна",
-    "Use the improved room list (will refresh to apply changes)": "Използвай подобрения списък със стаи (ще презареди за да се приложи промяната)",
     "Use custom size": "Използвай собствен размер",
     "Use a system font": "Използвай системния шрифт",
     "System font name": "Име на системния шрифт",
     "Hey you. You're the best!": "Хей, ти. Върхът си!",
     "Message layout": "Изглед на съобщенията",
-    "Compact": "Компактен",
     "Modern": "Модерен",
     "Customise your appearance": "Настройте изгледа",
     "Appearance Settings only affect this %(brand)s session.": "Настройките на изгледа влияят само на тази %(brand)s сесия.",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Автентичността на това шифровано съобщение не може да бъде гарантирана на това устройство.",
-    "Always show first": "Винаги показвай първо",
     "Show": "Покажи",
     "Message preview": "Преглед на съобщението",
     "List options": "Опции на списъка",
     "Leave Room": "Напусни стаята",
     "Room options": "Настройки на стаята",
-    "Use Recovery Key or Passphrase": "Използвай ключ за възстановяване или парола",
-    "Use Recovery Key": "Използвай ключ за възстановяване",
-    "Use your account to sign in to the latest version": "Използвайте профила си за да влезете в последната версия",
-    "We’re excited to announce Riot is now Element": "Развълнувани сме да обявим, че Riot вече е Element",
-    "Riot is now Element!": "Riot вече е Element!",
-    "Learn More": "Научи повече",
     "You joined the call": "Присъединихте се към разговор",
     "%(senderName)s joined the call": "%(senderName)s се присъедини към разговор",
     "Call in progress": "Тече разговор",
-    "You left the call": "Напуснахте разговора",
-    "%(senderName)s left the call": "%(senderName)s напусна разговора",
     "Call ended": "Разговора приключи",
     "You started a call": "Започнахте разговор",
     "%(senderName)s started a call": "%(senderName)s започна разговор",
     "Waiting for answer": "Изчакване на отговор",
     "%(senderName)s is calling": "%(senderName)s се обажда",
-    "You created the room": "Създадохте стаята",
-    "%(senderName)s created the room": "%(senderName)s създаде стаята",
-    "You made the chat encrypted": "Направихте чата шифрован",
-    "%(senderName)s made the chat encrypted": "%(senderName)s направи чата шифрован",
-    "You made history visible to new members": "Направихте историята видима за нови членове",
-    "%(senderName)s made history visible to new members": "%(senderName)s направи историята видима за нови членове",
-    "You made history visible to anyone": "Направихте историята видима за всички",
-    "%(senderName)s made history visible to anyone": "%(senderName)s направи историята видима за всички",
-    "You made history visible to future members": "Направихте историята видима за бъдещи членове",
-    "%(senderName)s made history visible to future members": "%(senderName)s направи историята видима за бъдещи членове",
-    "You were invited": "Бяхте поканени",
-    "%(targetName)s was invited": "%(targetName)s беше поканен",
-    "You left": "Напуснахте",
-    "%(targetName)s left": "%(targetName)s напусна",
-    "You were kicked (%(reason)s)": "Бяхте изгонени (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s беше изгонен(а) (%(reason)s)",
-    "You were kicked": "Бяхте изгонени",
-    "%(targetName)s was kicked": "%(targetName)s беше изгонен(а)",
-    "You rejected the invite": "Отхвърлихте поканата",
-    "%(targetName)s rejected the invite": "%(targetName)s отхвърли поканата",
-    "You were uninvited": "Поканата към вас беше премахната",
-    "%(targetName)s was uninvited": "Поканата към %(targetName)s беше премахната",
-    "You were banned (%(reason)s)": "Бяхте блокирани (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s беше блокиран(а) (%(reason)s)",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
     "* %(senderName)s %(emote)s": "%(senderName)s%(emote)s",
     "The person who invited you already left the room, or their server is offline.": "Участникът който ви е поканил вече е напуснал стаята или техният сървър не е на линия.",
@@ -2314,36 +1935,25 @@
     "Set up Secure Backup": "Конфигуриране на Защитен Архив",
     "Unknown App": "Неизвестно приложение",
     "Error leaving room": "Грешка при напускане на стаята",
-    "%(senderName)s declined the call.": "%(senderName)s отказа разговора.",
-    "(their device couldn't start the camera / microphone)": "(тяхното устройство не може да стартира камерата / микрофонът)",
-    "(connection failed)": "(връзката се разпадна)",
     "Are you sure you want to cancel entering passphrase?": "Сигурни ли сте че желате да прекратите въвеждането на паролата?",
     "This will end the conference for everyone. Continue?": "Това ще прекрати конферентният разговор за всички. Продължи?",
     "End conference": "Прекрати конфетентният разговор",
-    "Call Declined": "Обаждането е отказано",
     "The call could not be established": "Обаждането не може да бъде осъществено",
-    "The other party declined the call.": "Другата страна отказа обаждането.",
     "Answered Elsewhere": "Отговорено на друго място",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s зададе ACLs на сървър за тази стая.",
-    "Incoming call": "Входящ разговор",
-    "Incoming video call": "Входящ видео разговор",
-    "Incoming voice call": "Входящ гласов разговор",
     "Unknown caller": "Непознат абонат",
     "Downloading logs": "Изтегляне на логове",
     "Uploading logs": "Качване на логове",
     "Enable experimental, compact IRC style layout": "Включи експериментално, компактно IRC оформление",
     "Use a more compact ‘Modern’ layout": "Използвай по-компактно 'Модерно' оформление",
-    "Enable advanced debugging for the room list": "Включи разрешен debugging за списъка със стаите",
     "Offline encrypted messaging using dehydrated devices": "Офлайн шифровани съобщения чрез използването на дехидратирани устройства",
     "Show message previews for reactions in all rooms": "Показвай преглед на реакциите за всички стаи",
     "Show message previews for reactions in DMs": "Показвай преглед на реакциите за директни съобщения",
-    "New spinner design": "Нов дизайн на индикатора за активност",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Протипи за Общности v2. Изисква сървър съвместим с това. Много експериментално - използвайте с повишено внимание.",
     "Change notification settings": "Промяна на настройките за уведомление",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "Unexpected server error trying to leave the room": "Възникна неочаквана сървърна грешка при опит за напускане на стаята",
-    "(an error occurred)": "(възникна грешка)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Всички сървъри за възбранени от участие! Тази стая вече не може да бъде използвана.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s промени сървърните разрешения за контрол на достъпа до тази стая.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Добавя ( ͡° ͜ʖ ͡°) в началото на текстовото съобщение",
@@ -2358,8 +1968,6 @@
     "Security Key": "Ключ за сигурност",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Въведете защитната фраза или <button>използвайте ключа за сигурност</button> за да продължите.",
     "Security Phrase": "Защитна фраза",
-    "Invalid Recovery Key": "Невалиден ключ за възстановяване",
-    "Wrong Recovery Key": "Грешен ключ за възстановяване",
     "Looks good!": "Изглежда добре!",
     "Wrong file type": "Грешен тип файл",
     "Recent changes that have not yet been received": "Скорошни промени, които още не са били получени",
@@ -2402,7 +2010,6 @@
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Може да включите това, ако стаята ще се използва само за съвместна работа на вътрешни екипи на сървъра ви. Това не може да бъде променено по-късно.",
     "Your server requires encryption to be enabled in private rooms.": "Сървърът ви изисква в частните стаи да е включено шифроване.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Към частните стаи присъединяването е само с покана. Публичните могат да бъдат открити и присъединени от всеки в тази общност.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Към частните стаи присъединяването е само с покана. Публичните могат да бъдат открити и присъединени от всеки.",
     "An image will help people identify your community.": "Снимката би помогнала на хората да идентифицират общността ви.",
     "Add image (optional)": "Добавете снимка (незадължително)",
     "Enter name": "Въведете име",
@@ -2471,13 +2078,10 @@
     "Secret storage:": "Секретно складиране:",
     "Backup key cached:": "Резервният ключ е кеширан:",
     "Backup key stored:": "Резервният ключ е съхранен:",
-    "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.": "Правете резервно копие на ключовете за шифроване и данните в профила, в случай че загубите достъп до сесиите си. Ключовете ви ще бъдат защитени с уникален ключ за възстановяване.",
     "Algorithm:": "Алгоритъм:",
     "Backup version:": "Версия на резервното копие:",
     "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.": "Съществуват по-сложни уведомления, които не са показани тук.",
     "%(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 не може да кешира шифровани съобщения локално по сигурен начин когато работи в уеб браузър. Използвайте <desktopLink>%(brand)s Desktop </desktopLink> за да можете да търсите шифровани съобщения.",
     "Master private key:": "Главен частен ключ:",
     "not found in storage": "не е намерено в складирането",
@@ -2491,7 +2095,6 @@
     "Enable desktop notifications": "Включете уведомления на работния плот",
     "Don't miss a reply": "Не пропускайте отговор",
     "User menu": "Потребителско меню",
-    "Search rooms": "Търси стаи",
     "Save your Security Key": "Запази ключа за сигурност",
     "Confirm Security Phrase": "Потвърди фразата за сигурност",
     "Set a Security Phrase": "Настрой фраза за сигурност",
@@ -2508,10 +2111,6 @@
     "Welcome %(name)s": "Добре дошли, %(name)s",
     "Add a photo so people know it's you.": "Добавете снимка, за да може другите хора да знаят, че сте вие.",
     "Great, that'll help people know it's you": "Чудесно, това ще позволи на хората да знаят, че сте вие",
-    "Starting microphone...": "Стартиране на микрофона...",
-    "Starting camera...": "Стартиране на камерата...",
-    "Call connecting...": "Свързване на разговор...",
-    "Calling...": "Звънене...",
     "You do not have permission to create rooms in this community.": "Нямате привилегии да създавате стаи в тази общност.",
     "Cannot create rooms in this community": "Не можете да създавате стаи в тази общност",
     "Community and user menu": "Меню за общността и потребителя",
@@ -2520,17 +2119,10 @@
     "Failed to find the general chat for this community": "Неуспешно откриване на основния чат за тази общност",
     "Create community": "Създай общност",
     "Explore rooms in %(communityName)s": "Преглед на стаи в %(communityName)s",
-    "%(brand)s Android": "%(brand)s за Android",
-    "You have no visible notifications in this room.": "Нямате видими уведомления за тази стая.",
     "You’re all caught up": "Наваксали сте с всичко",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Прикачете файлове от чата или ги издърпайте и пуснете в стаята.",
     "No files visible in this room": "Няма видими файлове в тази стая",
     "Away": "Отсъства",
-    "%(brand)s iOS": "%(brand)s за iOS",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s Web": "Уеб версия на %(brand)s",
-    "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>.": "Въведете адреса на вашия Element Matrix Services сървър. Той или използва ваш собствен домейн или е поддомейн на <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.": "Може да използвате опцията за собствен сървър, за да влезете в друг Matrix сървър, чрез указване на адреса му. Това позволява да използвате %(brand)s с Matrix профил съществуващ на друг сървър.",
     "Forgot password?": "Забравена парола?",
     "Search (must be enabled)": "Търсене (трябва да е включено)",
     "Go to Home View": "Отиване на начален изглед",
@@ -2553,7 +2145,6 @@
     "Use Security Key": "Използване на ключ за сигурност",
     "Great! This Security Phrase looks strong enough.": "Чудесно! Тази фраза за сигурност изглежда достатъчно силна.",
     "Set up with a Security Key": "Настройка със ключ за сигурност",
-    "Please enter your Security Phrase a second time to confirm.": "Моля въведете фразата си за сигурност повторно за да потвърдите.",
     "Repeat your Security Phrase...": "Повторете фразата си за сигурност...",
     "Your Security Key is in your <b>Downloads</b> folder.": "Ключа за сигурност е във вашата папка <b>Изтегляния</b>.",
     "Your Security Key": "Вашият ключ за сигурност",
@@ -2836,7 +2427,6 @@
     "Space options": "Опции на пространството",
     "Workspace: <networkLink/>": "Работна област: <networkLink/>",
     "Channel: <channelLink/>": "Канал: <channelLink/>",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Пространствата са нов начин за групиране на стаи и хора. За да се присъедините към съществуващо пространство, се нуждаете от покана.",
     "Open space for anyone, best for communities": "Открийте пространство за всеки, най-добро за общности",
     "Add existing room": "Добави съществуваща стая",
     "Leave space": "Напусни пространство",
@@ -2851,7 +2441,6 @@
     "Invite only, best for yourself or teams": "Само с покана, най-добро за вас самият или отбори",
     "Public": "Публично",
     "Private": "Лично",
-    "You can change this later": "Можете да го промените по-късно",
     "Your public space": "Вашето публично пространство",
     "Your private space": "Вашето лично пространство",
     "You can change these anytime.": "Можете да ги промените по всяко време.",
@@ -2868,14 +2457,6 @@
     "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 за търсене",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Вашата обратна връзка ще направи пространствата по-добри. Kолкото повече изпаднете в подобробности, толкова по-добре.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Бета версията е налична за уеб, десктоп и Android. Някои функции може да не са налични на вашия Home сървър.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Можете да напуснете бета версията по всяко време от настройките или чрез докосване на симовола за бета версията, като този по-горе.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s ще се презареди с пуснати Пространства. Общностите и собствените етикети ще бъдат скрити.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Ако напуснете, %(brand)s ще се презареди със изключени Пространства. Общностите и собствените етикети ще бъдат видими отново.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Бета версията е налична за уеб, десктоп и Android. Благодарим ви, че изпробвахте бета версията.",
     "Spaces are a new way to group rooms and people.": "Пространствата са нов начин за групиране на стаи и хора.",
     "Spaces": "Пространства",
     "Check your devices": "Проверете устройствата си",
@@ -2897,5 +2478,17 @@
     "Already in call": "Вече в разговор",
     "You're already in a call with this person.": "Вече сте в разговор в този човек.",
     "Too Many Calls": "Твърде много повиквания",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Неуспешно повикване поради неуспешен достъп до микрофон. Проверете дали микрофонът е включен и настроен правилно."
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Неуспешно повикване поради неуспешен достъп до микрофон. Проверете дали микрофонът е включен и настроен правилно.",
+    "Integration manager": "Мениджър на интеграции",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Вашият %(brand)s не позволява да използвате мениджъра на интеграции за да направите това. Свържете се с администратор.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s и с мениджъра на интеграции.",
+    "Identity server is": "Сървър за самоличност:",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Мениджърът на интеграции получава конфигурационни данни, може да модифицира приспособления, да изпраща покани за стаи и да настройва нива на достъп от ваше име.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции за управление на ботове, приспособления и стикери.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции <b>%(serverName)s</b> за управление на ботове, приспособления и стикери.",
+    "Identity server": "Сървър за самоличност",
+    "Identity server (%(server)s)": "Сървър за самоличност (%(server)s)",
+    "Could not connect to identity server": "Неуспешна връзка със сървъра за самоличност",
+    "Not a valid identity server (status code %(code)s)": "Невалиден сървър за самоличност (статус код %(code)s)",
+    "Identity server URL must be HTTPS": "Адресът на сървъра за самоличност трябва да бъде HTTPS"
 }
diff --git a/src/i18n/strings/bn_BD.json b/src/i18n/strings/bn_BD.json
index 9e26dfeeb6..5ceda07ab4 100644
--- a/src/i18n/strings/bn_BD.json
+++ b/src/i18n/strings/bn_BD.json
@@ -1 +1,4 @@
-{}
\ No newline at end of file
+{
+    "Integration manager": "ইন্টিগ্রেশন ম্যানেজার",
+    "Identity server": "পরিচয় সার্ভার"
+}
diff --git a/src/i18n/strings/bn_IN.json b/src/i18n/strings/bn_IN.json
index 0967ef424b..5ceda07ab4 100644
--- a/src/i18n/strings/bn_IN.json
+++ b/src/i18n/strings/bn_IN.json
@@ -1 +1,4 @@
-{}
+{
+    "Integration manager": "ইন্টিগ্রেশন ম্যানেজার",
+    "Identity server": "পরিচয় সার্ভার"
+}
diff --git a/src/i18n/strings/bs.json b/src/i18n/strings/bs.json
index dc4ebda993..a7891ebdcd 100644
--- a/src/i18n/strings/bs.json
+++ b/src/i18n/strings/bs.json
@@ -2,5 +2,6 @@
     "Dismiss": "Odbaci",
     "Create Account": "Otvori račun",
     "Sign In": "Prijavite se",
-    "Explore rooms": "Istražite sobe"
+    "Explore rooms": "Istražite sobe",
+    "Identity server": "Identifikacioni Server"
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 9a9e0efaa7..68e62e73ba 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -1,5 +1,4 @@
 {
-    "Add a widget": "Afegeix un giny",
     "Account": "Compte",
     "No Microphones detected": "No s'ha detectat cap micròfon",
     "No Webcams detected": "No s'ha detectat cap càmera web",
@@ -14,12 +13,10 @@
     "Failed to forget room %(errCode)s": "No s'ha pogut oblidar la sala %(errCode)s",
     "Favourite": "Favorit",
     "Mute": "Silencia",
-    "Room directory": "Directori de sales",
     "Settings": "Configuració",
     "Start chat": "Inicia un xat",
     "Failed to change password. Is your password correct?": "S'ha produït un error en canviar la contrasenya. És correcta la teva contrasenya?",
     "Continue": "Continua",
-    "Custom Server Options": "Opcions de servidor personalitzat",
     "Dismiss": "Omet",
     "Notifications": "Notificacions",
     "Remove": "Elimina",
@@ -29,7 +26,6 @@
     "Search": "Cerca",
     "powered by Matrix": "amb tecnologia de Matrix",
     "Edit": "Edita",
-    "Unpin Message": "Anul·la la fixació de missatge",
     "Register": "Registre",
     "Rooms": "Sales",
     "Add rooms to this community": "Afegeix sales a aquesta comunitat",
@@ -39,10 +35,6 @@
     "This phone number is already in use": "Aquest número de telèfon ja està en ús",
     "Failed to verify email address: make sure you clicked the link in the email": "No s'ha pogut verificar l'adreça de correu electrònic: assegura't de fer clic a l'enllaç del correu electrònic",
     "Call Failed": "No s'ha pogut realitzar la trucada",
-    "The remote side failed to pick up": "El part remota no ha contestat",
-    "Unable to capture screen": "No s'ha pogut capturar la pantalla",
-    "Existing Call": "Trucada existent",
-    "You are already in a call.": "Ja ets en una trucada.",
     "VoIP is unsupported": "VoIP no és compatible",
     "You cannot place VoIP calls in this browser.": "No pots fer trucades VoIP en aquest navegador.",
     "You cannot place a call with yourself.": "No pots trucar-te a tu mateix.",
@@ -78,13 +70,13 @@
     "Invite new community members": "Convida nous membres a la comunitat",
     "Invite to Community": "Convida a la comunitat",
     "Which rooms would you like to add to this community?": "Quines sales vols afegir a aquesta comunitat?",
-    "Show these rooms to non-members on the community page and room list?": "Vols mostrar aquestes sales a la pàgina de la comunitat i a la llista de sales per als que no hi son membres?",
+    "Show these rooms to non-members on the community page and room list?": "Voleu mostrar aquestes sales a la pàgina de la comunitat i al llistat de sales, als qui no en siguin membres?",
     "Add rooms to the community": "Afegeix sales a la comunitat",
     "Add to community": "Afegeix a la comunitat",
     "Failed to invite the following users to %(groupId)s:": "No s'han pogut convidar a %(groupId)s els següents usuaris:",
-    "Failed to invite users to community": "No s'han pogut convidar els usuaris a la comunitat",
+    "Failed to invite users to community": "No s'ha pogut convidar els usuaris a la comunitat",
     "Failed to invite users to %(groupId)s": "No s'han pogut convidar els usuaris a %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "No s'han pogut afegir a %(groupId)s les següents sales:",
+    "Failed to add the following rooms to %(groupId)s:": "No s'ha pogut afegir a %(groupId)s les següents sales:",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no té permís per enviar-te notificacions, comprova la configuració del teu navegador",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s no ha rebut cap permís per enviar notificacions, torna-ho a provar",
     "Unable to enable Notifications": "No s'han pogut activar les notificacions",
@@ -95,7 +87,6 @@
     "Moderator": "Moderador",
     "Admin": "Administrador",
     "Failed to invite": "No s'ha pogut convidar",
-    "Failed to invite the following users to the %(roomName)s room:": "No s'ha pogut convidar a la sala %(roomName)s els següents usuaris:",
     "You need to be logged in.": "Has d'haver iniciat sessió.",
     "You need to be able to invite users to do that.": "Per fer això, necessites poder convidar a usuaris.",
     "Unable to create widget.": "No s'ha pogut crear el giny.",
@@ -108,44 +99,17 @@
     "Room %(roomId)s not visible": "Sala %(roomId)s no visible",
     "Missing user_id in request": "Falta l'user_id a la sol·licitud",
     "Usage": "Ús",
-    "/ddg is not a command": "/ddg no és una ordre",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-ho, simplement espera que es completin els resultats automàticament i clica'n el desitjat.",
     "Ignored user": "Usuari ignorat",
     "You are now ignoring %(userId)s": "Estàs ignorant l'usuari %(userId)s",
     "Unignored user": "Usuari no ignorat",
     "You are no longer ignoring %(userId)s": "Ja no estàs ignorant l'usuari %(userId)s",
     "Verified key": "Claus verificades",
-    "Call Timeout": "Temps d'espera de les trucades",
     "Reason": "Raó",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha acceptat la invitació de %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ha acceptat una invitació.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha sol·licitat una conferència VoIP.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha convidat a %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha expulsat a %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s han establert el seu nom visible a %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha retirat el seu nom visible %(oldDisplayName)s.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ha retirat la seva foto de perfil.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ha canviat la seva foto de perfil.",
-    "%(senderName)s set a profile picture.": "%(senderName)s ha establert una foto de perfil.",
-    "VoIP conference started.": "S'ha iniciat la conferència VoIP.",
-    "%(targetName)s joined the room.": "%(targetName)s ha entrat a la sala.",
-    "VoIP conference finished.": "S'ha finalitzat la conferència VoIP.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ha rebutjat la invitació.",
-    "%(targetName)s left the room.": "%(targetName)s ha sortit de la sala.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha readmès a %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha fet fora a %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirat la invitació per a %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha canviat el tema a \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha eliminat el nom de la sala.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha canviat el nom de la sala a %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha enviat una imatge.",
     "Someone": "Algú",
-    "(not supported by this browser)": "(no és compatible amb aquest navegador)",
-    "%(senderName)s answered the call.": "%(senderName)s ha contestat la trucada.",
-    "(could not connect media)": "(no s'ha pogut connectar el medi)",
-    "(no answer)": "(sense resposta)",
-    "(unknown failure: %(reason)s)": "(error desconegut: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha convidat a %(targetDisplayName)s a entrar a la sala.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a tots els seus membres, a partir de que hi són convidats.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a tots els seus membres des de que s'hi uneixen.",
@@ -168,18 +132,11 @@
     "Failed to join room": "No s'ha pogut entrar a la sala",
     "Message Pinning": "Fixació de missatges",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra les marques de temps en format de 12 hores (p.e. 2:30pm)",
-    "Autoplay GIFs and videos": "Reprodueix de forma automàtica els GIF i vídeos",
     "Enable automatic language detection for syntax highlighting": "Activa la detecció automàtica d'idiomes per al ressaltat de sintaxi",
     "Automatically replace plain text Emoji": "Substitueix automàticament Emoji de text pla",
     "Enable inline URL previews by default": "Activa per defecte la vista prèvia d'URL en línia",
     "Enable URL previews for this room (only affects you)": "Activa la vista prèvia d'URL d'aquesta sala (no afecta altres usuaris)",
     "Enable URL previews by default for participants in this room": "Activa per defecte la vista prèvia d'URL per als participants d'aquesta sala",
-    "Room Colour": "Color de la sala",
-    "Active call (%(roomName)s)": "Trucada activa (%(roomName)s)",
-    "unknown caller": "trucada d'un desconegut",
-    "Incoming voice call from %(name)s": "Trucada de veu entrant de %(name)s",
-    "Incoming video call from %(name)s": "Trucada de vídeo entrant de %(name)s",
-    "Incoming call from %(name)s": "Trucada entrant de %(name)s",
     "Decline": "Declina",
     "Accept": "Accepta",
     "Incorrect verification code": "El codi de verificació és incorrecte",
@@ -201,18 +158,8 @@
     "Authentication": "Autenticació",
     "Last seen": "Vist per última vegada",
     "Failed to set display name": "No s'ha pogut establir el nom visible",
-    "Cannot add any more widgets": "No s'ha pogut afegir cap més giny",
-    "The maximum permitted number of widgets have already been added to this room.": "Ja s'han afegit el màxim de ginys permesos en aquesta sala.",
-    "Drop File Here": "Deixeu anar un fitxer aquí",
     "Drop file here to upload": "Deixa anar el fitxer aquí per pujar-lo",
-    " (unsupported)": " (incompatible)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Uneix-te com <voiceText>voice</voiceText> o <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Trucada de conferència en curs %(supportedText)s.",
-    "%(senderName)s sent an image": "%(senderName)s ha enviat una imatge",
-    "%(senderName)s sent a video": "%(senderName)s ha enviat un vídeo",
-    "%(senderName)s uploaded a file": "%(senderName)s ha pujat un fitxer",
     "Options": "Opcions",
-    "Please select the destination room for this message": "Si us plau, seleccioneu la sala destinatària per a aquest missatge",
     "Disinvite": "Descarta la invitació",
     "Kick": "Fes fora",
     "Disinvite this user?": "Descartar la invitació per a aquest usuari?",
@@ -253,10 +200,7 @@
     "Mirror local video feed": "Remet el flux de vídeo local",
     "Server unavailable, overloaded, or something else went wrong.": "El servidor no està disponible, està sobrecarregat o alguna altra cosa no ha funcionat correctament.",
     "Command error": "Error en l'ordre",
-    "Jump to message": "Salta al missatge",
-    "No pinned messages.": "No hi ha cap missatge fixat.",
     "Loading...": "S'està carregant...",
-    "Pinned Messages": "Missatges fixats",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -279,7 +223,6 @@
     "Join Room": "Entra a la sala",
     "Upload avatar": "Puja l'avatar",
     "Forget room": "Oblida la sala",
-    "Community Invites": "Invitacions de les comunitats",
     "Invites": "Invitacions",
     "Favourites": "Preferits",
     "Low priority": "Baixa prioritat",
@@ -294,11 +237,7 @@
     "Banned users": "Usuaris expulsats",
     "This room is not accessible by remote Matrix servers": "Aquesta sala no és accessible per a servidors de Matrix remots",
     "Leave room": "Surt de la sala",
-    "Guests cannot join this room even if explicitly invited.": "Els usuaris d'altres xarxes no poden entrar a la sala d'aquest esdeveniment encara que hi hagin sigut convidats de forma explícita.",
-    "Click here to fix": "Feu clic aquí per corregir-ho",
-    "Who can access this room?": "Qui pot entrar a aquesta sala?",
     "Only people who have been invited": "Només les persones que hi hagin sigut convidades",
-    "Anyone who knows the room's link, apart from guests": "Qualsevol que conegui l'enllaç de la sala, excepte usuaris d'altres xarxes",
     "Publish this room to the public in %(domain)s's room directory?": "Vols publicar aquesta sala al directori de sales públiques de %(domain)s?",
     "Who can read history?": "Qui pot llegir l'historial?",
     "Anyone": "Qualsevol",
@@ -306,9 +245,7 @@
     "Members only (since they were invited)": "Només els membres (a partir del punt en què hi són convidats)",
     "Members only (since they joined)": "Només els membres (a partir del punt en què entrin a la sala)",
     "Permissions": "Permisos",
-    "Add a topic": "Afegeix un tema",
     "Jump to first unread message.": "Salta al primer missatge no llegit.",
-    "Anyone who knows the room's link, including guests": "Qualsevol que conegui l'enllaç de la sala, inclosos els usuaris d'altres xarxes",
     "not specified": "sense especificar",
     "This room has no local addresses": "Aquesta sala no té adreces locals",
     "Invalid community ID": "L'ID de la comunitat no és vàlid",
@@ -319,7 +256,6 @@
     "URL previews are enabled by default for participants in this room.": "Les previsualitzacions dels URL estan habilitades per defecte per als membres d'aquesta sala.",
     "URL previews are disabled by default for participants in this room.": "Les previsualitzacions dels URL estan inhabilitades per defecte per als membres d'aquesta sala.",
     "URL Previews": "Previsualitzacions dels URL",
-    "Error decrypting audio": "Error desxifrant àudio",
     "Error decrypting attachment": "Error desxifrant fitxer adjunt",
     "Decrypt %(text)s": "Desxifra %(text)s",
     "Download %(text)s": "Baixa %(text)s",
@@ -332,8 +268,6 @@
     "Copied!": "Copiat!",
     "Failed to copy": "No s'ha pogut copiar",
     "Add an Integration": "Afegeix una integració",
-    "An email has been sent to %(emailAddress)s": "S'ha enviat un correu electrònic a %(emailAddress)s",
-    "Please check your email to continue registration.": "Reviseu el vostre correu electrònic per a poder continuar amb el registre.",
     "Token incorrect": "Token incorrecte",
     "A text message has been sent to %(msisdn)s": "S'ha enviat un missatge de text a %(msisdn)s",
     "Please enter the code it contains:": "Introdueix el codi que conté:",
@@ -341,7 +275,6 @@
     "Sign in with": "Inicieu sessió amb",
     "Email address": "Correu electrònic",
     "Sign in": "Inicia sessió",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si no especifiqueu una adreça de correu electrònic, no podreu restablir la vostra contrasenya. N'esteu segur?",
     "Remove from community": "Elimina de la comunitat",
     "Disinvite this user from community?": "Voleu retirar la invitació de aquest usuari a la comunitat?",
     "Remove this user from community?": "Voleu eliminar de la comunitat a aquest usuari?",
@@ -362,32 +295,29 @@
     "Something went wrong when trying to get your communities.": "Alguna cosa ha anat malament mentre s'intentaven obtenir les comunitats.",
     "You're not currently a member of any communities.": "Actualment no sou membre de cap comunitat.",
     "Unknown Address": "Adreça desconeguda",
-    "Allow": "Permetre",
     "Delete Widget": "Suprimeix el giny",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "La supressió d'un giny l'elimina per a tots els usuaris d'aquesta sala. Esteu segur que voleu eliminar aquest giny?",
     "Delete widget": "Suprimeix el giny",
-    "Minimize apps": "Minimitza les aplicacions",
     "No results": "Sense resultats",
     "Communities": "Comunitats",
     "Home": "Inici",
-    "Manage Integrations": "Gestiona les integracions",
-    "%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s s'hi han unit",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)ss'ha unit",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ha sortit",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sha sortit",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s s'hi han unit i han sortit %(count)s vegades",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s s'hi han unit i han sortit",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s ha entrat i ha sortit %(count)s vegades",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s ha entrat i ha sortit",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sha entrat i ha sortit %(count)s vegades",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sha entrat i ha sortit",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s han sortit i han tornat a entrar %(count)s vegades",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s han sortit i han tornat a entrar",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s ha sortit i ha tornat a entrar %(count)s vegades",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ha sortit i ha tornat a entrar",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sha sortit i ha tornat a entrar %(count)s vegades",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sha sortit i ha tornat a entrar",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s han rebutjat les seves invitacions %(count)s vegades",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s han rebutjat les seves invitacions",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s ha rebutjat la seva invitació %(count)s vegades",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s ha rebutjat la seva invitació",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sha rebutjat la seva invitació %(count)s vegades",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sha rebutjat la seva invitació",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "S'han retirat les invitacions de %(severalUsers)s %(count)s vegades",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "S'han retirat les invitacions de %(severalUsers)s",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "S'ha retirat la invitació de %(oneUser)s %(count)s vegades",
@@ -410,12 +340,12 @@
     "was kicked %(count)s times|one": "l'han fet fora",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s han canviat el seu nom %(count)s vegades",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s han canviat el seu nom",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s ha canviat el seu nom %(count)s vegades",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sha canviat el seu nom %(count)s vegades",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ha canviat el seu nom",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s han canviat el seu avatar %(count)s vegades",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s han canviat el seu avatar",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s han canviat el seu avatar %(count)s vegades",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s ha canviat el seu avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)shan canviat el seu avatar %(count)s vegades",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sha canviat el seu avatar",
     "%(items)s and %(count)s others|other": "%(items)s i %(count)s altres",
     "%(items)s and %(count)s others|one": "%(items)s i un altre",
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
@@ -423,8 +353,6 @@
     "expand": "expandeix",
     "Custom level": "Nivell personalitzat",
     "And %(count)s more...|other": "I %(count)s més...",
-    "ex. @bob:example.com": "per exemple @carles:exemple.cat",
-    "Add User": "Afegeix un usuari",
     "Matrix ID": "ID de Matrix",
     "Matrix Room ID": "ID de la sala de Matrix",
     "email address": "correu electrònic",
@@ -437,9 +365,9 @@
     "Showing flair for these communities:": "Mostra els talents d'aquestes comunitats:",
     "Display your community flair in rooms configured to show it.": "Mostra els talents de la vostra comunitat dins les sales configurades per a mostrar-los.",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s han entrat %(count)s vegades",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s ha entrat %(count)s vegades",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sha entrat %(count)s vegades",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s han sortit %(count)s vegades",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s ha sortit %(count)s vegades",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sha sortit %(count)s vegades",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les ID de les comunitats només poden contendre caràcters a-z, 0-9, o '=_-./'",
     "Community IDs cannot be empty.": "Les ID de les comunitats no poden estar buides.",
     "Something went wrong whilst creating your community": "S'ha produït un error mentre es creava la comunitat",
@@ -463,22 +391,10 @@
     "Unable to verify email address.": "No s'ha pogut verificar el correu electrònic.",
     "This will allow you to reset your password and receive notifications.": "Això us permetrà restablir la vostra contrasenya i rebre notificacions.",
     "Skip": "Omet",
-    "Username not available": "Aquest nom d'usuari no està disponible",
-    "Username invalid: %(errMessage)s": "El nom d'usuari és invàlid: %(errMessage)s",
-    "An error occurred: %(error_string)s": "S'ha produït un error: %(error_string)s",
-    "Username available": "Aquest nom d'usuari està disponible",
-    "To get started, please pick a username!": "Per començar, seleccioneu un nom d'usuari!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Aquest serà el nom del seu compte al <span></span> servidor amfitrió, o bé trieu-ne un altre <a>different server</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Si ja teniu un compte a Matrix, podeu <a>log in</a>.",
     "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriorment heu utilitzat un versió de %(brand)s més recent, la vostra sessió podría ser incompatible amb aquesta versió. Tanqueu aquesta finestra i torneu a la versió més recent.",
-    "Private Chat": "Xat privat",
-    "Public Chat": "Xat públic",
-    "Custom": "Personalitzat",
     "Name": "Nom",
     "You must <a>register</a> to use this functionality": "Per poder utilitzar aquesta funcionalitat has de <a>registrar-te</a>",
     "You must join the room to see its files": "Per poder veure els fitxers de la sala t'hi has d'unir",
-    "There are no visible files in this room": "No hi ha fitxers visibles en aquesta 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": "<h1>Aquest és l'HTML per a la pàgina de la vostra comunitat</h1>\n<p>\n    Utilitzeu la descripció llarga per a presentar la comunitat a nous membres,\n    o per afegir-hi <a href=\"foo\">enlaços</a> d'interès. \n</p>\n<p>\n    També podeu utilitzar etiquetes 'img'.\n</p>\n",
     "Add rooms to the community summary": "Afegiu sales al resum de la comunitat",
     "Which rooms would you like to add to this summary?": "Quines sales voleu afegir a aquest resum?",
     "Add to summary": "Afegeix-ho al resum",
@@ -516,7 +432,6 @@
     "Are you sure you want to reject the invitation?": "Esteu segur que voleu rebutjar la invitació?",
     "Failed to reject invitation": "No s'ha pogut rebutjar la invitació",
     "Are you sure you want to leave the room '%(roomName)s'?": "Esteu segur que voleu sortir de la sala '%(roomName)s'?",
-    "Failed to leave room": "No s'ha pogut sortir de la sala",
     "For security, this session has been signed out. Please sign in again.": "Per seguretat, aquesta sessió s'ha tancat. Torna a iniciar la sessió.",
     "Old cryptography data detected": "S'han detectat dades de criptografia antigues",
     "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.": "S'han detectat dades d'una versió antiga del %(brand)s. Això haurà provocat que el xifratge d'extrem a extrem no funcioni correctament a la versió anterior. Els missatges xifrats d'extrem a extrem que s'han intercanviat recentment mentre s'utilitzava la versió anterior no es poden desxifrar en aquesta versió. També pot provocar que els missatges intercanviats amb aquesta versió fallin. Si teniu problemes, sortiu de la sessió i torneu a entrar-hi. Per poder llegir l'historial dels missatges xifrats, exporteu i torneu a importar les vostres claus.",
@@ -525,13 +440,9 @@
     "Error whilst fetching joined communities": "Error en l'obtenció de comunitats unides",
     "Create a new community": "Crea una comunitat nova",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunitat per agrupar usuaris i sales! Creeu una pàgina d'inici personalitzada per definir el vostre espai a l'univers Matrix.",
-    "You have no visible notifications": "No teniu cap notificació visible",
-    "%(count)s of your messages have not been sent.|other": "Alguns dels vostres missatges no s'han enviat.",
-    "%(count)s of your messages have not been sent.|one": "El vostre missatge no s'ha enviat.",
     "Warning": "Avís",
     "Connectivity to the server has been lost.": "S'ha perdut la connectivitat amb el servidor.",
     "Sent messages will be stored until your connection has returned.": "Els missatges enviats s'emmagatzemaran fins que la vostra connexió hagi tornat.",
-    "Active call": "Trucada activa",
     "You seem to be uploading files, are you sure you want to quit?": "Sembla que s'està pujant fitxers, esteu segur que voleu sortir?",
     "You seem to be in a call, are you sure you want to quit?": "Sembla que està en una trucada, estàs segur que vols sortir?",
     "Search failed": "No s'ha pogut cercar",
@@ -539,18 +450,10 @@
     "No more results": "No hi ha més resultats",
     "Room": "Sala",
     "Failed to reject invite": "No s'ha pogut rebutjar la invitació",
-    "Fill screen": "Emplena la pantalla",
-    "Click to unmute video": "Feu clic per activar el so de vídeo",
-    "Click to mute video": "Feu clic per desactivar el so de vídeo",
-    "Click to unmute audio": "Feu clic per activar el so",
-    "Click to mute audio": "Feu clic per desactivar el so",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "S'ha intentat carregar un punt específic dins la línia de temps d'aquesta sala, però no teniu permís per veure el missatge en qüestió.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "S'ha intentat carregar un punt específic de la línia de temps d'aquesta sala, però no s'ha pogut trobar.",
     "Failed to load timeline position": "No s'ha pogut carregar aquesta posició de la línia de temps",
     "Signed Out": "Sessió tancada",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar tot</resendText> o <cancelText>cancel·lar tot</cancelText> ara. També pots seleccionar missatges individualment per reenviar o cancel·lar.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar missarge</resendText> o <cancelText>cancel·lar missatge</cancelText> ara.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "No hi ha ningú més aquí! T'agradaria <inviteText>convidar algú</inviteText> o <nowarnText>no avisar més que la sala està buida</nowarnText>?",
     "Uploading %(filename)s and %(count)s others|other": "Pujant %(filename)s i %(count)s més",
     "Uploading %(filename)s and %(count)s others|zero": "Pujant %(filename)s",
     "Sign out": "Tanca la sessió",
@@ -558,12 +461,9 @@
     "Cryptography": "Criptografia",
     "Labs": "Laboratoris",
     "%(brand)s version:": "Versió de %(brand)s:",
-    "olm version:": "Versió d'olm:",
     "Incorrect username and/or password.": "Usuari i/o contrasenya incorrectes.",
-    "The phone number entered looks invalid": "El número de telèfon introduït sembla erroni",
     "Session ID": "ID de la sessió",
     "Export room keys": "Exporta les claus de la sala",
-    "Upload an avatar:": "Pujar un avatar:",
     "Confirm passphrase": "Introduïu una contrasenya",
     "Export": "Exporta",
     "Import room keys": "Importa les claus de la sala",
@@ -574,8 +474,6 @@
     "Send Reset Email": "Envia email de reinici",
     "Your homeserver's URL": "L'URL del teu servidor propi",
     "Analytics": "Analítiques",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s.",
-    "Identity Server is": "El servidor d'identitat és",
     "Submit debug logs": "Enviar logs de depuració",
     "The platform you're on": "La plataforma a la que et trobes",
     "Your language of choice": "El teu idioma desitjat",
@@ -584,42 +482,26 @@
     "The information being sent to us to help make %(brand)s better includes:": "La informació que s'envia a %(brand)s per ajudar-nos a millorar inclou:",
     "Fetching third party location failed": "Ha fallat l'obtenció de la ubicació de tercers",
     "Send Account Data": "Envia les dades del compte",
-    "Advanced notification settings": "Configuració avançada de notificacions",
-    "Uploading report": "S'està enviant l'informe",
     "Sunday": "Diumenge",
     "Failed to add tag %(tagName)s to room": "No s'ha pogut afegir l'etiqueta %(tagName)s a la sala",
     "Notification targets": "Objectius de les notificacions",
     "Failed to set direct chat tag": "No s'ha pogut establir l'etiqueta del xat directe",
     "Today": "Avui",
-    "Files": "Fitxers",
-    "You are not receiving desktop notifications": "No esteu rebent notificacions d'escriptori",
     "Friday": "Divendres",
-    "Update": "Actualització",
+    "Update": "Actualitzar",
     "What's New": "Novetats",
     "On": "Engegat",
     "Changelog": "Registre de canvis",
     "Waiting for response from server": "S'està esperant una resposta del servidor",
-    "Uploaded on %(date)s by %(user)s": "Pujat el %(date)s per l'usuari %(user)s",
     "Send Custom Event": "Envia els esdeveniments personalitzats",
-    "All notifications are currently disabled for all targets.": "Actualment totes les notificacions estan inhabilitades per a tots els objectius.",
     "Failed to send logs: ": "No s'han pogut enviar els logs: ",
-    "Forget": "Oblida",
-    "You cannot delete this image. (%(code)s)": "No podeu eliminar aquesta imatge. (%(code)s)",
-    "Cancel Sending": "Cancel·la l'enviament",
     "This Room": "Aquesta sala",
     "Resend": "Reenvia",
     "Room not found": "No s'ha trobat la sala",
     "Messages containing my display name": "Missatges que contenen el meu nom visible",
     "Messages in one-to-one chats": "Missatges en xats un a un",
     "Unavailable": "No disponible",
-    "Error saving email notification preferences": "Error desant preferències de notificacions de correu electrònic",
-    "View Decrypted Source": "Mostra el codi desxifrat",
-    "Failed to update keywords": "No s'han pogut actualitzar les paraules clau",
     "remove %(name)s from the directory.": "elimina %(name)s del directori.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notificacions sobre les següents paraules clau segueixen regles que no es poden mostrar aquí:",
-    "Please set a password!": "Si us plau, establiu una contrasenya",
-    "You have successfully set a password!": "Heu establert correctament la contrasenya",
-    "An error occurred whilst saving your email notification preferences.": "S'ha produït un error mentre es desaven les teves preferències de notificació de correu electrònic.",
     "Explore Room State": "Esbrina els estats de les sales",
     "Source URL": "URL origen",
     "Messages sent by bot": "Missatges enviats pel bot",
@@ -628,33 +510,22 @@
     "No update available.": "No hi ha cap actualització disponible.",
     "Noisy": "Sorollós",
     "Collecting app version information": "S'està recollint la informació de la versió de l'aplicació",
-    "Enable notifications for this account": "Habilita les notificacions per aquest compte",
     "Invite to this community": "Convida a aquesta comunitat",
     "Search…": "Cerca…",
-    "Messages containing <span>keywords</span>": "Missatges que contenen <span>keywords</span>",
     "When I'm invited to a room": "Quan sóc convidat a una sala",
     "Tuesday": "Dimarts",
-    "Enter keywords separated by a comma:": "Introduïu les paraules clau separades per una coma:",
-    "Forward Message": "Reenvia el missatge",
     "Remove %(name)s from the directory?": "Voleu retirar %(name)s del directori?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilitza moltes funcions avançades del navegador, algunes de les quals no estan disponibles o són experimentals al vostre navegador actual.",
     "Developer Tools": "Eines de desenvolupador",
     "Preparing to send logs": "Preparant l'enviament de logs",
     "Explore Account Data": "Explora les dades del compte",
     "Remove from Directory": "Elimina del directori",
     "Saturday": "Dissabte",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Recordeu-ho, si canvieu d'idea, sempre podreu establir una adreça de correu electrònic a las vostra configuració d'usuari.",
-    "Direct Chat": "Xat directe",
     "The server may be unavailable or overloaded": "El servidor pot no estar disponible o sobrecarregat",
     "Reject": "Rebutja",
-    "Failed to set Direct Message status of room": "No s'ha pogut establir l'estat del missatge directe de la sala",
     "Monday": "Dilluns",
-    "All messages (noisy)": "Tots els missatges (sorollós)",
-    "Enable them now": "Habilita-ho ara",
     "Toolbox": "Caixa d'eines",
     "Collecting logs": "S'estan recopilant els registres",
     "You must specify an event type!": "Has d'especificar un tipus d'esdeveniment!",
-    "(HTTP status %(httpStatus)s)": "(Estat de l´HTTP %(httpStatus)s)",
     "All Rooms": "Totes les sales",
     "State Key": "Clau d'estat",
     "Wednesday": "Dimecres",
@@ -662,50 +533,32 @@
     "All messages": "Tots els missatges",
     "Call invitation": "Invitació de trucada",
     "Downloading update...": "Descarregant l'actualització...",
-    "You have successfully set a password and an email address!": "Heu establert correctament la vostra contrasenya i l'adreça de correu electrònic",
     "Failed to send custom event.": "No s'ha pogut enviar l'esdeveniment personalitzat.",
     "What's new?": "Què hi ha de nou?",
-    "Notify me for anything else": "Notifica'm per a qualsevol altra cosa",
     "View Source": "Mostra el codi",
-    "Keywords": "Paraules clau",
-    "Can't update user notification settings": "No es pot actualitzar la configuració de notificacions d'usuari",
-    "Notify for all other messages/rooms": "Notifica per a tots els altres missatges o sales",
     "Unable to look up room ID from server": "No s'ha pogut cercar l'ID de la sala en el servidor",
     "Couldn't find a matching Matrix room": "No s'ha pogut trobar una sala de Matrix que coincideixi",
     "Invite to this room": "Convida a aquesta sala",
     "You cannot delete this message. (%(code)s)": "No podeu eliminar aquest missatge. (%(code)s)",
     "Thursday": "Dijous",
-    "I understand the risks and wish to continue": "Entenc el riscos i desitjo continuar",
     "Logs sent": "Logs enviats",
     "Back": "Enrere",
     "Reply": "Respon",
     "Show message in desktop notification": "Mostra els missatges amb notificacions d'escriptori",
-    "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.": "Els logs de depuració contenen dades d'ús de l'aplicació que inclouen el teu nom d'usuari, les IDs o pseudònims de les sales o grups que has visitat i els noms d'usuari d'altres usuaris. No contenen missatges.",
-    "Unhide Preview": "Mostra la previsualització",
     "Unable to join network": "No s'ha pogut unir-se a la xarxa",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Disculpeu, el seu navegador  <b>not</b> pot executar %(brand)s.",
     "Quote": "Cita",
     "Messages in group chats": "Missatges en xats de grup",
     "Yesterday": "Ahir",
     "Error encountered (%(errorDetail)s).": "S'ha trobat un error (%(errorDetail)s).",
     "Low Priority": "Baixa prioritat",
-    "Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions",
-    "Set Password": "Establiu una contrasenya",
     "Off": "Apagat",
     "%(brand)s does not know how to join a room on this network": "El %(brand)s no sap com unir-se a una sala en aquesta xarxa",
-    "Mentions only": "Només mencions",
     "Failed to remove tag %(tagName)s from room": "No s'ha pogut esborrar l'etiqueta %(tagName)s de la sala",
-    "You can now return to your account after signing out, and sign in on other devices.": "Ara podreu tornar a entrar al vostre compte des de altres dispositius.",
-    "Enable email notifications": "Habilita les notificacions per correu electrònic",
     "Event Type": "Tipus d'esdeveniment",
-    "Download this file": "Descarrega aquest fitxer",
-    "Pin Message": "Enganxa el missatge",
-    "Failed to change settings": "No s'ha pogut canviar la configuració",
     "View Community": "Mira la communitat",
     "Event sent!": "Esdeveniment enviat!",
     "Event Content": "Contingut de l'esdeveniment",
     "Thank you!": "Gràcies!",
-    "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!": "Amb el vostre navegador actual, l'aparença de l'aplicació pot ser completament incorrecta i algunes o totes les funcions poden no funcionar correctament. Si voleu provar-ho de totes maneres, podeu continuar, però esteu sols pel que fa als problemes que pugueu trobar!",
     "Checking for an update...": "Comprovant si hi ha actualitzacions...",
     "e.g. %(exampleValue)s": "p.e. %(exampleValue)s",
     "Every page you use in the app": "Cada pàgina que utilitzes a l'aplicació",
@@ -713,16 +566,12 @@
     "Your device resolution": "La resolució del teu dispositiu",
     "Show Stickers": "Mostra els adhesius",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quan aquesta pàgina contingui informació d'identificació, com per exemple una sala, usuari o ID de grup, aquestes dades s'eliminen abans d'enviar-se al servidor.",
-    "Call in Progress": "Trucada en curs",
-    "A call is currently being placed!": "En aquest moment s'està realitzant una trucada!",
-    "A call is already in progress!": "Ja hi ha una trucada en curs!",
     "Permission Required": "Es necessita permís",
     "You do not have permission to start a conference call in this room": "No tens permís per iniciar una conferència telefònica en aquesta sala",
     "Unable to load! Check your network connectivity and try again.": "No s'ha pogut carregar! Comprova la connectivitat de xarxa i torna-ho a intentar.",
     "Failed to invite users to the room:": "No s'han pogut convidar els usuaris a la sala:",
     "Missing roomId.": "Falta l'ID de sala.",
-    "Searches DuckDuckGo for results": "Cerca al DuckDuckGo els resultats",
-    "Changes your display nickname": "Canvia el teu àlies de visualització",
+    "Changes your display nickname": "Canvia l'àlies a mostrar",
     "Invites user with given id to current room": "Convida a la sala actual l'usuari amb l'ID indicat",
     "Kicks user with given id": "Expulsa l'usuari amb l'ID indicat",
     "Bans user with given id": "Bandeja l'usuari amb l'ID indicat",
@@ -799,8 +648,6 @@
     "Show avatar changes": "Mostra els canvis d'avatar",
     "Show display name changes": "Mostra els canvis de nom",
     "Show read receipts sent by other users": "Mostra les confirmacions de lectura enviades pels altres usuaris",
-    "Always show encryption icons": "Mostra sempre les icones que indiquen encriptació",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostra un recordatori per activar la Recuperació de missatges segurs en sales encriptades",
     "Show avatars in user and room mentions": "Mostra avatars en mencions d'usuaris i sales",
     "Enable big emoji in chat": "Activa Emojis grans en xats",
     "Send analytics data": "Envia dades d'anàlisi",
@@ -810,14 +657,12 @@
     "Language and region": "Idioma i regió",
     "Theme": "Tema",
     "Phone Number": "Número de telèfon",
-    "Help": "Ajuda",
     "Send typing notifications": "Envia notificacions d'escriptura",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Vols suprimir l'adreça de la sala %(alias)s i eliminar %(name)s del directori?",
     "We encountered an error trying to restore your previous session.": "Hem trobat un error en intentar recuperar la teva sessió prèvia.",
     "There was an error updating your community. The server is unable to process your request.": "S'ha produït un error en actualitzar la comunitat. El servidor no ha pogut processar la petició.",
     "There was an error creating your community. The name may be taken or the server is unable to process your request.": "S'ha produït un error en crear la comunitat. Potser el nom ja existeix o el servidor no ha pogut processar la petició.",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "S'ha retornat un error (%(errcode)s) mentre s'intentava validar la invitació. Pots provar a informar d'això a un administrador de sala.",
-    "Error: Problem communicating with the given homeserver.": "Error: problema comunicant-se amb el servidor local proporcionat.",
     "Upload Error": "Error de pujada",
     "A connection error occurred while trying to contact the server.": "S'ha produït un error de connexió mentre s'intentava connectar al servidor.",
     "%(brand)s encountered an error during upload of:": "%(brand)s ha trobat un error durant la pujada de:",
@@ -841,8 +686,6 @@
     "Error leaving room": "Error sortint de la sala",
     "Unexpected error resolving identity server configuration": "Error inesperat resolent la configuració del servidor d'identitat",
     "Unexpected error resolving homeserver configuration": "Error inesperat resolent la configuració del servidor local",
-    "(an error occurred)": "(s'ha produït un error)",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Els gestors d'integracions reben dades de configuració i poden modificar ginys, enviar invitacions a sales i establir nivells d'autoritat en nom teu.",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "S'ha produït un error en canviar els requisits del nivell d'autoritat de la sala. Assegura't que tens suficients permisos i torna-ho a provar.",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "S'ha produït un error en canviar el nivell d'autoritat de l'usuari. Assegura't que tens suficients permisos i torna-ho a provar.",
     "Power level": "Nivell d'autoritat",
@@ -854,7 +697,7 @@
     "Changes your avatar in all rooms": "Canvia el teu avatar en totes les sales",
     "Changes your avatar in this current room only": "Canvia el teu avatar només en aquesta sala actual",
     "Changes the avatar of the current room": "Canvia l'avatar de la sala actual",
-    "Changes your display nickname in the current room only": "Canvia el teu àlies de visualització només en la sala actual",
+    "Changes your display nickname in the current room only": "Canvia el teu àlies a mostrar només en la sala actual",
     "Double check that your server supports the room version chosen and try again.": "Comprova que el teu servidor és compatible amb la versió de sala que has triat i torna-ho a intentar.",
     "You do not have the required permissions to use this command.": "No disposes dels permisos necessaris per utilitzar aquesta ordre.",
     "Sends a message as html, without interpreting it as markdown": "Envia un missatge com a html sense interpretar-lo com a markdown",
@@ -918,9 +761,7 @@
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Per rebre invitacions directament a %(brand)s, utilitza un servidor d'identitat a Configuració.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Per rebre invitacions directament a %(brand)s, comparteix aquest correu electrònic a Configuració.",
     "Enable 'Manage Integrations' in Settings to do this.": "Per fer això, activa 'Gestió d'integracions' a Configuració.",
-    "We recommend you change your password and recovery key in Settings immediately": "Et recomanem que canviïs immediatament la teva contrasenya i clau de recuperació a Configuració",
     "Go to Settings": "Ves a Configuració",
-    "No identity server is configured: add one in server settings to reset your password.": "No hi ha cap servidor d'identitat configurat: afegeix-ne un a la configuració del servidor per poder restablir la teva contrasenya.",
     "User settings": "Configuració d'usuari",
     "All settings": "Totes les configuracions",
     "This will end the conference for everyone. Continue?": "Això finalitzarà la conferència per a tothom. Vols continuar?",
@@ -931,8 +772,6 @@
     "Call failed due to misconfigured server": "La trucada ha fallat a causa d'una configuració errònia al servidor",
     "The call was answered on another device.": "La trucada s'ha respost des d'un altre dispositiu.",
     "The call could not be established": "No s'ha pogut establir la trucada",
-    "The other party declined the call.": "L'altra part ha rebutjat la trucada.",
-    "Call Declined": "Trucada rebutjada",
     "Add Phone Number": "Afegeix número de telèfon",
     "Confirm adding email": "Confirma l'addició del correu electrònic",
     "To continue, use Single Sign On to prove your identity.": "Per continuar, utilitza la inscripció única SSO (per demostrar la teva identitat).",
@@ -951,5 +790,12 @@
     "Click the button below to confirm adding this email address.": "Fes clic al botó de sota per confirmar l'addició d'aquesta adreça de correu electrònic.",
     "Unable to access webcam / microphone": "No s'ha pogut accedir a la càmera web / micròfon",
     "Unable to access microphone": "No s'ha pogut accedir al micròfon",
-    "Explore rooms": "Explora sales"
+    "Explore rooms": "Explora sales",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sno ha fet canvis",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sno ha fet canvis %(count)s cops",
+    "Integration manager": "Gestor d'integracions",
+    "Identity server is": "El servidor d'identitat és",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Els gestors d'integracions reben dades de configuració i poden modificar ginys, enviar invitacions a sales i establir nivells d'autoritat en nom teu.",
+    "Identity server": "Servidor d'identitat",
+    "Could not connect to identity server": "No s'ha pogut connectar amb el servidor d'identitat"
 }
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 75472b4d38..6ef1a3dd1e 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -4,7 +4,7 @@
     "Filter room members": "Najít člena místnosti",
     "Historical": "Historické",
     "Home": "Úvod",
-    "Jump to first unread message.": "Přeskočit na první nepřečtenou zprávu.",
+    "Jump to first unread message.": "Přejít na první nepřečtenou zprávu.",
     "Logout": "Odhlásit se",
     "Low priority": "Nízká priorita",
     "Notifications": "Oznámení",
@@ -13,7 +13,7 @@
     "Settings": "Nastavení",
     "This room": "Tato místnost",
     "Video call": "Videohovor",
-    "Voice call": "Telefonát",
+    "Voice call": "Hlasový hovor",
     "Sun": "Ne",
     "Mon": "Po",
     "Tue": "Út",
@@ -33,9 +33,7 @@
     "Oct": "Říj",
     "Nov": "Lis",
     "Dec": "Pro",
-    "There are no visible files in this room": "V této místnosti nejsou žádné viditelné soubory",
     "Create new room": "Založit novou místnost",
-    "Room directory": "Adresář místností",
     "Start chat": "Zahájit konverzaci",
     "Options": "Volby",
     "Register": "Zaregistrovat",
@@ -52,16 +50,10 @@
     "Failed to forget room %(errCode)s": "Nepodařilo se zapomenout místnost %(errCode)s",
     "Dismiss": "Zavřít",
     "powered by Matrix": "používá protokol Matrix",
-    "Custom Server Options": "Vlastní nastavení serveru",
-    "Add a widget": "Přidat widget",
     "Accept": "Přijmout",
-    "%(targetName)s accepted an invitation.": "%(targetName)s přijal(a) pozvání.",
     "Account": "Účet",
-    "Access Token:": "Přístupový token:",
     "Add": "Přidat",
-    "Add a topic": "Přidat téma",
     "Admin": "Správce",
-    "Allow": "Povolit",
     "No Microphones detected": "Nerozpoznány žádné mikrofony",
     "No Webcams detected": "Nerozpoznány žádné webkamery",
     "Default Device": "Výchozí zařízení",
@@ -77,16 +69,11 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Opravdu chcete opustit místnost '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Opravdu chcete odmítnout pozvání?",
     "Attachment": "Příloha",
-    "Autoplay GIFs and videos": "Automaticky přehrávat GIFy a videa",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nelze se připojit k domovskému serveru – zkontrolujte prosím své připojení, prověřte, zda je <a>SSL certifikát</a> vašeho domovského serveru důvěryhodný, a že některé z rozšíření prohlížeče neblokuje komunikaci.",
-    "Anyone who knows the room's link, apart from guests": "Kdokoliv s odkazem na místnost, ale pouze registrovaní uživatelé",
-    "Anyone who knows the room's link, including guests": "Kdokoliv s odkazem na místnost, včetně hostů",
     "Banned users": "Vykázaní uživatelé",
     "Ban": "Vykázat",
     "Bans user with given id": "Vykáže uživatele s daným id",
-    "Cannot add any more widgets": "Nelze přidat žádné další widgety",
     "Change Password": "Změnit heslo",
-    "%(senderName)s changed their profile picture.": "%(senderName)s změnil(a) svůj profilový obrázek.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s změnil(a) název místnosti na %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil(a) název místnosti.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil(a) téma na „%(topic)s“.",
@@ -97,9 +84,7 @@
     "Create Room": "Vytvořit místnost",
     "Cryptography": "Šifrování",
     "Current password": "Současné heslo",
-    "Custom": "Vlastní",
     "Custom level": "Vlastní úroveň",
-    "/ddg is not a command": "/ddg není příkazem",
     "Deactivate Account": "Deaktivovat účet",
     "Decline": "Odmítnout",
     "Decrypt %(text)s": "Dešifrovat %(text)s",
@@ -107,23 +92,18 @@
     "Default": "Výchozí",
     "Disinvite": "Odvolat pozvání",
     "Download %(text)s": "Stáhnout %(text)s",
-    "Drop File Here": "Přetáhněte soubor sem",
     "Edit": "Upravit",
     "Email": "E-mail",
     "Email address": "E-mailová adresa",
     "Emoji": "Emoji",
     "Enable automatic language detection for syntax highlighting": "Zapnout automatické rozpoznávání jazyků pro zvýrazňování syntaxe",
-    "%(senderName)s ended the call.": "%(senderName)s ukončil(a) hovor.",
     "Enter passphrase": "Zadejte přístupovou frázi",
     "Error decrypting attachment": "Chyba při dešifrování přílohy",
-    "Error: Problem communicating with the given homeserver.": "Chyba: problém v komunikaci s daným domovským serverem.",
-    "Existing Call": "Probíhající hovor",
     "Export": "Exportovat",
     "Export E2E room keys": "Exportovat end-to-end klíče místností",
     "Failed to ban user": "Nepodařilo se vykázat uživatele",
     "Failed to join room": "Vstup do místnosti se nezdařil",
     "Failed to kick": "Vykopnutí se nezdařilo",
-    "Failed to leave room": "Opuštění místnosti se nezdařilo",
     "Failed to mute user": "Ztlumení uživatele se nezdařilo",
     "Failed to send email": "Odeslání e-mailu se nezdařilo",
     "Failed to reject invitation": "Nepodařilo se odmítnout pozvání",
@@ -141,27 +121,17 @@
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s přidal(a) widget %(widgetName)s",
     "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emoji",
     "Failed to upload image": "Obrázek se nepodařilo nahrát",
-    "%(senderName)s answered the call.": "%(senderName)s přijal(a) hovor.",
-    "Click to mute audio": "Klepněte pro vypnutí zvuku",
     "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste klepli na odkaz v e-mailové zprávě",
-    "Guests cannot join this room even if explicitly invited.": "Hosté nemohou vstoupit do této místnosti, i když jsou přímo pozváni.",
     "Homeserver is": "Domovský server je",
-    "Identity Server is": "Server identity je",
     "I have verified my email address": "Ověřil(a) jsem svou e-mailovou adresu",
     "Import": "Importovat",
-    "Import E2E room keys": "Importovat end-to-end klíče místností",
-    "Incoming call from %(name)s": "Příchozí hovor od %(name)s",
-    "Incoming video call from %(name)s": "Příchozí videohovor od %(name)s",
-    "Incoming voice call from %(name)s": "Příchozí hlasový hovor od %(name)s",
+    "Import E2E room keys": "Importovat šifrovací klíče místností",
     "Incorrect username and/or password.": "Nesprávné uživatelské jméno nebo heslo.",
     "Incorrect verification code": "Nesprávný ověřovací kód",
     "Invalid Email Address": "Neplatná e-mailová adresa",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval(a) uživatele %(targetName)s.",
     "Invites": "Pozvánky",
     "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
     "Join Room": "Vstoupit do místnosti",
-    "%(targetName)s joined the room.": "%(targetName)s vstoupil(a) do místnosti.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopl(a) uživatele %(targetName)s.",
     "Kick": "Vykopnout",
     "Kicks user with given id": "Vykopne uživatele s daným id",
     "Last seen": "Naposledy aktivní",
@@ -171,14 +141,12 @@
     "New passwords don't match": "Nová hesla se neshodují",
     "New passwords must match each other.": "Nová hesla se musí shodovat.",
     "not specified": "neurčeno",
-    "(not supported by this browser)": "(nepodporováno tímto prohlížečem)",
     "<not supported>": "<nepodporováno>",
     "AM": "dop.",
     "PM": "odp.",
     "No display name": "Žádné zobrazované jméno",
     "No more results": "Žádné další výsledky",
     "No results": "Žádné výsledky",
-    "olm version:": "verze olm:",
     "Only people who have been invited": "Pouze lidé, kteří byli pozváni",
     "Password": "Heslo",
     "Passwords can't be empty": "Hesla nemohou být prázdná",
@@ -190,13 +158,11 @@
     "Power level must be positive integer.": "Úroveň oprávnění musí být kladné celé číslo.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oprávnění %(powerLevelNumber)s)",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tuto změnu nepůjde vrátit zpět, protože tomuto uživateli nastavujete stejnou úroveň oprávnění, jakou máte vy.",
-    "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
     "Return to login screen": "Vrátit k přihlašovací obrazovce",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s není oprávněn posílat vám oznámení – zkontrolujte prosím nastavení svého prohlížeče",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nebyl oprávněn k posílání oznámení – zkuste to prosím znovu",
-    "%(brand)s version:": "verze %(brand)s:",
+    "%(brand)s version:": "Verze %(brand)s:",
     "Room %(roomId)s not visible": "Místnost %(roomId)s není viditelná",
-    "Room Colour": "Barva místnosti",
     "%(roomName)s does not exist.": "%(roomName)s neexistuje.",
     "%(roomName)s is not accessible at this time.": "Místnost %(roomName)s není v tuto chvíli dostupná.",
     "Save": "Uložit",
@@ -208,24 +174,19 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server může být nedostupný, přetížený nebo jste narazili na chybu.",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, přetížený nebo se něco pokazilo.",
     "Session ID": "ID sezení",
-    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil(a) profilový obrázek.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si změnil(a) zobrazované jméno na %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat čas v 12hodinovém formátu (např. 2:30 odp.)",
     "Sign in": "Přihlásit",
     "Sign out": "Odhlásit",
-    "%(count)s of your messages have not been sent.|other": "Některé z vašich zpráv nebyly odeslány.",
     "Someone": "Někdo",
     "Start authentication": "Začít ověření",
     "Submit": "Odeslat",
     "Success": "Úspěch",
-    "The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
     "This email address is already in use": "Tato e-mailová adresa je již používána",
     "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
     "This room has no local addresses": "Tato místnost nemá žádné místní adresy",
     "This room is not recognised.": "Tato místnost nebyla rozpoznána.",
     "VoIP is unsupported": "VoIP není podporován",
     "Warning!": "Varování!",
-    "Who can access this room?": "Kdo má přístup 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 k tomu nemáte oprávnění.",
@@ -235,22 +196,12 @@
     "Online": "Online",
     "Offline": "Offline",
     "Check for update": "Zkontrolovat aktualizace",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal(a) pozvání pro %(displayName)s.",
-    "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal(a) uživatele %(targetName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nezabezpečené skripty</a>.",
-    "Click here to fix": "Pro opravu klepněte zde",
-    "Click to mute video": "Klepněte pro zakázání videa",
-    "click to reveal": "klepněte pro odhalení",
-    "Click to unmute video": "Klepněte pro povolení videa",
-    "Click to unmute audio": "Klepněte pro povolení zvuku",
     "Displays action": "Zobrazí akci",
-    "Fill screen": "Vyplnit obrazovku",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "This doesn't appear to be a valid email address": "Tato e-mailová adresa se zdá být neplatná",
     "This phone number is already in use": "Toto telefonní číslo je již používáno",
     "This room is not accessible by remote Matrix servers": "Tato místnost není přístupná vzdáleným Matrix serverům",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Použijte tak, že vyčkáte na načtení našeptávaných výsledků a ty pak projdete tabulátorem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Pokusili jste se načíst bod v časové ose místnosti, ale pro zobrazení zpráv z daného časového úseku nemáte oprávnění.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Pokusili jste se načíst bod v časové ose místnosti, ale nepodařilo se ho najít.",
     "Unable to add email address": "Nepodařilo se přidat e-mailovou adresu",
@@ -258,10 +209,7 @@
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
     "Unable to verify email address.": "Nepodařilo se ověřit e-mailovou adresu.",
     "Unban": "Přijmout zpět",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s přijal(a) zpět uživatele %(targetName)s.",
-    "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
     "Unable to enable Notifications": "Nepodařilo se povolit oznámení",
-    "unknown caller": "neznámý volající",
     "Unmute": "Povolit",
     "Unnamed Room": "Nepojmenovaná místnost",
     "Uploading %(filename)s and %(count)s others|zero": "Nahrávání souboru %(filename)s",
@@ -271,13 +219,9 @@
     "Upload file": "Nahrát soubor",
     "Upload new:": "Nahrát nový:",
     "Usage": "Použití",
-    "Username invalid: %(errMessage)s": "Neplatné uživatelské jméno: %(errMessage)s",
     "Users": "Uživatelé",
     "Verification Pending": "Čeká na ověření",
     "Verified key": "Ověřený klíč",
-    "(no answer)": "(žádná odpověď)",
-    "(unknown failure: %(reason)s)": "(neznámá chyba: %(reason)s)",
-    "The remote side failed to pick up": "Vzdálené straně se nepodařilo hovor přijmout",
     "Who would you like to add to this community?": "Koho chcete přidat do této skupiny?",
     "Invite new community members": "Pozvěte nové členy skupiny",
     "Invite to Community": "Pozvat do skupiny",
@@ -294,22 +238,13 @@
     "Failed to add the following rooms to %(groupId)s:": "Nepodařilo se přidat následující místnosti do %(groupId)s:",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Vaše e-mailová adresa zřejmě nepatří k žádnému Matrix ID na tomto domovském serveru.",
     "Failed to invite": "Pozvání se nezdařilo",
-    "Failed to invite the following users to the %(roomName)s room:": "Do místnosti %(roomName)s se nepodařilo pozvat následující uživatele:",
     "You need to be logged in.": "Musíte být přihlášeni.",
     "You are now ignoring %(userId)s": "Nyní ignorujete %(userId)s",
     "You are no longer ignoring %(userId)s": "Už neignorujete %(userId)s",
     "Add rooms to this community": "Přidat místnosti do této skupiny",
-    "Unpin Message": "Odepnout zprávu",
     "Ignored user": "Ignorovaný uživatel",
     "Unignored user": "Odignorovaný uživatel",
     "Reason": "Důvod",
-    "VoIP conference started.": "VoIP konference započata.",
-    "VoIP conference finished.": "VoIP konference ukončena.",
-    "%(targetName)s left the room.": "%(targetName)s opustil(a) místnost.",
-    "You are already in a call.": "Již máte probíhající hovor.",
-    "%(senderName)s requested a VoIP conference.": "Uživatel %(senderName)s požádal o VoIP konferenci.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s odstranil(a) svůj profilový obrázek.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odmítl(a) pozvání.",
     "Communities": "Skupiny",
     "Message Pinning": "Připíchnutí zprávy",
     "Your browser does not support the required cryptography extensions": "Váš prohlížeč nepodporuje požadovaná kryptografická rozšíření",
@@ -318,10 +253,6 @@
     "Unignore": "Odignorovat",
     "Ignore": "Ignorovat",
     "Admin Tools": "Nástroje pro správce",
-    "No pinned messages.": "Žádné připíchnuté zprávy.",
-    "Pinned Messages": "Připíchnuté zprávy",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil(a) své zobrazované jméno (%(oldDisplayName)s).",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich pozvání.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy od chvíle jejich vstupu.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy.",
@@ -337,7 +268,6 @@
     "Copied!": "Zkopírováno!",
     "Failed to copy": "Nepodařilo se zkopírovat",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Smazáním widgetu ho odstraníte všem uživatelům v této místnosti. Opravdu chcete tento widget smazat?",
-    "The maximum permitted number of widgets have already been added to this room.": "V této místnosti již bylo dosaženo limitu pro maximální počet widgetů.",
     "Drop file here to upload": "Přetažením sem nahrajete",
     "Example": "Příklad",
     "Create Community": "Vytvořit skupinu",
@@ -345,12 +275,10 @@
     "Community ID": "ID skupiny",
     "example": "příklad",
     "Create": "Vytvořit",
-    "Please select the destination room for this message": "Vyberte prosím pro tuto zprávu cílovou místnost",
-    "Jump to read receipt": "Skočit na poslední potvrzení o přečtení",
+    "Jump to read receipt": "Přejít na poslední potvrzení o přečtení",
     "Invite": "Pozvat",
     "and %(count)s others...|one": "a někdo další...",
     "Hangup": "Zavěsit",
-    "Jump to message": "Přeskočit na zprávu",
     "Loading...": "Načítání...",
     "You seem to be uploading files, are you sure you want to quit?": "Zřejmě právě nahráváte soubory. Chcete přesto odejít?",
     "You seem to be in a call, are you sure you want to quit?": "Zřejmě máte probíhající hovor. Chcete přesto odejít?",
@@ -375,8 +303,6 @@
     "Failed to update community": "Skupinu se nepodařilo aktualizovat",
     "Failed to load %(groupId)s": "Nepodařilo se načíst %(groupId)s",
     "Search failed": "Vyhledávání selhalo",
-    "Failed to fetch avatar URL": "Nepodařilo se získat adresu avataru",
-    "Error decrypting audio": "Chyba při dešifrování zvuku",
     "Banned by %(displayName)s": "Vstup byl zakázán uživatelem %(displayName)s",
     "Privileged Users": "Privilegovaní uživatelé",
     "No users have specific privileges in this room": "Žádní uživatelé v této místnosti nemají zvláštní privilegia",
@@ -384,14 +310,10 @@
     "Invalid community ID": "Neplatné ID skupiny",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' není platné ID skupiny",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID skupiny (např. +neco:%(localDomain)s)",
-    "%(senderName)s sent an image": "%(senderName)s poslal(a) obrázek",
-    "%(senderName)s sent a video": "%(senderName)s poslal(a) video",
-    "%(senderName)s uploaded a file": "%(senderName)s nahrál(a) soubor",
     "Disinvite this user?": "Odvolat pozvání tohoto uživatele?",
     "Kick this user?": "Vykopnout tohoto uživatele?",
     "Unban this user?": "Přijmout zpět tohoto uživatele?",
     "Ban this user?": "Vykázat tohoto uživatele?",
-    "Community Invites": "Pozvánky do skupin",
     "Members only (since the point in time of selecting this option)": "Pouze členové (od chvíle vybrání této volby)",
     "Members only (since they were invited)": "Pouze členové (od chvíle jejich pozvání)",
     "Members only (since they joined)": "Pouze členové (od chvíle jejich vstupu)",
@@ -400,7 +322,6 @@
     "URL Previews": "Náhledy webových adres",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s změnil(a) avatar místnosti %(roomName)s",
     "Add an Integration": "Přidat začlenění",
-    "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s jsme poslali e-mail",
     "File to import": "Soubor k importu",
     "Passphrases must match": "Přístupové fráze se musí shodovat",
     "Passphrase must not be empty": "Přístupová fráze nesmí být prázdná",
@@ -409,21 +330,16 @@
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měli do kolonky níže zadat přístupovou frázi, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadané přístupové fráze.",
     "Confirm passphrase": "Potvrďte přístupovou frázi",
     "Import room keys": "Importovat klíče místnosti",
-    "Call Timeout": "Časový limit hovoru",
     "Show these rooms to non-members on the community page and room list?": "Zobrazovat tyto místnosti na domovské stránce skupiny a v seznamu místností i pro nečleny?",
     "Restricted": "Omezené",
     "Missing room_id in request": "V zadání chybí room_id",
     "Missing user_id in request": "V zadání chybí user_id",
-    "(could not connect media)": "(média se nepodařilo spojit)",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s nastavil viditelnost budoucí zpráv v místnosti neznámým (%(visibility)s).",
     "Not a valid %(brand)s keyfile": "Neplatný soubor s klíčem %(brand)s",
     "Mirror local video feed": "Zrcadlit lokání video",
     "Enable inline URL previews by default": "Nastavit povolení náhledů URL adres jako výchozí",
     "Enable URL previews for this room (only affects you)": "Povolit náhledy URL adres pro tuto místnost (ovlivňuje pouze vás)",
     "Enable URL previews by default for participants in this room": "Povolit náhledy URL adres pro členy této místnosti jako výchozí",
-    " (unsupported)": " (nepodporované)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Připojte se prostřednictvím <voiceText>audio</voiceText> nebo <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Probíhající konferenční hovor%(supportedText)s.",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -439,12 +355,10 @@
     "URL previews are disabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres zakázané pro členy této místnosti.",
     "Invalid file%(extra)s": "Neplatný soubor%(extra)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s %(integrationsUrl)s. Chcete pokračovat?",
-    "Please check your email to continue registration.": "Pro pokračování v registraci prosím zkontrolujte své e-maily.",
     "Token incorrect": "Neplatný token",
     "A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s byla odeslána textová zpráva",
     "Please enter the code it contains:": "Prosím zadejte kód z této zprávy:",
     "Sign in with": "Přihlásit se pomocí",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Pokud nezadáte svou e-mailovou adresu, nebude možné obnovit vaše heslo. Opravdu chcete pokračovat?",
     "Remove from community": "Odstranit ze skupiny",
     "Disinvite this user from community?": "Zrušit pozvání tohoto uživatele?",
     "Remove this user from community?": "Odstranit tohoto uživatele ze skupiny?",
@@ -462,7 +376,6 @@
     "Display your community flair in rooms configured to show it.": "Zobrazovat příslušnost ke skupině v místnostech, které to mají nastaveno.",
     "You're not currently a member of any communities.": "V současnosti nejste členem žádné skupiny.",
     "Unknown Address": "Neznámá adresa",
-    "Manage Integrations": "Správa integrací",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstoupili",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)svstoupili",
@@ -515,8 +428,6 @@
     "%(items)s and %(count)s others|one": "%(items)s a jeden další",
     "%(items)s and %(lastItem)s": "%(items)s a také %(lastItem)s",
     "And %(count)s more...|other": "A %(count)s dalších...",
-    "ex. @bob:example.com": "pr. @jan:příklad.com",
-    "Add User": "Přidat uživatele",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Identifikátor místnosti",
     "email address": "e-mailová adresa",
@@ -533,18 +444,9 @@
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Zkontrolujte svou e-mailovou schránku a klepněte na odkaz ve zprávě, kterou jsme vám poslali. V případě, že jste to už udělali, klepněte na tlačítko Pokračovat.",
     "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnovit si heslo a přijímat oznámení e-mailem.",
     "Skip": "Přeskočit",
-    "Username not available": "Uživatelské jméno už není dostupné",
-    "An error occurred: %(error_string)s": "Vyskytla se chyba: %(error_string)s",
-    "Username available": "Dostupné uživatelské jméno",
-    "To get started, please pick a username!": "Začněte tím, že si zvolíte uživatelské jméno!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude název vašeho účtu na domovském serveru <span></span>, anebo si můžete zvolit <a>jiný server</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Pokud už účet v síti Matrix máte, můžete se ihned <a>Přihlásit</a>.",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil(a)",
-    "Private Chat": "Soukromá konverzace",
-    "Public Chat": "Veřejná konverzace",
     "You must <a>register</a> to use this functionality": "Pro využívání této funkce se <a>zaregistrujte</a>",
     "You must join the room to see its files": "Pro zobrazení souborů musíte do místnosti vstoupit",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML kód stránky vaší skupiny</h1>\n<p>\n    Pomocí dlouhého popisu nejprve představte skupinu novým členům nebo uvěďte \n    nějaké důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Pro vložení obrázků můžete používat i HTML značky „img“\n</p>\n",
     "Add rooms to the community summary": "Přidat místnosti do přehledu skupiny",
     "Which rooms would you like to add to this summary?": "Které místnosti se přejete přidat do tohoto přehledu?",
     "Add to summary": "Přidat do přehledu",
@@ -577,11 +479,8 @@
     "Error whilst fetching joined communities": "Při získávání vašich skupin se vyskytla chyba",
     "Create a new community": "Vytvořit novou skupinu",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvořte skupinu s cílem seskupit uživatele a místnosti! Vytvořte si vlastní domovskou stránku a vymezte tak svůj prostor ve světe Matrix.",
-    "You have no visible notifications": "Nejsou dostupná žádná oznámení",
     "Connectivity to the server has been lost.": "Spojení se serverem bylo přerušeno.",
     "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.",
-    "Active call": "Aktivní hovor",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Kromě vás není v této místnosti nikdo jiný! Přejete si <inviteText>Pozvat další</inviteText> anebo <nowarnText>Přestat upozorňovat na prázdnou místnost</nowarnText>?",
     "Room": "Místnost",
     "Failed to load timeline position": "Bod v časové ose se nepodařilo načíst",
     "Analytics": "Analytické údaje",
@@ -596,11 +495,8 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Na adresu %(emailAddress)s byla odeslána zpráva. Potom, co přejdete na odkaz z této zprávy, klepněte níže.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Právě se přihlašujete na server %(hs)s, a nikoliv na server matrix.org.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tento domovský server nenabízí žádné přihlašovací toky podporované touto službou/klientem.",
-    "Set a display name:": "Nastavit zobrazované jméno:",
-    "Upload an avatar:": "Nahrát avatar:",
     "This server does not support authentication with a phone number.": "Tento server nepodporuje ověření telefonním číslem.",
     "Deops user with given id": "Zruší stav moderátor uživateli se zadaným ID",
-    "Searches DuckDuckGo for results": "Vyhledá výsledky na DuckDuckGo",
     "Ignores a user, hiding their messages from you": "Ignoruje uživatele a skryje všechny jeho zprávy",
     "Stops ignoring a user, showing their messages going forward": "Přestane ignorovat uživatele a začne zobrazovat jeho zprávy",
     "Notify the whole room": "Oznámení pro celou místnost",
@@ -614,17 +510,12 @@
     "Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
     "Warning": "Varování",
     "Fetching third party location failed": "Nepodařilo se zjistit umístění třetí strany",
-    "I understand the risks and wish to continue": "Rozumím a přesto chci pokračovat",
     "Send Account Data": "Poslat data o účtu",
-    "Advanced notification settings": "Rozšířená nastavení oznámení",
-    "Uploading report": "Nahrávání hlášení",
     "Sunday": "Neděle",
     "Messages sent by bot": "Zprávy poslané robotem",
     "Notification targets": "Cíle oznámení",
     "Failed to set direct chat tag": "Nepodařilo se nastavit štítek přímé konverzace",
     "Today": "Dnes",
-    "Files": "Soubory",
-    "You are not receiving desktop notifications": "Nedostáváte oznámení na plochu",
     "Friday": "Pátek",
     "Update": "Aktualizace",
     "What's New": "Co je nového",
@@ -632,23 +523,12 @@
     "Changelog": "Seznam změn",
     "Waiting for response from server": "Čekám na odezvu ze serveru",
     "Send Custom Event": "Odeslat vlastní událost",
-    "All notifications are currently disabled for all targets.": "Veškerá oznámení jsou aktuálně pro všechny cíle vypnuty.",
-    "Forget": "Zapomenout",
-    "You cannot delete this image. (%(code)s)": "Tento obrázek nemůžete smazat. (%(code)s)",
-    "Cancel Sending": "Zrušit odesílání",
     "This Room": "Tato místnost",
     "Noisy": "Hlučný",
     "Room not found": "Místnost nenalezena",
     "Messages containing my display name": "Zprávy obsahující mé zobrazované jméno",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Vězte, že kdybyste si to rozmysleli, e-mailovou adresu můžete kdykoliv doplnit v uživatelském nastavení.",
     "Unavailable": "Nedostupné",
-    "Error saving email notification preferences": "Chyba při ukládání nastavení e-mailových oznámení",
-    "View Decrypted Source": "Zobrazit dešifrovaný zdroj",
-    "Failed to update keywords": "Nepodařilo se aktualizovat klíčová slova",
     "remove %(name)s from the directory.": "odebrat %(name)s z adresáře.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Oznámení na následující klíčová slova se řídí pravidly, která zde nelze zobrazit:",
-    "Please set a password!": "Prosím nastavte si heslo!",
-    "You have successfully set a password!": "Úspěšně jste si nastavili heslo!",
     "Explore Room State": "Zjistit stav místnosti",
     "Source URL": "Zdrojová URL",
     "Failed to add tag %(tagName)s to room": "Nepodařilo se přidat štítek %(tagName)s k místnosti",
@@ -657,33 +537,21 @@
     "No update available.": "Není dostupná žádná aktualizace.",
     "Resend": "Poslat znovu",
     "Collecting app version information": "Sbírání informací o verzi aplikace",
-    "Keywords": "Klíčová slova",
-    "Enable notifications for this account": "Zapnout oznámení na tomto účtu",
     "Invite to this community": "Pozvat do této skupiny",
-    "Messages containing <span>keywords</span>": "Zprávy obsahující <span>klíčová slova</span>",
     "View Source": "Zobrazit zdroj",
     "Tuesday": "Úterý",
-    "Enter keywords separated by a comma:": "Vložte klíčová slova oddělená čárkou:",
-    "Forward Message": "Přeposlat",
-    "You have successfully set a password and an email address!": "Úspěšně jste si nastavili heslo a e-mailovou adresu!",
     "Remove %(name)s from the directory?": "Odebrat %(name)s z adresáře?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s používá mnoho pokročilých funkcí, z nichž některé jsou ve vašem současném prohlížeči nedostupné nebo experimentální.",
     "Developer Tools": "Nástroje pro vývojáře",
     "Explore Account Data": "Prozkoumat data o účtu",
     "Remove from Directory": "Odebrat z adresáře",
     "Saturday": "Sobota",
     "Messages in one-to-one chats": "Přímé zprávy",
-    "Direct Chat": "Přímá konverzace",
     "The server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
     "Reject": "Odmítnout",
-    "Failed to set Direct Message status of room": "Nepodařilo se přiřadit místnosti status Přímé zprávy",
     "Monday": "Pondělí",
-    "All messages (noisy)": "Všechny zprávy (hlučné)",
-    "Enable them now": "Povolit nyní",
     "Toolbox": "Sada nástrojů",
     "Collecting logs": "Sběr záznamů",
     "You must specify an event type!": "Musíte určit typ události!",
-    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Invite to this room": "Pozvat do této místnosti",
     "Send logs": "Odeslat záznamy",
     "All messages": "Všechny zprávy",
@@ -692,10 +560,7 @@
     "State Key": "Stavový klíč",
     "Failed to send custom event.": "Nepodařilo se odeslat vlastní událost.",
     "What's new?": "Co je nového?",
-    "Notify me for anything else": "Upozorni mě na cokoliv jiného",
     "When I'm invited to a room": "Pozvánka do místnosti",
-    "Can't update user notification settings": "Nelze aktualizovat uživatelské nastavení oznámení",
-    "Notify for all other messages/rooms": "Upozorni na všechny ostatní zprávy/místnosti",
     "Unable to look up room ID from server": "Nelze získat ID místnosti ze serveru",
     "Couldn't find a matching Matrix room": "Odpovídající Matrix místost nenalezena",
     "All Rooms": "Všechny místnosti",
@@ -703,36 +568,23 @@
     "Thursday": "Čtvrtek",
     "Search…": "Vyhledat…",
     "Back": "Zpět",
-    "Failed to change settings": "Nepodařilo se změnit nastavení",
     "Reply": "Odpovědět",
     "Show message in desktop notification": "Zobrazovat zprávu v oznámení na ploše",
-    "Unhide Preview": "Zobrazit náhled",
     "Unable to join network": "Nelze se připojit k síti",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Omlouváme se, váš prohlížeč <b>není</b> schopný %(brand)s spustit.",
-    "Uploaded on %(date)s by %(user)s": "Nahráno %(date)s uživatelem %(user)s",
     "Messages in group chats": "Zprávy ve skupinách",
     "Yesterday": "Včera",
     "Error encountered (%(errorDetail)s).": "Nastala chyba (%(errorDetail)s).",
     "Low Priority": "Nízká priorita",
     "%(brand)s does not know how to join a room on this network": "%(brand)s neví, jak vstoupit do místosti na této síti",
-    "Set Password": "Nastavit heslo",
-    "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových oznámení nastala chyba.",
     "Off": "Vypnout",
-    "Mentions only": "Pouze zmínky",
     "Failed to remove tag %(tagName)s from room": "Nepodařilo se odstranit štítek %(tagName)s z místnosti",
     "Wednesday": "Středa",
-    "You can now return to your account after signing out, and sign in on other devices.": "Nyní se můžete ke svému účtu vrátit i po odhlášení a používat ho na ostatních zařízeních.",
-    "Enable email notifications": "Zapnout oznámení přes e-mail",
     "Event Type": "Typ události",
-    "Download this file": "Stáhnout tento soubor",
-    "Pin Message": "Připíchnout zprávu",
     "Thank you!": "Děkujeme vám!",
     "View Community": "Zobrazit skupinu",
     "Event sent!": "Událost odeslána!",
     "Event Content": "Obsah události",
-    "Unable to fetch notification target list": "Nepodařilo se získat seznam cílů oznámení",
     "Quote": "Citovat",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
     "The platform you're on": "Vámi používaná platforma",
     "The version of %(brand)s": "Verze %(brand)su",
@@ -745,16 +597,11 @@
     "Your device resolution": "Rozlišení obrazovky vašeho zařízení",
     "The information being sent to us to help make %(brand)s better includes:": "Abychom mohli %(brand)s zlepšovat, posíláte nám následující informace:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Pokud tato stránka obsahuje identifikovatelné údaje, například ID místnosti, uživatele nebo skupiny, jsou tyto údaje před odesláním na server odstraněny.",
-    "Call in Progress": "Probíhající hovor",
-    "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": "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",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si změnil(a) zobrazované jméno na %(displayName)s.",
-    "Always show encryption icons": "Vždy zobrazovat ikonu stavu šifrovaní",
     "Send analytics data": "Odesílat analytická data",
     "Enable widget screenshots on supported widgets": "Povolit screenshot widgetu pro podporované widgety",
     "This event could not be displayed": "Tato událost nemohla být zobrazena",
@@ -765,7 +612,7 @@
     "Share Link to User": "Sdílet odkaz na uživatele",
     "Send an encrypted reply…": "Odeslat šifrovanou odpověď …",
     "Send an encrypted message…": "Odeslat šifrovanou zprávu…",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) viděl %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) viděl(a) %(dateTime)s",
     "Replying": "Odpovídá",
     "Share room": "Sdílet místnost",
     "System Alerts": "Systémová varování",
@@ -778,15 +625,9 @@
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "V šifrovaných místnostech, jako je tato, jsou URL náhledy ve výchozím nastavení vypnuté, aby bylo možné zajistit, že váš domovský server neshromažďuje informace o odkazech, které v této místnosti vidíte.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Když někdo ve zprávě pošle URL adresu, může být zobrazen její náhled obsahující informace jako titulek, popis a obrázek z cílové stránky.",
     "Code": "Kód",
-    "The email field must not be blank.": "E-mail nemůže být prázdný.",
-    "The phone number field must not be blank.": "Telefonní číslo nemůže být prázdné.",
-    "The password field must not be blank.": "Heslo nemůže být prázdné.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Pro další používání vašeho zařízení prosím kontaktujte prosím <a>správce vaší služby</a>.",
     "This homeserver has hit its Monthly Active User limit.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele.",
     "This homeserver has exceeded one of its resource limits.": "Tento domovský server překročil některý z limitů.",
-    "Failed to remove widget": "Nepovedlo se odstranit widget",
-    "An error ocurred whilst trying to remove the widget from the room": "Při odstraňování widgetu z místnosti nastala chyba",
-    "Minimize apps": "Minimalizovat aplikace",
     "Popout widget": "Otevřít widget v novém okně",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Není možné načíst událost, na kterou se odpovídalo. Buď neexistuje, nebo nemáte oprávnění ji zobrazit.",
     "<a>In reply to</a> <pill>": "<a>V odpovědi na</a> <pill>",
@@ -794,7 +635,6 @@
     "Logs sent": "Záznamy odeslány",
     "Failed to send logs: ": "Nepodařilo se odeslat záznamy: ",
     "Submit debug logs": "Odeslat ladící záznamy",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Ladící záznamy obsahují data o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasy navštívených místností a skupin a uživatelská jména jiných uživatelů. Neobsahují zprávy.",
     "Community IDs cannot be empty.": "ID skupiny nemůže být prázdné.",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Toto učiní účet permanentně nepoužitelný. Nebudete se moci přihlásit a nikdo se nebude moci se stejným uživatelskym ID znovu zaregistrovat. Účet bude odstraněn ze všech místnosti a bude vymazán ze serveru identity.<b>Tato akce je nevratná.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Deaktivace účtu <b>automaticky nesmaže zprávy, které jste poslali.</b> Chcete-li je smazat, zaškrtněte prosím odpovídající pole níže.",
@@ -817,9 +657,6 @@
     "Share Community": "Sdílet skupinu",
     "Share Room Message": "Sdílet zprávu z místnosti",
     "Link to selected message": "Odkaz na vybranou zprávu",
-    "COPY": "Kopírovat",
-    "Share Message": "Sdílet zprávu",
-    "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",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Změny <bold1>názvu</bold1> a <bold2>avataru</bold2> vaší skupiny možná nebudou viditelné pro ostatní uživatele po dobu až 30 minut.",
@@ -837,11 +674,7 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Dokud si nepřečtete a neodsouhlasíte <consentLink>naše smluvní podmínky</consentLink>, nebudete moci posílat žádné zprávy.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Vaše zpráva nebyla odeslána, protože tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele. Pro další využívání služby prosím kontaktujte jejího <a>správce</a>.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Vaše zpráva nebyla odeslána, protože tento domovský server dosáhl limitu svých zdrojů. Pro další využívání služby prosím kontaktujte jejího <a>správce</a>.",
-    "%(count)s of your messages have not been sent.|one": "Vaše zpráva nebyla odeslána.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Znovu poslat všechny</resendText> nebo <cancelText>zrušit všechny</cancelText>. Můžete též vybrat jednotlivé zprávy pro znovu odeslání nebo zrušení.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Znovu poslat zprávu</resendText> nebo <cancelText>zrušit zprávu</cancelText>.",
     "Clear filter": "Zrušit filtr",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jestli jste odeslali hlášení o chybě na GitHub, ladící záznamy nám pomohou problém najít. Ladicí záznamy obsahuji data o používání aplikace, která obsahují uživatelské jméno, ID nebo aliasy navštívených místnosti a uživatelská jména dalších uživatelů. Neobsahují zprávy.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Soukromí je pro nás důležité a proto neshromažďujeme osobní údaje ani údaje na základě, kterých by vás bylo možné identifikovat.",
     "Learn more about how we use analytics.": "Dozvědět se více o tom, jak zpracováváme analytické údaje.",
     "No Audio Outputs detected": "Nebyly rozpoznány žádné zvukové výstupy",
@@ -851,13 +684,11 @@
     "You'll lose access to your encrypted messages": "Přijdete o přístup k šifrovaným zprávám",
     "Are you sure you want to sign out?": "Opravdu se chcete odhlásit?",
     "Updating %(brand)s": "Aktualizujeme %(brand)s",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Abychom předešli řešení jednoho problému několikrát, podívejte se prosím nejdřív <existingIssuesLink>seznam existujících issue</existingIssuesLink> (a můžete jim dát 👍) nebo můžete <newIssueLink>vyrobit nové</newIssueLink>. Jenom nám prosím pište anglicky.",
-    "Report bugs & give feedback": "Hlášení chyb a zpětná vazba",
     "Go back": "Zpět",
     "Failed to upgrade room": "Nepovedlo se upgradeovat místnost",
     "The room upgrade could not be completed": "Upgrade místnosti se nepovedlo dokončit",
     "Upgrade this room to version %(version)s": "Upgradování místnosti na verzi %(version)s",
-    "Security & Privacy": "Zabezpečení",
+    "Security & Privacy": "Zabezpečení a soukromí",
     "Encryption": "Šifrování",
     "Once enabled, encryption cannot be disabled.": "Po zapnutí, už nepůjde šifrování vypnout.",
     "Encrypted": "Šifrováno",
@@ -883,7 +714,6 @@
     "Voice & Video": "Zvuk a video",
     "Missing media permissions, click the button below to request.": "Pro práci se zvukem a videem je potřeba oprávnění. Klepněte na tlačítko a my o ně požádáme.",
     "Request media permissions": "Požádat o oprávnění k mikrofonu a kameře",
-    "Allow Peer-to-Peer for 1:1 calls": "Povolit Peer-to-Peer hovory",
     "Preferences": "Předvolby",
     "Composer": "Editor zpráv",
     "Enable Emoji suggestions while typing": "Napovídat emoji",
@@ -919,23 +749,19 @@
     "Chat with %(brand)s Bot": "Konverzovat s %(brand)s Botem",
     "Ignored users": "Ignorovaní uživatelé",
     "Bulk options": "Hromadná možnost",
-    "Key backup": "Záloha klíčů",
     "This room has been replaced and is no longer active.": "Tato místnost byla nahrazena a už není používaná.",
     "The conversation continues here.": "Konverzace pokračuje zde.",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Poslali jsme vám ověřovací e-mail. Postupujte prosím podle instrukcí a pak klepněte na následující tlačítko.",
     "Email Address": "E-mailová adresa",
     "Delete Backup": "Smazat zálohu",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Opravdu? Pokud klíče nejsou správně zálohované můžete přijít o šifrované zprávy.",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené end-to-end šifrováním. Klíče pro jejich dešifrování máte jen vy a příjemci zpráv.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené koncovým šifrováním. Klíče pro jejich dešifrování máte jen vy a příjemci zpráv.",
     "Unable to load key backup status": "Nepovedlo se načíst stav zálohy",
     "Restore from Backup": "Obnovit ze zálohy",
     "Back up your keys before signing out to avoid losing them.": "Před odhlášením si zazálohujte klíče abyste o ně nepřišli.",
     "Backing up %(sessionsRemaining)s keys...": "Zálohování %(sessionsRemaining)s klíčů...",
     "All keys backed up": "Všechny klíče jsou zazálohované",
-    "Backup version: ": "Verze zálohy: ",
-    "Algorithm: ": "Algoritmus: ",
     "Start using Key Backup": "Začít používat zálohu klíčů",
-    "Add an email address to configure email notifications": "Pro nastavení e-mailových oznámení je třeba přidat e-mailovou adresu",
     "Whether or not you're logged in (we don't record your username)": "Zda jste nebo nejste přihlášeni (vaše uživatelské jméno se nezaznamenává)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Soubor '%(fileName)s' je větší než povoluje limit domovského serveru",
     "Unable to load! Check your network connectivity and try again.": "Stránku se nepovedlo načíst! Zkontrolujte prosím své připojení k internetu a zkuste to znovu.",
@@ -995,7 +821,7 @@
     "The other party cancelled the verification.": "Druhá strana ověření zrušila.",
     "Verified!": "Ověřeno!",
     "You've successfully verified this user.": "Uživatel úspěšně ověřen.",
-    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Bezpečné zprávy s tímto uživatelem jsou end-to-end šifrované a nikdo další je nemůže číst.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Bezpečné zprávy s tímto uživatelem jsou koncově šifrované a nikdo další je nemůže číst.",
     "Got It": "OK",
     "Verify this user by confirming the following emoji appear on their screen.": "Ověřte uživatele zkontrolováním, že se mu na obrazovce objevily stejné emoji.",
     "Verify this user by confirming the following number appears on their screen.": "Ověřte uživatele zkontrolováním, že se na obrazovce objevila stejná čísla.",
@@ -1061,14 +887,9 @@
     "Anchor": "Kotva",
     "Headphones": "Sluchátka",
     "Folder": "Desky",
-    "Pin": "Připínáček",
+    "Pin": "Připnout",
     "Yes": "Ano",
     "No": "Ne",
-    "Never lose encrypted messages": "Nikdy nepřijdete o šifrované zprávy",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Zprávy v této místnosti jsou zabezpečené end-to-end šifrováním. Můžete je číst jen vy a jejich příjemci.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Bezpečně zazálohujte své klíče abyste o ně nepřišli. <a>Více informací.</a>",
-    "Not now": "Teď ne",
-    "Don't ask me again": "Už se mě na to nikdy neptejte",
     "Add some now": "Přidat nějaké",
     "Main address": "Hlavní adresa",
     "This room is a continuation of another conversation.": "Tato místost je pokračováním jiné konverzace.",
@@ -1080,28 +901,22 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nepovedlo se najít profily následujících Matrix ID - chcete je stejně pozvat?",
     "Invite anyway and never warn me again": "Stejně je pozvat a nikdy mě nevarujte znovu",
     "Invite anyway": "Stejně je pozvat",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Pro odeslání záznamů je potřeba <a>vyrobit issue na GitHubu</a> s popisem problému.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Pro odeslání záznamů je potřeba <a>vytvořit issue na GitHubu</a> s popisem problému.",
     "Unable to load commit detail: %(msg)s": "Nepovedlo se načíst detaily revize: %(msg)s",
     "Incompatible Database": "Nekompatibilní databáze",
     "Continue With Encryption Disabled": "Pokračovat bez šifrování",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů vám dává jistotu, že je komunikace důvěrná.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů vám dává větší jistotu, že je komunikace důvěrná.",
     "Waiting for partner to confirm...": "Čekám až to partner potvrdí...",
     "Incoming Verification Request": "Přišla vám žádost o ověření",
     "Incompatible local cache": "Nekompatibilní lokální vyrovnávací paměť",
     "Clear cache and resync": "Smazat paměť a sesynchronizovat",
     "I don't want my encrypted messages": "Už své zašifrované zprávy nechci",
-    "Checking...": "Kontroluji...",
     "Unable to load backup status": "Nepovedlo se načíst stav zálohy",
     "Unable to restore backup": "Nepovedlo se obnovit ze zálohy",
     "No backup found!": "Nenalezli jsme žádnou zálohu!",
     "Failed to decrypt %(failedCount)s sessions!": "Nepovedlo se rozšifrovat %(failedCount)s sezení!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varování</b>: záloha by měla být prováděna na důvěryhodném počítači.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zadáním hesla k záloze získáte zpět přístup k šifrovaným zprávám a zabezpečené komunikaci.",
     "Next": "Další",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Pokud jste zapomněli své obnovovací heslo, použijte <button1>obnovovací klíč</button1> nebo <button2>nastavte další možnosti obnovení</button2>",
-    "This looks like a valid recovery key!": "To vypadá jako správný klíč!",
-    "Not a valid recovery key": "To není správný klíč",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Zadejte obnovovací klíč pro přístupu k historii zpráv a zabezpečené komunikaci.",
     "Recovery Method Removed": "Záloha klíčů byla odstraněna",
     "Go to Settings": "Přejít do nastavení",
     "For maximum security, this should be different from your account password.": "Z bezpečnostních důvodů by toto heslo mělo být jiné než přihlašovací heslo.",
@@ -1121,14 +936,9 @@
     "Set up Secure Messages": "Nastavit bezpečné obnovení zpráv",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste způsob obnovy neodstranili vy, mohou se pokoušet k vašemu účtu dostat útočníci. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
     "Set up": "Nastavit",
-    "Don't ask again": "Už se neptat",
     "New Recovery Method": "Nový způsob obnovy",
-    "If you don't want to set this up now, you can later in Settings.": "Pokud nechcete nastavení dokončit teď, můžete se k tomu vrátit později v nastavení.",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Detekovali jsme nové heslo a klíč pro bezpečné obnovení.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste nenastavili nový způsob obnovy vy, mohou se pokoušet k vašemu účtu dostat útočníci. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
     "Set up Secure Message Recovery": "Nastavit bezpečné obnovení zpráv",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Bez nastavení bezpečného obnovení zpráv přijdete po odhlášení o historii šifrované komunikace.",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "V šifrovaných konverzacích zobrazovat upozornění na možnost aktivovat bezpečné obnovení zpráv",
     "Gets or sets the room topic": "Nastaví nebo zjistí téma místnosti",
     "Forces the current outbound group session in an encrypted room to be discarded": "Vynutí zahození aktuálně používané relace skupiny v zašifrované místnosti",
     "Custom user status messages": "Vlastní statusy",
@@ -1149,31 +959,18 @@
     "This homeserver would like to make sure you are not a robot.": "Domovský server se potřebuje přesvědčit, že nejste robot.",
     "Please review and accept all of the homeserver's policies": "Pročtěte si a odsouhlaste prosím všechna pravidla domovského serveru",
     "Please review and accept the policies of this homeserver:": "Pročtěte si a odsouhlaste prosím pravidla domovského serveru:",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Zadejte adresu serveru Modular. Můžete použít svou vlastní doménu a nebo subdoménu <a>modular.im</a>.",
-    "Homeserver URL": "URL domovského serveru",
     "This homeserver does not support communities": "Tento domovský server nepodporuje skupiny",
     "Invalid homeserver discovery response": "Neplatná odpověd při hledání domovského serveru",
     "Failed to perform homeserver discovery": "Nepovedlo se zjisit adresu domovského serveru",
     "Registration has been disabled on this homeserver.": "Tento domovský server nepovoluje registraci.",
-    "Identity Server URL": "URL serveru identity",
     "Invalid identity server discovery response": "Neplatná odpověď při hledání serveru identity",
-    "Your Modular server": "Váš server Modular",
-    "Server Name": "Název serveru",
-    "The username field must not be blank.": "Je potřeba vyplnit uživatelské jméno.",
     "Username": "Uživatelské jméno",
-    "Not sure of your password? <a>Set a new one</a>": "Nepamatujete si heslo? <a>Nastavte si nové</a>",
     "Change": "Změnit",
-    "Create your account": "Vytvořte si účet",
     "Email (optional)": "E-mail (nepovinné)",
     "Phone (optional)": "Telefonní číslo (nepovinné)",
     "Confirm": "Potvrdit",
-    "Other servers": "Další servery",
-    "Free": "Zdarma",
     "Join millions for free on the largest public server": "Přidejte k miliónům registrovaným na největším veřejném serveru",
-    "Premium": "Prémiové",
-    "Premium hosting for organisations <a>Learn more</a>": "Prémiový hosting pro organizace <a>Více informací</a>",
     "Other": "Další možnosti",
-    "Find other public servers or use a custom server": "Najděte si jiný veřejný server a nebo používejte svůj vlastní",
     "Couldn't load page": "Nepovedlo se načíst stránku",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Jste správcem této skupiny. Bez pozvání od jiného správce nebudete mít možnost se připojit zpět.",
     "Guest": "Host",
@@ -1202,7 +999,6 @@
     "Change settings": "Měnit nastavení",
     "Kick users": "Vykopnout uživatele",
     "Ban users": "Vykázat uživatele",
-    "Remove messages": "Mazat zprávy",
     "Notify everyone": "Oznámení pro celou místnost",
     "Enable encryption?": "Povolit šifrování?",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Po zapnutí již nelze šifrování v této místnosti vypnout. Zprávy v šifrovaných místnostech mohou číst jen členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. <a>Více informací o šifrování.</a>",
@@ -1211,12 +1007,7 @@
     "Power level": "Úroveň oprávnění",
     "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": "Abyste po odhlášení nepřišli o přístup k historii šifrovaných konverzací, měli byste si před odhlášením exportovat šifrovací klíče místností. Prosím vraťte se k novější verzi %(brand)su a exportujte si klíče",
     "Room Settings - %(roomName)s": "Nastavení místnosti - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Uživatelské jméno může obsahovat malá písmena, čísla a znaky '=_-./'",
-    "Share Permalink": "Sdílet odkaz",
-    "Sign in to your Matrix account on %(serverName)s": "Přihlašte se k účtu Matrix na %(serverName)s",
-    "Create your Matrix account on %(serverName)s": "Vytvořte si účet Matrix na %(serverName)s",
     "Could not load user profile": "Nepovedlo se načíst profil uživatele",
-    "Your Matrix account on %(serverName)s": "Váš účet Matrix na serveru %(serverName)s",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Zda používáte funkci „breadcrumb“ (ikony nad seznamem místností)",
     "Replying With Files": "Odpovídání souborem",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "V tuto chvíli není možné odpovědět souborem. Chcete tento soubor nahrát bez odpovědi?",
@@ -1282,11 +1073,8 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pro tuto místnost se nepovedlo změnit příslušnost ke skupině. Možná to server neumožňuje, nebo došlo k dočasné chybě.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reagoval(a) %(shortName)s</reactedWith>",
     "edited": "upraveno",
-    "Maximize apps": "Maximalizovat aplikace",
     "Rotate Left": "Otočit doleva",
-    "Rotate counter-clockwise": "Otočit proti směru hodinových ručiček",
     "Rotate Right": "Otočit doprava",
-    "Rotate clockwise": "Otočit po směru hodinových ručiček",
     "Edit message": "Upravit zprávu",
     "GitHub issue": "issue na GitHubu",
     "Notes": "Poznámky",
@@ -1307,12 +1095,7 @@
     "Upload %(count)s other files|one": "Nahrát %(count)s další soubor",
     "Cancel All": "Zrušit vše",
     "Upload Error": "Chyba při nahrávání",
-    "A widget would like to verify your identity": "Widget by chtěl ověřit vaší identitu",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Widget z adresy %(widgetUrl)s by chtěl ověřit vaší identitu. Povolením umožníte widgetu ověřit vaše uživatelské ID, ale neumožníte mu provádět vaším jménem žádné operace.",
     "Remember my selection for this widget": "Zapamatovat si volbu pro tento widget",
-    "Deny": "Zakázat",
-    "Unable to validate homeserver/identity server": "Nepovedlo se ověřit domovský server nebo server identity",
-    "Sign in to your Matrix account on <underlinedServerName />": "Přihlašte se k Matrix účtu na serveru <underlinedServerName />",
     "Use an email address to recover your account": "Použít e-mailovou adresu k obnovení přístupu k účtu",
     "Enter email address (required on this homeserver)": "Zadejte e-mailovou adresu (tento domovský server ji vyžaduje)",
     "Doesn't look like a valid email address": "To nevypadá jako e-mailová adresa",
@@ -1322,10 +1105,8 @@
     "Passwords don't match": "Hesla nejsou stejná",
     "Other users can invite you to rooms using your contact details": "Ostatní uživatelé vás můžou pozvat do místností podle kontaktních údajů",
     "Enter phone number (required on this homeserver)": "Zadejte telefonní číslo (domovský server ho vyžaduje)",
-    "Doesn't look like a valid phone number": "To nevypadá jako telefonní číslo",
     "Enter username": "Zadejte uživatelské jméno",
     "Some characters not allowed": "Nějaké znaky jsou zakázané",
-    "Create your Matrix account on <underlinedServerName />": "Vytvořte si účet Matrix na serveru <underlinedServerName />",
     "Want more than a community? <a>Get your own server</a>": "Chcete víc? <a>Můžete mít vlastní server</a>",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s nemohl načíst seznam podporovaných protokolů z domovského serveru. Server je možná příliš zastaralý a nepodporuje komunikaci se síti třetích stran.",
     "%(brand)s failed to get the public room list.": "%(brand)s nemohl načíst seznam veřejných místností.",
@@ -1333,14 +1114,11 @@
     "Add room": "Přidat místnost",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
-    "Your profile": "Váš profil",
-    "Your Matrix account on <underlinedServerName />": "Váš účet Matrix na serveru <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "Nepovedlo se automaticky načíst konfiguraci ze serveru",
     "Invalid base_url for m.homeserver": "Neplatná base_url pro m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Na URL domovského serveru asi není funkční Matrix server",
     "Invalid base_url for m.identity_server": "Neplatná base_url pro m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "Na URL serveru identit asi není funkční Matrix server",
-    "Low bandwidth mode": "Mód nízké spotřeby dat",
     "Uploaded sound": "Zvuk nahrán",
     "Sounds": "Zvuky",
     "Notification sound": "Zvuk oznámení",
@@ -1371,15 +1149,10 @@
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "K pozvání e-mailem použijte server identit. Pokračováním použijete výchozí server identit (%(defaultIdentityServerName)s) nebo ho můžete změnit v Nastavení.",
     "Use an identity server to invite by email. Manage in Settings.": "Použít server identit na odeslání e-mailové pozvánky. Můžete spravovat v Nastavení.",
     "Displays list of commands with usages and descriptions": "Zobrazuje seznam příkazu s popiskem",
-    "%(senderName)s made no change.": "%(senderName)s neudělal žádnou změnu.",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Povolit použití serveru turn.matrix.org pro hlasové hovory pokud váš domovský server tuto službu neposkytuje (vaše IP adresu bude během hovoru viditelná)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Odesílat potvrzení o přijetí (vypnutá volba vyžaduje kompatibilní domovský server)",
     "Accept <policyLink /> to continue:": "Pro pokračování odsouhlaste <policyLink />:",
     "ID": "ID",
     "Public Name": "Veřejné jméno",
-    "Identity Server URL must be HTTPS": "Adresa serveru identit musí být na HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Toto není validní server identit (stavový kód %(code)s)",
-    "Could not connect to Identity Server": "Nepovedlo se připojení k serveru identit",
     "Checking server": "Kontrolování serveru",
     "Change identity server": "Změnit server identit",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Odpojit se ze serveru <current /> a připojit na <new />?",
@@ -1393,16 +1166,13 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Pořád <b>sdílíte osobní údaje</b> se serverem identit <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Než se odpojíte, doporučujeme odstranit e-mailovou adresu a telefonní číslo ze serveru identit.",
     "Disconnect anyway": "Stejně se odpojit",
-    "Identity Server (%(server)s)": "Server identit (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Pro hledání existujících kontaktů používáte server identit <server></server>. Níže ho můžete změnit.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Pokud nechcete na hledání existujících kontaktů používat server <server />, zvolte si jiný server.",
-    "Identity Server": "Server identit",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Pro hledání existujících kontaktů nepoužíváte žádný server identit <server></server>. Abyste mohli hledat kontakty, nějaký níže nastavte.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Po odpojení od serveru identit nebude možné vás najít podle e-mailové adresy ani telefonního čísla, a zároveň podle nich ani vy nebudete moci hledat ostatní kontakty.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Použití serveru identit je volitelné. Nemusíte server identit používat, ale nepůjde vás pak najít podle e-mailové adresy ani telefonního čísla a vy také nebudete moci hledat ostatní.",
     "Do not use an identity server": "Nepoužívat server identit",
     "Enter a new identity server": "Zadejte nový server identit",
-    "Integration Manager": "Správce integrací",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Pro zapsáním do registru e-mailových adres a telefonních čísel odsouhlaste podmínky používání serveru (%(serverName)s).",
     "Deactivate account": "Deaktivace účtu",
     "Always show the window menu bar": "Vždy zobrazovat horní lištu okna",
@@ -1413,14 +1183,11 @@
     "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",
-    "This room is private, and can only be joined by invitation.": "Tato místnost je neveřejná a lze do ní vstoupit jen s pozvánkou.",
     "Create a public room": "Vytvořit veřejnou místnost",
     "Create a private room": "Vytvořit neveřejnou místnost",
     "Topic (optional)": "Téma (volitelné)",
-    "Make this room public": "Zveřejnit místnost",
     "Hide advanced": "Skrýt pokročilé možnosti",
     "Show advanced": "Zobrazit pokročilé možnosti",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Zamezit uživatelům jiných domovských serverů, aby do místnosti vstoupili (nelze později změnit!)",
     "Your homeserver doesn't seem to support this feature.": "Váš domovský server asi tuto funkci nepodporuje.",
     "Message edits": "Úpravy zpráv",
     "Please fill why you're reporting.": "Vyplňte prosím co chcete nahlásit.",
@@ -1436,7 +1203,6 @@
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Tato akce vyžaduje přístup k výchozímu serveru identity <server /> aby šlo ověřit e-mail a telefon, ale server nemá podmínky použití.",
     "Trust": "Důvěra",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Multiple integration managers": "Více správců integrací",
     "Show previews/thumbnails for images": "Zobrazovat náhledy obrázků",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Před odpojením byste měli <b>smazat osobní údaje</b> ze serveru identit <idserver />. Bohužel, server je offline nebo neodpovídá.",
     "You should:": "Měli byste:",
@@ -1487,7 +1253,6 @@
     "Strikethrough": "Přešktnutě",
     "Code block": "Blok kódu",
     "Room %(name)s": "Místnost %(name)s",
-    "Recent rooms": "Nedávné místnosti",
     "Loading room preview": "Načítání náhdledu místnosti",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Při ověřování pozvánky došlo k chybě (%(errcode)s). Předejte tuto informaci správci místnosti.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Pozvánka do místnosti %(roomName)s byla poslána na adresu %(email)s, která není k tomuto účtu přidána",
@@ -1499,11 +1264,10 @@
     "%(count)s unread messages including mentions.|one": "Nepřečtená zmínka.",
     "%(count)s unread messages.|other": "%(count)s nepřečtených zpráv.",
     "%(count)s unread messages.|one": "Nepřečtená zpráva.",
-    "Unread mentions.": "Nepřečtená zmínka.",
     "Unread messages.": "Nepřečtené zprávy.",
     "Failed to deactivate user": "Deaktivace uživatele se nezdařila",
-    "This client does not support end-to-end encryption.": "Tento klient nepodporuje end-to-end šifrování.",
-    "Messages in this room are not end-to-end encrypted.": "Zprávy nejsou end-to-end šifrované.",
+    "This client does not support end-to-end encryption.": "Tento klient nepodporuje koncové šifrování.",
+    "Messages in this room are not end-to-end encrypted.": "Zprávy nejsou koncově šifrované.",
     "React": "Reagovat",
     "Message Actions": "Akce zprávy",
     "Show image": "Zobrazit obrázek",
@@ -1535,26 +1299,17 @@
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s neudělal(a) %(count)s krát žádnou změnu",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s neudělal(a) žádnou změnu",
     "e.g. my-room": "např. moje-mistnost",
-    "Use bots, bridges, widgets and sticker packs": "Použít roboty, propojení, widgety a balíky samolepek",
+    "Use bots, bridges, widgets and sticker packs": "Použít roboty, propojení, widgety a balíky nálepek",
     "Terms of Service": "Podmínky použití",
     "To continue you need to accept the terms of this service.": "Musíte souhlasit s podmínkami použití, abychom mohli pokračovat.",
     "Service": "Služba",
     "Summary": "Shrnutí",
     "Document": "Dokument",
     "Upload all": "Nahrát vše",
-    "Resend edit": "Odeslat změnu znovu",
     "Resend %(unsentCount)s reaction(s)": "Poslat %(unsentCount)s reakcí znovu",
-    "Resend removal": "Odeslat smazání znovu",
     "Report Content": "Nahlásit obsah",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Na domovském serveru chybí veřejný klíč pro captcha. Nahlaste to prosím správci serveru.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Žádný server identit není nakonfigurován, takže nemůžete přidat e-mailovou adresu pro obnovení hesla.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nastavte si e-mailovou adresu pro obnovení hesla. E-mail nebo telefon můžete také použít, aby vás vaši přátelé snadno našli.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nastavte si e-mailovou adresu pro obnovení hesla. E-mail můžete také použít, aby vás vaši přátelé snadno našli.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Zadejte adresu domovského serveru. <a>Co to znamená?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Zadejte adresu serveru identit. <a>Co to znamená?</a>",
-    "Explore": "Procházet",
     "Filter": "Filtr místností",
-    "Filter rooms…": "Najít místnost…",
     "%(creator)s created and configured the room.": "%(creator)s vytvořil(a) a nakonfiguroval(a) místnost.",
     "Preview": "Náhled",
     "View": "Zobrazit",
@@ -1562,9 +1317,8 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Najít místnost… (např. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Pokud nemůžete nějakou místnost najít, požádejte stávající členy o pozvánku nebo si <a>Vytvořte novou místnost</a>.",
     "Explore rooms": "Procházet místnosti",
-    "Jump to first unread room.": "Skočit na první nepřečtenou místnost.",
-    "Jump to first invite.": "Skočit na první pozvánku.",
-    "No identity server is configured: add one in server settings to reset your password.": "Žádný server identit není nakonfigurován: přidejte si ho v nastavení, abyste mohli obnovit heslo.",
+    "Jump to first unread room.": "Přejít na první nepřečtenou místnost.",
+    "Jump to first invite.": "Přejít na první pozvánku.",
     "This account has been deactivated.": "Tento účet byl deaktivován.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "nový účet (%(newAccountId)s) je registrován, ale už jste přihlášeni pod jiným účtem (%(loggedInUserId)s).",
     "Continue with previous account": "Pokračovat s předchozím účtem",
@@ -1581,7 +1335,6 @@
     "Clear personal data": "Smazat osobní data",
     "Command Autocomplete": "Automatické doplňování příkazů",
     "Community Autocomplete": "Automatické doplňování skupin",
-    "DuckDuckGo Results": "Výsledky hledání DuckDuckGo",
     "Emoji Autocomplete": "Automatické doplňování emoji",
     "Notification Autocomplete": "Automatické doplňování oznámení",
     "Room Autocomplete": "Automatické doplňování místností",
@@ -1619,11 +1372,7 @@
     "Cannot connect to integration manager": "Nepovedlo se připojení ke správci integrací",
     "The integration manager is offline or it cannot reach your homeserver.": "Správce integrací neběží nebo se nemůže připojit k vašemu domovskému serveru.",
     "Clear notifications": "Odstranit oznámení",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Použít správce integrací <b>(%(serverName)s)</b> na správu botů, widgetů a samolepek.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použít správce integrací na správu botů, widgetů a samolepek.",
     "Manage integrations": "Správa integrací",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Správce integrací dostává konfigurační data a může za vás modifikovat widgety, posílat pozvánky a nastavovat úrovně oprávnění.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Přizpůsobte si aplikaci s experimentálními funkcemi. <a>Více informací</a>.",
     "Ignored/Blocked": "Ignorováno/Blokováno",
     "Error adding ignored user/server": "Chyba při přidávání ignorovaného uživatele/serveru",
     "Something went wrong. Please try again or view your console for hints.": "Něco se nepovedlo. Zkuste pro prosím znovu nebo se podívejte na detaily do konzole.",
@@ -1656,14 +1405,11 @@
     "Failed to connect to integration manager": "Nepovedlo se připojit ke správci integrací",
     "Trusted": "Důvěryhodné",
     "Not trusted": "Nedůvěryhodné",
-    "Direct message": "Přímá zpráva",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> v %(roomName)s",
-    "Messages in this room are end-to-end encrypted.": "V této místnosti jsou zprávy šifrované end-to-end.",
+    "Messages in this room are end-to-end encrypted.": "V této místnosti jsou zprávy koncově šifrované.",
     "Security": "Bezpečnost",
     "Verify": "Ověřit",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Tohoto uživatele ignorujete, takže jsou jeho zprávy skryté. <a>Přesto zobrazit.</a>",
     "Reactions": "Reakce",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagoval(a) %(content)s</reactedWith>",
     "Any of the following data may be shared:": "Následující data můžou být sdílena:",
     "Your display name": "Vaše zobrazované jméno",
     "Your avatar URL": "URL vašeho avataru",
@@ -1672,7 +1418,6 @@
     "%(brand)s URL": "URL %(brand)su",
     "Room ID": "ID místnosti",
     "Widget ID": "ID widgetu",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Použití tohoto widgetu může sdílet data <helpIcon /> s %(widgetDomain)s a vaším správcem integrací.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Použití tohoto widgetu může sdílet data <helpIcon /> s %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Widgety nepoužívají šifrování zpráv.",
     "Widget added by": "Widget přidal",
@@ -1681,8 +1426,6 @@
     "Integrations are disabled": "Integrace jsou zakázané",
     "Enable 'Manage Integrations' in Settings to do this.": "Pro provedení této akce povolte v nastavení správu integrací.",
     "Integrations not allowed": "Integrace nejsou povolené",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Váš %(brand)s neumožňuje použít správce integrací. Kontaktujte prosím správce.",
-    "Automatically invite users": "Automaticky zvát uživatele",
     "Upgrade private room": "Upgradovat soukromou místnost",
     "Upgrade public room": "Upgradovat veřejnou místnost",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgradování místnosti je pokročilá operace a je doporučeno jí provést pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo zranitelnostem.",
@@ -1690,19 +1433,11 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Upgradujeme tuto místnost z <oldVersion /> na <newVersion />.",
     "Upgrade": "Upgradovat",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varování</b>: Nastavujte zálohu jen z důvěryhodných počítačů.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Pokud si nepamatujete obnovovací klíč, můžete si <button>nastavit nové možnosti obnovení</button>",
     "Notification settings": "Nastavení oznámení",
-    "Reload": "Načíst znovu",
-    "Take picture": "Udělat fotku",
     "Remove for everyone": "Odstranit pro všechny",
-    "Remove for me": "Odstranit (jen pro mě)",
     "User Status": "Stav uživatele",
     "Verification Request": "Požadavek na ověření",
-    "Set up with a recovery key": "Nastavit obnovovací klíč",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Váš obnovovací klíč byl <b>zkopírován do schránky</b>, vložte jej:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Váš obnovovací klíč je ve složce <b>Stažené</b>.",
     "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště",
-    "The message you are trying to send is too large.": "Zpráva kterou se snažíte odeslat je příliš velká.",
     "not found": "nenalezeno",
     "Backup has a <validity>valid</validity> signature from this user": "Záloha má <validity>platný</validity> podpis od tohoto uživatele",
     "Backup has a <validity>invalid</validity> signature from this user": "Záloha má <validity>neplatný</validity> podpis od tohoto uživatele",
@@ -1712,11 +1447,9 @@
     "%(count)s verified sessions|other": "%(count)s ověřených relací",
     "%(count)s verified sessions|one": "1 ověřená relace",
     "Language Dropdown": "Menu jazyků",
-    "Help": "Pomoc",
     "Country Dropdown": "Menu států",
     "Verify this session": "Ověřit tuto relaci",
     "Encryption upgrade available": "Je dostupná aktualizace šifrování",
-    "Set up encryption": "Nastavit šifrování",
     "Verifies a user, session, and pubkey tuple": "Ověří uživatele, relaci a veřejné klíče",
     "Unknown (user, session) pair:": "Neznámý pár (uživatel, relace):",
     "Session already verified!": "Relace je už ověřená!",
@@ -1747,21 +1480,15 @@
     "They don't match": "Neodpovídají",
     "To be secure, do this in person or use a trusted way to communicate.": "Aby bylo ověření bezpečné, proveďte ho osobně nebo použijte důvěryhodný komunikační prostředek.",
     "Lock": "Zámek",
-    "Verify yourself & others to keep your chats safe": "Ověřte sebe a ostatní, aby byla vaše komunikace bezpečná",
     "Other users may not trust it": "Ostatní uživatelé této relaci nemusí věřit",
     "Later": "Později",
     "Review": "Prohlédnout",
     "This bridge was provisioned by <user />.": "Toto propojení poskytuje <user />.",
     "This bridge is managed by <user />.": "Toto propojení spravuje <user />.",
-    "Workspace: %(networkName)s": "Pracovní oblast: %(networkName)s",
-    "Channel: %(channelName)s": "Kanál: %(channelName)s",
     "Show less": "Zobrazit méně",
     "Show more": "Více",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Změna hesla resetuje šifrovací klíče pro všechny vaše relace. Pokud si nejdřív nevyexportujete klíče místností a po změně je znovu neimportujete, nedostanete se k historickým zprávám. V budoucnu se toto zjednoduší.",
-    "Cross-signing and secret storage are enabled.": "Cross-signing a bezpečné úložiště jsou zapnuté.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Váš účet má v bezpečném úložišti identitu pro cross-signing, ale v této relaci jí zatím nevěříte.",
-    "Cross-signing and secret storage are not yet set up.": "Zatím nemáte nastavený cross-signing a bezpečné úložiště.",
-    "Bootstrap cross-signing and secret storage": "Zapnout cross-signing a bezpečné úložiště",
     "Cross-signing public keys:": "Veřejné klíče pro cross-signing:",
     "in memory": "v paměti",
     "Cross-signing private keys:": "Soukromé klíče pro cross-signing:",
@@ -1772,9 +1499,6 @@
     "Unable to load session list": "Nepovedlo se načíst seznam relací",
     "Delete %(count)s sessions|other": "Smazat %(count)s relací",
     "Delete %(count)s sessions|one": "Smazat %(count)s relaci",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Bezpečně uchovávat šifrované zprávy na tomto zařízení, aby se v nich dalo vyhledávat pomocí ",
-    " to store messages from ": " na uchování zpráv z ",
-    "rooms.": "místností.",
     "Manage": "Spravovat",
     "Securely cache encrypted messages locally for them to appear in search results.": "Bezpečně uchovávat zprávy na tomto zařízení aby se v nich dalo vyhledávat.",
     "Enable": "Povolit",
@@ -1792,7 +1516,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Záloha má <validity>neplatný</validity> podpis z <verify>neověřené</verify> relace <device></device>",
     "Backup is not signed by any of your sessions": "Záloha nemá podpis z žádné vaší relace",
     "This backup is trusted because it has been restored on this session": "Záloze věříme, protože už byla v této relaci načtena",
-    "Backup key stored: ": "Zálohovací klíč je uložen: ",
     "Your keys are <b>not being backed up from this session</b>.": "Vaše klíče <b>nejsou z této relace zálohovány</b>.",
     "Enable desktop notifications for this session": "Povolit v této relaci oznámení",
     "Enable audible notifications for this session": "Povolit v této relaci zvuková oznámení",
@@ -1809,7 +1532,7 @@
     "You have not verified this user.": "Tohoto uživatele jste neověřili.",
     "You have verified this user. This user has verified all of their sessions.": "Tohoto uživatele jste ověřili a on ověřil všechny své relace.",
     "Someone is using an unknown session": "Někdo používá neznámou relaci",
-    "This room is end-to-end encrypted": "Místnost je šifrovaná end-to-end",
+    "This room is end-to-end encrypted": "Místnost je koncově šifrovaná",
     "Everyone in this room is verified": "V této místnosti jsou všichni ověřeni",
     "Mod": "Moderátor",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Požadavek na sdílení klíčů byl odeslán - podívejte se prosím na své ostatní relace, jestli vám přišel.",
@@ -1818,7 +1541,6 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Znovu zažádat o šifrovací klíče</requestLink> z vašich ostatních relací.",
     "Encrypted by an unverified session": "Šifrované neověřenou relací",
     "Encrypted by a deleted session": "Šifrované smazanou relací",
-    "Invite only": "Pouze na pozvání",
     "Send a reply…": "Odpovědět…",
     "Send a message…": "Odeslat zprávu…",
     "Direct Messages": "Přímé zprávy",
@@ -1849,7 +1571,6 @@
     "You've successfully verified %(displayName)s!": "Úspěšně jste ověřili uživatele %(displayName)s!",
     "Got it": "Dobře",
     "Encryption enabled": "Šifrování je zapnuté",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Zprávy v této místnosti jsou šifrované end-to-end. Více informací a možnost ověření uživatele najdete v jeho profilu.",
     "Encryption not enabled": "Šifrování je vypnuté",
     "The encryption used by this room isn't supported.": "Šifrování používané v této místnosti není podporované.",
     "Clear all data in this session?": "Smazat všechna data v této relaci?",
@@ -1858,10 +1579,8 @@
     "Session name": "Název relace",
     "Session key": "Klíč relace",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ověření uživatele označí jeho relace za důvěryhodné a vaše relace budou důvěryhodné pro něj.",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dát trochu klidu mysli navíc při používání šifrovaných zpráv.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dává větší jistotu, že je komunikace důvěrná.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ověření zařízení ho označí za důvěryhodné a uživatelé, kteří věří vám budou také tomuto zařízení důvěřovat.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Následující uživatele se nepovedlo do konverzace pozvat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Nepovedlo se nám vyrobit soukromou konverzaci. Zkontrolujte prosím, že pozvaný uživatel opravdu existuje a pak to zkuste znovu.",
     "Something went wrong trying to invite the users.": "Při odesílání pozvánek se něco pokazilo.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Nemůžeme pozvat tyto uživatele. Zkontrolujte prosím, že opravdu existují a zkuste to znovu.",
     "Failed to find the following users": "Nepovedlo se najít následující uživatele",
@@ -1870,29 +1589,17 @@
     "Suggestions": "Návrhy",
     "Recently Direct Messaged": "Nedávno kontaktovaní",
     "Go": "Ok",
-    "New session": "Nová relace",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Použijte tuto relaci pro ověření nové a udělení jí přístupu k vašim šifrovaným zprávám:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Pokud jste se do této nové relace nepřihlásili, váš účet může být kompromitován.",
-    "This wasn't me": "To jsem nebyl(a) já",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Toto vám umožní se přihlásit do dalších relací a vrátit se ke svému účtu poté, co se odhlásíte.",
-    "Recovery key mismatch": "Obnovovací klíč neodpovídá",
-    "Incorrect recovery passphrase": "Nesprávné heslo pro obnovení",
-    "Enter recovery passphrase": "Zadejte heslo pro obnovení zálohy",
-    "Enter recovery key": "Zadejte obnovovací klíč",
     "Confirm your identity by entering your account password below.": "Potvrďte svou identitu zadáním hesla ke svému účtu.",
     "Start": "Začít",
     "Session verified": "Relace je ověřena",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaše nová relace je teď ověřená. Má přístup k šifrovaným zprávám a ostatní uživatelé jí budou věřit.",
     "Your new session is now verified. Other users will see it as trusted.": "Vaše nová relace je teď ověřená. Ostatní uživatelé jí budou věřit.",
     "Done": "Hotovo",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Bez dokončení ověření nebude mít nová relace přístup k šifrovaným zprávám.",
     "Go Back": "Zpět",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Změna hesla resetuje šifrovací klíče ve všech vašich přihlášených relacích a přijdete tak o přístup k historickým zprávám. Před změnou hesla si nastavte zálohu klíčů nebo si klíče pro místnosti exportujte.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Všude jsme vás odhlásili, takže nedostáváte žádná oznámení. Můžete je znovu povolit tím, že se na všech svých zařízeních znovu přihlásíte.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Získejte znovu přístup k účtu a obnovte si šifrovací klíče uložené v této relaci. Bez nich nebudete schopni číst zabezpečené zprávy na některých zařízeních.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou tu pořád uložena. Smažte je, pokud chcete tuto relaci zahodit, nebo se přihlaste pod jiný účet.",
-    "If you cancel now, you won't complete verifying the other user.": "Pokud teď proces zrušíte, tak nebude druhý uživatel ověřen.",
-    "If you cancel now, you won't complete verifying your other session.": "Pokud teď proces zrušíte, tak nebude druhá relace ověřena.",
     "Cancel entering passphrase?": "Zrušit zadávání přístupové fráze?",
     "Setting up keys": "Příprava klíčů",
     "%(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)su chybí nějaké komponenty, které jsou potřeba pro vyhledávání v zabezpečených místnostech. Pokud chcete s touto funkcí experimentovat, tak si pořiďte vlastní %(brand)s Desktop s <nativeLink>přidanými komponentami</nativeLink>.",
@@ -1904,7 +1611,6 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Server si vás potřebuje ověřit, abychom mohli provést aktualizaci.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualizujte tuto přihlášenou relaci abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
     "Show typing notifications": "Zobrazovat oznámení „... právě píše...“",
-    "Reset cross-signing and secret storage": "Obnovit bezpečné úložiště a cross-signing",
     "Destroy cross-signing keys?": "Nenávratně smazat klíče pro cross-signing?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Smazání klíčů pro cross-signing je definitivní. Každý, kdo vás ověřil, teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení, ze kterých se můžete ověřit, tak to asi nechcete udělat.",
     "Clear cross-signing keys": "Smazat klíče pro cross-signing",
@@ -1917,21 +1623,18 @@
     "Compare unique emoji": "Porovnejte jedinečnou kombinaci emoji",
     "Compare a unique set of emoji if you don't have a camera on either device": "Pokud na žádném zařízení nemáte kameru, porovnejte jedinečnou kombinaci emoji",
     "Not Trusted": "Nedůvěryhodné",
-    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil do nové relace bez ověření:",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil(a) do nové relace bez ověření:",
     "Ask this user to verify their session, or manually verify it below.": "Požádejte tohoto uživatele, aby ověřil svou relaci, nebo jí níže můžete ověřit manuálně.",
     "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.": "Relace, kterou se snažíte ověřit, neumožňuje ověření QR kódem ani pomocí emoji, což je to, co %(brand)s podporuje. Zkuste použít jiného klienta.",
     "Verify by scanning": "Ověřte naskenováním",
     "You declined": "Odmítli jste",
     "%(name)s declined": "%(name)s odmítl(a)",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Uschovejte si kopii na bezpečném místě, například ve správci hesel nebo v trezoru.",
-    "Your recovery key": "Váš obnovovací klíč",
     "Copy": "Zkopírovat",
     "Upgrade your encryption": "Aktualizovat šifrování",
-    "Make a copy of your recovery key": "Vytvořit kopii svého obnovovacího klíče",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Bez nastavení Bezpečného Obnovení Zpráv nebudete moci obnovit historii šifrovaných zpráv pokud se odhlásíte nebo použijete jinou relaci.",
     "Create key backup": "Vytvořit zálohu klíčů",
     "This session is encrypting history using the new recovery method.": "Tato relace šifruje historii zpráv s podporou nového způsobu obnovení.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tato relace zjistila, že klíč a heslo k obnovení zpráv byly odstraněny.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Pokud se vám to stalo neúmyslně, můžete znovu nastavit zálohu zpráv pro tuto relaci. To znovu zašifruje historii zpráv novým způsobem.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Když je to zakázané, zprávy v šifrovaných místnostech se nebudou objevovat ve výsledcích vyhledávání.",
     "Disable": "Zakázat",
@@ -1953,12 +1656,7 @@
     "Accepting …": "Přijímání…",
     "Declining …": "Odmítání…",
     "Verification Requests": "Požadavky na ověření",
-    "Your account is not secure": "Váš účet není zabezpečený",
-    "Your password": "Vaše heslo",
-    "This session, or the other session": "Tato relace, nebo jiná",
-    "We recommend you change your password and recovery key in Settings immediately": "Doporučujeme vám si v nastavení okamžitě změnit své heslo a obnovovací klíče",
     "exists": "existuje",
-    "The internet connection either session is using": "Internetové připojení používané jednou z relací",
     "Displays information about a user": "Zobrazuje informace o uživateli",
     "Mark all as read": "Označit vše jako přečtené",
     "Not currently indexing messages for any room.": "Aktuálně neindexujeme žádné zprávy.",
@@ -1988,7 +1686,6 @@
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Nepovedlo se změnit alternativní adresy místnosti. Možná to server neumožňuje a nebo je to dočasná chyba.",
     "Local address": "Lokální adresa",
     "Published Addresses": "Publikovaná adresa",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publikovaná adresa může být použíta kýmkoli na libovolném serveru pro přidání se do místnosti. Abyste mohli adresu publikovat, musí být nejdříve nastavená jako lokální.",
     "Other published addresses:": "Další publikované adresy:",
     "No other published addresses yet, add one below": "Zatím žádné další publikované adresy, přidejte nějakou níže",
     "New published address (e.g. #alias:server)": "Nové publikované adresy (například #alias:server)",
@@ -2013,18 +1710,14 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Potvrďte, že následující emotikony se zobrazují ve stejném pořadí na obou zařízeních:",
     "Verify this session by confirming the following number appears on its screen.": "Ověřtě tuto relaci potrvrzením, že se následující čísla objevily na její obrazovce.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Čekám na ověření od relace %(deviceName)s (%(deviceId)s)…",
-    "From %(deviceName)s (%(deviceId)s)": "Od %(deviceName)s (%(deviceId)s)",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Potvrďte odstranění těchto relací pomocí Jednotného přihlášení.",
     "Confirm deleting these sessions": "Potvrdit odstranění těchto relací",
     "Click the button below to confirm deleting these sessions.": "Kliknutím na tlačítko potvrdíte odstranění těchto relací.",
     "Delete sessions": "Odstranit relace",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Pro hlášení bezpečnostních problémů s Matrixem si prosím přečtěte <a>naší Bezpečnostní politiku</a> (anglicky).",
-    "Waiting for you to accept on your other session…": "Čekáme na vaše přijetí v druhé relaci…",
     "Almost there! Is your other session showing the same shield?": "Téměř hotovo! Je vaše druhá relace také ověřená?",
     "Almost there! Is %(displayName)s showing the same shield?": "Téměř hotovo! Je relace %(displayName)s také ověřená?",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ověřili jste %(deviceName)s (%(deviceId)s)!",
-    "If you cancel now, you won't complete your operation.": "Pokud teď akci stornujete, nebudete jí moci dokončit.",
-    "Review where you’re logged in": "Zobrazit kde jste přihlášení",
     "New login. Was this you?": "Nové přihlášní. Jste to vy?",
     "%(name)s is requesting verification": "%(name)s žádá o ověření",
     "Failed to set topic": "Nepovedlo se nastavit téma",
@@ -2063,7 +1756,7 @@
     "Add a new server...": "Přidat nový server...",
     "%(networkName)s rooms": "místnosti v %(networkName)s",
     "Matrix rooms": "místnosti na Matrixu",
-    "Enable end-to-end encryption": "Povolit E2E šifrování",
+    "Enable end-to-end encryption": "Povolit koncové šifrování",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Toto nelze později vypnout. Většina botů a propojení zatím nefunguje.",
     "Server did not require any authentication": "Server nevyžadoval žádné ověření",
     "Server did not return valid authentication information.": "Server neposkytl platné informace o ověření.",
@@ -2071,19 +1764,15 @@
     "Are you sure you want to deactivate your account? This is irreversible.": "Opravdu chcete deaktivovat účet? Je to nevratné.",
     "Confirm account deactivation": "Potvrďte deaktivaci účtu",
     "There was a problem communicating with the server. Please try again.": "Došlo k potížím při komunikaci se serverem. Zkuste to prosím znovu.",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Začněte s někým konverzovat za pomocí jména, přihlašovacího jména (jako <userId/>) nebo emailu.",
     "Opens chat with the given user": "Otevře konverzaci s tímto uživatelem",
     "Sends a message to the given user": "Pošle zprávu danému uživateli",
     "Waiting for your other session to verify…": "Čekáme na ověření od vaší druhé relace…",
-    "Verify all your sessions to ensure your account & messages are safe": "Ověřte všechny své relace, abyste zaručili, že jsou vaše zprávy a účet bezpečné",
-    "Verify the new login accessing your account: %(name)s": "Ověřte nové přihlášení na váš účet: %(name)s",
     "Room name or address": "Jméno nebo adresa místnosti",
-    "Joins room with given address": "Přidat se do místnosti s danou adresou",
+    "Joins room with given address": "Vstoupit do místnosti s danou adresou",
     "Unrecognised room address:": "Nerozpoznaná adresa místnosti:",
     "Font size": "Velikost písma",
     "IRC display name width": "šířka zobrazovného IRC jména",
     "unexpected type": "neočekávaný typ",
-    "Session backup key:": "Klíč k záloze relace:",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Pomocí Jednotného přihlášení potvrdit odstranění těchto relací.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Pomocí Jednotného přihlášení potvrdit odstranění této relace.",
     "Size must be a number": "Velikost musí být číslo",
@@ -2094,20 +1783,11 @@
     "Room ID or address of ban list": "ID nebo adresa seznamu zablokovaných",
     "Help us improve %(brand)s": "Pomozte nám zlepšovat %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Zasílat <UsageDataLink>anonymní údaje o použití aplikace</UsageDataLink>, která nám pomáhají %(brand)s zlepšovat. K tomu se použije <PolicyLink>soubor cookie</PolicyLink>.",
-    "I want to help": "Chci pomoci",
     "Your homeserver has exceeded its user limit.": "Na vašem domovském serveru byl překročen limit počtu uživatelů.",
     "Your homeserver has exceeded one of its resource limits.": "Na vašem domovském serveru byl překročen limit systémových požadavků.",
     "Contact your <a>server admin</a>.": "Kontaktujte <a>administrátora serveru</a>.",
     "Ok": "Ok",
-    "Set password": "Nastavit heslo",
-    "To return to your account in future you need to set a password": "Abyste se k účtu mohli v budoucnu vrátit, je potřeba nastavit heslo",
-    "Restart": "Restartovat",
-    "Upgrade your %(brand)s": "Aktualizovat %(brand)s",
-    "A new version of %(brand)s is available!": "Je dostupná nová verze %(brand)su!",
     "Are you sure you want to cancel entering passphrase?": "Chcete určitě zrušit zadávání přístupové fráze?",
-    "Use your account to sign in to the latest version": "Přihlašte se za pomoci svého účtu do nejnovější verze",
-    "Riot is now Element!": "Riot je nyní Element!",
-    "Learn More": "Zjistit více",
     "Light": "Světlý",
     "Dark": "Tmavý",
     "You joined the call": "Připojili jste se k hovoru",
@@ -2141,22 +1821,16 @@
     "Categories": "Kategorie",
     "QR Code": "QR kód",
     "Room address": "Adresa místnosti",
-    "Please provide a room address": "Zadejte prosím adresu místnosti",
     "This address is available to use": "Tato adresa je dostupná",
     "This address is already in use": "Tato adresa je již používána",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Připomínka: váš prohlížeč není podporován, takže vaše zkušenost může být nepředvídatelná.",
-    "Set a room address to easily share your room with other people.": "Nastavte adresu místnosti, abyste ji mohli snadno sdílet s lidmi.",
     "To continue, use Single Sign On to prove your identity.": "Pro pokračování prokažte svou identitu pomocí Jednotného přihlášení.",
     "Confirm to continue": "Pro pokračování potvrďte",
     "Click the button below to confirm your identity.": "Klikněte na tlačítko níže pro potvrzení vaší identity.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Pozvěte někoho za použití jeho jména, uživatelského jména (např. <userId/>), e-mailové adresy, a nebo <a>sdílejte tuto místnost</a>.",
     "a new master key signature": "nový podpis hlavního klíče",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
-    "We’re excited to announce Riot is now Element": "S nadšením oznamujeme, že Riot je nyní Element",
     "Enable experimental, compact IRC style layout": "Povolit experimentální, kompaktní zobrazení zpráv ve stylu IRC",
     "New version available. <a>Update now.</a>": "Je dostupná nová verze. <a>Aktualizovat nyní.</a>",
     "Message layout": "Zobrazení zpráv",
-    "Compact": "Kompaktní",
     "Modern": "Moderní",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Zadejte jméno písma, které máte naistalované v systému, a %(brand)s se jej pokusí použít.",
     "Customise your appearance": "Přizpůsobte si vzhled aplikace",
@@ -2168,8 +1842,6 @@
     "Unexpected server error trying to leave the room": "Neočekávaná chyba serveru při odcházení z místnosti",
     "The person who invited you already left the room.": "Uživatel, který vás pozval, již opustil místnost.",
     "The person who invited you already left the room, or their server is offline.": "Uživatel, který vás pozval, již opustil místnost nebo je jeho server offline.",
-    "You left the call": "Odešli jste z hovoru",
-    "%(senderName)s left the call": "%(senderName)s opustil/a hovor",
     "Call ended": "Hovor skončil",
     "You started a call": "Začali jste hovor",
     "%(senderName)s started a call": "%(senderName)s začal(a) hovor",
@@ -2188,13 +1860,10 @@
     "Uploading logs": "Nahrávání záznamů",
     "Downloading logs": "Stahování záznamů",
     "Unknown caller": "Neznámý volající",
-    "Incoming voice call": "Příchozí hovor",
-    "Incoming video call": "Příchozí videohovor",
-    "Incoming call": "Příchozí hovor",
     "Your server isn't responding to some <a>requests</a>.": "Váš server neodpovídá na některé <a>požadavky</a>.",
     "Master private key:": "Hlavní soukromý klíč:",
     "%(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 nemůže bezpečně ukládat šifrované zprávy lokálně v prohlížeči. Pro zobrazení šifrovaných zpráv ve výsledcích vyhledávání použijte <desktopLink>%(brand)s Desktop</desktopLink>.",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Váš administrátor vypnul šifrování ve výchozím nastavení soukromých místností a přímých chatů.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Správce vašeho serveru vypnul ve výchozím nastavení koncové šifrování v soukromých místnostech a přímých zprávách.",
     "To link to this room, please add an address.": "Přidejte prosím místnosti adresu aby na ní šlo odkazovat.",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Pravost této šifrované zprávy nelze na tomto zařízení ověřit.",
     "Emoji picker": "Výběr emoji",
@@ -2232,7 +1901,7 @@
     "Collapse room list section": "Sbalit seznam místností",
     "Select room from the room list": "Vybrat místnost v seznamu",
     "Navigate up/down in the room list": "Posouvat se nahoru/dolů v seznamu místností",
-    "Jump to room search": "Filtrovat místnosti",
+    "Jump to room search": "Přejít na vyhledávání místností",
     "Toggle video on/off": "Zapnout nebo vypnout video",
     "Toggle microphone mute": "Ztlumit nebo zapnout mikrofon",
     "Jump to start/end of the composer": "Skočit na konec/začátek textového pole",
@@ -2246,20 +1915,15 @@
     "Autocomplete": "Automatické doplňování",
     "Room List": "Seznam místností",
     "Calls": "Hovory",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pro nastavení filtru přetáhněte avatar skupiny do panelu filtrování na levé straně obrazovky. Pak v tomto panelu můžete kdykoliv klepnout na avatar skupiny a uvidíte jen místnosti a lidi z dané skupiny.",
     "Send feedback": "Odeslat zpětnou vazbu",
     "Feedback": "Zpětná vazba",
     "Feedback sent": "Zpětná vazba byla odeslána",
-    "Security & privacy": "Zabezpečení",
+    "Security & privacy": "Zabezpečení a soukromí",
     "All settings": "Všechna nastavení",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Napište jméno nebo emailovou adresu uživatele se kterým chcete začít konverzaci (např. <userId/>).",
     "Start a new chat": "Založit novou konverzaci",
     "Which officially provided instance you are using, if any": "Kterou oficiální instanci Riot.im používáte (a jestli vůbec)",
     "Change the topic of this room": "Změnit téma této místnosti",
-    "%(senderName)s declined the call.": "%(senderName)s odmítl(a) hovor.",
-    "(an error occurred)": "(došlo k chybě)",
-    "(their device couldn't start the camera / microphone)": "(zařízení druhé strany nemohlo spustit kameru / mikrofon)",
-    "(connection failed)": "(spojení selhalo)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 K místnosti nemá přístup žádný server! Místnost už nemůže být používána.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Vloží ( ͡° ͜ʖ ͡°) na začátek zprávy",
     "Czech Republic": "Česká republika",
@@ -2281,8 +1945,6 @@
     "The call was answered on another device.": "Hovor byl přijat na jiném zařízení.",
     "Answered Elsewhere": "Zodpovězeno jinde",
     "The call could not be established": "Hovor se nepovedlo navázat",
-    "The other party declined the call.": "Druhá strana hovor odmítla.",
-    "Call Declined": "Hovor odmítnut",
     "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "TIP pro profíky: Pokud nahlásíte chybu, odešlete prosím <debugLogsLink>ladicí protokoly</debugLogsLink>, které nám pomohou problém vypátrat.",
     "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Nejříve si prosím prohlédněte <existingIssuesLink>existující chyby na Githubu</existingIssuesLink>. Žádná shoda? <newIssueLink>Nahlašte novou chybu</newIssueLink>.",
     "Report a bug": "Nahlásit chybu",
@@ -2298,7 +1960,6 @@
     "%(count)s people|other": "%(count)s osob",
     "About": "O",
     "You’re all caught up": "Vše vyřízeno",
-    "You have no visible notifications in this room.": "V této místnosti nemáte žádná viditelná oznámení.",
     "Hey you. You're the best!": "Hej ty. Jsi nejlepší!",
     "Secret storage:": "Bezpečné úložiště:",
     "Backup key cached:": "Klíč zálohy cachován:",
@@ -2307,22 +1968,18 @@
     "Algorithm:": "Algoritmus:",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Tuto možnost můžete povolit, pokud bude místnost použita pouze pro spolupráci s interními týmy na vašem domovském serveru. Toto nelze později změnit.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Blokovat komukoli, kdo není součástí serveru %(serverName)s, aby se připojil do této místnosti.",
-    "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.": "Zálohujte šifrovací klíče s daty vašeho účtu pro případ, že ztratíte přístup k relacím. Vaše klíče budou zabezpečeny jedinečným klíčem pro obnovení.",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Níže můžete spravovat názvy a odhlásit se ze svých relací nebo <a>je ověřit v uživatelském profilu</a>.",
-    "or another cross-signing capable Matrix client": "nebo jiný Matrix klient schopný cross-signing",
     "Cross-signing is not set up.": "Cross-signing není nastaveno.",
     "Cross-signing is ready for use.": "Cross-signing je připraveno k použití.",
     "Create a Group Chat": "Vytvořit skupinový chat",
     "Send a Direct Message": "Poslat přímou zprávu",
-    "This requires the latest %(brand)s on your other devices:": "To vyžaduje nejnovější %(brand)s na vašich ostatních zařízeních:",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Potvrďte svou identitu ověřením tohoto přihlášení z jedné z vašich dalších relací a udělte mu přístup k šifrovaným zprávám.",
     "Verify this login": "Ověřte toto přihlášení",
     "Welcome to %(appName)s": "Vítá vás %(appName)s",
     "Liberate your communication": "Osvoboďte svou komunikaci",
     "Navigation": "Navigace",
     "Use the + to make a new room or explore existing ones below": "Pomocí + vytvořte novou místnost nebo prozkoumejte stávající místnosti",
     "Secure Backup": "Zabezpečená záloha",
-    "Jump to oldest unread message": "Jít na nejstarší nepřečtenou zprávu",
+    "Jump to oldest unread message": "Přejít na nejstarší nepřečtenou zprávu",
     "Upload a file": "Nahrát soubor",
     "You've reached the maximum number of simultaneous calls.": "Dosáhli jste maximálního počtu souběžných hovorů.",
     "Too Many Calls": "Přiliš mnoho hovorů",
@@ -2333,29 +1990,20 @@
     "Switch to light mode": "Přepnout do světlého režimu",
     "User settings": "Uživatelská nastavení",
     "Community settings": "Nastavení skupiny",
-    "Confirm your recovery passphrase": "Potvrďte vaši přístupovou frázi pro obnovení",
-    "Repeat your recovery passphrase...": "Opakujte přístupovou frázi pro obnovení...",
-    "Please enter your recovery passphrase a second time to confirm.": "Potvrďte prosím podruhé svou frázi pro obnovení.",
     "Use a different passphrase?": "Použít jinou přístupovou frázi?",
-    "Great! This recovery passphrase looks strong enough.": "Skvělé! Tato fráze pro obnovení vypadá dostatečně silně.",
-    "Enter a recovery passphrase": "Zadejte frázi pro obnovení",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s nebo %(usernamePassword)s",
     "If you've joined lots of rooms, this might take a while": "Pokud jste se připojili ke spoustě místností, může to chvíli trvat",
     "There was a problem communicating with the homeserver, please try again later.": "Při komunikaci s domovským serverem došlo k potížím, zkuste to prosím později.",
     "Continue with %(ssoButtons)s": "Pokračovat s %(ssoButtons)s",
-    "Use Recovery Key": "Použít klíč pro obnovu",
-    "Use Recovery Key or Passphrase": "Použít klíč pro obnovu nebo frázi",
     "Already have an account? <a>Sign in here</a>": "Máte již účet? <a>Přihlašte se zde</a>",
     "Host account on": "Hostovat účet na",
     "Signing In...": "Přihlašování...",
     "Syncing...": "Synchronizuji...",
     "That username already exists, please try another.": "Toto uživatelské jméno již existuje, zkuste prosím jiné.",
-    "Verify other session": "Ověření jiné relace",
     "Filter rooms and people": "Filtrovat místnosti a lidi",
     "Explore rooms in %(communityName)s": "Prozkoumejte místnosti v %(communityName)s",
     "delete the address.": "smazat adresu.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Smazat adresu místnosti %(alias)s a odebrat %(name)s z adresáře?",
-    "Self-verification request": "Požadavek na sebeověření",
     "%(creator)s created this DM.": "%(creator)s vytvořil(a) tuto přímou zprávu.",
     "You do not have permission to create rooms in this community.": "Nemáte oprávnění k vytváření místností v této skupině.",
     "Cannot create rooms in this community": "V této skupině nelze vytvořit místnosti",
@@ -2383,7 +2031,7 @@
     "This is the start of <roomName/>.": "Toto je začátek místnosti <roomName/>.",
     "Topic: %(topic)s ": "Téma: %(topic)s ",
     "Topic: %(topic)s (<a>edit</a>)": "Téma: %(topic)s (<a>upravit</a>)",
-    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Zprávy zde jsou šifrovány end-to-end. Ověřte uživatele %(displayName)s v jeho profilu - klepněte na jeho avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Zprávy zde jsou koncově šifrovány. Ověřte uživatele %(displayName)s v jeho profilu - klepněte na jeho avatar.",
     "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.": "Zadejte frázi zabezpečení, kterou znáte jen vy, k ochraně vašich dat. Z důvodu bezpečnosti byste neměli znovu používat heslo k účtu.",
     "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Použijte tajnou frázi, kterou znáte pouze vy, a volitelně uložte bezpečnostní klíč, který použijete pro zálohování.",
     "Enter a Security Phrase": "Zadání bezpečnostní fráze",
@@ -2411,13 +2059,7 @@
     "Show": "Zobrazit",
     "Reason (optional)": "Důvod (volitelné)",
     "Add image (optional)": "Přidat obrázek (volitelné)",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Do soukromé místnosti se lze připojit pouze s pozvánkou. Veřejné místnosti lze najít a může se do nich připojit kdokoli.",
     "Currently indexing: %(currentRoom)s": "Aktuálně se indexuje: %(currentRoom)s",
-    "Secure your backup with a recovery passphrase": "Zabezpečte zálohu pomocí fráze pro obnovení",
-    "%(brand)s Android": "%(brand)s Android",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s Web": "%(brand)s Web",
     "Use email to optionally be discoverable by existing contacts.": "Pomocí e-mailu můžete být volitelně viditelní pro existující kontakty.",
     "Use email or phone to optionally be discoverable by existing contacts.": "Použijte e-mail nebo telefon, abyste byli volitelně viditelní pro stávající kontakty.",
     "Sign in with SSO": "Přihlásit pomocí SSO",
@@ -2447,7 +2089,6 @@
     "Information": "Informace",
     "%(count)s results|one": "%(count)s výsledek",
     "Explore community rooms": "Prozkoumat místnosti skupin",
-    "Role": "Role",
     "Madagascar": "Madagaskar",
     "Macedonia": "Makedonie",
     "Macau": "Macao",
@@ -2597,7 +2238,6 @@
     "American Samoa": "Americká Samoa",
     "Room Info": "Informace o místnosti",
     "Enable desktop notifications": "Povolit oznámení na ploše",
-    "Invalid Recovery Key": "Neplatný klíč pro obnovení",
     "Security Key": "Bezpečnostní klíč",
     "Use your Security Key to continue.": "Pokračujte pomocí bezpečnostního klíče.",
     "If they don't match, the security of your communication may be compromised.": "Pokud se neshodují, bezpečnost vaší komunikace může být kompromitována.",
@@ -2628,12 +2268,10 @@
     "Cancel replying to a message": "Zrušení odpovědi na zprávu",
     "Don't miss a reply": "Nezmeškejte odpovědět",
     "Unknown App": "Neznámá aplikace",
-    "%(name)s paused": "%(name)s pozastaven",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Zálohu nebylo možné dešifrovat pomocí tohoto klíče pro obnovení: ověřte, zda jste zadali správný klíč pro obnovení.",
     "Move right": "Posunout doprava",
     "Move left": "Posunout doleva",
     "Go to Home View": "Přejít na domovské zobrazení",
-    "Dismiss read marker and jump to bottom": "Zavřít značku přečtených zpráv a skočit dolů",
+    "Dismiss read marker and jump to bottom": "Zavřít značku přečtených zpráv a přejít dolů",
     "Previous/next room or DM": "Předchozí/další místnost nebo přímá zpráva",
     "Previous/next unread room or DM": "Předchozí/další nepřečtená místnost nebo přímá zpráva",
     "Not encrypted": "Není šifrováno",
@@ -2643,7 +2281,6 @@
     "Approve widget permissions": "Schválit oprávnění widgetu",
     "Enter name": "Zadejte jméno",
     "Ignored attempt to disable encryption": "Ignorovaný pokus o deaktivaci šifrování",
-    "Show chat effects": "Zobrazit efekty chatu",
     "%(count)s people|one": "%(count)s osoba",
     "Takes the call in the current room off hold": "Zruší podržení hovoru v aktuální místnosti",
     "Places the call in the current room on hold": "Podrží hovor v aktuální místnosti",
@@ -2743,7 +2380,6 @@
     "Nauru": "Nauru",
     "Namibia": "Namibie",
     "Security Phrase": "Bezpečnostní fráze",
-    "Wrong Recovery Key": "Nesprávný klíč pro obnovení",
     "Fetching keys from server...": "Načítání klíčů ze serveru ...",
     "Use Command + Enter to send a message": "K odeslání zprávy použijte Command + Enter",
     "Use Ctrl + Enter to send a message": "K odeslání zprávy použijte Ctrl + Enter",
@@ -2766,19 +2402,14 @@
     "A connection error occurred while trying to contact the server.": "Při pokusu o kontakt se serverem došlo k chybě připojení.",
     "The server is not configured to indicate what the problem is (CORS).": "Server není nakonfigurován tak, aby indikoval, v čem je problém (CORS).",
     "Recent changes that have not yet been received": "Nedávné změny, které dosud nebyly přijaty",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nelze získat přístup k úložišti klíčů. Ověřte, zda jste zadali správnou přístupovou frázi pro obnovení.",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Pokračujte zadáním bezpečnostní fráze nebo <button>použijte váš bezpečnostní klíč</button> pro pokračování.",
     "Restoring keys from backup": "Obnovení klíčů ze zálohy",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Zálohu nebylo možné dešifrovat pomocí této přístupové fráze pro obnovení: ověřte, zda jste zadali správnou přístupovou frázi pro obnovení.",
     "%(completed)s of %(total)s keys restored": "Obnoveno %(completed)s z %(total)s klíčů",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Uložte bezpečnostní klíč někam na bezpečné místo, například do správce hesel nebo do trezoru, který slouží k ochraně vašich šifrovaných dat.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Váš klíč pro obnovení je bezpečnostní sítí - můžete jej použít k obnovení přístupu k šifrovaným zprávám, pokud zapomenete přístupovou frázi pro obnovení.",
-    "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.": "Byla zjištěna data ze starší verze %(brand)s. To bude mít za následek nefunkčnost end-to-end kryptografie ve starší verzi. End-to-end šifrované zprávy vyměněné nedávno při používání starší verze nemusí být v této verzi dešifrovatelné. To může také způsobit selhání zpráv vyměňovaných s touto verzí. Pokud narazíte na problémy, odhlaste se a znovu se přihlaste. Chcete-li zachovat historii zpráv, exportujte a znovu importujte klíče.",
+    "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.": "Byla zjištěna data ze starší verze %(brand)s. To bude mít za následek nefunkčnost koncové kryptografie ve starší verzi. Koncově šifrované zprávy vyměněné nedávno při používání starší verze nemusí být v této verzi dešifrovatelné. To může také způsobit selhání zpráv vyměňovaných s touto verzí. Pokud narazíte na problémy, odhlaste se a znovu se přihlaste. Chcete-li zachovat historii zpráv, exportujte a znovu importujte klíče.",
     "Failed to find the general chat for this community": "Nepodařilo se najít obecný chat pro tuto skupinu",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Na náš server uložíme zašifrovanou kopii vašich klíčů. Zabezpečte zálohu pomocí přístupové fráze pro obnovení.",
-    "Enter your recovery passphrase a second time to confirm it.": "Zadejte podruhé přístupovou frázi pro obnovení a potvrďte ji.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Pokud nyní nebudete pokračovat, můžete ztratit šifrované zprávy a data, pokud ztratíte přístup ke svým přihlašovacím údajům.",
-    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Zprávy v této místnosti jsou šifrovány end-to-end. Když se lidé připojí, můžete je ověřit v jejich profilu, stačí klepnout na jejich avatara.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Zprávy v této místnosti jsou koncově šifrovány. Když se lidé připojí, můžete je ověřit v jejich profilu, stačí klepnout na jejich avatara.",
     "Revoke permissions": "Odvolat oprávnění",
     "Continuing without email": "Pokračuje se bez e-mailu",
     "You can change this later if needed.": "V případě potřeby to můžete později změnit.",
@@ -2823,16 +2454,13 @@
     "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.": "Toto můžete deaktivovat, pokud bude místnost použita pro spolupráci s externími týmy, které mají svůj vlastní domovský server. Toto nelze později změnit.",
     "Join the conference from the room information card on the right": "Připojte se ke konferenci z informační karty místnosti napravo",
     "Join the conference at the top of this room": "Připojte se ke konferenci v horní části této místnosti",
-    "There are advanced notifications which are not shown here.": "Existují pokročilá oznámení, která se zde nezobrazují.",
-    "Enable advanced debugging for the room list": "Povolit pokročilé ladění pro seznam místností",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místnosti.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místností.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Možná jste je nakonfigurovali v jiném klientovi než %(brand)s. Nelze je zobrazit v %(brand)s, ale stále platí.",
     "well formed": "ve správném tvaru",
     "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Při vytváření vaší skupiny došlo k chybě. Název může být již obsazen nebo server nemůže zpracovat váš požadavek.",
     "See <b>%(eventType)s</b> events posted to this room": "Zobrazit události <b>%(eventType)s</b> zveřejněné v této místnosti",
     "Send stickers to your active room as you": "Poslat nálepky do vaší aktivní místnosti jako vy",
-    "Send stickers to this room as you": "Poslat samolepky jako vy do této místnosti",
+    "Send stickers to this room as you": "Poslat nálepky jako vy do této místnosti",
     "Change the topic of your active room": "Změnit téma vaší aktivní místnosti",
     "Change which room you're viewing": "Změnit kterou místnost si prohlížíte",
     "Send stickers into your active room": "Poslat nálepky do vaší aktivní místnosti",
@@ -2860,7 +2488,6 @@
     "See <b>%(msgtype)s</b> messages posted to this room": "Prohlédnout zprávy <b>%(msgtype)s</b> zveřejněné v této místnosti",
     "See <b>%(msgtype)s</b> messages posted to your active room": "Prohlédnout zprávy <b>%(msgtype)s</b> zveřejněné ve vaší aktivní místnosti",
     "Render LaTeX maths in messages": "Ve zprávách vykreslit matematické výrazy LaTeXu",
-    "New spinner design": "Nový design ukazatele zpracování",
     "Show message previews for reactions in DMs": "Zobrazit náhledy zpráv pro reakce v přímých zprávách",
     "Show message previews for reactions in all rooms": "Zobrazit náhledy zpráv pro reakce ve všech místnostech",
     "Sends the given message with confetti": "Pošle zprávu s konfetami",
@@ -2901,7 +2528,6 @@
     "There was an error finding this widget.": "Při hledání tohoto widgetu došlo k chybě.",
     "Active Widgets": "Aktivní widgety",
     "Open dial pad": "Otevřít číselník",
-    "Start a Conversation": "Zahájit konverzaci",
     "Dial pad": "Číselník",
     "There was an error looking up the phone number": "Při vyhledávání telefonního čísla došlo k chybě",
     "Unable to look up phone number": "Nelze nalézt telefonní číslo",
@@ -2918,7 +2544,6 @@
     "Access your secure message history and set up secure messaging by entering your Security Key.": "Vstupte do historie zabezpečených zpráv a nastavte zabezpečené zprávy zadáním bezpečnostního klíče.",
     "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Vstupte do historie zabezpečených zpráv a nastavte zabezpečené zprávy zadáním bezpečnostní fráze.",
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Nelze získat přístup k zabezpečenému úložišti. Ověřte, zda jste zadali správnou bezpečnostní frázi.",
-    "We recommend you change your password and Security Key in Settings immediately": "Doporučujeme vám okamžitě změnit heslo a bezpečnostní klíč v Nastavení",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Tato relace zjistila, že byla odstraněna vaše bezpečnostní fráze a klíč pro zabezpečené zprávy.",
     "A new Security Phrase and key for Secure Messages have been detected.": "Byla zjištěna nová bezpečnostní fráze a klíč pro zabezpečené zprávy.",
     "Make a copy of your Security Key": "Vytvořte kopii bezpečnostního klíče",
@@ -2932,7 +2557,6 @@
     "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Váš bezpečnostní klíč byl <b>zkopírován do schránky</b>, vložte jej do:",
     "Your Security Key is in your <b>Downloads</b> folder.": "Váš bezpečnostní klíč je ve složce <b>Stažené soubory</b>.",
     "Your Security Key": "Váš bezpečnostní klíč",
-    "Please enter your Security Phrase a second time to confirm.": "Potvrďte prosím svou bezpečnostní frázi.",
     "Great! This Security Phrase looks strong enough.": "Skvělé! Tato bezpečnostní fráze vypadá dostatečně silně.",
     "Use Security Key or Phrase": "Použijte bezpečnostní klíč nebo frázi",
     "Not a valid Security Key": "Neplatný bezpečnostní klíč",
@@ -2947,12 +2571,8 @@
     "Remember this": "Zapamatujte si toto",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "Widget ověří vaše uživatelské ID, ale nebude za vás moci provádět akce:",
     "Allow this widget to verify your identity": "Povolte tomuto widgetu ověřit vaši identitu",
-    "Use Ctrl + F to search": "Hledejte pomocí Ctrl + F",
-    "Use Command + F to search": "Hledejte pomocí Command + F",
     "Converts the DM to a room": "Převede přímou zprávu na místnost",
     "Converts the room to a DM": "Převede místnost na přímou zprávu",
-    "Mobile experience": "Zážitek na mobilních zařízeních",
-    "Element Web is currently experimental on mobile. The native apps are recommended for most people.": "Element Web je v současné době experimentální na mobilních zařízeních. Nativní aplikace se doporučují pro většinu lidí.",
     "Use app for a better experience": "Pro lepší zážitek použijte aplikaci",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web je v mobilní verzi experimentální. Chcete-li získat lepší zážitek a nejnovější funkce, použijte naši bezplatnou nativní aplikaci.",
     "Use app": "Použijte aplikaci",
@@ -2963,13 +2583,9 @@
     "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.": "Požádali jsme prohlížeč, aby si zapamatoval, který domovský server používáte k přihlášení, ale váš prohlížeč to bohužel zapomněl. Přejděte na přihlašovací stránku a zkuste to znovu.",
     "We couldn't log you in": "Nemohli jsme vás přihlásit",
     "Show stickers button": "Tlačítko Zobrazit nálepky",
-    "Windows": "Okna",
-    "Screens": "Obrazovky",
-    "Share your screen": "Sdílejte svou obrazovku",
     "Expand code blocks by default": "Ve výchozím nastavení rozbalit bloky kódu",
     "Show line numbers in code blocks": "Zobrazit čísla řádků v blocích kódu",
     "Recently visited rooms": "Nedávno navštívené místnosti",
-    "Upgrade to pro": "Upgradujte na profesionální verzi",
     "Minimize dialog": "Minimalizovat dialog",
     "Maximize dialog": "Maximalizovat dialog",
     "%(hostSignupBrand)s Setup": "Nastavení %(hostSignupBrand)s",
@@ -3004,54 +2620,28 @@
     "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)",
-    "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 prostoru: %(csvUsers)s",
     "A private space for you and your teammates": "Soukromý prostor 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í v prostoru 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í prostorů.",
-    "Default Rooms": "Výchozí místnosti",
-    "Add existing rooms & spaces": "Přidat stávající místnosti a prostory",
-    "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 prostor '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Tento prostor 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 prostor",
-    "Make this space private": "Nastavit tento prostor jako soukromý",
     "Edit settings relating to your space.": "Upravte nastavení týkající se vašeho prostoru.",
     "Space settings": "Nastavení prostoru",
     "Failed to save space settings.": "Nastavení prostoru se nepodařilo uložit.",
@@ -3059,19 +2649,12 @@
     "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 prostor</a>.",
     "Unnamed Space": "Nejmenovaný prostor",
     "Invite to %(spaceName)s": "Pozvat do %(spaceName)s",
-    "Failed to add rooms to space": "Nepodařilo se přidat místnosti do prostoru",
-    "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": "Prostory",
-    "Filter your rooms and spaces": "Filtrujte své místnosti a prostory",
-    "Add existing spaces/rooms": "Přidat existující space/místnost",
     "Space selection": "Výběr prostoru",
     "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 prostoru, 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 prostoru",
     "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 prostoru",
@@ -3082,30 +2665,22 @@
     "Sending your message...": "Odesílání zprávy...",
     "Spell check dictionaries": "Slovníky pro kontrolu pravopisu",
     "Space options": "Nastavení prostoru",
-    "Space Home": "Domov space",
-    "New room": "Nová místnost",
     "Leave space": "Opusit prostor",
     "Invite people": "Pozvat lidi",
     "Share your public space": "Sdílejte svůj veřejný prostor",
-    "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 panel prostoru",
     "Collapse space panel": "Sbalit panel prostoru",
     "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ý prostor",
     "Your public space": "Váš veřejný prostor",
-    "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ý prostor pro kohokoli, nejlepší pro komunity",
     "Public": "Veřejný",
     "Create a space": "Vytvořit prostor",
-    "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.": "Prototyp prostorů. Nejsou kompatibilní se skupinami, skupinami v2 a vlastními štítky. Pro některé funkce je vyžadován kompatibilní domovský server.",
+    "Jump to the bottom of the timeline when you send a message": "Po odeslání zprávy přejít na konec časové osy",
     "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",
@@ -3118,10 +2693,8 @@
     "Welcome to <name/>": "Vítejte v <name/>",
     "Support": "Podpora",
     "Room name": "Název místnosti",
-    "Finish": "Dokončit",
     "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.": "Toto obvykle ovlivňuje pouze to, jak je místnost zpracována na serveru. Pokud máte problémy s %(brand)s, nahlaste prosím chybu.",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Pro každého z nich vytvoříme místnost. Později můžete přidat další, včetně již existujících.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Vytvořme místnost pro každého z nich. Později můžete přidat i další, včetně již existujících.",
     "Make sure the right people have access. You can invite more later.": "Zajistěte přístup pro správné lidi. Další můžete pozvat později.",
     "A private space to organise your rooms": "Soukromý prostor pro uspořádání vašich místností",
     "Make sure the right people have access to %(name)s": "Zajistěte, aby do %(name)s měli přístup správní lidé",
@@ -3131,19 +2704,12 @@
     "Private space": "Soukromý prostor",
     "Public space": "Veřejný prostor",
     "<inviter/> invites you": "<inviter/> vás zve",
-    "Search names and description": "Prohledat jména a popisy",
-    "Create room": "Vytvořit místnost",
     "You may want to try a different search or check for typos.": "Možná budete chtít zkusit vyhledat něco jiného nebo zkontrolovat překlepy.",
     "No results found": "Nebyly nalezeny žádné výsledky",
     "Mark as suggested": "Označit jako doporučené",
     "Mark as not suggested": "Označit jako nedoporučené",
     "Removing...": "Odebírání...",
     "Failed to remove some rooms. Try again later": "Odebrání některých místností se nezdařilo. Zkuste to později znovu",
-    "%(count)s rooms and 1 space|one": "%(count)s místnost a 1 prostor",
-    "%(count)s rooms and 1 space|other": "%(count)s místností a 1 prostor",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s místnost a %(numSpaces)s prostorů",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s místností a %(numSpaces)s prostorů",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Pokud nemůžete najít místnost, kterou hledáte, požádejte o pozvánku nebo <a>vytvořte novou místnost</a>.",
     "This room is suggested as a good one to join": "Tato místnost je doporučena jako dobrá pro připojení",
     "Suggested": "Doporučeno",
     "%(count)s rooms|one": "%(count)s místnost",
@@ -3156,36 +2722,23 @@
     "Invite with email or username": "Pozvěte e-mailem nebo uživatelským jménem",
     "You can change these anytime.": "Tyto údaje můžete kdykoli změnit.",
     "Add some details to help people recognise it.": "Přidejte nějaké podrobnosti, aby ho lidé lépe rozpoznali.",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Prostory jsou nový způsob, jak seskupovat místnosti a lidi. Chcete-li se připojit ke stávajícímu prostoru, budete potřebovat pozvánku.",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "K vašemu účtu přistupuje nové přihlášení: %(name)s (%(deviceID)s) pomocí %(ip)s",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Z %(deviceName)s (%(deviceId)s) pomocí %(ip)s",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Ověřte toto přihlášení, abyste získali přístup k šifrovaným zprávám a dokázali ostatním, že jste to opravdu vy.",
-    "Verify with another session": "Ověřit pomocí jiné relace",
     "Just me": "Jen já",
     "Edit devices": "Upravit zařízení",
     "Check your devices": "Zkontrolujte svá zařízení",
     "You have unverified logins": "Máte neověřená přihlášení",
-    "Open": "Otevřít",
-    "Share decryption keys for room history when inviting users": "Při pozvání uživatelů sdílet dešifrovací klíče pro historii místnosti",
     "Manage & explore rooms": "Spravovat a prozkoumat místnosti",
-    "Message search initilisation failed": "Inicializace vyhledávání zpráv se nezdařila",
     "%(count)s people you know have already joined|one": "%(count)s osoba, kterou znáte, se již připojila",
     "Invited people will be able to read old messages.": "Pozvaní lidé budou moci číst staré zprávy.",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Pokud tak učiníte, nezapomeňte, že žádná z vašich zpráv nebude smazána, ale vyhledávání může být na několik okamžiků degradováno, zatímco index bude znovu vytvářen",
     "You can add more later too, including already existing ones.": "Později můžete přidat i další, včetně již existujících.",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Ověřte svou identitu, abyste získali přístup k šifrovaným zprávám a prokázali svou identitu ostatním.",
     "Sends the given message as a spoiler": "Odešle danou zprávu jako spoiler",
     "Review to ensure your account is safe": "Zkontrolujte, zda je váš účet v bezpečí",
     "%(deviceId)s from %(ip)s": "%(deviceId)s z %(ip)s",
-    "Send and receive voice messages (in development)": "Odesílat a přijímat hlasové zprávy (ve vývoji)",
     "unknown person": "neznámá osoba",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Konzultace s %(transferTarget)s. <a>Převod na %(transferee)s</a>",
     "Warn before quitting": "Varovat před ukončením",
     "Invite to just this room": "Pozvat jen do této místnosti",
     "Quick actions": "Rychlé akce",
-    "Invite messages are hidden by default. Click to show the message.": "Zprávy s pozvánkou jsou ve výchozím nastavení skryté. Kliknutím zobrazíte zprávu.",
-    "Record a voice message": "Nahrát hlasovou zprávu",
-    "Stop & send recording": "Zastavit a odeslat záznam",
     "Accept on your other login…": "Přijměte ve svém dalším přihlášení…",
     "%(count)s people you know have already joined|other": "%(count)s lidí, které znáte, se již připojili",
     "Add existing rooms": "Přidat stávající místnosti",
@@ -3228,8 +2781,6 @@
     "Failed to send": "Odeslání se nezdařilo",
     "What do you want to organise?": "Co si přejete organizovat?",
     "Filter all spaces": "Filtrovat všechny prostory",
-    "Delete recording": "Smazat zvukovou zprávu",
-    "Stop the recording": "Zastavit nahrávání",
     "%(count)s results in all spaces|one": "%(count)s výsledek ve všech prostorech",
     "%(count)s results in all spaces|other": "%(count)s výsledků ve všech prostorech",
     "Play": "Přehrát",
@@ -3238,10 +2789,7 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Vyberte místnosti nebo konverzace, které chcete přidat. Toto je prostor pouze pro vás, nikdo nebude informován. Později můžete přidat další.",
     "You have no ignored users.": "Nemáte žádné ignorované uživatele.",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Jedná se o experimentální funkci.</b> Noví uživatelé, kteří obdrží pozvánku, ji budou muset otevřít na <link/>, aby se mohli připojit.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Pro připojení k %(spaceName)s, zapněte <a>Prostory beta</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Pro zobrazení %(spaceName)s, zapněte <a>Prostory beta</a>",
     "Select a room below first": "Nejprve si vyberte místnost níže",
-    "Communities are changing to Spaces": "Skupiny se mění na Prostory",
     "Join the beta": "Připojit se k beta verzi",
     "Leave the beta": "Opustit beta verzi",
     "Beta": "Beta",
@@ -3251,8 +2799,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Přidávání místnosti...",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Přidávání místností... (%(progress)s z %(count)s)",
     "Not all selected were added": "Ne všechny vybrané byly přidány",
-    "You can add existing spaces to a space.": "Do prostoru můžete přidat existující prostory.",
-    "Feeling experimental?": "Chcete experimentovat?",
     "You are not allowed to view this server's rooms list": "Namáte oprávnění zobrazit seznam místností tohoto serveru",
     "Error processing voice message": "Chyba při zpracování hlasové zprávy",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Ve vašem zařízení nebyl nalezen žádný mikrofon. Zkontrolujte prosím nastavení a zkuste to znovu.",
@@ -3262,29 +2808,18 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Chcete experimentovat? Laboratoře jsou nejlepším způsobem, jak získat novinky v raném stádiu, vyzkoušet nové funkce a pomoci je formovat ještě před jejich spuštěním. <a>Zjistěte více</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "Přístupový token vám umožní plný přístup k účtu. Nikomu ho nesdělujte.",
     "Access Token": "Přístupový token",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Prostory představují nový způsob seskupování místností a osob. Chcete-li se připojit k existujícímu prostoru, potřebujete pozvánku.",
     "Please enter a name for the space": "Zadejte prosím název prostoru",
     "Connecting": "Spojování",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Povolit Peer-to-Peer pro hovory 1:1 (pokud tuto funkci povolíte, druhá strana může vidět vaši IP adresu)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta verze je k dispozici pro web, desktop a Android. Některé funkce mohou být na vašem domovském serveru nedostupné.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Beta verzi můžete kdykoli opustit v nastavení nebo klepnutím na štítek beta verze, jako je ten výše.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s se znovu načte s povolenými Prostory. Skupiny a vlastní značky budou skryty.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta verze je k dispozici pro web, desktop a Android. Děkujeme vám za vyzkoušení beta verze.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s se znovu načte s vypnutými Prostory. Skupiny a vlastní značky budou opět viditelné.",
     "Spaces are a new way to group rooms and people.": "Prostory představují nový způsob seskupování místností a osob.",
     "Message search initialisation failed": "Inicializace vyhledávání zpráv se nezdařila",
-    "Spaces are a beta feature.": "Prostory jsou funkcí beta verze.",
     "Search names and descriptions": "Hledat názvy a popisy",
     "You may contact me if you have any follow up questions": "V případě dalších dotazů se na mě můžete obrátit",
     "To leave the beta, visit your settings.": "Chcete-li opustit beta verzi, jděte do nastavení.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Vaše platforma a uživatelské jméno budou zaznamenány, abychom mohli co nejlépe využít vaši zpětnou vazbu.",
     "%(featureName)s beta feedback": "%(featureName)s zpětná vazba beta verze",
     "Thank you for your feedback, we really appreciate it.": "Děkujeme za vaši zpětnou vazbu, velmi si jí vážíme.",
-    "Beta feedback": "Zpětná vazba na betaverzi",
     "Add reaction": "Přidat reakci",
-    "Send and receive voice messages": "Odeslat a přijmout hlasové zprávy",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Vaše zpětná vazba pomůže zlepšit prostory. Čím podrobnější bude, tím lépe.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Pokud odejdete, %(brand)s se znovu načte s vypnutými Prostory. Skupiny a vlastní značky budou opět viditelné.",
     "Space Autocomplete": "Automatické dokončení prostoru",
     "Go to my space": "Přejít do mého prostoru",
     "sends space invaders": "pošle space invaders",
@@ -3292,5 +2827,340 @@
     "See when people join, leave, or are invited to your active room": "Zjistěte, kdy se lidé připojí, odejdou nebo jsou pozváni do vaší aktivní místnosti",
     "Kick, ban, or invite people to this room, and make you leave": "Vykopnout, vykázat, pozvat lidi do této místnosti nebo odejít",
     "Kick, ban, or invite people to your active room, and make you leave": "Vykopnout, vykázat, pozvat lidi do vaší aktivní místnosti nebo odejít",
-    "See when people join, leave, or are invited to this room": "Zjistěte, kdy se lidé připojí, odejdou nebo jsou pozváni do této místnosti"
+    "See when people join, leave, or are invited to this room": "Zjistěte, kdy se lidé připojí, odejdou nebo jsou pozváni do této místnosti",
+    "Currently joining %(count)s rooms|one": "Momentálně se připojuje %(count)s místnost",
+    "Currently joining %(count)s rooms|other": "Momentálně se připojuje %(count)s místností",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Vyzkoušejte jiná slova nebo zkontrolujte překlepy. Některé výsledky nemusí být viditelné, protože jsou soukromé a potřebujete k nim pozvánku.",
+    "No results for \"%(query)s\"": "Žádné výsledky pro \"%(query)s\"",
+    "The user you called is busy.": "Volaný uživatel je zaneprázdněn.",
+    "User Busy": "Uživatel zaneprázdněn",
+    "Teammates might not be able to view or join any private rooms you make.": "Je možné, že spolupracovníci nebudou moci zobrazit soukromé místnosti, které jste vytvořili, nebo se k nim připojit.",
+    "Or send invite link": "Nebo pošlete pozvánku",
+    "If you can't see who you’re looking for, send them your invite link below.": "Pokud jste nenašli, koho hledáte, pošlete mu odkaz na pozvánku níže.",
+    "Some suggestions may be hidden for privacy.": "Některé návrhy mohou být z důvodu ochrany soukromí skryty.",
+    "Search for rooms or people": "Hledat místnosti nebo osoby",
+    "Message preview": "Náhled zprávy",
+    "Forward message": "Přeposlat zprávu",
+    "Open link": "Otevřít odkaz",
+    "Sent": "Odesláno",
+    "You don't have permission to do this": "K tomu nemáte povolení",
+    "Error - Mixed content": "Chyba - Smíšený obsah",
+    "Error loading Widget": "Chyba při načítání widgetu",
+    "Pinned messages": "Připnuté zprávy",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Pokud máte oprávnění, otevřete nabídku na libovolné zprávě a výběrem možnosti <b>Připnout</b> je sem vložte.",
+    "Nothing pinned, yet": "Zatím není nic připnuto",
+    "End-to-end encryption isn't enabled": "Není povoleno koncové šifrování",
+    "[number]": "[číslo]",
+    "To view %(spaceName)s, you need an invite": "Pro zobrazení %(spaceName)s potřebujete pozvánku",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Kliknutím na avatar na panelu filtrů můžete kdykoli zobrazit pouze místnosti a lidi spojené s danou komunitou.",
+    "Move down": "Posun dolů",
+    "Move up": "Posun nahoru",
+    "Report": "Nahlásit",
+    "Collapse reply thread": "Sbalit vlákno odpovědi",
+    "Show preview": "Zobrazit náhled",
+    "View source": "Zobrazit zdroj",
+    "Forward": "Vpřed",
+    "Settings - %(spaceName)s": "Nastavení - %(spaceName)s",
+    "Report the entire room": "Nahlásit celou místnost",
+    "Spam or propaganda": "Spam nebo propaganda",
+    "Illegal Content": "Nelegální obsah",
+    "Toxic Behaviour": "Nevhodné chování",
+    "Disagree": "Nesouhlasím",
+    "Please pick a nature and describe what makes this message abusive.": "Vyberte prosím charakter zprávy a popište, v čem je tato zpráva zneužitelná.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Jakýkoli jiný důvod. Popište problém.\nTento problém bude nahlášen moderátorům místnosti.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Tato místnost je věnována nelegálnímu a nevhodnému obsahu nebo moderátoři nedokáží nelegální a nevhodný obsah moderovat.\nTato skutečnost bude nahlášena správcům %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Tato místnost je věnována nelegálnímu a nevhodnému obsahu nebo moderátoři nedokáží nelegální a nevhodný obsah moderovat.\nTata skutečnost bude nahlášena správcům %(homeserver)s. Správci NEBUDOU moci číst zašifrovaný obsah této místnosti.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Tento uživatel spamuje místnost reklamami, odkazy na reklamy nebo propagandou.\nTato skutečnost bude nahlášena moderátorům místnosti.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Tento uživatel se chová nezákonně, například zveřejňuje osobní údaje o cizích lidech nebo vyhrožuje násilím.\nTato skutečnost bude nahlášena moderátorům místnosti, kteří to mohou předat právním orgánům.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "To, co tento uživatel píše, je špatné.\nTato skutečnost bude nahlášena moderátorům místnosti.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Tento uživatel se chová nevhodně, například uráží ostatní uživatele, sdílí obsah určený pouze pro dospělé v místnosti určené pro rodiny s dětmi nebo jinak porušuje pravidla této místnosti.\nTato skutečnost bude nahlášena moderátorům místnosti.",
+    "Please provide an address": "Uveďte prosím adresu",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)szměnil ACL serveru",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)szměnil %(count)s krát ACL serveru",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)szměnili ACL serveru",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)szměnili %(count)s krát ACL serveru",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Inicializace vyhledávání zpráv se nezdařila, zkontrolujte <a>svá nastavení</a>",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Nastavte adresy pro tento prostor, aby jej uživatelé mohli najít prostřednictvím domovského serveru (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Chcete-li adresu zveřejnit, je třeba ji nejprve nastavit jako místní adresu.",
+    "Published addresses can be used by anyone on any server to join your room.": "Zveřejněné adresy může použít kdokoli na jakémkoli serveru, aby se připojil k vaší místnosti.",
+    "Published addresses can be used by anyone on any server to join your space.": "Zveřejněné adresy může použít kdokoli na jakémkoli serveru, aby se připojil k vašemu prostoru.",
+    "This space has no local addresses": "Tento prostor nemá žádné místní adresy",
+    "Space information": "Informace o prostoru",
+    "Collapse": "Sbalit",
+    "Expand": "Rozbalit",
+    "Recommended for public spaces.": "Doporučeno pro veřejné prostory.",
+    "Allow people to preview your space before they join.": "Umožněte lidem prohlédnout si váš prostor ještě předtím, než se připojí.",
+    "Preview Space": "Nahlédnout do prostoru",
+    "Decide who can view and join %(spaceName)s.": "Rozhodněte, kdo může prohlížet a připojovat se k %(spaceName)s.",
+    "This may be useful for public spaces.": "To může být užitečné pro veřejné prostory.",
+    "Guests can join a space without having an account.": "Hosté se mohou připojit k prostoru, aniž by měli účet.",
+    "Enable guest access": "Povolit přístup hostům",
+    "Failed to update the history visibility of this space": "Nepodařilo se aktualizovat viditelnost historie tohoto prostoru",
+    "Failed to update the guest access of this space": "Nepodařilo se aktualizovat přístup hosta do tohoto prostoru",
+    "Failed to update the visibility of this space": "Nepodařilo se aktualizovat viditelnost tohoto prostoru",
+    "e.g. my-space": "např. můj-prostor",
+    "Silence call": "Ztlumit zvonění",
+    "Sound on": "Zvuk zapnutý",
+    "Show all rooms in Home": "Zobrazit všechny místnosti na domácí obrazovce",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototyp Nahlášování moderátorům. V místnostech, které podporují moderování, vám tlačítko `nahlásit` umožní nahlásit zneužití moderátorům místnosti",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s změnil(a) <a>připnuté zprávy</a> v místnosti.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s vykopl(a) uživatele %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s vykopl(a) uživatele %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s přijal(a) zpět uživatele %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s opustil(a) místnost",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s opustil(a) místnost: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s odmítl(a) pozvání",
+    "%(targetName)s joined the room": "%(targetName)s vstoupil(a) do místnosti",
+    "%(senderName)s made no change": "%(senderName)s neprovedl(a) žádnou změnu",
+    "%(senderName)s set a profile picture": "%(senderName)s si nastavil(a) profilový obrázek",
+    "%(senderName)s changed their profile picture": "%(senderName)s změnil(a) svůj profilový obrázek",
+    "%(senderName)s removed their profile picture": "%(senderName)s odstranil(a) svůj profilový obrázek",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s odstranil(a) své zobrazované jméno (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s si změnil(a) zobrazované jméno na %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s si změnil(a) zobrazované jméno na %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s vykázal(a) %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s vykázal(a) %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s pozval(a) %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s přijal(a) pozvání",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s přijal(a) pozvání do %(displayName)s",
+    "Some invites couldn't be sent": "Některé pozvánky nebylo možné odeslat",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Poslali jsme ostatním, ale níže uvedení lidé nemohli být pozváni do <RoomName/>",
+    "Visibility": "Viditelnost",
+    "Address": "Adresa",
+    "To view all keyboard shortcuts, click here.": "Pro zobrazení všech klávesových zkratek, klikněte zde.",
+    "Unnamed audio": "Nepojmenovaný audio soubor",
+    "Error processing audio message": "Došlo k chybě při zpracovávání hlasové zprávy",
+    "Images, GIFs and videos": "Obrázky, GIFy a videa",
+    "Code blocks": "Bloky kódu",
+    "Displaying time": "Zobrazování času",
+    "Keyboard shortcuts": "Klávesové zkratky",
+    "Use Ctrl + F to search timeline": "Stiskněte Ctrl + F k vyhledávání v časové ose",
+    "Use Command + F to search timeline": "Stiskněte Command + F k vyhledávání v časové ose",
+    "Integration manager": "Správce integrací",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Váš %(brand)s neumožňuje použít správce integrací. Kontaktujte prosím správce.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Použití tohoto widgetu může sdílet data <helpIcon /> s %(widgetDomain)s a vaším správcem integrací.",
+    "Identity server is": "Server identity je",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Správci integrace přijímají konfigurační data a mohou vaším jménem upravovat widgety, odesílat pozvánky do místností a nastavovat úrovně oprávnění.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Použít správce integrací na správu botů, widgetů a nálepek.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Použít správce integrací <b>(%(serverName)s)</b> na správu botů, widgetů a nálepek.",
+    "Identity server": "Server identit",
+    "Identity server (%(server)s)": "Server identit (%(server)s)",
+    "Could not connect to identity server": "Nepodařilo se připojit k serveru identit",
+    "Not a valid identity server (status code %(code)s)": "Toto není platný server identit (stavový kód %(code)s)",
+    "Identity server URL must be HTTPS": "Adresa serveru identit musí být na HTTPS",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Upozorňujeme, že aktualizací vznikne nová verze místnosti</b>. Všechny aktuální zprávy zůstanou v této archivované místnosti.",
+    "Automatically invite members from this room to the new one": "Automaticky pozve členy této místnosti do nové místnosti",
+    "These are likely ones other room admins are a part of.": "Pravděpodobně se jedná o ty, kterých se účastní i ostatní správci místností.",
+    "Other spaces or rooms you might not know": "Další prostory nebo místnosti, které možná neznáte",
+    "Spaces you know that contain this room": "Prostory, které znáte a které obsahují tuto místnost",
+    "Search spaces": "Hledat prostory",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Rozhodněte, které prostory mají přístup do této místnosti. Pokud je vybrán prostor, mohou jeho členové najít <RoomName/> a připojit se k němu.",
+    "Select spaces": "Vybrané prostory",
+    "You're removing all spaces. Access will default to invite only": "Odstraňujete všechny prostory. Přístup bude ve výchozím nastavení pouze na pozvánky",
+    "User Directory": "Adresář uživatelů",
+    "& %(count)s more|other": "a %(count)s dalších",
+    "Only invited people can join.": "Připojit se mohou pouze pozvané osoby.",
+    "Private (invite only)": "Soukromý (pouze pro pozvané)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Tato změna umožní členům vybraných prostorů přístup do této místnosti bez pozvánky.",
+    "There was an error loading your notification settings.": "Došlo k chybě při načítání nastavení oznámení.",
+    "Global": "Globální",
+    "Enable email notifications for %(email)s": "Povolení e-mailových oznámení pro %(email)s",
+    "Enable for this account": "Povolit pro tento účet",
+    "An error occurred whilst saving your notification preferences.": "Při ukládání předvoleb oznámení došlo k chybě.",
+    "Error saving notification preferences": "Chyba při ukládání předvoleb oznámení",
+    "Messages containing keywords": "Zprávy obsahující klíčová slova",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Díky tomuto mohou místnosti zůstat soukromé a zároveň je mohou lidé v prostoru najít a připojit se k nim. Všechny nové místnosti v prostoru budou mít tuto možnost k dispozici.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Chcete-li členům prostoru pomoci najít soukromou místnost a připojit se k ní, přejděte do nastavení Zabezpečení a soukromí dané místnosti.",
+    "Error downloading audio": "Chyba při stahování audia",
+    "No answer": "Žádná odpověď",
+    "An unknown error occurred": "Došlo k neznámé chybě",
+    "Their device couldn't start the camera or microphone": "Jejich zařízení nemohlo spustit kameru nebo mikrofon",
+    "Connection failed": "Spojení se nezdařilo",
+    "Could not connect media": "Nepodařilo se připojit média",
+    "Unable to copy a link to the room to the clipboard.": "Nelze zkopírovat odkaz na místnost do schránky.",
+    "Unable to copy room link": "Nelze zkopírovat odkaz na místnost",
+    "Anyone can find and join.": "Kdokoliv může místnost najít a připojit se do ní.",
+    "Room visibility": "Viditelnost místnosti",
+    "Visible to space members": "Viditelné pro členy prostoru",
+    "Public room": "Veřejná místnost",
+    "Private room (invite only)": "Soukromá místnost (pouze pro pozvané)",
+    "Create a room": "Vytvořit místnost",
+    "Only people invited will be able to find and join this room.": "Tuto místnost budou moci najít a připojit se k ní pouze pozvaní lidé.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Tuto místnost bude moci najít a připojit se k ní kdokoli, nejen členové <SpaceName/>.",
+    "You can change this at any time from room settings.": "Tuto hodnotu můžete kdykoli změnit v nastavení místnosti.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Všichni v <SpaceName/> budou moci tuto místnost najít a připojit se k ní.",
+    "Image": "Obrázek",
+    "Sticker": "Nálepka",
+    "The call is in an unknown state!": "Hovor je v neznámém stavu!",
+    "Call back": "Zavolat zpět",
+    "Copy Room Link": "Kopírovat odkaz",
+    "Show %(count)s other previews|one": "Zobrazit %(count)s další náhled",
+    "Show %(count)s other previews|other": "Zobrazit %(count)s dalších náhledů",
+    "Access": "Přístup",
+    "People with supported clients will be able to join the room without having a registered account.": "Lidé s podporovanými klienty se budou moci do místnosti připojit, aniž by měli registrovaný účet.",
+    "Decide who can join %(roomName)s.": "Rozhodněte, kdo se může připojit k místnosti %(roomName)s.",
+    "Space members": "Členové prostoru",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Každý, kdo se nachází v prostoru, ho může najít a připojit se k němu. Můžete vybrat více prostorů.",
+    "Spaces with access": "Prostory s přístupem",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Každý, kdo se nachází v prostoru, ho může najít a připojit se k němu. <a>Zde upravte, ke kterým prostorům lze přistupovat.</a>",
+    "Currently, %(count)s spaces have access|other": "V současné době má %(count)s prostorů přístup k",
+    "Upgrade required": "Vyžadována aktualizace",
+    "Mentions & keywords": "Zmínky a klíčová slova",
+    "Message bubbles": "Bubliny zpráv",
+    "IRC": "IRC",
+    "New keyword": "Nové klíčové slovo",
+    "Keyword": "Klíčové slovo",
+    "New layout switcher (with message bubbles)": "Nový přepínač rozložení (s bublinami zpráv)",
+    "Help space members find private rooms": "Pomoci členům prostorů najít soukromé místnosti",
+    "Help people in spaces to find and join private rooms": "Pomoci lidem v prostorech najít soukromé místnosti a připojit se k nim",
+    "New in the Spaces beta": "Nové v betaverzi Spaces",
+    "User %(userId)s is already invited to the room": "Uživatel %(userId)s je již pozván do místnosti",
+    "Transfer Failed": "Přepojení se nezdařilo",
+    "Unable to transfer call": "Nelze přepojit hovor",
+    "Share content": "Sdílet obsah",
+    "Application window": "Okno aplikace",
+    "Share entire screen": "Sdílet celou obrazovku",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Nyní můžete sdílet obrazovku stisknutím tlačítka \"sdílení obrazovky\" během hovoru. Můžete tak učinit i při zvukových hovorech, pokud to obě strany podporují!",
+    "Screen sharing is here!": "Sdílení obrazovky je tu!",
+    "Your camera is still enabled": "Vaše kamera je stále zapnutá",
+    "Your camera is turned off": "Vaše kamera je vypnutá",
+    "%(sharerName)s is presenting": "%(sharerName)s prezentuje",
+    "You are presenting": "Prezentujete",
+    "Anyone will be able to find and join this room.": "Kdokoliv může najít tuto místnost a připojit se k ní.",
+    "Add existing space": "Přidat stávající prostor",
+    "Add space": "Přidat prostor",
+    "Give feedback.": "Poskytněte zpětnou vazbu.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Děkujeme, že jste vyzkoušeli Prostory. Vaše zpětná vazba pomůže při tvorbě dalších verzí.",
+    "Spaces feedback": "Zpětná vazba prostorů",
+    "Spaces are a new feature.": "Prostory jsou novou funkcí.",
+    "We're working on this, but just want to let you know.": "Pracujeme na tom, ale jen vás chceme informovat.",
+    "Search for rooms or spaces": "Hledat místnosti nebo prostory",
+    "Leave %(spaceName)s": "Opustit %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Jste jediným správcem některých místností nebo prostorů, které chcete opustit. Jejich opuštěním zůstanou bez správců.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Jste jediným správcem tohoto prostoru. Jeho opuštění bude znamenat, že nad ním nebude mít nikdo kontrolu.",
+    "You won't be able to rejoin unless you are re-invited.": "Pokud nebudete znovu pozváni, nebudete se moci připojit.",
+    "Search %(spaceName)s": "Hledat %(spaceName)s",
+    "Want to add an existing space instead?": "Chcete místo toho přidat stávající prostor?",
+    "Private space (invite only)": "Soukromý prostor (pouze pro pozvané)",
+    "Space visibility": "Viditelnost prostoru",
+    "Add a space to a space you manage.": "Přidat prostor do prostoru, který spravujete.",
+    "Only people invited will be able to find and join this space.": "Tento prostor budou moci najít a připojit se k němu pouze pozvaní lidé.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Kdokoliv bude moci najít a připojit se k tomuto prostoru, nejen členové <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Kdokoli v <SpaceName/> ho bude moci najít a připojit se.",
+    "Adding spaces has moved.": "Přidávání prostorů bylo přesunuto.",
+    "Search for rooms": "Hledat místnosti",
+    "Search for spaces": "Hledat prostory",
+    "Create a new space": "Vytvořit nový prostor",
+    "Want to add a new space instead?": "Chcete místo toho přidat nový prostor?",
+    "Decrypting": "Dešifrování",
+    "Show all rooms": "Zobrazit všechny místnosti",
+    "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí na domovské obrazovce.",
+    "Send pseudonymous analytics data": "Odeslat pseudonymní analytická data",
+    "Missed call": "Zmeškaný hovor",
+    "Call declined": "Hovor odmítnut",
+    "Surround selected text when typing special characters": "Ohraničit označený text při psaní speciálních znaků",
+    "Stop recording": "Zastavit nahrávání",
+    "Send voice message": "Odeslat hlasovou zprávu",
+    "Mute the microphone": "Ztlumit mikrofon",
+    "Unmute the microphone": "Zrušit ztlumení mikrofonu",
+    "Dialpad": "Číselník",
+    "More": "Více",
+    "Show sidebar": "Zobrazit postranní panel",
+    "Hide sidebar": "Skrýt postranní panel",
+    "Start sharing your screen": "Začít sdílet obrazovku",
+    "Stop sharing your screen": "Přestat sdílet obrazovku",
+    "Stop the camera": "Vypnout kameru",
+    "Start the camera": "Zapnout kameru",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s%(count)s krát změnil(a) <a>připnuté zprávy</a> místnosti.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s%(count)s krát změnili <a>připnuté zprávy</a> místnosti.",
+    "Olm version:": "Verze Olm:",
+    "Don't send read receipts": "Neposílat potvrzení o přečtení",
+    "Delete avatar": "Smazat avatar",
+    "Created from <Community />": "Vytvořeno z <Community />",
+    "Communities won't receive further updates.": "Skupiny nebudou dostávat další aktualizace.",
+    "Spaces are a new way to make a community, with new features coming.": "Prostory jsou novým způsobem vytváření komunit a přibývají nové funkce.",
+    "Communities can now be made into Spaces": "Ze skupin lze nyní vytvořit prostory",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Požádejte <a>správce</a> této skupiny, aby z ní udělali prostor a počkejte na pozvánku.",
+    "You can create a Space from this community <a>here</a>.": "<a>Zde</a> můžete vytvořit prostor z této skupiny.",
+    "This description will be shown to people when they view your space": "Tento popis se zobrazí lidem při prohlížení vašeho prostoru",
+    "Flair won't be available in Spaces for the foreseeable future.": "Symbol příslušnosti ke skupině nebude v dohledné době dostupný ve Spaces.",
+    "All rooms will be added and all community members will be invited.": "Všechny místnosti budou přidány a všichni členové skupiny budou pozváni.",
+    "To create a Space from another community, just pick the community in Preferences.": "Chcete-li vytvořit prostor z jiné skupiny, vyberte ji v Předvolbách.",
+    "Show my Communities": "Zobrazit moje Skupiny",
+    "A link to the Space will be put in your community description.": "Odkaz na prostor bude vložen do popisu vaší skupiny.",
+    "Create Space from community": "Vytvořit prostor ze skupiny",
+    "Failed to migrate community": "Nepodařilo se převést skupinu",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> byl vytvořen a všichni, kteří byli součástí skupiny, do něj byli pozváni.",
+    "Space created": "Prostor byl vytvořen",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Chcete-li zobrazit Prostory, skryjte skupiny v <a>Předvolbách</a>",
+    "This community has been upgraded into a Space": "Tato skupina byla převedena na prostor",
+    "If a community isn't shown you may not have permission to convert it.": "Pokud skupina není zobrazena, nemusíte mít povolení k její konverzi.",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Skupiny byly archivovány, aby uvolnily místo pro Prostory, ale níže můžete své skupiny převést na prostory. Převedení zajistí, že vaše konverzace budou mít nejnovější funkce.",
+    "Create Space": "Vytvořit prostor",
+    "What kind of Space do you want to create?": "Jaký druh prostoru chcete vytvořit?",
+    "Open Space": "Otevřít prostor",
+    "You can change this later.": "Toto můžete změnit později.",
+    "Unknown failure: %(reason)s": "Neznámá chyba: %(reason)s",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ladící protokoly obsahují údaje o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasů místností nebo skupin, které jste navštívili, s kterými prvky uživatelského rozhraní jste naposledy interagovali a uživatelská jména ostatních uživatelů. Neobsahují zprávy.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Pokud jste odeslali chybu prostřednictvím GitHubu, ladící protokoly nám mohou pomoci problém vysledovat. Ladicí protokoly obsahují údaje o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasů místností nebo skupin, které jste navštívili, s jakými prvky uživatelského rozhraní jste naposledy interagovali a uživatelská jména ostatních uživatelů. Neobsahují zprávy.",
+    "Rooms and spaces": "Místnosti a prostory",
+    "Results": "Výsledky",
+    "Enable encryption in settings.": "Povolte šifrování v nastavení.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Vaše soukromé zprávy jsou obvykle šifrované, ale tato místnost není. Obvykle je to způsobeno nepodporovaným zařízením nebo použitou metodou, například e-mailovými pozvánkami.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Abyste se těmto problémům vyhnuli, vytvořte pro plánovanou konverzaci <a>novou veřejnou místnost</a>.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nedoporučujeme šifrované místnosti zveřejňovat.</b> Znamená to, že místnost může kdokoli najít a připojit se k ní, takže si kdokoli může přečíst zprávy. Nezískáte tak žádnou z výhod šifrování. Šifrování zpráv ve veřejné místnosti zpomalí příjem a odesílání zpráv.",
+    "Are you sure you want to make this encrypted room public?": "Jste si jisti, že chcete tuto šifrovanou místnost zveřejnit?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Chcete-li se těmto problémům vyhnout, vytvořte pro plánovanou konverzaci <a>novou šifrovanou místnost</a>.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nedoporučuje se šifrovat veřejné místnosti.</b>Veřejné místnosti může najít a připojit se k nim kdokoli, takže si v nich může číst zprávy kdokoli. Nezískáte tak žádnou z výhod šifrování a nebudete ho moci později vypnout. Šifrování zpráv ve veřejné místnosti zpomalí příjem a odesílání zpráv.",
+    "Are you sure you want to add encryption to this public room?": "Opravdu chcete šifrovat tuto veřejnou místnost?",
+    "Cross-signing is ready but keys are not backed up.": "Křížové podepisování je připraveno, ale klíče nejsou zálohovány.",
+    "Low bandwidth mode (requires compatible homeserver)": "Režim malé šířky pásma (vyžaduje kompatibilní domovský server)",
+    "Multiple integration managers (requires manual setup)": "Více správců integrace (vyžaduje ruční nastavení)",
+    "Threaded messaging": "Zprávy ve vláknech",
+    "Thread": "Vlákno",
+    "Show threads": "Zobrazit vlákna",
+    "The above, but in <Room /> as well": "Výše uvedené, ale také v <Room />",
+    "The above, but in any room you are joined or invited to as well": "Výše uvedené, ale také v jakékoli místnosti, ke které jste připojeni nebo do které jste pozváni",
+    "Autoplay videos": "Automatické přehrávání videí",
+    "Autoplay GIFs": "Automatické přehrávání GIFů",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s odepnul zprávu z této místnosti. Zobrazit všechny připnuté zprávy.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s odepnul <a>zprávu</a> z této místnosti. Zobrazit všechny <b>připnuté zprávy</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s připnul zprávu k této místnosti. Zobrazit všechny připnuté zprávy.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s připnul <a>zprávu</a> k této místnosti. Zobrazit všechny <b>připnuté zprávy</b>.",
+    "Currently, %(count)s spaces have access|one": "V současné době má prostor přístup",
+    "& %(count)s more|one": "a %(count)s další",
+    "Some encryption parameters have been changed.": "Byly změněny některé parametry šifrování.",
+    "Role in <RoomName/>": "Role v <RoomName/>",
+    "Send a sticker": "Odeslat nálepku",
+    "Explore %(spaceName)s": "Prozkoumat %(spaceName)s",
+    "Reply to encrypted thread…": "Odpovědět na zašifrované vlákno…",
+    "Reply to thread…": "Odpovědět na vlákno…",
+    "Add emoji": "Přidat emoji",
+    "Unknown failure": "Neznámá chyba",
+    "Failed to update the join rules": "Nepodařilo se aktualizovat pravidla pro připojení",
+    "Select the roles required to change various parts of the space": "Výbrat role potřebné ke změně různých částí prostoru",
+    "Change description": "Změnit popis",
+    "Change main address for the space": "Změnit hlavní adresu prostoru",
+    "Change space name": "Změnit název prostoru",
+    "Change space avatar": "Změnit avatar prostoru",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Kdokoli v <spaceName/> může prostor najít a připojit se. Můžete vybrat i další prostory.",
+    "Message didn't send. Click for info.": "Zpráva se neodeslala. Klikněte pro informace.",
+    "To join this Space, hide communities in your <a>preferences</a>": "Pro připojení k tomuto prostoru, skryjte zobrazení skupin v <a>předvolbách</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "Pro zobrazení tohoto prostoru, skryjte zobrazení skupin v <a>předvolbách</a>",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Pro připojení k %(communityName)s, přepněte na skupiny v <a>předvolbách</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Pro zobrazní %(communityName)s, přepněte na zobrazení skupin v <a>předvolbách</a>",
+    "Private community": "Soukromá skupina",
+    "Public community": "Veřejná skupina",
+    "Message": "Zpráva",
+    "Upgrade anyway": "I přesto aktualizovat",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Tato místnost se nachází v některých prostorech, jejichž nejste správcem. V těchto prostorech bude stará místnost stále zobrazena, ale lidé budou vyzváni, aby se připojili k nové místnosti.",
+    "Before you upgrade": "Než provedete aktualizaci",
+    "To join a space you'll need an invite.": "Pro připojení k prostoru potřebujete pozvánku.",
+    "You can also make Spaces from <a>communities</a>.": "Můžete také vytvořit prostory ze <a>skupin</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Dočasně zobrazit skupiny místo prostorů pro tuto relaci. Podpora bude v blízké budoucnosti odstraněna. Toto provede přenačtení Elementu.",
+    "Display Communities instead of Spaces": "Zobrazit skupiny místo prostorů",
+    "Joining space …": "Připojování k prostoru…",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reagoval(a) na %(content)s"
 }
diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
index b99b834636..2b4af70877 100644
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@@ -11,5 +11,6 @@
     "Sign In": "Mewngofnodi",
     "Create Account": "Creu Cyfrif",
     "Dismiss": "Wfftio",
-    "Explore rooms": "Archwilio Ystafelloedd"
+    "Explore rooms": "Archwilio Ystafelloedd",
+    "Identity server": "Gweinydd Adnabod"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 15ce2986da..c1ed2efd95 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -1,6 +1,5 @@
 {
     "Filter room members": "Filter medlemmer",
-    "You have no visible notifications": "Du har ingen synlige meddelelser",
     "Invites": "Invitationer",
     "Favourites": "Favoritter",
     "Rooms": "Rum",
@@ -17,7 +16,6 @@
     "Invites user with given id to current room": "Inviterer bruger med givet id til nuværende rum",
     "Kicks user with given id": "Smider bruger med givet id ud",
     "Changes your display nickname": "Ændrer dit viste navn",
-    "Searches DuckDuckGo for results": "Søger på DuckDuckGo efter resultater",
     "Commands": "Kommandoer",
     "Emoji": "Emoji",
     "Sign in": "Log ind",
@@ -25,11 +23,8 @@
     "Account": "Konto",
     "Admin": "Administrator",
     "Advanced": "Avanceret",
-    "Anyone who knows the room's link, apart from guests": "Alle der kender link til rummet, bortset fra gæster",
-    "Anyone who knows the room's link, including guests": "Alle der kender link til rummet, inklusiv gæster",
     "Are you sure you want to reject the invitation?": "Er du sikker på du vil afvise invitationen?",
     "Banned users": "Bortviste brugere",
-    "Click here to fix": "Klik her for at rette",
     "Continue": "Fortsæt",
     "Create Room": "Opret rum",
     "Cryptography": "Kryptografi",
@@ -38,7 +33,6 @@
     "Error": "Fejl",
     "Export E2E room keys": "Eksporter E2E rum nøgler",
     "Failed to change password. Is your password correct?": "Kunne ikke ændre password. Er dit password korrekt?",
-    "Failed to leave room": "Kunne ikke forlade rum",
     "Failed to reject invitation": "Kunne ikke afvise invitationen",
     "Failed to send email": "Kunne ikke sende e-mail",
     "Failed to unban": "Var ikke i stand til at ophæve forbuddet",
@@ -47,19 +41,13 @@
     "Remove": "Fjern",
     "Settings": "Indstillinger",
     "unknown error code": "Ukendt fejlkode",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepterede en invitation.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterede invitationen til %(displayName)s.",
-    "%(senderName)s answered the call.": "%(senderName)s besvarede opkaldet.",
-    "Add a widget": "Tilføj en widget",
     "OK": "OK",
     "Search": "Søg",
-    "Custom Server Options": "Brugerdefinerede serverindstillinger",
     "Dismiss": "Afslut",
     "powered by Matrix": "Drevet af Matrix",
     "Close": "Luk",
     "Cancel": "Afbryd",
     "Edit": "Rediger",
-    "Unpin Message": "Frigør Besked",
     "Failed to forget room %(errCode)s": "Kunne ikke glemme rummet %(errCode)s",
     "Mute": "Sæt på lydløs",
     "Leave": "Forlad",
@@ -72,11 +60,6 @@
     "This email address is already in use": "Denne email adresse er allerede i brug",
     "This phone number is already in use": "Dette telefonnummer er allerede i brug",
     "Failed to verify email address: make sure you clicked the link in the email": "Kunne ikke bekræfte emailaddressen: vær sikker på at klikke på linket i e-mailen",
-    "Call Timeout": "Opkalds Timeout",
-    "The remote side failed to pick up": "Den anden side tog den ikke",
-    "Unable to capture screen": "Kunne ikke optage skærm",
-    "Existing Call": "Eksisterende Opkald",
-    "You are already in a call.": "Du er allerede i et opkald.",
     "VoIP is unsupported": "VoIP er ikke understøttet",
     "You cannot place VoIP calls in this browser.": "Du kan ikke lave VoIP-opkald i denne browser.",
     "You cannot place a call with yourself.": "Du kan ikke ringe til dig selv.",
@@ -126,7 +109,6 @@
     "Moderator": "Moderator",
     "Operation failed": "Operation mislykkedes",
     "Failed to invite": "Kunne ikke invitere",
-    "Failed to invite the following users to the %(roomName)s room:": "Kunne ikke invitere de følgende brugere til %(roomName)s rummet:",
     "You need to be logged in.": "Du skal være logget ind.",
     "You need to be able to invite users to do that.": "Du skal kunne invitere brugere for at gøre dette.",
     "Unable to create widget.": "Kunne ikke lave widget.",
@@ -139,81 +121,42 @@
     "Room %(roomId)s not visible": "rum %(roomId)s ikke synligt",
     "Missing user_id in request": "Manglende user_id i forespørgsel",
     "Usage": "Brug",
-    "/ddg is not a command": "/ddg er ikke en kommando",
-    "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på at autocomplete resultaterne indlæses, og så bruge Tab for at bladre igennem dem.",
     "Ignored user": "Ignoreret bruger",
     "You are now ignoring %(userId)s": "Du ignorerer nu %(userId)s",
     "Unignored user": "Holdt op med at ignorere bruger",
     "You are no longer ignoring %(userId)s": "Du ignorerer ikke længere %(userId)s",
     "Verified key": "Verificeret nøgle",
     "Reason": "Årsag",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterede %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannede %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte deres viste navn til %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernede deres viste navn (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s fjernede deres profilbillede.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ændrede deres profilbillede.",
-    "%(senderName)s set a profile picture.": "%(senderName)s indstillede deres profilbillede.",
-    "VoIP conference started.": "VoIP konference startet.",
-    "%(targetName)s joined the room.": "%(targetName)s forbandt til rummet.",
-    "VoIP conference finished.": "VoIP konference afsluttet.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s afviste invitationen.",
-    "%(targetName)s left the room.": "%(targetName)s forlod rummet.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbannede %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickede %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trak %(targetName)ss invitation tilbage.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ændrede emnet til \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernede rumnavnet.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ændrede rumnavnet til %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et billed.",
     "Someone": "Nogen",
-    "(not supported by this browser)": "(Ikke understøttet af denne browser)",
-    "(could not connect media)": "(kunne ikke forbinde til mediet)",
-    "(no answer)": "(intet svar)",
-    "(unknown failure: %(reason)s)": "(ukendt fejl: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s afsluttede opkaldet.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterede %(targetDisplayName)s til rummet.",
     "Submit debug logs": "Indsend debug-logfiler",
     "Online": "Online",
     "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
     "Send Account Data": "Send Konto Data",
-    "All notifications are currently disabled for all targets.": "Alle meddelelser er for øjeblikket deaktiveret for alle mål.",
-    "Uploading report": "Uploader rapport",
     "Sunday": "Søndag",
     "Messages sent by bot": "Beskeder sendt af en bot",
     "Notification targets": "Meddelelsesmål",
     "Failed to set direct chat tag": "Kunne ikke markere rummet som direkte chat",
     "Today": "I dag",
-    "Files": "Filer",
-    "You are not receiving desktop notifications": "Du modtager ikke skrivebordsmeddelelser",
     "Friday": "Fredag",
     "Update": "Opdater",
     "What's New": "Hvad er nyt",
     "On": "Tændt",
     "Changelog": "Ændringslog",
     "Waiting for response from server": "Venter på svar fra server",
-    "Uploaded on %(date)s by %(user)s": "Uploadet den %(date)s af %(user)s",
     "Send Custom Event": "Send Brugerdefineret Begivenhed",
     "Off": "Slukket",
-    "Advanced notification settings": "Avancerede notifikationsindstillinger",
-    "Forget": "Glem",
-    "You cannot delete this image. (%(code)s)": "Du kan ikke slette dette billede. (%(code)s)",
-    "Cancel Sending": "Stop Forsendelse",
     "Warning": "Advarsel",
     "This Room": "Dette rum",
     "Room not found": "Rummet ikke fundet",
     "Messages containing my display name": "Beskeder der indeholder mit viste navn",
     "Messages in one-to-one chats": "Beskeder i en-til-en chats",
     "Unavailable": "Utilgængelig",
-    "Error saving email notification preferences": "Fejl ved at gemme e-mail-underretningsindstillinger",
-    "View Decrypted Source": "Se Dekrypteret Kilde",
-    "Failed to update keywords": "Kunne ikke opdatere søgeord",
     "remove %(name)s from the directory.": "fjern %(name)s fra kataloget.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Meddelelser om følgende søgeord følger regler, der ikke kan vises her:",
-    "Please set a password!": "Indstil venligst et password!",
-    "You have successfully set a password!": "Du har succesfuldt indstillet et password!",
-    "An error occurred whilst saving your email notification preferences.": "Der opstod en fejl under opbevaring af dine e-mail-underretningsindstillinger.",
     "Explore Room State": "Udforsk Rum Tilstand",
     "Source URL": "Kilde URL",
     "Failed to add tag %(tagName)s to room": "Kunne ikke tilføje tag(s): %(tagName)s til rummet",
@@ -222,32 +165,21 @@
     "No update available.": "Ingen opdatering tilgængelig.",
     "Noisy": "Støjende",
     "Collecting app version information": "Indsamler app versionsoplysninger",
-    "Keywords": "Søgeord",
-    "Enable notifications for this account": "Aktivér underretninger for dette brugernavn",
     "Invite to this community": "Inviter til dette fællesskab",
     "Search…": "Søg…",
-    "Messages containing <span>keywords</span>": "Beskeder der indeholder <span>keywords</span>",
     "When I'm invited to a room": "Når jeg bliver inviteret til et rum",
     "Tuesday": "Tirsdag",
-    "Enter keywords separated by a comma:": "Indtast søgeord adskilt af et komma:",
-    "Forward Message": "Videresend Besked",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra kataloget?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s bruger mange avancerede browser funktioner, hvoraf nogle af dem ikke er tilgængelige eller er eksperimentelle i din browser.",
     "Event sent!": "Begivenhed sendt!",
     "Explore Account Data": "Udforsk Konto Data",
     "Saturday": "Lørdag",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Husk, du kan altid indstille en emailadresse i dine bruger indstillinger hvis du ombestemmer dig.",
-    "Direct Chat": "Personlig Chat",
     "The server may be unavailable or overloaded": "Serveren kan være utilgængelig eller overbelastet",
     "Reject": "Afvis",
-    "Failed to set Direct Message status of room": "Kunne ikke indstille Direkte Beskedstatus for rummet",
     "Monday": "Mandag",
     "Remove from Directory": "Fjern fra Katalog",
-    "Enable them now": "Aktivér dem nu",
     "Toolbox": "Værktøjer",
     "Collecting logs": "Indsamler logfiler",
     "You must specify an event type!": "Du skal angive  en begivenhedstype!",
-    "(HTTP status %(httpStatus)s)": "(HTTP tilstand %(httpStatus)s)",
     "Invite to this room": "Inviter til dette rum",
     "State Key": "Tilstandsnøgle",
     "Send": "Send",
@@ -255,51 +187,33 @@
     "All messages": "Alle beskeder",
     "Call invitation": "Opkalds invitation",
     "Downloading update...": "Downloader opdatering...",
-    "You have successfully set a password and an email address!": "Du har succesfuldt indstillet et password og en emailadresse!",
     "Failed to send custom event.": "Kunne ikke sende brugerdefinerede begivenhed.",
     "What's new?": "Hvad er nyt?",
-    "Notify me for anything else": "Underret mig om noget andet",
     "View Source": "Se Kilde",
-    "Can't update user notification settings": "Kan ikke opdatere brugermeddelelsesindstillinger",
-    "Notify for all other messages/rooms": "Underret om alle andre meddelelser / rum",
     "Unable to look up room ID from server": "Kunne ikke slå rum-id op på server",
     "Couldn't find a matching Matrix room": "Kunne ikke finde et matchende Matrix-rum",
     "All Rooms": "Alle rum",
     "You cannot delete this message. (%(code)s)": "Du kan ikke slette denne besked. (%(code)s)",
     "Thursday": "Torsdag",
-    "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker at fortsætte",
     "Back": "Tilbage",
     "Show message in desktop notification": "Vis besked i skrivebordsnotifikation",
-    "Unhide Preview": "Vis Forhåndsvisning",
     "Unable to join network": "Kan ikke forbinde til netværket",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklager, din browser kan <b>ikke</b> køre %(brand)s.",
     "Quote": "Citat",
     "Messages in group chats": "Beskeder i gruppechats",
     "Yesterday": "I går",
     "Error encountered (%(errorDetail)s).": "En fejl er opstået (%(errorDetail)s).",
     "Event Type": "Begivenhedstype",
     "Low Priority": "Lav prioritet",
-    "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
-    "Set Password": "Indstil Password",
     "Resend": "Send igen",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ved ikke, hvordan man kan deltage i et rum på dette netværk",
-    "Mentions only": "Kun nævninger",
     "Failed to remove tag %(tagName)s from room": "Kunne ikke fjerne tag(s): %(tagName)s fra rummet",
     "Wednesday": "Onsdag",
-    "You can now return to your account after signing out, and sign in on other devices.": "Du kan nu vende tilbage til din konto efter at have logget ud og logge ind på andre enheder.",
-    "Enable email notifications": "Aktivér e-mail-underretninger",
-    "Download this file": "Download denne fil",
-    "Pin Message": "Fasthold Besked",
-    "Failed to change settings": "Kunne ikke ændre indstillinger",
     "Developer Tools": "Udviklingsværktøjer",
     "Event Content": "Begivenhedsindhold",
     "Thank you!": "Tak!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med din nuværnde broser kan udseendet og fornemmelsen af programmet være helt forkert og nogle funktioner virker måske ikke. Hvis du alligevel vil prøve så kan du fortsætte, men det er på egen risiko!",
     "Checking for an update...": "Checker om der er en opdatering...",
     "Logs sent": "Logfiler sendt",
     "Reply": "Besvar",
-    "All messages (noisy)": "Alle meddelelser (højlydt)",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug-logfiler indeholder brugerdata såsom brugernavn, ID'er eller aliaser for de rum eller grupper, du har besøgt, og andres brugernavne. De indeholder ikke meddelelser.",
     "Failed to send logs: ": "Kunne ikke sende logfiler: ",
     "View Community": "Vis community",
     "Preparing to send logs": "Forbereder afsendelse af logfiler",
@@ -323,9 +237,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bed administratoren af din homeserver (<code>%(homeserverDomain)s</code>) om at konfigurere en TURN server for at opkald virker pålideligt.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativt kan du prøve at bruge den offentlige server <code>turn.matrix.org</code>, men det er ikke lige så pålideligt, og din IP-adresse deles med den server. Du kan også administrere dette under Indstillinger.",
     "Try using turn.matrix.org": "Prøv at bruge turn.matrix.org",
-    "Call in Progress": "Igangværende opkald",
-    "A call is currently being placed!": "Et opkald er allerede ved at blive oprettet!",
-    "A call is already in progress!": "Et opkald er allerede i gang!",
     "Permission Required": "Tilladelse påkrævet",
     "You do not have permission to start a conference call in this room": "Du har ikke rettighed til at starte et gruppekald i dette rum",
     "Replying With Files": "Svare med filer",
@@ -372,8 +283,6 @@
     "Sends the given message coloured as a rainbow": "Sender beskeden med regnbuefarver",
     "Sends the given emote coloured as a rainbow": "Sender emoji'en med regnbuefarver",
     "Displays list of commands with usages and descriptions": "Viser en liste over kommandoer med beskrivelser",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ændrede sit visningsnavn til %(displayName)s.",
-    "%(senderName)s made no change.": "%(senderName)s foretog ingen ændring.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s opgraderede dette rum.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s gjorde rummet offentligt for alle som kender linket.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s begrænsede adgang til rummet til kun inviterede.",
@@ -468,7 +377,6 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s ændret af %(senderName)s",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Gruppér og filtrér rum efter egne tags (opdater for at anvende ændringerne)",
     "Render simple counters in room header": "Vis simple tællere i rumhovedet",
-    "Multiple integration managers": "Flere integrationsmanagere",
     "Enable Emoji suggestions while typing": "Aktiver emoji forslag under indtastning",
     "Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Hvorvidt du benytter %(brand)s på en enhed, hvor touch er den primære input-grænseflade",
@@ -483,15 +391,11 @@
     "Confirm adding phone number": "Bekræft tilføjelse af telefonnummer",
     "Click the button below to confirm adding this phone number.": "Klik på knappen herunder for at bekræfte tilføjelsen af dette telefonnummer.",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Om du anvender %(brand)s som en installeret Progressiv Web App",
-    "If you cancel now, you won't complete verifying the other user.": "Hvis du annullerer du, vil du ikke have færdiggjort verifikationen af den anden bruger.",
-    "If you cancel now, you won't complete verifying your other session.": "Hvis du annullerer nu, vil du ikke have færdiggjort verifikationen af din anden session.",
-    "If you cancel now, you won't complete your operation.": "Hvis du annullerer nu, vil du ikke færdiggøre din operation.",
     "Cancel entering passphrase?": "Annuller indtastning af kodeord?",
     "Enter passphrase": "Indtast kodeord",
     "Setting up keys": "Sætter nøgler op",
     "Verify this session": "Verificér denne session",
     "Encryption upgrade available": "Opgradering af kryptering tilgængelig",
-    "Set up encryption": "Opsæt kryptering",
     "Identity server has no terms of service": "Identity serveren har ingen terms of service",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handling kræver adgang til default identitets serveren <server /> for at validere en email adresse eller et telefonnummer, men serveren har ingen terms of service.",
     "Only continue if you trust the owner of the server.": "Fortsæt kun hvis du stoler på ejeren af denne server.",
@@ -538,7 +442,6 @@
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s opdaterede en ban-regel der matcher %(glob)s på grund af %(reason)s",
     "Explore rooms": "Udforsk rum",
     "Verification code": "Verifikationskode",
-    "Who can access this room?": "Hvem kan tilgå dette rum?",
     "Encrypted": "Krypteret",
     "Once enabled, encryption cannot be disabled.": "Efter aktivering er det ikke muligt at slå kryptering fra.",
     "Security & Privacy": "Sikkerhed & Privatliv",
@@ -584,11 +487,8 @@
     "Change Password": "Skift adgangskode",
     "Current password": "Nuværende adgangskode",
     "Theme added!": "Tema tilføjet!",
-    "The other party declined the call.": "Den anden part afviste opkaldet.",
     "Comment": "Kommentar",
     "or": "eller",
-    "%(brand)s Android": "%(brand)s Android",
-    "%(brand)s iOS": "%(brand)s iOS",
     "Privacy": "Privatliv",
     "Please enter a name for the room": "Indtast et navn for rummet",
     "No results": "Ingen resultater",
@@ -617,7 +517,6 @@
     "Unable to access webcam / microphone": "Kan ikke tilgå webcam / mikrofon",
     "Unable to access microphone": "Kan ikke tilgå mikrofonen",
     "The call could not be established": "Opkaldet kunne ikke etableres",
-    "Call Declined": "Opkald afvist",
     "Folder": "Mappe",
     "We couldn't log you in": "Vi kunne ikke logge dig ind",
     "Try again": "Prøv igen",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index dcc5343af4..61f6239929 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1,6 +1,5 @@
 {
     "Filter room members": "Raummitglieder filtern",
-    "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen",
     "Invites": "Einladungen",
     "Favourites": "Favoriten",
     "Rooms": "Räume",
@@ -15,18 +14,15 @@
     "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID",
     "Deops user with given id": "Setzt das Berechtigungslevel beim Benutzer mit der angegebenen ID zurück",
     "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",
+    "Kicks user with given id": "Benutzer mit der angegebenen ID entfernen",
     "Changes your display nickname": "Ändert deinen Anzeigenamen",
     "Change Password": "Passwort ändern",
-    "Searches DuckDuckGo for results": "Verwendet DuckDuckGo zum Suchen",
     "Commands": "Kommandos",
     "Emoji": "Emojis",
     "Sign in": "Anmelden",
     "Warning!": "Warnung!",
     "Error": "Fehler",
     "Advanced": "Erweitert",
-    "Anyone who knows the room's link, apart from guests": "Alle, die den Raumlink kennen (ausgenommen Gäste)",
-    "Anyone who knows the room's link, including guests": "Alle, die den Raumlink kennen (auch Gäste)",
     "Are you sure you want to reject the invitation?": "Bist du sicher, dass du die Einladung ablehnen willst?",
     "Banned users": "Verbannte Benutzer",
     "Continue": "Fortfahren",
@@ -35,27 +31,22 @@
     "Deactivate Account": "Benutzerkonto deaktivieren",
     "Failed to send email": "Fehler beim Senden der E-Mail",
     "Account": "Benutzerkonto",
-    "Click here to fix": "Zum Reparieren hier klicken",
     "Default": "Standard",
     "Export E2E room keys": "E2E-Raum-Schlüssel exportieren",
     "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?",
-    "Failed to leave room": "Verlassen des Raums fehlgeschlagen",
     "Failed to reject invitation": "Einladung konnte nicht abgelehnt werden",
     "Failed to unban": "Aufheben der Verbannung fehlgeschlagen",
     "Favourite": "Favorit",
     "Forget room": "Raum entfernen",
     "For security, this session has been signed out. Please sign in again.": "Aus Sicherheitsgründen wurde diese Sitzung beendet. Bitte melde dich erneut an.",
-    "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
     "Hangup": "Auflegen",
     "Homeserver is": "Dein Heimserver ist",
-    "Identity Server is": "Der Identitätsserver ist",
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
     "Import E2E room keys": "E2E-Raumschlüssel importieren",
     "Invalid Email Address": "Ungültige E-Mail-Adresse",
     "Sign in with": "Anmelden mit",
     "Leave room": "Raum verlassen",
     "Logout": "Abmelden",
-    "Manage Integrations": "Integrationen verwalten",
     "Moderator": "Moderator",
     "Notifications": "Benachrichtigungen",
     "<not supported>": "<nicht unterstützt>",
@@ -70,7 +61,6 @@
     "Reject invitation": "Einladung ablehnen",
     "Remove": "Entfernen",
     "Return to login screen": "Zur Anmeldemaske zurückkehren",
-    "Room Colour": "Raumfarbe",
     "Send Reset Email": "E-Mail zum Zurücksetzen senden",
     "Settings": "Einstellungen",
     "Signed Out": "Abgemeldet",
@@ -93,26 +83,18 @@
     "Verification Pending": "Verifizierung ausstehend",
     "Video call": "Videoanruf",
     "Voice call": "Sprachanruf",
-    "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
-    "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, 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",
     "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, Benachrichtigungen zu senden - Bitte überprüfe deine Browsereinstellungen",
     "%(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",
     "This phone number is already in use": "Diese Telefonnummer wird bereits verwendet",
-    "Unable to capture screen": "Der Bildschirm kann nicht aufgenommen werden",
     "Unable to enable Notifications": "Benachrichtigungen konnten nicht aktiviert werden",
     "Upload Failed": "Hochladen fehlgeschlagen",
     "VoIP is unsupported": "VoIP wird nicht unterstützt",
-    "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.": "Anrufe 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 Heimserver verbunden zu sein.",
@@ -137,26 +119,12 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s, %(time)s",
-    "Set a display name:": "Anzeigename eingeben:",
-    "Upload an avatar:": "Profilbild hochladen:",
     "This server does not support authentication with a phone number.": "Dieser Server unterstützt keine Authentifizierung per Telefonnummer.",
-    "An error occurred: %(error_string)s": "Ein Fehler ist aufgetreten: %(error_string)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s hat eine Einladung angenommen.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert.",
-    "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s verbannt.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
-    "/ddg is not a command": "/ddg ist kein Befehl",
-    "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
     "Failed to send request.": "Anfrage konnte nicht gesendet werden.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
-    "%(targetName)s joined the room.": "%(targetName)s hat den Raum betreten.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s hat %(targetName)s rausgeworfen.",
-    "%(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 Chatverlauf für alle Raummitglieder ab ihrer Einladung sichtbar gemacht.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den Chatverlauf für alle Raummitglieder ab ihrem Beitreten sichtbar gemacht.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raummitglieder sichtbar gemacht.",
@@ -164,30 +132,17 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf für Unbekannte sichtbar gemacht (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
-    "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)",
     "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.",
     "Reason": "Grund",
-    "%(targetName)s rejected the invitation.": "%(targetName)s hat die Einladung abgelehnt.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s hat den Anzeigenamen entfernt (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s hat das Profilbild gelöscht.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s möchte eine VoIP-Konferenz beginnen.",
     "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s hat %(targetDisplayName)s in diesen Raum eingeladen.",
-    "%(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 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.",
     "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.",
     "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",
     "and %(count)s others...|other": "und %(count)s weitere...",
     "and %(count)s others...|one": "und ein weiterer...",
@@ -195,8 +150,6 @@
     "Attachment": "Anhang",
     "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",
     "Command error": "Fehler im Befehl",
     "Decrypt %(text)s": "%(text)s entschlüsseln",
     "Disinvite": "Einladung zurückziehen",
@@ -204,14 +157,13 @@
     "Failed to ban user": "Verbannen des Benutzers fehlgeschlagen",
     "Failed to change power level": "Ändern der Berechtigungsstufe fehlgeschlagen",
     "Failed to join room": "Betreten des Raumes ist fehlgeschlagen",
-    "Failed to kick": "Rauswurf fehlgeschlagen",
+    "Failed to kick": "Entfernen fehlgeschlagen",
     "Failed to mute user": "Stummschalten des Nutzers fehlgeschlagen",
     "Failed to reject invite": "Ablehnen der Einladung ist fehlgeschlagen",
     "Failed to set display name": "Anzeigename konnte nicht geändert werden",
-    "Fill screen": "Fülle Bildschirm",
     "Incorrect verification code": "Falscher Verifizierungscode",
     "Join Room": "Raum beitreten",
-    "Kick": "Rausschmeißen",
+    "Kick": "Entfernen",
     "not specified": "nicht angegeben",
     "No more results": "Keine weiteren Ergebnisse",
     "No results": "Keine Ergebnisse",
@@ -221,7 +173,6 @@
     "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.",
     "Submit": "Absenden",
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Dir fehlt die Berechtigung, diese alten Nachrichten zu lesen.",
@@ -231,13 +182,9 @@
     "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",
-    "Click to unmute audio": "Klicken, um den Ton wieder einzuschalten",
     "Failed to load timeline position": "Laden der Chat-Position fehlgeschlagen",
-    "Autoplay GIFs and videos": "Videos und GIFs automatisch abspielen",
     "%(items)s and %(lastItem)s": "%(items)s und %(lastItem)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "Access Token:": "Zugangstoken:",
     "Always show message timestamps": "Nachrichtenzeitstempel immer anzeigen",
     "Authentication": "Authentifizierung",
     "An error has occurred.": "Ein Fehler ist aufgetreten.",
@@ -245,7 +192,6 @@
     "Current password": "Aktuelles Passwort",
     "Email": "E-Mail",
     "New passwords don't match": "Die neuen Passwörter stimmen nicht überein",
-    "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
     "%(brand)s version:": "Version von %(brand)s:",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Uhrzeiten im 12-Stunden-Format (z. B. 2:30pm)",
@@ -255,7 +201,6 @@
     "Operation failed": "Aktion fehlgeschlagen",
     "Unmute": "Stummschalten aufheben",
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
-    "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 Raumnamen entfernt.",
     "Passphrases must match": "Passphrases müssen übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
@@ -271,21 +216,14 @@
     "Incorrect password": "Ungültiges Passwort",
     "Unable to restore session": "Sitzungswiederherstellung fehlgeschlagen",
     "Unknown Address": "Unbekannte Adresse",
-    "ex. @bob:example.com": "z. B. @bob:example.com",
-    "Add User": "Benutzer hinzufügen",
-    "Custom Server Options": "Benutzerdefinierte Server-Optionen",
     "Dismiss": "Ausblenden",
-    "Please check your email to continue registration.": "Bitte prüfe deine E-Mails, um mit der Registrierung fortzufahren.",
     "Token incorrect": "Token fehlerhaft",
     "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": "Entschlüsseln des Audios fehlgeschlagen",
     "Error decrypting image": "Entschlüsselung des Bilds fehlgeschlagen",
     "Error decrypting video": "Videoentschlü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 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 Raumnamens oder eines Raumthemas 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.",
@@ -295,12 +233,10 @@
     "URL Previews": "URL-Vorschau",
     "Offline": "Offline",
     "Online": "Online",
-    " (unsupported)": " (nicht unterstützt)",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Dieser Prozess erlaubt es dir, die zuvor von einem anderen Matrix-Client exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf dem anderen Client entschlüsselt werden konnten.",
     "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": "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?": "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 Systemstart automatisch starten",
     "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
@@ -317,8 +253,6 @@
     "Export": "Exportieren",
     "Import": "Importieren",
     "Incorrect username and/or password.": "Inkorrekter Nutzername und/oder Passwort.",
-    "Results from DuckDuckGo": "Ergebnisse von DuckDuckGo",
-    "Add a topic": "Thema hinzufügen",
     "Anyone": "Jeder",
     "Are you sure you want to leave the room '%(roomName)s'?": "Bist du sicher, dass du den Raum '%(roomName)s' verlassen möchtest?",
     "Custom level": "Benutzerdefiniertes Berechtigungslevel",
@@ -331,55 +265,33 @@
     "%(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",
-    "The phone number entered looks invalid": "Die eingegebene Telefonnummer scheint ungültig zu sein",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wird hochgeladen",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
     "Create new room": "Neuer Raum",
-    "Room directory": "Raum-Verzeichnis",
     "Start chat": "Chat starten",
     "New Password": "Neues Passwort",
-    "Username available": "Benutzername ist verfügbar",
-    "Username not available": "Benutzername ist nicht verfügbar",
     "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": "Annehmen",
-    "Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)",
     "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",
     "Decline": "Ablehnen",
-    "Drop File Here": "Lasse Datei hier los",
     "Failed to upload profile picture!": "Hochladen des Profilbilds fehlgeschlagen!",
-    "Incoming call from %(name)s": "Eingehender Anruf von %(name)s",
-    "Incoming video call from %(name)s": "Eingehender Videoanruf von %(name)s",
-    "Incoming voice call from %(name)s": "Eingehender Sprachanruf von %(name)s",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Per <voiceText>Sprachanruf</voiceText> oder <videoText>Videoanruf</videoText> beitreten.",
     "Last seen": "Zuletzt gesehen um",
     "No display name": "Kein Anzeigename",
-    "Private Chat": "Privater Chat",
-    "Public Chat": "Öffentlicher Chat",
     "%(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",
     "Unnamed Room": "Unbenannter Raum",
     "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 Ergebnisse)",
-    "(could not connect media)": "(Medienverbindung konnte nicht hergestellt werden)",
-    "(no answer)": "(keine Antwort)",
-    "(unknown failure: %(reason)s)": "(Unbekannter Fehler: %(reason)s)",
     "Your browser does not support the required cryptography extensions": "Dein Browser unterstützt die benötigten Verschlüsselungserweiterungen nicht",
     "Not a valid %(brand)s keyfile": "Keine gültige %(brand)s-Schlüsseldatei",
     "Authentication check failed: incorrect password?": "Authentifizierung fehlgeschlagen: Falsches Passwort?",
@@ -387,13 +299,10 @@
     "This will allow you to reset your password and receive notifications.": "Dies ermöglicht es dir, dein Passwort zurückzusetzen und Benachrichtigungen zu empfangen.",
     "Skip": "Überspringen",
     "Check for update": "Nach Aktualisierung suchen",
-    "Add a widget": "Widget hinzufügen",
-    "Allow": "Erlauben",
     "Delete widget": "Widget entfernen",
     "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 Syntaxhervorhebung",
-    "To get started, please pick a username!": "Um zu starten, wähle bitte einen Nutzernamen!",
     "Unable to create widget.": "Widget kann nicht erstellt werden.",
     "You are not in this room.": "Du bist nicht in diesem Raum.",
     "You do not have permission to do that in this room.": "Du hast dafür keine Berechtigung in diesem Raum.",
@@ -402,11 +311,9 @@
     "Featured Rooms:": "Hervorgehobene Räume:",
     "Featured Users:": "Hervorgehobene Benutzer:",
     "Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
-    "Failed to upload image": "Bild-Hochladen fehlgeschlagen",
+    "Failed to upload image": "Hochladen des Bildes fehlgeschlagen",
     "AM": "a. m.",
     "PM": "p. m.",
-    "The maximum permitted number of widgets have already been added to this room.": "Die maximal erlaubte Anzahl an hinzufügbaren Widgets für diesen Raum wurde erreicht.",
-    "Cannot add any more widgets": "Kann keine weiteren Widgets hinzufügen",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s entfernt",
     "%(widgetName)s widget modified by %(senderName)s": "Das Widget '%(widgetName)s' wurde von %(senderName)s bearbeitet",
@@ -448,15 +355,11 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Bitte einen der folgenden gültigen Adresstypen verwenden: %(validTypesList)s.",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Entfernen von '%(roomName)s' aus %(groupId)s fehlgeschlagen",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Bist du sicher, dass du '%(roomName)s' aus '%(groupId)s' entfernen möchtest?",
-    "Pinned Messages": "Angeheftete Nachrichten",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s hat die angehefteten Nachrichten für diesen Raum geändert.",
     "Jump to read receipt": "Zur Lesebestätigung springen",
     "Message Pinning": "Nachrichten anheften",
     "Long Description (HTML)": "Lange Beschreibung (HTML)",
-    "Jump to message": "Zur Nachricht springen",
-    "No pinned messages.": "Keine angehefteten Nachrichten vorhanden.",
     "Loading...": "Lädt...",
-    "Unpin Message": "Nachricht nicht mehr anheften",
     "Unnamed room": "Unbenannter Raum",
     "World readable": "Für alle lesbar",
     "Guests can join": "Gäste können beitreten",
@@ -508,9 +411,6 @@
     "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 '=_-./'",
-    "%(senderName)s sent an image": "%(senderName)s hat ein Bild gesendet",
-    "%(senderName)s sent a video": "%(senderName)s hat ein Video gesendet",
-    "%(senderName)s uploaded a file": "%(senderName)s hat eine Datei hochgeladen",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)shaben den Raum %(count)s-mal betreten",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)shaben den Raum betreten",
@@ -539,10 +439,10 @@
     "were banned %(count)s times|one": "wurden verbannt",
     "was banned %(count)s times|other": "wurde %(count)s-mal verbannt",
     "was banned %(count)s times|one": "wurde verbannt",
-    "were kicked %(count)s times|other": "wurden %(count)s-mal rausgeworfen",
-    "were kicked %(count)s times|one": "wurden rausgeworfen",
-    "was kicked %(count)s times|other": "wurde %(count)s-mal rausgeworfen",
-    "was kicked %(count)s times|one": "wurde rausgeworfen",
+    "were kicked %(count)s times|other": "wurden %(count)s-mal entfernt",
+    "were kicked %(count)s times|one": "wurden entfernt",
+    "was kicked %(count)s times|other": "wurde %(count)s-mal entfernt",
+    "was kicked %(count)s times|one": "wurde entfernt",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)shaben %(count)s-mal ihren Namen geändert",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)shaben ihren Namen geändert",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)shat %(count)s-mal den Namen geändert",
@@ -551,13 +451,12 @@
     "%(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 diesen Benutzer zurückziehen?",
-    "Kick this user?": "Diesen Benutzer rausschmeißen?",
+    "Kick this user?": "Diesen Benutzer entfernen?",
     "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)": "Mitglieder",
     "Members only (since they were invited)": "Mitglieder (ab Einladung)",
     "Members only (since they joined)": "Mitglieder (ab Beitreten)",
-    "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 diesen Benutzer zurückziehen?",
     "Remove this user from community?": "Diesen Benutzer aus der Community entfernen?",
@@ -578,18 +477,15 @@
     "Visibility in Room List": "Sichtbarkeit in Raumliste",
     "Visible to everyone": "Für alle sichtbar",
     "Only visible to community members": "Nur für Communitymitglieder sichtbar",
-    "Community Invites": "Community-Einladungen",
     "Notify the whole room": "Alle im Raum benachrichtigen",
     "Room Notification": "Raum-Benachrichtigung",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Diese Räume werden Community-Mitgliedern auf der Community-Seite angezeigt. Community-Mitglieder können diesen Räumen beitreten, indem sie diese anklicken.",
     "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume öffentlich auf der Communityseite und in der Raumliste angezeigt werden?",
-    "<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 für deine Community-Seite</h1>\n<p>\n    Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n    oder um wichtige <a href=\"foo\">Links</a> bereitzustellen.\n</p>\n<p>\n    Du kannst sogar 'img'-Tags (HTML) verwenden\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!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!",
     "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
     "Enable URL previews for this room (only affects you)": "URL-Vorschau für dich in diesem Raum",
     "Enable URL previews by default for participants in this room": "URL-Vorschau für Raummitglieder",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Du meldest dich gerade am Server von %(hs)s 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 des Raumes standardmäßig deaktiviert.",
     "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder des Raumes standardmäßig aktiviert.",
     "Restricted": "Eingeschränkt",
@@ -617,10 +513,6 @@
     "Send an encrypted reply…": "Verschlüsselte Antwort senden…",
     "Send an encrypted message…": "Verschlüsselte Nachricht senden…",
     "Replying": "Antwortet",
-    "Minimize apps": "Apps minimieren",
-    "%(count)s of your messages have not been sent.|one": "Deine Nachricht wurde nicht gesendet.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alle erneut senden</resendText> oder <cancelText>alle abbrechen</cancelText>. Du kannst auch einzelne Nachrichten erneut senden oder abbrechen.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Nachricht jetzt erneut senden</resendText> oder <cancelText>senden abbrechen</cancelText> now.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatsphäre ist uns wichtig, deshalb sammeln wir keine persönlichen oder identifizierbaren Daten für unsere Analysen.",
     "The information being sent to us to help make %(brand)s better includes:": "Zu den Informationen, die uns zugesandt werden, um zu helfen, %(brand)s besser zu machen, gehören:",
     "The platform you're on": "Benutzte Plattform",
@@ -636,16 +528,13 @@
     "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.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direktchat-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",
     "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ü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-IDs und Aliase, die du besucht hast sowie Nutzernamen anderer Nutzer mit denen du schreibst. Sie enthalten keine Nachrichten.",
-    "Submit debug logs": "Fehlerberichte einreichen",
+    "Submit debug logs": "Fehlerbericht einreichen",
     "Code": "Code",
     "Opens the Developer Tools dialog": "Entwickler-Werkzeuge öffnen",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Von %(displayName)s (%(userName)s) um %(dateTime)s gesehen",
@@ -662,13 +551,9 @@
     "Stickerpack": "Stickerpaket",
     "Fetching third party location failed": "Das Abrufen des Drittanbieterstandorts ist fehlgeschlagen",
     "Send Account Data": "Benutzerkontodaten senden",
-    "All notifications are currently disabled for all targets.": "Aktuell sind alle Benachrichtigungen für alle Ziele deaktiviert.",
-    "Uploading report": "Lade Bericht hoch",
     "Sunday": "Sonntag",
     "Notification targets": "Benachrichtigungsziele",
     "Today": "Heute",
-    "Files": "Dateien",
-    "You are not receiving desktop notifications": "Du erhältst keine Desktop-Benachrichtigungen",
     "Friday": "Freitag",
     "Update": "Aktualisieren",
     "What's New": "Was ist neu",
@@ -676,24 +561,14 @@
     "Changelog": "Änderungsprotokoll",
     "Waiting for response from server": "Auf Antwort vom Server warten",
     "Send Custom Event": "Benutzerdefiniertes Event senden",
-    "Advanced notification settings": "Erweiterte Benachrichtigungseinstellungen",
     "Failed to send logs: ": "Senden von Protokolldateien fehlgeschlagen: ",
-    "Forget": "Entfernen",
-    "You cannot delete this image. (%(code)s)": "Das Bild kann nicht gelöscht werden. (%(code)s)",
-    "Cancel Sending": "Senden abbrechen",
     "This Room": "In diesem Raum",
     "Resend": "Erneut senden",
     "Room not found": "Raum nicht gefunden",
     "Messages containing my display name": "Nachrichten mit meinem Anzeigenamen",
     "Messages in one-to-one chats": "Direktnachrichten",
     "Unavailable": "Nicht verfügbar",
-    "View Decrypted Source": "Entschlüsselten Quellcode ansehen",
-    "Failed to update keywords": "Schlüsselwörter konnten nicht aktualisiert werden",
     "remove %(name)s from the directory.": "entferne %(name)s aus dem Verzeichnis.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Die Benachrichtigungen zu den folgenden Schlüsselwörtern folgen Regeln, die hier nicht angezeigt werden können:",
-    "Please set a password!": "Bitte setze ein Passwort!",
-    "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!",
-    "An error occurred whilst saving your email notification preferences.": "Beim Speichern deiner E-Mail-Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
     "Explore Room State": "Raumstatus erkunden",
     "Source URL": "Quell-URL",
     "Messages sent by bot": "Nachrichten von Bots",
@@ -702,39 +577,24 @@
     "No update available.": "Keine Aktualisierung verfügbar.",
     "Noisy": "Laut",
     "Collecting app version information": "App-Versionsinformationen werden abgerufen",
-    "Keywords": "Schlüsselwörter",
-    "Enable notifications for this account": "Benachrichtigungen für dieses Konto",
     "Invite to this community": "In diese Community einladen",
-    "Messages containing <span>keywords</span>": "Nachrichten mit <span>Schlüsselwörtern</span>",
-    "Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
     "Tuesday": "Dienstag",
-    "Enter keywords separated by a comma:": "Gib die Schlüsselwörter durch einen Beistrich getrennt ein:",
-    "Forward Message": "Nachricht weiterleiten",
-    "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s aus dem Verzeichnis entfernt werden?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s nutzt zahlreiche fortgeschrittene Browser-Funktionen, die teilweise in deinem aktuell verwendeten Browser noch nicht verfügbar sind oder sich noch im experimentellen Status befinden.",
     "Developer Tools": "Entwicklerwerkzeuge",
     "Preparing to send logs": "Senden von Protokolldateien wird vorbereitet",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Vergiss nicht, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst, wenn du deine Meinung änderst.",
     "Explore Account Data": "Kontodaten erkunden",
-    "All messages (noisy)": "Alle Nachrichten (laut)",
     "Saturday": "Samstag",
-    "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
-    "Direct Chat": "Direkt-Chat",
     "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
     "Reject": "Ablehnen",
-    "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
     "Monday": "Montag",
     "Remove from Directory": "Aus dem Raum-Verzeichnis entfernen",
-    "Enable them now": "Diese jetzt aktivieren",
     "Toolbox": "Werkzeugkasten",
     "Collecting logs": "Protokolle werden abgerufen",
     "You must specify an event type!": "Du musst einen Eventtyp spezifizieren!",
-    "(HTTP status %(httpStatus)s)": "(HTTP-Status %(httpStatus)s)",
     "Invite to this room": "In diesen Raum einladen",
     "Wednesday": "Mittwoch",
     "You cannot delete this message. (%(code)s)": "Diese Nachricht kann nicht gelöscht werden. (%(code)s)",
-    "Quote": "Zitat",
+    "Quote": "Zitieren",
     "Send logs": "Protokolldateien übermitteln",
     "All messages": "Alle Nachrichten",
     "Call invitation": "Anrufe",
@@ -742,10 +602,7 @@
     "State Key": "Statusschlüssel",
     "Failed to send custom event.": "Senden des benutzerdefinierten Events fehlgeschlagen.",
     "What's new?": "Was ist neu?",
-    "Notify me for anything else": "Über alles andere benachrichtigen",
     "When I'm invited to a room": "Einladungen",
-    "Can't update user notification settings": "Benachrichtigungseinstellungen des Benutzers konnten nicht aktualisiert werden",
-    "Notify for all other messages/rooms": "Benachrichtigungen für alle anderen Mitteilungen/Räume aktivieren",
     "Unable to look up room ID from server": "Es ist nicht möglich, die Raum-ID auf dem Server nachzuschlagen",
     "Couldn't find a matching Matrix room": "Konnte keinen entsprechenden Matrix-Raum finden",
     "All Rooms": "In allen Räumen",
@@ -755,46 +612,31 @@
     "Back": "Zurück",
     "Reply": "Antworten",
     "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-IDs 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",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Es tut uns leid, aber dein Browser kann %(brand)s <b>nicht</b> ausführen.",
     "Messages in group chats": "Gruppenchats",
     "Yesterday": "Gestern",
     "Error encountered (%(errorDetail)s).": "Es ist ein Fehler aufgetreten (%(errorDetail)s).",
     "Low Priority": "Niedrige Priorität",
-    "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
-    "Set Password": "Passwort einrichten",
     "Off": "Aus",
     "%(brand)s does not know how to join a room on this network": "%(brand)s weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
-    "Mentions only": "Nur, wenn du erwähnt wirst",
-    "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Benutzerkonto zurückkehren, nachdem du dich abgemeldet hast. Anschließend kannst du dich an anderen Geräten anmelden.",
-    "Enable email notifications": "Benachrichtigungen per E-Mail",
     "Event Type": "Eventtyp",
-    "Download this file": "Datei herunterladen",
-    "Pin Message": "Nachricht anheften",
-    "Failed to change settings": "Einstellungen konnten nicht geändert werden",
     "View Community": "Community ansehen",
     "Event sent!": "Event gesendet!",
     "View Source": "Rohdaten anzeigen",
     "Event Content": "Eventinhalt",
     "Thank you!": "Danke!",
-    "Uploaded on %(date)s by %(user)s": "Hochgeladen: %(date)s von %(user)s",
-    "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!": "In deinem aktuell verwendeten Browser können Aussehen und Handhabung der Anwendung unter Umständen noch komplett fehlerhaft sein, so dass einige bzw. im Extremfall alle Funktionen nicht zur Verfügung stehen. Du kannst es trotzdem versuchen und fortfahren, bist dabei aber bezüglich aller auftretenden Probleme auf dich allein gestellt!",
     "Checking for an update...": "Nach Aktualisierungen suchen...",
     "Missing roomId.": "Fehlende Raum-ID.",
     "Every page you use in the app": "Jede Seite, die du in der App benutzt",
     "e.g. <CurrentPageURL>": "z. B. <CurrentPageURL>",
     "Your device resolution": "Deine Bildschirmauflösung",
-    "Popout widget": "Widget ausklinken",
-    "Always show encryption icons": "Immer Verschlüsselungssymbole zeigen",
+    "Popout widget": "Widget in eigenem Fenster öffnen",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Das Ereignis, auf das geantwortet wurde, konnte nicht geladen werden. Entweder es existiert nicht oder du hast keine Berechtigung, dieses anzusehen.",
     "Send Logs": "Sende Protokoll",
     "Clear Storage and Sign Out": "Speicher leeren und abmelden",
     "Refresh": "Neu laden",
     "We encountered an error trying to restore your previous session.": "Wir haben ein Problem beim Wiederherstellen deiner vorherigen Sitzung festgestellt.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Den Browser-Speicher zu löschen kann das Problem lösen, wird dich aber abmelden und verschlüsselte Chats unlesbar machen.",
-    "Collapse Reply Thread": "Antwort-Thread zusammenklappen",
     "Enable widget screenshots on supported widgets": "Bildschirmfotos für unterstützte Widgets",
     "Send analytics data": "Analysedaten senden",
     "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
@@ -817,26 +659,16 @@
     "Share Community": "Teile Community",
     "Share Room Message": "Raumnachricht teilen",
     "Link to selected message": "Link zur ausgewählten Nachricht",
-    "COPY": "KOPIEREN",
-    "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 Linkvorschau 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.": "Die URL-Vorschau kann Informationen wie den Titel, die Beschreibung sowie ein Vorschaubild der Website 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?": "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!",
     "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",
-    "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": "Systembenachrichtigung",
     "Only room administrators will see this warning": "Nur Raumadministratoren 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.",
@@ -878,8 +710,6 @@
     "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.",
     "Delete Backup": "Sicherung löschen",
-    "Backup version: ": "Sicherungsversion: ",
-    "Algorithm: ": "Algorithmus: ",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Um zu vermeiden, dass dein Chatverlauf verloren geht, musst du deine Raumschlüssel exportieren, bevor du dich abmeldest. Dazu musst du auf die neuere Version von %(brand)s zurückgehen",
     "Incompatible Database": "Inkompatible Datenbanken",
     "Continue With Encryption Disabled": "Mit deaktivierter Verschlüsselung fortfahren",
@@ -892,11 +722,9 @@
     "<b>Save it</b> on a USB key or backup drive": "<b>Speichere ihn</b> auf einem USB-Schlüssel oder Sicherungslaufwerk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiere ihn</b> in deinen persönlichen Cloud-Speicher",
     "Unable to create key backup": "Konnte Schlüsselsicherung nicht erstellen",
-    "Retry": "Erneut probieren",
+    "Retry": "Wiederholen",
     "Unable to restore backup": "Konnte Schlüsselsicherung nicht wiederherstellen",
     "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": "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",
@@ -927,7 +755,6 @@
     "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",
-    "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 mit \"@room\"",
     "Encrypted messages in one-to-one chats": "Verschlüsselte Direktnachrichten",
     "Encrypted messages in group chats": "Verschlüsselte Gruppenchats",
@@ -935,18 +762,13 @@
     "Straight rows of keys are easy to guess": "Gerade Reihen von Tasten sind einfach zu erraten",
     "Custom user status messages": "Angepasste Nutzerstatusnachrichten",
     "Unable to load key backup status": "Konnte Status der Schlüsselsicherung nicht laden",
-    "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": "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 Übermittlungsdetails nicht laden: %(msg)s",
-    "Checking...": "Überprüfe...",
     "Unable to load backup status": "Konnte Sicherungsstatus nicht laden",
     "Failed to decrypt %(failedCount)s sessions!": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Greife auf deine gesicherten Chatverlauf zu und richten einen sicheren Nachrichtenversand ein, indem du deine Wiederherstellungspassphrase eingibst.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Wenn du deinen Wiederherstellungspassphrase vergessen hast, kannst du <button1>deinen Wiederherstellungsschlüssel benutzen</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Greife auf deinen gesicherten Chatverlauf zu und richten durch Eingabe deines Wiederherstellungsschlüssels einen sicheren Nachrichtenversand ein.",
     "Set a new status...": "Setze einen neuen Status...",
     "Clear status": "Status löschen",
     "Invalid homeserver discovery response": "Ungültige Antwort beim Aufspüren des Heimservers",
@@ -954,8 +776,6 @@
     "General failure": "Allgemeiner Fehler",
     "Failed to perform homeserver discovery": "Fehler beim Aufspüren des Heimservers",
     "Set up Secure Message Recovery": "Richte Sichere Nachrichten-Wiederherstellung ein",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ohne Sichere Nachrichten-Wiederherstellung einzurichten, wirst du deine sichere Nachrichtenhistorie verlieren, wenn du dich abmeldest.",
-    "If you don't want to set this up now, you can later in Settings.": "Wenn du dies jetzt nicht einrichten willst, kannst du dies später in den Einstellungen tun.",
     "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 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",
@@ -979,7 +799,7 @@
     "Render simple counters in room header": "Einfache Zähler in Raumkopfzeile anzeigen",
     "Enable Emoji suggestions while typing": "Emojivorschläge während Eingabe",
     "Show a placeholder for removed messages": "Platzhalter für gelöschte Nachrichten",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Betreten oder Verlassen von Benutzern (ausgen. Einladungen/Rauswürfe/Banne)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Betreten oder Verlassen von Benutzern (ausgen. Einladungen/Entfernen/Banne)",
     "Show avatar changes": "Avataränderungen",
     "Show display name changes": "Änderungen von Anzeigenamen",
     "Send typing notifications": "Tippbenachrichtigungen senden",
@@ -999,7 +819,6 @@
     "Email Address": "E-Mail-Adresse",
     "Backing up %(sessionsRemaining)s keys...": "Sichere %(sessionsRemaining)s Schlüssel...",
     "All keys backed up": "Alle Schlüssel gesichert",
-    "Add an email address to configure email notifications": "Füge eine E-Mail-Adresse hinzu, um E-Mail-Benachrichtigungen zu konfigurieren",
     "Unable to verify phone number.": "Die Telefonnummer kann nicht überprüft werden.",
     "Verification code": "Bestätigungscode",
     "Phone Number": "Telefonnummer",
@@ -1026,7 +845,7 @@
     "Versions": "Versionen",
     "Room Addresses": "Raumadressen",
     "Deactivating your account is a permanent action - be careful!": "Die Deaktivierung deines Kontos ist unwiderruflich - sei vorsichtig!",
-    "Preferences": "Chats",
+    "Preferences": "Optionen",
     "Room list": "Raumliste",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Die Datei '%(fileName)s' überschreitet die maximale Uploadgröße deines Heimservers",
     "This room has no topic.": "Dieser Raum hat kein Thema.",
@@ -1107,9 +926,8 @@
     "Security & Privacy": "Sicherheit",
     "Encryption": "Verschlüsselung",
     "Once enabled, encryption cannot be disabled.": "Sobald du die Verschlüsselung aktivierst, kann du sie nicht mehr deaktivieren.",
-    "Encrypted": "Verschlüsselt",
+    "Encrypted": "Verschlüsseln",
     "Ignored users": "Blockierte 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 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.",
@@ -1121,7 +939,6 @@
     "Join": "Beitreten",
     "Waiting for partner to confirm...": "Warte auf Bestätigung des Gesprächspartners...",
     "Incoming Verification Request": "Eingehende Verifikationsanfrage",
-    "Allow Peer-to-Peer for 1:1 calls": "Peer-to-Peer-Verbindungen für Direktanrufe erlauben",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Bist du sicher? Du wirst alle deine verschlüsselten Nachrichten verlieren, wenn deine Schlüssel nicht gut gesichert sind.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Verschlüsselte Nachrichten sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger haben die Schlüssel um diese Nachrichten zu lesen.",
     "Restore from Backup": "Von Sicherung wiederherstellen",
@@ -1132,11 +949,6 @@
     "Success!": "Erfolgreich!",
     "Your keys are being backed up (the first backup could take a few minutes).": "Deine Schlüssel werden gesichert (Das erste Backup könnte ein paar Minuten in Anspruch nehmen).",
     "Voice & Video": "Anrufe",
-    "Never lose encrypted messages": "Verliere niemals verschlüsselte Nachrichten",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Nachrichten in diesem Raum sind mit einer Ende-zu-Ende-Verschlüsselung gesichert. Nur du und dein(e) Gesprächspartner haben die Schlüssel, um die Nachrichten zu lesen.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Speichere deine Schlüssel an einem sicheren Ort, um diese nicht zu verlieren. <a>Lerne wie.</a>",
-    "Not now": "Später",
-    "Don't ask me again": "Nicht mehr fragen",
     "Go back": "Zurück",
     "Are you sure you want to sign out?": "Bist du sicher, dass du dich abmelden möchtest?",
     "Manually export keys": "Manueller Schlüssel Export",
@@ -1144,31 +956,16 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Überprüfe diesen Benutzer, um ihn als vertrauenswürdig zu kennzeichnen. Benutzern zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende-verschlüsselten Nachrichten.",
     "I don't want my encrypted messages": "Ich möchte meine verschlüsselten Nachrichten nicht",
     "You'll lose access to your encrypted messages": "Du wirst den Zugang zu deinen verschlüsselten Nachrichten verlieren",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Wenn du Fehler bemerkst oder eine Rückmeldung geben möchtest, teile dies uns auf GitHub mit.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Um doppelte Issues zu vermeiden, <existingIssuesLink>schaue bitte zuerst die existierenden Issues an</existingIssuesLink> (und füge ein \"+1\" hinzu), oder <newIssueLink>erstelle ein neues Issue</newIssueLink>, wenn du kein passendes findest.",
-    "Report bugs & give feedback": "Melde Fehler & gib Rückmeldungen",
     "Update status": "Aktualisiere Status",
     "Set status": "Setze Status",
     "Hide": "Verbergen",
     "This homeserver would like to make sure you are not a robot.": "Dieser Heimserver möchte sicherstellen, dass du kein Roboter bist.",
-    "Server Name": "Servername",
-    "Your Modular server": "Dein Modular-Server",
-    "The username field must not be blank.": "Das Feld für den Benutzername darf nicht leer sein.",
     "Username": "Benutzername",
-    "Not sure of your password? <a>Set a new one</a>": "Du bist dir bei deinem Passwort nicht sicher? <a>Setze ein neues</a>",
     "Change": "Ändern",
-    "Create your account": "Erstelle dein Konto",
     "Email (optional)": "E-Mail (optional)",
     "Phone (optional)": "Telefon (optional)",
     "Confirm": "Bestätigen",
-    "Other servers": "Andere Server",
-    "Homeserver URL": "Heimserver-Adresse",
-    "Identity Server URL": "Identitätsserver-URL",
-    "Free": "Frei",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium-Hosting für Organisationen <a>Lerne mehr</a>",
     "Other": "Andere",
-    "Find other public servers or use a custom server": "Finde andere öffentliche Server oder benutze einen angepassen Server",
     "Couldn't load page": "Konnte Seite nicht laden",
     "This homeserver does not support communities": "Dieser Heimserver unterstützt keine Community",
     "Guest": "Gast",
@@ -1181,11 +978,9 @@
     "Registration has been disabled on this homeserver.": "Registrierungen wurden auf diesem Heimserver deaktiviert.",
     "Keep going...": "Fortfahren...",
     "For maximum security, this should be different from your account password.": "Für maximale Sicherheit, sollte dies anders als dein Konto-Passwort sein.",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Eine neue Wiederherstellungspassphrase und -Schlüssel für sichere Nachrichten wurde festgestellt.",
     "Recovery Method Removed": "Wiederherstellungsmethode gelöscht",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die Wiederherstellungsmethode nicht gelöscht hast, kann ein Angreifer versuchen Zugang zu deinem Konto zu bekommen. Ändere dein Passwort und richte sofort eine neue Wiederherstellungsmethode in den Einstellungen ein.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warnung</b>: Du solltest die Schlüsselsicherung nur auf einem vertrauenswürdigen Gerät einrichten.",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Gib die Adresse deines Modular-Heimservers an. Es kann deine eigene Domain oder eine Subdomain von <a>modular.im</a> sein.",
     "Unable to query for supported registration methods.": "Konnte unterstützte Registrierungsmethoden nicht abrufen.",
     "Bulk options": "Sammeloptionen",
     "Join millions for free on the largest public server": "Schließe dich kostenlos auf dem größten öffentlichen Server Millionen von Menschen an",
@@ -1211,9 +1006,8 @@
     "Send messages": "Nachrichten senden",
     "Invite users": "Benutzer einladen",
     "Change settings": "Einstellungen ändern",
-    "Kick users": "Benutzer rauswerfen",
+    "Kick users": "Benutzer entfernen",
     "Ban users": "Benutzer verbannen",
-    "Remove messages": "Nachrichten löschen",
     "Notify everyone": "Jeden benachrichtigen",
     "Send %(eventType)s events": "%(eventType)s-Ereignisse senden",
     "Select the roles required to change various parts of the room": "Wähle Rollen, die benötigt werden, um einige Teile des Raumes zu ändern",
@@ -1225,14 +1019,8 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Es gab ein Problem beim Aktualisieren des Abzeichens für diesen Raum. Es kann sein, dass der Server es nicht erlaubt oder ein temporäres Problem auftrat.",
     "Power level": "Berechtigungsstufe",
     "Room Settings - %(roomName)s": "Raumeinstellungen - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Ein Benutzername kann nur Kleinbuchstaben, Nummern und '=_-./' enthalten",
-    "Share Permalink": "Teile permanenten Link",
-    "Sign in to your Matrix account on %(serverName)s": "Melde dich mit deinem Matrixkonto auf %(serverName)s an",
-    "Create your Matrix account on %(serverName)s": "Erstelle ein Matrixkonto auf %(serverName)s",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
     "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",
     "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.",
@@ -1248,7 +1036,6 @@
     "Adds a custom widget by URL to the room": "Fügt ein Benutzerwidget über eine URL zum Raum hinzu",
     "Please supply a https:// or http:// widget URL": "Bitte gib eine mit https:// oder http:// beginnende Widget-URL an",
     "Sends the given emote coloured as a rainbow": "Zeigt Aktionen in Regenbogenfarben",
-    "%(senderName)s made no change.": "%(senderName)s hat keine Änderung vorgenommen.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung für %(targetDisplayName)s zurückgezogen.",
     "Cannot reach homeserver": "Der Heimserver ist nicht erreichbar",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Stelle sicher, dass du eine stabile Internetverbindung hast oder wende dich an deinen Serveradministrator",
@@ -1262,7 +1049,6 @@
     "Unexpected error resolving homeserver configuration": "Ein unerwarteter Fehler ist beim Laden der Heimserverkonfiguration aufgetreten",
     "The user's homeserver does not support the version of the room.": "Die Raumversion wird vom Heimserver des Benutzers nicht unterstützt.",
     "Show hidden events in timeline": "Zeige versteckte Ereignisse in der Chronik",
-    "Low bandwidth mode": "Modus für niedrige Bandbreite",
     "Reset": "Zurücksetzen",
     "Joining room …": "Raum beitreten …",
     "Rejecting invite …": "Einladung ablehnen…",
@@ -1280,13 +1066,11 @@
     "Upload": "Hochladen",
     "Cancel All": "Alle abbrechen",
     "Upload Error": "Fehler beim Hochladen",
-    "Deny": "Ablehnen",
     "Enter password": "Passwort eingeben",
     "Password is allowed, but unsafe": "Passwort ist erlaubt, aber unsicher",
     "Passwords don't match": "Passwörter stimmen nicht überein",
     "Enter username": "Benutzername eingeben",
     "Add room": "Raum hinzufügen",
-    "Your profile": "Dein Profil",
     "Registration Successful": "Registrierung erfolgreich",
     "Failed to revoke invite": "Einladung konnte nicht zurückgezogen werden",
     "Revoke invite": "Einladung zurückziehen",
@@ -1298,20 +1082,14 @@
     "Call failed due to misconfigured server": "Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen",
     "Try using turn.matrix.org": "Versuche es mit turn.matrix.org",
     "You do not have the required permissions to use this command.": "Du hast nicht die erforderlichen Berechtigungen, diesen Befehl zu verwenden.",
-    "Multiple integration managers": "Mehrere Integrationsverwalter",
     "Public Name": "Öffentlicher Name",
-    "Identity Server URL must be HTTPS": "Identitätsserver-URL muss HTTPS 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 Standardidentitätsserver (%(defaultIdentityServerName)s) zu benutzen oder ändere ihn in den Einstellungen.",
     "ID": "ID",
-    "Not a valid Identity Server (status code %(code)s)": "Ungültiger Identitätsserver (Fehlercode %(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.",
-    "Identity Server (%(server)s)": "Identitätsserver (%(server)s)",
     "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.": "Die Verwendung eines Identitätsserver ist optional. Solltest du dich dazu entschließen, keinen Identitätsserver zu verwenden, kannst du von anderen Nutzern nicht gefunden werden und andere nicht per E-Mail oder Telefonnummer einladen.",
     "Do not use an identity server": "Keinen Identitätsserver verwenden",
     "Enter a new identity server": "Gib einen neuen Identitätsserver ein",
@@ -1321,7 +1099,7 @@
     "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",
-    "Changes the avatar of the current room": "Ändert den Avatar für diesen Raum",
+    "Changes the avatar of the current room": "Ändert den Avatar des Raums",
     "Deactivate account": "Benutzerkonto deaktivieren",
     "Show previews/thumbnails for images": "Vorschauen für Bilder",
     "View": "Vorschau",
@@ -1337,7 +1115,6 @@
     "Use an identity server to invite by email. Manage in Settings.": "Mit einem Identitätsserver kannst du über E-Mail Einladungen zu verschicken. Verwalte ihn in den Einstellungen.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Verwende neue Möglichkeiten, Menschen zu blockieren",
-    "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 und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
     "Accept <policyLink /> to continue:": "Akzeptiere <policyLink />, um fortzufahren:",
@@ -1352,9 +1129,7 @@
     "%(senderName)s placed a video call.": "%(senderName)s hat einen Videoanruf getätigt.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hat einen Videoanruf getätigt. (Nicht von diesem Browser unterstützt)",
     "Verify this session": "Sitzung verifizieren",
-    "Set up encryption": "Verschlüsselung einrichten",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s aktualisierte eine ungültige Ausschlussregel",
-    "The message you are trying to send is too large.": "Die Nachricht, die du versuchst zu senden, ist zu lang.",
     "a few seconds ago": "vor ein paar Sekunden",
     "about a minute ago": "vor etwa einer Minute",
     "%(num)s minutes ago": "vor %(num)s Minuten",
@@ -1376,7 +1151,6 @@
     "Verify": "Verifizieren",
     "Decline (%(counter)s)": "(%(counter)s) ablehnen",
     "not found": "nicht gefunden",
-    "rooms.": "Räumen zu speichern.",
     "Manage": "Verwalten",
     "Securely cache encrypted messages locally for them to appear in search results.": "Speichere verschlüsselte Nachrichten lokal, sodass sie deinen Suchergebnissen erscheinen können.",
     "Enable": "Aktivieren",
@@ -1385,10 +1159,9 @@
     "The integration manager is offline or it cannot reach your homeserver.": "Der Integrationsverwalter 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</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?",
-    "The identity server you have chosen does not have any terms of service.": "Der von dir gewählte Identitätsserver hat keine Nutzungsbedingungen.",
+    "The identity server you have chosen does not have any terms of service.": "Der von dir gewählte Identitätsserver gibt keine Nutzungsbedingungen an.",
     "Disconnect identity server": "Verbindung zum Identitätsserver trennen",
     "contact the administrators of identity server <idserver />": "Administration des Identitätsservers <idserver /> kontaktieren",
     "wait and try again later": "warte und versuche es später erneut",
@@ -1396,12 +1169,9 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Du <b>teilst deine persönlichen Daten</b> immer noch auf dem Identitätsserver <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Wir empfehlen, dass du deine E-Mail-Adressen und Telefonnummern vom Identitätsserver löschst, bevor du die Verbindung trennst.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Zur Zeit benutzt du keinen Identitätsserver. Trage unten einen Server ein, um Kontakte finden und von anderen gefunden zu werden.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Nutze einen Integrationsverwalter <b>(%(serverName)s)</b>, um Bots, Widgets und Stickerpakete zu verwalten.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsverwalter, um Bots, Widgets und Stickerpakete zu verwalten.",
     "Manage integrations": "Integrationen verwalten",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Stimme den Nutzungsbedingungen des Identitätsservers %(serverName)s zu, um dich per E-Mail-Adresse und Telefonnummer auffindbar zu machen.",
     "Clear cache and reload": "Zwischenspeicher löschen und neu laden",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Passe deine Erfahrung mit experimentellen Funktionen an. <a>Mehr erfahren</a>.",
     "Ignored/Blocked": "Ignoriert/Blockiert",
     "Something went wrong. Please try again or view your console for hints.": "Etwas ist schief gelaufen. Bitte versuche es erneut oder sieh für weitere Hinweise in deiner Konsole nach.",
     "Error subscribing to list": "Fehler beim Abonnieren der Liste",
@@ -1419,12 +1189,10 @@
     "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 die Berührung 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 (PWA) verwendest",
     "Your user agent": "Dein Useragent",
-    "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.",
-    "If you cancel now, you won't complete verifying your other session.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung der anderen Sitzung nicht beenden können.",
     "Cancel entering passphrase?": "Eingabe der Passphrase abbrechen?",
     "Setting up keys": "Einrichten der Schlüssel",
     "Encryption upgrade available": "Verschlüsselungsaufstufung verfügbar",
-    "Verifies a user, session, and pubkey tuple": "Verifiziert einen Benutzer, eine Sitzung und die öffentlichen Schlüsselpaare",
+    "Verifies a user, session, and pubkey tuple": "Verifiziert Benutzer, Sitzung und öffentlichen Schlüsselpaare",
     "Unknown (user, session) pair:": "Unbekanntes Nutzer-/Sitzungspaar:",
     "Session already verified!": "Sitzung bereits verifiziert!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "WARNUNG: Die Sitzung wurde bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
@@ -1440,16 +1208,13 @@
     "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 alle verfügbaren Befehle aufzulisten. Willst du es stattdessen als Nachricht senden?",
-    "Direct message": "Direktnachricht",
     "Suggestions": "Vorschläge",
     "Recently Direct Messaged": "Zuletzt kontaktiert",
     "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 die Protokolldateien</a>.",
     "Notification settings": "Benachrichtigungen",
-    "Help": "Hilf uns",
     "Filter": "Filtern",
-    "Filter rooms…": "Räume filtern…",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
     "Go Back": "Zurück",
     "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
@@ -1468,7 +1233,6 @@
     "%(count)s sessions|other": "%(count)s Sitzungen",
     "Hide sessions": "Sitzungen ausblenden",
     "Encryption enabled": "Verschlüsselung aktiviert",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt. Erfahre mehr & überprüfe diesen Benutzer in seinem Benutzerprofil.",
     "Encryption not enabled": "Verschlüsselung nicht aktiviert",
     "You verified %(name)s": "Du hast %(name)s verifiziert",
     "You cancelled verifying %(name)s": "Du hast die Verifizierung von %(name)s abgebrochen",
@@ -1479,20 +1243,15 @@
     "%(name)s wants to verify": "%(name)s will eine Verifizierung",
     "Your display name": "Dein Anzeigename",
     "Please enter a name for the room": "Bitte gib einen Namen für den Raum ein",
-    "This room is private, and can only be joined by invitation.": "Dieser Raum ist privat und kann nur auf Einladung betreten werden.",
     "Create a private room": "Einen privaten Raum erstellen",
     "Topic (optional)": "Thema (optional)",
-    "Make this room public": "Mache diesen Raum öffentlich",
     "Hide advanced": "Erweiterte Einstellungen ausblenden",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Hindere Benutzer auf anderen Matrix-Homeservern daran, diesem Raum beizutreten (Diese Einstellung kann später nicht geändert werden!)",
     "Session name": "Name der Sitzung",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "So kannst du nach der Abmeldung zu deinem Konto zurückkehren und dich bei anderen Sitzungen anmelden.",
     "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ältst keine Push-Benachrichtigungen mehr. Um sie 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 als vertrauenswürdig markiert.",
     "Sign out and remove encryption keys?": "Abmelden und Verschlüsselungsschlüssel entfernen?",
-    "Sign in to your Matrix account on <underlinedServerName />": "Melde dich bei deinem Matrix-Konto auf <underlinedServerName /> an",
     "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.",
     "Sign in and regain access to your account.": "Melden dich an und erhalte wieder Zugang zu deinem Konto.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deine Homeserver-Administration für weitere Informationen.",
@@ -1527,9 +1286,7 @@
     "Service": "Dienst",
     "Summary": "Zusammenfassung",
     "Document": "Dokument",
-    "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 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:",
@@ -1547,10 +1304,7 @@
     "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 />",
     "Preview": "Vorschau",
-    "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": "Kürzlich gesendete Nachrichten von %(user)s entfernen",
@@ -1594,7 +1348,6 @@
     "This backup is trusted because it has been restored on this session": "Dieser Sicherung wird vertraut, da sie während dieser Sitzung wiederhergestellt wurde",
     "Enable desktop notifications for this session": "Desktopbenachrichtigungen in dieser Sitzung",
     "Enable audible notifications for this session": "Benachrichtigungstöne in dieser Sitzung",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationsverwalter erhalten Konfigurationsdaten und können Widgets modifizieren, Raumeinladungen verschicken und in deinem Namen Berechtigungslevel setzen.",
     "Read Marker lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung (ms)",
     "Read Marker off-screen lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung außerhalb des Bildschirms (ms)",
     "Session key:": "Sitzungsschlüssel:",
@@ -1619,32 +1372,24 @@
     "Report Content to Your Homeserver Administrator": "Inhalte an die Administration deines Heimservers melden",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Wenn du diese Nachricht meldest, wird die eindeutige Event-ID an die Administration deines Heimservers übermittelt. Wenn die Nachrichten in diesem Raum verschlüsselt sind, wird deine Heimserver-Administration nicht in der Lage sein, Nachrichten zu lesen oder Medien einzusehen.",
     "Send report": "Bericht senden",
-    "Enter recovery passphrase": "Gib die Wiederherstellungspassphrase ein",
-    "Enter recovery key": "Wiederherstellungspassphrase eingeben",
     "Report Content": "Inhalt melden",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Gib eine E-Mail-Adresse an um dein Konto wiederherstellen zu können. Die E-Mail-Adresse kann auch genutzt werden um deinen Kontakt zu finden.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Gib eine andere Heimserver-Adresse an <a>Was bedeutet das?</a>",
     "%(creator)s created and configured the room.": "%(creator)s hat den Raum erstellt und konfiguriert.",
-    "Set up with a recovery key": "Mit einem Wiederherstellungsschlüssel einrichten",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewahre eine Kopie an einem sicheren Ort, wie einem Passwort-Manager oder in einem Safe auf.",
-    "Your recovery key": "Dein Wiederherstellungsschlüssel",
     "Copy": "In Zwischenablage kopieren",
-    "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel",
     "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": "Kürzlich besuchte Räume anzeigen",
     "Use Single Sign On to continue": "Einmalanmeldung zum Fortfahren nutzen",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse durch Single Sign-on, um deine Identität nachzuweisen.",
-    "Single Sign On": "Einmalanmeldung",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die neue E-Mail-Adresse mit Single-Sign-On, um deine Identität nachzuweisen.",
+    "Single Sign On": "Single Sign-on",
     "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 der Einmalanmeldung 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",
     "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen",
     "Command failed": "Befehl fehlgeschlagen",
     "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.",
+    "Click the button below to confirm adding this email address.": "Klicke unten auf den Knopf, 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 Ausschlussregel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschlussregel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
@@ -1665,11 +1410,8 @@
     "They match": "Sie passen zueinander",
     "They don't match": "Sie passen nicht zueinander",
     "To be secure, do this in person or use a trusted way to communicate.": "Um sicher zu gehen, mache dies persönlich oder verwende eine vertrauenswürdige Art der Kommunikation.",
-    "Verify yourself & others to keep your chats safe": "Verifiziere dich & andere, um eure Chats zu schützen",
     "This bridge was provisioned by <user />.": "Diese Brücke wurde von <user /> bereitgestellt.",
     "This bridge is managed by <user />.": "Diese Brücke wird von <user /> verwaltet.",
-    "Workspace: %(networkName)s": "Arbeitsbereich: %(networkName)s",
-    "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Show less": "Weniger 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.",
@@ -1686,13 +1428,8 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bestätige das Löschen deines Kontos indem du dich mittels Einmalanmeldung anmeldest um deine Identität nachzuweisen.",
     "Confirm account deactivation": "Konto löschen bestätigen",
     "Confirm your identity by entering your account password below.": "Bestätige deine Identität, indem du unten dein Kontopasswort eingibst.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Bestätige deine Identität indem du diesen Login von einer deiner anderen Sitzungen verifizierst um Zugriff auf deine verschlüsselten Nachrichten zu erhalten.",
     "Enter your account password to confirm the upgrade:": "Gib dein Kontopasswort ein, um die Aktualisierung zu bestätigen:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Du musst dich am Server authentifizieren, um die Aktualisierung zu bestätigen.",
-    "Enter your recovery passphrase a second time to confirm it.": "Gib deine Wiederherstellungspassphrase zur Bestätigung erneut ein.",
-    "Confirm your recovery passphrase": "Bestätige deine Wiederherstellungspassphrase",
-    "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen.",
-    "Review where you’re logged in": "Überprüfe, wo du eingeloggt bist",
     "New login. Was this you?": "Neue Anmeldung. Warst du das?",
     "Please supply a widget URL or embed code": "Bitte gib eine Widget-URL oder einen Einbettungscode an",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Gibt den per SMS an +%(msisdn)s gesendeten Bestätigungscode ein.",
@@ -1723,21 +1460,14 @@
     "Uploaded sound": "Hochgeladener Ton",
     "Upgrade this room to the recommended room version": "Aktualisiere diesen Raum auf die empfohlene Raumversion",
     "this room": "Dieser Raum",
-    "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.",
+    "View older messages in %(roomName)s.": "Alte Nachrichten in %(roomName)s anzeigen.",
     "Send a bug report with logs": "Einen Fehlerbericht mit der Protokolldatei 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:",
     "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)",
     "Your homeserver does not support cross-signing.": "Dein Heimserver unterstützt keine Quersignierung.",
-    "Cross-signing and secret storage are enabled.": "Cross-signing und der sichere Speicher wurden eingerichtet.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Dein Konto hat eine Quersignaturidentität im sicheren Speicher, der von dieser Sitzung jedoch noch nicht vertraut wird.",
-    "Cross-signing and secret storage are not yet set up.": "Cross-Signing und der sichere Speicher sind noch nicht eingerichtet.",
-    "Reset cross-signing and secret storage": "Cross-Signing und den sicheren Speicher zurücksetzen",
-    "Bootstrap cross-signing and secret storage": "Richte Cross-Signing und den sicheren Speicher ein",
     "unexpected type": "unbekannter Typ",
     "Cross-signing public keys:": "Öffentlicher Quersignaturschlüssel:",
     "in memory": "im Speicher",
@@ -1747,7 +1477,6 @@
     "cached locally": "lokal zwischengespeichert",
     "not found locally": "lokal nicht gefunden",
     "User signing private key:": "Privater Benutzerschlüssel:",
-    "Session backup key:": "Sitzungswiederherstellungsschlüssel:",
     "Secret storage public key:": "Öffentlicher Schlüssel des sicheren Speichers:",
     "in account data": "in den Kontodaten",
     "Homeserver feature support:": "Unterstützte Funktionen des Heimservers:",
@@ -1755,15 +1484,13 @@
     "Delete sessions|other": "Sitzungen löschen",
     "Delete sessions|one": "Sitzung löschen",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Alle Sitzungen einzeln verifizieren, anstatt auch Sitzungen zu vertrauen, die durch Quersignierungen verifiziert sind.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Der Zwischenspeicher für die lokale Suche in verschlüsselten Nachrichten benötigt ",
-    " to store messages from ": " um Nachrichten 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>.": "Um verschlüsselte Nachrichten lokal zu durchsuchen, benötigt %(brand)s weitere Komponenten. Wenn du diese Funktion testen möchtest, kannst du dir deine eigene Version von %(brand)s Desktop mit der <nativeLink>integrierten Suchfunktion kompilieren</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 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>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von einer <verify>nicht verifizierten</verify> Sitzung <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Die Sicherung hat eine <validity>gültige</validity> Signatur von der <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 der <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 der <verify>verifizierten</verify> Sitzung \"<device></device>\"",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von der <verify>nicht verifizierten</verify> Sitzung \"<device></device>\"",
     "Your keys are <b>not being backed up from this session</b>.": "Deine Schlüssel werden von dieser Sitzung <b>nicht gesichert</b>.",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Zur Zeit verwendest du <server></server>, um Kontakte zu finden und von anderen gefunden zu werden. Du kannst deinen Identitätsserver weiter unten ändern.",
     "Invalid theme schema.": "Ungültiges Designschema.",
@@ -1784,7 +1511,6 @@
     "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": "Moderator",
-    "Invite only": "Nur auf Einladung",
     "Scroll to most recent messages": "Zur neusten Nachricht springen",
     "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.",
@@ -1799,7 +1525,6 @@
     "Italics": "Kursiv",
     "Strikethrough": "Durchgestrichen",
     "Code block": "Code-Block",
-    "Recent rooms": "Letzte Räume",
     "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",
@@ -1823,7 +1548,6 @@
     "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.",
     "%(count)s unread messages.|other": "%(count)s ungelesene Nachrichten.",
     "%(count)s unread messages.|one": "1 ungelesene Nachricht.",
-    "Unread mentions.": "Ungelesene Erwähnungen.",
     "Unread messages.": "Ungelesene Nachrichten.",
     "This room has already been upgraded.": "Dieser Raum wurde bereits aktualisiert.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dieser Raum läuft mit der Raumversion <roomVersion />, welche dieser Heimserver als <i>instabil</i> markiert hat.",
@@ -1836,13 +1560,11 @@
     "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 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. 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": "Verifizierung starten",
@@ -1857,7 +1579,6 @@
     "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.": "Dieser Client unterstützt keine Ende-zu-Ende-Verschlüsselung.",
     "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 Emojivergleich.",
@@ -1884,7 +1605,6 @@
     "You sent a verification request": "Du hast eine Verifizierungsanfrage gesendet",
     "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",
@@ -1909,14 +1629,11 @@
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "Raum-ID",
     "Widget ID": "Widget-ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsserver übertragen werden.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s übertragen werden.",
     "Widgets do not use message encryption.": "Widgets verwenden keine Nachrichtenverschlüsselung.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Bitte <newIssueLink>erstelle ein neues Issue</newIssueLink> auf GitHub damit wir diesen Fehler untersuchen können.",
     "Rotate Left": "Nach links drehen",
-    "Rotate counter-clockwise": "Gegen den Uhrzeigersinn drehen",
     "Rotate Right": "Nach rechts drehen",
-    "Rotate clockwise": "Im Uhrzeigersinn drehen",
     "Language Dropdown": "Sprachauswahl",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)shaben keine Änderung vorgenommen",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)shat %(count)s mal keine Änderung vorgenommen",
@@ -1954,7 +1671,6 @@
     "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 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",
@@ -1962,8 +1678,6 @@
     "a new cross-signing key signature": "Eine neue Cross-Signing-Schlüsselsignatur",
     "a device cross-signing signature": "Eine Geräte Schlüssel Signatur",
     "a key signature": "Eine Schlüssel Signatur",
-    "Your password": "Dein Passwort",
-    "This session, or the other session": "Diese oder die andere Sitzung",
     "Alt Gr": "Alt Gr",
     "Shift": "Umschalt",
     "Super": "Windows/Apple",
@@ -1979,61 +1693,41 @@
     "Space": "Leertaste",
     "End": "Ende",
     "Enable 'Manage Integrations' in Settings to do this.": "Aktiviere hierzu in den Einstellungen \"Integrationen verwalten\".",
-    "The internet connection either session is using": "Die Internetverbindung, die eine der beiden Sitzung verwendet",
-    "We recommend you change your password and recovery key in Settings immediately": "Wir empfehlen, dein Passwort und deine Wiederherstellungsschlüssel sofort in den Einstellungen zu ändern",
-    "New session": "Neue Sitzung",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet.",
-    "This wasn't me": "Das war ich nicht",
     "Please fill why you're reporting.": "Bitte gib an, weshalb du einen Fehler meldest.",
-    "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>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du wirst diesen Raum von <oldVersion /> zu <newVersion /> aktualisieren.",
     "Missing session data": "Fehlende Sitzungsdaten",
     "Your browser likely removed this data when running low on disk space.": "Dein Browser hat diese Daten wahrscheinlich entfernt als der Festplattenspeicher knapp wurde.",
-    "Integration Manager": "Integrationsverwaltung",
     "Find others by phone or email": "Finde Andere per Telefon oder E-Mail",
     "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
-    "Verify other session": "Andere Sitzung verifizieren",
     "Verification Request": "Verifizierungsanfrage",
     "Upload %(count)s other files|other": "%(count)s andere Dateien hochladen",
     "Upload %(count)s other files|one": "%(count)s andere Datei hochladen",
-    "A widget would like to verify your identity": "Ein Widget möchte deine Identität verifizieren",
     "Remember my selection for this widget": "Speichere meine Auswahl für dieses Widget",
     "Restoring keys from backup": "Schlüssel aus der Sicherung wiederherstellen",
     "Fetching keys from server...": "Lade Schlüssel vom Server...",
     "%(completed)s of %(total)s keys restored": "%(completed)s von %(total)s Schlüsseln wiederhergestellt",
     "Keys restored": "Schlüssel wiederhergestellt",
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s Schlüssel erfolgreich wiederhergestellt",
-    "Reload": "Neu laden",
-    "Take picture": "Foto machen",
     "User Status": "Nutzerstatus",
     "Country Dropdown": "Landauswahl",
-    "Recovery key mismatch": "Nicht übereinstimmende Wiederherstellungsschlüssel",
-    "Incorrect recovery passphrase": "Falsche Wiederherstellungspassphrase",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Wenn du deine Wiederherstellungsschlüssel vergessen hast, kannst du <button>neue Wiederherstellungsoptionen einrichten</button>",
-    "Resend edit": "Bearbeitung erneut senden",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s Reaktion(en) erneut senden",
-    "Resend removal": "Entfernen erneut senden",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deinem Heimserver-Administrator.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Da kein Identitätsserver konfiguriert ist, kannst du keine E-Mail-Adresse hinzufügen, um dein Kennwort in Zukunft zurückzusetzen.",
     "Use an email address to recover your account": "Verwende eine E-Mail-Adresse, um dein Konto wiederherzustellen",
     "Enter email address (required on this homeserver)": "E-Mail-Adresse eingeben (auf diesem Heimserver erforderlich)",
     "Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus",
     "Enter phone number (required on this homeserver)": "Telefonnummer eingeben (auf diesem Heimserver erforderlich)",
-    "Doesn't look like a valid phone number": "Das sieht nicht nach einer gültigen Telefonnummer aus",
     "Sign in with SSO": "Einmalanmeldung verwenden",
     "Welcome to %(appName)s": "Willkommen bei %(appName)s",
     "Send a Direct Message": "Direktnachricht senden",
     "Create a Group Chat": "Gruppenchat erstellen",
     "Use lowercase letters, numbers, dashes and underscores only": "Verwende nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "URL deines benutzerdefinierten Identitätsservers eingeben <a>Was bedeutet das?</a>",
     "%(brand)s failed to get the public room list.": "%(brand)s konnte die Liste der öffentlichen Räume nicht laden.",
     "Verify this login": "Diese Anmeldung verifizieren",
     "Syncing...": "Synchronisiere...",
@@ -2072,11 +1766,7 @@
     "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 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",
     "Cancelled signature upload": "Hochladen der Signatur abgebrochen",
     "Unable to upload": "Hochladen nicht möglich",
@@ -2087,44 +1777,28 @@
     "If they don't match, the security of your communication may be compromised.": "Wenn sie nicht übereinstimmen kann die Sicherheit eurer Kommunikation kompromittiert sein.",
     "Your homeserver doesn't seem to support this feature.": "Dein Heimserver scheint diese Funktion nicht zu unterstützen.",
     "Message edits": "Nachrichtenänderungen",
-    "Your account is not secure": "Dein Konto ist nicht sicher",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben.",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Der sichere Speicher konnte nicht geladen werden. Bitte stelle sicher dass du die richtige Wiederherstellungspassphrase eingegeben hast.",
-    "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 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",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s konnte die Protokollliste nicht vom Heimserver abrufen. Der Heimserver ist möglicherweise zu alt, um Netzwerke von Drittanbietern zu unterstützen.",
-    "No identity server is configured: add one in server settings to reset your password.": "Kein Identitätsserver konfiguriert: Füge einen in den Servereinstellungen hinzu, um dein Kennwort zurückzusetzen.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
-    "This requires the latest %(brand)s on your other devices:": "Dies benötigt die neuste Version von %(brand)s auf deinen anderen Geräten:",
     "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen",
     "Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
     "Command Autocomplete": "Autovervollständigung aktivieren",
     "Community Autocomplete": "Community-Autovervollständigung",
-    "DuckDuckGo Results": "DuckDuckGo Ergebnisse",
-    "Great! This recovery passphrase looks strong enough.": "Super! Diese Wiederherstellungspassphrase sieht stark genug aus.",
-    "Enter a recovery passphrase": "Gib eine Wiederherstellungspassphrase ein",
     "Emoji Autocomplete": "Emoji-Auto-Vervollständigung",
     "Room Autocomplete": "Raum-Auto-Vervollständigung",
     "User Autocomplete": "Nutzer-Auto-Vervollständigung",
     "Restore your key backup to upgrade your encryption": "Schlüsselsicherung wiederherstellen, um deine Verschlüsselung zu aktualisieren",
     "Restore": "Wiederherstellen",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Dein Wiederherstellungsschlüssel wurde <b>in die Zwischenablage kopiert</b>. Füge ihn ein in:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Dein Wiederherstellungsschlüssel ist in deinem <b>Download-Ordner</b>.",
     "Upgrade your encryption": "Deine Verschlüsselung aktualisieren",
     "Unable to set up secret storage": "Sicherer Speicher kann nicht eingerichtet werden",
-    "Repeat your recovery passphrase...": "Gib die Wiederherstellungspassphrase erneut ein...",
-    "Secure your backup with a recovery passphrase": "Verschlüssele deine Sicherung mit einer Wiederherstellungspassphrase",
     "Create key backup": "Schlüsselsicherung erstellen",
     "This session is encrypting history using the new recovery method.": "Diese Sitzung verschlüsselt den Verlauf mit der neuen Wiederherstellungsmethode.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Diese Sitzung hat festgestellt, dass deine Wiederherstellungspassphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.",
     "Currently indexing: %(currentRoom)s": "Indiziere: %(currentRoom)s",
     "Navigation": "Navigation",
     "Calls": "Anrufe",
@@ -2137,21 +1811,15 @@
     "Close dialog or context menu": "Dialog oder Kontextmenü schließen",
     "Cancel autocomplete": "Autovervollständigung deaktivieren",
     "Unable to revoke sharing for email address": "Dem Teilen der E-Mail-Adresse kann nicht widerrufen werden",
-    "Unable to validate homeserver/identity server": "Heimserver/Identitätsserver nicht validierbar",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Ohne Abschluss der Sicherungseinrichtung in dieser Sitzung wird sie keinen Zugriff auf verschlüsselte Nachrichten erhalten.",
     "Disable": "Deaktivieren",
     "Not currently indexing messages for any room.": "Derzeit werden keine Nachrichten für Räume indiziert.",
     "Space used:": "Speicherplatzbedarf:",
     "Indexed messages:": "Indizierte Nachrichten:",
     "Indexed rooms:": "Indizierte Räume:",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s von %(totalRooms)s",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Der Wiederherstellungsschlüssel ist ein Sicherheitsnetz - du kannst damit deine verschlüsselten Nachrichten wiederherstellen wenn du deine Wiederherstellungspassphrase vergessen hast.",
     "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne eine Schlüsselsicherung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden wenn du dich abmeldest oder eine andere Sitzung verwendest.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Ändern des Raumaliases. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
-    "Self-verification request": "Selbstverifikationsanfrage",
-    "or another cross-signing capable Matrix client": "oder einen anderen Matrix Client der Cross-signing fähig ist",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s verwendet einen sicheren Zwischenspeicher für verschlüsselte Nachrichten, damit sie in den Suchergebnissen angezeigt werden:",
     "Liberate your communication": "Befreie deine Kommunikation",
     "Message downloading sleep time(ms)": "Wartezeit zwischen dem Herunterladen von Nachrichten (ms)",
@@ -2183,14 +1851,12 @@
     "Click the button below to confirm your identity.": "Klicke den Button unten um deine Identität zu bestätigen.",
     "Confirm encryption setup": "Bestätige die Einrichtung der Verschlüsselung",
     "Click the button below to confirm setting up encryption.": "Klick die Schaltfläche unten um die Einstellungen der Verschlüsselung zu bestätigen.",
-    "Font scaling": "Schriftskalierung",
     "Font size": "Schriftgröße",
     "IRC display name width": "Breite des IRC-Anzeigenamens",
     "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",
-    "Create room": "Raum erstellen",
     "Jump to oldest unread message": "Zur ältesten ungelesenen Nachricht springen",
     "Upload a file": "Eine Datei hochladen",
     "Dismiss read marker and jump to bottom": "Entferne Lesemarker und springe nach unten",
@@ -2199,16 +1865,10 @@
     "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.",
-    "I want to help": "Ich möchte helfen",
     "Your homeserver has exceeded its user limit.": "Dein Heimserver hat das Benutzergrenzwert erreicht.",
     "Your homeserver has exceeded one of its resource limits.": "Dein Heimserver hat eine seiner Ressourcengrenzen erreicht.",
     "Contact your <a>server admin</a>.": "Kontaktiere deine <a>Heimserveradministration</a>.",
     "Ok": "Ok",
-    "Set password": "Setze Passwort",
-    "To return to your account in future you need to set a password": "Um dein Konto zukünftig wieder verwenden zu können, setze ein Passwort",
-    "Restart": "Neustarten",
-    "Upgrade your %(brand)s": "Aktualisiere dein %(brand)s",
-    "A new version of %(brand)s is available!": "Eine neue Version von %(brand)s ist verfügbar!",
     "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.",
@@ -2219,16 +1879,13 @@
     "Error removing address": "Fehler beim Löschen der Adresse",
     "Categories": "Kategorien",
     "Room address": "Raumadresse",
-    "Please provide a room address": "Bitte gib eine Raumadresse an",
     "This address is available to use": "Diese Adresse ist verfügbar",
     "This address is already in use": "Diese Adresse wird bereits verwendet",
-    "Address (optional)": "Adresse (optional)",
     "delete the address.": "lösche die Adresse.",
     "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 Serveradministration 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 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?",
     "Switch to light mode": "Zum hellen Thema wechseln",
@@ -2240,8 +1897,6 @@
     "Room ID or address of ban list": "Raum-ID oder Adresse der Verbotsliste",
     "No recently visited rooms": "Keine kürzlich besuchten Räume",
     "Sort by": "Sortieren nach",
-    "Unread rooms": "Ungelesene Räume",
-    "Always show first": "Zeige immer zuerst",
     "Show": "Zeige",
     "Message preview": "Nachrichtenvorschau",
     "List options": "Optionen anzeigen",
@@ -2252,15 +1907,11 @@
     "Activity": "Aktivität",
     "A-Z": "A-Z",
     "Looks good!": "Sieht gut aus!",
-    "Use Recovery Key or Passphrase": "Verwende einen Wiederherstellungsschlüssel oder deine Passphrase",
-    "Use Recovery Key": "Verwende einen Wiederherstellungsschlüssel",
     "Light": "Hell",
     "Dark": "Dunkel",
-    "Use the improved room list (will refresh to apply changes)": "Verwende die verbesserte Raumliste (lädt die Anwendung neu)",
     "Use custom size": "Andere Schriftgröße verwenden",
     "Hey you. You're the best!": "Hey du. Du bist großartig!",
     "Message layout": "Nachrichtenlayout",
-    "Compact": "Kompakt",
     "Modern": "Modern",
     "Use a system font": "Systemschriftart verwenden",
     "System font name": "Systemschriftart",
@@ -2270,81 +1921,23 @@
     "You joined the call": "Du bist dem Anruf beigetreten",
     "%(senderName)s joined the call": "%(senderName)s ist dem Anruf beigetreten",
     "Call in progress": "Laufendes Gespräch",
-    "You left the call": "Du hast den Anruf verlassen",
-    "%(senderName)s left the call": "%(senderName)s hat den Anruf verlassen",
     "Call ended": "Anruf beendet",
     "You started a call": "Du hast einen Anruf gestartet",
     "%(senderName)s started a call": "%(senderName)s hat einen Anruf gestartet",
     "Waiting for answer": "Warte auf eine Antwort",
     "%(senderName)s is calling": "%(senderName)s ruft an",
-    "You created the room": "Du hast den Raum erstellt",
-    "%(senderName)s created the room": "%(senderName)s hat den Raum erstellt",
-    "You made the chat encrypted": "Du hast den Raum verschlüsselt",
-    "%(senderName)s made the chat encrypted": "%(senderName)s hat den Raum verschlüsselt",
-    "You made history visible to new members": "Du hast die bisherige Kommunikation für neue Teilnehmern sichtbar gemacht",
-    "%(senderName)s made history visible to new members": "%(senderName)s hat die bisherige Kommunikation für neue Teilnehmern sichtbar gemacht",
-    "You made history visible to anyone": "Du hast die bisherige Kommunikation für alle sichtbar gemacht",
-    "%(senderName)s made history visible to anyone": "%(senderName)s hat die bisherige Kommunikation für alle sichtbar gemacht",
-    "You made history visible to future members": "Du hast die bisherige Kommunikation für zukünftige Teilnehmer sichtbar gemacht",
-    "%(senderName)s made history visible to future members": "%(senderName)s hat die bisherige Kommunikation für zukünftige Teilnehmer sichtbar gemacht",
-    "You were invited": "Du wurdest eingeladen",
-    "%(targetName)s was invited": "%(targetName)s wurde eingeladen",
-    "You left": "Du hast den Raum verlassen",
-    "%(targetName)s left": "%(targetName)s hat den Raum verlassen",
-    "You were kicked (%(reason)s)": "Du wurdest herausgeworfen (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s wurde herausgeworfen (%(reason)s)",
-    "You were kicked": "Du wurdest herausgeworfen",
-    "%(targetName)s was kicked": "%(targetName)s wurde herausgeworfen",
-    "You rejected the invite": "Du hast die Einladung abgelehnt",
-    "%(targetName)s rejected the invite": "%(targetName)s hat die Einladung abgelehnt",
-    "You were uninvited": "Deine Einladung wurde zurückgezogen",
-    "%(targetName)s was uninvited": "Die Einladung für %(targetName)s wurde zurückgezogen",
-    "You were banned (%(reason)s)": "Du wurdest verbannt (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s wurde verbannt (%(reason)s)",
-    "You were banned": "Du wurdest verbannt",
-    "%(targetName)s was banned": "%(targetName)s wurde verbannt",
-    "You joined": "Du bist beigetreten",
-    "%(targetName)s joined": "%(targetName)s ist beigetreten",
-    "You changed your name": "Du hast deinen Namen geändert",
-    "%(targetName)s changed their name": "%(targetName)s hat den Namen geändert",
-    "You changed your avatar": "Du hast deinen Avatar geändert",
-    "%(targetName)s changed their avatar": "%(targetName)s hat den Avatar geändert",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Du hast den Raumnamen geändert",
-    "%(senderName)s changed the room name": "%(senderName)s hat den Raumnamen geändert",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Du hast die Einladung für %(targetName)s zurückgezogen",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen",
-    "You invited %(targetName)s": "Du hast %(targetName)s eingeladen",
     "%(senderName)s invited %(targetName)s": "%(senderName)s hat %(targetName)s eingeladen",
-    "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 Ladeanimation",
     "Use a more compact ‘Modern’ layout": "Modernes kompaktes Layout",
     "Message deleted on %(date)s": "Nachricht am %(date)s gelöscht",
     "Wrong file type": "Falscher Dateityp",
-    "Wrong Recovery Key": "Falscher Wiederherstellungsschlüssel",
-    "Invalid Recovery Key": "Ungültiger Wiederherstellungsschlüssel",
-    "Riot is now Element!": "Riot ist jetzt Element!",
-    "Learn More": "Mehr erfahren",
     "Unknown caller": "Unbekannter Anrufer",
-    "Incoming voice call": "Eingehender Sprachanruf",
-    "Incoming video call": "Eingehender Videoanruf",
-    "Incoming call": "Eingehender Anruf",
-    "There are advanced notifications which are not shown here.": "Erweiterte Benachrichtigungen werden hier nicht angezeigt.",
     "Are you sure you want to cancel entering passphrase?": "Bist du sicher, dass du die Eingabe der Passphrase abbrechen möchtest?",
-    "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",
     "Enable experimental, compact IRC style layout": "Kompaktes Layout im IRC-Stil (experimentell)",
     "User menu": "Benutzermenü",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X für Android",
-    "We’re excited to announce Riot is now Element": "Wir freuen uns zu verkünden, dass Riot jetzt Element ist",
     "%(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.": "Das Durchsuchen von verschlüsselten Nachrichten wird aus Sicherheitsgründen nur von %(brand)s Desktop unterstützt. <desktopLink>Hier geht's zum Download</desktopLink>.",
     "Show rooms with unread messages first": "Räume mit ungelesenen Nachrichten zuerst zeigen",
     "Show previews of messages": "Nachrichtenvorschau anzeigen",
@@ -2359,14 +1952,10 @@
     "Edited at %(date)s": "Geändert am %(date)s",
     "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!",
-    "Learn more at <a>element.io/previously-riot</a>": "Erfahre mehr unter <a>element.io/previously-riot</a>",
     "The person who invited you already left the room.": "Die Person, die dich eingeladen hat, hat den Raum bereits verlassen.",
     "The person who invited you already left the room, or their server is offline.": "Die Person, die dich eingeladen hat, hat den Raum bereits verlassen oder ihr Server ist nicht erreichbar bzw. aus.",
     "Change notification settings": "Benachrichtigungseinstellungen ändern",
     "Your server isn't responding to some <a>requests</a>.": "Dein Server antwortet auf einige <a>Anfragen</a> nicht.",
-    "Go to Element": "Zu Element gehen",
     "Server isn't responding": "Server antwortet nicht",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Server reagiert nicht auf einige deiner Anfragen. Im Folgenden sind einige der wahrscheinlichsten Gründe aufgeführt.",
     "The server (%(serverName)s) took too long to respond.": "Der Server (%(serverName)s) brauchte zu lange zum antworten.",
@@ -2376,11 +1965,9 @@
     "The server has denied your request.": "Der Server hat deine Anfrage abgewiesen.",
     "Your area is experiencing difficulties connecting to the internet.": "Deine Region hat Schwierigkeiten, eine Verbindung zum Internet herzustellen.",
     "A connection error occurred while trying to contact the server.": "Beim Versuch, den Server zu kontaktieren, ist ein Verbindungsfehler aufgetreten.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Du hast sie ggf. in einem anderen Client als %(brand)s konfiguriert. Du kannst sie nicht in %(brand)s verändern, aber sie werden trotzdem angewandt.",
     "Master private key:": "Privater Hauptschlüssel:",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Setze den Schriftnamen auf eine in deinem System installierte Schriftart und %(brand)s wird versuchen, sie zu verwenden.",
     "Custom Tag": "Benutzerdefinierter Tag",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Du bist bereits eingeloggt und kannst loslegen. Allerdings kannst du auch die neuesten Versionen der App für alle Plattformen unter <a>element.io/get-started</a> herunterladen.",
     "You're all caught up.": "Alles gesichtet.",
     "The server is not configured to indicate what the problem is (CORS).": "Der Server ist nicht so konfiguriert, dass das Problem angezeigt wird (CORS).",
     "Recent changes that have not yet been received": "Letzte Änderungen, die noch nicht eingegangen sind",
@@ -2391,14 +1978,9 @@
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Gib deine Sicherheitsphrase ein oder <button>benutze deinen Sicherheitsschlüssel</button> um fortzufahren.",
     "Security Key": "Sicherheitsschlüssel",
     "Use your Security Key to continue.": "Benutze deinen Sicherheitsschlüssel um fortzufahren.",
-    "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.": "Du kannst in den benutzerdefinierten Server-Optionen eine andere Heimserver URL angeben, um dich bei anderen Matrix Servern anzumelden. Dadurch kannst du %(brand)s mit einem existierenden Matrix-Account auf einem anderen Home-Server nutzen.",
-    "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>.": "Gib die Adresse deines Element Matrix Services-Heimservers ein. Es kann deine eigene Domain oder eine Subdomain von <a>element.io</a> sein.",
     "No files visible in this room": "Keine Dateien in diesem Raum",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Hänge Dateien aus dem Chat an oder ziehe sie einfach per Drag & Drop an eine beliebige Stelle im Raum.",
     "You’re all caught up": "Alles gesichtet",
-    "You have no visible notifications in this room.": "Du hast keine sichtbaren Benachrichtigungen in diesem Raum.",
-    "Search rooms": "Räume suchen",
-    "%(brand)s Android": "%(brand)s Android",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Schütze dich vor dem Verlust des Zugriffs auf verschlüsselte Nachrichten und Daten, indem du Verschlüsselungsschlüssel auf deinem Server sicherst.",
     "Generate a Security Key": "Sicherheitsschlüssel generieren",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wir generieren einen Sicherheitsschlüssel, den du an einem sicheren Ort wie z. B. in einem Passwort-Manager oder einem Safe aufbewahren kannst.",
@@ -2408,7 +1990,6 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Bewahre deinen Sicherheitsschlüssel an einem sicheren Ort wie z. B. in einem Passwort-Manager oder einem Safe auf. Er wird zum Schutz deiner verschlüsselten Daten verwendet.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Wenn du jetzt abbrichst, kannst du verschlüsselte Nachrichten und Daten verlieren, wenn du den Zugriff auf deine Logins verlierst.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Du kannst auch in den Einstellungen eine Sicherung erstellen & deine Schlüssel verwalten.",
-    "Set up Secure backup": "Sicheres Backup einrichten",
     "Show message previews for reactions in DMs": "Anzeigen einer Nachrichtenvorschau für Reaktionen in DMs",
     "Show message previews for reactions in all rooms": "Zeige eine Nachrichtenvorschau für Reaktionen in allen Räumen an",
     "Uploading logs": "Protokolle werden hochgeladen",
@@ -2436,14 +2017,11 @@
     "Add image (optional)": "Bild hinzufügen (optional)",
     "Create a room in %(communityName)s": "Erstelle einen Raum in %(communityName)s",
     "Create community": "Erstelle Community",
-    "Cross-signing and secret storage are ready for use.": "Cross-Signing und der sichere Speicher sind bereit zur Benutzung.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Cross-Signing ist bereit, aber der sichere Speicher wird noch nicht als Schlüsselbackup benutzt.",
     "People you know on %(brand)s": "Leute, die du auf %(brand)s kennst",
     "Send %(count)s invites|one": "%(count)s Einladung senden",
     "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 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 Benutzern von deinem Heimserver verwendet werden soll. 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 Benutzern von anderen Heimserver verwendet werden soll. Dies kann später nicht mehr geändert werden.",
@@ -2452,7 +2030,6 @@
     "There was an error updating your community. The server is unable to process your request.": "Beim Aktualisieren deiner Community ist ein Fehler aufgetreten. Der Server kann deine Anfrage nicht verarbeiten.",
     "Update community": "Community aktualisieren",
     "May include members not in %(communityName)s": "Kann Mitglieder enthalten, die nicht in %(communityName)s enthalten sind",
-    "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>.": "Starte ein Gespräch mit jemandem unter Verwendung seines/ihres Namens, Nutzernamens (wie <userId/>) oder E-Mail-Adresse. Dadurch werden sie nicht zu %(communityName)s eingeladen. Klicke hier <a>hier</a>, um jemanden zu %(communityName)s einzuladen.",
     "Failed to find the general chat for this community": "Der allgemeine Chat für diese Community konnte nicht gefunden werden",
     "Community settings": "Community-Einstellungen",
     "User settings": "Nutzer-Einstellungen",
@@ -2461,10 +2038,6 @@
     "Unknown App": "Unbekannte App",
     "%(count)s results|one": "%(count)s Ergebnis",
     "Room Info": "Rauminfo",
-    "Apps": "Apps",
-    "Unpin app": "App nicht mehr anheften",
-    "Edit apps, bridges & bots": "Apps, Bridges & Bots bearbeiten",
-    "Add apps, bridges & bots": "Apps, Bridges & Bots hinzufügen",
     "Not encrypted": "Nicht verschlüsselt",
     "About": "Über",
     "%(count)s people|other": "%(count)s Personen",
@@ -2472,34 +2045,22 @@
     "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",
     "Unpin": "Nicht mehr anheften",
-    "Group call modified by %(senderName)s": "Gruppenanruf wurde von %(senderName)s verändert",
-    "Group call started by %(senderName)s": "Gruppenanruf von %(senderName)s gestartet",
-    "Group call ended by %(senderName)s": "Gruppenanruf wurde von %(senderName)s beendet",
     "Cross-signing is ready for use.": "Quersignaturen sind bereits in Anwendung.",
     "Cross-signing is not set up.": "Quersignierung wurde nicht eingerichtet.",
     "Backup version:": "Version der Sicherung:",
     "Algorithm:": "Algorithmus:",
-    "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.": "Sichere deine Verschlüsselungsschlüssel mit deinen Kontodaten, falls du den Zugriff auf deine Sitzungen verlierst. Deine Schlüssel werden mit einem eindeutigen Wiederherstellungsschlüssel gesichert.",
     "Backup key stored:": "Sicherungsschlüssel gespeichert:",
     "Backup key cached:": "Sicherungsschlüssel zwischengespeichert:",
     "Secret storage:": "Sicherer Speicher:",
     "ready": "bereit",
     "not ready": "nicht bereit",
     "Secure Backup": "Sicheres Backup",
-    "End Call": "Anruf beenden",
-    "Remove the group call from the room?": "Konferenzgespräch aus diesem Raum entfernen?",
-    "You don't have permission to remove the call from the room": "Du hast keine Berechtigung um den Konferenzanruf aus dem Raum zu entfernen",
     "Safeguard against losing access to encrypted messages & data": "Schütze dich vor dem Verlust verschlüsselter Nachrichten und Daten",
     "not found in storage": "nicht im Speicher gefunden",
     "Widgets": "Widgets",
     "Edit widgets, bridges & bots": "Widgets, Brücken und Bots bearbeiten",
     "Add widgets, bridges & bots": "Widgets, Brücken und Bots hinzufügen",
-    "You can only pin 2 widgets at a time": "Du kannst jeweils nur 2 Widgets anheften",
-    "Minimize widget": "Widget minimieren",
-    "Maximize widget": "Widget maximieren",
     "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>",
@@ -2522,10 +2083,6 @@
     "Failed to save your profile": "Speichern des Profils fehlgeschlagen",
     "The operation could not be completed": "Die Operation konnte nicht abgeschlossen werden",
     "Remove messages sent by others": "Nachrichten von anderen löschen",
-    "Starting camera...": "Starte Kamera...",
-    "Call connecting...": "Verbinde den Anruf...",
-    "Calling...": "Rufe an...",
-    "Starting microphone...": "Starte Mikrofon...",
     "Move right": "Nach rechts schieben",
     "Move left": "Nach links schieben",
     "Revoke permissions": "Berechtigungen widerrufen",
@@ -2533,18 +2090,12 @@
     "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.",
-    "(an error occurred)": "(ein Fehler ist aufgetreten)",
-    "(their device couldn't start the camera / microphone)": "(Gerät des Gegenübers konnte Kamera oder Mikrofon nicht starten)",
-    "(connection failed)": "(Verbindung fehlgeschlagen)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alle Server sind von der Teilnahme ausgeschlossen! Dieser Raum kann nicht mehr genutzt werden.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s hat die Server-ACLs für diesen Raum geändert.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s hat die Server-ACLs für diesen Raum gesetzt.",
     "The call was answered on another device.": "Der Anruf wurde auf einem anderen Gerät angenommen.",
     "Answered Elsewhere": "Anderswo beantwortet",
     "The call could not be established": "Der Anruf kann nicht getätigt werden",
-    "The other party declined the call.": "Die andere Seite hat den Anruf abgelehnt.",
-    "Call Declined": "Anruf abgelehnt",
     "Data on this screen is shared with %(widgetDomain)s": "Daten auf diesem Bildschirm werden mit %(widgetDomain)s geteilt",
     "Modal Widget": "Modales Widget",
     "Offline encrypted messaging using dehydrated devices": "Offline verschlüsselte Kommunikation mit Hilfe von dehydrierten Geräten",
@@ -2618,7 +2169,6 @@
     "%(senderName)s ended the call": "%(senderName)s hat den Anruf beendet",
     "Use Command + Enter to send a message": "Benutze Betriebssystemtaste + Eingabe um eine Nachricht zu senden",
     "Use Ctrl + Enter to send a message": "Nachrichten mit Strg + Enter 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 %(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 beide nehmt an dieser Konversation teil, es sei denn, ihr ladet jemanden ein.",
@@ -2631,7 +2181,6 @@
     "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, 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.",
@@ -2914,13 +2463,12 @@
     "Afghanistan": "Afghanistan",
     "United States": "Vereinigte Staaten",
     "United Kingdom": "Großbritannien",
-    "We call the places you where you can host your account ‘homeservers’.": "Orte, an denen du dein Benutzerkonto hosten kannst, nennen wir \"Homeserver\".",
     "Specify a homeserver": "Gib einen Homeserver an",
     "Render LaTeX maths in messages": "LaTeX-Matheformeln",
     "Decide where your account is hosted": "Gib an wo dein Benutzerkonto gehostet werden soll",
     "Already have an account? <a>Sign in here</a>": "Hast du schon ein Benutzerkonto? <a>Melde dich hier an</a>",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s oder %(usernamePassword)s",
-    "Continue with %(ssoButtons)s": "Mit %(ssoButtons)s fortfahren",
+    "Continue with %(ssoButtons)s": "Mit %(ssoButtons)s anmelden",
     "That username already exists, please try another.": "Dieser Benutzername existiert schon. Bitte versuche es mit einem anderen.",
     "New? <a>Create account</a>": "Neu? <a>Erstelle ein Benutzerkonto</a>",
     "There was a problem communicating with the homeserver, please try again later.": "Es gab ein Problem bei der Kommunikation mit dem Homseserver. Bitte versuche es später erneut.",
@@ -2947,8 +2495,6 @@
     "No other application is using the webcam": "keine andere Anwendung auf die Webcam zugreift",
     "Permission is granted to use the webcam": "Zugriff auf Webcam gestattet",
     "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:",
     "Unable to access webcam / microphone": "Auf Webcam / Mikrofon konnte nicht zugegriffen werden",
     "Unable to access microphone": "Es konnte nicht auf das Mikrofon zugegriffen werden",
     "Host account on": "Konto betreiben auf",
@@ -2957,14 +2503,12 @@
     "We call the places where you can host your account ‘homeservers’.": "Den Ort, an dem du dein Konto betreibst, nennen wir „Heimserver“.",
     "Invalid URL": "Ungültiger Link",
     "Unable to validate homeserver": "Überprüfung des Heimservers nicht möglich",
-    "%(name)s paused": "%(name)s hat pausiert",
     "%(peerName)s held the call": "%(peerName)s hält den Anruf",
     "You held the call <a>Resume</a>": "Du hältst den Anruf <a>Fortsetzen</a>",
     "sends fireworks": "sendet Feuerwerk",
     "Sends the given message with fireworks": "Sendet die Nachricht mit Feuerwerk",
     "sends confetti": "sendet Konfetti",
     "Sends the given message with confetti": "Sendet die Nachricht mit Konfetti",
-    "Show chat effects": "Chat-Effekte anzeigen",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Stellt ┬──┬ ノ( ゜-゜ノ) einer Klartextnachricht voran",
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran",
     "Effects": "Effekte",
@@ -2993,11 +2537,9 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Zugriff auf geheimen Speicher nicht möglich. Bitte überprüfe, ob du die richtige Sicherheitsphrase eingegeben hast.",
     "Invalid Security Key": "Ungültiger Sicherheitsschlüssel",
     "Wrong Security Key": "Falscher Sicherheitsschlüssel",
-    "We recommend you change your password and Security Key in Settings immediately": "Wir empfehlen dir, dein Passwort und deinen Sicherheitsschlüssel sofort in den Einstellungen zu ändern",
     "There was an error finding this widget.": "Fehler beim Finden dieses Widgets.",
     "Active Widgets": "Aktive Widgets",
     "Open dial pad": "Wähltastatur öffnen",
-    "Start a Conversation": "Beginne eine Konversation",
     "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.": "Sichere deine Verschlüsselungsschlüssel mit deinen Kontodaten, falls du den Zugriff auf deine Sitzungen verlierst. Deine Schlüssel werden mit einem eindeutigen Sicherheitsschlüssel gesichert.",
     "Channel: <channelLink/>": "Kanal: <channelLink/>",
     "Workspace: <networkLink/>": "Arbeitsraum: <networkLink/>",
@@ -3015,7 +2557,6 @@
     "Your Security Key": "Dein Sicherheitsschlüssel",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Dein Sicherheitsschlüssel ist ein Sicherheitsnetz. Du kannst ihn nutzen, um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Sicherheitsphrase vergessen hast.",
     "Repeat your Security Phrase...": "Wiederhole deine Sicherheitsphrase...",
-    "Please enter your Security Phrase a second time to confirm.": "Gib deine Sicherheitsphrase zur Bestätigung ein zweites Mal ein.",
     "Great! This Security Phrase looks strong enough.": "Großartig! Diese Sicherheitsphrase sieht stark genug aus.",
     "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Greife auf deinen sicheren Chatverlauf zu und richte die sichere Nachrichtenübermittlung ein, indem du deine Sicherheitsphrase (z.B. einem langen Satz, den niemand errät) eingibst.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Sichere dein Backup mit einer Sicherheitsphrase (z.B. einem langen Satz, den niemand errät).",
@@ -3029,9 +2570,6 @@
     "Remember this": "Dies merken",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "Das Widget überprüft deine Nutzer-ID, kann jedoch keine Aktionen für dich ausführen:",
     "Allow this widget to verify your identity": "Erlaube diesem Widget deine Identität zu überprüfen",
-    "Use Command + F to search": "Nutze Befehlstaste (⌘) + F zum Suchen",
-    "Use Ctrl + F to search": "Strg + F zum Suchen",
-    "Element Web is currently experimental on mobile. The native apps are recommended for most people.": "Element Web ist derzeit experimentell auf mobilen Endgeräten. Die nativen Apps werden empfohlen.",
     "Converts the DM to a room": "Wandelt die Direktnachricht in einen Raum um",
     "Converts the room to a DM": "Wandelt den Raum in eine 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.",
@@ -3043,14 +2581,10 @@
     "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 Heimserver hat deinen Anmeldeversuch abgelehnt. Vielleicht dauert der Prozess einfach zu lange. Bitte versuche es erneut. Wenn dies öfters passiert, wende dich bitte an deine Heimserveradministrator.",
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Heimserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies öfters passiert, wende dich bitte an deine Heimserveradministrator.",
     "We couldn't log you in": "Wir konnten dich nicht anmelden",
-    "Windows": "Fenster",
-    "Screens": "Bildschirme",
-    "Share your screen": "Bildschirm teilen",
     "Recently visited rooms": "Kürzlich besuchte Räume",
     "Show line numbers in code blocks": "Zeilennummern in Codeblöcken",
     "Expand code blocks by default": "Lange Codeblöcke vollständig anzeigen",
     "Try again": "Erneut versuchen",
-    "Upgrade to pro": "Hochstufen zu Pro",
     "Minimize dialog": "Dialog minimieren",
     "Maximize dialog": "Dialog maximieren",
     "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s-Einrichtung",
@@ -3081,31 +2615,22 @@
     "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": "Speichern",
-    "View dev tools": "Entwicklerwerkzeuge",
-    "Apply": "Anwenden",
     "Create a new room": "Neuen Raum erstellen",
     "Suggested Rooms": "Vorgeschlagene Räume",
     "Add existing room": "Existierenden Raum hinzufügen",
     "Send message": "Nachricht senden",
-    "New room": "Neuer Raum",
     "Share invite link": "Einladungslink teilen",
     "Click to copy": "Klicken um zu kopieren",
     "Collapse space panel": "Space-Feld einklappen",
     "Expand space panel": "Space-Feld aufklappen",
     "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 die Sichtbarkeit später ändern",
     "Invite only, best for yourself or teams": "Nur Eingeladene können beitreten - 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",
+    "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": "Neuen Space erstellen",
     "Delete": "Löschen",
     "This homeserver has been blocked by its administrator.": "Dieser Heimserver wurde von ihrer Administration geblockt.",
@@ -3119,28 +2644,19 @@
     "Sending your message...": "Nachricht wird gesendet...",
     "Leave space": "Space verlassen",
     "Share your public space": "Teile deinen öffentlichen Space mit der Welt",
-    "Invite members": "Mitglieder einladen",
     "Add some details to help people recognise it.": "Gib einige Infos über deinen neuen Space an.",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Mit Matrix-Spaces kannst du Räume und Personen gruppieren. Um einen existierenden Space zu betreten, musst du eingeladen werden.",
-    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces Prototyp. Inkompatibel mit Communities, Communities v2 und benutzerdefinierte Tags. Für einige Funktionen wird ein kompatibler Heimserver benötigt.",
-    "Invite to this space": "In diesen Space enladen",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifiziere diese Anmeldung um deine Identität zu bestätigen und Zugriff auf verschlüsselte Nachrichten zu erhalten.",
+    "Invite to this space": "In diesen Space einladen",
     "What projects are you working on?": "An welchen Projekten arbeitest du gerade?",
     "Failed to invite the following users to your space: %(csvUsers)s": "Die folgenden Leute konnten nicht eingeladen werden: %(csvUsers)s",
     "Share %(name)s": "%(name)s teilen",
     "Skip for now": "Für jetzt überspringen",
     "Random": "Zufällig",
     "Welcome to <name/>": "Willkommen bei <name/>",
-    "Add existing rooms & spaces": "Existierende Räume oder Spaces hinzufügen",
     "Private space": "Privater Space",
     "Public space": "Öffentlicher Space",
     "<inviter/> invites you": "Du wirst von <inviter/> eingeladen",
     "No results found": "Keine Ergebnisse",
     "Failed to remove some rooms. Try again later": "Einige Räume konnten nicht entfernt werden. Versuche es bitte später nocheinmal",
-    "%(count)s rooms and 1 space|one": "%(count)s Raum und 1 space",
-    "%(count)s rooms and 1 space|other": "%(count)s Räume und 1 Space",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s Raum und %(numSpaces)s Spaces",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s Räume und %(numSpaces)s Spaces",
     "Suggested": "Vorgeschlagen",
     "%(count)s rooms|one": "%(count)s Raum",
     "%(count)s rooms|other": "%(count)s Räume",
@@ -3152,7 +2668,6 @@
     "Failed to start livestream": "Livestream kann nicht gestartet werden",
     "Unable to start audio streaming.": "Audiostream kann nicht gestartet werden.",
     "Leave Space": "Space verlassen",
-    "Make this space private": "Diesen Space als Privat markieren",
     "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.": "Dies beeinflusst meistens nur die Verarbeitung des Raumes am Server. Falls du Probleme mit %(brand)s hast, erstelle bitte einen Bug-Report.",
     "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Lade Leute mit Namen und Benutzername (z.B. <userId/>) ein oder <a>teile diesen Space</a>.",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Lade Leute mit Namen, E-Mail und Benutzername (z.B. <userId/>) ein oder <a>teile diesen Space</a>.",
@@ -3163,12 +2678,7 @@
     "Invite People": "Personen einladen",
     "Invite with email or username": "Personen mit E-Mail oder Benutzernamen einladen",
     "You can change these anytime.": "Du kannst diese jederzeit ändern.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Von %(deviceName)s (%(deviceId)s) mit der Adresse %(ip)s",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Neue Anmeldung: %(name)s (%(deviceID)s) mit der IP-Adresse %(ip)s",
-    "Verify with another session": "Mit anderer Sitzung verifizieren",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Wir erstellen dir für jedes einen Raum. Du kannst jederzeit neue oder existierende Räume hinzufügen.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Wir erstellen dir für jedes Thema einen Raum. Du kannst jederzeit neue hinzufügen.",
-    "What are some things you want to discuss?": "Über welche Themen wollt ihr schreiben?",
     "Invite by username": "Mit Benutzername einladen",
     "Make sure the right people have access. You can invite more later.": "Stelle sicher, dass die richtigen Leute Zugriff haben. Du kannst jederzeit neue Einladen.",
     "Invite your teammates": "Lade deine Kollegen ein",
@@ -3182,29 +2692,20 @@
     "It's just you at the moment, it will be even better with others.": "Momentan bist nur du hier. Mit anderen Leuten wird es noch viel besser.",
     "Creating rooms...": "Räume werden erstellt...",
     "Your server does not support showing space hierarchies.": "Dein Homeserver unterstützt hierarchische Spaces nicht.",
-    "Search names and description": "Name und Beschreibung durchsuchen",
     "You may want to try a different search or check for typos.": "Versuche es mit etwas anderem oder prüfe auf Tippfehler.",
     "Mark as not suggested": "Als nicht empfohlen markieren",
     "Mark as suggested": "Als empfohlen markieren",
     "Removing...": "Wird entfernt...",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Findest du den Raum, den du suchst nicht? Frag nach einer Einladung oder <a>erstelle einen neuen Raum</a>.",
     "You don't have permission": "Du hast dazu keine Berechtigung",
     "This space is not public. You will not be able to rejoin without an invite.": "Du wirst diesen privaten Space nur mit einer Einladung wieder betreten können.",
     "Saving...": "Speichern...",
     "Space settings": "Spaceeinstellungen",
     "Failed to save space settings.": "Spaceeinstellungen konnten nicht gespeichert werden.",
     "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Wenn du fortfährst, geben wir %(hostSignupBrand)s für den Erstellungsprozess kurzzeitig Zugriff auf deinen Account und deine E-Mail-Adresse. Diese Daten werden nicht gespeichert.",
-    "Failed to add rooms to space": "Raum konnte nicht zum Space hinzugefügt werden",
-    "Applying...": "Anwenden...",
-    "Filter your rooms and spaces": "Durchsuche deine Räume und Spaces",
-    "Add existing spaces/rooms": "Existierende Spaces oder Räume hinzufügen",
     "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.": "Das Entfernen von Rechten kann nicht rückgängig gemacht werden. Falls sie dir niemand anderer zurückgeben kann, kannst du sie nie wieder erhalten.",
     "You do not have permissions to add rooms to this space": "Keine Berechtigung zum Hinzufügen neuer Räume zum Space",
     "You do not have permissions to create new rooms in this space": "Keine Berechtigung zum Erstellen neuer Räume in diesem Space",
-    "Don't want to add an existing room?": "Willst du keinen existierenden Raum hinzufügen?",
     "Edit devices": "Sitzungen anzeigen",
-    "Your private space <name/>": "Dein privater Space <name/>",
-    "Your public space <name/>": "Dein öffentlicher Space <name/>",
     "Quick actions": "Schnellaktionen",
     "We couldn't create your DM.": "Wir konnten deine Direktnachricht nicht erstellen.",
     "Adding...": "Hinzufügen...",
@@ -3213,22 +2714,17 @@
     "%(count)s people you know have already joined|one": "%(count)s Person, die du kennst, ist schon beigetreten",
     "%(count)s people you know have already joined|other": "%(count)s Leute, die du kennst, sind bereits beigetreten",
     "Accept on your other login…": "Akzeptiere in deiner anderen Anmeldung…",
-    "Stop & send recording": "Stoppen und Aufzeichnung senden",
-    "Record a voice message": "Eine Sprachnachricht aufnehmen",
-    "Invite messages are hidden by default. Click to show the message.": "Einladungsnachrichten sind standardmäßig ausgeblendet. Klicken um diese anzuzeigen.",
     "Warn before quitting": "Vor Beenden warnen",
     "Spell check dictionaries": "Wörterbücher für Rechtschreibprüfung",
     "Space options": "Matrix-Space-Optionen",
-    "Manage & explore rooms": "Räume entdecken und verwalten",
+    "Manage & explore rooms": "Räume erkunden und verwalten",
     "unknown person": "unbekannte Person",
-    "Send and receive voice messages (in development)": "Sprachnachrichten senden und empfangen (in der Entwicklung)",
     "Check your devices": "Überprüfe deine Sitzungen",
     "%(deviceId)s from %(ip)s": "%(deviceId)s von %(ip)s",
     "This homeserver has been blocked by it's administrator.": "Dieser Heimserver wurde von seiner Administration blockiert.",
     "You have unverified logins": "Du hast nicht-bestätigte Anmeldungen",
     "Review to ensure your account is safe": "Überprüfen, um sicher zu sein, dass dein Konto sicher ist",
-    "Message search initilisation failed": "Initialisierung der Nachrichtensuche fehlgeschlagen",
-    "Support": "Unterstützen",
+    "Support": "Support",
     "This room is suggested as a good one to join": "Dieser Raum wurde als gut zum Beitreten vorgeschlagen",
     "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.": "Deine Nachricht wurde nicht versendet, weil dieser Heimserver von dessen Administrator gesperrt wurde. Bitte <a>kontaktiere deinen Dienstadministrator</a> um den Dienst weiterzunutzen.",
     "Verification requested": "Verifizierung angefragt",
@@ -3242,10 +2738,9 @@
     "Confirm abort of host creation": "Bestätige das Beenden der Host-Erstellung",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Soll die Host-Erstellung wirklich beendet werden? Dieser Prozess kann nicht wieder fortgesetzt werden.",
     "Invite to just this room": "Nur in diesen Raum einladen",
-    "Consult first": "Konsultiere zuerst",
+    "Consult first": "Zuerst Anfragen",
     "Reset event store?": "Ereignisspeicher zurück setzen?",
     "You most likely do not want to reset your event index store": "Es ist wahrscheinlich, dass du den Ereignis-Indexspeicher nicht zurück setzen möchtest",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Falls du dies tust, werden keine deiner Nachrichten gelöscht. Allerdings wird die Such-Funktion eine Weile lang schlecht funktionieren, bis der Index wieder hergestellt ist",
     "Reset event store": "Ereignisspeicher zurück setzen",
     "Show options to enable 'Do not disturb' mode": "Optionen für den \"Nicht-Stören-Modus\" anzeigen",
     "You can add more later too, including already existing ones.": "Natürlich kannst du jederzeit weitere Räume hinzufügen.",
@@ -3256,7 +2751,7 @@
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Du bist die einzige Person hier. Wenn du ihn jetzt verlässt, ist er für immer verloren (eine lange Zeit).",
     "Edit settings relating to your space.": "Einstellungen vom Space bearbeiten.",
     "Please choose a strong password": "Bitte gib ein sicheres Passwort ein",
-    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Wenn du alles zurücksetzt, gehen alle verifizierten Anmeldungen, Benutzer und verschlüsselte Nachrichten verloren.",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Wenn du alles zurücksetzt, gehen alle verifizierten Anmeldungen, Benutzer und vergangenen Nachrichten verloren.",
     "Only do this if you have no other device to complete verification with.": "Verwende es nur, wenn du kein Gerät, mit dem du dich verifizieren, kannst bei dir hast.",
     "Reset everything": "Alles zurücksetzen",
     "Forgotten or lost all recovery methods? <a>Reset all</a>": "Hast du alle Wiederherstellungsmethoden vergessen? <a>Setze sie hier zurück</a>",
@@ -3282,33 +2777,26 @@
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Falls du es wirklich willst: Es werden keine Nachrichten gelöscht. Außerdem wird die Suche, während der Index erstellt wird, etwas langsamer sein",
     "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s Mitglieder inklusive %(commaSeparatedMembers)s",
     "Including %(commaSeparatedMembers)s": "Inklusive%(commaSeparatedMembers)s",
-    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Beratung mit %(transferTarget)s. <a>Übertragung zu %(transferee)s</a>",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "%(transferTarget)s wird angefragt. <a>Übertragung zu %(transferee)s</a>",
     "Play": "Abspielen",
     "Pause": "Pause",
     "What do you want to organise?": "Was willst du organisieren?",
     "Enter your Security Phrase a second time to confirm it.": "Gib dein Kennwort ein zweites Mal zur Bestätigung ein.",
-    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Wähle Räume oder Konversationen die Du hinzufügen möchtest. Dieser Bereich ist nur für Dich, niemand wird informiert. Du kannst später mehr hinzufügen.",
+    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Wähle Räume oder Konversationen die du hinzufügen willst. Dieser Space ist nur für dich, niemand wird informiert. Du kannst später mehr hinzufügen.",
     "Filter all spaces": "Alle Spaces durchsuchen",
-    "Delete recording": "Aufnahme löschen",
-    "Stop the recording": "Aufnahme stoppen",
     "%(count)s results in all spaces|one": "%(count)s Ergebnis",
     "%(count)s results in all spaces|other": "%(count)s Ergebnisse",
     "You have no ignored users.": "Du ignorierst keine Benutzer.",
     "Error processing voice message": "Fehler beim Verarbeiten der Sprachnachricht",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Um %(spaceName)s beizutreten, aktiviere die <a>Spaces Betaversion</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Um %(spaceName)s zu betreten, <a>aktiviere die Spaces Beta</a>",
     "Select a room below first": "Wähle zuerst einen Raum aus",
-    "Communities are changing to Spaces": "Spaces ersetzen Communities",
     "Join the beta": "Beta beitreten",
     "Leave the beta": "Beta verlassen",
     "Beta": "Beta",
-    "Tap for more info": "Klicke für mehr Infos",
+    "Tap for more info": "Für mehr Infos hier klicken",
     "Spaces is a beta feature": "Spaces sind noch in der Entwicklung und möglicherweise instabil",
     "Want to add a new room instead?": "Willst du einen neuen Raum hinzufügen?",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Raum wird hinzugefügt...",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Räume werden hinzugefügt... (%(progress)s von %(count)s)",
-    "You can add existing spaces to a space.": "Du kannst existierende Spaces zu einem Space hinzfügen.",
-    "Feeling experimental?": "Willst du die Entwicklung von Element hautnah miterleben?",
     "You are not allowed to view this server's rooms list": "Du darfst diese Raumliste nicht sehen",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Es konnte kein Mikrofon gefunden werden. Überprüfe deine Einstellungen und versuche es erneut.",
     "No microphone found": "Kein Mikrofon gefunden",
@@ -3318,16 +2806,8 @@
     "Please enter a name for the space": "Gib den Namen des Spaces ein",
     "Connecting": "Verbinden",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Direktverbindung für Direktanrufe aktivieren. Dadurch sieht dein Gegenüber möglicherweise deine IP-Adresse.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Die Betaversion ist verfügbar für Browser, Desktop und Android. Je nach Homeserver sind einige Funktionen möglicherweise nicht verfügbar.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Du kannst die Betaversion jederzeit verlassen. Mache dies entweder in den Einstellungen oder klicke auf eines der \"Beta\"-Icons wie das hier oben.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s wird mit aktivierten Spaces neuladen. Danach kannst Communities und Custom Tags nicht verwenden.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Die Betaversion ist für Browser, Desktop und Android verfügbar. Danke, dass Du die Betaversion testest.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s wird mit deaktivierten Spaces neuladen und du kannst Communities und Custom Tags wieder verwenden können.",
-    "Spaces are a beta feature.": "Spaces sind in der Beta.",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Wir haben Spaces entwickelt, damit ihr eure Räume besser organisieren könnt. Um einen existierenden Space beitreten zu können musst du (noch) von jemandem eingeladen werden.",
     "Spaces are a new way to group rooms and people.": "Wir haben Spaces entwickelt, damit ihr eure Räume besser organisieren könnt.",
     "Message search initialisation failed": "Initialisierung der Nachrichtensuche fehlgeschlagen",
-    "Send and receive voice messages": "Sprachnachrichten",
     "Search names and descriptions": "Nach Name und Beschreibung filtern",
     "Not all selected were added": "Nicht alle Ausgewählten konnten hinzugefügt werden",
     "Add reaction": "Reaktion hinzufügen",
@@ -3337,11 +2817,322 @@
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Die Platform von Element und dein Benutzername werden mitgeschickt, damit wir dein Feedback bestmöglich nachvollziehen können.",
     "%(featureName)s beta feedback": "%(featureName)s-Beta Feedback",
     "Thank you for your feedback, we really appreciate it.": "Uns liegt es am Herzen, Element zu verbessern. Deshalb ein großes Danke für dein Feedback.",
-    "Beta feedback": "Beta Feedback",
     "Your access token gives full access to your account. Do not share it with anyone.": "Dein Zugriffstoken gibt vollen Zugriff auf dein Konto. Teile es niemals mit jemanden anderen.",
     "Access Token": "Zugriffstoken",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Dein Feedback hilfst uns, die Spaces zu verbessern. Je genauer, desto besser.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Durchs Verlassen lädt %(brand)s mit deaktivierten Spaces neu. Danach kannst du Communities und Custom Tags wieder verwenden.",
     "sends space invaders": "sendet Space Invaders",
-    "Sends the given message with a space themed effect": "Sendet die Nachricht mit Raumschiffen"
+    "Sends the given message with a space themed effect": "Sendet die Nachricht mit Raumschiffen",
+    "Space Autocomplete": "Spaces automatisch vervollständigen",
+    "Currently joining %(count)s rooms|one": "Betrete %(count)s Raum",
+    "Currently joining %(count)s rooms|other": "Betrete %(count)s Räume",
+    "Go to my space": "Zu meinem Space",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Überprüfe auf Tippfehler oder verwende andere Suchbegriffe. Beachte, dass Ergebnisse aus privaten Räumen, in die du nicht eingeladen wurdest, nicht angezeigt werden.",
+    "See when people join, leave, or are invited to this room": "Anzeigen, wenn Leute eingeladen werden, den Raum betreten oder verlassen",
+    "The user you called is busy.": "Der angerufene Benutzer ist momentan beschäftigt.",
+    "User Busy": "Benutzer beschäftigt",
+    "No results for \"%(query)s\"": "Keine Ergebnisse für \"%(query)s\"",
+    "Some suggestions may be hidden for privacy.": "Um deine Privatsphäre zu schützen, werden einige Vorschläge möglicherweise ausgeblendet.",
+    "Or send invite link": "Oder versende einen Einladungslink",
+    "If you can't see who you’re looking for, send them your invite link below.": "Niemanden gefunden? Sende ihnen stattdessen einen Einladungslink.",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Du kannst, sofern du die Berechtigung dazu hast, Nachrichten in ihrem Menü <b>hier anpinnen</b>.",
+    "Search for rooms or people": "Räume oder Leute suchen",
+    "Forward message": "Nachricht weiterleiten",
+    "Open link": "Link öffnen",
+    "Sent": "Gesendet",
+    "You don't have permission to do this": "Du bist dazu nicht berechtigt",
+    "Error loading Widget": "Fehler beim Laden des Widgets",
+    "Pinned messages": "Angeheftete Nachrichten",
+    "Nothing pinned, yet": "Es ist nichts angepinnt. Noch nicht.",
+    "End-to-end encryption isn't enabled": "Ende-zu-Ende-Verschlüsselung ist deaktiviert",
+    "See when people join, leave, or are invited to your active room": "Anzeigen, wenn Leute den aktuellen Raum betreten, verlassen oder in ihn eingeladen werden",
+    "Teammates might not be able to view or join any private rooms you make.": "Mitglieder werden private Räume möglicherweise weder anzeigen noch betreten können.",
+    "Error - Mixed content": "Fehler - Uneinheitlicher Inhalt",
+    "Kick, ban, or invite people to your active room, and make you leave": "Den aktiven Raum verlassen, Leute einladen, entfernen oder bannen",
+    "Kick, ban, or invite people to this room, and make you leave": "Diesen Raum verlassen, Leute einladen, entfernen oder bannen",
+    "View source": "Rohdaten anzeigen",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Die Person verbreitet Falschinformation.\nDies wird an die Raummoderation gemeldet.",
+    "[number]": "[Nummer]",
+    "To view %(spaceName)s, you need an invite": "Du musst eingeladen sein, um %(spaceName)s zu sehen",
+    "Move down": "Nach unten",
+    "Move up": "Nach oben",
+    "Report": "Melden",
+    "Collapse reply thread": "Antworten verbergen",
+    "Show preview": "Vorschau zeigen",
+    "Forward": "Weiterleiten",
+    "Settings - %(spaceName)s": "Einstellungen - %(spaceName)s",
+    "Report the entire room": "Den ganzen Raum melden",
+    "Spam or propaganda": "Spam oder Propaganda",
+    "Illegal Content": "Illegale Inhalte",
+    "Toxic Behaviour": "Toxisches Verhalten",
+    "Disagree": "Ablehnen",
+    "Please pick a nature and describe what makes this message abusive.": "Bitte wähle eine Kategorie aus und beschreibe, was die Nachricht missbräuchlich macht.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Anderer Grund. Bitte beschreibe das Problem.\nDies wird an die Raummoderation gemeldet.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Dieser Benutzer spammt den Raum mit Werbung, Links zu Werbung oder Propaganda.\nDies wird an die Raummoderation gemeldet.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Dieser Benutzer zeigt toxisches Verhalten. Darunter fällt unter anderem Beleidigen anderer Personen, Teilen von NSFW-Inhalten in familienfreundlichen Räumen oder das anderwertige Missachten von Regeln des Raumes.\nDies wird an die Raum-Mods gemeldet.",
+    "Please provide an address": "Bitte gib eine Adresse an",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s hat die Server-ACLs geändert",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s hat die Server-ACLs %(count)s-mal geändert",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s haben die Server-ACLs geändert",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s haben die Server-ACLs %(count)s-mal geändert",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Füge Adressen für diesen Space hinzu, damit andere Leute ihn über deinen Homeserver (%(localDomain)s) finden können",
+    "To publish an address, it needs to be set as a local address first.": "Damit du die Adresse veröffentlichen kannst, musst du sie zuerst als lokale Adresse hinzufügen.",
+    "Published addresses can be used by anyone on any server to join your room.": "Veröffentlichte Adressen erlauben jedem, dem Raum beizutreten.",
+    "Published addresses can be used by anyone on any server to join your space.": "Veröffentlichte Adressen erlauben jedem, dem Space beizutreten.",
+    "This space has no local addresses": "Dieser Space hat keine lokale Adresse",
+    "Space information": "Information über den Space",
+    "Collapse": "Verbergen",
+    "Expand": "Erweitern",
+    "Recommended for public spaces.": "Empfohlen für öffentliche Spaces.",
+    "Allow people to preview your space before they join.": "Personen können den Space vor dem Beitreten erkunden.",
+    "Preview Space": "Space-Vorschau erlauben",
+    "Decide who can view and join %(spaceName)s.": "Konfiguriere, wer %(spaceName)s sehen und beitreten kann.",
+    "Visibility": "Sichtbarkeit",
+    "This may be useful for public spaces.": "Sinnvoll für öffentliche Spaces.",
+    "Guests can join a space without having an account.": "Gäste ohne Account können den Space betreten.",
+    "Enable guest access": "Gastzugriff",
+    "Failed to update the history visibility of this space": "Verlaufssichtbarkeit des Space konnte nicht geändert werden",
+    "Failed to update the guest access of this space": "Gastzugriff des Space konnte nicht geändert werden",
+    "Failed to update the visibility of this space": "Sichtbarkeit des Space konnte nicht geändert werden",
+    "Address": "Adresse",
+    "e.g. my-space": "z.B. Mein-Space",
+    "Sound on": "Ton an",
+    "Show all rooms in Home": "Alle Räume auf der Startseite zeigen",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Inhalte an Mods melden. In Räumen, die Moderation unterstützen, kannst du so unerwünschte Inhalte direkt der Raummoderation melden",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s hat die <a>angehefteten Nachrichten</a> geändert.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s hat %(targetName)s entfernt",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s hat %(targetName)s entfernt: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s hat %(targetName)s entbannt",
+    "%(targetName)s left the room": "%(targetName)s hat den Raum verlassen",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s hat den Raum verlassen: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s hat die Einladung abgelehnt",
+    "%(targetName)s joined the room": "%(targetName)s hat den Raum betreten",
+    "%(senderName)s made no change": "%(senderName)s hat keine Änderungen gemacht",
+    "%(senderName)s set a profile picture": "%(senderName)s hat das Profilbild gesetzt",
+    "%(senderName)s changed their profile picture": "%(senderName)s hat das Profilbild geändert",
+    "%(senderName)s removed their profile picture": "%(senderName)s hat das Profilbild entfernt",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s hat den alten Nicknamen %(oldDisplayName)s entfernt",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s hat den Nicknamen zu %(displayName)s geändert",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s hat den Nicknamen zu %(displayName)s geändert",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s hat %(targetName)s gebannt",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s hat %(targetName)s gebannt: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s hat die Einladung akzeptiert",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert",
+    "Some invites couldn't be sent": "Einige Einladungen konnten nicht versendet werden",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Die anderen wurden gesendet, aber die folgenden Leute konnten leider nicht in <RoomName/> eingeladen werden",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Initialisierung der Nachrichtensuche fehlgeschlagen. Öffne <a>die Einstellungen</a> für mehr Information.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Der Raum beinhaltet illegale oder toxische Nachrichten und die Raummoderation verhindert es nicht.\nDies wird an die Betreiber von %(homeserver)s gemeldet werden.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Der Raum beinhaltet illegale oder toxische Nachrichten und die Raummoderation verhindert es nicht.\nDies wird an die Betreiber von %(homeserver)s gemeldet werden. Diese können jedoch die verschlüsselten Nachrichten nicht lesen.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Diese Person zeigt illegales Verhalten, beispielsweise das Leaken persönlicher Daten oder Gewaltdrohungen.\nDies wird an die Raummoderation gemeldet, welche dies an die Justiz weitergeben kann.",
+    "Unnamed audio": "Unbenannte Audiodatei",
+    "Show %(count)s other previews|one": "%(count)s andere Vorschau zeigen",
+    "Show %(count)s other previews|other": "%(count)s andere Vorschauen zeigen",
+    "Images, GIFs and videos": "Mediendateien",
+    "To view all keyboard shortcuts, click here.": "Alle Tastenkombinationen anzeigen",
+    "Keyboard shortcuts": "Tastenkombinationen",
+    "User %(userId)s is already invited to the room": "%(userId)s ist schon eingeladen",
+    "Unable to copy a link to the room to the clipboard.": "Der Link zum Raum konnte nicht kopiert werden.",
+    "Unable to copy room link": "Raumlink konnte nicht kopiert werden",
+    "Integration manager": "Integrationsverwaltung",
+    "User Directory": "Benutzerverzeichnis",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
+    "Transfer Failed": "Übertragen fehlgeschlagen",
+    "Unable to transfer call": "Übertragen des Anrufs fehlgeschlagen",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsmanager übertragen werden.",
+    "Identity server is": "Der Identitätsserver ist",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationsverwalter erhalten Konfigurationsdaten und können Widgets modifizieren, Raumeinladungen verschicken und in deinem Namen Berechtigungslevel setzen.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsverwalter, um Bots, Widgets und Stickerpakete zu verwalten.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Nutze einen Integrationsverwalter <b>(%(serverName)s)</b>, um Bots, Widgets und Stickerpakete zu verwalten.",
+    "Identity server": "Identitätsserver",
+    "Identity server (%(server)s)": "Identitätsserver (%(server)s)",
+    "Could not connect to identity server": "Verbindung zum Identitätsserver konnte nicht hergestellt werden",
+    "Not a valid identity server (status code %(code)s)": "Ungültiger Identitätsserver (Fehlercode %(code)s)",
+    "Identity server URL must be HTTPS": "Der Identitätsserver muss über HTTPS erreichbar sein",
+    "Error processing audio message": "Fehler beim Verarbeiten der Audionachricht",
+    "Copy Room Link": "Raumlink kopieren",
+    "Code blocks": "Codeblöcke",
+    "There was an error loading your notification settings.": "Fehler beim Laden der Benachrichtigungseinstellungen.",
+    "Mentions & keywords": "Erwähnungen und Schlüsselwörter",
+    "Global": "Global",
+    "New keyword": "Neues Schlüsselwort",
+    "Keyword": "Schlüsselwort",
+    "Enable email notifications for %(email)s": "E-Mail-Benachrichtigungen für %(email)s aktivieren",
+    "Enable for this account": "Für dieses Konto aktivieren",
+    "An error occurred whilst saving your notification preferences.": "Beim Speichern der Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
+    "Error saving notification preferences": "Fehler beim Speichern der Benachrichtigungseinstellungen",
+    "Messages containing keywords": "Nachrichten mit Schlüsselwörtern",
+    "Use Ctrl + F to search timeline": "Nutze STRG + F, um den Verlauf zu durchsuchen",
+    "The call is in an unknown state!": "Dieser Anruf ist in einem unbekannten Zustand!",
+    "Call back": "Zurückrufen",
+    "Connection failed": "Verbindung fehlgeschlagen",
+    "IRC": "IRC",
+    "Silence call": "Anruf stummschalten",
+    "Error downloading audio": "Fehler beim Herunterladen der Audiodatei",
+    "Image": "Bild",
+    "Sticker": "Sticker",
+    "An unknown error occurred": "Ein unbekannter Fehler ist aufgetreten",
+    "Message bubbles": "Nachrichtenblasen",
+    "New layout switcher (with message bubbles)": "Layout ändern erlauben (mit Nachrichtenblasen)",
+    "New in the Spaces beta": "Neues in der Spaces Beta",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Um Mitgliedern beim Finden privater Räume zu helfen, öffne die Sicherheitseinstellungen des Raumes.",
+    "Help space members find private rooms": "Hilf Mitgliedern, private Räume zu finden",
+    "More": "Mehr",
+    "Show sidebar": "Seitenleiste anzeigen",
+    "Hide sidebar": "Seitenleiste verbergen",
+    "Start sharing your screen": "Bildschirmfreigabe starten",
+    "Stop sharing your screen": "Bildschirmfreigabe beenden",
+    "Don't send read receipts": "Keine Lesebestätigungen senden",
+    "Send pseudonymous analytics data": "Sende pseudonymisierte Nutzungsdaten",
+    "Your camera is still enabled": "Deine Kamera ist noch aktiv",
+    "Your camera is turned off": "Deine Kamera ist ausgeschaltet",
+    "Missed call": "Verpasster Anruf",
+    "Call declined": "Anruf abgelehnt",
+    "Dialpad": "Telefontastatur",
+    "Stop the camera": "Kamera stoppen",
+    "Start the camera": "Kamera starten",
+    "You can change this at any time from room settings.": "Du kannst das jederzeit in den Raumeinstellungen ändern.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Alle in <SpaceName/> können diesen Raum beitreten.",
+    "Adding spaces has moved.": "Das Hinzufügen von Spaces ist umgezogen.",
+    "Search for rooms": "Räume suchen",
+    "Search for spaces": "Spaces suchen",
+    "Create a new space": "Neuen Space erstellen",
+    "Want to add a new space instead?": "Willst du stattdessen einen neuen Space hinzufügen?",
+    "Add existing space": "Existierenden Space hinzufügen",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> %(count)s mal geändert.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> %(count)s mal geändert.",
+    "Share content": "Inhalt teilen",
+    "Application window": "Anwendungsfenster",
+    "Share entire screen": "Vollständigen Bildschirm teilen",
+    "Decrypting": "Entschlüsseln",
+    "Unknown failure: %(reason)s": "Unbekannter Fehler: %(reason)s",
+    "Stop recording": "Aufnahme beenden",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Ab sofort kannst du deinen Bildschirm teilen. Klicke im Anruf dazu auf den „Bildschirm teilen“-Knopf. Das ist auch in Sprachanrufen möglich!",
+    "Screen sharing is here!": "Ab sofort kannst du deinen Bildschirm teilen 🎉",
+    "Send voice message": "Sprachnachricht senden",
+    "Access": "Zugriff",
+    "Decide who can join %(roomName)s.": "Entscheide, wer %(roomName)s betreten kann.",
+    "Space members": "Spacemitglieder",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Alle aus den ausgewählten Spaces können beitreten.",
+    "Spaces with access": "Spaces mit Zugriff",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Alle in den ausgewählten Spaces können beitreten. <a>Du kannst die Spaces hier ändern.</a>",
+    "Currently, %(count)s spaces have access|other": "%(count)s Spaces haben Zugriff",
+    "& %(count)s more|other": "und %(count)s weitere",
+    "Upgrade required": "Upgrade erforderlich",
+    "Only invited people can join.": "Nur eingeladene Personen können beitreten.",
+    "Private (invite only)": "Privat (Beitreten mit Einladung)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Dieses Upgrade erlaubt Mitgliedern der ausgewählten Spaces automatisch Zugriff.",
+    "If a community isn't shown you may not have permission to convert it.": "Wenn eine Community nicht angezeigt wird, hast du keine Berechtigung, sie zu konvertieren.",
+    "Show my Communities": "Meine Communities anzeigen",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Die Communities wurden archiviert, um Platz für Spaces zu machen. Du kannst sie aber konvertieren und so alle neuen Features der Spaces nutzen.",
+    "Create Space": "Space erstellen",
+    "Open Space": "Space öffnen",
+    "Olm version:": "Version von Olm:",
+    "Show all rooms": "Alle Räume anzeigen",
+    "You can change this later.": "Du kannst dies jederzeit ändern.",
+    "What kind of Space do you want to create?": "Was für einen Space willst du erstellen?",
+    "Give feedback.": "Feedback geben.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Danke dass du die Spaces ausprobierst. Dein Feedback hilft, uns das Feature zu verbessern.",
+    "Spaces feedback": "Feedback zu Spaces",
+    "Spaces are a new feature.": "Spaces sind ein neues Feature.",
+    "Delete avatar": "Avatar löschen",
+    "%(sharerName)s is presenting": "%(sharerName)s präsentiert",
+    "You are presenting": "Du präsentierst",
+    "All rooms you're in will appear in Home.": "Alle Räume werden auf der Startseite angezeigt.",
+    "Only people invited will be able to find and join this room.": "Nur eingeladene Personen können den Raum finden und betreten.",
+    "Anyone will be able to find and join this room.": "Alle können diesen Raum finden und betreten.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Alle, nicht nur Mitglieder von <SpaceName/>, können beitreten.",
+    "This community has been upgraded into a Space": "Diese Community hat ein Upgrade erhalten und ist jetzt ein Space",
+    "Visible to space members": "Für Space-Mitglieder sichtbar",
+    "Public room": "Öffentlicher Raum",
+    "Private room (invite only)": "Privater Raum (Einladung erforderlich)",
+    "Room visibility": "Raumsichtbarkeit",
+    "Create a room": "Raum erstellen",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Um Spaces zu sehen, <a>verstecke Communities in den Einstellungen</a>",
+    "We're working on this, but just want to let you know.": "Wir arbeiten daran, wollten dich aber darauf hinweisen.",
+    "Search for rooms or spaces": "Räume und Spaces suchen",
+    "Created from <Community />": "Erstellt aus <Community />",
+    "Communities won't receive further updates.": "Communities werden keine Updates mehr erhalten.",
+    "Spaces are a new way to make a community, with new features coming.": "Spaces sind der neue Weg, eine Community zu gründen und bieten viele neue Features.",
+    "Communities can now be made into Spaces": "Communities können ab sofort zu Spaces konvertiert werden",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "<a>Frag die Admins</a> dieser Community, dass sie sie zu einem Space konvertieren.",
+    "You can create a Space from this community <a>here</a>.": "<a>Hier kannst du die Community zu einem Space konvertieren</a>.",
+    "Add space": "Space hinzufügen",
+    "Automatically invite members from this room to the new one": "Mitglieder automatisch in den neuen Raum einladen",
+    "Search spaces": "Spaces durchsuchen",
+    "Select spaces": "Spaces auswählen",
+    "Leave %(spaceName)s": "%(spaceName)s verlassen",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Du bist der einzige Admin einiger Räume oder Spaces, die du verlassen willst. Dadurch werden diese keine Admins mehr haben.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Du bist der letzte Admin in diesem Space. Wenn du ihn jetzt verlässt, hat niemand mehr die Kontrolle über ihn.",
+    "You won't be able to rejoin unless you are re-invited.": "Ohne neuer Einladung kannst du nicht erneut beitreten.",
+    "Search %(spaceName)s": "%(spaceName)s durchsuchen",
+    "Want to add an existing space instead?": "Willst du einen existierenden Space hinzufügen?",
+    "Only people invited will be able to find and join this space.": "Nur eingeladene Personen können diesen Space sehen und beitreten.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Alle, nicht nur Mitglieder von <SpaceName/> können beitreten.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Alle in <SpaceName/> können beitreten.",
+    "Private space (invite only)": "Privater Space (Betreten auf Einladung)",
+    "Space visibility": "Sichtbarkeit des Space",
+    "This description will be shown to people when they view your space": "Dieser Text wird Leuten, die den Space betrachten, angezeigt",
+    "Flair won't be available in Spaces for the foreseeable future.": "Abzeichen in Spaces werden in absehbarer Zeit nicht verfügbar sein.",
+    "All rooms will be added and all community members will be invited.": "Alle Räume werden hinzugefügt werden und alle Community-Mitglider eingeladen.",
+    "A link to the Space will be put in your community description.": "In die Beschreibung der Community wird ein Link zum Space hinzugefügt.",
+    "Create Space from community": "Space aus einer Community erstellen",
+    "Failed to migrate community": "Fehler beim konvertieren der Community",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> wurde erfolgreich erstellt. Alle aus der alten Community wurden eingeladen.",
+    "Space created": "Space erstellt",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Upgraden wird eine neue Version des Raums erstellen</b>. Die alten Nachrichten bleiben im alten Raum archiviert.",
+    "Other spaces or rooms you might not know": "Andere Spaces, die du möglicherweise nicht kennst",
+    "Spaces you know that contain this room": "Spaces, in denen du Mitglied bist und diesen Raum enthalten",
+    "You're removing all spaces. Access will default to invite only": "Du entfernst alle Spaces. Neue Personen können nur mehr mit Einladung beitreten",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug Logs enthalten Nutzungsdaten wie Nutzernamen von dir und anderen Personen, Raum-IDs deiner beigetretenen Räume und Spaces sowie mit welchen Elementen der Oberfläche du kürzlich interagiert hast aber keine Nachrichteninhalte.",
+    "People with supported clients will be able to join the room without having a registered account.": "Personen können diesen Raum ohne registrierten Account betreten.",
+    "Anyone can find and join.": "Jeder kann finden und beitreten.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Wenn du einen Bugreport bei GitHub einreichst, können uns Debug Logs helfen, das Problem ausfindig zu machen. Sie enthalten Nutzungsdaten wie Nutzernamen von dir und anderen Personen, Raum-IDs deiner beigetretenen Räume und Spaces sowie mit welchen Elementen der Oberfläche du kürzlich interagiert hast.",
+    "Mute the microphone": "Stummschalten",
+    "Unmute the microphone": "Stummschaltung deaktivieren",
+    "Displaying time": "Zeitanzeige",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "In der linken Leiste kannst du eine Community auswählen, damit dir nur die Räume und Personen dieser Community angezeigt werden.",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Entscheide, welche Spaces auf den Raum zugreifen können. Mitglieder ausgewählter Spaces können <RoomName/> betreten.",
+    "To create a Space from another community, just pick the community in Preferences.": "Um eine andere Community in einen Space zu konvertieren, wähle sie in Einstellungen -> Chats.",
+    "Their device couldn't start the camera or microphone": "Mikrofon oder Kamera des Gesprächspartners konnte nicht gestartet werden",
+    "Enable encryption in settings.": "Aktiviere Verschlüsselung in den Einstellungen.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Dieser Raum ist nicht verschlüsselt. Oft ist dies aufgrund eines nicht unterstützten Geräts oder Methode wie E-Mail-Einladungen der Fall.",
+    "Cross-signing is ready but keys are not backed up.": "Quersignatur ist bereit, die Schlüssel sind aber nicht gesichert.",
+    "Help people in spaces to find and join private rooms": "Hilf Personen in Spaces, privaten Räumen beizutreten",
+    "Use Command + F to search timeline": "Nutze Command + F um den Verlauf zu durchsuchen",
+    "Reply to thread…": "Nachricht an Thread senden…",
+    "Reply to encrypted thread…": "Verschlüsselte Nachricht an Thread senden…",
+    "Role in <RoomName/>": "Rolle in <RoomName/>",
+    "Results": "Ergebnisse",
+    "Rooms and spaces": "Räume und Spaces",
+    "Thread": "Thread",
+    "Show threads": "Threads anzeigen",
+    "Explore %(spaceName)s": "%(spaceName)s erkunden",
+    "Send a sticker": "Sticker senden",
+    "Add emoji": "Emoji hinzufügen",
+    "Are you sure you want to make this encrypted room public?": "Willst du diesen verschlüsselten Raum wirklich öffentlich machen?",
+    "Unknown failure": "Unbekannter Fehler",
+    "Failed to update the join rules": "Fehler beim updaten der Beitrittsregeln",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Um dieses Problem zu vermeiden, <a>erstelle einen neuen verschlüsselten Raum</a> für deine Konversation.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Verschlüsselung ist für öffentliche Räume nicht empfohlen.</b> Jeder kann den Raum betreten und so auch Nachrichten lesen und Senden und Empfangen wird langsamer. Du hast daher von der Verschlüsselung keinen Vorteil und kannst sie später nicht mehr ausschalten.",
+    "Are you sure you want to add encryption to this public room?": "Dieser Raum ist öffentlich. Willst du die Verschlüsselung wirklich aktivieren?",
+    "Change description": "Beschreibung bearbeiten",
+    "Change main address for the space": "Hauptadresse des Space ändern",
+    "Change space name": "Name des Space ändern",
+    "Change space avatar": "Space-Icon ändern",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Alle in <spaceName/> kann beitreten. Du kannst auch weitere Spaces auswählen.",
+    "Currently, %(count)s spaces have access|one": "Derzeit hat ein Space Zugriff",
+    "& %(count)s more|one": "und %(count)s weitere",
+    "Low bandwidth mode (requires compatible homeserver)": "Modus für niedrige Bandweite (kompatibler Heimserver benötigt)",
+    "Autoplay videos": "Videos automatisch abspielen",
+    "Autoplay GIFs": "GIFs automatisch abspielen",
+    "Multiple integration managers (requires manual setup)": "Mehrere Integrationsmanager (benötigt manuelles Einrichten)",
+    "Threaded messaging": "Threads",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s hat eine Nachricht losgelöst. Alle angepinnten Nachrichten anzeigen.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s hat <a>eine Nachricht</a> losgeheftet. Alle <b>angehefteten Nachrichten anzeigen</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s hat eine Nachricht angeheftet. Alle angehefteten Nachrichten anzeigen.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s hat <a>eine Nachricht</a> angeheftet. <b>Alle angehefteten Nachrichten anzeigen</b>.",
+    "Joining space …": "Space beitreten…",
+    "To join a space you'll need an invite.": "Um einem Space beizutreten brauchst du eine Einladung.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "In dieser Sitzung temporär Communities statt Spaces anzeigen. Unterstützung hierfür wird in naher Zukunft entfernt. Dies wird Element neu laden.",
+    "Display Communities instead of Spaces": "Communities statt Spaces anzeigen"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 8700abbff1..fb389d5dc1 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -8,10 +8,7 @@
     "Search": "Αναζήτηση",
     "Settings": "Ρυθμίσεις",
     "unknown error code": "άγνωστος κωδικός σφάλματος",
-    "%(targetName)s accepted an invitation.": "%(targetName)s δέχτηκε την πρόσκληση.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s δέχτηκες την πρόσκληση για %(displayName)s.",
     "Account": "Λογαριασμός",
-    "Add a topic": "Προσθήκη θέματος",
     "Admin": "Διαχειριστής",
     "No Microphones detected": "Δεν εντοπίστηκε μικρόφωνο",
     "No Webcams detected": "Δεν εντοπίστηκε κάμερα",
@@ -21,24 +18,17 @@
     "Advanced": "Προχωρημένα",
     "Authentication": "Πιστοποίηση",
     "A new password must be entered.": "Ο νέος κωδικός πρόσβασης πρέπει να εισαχθεί.",
-    "%(senderName)s answered the call.": "Ο χρήστης %(senderName)s απάντησε την κλήση.",
     "An error has occurred.": "Παρουσιάστηκε ένα σφάλμα.",
     "Anyone": "Oποιοσδήποτε",
     "Are you sure?": "Είστε σίγουροι;",
     "Are you sure you want to leave the room '%(roomName)s'?": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από το δωμάτιο '%(roomName)s';",
     "Are you sure you want to reject the invitation?": "Είστε σίγουροι ότι θέλετε να απορρίψετε την πρόσκληση;",
     "Attachment": "Επισύναψη",
-    "%(senderName)s banned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
-    "Autoplay GIFs and videos": "Αυτόματη αναπαραγωγή GIFs και βίντεο",
-    "Anyone who knows the room's link, apart from guests": "Oποιοσδήποτε",
     "%(items)s and %(lastItem)s": "%(items)s και %(lastItem)s",
-    "Access Token:": "Κωδικός πρόσβασης:",
     "Always show message timestamps": "Εμφάνιση πάντα της ένδειξης ώρας στα μηνύματα",
     "and %(count)s others...|one": "και ένας ακόμα...",
     "and %(count)s others...|other": "και %(count)s άλλοι...",
-    "Anyone who knows the room's link, including guests": "Οποιοσδήποτε γνωρίζει τον σύνδεσμο του δωματίου, συμπεριλαμβανομένων των επισκεπτών",
     "Change Password": "Αλλαγή κωδικού πρόσβασης",
-    "%(senderName)s changed their profile picture.": "Ο %(senderName)s άλλαξε τη φωτογραφία του προφίλ του.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα του δωματίου σε %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Ο %(senderDisplayName)s άλλαξε το θέμα σε \"%(topic)s\".",
     "Bans user with given id": "Αποκλεισμός χρήστη με το συγκεκριμένο αναγνωριστικό",
@@ -51,7 +41,6 @@
     "Cryptography": "Κρυπτογραφία",
     "Current password": "Τωρινός κωδικός πρόσβασης",
     "Custom level": "Προσαρμοσμένο επίπεδο",
-    "/ddg is not a command": "Το /ddg δεν αναγνωρίζεται ως εντολή",
     "Deactivate Account": "Απενεργοποίηση λογαριασμού",
     "Decrypt %(text)s": "Αποκρυπτογράφηση %(text)s",
     "Default": "Προεπιλογή",
@@ -60,14 +49,11 @@
     "Email": "Ηλεκτρονική διεύθυνση",
     "Email address": "Ηλεκτρονική διεύθυνση",
     "Emoji": "Εικονίδια",
-    "%(senderName)s ended the call.": "Ο %(senderName)s τερμάτισε την κλήση.",
     "Error decrypting attachment": "Σφάλμα κατά την αποκρυπτογράφηση της επισύναψης",
-    "Existing Call": "Υπάρχουσα κλήση",
     "Export": "Εξαγωγή",
     "Export E2E room keys": "Εξαγωγή κλειδιών κρυπτογράφησης για το δωμάτιο",
     "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",
     "Failed to join room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
-    "Failed to leave room": "Δεν ήταν δυνατή η αποχώρηση από το δωμάτιο",
     "Failed to mute user": "Δεν ήταν δυνατή η σίγαση του χρήστη",
     "Failed to reject invite": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
     "Failed to reject invitation": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
@@ -75,14 +61,12 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση της διεύθυνσης ηλεκτρονικής αλληλογραφίας: βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε",
     "Favourite": "Αγαπημένο",
     "Favourites": "Αγαπημένα",
-    "Fill screen": "Γέμισε την οθόνη",
     "Filter room members": "Φιλτράρισμα μελών",
     "Forget room": "Αγνόηση δωματίου",
     "For security, this session has been signed out. Please sign in again.": "Για λόγους ασφαλείας, αυτή η συνεδρία έχει τερματιστεί. Παρακαλούμε συνδεθείτε ξανά.",
     "Hangup": "Κλείσιμο",
     "Historical": "Ιστορικό",
     "Homeserver is": "Ο διακομιστής είναι",
-    "Identity Server is": "Ο διακομιστής ταυτοποίησης είναι",
     "I have verified my email address": "Έχω επαληθεύσει την διεύθυνση ηλ. αλληλογραφίας",
     "Import": "Εισαγωγή",
     "Import E2E room keys": "Εισαγωγή κλειδιών E2E",
@@ -92,17 +76,13 @@
     "Invited": "Προσκλήθηκε",
     "Invites": "Προσκλήσεις",
     "Sign in with": "Συνδεθείτε με",
-    "%(targetName)s joined the room.": "Ο %(targetName)s συνδέθηκε στο δωμάτιο.",
     "Jump to first unread message.": "Πηγαίνετε στο πρώτο μη αναγνωσμένο μήνυμα.",
-    "%(senderName)s kicked %(targetName)s.": "Ο %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Kick": "Απομάκρυνση",
     "Kicks user with given id": "Διώχνει χρήστες με το συγκεκριμένο id",
     "Labs": "Πειραματικά",
     "Leave room": "Αποχώρηση από το δωμάτιο",
-    "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
     "Logout": "Αποσύνδεση",
     "Low priority": "Χαμηλής προτεραιότητας",
-    "Click here to fix": "Κάνε κλικ εδώ για διόρθωση",
     "Command error": "Σφάλμα εντολής",
     "Commands": "Εντολές",
     "Failed to send request.": "Δεν ήταν δυνατή η αποστολή αιτήματος.",
@@ -112,18 +92,15 @@
     "Name": "Όνομα",
     "New passwords don't match": "Οι νέοι κωδικοί πρόσβασης είναι διαφορετικοί",
     "New passwords must match each other.": "Οι νέοι κωδικοί πρόσβασης πρέπει να ταιριάζουν.",
-    "(not supported by this browser)": "(δεν υποστηρίζεται από τον περιηγητή)",
     "<not supported>": "<δεν υποστηρίζεται>",
     "No more results": "Δεν υπάρχουν άλλα αποτελέσματα",
     "No results": "Κανένα αποτέλεσμα",
     "OK": "Εντάξει",
-    "olm version:": "Έκδοση olm:",
     "Password": "Κωδικός πρόσβασης",
     "Passwords can't be empty": "Οι κωδικοί πρόσβασης δεν γίνετε να είναι κενοί",
     "Phone": "Τηλέφωνο",
     "Register": "Εγγραφή",
     "%(brand)s version:": "Έκδοση %(brand)s:",
-    "Room Colour": "Χρώμα δωματίου",
     "Rooms": "Δωμάτια",
     "Save": "Αποθήκευση",
     "Search failed": "Η αναζήτηση απέτυχε",
@@ -136,54 +113,36 @@
     "This email address was not found": "Δεν βρέθηκε η διεύθυνση ηλ. αλληλογραφίας",
     "Success": "Επιτυχία",
     "Cancel": "Ακύρωση",
-    "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή",
     "Dismiss": "Απόρριψη",
     "Close": "Κλείσιμο",
     "Create new room": "Δημιουργία νέου δωματίου",
-    "Room directory": "Ευρετήριο",
     "Start chat": "Έναρξη συνομιλίας",
     "Accept": "Αποδοχή",
-    "Active call (%(roomName)s)": "Ενεργή κλήση (%(roomName)s)",
     "Add": "Προσθήκη",
     "Admin Tools": "Εργαλεία διαχειριστή",
     "No media permissions": "Χωρίς δικαιώματα πολυμέσων",
     "Ban": "Αποκλεισμός",
     "Banned users": "Αποκλεισμένοι χρήστες",
-    "Call Timeout": "Λήξη χρόνου κλήσης",
-    "Click to mute audio": "Κάντε κλικ για σίγαση του ήχου",
-    "Click to mute video": "Κάντε κλικ για σίγαση του βίντεο",
-    "click to reveal": "κάντε κλικ για εμφάνιση",
-    "Click to unmute video": "Κάντε κλικ για άρση σίγασης του βίντεο",
-    "Click to unmute audio": "Κάντε κλικ για άρση σίγασης του ήχου",
-    "Custom": "Προσαρμοσμένο",
     "Decline": "Απόρριψη",
-    "Drop File Here": "Αποθέστε εδώ το αρχείο",
     "Enter passphrase": "Εισαγωγή συνθηματικού",
     "Failed to set display name": "Δεν ήταν δυνατό ο ορισμός του ονόματος εμφάνισης",
     "Failed to upload profile picture!": "Δεν ήταν δυνατή η αποστολή της εικόνας προφίλ!",
     "Home": "Αρχική",
     "Last seen": "Τελευταία εμφάνιση",
-    "Manage Integrations": "Διαχείριση ενσωματώσεων",
     "Missing room_id in request": "Λείπει το room_id στο αίτημα",
     "Permissions": "Δικαιώματα",
     "Power level must be positive integer.": "Το επίπεδο δύναμης πρέπει να είναι ένας θετικός ακέραιος.",
-    "Private Chat": "Προσωπική συνομιλία",
     "Privileged Users": "Προνομιούχοι χρήστες",
     "Profile": "Προφίλ",
-    "Public Chat": "Δημόσια συνομιλία",
     "Reason": "Αιτία",
-    "%(targetName)s rejected the invitation.": "Ο %(targetName)s απέρριψε την πρόσκληση.",
     "Reject invitation": "Απόρριψη πρόσκλησης",
-    "Results from DuckDuckGo": "Αποτελέσματα από DuckDuckGo",
     "Return to login screen": "Επιστροφή στην οθόνη σύνδεσης",
     "Room %(roomId)s not visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό",
     "%(roomName)s does not exist.": "Το %(roomName)s δεν υπάρχει.",
-    "Searches DuckDuckGo for results": "Γίνεται αναζήτηση στο DuckDuckGo για αποτελέσματα",
     "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από τον/την %(userName)s στις %(dateTime)s",
     "Send Reset Email": "Αποστολή μηνύματος επαναφοράς",
     "%(senderDisplayName)s sent an image.": "Ο %(senderDisplayName)s έστειλε μια φωτογραφία.",
     "Session ID": "Αναγνωριστικό συνεδρίας",
-    "%(senderName)s set a profile picture.": "Ο %(senderName)s όρισε τη φωτογραφία του προφίλ του.",
     "Start authentication": "Έναρξη πιστοποίησης",
     "Submit": "Υποβολή",
     "This room has no local addresses": "Αυτό το δωμάτιο δεν έχει τοπικές διευθύνσεις",
@@ -194,9 +153,7 @@
     "Unable to remove contact information": "Αδυναμία αφαίρεσης πληροφοριών επαφής",
     "Unable to verify email address.": "Αδυναμία επιβεβαίωσης διεύθυνσης ηλεκτρονικής αλληλογραφίας.",
     "Unban": "Άρση αποκλεισμού",
-    "%(senderName)s unbanned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Unable to enable Notifications": "Αδυναμία ενεργοποίησης των ειδοποιήσεων",
-    "unknown caller": "άγνωστος καλών",
     "Unmute": "Άρση σίγασης",
     "Unnamed Room": "Ανώνυμο δωμάτιο",
     "Upload avatar": "Αποστολή προσωπικής εικόνας",
@@ -204,13 +161,10 @@
     "Upload file": "Αποστολή αρχείου",
     "Upload new:": "Αποστολή νέου:",
     "Usage": "Χρήση",
-    "Username invalid: %(errMessage)s": "Μη έγκυρο όνομα χρήστη: %(errMessage)s",
     "Users": "Χρήστες",
     "Video call": "Βιντεοκλήση",
     "Voice call": "Φωνητική κλήση",
     "Warning!": "Προειδοποίηση!",
-    "You are already in a call.": "Είστε ήδη σε μια κλήση.",
-    "You have no visible notifications": "Δεν έχετε ορατές ειδοποιήσεις",
     "You must <a>register</a> to use this functionality": "Πρέπει να <a>εγγραφείτε</a> για να χρησιμοποιήσετε αυτή την λειτουργία",
     "You need to be logged in.": "Πρέπει να είστε συνδεδεμένος.",
     "Sun": "Κυρ",
@@ -234,14 +188,10 @@
     "Dec": "Δεκ",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Ορισμός ονόματος εμφάνισης:",
-    "Upload an avatar:": "Αποστολή προσωπικής εικόνας:",
     "This server does not support authentication with a phone number.": "Αυτός ο διακομιστής δεν υποστηρίζει πιστοποίηση με αριθμό τηλεφώνου.",
-    "An error occurred: %(error_string)s": "Προέκυψε ένα σφάλμα: %(error_string)s",
     "Room": "Δωμάτιο",
     "(~%(count)s results)|one": "(~%(count)s αποτέλεσμα)",
     "(~%(count)s results)|other": "(~%(count)s αποτελέσματα)",
-    "Active call": "Ενεργή κλήση",
     "New Password": "Νέος κωδικός πρόσβασης",
     "Start automatically after system login": "Αυτόματη έναρξη μετά τη σύνδεση",
     "Options": "Επιλογές",
@@ -256,11 +206,8 @@
     "Incorrect password": "Λανθασμένος κωδικός πρόσβασης",
     "Unable to restore session": "Αδυναμία επαναφοράς συνεδρίας",
     "Unknown Address": "Άγνωστη διεύθυνση",
-    "ex. @bob:example.com": "π.χ @bob:example.com",
-    "Add User": "Προσθήκη χρήστη",
     "Token incorrect": "Εσφαλμένο διακριτικό",
     "Please enter the code it contains:": "Παρακαλούμε εισάγετε τον κωδικό που περιέχει:",
-    "Error decrypting audio": "Σφάλμα κατά την αποκρυπτογράφηση του ήχου",
     "Error decrypting image": "Σφάλμα κατά την αποκρυπτογράφηση της εικόνας",
     "Error decrypting video": "Σφάλμα κατά την αποκρυπτογράφηση του βίντεο",
     "Add an Integration": "Προσθήκη ενσωμάτωσης",
@@ -271,21 +218,12 @@
     "Offline": "Εκτός σύνδεσης",
     "%(senderDisplayName)s removed the room avatar.": "Ο %(senderDisplayName)s διέγραψε την προσωπική εικόνα του δωματίου.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "Ο %(senderDisplayName)s άλλαξε την προσωπική εικόνα του %(roomName)s",
-    "Username available": "Διαθέσιμο όνομα χρήστη",
-    "Username not available": "Μη διαθέσιμο όνομα χρήστη",
     "Something went wrong!": "Κάτι πήγε στραβά!",
-    "Error: Problem communicating with the given homeserver.": "Σφάλμα: πρόβλημα κατά την επικοινωνία με τον ορισμένο διακομιστή.",
     "Failed to ban user": "Δεν ήταν δυνατό ο αποκλεισμός του χρήστη",
     "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης",
-    "Failed to fetch avatar URL": "Δεν ήταν δυνατή η ανάκτηση της διεύθυνσης εικόνας",
     "Failed to unban": "Δεν ήταν δυνατή η άρση του αποκλεισμού",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Οι επισκέπτες δεν μπορούν να συνδεθούν στο δωμάτιο ακόμη και αν έχουν καλεστεί.",
-    "Incoming call from %(name)s": "Εισερχόμενη κλήση από %(name)s",
-    "Incoming video call from %(name)s": "Εισερχόμενη βιντεοκλήση από %(name)s",
-    "Incoming voice call from %(name)s": "Εισερχόμενη φωνητική κλήση από %(name)s",
     "Invalid file%(extra)s": "Μη έγκυρο αρχείο %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "Ο %(senderName)s προσκάλεσε τον %(targetName)s.",
     "Invites user with given id to current room": "Προσκαλεί τον χρήστη με το δοσμένο αναγνωριστικό στο τρέχον δωμάτιο",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που προσκλήθηκαν.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που συνδέθηκαν.",
@@ -298,53 +236,36 @@
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία και κάντε κλικ στον σύνδεσμο που περιέχει. Μόλις γίνει αυτό, κάντε κλίκ στο κουμπί συνέχεια.",
-    "%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.",
-    "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "Το %(brand)s δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
     "%(brand)s was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο %(brand)s - παρακαλούμε προσπαθήστε ξανά",
     "%(roomName)s is not accessible at this time.": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.",
     "Server may be unavailable, overloaded, or search timed out :(": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να έχει λήξει η αναζήτηση :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να πέσατε σε ένα σφάλμα.",
     "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.",
-    "%(count)s of your messages have not been sent.|other": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
-    "Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
     "Uploading %(filename)s and %(count)s others|zero": "Γίνεται αποστολή του %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
     "Verification Pending": "Εκκρεμεί επιβεβαίωση",
     "Verified key": "Επιβεβαιωμένο κλειδί",
-    "VoIP conference finished.": "Ολοκληρώθηκε η συνδιάσκεψη VoIP.",
-    "VoIP conference started.": "Ξεκίνησησε η συνδιάσκεψη VoIP.",
     "VoIP is unsupported": "Δεν υποστηρίζεται το VoIP",
-    "Who can access this room?": "Ποιος μπορεί να προσπελάσει αυτό το δωμάτιο;",
     "Who can read history?": "Ποιος μπορεί να διαβάσει το ιστορικό;",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "Ο %(senderName)s ανακάλεσε την πρόσκληση του %(targetName)s.",
     "You cannot place a call with yourself.": "Δεν μπορείτε να καλέσετε τον ευατό σας.",
     "You cannot place VoIP calls in this browser.": "Δεν μπορείτε να πραγματοποιήσετε κλήσεις VoIP με αυτόν τον περιηγητή.",
     "You do not have permission to post to this room": "Δεν έχετε δικαιώματα για να δημοσιεύσετε σε αυτό το δωμάτιο",
     "You seem to be in a call, are you sure you want to quit?": "Φαίνεται ότι είστε σε μια κλήση, είστε βέβαιοι ότι θέλετε να αποχωρήσετε;",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
-    "There are no visible files in this room": "Δεν υπάρχουν ορατά αρχεία σε αυτό το δωμάτιο",
     "Connectivity to the server has been lost.": "Χάθηκε η συνδεσιμότητα στον διακομιστή.",
-    "Please select the destination room for this message": "Παρακαλούμε επιλέξτε ένα δωμάτιο προορισμού για αυτό το μήνυμα",
     "Analytics": "Αναλυτικά δεδομένα",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "Το %(brand)s συλλέγει ανώνυμα δεδομένα επιτρέποντας μας να βελτιώσουμε την εφαρμογή.",
     "Failed to invite": "Δεν ήταν δυνατή η πρόσκληση",
-    "Please check your email to continue registration.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία για να συνεχίσετε με την εγγραφή.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Αν δεν ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας, δεν θα θα μπορείτε να επαναφέρετε τον κωδικό πρόσβασης σας. Είστε σίγουροι;",
-    " (unsupported)": " (μη υποστηριζόμενο)",
     "%(senderDisplayName)s changed the room avatar to <img/>": "Ο %(senderDisplayName)s άλλαξε την εικόνα του δωματίου σε <img/>",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του %(brand)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.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή - παρακαλούμε ελέγξτε την συνδεσιμότητα, βεβαιωθείτε ότι το <a>πιστοποιητικό SSL</a> του διακομιστή είναι έμπιστο και ότι κάποιο πρόσθετο περιηγητή δεν αποτρέπει τα αιτήματα.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή μέσω HTTP όταν μια διεύθυνση HTTPS βρίσκεται στην μπάρα του περιηγητή. Είτε χρησιμοποιήστε HTTPS ή <a>ενεργοποιήστε τα μη ασφαλή σενάρια εντολών</a>.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Ο %(senderName)s άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Ο %(senderName)s αφαίρεσε το όνομα εμφάνισης του (%(oldDisplayName)s).",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Ο %(senderName)s έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
-    "%(senderName)s set their display name to %(displayName)s.": "Ο %(senderName)s όρισε το όνομα του σε %(displayName)s.",
-    "The phone number entered looks invalid": "Ο αριθμός που καταχωρίσατε δεν είναι έγκυρος",
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
-    "The remote side failed to pick up": "Η απομακρυσμένη πλευρά απέτυχε να συλλέξει",
     "This room is not accessible by remote Matrix servers": "Αυτό το δωμάτιο δεν είναι προσβάσιμο από απομακρυσμένους διακομιστές Matrix",
     "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
     "You have <a>disabled</a> URL previews by default.": "Έχετε <a>απενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
@@ -353,29 +274,20 @@
     "You seem to be uploading files, are you sure you want to quit?": "Φαίνεται ότι αποστέλετε αρχεία, είστε βέβαιοι ότι θέλετε να αποχωρήσετε;",
     "You must join the room to see its files": "Πρέπει να συνδεθείτε στο δωμάτιο για να δείτε τα αρχεία του",
     "Reject all %(invitedRooms)s invites": "Απόρριψη όλων των προσκλήσεων %(invitedRooms)s",
-    "Failed to invite the following users to the %(roomName)s room:": "Δεν ήταν δυνατή η πρόσκληση των παρακάτω χρηστών στο δωμάτιο %(roomName)s:",
     "Deops user with given id": "Deop χρήστη με το συγκεκριμένο αναγνωριστικό",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Συμμετάσχετε με <voiceText>φωνή</voiceText> ή <videoText>βίντεο</videoText>.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Εμφάνιση χρονικών σημάνσεων σε 12ωρη μορφή ώρας (π.χ. 2:30 μ.μ.)",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Η διεύθυνση της ηλ. αλληλογραφίας σας δεν φαίνεται να συσχετίζεται με μια ταυτότητα Matrix σε αυτόν τον Διακομιστή Φιλοξενίας.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Δεν θα μπορέσετε να αναιρέσετε αυτήν την αλλαγή καθώς προωθείτε τον χρήστη να έχει το ίδιο επίπεδο δύναμης με τον εαυτό σας.",
     "Sent messages will be stored until your connection has returned.": "Τα απεσταλμένα μηνύματα θα αποθηκευτούν μέχρι να αακτηθεί η σύνδεσή σας.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Είστε βέβαιοι ότι θέλετε να καταργήσετε (διαγράψετε) αυτό το συμβάν; Σημειώστε ότι αν διαγράψετε το όνομα δωματίου ή αλλάξετε το θέμα, θα μπορούσε να αναιρέσει την αλλαγή.",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Αυτό θα είναι το όνομα του λογαριασμού σας στον διακομιστή <span></span>, ή μπορείτε να επιλέξετε <a>διαφορετικό διακομιστή</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Αν έχετε ήδη λογαριασμό Matrix μπορείτε να <a>συνδεθείτε</a>.",
     "Failed to load timeline position": "Δεν ήταν δυνατή η φόρτωση της θέσης του χρονολόγιου",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Προσπαθήσατε να φορτώσετε ένα συγκεκριμένο σημείο στο χρονολόγιο του δωματίου, αλλά δεν έχετε δικαίωμα να δείτε το εν λόγω μήνυμα.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Προσπαθήσατε να φορτώσετε ένα συγκεκριμένο σημείο στο χρονολόγιο του δωματίου, αλλά δεν καταφέρατε να το βρείτε.",
     "Failed to kick": "Δεν ήταν δυνατή η απομάκρυνση",
-    "(no answer)": "(χωρίς απάντηση)",
-    "(unknown failure: %(reason)s)": "(άγνωστο σφάλμα: %(reason)s)",
-    "Ongoing conference call%(supportedText)s.": "Κλήση συνδιάσκεψης σε εξέλιξη %(supportedText)s.",
     "Your browser does not support the required cryptography extensions": "Ο περιηγητής σας δεν υποστηρίζει τα απαιτούμενα πρόσθετα κρυπτογράφησης",
     "Not a valid %(brand)s keyfile": "Μη έγκυρο αρχείο κλειδιού %(brand)s",
     "Authentication check failed: incorrect password?": "Αποτυχία ελέγχου πιστοποίησης: λανθασμένος κωδικός πρόσβασης;",
     "Displays action": "Εμφανίζει την ενέργεια",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Για να το χρησιμοποιήσετε, απλά περιμένετε μέχρι να φορτωθούν τα αποτέλεσμα αυτόματης συμπλήρωσης. Έπειτα επιλέξτε ένα από αυτά χρησιμοποιώντας τον στηλοθέτη.",
-    "(could not connect media)": "(αδυναμία σύνδεσης με το πολυμέσο)",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Αυτή η διαδικασία σας επιτρέπει να εξαγάγετε τα κλειδιά για τα μηνύματα που έχετε λάβει σε κρυπτογραφημένα δωμάτια σε ένα τοπικό αρχείο. Στη συνέχεια, θα μπορέσετε να εισάγετε το αρχείο σε άλλο πρόγραμμα του Matrix, έτσι ώστε το πρόγραμμα να είναι σε θέση να αποκρυπτογραφήσει αυτά τα μηνύματα.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Το αρχείο εξαγωγής θα επιτρέψει σε οποιονδήποτε που μπορεί να το διαβάσει να αποκρυπτογραφήσει κρυπτογραφημένα μηνύματα που εσείς μπορείτε να δείτε, οπότε θα πρέπει να είστε προσεκτικοί για να το κρατήσετε ασφαλές. Για να βοηθήσετε με αυτό, θα πρέπει να εισαγάγετε ένα συνθηματικό, το οποία θα χρησιμοποιηθεί για την κρυπτογράφηση των εξαγόμενων δεδομένων. Η εισαγωγή δεδομένων θα είναι δυνατή χρησιμοποιώντας μόνο το ίδιο συνθηματικό.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Αυτή η διαδικασία σας επιτρέπει να εισαγάγετε κλειδιά κρυπτογράφησης που έχετε προηγουμένως εξάγει από άλλο πρόγραμμα του Matrix. Στη συνέχεια, θα μπορέσετε να αποκρυπτογραφήσετε τυχόν μηνύματα που το άλλο πρόγραμμα θα μπορούσε να αποκρυπτογραφήσει.",
@@ -387,16 +299,12 @@
     "Skip": "Παράβλεψη",
     "Check for update": "Έλεγχος για ενημέρωση",
     "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
-    "All notifications are currently disabled for all targets.": "Όλες οι ειδοποιήσεις είναι προς το παρόν απενεργοποιημένες για όλες τις συσκευές.",
-    "Uploading report": "Αποστολή αναφοράς",
     "Sunday": "Κυριακή",
     "Guests can join": "Επισκέπτες μπορούν να συνδεθούν",
     "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο",
     "Notification targets": "Στόχοι ειδοποιήσεων",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",
     "Today": "Σήμερα",
-    "Files": "Αρχεία",
-    "You are not receiving desktop notifications": "Δεν λαμβάνετε ειδοποιήσεις στην επιφάνεια εργασίας",
     "Friday": "Παρασκευή",
     "Update": "Ενημέρωση",
     "%(brand)s does not know how to join a room on this network": "To %(brand)s δεν γνωρίζει πως να συνδεθεί σε δωμάτια που ανήκουν σ' αυτό το δίκτυο",
@@ -404,12 +312,7 @@
     "Changelog": "Αλλαγές",
     "Waiting for response from server": "Αναμονή απάντησης από τον διακομιστή",
     "Leave": "Αποχώρηση",
-    "Uploaded on %(date)s by %(user)s": "Απεστάλη στις %(date)s από %(user)s",
-    "Advanced notification settings": "Προχωρημένες ρυθμίσεις ειδοποιήσεων",
-    "Forget": "Παράλειψη",
     "World readable": "Εμφανές σε όλους",
-    "You cannot delete this image. (%(code)s)": "Δεν μπορείτε να διαγράψετε αυτή την εικόνα. (%(code)s)",
-    "Cancel Sending": "Ακύρωση αποστολής",
     "Warning": "Προειδοποίηση",
     "This Room": "Στο δωμάτιο",
     "Resend": "Αποστολή ξανά",
@@ -417,82 +320,48 @@
     "Messages containing my display name": "Μηνύματα που περιέχουν το όνομα μου",
     "Messages in one-to-one chats": "Μηνύματα σε 1-προς-1 συνομιλίες",
     "Unavailable": "Μη διαθέσιμο",
-    "View Decrypted Source": "Προβολή του αποκρυπτογραφημένου κώδικα",
     "Send": "Αποστολή",
     "remove %(name)s from the directory.": "αφαίρεση του %(name)s από το ευρετήριο.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Οι ειδοποιήσεις για τις επόμενες λέξεις κλειδία ακολουθούν κανόνες που δεν είναι δυνατόν να εμφανιστούν εδώ:",
-    "Please set a password!": "Παρακαλούμε ορίστε έναν κωδικό πρόσβασης!",
-    "You have successfully set a password!": "Ο κωδικός πρόσβασης ορίστηκε επιτυχώς!",
-    "An error occurred whilst saving your email notification preferences.": "Ένα σφάλμα προέκυψε κατά την αποθήκευση των ρυθμίσεων σας.",
     "Source URL": "Πηγαίο URL",
     "Messages sent by bot": "Μηνύματα από bots",
     "Members": "Μέλη",
     "No update available.": "Δεν υπάρχει διαθέσιμη ενημέρωση.",
     "Noisy": "Δυνατά",
     "Collecting app version information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
-    "Keywords": "Λέξεις κλειδιά",
-    "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
-    "Messages containing <span>keywords</span>": "Μηνύματα που περιέχουν <span>λέξεις κλειδιά</span>",
-    "Error saving email notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων",
     "Tuesday": "Τρίτη",
-    "Enter keywords separated by a comma:": "Προσθέστε λέξεις κλειδιά χωρισμένες με κόμμα:",
-    "I understand the risks and wish to continue": "Κατανοώ του κινδύνους και επιθυμώ να συνεχίσω",
     "Remove %(name)s from the directory?": "Αφαίρεση του %(name)s από το ευρετήριο;",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το %(brand)s χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
     "Unnamed room": "Ανώνυμο δωμάτιο",
     "Remove from Directory": "Αφαίρεση από το ευρετήριο",
     "Saturday": "Σάββατο",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Να θυμάστε ότι μπορείτε πάντα να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στις ρυθμίσεις χρήστη αν αλλάξετε γνώμη.",
-    "Direct Chat": "Απευθείας συνομιλία",
     "The server may be unavailable or overloaded": "Ο διακομιστής είναι μη διαθέσιμος ή υπερφορτωμένος",
     "Reject": "Απόρριψη",
-    "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
     "Monday": "Δευτέρα",
-    "All messages (noisy)": "Όλα τα μηνύματα (δυνατά)",
-    "Enable them now": "Ενεργοποίηση",
-    "Forward Message": "Προώθηση",
     "Collecting logs": "Συγκέντρωση πληροφοριών",
-    "(HTTP status %(httpStatus)s)": "(Κατάσταση HTTP %(httpStatus)s)",
     "All Rooms": "Όλα τα δωμάτια",
     "Wednesday": "Τετάρτη",
-    "Failed to update keywords": "Οι λέξεις κλειδιά δεν ενημερώθηκαν",
     "Send logs": "Αποστολή πληροφοριών",
     "All messages": "Όλα τα μηνύματα",
     "Call invitation": "Πρόσκληση σε κλήση",
     "Downloading update...": "Γίνεται λήψη της ενημέρωσης...",
-    "You have successfully set a password and an email address!": "Ο κωδικός πρόσβασης και η διεύθυνση ηλεκτρονικής αλληλογραφίας ορίστηκαν επιτυχώς!",
     "What's new?": "Τι νέο υπάρχει;",
-    "Notify me for anything else": "Ειδοποίηση  για οτιδήποτε άλλο",
     "When I'm invited to a room": "Όταν με προσκαλούν σ' ένα δωμάτιο",
-    "Can't update user notification settings": "Δεν είναι δυνατή η ενημέρωση των ρυθμίσεων ειδοποίησης χρήστη",
-    "Notify for all other messages/rooms": "Ειδοποίηση για όλα τα υπόλοιπα μηνύματα/δωμάτια",
     "Unable to look up room ID from server": "Δεν είναι δυνατή η εύρεση του ID για το δωμάτιο",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
     "Invite to this room": "Πρόσκληση σε αυτό το δωμάτιο",
     "You cannot delete this message. (%(code)s)": "Δεν μπορείτε να διαγράψετε αυτό το μήνυμα. (%(code)s)",
     "Thursday": "Πέμπτη",
     "Search…": "Αναζήτηση…",
-    "Unhide Preview": "Προεπισκόπηση",
     "Unable to join network": "Δεν είναι δυνατή η σύνδεση στο δίκτυο",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Λυπούμαστε, αλλά ο περιηγητές σας <b>δεν</b> υποστηρίζεται από το %(brand)s.",
     "Messages in group chats": "Μηνύματα σε ομαδικές συνομιλίες",
     "Yesterday": "Χθές",
     "Error encountered (%(errorDetail)s).": "Παρουσιάστηκε σφάλμα (%(errorDetail)s).",
     "Low Priority": "Χαμηλή προτεραιότητα",
     "What's New": "Τι νέο υπάρχει",
-    "Set Password": "Ορισμός κωδικού πρόσβασης",
     "Off": "Ανενεργό",
-    "Mentions only": "Μόνο αναφορές",
     "Failed to remove tag %(tagName)s from room": "Δεν ήταν δυνατή η διαγραφή της ετικέτας %(tagName)s από το δωμάτιο",
-    "You can now return to your account after signing out, and sign in on other devices.": "Μπορείτε να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
-    "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
     "No rooms to show": "Δεν υπάρχουν δωμάτια για εμφάνιση",
-    "Download this file": "Λήψη αρχείου",
-    "Failed to change settings": "Δεν ήταν δυνατή η αλλαγή των ρυθμίσεων",
     "View Source": "Προβολή κώδικα",
-    "Unable to fetch notification target list": "Δεν ήταν δυνατή η εύρεση στόχων για τις ειδοποιήσεις",
     "Quote": "Παράθεση",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
     "Checking for an update...": "Γίνεται έλεγχος για ενημέρωση...",
     "The platform you're on": "Η πλατφόρμα στην οποία βρίσκεστε",
     "The version of %(brand)s": "Η έκδοση του %(brand)s",
@@ -525,29 +394,18 @@
     "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
     "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s",
     "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Ο/Η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομά του/της σε %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
     "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Enable URL previews for this room (only affects you)": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
-    "Cannot add any more widgets": "Δεν είναι δυνατή η προσθήκη άλλων γραφικών στοιχείων",
-    "The maximum permitted number of widgets have already been added to this room.": "Ο μέγιστος επιτρεπτός αριθμός γραφικών στοιχείων έχει ήδη προστεθεί σε αυτό το δωμάτιο.",
-    "Add a widget": "Προσθέστε ένα γραφικό στοιχείο",
-    "%(senderName)s sent an image": "Ο/Η %(senderName)s έστειλε μία εικόνα",
-    "%(senderName)s sent a video": "Ο/Η %(senderName)s έστειλε ένα βίντεο",
-    "%(senderName)s uploaded a file": "Ο/Η %(senderName)s αναφόρτωσε ένα αρχείο",
     "Disinvite this user?": "Απόσυρση της πρόσκλησης αυτού του χρήστη;",
     "Mention": "Αναφορά",
     "Invite": "Πρόσκληση",
     "Send an encrypted reply…": "Αποστολή κρυπτογραφημένης απάντησης…",
     "Send an encrypted message…": "Αποστολή κρυπτογραφημένου μηνύματος…",
-    "Unpin Message": "Ξεκαρφίτσωμα μηνύματος",
-    "Jump to message": "Πηγαίντε στο μήνυμα",
-    "No pinned messages.": "Κανένα καρφιτσωμένο μήνυμα.",
     "Loading...": "Φόρτωση...",
-    "Pinned Messages": "Καρφιτσωμένα Μηνύματα",
     "%(duration)ss": "%(duration)sδ",
     "%(duration)sm": "%(duration)sλ",
     "%(duration)sh": "%(duration)sω",
@@ -569,9 +427,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Παρακαλείστε να ρωτήσετε τον διαχειριστή του διακομιστή φιλοξενίας σας (<code>%(homeserverDomain)s</code>) να ρυθμίσουν έναν διακομιστή πρωτοκόλλου TURN ώστε οι κλήσεις να λειτουργούν απρόσκοπτα.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Εναλλακτικά, δοκιμάστε να χρησιμοποιήσετε τον δημόσιο διακομιστή στο <code>turn.matrix.org</code>, αλλά δεν θα είναι το ίδιο απρόσκοπτο, και θα κοινοποιεί την διεύθυνση IP σας με τον διακομιστή. Μπορείτε επίσης να το διαχειριστείτε στις Ρυθμίσεις.",
     "Try using turn.matrix.org": "Δοκιμάστε το turn.matrix.org",
-    "Call in Progress": "Κλήση σε Εξέλιξη",
-    "A call is currently being placed!": "Μια κλήση πραγματοποιείτε τώρα!",
-    "A call is already in progress!": "Μια κλήση είναι σε εξέλιξη ήδη!",
     "Permission Required": "Απαιτείται Άδεια",
     "You do not have permission to start a conference call in this room": "Δεν έχετε άδεια για να ξεκινήσετε μια κλήση συνδιάσκεψης σε αυτό το δωμάτιο",
     "Replying With Files": "Απαντώντας Με Αρχεία",
@@ -660,10 +515,6 @@
     "%(senderName)s placed a video call.": "Ο %(senderName)s έκανε μία κλήση βίντεο.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "Ο %(senderName)s έκανε μια ηχητική κλήση. (δεν υποστηρίζεται από το πρόγραμμα περιήγησης)",
     "%(senderName)s placed a voice call.": "Ο %(senderName)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 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 για αυτό το δωμάτιο.",
@@ -680,7 +531,6 @@
     "%(senderDisplayName)s made the room public to whoever knows the link.": "Ο %(senderDisplayName)s έκανε το δωμάτιο δημόσιο για όποιον γνωρίζει τον σύνδεσμο.",
     "%(senderDisplayName)s upgraded this room.": "Ο %(senderDisplayName)s αναβάθμισε αυτό το δωμάτιο.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα δωματίου από %(oldRoomName)s σε %(newRoomName)s.",
-    "%(senderName)s made no change.": "Ο %(senderName)s δεν έκανε καμία αλλαγή.",
     "Converts the DM to a room": "Μετατρέπει την προσωπική συνομιλία σε δωμάτιο",
     "Converts the room to a DM": "Μετατρέπει το δωμάτιο σε προσωπική συνομιλία",
     "Takes the call in the current room off hold": "Επαναφέρει την κλήση στο τρέχον δωμάτιο από την αναμονή",
@@ -916,8 +766,6 @@
     "The call was answered on another device.": "Η κλήση απαντήθηκε σε μια άλλη συσκευή.",
     "Answered Elsewhere": "Απαντήθηκε αλλού",
     "The call could not be established": "Η κλήση δεν μπόρεσε να πραγματοποιηθεί",
-    "The other party declined the call.": "Η άλλη πλευρά απέρριψε την κλήση.",
-    "Call Declined": "Η κλήση απορρίφθηκε",
     "Your user agent": "Η συσκευή σας",
     "Confirm adding phone number": "Επιβεβαιώστε την προσθήκη του τηλεφωνικού αριθμού",
     "Click the button below to confirm adding this email address.": "Πιέστε το κουμπί από κάτω για να επιβεβαιώσετε την προσθήκη της διεύθυνσης ηλ. ταχυδρομείου.",
@@ -925,5 +773,6 @@
     "Done": "Τέλος",
     "Not Trusted": "Μη Έμπιστο",
     "You're already in a call with this person.": "Είστε ήδη σε κλήση με αυτόν τον χρήστη.",
-    "Already in call": "Ήδη σε κλήση"
+    "Already in call": "Ήδη σε κλήση",
+    "Identity server is": "Ο διακομιστής ταυτοποίησης είναι"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9e85ea28c8..9f245b8dab 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -35,11 +35,8 @@
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
     "Call Failed": "Call Failed",
-    "Call Declined": "Call Declined",
-    "The other party declined the call.": "The other party declined the call.",
     "User Busy": "User Busy",
     "The user you called is busy.": "The user you called is busy.",
-    "The remote side failed to pick up": "The remote side failed to pick up",
     "The call could not be established": "The call could not be established",
     "Answered Elsewhere": "Answered Elsewhere",
     "The call was answered on another device.": "The call was answered on another device.",
@@ -55,18 +52,18 @@
     "A microphone and webcam are plugged in and set up correctly": "A microphone and webcam are plugged in and set up correctly",
     "Permission is granted to use the webcam": "Permission is granted to use the webcam",
     "No other application is using the webcam": "No other application is using the webcam",
-    "Unable to capture screen": "Unable to capture screen",
+    "Already in call": "Already in call",
+    "You're already in a call with this person.": "You're already in a call with this person.",
     "VoIP is unsupported": "VoIP is unsupported",
     "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.",
     "Unable to look up phone number": "Unable to look up phone number",
     "There was an error looking up the phone number": "There was an error looking up the phone number",
-    "Call in Progress": "Call in Progress",
-    "A call is currently being placed!": "A call is currently being placed!",
+    "Unable to transfer call": "Unable to transfer call",
+    "Transfer Failed": "Transfer Failed",
+    "Failed to transfer call": "Failed to transfer call",
     "Permission Required": "Permission Required",
     "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "End conference": "End conference",
@@ -105,6 +102,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "%(date)s at %(time)s": "%(date)s at %(time)s",
     "Who would you like to add to this community?": "Who would you like to add to this community?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID",
     "Invite new community members": "Invite new community members",
@@ -396,7 +394,8 @@
     "Failed to invite": "Failed to invite",
     "Operation failed": "Operation failed",
     "Failed to invite users to the room:": "Failed to invite users to the room:",
-    "Failed to invite the following users to the %(roomName)s room:": "Failed to invite the following users to the %(roomName)s room:",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "We sent the others, but the below people couldn't be invited to <RoomName/>",
+    "Some invites couldn't be sent": "Some invites couldn't be sent",
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
@@ -428,13 +427,8 @@
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message",
     "Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
     "Sends a message as html, without interpreting it as markdown": "Sends a message as html, without interpreting it as markdown",
-    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
-    "/ddg is not a command": "/ddg is not a command",
-    "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
     "Upgrades a room to a new version": "Upgrades a room to a new version",
     "You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
-    "Error upgrading room": "Error upgrading room",
-    "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
     "Changes your display nickname": "Changes your display nickname",
     "Changes your display nickname in the current room only": "Changes your display nickname in the current room only",
     "Changes the avatar of the current room": "Changes the avatar of the current room",
@@ -489,25 +483,34 @@
     "Converts the room to a DM": "Converts the room to a DM",
     "Converts the DM to a room": "Converts the DM to a room",
     "Displays action": "Displays action",
-    "Reason": "Reason",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
-    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
-    "%(senderName)s made no change.": "%(senderName)s made no change.",
-    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
-    "%(targetName)s left the room.": "%(targetName)s left the room.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
+    "Someone": "Someone",
+    "%(senderName)s placed a voice call.": "%(senderName)s placed a voice call.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s placed a voice call. (not supported by this browser)",
+    "%(senderName)s placed a video call.": "%(senderName)s placed a video call.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s placed a video call. (not supported by this browser)",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepted the invitation for %(displayName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s invited %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s banned %(targetName)s: %(reason)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s banned %(targetName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s changed their display name to %(displayName)s",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s set their display name to %(displayName)s",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removed their display name (%(oldDisplayName)s)",
+    "%(senderName)s removed their profile picture": "%(senderName)s removed their profile picture",
+    "%(senderName)s changed their profile picture": "%(senderName)s changed their profile picture",
+    "%(senderName)s set a profile picture": "%(senderName)s set a profile picture",
+    "%(senderName)s made no change": "%(senderName)s made no change",
+    "%(targetName)s joined the room": "%(targetName)s joined the room",
+    "%(targetName)s rejected the invitation": "%(targetName)s rejected the invitation",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s left the room: %(reason)s",
+    "%(targetName)s left the room": "%(targetName)s left the room",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s unbanned %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s withdrew %(targetName)s's invitation",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s kicked %(targetName)s: %(reason)s",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s kicked %(targetName)s",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
+    "%(senderDisplayName)s changed the room avatar.": "%(senderDisplayName)s changed the room avatar.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
@@ -524,7 +527,10 @@
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s set the server ACLs for this room.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s changed the server ACLs for this room.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 All servers are banned from participating! This room can no longer be used.",
+    "Message deleted": "Message deleted",
+    "Message deleted by %(name)s": "Message deleted by %(name)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s sent a sticker.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s added the alternative addresses %(addresses)s for this room.",
@@ -534,21 +540,6 @@
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s changed the alternative addresses for this room.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s changed the main and alternative addresses for this room.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s changed the addresses for this room.",
-    "Someone": "Someone",
-    "(not supported by this browser)": "(not supported by this browser)",
-    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
-    "(could not connect media)": "(could not connect media)",
-    "(connection failed)": "(connection failed)",
-    "(their device couldn't start the camera / microphone)": "(their device couldn't start the camera / microphone)",
-    "(an error occurred)": "(an error occurred)",
-    "(no answer)": "(no answer)",
-    "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
-    "%(senderName)s declined the call.": "%(senderName)s declined the call.",
-    "%(senderName)s placed a voice call.": "%(senderName)s placed a voice call.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s placed a voice call. (not supported by this browser)",
-    "%(senderName)s placed a video call.": "%(senderName)s placed a video call.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s placed a video call. (not supported by this browser)",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
@@ -556,8 +547,13 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s pinned a message to this room. See all pinned messages.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s unpinned a message from this room. See all pinned messages.",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s changed the <a>pinned messages</a> for the room.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
@@ -614,6 +610,8 @@
     "See when anyone posts a sticker to your active room": "See when anyone posts a sticker to your active room",
     "with an empty state key": "with an empty state key",
     "with state key %(stateKey)s": "with state key %(stateKey)s",
+    "The above, but in any room you are joined or invited to as well": "The above, but in any room you are joined or invited to as well",
+    "The above, but in <Room /> as well": "The above, but in <Room /> as well",
     "Send <b>%(eventType)s</b> events as you in this room": "Send <b>%(eventType)s</b> events as you in this room",
     "See <b>%(eventType)s</b> events posted to this room": "See <b>%(eventType)s</b> events posted to this room",
     "Send <b>%(eventType)s</b> events as you in your active room": "Send <b>%(eventType)s</b> events as you in your active room",
@@ -663,6 +661,7 @@
     "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...",
+    "Attachment": "Attachment",
     "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
     "%(items)s and %(count)s others|one": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
@@ -690,6 +689,7 @@
     "Error leaving room": "Error leaving room",
     "Unrecognised address": "Unrecognised address",
     "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
+    "User %(userId)s is already invited to the room": "User %(userId)s is already invited to the room",
     "User %(userId)s is already in the room": "User %(userId)s is already in the room",
     "User %(user_id)s does not exist": "User %(user_id)s does not exist",
     "User %(user_id)s may or may not exist": "User %(user_id)s may or may not exist",
@@ -723,9 +723,25 @@
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
     "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
     "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "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.",
     "Invite to %(spaceName)s": "Invite to %(spaceName)s",
     "Share your public space": "Share your public space",
     "Unknown App": "Unknown App",
+    "Are you sure you want to exit during this export?": "Are you sure you want to exit during this export?",
+    "HTML": "HTML",
+    "JSON": "JSON",
+    "Plain Text": "Plain Text",
+    "From the beginning": "From the beginning",
+    "Specify a number of messages": "Specify a number of messages",
+    "Current Timeline": "Current Timeline",
+    "Media omitted": "Media omitted",
+    "Media omitted - file size limit exceeded": "Media omitted - file size limit exceeded",
+    "%(creatorName)s created this room.": "%(creatorName)s created this room.",
+    "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.",
+    "Topic: %(topic)s": "Topic: %(topic)s",
+    "Error fetching file": "Error fetching file",
+    "File Attached": "File Attached",
     "Help us improve %(brand)s": "Help us improve %(brand)s",
     "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",
@@ -738,6 +754,13 @@
     "Notifications": "Notifications",
     "Enable desktop notifications": "Enable desktop notifications",
     "Enable": "Enable",
+    "Unknown caller": "Unknown caller",
+    "Voice call": "Voice call",
+    "Video call": "Video call",
+    "Decline": "Decline",
+    "Accept": "Accept",
+    "Sound on": "Sound on",
+    "Silence call": "Silence call",
     "Use app for a better experience": "Use app for a better experience",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.",
     "Use app": "Use app",
@@ -784,31 +807,25 @@
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(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.",
-    "Spaces": "Spaces",
-    "Spaces are a new way to group rooms and people.": "Spaces are a new way to group rooms and people.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta available for web, desktop and Android. Thank you for trying the beta.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "You can leave the beta any time from settings or tapping on a beta badge, like the one above.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Your feedback will help make spaces better. The more detail you can go into, the better.",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators",
     "Show options to enable 'Do not disturb' mode": "Show options to enable 'Do not disturb' mode",
-    "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.",
     "Message Pinning": "Message Pinning",
+    "Threaded messaging": "Threaded messaging",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
     "Render simple counters in room header": "Render simple counters in room header",
-    "Multiple integration managers": "Multiple integration managers",
+    "Multiple integration managers (requires manual setup)": "Multiple integration managers (requires manual setup)",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Support adding custom themes": "Support adding custom themes",
     "Show message previews for reactions in DMs": "Show message previews for reactions in DMs",
     "Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
     "Offline encrypted messaging using dehydrated devices": "Offline encrypted messaging using dehydrated devices",
-    "Enable advanced debugging for the room list": "Enable advanced debugging for the room list",
+    "Send pseudonymous analytics data": "Send pseudonymous analytics data",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
+    "New layout switcher (with message bubbles)": "New layout switcher (with message bubbles)",
+    "Don't send read receipts": "Don't send read receipts",
     "Font size": "Font size",
     "Use custom size": "Use custom size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
@@ -821,7 +838,8 @@
     "Show read receipts sent by other users": "Show read receipts sent by other users",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
     "Always show message timestamps": "Always show message timestamps",
-    "Autoplay GIFs and videos": "Autoplay GIFs and videos",
+    "Autoplay GIFs": "Autoplay GIFs",
+    "Autoplay videos": "Autoplay videos",
     "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",
@@ -830,10 +848,11 @@
     "Enable big emoji in chat": "Enable big emoji in chat",
     "Send typing notifications": "Send typing notifications",
     "Show typing notifications": "Show typing notifications",
-    "Use Command + F to search": "Use Command + F to search",
-    "Use Ctrl + F to search": "Use Ctrl + F to search",
+    "Use Command + F to search timeline": "Use Command + F to search timeline",
+    "Use Ctrl + F to search timeline": "Use Ctrl + F to search timeline",
     "Use Command + Enter to send a message": "Use Command + Enter to send a message",
     "Use Ctrl + Enter to send a message": "Use Ctrl + Enter to send a message",
+    "Surround selected text when typing special characters": "Surround selected text when typing special characters",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
     "Enable Community Filter Panel": "Enable Community Filter Panel",
@@ -847,7 +866,6 @@
     "Enable inline URL previews by default": "Enable inline URL previews by default",
     "Enable URL previews for this room (only affects you)": "Enable URL previews for this room (only affects you)",
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
-    "Room Colour": "Room Colour",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
     "Show developer tools": "Show developer tools",
@@ -855,7 +873,7 @@
     "Show rooms with unread notifications first": "Show rooms with unread notifications first",
     "Show shortcuts to recently viewed rooms above the room list": "Show shortcuts to recently viewed rooms above the room list",
     "Show hidden events in timeline": "Show hidden events in timeline",
-    "Low bandwidth mode": "Low bandwidth mode",
+    "Low bandwidth mode (requires compatible homeserver)": "Low bandwidth mode (requires compatible homeserver)",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
@@ -863,6 +881,10 @@
     "Manually verify all remote sessions": "Manually verify all remote sessions",
     "IRC display name width": "IRC display name width",
     "Show chat effects (animations when receiving e.g. confetti)": "Show chat effects (animations when receiving e.g. confetti)",
+    "Show all rooms in Home": "Show all rooms in Home",
+    "All rooms you're in will appear in Home.": "All rooms you're in will appear in Home.",
+    "Display Communities instead of Spaces": "Display Communities instead of Spaces",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading logs": "Uploading logs",
@@ -895,31 +917,31 @@
     "You held the call <a>Resume</a>": "You held the call <a>Resume</a>",
     "%(peerName)s held the call": "%(peerName)s held the call",
     "Connecting": "Connecting",
+    "You are presenting": "You are presenting",
+    "%(sharerName)s is presenting": "%(sharerName)s is presenting",
+    "Your camera is turned off": "Your camera is turned off",
+    "Your camera is still enabled": "Your camera is still enabled",
+    "Start the camera": "Start the camera",
+    "Stop the camera": "Stop the camera",
+    "Stop sharing your screen": "Stop sharing your screen",
+    "Start sharing your screen": "Start sharing your screen",
+    "Hide sidebar": "Hide sidebar",
+    "Show sidebar": "Show sidebar",
+    "More": "More",
+    "Dialpad": "Dialpad",
+    "Unmute the microphone": "Unmute the microphone",
+    "Mute the microphone": "Mute the microphone",
+    "Hangup": "Hangup",
     "Video Call": "Video Call",
     "Voice Call": "Voice Call",
     "Fill Screen": "Fill Screen",
     "Return to call": "Return to call",
     "%(name)s on hold": "%(name)s on hold",
-    "Dial pad": "Dial pad",
-    "Unknown caller": "Unknown caller",
-    "Incoming voice call": "Incoming voice call",
-    "Incoming video call": "Incoming video call",
-    "Incoming call": "Incoming call",
-    "Decline": "Decline",
-    "Accept": "Accept",
-    "Pause": "Pause",
-    "Play": "Play",
     "The other party cancelled the verification.": "The other party cancelled the verification.",
     "Verified!": "Verified!",
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
-    "Verify this session by completing one of the following:": "Verify this session by completing one of the following:",
-    "Scan this unique code": "Scan this unique code",
-    "or": "or",
-    "Compare unique emoji": "Compare unique emoji",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Compare a unique set of emoji if you don't have a camera on either device",
-    "Start": "Start",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirm the emoji below are displayed on both sessions, in the same order:",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
     "Verify this session by confirming the following number appears on its screen.": "Verify this session by confirming the following number appears on its screen.",
@@ -999,18 +1021,29 @@
     "Your server isn't responding to some <a>requests</a>.": "Your server isn't responding to some <a>requests</a>.",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
+    "Delete avatar": "Delete avatar",
     "Delete": "Delete",
+    "Upload avatar": "Upload avatar",
     "Upload": "Upload",
     "Name": "Name",
     "Description": "Description",
     "Please enter a name for the space": "Please enter a name for the space",
+    "Spaces are a new feature.": "Spaces are a new feature.",
+    "Spaces feedback": "Spaces feedback",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Thank you for trying Spaces. Your feedback will help inform the next versions.",
+    "Give feedback.": "Give feedback.",
+    "e.g. my-space": "e.g. my-space",
+    "Address": "Address",
     "Create a space": "Create a space",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.",
+    "Spaces are a new way to group rooms and people.": "Spaces are a new way to group rooms and people.",
+    "What kind of Space do you want to create?": "What kind of Space do you want to create?",
+    "You can change this later.": "You can change this later.",
     "Public": "Public",
     "Open space for anyone, best for communities": "Open space for anyone, best for communities",
     "Private": "Private",
     "Invite only, best for yourself or teams": "Invite only, best for yourself or teams",
-    "You can change this later": "You can change this later",
+    "You can also make Spaces from <a>communities</a>.": "You can also make Spaces from <a>communities</a>.",
+    "To join a space you'll need an invite.": "To join a space you'll need an invite.",
     "Go back": "Go back",
     "Your public space": "Your public space",
     "Your private space": "Your private space",
@@ -1018,22 +1051,42 @@
     "You can change these anytime.": "You can change these anytime.",
     "Creating...": "Creating...",
     "Create": "Create",
+    "Home": "Home",
+    "Show all rooms": "Show all rooms",
+    "All rooms": "All rooms",
+    "Options": "Options",
+    "Spaces": "Spaces",
     "Expand space panel": "Expand space panel",
     "Collapse space panel": "Collapse space panel",
-    "All rooms": "All rooms",
     "Click to copy": "Click to copy",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Share invite link": "Share invite link",
     "Invite people": "Invite people",
     "Invite with email or username": "Invite with email or username",
-    "Settings": "Settings",
-    "Leave space": "Leave space",
-    "Create new room": "Create new room",
-    "Add existing room": "Add existing room",
-    "Members": "Members",
-    "Manage & explore rooms": "Manage & explore rooms",
-    "Explore rooms": "Explore rooms",
+    "Failed to save space settings.": "Failed to save space settings.",
+    "General": "General",
+    "Edit settings relating to your space.": "Edit settings relating to your space.",
+    "Saving...": "Saving...",
+    "Save Changes": "Save Changes",
+    "Leave Space": "Leave Space",
+    "Failed to update the guest access of this space": "Failed to update the guest access of this space",
+    "Failed to update the history visibility of this space": "Failed to update the history visibility of this space",
+    "Hide advanced": "Hide advanced",
+    "Enable guest access": "Enable guest access",
+    "Guests can join a space without having an account.": "Guests can join a space without having an account.",
+    "This may be useful for public spaces.": "This may be useful for public spaces.",
+    "Show advanced": "Show advanced",
+    "Visibility": "Visibility",
+    "Decide who can view and join %(spaceName)s.": "Decide who can view and join %(spaceName)s.",
+    "Failed to update the visibility of this space": "Failed to update the visibility of this space",
+    "Preview Space": "Preview Space",
+    "Allow people to preview your space before they join.": "Allow people to preview your space before they join.",
+    "Recommended for public spaces.": "Recommended for public spaces.",
+    "Jump to first unread room.": "Jump to first unread room.",
+    "Jump to first invite.": "Jump to first invite.",
+    "Expand": "Expand",
+    "Collapse": "Collapse",
     "Space options": "Space options",
     "Remove": "Remove",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
@@ -1043,11 +1096,11 @@
     "Failed to upload profile picture!": "Failed to upload profile picture!",
     "Upload new:": "Upload new:",
     "No display name": "No display name",
-    "New passwords don't match": "New passwords don't match",
-    "Passwords can't be empty": "Passwords can't be empty",
     "Warning!": "Warning!",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
     "Export E2E room keys": "Export E2E room keys",
+    "New passwords don't match": "New passwords don't match",
+    "Passwords can't be empty": "Passwords can't be empty",
     "Do you want to set an email address?": "Do you want to set an email address?",
     "Confirm password": "Confirm password",
     "Passwords don't match": "Passwords don't match",
@@ -1055,9 +1108,9 @@
     "Change Password": "Change Password",
     "Your homeserver does not support cross-signing.": "Your homeserver does not support cross-signing.",
     "Cross-signing is ready for use.": "Cross-signing is ready for use.",
+    "Cross-signing is ready but keys are not backed up.": "Cross-signing is ready but keys are not backed up.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing is not set up.": "Cross-signing is not set up.",
-    "Set up": "Set up",
     "Reset": "Reset",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
@@ -1100,33 +1153,45 @@
     "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.",
-    "Error saving email notification preferences": "Error saving email notification preferences",
-    "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
-    "Keywords": "Keywords",
-    "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
-    "Failed to change settings": "Failed to change settings",
-    "Can't update user notification settings": "Can't update user notification settings",
-    "Failed to update keywords": "Failed to update keywords",
-    "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
-    "Notify for all other messages/rooms": "Notify for all other messages/rooms",
-    "Notify me for anything else": "Notify me for anything else",
-    "Enable notifications for this account": "Enable notifications for this account",
-    "Clear notifications": "Clear notifications",
-    "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
-    "Enable email notifications": "Enable email notifications",
-    "Add an email address to configure email notifications": "Add an email address to configure email notifications",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
-    "Unable to fetch notification target list": "Unable to fetch notification target list",
-    "Notification targets": "Notification targets",
-    "Advanced notification settings": "Advanced notification settings",
-    "There are advanced notifications which are not shown here.": "There are advanced notifications which are not shown here.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.",
+    "Private (invite only)": "Private (invite only)",
+    "Only invited people can join.": "Only invited people can join.",
+    "Anyone can find and join.": "Anyone can find and join.",
+    "Upgrade required": "Upgrade required",
+    "& %(count)s more|other": "& %(count)s more",
+    "& %(count)s more|one": "& %(count)s more",
+    "Currently, %(count)s spaces have access|other": "Currently, %(count)s spaces have access",
+    "Currently, %(count)s spaces have access|one": "Currently, a space has access",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>",
+    "Spaces with access": "Spaces with access",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Anyone in <spaceName/> can find and join. You can select other spaces too.",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Anyone in a space can find and join. You can select multiple spaces.",
+    "Space members": "Space members",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "This upgrade will allow members of selected spaces access to this room without an invite.",
+    "Before you upgrade": "Before you upgrade",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.",
+    "Upgrade anyway": "Upgrade anyway",
+    "Message layout": "Message layout",
+    "IRC": "IRC",
+    "Modern": "Modern",
+    "Message bubbles": "Message bubbles",
+    "Messages containing keywords": "Messages containing keywords",
+    "Error saving notification preferences": "Error saving notification preferences",
+    "An error occurred whilst saving your notification preferences.": "An error occurred whilst saving your notification preferences.",
+    "Enable for this account": "Enable for this account",
+    "Enable email notifications for %(email)s": "Enable email notifications for %(email)s",
     "Enable desktop notifications for this session": "Enable desktop notifications for this session",
     "Show message in desktop notification": "Show message in desktop notification",
     "Enable audible notifications for this session": "Enable audible notifications for this session",
+    "Clear notifications": "Clear notifications",
+    "Keyword": "Keyword",
+    "New keyword": "New keyword",
+    "Global": "Global",
+    "Mentions & keywords": "Mentions & keywords",
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Notification targets": "Notification targets",
+    "There was an error loading your notification settings.": "There was an error loading your notification settings.",
     "Failed to save your profile": "Failed to save your profile",
     "The operation could not be completed": "The operation could not be completed",
     "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> to your own domain",
@@ -1160,6 +1225,7 @@
     "Algorithm:": "Algorithm:",
     "Your keys are <b>not being backed up from this session</b>.": "Your keys are <b>not being backed up from this session</b>.",
     "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
+    "Set up": "Set up",
     "well formed": "well formed",
     "unexpected type": "unexpected type",
     "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.": "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.",
@@ -1171,9 +1237,9 @@
     "Secret storage:": "Secret storage:",
     "ready": "ready",
     "not ready": "not ready",
-    "Identity Server URL must be HTTPS": "Identity Server URL must be HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Not a valid Identity Server (status code %(code)s)",
-    "Could not connect to Identity Server": "Could not connect to Identity Server",
+    "Identity server URL must be HTTPS": "Identity server URL must be HTTPS",
+    "Not a valid identity server (status code %(code)s)": "Not a valid identity server (status code %(code)s)",
+    "Could not connect to identity server": "Could not connect to identity server",
     "Checking server": "Checking server",
     "Change identity server": "Change identity server",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Disconnect from the identity server <current /> and connect to <new /> instead?",
@@ -1190,20 +1256,20 @@
     "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.",
-    "Identity Server (%(server)s)": "Identity Server (%(server)s)",
+    "Identity server (%(server)s)": "Identity server (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
-    "Identity Server": "Identity Server",
+    "Identity server": "Identity server",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.",
     "Do not use an identity server": "Do not use an identity server",
     "Enter a new identity server": "Enter a new identity server",
     "Change": "Change",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Use an integration manager to manage bots, widgets, and sticker packs.",
     "Manage integrations": "Manage integrations",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
+    "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...",
@@ -1221,8 +1287,6 @@
     "Custom theme URL": "Custom theme URL",
     "Add theme": "Add theme",
     "Theme": "Theme",
-    "Hide advanced": "Hide advanced",
-    "Show advanced": "Show advanced",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
     "Enable experimental, compact IRC style layout": "Enable experimental, compact IRC style layout",
     "Customise your appearance": "Customise your appearance",
@@ -1243,27 +1307,26 @@
     "Deactivate Account": "Deactivate Account",
     "Deactivate account": "Deactivate account",
     "Discovery": "Discovery",
-    "General": "General",
+    "%(brand)s version:": "%(brand)s version:",
+    "Olm version:": "Olm version:",
     "Legal": "Legal",
     "Credits": "Credits",
     "For help with using %(brand)s, click <a>here</a>.": "For help with using %(brand)s, click <a>here</a>.",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.",
     "Chat with %(brand)s Bot": "Chat with %(brand)s Bot",
     "Bug reporting": "Bug reporting",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.",
     "Submit debug logs": "Submit debug logs",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.",
     "Help & About": "Help & About",
     "FAQ": "FAQ",
     "Keyboard Shortcuts": "Keyboard Shortcuts",
     "Versions": "Versions",
-    "%(brand)s version:": "%(brand)s version:",
-    "olm version:": "olm version:",
+    "Copy": "Copy",
     "Homeserver is": "Homeserver is",
-    "Identity Server is": "Identity Server is",
+    "Identity server is": "Identity server is",
     "Access Token": "Access Token",
     "Your access token gives full access to your account. Do not share it with anyone.": "Your access token gives full access to your account. Do not share it with anyone.",
-    "Copy": "Copy",
     "Clear cache and reload": "Clear cache and reload",
     "Labs": "Labs",
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.",
@@ -1300,13 +1363,24 @@
     "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
     "Room ID or address of ban list": "Room ID or address of ban list",
     "Subscribe": "Subscribe",
+    "Open Space": "Open Space",
+    "Create Space": "Create Space",
     "Start automatically after system login": "Start automatically after system login",
     "Warn before quitting": "Warn before quitting",
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
     "Preferences": "Preferences",
     "Room list": "Room list",
+    "Communities": "Communities",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.",
+    "Show my Communities": "Show my Communities",
+    "If a community isn't shown you may not have permission to convert it.": "If a community isn't shown you may not have permission to convert it.",
+    "Keyboard shortcuts": "Keyboard shortcuts",
+    "To view all keyboard shortcuts, click here.": "To view all keyboard shortcuts, click here.",
+    "Displaying time": "Displaying time",
     "Composer": "Composer",
+    "Code blocks": "Code blocks",
+    "Images, GIFs and videos": "Images, GIFs and videos",
     "Timeline": "Timeline",
     "Autocomplete delay (ms)": "Autocomplete delay (ms)",
     "Read Marker lifetime (ms)": "Read Marker lifetime (ms)",
@@ -1332,23 +1406,24 @@
     "Where you’re logged in": "Where you’re logged in",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
+    "Default Device": "Default Device",
     "No media permissions": "No media permissions",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "You may need to manually permit %(brand)s to access your microphone/webcam",
     "Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
     "Request media permissions": "Request media permissions",
-    "No Audio Outputs detected": "No Audio Outputs detected",
-    "No Microphones detected": "No Microphones detected",
-    "No Webcams detected": "No Webcams detected",
-    "Default Device": "Default Device",
     "Audio Output": "Audio Output",
+    "No Audio Outputs detected": "No Audio Outputs detected",
     "Microphone": "Microphone",
+    "No Microphones detected": "No Microphones detected",
     "Camera": "Camera",
+    "No Webcams detected": "No Webcams detected",
     "Voice & Video": "Voice & Video",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
     "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
     "this room": "this room",
     "View older messages in %(roomName)s.": "View older messages in %(roomName)s.",
+    "Space information": "Space information",
     "Room information": "Room information",
     "Internal room ID:": "Internal room ID:",
     "Room version": "Room version",
@@ -1365,23 +1440,28 @@
     "Notification sound": "Notification sound",
     "Set a new custom sound": "Set a new custom sound",
     "Browse": "Browse",
+    "Failed to unban": "Failed to unban",
+    "Unban": "Unban",
+    "Banned by %(displayName)s": "Banned by %(displayName)s",
+    "Reason": "Reason",
+    "Error changing power level requirement": "Error changing power level requirement",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.",
+    "Error changing power level": "Error changing power level",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.",
+    "Change space avatar": "Change space avatar",
     "Change room avatar": "Change room avatar",
+    "Change space name": "Change space name",
     "Change room name": "Change room name",
+    "Change main address for the space": "Change main address for the space",
     "Change main address for the room": "Change main address for the room",
     "Change history visibility": "Change history visibility",
     "Change permissions": "Change permissions",
+    "Change description": "Change description",
     "Change topic": "Change topic",
     "Upgrade the room": "Upgrade the room",
     "Enable room encryption": "Enable room encryption",
     "Change server ACLs": "Change server ACLs",
     "Modify widgets": "Modify widgets",
-    "Failed to unban": "Failed to unban",
-    "Unban": "Unban",
-    "Banned by %(displayName)s": "Banned by %(displayName)s",
-    "Error changing power level requirement": "Error changing power level requirement",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.",
-    "Error changing power level": "Error changing power level",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.",
     "Default role": "Default role",
     "Send messages": "Send messages",
     "Invite users": "Invite users",
@@ -1397,25 +1477,31 @@
     "Send %(eventType)s events": "Send %(eventType)s events",
     "Roles & Permissions": "Roles & Permissions",
     "Permissions": "Permissions",
+    "Select the roles required to change various parts of the space": "Select the roles required to change various parts of the space",
     "Select the roles required to change various parts of the room": "Select the roles required to change various parts of the room",
+    "Are you sure you want to add encryption to this public room?": "Are you sure you want to add encryption to this public room?",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.",
     "Enable encryption?": "Enable encryption?",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
-    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
-    "Click here to fix": "Click here to fix",
     "To link to this room, please add an address.": "To link to this room, please add an address.",
-    "Only people who have been invited": "Only people who have been invited",
-    "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
-    "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
-    "Anyone": "Anyone",
+    "Decide who can join %(roomName)s.": "Decide who can join %(roomName)s.",
+    "Failed to update the join rules": "Failed to update the join rules",
+    "Unknown failure": "Unknown failure",
+    "Are you sure you want to make this encrypted room public?": "Are you sure you want to make this encrypted room public?",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.",
     "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
     "Members only (since they were invited)": "Members only (since they were invited)",
     "Members only (since they joined)": "Members only (since they joined)",
+    "Anyone": "Anyone",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
+    "People with supported clients will be able to join the room without having a registered account.": "People with supported clients will be able to join the room without having a registered account.",
     "Who can read history?": "Who can read history?",
     "Security & Privacy": "Security & Privacy",
     "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
     "Encrypted": "Encrypted",
-    "Who can access this room?": "Who can access this room?",
+    "Access": "Access",
     "Unable to revoke sharing for email address": "Unable to revoke sharing for email address",
     "Unable to share email address": "Unable to share email address",
     "Your email address hasn't been verified yet": "Your email address hasn't been verified yet",
@@ -1473,8 +1559,9 @@
     "Encrypting your message...": "Encrypting your message...",
     "Your message was sent": "Your message was sent",
     "Failed to send": "Failed to send",
-    "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",
+    "Show %(count)s other previews|other": "Show %(count)s other previews",
+    "Show %(count)s other previews|one": "Show %(count)s other preview",
     "Close preview": "Close preview",
     "and %(count)s others...|other": "and %(count)s others...",
     "and %(count)s others...|one": "and one other...",
@@ -1486,11 +1573,19 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Send message": "Send message",
     "Emoji picker": "Emoji picker",
+    "Add emoji": "Add emoji",
     "Upload file": "Upload file",
+    "Reply to encrypted thread…": "Reply to encrypted thread…",
+    "Reply to thread…": "Reply to thread…",
     "Send an encrypted reply…": "Send an encrypted reply…",
     "Send a reply…": "Send a reply…",
     "Send an encrypted message…": "Send an encrypted message…",
     "Send a message…": "Send a message…",
+    "Hide Stickers": "Hide Stickers",
+    "Show Stickers": "Show Stickers",
+    "Send a sticker": "Send a sticker",
+    "Send voice message": "Send voice message",
+    "More options": "More options",
     "The conversation continues here.": "The conversation continues here.",
     "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
@@ -1510,6 +1605,10 @@
     "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/>.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.",
+    "Enable encryption in settings.": "Enable encryption in settings.",
+    "End-to-end encryption isn't enabled": "End-to-end encryption isn't enabled",
+    "Message didn't send. Click for info.": "Message didn't send. Click for info.",
     "Unpin": "Unpin",
     "View message": "View message",
     "%(duration)ss": "%(duration)ss",
@@ -1534,6 +1633,8 @@
     "Unnamed room": "Unnamed room",
     "World readable": "World readable",
     "Guests can join": "Guests can join",
+    "Screen sharing is here!": "Screen sharing is here!",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!",
     "(~%(count)s results)|other": "(~%(count)s results)",
     "(~%(count)s results)|one": "(~%(count)s result)",
     "Join Room": "Join Room",
@@ -1541,18 +1642,17 @@
     "Hide Widgets": "Hide Widgets",
     "Show Widgets": "Show Widgets",
     "Search": "Search",
-    "Voice call": "Voice call",
-    "Video call": "Video call",
-    "Start a Conversation": "Start a Conversation",
-    "Open dial pad": "Open dial pad",
     "Invites": "Invites",
     "Favourites": "Favourites",
     "People": "People",
     "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 rooms": "Explore rooms",
     "Explore community rooms": "Explore community rooms",
     "Explore public rooms": "Explore public rooms",
     "Low priority": "Low priority",
@@ -1565,12 +1665,14 @@
     "Start a new chat": "Start a new chat",
     "Explore all public rooms": "Explore all public rooms",
     "Quick actions": "Quick actions",
+    "Explore %(spaceName)s": "Explore %(spaceName)s",
     "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 in all spaces|other": "%(count)s results in all spaces",
     "%(count)s results in all spaces|one": "%(count)s result in all spaces",
     "%(count)s results|other": "%(count)s results",
     "%(count)s results|one": "%(count)s result",
     "This room": "This room",
+    "Joining space …": "Joining space …",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",
     "Rejecting invite …": "Rejecting invite …",
@@ -1615,8 +1717,6 @@
     "Activity": "Activity",
     "A-Z": "A-Z",
     "List options": "List options",
-    "Jump to first unread room.": "Jump to first unread room.",
-    "Jump to first invite.": "Jump to first invite.",
     "Show %(count)s more|other": "Show %(count)s more",
     "Show %(count)s more|one": "Show %(count)s more",
     "Show less": "Show less",
@@ -1629,6 +1729,8 @@
     "Favourite": "Favourite",
     "Low Priority": "Low Priority",
     "Invite People": "Invite People",
+    "Copy Room Link": "Copy Room Link",
+    "Settings": "Settings",
     "Leave Room": "Leave Room",
     "Room options": "Room options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
@@ -1647,8 +1749,6 @@
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Add some now": "Add some now",
     "Stickerpack": "Stickerpack",
-    "Hide Stickers": "Hide Stickers",
-    "Show Stickers": "Show Stickers",
     "Failed to revoke invite": "Failed to revoke invite",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.",
     "Admin Tools": "Admin Tools",
@@ -1660,9 +1760,7 @@
     "We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.",
     "No microphone found": "No microphone found",
     "We didn't find a microphone on your device. Please check your settings and try again.": "We didn't find a microphone on your device. Please check your settings and try again.",
-    "Record a voice message": "Record a voice message",
-    "Stop the recording": "Stop the recording",
-    "Delete recording": "Delete recording",
+    "Stop recording": "Stop 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.",
@@ -1673,14 +1771,18 @@
     "Error removing address": "Error removing address",
     "Main address": "Main address",
     "not specified": "not specified",
+    "This space has no local addresses": "This space has no local addresses",
     "This room has no local addresses": "This room has no local addresses",
     "Local address": "Local address",
     "Published Addresses": "Published Addresses",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.",
+    "Published addresses can be used by anyone on any server to join your space.": "Published addresses can be used by anyone on any server to join your space.",
+    "Published addresses can be used by anyone on any server to join your room.": "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.": "To publish an address, it needs to be set as a local address first.",
     "Other published addresses:": "Other published addresses:",
     "No other published addresses yet, add one below": "No other published addresses yet, add one below",
     "New published address (e.g. #alias:server)": "New published address (e.g. #alias:server)",
     "Local Addresses": "Local Addresses",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
     "Show more": "Show more",
     "Error updating flair": "Error updating flair",
@@ -1717,13 +1819,13 @@
     "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",
-    "You’re all caught up": "You’re all caught up",
-    "You have no visible notifications.": "You have no visible notifications.",
+    "Members": "Members",
+    "Nothing pinned, yet": "Nothing pinned, yet",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.",
     "Pinned messages": "Pinned messages",
     "Room Info": "Room Info",
     "You can only pin up to %(count)s widgets|other": "You can only pin up to %(count)s widgets",
     "Unpin a widget to view it in this panel": "Unpin a widget to view it in this panel",
-    "Options": "Options",
     "Set my room layout for everyone": "Set my room layout for everyone",
     "Widgets": "Widgets",
     "Edit widgets, bridges & bots": "Edit widgets, bridges & bots",
@@ -1733,6 +1835,8 @@
     "%(count)s people|other": "%(count)s people",
     "%(count)s people|one": "%(count)s person",
     "Show files": "Show files",
+    "Export chat": "Export chat",
+    "Show threads": "Show threads",
     "Share room": "Share room",
     "Room settings": "Room settings",
     "Trusted": "Trusted",
@@ -1747,7 +1851,7 @@
     "Mention": "Mention",
     "Invite": "Invite",
     "Share Link to User": "Share Link to User",
-    "Direct message": "Direct message",
+    "Message": "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.",
@@ -1785,11 +1889,17 @@
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?",
     "Deactivate user": "Deactivate user",
     "Failed to deactivate user": "Failed to deactivate user",
-    "Role": "Role",
+    "Role in <RoomName/>": "Role in <RoomName/>",
     "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.",
+    "Scan this unique code": "Scan this unique code",
+    "Compare unique emoji": "Compare unique emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Compare a unique set of emoji if you don't have a camera on either device",
+    "Start": "Start",
+    "or": "or",
+    "Verify this session by completing one of the following:": "Verify this session by completing one of the following:",
     "Verify by scanning": "Verify by scanning",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
@@ -1812,6 +1922,17 @@
     "You cancelled verification.": "You cancelled verification.",
     "Verification cancelled": "Verification cancelled",
     "Compare emoji": "Compare emoji",
+    "Call declined": "Call declined",
+    "Call back": "Call back",
+    "No answer": "No answer",
+    "Could not connect media": "Could not connect media",
+    "Connection failed": "Connection failed",
+    "Their device couldn't start the camera or microphone": "Their device couldn't start the camera or microphone",
+    "An unknown error occurred": "An unknown error occurred",
+    "Unknown failure: %(reason)s": "Unknown failure: %(reason)s",
+    "Retry": "Retry",
+    "Missed call": "Missed call",
+    "The call is in an unknown state!": "The call is in an unknown state!",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -1821,26 +1942,32 @@
     "Saturday": "Saturday",
     "Today": "Today",
     "Yesterday": "Yesterday",
+    "Decrypting": "Decrypting",
+    "Download": "Download",
     "View Source": "View Source",
+    "Some encryption parameters have been changed.": "Some encryption parameters have been changed.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their 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.": "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.",
     "Encryption enabled": "Encryption enabled",
     "Ignored attempt to disable encryption": "Ignored attempt to disable encryption",
     "Encryption not enabled": "Encryption not enabled",
     "The encryption used by this room isn't supported.": "The encryption used by this room isn't supported.",
-    "Error decrypting audio": "Error decrypting audio",
+    "Error processing audio message": "Error processing audio message",
     "React": "React",
     "Edit": "Edit",
-    "Retry": "Retry",
     "Reply": "Reply",
+    "Thread": "Thread",
+    "Collapse quotes │ ⇧+click": "Collapse quotes │ ⇧+click",
+    "Expand quotes │ ⇧+click": "Expand quotes │ ⇧+click",
     "Message Actions": "Message Actions",
-    "Attachment": "Attachment",
+    "Download %(text)s": "Download %(text)s",
     "Error decrypting attachment": "Error decrypting attachment",
     "Decrypt %(text)s": "Decrypt %(text)s",
-    "Download %(text)s": "Download %(text)s",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "Error decrypting image": "Error decrypting image",
     "Show image": "Show image",
+    "Sticker": "Sticker",
+    "Image": "Image",
     "Join the conference at the top of this room": "Join the conference at the top of this room",
     "Join the conference from the room information card on the right": "Join the conference from the room information card on the right",
     "Video conference ended by %(senderName)s": "Video conference ended by %(senderName)s",
@@ -1865,10 +1992,8 @@
     "Add reaction": "Add reaction",
     "Show all": "Show all",
     "Reactions": "Reactions",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reacted with %(content)s",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
-    "Message deleted": "Message deleted",
-    "Message deleted by %(name)s": "Message deleted by %(name)s",
     "Message deleted on %(date)s": "Message deleted on %(date)s",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
@@ -1921,19 +2046,22 @@
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "Room ID",
     "Widget ID": "Widget ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Widgets do not use message encryption.",
     "Widget added by": "Widget added by",
     "This widget may use cookies.": "This widget may use cookies.",
+    "Error loading Widget": "Error loading Widget",
+    "Error - Mixed content": "Error - Mixed content",
     "Popout widget": "Popout widget",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Message search initialisation failed, check <a>your settings</a> for more information",
     "Use the <a>Desktop app</a> to see all encrypted files": "Use the <a>Desktop app</a> to see all encrypted files",
     "Use the <a>Desktop app</a> to search encrypted messages": "Use the <a>Desktop app</a> to search encrypted messages",
     "This version of %(brand)s does not support viewing some encrypted files": "This version of %(brand)s does not support viewing some encrypted files",
     "This version of %(brand)s does not support searching encrypted messages": "This version of %(brand)s does not support searching encrypted messages",
-    "Share your screen": "Share your screen",
-    "Screens": "Screens",
-    "Windows": "Windows",
+    "Share entire screen": "Share entire screen",
+    "Application window": "Application window",
+    "Share content": "Share content",
     "Join": "Join",
     "No results": "No results",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
@@ -1950,7 +2078,6 @@
     "Zoom in": "Zoom in",
     "Rotate Left": "Rotate Left",
     "Rotate Right": "Rotate Right",
-    "Download": "Download",
     "Information": "Information",
     "Language Dropdown": "Language Dropdown",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
@@ -2006,15 +2133,22 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)smade no changes",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)smade no changes %(count)s times",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)schanged the server ACLs %(count)s times",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)schanged the server ACLs",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)schanged the server ACLs %(count)s times",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)schanged the server ACLs",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.",
     "Power level": "Power level",
     "Custom level": "Custom level",
     "QR Code": "QR Code",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
     "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
+    "In reply to <a>this message</a>": "In reply to <a>this message</a>",
     "Room address": "Room address",
     "e.g. my-room": "e.g. my-room",
     "Some characters not allowed": "Some characters not allowed",
-    "Please provide a room address": "Please provide a room address",
+    "Please provide an address": "Please provide an address",
     "This address is available to use": "This address is available to use",
     "This address is already in use": "This address is already in use",
     "Server Options": "Server Options",
@@ -2024,7 +2158,6 @@
     "Continue with %(provider)s": "Continue with %(provider)s",
     "Sign in with single sign-on": "Sign in with single sign-on",
     "And %(count)s more...|other": "And %(count)s more...",
-    "Home": "Home",
     "Enter a server name": "Enter a server name",
     "Looks good": "Looks good",
     "You are not allowed to view this server's rooms list": "You are not allowed to view this server's rooms list",
@@ -2039,17 +2172,20 @@
     "Add a new server...": "Add a new server...",
     "%(networkName)s rooms": "%(networkName)s rooms",
     "Matrix rooms": "Matrix rooms",
+    "Add existing space": "Add existing space",
+    "Want to add a new space instead?": "Want to add a new space instead?",
+    "Create a new space": "Create a new space",
+    "Search for spaces": "Search for spaces",
     "Not all selected were added": "Not all selected were added",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Adding rooms... (%(progress)s out of %(count)s)",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Adding room...",
-    "Filter your rooms and spaces": "Filter your rooms and spaces",
-    "Feeling experimental?": "Feeling experimental?",
-    "You can add existing spaces to a space.": "You can add existing spaces to a space.",
     "Direct Messages": "Direct Messages",
     "Space selection": "Space selection",
     "Add existing rooms": "Add existing rooms",
     "Want to add a new room instead?": "Want to add a new room instead?",
     "Create a new room": "Create a new room",
+    "Search for rooms": "Search for rooms",
+    "Adding spaces has moved.": "Adding spaces has moved.",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix Room ID",
     "email address": "email address",
@@ -2063,15 +2199,8 @@
     "Invite anyway and never warn me again": "Invite anyway and never warn me again",
     "Invite anyway": "Invite anyway",
     "Close dialog": "Close dialog",
-    "Beta feedback": "Beta feedback",
-    "Thank you for your feedback, we really appreciate it.": "Thank you for your feedback, we really appreciate it.",
-    "Done": "Done",
     "%(featureName)s beta feedback": "%(featureName)s beta feedback",
-    "Your platform and username will be noted to help us use your feedback as much as we can.": "Your platform and username will be noted to help us use your feedback as much as we can.",
     "To leave the beta, visit your settings.": "To leave the beta, visit your settings.",
-    "Feedback": "Feedback",
-    "You may contact me if you have any follow up questions": "You may contact me if you have any follow up questions",
-    "Send feedback": "Send feedback",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
     "Preparing to send logs": "Preparing to send logs",
     "Logs sent": "Logs sent",
@@ -2079,7 +2208,7 @@
     "Failed to send logs: ": "Failed to send logs: ",
     "Preparing to download logs": "Preparing to download logs",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
     "Download logs": "Download logs",
     "GitHub issue": "GitHub issue",
@@ -2123,20 +2252,48 @@
     "Community ID": "Community ID",
     "example": "example",
     "Please enter a name for the room": "Please enter a name for the room",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Everyone in <SpaceName/> will be able to find and join this room.",
+    "You can change this at any time from room settings.": "You can change this at any time from room settings.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Anyone will be able to find and join this room, not just members of <SpaceName/>.",
+    "Anyone will be able to find and join this room.": "Anyone will be able to find and join this room.",
+    "Only people invited will be able to find and join this room.": "Only people invited will be able to find and join this room.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
     "Your server requires encryption to be enabled in private rooms.": "Your server requires encryption to be enabled in private rooms.",
     "Enable end-to-end encryption": "Enable end-to-end encryption",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.",
     "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.": "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.",
+    "Create a room": "Create a room",
+    "Create a room in %(communityName)s": "Create a room in %(communityName)s",
     "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",
     "Topic (optional)": "Topic (optional)",
-    "Make this room public": "Make this room public",
+    "Room visibility": "Room visibility",
+    "Private room (invite only)": "Private room (invite only)",
+    "Public room": "Public room",
+    "Visible to space members": "Visible to space members",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Block anyone not part of %(serverName)s from ever joining this room.",
     "Create Room": "Create Room",
+    "This community has been upgraded into a Space": "This community has been upgraded into a Space",
+    "To view Spaces, hide communities in <a>Preferences</a>": "To view Spaces, hide communities in <a>Preferences</a>",
+    "Space created": "Space created",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.",
+    "To create a Space from another community, just pick the community in Preferences.": "To create a Space from another community, just pick the community in Preferences.",
+    "Failed to migrate community": "Failed to migrate community",
+    "Create Space from community": "Create Space from community",
+    "A link to the Space will be put in your community description.": "A link to the Space will be put in your community description.",
+    "All rooms will be added and all community members will be invited.": "All rooms will be added and all community members will be invited.",
+    "Flair won't be available in Spaces for the foreseeable future.": "Flair won't be available in Spaces for the foreseeable future.",
+    "This description will be shown to people when they view your space": "This description will be shown to people when they view your space",
+    "Space visibility": "Space visibility",
+    "Private space (invite only)": "Private space (invite only)",
+    "Public space": "Public space",
+    "Anyone in <SpaceName/> will be able to find and join.": "Anyone in <SpaceName/> will be able to find and join.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Anyone will be able to find and join this space, not just members of <SpaceName/>.",
+    "Only people invited will be able to find and join this space.": "Only people invited will be able to find and join this space.",
+    "Add a space to a space you manage.": "Add a space to a space you manage.",
+    "Want to add an existing space instead?": "Want to add an existing space instead?",
+    "Adding...": "Adding...",
     "Sign out": "Sign out",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this",
     "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.": "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.",
@@ -2194,6 +2351,23 @@
     "There was an error updating your community. The server is unable to process your request.": "There was an error updating your community. The server is unable to process your request.",
     "Update community": "Update community",
     "An error has occurred.": "An error has occurred.",
+    "Enter a number between %(min)s and %(max)s": "Enter a number between %(min)s and %(max)s",
+    "Size can only be a number between %(min)s MB and %(max)s MB": "Size can only be a number between %(min)s MB and %(max)s MB",
+    "Number of messages can only be a number between %(min)s and %(max)s": "Number of messages can only be a number between %(min)s and %(max)s",
+    "Number of messages": "Number of messages",
+    "MB": "MB",
+    "Export Successful": "Export Successful",
+    "The export was cancelled successfully": "The export was cancelled successfully",
+    "Your export was successful. Find it in your Downloads folder.": "Your export was successful. Find it in your Downloads folder.",
+    "Are you sure you want to stop exporting your data? If you do, you'll need to start over.": "Are you sure you want to stop exporting your data? If you do, you'll need to start over.",
+    "Stop": "Stop",
+    "Exporting your data": "Exporting your data",
+    "Export Chat": "Export Chat",
+    "Select from the options below to export chats from your timeline": "Select from the options below to export chats from your timeline",
+    "Format": "Format",
+    "Size Limit": "Size Limit",
+    "Include Attachments": "Include Attachments",
+    "Export": "Export",
     "Feedback sent": "Feedback sent",
     "Rate %(brand)s": "Rate %(brand)s",
     "Tell us below how you feel about %(brand)s so far.": "Tell us below how you feel about %(brand)s so far.",
@@ -2202,8 +2376,21 @@
     "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>.",
+    "Send feedback": "Send feedback",
+    "You don't have permission to do this": "You don't have permission to do this",
+    "Sending": "Sending",
+    "Sent": "Sent",
+    "Open link": "Open link",
+    "Forward message": "Forward message",
+    "Message preview": "Message preview",
+    "Search for rooms or people": "Search for rooms or people",
+    "Thank you for your feedback, we really appreciate it.": "Thank you for your feedback, we really appreciate it.",
+    "Done": "Done",
+    "Your platform and username will be noted to help us use your feedback as much as we can.": "Your platform and username will be noted to help us use your feedback as much as we can.",
+    "You may contact me if you have any follow up questions": "You may contact me if you have any follow up questions",
     "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.",
     "Abort": "Abort",
@@ -2226,17 +2413,15 @@
     "Integrations are disabled": "Integrations are disabled",
     "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
     "Integrations not allowed": "Integrations not allowed",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.",
     "To continue, use Single Sign On to prove your identity.": "To continue, use Single Sign On to prove your identity.",
     "Confirm to continue": "Confirm to continue",
     "Click the button below to confirm your identity.": "Click the button below to confirm your identity.",
     "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.": "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.",
-    "Failed to transfer call": "Failed to transfer call",
     "Failed to find the following users": "Failed to find the following users",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
     "Recent Conversations": "Recent Conversations",
@@ -2247,6 +2432,9 @@
     "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",
+    "Some suggestions may be hidden for privacy.": "Some suggestions may be hidden for privacy.",
+    "If you can't see who you’re looking for, send them your invite link below.": "If you can't see who you’re looking for, send them your invite link below.",
+    "Or send invite link": "Or send invite link",
     "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>.",
@@ -2256,6 +2444,8 @@
     "Invited people will be able to read old messages.": "Invited people will be able to read old messages.",
     "Transfer": "Transfer",
     "Consult first": "Consult first",
+    "User Directory": "User Directory",
+    "Dial pad": "Dial pad",
     "a new master key signature": "a new master key signature",
     "a new cross-signing key signature": "a new cross-signing key signature",
     "a device cross-signing signature": "a device cross-signing signature",
@@ -2272,12 +2462,34 @@
     "Clear cache and resync": "Clear cache and resync",
     "%(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 now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
     "Updating %(brand)s": "Updating %(brand)s",
+    "Don't leave any rooms": "Don't leave any rooms",
+    "Leave all rooms": "Leave all rooms",
+    "Leave some rooms": "Leave some rooms",
+    "Search %(spaceName)s": "Search %(spaceName)s",
+    "You won't be able to rejoin unless you are re-invited.": "You won't be able to rejoin unless you are re-invited.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "You're the only admin of this space. Leaving it will mean no one has control over it.",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.",
+    "Leave %(spaceName)s": "Leave %(spaceName)s",
+    "You are about to leave <spaceName/>.": "You are about to leave <spaceName/>.",
+    "Would you like to leave the rooms in this space?": "Would you like to leave the rooms in this space?",
+    "Leave space": "Leave space",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
     "Start using Key Backup": "Start using Key Backup",
     "I don't want my encrypted messages": "I don't want my encrypted messages",
     "Manually export keys": "Manually export keys",
     "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
+    "%(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",
+    "You're removing all spaces. Access will default to invite only": "You're removing all spaces. Access will default to invite only",
+    "Select spaces": "Select spaces",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.",
+    "Search spaces": "Search spaces",
+    "Spaces you know that contain this room": "Spaces you know that contain this room",
+    "Other spaces or rooms you might not know": "Other spaces or rooms you might not know",
+    "These are likely ones other room admins are a part of.": "These are likely ones other room admins are a part of.",
     "Confirm by comparing the following with the User Settings in your other session:": "Confirm by comparing the following with the User Settings in your other session:",
     "Confirm this user's session by comparing the following with their User Settings:": "Confirm this user's session by comparing the following with their User Settings:",
     "Session name": "Session name",
@@ -2289,23 +2501,28 @@
     "Message edits": "Message edits",
     "Modal Widget": "Modal Widget",
     "Data on this screen is shared with %(widgetDomain)s": "Data on this screen is shared with %(widgetDomain)s",
-    "Your account is not secure": "Your account is not secure",
-    "Your password": "Your password",
-    "This session, or the other session": "This session, or the other session",
-    "The internet connection either session is using": "The internet connection either session is using",
-    "We recommend you change your password and Security Key in Settings immediately": "We recommend you change your password and Security Key in Settings immediately",
-    "New session": "New session",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Use this session to verify your new one, granting it access to encrypted messages:",
-    "If you didn’t sign in to this session, your account may be compromised.": "If you didn’t sign in to this session, your account may be compromised.",
-    "This wasn't me": "This wasn't me",
     "Doesn't look like a valid email address": "Doesn't look like a valid email address",
     "Continuing without email": "Continuing without email",
     "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>.": "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>.",
     "Email (optional)": "Email (optional)",
     "Please fill why you're reporting.": "Please fill why you're reporting.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "What this user is writing is wrong.\nThis will be reported to the room moderators.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.",
+    "Please pick a nature and describe what makes this message abusive.": "Please pick a nature and describe what makes this message abusive.",
+    "Report Content": "Report Content",
+    "Disagree": "Disagree",
+    "Toxic Behaviour": "Toxic Behaviour",
+    "Illegal Content": "Illegal Content",
+    "Spam or propaganda": "Spam or propaganda",
+    "Report the entire room": "Report the entire room",
+    "Send report": "Send report",
     "Report Content to Your Homeserver Administrator": "Report Content to Your Homeserver Administrator",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.",
-    "Send report": "Send report",
     "Room Settings - %(roomName)s": "Room Settings - %(roomName)s",
     "Failed to upgrade room": "Failed to upgrade room",
     "The room upgrade could not be completed": "The room upgrade could not be completed",
@@ -2316,12 +2533,13 @@
     "Update any local room aliases to point to the new room": "Update any local room aliases to point to the new room",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Put a link back to the old room at the start of the new room so people can see old messages",
-    "Automatically invite users": "Automatically invite users",
+    "Automatically invite members from this room to the new one": "Automatically invite members from this room to the new one",
     "Upgrade private room": "Upgrade private room",
     "Upgrade public room": "Upgrade public room",
     "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.",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.",
     "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.",
@@ -2368,19 +2586,13 @@
     "Share Room Message": "Share Room Message",
     "Link to selected message": "Link to selected message",
     "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",
+    "Settings - %(spaceName)s": "Settings - %(spaceName)s",
     "To help us prevent this in future, please <a>send us logs</a>.": "To help us prevent this in future, please <a>send us logs</a>.",
     "Missing session data": "Missing session data",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
     "Your browser likely removed this data when running low on disk space.": "Your browser likely removed this data when running low on disk space.",
-    "Integration Manager": "Integration Manager",
+    "Integration manager": "Integration manager",
     "Find others by phone or email": "Find others by phone or email",
     "Be found by phone or email": "Be found by phone or email",
     "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs",
@@ -2464,19 +2676,20 @@
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Unable to reject invite": "Unable to reject invite",
     "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
-    "Forward Message": "Forward Message",
-    "Unpin Message": "Unpin Message",
-    "Pin Message": "Pin Message",
-    "Unhide Preview": "Unhide Preview",
-    "Share Permalink": "Share Permalink",
-    "Share Message": "Share Message",
+    "Forward": "Forward",
+    "View source": "View source",
+    "Show preview": "Show preview",
     "Source URL": "Source URL",
-    "Collapse Reply Thread": "Collapse Reply Thread",
-    "Report Content": "Report Content",
+    "Collapse reply thread": "Collapse reply thread",
+    "Report": "Report",
+    "Add space": "Add space",
+    "Manage & explore rooms": "Manage & explore rooms",
     "Clear status": "Clear status",
     "Update status": "Update status",
     "Set status": "Set status",
     "Set a new status...": "Set a new status...",
+    "Move up": "Move up",
+    "Move down": "Move down",
     "View Community": "View Community",
     "Unable to start audio streaming.": "Unable to start audio streaming.",
     "Failed to start livestream": "Failed to start livestream",
@@ -2540,12 +2753,15 @@
     "Use email or phone to optionally be discoverable by existing contacts.": "Use email or phone to optionally be discoverable by existing contacts.",
     "Use email to optionally be discoverable by existing contacts.": "Use email to optionally be discoverable by existing contacts.",
     "Sign in with SSO": "Sign in with SSO",
+    "Unnamed audio": "Unnamed audio",
+    "Error downloading audio": "Error downloading audio",
+    "Pause": "Pause",
+    "Play": "Play",
     "Couldn't load page": "Couldn't load page",
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "You must join the room to see its files": "You must join the room to see its files",
     "No files visible in this room": "No files visible in this room",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Attach files from chat or just drag and drop them anywhere in a room.",
-    "Communities": "Communities",
     "Create community": "Create community",
     "<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 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",
     "Add rooms to the community summary": "Add rooms to the community summary",
@@ -2573,6 +2789,11 @@
     "Community Settings": "Community Settings",
     "Want more than a community? <a>Get your own server</a>": "Want more than a community? <a>Get your own server</a>",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.",
+    "You can create a Space from this community <a>here</a>.": "You can create a Space from this community <a>here</a>.",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.",
+    "Communities can now be made into Spaces": "Communities can now be made into Spaces",
+    "Spaces are a new way to make a community, with new features coming.": "Spaces are a new way to make a community, with new features coming.",
+    "Communities won't receive further updates.": "Communities won't receive further updates.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
     "Featured Rooms:": "Featured Rooms:",
     "Featured Users:": "Featured Users:",
@@ -2582,10 +2803,10 @@
     "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
     "Who can join this community?": "Who can join this community?",
+    "Only people who have been invited": "Only people who have been invited",
     "Everyone": "Everyone",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
     "Long Description (HTML)": "Long Description (HTML)",
-    "Upload avatar": "Upload avatar",
     "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",
@@ -2599,6 +2820,11 @@
     "Explore Public Rooms": "Explore Public Rooms",
     "Create a Group Chat": "Create a Group Chat",
     "Upgrade to %(hostSignupBrand)s": "Upgrade to %(hostSignupBrand)s",
+    "Open dial pad": "Open dial pad",
+    "Public community": "Public community",
+    "Private community": "Private community",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "To view %(communityName)s, swap to communities in your <a>preferences</a>",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "To join %(communityName)s, swap to communities in your <a>preferences</a>",
     "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.",
@@ -2608,6 +2834,8 @@
     "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",
+    "Unable to copy room link": "Unable to copy room link",
+    "Unable to copy a link to the room to the clipboard.": "Unable to copy a link to the room to the clipboard.",
     "Signed Out": "Signed Out",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "Terms and Conditions": "Terms and Conditions",
@@ -2623,11 +2851,12 @@
     "%(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.",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.",
     "Error whilst fetching joined communities": "Error whilst fetching joined communities",
     "Create a new community": "Create a new community",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
-    "Communities are changing to Spaces": "Communities are changing to Spaces",
+    "You’re all caught up": "You’re all caught up",
+    "You have no visible notifications.": "You have no visible notifications.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
     "%(brand)s failed to get the public room list.": "%(brand)s failed to get the public room list.",
     "The homeserver may be unavailable or overloaded.": "The homeserver may be unavailable or overloaded.",
@@ -2662,7 +2891,6 @@
     "Some of your messages have not been sent": "Some of your messages have not been sent",
     "Delete all": "Delete all",
     "Retry all": "Retry all",
-    "Sending": "Sending",
     "You can select all or individual messages to retry or delete": "You can select all or individual messages to retry or delete",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
@@ -2677,33 +2905,26 @@
     "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.",
     "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",
-    "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
-    "%(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",
     "Select a room below first": "Select a room below first",
     "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",
+    "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
     "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.",
+    "Results": "Results",
+    "Rooms and spaces": "Rooms and spaces",
+    "Space": "Space",
     "Search names and descriptions": "Search names and descriptions",
-    "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>.",
-    "Create room": "Create room",
-    "Spaces are a beta feature.": "Spaces are a beta feature.",
-    "Public space": "Public space",
     "Private space": "Private space",
     "<inviter/> invites you": "<inviter/> invites you",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "To view %(spaceName)s, turn on the <a>Spaces beta</a>",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "To join %(spaceName)s, turn on the <a>Spaces beta</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "To view this Space, hide communities in your <a>preferences</a>",
+    "To join this Space, hide communities in your <a>preferences</a>": "To join this Space, hide communities in your <a>preferences</a>",
+    "To view %(spaceName)s, you need an invite": "To view %(spaceName)s, you need an invite",
+    "Created from <Community />": "Created from <Community />",
     "Welcome to <name/>": "Welcome to <name/>",
     "Random": "Random",
     "Support": "Support",
@@ -2713,6 +2934,7 @@
     "Creating rooms...": "Creating rooms...",
     "What do you want to organise?": "What do you want to organise?",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.",
+    "Search for rooms or spaces": "Search for rooms or spaces",
     "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",
@@ -2723,6 +2945,8 @@
     "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",
+    "Teammates might not be able to view or join any private rooms you make.": "Teammates might not be able to view or join any private rooms you make.",
+    "We're working on this, but just want to let you know.": "We're working on this, but just want to let you know.",
     "Failed to invite the following users to your space: %(csvUsers)s": "Failed to invite the following users to your space: %(csvUsers)s",
     "Inviting...": "Inviting...",
     "Invite your teammates": "Invite your teammates",
@@ -2834,8 +3058,6 @@
     "Commands": "Commands",
     "Command Autocomplete": "Command Autocomplete",
     "Community Autocomplete": "Community Autocomplete",
-    "Results from DuckDuckGo": "Results from DuckDuckGo",
-    "DuckDuckGo Results": "DuckDuckGo Results",
     "Emoji": "Emoji",
     "Emoji Autocomplete": "Emoji Autocomplete",
     "Notify the whole room": "Notify the whole room",
@@ -2901,7 +3123,6 @@
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.",
     "Enter passphrase": "Enter passphrase",
     "Confirm passphrase": "Confirm passphrase",
-    "Export": "Export",
     "Import room keys": "Import room keys",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
@@ -2974,6 +3195,6 @@
     "Page Down": "Page Down",
     "Esc": "Esc",
     "Enter": "Enter",
-    "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "[number]": "[number]"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index a5d7756de8..f48fd477e6 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -1,12 +1,7 @@
 {
-    "Add a widget": "Add a widget",
     "AM": "AM",
     "PM": "PM",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
     "Account": "Account",
-    "Access Token:": "Access Token:",
-    "Add a topic": "Add a topic",
     "Admin": "Admin",
     "No Microphones detected": "No Microphones detected",
     "No Webcams detected": "No Webcams detected",
@@ -22,35 +17,22 @@
     "and %(count)s others...|other": "and %(count)s others...",
     "and %(count)s others...|one": "and one other...",
     "A new password must be entered.": "A new password must be entered.",
-    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "An error has occurred.": "An error has occurred.",
     "Anyone": "Anyone",
-    "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
-    "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
     "Are you sure?": "Are you sure?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Attachment": "Attachment",
-    "Autoplay GIFs and videos": "Autoplay GIFs and videos",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
     "Ban": "Ban",
     "Banned users": "Banned users",
     "Bans user with given id": "Bans user with given id",
-    "Call Timeout": "Call Timeout",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Change Password": "Change Password",
-    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "Changes your display nickname": "Changes your display nickname",
-    "Click here to fix": "Click here to fix",
-    "Click to mute audio": "Click to mute audio",
-    "Click to mute video": "Click to mute video",
-    "click to reveal": "click to reveal",
-    "Click to unmute video": "Click to unmute video",
-    "Click to unmute audio": "Click to unmute audio",
     "Command error": "Command error",
     "Commands": "Commands",
     "Confirm password": "Confirm password",
@@ -59,7 +41,6 @@
     "Cryptography": "Cryptography",
     "Current password": "Current password",
     "Custom level": "Custom level",
-    "/ddg is not a command": "/ddg is not a command",
     "Deactivate Account": "Deactivate Account",
     "Decrypt %(text)s": "Decrypt %(text)s",
     "Deops user with given id": "Deops user with given id",
@@ -72,10 +53,8 @@
     "Email": "Email",
     "Email address": "Email address",
     "Emoji": "Emoji",
-    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
     "Error": "Error",
     "Error decrypting attachment": "Error decrypting attachment",
-    "Existing Call": "Existing Call",
     "Export": "Export",
     "Export E2E room keys": "Export E2E room keys",
     "Failed to ban user": "Failed to ban user",
@@ -84,7 +63,6 @@
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Failed to join room": "Failed to join room",
     "Failed to kick": "Failed to kick",
-    "Failed to leave room": "Failed to leave room",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Failed to load group members": "Failed to load group members",
     "Failed to load timeline position": "Failed to load timeline position",
@@ -99,16 +77,13 @@
     "Failure to create room": "Failure to create room",
     "Favourite": "Favorite",
     "Favourites": "Favorites",
-    "Fill screen": "Fill screen",
     "Filter room members": "Filter room members",
     "Forget room": "Forget room",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Hangup": "Hangup",
     "Historical": "Historical",
     "Homeserver is": "Homeserver is",
-    "Identity Server is": "Identity Server is",
     "I have verified my email address": "I have verified my email address",
     "Import": "Import",
     "Import E2E room keys": "Import E2E room keys",
@@ -116,15 +91,12 @@
     "Incorrect verification code": "Incorrect verification code",
     "Invalid Email Address": "Invalid Email Address",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
     "Invited": "Invited",
     "Invites": "Invites",
     "Invites user with given id to current room": "Invites user with given id to current room",
     "Sign in with": "Sign in with",
     "Join Room": "Join Room",
-    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
     "Jump to first unread message.": "Jump to first unread message.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
     "Kick": "Kick",
     "Kicks user with given id": "Kicks user with given id",
     "Labs": "Labs",
@@ -137,7 +109,6 @@
     "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
     "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
     "Leave room": "Leave room",
-    "%(targetName)s left the room.": "%(targetName)s left the room.",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "Logout": "Logout",
     "Low priority": "Low priority",
@@ -146,7 +117,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
-    "Manage Integrations": "Manage Integrations",
     "Missing room_id in request": "Missing room_id in request",
     "Missing user_id in request": "Missing user_id in request",
     "Moderator": "Moderator",
@@ -156,13 +126,11 @@
     "New passwords must match each other.": "New passwords must match each other.",
     "not specified": "not specified",
     "Notifications": "Notifications",
-    "(not supported by this browser)": "(not supported by this browser)",
     "<not supported>": "<not supported>",
     "No more results": "No more results",
     "No results": "No results",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
     "OK": "OK",
-    "olm version:": "olm version:",
     "Only people who have been invited": "Only people who have been invited",
     "Operation failed": "Operation failed",
     "Password": "Password",
@@ -176,24 +144,17 @@
     "Profile": "Profile",
     "Reason": "Reason",
     "Register": "Register",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
     "Reject invitation": "Reject invitation",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
     "Remove": "Remove",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
-    "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Return to login screen": "Return to login screen",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s does not have permission to send you notifications - please check your browser settings",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s was not given permission to send notifications - please try again",
     "%(brand)s version:": "%(brand)s version:",
     "Room %(roomId)s not visible": "Room %(roomId)s not visible",
-    "Room Colour": "Room Color",
     "Rooms": "Rooms",
     "Save": "Save",
     "Search": "Search",
     "Search failed": "Search failed",
-    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
     "Send Reset Email": "Send Reset Email",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
@@ -202,35 +163,28 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
     "Session ID": "Session ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
     "Settings": "Settings",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
     "Signed Out": "Signed Out",
     "Sign in": "Sign in",
     "Sign out": "Sign out",
-    "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "Someone": "Someone",
     "Submit": "Submit",
     "Success": "Success",
     "This email address is already in use": "This email address is already in use",
     "This email address was not found": "This email address was not found",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
-    "The remote side failed to pick up": "The remote side failed to pick up",
     "This room has no local addresses": "This room has no local addresses",
     "This room is not recognised.": "This room is not recognized.",
     "This doesn't appear to be a valid email address": "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 is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
-    "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Unable to add email address": "Unable to add email address",
     "Unable to remove contact information": "Unable to remove contact information",
     "Unable to verify email address.": "Unable to verify email address.",
     "Unban": "Unban",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
-    "Unable to capture screen": "Unable to capture screen",
     "Unable to enable Notifications": "Unable to enable Notifications",
     "unknown error code": "unknown error code",
     "Unmute": "Unmute",
@@ -243,23 +197,14 @@
     "Verified key": "Verified key",
     "Video call": "Video call",
     "Voice call": "Voice call",
-    "VoIP conference finished.": "VoIP conference finished.",
-    "VoIP conference started.": "VoIP conference started.",
     "VoIP is unsupported": "VoIP is unsupported",
-    "(could not connect media)": "(could not connect media)",
-    "(no answer)": "(no answer)",
-    "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
     "Warning!": "Warning!",
-    "Who can access this room?": "Who can access this room?",
     "Who can read history?": "Who can read history?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-    "You are already in a call.": "You are already in a call.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
     "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
     "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have no visible notifications": "You have no visible notifications",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "You need to be logged in.": "You need to be logged in.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
@@ -288,17 +233,11 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Set a display name:",
-    "Upload an avatar:": "Upload an avatar:",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
-    "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
-    "There are no visible files in this room": "There are no visible files in this room",
     "Room": "Room",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "Cancel": "Cancel",
-    "Active call": "Active call",
-    "Please select the destination room for this message": "Please select the destination room for this message",
     "Start automatically after system login": "Start automatically after system login",
     "Analytics": "Analytics",
     "Banned by %(displayName)s": "Banned by %(displayName)s",
@@ -318,7 +257,6 @@
     "You must join the room to see its files": "You must join the room to see its files",
     "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
     "Failed to invite": "Failed to invite",
-    "Failed to invite the following users to the %(roomName)s room:": "Failed to invite the following users to the %(roomName)s room:",
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
     "Unknown error": "Unknown error",
@@ -326,77 +264,50 @@
     "Unable to restore session": "Unable to restore session",
     "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.": "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.",
     "Unknown Address": "Unknown Address",
-    "ex. @bob:example.com": "ex. @bob:example.com",
-    "Add User": "Add User",
-    "Custom Server Options": "Custom Server Options",
     "Dismiss": "Dismiss",
-    "Please check your email to continue registration.": "Please check your email to continue registration.",
     "Token incorrect": "Token incorrect",
     "Please enter the code it contains:": "Please enter the code it contains:",
     "powered by Matrix": "powered by Matrix",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
-    "Error decrypting audio": "Error decrypting audio",
     "Error decrypting image": "Error decrypting image",
     "Error decrypting video": "Error decrypting video",
     "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?",
     "URL Previews": "URL Previews",
     "Drop file here to upload": "Drop file here to upload",
-    " (unsupported)": " (unsupported)",
-    "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
     "Online": "Online",
     "Idle": "Idle",
     "Offline": "Offline",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
-    "Active call (%(roomName)s)": "Active call (%(roomName)s)",
     "Accept": "Accept",
     "Add": "Add",
     "Admin Tools": "Admin Tools",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
     "Close": "Close",
-    "Custom": "Custom",
     "Decline": "Decline",
     "Create new room": "Create new room",
-    "Room directory": "Room directory",
     "Start chat": "Start chat",
-    "Drop File Here": "Drop File Here",
-    "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
-    "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Failed to upload profile picture!": "Failed to upload profile picture!",
     "Home": "Home",
-    "Incoming call from %(name)s": "Incoming call from %(name)s",
-    "Incoming video call from %(name)s": "Incoming video call from %(name)s",
-    "Incoming voice call from %(name)s": "Incoming voice call from %(name)s",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
     "Last seen": "Last seen",
     "No display name": "No display name",
-    "Private Chat": "Private Chat",
-    "Public Chat": "Public Chat",
     "%(roomName)s does not exist.": "%(roomName)s does not exist.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
     "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
     "Start authentication": "Start authentication",
-    "The phone number entered looks invalid": "The phone number entered looks invalid",
     "This room": "This room",
-    "unknown caller": "unknown caller",
     "Unnamed Room": "Unnamed Room",
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "Upload new:": "Upload new:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "(~%(count)s results)|one": "(~%(count)s result)",
     "(~%(count)s results)|other": "(~%(count)s results)",
     "New Password": "New Password",
-    "Username available": "Username available",
-    "Username not available": "Username not available",
     "Something went wrong!": "Something went wrong!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -404,19 +315,14 @@
     "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
     "Skip": "Skip",
     "Check for update": "Check for update",
-    "Allow": "Allow",
-    "Cannot add any more widgets": "Cannot add any more widgets",
     "Define the power level of a user": "Define the power level of a user",
     "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
     "Sets the room name": "Sets the room name",
-    "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
-    "To get started, please pick a username!": "To get started, please pick a username!",
     "Unable to create widget.": "Unable to create widget.",
     "You are not in this room.": "You are not in this room.",
     "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
     "Example": "Example",
     "Create": "Create",
-    "Pinned Messages": "Pinned Messages",
     "Featured Rooms:": "Featured Rooms:",
     "Featured Users:": "Featured Users:",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
@@ -425,15 +331,12 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "Fetching third party location failed": "Fetching third party location failed",
-    "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
-    "Uploading report": "Uploading report",
     "Sunday": "Sunday",
     "Guests can join": "Guests can join",
     "Messages sent by bot": "Messages sent by bot",
     "Notification targets": "Notification targets",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Today": "Today",
-    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
     "Friday": "Friday",
     "Update": "Update",
     "What's New": "What's New",
@@ -441,11 +344,7 @@
     "Changelog": "Changelog",
     "Waiting for response from server": "Waiting for response from server",
     "Leave": "Leave",
-    "Advanced notification settings": "Advanced notification settings",
-    "Forget": "Forget",
     "World readable": "World readable",
-    "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
-    "Cancel Sending": "Cancel Sending",
     "Warning": "Warning",
     "This Room": "This Room",
     "Noisy": "Noisy",
@@ -453,44 +352,23 @@
     "Messages containing my display name": "Messages containing my display name",
     "Messages in one-to-one chats": "Messages in one-to-one chats",
     "Unavailable": "Unavailable",
-    "View Decrypted Source": "View Decrypted Source",
-    "Failed to update keywords": "Failed to update keywords",
     "remove %(name)s from the directory.": "remove %(name)s from the directory.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
-    "Please set a password!": "Please set a password!",
-    "You have successfully set a password!": "You have successfully set a password!",
-    "An error occurred whilst saving your email notification preferences.": "An error occurred while saving your email notification preferences.",
     "Source URL": "Source URL",
     "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
     "Members": "Members",
     "No update available.": "No update available.",
     "Resend": "Resend",
-    "Files": "Files",
     "Collecting app version information": "Collecting app version information",
-    "Keywords": "Keywords",
-    "Unpin Message": "Unpin Message",
-    "Enable notifications for this account": "Enable notifications for this account",
-    "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
-    "Error saving email notification preferences": "Error saving email notification preferences",
     "Tuesday": "Tuesday",
-    "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
     "Search…": "Search…",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.",
     "Unnamed room": "Unnamed room",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
-    "All messages (noisy)": "All messages (noisy)",
     "Saturday": "Saturday",
-    "I understand the risks and wish to continue": "I understand the risks and wish to continue",
-    "Direct Chat": "Direct Chat",
     "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
     "Reject": "Reject",
-    "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
     "Monday": "Monday",
     "Remove from Directory": "Remove from Directory",
-    "Enable them now": "Enable them now",
     "Collecting logs": "Collecting logs",
-    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "All Rooms": "All Rooms",
     "Wednesday": "Wednesday",
     "Quote": "Quote",
@@ -499,40 +377,23 @@
     "All messages": "All messages",
     "Call invitation": "Call invitation",
     "Downloading update...": "Downloading update...",
-    "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
     "What's new?": "What's new?",
-    "Notify me for anything else": "Notify me for anything else",
     "When I'm invited to a room": "When I'm invited to a room",
-    "Can't update user notification settings": "Can't update user notification settings",
-    "Notify for all other messages/rooms": "Notify for all other messages/rooms",
     "Unable to look up room ID from server": "Unable to look up room ID from server",
     "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
     "Invite to this room": "Invite to this room",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Thursday": "Thursday",
-    "Forward Message": "Forward Message",
-    "Unhide Preview": "Unhide Preview",
     "Unable to join network": "Unable to join network",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, your browser is <b>not</b> able to run %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Messages in group chats": "Messages in group chats",
     "Yesterday": "Yesterday",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "Low Priority": "Low Priority",
-    "Unable to fetch notification target list": "Unable to fetch notification target list",
-    "Set Password": "Set Password",
     "Off": "Off",
     "%(brand)s does not know how to join a room on this network": "%(brand)s does not know how to join a room on this network",
-    "Mentions only": "Mentions only",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
-    "Enable email notifications": "Enable email notifications",
     "No rooms to show": "No rooms to show",
-    "Download this file": "Download this file",
-    "Pin Message": "Pin Message",
-    "Failed to change settings": "Failed to change settings",
     "View Source": "View Source",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Checking for an update...": "Checking for an update...",
     "The platform you're on": "The platform you're on",
     "The version of %(brand)s": "The version of %(brand)s",
@@ -547,9 +408,6 @@
     "The information being sent to us to help make %(brand)s better includes:": "The information being sent to us to help make %(brand)s better includes:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
     "Call Failed": "Call Failed",
-    "Call in Progress": "Call in Progress",
-    "A call is currently being placed!": "A call is currently being placed!",
-    "A call is already in progress!": "A call is already in progress!",
     "Permission Required": "Permission Required",
     "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
@@ -569,7 +427,6 @@
     "Missing roomId.": "Missing roomId.",
     "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
     "Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
     "Spanner": "Wrench",
     "Aeroplane": "Airplane",
     "Cat": "Cat",
@@ -658,13 +515,21 @@
     "Single Sign On": "Single Sign On",
     "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.",
     "Use Single Sign On to continue": "Use Single Sign On to continue",
-    "Message search initilisation failed": "Message search initialization failed",
     "%(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 now uses 3-5x less memory, by only loading information about other users when needed. Please wait while we resynchronize with the server!",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Customize your experience with experimental labs features. <a>Learn more</a>.",
     "Customise your appearance": "Customize your appearance",
     "Unrecognised command: %(commandText)s": "Unrecognized command: %(commandText)s",
     "Add some details to help people recognise it.": "Add some details to help people recognize it.",
     "Unrecognised room address:": "Unrecognized room address:",
     "A private space to organise your rooms": "A private space to organize your rooms",
-    "Message search initialisation failed": "Message search initialization failed"
+    "Message search initialisation failed": "Message search initialization failed",
+    "Permission is granted to use the webcam": "Permission is granted to use the webcam",
+    "A microphone and webcam are plugged in and set up correctly": "A microphone and webcam are plugged in and set up correctly",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "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.": "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.",
+    "Unable to access microphone": "Unable to access microphone",
+    "The call was answered on another device.": "The call was answered on another device.",
+    "Answered Elsewhere": "Answered Elsewhere",
+    "The call could not be established": "The call could not be established",
+    "The user you called is busy.": "The user you called is busy.",
+    "User Busy": "User Busy"
 }
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index fc8c00fd19..86ffb94251 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2,9 +2,6 @@
     "This email address is already in use": "Tiu ĉi retpoŝtadreso jam estas uzata",
     "This phone number is already in use": "Tiu ĉi telefonnumero jam estas uzata",
     "Failed to verify email address: make sure you clicked the link in the email": "Kontrolo de via retpoŝtadreso malsukcesis: certigu, ke vi klakis la ligilon en la retmesaĝo",
-    "Call Timeout": "Voka tempolimo",
-    "The remote side failed to pick up": "La defora flanko malsukcesis respondi",
-    "Unable to capture screen": "Ne povas registri ekranon",
     "You cannot place a call with yourself.": "Vi ne povas voki vin mem.",
     "Warning!": "Averto!",
     "Sign in with": "Saluti per",
@@ -38,8 +35,6 @@
     "Who would you like to add to this community?": "Kiun vi volas aldoni al tiu ĉi komunumo?",
     "Invite new community members": "Invitu novajn komunumanojn",
     "Invite to Community": "Inviti al komunumo",
-    "Existing Call": "Jama voko",
-    "You are already in a call.": "Vi jam partoprenas vokon.",
     "VoIP is unsupported": "VoIP ne estas subtenata",
     "You cannot place VoIP calls in this browser.": "VoIP-vokoj ne fareblas en tiu ĉi foliumilo.",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Averto: ajna persono aldonita al komunumo estos publike videbla al iu ajn, kiu konas la identigilon de tiu komunumo",
@@ -62,7 +57,6 @@
     "Admin": "Administranto",
     "Operation failed": "Ago malsukcesis",
     "Failed to invite": "Invito malsukcesis",
-    "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la ĉambro %(roomName)s:",
     "You need to be logged in.": "Vi devas esti salutinta.",
     "You need to be able to invite users to do that.": "Vi bezonas permeson inviti uzantojn por tio.",
     "Unable to create widget.": "Ne povas krei fenestraĵon.",
@@ -75,43 +69,17 @@
     "Room %(roomId)s not visible": "Ĉambro %(roomId)s ne videblas",
     "Missing user_id in request": "En peto mankas user_id",
     "Usage": "Uzo",
-    "/ddg is not a command": "/ddg ne estas komando",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Por uzi ĝin, atendu aperon de sugestaj rezultoj, kaj tabu tra ili.",
     "Ignored user": "Malatentata uzanto",
     "You are now ignoring %(userId)s": "Vi nun malatentas uzanton %(userId)s",
     "Unignored user": "Reatentata uzanto",
     "You are no longer ignoring %(userId)s": "Vi nun reatentas uzanton %(userId)s",
     "Verified key": "Kontrolita ŝlosilo",
     "Reason": "Kialo",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akceptis la inviton por %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s akceptis inviton.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s petis rettelefonan vokon.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invitis uzanton %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s forbaris uzanton %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s agordis sian vidigan nomon al %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s forigis sian vidigan nomon (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s forigis sian profilbildon.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
-    "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
-    "VoIP conference started.": "Rettelefona voko komenciĝis.",
-    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
-    "VoIP conference finished.": "Rettelefona voko finiĝis.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
-    "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s malbaris uzanton %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s forpelis uzanton %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s nuligis inviton por %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al « %(topic)s ».",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la ĉambro.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro al %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendis bildon.",
     "Someone": "Iu",
-    "(not supported by this browser)": "(nesubtenata de tiu ĉi foliumilo)",
-    "%(senderName)s answered the call.": "%(senderName)s akceptis la vokon.",
-    "(could not connect media)": "(ne povis kunigi aŭdovidaĵojn)",
-    "(no answer)": "(sen respondo)",
-    "(unknown failure: %(reason)s)": "(nekonata eraro: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s finis la vokon.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendis ĉambran inviton al %(targetDisplayName)s.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, ekde la tempo de invito.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, ekde la tempo de aliĝo.",
@@ -134,7 +102,6 @@
     "Message Pinning": "Fiksado de mesaĝoj",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Montri tempindikojn en 12-hora formo (ekz. 2:30 post.)",
     "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
-    "Autoplay GIFs and videos": "Memfare ludi GIF-bildojn kaj filmojn",
     "Call Failed": "Voko malsukcesis",
     "Send": "Sendi",
     "Enable automatic language detection for syntax highlighting": "Ŝalti memagan rekonon de lingvo por sintaksa markado",
@@ -143,12 +110,6 @@
     "Enable inline URL previews by default": "Ŝalti entekstan antaŭrigardon al retadresoj",
     "Enable URL previews for this room (only affects you)": "Ŝalti URL-antaŭrigardon en ĉi tiu ĉambro (nur por vi)",
     "Enable URL previews by default for participants in this room": "Ŝalti URL-antaŭrigardon por anoj de ĉi tiu ĉambro",
-    "Room Colour": "Koloro de ĉambro",
-    "Active call (%(roomName)s)": "Aktiva voko (%(roomName)s)",
-    "unknown caller": "nekonata vokanto",
-    "Incoming voice call from %(name)s": "Envena voĉvoko de %(name)s",
-    "Incoming video call from %(name)s": "Envena vidvoko de %(name)s",
-    "Incoming call from %(name)s": "Envena voko de %(name)s",
     "Decline": "Rifuzi",
     "Accept": "Akcepti",
     "Error": "Eraro",
@@ -172,19 +133,8 @@
     "Authentication": "Aŭtentikigo",
     "Last seen": "Laste vidita",
     "Failed to set display name": "Malsukcesis agordi vidigan nomon",
-    "Cannot add any more widgets": "Pluaj fenestraĵoj ne aldoneblas",
-    "The maximum permitted number of widgets have already been added to this room.": "La maksimuma permesata nombro de fenestraĵoj jam aldoniĝis al tiu ĉambro.",
-    "Add a widget": "Aldoni fenestraĵon",
-    "Drop File Here": "Demetu dosieron tien ĉi",
     "Drop file here to upload": "Demetu dosieron tien ĉi por ĝin alŝuti",
-    " (unsupported)": " (nesubtenata)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Aliĝu al voko kun <voiceText>voĉo</voiceText> aŭ <videoText>vido</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Nuntempa grupvoko%(supportedText)s.",
-    "%(senderName)s sent an image": "%(senderName)s sendis bildon",
-    "%(senderName)s sent a video": "%(senderName)s sendis filmon",
-    "%(senderName)s uploaded a file": "%(senderName)s alŝutis dosieron",
     "Options": "Agordoj",
-    "Please select the destination room for this message": "Bonvolu elekti celan ĉambron por tiu mesaĝo",
     "Disinvite": "Malinviti",
     "Kick": "Forpeli",
     "Disinvite this user?": "Ĉu malinviti ĉi tiun uzanton?",
@@ -223,11 +173,7 @@
     "Server error": "Servila eraro",
     "Server unavailable, overloaded, or something else went wrong.": "Servilo estas neatingebla, troŝarĝita, aŭ io alia misokazis.",
     "Command error": "Komanda eraro",
-    "Unpin Message": "Malfiksi mesaĝon",
-    "Jump to message": "Salti al mesaĝo",
-    "No pinned messages.": "Neniuj fiksitaj mesaĝoj.",
     "Loading...": "Enlegante…",
-    "Pinned Messages": "Fiksitaj mesaĝoj",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -253,7 +199,6 @@
     "Settings": "Agordoj",
     "Forget room": "Forgesi ĉambron",
     "Search": "Serĉi",
-    "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
     "Favourites": "Elstarigitaj",
     "Rooms": "Ĉambroj",
@@ -272,12 +217,7 @@
     "This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
     "Leave room": "Eliri ĉambron",
     "Favourite": "Elstarigi",
-    "Guests cannot join this room even if explicitly invited.": "Gastoj ne povas aliĝi ĉi tiun ĉambron eĉ kun malimplica invito.",
-    "Click here to fix": "Klaku ĉi tie por riparo",
-    "Who can access this room?": "Kiu povas aliri ĉi tiun ĉambron?",
     "Only people who have been invited": "Nur invititaj uzantoj",
-    "Anyone who knows the room's link, apart from guests": "Iu ajn kun la ligilo, krom gastoj",
-    "Anyone who knows the room's link, including guests": "Iu ajn kun la ligilo, inkluzive gastojn",
     "Publish this room to the public in %(domain)s's room directory?": "Ĉu publikigi ĉi tiun ĉambron per la katalogo de ĉambroj de %(domain)s?",
     "Who can read history?": "Kiu povas legi la historion?",
     "Anyone": "Iu ajn",
@@ -286,7 +226,6 @@
     "Members only (since they joined)": "Nur ĉambranoj (ekde la aliĝo)",
     "Permissions": "Permesoj",
     "Advanced": "Altnivela",
-    "Add a topic": "Aldoni temon",
     "Cancel": "Nuligi",
     "Jump to first unread message.": "Salti al unua nelegita mesaĝo.",
     "Close": "Fermi",
@@ -300,7 +239,6 @@
     "URL previews are enabled by default for participants in this room.": "Antaŭrigardoj de URL-oj estas implicite ŝaltitaj por anoj de tiu ĉi ĉambro.",
     "URL previews are disabled by default for participants in this room.": "Antaŭrigardoj de URL-oj estas implicite malŝaltitaj por anoj de tiu ĉi ĉambro.",
     "URL Previews": "Antaŭrigardoj al retpaĝoj",
-    "Error decrypting audio": "Malĉifro de sono eraris",
     "Error decrypting attachment": "Malĉifro de aldonaĵo eraris",
     "Decrypt %(text)s": "Malĉifri %(text)s",
     "Download %(text)s": "Elŝuti %(text)s",
@@ -312,7 +250,6 @@
     "Copied!": "Kopiita!",
     "Failed to copy": "Malsukcesis kopii",
     "Add an Integration": "Aldoni kunigon",
-    "Custom Server Options": "Propraj servilaj elektoj",
     "Dismiss": "Rezigni",
     "powered by Matrix": "funkciigata de Matrix",
     "Warning": "Averto",
@@ -322,14 +259,11 @@
     "Leave": "Foriri",
     "Register": "Registri",
     "Add rooms to this community": "Aldoni ĉambrojn al ĉi tiu komunumo",
-    "An email has been sent to %(emailAddress)s": "Retletero sendiĝis al %(emailAddress)s",
-    "Please check your email to continue registration.": "Bonvolu kontroli vian retpoŝton por daŭrigi la registriĝon.",
     "Token incorrect": "Malĝusta peco",
     "A text message has been sent to %(msisdn)s": "Tekstmesaĝo sendiĝîs al %(msisdn)s",
     "Please enter the code it contains:": "Bonvolu enigi la enhavatan kodon:",
     "Start authentication": "Komenci aŭtentikigon",
     "Email address": "Retpoŝtadreso",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se vi ne enigos retpoŝtadreson, vi ne povos restarigi vian pasvorton. Ĉu vi certas?",
     "Remove from community": "Forigi de komunumo",
     "Disinvite this user from community?": "Ĉu malinviti ĉi tiun uzanton de komunumo?",
     "Remove this user from community?": "Ĉu forigi ĉi tiun uzanton de komunumo?",
@@ -349,14 +283,12 @@
     "Something went wrong when trying to get your communities.": "Io misokazis dum legado de viaj komunumoj.",
     "You're not currently a member of any communities.": "Vi nuntempe apartenas al neniu komunumo.",
     "Unknown Address": "Nekonata adreso",
-    "Allow": "Permesi",
     "Delete Widget": "Forigi fenestraĵon",
     "Delete widget": "Forigi fenestraĵon",
     "Create new room": "Krei novan ĉambron",
     "No results": "Neniuj rezultoj",
     "Communities": "Komunumoj",
     "Home": "Hejmo",
-    "Manage Integrations": "Administri kunigojn",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)saliĝis",
@@ -412,16 +344,9 @@
     "collapse": "maletendi",
     "expand": "etendi",
     "Custom level": "Propra nivelo",
-    "Room directory": "Katalogo de ĉambroj",
-    "Username not available": "Uzantonomo ne disponeblas",
-    "Username invalid: %(errMessage)s": "Uzantonomo ne validas: %(errMessage)s",
-    "Username available": "Uzantonomo disponeblas",
-    "To get started, please pick a username!": "Por komenci, bonvolu elekti uzantonomon!",
     "Incorrect username and/or password.": "Malĝusta uzantnomo kaj/aŭ pasvorto.",
     "Start chat": "Komenci babilon",
     "And %(count)s more...|other": "Kaj %(count)s pliaj…",
-    "ex. @bob:example.com": "ekz-e @nomo:ekzemplo.net",
-    "Add User": "Aldoni uzanton",
     "Matrix ID": "Identigilo en Matrix",
     "Matrix Room ID": "Ĉambra identigilo en Matrix",
     "email address": "retpoŝtadreso",
@@ -453,17 +378,9 @@
     "Unable to verify email address.": "Retpoŝtadreso ne kontroleblas.",
     "This will allow you to reset your password and receive notifications.": "Tio ĉi permesos al vi restarigi vian pasvorton kaj ricevi sciigojn.",
     "Skip": "Preterpasi",
-    "An error occurred: %(error_string)s": "Okazis eraro: %(error_string)s",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tio ĉi estos la nomo de via konto sur la hejmservilo <span></span>, aŭ vi povas elekti <a>alian servilon</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Se vi jam havas Matrix-konton, vi povas <a>saluti</a> anstataŭe.",
-    "Private Chat": "Privata babilo",
-    "Public Chat": "Publika babilo",
-    "Custom": "Propra",
     "Name": "Nomo",
     "You must <a>register</a> to use this functionality": "Vi devas <a>registriĝî</a> por uzi tiun ĉi funkcion",
     "You must join the room to see its files": "Vi devas aliĝi al la ĉambro por vidi tie dosierojn",
-    "There are no visible files in this room": "En ĉi tiu ĉambro estas neniaj videblaj dosieroj",
-    "<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 por la paĝo de via komunumo</h1>\n<p>\n    Uzu la longan priskribon por enkonduki novajn komunumanojn, aŭ disdoni iujn\n    gravajn <a href=\"ligo\">ligilojn</a>\n</p>\n<p>\n    Vi povas eĉ uzi etikedojn « img »\n</p>\n",
     "Add rooms to the community summary": "Aldoni ĉambrojn al la komunuma superrigardo",
     "Which rooms would you like to add to this summary?": "Kiujn ĉambrojn vi volas aldoni al ĉi tiu superrigardo?",
     "Add to summary": "Aldoni al superrigardo",
@@ -499,7 +416,6 @@
     "Are you sure you want to reject the invitation?": "Ĉu vi certe volas rifuzi la inviton?",
     "Failed to reject invitation": "Malsukcesis rifuzi la inviton",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ĉu vi certe volas forlasi la ĉambron '%(roomName)s'?",
-    "Failed to leave room": "Malsukcesis forlasi la ĉambron",
     "Signed Out": "Adiaŭinta",
     "Old cryptography data detected": "Malnovaj datumoj de ĉifroteĥnikaro troviĝis",
     "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.": "Datumoj el malnova versio de %(brand)s troviĝis. Ĉi tio malfunkciigos tutvojan ĉifradon en la malnova versio. Tutvoje ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
@@ -508,11 +424,8 @@
     "Error whilst fetching joined communities": "Akirado de viaj komunumoj eraris",
     "Create a new community": "Krei novan komunumon",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Kreu komunumon por kunigi uzantojn kaj ĉambrojn! Fari propran hejmpaĝon por montri vian spacon en la universo de Matrix.",
-    "You have no visible notifications": "Neniuj videblaj sciigoj",
     "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
     "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
-    "Active call": "Aktiva voko",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Neniu alia ĉeestas! Ĉu vi volas <inviteText>inviti aliajn</inviteText> aŭ <nowarnText>ĉesigi avertadon pri la malplena ĉambro</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Ŝajne vi alŝutas dosierojn nun; ĉu vi tamen volas foriri?",
     "You seem to be in a call, are you sure you want to quit?": "Ŝajne vi vokas nun; ĉu vi tamen volas foriri?",
     "Search failed": "Serĉo malsukcesis",
@@ -520,11 +433,6 @@
     "No more results": "Neniuj pliaj rezultoj",
     "Room": "Ĉambro",
     "Failed to reject invite": "Malsukcesis rifuzi inviton",
-    "Fill screen": "Plenigi ekranon",
-    "Click to unmute video": "Klaku por ŝalti vidon",
-    "Click to mute video": "Klaku por malŝalti vidon",
-    "Click to unmute audio": "Klaku por ŝalti sonon",
-    "Click to mute audio": "Klaku por malŝalti sonon",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Provis enlegi certan parton de ĉi tiu historio, sed vi ne havas permeson vidi ĝin.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Provis enlegi certan parton de ĉi tiu historio, sed malsukcesis ĝin trovi.",
     "Failed to load timeline position": "Malsukcesis enlegi lokon en historio",
@@ -554,12 +462,8 @@
     "Notifications": "Sciigoj",
     "Profile": "Profilo",
     "Account": "Konto",
-    "Access Token:": "Atinga ĵetono:",
-    "click to reveal": "klaku por malkovri",
     "Homeserver is": "Hejmservilo estas",
-    "Identity Server is": "Identiga servilo estas",
     "%(brand)s version:": "versio de %(brand)s:",
-    "olm version:": "versio de olm:",
     "Failed to send email": "Malsukcesis sendi retleteron",
     "The email address linked to your account must be entered.": "Vi devas enigi retpoŝtadreson ligitan al via konto.",
     "A new password must be entered.": "Vi devas enigi novan pasvorton.",
@@ -569,14 +473,9 @@
     "Return to login screen": "Reiri al saluta paĝo",
     "Send Reset Email": "Sendi restarigan retleteron",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Rimarku ke vi salutas la servilon %(hs)s, ne matrix.org.",
-    "The phone number entered looks invalid": "Tiu ĉi telefona numero ŝajnas malvalida",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tiu ĉi hejmservilo ne proponas salutajn fluojn subtenatajn de tiu ĉi kliento.",
-    "Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ <a>ŝaltu malsekurajn skriptojn</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke <a>la SSL-atestilo de via hejmservilo</a> estas fidata, kaj ke neniu foliumila kromprogramo blokas petojn.",
-    "Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo",
-    "Set a display name:": "Agordi vidigan nomon:",
-    "Upload an avatar:": "Alŝuti profilbildon:",
     "This server does not support authentication with a phone number.": "Ĉi tiu servilo ne subtenas aŭtentikigon per telefona numero.",
     "Displays action": "Montras agon",
     "Bans user with given id": "Forbaras uzanton kun la donita identigilo",
@@ -585,11 +484,9 @@
     "Invites user with given id to current room": "Invitas uzanton per identigilo al la nuna ĉambro",
     "Kicks user with given id": "Forpelas uzanton kun la donita identigilo",
     "Changes your display nickname": "Ŝanĝas vian vidigan nomon",
-    "Searches DuckDuckGo for results": "Serĉas rezultojn per DuckDuckGo",
     "Ignores a user, hiding their messages from you": "Malatentas uzanton, kaŝante ĝiajn mesaĝojn de vi",
     "Stops ignoring a user, showing their messages going forward": "Ĉesas malatenti uzanton, montronte ĝiajn pluajn mesaĝojn",
     "Commands": "Komandoj",
-    "Results from DuckDuckGo": "Rezultoj de DuckDuckGo",
     "Emoji": "Mienetoj",
     "Notify the whole room": "Sciigi la tutan ĉambron",
     "Room Notification": "Ĉambra sciigo",
@@ -612,7 +509,6 @@
     "The version of %(brand)s": "La versio de %(brand)s",
     "Your language of choice": "Via preferata lingvo",
     "The information being sent to us to help make %(brand)s better includes:": "La informoj sendataj al ni por plibonigi %(brand)son inkluzivas:",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ŝanĝis sian vidigan nomon al %(displayName)s.",
     "Send an encrypted reply…": "Sendi ĉifritan respondon…",
     "Send an encrypted message…": "Sendi ĉifritan mesaĝon…",
     "Replying": "Respondante",
@@ -627,16 +523,11 @@
     "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al ĉambro",
     "Submit debug logs": "Sendi sencimigan protokolon",
     "Fetching third party location failed": "Malsukcesis trovi lokon de ekstera liveranto",
-    "I understand the risks and wish to continue": "Mi komprenas la riskon kaj volas pluiĝi",
     "Send Account Data": "Sendi kontajn informojn",
-    "Advanced notification settings": "Specialaj agordoj de sciigoj",
-    "Uploading report": "Alŝutante raporton",
     "Sunday": "Dimanĉo",
     "Notification targets": "Celoj de sciigoj",
     "Failed to set direct chat tag": "Malsukcesis agordi la etikedon de rekta babilo",
     "Today": "Hodiaŭ",
-    "Files": "Dosieroj",
-    "You are not receiving desktop notifications": "Vi ne ricevadas sciigojn labortablajn",
     "Friday": "Vendredo",
     "Update": "Ĝisdatigi",
     "What's New": "Kio novas",
@@ -644,23 +535,13 @@
     "Changelog": "Protokolo de ŝanĝoj",
     "Waiting for response from server": "Atendante respondon el la servilo",
     "Send Custom Event": "Sendi propran okazon",
-    "All notifications are currently disabled for all targets.": "Ĉiuj sciigoj nun estas malŝaltitaj por ĉiuj aparatoj.",
-    "Forget": "Forgesi",
-    "You cannot delete this image. (%(code)s)": "Vi ne povas forigi tiun ĉi bildon. (%(code)s)",
-    "Cancel Sending": "Nuligi sendon",
     "This Room": "Ĉi tiu ĉambro",
     "Noisy": "Brue",
     "Room not found": "Ĉambro ne troviĝis",
     "Messages containing my display name": "Mesaĝoj enhavantaj mian vidigan nomon",
     "Messages in one-to-one chats": "Mesaĝoj en duopaj babiloj",
     "Unavailable": "Nedisponebla",
-    "View Decrypted Source": "Vidi malĉifritan fonton",
-    "Failed to update keywords": "Malsukcesis ĝisdatigi la ĉefvortojn",
     "remove %(name)s from the directory.": "forigi %(name)s de la katalogo.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "La sciigoj de la jenaj ĉefvortoj obeas regulojn kiuj ne povas esti montrataj ĉi tie:",
-    "Please set a password!": "Bonvolu agordi pasvorton!",
-    "You have successfully set a password!": "Vi sukcese agordis pasvorton!",
-    "An error occurred whilst saving your email notification preferences.": "Konservo de agordoj pri retpoŝtaj sciigoj eraris.",
     "Explore Room State": "Esplori staton de ĉambro",
     "Source URL": "Fonta URL",
     "Messages sent by bot": "Mesaĝoj senditaj per roboto",
@@ -669,32 +550,20 @@
     "No update available.": "Neniuj ĝisdatigoj haveblas.",
     "Resend": "Resendi",
     "Collecting app version information": "Kolektante informon pri versio de la aplikaĵo",
-    "Enable notifications for this account": "Ŝalti sciigojn por tiu ĉi konto",
     "Invite to this community": "Inviti al tiu ĉi komunumo",
-    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ĉefvortojn</span>",
-    "Error saving email notification preferences": "Konservo de preferoj pri retpoŝtaj sciigoj eraris",
     "Tuesday": "Mardo",
-    "Enter keywords separated by a comma:": "Entajpu ĉefvortojn apartigitajn per komoj:",
     "Search…": "Serĉi…",
-    "You have successfully set a password and an email address!": "Vi sukcese agordis pasvorton kaj retpoŝtadreson!",
     "Remove %(name)s from the directory?": "Ĉu forigi %(name)s de la katalogo?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s uzas multajn specialajn funkciojn, el kiuj kelkaj ne disponeblas aŭ estas eksperimentaj en via nuna foliumilo.",
     "Event sent!": "Okazo sendiĝis!",
     "Explore Account Data": "Esplori kontajn datumojn",
-    "All messages (noisy)": "Ĉiuj mesaĝoj (lauta)",
     "Saturday": "Sabato",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Memoru: vi ĉiam povas agordi retpoŝtadreson en viaj agordoj por uzantoj.",
-    "Direct Chat": "Rekta babilo",
     "The server may be unavailable or overloaded": "La servilo povas esti nedisponebla aŭ troŝarĝita",
     "Reject": "Rifuzi",
-    "Failed to set Direct Message status of room": "Malsukcesis agordi staton de rekteco al la ĉambro",
     "Monday": "Lundo",
     "Remove from Directory": "Forigi de katalogo",
-    "Enable them now": "Ŝalti ilin nun",
     "Toolbox": "Ilaro",
     "Collecting logs": "Kolektante protokolon",
     "You must specify an event type!": "Vi devas specifi tipon de okazo!",
-    "(HTTP status %(httpStatus)s)": "(stato de HTTP %(httpStatus)s)",
     "Invite to this room": "Inviti al ĉi tiu ĉambro",
     "Wednesday": "Merkredo",
     "You cannot delete this message. (%(code)s)": "Vi ne povas forigi tiun ĉi mesaĝon. (%(code)s)",
@@ -706,57 +575,36 @@
     "State Key": "Stata ŝlosilo",
     "Failed to send custom event.": "Malsukcesis sendi propran okazon.",
     "What's new?": "Kio novas?",
-    "Notify me for anything else": "Sciigu min pri ĉio alia",
     "When I'm invited to a room": "Kiam mi estas invitita al ĉambro",
-    "Keywords": "Ĉefvortoj",
-    "Can't update user notification settings": "Agordoj de sciigoj al uzanto ne ĝisdatigeblas",
-    "Notify for all other messages/rooms": "Sciigu min por ĉiuj aliaj mesaĝoj/ĉambroj",
     "Unable to look up room ID from server": "Ne povas akiri ĉambran identigilon de la servilo",
     "Couldn't find a matching Matrix room": "Malsukcesis trovi akordan ĉambron en Matrix",
     "All Rooms": "Ĉiuj ĉambroj",
     "Thursday": "Ĵaŭdo",
-    "Forward Message": "Plusendi mesaĝon",
     "Back": "Reen",
-    "Failed to change settings": "Malsukcesis ŝanĝi la agordojn",
     "Reply": "Respondi",
     "Show message in desktop notification": "Montradi mesaĝojn en labortablaj sciigoj",
-    "Unhide Preview": "Malkaŝi antaŭrigardon",
     "Unable to join network": "Ne povas konektiĝi al la reto",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Pardonon, via foliumilo <b>ne kapablas</b> funkciigi klienton %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Alŝutita je %(date)s de %(user)s",
     "Messages in group chats": "Mesaĝoj en grupaj babiloj",
     "Yesterday": "Hieraŭ",
     "Error encountered (%(errorDetail)s).": "Okazis eraro (%(errorDetail)s).",
     "Low Priority": "Malalta prioritato",
-    "Unable to fetch notification target list": "Ne povas akiri la liston de celoj por sciigoj",
-    "Set Password": "Agordi pasvorton",
     "Off": "Ne",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ne scias aliĝi al ĉambroj en tiu ĉi reto",
-    "Mentions only": "Nur mencioj",
     "Failed to remove tag %(tagName)s from room": "Malsukcesis forigi etikedon %(tagName)s el la ĉambro",
-    "You can now return to your account after signing out, and sign in on other devices.": "Vi nun rajtas reveni al via konto post adiaŭo, kaj saluti per ĝi kun aliaj aparatoj.",
-    "Enable email notifications": "Ŝalti retpoŝtajn sciigojn",
     "Event Type": "Tipo de okazo",
-    "Download this file": "Elŝuti ĉi tiun dosieron",
-    "Pin Message": "Fiksi mesaĝon",
     "Thank you!": "Dankon!",
     "View Community": "Vidi Komunumon",
     "Developer Tools": "Evoluigiloj",
     "View Source": "Vidi fonton",
     "Event Content": "Enhavo de okazo",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Kun via nuna foliumilo, la aspekto kaj funkciado de la aplikaĵo povas esti tute malĝusta, kaj kelkaj aŭ ĉiu funkcioj eble ne tute funkcios. Se vi tamen volas provi, vi povas daŭrigi, sed vi ricevos nenian subtenon se vi renkontos problemojn!",
     "Checking for an update...": "Serĉante ĝisdatigojn…",
     "Logs sent": "Protokolo sendiĝis",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian uzantonomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
     "Preparing to send logs": "Pretigante sendon de protokolo",
     "e.g. %(exampleValue)s": "ekz. %(exampleValue)s",
     "Every page you use in the app": "Ĉiu paĝo kiun vi uzas en la aplikaĵo",
     "e.g. <CurrentPageURL>": "ekz. <CurrentPageURL>",
     "Your device resolution": "La distingumo de via aparato",
-    "Call in Progress": "Voko farata",
-    "A call is already in progress!": "Voko estas jam farata!",
-    "Always show encryption icons": "Ĉiam montri bildetojn de ĉifrado",
     "Send analytics data": "Sendi statistikajn datumojn",
     "Key request sent.": "Peto de ŝlosilo sendita.",
     "Permission Required": "Necesas permeso",
@@ -764,7 +612,6 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s agordis la ĉefan adreson por la ĉambro al %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s forigis la ĉefan adreson de la ĉambro.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Bonvolu <a>kontakti administranton de la servo</a> por daŭre uzadi la servon.",
-    "A call is currently being placed!": "Alia voko nun dumas!",
     "Unable to load! Check your network connectivity and try again.": "Ne eblas enlegi! Kontrolu vian retan konekton kaj reprovu.",
     "Failed to invite users to the room:": "Malsukcesis inviti uzantojn al la ĉambro:",
     "Opens the Developer Tools dialog": "Maflermas evoluigistan interagujon",
@@ -800,7 +647,6 @@
     "There was an error joining the room": "Aliĝo al la ĉambro eraris",
     "Sorry, your homeserver is too old to participate in this room.": "Pardonon, via hejmservilo estas tro malnova por partoprenado en la ĉambro.",
     "Please contact your homeserver administrator.": "Bonvolu kontakti la administranton de via hejmservilo.",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Montri memorigilon por ŝalti Sekuran ricevon de mesaĝoj en ĉifrataj ĉambroj",
     "Show developer tools": "Montri verkistajn ilojn",
     "Messages containing @room": "Mesaĝoj enhavantaj @room",
     "Encrypted messages in one-to-one chats": "Ĉifritaj mesaĝoj en duopaj babiloj",
@@ -810,7 +656,6 @@
     "Theme": "Haŭto",
     "General": "Ĝeneralaj",
     "<a>In reply to</a> <pill>": "<a>Responde al</a> <pill>",
-    "Share Message": "Diskonigi",
     "Whether or not you're logged in (we don't record your username)": "Ĉu vi salutis aŭ ne (ni ne registras vian uzantonomon)",
     "You do not have permission to start a conference call in this room": "Vi ne havas permeson komenci grupvokon en ĉi tiu ĉambro",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "La dosiero '%(fileName)s' superas la grandecan limon de ĉi tiu hejmservilo",
@@ -899,7 +744,6 @@
     "Composer": "Komponilo",
     "Room list": "Ĉambrolisto",
     "Ignored users": "Malatentaj uzantoj",
-    "Key backup": "Sekurkopio de ŝlosilo",
     "Security & Privacy": "Sekureco kaj Privateco",
     "Voice & Video": "Voĉo kaj vido",
     "Room information": "Informoj pri ĉambro",
@@ -921,7 +765,6 @@
     "Change settings": "Ŝanĝi agordojn",
     "Kick users": "Forpeli uzantojn",
     "Ban users": "Forbari uzantojn",
-    "Remove messages": "Forigi mesaĝojn",
     "Notify everyone": "Sciigi ĉiujn",
     "Muted Users": "Silentigitaj uzantoj",
     "Roles & Permissions": "Roloj kaj Permesoj",
@@ -930,13 +773,10 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vidita de %(displayName)s (%(userName)s) je %(dateTime)s",
     "Share room": "Kunhavigi ĉambron",
     "System Alerts": "Sistemaj avertoj",
-    "Not now": "Ne nun",
-    "Don't ask me again": "Ne demandu min denove",
     "Main address": "Ĉefa adreso",
     "Room avatar": "Profilbildo de ĉambro",
     "Room Name": "Nomo de ĉambro",
     "Room Topic": "Temo de ĉambro",
-    "Failed to remove widget": "Malsukcesis forigi fenestraĵon",
     "Join": "Aliĝi",
     "Invite anyway": "Tamen inviti",
     "To continue, please enter your password:": "Por daŭrigi, bonvoluenigi vian pasvorton:",
@@ -945,12 +785,10 @@
     "Room Settings - %(roomName)s": "Agordoj de ĉambro – %(roomName)s",
     "Failed to upgrade room": "Malsukcesis gradaltigi ĉambron",
     "Refresh": "Aktualigi",
-    "Checking...": "Kontrolante…",
     "Share Room": "Kunhavigi ĉambron",
     "Share User": "Kunhavigi uzanton",
     "Share Community": "Kunhavigi komunumon",
     "Share Room Message": "Kunhavigi ĉambran mesaĝon",
-    "COPY": "KOPII",
     "Next": "Sekva",
     "Clear status": "Vakigi staton",
     "Update status": "Ĝisdatigi staton",
@@ -958,19 +796,11 @@
     "Set a new status...": "Agordi novan staton...",
     "Hide": "Kaŝi",
     "Code": "Kodo",
-    "Server Name": "Nomo de servilo",
     "Username": "Uzantonomo",
-    "Not sure of your password? <a>Set a new one</a>": "Ĉu vi ne certas pri via pasvorto? <a>Agordu novan</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Saluti per via Matrix-konto sur %(serverName)s",
     "Change": "Ŝanĝi",
-    "Create your Matrix account on %(serverName)s": "Krei vian Matrix-konton sur %(serverName)s",
     "Email (optional)": "Retpoŝto (malnepra)",
     "Phone (optional)": "Telefono (malnepra)",
     "Confirm": "Konfirmi",
-    "Other servers": "Aliaj serviloj",
-    "Homeserver URL": "Hejmservila URL",
-    "Identity Server URL": "URL de identiga servilo",
-    "Free": "Senpaga",
     "Other": "Alia",
     "Couldn't load page": "Ne povis enlegi paĝon",
     "Unable to join community": "Ne povas aliĝi al komunumo",
@@ -979,19 +809,15 @@
     "Leave this community": "Forlasi ĉi tiun komunumon",
     "Everyone": "Ĉiuj",
     "This homeserver does not support communities": "Ĉi tiu hejmservilo ne subtenas komunumojn",
-    "%(count)s of your messages have not been sent.|other": "Kelkaj viaj mesaĝoj ne sendiĝis.",
-    "%(count)s of your messages have not been sent.|one": "Via mesaĝo ne sendiĝis.",
     "Clear filter": "Vakigi filtrilon",
     "Guest": "Gasto",
     "Could not load user profile": "Ne povis enlegi profilon de uzanto",
-    "Your Matrix account on %(serverName)s": "Via Matrix-konto sur %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Kontrola retpoŝtmesaĝo estos sendita al via enirkesto por kontroli agordadon de via nova pasvorto.",
     "Sign in instead": "Anstataŭe saluti",
     "Your password has been reset.": "Vi reagordis vian pasvorton.",
     "Set a new password": "Agordi novan pasvorton",
     "General failure": "Ĝenerala fiasko",
     "Create account": "Krei konton",
-    "Create your account": "Krei vian konton",
     "Keep going...": "Daŭrigu…",
     "That matches!": "Tio akordas!",
     "That doesn't match.": "Tio ne akordas.",
@@ -1042,7 +868,6 @@
     "Show avatars in user and room mentions": "Montri profilbildojn en mencioj de uzantoj kaj ĉambroj",
     "Enable big emoji in chat": "Ŝalti grandajn bildsignojn en babilejo",
     "Send typing notifications": "Sendi sciigojn pri tajpado",
-    "Allow Peer-to-Peer for 1:1 calls": "Permesi samtavolan teĥnikon por duopaj vokoj",
     "Prompt before sending invites to potentially invalid matrix IDs": "Averti antaŭ ol sendi invitojn al eble nevalidaj Matrix-identigiloj",
     "Messages containing my username": "Mesaĝoj enhavantaj mian uzantnomon",
     "When rooms are upgraded": "Kiam ĉambroj gradaltiĝas",
@@ -1064,14 +889,10 @@
     "Restore from Backup": "Rehavi el savkopio",
     "Backing up %(sessionsRemaining)s keys...": "Savkopiante %(sessionsRemaining)s ŝlosilojn…",
     "All keys backed up": "Ĉiuj ŝlosiloj estas savkopiitaj",
-    "Backup version: ": "Versio de savkopio: ",
-    "Algorithm: ": "Algoritmo: ",
     "Back up your keys before signing out to avoid losing them.": "Savkopiu viajn ŝlosilojn antaŭ adiaŭo, por ilin ne perdi.",
-    "Add an email address to configure email notifications": "Aldonu retpoŝtadreson por agordi retpoŝtajn sciigojn",
     "Unable to verify phone number.": "Ne povas kontroli telefonnumeron.",
     "Verification code": "Kontrola kodo",
     "Deactivating your account is a permanent action - be careful!": "Malaktivigo de via konto estas nemalfarebla – atentu!",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Se vi raportis eraron per GitHub, senerariga protokolo povas helpi al ni spuri la problemon. Senerariga protokolo povas enhavi datumojn pri uzo de la aplikaĵo, inkluzive vian uzantnomon, identigilojn aŭ nomojn de la vizititaj ĉambroj aŭ grupoj, kaj uzantnomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Accept all %(invitedRooms)s invites": "Akcepti ĉiujn %(invitedRooms)s invitojn",
     "Missing media permissions, click the button below to request.": "Mankas aŭdovidaj permesoj; klaku al la suba butono por peti.",
     "Request media permissions": "Peti aŭdovidajn permesojn",
@@ -1080,7 +901,6 @@
     "View older messages in %(roomName)s.": "Montri pli malnovajn mesaĝojn en %(roomName)s.",
     "Account management": "Administrado de kontoj",
     "This event could not be displayed": "Ĉi tiu okazo ne povis montriĝi",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali foliumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vi estas administranto de tiu ĉi komunumo. Sen invito de alia administranto vi ne povos re-aliĝi.",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Ŝanĝoj al viaj komunumaj <bold1>nomo</bold1> kaj <bold2>profilbildo</bold2> eble ne montriĝos al aliaj uzantoj ĝis 30 minutoj.",
     "Who can join this community?": "Kiu povas aliĝi al tiu ĉi komunumo?",
@@ -1097,14 +917,9 @@
     "Click here to see older messages.": "Klaku ĉi tien por vidi pli malnovajn mesaĝojn.",
     "edited": "redaktita",
     "Failed to load group members": "Malsukcesis enlegi grupanojn",
-    "An error ocurred whilst trying to remove the widget from the room": "Forigo de la fenestraĵo el la ĉambro eraris",
-    "Minimize apps": "Plejetigi aplikaĵojn",
-    "Maximize apps": "Plejgrandigi aplikaĵojn",
     "Popout widget": "Fenestrigi fenestraĵon",
     "Rotate Left": "Turni maldekstren",
-    "Rotate counter-clockwise": "Turni kontraŭhorloĝe",
     "Rotate Right": "Turni dekstren",
-    "Rotate clockwise": "Turni laŭhorloĝe",
     "Edit message": "Redakti mesaĝon",
     "This room has already been upgraded.": "Ĉi tiu ĉambro jam gradaltiĝis.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ĉi tiu ĉambro uzas ĉambran version <roomVersion />, kiun la hejmservilo markis kiel <i>nestabilan</i>.",
@@ -1133,9 +948,6 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Ĉi tiu ĉambro ne ekzistas. Ĉu vi certe provas la ĝustan lokon?",
     "Try again later, or ask a room admin to check if you have access.": "Reprovu poste, aŭ petu administranton kontroli, ĉu vi rajtas aliri.",
     "%(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>.": "Okazis eraro %(errcode)s dum aliro al la ĉambro. Se vi pensas, ke vi mise vidas la eraron, bonvolu <issueLink>raporti problemon</issueLink>.",
-    "Never lose encrypted messages": "Neniam perdu ĉifritajn mesaĝojn",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Nur vi kaj la ricevonto(j) havas la ŝlosilojn necesajn por ilin legi.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Savkopiu sekure viajn ŝlosilojn por ilin ne perdi. <a>Eksciu plion.</a>",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Gradaltigo de la ĉambro forigos la nunan ĉambron kaj kreos novan kun la sama nomo.",
     "You don't currently have any stickerpacks enabled": "Vi havas neniujn ŝaltitajn glumarkarojn",
     "Add some now": "Iujn aldoni",
@@ -1162,7 +974,6 @@
     "Put a link back to the old room at the start of the new room so people can see old messages": "Metos en la novan ĉambron ligilon al la malnova, por ke oni povu rigardi la malnovajn mesaĝojn",
     "Sign out and remove encryption keys?": "Ĉu adiaŭi kaj forigi ĉifrajn ŝlosilojn?",
     "Send Logs": "Sendi protokolon",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Uzantonomo povas enhavi nur minusklojn, numerojn, kaj la signojn: =_-./",
     "Link to most recent message": "Ligi al plej freŝa mesaĝo",
     "Link to selected message": "Ligi al elektita mesaĝo",
     "To help us prevent this in future, please <a>send us logs</a>.": "Por malhelpi tion ose, bonvolu <a>sendi al ni protokolon</a>.",
@@ -1177,38 +988,23 @@
     "Upload %(count)s other files|one": "Alŝuti %(count)s alian dosieron",
     "Cancel All": "Nuligi ĉion",
     "Upload Error": "Alŝuto eraris",
-    "A widget would like to verify your identity": "Fenestraĵo volas kontroli vian identecon",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Fenestraĵo de %(widgetUrl)s volas kontroli vian identecon. Se vi permesos tion, ĝi povos kontroli vian identigilon de uzanto, sed ne agi per vi.",
     "Remember my selection for this widget": "Memoru mian elekton por tiu ĉi fenestraĵo",
-    "Deny": "Rifuzi",
     "Unable to load backup status": "Ne povas legi staton de savkopio",
-    "Collapse Reply Thread": "Maletendi respondan fadenon",
     "This homeserver would like to make sure you are not a robot.": "Ĉi tiu hejmservilo volas certigi, ke vi ne estas roboto.",
     "Please review and accept all of the homeserver's policies": "Bonvolu tralegi kaj akcepti ĉioman politikon de ĉi tiu hejmservilo",
     "Please review and accept the policies of this homeserver:": "Bonvolu tralegi kaj akcepti la politikon de ĉi tiu hejmservilo:",
-    "Unable to validate homeserver/identity server": "Ne povas kontroli hejmservilon aŭ identigan servilon",
-    "The email field must not be blank.": "La kampo de retpoŝtadreso ne estu malplena.",
-    "The username field must not be blank.": "La kampo de uzantonomo ne estu malplena.",
-    "The phone number field must not be blank.": "La kampo de telefonnumero ne estu malplena.",
-    "The password field must not be blank.": "La kampo de pasvorto ne estu malplena.",
-    "Sign in to your Matrix account on <underlinedServerName />": "Saluti per via Matrix-konto sur <underlinedServerName />",
     "Use an email address to recover your account": "Uzu retpoŝtadreson por rehavi vian konton",
     "Enter email address (required on this homeserver)": "Enigu retpoŝtadreson (ĉi tiu hejmservilo ĝin postulas)",
     "Doesn't look like a valid email address": "Tio ne ŝajnas esti valida retpoŝtadreso",
     "Enter password": "Enigu pasvorton",
     "Password is allowed, but unsafe": "Pasvorto estas permesita, sed nesekura",
     "Nice, strong password!": "Bona, forta pasvorto!",
-    "Create your Matrix account on <underlinedServerName />": "Krei vian Matrix-konton sur <underlinedServerName />",
     "Join millions for free on the largest public server": "Senpage aliĝu al milionoj sur la plej granda publika servilo",
-    "Premium": "Paga",
-    "Premium hosting for organisations <a>Learn more</a>": "Paga gastigo por organizaĵoj <a>Eksciu plion</a>",
     "Want more than a community? <a>Get your own server</a>": "Ĉu vi volas plion ol nur komunumon? <a>Akiru propran servilon</a>",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ĉi tiu ĉambro uziĝas por gravaj mesaĝoj de la hejmservilo, kaj tial vi ne povas foriri.",
     "Add room": "Aldoni ĉambron",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Vi havas %(count)s nelegitajn sciigojn en antaŭa versio de ĉi tiu ĉambro.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Vi havas %(count)s nelegitan sciigon en antaŭa versio de ĉi tiu ĉambro.",
-    "Your profile": "Via profilo",
-    "Your Matrix account on <underlinedServerName />": "Via Matrix-konto sur <underlinedServerName />",
     "This homeserver does not support login using email address.": "Ĉi tiu hejmservilo ne subtenas saluton per retpoŝtadreso.",
     "Registration has been disabled on this homeserver.": "Registriĝoj malŝaltiĝis sur ĉi tiu hejmservilo.",
     "Unable to query for supported registration methods.": "Ne povas peti subtenatajn registrajn metodojn.",
@@ -1239,13 +1035,11 @@
     "Unexpected error resolving homeserver configuration": "Neatendita eraro eltrovi hejmservilajn agordojn",
     "Unexpected error resolving identity server configuration": "Neatendita eraro eltrovi agordojn de identiga servilo",
     "Changes your avatar in all rooms": "Ŝanĝas vian profilbildon en ĉiuj ĉàmbroj",
-    "%(senderName)s made no change.": "%(senderName)s nenion ŝanĝis.",
     "Straight rows of keys are easy to guess": "Rektaj vicoj de klavoj estas facile diveneblaj",
     "Short keyboard patterns are easy to guess": "Mallongaj ripetoj de klavoj estas facile diveneblaj",
     "Enable Community Filter Panel": "Ŝalti komunume filtran panelon",
     "Enable widget screenshots on supported widgets": "Ŝalti bildojn de fenestraĵoj por subtenataj fenestraĵoj",
     "Show hidden events in timeline": "Montri kaŝitajn okazojn en historio",
-    "Low bandwidth mode": "Reĝimo de malmulta kapacito",
     "Start using Key Backup": "Ekuzi Savkopiadon de ŝlosiloj",
     "Timeline": "Historio",
     "Autocomplete delay (ms)": "Prokrasto de memaga kompletigo",
@@ -1271,7 +1065,6 @@
     "Removing…": "Forigante…",
     "I don't want my encrypted messages": "Mi ne volas miajn ĉifritajn mesaĝojn",
     "No backup found!": "Neniu savkopio troviĝis!",
-    "Resend edit": "Resendi redakton",
     "Go to Settings": "Iri al agordoj",
     "Flair": "Insigno",
     "No Audio Outputs detected": "Neniu soneligo troviĝis",
@@ -1310,54 +1103,36 @@
     "Are you sure you want to sign out?": "Ĉu vi certe volas adiaŭi?",
     "Your homeserver doesn't seem to support this feature.": "Via hejmservilo ŝajne ne subtenas ĉi tiun funkcion.",
     "Message edits": "Redaktoj de mesaĝoj",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Se vi renkontas problemojn aŭ havas prikomentojn, bonvolu sciigi nin per GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Por eviti duoblajn raportojn, bonvolu unue <existingIssuesLink>rigardi jamajn raportojn</existingIssuesLink> (kaj meti +1) aŭ <newIssueLink>raporti novan problemon</newIssueLink> se vi neniun trovos.",
-    "Report bugs & give feedback": "Raporti erarojn kaj sendi prikomentojn",
     "Clear Storage and Sign Out": "Vakigi memoron kaj adiaŭi",
     "We encountered an error trying to restore your previous session.": "Ni renkontis eraron provante rehavi vian antaŭan salutaĵon.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vakigo de la memoro de via foliumilo eble korektos la problemon, sed adiaŭigos vin, kaj malebligos legadon de historio de ĉifritaj babiloj.",
     "Missing session data": "Mankas datumoj de salutaĵo",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Iuj datumoj de salutaĵo, inkluzive viajn ĉifrajn ŝlosilojn, mankas. Por tion korekti, resalutu, kaj rehavu la ŝlosilojn el savkopio.",
-    "Your browser likely removed this data when running low on disk space.": "Via foliumilo probable forigos ĉi tiujn datumojn kiam al ĝi mankos spaco sur disko.",
+    "Your browser likely removed this data when running low on disk space.": "Via foliumilo verŝajne forigos ĉi tiujn datumojn kiam al ĝi mankos spaco sur disko.",
     "Unable to restore backup": "Ne povas rehavi savkopion",
     "Failed to decrypt %(failedCount)s sessions!": "Malsukcesis malĉifri%(failedCount)s salutaĵojn!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Averto</b>: vi agordu ŝlosilan savkopion nur per fidata komputilo.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Aliru vian sekuran mesaĝan historion kaj agordu sekuran mesaĝadon per enigo de via rehava pasfrazo.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se vi forgesis vian rehavan pasfrazon, vi povas <button1>uzi viajn rehavan ŝlosilon</button1> aŭ <button2>agordi novajn rehavajn elektojn</button2>",
-    "This looks like a valid recovery key!": "Ŝajnas esti valida rehava ŝlosilo!",
-    "Not a valid recovery key": "Ne estas valida rehava ŝlosilo",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Aliru vian sekuran mesaĝan historion kaj agordu sekuran mesaĝadon per enigo de via rehava ŝlosilo.",
     "Resend %(unsentCount)s reaction(s)": "Resendi %(unsentCount)s reago(j)n",
-    "Resend removal": "Resendi forigon",
-    "Share Permalink": "Kunhavi daŭran ligilon",
     "Passwords don't match": "Pasvortoj ne akordas",
     "Other users can invite you to rooms using your contact details": "Aliaj uzantoj povas inviti vin al ĉambroj per viaj kontaktaj detaloj",
     "Enter phone number (required on this homeserver)": "Enigu telefonnumeron (bezonata sur ĉi tiu hejmservilo)",
-    "Doesn't look like a valid phone number": "Ne ŝajnas esti valida telefonnumero",
     "Use lowercase letters, numbers, dashes and underscores only": "Uzu nur malgrandajn leterojn, numerojn, streketojn kaj substrekojn",
     "Enter username": "Enigu uzantonomon",
     "Some characters not allowed": "Iuj signoj ne estas permesitaj",
-    "Find other public servers or use a custom server": "Trovi aliajn publikajn servilojn aŭ uzi propran",
     "Terms and Conditions": "Uzokondiĉoj",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Por daŭre uzadi la hejmservilon %(homeserverDomain)s, vi devas tralegi kaj konsenti niajn uzokondiĉojn.",
     "Review terms and conditions": "Tralegi uzokondiĉojn",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Ĉu vi sciis: vi povas uzi komunumojn por filtri vian sperton de %(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.": "Por agordi filtrilon, tiru komunuman profilbildon sur la filtran panelon je la maldekstra flanko. Vi povas klaki profilbildon en la filtra panelo iam ajn, por vidi nur ĉambrojn kaj personojn ligitajn al ties komunumo.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s malsukcesis akiri liston de protokoloj de la hejmservilo. Eble la hejmservilo estas tro malnova por subteni eksterajn retojn.",
     "%(brand)s failed to get the public room list.": "%(brand)s malsukcesis akiri la liston de publikaj ĉambroj.",
     "The homeserver may be unavailable or overloaded.": "La hejmservilo eble estas neatingebla aŭ troŝarĝita.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vi ne povas sendi mesaĝojn ĝis vi tralegos kaj konsentos <consentLink>niajn uzokondiĉojn</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.": "Via mesaĝo ne sendiĝis, ĉar tiu ĉi hejmservilo atingis sian monatan limon de aktivaj uzantoj. Bonvolu <a>kontakti vian administranton de servo</a> por plue uzadi la servon.",
     "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.": "Via mesaĝo ne sendiĝis, ĉar tiu ĉi hejmservilo atingis rimedan limon. Bonvolu <a>kontakti vian administranton de servo</a> por plue uzadi la servon.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Ĉion resendi</resendText> aŭ <cancelText>ĉion nuligi</cancelText> nun. Vi ankaŭ povas elekti unuopajn mesaĝojn por sendo aŭ nuligo.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Mesaĝon resendi</resendText> aŭ <cancelText>mesaĝon nuligi</cancelText> nun.",
     "Forgotten your password?": "Ĉu vi forgesis vian pasvorton?",
     "You're signed out": "Vi adiaŭis",
     "Clear personal data": "Vakigi personajn datumojn",
-    "If you don't want to set this up now, you can later in Settings.": "Se vi ne volas agordi tion nun, vi povas fari ĝin poste per agordoj.",
-    "Don't ask again": "Ne demandi ree",
     "New Recovery Method": "Nova rehava metodo",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Novaj rehava pasfrazo kaj ŝlosilo por Sekuraj mesaĝoj troviĝis.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se vi ne agordis la novan rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj.",
     "Set up Secure Messages": "Agordi Sekurajn mesaĝojn",
     "Recovery Method Removed": "Rehava metodo foriĝis",
@@ -1389,13 +1164,9 @@
     "Set up Secure Message Recovery": "Agordi Sekuran rehavon de mesaĝoj",
     "Starting backup...": "Komencante savkopion…",
     "Unable to create key backup": "Ne povas krei savkopion de ŝlosiloj",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Sen agordo de Sekura rehavo de mesaĝoj, vi perdos vian sekuran historion de mesaĝoj per adiaŭo.",
     "Bulk options": "Amasaj elektebloj",
-    "Your Modular server": "Via Modular-servilo",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Enigu la lokon de via Modular-hejmservilo. Ĝi povas uzi vian propran domajnan nomon aŭ esti subdomajno de <a>modular.im</a>.",
     "Invalid base_url for m.homeserver": "Nevalida base_url por m.homeserver",
     "Invalid base_url for m.identity_server": "Nevalida base_url por m.identity_server",
-    "Identity Server": "Identiga servilo",
     "Find others by phone or email": "Trovu aliajn per telefonnumero aŭ retpoŝtadreso",
     "Be found by phone or email": "Troviĝu per telefonnumero aŭ retpoŝtadreso",
     "Use bots, bridges, widgets and sticker packs": "Uzu robotojn, pontojn, fenestraĵojn, kaj glumarkarojn",
@@ -1420,11 +1191,7 @@
     "Actions": "Agoj",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Uzu identigan servilon por inviti retpoŝte. Klaku al « daŭrigi » por uzi la norman identigan servilon (%(defaultIdentityServerName)s) aŭ administru tion en Agordoj.",
     "Displays list of commands with usages and descriptions": "Montras liston de komandoj kun priskribo de uzo",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Sendi legokonfirmojn de mesaĝoj (bezonas akordan hejmservilon por malŝalto)",
     "Accept <policyLink /> to continue:": "Akceptu <policyLink /> por daŭrigi:",
-    "Identity Server URL must be HTTPS": "URL de identiga servilo devas esti HTTPS-a",
-    "Not a valid Identity Server (status code %(code)s)": "Nevalida identiga servilo (statkodo %(code)s)",
-    "Could not connect to Identity Server": "Ne povis konektiĝi al identiga servilo",
     "Checking server": "Kontrolante servilon",
     "Change identity server": "Ŝanĝi identigan servilon",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Ĉu malkonekti de la nuna identiga servilo <current /> kaj konekti anstataŭe al <new />?",
@@ -1438,7 +1205,6 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Vi ankoraŭ <b>havigas siajn personajn datumojn</b> je la identiga servilo <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Ni rekomendas, ke vi forigu viajn retpoŝtadresojn kaj telefonnumerojn de la identiga servilo, antaŭ ol vi malkonektiĝos.",
     "Disconnect anyway": "Tamen malkonekti",
-    "Identity Server (%(server)s)": "Identiga servilo (%(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.": "Vi nun uzas servilon <server></server> por trovi kontaktojn, kaj troviĝi de ili. Vi povas ŝanĝi vian identigan servilon sube.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se vi ne volas uzi servilon <server /> por trovi kontaktojn kaj troviĝi mem, enigu alian identigan servilon sube.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Vi nun ne uzas identigan servilon. Por trovi kontaktojn kaj troviĝi de ili mem, aldonu iun sube.",
@@ -1469,11 +1235,7 @@
     "Italics": "Kursive",
     "Strikethrough": "Trastrekite",
     "Code block": "Kodujo",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Agordi retpoŝtadreson por rehavo de konto. Uzu retpoŝton aŭ telefonon por laŭelekte troviĝi de jamaj kontaktoj.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Agordi retpoŝtadreson por rehavo de konto. Uzu retpoŝton por laŭelekte troviĝi de jamaj kontaktoj.",
-    "Explore": "Esplori",
     "Filter": "Filtri",
-    "Filter rooms…": "Filtri ĉambrojn…",
     "Preview": "Antaŭrigardo",
     "View": "Rigardo",
     "Find a room…": "Trovi ĉambron…",
@@ -1484,14 +1246,12 @@
     "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.": "Ĉi tiu ago bezonas atingi la norman identigan servilon <server /> por kontroli retpoŝtadreson aŭ telefonnumeron, sed la servilo ne havas uzokondiĉojn.",
     "Trust": "Fido",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Multiple integration managers": "Pluraj kunigiloj",
     "Show previews/thumbnails for images": "Montri antaŭrigardojn/bildetojn je bildoj",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Vi <b>forigu viajn personajn datumojn</b> de identiga servilo <idserver /> antaŭ ol vi malkonektiĝos. Bedaŭrinde, identiga servilo <idserver /> estas nuntempe eksterreta kaj ne eblas ĝin atingi.",
     "You should:": "Vi:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "kontrolu kromprogramojn de via foliumilo je ĉio, kio povus malhelpi konekton al la identiga servilo (ekzemple « Privacy Badger »)",
     "contact the administrators of identity server <idserver />": "kontaktu la administrantojn de la identiga servilo <idserver />",
     "wait and try again later": "atendu kaj reprovu pli poste",
-    "Integration Manager": "Kunigilo",
     "Clear cache and reload": "Vakigi kaŝmemoron kaj relegi",
     "Show tray icon and minimize window to it on close": "Montri pletan bildsimbolon kaj tien plejetigi la fenestron je fermo",
     "Read Marker lifetime (ms)": "Vivodaŭro de legomarko (ms)",
@@ -1514,7 +1274,6 @@
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Vi estas forigonta 1 mesaĝon de %(user)s. Ne eblas tion malfari. Ĉu vi volas pluigi?",
     "Remove %(count)s messages|one": "Forigi 1 mesaĝon",
     "Room %(name)s": "Ĉambro %(name)s",
-    "Recent rooms": "Freŝaj vizititaj ĉambroj",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Eraris (%(errcode)s) validigo de via invito. Vi povas transdoni ĉi tiun informon al ĉambra administranto.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Ĉi tiu invito al %(roomName)s sendiĝis al %(email)s, kiu ne estas ligita al via konto",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Ligu ĉi tiun retpoŝtadreson al via konto en Agordoj por ricevadi invitojn rekte per %(brand)s.",
@@ -1525,7 +1284,6 @@
     "%(count)s unread messages including mentions.|one": "1 nelegita mencio.",
     "%(count)s unread messages.|other": "%(count)s nelegitaj mesaĝoj.",
     "%(count)s unread messages.|one": "1 nelegita mesaĝo.",
-    "Unread mentions.": "Nelegitaj mencioj.",
     "Unread messages.": "Nelegitaj mesaĝoj.",
     "Failed to deactivate user": "Malsukcesis malaktivigi uzanton",
     "This client does not support end-to-end encryption.": "Ĉi tiu kliento ne subtenas tutvojan ĉifradon.",
@@ -1559,14 +1317,11 @@
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. Administru per <settings>Agordoj</settings>.",
     "Close dialog": "Fermi interagujon",
     "Please enter a name for the room": "Bonvolu enigi nomon por la ĉambro",
-    "This room is private, and can only be joined by invitation.": "Ĉi tiu ĉambro estas privata, kaj eblas aliĝi nur per invito.",
     "Create a public room": "Krei publikan ĉambron",
     "Create a private room": "Krei privatan ĉambron",
     "Topic (optional)": "Temo (malnepra)",
-    "Make this room public": "Publikigi ĉi tiun ĉambron",
     "Hide advanced": "Kaŝi specialajn",
     "Show advanced": "Montri specialajn",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Bloki aliĝojn al ĉi tiu ĉambro de uzantoj el aliaj Matrix-serviloj (Ĉi tiun agordon ne eblas poste ŝanĝi!)",
     "Please fill why you're reporting.": "Bonvolu skribi, kial vi raportas.",
     "Report Content to Your Homeserver Administrator": "Raporti enhavon al la administrantode via hejmservilo",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Per raporto de ĉi tiu mesaĝo vi sendos ĝian unikan «identigilon de okazo» al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
@@ -1575,26 +1330,21 @@
     "To continue you need to accept the terms of this service.": "Por pluigi, vi devas akcepti la uzokondiĉojn de ĉi tiu servo.",
     "Document": "Dokumento",
     "Report Content": "Raporti enhavon",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Neniu identiga servilo estas agordita, kaj tial vi ne povas aldoni retpoŝtadreson por ose restarigi vian pasvorton.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Enigu vian propran hejmservilan URL-on. <a>Kion tio signifas?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Enigu vian propran URL-on de identiga servilo. <a>Kion tio signifas?</a>",
     "%(creator)s created and configured the room.": "%(creator)s kreis kaj agordis la ĉambron.",
     "Find a room… (e.g. %(exampleRoom)s)": "Trovi ĉambron… (ekzemple (%(exampleRoom)s)",
     "Jump to first unread room.": "Salti al unua nelegita ĉambro.",
     "Jump to first invite.": "Salti al unua invito.",
-    "No identity server is configured: add one in server settings to reset your password.": "Neniu identiga servilo estas agordita: aldonu iun per la servilaj agordoj, por restarigi vian pasvorton.",
     "Command Autocomplete": "Memkompletigo de komandoj",
     "Community Autocomplete": "Memkompletigo de komunumoj",
-    "DuckDuckGo Results": "Rezultoj de DuckDuckGo",
     "Emoji Autocomplete": "Memkompletigo de mienetoj",
     "Notification Autocomplete": "Memkompletigo de sciigoj",
     "Room Autocomplete": "Memkompletigo de ĉambroj",
     "User Autocomplete": "Memkompletigo de uzantoj",
     "Custom (%(level)s)": "Propra (%(level)s)",
-    "%(senderName)s placed a voice call.": "%(senderName)s metis voĉvokon.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s metis voĉvokon. (mankas subteno en ĉi tiu foliumilo)",
-    "%(senderName)s placed a video call.": "%(senderName)s metis vidvokon.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s metis vidvokon. (mankas subteno en ĉi tiu foliumilo)",
+    "%(senderName)s placed a voice call.": "%(senderName)s ekigis voĉvokon.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s ekigis voĉvokon. (mankas subteno en ĉi tiu foliumilo)",
+    "%(senderName)s placed a video call.": "%(senderName)s ekigis vidvokon.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ekigis vidvokon. (mankas subteno en ĉi tiu foliumilo)",
     "Try out new ways to ignore people (experimental)": "Elprovi novajn manierojn malatenti personojn (eksperimente)",
     "Match system theme": "Similiĝi la sisteman haŭton",
     "My Ban List": "Mia listo de forbaroj",
@@ -1641,7 +1391,6 @@
     "Other users may not trust it": "Aliaj uzantoj eble ne kredas ĝin",
     "Later": "Pli poste",
     "Verify": "Kontroli",
-    "Set up encryption": "Agordi ĉifradon",
     "Upgrade": "Gradaltigi",
     "Cannot connect to integration manager": "Ne povas konektiĝi al kunigilo",
     "The integration manager is offline or it cannot reach your homeserver.": "La kunigilo estas eksterreta aŭ ne povas atingi vian hejmservilon.",
@@ -1665,25 +1414,20 @@
     "Start Verification": "Komenci kontrolon",
     "Trusted": "Fidata",
     "Not trusted": "Nefidata",
-    "Direct message": "Individua ĉambro",
     "Security": "Sekureco",
     "Reactions": "Reagoj",
     "More options": "Pliaj elektebloj",
     "Integrations are disabled": "Kunigoj estas malŝaltitaj",
     "Integrations not allowed": "Kunigoj ne estas permesitaj",
     "Suggestions": "Rekomendoj",
-    "Automatically invite users": "Memage inviti uzantojn",
     "Upgrade private room": "Gradaltigi privatan ĉambron",
     "Upgrade public room": "Gradaltigi publikan ĉambron",
     "Notification settings": "Agordoj pri sciigoj",
-    "Take picture": "Foti",
     "Start": "Komenci",
     "Done": "Fini",
     "Go Back": "Reiri",
     "Upgrade your encryption": "Gradaltigi vian ĉifradon",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ĉu vi uzas %(brand)son per aparato, kies ĉefa enigilo estas tuŝado",
-    "If you cancel now, you won't complete verifying the other user.": "Se vi nuligos nun, vi ne finos kontrolon de la alia uzanto.",
-    "If you cancel now, you won't complete verifying your other session.": "Se vi nuligos nun, vi ne finos kontrolon de via alia salutaĵo.",
     "Cancel entering passphrase?": "Ĉu nuligi enigon de pasfrazo?",
     "Setting up keys": "Agordo de klavoj",
     "Verify this session": "Kontroli ĉi tiun salutaĵon",
@@ -1700,7 +1444,6 @@
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: MALSUKCESIS KONTROLO DE ŜLOSILOJ! La subskriba ŝlosilo de %(userId)s kaj session %(deviceId)s estas «%(fprint)s», kiu ne akordas la donitan ŝlosilon «%(fingerprint)s». Tio povus signifi, ke via komunikado estas spionata!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La subskriba ŝlosilo, kiun vi donis, akordas la subskribas ŝlosilon, kinu vi ricevis de la salutaĵo %(deviceId)s de la uzanto %(userId)s. Salutaĵo estis markita kontrolita.",
     "Displays information about a user": "Montras informojn pri uzanto",
-    "The message you are trying to send is too large.": "La mesaĝo, kiun vi provas sendi, estas tro granda.",
     "Show typing notifications": "Montri sciigojn pri tajpado",
     "Never send encrypted messages to unverified sessions from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj salutaĵoj de ĉi tiu salutaĵo",
     "Never send encrypted messages to unverified sessions in this room from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj salutaĵoj en ĉi tiu ĉambro de ĉi tiu salutaĵo",
@@ -1719,11 +1462,8 @@
     "They match": "Ili akordas",
     "They don't match": "Ili ne akordas",
     "To be secure, do this in person or use a trusted way to communicate.": "Por plia sekureco, faru tion persone, aŭ uzu alian fidatan komunikilon.",
-    "Verify yourself & others to keep your chats safe": "Kontrolu vin mem kaj aliajn por sekurigi viajn babilojn",
-    "Channel: %(channelName)s": "Kanalo: %(channelName)s",
     "Show less": "Montri malpli",
     "Show more": "Montri pli",
-    "Help": "Helpo",
     "Session verified": "Salutaĵo kontroliĝis",
     "Copy": "Kopii",
     "Your user agent": "Via klienta aplikaĵo",
@@ -1760,14 +1500,9 @@
     "Review": "Rekontroli",
     "This bridge was provisioned by <user />.": "Ĉi tiu ponto estas provizita de <user />.",
     "This bridge is managed by <user />.": "Ĉi tiu ponto estas administrata de <user />.",
-    "Workspace: %(networkName)s": "Labortablo: %(networkName)s",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ŝanĝo de pasvorto nuntempe restarigos ĉiujn tutvoje ĉifrajn ŝlosilojn en ĉiuj salutaĵoj, malebligante legadon de ĉifrita historio, malse vi unue elportus la ŝlosilojn de viaj ĉambroj kaj reenportus ilin poste. Ĉi tion ni plibonigos ose.",
     "Your homeserver does not support cross-signing.": "Via hejmservilo ne subtenas delegajn subskribojn.",
-    "Cross-signing and secret storage are enabled.": "Delegaj subskriboj kaj sekreta deponejo estas ŝaltitaj.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Via konto havas identecon por delegaj subskriboj en sekreta deponejo, sed ĉi tiu salutaĵo ankoraŭ ne fidas ĝin.",
-    "Cross-signing and secret storage are not yet set up.": "Delegaj subskriboj kaj sekreta deponejo ankoraŭ ne agordiĝis.",
-    "Reset cross-signing and secret storage": "Remeti delegajn subskribojn kaj sekretan deponejon",
-    "Bootstrap cross-signing and secret storage": "Pretigi delegajn subskribojn kaj sekretan deponejon",
     "Cross-signing public keys:": "Delegaj publikaj ŝlosiloj:",
     "in memory": "en memoro",
     "not found": "ne trovita",
@@ -1781,9 +1516,6 @@
     "Unable to load session list": "Ne povas enlegi liston de salutaĵoj",
     "Delete %(count)s sessions|other": "Forigi %(count)s salutaĵojn",
     "Delete %(count)s sessions|one": "Forigi %(count)s salutaĵon",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sekure kaŝmemori ĉifritajn mesaĝojn loke, por aperigi ilin en serĉrezultoj, uzante ",
-    " to store messages from ": " por deponi mesaĝojn el ",
-    "rooms.": "ĉambroj.",
     "Manage": "Administri",
     "Securely cache encrypted messages locally for them to appear in search results.": "Sekure kaŝmemori ĉifritajn mesaĝojn loke, por aperigi ilin en serĉrezultoj.",
     "Enable": "Ŝalti",
@@ -1804,21 +1536,16 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Savkopio havas <validity>nevalidan</validity> subskribon de <verify>nekontrolita</verify> salutaĵo <device></device>",
     "Backup is not signed by any of your sessions": "Savkopio estas subskribita de neniu el viaj salutaĵoj",
     "This backup is trusted because it has been restored on this session": "Ĉi tiu savkopio estas fidata, ĉar ĝi estis rehavita en ĉi tiu salutaĵo",
-    "Backup key stored: ": "Savkopia ŝlosilo deponita: ",
     "Your keys are <b>not being backed up from this session</b>.": "Viaj ŝlosiloj <b>ne estas savkopiataj el ĉi tiu salutaĵo</b>.",
     "Enable desktop notifications for this session": "Ŝalti labortablajn sciigojn por ĉi tiu salutaĵo",
     "Enable audible notifications for this session": "Ŝalti aŭdeblajn sciigojn por ĉi tiu salutaĵo",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Uzu kunigilon <b>(%(serverName)s)</b> por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Uzu kunigilon por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
     "Manage integrations": "Administri kunigojn",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi povnivelojn.",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Via pasvorto sukcese ŝanĝiĝis. Vi ne ricevados pasivajn sciigojn en aliaj salutaĵoj, ĝis vi ilin resalutos",
     "Error downloading theme information.": "Eraris elŝuto de informoj pri haŭto.",
     "Theme added!": "Haŭto aldoniĝis!",
     "Custom theme URL": "Propra URL al haŭto",
     "Add theme": "Aldoni haŭton",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Por raparto de sekureca problemo rilata al Matrix, bonvolu legi la <a>Eldiran Politikon pri Sekureco</a> de Matrix.org.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Alĝustigu vian sperton per eksperimentaj laboratoriaj funkcioj. <a>Eksciu plion</a>.",
     "Ignored/Blocked": "Malatentita/Blokita",
     "Error adding ignored user/server": "Eraris aldono de malatentita uzanto/servilo",
     "Something went wrong. Please try again or view your console for hints.": "Io eraris. Bonvolu reprovi aŭ serĉi helpilojn en via konzolo.",
@@ -1852,7 +1579,6 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Repeti viajn ĉifrajn ŝlosilojn</requestLink> de ceteraj viaj salutaĵoj.",
     "Encrypted by an unverified session": "Ĉifrita de nekontrolita salutaĵo",
     "Encrypted by a deleted session": "Ĉifrita de forigita salutaĵo",
-    "Invite only": "Nur por invititaj",
     "Close preview": "Fermi antaŭrigardon",
     "Unrecognised command: %(commandText)s": "Nerekonita komando: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vi povas komandi <code>/help</code> por listigi uzeblajn komandojn. Ĉu vi intencis sendi ĉi tion kiel mesaĝon?",
@@ -1875,7 +1601,6 @@
     "%(count)s sessions|other": "%(count)s salutaĵoj",
     "%(count)s sessions|one": "%(count)s salutaĵo",
     "Hide sessions": "Kaŝi salutaĵojn",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "La salutaĵo, kiun vi provas kontroli, ne subtenas skanadon de rapidrespondaj kodoj nek kontrolon per bildsignoj, kiujn subtenas %(brand)s. Provu per alia kliento.",
     "Verify by scanning": "Kontroli per skanado",
     "Ask %(displayName)s to scan your code:": "Petu de %(displayName)s skani vian kodon:",
@@ -1885,7 +1610,6 @@
     "You've successfully verified %(displayName)s!": "Vi sukcese kontrolis uzanton %(displayName)s!",
     "Got it": "Komprenite",
     "Encryption enabled": "Ĉifrado estas ŝaltita",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Eksciu plion kaj kontrolu ĉi tiun uzanton per ĝia profilo.",
     "Encryption not enabled": "Ĉifrado ne estas ŝaltita",
     "The encryption used by this room isn't supported.": "La ĉifro uzata de ĉi tiu ĉambro ne estas subtenata.",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Vi malatentis ĉi tiun uzanton, ĝia mesaĝo estas do kaŝita. <a>Tamen montri.</a>",
@@ -1893,9 +1617,7 @@
     "%(name)s declined": "%(name)s rifuzis",
     "Accepting …": "Akceptante…",
     "Declining …": "Rifuzante…",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagis per %(content)s</reactedWith>",
     "Any of the following data may be shared:": "Ĉiu el la jenaj datumoj povas kunhaviĝi:",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s kaj via kunigilo.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s.",
     "Language Dropdown": "Lingva falmenuo",
     "Destroy cross-signing keys?": "Ĉu detrui delege ĉifrajn ŝlosilojn?",
@@ -1911,9 +1633,6 @@
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Kontrolu ĉi tiun aparaton por marki ĝin fidata. Fidado povas pacigi la menson de vi kaj aliaj uzantoj dum uzado de tutvoje ĉifrataj mesaĝoj.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Kontrolo de ĉi tiu aparato markos ĝin fidata, kaj ankaŭ la uzantoj, kiuj interkontrolis kun vi, fidos ĉi tiun aparaton.",
     "Enable 'Manage Integrations' in Settings to do this.": "Ŝaltu «Administri kunigojn» en Agordoj, por fari ĉi tion.",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Via %(brand)so ne permesas al vi uzi kunigilon por tio. Bonvolu kontakti administranton.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Malsukcesis inviti la jenajn uzantojn al babilo: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Ni ne povis krei vian rektan ĉambron. Bonvolu kontroli, kiujn uzantojn vi invitas, kaj reprovu.",
     "Something went wrong trying to invite the users.": "Io eraris dum invito de la uzantoj.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ni ne povis inviti tiujn uzantojn. Bonvolu kontroli, kiujn uzantojn vi invitas, kaj reprovu.",
     "Failed to find the following users": "Malsukcesis trovi la jenajn uzantojn",
@@ -1921,36 +1640,18 @@
     "Recent Conversations": "Freŝaj interparoloj",
     "Recently Direct Messaged": "Freŝe uzitaj individuaj ĉambroj",
     "Go": "Iri",
-    "Your account is not secure": "Via konto ne estas sekura",
-    "Your password": "Via pasvorto",
-    "This session, or the other session": "Ĉi tiu salutaĵo, aŭ la alia salutaĵo",
-    "The internet connection either session is using": "La retkonekto uzata de iu el la salutaĵoj",
-    "We recommend you change your password and recovery key in Settings immediately": "Ni rekomendas, ke vi tuj ŝanĝu viajn pasvorton kaj rehavan ŝlosilon en Agordoj",
-    "New session": "Nova salutaĵo",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Uzu ĉi tiun salutaĵon por kontroli vian novan, donante al ĝi aliron al ĉifritaj mesaĝoj:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Se vi ne salutis ĉi tiun salutaĵon, via konto eble estas malkonfidencigita.",
-    "This wasn't me": "Tio ne estis mi",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gradaltigo de ĉambro estas altnivela ago kaj estas kutime rekomendata kiam ĉambro estas malstabila pro eraroj, mankantaj funkcioj, aŭ malsekuraĵoj.",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Ĉi tio kutime influas nur traktadon de la ĉambro de la servilo. Se vi spertas problemojn pri %(brand)s, bonvolu <a>raporti problemon</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vi gradaltigos ĉi tiun ĉambron de <oldVersion /> al <newVersion />.",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ĉi tio ebligos saluti aliajn salutaĵojn, kaj reveni al via konto post adiaŭo.",
     "Verification Request": "Kontrolpeto",
-    "Recovery key mismatch": "Malakordo de rehavaj ŝlosiloj",
-    "Incorrect recovery passphrase": "Malĝusta rehava pasfrazo",
-    "Enter recovery passphrase": "Enigu la rehavan pasfrazon",
-    "Enter recovery key": "Enigu la rehavan ŝlosilon",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Averto</b>: savkopiadon de ŝlosiloj vi starigu nur per fidata komputilo.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se vi forgesis vian rehavan ŝlosilon, vi povas <button>reagordi rehavon</button>",
-    "Reload": "Relegi",
     "Remove for everyone": "Forigi por ĉiuj",
-    "Remove for me": "Forigi por mi mem",
     "User Status": "Stato de uzanto",
     "Country Dropdown": "Landa falmenuo",
     "Confirm your identity by entering your account password below.": "Konfirmu vian identecon per enigo de la pasvorto de via konto sube.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Mankas publika ŝlosilo por testo de homeco en hejmservila agordaro. Bonvolu raporti tion al la administranto de via hejmservilo.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Via nova salutaĵo nun estas kontrolita. Ĝi povas atingi viajn ĉifritajn mesaĝojn, kaj aliaj uzantoj vidos ĝin fidata.",
     "Your new session is now verified. Other users will see it as trusted.": "Via nova salutaĵo nun estas kontrolita. Aliaj uzantoj vidos ĝin fidata.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Sen plenigo de sekureco en ĉi tiu salutaĵo, ĝi ne povos atingi ĉifritajn mesaĝojn.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Ŝanĝo de via pasvorto restarigos ĉiujn tutvoje ĉifrajn ŝlosilojn en ĉiuj viaj salutaĵoj, igante ĉifritan historion de babilo nelegebla. Agordu Savkopiadon de ŝlosiloj aŭ elportu viajn ĉambrajn ŝlosilojn el alia salutaĵo, antaŭ ol vi restarigos vian pasvorton.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Vi adiaŭis ĉiujn viajn salutaĵojn kaj ne plu ricevados pasivajn sciigojn. Por reŝalti sciigojn, vi resalutu per ĉiu el viaj aparatoj.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Reprenu aliron al via konto kaj rehavu ĉifrajn ŝlosilojn deponitajn en ĉi tiu salutaĵo. Sen ili, vi ne povos legi ĉiujn viajn sekurajn mesaĝojn en iu ajn salutaĵo.",
@@ -1960,17 +1661,11 @@
     "Restore": "Rehavi",
     "You'll need to authenticate with the server to confirm the upgrade.": "Vi devos aŭtentikigi kun la servilo por konfirmi la gradaltigon.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Gradaltigu ĉi tiun salutaĵon por ebligi al ĝi kontroladon de aliaj salutaĵoj, donante al ili aliron al ĉifritaj mesaĵoj, kaj markante ilin fidataj por aliaj uzantoj.",
-    "Set up with a recovery key": "Starigi kun rehava ŝlosilo",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Tenu ĝian kopion en sekura loko, ekzemple mastrumilo de pasvortoj, aŭ eĉ sekurkesto.",
-    "Your recovery key": "Via rehava ŝlosilo",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Via rehava ŝlosilo estis <b>kopiita al via tondujo</b>, algluu ĝin al:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Via rehava ŝlosilo estas en via dosierujo kun <b>Elŝutoj</b>.",
-    "Make a copy of your recovery key": "Fari kopionde via rehava ŝlosilo",
     "Unable to set up secret storage": "Ne povas starigi sekretan deponejon",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Sen Sekura rehavo de mesaĝoj, vi ne povos rehavi vian historion de ĉifritaj mesaĝoj se vi adiaŭos aŭ uzos alian salutaĵon.",
     "Create key backup": "Krei savkopion de ŝlosiloj",
     "This session is encrypting history using the new recovery method.": "Ĉi tiu salutaĵo nun ĉifras historion kun la nova rehava metodo.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ĉi tiu salutaĵo trovis, ke viaj rehava pasfrazo kaj ŝlosilo por Sekuraj mesaĝoj estis forigitaj.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Se vi faris tion akcidente, vi povas agordi Sekurajn mesaĝojn en ĉi tiu salutaĵo, kio reĉifros la historion de mesaj de ĉi tiu salutaĵo kun nova rehava metodo.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Post malŝalto, mesaĝoj el ĉifritaj ĉambroj ne aperos en serĉorezultoj.",
     "Disable": "Malŝalti",
@@ -1985,7 +1680,6 @@
     "Scroll to most recent messages": "Rulumi al plej freŝaj mesaĝoj",
     "Local address": "Loka adreso",
     "Published Addresses": "Publikigitaj adresoj",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publikigitan adreson povas uzi ĉiu persono el ĉiu servilo por aliĝi al via ĉambro. Por ke adreso publikiĝu, ĝi unue estu agordita kiel adreso loka.",
     "Other published addresses:": "Aliaj publikigitaj adresoj:",
     "No other published addresses yet, add one below": "Ankoraŭ neniuj aliaj publikigitaj adresoj; aldonu iun sube",
     "New published address (e.g. #alias:server)": "Nova publikigita adreso (ekz. #kromnomo:servilo)",
@@ -2011,8 +1705,7 @@
     "cached locally": "kaŝmemorita loke",
     "not found locally": "ne trovita loke",
     "User signing private key:": "Uzantosubskriba privata ŝlosilo:",
-    "Keyboard Shortcuts": "Klavkombinoj",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Komencu interparolon kun iu per ĝia nomo, uzantonomo (kiel <userId/>), aŭ retpoŝtadreso.",
+    "Keyboard Shortcuts": "Ŝparklavoj",
     "a new master key signature": "nova ĉefŝlosila subskribo",
     "a new cross-signing key signature": "nova subskribo de delega ŝlosilo",
     "a device cross-signing signature": "delega subskribo de aparato",
@@ -2067,7 +1760,6 @@
     "End": "Finen-klavo",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Ĉu vi uzas %(brand)son kiel Progresan retan aplikaĵon",
     "Manually verify all remote sessions": "Permane kontroli ĉiujn forajn salutaĵojn",
-    "Session backup key:": "Savkopia ŝlosilo de salutaĵo:",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Unuope kontroli ĉiun salutaĵon de uzanto por marki ĝin fidata, ne fidante delege subskribitajn aparatojn.",
     "Invalid theme schema.": "Nevalida skemo de haŭto.",
     "Mod": "Reguligisto",
@@ -2085,8 +1777,6 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Konfirmu aldonon de ĉi tiu telefonnumero per identiĝo per ununura saluto.",
     "Confirm adding phone number": "Konfirmu aldonon de telefonnumero",
     "Click the button below to confirm adding this phone number.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu telefonnumero.",
-    "If you cancel now, you won't complete your operation.": "Se vi nuligos nun, vi ne finos vian agon.",
-    "Review where you’re logged in": "Kontrolu, kie vi salutis",
     "New login. Was this you?": "Nova saluto. Ĉu tio estis vi?",
     "%(name)s is requesting verification": "%(name)s petas kontrolon",
     "Sends a message as html, without interpreting it as markdown": "Sendas mesaĝon kiel HTML, ne interpretante ĝin kiel Markdown",
@@ -2100,9 +1790,6 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Konfirmu, ke la ĉi-subaj bildsignoj aperas samorde en ambaŭ salutaĵoj:",
     "Verify this session by confirming the following number appears on its screen.": "Kontrolu ĉi tiun salutaĵon per konfirmo, ke la jena nombro aperas sur ĝia ekrano.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Atendante konfirmon de via alia salutaĵo, %(deviceName)s (%(deviceId)s)…",
-    "Verify all your sessions to ensure your account & messages are safe": "Kontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj sekuras",
-    "Verify the new login accessing your account: %(name)s": "Kontrolu la novan saluton alirantan vian konton: %(name)s",
-    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
     "well formed": "bone formita",
     "unexpected type": "neatendita tipo",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Konfirmu forigon de ĉi tiuj salutaĵoj per identiĝo per ununura saluto.",
@@ -2114,7 +1801,6 @@
     "Delete sessions|one": "Forigi salutaĵon",
     "Where you’re logged in": "Kie vi salutis",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Sube administru la nomojn de viaj salutaĵoj kaj ilin adiaŭu, aŭ <a>ilin kontrolu en via profilo de uzanto</a>.",
-    "Waiting for you to accept on your other session…": "Atendante vian akcepton en via alia salutaĵo…",
     "Almost there! Is your other session showing the same shield?": "Preskaŭ finite! Ĉu via alia salutaĵo montras la saman ŝildon?",
     "Almost there! Is %(displayName)s showing the same shield?": "Preskaŭ finite! Ĉu %(displayName)s montras la saman ŝildon?",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Vi sukcese kontrolis %(deviceName)s (%(deviceId)s)!",
@@ -2136,13 +1822,9 @@
     "Confirm account deactivation": "Konfirmi malaktivigon de konto",
     "There was a problem communicating with the server. Please try again.": "Eraris komunikado kun la servilo. Bonvolu reprovi.",
     "Unable to upload": "Ne povas alŝuti",
-    "Verify other session": "Kontroli alian salutaĵon",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ne povas aliri sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan rehavan pasfrazon.",
     "Restoring keys from backup": "Rehavo de ŝlosiloj el savkopio",
     "Fetching keys from server...": "Akirante ŝlosilojn el servilo…",
     "%(completed)s of %(total)s keys restored": "%(completed)s el %(total)s ŝlosiloj rehaviĝis",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Savkopio ne estis malĉifrebla per ĉi tiu rehava ŝlosilo: bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Savkopio ne estis malĉifrebla per ĉi tiu rehava pasfrazo: bonvolu kontroli, ke vi enigis la ĝustan rehavan pasfrazon.",
     "Keys restored": "Ŝlosiloj rehaviĝis",
     "Successfully restored %(sessionCount)s keys": "Sukcese rehavis %(sessionCount)s ŝlosilojn",
     "Sign in with SSO": "Saluti per ununura saluto",
@@ -2151,27 +1833,13 @@
     "Send a Direct Message": "Sendi rektan mesaĝon",
     "Explore Public Rooms": "Esplori publikajn ĉambrojn",
     "Create a Group Chat": "Krei grupan babilon",
-    "Self-verification request": "Memkontrola peto",
     "Verify this login": "Kontroli ĉi tiun saluton",
     "Syncing...": "Spegulante…",
     "Signing In...": "Salutante…",
     "If you've joined lots of rooms, this might take a while": "Se vi aliĝis al multaj ĉambroj, tio povas daŭri longe",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Konfirmu vian identecon per kontrolo de ĉi tiu saluto el unu el viaj aliaj salutaĵoj, permesante al ĝi legadon de ĉifritaj mesaĝoj.",
-    "This requires the latest %(brand)s on your other devices:": "Ĉi tio bezonas la plej freŝan version de %(brand)s en viaj aliaj aparatoj:",
-    "or another cross-signing capable Matrix client": "aŭ alian Matrix-klienton kapablan je delegaj subskriboj",
-    "Great! This recovery passphrase looks strong enough.": "Bonege! Ĉi tiu rehava pasfrazo ŝajnas sufiĉe forta.",
-    "Enter a recovery passphrase": "Enigu rehavan pasfrazon",
-    "Enter your recovery passphrase a second time to confirm it.": "Enigu vian rehavan pasfrazon duafoje por konfirmi ĝin.",
-    "Confirm your recovery passphrase": "Konfirmi vian rehavan pasfrazon",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Via rehava ŝlosilo asekuras vin – vi povas ĝin uzi por rehavi aliron al viaj ĉifritaj mesaĝoj se vi forgesas vian rehavan pasfrazon.",
     "Unable to query secret storage status": "Ne povis peti staton de sekreta deponejo",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ni deponos ĉifritan kopion de viaj ŝlosiloj en nia servilo. Sekurigu vian savkopion per rehava pasfrazo.",
-    "Please enter your recovery passphrase a second time to confirm.": "Bonvolu enigi vian rehavan pasfrazon duafoje por konfirmi.",
-    "Repeat your recovery passphrase...": "Ripetu vian rehavan pasfrazon…",
-    "Secure your backup with a recovery passphrase": "Sekurigu vian savkopion per rehava pasfrazo",
     "Currently indexing: %(currentRoom)s": "Nun indeksante: %(currentRoom)s",
     "Cancel replying to a message": "Nuligi respondon al mesaĝo",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), retpoŝtadreso, aŭ <a>kunhavigu la ĉambron</a>.",
     "Message deleted": "Mesaĝo foriĝis",
     "Message deleted by %(name)s": "Mesaĝon forigis %(name)s",
     "Opens chat with the given user": "Malfermas babilon kun la uzanto",
@@ -2187,9 +1855,7 @@
     "Dismiss read marker and jump to bottom": "Forigi legomarkon kaj iri al fundo",
     "Jump to oldest unread message": "Iri al plej malnova nelegita mesaĝo",
     "Upload a file": "Alŝuti dosieron",
-    "Create room": "Krei ĉambron",
     "IRC display name width": "Larĝo de vidiga nomo de IRC",
-    "Font scaling": "Skalado de tiparoj",
     "Font size": "Grando de tiparo",
     "Size must be a number": "Grando devas esti nombro",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Propra grando de tiparo povas interi nur %(min)s punktojn kaj %(max)s punktojn",
@@ -2208,118 +1874,52 @@
     "Error removing address": "Eraris forigo de adreso",
     "Categories": "Kategorioj",
     "Room address": "Adreso de ĉambro",
-    "Please provide a room address": "Bonvolu doni adreson de ĉambro",
     "This address is available to use": "Ĉi tiu adreso estas uzebla",
     "This address is already in use": "Ĉi tiu adreso jam estas uzata",
-    "Set a room address to easily share your room with other people.": "Agordu adreson de ĉambro por facile konigi la ĉambron al aliuloj.",
     "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.": "Vi antaŭe uzis pli novan version de %(brand)s kun tiu ĉi salutaĵo. Por ree uzi ĉi tiun version kun tutvoja ĉifrado, vi devos adiaŭi kaj resaluti.",
-    "Address (optional)": "Adreso (malnepra)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la adreson de ĉambro %(alias)s kaj forigi %(name)s de la katalogo?",
     "delete the address.": "forigi la adreson.",
     "Use a different passphrase?": "Ĉu uzi alian pasfrazon?",
     "Help us improve %(brand)s": "Helpu al ni plibonigi %(brand)son",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Sendi <UsageDataLink>sennomajn datumojn pri uzado</UsageDataLink>, kiuj helpos al ni plibonigi %(brand)son. Ĉi tio uzos <PolicyLink>kuketon</PolicyLink>.",
-    "I want to help": "Mi volas helpi",
     "Your homeserver has exceeded its user limit.": "Via hejmservilo atingis sian limon de uzantoj.",
     "Your homeserver has exceeded one of its resource limits.": "Via hejmservilo atingis iun limon de rimedoj.",
     "Contact your <a>server admin</a>.": "Kontaktu <a>administranton de via servilo</a>.",
     "Ok": "Bone",
-    "Set password": "Agordi pasvorton",
-    "To return to your account in future you need to set a password": "Por reveni ose al via konto, vi devas agordi pasvorton",
-    "Restart": "Restartigi",
-    "Upgrade your %(brand)s": "Gradaltigi vian %(brand)son",
-    "A new version of %(brand)s is available!": "Nova versio de %(brand)s estas disponebla!",
     "New version available. <a>Update now.</a>": "Nova versio estas disponebla. <a>Ĝisdatigu nun.</a>",
     "Emoji picker": "Elektilo de bildsignoj",
-    "Use your account to sign in to the latest version": "Uzu vian konton por saluti la plej freŝan version",
-    "We’re excited to announce Riot is now Element": "Ni ekscite anoncas, ke Riot nun estas Elemento",
-    "Riot is now Element!": "Riot nun estas Elemento!",
-    "Learn More": "Eksciu plion",
     "Light": "Hela",
     "Dark": "Malhela",
     "You joined the call": "Vi aliĝis al la voko",
     "%(senderName)s joined the call": "%(senderName)s aliĝis al la voko",
     "Call in progress": "Voko okazas",
-    "You left the call": "Vi foriris de la voko",
-    "%(senderName)s left the call": "%(senderName)s foriris de la voko",
     "Call ended": "Voko finiĝis",
     "You started a call": "Vi komencis vokon",
     "%(senderName)s started a call": "%(senderName)s komencis vokon",
     "Waiting for answer": "Atendante respondon",
     "%(senderName)s is calling": "%(senderName)s vokas",
-    "You created the room": "Vi kreis la ĉambron",
-    "%(senderName)s created the room": "%(senderName)s kreis la ĉambron",
-    "You made the chat encrypted": "Vi ekĉifris la babilon",
-    "%(senderName)s made the chat encrypted": "%(senderName)s ekĉifris la babilon",
-    "You made history visible to new members": "Vi videbligis la historion al novaj anoj",
-    "%(senderName)s made history visible to new members": "%(senderName)s videbligis la historion al novaj anoj",
-    "You made history visible to anyone": "Vi videbligis la historion al ĉiu ajn",
-    "%(senderName)s made history visible to anyone": "%(senderName)s videbligis la historion al ĉiu ajn",
-    "You made history visible to future members": "Vi videbligis la historion al osaj anoj",
-    "%(senderName)s made history visible to future members": "%(senderName)s videbligis la historion al osaj anoj",
-    "You were invited": "Vi estis invitita",
-    "%(targetName)s was invited": "%(senderName)s estis invitita",
-    "You left": "Vi foriris",
-    "%(targetName)s left": "%(senderName)s foriris",
-    "You were kicked (%(reason)s)": "Vi estis forpelita (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s estis forpelita (%(reason)s)",
-    "You were kicked": "Vi estis forpelita",
-    "%(targetName)s was kicked": "%(targetName)s estis forpelita",
-    "You rejected the invite": "Vi rifuzis la inviton",
-    "%(targetName)s rejected the invite": "%(targetName)s rifuzis la inviton",
-    "You were uninvited": "Vi estis malinvitita",
-    "%(targetName)s was uninvited": "%(targetName)s estis malinvitita",
-    "You were banned (%(reason)s)": "Vi estis forbarita (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s estis forbarita (%(reason)s)",
-    "You were banned": "Vi estis forbarita",
-    "%(targetName)s was banned": "%(targetName)s estis forbarita",
-    "You joined": "Vi aliĝis",
-    "%(targetName)s joined": "%(targetName)s aliĝis",
-    "You changed your name": "Vi ŝanĝis vian nomon",
-    "%(targetName)s changed their name": "%(targetName)s ŝanĝis sian nomon",
-    "You changed your avatar": "Vi ŝanĝis vian profilbildon",
-    "%(targetName)s changed their avatar": "%(targetName)s ŝanĝis sian profilbildon",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Vi ŝanĝis la nomon de la ĉambro",
-    "%(senderName)s changed the room name": "%(senderName)s ŝanĝis la nomon de la ĉambro",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Vi malinvitis uzanton %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s malinvitis uzanton %(targetName)s",
-    "You invited %(targetName)s": "Vi invitis uzanton %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s invitis uzanton %(targetName)s",
-    "You changed the room topic": "Vi ŝanĝis la temon de la ĉambro",
-    "%(senderName)s changed the room topic": "%(senderName)s ŝanĝis la temon de la ĉambro",
-    "Use the improved room list (will refresh to apply changes)": "Uzi la plibonigitan ĉambrobreton (aktualigos la paĝon por apliki la ŝanĝojn)",
     "Use custom size": "Uzi propran grandon",
     "Use a more compact ‘Modern’ layout": "Uzi pli densan »Modernan« aranĝon",
     "Use a system font": "Uzi sisteman tiparon",
     "System font name": "Nomo de sistema tiparo",
     "Enable experimental, compact IRC style layout": "Ŝalti eksperimentan, densan IRC-ecan aranĝon",
     "Unknown caller": "Nekonata vokanto",
-    "Incoming voice call": "Envena voĉvoko",
-    "Incoming video call": "Envena vidvoko",
-    "Incoming call": "Envena voko",
     "%(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 povas sekure kaŝkopii ĉifritajn mesaĝojn loke, funkciante per foliumilo. Uzu <desktopLink>%(brand)s Desktop</desktopLink> por aperigi ĉifritajn mesaĝojn en serĉrezultoj.",
-    "There are advanced notifications which are not shown here.": "Ekzistas specialaj sciigoj, kiuj ne estas montrataj ĉi tie.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Vi eble agordis ilin en kliento alia ol %(brand)s. Vi ne povas agordi ilin en %(brand)s, sed ili tamen estas aplikataj.",
     "Hey you. You're the best!": "He, vi. Vi bonegas!",
     "Message layout": "Aranĝo de mesaĝoj",
-    "Compact": "Densa",
     "Modern": "Moderna",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Agordu la nomon de tiparo instalita en via sistemo kaj %(brand)s provos ĝin uzi.",
     "Customise your appearance": "Adaptu vian aspekton",
     "Appearance Settings only affect this %(brand)s session.": "Agordoj de aspekto nur efikos sur ĉi tiun salutaĵon de %(brand)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.": "Aldonu uzantojn kaj servilojn, kiujn vi volas malatenti, ĉi tien. Uzu steletojn por ke %(brand)s atendu iujn ajn signojn. Ekzemple, <code>@bot:*</code> malatentigus ĉiujn uzantojn, kiuj havas la nomon «bot» sur ĉiu ajn servilo.",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "La administranto de via servilo malŝaltis implicitan tutvojan ĉifradon en privataj kaj individuaj ĉambroj.",
-    "Make this room low priority": "Doni al la ĉambro malaltan prioritaton",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Ĉambroj kun malalta prioritato montriĝas en aparta sekcio, en la suba parto de via ĉambrobreto,",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "La aŭtentikeco de ĉi tiu ĉifrita mesaĝo ne povas esti garantiita sur ĉi tiu aparato.",
     "No recently visited rooms": "Neniuj freŝdate vizititaj ĉambroj",
     "People": "Personoj",
-    "Unread rooms": "Nelegitaj ĉambroj",
-    "Always show first": "Ĉiam montri unuaj",
     "Show": "Montri",
     "Message preview": "Antaŭrigardo al mesaĝo",
     "Sort by": "Ordigi laŭ",
@@ -2336,33 +1936,18 @@
     "Forget Room": "Forgesi ĉambron",
     "Room options": "Elektebloj pri ĉambro",
     "Message deleted on %(date)s": "Mesaĝo forigita je %(date)s",
-    "Use your account to sign in to the latest version of the app at <a />": "Uzu vian konton por saluti la plej freŝan version de la aplikaĵo je <a />",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Vi jam estas salutinta kaj preta ĉi tie, sed vi povas ankaŭ ekhavi la plej freŝajn versiojn de la aplikaĵoj sur ĉiuj platformoj je <a>element.io/get-started</a>.",
-    "Go to Element": "Iri al Elemento",
-    "We’re excited to announce Riot is now Element!": "Ni estas ekscititaj anonci, ke Riot nun estas Elemento!",
-    "Learn more at <a>element.io/previously-riot</a>": "Eksciu plion je <a>element.io/previously-riot</a>",
     "Wrong file type": "Neĝusta dosiertipo",
     "Looks good!": "Ŝajnas bona!",
-    "Wrong Recovery Key": "Neĝusta rehava ŝlosilo",
-    "Invalid Recovery Key": "Nevalida rehava ŝlosilo",
     "Security Phrase": "Sekureca frazo",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Enigu vian sekurecan frazon aŭ <button>uzu vian sekurecan ŝlosilon</button> por daŭrigi.",
     "Security Key": "Sekureca ŝlosilo",
     "Use your Security Key to continue.": "Uzu vian sekurecan ŝlosilon por daŭrigi.",
-    "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.": "Vi povas uzi proprajn elekteblojn pri servilo por saluti aliajn servilojn de Matrix, per specifo de alia URL de hejmservilo. Tio ebligas al vi uzi la programon %(brand)s kun jama konto de Matrix je alia hejmservilo.",
-    "Search rooms": "Serĉi ĉambrojn",
     "Switch to light mode": "Ŝalti helan reĝimon",
     "Switch to dark mode": "Ŝalti malhelan reĝimon",
     "Switch theme": "Ŝalti haŭton",
     "Security & privacy": "Sekureco kaj privateco",
     "All settings": "Ĉiuj agordoj",
     "User menu": "Menuo de uzanto",
-    "Use Recovery Key or Passphrase": "Uzi rehavan ŝlosilon aŭ pasfrazon",
-    "Use Recovery Key": "Uzi rehavan ŝlosilon",
-    "%(brand)s Web": "%(brand)s por Reto",
-    "%(brand)s Desktop": "%(brand)s por Labortablo",
-    "%(brand)s iOS": "%(brand)s por iOS",
-    "%(brand)s X for Android": "%(brand)s X por Android",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj per savkopiado de ĉifraj ŝlosiloj al via servilo.",
     "Generate a Security Key": "Generi sekurecan ŝlosilon",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Ni estigos sekurecan ŝlosilon, kiun vi devus konservi en sekura loko, ekzemple administrilo de pasvortoj, aŭ sekurŝranko.",
@@ -2372,11 +1957,9 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Deponu vian sekurecan ŝlosilon en sekura loko, ekzemple administrilo de pasvortoj aŭ sekurŝranko, ĉar ĝi protektos viajn ĉifritajn datumojn.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se vi nuligos nun, vi eble perdos ĉifritajn mesaĝojn kaj datumojn se vi perdos aliron al viaj salutoj.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Vi ankaŭ povas agordi Sekuran savkopiadon kaj administri viajn ŝlosilojn per Agordoj.",
-    "Set up Secure backup": "Agordi Sekuran savkopiadon",
     "Set a Security Phrase": "Agordi Sekurecan frazon",
     "Confirm Security Phrase": "Konfirmi Sekurecan frazon",
     "Save your Security Key": "Konservi vian Sekurecan ŝlosilon",
-    "New spinner design": "Nova aspekto de la atendosimbolo",
     "Show rooms with unread messages first": "Montri ĉambrojn kun nelegitaj mesaĝoj kiel unuajn",
     "Show previews of messages": "Montri antaŭrigardojn al mesaĝoj",
     "This room is public": "Ĉi tiu ĉambro estas publika",
@@ -2384,7 +1967,6 @@
     "Edited at %(date)s": "Redaktita je %(date)s",
     "Click to view edits": "Klaku por vidi redaktojn",
     "Are you sure you want to cancel entering passphrase?": "Ĉu vi certe volas nuligi enigon de pasfrazo?",
-    "Enable advanced debugging for the room list": "Ŝalti altnivelan erarserĉadon por la ĉambrobreto",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Custom Tag": "Propra etikedo",
     "Feedback": "Prikomenti",
@@ -2395,7 +1977,7 @@
     "Show message previews for reactions in all rooms": "Montri antaŭrigardojn al mesaĝoj ĉe reagoj en ĉiuj ĉambroj",
     "Your server isn't responding to some <a>requests</a>.": "Via servilo ne respondas al iuj <a>petoj</a>.",
     "Server isn't responding": "Servilo ne respondas",
-    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Via servilo ne respondas al iuj el viaj petoj. Vidu sube kelkon de la plej probablaj kialoj.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Via servilo ne respondas al iuj el viaj petoj. Vidu sube kelkon de la plej verŝajnaj kialoj.",
     "The server (%(serverName)s) took too long to respond.": "La servilo (%(serverName)s) tro longe ne respondis.",
     "Your firewall or anti-virus is blocking the request.": "Via fajroŝirmilo aŭ kontraŭvirusilo blokas la peton.",
     "A browser extension is preventing the request.": "Kromprogramo de la foliumilo malhelpas la peton.",
@@ -2406,22 +1988,15 @@
     "The server is not configured to indicate what the problem is (CORS).": "La servilo ne estas agordita por indiki la problemon (CORS).",
     "Recent changes that have not yet been received": "Freŝaj ŝanĝoj ankoraŭ ne ricevitaj",
     "No files visible in this room": "Neniuj dosieroj videblas en ĉi tiu ĉambro",
-    "You have no visible notifications in this room.": "Vi havas neniujn videblajn sciigojn en ĉi tiu ĉambro.",
-    "%(brand)s Android": "%(brand)s por Android",
     "Community and user menu": "Menuo de komunumo kaj uzanto",
     "User settings": "Agordoj de uzanto",
     "Community settings": "Agordoj de komunumo",
     "Failed to find the general chat for this community": "Malsukcesis trovi la ĝeneralan babilejon por ĉi tiu komunumo",
-    "Starting camera...": "Pretigante filmilon…",
-    "Starting microphone...": "Pretigante mikrofonon…",
-    "Call connecting...": "Konektante vokon…",
-    "Calling...": "Vokante…",
     "Explore rooms in %(communityName)s": "Esploru ĉambrojn en %(communityName)s",
     "You do not have permission to create rooms in this community.": "Vi ne havas permeson krei ĉambrojn en ĉi tiu komunumo.",
     "Cannot create rooms in this community": "Ne povas krei ĉambrojn en ĉi tiu komunumo",
     "Create community": "Krei komunumon",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Kunsendu dosierojn per la babilujo, aŭ trenu ilin kien ajn en ĉambro vi volas.",
-    "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>.": "Enigu la lokon de via hejmservilo de «Element Matrix Services». Ĝi povas uzi vian propran retnomon aŭ esti subretnomo de <a>element.io</a>.",
     "Move right": "Movi dekstren",
     "Move left": "Movi maldekstren",
     "Revoke permissions": "Nuligi permesojn",
@@ -2440,7 +2015,6 @@
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Vi povus ŝalti ĉi tion se la ĉambro estus uzota nur por kunlaborado de internaj skipoj je via hejmservilo. Ĝi ne ŝanĝeblas poste.",
     "Your server requires encryption to be enabled in private rooms.": "Via servilo postulas ŝaltitan ĉifradon en privataj ĉambroj.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privataj ĉambroj povas esti trovitaj kaj aliĝitaj nur per invito. Publikaj ĉambroj povas esti trovitaj kaj aliĝitaj de iu ajn en ĉi tiu komunumo.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privataj ĉambroj povas esti trovitaj kaj aliĝitaj nur per invito. Publikaj ĉambroj povas esti trovitaj kaj aliĝitaj de iu ajn.",
     "An image will help people identify your community.": "Bildo helpos al aliuloj rekoni vian komunumon.",
     "Add image (optional)": "Aldonu bildon (se vi volas)",
     "Enter name": "Enigu nomon",
@@ -2496,7 +2070,6 @@
     "Secret storage:": "Sekreta deponejo:",
     "Backup key cached:": "Kaŝmemorita Savkopia ŝlosilo:",
     "Backup key stored:": "Deponita Savkopia ŝlosilo:",
-    "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.": "Savkopiu viajn ĉifrajn ŝlosilojn kun la datumoj de via konto, pro eblo ke vi perdus aliron al viaj salutaĵoj. Viaj ŝlosiloj estos sekurigitaj per unika Rehava ŝlosilo.",
     "Algorithm:": "Algoritmo:",
     "Backup version:": "Repaŝa versio:",
     "The operation could not be completed": "La ago ne povis finiĝi",
@@ -2512,10 +2085,6 @@
     "Unknown App": "Nekonata aplikaĵo",
     "Error leaving room": "Eraro dum foriro de la ĉambro",
     "Unexpected server error trying to leave the room": "Neatendita servila eraro dum foriro de ĉambro",
-    "%(senderName)s declined the call.": "%(senderName)s rifuzis la vokon.",
-    "(an error occurred)": "(okazis eraro)",
-    "(their device couldn't start the camera / microphone)": "(ĝia aparato ne povis funkciigi la filmilon / mikrofonon)",
-    "(connection failed)": "(konekto malsukcesis)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Ĉiuj serviloj estas forbaritaj de partoprenado! La ĉambro ne plu povas esti uzata.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Antaŭmetas ( ͡° ͜ʖ ͡°) al platteksta mesaĝo",
     "This will end the conference for everyone. Continue?": "Ĉi tio finos la grupan vokon por ĉiuj. Ĉu daŭrigi?",
@@ -2523,8 +2092,6 @@
     "The call was answered on another device.": "La voko estis respondita per alia aparato.",
     "Answered Elsewhere": "Respondita aliloke",
     "The call could not be established": "Ne povis meti la vokon",
-    "The other party declined the call.": "La alia persono rifuzis la vokon.",
-    "Call Declined": "Voko rifuziĝis",
     "Rate %(brand)s": "Taksu pri %(brand)s",
     "Feedback sent": "Prikomentoj sendiĝis",
     "You’re all caught up": "Vi nenion preterpasis",
@@ -2872,9 +2439,6 @@
     "Homeserver": "Hejmservilo",
     "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.": "Vi povas uzi la proprajn elekteblojn de servilo por saluti aliajn servilojn de Matrix, specifigante la URL-on de alia hejmservilo. Tio ebligas uzi Elementon kun jama konto de Matrix ĉe alia hejmservilo.",
     "Server Options": "Elektebloj de servilo",
-    "Windows": "Fenestroj",
-    "Screens": "Ekranoj",
-    "Share your screen": "Vidigu vian ekranon",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
     "Channel: <channelLink/>": "Kanalo: <channelLink/>",
@@ -2892,7 +2456,6 @@
     "Your Security Key": "Via Sekureca ŝlosilo",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Via Sekureca ŝlosilo estas speco de asekuro – vi povas uzi ĝin por rehavi aliron al viaj ĉifritaj mesaĝoj, se vi forgesas vian Sekurecan frazon.",
     "Repeat your Security Phrase...": "Ripetu vian Sekurecan frazon…",
-    "Please enter your Security Phrase a second time to confirm.": "Bonvolu enigi vian Sekurecan frazon je dua fojo por konfirmi.",
     "Set up with a Security Key": "Agordi per Sekureca ŝlosilo",
     "Great! This Security Phrase looks strong enough.": "Bonege! La Sekureca frazo ŝajnas sufiĉe forta.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Ni konservos ĉifritan kopion de viaj ŝlosiloj en nia servilo. Sekurigu vian savkopion per Sekureca frazo.",
@@ -2910,7 +2473,6 @@
     "Got an account? <a>Sign in</a>": "Ĉu vi havas konton? <a>Salutu</a>",
     "Filter rooms and people": "Filtri ĉambrojn kaj personojn",
     "You have no visible notifications.": "Vi havas neniujn videblajn sciigojn.",
-    "Upgrade to pro": "Gradaltigu al profesionala versio",
     "Now, let's help you get started": "Nun, ni helpos al vi komenci",
     "Welcome %(name)s": "Bonvenu, %(name)s",
     "Add a photo so people know it's you.": "Aldonu foton, por ke oni vin rekonu.",
@@ -2961,10 +2523,8 @@
     "You should know": "Vi sciu",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Kiam oni aliĝas, vi povas kontroli ĝin per ĝia profilo; simple tuŝetu ĝian profilbildon.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Mesaĝoj ĉi tie estas tutvoje ĉifritaj. Kontrolu uzanton %(displayName)s per ĝia profilo – tuŝetu ĝian profilbildon.",
-    "Role": "Rolo",
     "Use the + to make a new room or explore existing ones below": "Uzu la simbolon + por krei novan ĉambron aŭ esplori jam ekzistantajn sube",
     "Start a new chat": "Komenci novan babilon",
-    "Start a Conversation": "Komenci interparolon",
     "Recently visited rooms": "Freŝe vizititiaj ĉambroj",
     "This is the start of <roomName/>.": "Jen la komenco de <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Aldonu foton, por ke oni facile trovu vian ĉambron.",
@@ -2983,7 +2543,6 @@
     "Sends the given message with fireworks": "Sendas la mesaĝon kun artfajraĵo",
     "sends confetti": "sendas konfetojn",
     "Sends the given message with confetti": "Sendas la mesaĝon kun konfetoj",
-    "Show chat effects": "Montri efektojn de babilujo",
     "Show line numbers in code blocks": "Montri numerojn de linioj en kodujoj",
     "Expand code blocks by default": "Implicite etendi kodujojn",
     "Show stickers button": "Butono por montri glumarkojn",
@@ -3012,7 +2571,6 @@
     "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": "Transdoni",
     "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/>).",
@@ -3042,21 +2600,16 @@
     "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.",
     "Public": "Publika",
     "Delete": "Forigi",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "De %(deviceName)s (%(deviceId)s) de %(ip)s",
     "Jump to the bottom of the timeline when you send a message": "Salti al subo de historio sendinte mesaĝon",
     "Check your devices": "Kontrolu viajn aparatojn",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Nova saluto aliras vian konton: %(name)s (%(deviceID)s) de %(ip)s",
     "You have unverified logins": "Vi havas nekontrolitajn salutojn",
     "You're already in a call with this person.": "Vi jam vokas ĉi tiun personon.",
     "Already in call": "Jam vokanta",
     "<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 por la paĝo de via komunumo</h1>\n<p>\n    Uzu la longan priskribon por enkonduki novajn anojn en la komunumon, aŭ disdoni\n    kelkajn gravajn <a href=\"foo\">ligilojn</a>.\n</p>\n<p>\n    Vi povas eĉ aldoni bildojn per Matriks-URL <img src=\"mxc://url\" />\n</p>\n",
-    "View dev tools": "Montri programistilojn",
     "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.": "Ĉi tiu kutime influas nur traktadon de la ĉambro servil-flanke. Se vi spertas problemojn pri via %(brand)s, bonvolu raporti eraron.",
     "Mark as suggested": "Marki rekomendata",
     "Mark as not suggested": "Marki nerekomendata",
@@ -3068,27 +2621,17 @@
     "Support": "Subteno",
     "Random": "Hazarda",
     "Welcome to <name/>": "Bonvenu al <name/>",
-    "Your private space <name/>": "Via privata aro <name/>",
-    "Your public space <name/>": "Via publika aro <name/>",
     "Your server does not support showing space hierarchies.": "Via servilo ne subtenas montradon de hierarĥioj de aroj.",
-    "Add existing rooms & spaces": "Aldoni jamajn ĉambrojn kaj arojn",
     "Private space": "Privata aro",
     "Public space": "Publika aro",
     "<inviter/> invites you": "<inviter/> invitas vin",
-    "Search names and description": "Serĉi nomojn kaj priskribojn",
     "No results found": "Neniuj rezultoj troviĝis",
     "Removing...": "Forigante…",
     "Failed to remove some rooms. Try again later": "Malsukcesis forigi iujn arojn. Reprovu poste",
-    "%(count)s rooms and 1 space|one": "%(count)s ĉambro kaj 1 aro",
-    "%(count)s rooms and 1 space|other": "%(count)s ĉambroj kaj 1 aro",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s ĉambro kaj %(numSpaces)s aroj",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s ĉambroj kaj %(numSpaces)s aroj",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Se vi ne povas trovi la ĉambron, kiun vi serĉas, petu inviton aŭ <a>kreu novan ĉambron</a>.",
     "%(count)s rooms|one": "%(count)s ĉambro",
     "%(count)s rooms|other": "%(count)s ĉambroj",
     "%(count)s members|one": "%(count)s ano",
     "%(count)s members|other": "%(count)s anoj",
-    "Open": "Malfermi",
     "%(count)s messages deleted.|one": "%(count)s mesaĝo foriĝis.",
     "%(count)s messages deleted.|other": "%(count)s mesaĝoj foriĝis.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Ĉu vi certe volas forlasi la aron «%(spaceName)s»?",
@@ -3100,7 +2643,6 @@
     "Save Changes": "Konservi ŝanĝojn",
     "Saving...": "Konservante…",
     "Leave Space": "Forlasi aron",
-    "Make this space private": "Privatigi ĉi tiun aron",
     "Edit settings relating to your space.": "Redaktu agordojn pri via aro.",
     "Space settings": "Agordoj de aro",
     "Failed to save space settings.": "Malsukcesis konservi agordojn de aro.",
@@ -3110,21 +2652,14 @@
     "Unnamed Space": "Sennoma aro",
     "Invite to %(spaceName)s": "Inviti al %(spaceName)s",
     "Abort": "Nuligi",
-    "Don't want to add an existing room?": "Ĉu vi ne volas aldoni jaman ĉambron?",
-    "Failed to add rooms to space": "Malsukcesis aldoni ĉambrojn al aro",
-    "Apply": "Apliki",
-    "Applying...": "Aplikante…",
     "Create a new room": "Krei novan ĉambron",
     "Spaces": "Aroj",
-    "Filter your rooms and spaces": "Filtru viajn ĉambrojn kaj arojn",
-    "Add existing spaces/rooms": "Aldoni jamajn arojn/ĉambrojn",
     "Space selection": "Elekto de aro",
     "Edit devices": "Redakti aparatojn",
     "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.": "Vi ne povos malfari ĉi tiun ŝanĝon, ĉar vi malrangaltigas vin mem; se vi estas la lasta altranga uzanto de la aro, vi ne plu povos rehavi viajn rajtojn.",
     "Invite People": "Inviti personojn",
     "Empty room": "Malplena ĉamrbo",
     "You do not have permissions to add rooms to this space": "Vi ne havas permeson aldoni ĉambrojn al ĉi tiu aro",
-    "Explore space rooms": "Esplori ĉambrojn de aro",
     "Add existing room": "Aldoni jaman ĉambron",
     "You do not have permissions to create new rooms in this space": "Vi ne havas permeson krei novajn ĉambrojn en ĉi tiu aro",
     "Send message": "Sendi mesaĝon",
@@ -3132,10 +2667,8 @@
     "Your message was sent": "Via mesaĝo sendiĝis",
     "Encrypting your message...": "Ĉifrante mesaĝon…",
     "Sending your message...": "Sendante mesaĝon…",
-    "New room": "Nova ĉambro",
     "Leave space": "Forlasi aron",
     "Share your public space": "Diskonigu vian publikan aron",
-    "Invite members": "Inviti anojn",
     "Invite with email or username": "Inviti per retpoŝtadreso aŭ uzantonomo",
     "Invite people": "Inviti personojn",
     "Share invite link": "Diskonigi invitan ligilon",
@@ -3147,21 +2680,14 @@
     "Add some details to help people recognise it.": "Aldonu kelkajn detalojn, por ke ĝi estu rekonebla.",
     "Your private space": "Via privata aro",
     "Your public space": "Via publika aro",
-    "You can change this later": "Vi povas ŝanĝi ĉi tion poste",
     "Invite only, best for yourself or teams": "Nur invita, ideala por vi mem aŭ por skipoj",
     "Private": "Privata",
     "Open space for anyone, best for communities": "Malferma aro por ĉiu ajn, ideala por komunumoj",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Aroj estas novaj manieroj grupigi ĉambrojn kaj personojn. Por aliĝi al aro, vi bezonas inviton.",
     "Create a space": "Krei aron",
-    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Pratipo de Aroj. Malkonforma kun Komunumoj, Komunumoj v2, kaj Propraj etikedoj. Bezonas konforman hejmservilon por iuj funkcioj.",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Kontrolu ĉi tiun saluton por aliri viajn ĉifritajn mesaĝojn, kaj pruvi al aliuloj, ke la salutanto vere estas vi.",
-    "Verify with another session": "Knotroli per alia salutaĵo",
     "Original event source": "Originala fonto de okazo",
     "Decrypted event source": "Malĉifrita fonto de okazo",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Por ĉiu el ili ni kreos ĉambron. Vi povos aldoni pliajn pli poste, inkluzive jam ekzistantajn.",
     "What projects are you working on?": "Kiujn projektojn vi prilaboras?",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Ni kreu ĉambron por ĉiu el ili. Vi povas aldoni pliajn poste, inkluzive jam ekzistantajn.",
-    "What are some things you want to discuss?": "Pri kio volas vi paroli?",
     "Invite by username": "Inviti per uzantonomo",
     "Make sure the right people have access. You can invite more later.": "Certigu, ke la ĝustaj personoj povas aliri. Vi povas inviti pliajn pli poste.",
     "Invite your teammates": "Invitu viajn kunulojn",
@@ -3186,7 +2712,6 @@
     "Values at explicit levels": "Valoroj por malimplicitaj niveloj",
     "Spell check dictionaries": "Literumadaj vortaroj",
     "Space options": "Agordoj de aro",
-    "Space Home": "Hejmo de aro",
     "with state key %(stateKey)s": "kun statŝlosilo %(stateKey)s",
     "with an empty state key": "kun malplena statŝlosilo",
     "Invited people will be able to read old messages.": "Invititoj povos legi malnovajn mesaĝojn.",
@@ -3203,8 +2728,6 @@
     "View all %(count)s members|one": "Montri 1 anon",
     "View all %(count)s members|other": "Montri ĉiujn %(count)s anojn",
     "Accept on your other login…": "Akceptu per via alia saluto…",
-    "Stop & send recording": "Ĉesi kaj sendi registrajon",
-    "Record a voice message": "Registri voĉmesaĝon",
     "Quick actions": "Rapidaj agoj",
     "Invite to just this room": "Inviti nur al ĉi tiu ĉambro",
     "%(seconds)ss left": "%(seconds)s sekundoj restas",
@@ -3214,7 +2737,6 @@
     "Workspace: <networkLink/>": "Laborspaco: <networkLink/>",
     "Manage & explore rooms": "Administri kaj esplori ĉambrojn",
     "unknown person": "nekonata persono",
-    "Send and receive voice messages (in development)": "Sendi kaj ricevi voĉmesaĝojn (evoluigate)",
     "Show options to enable 'Do not disturb' mode": "Montri elekteblojn por ŝalti sendistran reĝimon",
     "%(deviceId)s from %(ip)s": "%(deviceId)s de %(ip)s",
     "Review to ensure your account is safe": "Kontrolu por certigi sekurecon de via konto",
@@ -3227,21 +2749,15 @@
     "You may contact me if you have any follow up questions": "Vi povas min kontakti okaze de pliaj demandoj",
     "To leave the beta, visit your settings.": "Por foriri de la prova versio, iru al viaj agordoj.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Via platformo kaj uzantonomo helpos al ni pli bone uzi viajn prikomentojn.",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Viaj prikomentoj helpos plibonigi arojn. Kiom pli detale vi skribos, tiom pli bonos.",
     "%(featureName)s beta feedback": "Komentoj pri la prova versio de %(featureName)s",
     "Thank you for your feedback, we really appreciate it.": "Dankon pro viaj prikomentoj, ni vere ilin ŝatas.",
-    "Beta feedback": "Komentoj pri la prova versio",
     "Want to add a new room instead?": "Ĉu vi volas anstataŭe aldoni novan ĉambron?",
-    "You can add existing spaces to a space.": "Vi povas arigi arojn.",
-    "Feeling experimental?": "Ĉu vi eksperimentemas?",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Aldonante ĉambron…",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Aldonante ĉambrojn… (%(progress)s el %(count)s)",
     "Not all selected were added": "Ne ĉiuj elektitoj aldoniĝis",
     "You are not allowed to view this server's rooms list": "Vi ne rajtas vidi liston de ĉambroj de tu ĉi servilo",
     "Add reaction": "Aldoni reagon",
     "Error processing voice message": "Eraris traktado de voĉmesaĝo",
-    "Delete recording": "Forigi registraĵon",
-    "Stop the recording": "Ĉesigi la registradon",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Ni ne trovis mikrofonon en via aparato. Bonvolu kontroli viajn agordojn kaj reprovi.",
     "No microphone found": "Neniu mikrofono troviĝis",
     "We were unable to access your microphone. Please check your browser settings and try again.": "Ni ne povis aliri vian mikrofonon. Bonvolu kontroli la agordojn de via foliumilo kaj reprovi.",
@@ -3249,18 +2765,12 @@
     "%(count)s results in all spaces|one": "%(count)s rezulto en ĉiuj aroj",
     "%(count)s results in all spaces|other": "%(count)s rezultoj en ĉiuj aroj",
     "You have no ignored users.": "Vi malatentas neniujn uzantojn.",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Aroj prezentas novan manieron grupigi ĉambrojn kaj personojn. Por aliĝi al jama spaco, vi bezonos inviton.",
     "Please enter a name for the space": "Bonvolu enigi nomon por la aro",
     "Play": "Ludi",
     "Pause": "Paŭzigi",
     "Connecting": "Konektante",
     "Sends the given message with a space themed effect": "Sendas mesaĝon kun la efekto de kosmo",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permesi samtavolajn individuajn vokojn (kaj do videbligi vian IP-adreson al la alia vokanto)",
-    "Send and receive voice messages": "Sendi kaj ricevi voĉmesaĝojn",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Prova versio disponeblas por reto, labortablo, kaj Androido. Iuj funkcioj eble ne disponeblas per via hejmservilo.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Vi povas forlasi la provan version iam ajn per la agordoj, aŭ per tuŝeto al la prova insigno, kiel tiu ĉi-supre.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s estos enlegita kun subetno de Aroj. Komunumoj kaj propraj etikedoj iĝos kaŝitaj.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Se vi foriros, %(brand)s estos enlegita sen subteno de Aroj. Komunumoj kaj propraj etikedoj ree estos videblaj.",
     "Spaces are a new way to group rooms and people.": "Aroj prezentas novan manieron grupigi ĉambrojn kaj homojn.",
     "See when people join, leave, or are invited to your active room": "Vidu kiam oni aliĝas, foriras, aŭ invitiĝas al via aktiva ĉambro",
     "See when people join, leave, or are invited to this room": "Vidu kiam oni aliĝas, foriras, aŭ invitiĝas al la ĉambro",
@@ -3277,7 +2787,6 @@
     "Message search initialisation failed": "Malsukcesis komenci serĉadon de mesaĝoj",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Konsultante kun %(transferTarget)s. <a>Transdono al %(transferee)s</a>",
     "sends space invaders": "sendas imiton de ludo « Space Invaders »",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Prova versio disponeblas por reto, labortablo, kaj Androido. Dankon pro via provo.",
     "Enter your Security Phrase a second time to confirm it.": "Enigu vian Sekurecan frazon duafoje por ĝin konfirmi.",
     "Space Autocomplete": "Memaga finfaro de aro",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Sen kontrolo, vi ne povos aliri al ĉiuj viaj mesaĝoj, kaj aliuloj vin povos vidi nefidata.",
@@ -3292,9 +2801,6 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Elektu aldonotajn ĉambrojn aŭ interparolojn. Ĉi tiu aro estas nur por vi, neniu estos informita. Vi povas aldoni pliajn pli poste.",
     "What do you want to organise?": "Kion vi volas organizi?",
     "Skip for now": "Preterpasi ĉi-foje",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Por aliĝi al %(spaceName)s, ŝaltu <a>la provan version de Aroj</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Por vidi %(spaceName)s, ŝaltu la <a>provan version de Aroj</a>",
-    "Spaces are a beta feature.": "Aroj estas prova funkcio.",
     "Search names and descriptions": "Serĉi nomojn kaj priskribojn",
     "Select a room below first": "Unue elektu ĉambron de sube",
     "You can select all or individual messages to retry or delete": "Vi povas elekti ĉiujn aŭ unuopajn mesaĝojn, por reprovi aŭ forigi",
@@ -3303,7 +2809,6 @@
     "Delete all": "Forigi ĉiujn",
     "Some of your messages have not been sent": "Kelkaj viaj mesaĝoj ne sendiĝis",
     "Filter all spaces": "Filtri ĉiujn arojn",
-    "Communities are changing to Spaces": "Komunumoj iĝas Aroj",
     "Verification requested": "Kontrolpeto",
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Vi estas la nura persono tie ĉi. Se vi foriros, neniu alia plu povos aliĝi, inkluzive vin mem.",
     "Avatar": "Profilbildo",
@@ -3319,6 +2824,280 @@
     "Verify other login": "Kontroli alian saluton",
     "Reset event store": "Restarigi deponejon de okazoj",
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Se vi tamen tion faras, sciu ke neniu el viaj mesaĝoj foriĝos, sed via sperto pri serĉado povas malboniĝi momente, dum la indekso estas refarata",
-    "You most likely do not want to reset your event index store": "Plej probable, vi ne volas restarigi vian deponejon de indeksoj de okazoj",
-    "Reset event store?": "Ĉu restarigi deponejon de okazoj?"
+    "You most likely do not want to reset your event index store": "Plej verŝajne, vi ne volas restarigi vian deponejon de indeksoj de okazoj",
+    "Reset event store?": "Ĉu restarigi deponejon de okazoj?",
+    "Currently joining %(count)s rooms|one": "Nun aliĝante al %(count)s ĉambro",
+    "Currently joining %(count)s rooms|other": "Nun aliĝante al %(count)s ĉambroj",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Provu aliajn vortojn aŭ kontorolu, ĉu vi ne tajperaris. Iuj rezultoj eble ne videblos, ĉar ili estas privataj kaj vi bezonus inviton por aliĝi.",
+    "No results for \"%(query)s\"": "Neniuj rezultoj por «%(query)s»",
+    "The user you called is busy.": "La uzanto, kiun vi vokis, estas okupata.",
+    "User Busy": "Uzanto estas okupata",
+    "Integration manager": "Kunigilo",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Via %(brand)so ne permesas al vi uzi kunigilon por tio. Bonvolu kontakti administranton.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> al %(widgetDomain)s kaj via kunigilo.",
+    "Identity server is": "Identiga servilo estas",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi povnivelojn.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Uzu kunigilon por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Uzu kunigilon <b>(%(serverName)s)</b> por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
+    "Identity server": "Identiga servilo",
+    "Identity server (%(server)s)": "Identiga servilo (%(server)s)",
+    "Could not connect to identity server": "Ne povis konektiĝi al identiga servilo",
+    "Not a valid identity server (status code %(code)s)": "Nevalida identiga servilo (statkodo %(code)s)",
+    "Silence call": "Silenta voko",
+    "Sound on": "Kun sono",
+    "User %(userId)s is already invited to the room": "Uzanto %(userId)s jam invitiĝis al la ĉambro",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s ŝanĝis la <a>fiksitajn mesaĝojn</a> de la ĉambro.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s forpelis uzanton %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s forpelis uzanton %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s malforbaris uzanton %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s foriris de la ĉambro",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s foriris de la ĉambro: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s rifuzis la inviton",
+    "%(targetName)s joined the room": "%(targetName)s aliĝis al la ĉambro",
+    "%(senderName)s made no change": "%(senderName)s faris nenian ŝanĝon",
+    "%(senderName)s set a profile picture": "%(senderName)s agordis profilbildon",
+    "%(senderName)s changed their profile picture": "%(senderName)s ŝanĝis sian profilbildon",
+    "%(senderName)s removed their profile picture": "%(senderName)s forigis sian profilbildon",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s forigis sian prezentan nomon (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s ŝanĝis sian prezentan nomon al %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s ŝanĝis sian prezentan nomon al %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s forbaris uzanton %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s forbaris uzanton %(targetName)s: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s akceptis inviton",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s akceptis la inviton por %(displayName)s",
+    "Some invites couldn't be sent": "Ne povis sendi iujn invitojn",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Ni sendis la aliajn, sed la ĉi-subaj personoj ne povis ricevi inviton al <RoomName/>",
+    "Transfer Failed": "Malsukcesis transdono",
+    "Unable to transfer call": "Ne povas transdoni vokon",
+    "Preview Space": "Antaŭrigardi aron",
+    "Decide who can view and join %(spaceName)s.": "Decidu, kiu povas rigardi kaj aliĝi aron %(spaceName)s.",
+    "Visibility": "Videbleco",
+    "This may be useful for public spaces.": "Tio povas esti utila por publikaj aroj.",
+    "Guests can join a space without having an account.": "Gastoj povas aliĝi al aro sen konto.",
+    "Enable guest access": "Ŝalti aliron de gastoj",
+    "Failed to update the history visibility of this space": "Malsukcesis ĝisdatigi videblecon de historio de ĉi tiu aro",
+    "Failed to update the guest access of this space": "Malsukcesis ĝisdatigi aliron de gastoj al ĉi tiu aro",
+    "Failed to update the visibility of this space": "Malsukcesis ĝisdatigi la videblecon de ĉi tiu aro",
+    "Show all rooms": "Montri ĉiujn ĉambrojn",
+    "Address": "Adreso",
+    "e.g. my-space": "ekz. mia-aro",
+    "Give feedback.": "Prikomentu.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Dankon ĉar vi provas arojn. Viaj prikomentoj helpos al ni evoluigi la venontajn versiojn.",
+    "Spaces feedback": "Prikomentoj pri aroj",
+    "Spaces are a new feature.": "Aroj estas nova funkcio.",
+    "Delete avatar": "Forigi profilbildon",
+    "Mute the microphone": "Silentigi la mikrofonon",
+    "Unmute the microphone": "Malsilentigi la mikrofonon",
+    "Dialpad": "Ciferplato",
+    "More": "Pli",
+    "Show sidebar": "Montri flankan breton",
+    "Hide sidebar": "Kaŝi flankan breton",
+    "Start sharing your screen": "Ŝalti ekranvidadon",
+    "Stop sharing your screen": "Malŝalti ekranvidadon",
+    "Stop the camera": "Malŝalti la filmilon",
+    "Start the camera": "Ŝalti la filmilon",
+    "Your camera is still enabled": "Via filmilo ankoraŭ estas ŝaltita",
+    "Your camera is turned off": "Via filmilo estas malŝaltita",
+    "%(sharerName)s is presenting": "%(sharerName)s prezentas",
+    "You are presenting": "Vi prezentas",
+    "Surround selected text when typing special characters": "Ĉirkaŭi elektitan tekston dum tajpado de specialaj signoj",
+    "Don't send read receipts": "Ne sendi legokonfirmojn",
+    "New layout switcher (with message bubbles)": "Nova baskulo de aranĝo (kun mesaĝaj vezikoj)",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Pratipo de raportado al reguligistoj. En ĉambroj, kiuj subtenas reguligadon, la butono «raporti» povigos vin raporti misuzon al reguligistoj de ĉambro",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Tio faciligas, ke ĉambroj restu privataj por aro, sed ebligas serĉadon kaj aliĝadon al personoj en tiu sama aro. Ĉiuj novaj ĉambroj en aro havos tiun ĉi elekteblon.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Por helpi al aranoj trovi kaj aliĝi privatan ĉambron, iru al la agordoj de Sekureco kaj Privateco de tiu ĉambro.",
+    "Help space members find private rooms": "Helpu aranojn trovi privatajn ĉambrojn",
+    "Help people in spaces to find and join private rooms": "Helpu al personoj en aroj trovi kaj aliĝi privatajn ĉambrojn",
+    "New in the Spaces beta": "Nove en beta-versio de aroj",
+    "This space has no local addresses": "Ĉi tiu aro ne havas lokajn adresojn",
+    "Stop recording": "Malŝalti registradon",
+    "Copy Room Link": "Kopii ligilon al ĉambro",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Nun vi povas vidigi vian ekranon per la butono «ekranvidado» dum voko. Vi eĉ povas fari tion dum voĉvokoj, se ambaŭ flankoj tion subtenas!",
+    "Screen sharing is here!": "Ekranvidado venis!",
+    "End-to-end encryption isn't enabled": "Tutvoja ĉifrado ne estas ŝaltita",
+    "Send voice message": "Sendi voĉmesaĝon",
+    "Show %(count)s other previews|one": "Montri %(count)s alian antaŭrigardon",
+    "Show %(count)s other previews|other": "Montri %(count)s aliajn antaŭrigardojn",
+    "Access": "Aliro",
+    "People with supported clients will be able to join the room without having a registered account.": "Personoj kun subtenataj klientoj povos aliĝi al la ĉambro sen registrita konto.",
+    "Decide who can join %(roomName)s.": "Decidu, kiu povas aliĝi al %(roomName)s.",
+    "Space members": "Aranoj",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Ĉiu en aro povas trovi kaj aliĝi. Vi povas elekti plurajn arojn.",
+    "Spaces with access": "Aroj kun aliro",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Ĉiu en aro povas trovi kaj aliĝi. <a>Redaktu, kiuj aroj povas aliri, tie ĉi.</a>",
+    "Currently, %(count)s spaces have access|other": "Nun, %(count)s aroj rajtas aliri",
+    "& %(count)s more|other": "kaj %(count)s pli",
+    "Upgrade required": "Necesas gradaltigo",
+    "Anyone can find and join.": "Ĉiu povas trovi kaj aliĝi.",
+    "Only invited people can join.": "Nur invititoj povas aliĝi.",
+    "Private (invite only)": "Privata (nur invititoj)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Ĉi tiu gradaltigo povigos anojn de la elektitaj aroj aliri ĉi tiun ĉambron sen invito.",
+    "Space information": "Informoj pri aro",
+    "Images, GIFs and videos": "Bildoj, GIF-bildoj kaj filmoj",
+    "Code blocks": "Kodujoj",
+    "To view all keyboard shortcuts, click here.": "Por vidi ĉiujn ŝparklavojn, klaku ĉi tie.",
+    "Keyboard shortcuts": "Ŝparklavoj",
+    "Olm version:": "Versio de Olm:",
+    "Identity server URL must be HTTPS": "URL de identiga servilo devas esti je HTTPS",
+    "There was an error loading your notification settings.": "Eraris enlegado de viaj agordoj pri sciigoj.",
+    "Mentions & keywords": "Mencioj kaj ĉefvortoj",
+    "Global": "Ĉie",
+    "New keyword": "Nova ĉefvorto",
+    "Keyword": "Ĉefvorto",
+    "Enable email notifications for %(email)s": "Ŝalti retpoŝtajn sciigojn por %(email)s",
+    "Enable for this account": "Ŝalti por ĉi tiu konto",
+    "An error occurred whilst saving your notification preferences.": "Eraris konservado de viaj preferoj pri sciigoj.",
+    "Error saving notification preferences": "Eraris konservado de preferoj pri sciigoj",
+    "Messages containing keywords": "Mesaĝoj enhavantaj ĉefvortojn",
+    "Message bubbles": "Mesaĝaj vezikoj",
+    "IRC": "IRC",
+    "Collapse": "Maletendi",
+    "Expand": "Etendi",
+    "Recommended for public spaces.": "Rekomendita por publikaj aroj.",
+    "Allow people to preview your space before they join.": "Povigi personojn antaŭrigardi vian aron antaŭ aliĝo.",
+    "To publish an address, it needs to be set as a local address first.": "Por ke adreso publikiĝu, ĝi unue devas esti loka adreso.",
+    "Published addresses can be used by anyone on any server to join your room.": "Publikigitajn adresojn povas uzi ajna persono sur ajna servilo por aliĝi al via ĉambro.",
+    "Published addresses can be used by anyone on any server to join your space.": "Publikigitajn adresojn povas uzi ajna persono sur ajna servilo por aliĝi al via aro.",
+    "We're working on this, but just want to let you know.": "Ni prilaboras ĉi tion, sed volas simple informi vin.",
+    "Search for rooms or spaces": "Serĉi ĉambrojn aŭ arojn",
+    "Created from <Community />": "Kreita el <Community />",
+    "To view %(spaceName)s, you need an invite": "Por vidi aron %(spaceName)s, vi bezonas inviton",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Vi ĉiam povas klaki profilbildon en la filtra breto, por vidi nur la ĉambrojn kaj homojn ligitajn al tiu komunumo.",
+    "Unable to copy a link to the room to the clipboard.": "Ne povas kopii ligilon al ĉambro al tondujo.",
+    "Unable to copy room link": "Ne povas kopii ligilon al ĉambro",
+    "Communities won't receive further updates.": "Komunumoj ne ĝisdatiĝos plu.",
+    "Spaces are a new way to make a community, with new features coming.": "Aroj estas nova maniero fari komunumon, kun novaj funkcioj.",
+    "Communities can now be made into Spaces": "Komunumoj nun povas iĝi aroj",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Petu, ke <a>administrantoj</a> de ĉi tiu komunumo igu ĝin aro, kaj atentu la inviton.",
+    "You can create a Space from this community <a>here</a>.": "Vi povas krei aron el ĉi tiu komunumo <a>tie ĉi</a>.",
+    "Error downloading audio": "Eraris elŝuto de sondosiero",
+    "Unnamed audio": "Sennoma sondosiero",
+    "Move down": "Subenigi",
+    "Move up": "Suprenigi",
+    "Add space": "Aldoni aron",
+    "Report": "Raporti",
+    "Collapse reply thread": "Maletendi respondan fadenon",
+    "Show preview": "Antaŭrigardi",
+    "View source": "Montri fonton",
+    "Settings - %(spaceName)s": "Agordoj – %(spaceName)s",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Sciu, ke gradaltigo kreos novan version de la ĉambro</b>. Ĉiuj nunaj mesaĝoj restos en ĉi tiu arĥivita ĉambro.",
+    "Automatically invite members from this room to the new one": "Memage inviti anojn de ĉi tiu ĉambro al la nova",
+    "Report the entire room": "Raporti la tutan ĉambron",
+    "Spam or propaganda": "Rubmesaĝo aŭ propagando",
+    "Illegal Content": "Kontraŭleĝa enhavo",
+    "Toxic Behaviour": "Vunda konduto",
+    "Disagree": "Malkonsento",
+    "Please pick a nature and describe what makes this message abusive.": "Bonvolu elekti karakteron kaj priskribi, kial la mesaĝo estas mistrakta.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Alia kialo. Bonvolu priskribi la problemon.\nĈi tio raportiĝos al reguligistoj de la ĉambro.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Ĉi tiu ĉambro estas dediĉita al kontraŭleĝa aŭ vunda enhavo, aŭ la reguligistoj malsukcesas tian enhavon reguligi.\nĈi tio raportiĝos al administrantoj de %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Ĉi tiu ĉambro estas destinita al kontraŭleĝa al vunda enhavo, aŭ la reguligistoj ne sukcesas tian enhavon reguligi.\nĈi tio raportiĝos al administrantoj de %(homeserver)s. La administrantoj NE povos legi ĉifritan historion de ĉi tiu ĉambro.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Ĉi tiu uzanto sendas rubmesaĝojn kun reklamoj, ligiloj al reklamoj, aŭ al propagando.\nĈi tio raportiĝos al reguligistoj de la ĉambro.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Ĉi tiu uzanto kondutas kontraŭleĝe, ekzemple malkaŝante personajn informojn pri aliuloj, aŭ minacante per agreso.\nĈi tio raportiĝos al reguligistoj de la ĉambro, kiuj povos ĝin plusendi al leĝa aŭtoritato.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Ĉi tiu uzanto kondutas vunde, ekzemple insultante aliajn uzantojn aŭ havigante konsternan enhavon en infantaŭga ĉambro, aŭ alimaniere malobeante regulojn de la ĉambro.\nTio ĉi raportiĝos al reguligistoj de la ĉambro.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Tio, kion skribas ĉi tiu uzanto, maltaŭgas.\nTio ĉi raportiĝos al reguligistoj de la ĉambro.",
+    "Other spaces or rooms you might not know": "Aliaj aroj aŭ ĉambroj, kiujn vi eble ne konas",
+    "Spaces you know that contain this room": "Konataj aroj, kiuj enhavas ĉi tiun ĉambron",
+    "Search spaces": "Serĉi arojn",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decidu, kiuj aroj rajtos aliri ĉi tiun ĉambron. Se aro estas elektita, ĝiaj anoj povas trovi kaj aliĝi al <RoomName/>.",
+    "Select spaces": "Elekti arojn",
+    "You're removing all spaces. Access will default to invite only": "Vi forigas ĉiujn arojn. Implicite povos aliri nur invititoj",
+    "Leave %(spaceName)s": "Foriri de %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Vi estas la sola administranto de iuj ĉambroj aŭ aroj, de kie vi volas foriri. Se vi faros tion, neniu povos ilin plu administri.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Vi estas la sola administranto de ĉi tiu aro. Se vi foriros, neniu povos ĝin administri.",
+    "You won't be able to rejoin unless you are re-invited.": "Vi ne povos ree aliĝi, krom se oni ree invitos vin.",
+    "Search %(spaceName)s": "Serĉi je %(spaceName)s",
+    "User Directory": "Katologo de uzantoj",
+    "Or send invite link": "Aŭ sendu invitan ligilon",
+    "If you can't see who you’re looking for, send them your invite link below.": "Se vi ne trovis tiun, kiun vi serĉis, sendu al ĝi inviton per la ĉi-suba ligilo.",
+    "Some suggestions may be hidden for privacy.": "Iuj proponoj povas esti kaŝitaj pro privateco.",
+    "Search for rooms or people": "Serĉi ĉambrojn aŭ personojn",
+    "Forward message": "Plusendi mesaĝon",
+    "Open link": "Malfermi ligilon",
+    "Sent": "Sendite",
+    "You don't have permission to do this": "Vi ne rajtas fari tion",
+    "Want to add an existing space instead?": "Ĉu vi volas aldoni jaman aron anstataŭe?",
+    "Add a space to a space you manage.": "Aldoni aron al administrata aro.",
+    "Only people invited will be able to find and join this space.": "Nur invititoj povos trovi kaj aliĝi ĉi tiun aron.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Ĉiu povos trovi kaj aliĝi ĉi tiun aron, ne nur anoj de <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Ĉiu en <SpaceName/> povos ĝin trovi kaj aliĝi.",
+    "Private space (invite only)": "Privata aro (nur por invititoj)",
+    "Space visibility": "Videbleco de aro",
+    "This description will be shown to people when they view your space": "Ĉi tiu priskribo montriĝos al homoj, kiam ili rigardos vian aron",
+    "Flair won't be available in Spaces for the foreseeable future.": "Insigno ne estos baldaŭ disponebla en aroj.",
+    "All rooms will be added and all community members will be invited.": "Ĉiuj ĉambroj aldoniĝos kaj ĉiuj komunumanoj invitiĝos.",
+    "A link to the Space will be put in your community description.": "Ligilo al la aro metiĝos en la priskribon de via komunumo.",
+    "Create Space from community": "Krei aron el komunumo",
+    "Failed to migrate community": "Malsukcesis migri komunumon",
+    "To create a Space from another community, just pick the community in Preferences.": "Por krei aron el alia komunumo, simple elektu la komunumon en Agordoj.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> kreiĝis, kaj ĉiu komunumano invitiĝis.",
+    "Space created": "Aro kreiĝis",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Por vidi arojn, kaŝu komunumojn en <a>Agordoj</a>",
+    "This community has been upgraded into a Space": "Ĉi tiu komunumo gradaltiĝis al aro",
+    "Visible to space members": "Videbla al aranoj",
+    "Public room": "Publika ĉambro",
+    "Private room (invite only)": "Privata ĉambro (nur por invititoj)",
+    "Room visibility": "Videbleco de ĉambro",
+    "Create a room": "Krei ĉambron",
+    "Only people invited will be able to find and join this room.": "Nur invititoj povos trovi kaj aliĝi ĉi tiun ĉambron.",
+    "Anyone will be able to find and join this room.": "Ĉiu povos trovi kaj aliĝi ĉi tiun ĉambron.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Ĉiu povos trovi kaj aliĝi ĉi tiun ĉambron, ne nur anoj de <SpaceName/>.",
+    "You can change this at any time from room settings.": "Vi povas ŝanĝi ĉi tion iam ajn per agordoj de la ĉambro.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Ĉiu en <SpaceName/> povos trovi kaj aliĝi ĉi tiun ĉambron.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Erarserĉaj protokoloj enhavas datumojn pri uzado de la aplikaĵo, inkluzive vian uzantonomon, la identigilojn aŭ kromnomojn de vizititaj ĉambroj aŭ grupoj, fasadaj elementoj, kun kiuj vi freŝe interagis, kaj uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
+    "Adding spaces has moved.": "Aldonejo de aroj moviĝis.",
+    "Search for rooms": "Serĉi ĉambrojn",
+    "Search for spaces": "Serĉi arojn",
+    "Create a new space": "Krei novan aron",
+    "Want to add a new space instead?": "Ĉu vi volas aldoni novan aron anstataŭe?",
+    "Add existing space": "Aldoni jaman aron",
+    "Please provide an address": "Bonvolu doni adreson",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s ŝanĝis la <a>fiksitajn mesaĝojn</a> de la ĉambro %(count)s-foje.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s ŝanĝis la <a>fiksitajn mesaĝojn</a> de la ĉambro %(count)s-foje.",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s ŝanĝis la servilblokajn listojn",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s ŝanĝis la servilblokajn listojn %(count)s-foje",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ŝanĝis la servilblokajn listojn",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ŝanĝis la servilblokajn listojn %(count)s-foje",
+    "Share content": "Havigi enhavon",
+    "Application window": "Fenestro de aplikaĵo",
+    "Share entire screen": "Vidigi tutan ekranon",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Malsukcesis komencigo de serĉado de mesaĝoj, kontrolu <a>viajn agordojn</a> por pliaj informoj",
+    "Error - Mixed content": "Eraris – Miksita enhavo",
+    "Error loading Widget": "Eraris enlegado de fenestraĵo",
+    "Image": "Bildo",
+    "Sticker": "Glumarko",
+    "Error processing audio message": "Eraris traktado de sonmesaĝo",
+    "Decrypting": "Malĉifrante",
+    "The call is in an unknown state!": "La voko estas en nekonata stato!",
+    "Unknown failure: %(reason)s": "Malsukceso nekonata: %(reason)s",
+    "No answer": "Sen respondo",
+    "Enable encryption in settings.": "Ŝaltu ĉifradon per agordoj.",
+    "Send pseudonymous analytics data": "Sendi kromnomaj analizajn datumojn",
+    "Offline encrypted messaging using dehydrated devices": "Eksterreta ĉifrita komunikado per alsalutaĵoj",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s nuligis inviton por %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s nuligis inviton por %(targetName)s: %(reason)s",
+    "An unknown error occurred": "Okazis nekonata eraro",
+    "Their device couldn't start the camera or microphone": "Ĝia aparato ne povis startigi la filmilon aŭ la mikrofonon",
+    "Connection failed": "Malsukcesis konekto",
+    "Could not connect media": "Ne povis konekti vidaŭdaĵon",
+    "Missed call": "Nerespondita voko",
+    "Call back": "Revoki",
+    "Call declined": "Voko rifuziĝis",
+    "Pinned messages": "Fiksitaj mesaĝoj",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Se vi havas la bezonajn permesojn, malfermu la menuon sur ajna mesaĝo, kaj klaku al <b>Fiksi</b> por meti ĝin ĉi tien.",
+    "Nothing pinned, yet": "Ankoraŭ nenio fiksita",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Agordu adresojn por ĉi tiu aro, por ke uzantoj trovu ĝin per via hejmservilo (%(localDomain)s)",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Viaj privataj mesaĝoj normale estas ĉifrataj, sed ĉi tiu ĉambro ne estas ĉifrata. Plej ofte tio okazas pro uzo de nesubtenata aparato aŭ metodo, ekzemple retpoŝtaj invitoj.",
+    "Displaying time": "Montrado de tempo",
+    "If a community isn't shown you may not have permission to convert it.": "Se komunumo ne montriĝas, eble vi ne rajtas fari aron el ĝi.",
+    "Show my Communities": "Montri miajn komunumojn",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Komunumoj arĥiviĝis pro aroj, sed ĉi-sube vi povas krei arojn el viaj komunumoj. Tiel vi certigos, ke viaj interparoloj havos la plej freŝajn funkciojn.",
+    "Create Space": "Krei aron",
+    "Open Space": "Malfermi aron",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se vi raportis eraron per GitHub, erarserĉaj protokoloj povas helpi nin trovi la problemon. Erarserĉaj protokoloj enhavas datumojn pri via uzado de aplikaĵo, inkluzive vian uzantonomon, identigilojn aŭ kromnomojn de ĉambroj aŭ grupoj, kiujn vi vizitis, freŝe uzitajn fasadajn elementojn, kaj la uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
+    "Cross-signing is ready but keys are not backed up.": "Delegaj subskriboj pretas, sed ŝlosiloj ne estas savkopiitaj.",
+    "You can change this later.": "Vi povas ŝanĝi ĉi tion poste.",
+    "What kind of Space do you want to create?": "Kian aron volas vi krei?",
+    "All rooms you're in will appear in Home.": "Ĉiuj ĉambroj, kie vi estas, aperos en la ĉefpaĝo.",
+    "Show all rooms in Home": "Montri ĉiujn ĉambrojn en ĉefpaĝo",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fiksis <a>mesaĝon</a> al ĉi tiu ĉambro. Vidu ĉiujn <b>fiksitajn mesaĝojn</b>."
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 60f5d06bec..d5568f003c 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1,8 +1,5 @@
 {
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceptó una invitación.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptó la invitación para %(displayName)s.",
     "Account": "Cuenta",
-    "Access Token:": "Token de Acceso:",
     "Admin": "Admin",
     "Advanced": "Avanzado",
     "Always show message timestamps": "Siempre mostrar las marcas temporales de mensajes",
@@ -11,32 +8,19 @@
     "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.",
-    "Anyone who knows the room's link, apart from guests": "Cualquier persona que conozca el enlace a esta sala, pero excluir a la gente sin cuenta",
-    "Anyone who knows the room's link, including guests": "Cualquier persona que conozca el enlace a esta sala, incluyendo gente sin cuenta",
     "Are you sure?": "¿Estás seguro?",
     "Are you sure you want to reject the invitation?": "¿Estás seguro que quieres rechazar la invitación?",
     "Attachment": "Adjunto",
-    "Autoplay GIFs and videos": "Reproducir automáticamente GIFs y videos",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s vetó a %(targetName)s.",
     "Ban": "Vetar",
     "Banned users": "Usuarios vetados",
     "Bans user with given id": "Veta al usuario con la ID dada",
-    "Call Timeout": "Tiempo de Espera de Llamada",
     "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>.": "No se ha podido conectar al servidor base a través de HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>activando los scripts inseguros</a>.",
     "Change Password": "Cambiar contraseña",
-    "%(senderName)s changed their profile picture.": "%(senderName)s cambió su imagen de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha cambiado el nivel de acceso de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambió el nombre de la sala a %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambió el tema a \"%(topic)s\".",
     "Changes your display nickname": "Cambia tu apodo público",
-    "Click here to fix": "Haz clic aquí para arreglar",
-    "Click to mute audio": "Haz clic para silenciar el audio",
-    "Click to mute video": "Haz clic para silenciar el vídeo",
-    "click to reveal": "Haz clic para ver",
-    "Click to unmute video": "Haz clic para dejar de silenciar el vídeo",
-    "Click to unmute audio": "Haz clic para dejar de silenciar el audio",
     "Command error": "Error de comando",
     "Commands": "Comandos",
     "Confirm password": "Confirmar contraseña",
@@ -44,7 +28,6 @@
     "Create Room": "Crear sala",
     "Cryptography": "Criptografía",
     "Current password": "Contraseña actual",
-    "/ddg is not a command": "/ddg no es un comando",
     "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",
@@ -55,10 +38,8 @@
     "Email": "Correo electrónico",
     "Email address": "Dirección de correo electrónico",
     "Emoji": "Emoticones",
-    "%(senderName)s ended the call.": "%(senderName)s finalizó la llamada.",
     "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",
     "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?",
@@ -66,7 +47,6 @@
     "Failed to forget room %(errCode)s": "No se pudo olvidar la sala %(errCode)s",
     "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",
     "Failed to mute user": "No se pudo silenciar al usuario",
     "Failed to reject invite": "Falló al rechazar invitación",
@@ -79,33 +59,26 @@
     "Failure to create room": "No se ha podido crear la sala",
     "Favourite": "Añadir a favoritos",
     "Favourites": "Favoritos",
-    "Fill screen": "Llenar pantalla",
     "Filter room members": "Filtrar miembros de la sala",
     "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.",
+    "For security, this session has been signed out. Please sign in again.": "Esta sesión ha sido cerrada. Por favor, inicia sesión de nuevo.",
     "%(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.": "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",
     "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": "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",
     "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",
     "Low priority": "Prioridad baja",
     "Accept": "Aceptar",
@@ -118,19 +91,13 @@
     "Camera": "Cámara",
     "Anyone": "Todos",
     "Close": "Cerrar",
-    "Custom": "Personalizado",
     "Custom level": "Nivel personalizado",
     "Decline": "Rechazar",
     "Enter passphrase": "Introducir frase de contraseña",
-    "Error: Problem communicating with the given homeserver.": "Error: No es posible comunicar con el servidor doméstico indicado.",
     "Export": "Exportar",
-    "Failed to fetch avatar URL": "Fallo al obtener la URL del avatar",
     "Failed to upload profile picture!": "¡No se pudo subir la imagen de perfil!",
     "Home": "Inicio",
     "Import": "Importar",
-    "Incoming call from %(name)s": "Llamada entrante de %(name)s",
-    "Incoming video call from %(name)s": "Llamada de vídeo entrante de %(name)s",
-    "Incoming voice call from %(name)s": "Llamada de voz entrante de %(name)s",
     "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.",
@@ -141,7 +108,6 @@
     "%(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, selecciona la sala de destino para este mensaje",
     "Create new room": "Crear nueva sala",
     "Start chat": "Iniciar conversación",
     "New Password": "Contraseña nueva",
@@ -156,11 +122,9 @@
     "You must join the room to see its files": "Debes unirte a la sala para ver sus archivos",
     "Reject all %(invitedRooms)s invites": "Rechazar todas las invitaciones a %(invitedRooms)s",
     "Failed to invite": "No se pudo invitar",
-    "Failed to invite the following users to the %(roomName)s room:": "No se pudo invitar a los siguientes usuarios a la sala %(roomName)s:",
     "Unknown error": "Error desconocido",
     "Incorrect password": "Contraseña incorrecta",
     "Unable to restore session": "No se puede recuperar la sesión",
-    "Room Colour": "Color de la sala",
     "%(roomName)s does not exist.": "%(roomName)s no existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s no es accesible en este momento.",
     "Rooms": "Salas",
@@ -168,7 +132,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 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",
@@ -176,28 +140,19 @@
     "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.",
-    "%(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": "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",
     "Start authentication": "Iniciar autenticación",
     "Submit": "Enviar",
     "Success": "Éxito",
-    "The phone number entered looks invalid": "El número telefónico indicado parece erróneo",
-    "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 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í",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Unirse con <voiceText>voz</voiceText> o <videoText>vídeo</videoText>.",
-    "Manage Integrations": "Gestionar integraciones",
     "Missing room_id in request": "Falta el room_id en la solicitud",
     "Missing user_id in request": "Falta el user_id en la solicitud",
     "Moderator": "Moderador",
@@ -207,14 +162,12 @@
     "New passwords must match each other.": "Las contraseñas nuevas deben coincidir.",
     "not specified": "sin especificar",
     "Notifications": "Notificaciones",
-    "(not supported by this browser)": "(no soportado por este navegador)",
     "<not supported>": "<no soportado>",
     "No display name": "Sin nombre público",
     "No more results": "No hay más resultados",
     "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:",
     "Only people who have been invited": "Solo las personas que hayan sido invitadas",
     "Operation failed": "Falló la operación",
     "Password": "Contraseña",
@@ -223,30 +176,21 @@
     "Phone": "Teléfono",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, consulta tu correo electrónico y haz clic en el enlace que contiene. Una vez hecho esto, haz clic en continuar.",
     "Power level must be positive integer.": "El nivel de autoridad debe ser un número entero positivo.",
-    "Private Chat": "Conversación privada",
     "Privileged Users": "Usuarios con privilegios",
     "Profile": "Perfil",
-    "Public Chat": "Sala pública",
     "Reason": "Motivo",
     "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).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s eliminó su imagen de perfil.",
     "Remove": "Eliminar",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitó una conferencia de vozIP.",
-    "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 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 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",
     "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 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",
@@ -256,20 +200,15 @@
     "Cancel": "Cancelar",
     "Dismiss": "Omitir",
     "powered by Matrix": "con el poder de Matrix",
-    "Room directory": "Directorio de salas",
-    "Custom Server Options": "Opciones de Servidor Personalizado",
     "unknown error code": "Código de error desconocido",
     "Skip": "Omitir",
     "Do you want to set an email address?": "¿Quieres poner una dirección de correo electrónico?",
     "This will allow you to reset your password and receive notifications.": "Esto te permitirá reiniciar tu contraseña y recibir notificaciones.",
     "Authentication check failed: incorrect password?": "La verificación de autenticación falló: ¿contraseña incorrecta?",
-    "Add a widget": "Añadir widget",
-    "Allow": "Permitir",
     "Delete widget": "Eliminar widget",
     "Define the power level of a user": "Define el nivel de autoridad de un usuario",
     "Edit": "Editar",
     "Enable automatic language detection for syntax highlighting": "Activar la detección automática del lenguaje para resaltar la sintaxis",
-    "To get started, please pick a username!": "Para empezar, ¡por favor elija un nombre de usuario!",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no tiene permiso para ver el mensaje solicitado.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no se ha podido encontrarlo.",
     "Unable to add email address": "No es posible añadir la dirección de correo electrónico",
@@ -277,9 +216,7 @@
     "Unable to remove contact information": "No se ha podido eliminar la información de contacto",
     "Unable to verify email address.": "No es posible verificar la dirección de correo electrónico.",
     "Unban": "Quitar Veto",
-    "Unable to capture screen": "No es posible capturar la pantalla",
     "Unable to enable Notifications": "No se han podido activar las notificaciones",
-    "unknown caller": "Persona que llama desconocida",
     "Unnamed Room": "Sala sin nombre",
     "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y otros %(count)s",
@@ -289,40 +226,26 @@
     "Upload file": "Subir archivo",
     "Upload new:": "Subir nuevo:",
     "Usage": "Uso",
-    "Username invalid: %(errMessage)s": "Nombre de usuario no válido: %(errMessage)s",
     "Users": "Usuarios",
     "Verification Pending": "Verificación Pendiente",
     "Verified key": "Clave verificada",
     "Video call": "Llamada de vídeo",
     "Voice call": "Llamada de voz",
-    "VoIP conference finished.": "conferencia de vozIP finalizada.",
-    "VoIP conference started.": "conferencia de vozIP iniciada.",
     "VoIP is unsupported": "VoIP no es compatible",
-    "(could not connect media)": "(no se ha podido conectar medio)",
-    "(no answer)": "(sin respuesta)",
-    "(unknown failure: %(reason)s)": "(error desconocido: %(reason)s)",
     "Warning!": "¡Advertencia!",
-    "Who can access this room?": "¿Quién puede acceder a esta sala?",
     "Who can read history?": "¿Quién puede leer el historial?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s retiró la invitación de %(targetName)s.",
-    "You are already in a call.": "Ya estás participando en una llamada.",
     "You are not in this room.": "No estás en esta sala.",
     "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 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 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.",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para usarlo, tan solo espera a que se carguen los resultados de autocompletar y navega entre ellos.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s le quitó el veto a %(targetName)s.",
     "Unmute": "Dejar de silenciar",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivel de permisos %(powerLevelNumber)s)",
     "You cannot place VoIP calls in this browser.": "No puedes realizar llamadas VoIP en este navegador.",
     "You do not have permission to post to this room": "No tienes permiso para publicar en esta sala",
     "You have <a>disabled</a> URL previews by default.": "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": "<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.",
@@ -352,7 +275,6 @@
     "Nov": "Nov",
     "Dec": "Dic",
     "Warning": "Advertencia",
-    "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",
@@ -360,25 +282,20 @@
     "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": "Si estás o no usando el 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",
     "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",
     "Send Account Data": "Enviar Datos de la Cuenta",
-    "Advanced notification settings": "Ajustes avanzados de notificaciones",
-    "Uploading report": "Enviando informe",
     "Sunday": "Domingo",
     "Guests can join": "Los invitados se pueden unir",
     "Failed to add tag %(tagName)s to room": "Error al añadir la etiqueta %(tagName)s a la sala",
     "Notification targets": "Destinos de notificaciones",
     "Failed to set direct chat tag": "Error al establecer la etiqueta de conversación directa",
     "Today": "Hoy",
-    "Files": "Archivos",
-    "You are not receiving desktop notifications": "No estás recibiendo notificaciones de escritorio",
     "Friday": "Viernes",
     "Update": "Actualizar",
     "What's New": "Novedades",
@@ -386,27 +303,16 @@
     "Changelog": "Registro de cambios",
     "Waiting for response from server": "Esperando una respuesta del servidor",
     "Leave": "Salir",
-    "Uploaded on %(date)s by %(user)s": "Subido el %(date)s por %(user)s",
     "Send Custom Event": "Enviar evento personalizado",
-    "All notifications are currently disabled for all targets.": "Las notificaciones están desactivadas para todos los objetivos.",
     "Failed to send logs: ": "Error al enviar registros: ",
-    "Forget": "Olvidar",
     "World readable": "Legible por todo el mundo",
-    "You cannot delete this image. (%(code)s)": "No puedes eliminar esta imagen. (%(code)s)",
-    "Cancel Sending": "Cancelar envío",
     "This Room": "Esta sala",
     "Resend": "Reenviar",
     "Room not found": "Sala no encontrada",
     "Messages containing my display name": "Mensajes que contengan mi nombre público",
     "Messages in one-to-one chats": "Mensajes en conversaciones uno a uno",
     "Unavailable": "No disponible",
-    "View Decrypted Source": "Ver fuente descifrada",
-    "Failed to update keywords": "Error al actualizar las palabras clave",
     "remove %(name)s from the directory.": "eliminar a %(name)s del directorio.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Las notificaciones de las siguientes palabras clave siguen reglas que no se pueden mostrar aquí:",
-    "Please set a password!": "¡Por favor establece una contraseña!",
-    "You have successfully set a password!": "¡Has establecido una nueva contraseña!",
-    "An error occurred whilst saving your email notification preferences.": "Se ha producido un error al guardar las preferencias de notificación por email.",
     "Explore Room State": "Explorar Estado de la Sala",
     "Source URL": "URL de Origen",
     "Messages sent by bot": "Mensajes enviados por bots",
@@ -415,35 +321,22 @@
     "No update available.": "No hay actualizaciones disponibles.",
     "Noisy": "Sonoro",
     "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 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",
-    "Enter keywords separated by a comma:": "Escribe palabras clave separadas por una coma:",
     "Search…": "Buscar…",
-    "You have successfully set a password and an email address!": "¡Has establecido una nueva contraseña y dirección de correo electrónico!",
     "Remove %(name)s from the directory?": "¿Eliminar a %(name)s del directorio?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
     "Event sent!": "Evento enviado!",
     "Preparing to send logs": "Preparando para enviar registros",
     "Unnamed room": "Sala sin nombre",
     "Explore Account Data": "Explorar Datos de la Cuenta",
     "Remove from Directory": "Eliminar del Directorio",
     "Saturday": "Sábado",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Recuerda que si es necesario puedes establecer una dirección de email en los ajustes de usuario.",
-    "Direct Chat": "Conversación Directa",
     "The server may be unavailable or overloaded": "El servidor puede estar no disponible o sobrecargado",
     "Reject": "Rechazar",
-    "Failed to set Direct Message status of room": "No se pudo establecer el estado de Mensaje Directo de la sala",
     "Monday": "Lunes",
-    "All messages (noisy)": "Todos los mensajes (ruidoso)",
-    "Enable them now": "Habilitarlos ahora",
     "Toolbox": "Caja de herramientas",
     "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 la sala",
     "Send": "Enviar",
     "Send logs": "Enviar registros",
@@ -454,48 +347,32 @@
     "State Key": "Clave de estado",
     "Failed to send custom event.": "Ha fallado el envio del evento personalizado.",
     "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",
-    "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
     "Unable to look up room ID from server": "No se puede buscar el ID de la sala desde el servidor",
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincida",
     "All Rooms": "Todas las salas",
     "You cannot delete this message. (%(code)s)": "No puedes eliminar este mensaje. (%(code)s)",
     "Thursday": "Jueves",
-    "Forward Message": "Reenviar mensaje",
     "Logs sent": "Registros enviados",
     "Back": "Atrás",
     "Reply": "Responder",
     "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",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar %(brand)s.",
     "Messages in group chats": "Mensajes en conversaciones grupales",
     "Yesterday": "Ayer",
     "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).",
     "Low Priority": "Prioridad baja",
     "%(brand)s does not know how to join a room on this network": "%(brand)s no sabe cómo unirse a una sala en esta red",
-    "Set Password": "Establecer contraseña",
     "Off": "Apagado",
-    "Mentions only": "Solo menciones",
     "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
     "Wednesday": "Miércoles",
-    "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.",
-    "Enable email notifications": "Activar notificaciones por correo",
     "Event Type": "Tipo de Evento",
     "No rooms to show": "No hay salas para mostrar",
-    "Download this file": "Descargar este archivo",
-    "Pin Message": "Anclar mensaje",
-    "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "Developer Tools": "Herramientas de desarrollo",
     "View Source": "Ver fuente",
     "Event Content": "Contenido del Evento",
-    "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…",
     "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",
@@ -503,9 +380,6 @@
     "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",
-    "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": "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",
@@ -527,8 +401,7 @@
     "Stops ignoring a user, showing their messages going forward": "Deja de ignorar a un usuario, mostrando sus mensajes a partir de ahora",
     "Unignored user": "Usuario no ignorado",
     "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.",
+    "Opens the Developer Tools dialog": "Abre el diálogo de herramientas de desarrollo",
     "%(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",
@@ -536,7 +409,6 @@
     "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 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": "Invertir horizontalmente el vídeo local (espejo)",
     "Send analytics data": "Enviar datos de análisis de estadísticas",
@@ -545,12 +417,7 @@
     "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)",
-    "Ongoing conference call%(supportedText)s.": "Llamada de conferencia en curso%(supportedText)s.",
     "This event could not be displayed": "No se pudo mostrar este evento",
-    "%(senderName)s sent an image": "%(senderName)s envió una imagen",
-    "%(senderName)s sent a video": "%(senderName)s envió un vídeo",
-    "%(senderName)s uploaded a file": "%(senderName)s subió un fichero",
     "Key request sent.": "Solicitud de clave enviada.",
     "Disinvite this user?": "¿Dejar de invitar a este usuario?",
     "Kick this user?": "¿Echar a este usuario?",
@@ -561,16 +428,13 @@
     "Demote": "Quitar permisos",
     "Unignore": "Dejar de ignorar",
     "Ignore": "Ignorar",
-    "Jump to read receipt": "Saltar a recibo leído",
+    "Jump to read receipt": "Saltar al último mensaje sin leer",
     "Mention": "Mencionar",
     "Invite": "Invitar",
     "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 al mensaje",
-    "No pinned messages.": "No hay mensajes anclados.",
     "Loading...": "Cargando…",
-    "Pinned Messages": "Mensajes anclados",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -587,7 +451,6 @@
     "(~%(count)s results)|other": "(~%(count)s resultados)",
     "(~%(count)s results)|one": "(~%(count)s resultado)",
     "Share room": "Compartir sala",
-    "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 participantes (desde el momento en que se selecciona esta opción)",
@@ -608,9 +471,8 @@
     "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",
-    "Error decrypting video": "Error al descifrar video",
+    "Error decrypting video": "Error al descifrar el vídeo",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambió el avatar para %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eliminó el avatar de la sala.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s cambió el avatar de la sala a <img/>",
@@ -618,16 +480,10 @@
     "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 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, 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.",
-    "The password field must not be blank.": "El campo de contraseña no debe estar en blanco.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si no indica una dirección de correo electrónico, no podrá reiniciar su contraseña. ¿Está seguro?",
     "Remove from community": "Eliminar de la comunidad",
     "Disinvite this user from community?": "¿Quitar como invitado a este usuario de la comunidad?",
     "Remove this user from community?": "¿Eliminar a este usuario de la comunidad?",
@@ -649,9 +505,6 @@
     "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á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",
     "Popout widget": "Widget en ventana externa",
     "Communities": "Comunidades",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
@@ -708,17 +561,15 @@
     "collapse": "colapsar",
     "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>",
+    "<a>In reply to</a> <pill>": "<a>Respondiendo a </a> <pill>",
     "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",
     "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.",
+    "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 asunto 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 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",
@@ -739,23 +590,13 @@
     "We encountered an error trying to restore your previous session.": "Encontramos un error al intentar restaurar su sesión anterior.",
     "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.": "Si ha usado anteriormente una versión más reciente de %(brand)s, su sesión puede ser incompatible con ésta. Cierre la ventana y vuelva a la versión más reciente.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpiando el almacenamiento del navegador puede arreglar el problema, pero le desconectará y cualquier historial de conversación cifrado se volverá ilegible.",
-    "Username not available": "Nombre de usuario no disponible",
-    "An error occurred: %(error_string)s": "Ocurrió un error: %(error_string)s",
-    "Username available": "Nombre de usuario disponible",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será el nombre de su cuenta en el <span></span> servidor doméstico, o puede elegir un <a>servidor diferente</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Si ya tiene una cuenta de Matrix puede conectarse: <a>log in</a>.",
     "Share Room": "Compartir sala",
     "Link to most recent message": "Enlazar a mensaje más reciente",
     "Share User": "Compartir usuario",
     "Share Community": "Compartir Comunidad",
     "Share Room Message": "Compartir el mensaje de la sala",
     "Link to selected message": "Enlazar a mensaje seleccionado",
-    "COPY": "COPIAR",
     "Unable to reject invite": "No se pudo rechazar la invitación",
-    "Share Message": "Compartir mensaje",
-    "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": "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",
@@ -803,21 +644,14 @@
     "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.": "Se detectó una versión más antigua de %(brand)s. Esto habrá provocado que la criptografía de extremo a extremo funcione incorrectamente en la versión más antigua. Los mensajes cifrados de extremo a extremo intercambiados recientemente mientras usaba la versión más antigua puede que no sean descifrables con esta versión. Esto también puede hacer que fallen con la más reciente. Si experimenta problemas, desconecte y vuelva a ingresar. Para conservar el historial de mensajes, exporte y vuelva a importar sus claves.",
     "Your Communities": "Sus Comunidades",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sabía que: puede usar comunidades para filtrar su experiencia con %(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.": "Para configurar un filtro, arrastre un avatar de comunidad sobre el panel de filtro en la parte izquierda de la pantalla. Puede pulsar sobre un avatar en el panel de filtro en cualquier momento para ver solo las salas y personas asociadas con esa comunidad.",
     "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 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 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",
-    "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>?",
     "Room": "Sala",
     "Clear filter": "Borrar filtro",
-    "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 has enviado un error a GitHub, estos registros pueden ayudar a localizar el problema. Contienen información de uso de la aplicación, incluido el nombre de usuario, IDs o alias de las salas o grupos visitados y los nombres de otros usuarios. No contienen mensajes.",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "La privacidad es importante para nosotros, por lo que no se recopila información personal o identificable en los análisis de estadísticas.",
     "Learn more about how we use analytics.": "Más información sobre el uso de los análisis de estadísticas.",
@@ -828,8 +662,6 @@
     "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.",
-    "Set a display name:": "Establece un nombre público:",
-    "Upload an avatar:": "Subir un avatar:",
     "This server does not support authentication with a phone number.": "Este servidor no es compatible con autenticación mediante número telefónico.",
     "Notify the whole room": "Notificar a toda la sala",
     "Room Notification": "Notificación de Salas",
@@ -855,8 +687,8 @@
     "Please contact your homeserver administrator.": "Por favor, contacta con la administración de tu servidor base.",
     "This room has been replaced and is no longer active.": "Esta sala ha sido reemplazada y ya no está activa.",
     "The conversation continues here.": "La conversación continúa aquí.",
-    "This room is a continuation of another conversation.": "Esta sala es una continuación de otra conversación.",
-    "Click here to see older messages.": "Haz clic aquí para ver mensajes más antiguos.",
+    "This room is a continuation of another conversation.": "Esta sala es una continuación de otra.",
+    "Click here to see older messages.": "Haz clic aquí para ver mensajes anteriores.",
     "Failed to upgrade room": "No se pudo actualizar la sala",
     "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",
@@ -867,13 +699,13 @@
     "%(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!",
     "Updating %(brand)s": "Actualizando %(brand)s",
     "Room version:": "Versión de la sala:",
-    "Developer options": "Opciones de desarrollador",
+    "Developer options": "Opciones de desarrollo",
     "Room version": "Versión de la sala",
     "Room information": "Información de la sala",
-    "Room Topic": "Tema de la sala",
+    "Room Topic": "Asunto de la sala",
     "Theme": "Tema",
     "Voice & Video": "Voz y vídeo",
-    "Gets or sets the room topic": "Obtiene o establece el tema de la sala",
+    "Gets or sets the room topic": "Ver o cambiar el asunto de la sala",
     "This room has no topic.": "Esta sala no tiene tema.",
     "Sets the room name": "Establece el nombre de la sala",
     "Phone numbers": "Números de teléfono",
@@ -932,13 +764,11 @@
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensajes de entrada/salida (no afecta a invitaciones/expulsiones/baneos)",
     "Show avatar changes": "Mostrar cambios de avatar",
     "Show display name changes": "Muestra cambios en los nombres",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar un recordatorio para habilitar 'Recuperación Segura de Mensajes' en sala cifradas",
     "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 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",
+    "Show developer tools": "Mostrar herramientas de desarrollo",
     "Messages containing my username": "Mensajes que contengan mi nombre",
     "Messages containing @room": "Mensajes que contengan @room",
     "Encrypted messages in one-to-one chats": "Mensajes cifrados en salas uno a uno",
@@ -1023,10 +853,7 @@
     "Back up your keys before signing out to avoid losing them.": "Haz copia de tus claves antes de salir para evitar perderlas.",
     "Backing up %(sessionsRemaining)s keys...": "Haciendo copia de %(sessionsRemaining)s claves…",
     "All keys backed up": "Se han copiado todas las claves",
-    "Backup version: ": "Versión de la copia: ",
-    "Algorithm: ": "Algoritmo: ",
     "Start using Key Backup": "Comenzar a usar la copia de claves",
-    "Add an email address to configure email notifications": "Añade una dirección para configurar las notificaciones por correo",
     "Unable to verify phone number.": "No se pudo verificar el número de teléfono.",
     "Verification code": "Código de verificación",
     "Phone Number": "Número de teléfono",
@@ -1058,14 +885,8 @@
     "Encrypted": "Cifrado",
     "Ignored users": "Usuarios ignorados",
     "Bulk options": "Opciones generales",
-    "Key backup": "Copia de clave",
     "Missing media permissions, click the button below to request.": "No hay permisos de medios, haz clic abajo para pedirlos.",
     "Request media permissions": "Pedir permisos de los medios",
-    "Never lose encrypted messages": "Nunca perder mensajes cifrados",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Los mensajes en esta sala están cifrados de extremo a extremo. Solo tu y el/los destinatario/s tiene/n las claves para leer estos mensajes.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Haz copia de manera segura de tus claves para evitar perderlas. <a>Lee más.</a>",
-    "Not now": "Ahora no",
-    "Don't ask me again": "No preguntarme más",
     "Add some now": "Añadir alguno ahora",
     "Main address": "Dirección principal",
     "Room avatar": "Avatar de la sala",
@@ -1091,8 +912,8 @@
     "Enable Community Filter Panel": "Activar el panel de filtro de comunidad",
     "Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
     "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 las «migas de pan» (iconos sobre la lista de salas)",
+    "Whether or not you're logged in (we don't record your username)": "Si has iniciado sesión o no (no guardamos tu nombre de usuario)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Si estás usando 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.",
@@ -1104,7 +925,6 @@
     "Changes your avatar in this current room only": "Cambia tu avatar sólo en la sala actual",
     "Changes your avatar in all rooms": "Cambia tu avatar en todas las salas",
     "Unbans user with given ID": "Desbloquea el usuario con ese ID",
-    "%(senderName)s made no change.": "%(senderName)s no hizo ningún cambio.",
     "Sends the given message coloured as a rainbow": "Envía el mensaje coloreado como un arcoiris",
     "Sends the given emote coloured as a rainbow": "Envía el emoji coloreado como un arcoiris",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ha activado las insignias para %(groups)s en esta sala.",
@@ -1126,7 +946,6 @@
     "The user's homeserver does not support the version of the room.": "El servidor del usuario no soporta la versión de la sala.",
     "Show read receipts sent by other users": "Mostrar las confirmaciones de lectura enviadas por otros usuarios",
     "Show hidden events in timeline": "Mostrar eventos ocultos en la línea de tiempo",
-    "Low bandwidth mode": "Modo de ancho de banda bajo",
     "Got It": "Entendido",
     "Scissors": "Tijeras",
     "Call failed due to misconfigured server": "La llamada ha fallado debido a una mala configuración del servidor",
@@ -1146,7 +965,6 @@
     "Please supply a https:// or http:// widget URL": "Por favor provisiona un URL de widget de http:// o https://",
     "You cannot modify widgets in this room.": "No puedes modificar widgets en esta sala.",
     "Displays list of commands with usages and descriptions": "Muestra lista de comandos con usos y descripciones",
-    "Multiple integration managers": "Administradores de integración múltiples",
     "Add Email Address": "Añadir dirección de correo",
     "Add Phone Number": "Añadir número de teléfono",
     "Identity server has no terms of service": "El servidor de identidad no tiene términos de servicio",
@@ -1178,7 +996,6 @@
     "%(count)s unread messages including mentions.|one": "1 mención sin leer.",
     "%(count)s unread messages.|other": "%(count)s mensajes sin leer.",
     "%(count)s unread messages.|one": "1 mensaje sin leer.",
-    "Unread mentions.": "Menciones sin leer.",
     "Unread messages.": "Mensajes sin leer.",
     "Jump to first unread room.": "Saltar a la primera sala sin leer.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
@@ -1186,7 +1003,6 @@
     "Setting up keys": "Configurando claves",
     "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",
     "Unknown (user, session) pair:": "Par (usuario, sesión) desconocido:",
     "Session already verified!": "¡La sesión ya ha sido verificada!",
@@ -1203,31 +1019,25 @@
     "They don't match": "No coinciden",
     "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 ella",
     "Upgrade": "Actualizar",
     "Verify": "Verificar",
     "Later": "Más tarde",
     "Upload": "Subir",
-    "Workspace: %(networkName)s": "Espacio de trabajo: %(networkName)s",
-    "Channel: %(channelName)s": "Canal: %(channelName)s",
     "Show less": "Mostrar menos",
     "Show more": "Mostrar más",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Cambiar la contraseña 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",
     "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 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",
     "Enter a new identity server": "Introducir un servidor de identidad nuevo",
     "Change": "Cambiar",
-    "Manage integrations": "Gestionar integraciones",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los administradores de integración reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establecer niveles de poder en tu nombre.",
+    "Manage integrations": "Gestor de integraciones",
     "Something went wrong trying to invite the users.": "Algo salió mal al intentar invitar a los usuarios.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "No se pudo invitar a esos usuarios. Por favor, revisa los usuarios que quieres invitar e inténtalo de nuevo.",
     "Failed to find the following users": "No se encontró a los siguientes usuarios",
@@ -1245,27 +1055,17 @@
     "You'll lose access to your encrypted messages": "Perderás acceso a tus mensajes cifrados",
     "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 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 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.",
     "Report Content to Your Homeserver Administrator": "Reportar contenido al administrador de tu servidor base",
     "Send report": "Enviar reporte",
     "Room Settings - %(roomName)s": "Configuración de la sala - %(roomName)s",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Actualizar esta sala requiere cerrar la instancia actual de esta sala y crear una nueva sala en su lugar. Para dar a los miembros de la sala la mejor experiencia, haremos lo siguiente:",
-    "Automatically invite users": "Invitar a usuarios automáticamente",
     "Upgrade private room": "Actualizar sala privada",
     "Upgrade public room": "Actualizar sala pública",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Actualizar una sala es una acción avanzada y es normalmente recomendada cuando una sala es inestable debido a fallos, funcionalidades no disponibles y vulnerabilidades.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Esto solo afecta a como la sala es procesada en el servidor. Si estás teniendo problemas con tu %(brand)s, por favor<a>reporta un fallo</a>.",
-    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Actualizarás esta sala de <oldVersion /> a <newVersion />.",
+    "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>.": "Esto solo afecta a cómo procesa la sala el servidor. Si estás teniendo problemas con %(brand)s, por favor, <a>avísanos del fallo</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Actualizarás esta sala de la versión <oldVersion /> a la <newVersion />.",
     "Sign out and remove encryption keys?": "¿Salir y borrar las claves de cifrado?",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Un nombre de usuario solo puede contener letras minúsculas, números y '=_-./'",
-    "Checking...": "Comprobando...",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Esto te permitirá volver a tu cuenta después de desconectarte, y conectarte en otras sesiones.",
     "To help us prevent this in future, please <a>send us logs</a>.": "Para ayudarnos a prevenir esto en el futuro, por favor, <a>envíanos logs</a>.",
     "Missing session data": "Faltan datos de sesión",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Algunos datos de sesión, incluyendo claves de mensajes cifrados, no se encuentran. Desconéctate y vuelve a conectarte para solucionarlo, restableciendo las claves desde la copia de seguridad.",
@@ -1289,9 +1089,7 @@
     "Upload %(count)s other files|one": "Subir %(count)s otro archivo",
     "Cancel All": "Cancelar todo",
     "Upload Error": "Error de subida",
-    "A widget would like to verify your identity": "Un widget quisiera verificar tu identidad",
     "Remember my selection for this widget": "Recordar mi selección para este widget",
-    "Deny": "Rechazar",
     "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.": "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",
@@ -1316,8 +1114,6 @@
     "Server or user ID to ignore": "Servidor o ID de usuario a ignorar",
     "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.",
     "Cancel entering passphrase?": "¿Cancelar el ingresar tu contraseña de recuperación?",
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s actualizó la regla bloqueando salas que coinciden con %(glob)s por %(reason)s",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s actualizó la regla bloqueando servidores que coinciden con %(glob)s por %(reason)s",
@@ -1330,7 +1126,6 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambió una regla que estaba bloqueando a salas que coinciden con %(oldGlob)s a %(newGlob)s por %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambió una regla que estaba bloqueando a servidores que coinciden con %(oldGlob)s a %(newGlob)s por %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s actualizó una regla de bloqueo que correspondía a %(oldGlob)s a %(newGlob)s por %(reason)s",
-    "The message you are trying to send is too large.": "El mensaje que estás intentando enviar es demasiado largo.",
     "a few seconds ago": "hace unos segundos",
     "about a minute ago": "hace aproximadamente un minuto",
     "%(num)s minutes ago": "hace %(num)s minutos",
@@ -1351,10 +1146,10 @@
     "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 de una de las siguientes formas:",
-    "Scan this unique code": "Escanea este código único",
+    "Scan this unique code": "Escanea este código",
     "or": "o",
-    "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",
+    "Compare unique emoji": "Compara los emojis",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Compara un conjunto de emojis 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": "Revisar",
@@ -1364,7 +1159,6 @@
     "Unable to load session list": "No se pudo cargar la lista de sesiones",
     "Delete %(count)s sessions|other": "Borrar %(count)s sesiones",
     "Delete %(count)s sessions|one": "Borrar %(count)s sesión",
-    "rooms.": "salas.",
     "Manage": "Gestionar",
     "Enable": "Activar",
     "This session is backing up your keys. ": "Esta sesión está haciendo una copia de seguridad de tus claves. ",
@@ -1396,7 +1190,6 @@
     "Change settings": "Cambiar la configuración",
     "Kick users": "Echar usuarios",
     "Ban users": "Bloquear a usuarios",
-    "Remove messages": "Eliminar mensajes",
     "Notify everyone": "Notificar a todos",
     "Send %(eventType)s events": "Enviar eventos %(eventType)s",
     "Select the roles required to change various parts of the room": "Selecciona los roles requeridos para cambiar varias partes de la sala",
@@ -1408,10 +1201,9 @@
     "Remove %(email)s?": "¿Eliminar %(email)s?",
     "Backup is not signed by any of your sessions": "La copia de seguridad no está firmada por ninguna de tus sesiones",
     "This backup is trusted because it has been restored on this session": "Esta copia de seguridad es de confianza porque ha sido restaurada en esta sesión",
-    "Backup key stored: ": "Clave de seguridad almacenada: ",
     "Your keys are <b>not being backed up from this session</b>.": "<b>No se está haciendo una copia de seguridad de tus claves en esta sesión</b>.",
     "Clear notifications": "Limpiar notificaciones",
-    "Enable desktop notifications for this session": "Activar notificaciones de escritorio para esta sesión",
+    "Enable desktop notifications for this session": "Activa las notificaciones de escritorio para esta sesión",
     "Enable audible notifications for this session": "Activar notificaciones sonoras para esta sesión",
     "Checking server": "Comprobando servidor",
     "Change identity server": "Cambiar servidor de identidad",
@@ -1422,7 +1214,7 @@
     "Disconnect from the identity server <idserver />?": "¿Desconectarse del servidor de identidad <idserver />?",
     "Disconnect": "Desconectarse",
     "You should:": "Deberías:",
-    "Use Single Sign On to continue": "Continuar con SSO",
+    "Use Single Sign On to continue": "Continuar con registro único (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",
@@ -1433,15 +1225,13 @@
     "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 (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ú?",
     "%(name)s is requesting verification": "%(name)s solicita verificación",
     "Sign In or Create Account": "Iniciar sesión o Crear una cuenta",
     "Use your account or create a new one to continue.": "Usa tu cuenta existente o crea una nueva para continuar.",
     "Create Account": "Crear cuenta",
     "Sign In": "Iniciar sesión",
-    "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo en markdown",
+    "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 cambiar el tema",
     "Command failed": "El comando falló",
     "Could not find user in room": "No se ha encontrado el usuario en la sala",
@@ -1457,12 +1247,12 @@
     "%(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.": "Verificar la otra sesión utilizando una de las siguientes opciones.",
+    "Verify your other session using one of the options below.": "Verifica 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í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",
+    "Interactively verify by Emoji": "Verificar interactivamente con emojis",
     "Done": "Listo",
     "Support adding custom themes": "Soporta la adición de temas personalizados",
     "Show info about bridges in room settings": "Mostrar información sobre puentes en la configuración de salas",
@@ -1470,24 +1260,16 @@
     "Show rooms with unread notifications first": "Mostrar primero las salas con notificaciones no leídas",
     "Show shortcuts to recently viewed rooms above the room list": "Mostrar atajos a las salas recientemente vistas por encima de la lista de salas",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permitir el servidor de respaldo de asistencia de llamadas turn.matrix.org cuando 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 iconos 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 emojis de abajo son los mismos y tienen el mismo orden en los dos sitios:",
     "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 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",
-    "Verify the new login accessing your account: %(name)s": "Verifica el nuevo inicio de sesión que está accediendo a tu cuenta: %(name)s",
-    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
     "This bridge was provisioned by <user />.": "Este puente fue aportado por <user />.",
-    "This bridge is managed by <user />.": "Este puente es administrado por <user />.",
+    "This bridge is managed by <user />.": "Este puente lo gestiona <user />.",
     "Your homeserver does not support cross-signing.": "Tu servidor base no soporta las firmas cruzadas.",
-    "Cross-signing and secret storage are enabled.": "La firma cruzada y el almacenamiento secreto están activados.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Su cuenta tiene una identidad de firma cruzada en un almacenamiento secreto, pero aún no es confiada en esta sesión.",
-    "Cross-signing and secret storage are not yet set up.": "Las firmas cruzadas y el almacenamiento secreto aún no han sido configurados.",
-    "Reset cross-signing and secret storage": "Resetear las señales cruzadas y el almacenamiento secreto",
-    "Bootstrap cross-signing and secret storage": "Reconfiguración de firma cruzada y almacenamiento secreto",
     "well formed": "bien formado",
     "unexpected type": "tipo inesperado",
     "Cross-signing public keys:": "Firmando las llaves públicas de manera cruzada:",
@@ -1496,7 +1278,6 @@
     "cached locally": "almacenado localmente",
     "not found locally": "no encontrado localmente",
     "User signing private key:": "Usuario firmando llave privada:",
-    "Session backup key:": "Llave / Código de respaldo de la sesión:",
     "Homeserver feature support:": "Características apoyadas por servidor local:",
     "exists": "existe",
     "Your homeserver does not support session management.": "Su servidor local no soporta la gestión de sesiones.",
@@ -1508,8 +1289,6 @@
     "Delete sessions|other": "Eliminar sesiones",
     "Delete sessions|one": "Eliminar sesión",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sesión utilizada por un usuario para marcarla como de confianza, no confiando en dispositivos de firma cruzada.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Almacenar localmente, de manera segura,  los mensajes cifrados localmente para que aparezcan en los resultados de la búsqueda, utilizando ",
-    " to store messages from ": " para almacenar mensajes de ",
     "Securely cache encrypted messages locally for them to appear in search results.": "Almacenar localmente, de manera segura, a los mensajes cifrados localmente para que aparezcan en los resultados de búsqueda.",
     "%(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>.": "A %(brand)s le faltan algunos componentes necesarios para el almacenamiento seguro de mensajes cifrados a nivel local. Si quieres experimentar con esta característica, construye un Escritorio %(brand)s personalizado con <nativeLink> componentes de búsqueda añadidos</nativeLink>.",
     "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.",
@@ -1526,9 +1305,6 @@
     "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> 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",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Usted debe <b> eliminar sus datos personales </b> del servidor de identidad <idserver /> antes de desconectarse. Desafortunadamente, el servidor de identidad <idserver /> está actualmente desconectado o es imposible comunicarse con él por otra razón.",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "comprueba los complementos (plugins) de tu navegador para ver si hay algo que pueda bloquear el servidor de identidad (como p.ej. Privacy Badger)",
     "contact the administrators of identity server <idserver />": "contactar con los administradores del servidor de identidad <idserver />",
@@ -1537,8 +1313,6 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Usted todavía está <b> compartiendo sus datos personales</b> en el servidor de identidad <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Le recomendamos que elimine sus direcciones de correo electrónico y números de teléfono del servidor de identidad antes de desconectarse.",
     "Go back": "Atrás",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usar un gestor de integraciones <b>(%(serverName)s)</b> para manejar los bots, widgets y paquetes de pegatinas.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Utiliza un Administrador de Integración para gestionar los bots, los widgets y los paquetes de pegatinas.",
     "Invalid theme schema.": "Esquema de tema inválido.",
     "Error downloading theme information.": "Error al descargar la información del tema.",
     "Theme added!": "¡Se añadió el tema!",
@@ -1546,7 +1320,6 @@
     "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, lee la <a>Política de divulgación de seguridad</a> de Matrix.org.",
     "Keyboard Shortcuts": "Atajos de teclado",
-    "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",
@@ -1597,9 +1370,7 @@
     "Your key share request has been sent - please check your other sessions for key share requests.": "Su solicitud de intercambio de claves ha sido enviada. Por favor, compruebe en sus otras sesiones si hay solicitudes de intercambio de claves.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Solicitudes para compartir claves son enviadas a sus otras sesiones de forma automática. Si ha rechazado o descartado la solicitud de compartir claves en sus otras sesiones, haga clic aquí para solicitar de nuevo las claves de esta sesión.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Si tus otras sesiones no tienen la clave para este mensaje no podrán descifrarlo.",
-    "Rotate counter-clockwise": "Girar en sentido contrario a las agujas del reloj",
     "Rotate Right": "Girar a la derecha",
-    "Rotate clockwise": "Girar en el sentido de las agujas del reloj",
     "Language Dropdown": "Lista selección de idiomas",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s veces no efectuarion cambios",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s no efectuaron cambios",
@@ -1630,7 +1401,7 @@
     "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": "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í.",
+    "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 problema, como por ejemplo lo que estaba haciendo en ese momento, nombre (ID) de sala, nombre (ID) de usuario, etc., por favor incluye esas cosas aquí.",
     "Removing…": "Quitando…",
     "Destroy cross-signing keys?": "¿Destruir las claves de firma cruzada?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La eliminación de claves de firma cruzada es definitiva. Cualquiera con el que lo hayas verificado verá alertas de seguridad. Es casi seguro que no quieres hacer esto, a menos que hayas perdido todos los dispositivos puedas usar hacer una firma cruzada.",
@@ -1639,16 +1410,13 @@
     "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": "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": "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!)",
     "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.",
@@ -1666,11 +1434,6 @@
     "Integrations are disabled": "Las integraciones están desactivadas",
     "Enable 'Manage Integrations' in Settings to do this.": "Activa «Gestionar integraciones» en ajustes para hacer esto.",
     "Integrations not allowed": "Integraciones no están permitidas",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s no utilizar un \"gestor de integración\" para hacer esto. Por favor, contacta con un administrador.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Error invitando a los siguientes usuarios al chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "No se ha podido crear el mensaje directo. Por favor, comprueba los usuarios que quieres invitar e inténtalo de nuevo.",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Iniciar una conversación con alguien usando su nombre, nombre de usuario (como <userId/>) o dirección de correo electrónico.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitar a alguien usando su nombre, nombre de usuario (como <userId/>), dirección de correo electrónico o <a> compartir esta sala</a>.",
     "a new master key signature": "una nueva firma de llave maestra",
     "a new cross-signing key signature": "una nueva firma de código de firma cruzada",
     "a device cross-signing signature": "una firma para la firma cruzada de dispositivos",
@@ -1693,10 +1456,10 @@
     "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": "Unirme a la Sala",
-    "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?",
+    "Do you want to chat with %(user)s?": "¿Quieres empezar una conversación con %(user)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?",
+    "You're previewing %(roomName)s. Want to join it?": "Esto es una vista previa de %(roomName)s. ¿Te quieres unir?",
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Estás seguro de estar en el lugar correcto?",
     "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso.",
@@ -1706,7 +1469,6 @@
     "Encrypted by an unverified session": "Cifrado por una sesión no verificada",
     "Unencrypted": "Sin cifrar",
     "Encrypted by a deleted session": "Cifrado por una sesión eliminada",
-    "Invite only": "Sólamente por invitación",
     "Scroll to most recent messages": "Ir a los mensajes más recientes",
     "Close preview": "Cerrar vista previa",
     "No recent messages by %(user)s found": "No se han encontrado mensajes recientes de %(user)s",
@@ -1722,14 +1484,13 @@
     "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 reply…": "Enviar una respuesta…",
     "Send a message…": "Enviar un mensaje…",
     "Bold": "Negrita",
     "Italics": "Cursiva",
     "Strikethrough": "Tachado",
     "Code block": "Bloque de código",
     "Room %(name)s": "Sala %(name)s",
-    "Recent rooms": "Salas recientes",
     "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.",
@@ -1738,8 +1499,8 @@
     "This invite to %(roomName)s was sent to %(email)s": "Esta invitación a %(roomName)s fue enviada a %(email)s",
     "Use an identity server in Settings to receive invites directly in %(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 una conversación",
+    "<userName/> wants to chat": "<userName/> quiere mandarte mensajes",
+    "Start chatting": "Empezar 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 +1521,6 @@
     "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. 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)",
@@ -1768,7 +1528,6 @@
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establecer las direcciones de esta sala para que los usuarios puedan encontrarla a través de tu servidor base (%(localDomain)s)",
     "Error updating flair": "Error al actualizar el botón",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Error al actualizar el botón para esta sala. Posiblemente el servidor no lo permita o que se produjo un error temporal.",
-    "Waiting for you to accept on your other session…": "Esperando que aceptes en tu otra sesión…",
     "Waiting for %(displayName)s to accept…": "Esperando a que %(displayName)s acepte…",
     "Accepting…": "Aceptando…",
     "Start Verification": "Iniciar verificación",
@@ -1792,8 +1551,6 @@
     "%(count)s sessions|other": "%(count)s sesiones",
     "%(count)s sessions|one": "%(count)s sesión",
     "Hide sessions": "Ocultar sesiones",
-    "Direct message": "Mensaje directo",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
     "This client does not support end-to-end encryption.": "Este cliente no es compatible con el cifrado de extremo a extremo.",
     "Security": "Seguridad",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "La sesión que está tratando de verificar no soporta el escaneo de un código QR o la verificación mediante emoji, que es lo que soporta %(brand)s. Inténtalo con un cliente diferente.",
@@ -1819,7 +1576,6 @@
     "Verification cancelled": "Verificación cancelada",
     "Compare emoji": "Comparar emoji",
     "Encryption enabled": "Cifrado activado",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Los mensajes en esta sala están encriptados de extremo a extremo. Aprende más & verifica este usuario en su perfil de usuario.",
     "Encryption not enabled": "Cifrado no activado",
     "The encryption used by this room isn't supported.": "El cifrado usado por esta sala no es compatible.",
     "React": "Reaccionar",
@@ -1841,7 +1597,6 @@
     "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",
@@ -1868,12 +1623,10 @@
     "%(brand)s URL": "URL de %(brand)s",
     "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.",
     "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.": "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.",
     "Rotate Left": "Girar a la izquierda",
@@ -1886,46 +1639,21 @@
     "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",
-    "Your password": "Su contraseña",
-    "This session, or the other session": "Esta sesión, o la otra sesión",
-    "The internet connection either session is using": "La conexión a Internet usado por cualquiera de las dos sesiones",
-    "We recommend you change your password and recovery key in Settings immediately": "Le recomendamos que cambie inmediatamente su contraseña y su clave de recuperación en Configuración",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para ayudar a evitar la duplicación de entradas, por favor <existingIssuesLink> ver primero los entradas existentes</existingIssuesLink> (y añadir un +1) o, <newIssueLink> si no lo encuentra, crear una nueva entrada </newIssueLink>.",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar este mensaje enviará su único «event ID al administrador de 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",
     "Verification Request": "Solicitud de verificación",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Un widget localizado en %(widgetUrl)s desea verificar su identidad. Permitiendo esto, el widget podrá verificar su identidad de usuario, pero no realizar acciones como usted.",
-    "Enter recovery passphrase": "Introduzca la contraseña de recuperación",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "No se puede acceder al almacenamiento secreto. Por favor, compruebe que ha introducido la frase de recuperación correcta.",
-    "Enter recovery key": "Introduzca la clave de recuperación",
-    "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 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",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "La copia de seguridad no pudo ser descifrada con esta clave de recuperación: por favor, comprueba que hayas introducido la clave de recuperación correcta.",
-    "Incorrect recovery passphrase": "Contraseña de recuperación incorrecta",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "La copia de seguridad no pudo ser descifrada con esta contraseña de recuperación: por favor, comprueba que hayas introducido la contraseña de recuperación correcta.",
     "Unable to restore backup": "No se pudo restaurar la copia de seguridad",
     "No backup found!": "¡No se encontró una copia de seguridad!",
     "Keys restored": "Se restauraron las claves",
     "Failed to decrypt %(failedCount)s sessions!": "¡Error al descifrar %(failedCount)s sesiones!",
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s claves restauradas con éxito",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Advertencia</b>: deberías configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acceda a su historial de mensajes seguros y configure la mensajería segura introduciendo su contraseña de recuperación.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Si has olvidado tu contraseña de recuperación puedes <button1> usar tu clave de recuperación </button1> o <button2> configurar nuevas opciones de recuperación </button2>",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Advertencia</b>: Configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Accede a tu historial de mensajes seguros y configura la mensajería segura introduciendo tu clave de recuperación.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si has olvidado tu clave de recuperación puedes <button> configurar nuevas opciones de recuperación</button>",
-    "Resend edit": "Reenviar la edición",
     "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s reacción(es)",
-    "Resend removal": "Reenviar la eliminación",
-    "Share Permalink": "Compartir enlace",
     "Report Content": "Reportar contenido",
     "Notification settings": "Notificaciones",
     "Clear status": "Borrar estado",
@@ -1933,11 +1661,7 @@
     "Set status": "Cambiar estado",
     "Set a new status...": "Elegir un nuevo estado…",
     "Hide": "Ocultar",
-    "Help": "Ayuda",
-    "Reload": "Recargar",
-    "Take picture": "Tomar una foto",
     "Remove for everyone": "Eliminar para todos",
-    "Remove for me": "Eliminar para mi",
     "User Status": "Estado de usuario",
     "This homeserver would like to make sure you are not a robot.": "A este servidor le gustaría asegurarse de que no eres un robot.",
     "Country Dropdown": "Seleccione país",
@@ -1945,14 +1669,7 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta la clave pública del captcha en la configuración del servidor base. Por favor, informa de esto al administrador de tu servidor base.",
     "Please review and accept all of the homeserver's policies": "Por favor, revisa y acepta todas las políticas del servidor base",
     "Please review and accept the policies of this homeserver:": "Por favor, revisa y acepta las políticas de este servidor base:",
-    "Unable to validate homeserver/identity server": "No se pudo validar el servidor doméstico/servidor de identidad",
-    "Your Modular server": "Su servidor modular",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Introduzca la ubicación de su Servidor Modular Doméstico. Este puede usar su propio nombre de dominio o ser un subdominio de <a>modular.im</a>.",
-    "Server Name": "Nombre del servidor",
-    "The username field must not be blank.": "El campo del nombre de usuario no puede estar en blanco.",
     "Username": "Nombre de usuario",
-    "Not sure of your password? <a>Set a new one</a>": "¿No estás seguro de tu contraseña? <a>Escoge una nueva</a>",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No se ha configurado ningún servidor de identidad, por lo que no se puede añadir una dirección de correo electrónico para restablecer la contraseña en el futuro.",
     "Use an email address to recover your account": "Utilice una dirección de correo electrónico para recuperar su cuenta",
     "Enter email address (required on this homeserver)": "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",
@@ -1963,29 +1680,12 @@
     "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)",
-    "Doesn't look like a valid phone number": "No parece ser un número de teléfono válido",
     "Use lowercase letters, numbers, dashes and underscores only": "Use sólo letras minúsculas, números, guiones y guiones bajos",
     "Enter username": "Introduce nombre de usuario",
     "Email (optional)": "Correo electrónico (opcional)",
     "Phone (optional)": "Teléfono (opcional)",
-    "Create your Matrix account on %(serverName)s": "Crea tu cuenta de Matrix en %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Crea tu cuenta de Matrix en <underlinedServerName />",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Configura un correo electrónico para la recuperación de la cuenta. Opcionalmente utilice correo electrónico o teléfono para que los contactos existentes puedan descubrirlo.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Configura un correo electrónico para la recuperación de la cuenta. Opcionalmente utilice el correo electrónico para poder ser descubierto por contactos existentes.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Ingrese la URL de su servidor doméstico <a>¿Qué significa esto?</a>",
-    "Homeserver URL": "URL del servidor doméstico",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Introduzca la URL de su servidor de identidad personalizada <a> ¿Qué significa esto?</a>",
-    "Identity Server URL": "URL del servidor de identidad",
-    "Other servers": "Otros servidores",
-    "Free": "Gratis",
     "Join millions for free on the largest public server": "Únete de forma gratuita a millones de personas en el servidor público más grande",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Alojamiento Premium para organizaciones <a>Aprende más</a>",
-    "Find other public servers or use a custom server": "Descubra otros servidores públicos o utilice un servidor personalizado",
-    "Sign in to your Matrix account on %(serverName)s": "Inicie sesión en su cuenta de Matrix en %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Inicie sesión en su cuenta de Matrix en <underlinedServerName />",
     "Sign in with SSO": "Ingrese con SSO",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
     "Couldn't load page": "No 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>",
@@ -1994,11 +1694,8 @@
     "Liberate your communication": "Libera tu comunicación",
     "Send a Direct Message": "Envía un mensaje directo",
     "Explore Public Rooms": "Explora las salas públicas",
-    "Create a Group Chat": "Crea un chat grupal",
-    "Explore": "Explorar",
+    "Create a Group Chat": "Crea una conversación grupal",
     "Filter": "Filtrar",
-    "Filter rooms…": "Filtrar salas…",
-    "Self-verification request": "Solicitud de auto-verificación",
     "%(creator)s created and configured the room.": "Sala creada y configurada por %(creator)s.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s no ha posido obtener la lista de protocolo del servidor base. El servidor base puede ser demasiado viejo para admitir redes de terceros.",
     "%(brand)s failed to get the public room list.": "%(brand)s no logró obtener la lista de salas públicas.",
@@ -2012,16 +1709,12 @@
     "Jump to first invite.": "Salte a la primera invitación.",
     "Add room": "Añadir sala",
     "Guest": "Invitado",
-    "Your profile": "Su perfil",
     "Could not load user profile": "No se pudo cargar el perfil de usuario",
-    "Verify this login": "Verificar este inicio de sesión",
+    "Verify this login": "Verifica este inicio de sesión",
     "Session verified": "Sesión verificada",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Cambiar la contraseña restablecerá cualquier clave de cifrado de extremo a extremo en todas sus sesiones, haciendo ilegible el historial de chat cifrado. Configura la copia de seguridad de las claves o exporta las claves de la sala de otra sesión antes de restablecer la contraseña.",
-    "Your Matrix account on %(serverName)s": "Su cuenta de Matrix en %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Su cuenta de Matrix en <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "No hay ningún servidor de identidad configurado: añada uno en la configuración del servidor para poder restablecer su contraseña.",
     "Sign in instead": "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.",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Te enviaremos un correo electrónico de verificación para cambiar tu contraseña.",
     "Your password has been reset.": "Su contraseña ha sido restablecida.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Ha cerrado todas las sesiones y ya no recibirá más notificaciones push. Para volver a activar las notificaciones, inicie sesión de nuevo en cada dispositivo.",
     "Set a new password": "Elegir una nueva contraseña",
@@ -2036,52 +1729,23 @@
     "This homeserver does not support login using email address.": "Este servidor base no admite iniciar sesión con una dirección de correo electrónico.",
     "This account has been deactivated.": "Esta cuenta ha sido desactivada.",
     "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 ayuda a mejorar %(brand)s. Esto usará <PolicyLink>una cookie</PolicyLink>.",
-    "I want to help": "Quiero ayudar",
     "Ok": "Ok",
-    "Set password": "Establecer contraseña",
-    "To return to your account in future you need to set a password": "Para poder regresar a tu cuenta en un futuro necesitas establecer una contraseña",
-    "Restart": "Reiniciar",
-    "Upgrade your %(brand)s": "Actualiza tu %(brand)s",
-    "A new version of %(brand)s is available!": "¡Una nueva versión de %(brand)s se encuentra disponible!",
     "You joined the call": "Te has unido a la llamada",
     "%(senderName)s joined the call": "%(senderName)s se ha unido a la llamada",
     "Call in progress": "Llamada en progreso",
-    "You left the call": "Has abandonado la llamada",
-    "%(senderName)s left the call": "%(senderName)s dejo la llamada",
     "Call ended": "La llamada ha finalizado",
     "You started a call": "Has iniciado una llamada",
     "%(senderName)s started a call": "%(senderName)s inicio una llamada",
     "Waiting for answer": "Esperado por una respuesta",
     "%(senderName)s is calling": "%(senderName)s está llamando",
-    "%(senderName)s created the room": "%(senderName)s creo la sala",
-    "You were invited": "Has sido invitado",
-    "%(targetName)s was invited": "%(targetName)s ha sido invitado",
-    "%(targetName)s left": "%(targetName)s se ha ido",
-    "You were kicked (%(reason)s)": "Has sido expulsado por %(reason)s",
-    "You rejected the invite": "Has rechazado la invitación",
-    "%(targetName)s rejected the invite": "%(targetName)s rechazo la invitación",
-    "You were banned (%(reason)s)": "Has sido baneado por %(reason)s",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s fue baneado por %(reason)s",
-    "You were banned": "Has sido baneado",
-    "%(targetName)s was banned": "%(targetName)s fue baneado",
-    "You joined": "Te has unido",
-    "%(targetName)s joined": "%(targetName)s se ha unido",
-    "You changed your name": "Has cambiado tu nombre",
-    "%(targetName)s changed their name": "%(targetName)s cambio su nombre",
-    "You changed your avatar": "Ha cambiado su avatar",
-    "%(targetName)s changed their avatar": "%(targetName)s ha cambiado su avatar",
-    "You changed the room name": "Has cambiado el nombre de la sala",
-    "%(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": "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",
-    "Sends a message to the given user": "Enviar un mensaje al usuario especificado",
+    "Sends a message to the given user": "Enviar un mensaje al usuario seleccionado",
     "Light": "Claro",
     "Dark": "Oscuro",
     "Unexpected server error trying to leave the room": "Error inesperado del servidor al abandonar esta sala",
@@ -2096,7 +1760,7 @@
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Tu nueva sesión ha sido verificada. Ahora tiene acceso a los mensajes cifrados y otros usuarios la verán como verificada.",
-    "Your new session is now verified. Other users will see it as trusted.": "Tu sesión se encuentra ahora verificada. Otros usuarios la verán como confiable.",
+    "Your new session is now verified. Other users will see it as trusted.": "Has verificado esta sesión. El resto la verá como «de confianza».",
     "This session is encrypting history using the new recovery method.": "Esta sesión está cifrando el historial usando el nuevo método de recuperación.",
     "Change notification settings": "Cambiar los ajustes de notificaciones",
     "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.",
@@ -2108,20 +1772,14 @@
     "Enable experimental, compact IRC style layout": "Activar el diseño experimental de IRC compacto",
     "Uploading logs": "Subiendo registros",
     "Downloading logs": "Descargando registros",
-    "Incoming voice call": "Llamada de voz entrante",
-    "Incoming video call": "Videollamada entrante",
-    "Incoming call": "Llamada entrante",
     "Waiting for your other session to verify…": "Esperando a tu otra sesión confirme…",
     "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>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",
     "Use between %(min)s pt and %(max)s pt": "Utiliza un valor entre %(min)s y %(max)s",
     "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.": "Escribe el nombre de la fuente instalada en tu sistema y %(brand)s intentará usarla.",
     "Customise your appearance": "Personaliza la apariencia",
@@ -2137,14 +1795,9 @@
     "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",
-    "Group call started by %(senderName)s": "Llamada grupal iniciada por %(senderName)s",
-    "Group call ended by %(senderName)s": "Llamada de grupo finalizada por %(senderName)s",
     "Unknown App": "Aplicación desconocida",
-    "New spinner design": "Nuevo diseño de ruleta",
     "Show message previews for reactions in DMs": "Mostrar vistas previas de mensajes para reacciones en DM",
     "Show message previews for reactions in all rooms": "Mostrar vistas previas de mensajes para reacciones en todas las salas",
-    "Enable advanced debugging for the room list": "Activar la depuración avanzada para la lista de salas",
     "IRC display name width": "Ancho del nombre de visualización de IRC",
     "Unknown caller": "Llamador desconocido",
     "Cross-signing is ready for use.": "La firma cruzada está lista para su uso.",
@@ -2153,7 +1806,6 @@
     "%(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.",
     "Backup key stored:": "Clave de respaldo almacenada:",
     "Backup key cached:": "Clave de respaldo almacenada en caché:",
     "Secret storage:": "Almacenamiento secreto:",
@@ -2188,20 +1840,14 @@
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Se produjo un error al eliminar esa dirección. Puede que ya no exista o se haya producido un error temporal.",
     "Error removing address": "Error al eliminar la dirección",
     "Room Info": "Información de la sala",
-    "Apps": "Aplicaciones",
-    "Unpin app": "Desanclar aplicación",
-    "Edit apps, bridges & bots": "Edite aplicaciones, puentes y bots",
-    "Add apps, bridges & bots": "Agregar aplicaciones, puentes y bots",
     "Not encrypted": "Sin cifrar",
     "About": "Acerca de",
     "%(count)s people|other": "%(count)s personas",
     "%(count)s people|one": "%(count)s persona",
-    "Show files": "Mostrar archivos",
+    "Show files": "Ver archivos",
     "Room settings": "Configuración de la sala",
     "You've successfully verified your device!": "¡Ha verificado correctamente su dispositivo!",
     "Take a picture": "Toma una foto",
-    "Pin to room": "Anclar a la habitación",
-    "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": "Haz clic para ver las ediciones",
@@ -2209,7 +1855,6 @@
     "Information": "Información",
     "QR Code": "Código QR",
     "Room address": "Dirección de la sala",
-    "Please provide a room address": "Por favor, introduce una dirección de sala",
     "This address is available to use": "Esta dirección está disponible para usar",
     "This address is already in use": "Esta dirección ya está en uso",
     "Preparing to download logs": "Preparándose para descargar registros",
@@ -2228,7 +1873,6 @@
     "Enter name": "Introduce un nombre",
     "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 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.",
@@ -2241,7 +1885,6 @@
     "Confirm to continue": "Confirmar para continuar",
     "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.",
     "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.",
@@ -2257,8 +1900,6 @@
     "Copy": "Copiar",
     "Wrong file type": "Tipo de archivo incorrecto",
     "Looks good!": "¡Se ve bien!",
-    "Wrong Recovery Key": "Clave de recuperación incorrecta",
-    "Invalid Recovery Key": "Clave de recuperación no válida",
     "Security Phrase": "Frase de seguridad",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Ingrese su Frase de seguridad o <button>Usa tu llave de seguridad</button> para continuar.",
     "Security Key": "Clave de seguridad",
@@ -2266,16 +1907,12 @@
     "Unpin": "Desprender",
     "This room is public": "Esta sala es pública",
     "Away": "Lejos",
-    "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.": "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?",
     "delete the address.": "eliminar la dirección.",
     "Explore rooms in %(communityName)s": "Explora salas en %(communityName)s",
-    "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",
@@ -2300,17 +1937,6 @@
     "<a>Log in</a> to your new account.": "<a>Inicie sesión</a> en su nueva cuenta.",
     "You can now close this window or <a>log in</a> to your new account.": "Ahora puedes cerrar esta ventana o <a>iniciar sesión</a> en otra cuenta.",
     "Registration Successful": "Registro exitoso",
-    "Create your account": "Crea tu cuenta",
-    "Use Recovery Key or Passphrase": "Usar clave de recuperación o frase de contraseña",
-    "Use Recovery Key": "Usar clave de recuperación",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirme su identidad verificando este inicio de sesión de una de sus otras sesiones, otorgándole acceso a los mensajes cifrados.",
-    "This requires the latest %(brand)s on your other devices:": "Esto requiere la última %(brand)s en sus otros dispositivos:",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Escritorio",
-    "%(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.": "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.",
@@ -2323,7 +1949,6 @@
     "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.": "Advertencia: sus datos personales (incluidas las claves de cifrado) todavía se almacenan en esta sesión. Bórrelo si terminó de usar esta sesión o si desea iniciar sesión en otra cuenta.",
     "Command Autocomplete": "Comando Autocompletar",
     "Community Autocomplete": "Autocompletar de la comunidad",
-    "DuckDuckGo Results": "Resultados de DuckDuckGo",
     "Emoji Autocomplete": "Autocompletar Emoji",
     "Notification Autocomplete": "Autocompletar notificación",
     "Room Autocomplete": "Autocompletar sala",
@@ -2341,14 +1966,10 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Deberá autenticarse con el servidor para confirmar la actualización.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Actualice esta sesión para permitirle verificar otras sesiones, otorgándoles acceso a mensajes cifrados y marcándolos como confiables para otros usuarios.",
     "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.": "Ingrese una frase de seguridad que solo usted conozca, ya que se usa para proteger sus datos. Para estar seguro, no debe volver a utilizar la contraseña de su cuenta.",
-    "Enter a recovery passphrase": "Ingrese una frase de contraseña de recuperación",
-    "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.": "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",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Guarde su llave de seguridad en un lugar seguro, como un administrador de contraseñas o una caja fuerte, ya que se usa para proteger sus datos cifrados.",
     "Download": "Descargar",
     "Unable to query secret storage status": "No se puede consultar el estado del almacenamiento secreto",
@@ -2361,38 +1982,23 @@
     "Confirm Security Phrase": "Confirmar la frase de seguridad",
     "Save your Security Key": "Guarde su llave de seguridad",
     "Unable to set up secret storage": "No se puede configurar el almacenamiento secreto",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Almacenaremos una copia encriptada de sus claves en nuestro servidor. Asegure su copia de seguridad con una contraseña de recuperación.",
     "For maximum security, this should be different from your account password.": "Para mayor seguridad, esta debe ser diferente a la contraseña de su cuenta.",
-    "Set up with a recovery key": "Configurar con una clave de recuperación",
-    "Please enter your recovery passphrase a second time to confirm.": "Ingrese su contraseña de recuperación por segunda vez para confirmar.",
-    "Repeat your recovery passphrase...": "Repite tu contraseña de recuperación ...",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Su clave de recuperación es una red de seguridad; puede usarla para restaurar el acceso a sus mensajes cifrados si olvida su contraseña de recuperación.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Guarde una copia en un lugar seguro, como un administrador de contraseñas o incluso una caja fuerte.",
-    "Your recovery key": "Tu clave de recuperación",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Tu clave de recuperación se ha <b>copiado en tu portapapeles</b>, pégala en:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Tu clave de recuperación está en tu carpeta <b>Descargas</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Imprímelo</b> y guárdalo en un lugar seguro",
     "<b>Save it</b> on a USB key or backup drive": "<b>Guárdelo</b> en una llave USB o unidad de respaldo",
     "<b>Copy it</b> to your personal cloud storage": "<b>Cópielo</b> a su almacenamiento personal en la nube",
     "Your keys are being backed up (the first backup could take a few minutes).": "Se está realizando una copia de seguridad de sus claves (la primera copia de seguridad puede tardar unos minutos).",
     "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.": "Sin configurar Secure Message Recovery, no podrás restaurar tu historial de mensajes encriptados si cierras sesión o usas otra sesión.",
     "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...": "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",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Sin configurar Secure Message Recovery, perderá su historial de mensajes seguros cuando cierre la sesión.",
-    "If you don't want to set this up now, you can later in Settings.": "Si no desea configurar esto ahora, puede hacerlo más tarde en Configuración.",
-    "Don't ask again": "No vuelvas a preguntar",
     "New Recovery Method": "Nuevo método de recuperación",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Se han detectado una nueva contraseña y clave de recuperación para mensajes seguros.",
     "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 no configuró el nuevo método de recuperación, es posible que un atacante esté intentando acceder a su cuenta. Cambie la contraseña de su cuenta y configure un nuevo método de recuperación inmediatamente en Configuración.",
     "Go to Settings": "Ir a la configuración",
     "Set up Secure Messages": "Configurar mensajes seguros",
     "Recovery Method Removed": "Método de recuperación eliminado",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Esta sesión ha detectado que se han eliminado su contraseña de recuperación y la clave para Mensajes seguros.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Si hizo esto accidentalmente, puede configurar Mensajes seguros en esta sesión que volverá a cifrar el historial de mensajes de esta sesión con un nuevo método de recuperación.",
     "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 no eliminó el método de recuperación, es posible que un atacante esté intentando acceder a su cuenta. Cambie la contraseña de su cuenta y configure un nuevo método de recuperación inmediatamente en Configuración.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Si está desactivado, los mensajes de las salas cifradas no aparecerán en los resultados de búsqueda.",
@@ -2421,9 +2027,9 @@
     "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",
+    "Cancel replying to a message": "Cancelar responder al mensaje",
     "Toggle microphone mute": "Alternar silencio del micrófono",
-    "Toggle video on/off": "Activar/desactivar video",
+    "Toggle video on/off": "Activar/desactivar vídeo",
     "Scroll up/down in the timeline": "Desplazarse hacia arriba o hacia abajo en la línea de tiempo",
     "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",
@@ -2452,7 +2058,7 @@
     "This version of %(brand)s does not support searching encrypted messages": "Esta versión de %(brand)s no puede buscar mensajes cifrados",
     "Video conference ended by %(senderName)s": "Videoconferencia terminada por %(senderName)s",
     "Join the conference from the room information card on the right": "Únete a la conferencia desde el panel de información de la sala de la derecha",
-    "Join the conference at the top of this room": "Unirse a la conferencia en la parte de arriba de la sala",
+    "Join the conference at the top of this room": "Únete a la conferencia en la parte de arriba de la sala",
     "Ignored attempt to disable encryption": "Se ha ignorado un intento de desactivar el cifrado",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Los mensajes en esta sala están cifrados de extremo a extremo. Cuando alguien se una podrás verificarle en su perfil, tan solo pulsa en su imagen.",
     "Add widgets, bridges & bots": "Añadir widgets, puentes y bots",
@@ -2498,7 +2104,6 @@
     "That phone number doesn't look quite right, please check and try again": "Ese número de teléfono no parece ser correcto, compruébalo e inténtalo de nuevo",
     "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…",
     "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:",
@@ -2761,15 +2366,13 @@
     "Homeserver": "Servidor base",
     "Server Options": "Opciones del servidor",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Estos mensajes se cifran de extremo a extremo. Verifica a %(displayName)s en su perfil - toca su imagen.",
-    "Role": "Rol",
     "Start a new chat": "Empezar una nueva conversación",
     "Open dial pad": "Abrir teclado numérico",
-    "Start a Conversation": "Empezar una conversación",
     "This is the start of <roomName/>.": "Este es el inicio de <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Añade una imagen para que la gente reconozca la sala fácilmente.",
     "%(displayName)s created this room.": "%(displayName)s creó esta sala.",
     "You created this room.": "Creaste esta sala.",
-    "<a>Add a topic</a> to help people know what it is about.": "<a>Añade un tema</a> para que la gente sepa de qué va esta sala.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Escribe un asunto</a> para que la gente sepa de qué va esta sala.",
     "Topic: %(topic)s ": "Tema: %(topic)s ",
     "Topic: %(topic)s (<a>edit</a>)": "Tema: %(topic)s (<a>cambiar</a>)",
     "Remove messages sent by others": "Eliminar mensajes mandados por otros",
@@ -2789,11 +2392,8 @@
     "Sends the given message with fireworks": "Envía el mensaje con fuegos artificiales",
     "sends confetti": "envía confeti",
     "Sends the given message with confetti": "Envía el mensaje con confeti",
-    "Show chat effects": "Ver efectos",
     "Use Ctrl + Enter to send a message": "Usa Control + Intro para enviar un mensaje",
     "Use Command + Enter to send a message": "Usa Comando + Intro para enviar un mensje",
-    "Use Ctrl + F to search": "Usa Control + F para buscar",
-    "Use Command + F to search": "Usa comando + F para buscar",
     "Render LaTeX maths in messages": "Mostrar matemáticas en los mensajes usando LaTeX",
     "%(senderName)s ended the call": "%(senderName)s ha terminado la llamada",
     "You ended the call": "Has terminado la llamada",
@@ -2801,7 +2401,7 @@
     "Safeguard against losing access to encrypted messages & data": "Evita perder acceso a datos y mensajes cifrados",
     "Use app": "Usar la aplicación",
     "Use app for a better experience": "Usa la aplicación para una experiencia mejor",
-    "Enable desktop notifications": "Activar notificaciones de escritorio",
+    "Enable desktop notifications": "Activa las notificaciones de escritorio",
     "Don't miss a reply": "No te pierdas ninguna respuesta",
     "Send messages as you in your active room": "Enviar mensajes en tu sala activa",
     "See messages posted to your active room": "Ver los mensajes publicados en tu sala activa",
@@ -2814,10 +2414,10 @@
     "Change the avatar of your active room": "Cambiar la foto de tu sala actual",
     "See when the avatar changes in this room": "Ver cuándo cambia la imagen de esta sala",
     "Change the avatar of this room": "Cambiar la imagen de esta sala",
-    "See when the name changes in your active room": "Ver cuándo cambia el tema de tu sala actual",
+    "See when the name changes in your active room": "Ver cuándo cambia el asunto de tu sala actual",
     "Change the name of your active room": "Cambiar el nombre de tu sala actual",
-    "See when the name changes in this room": "Ver cuándo cambia el tema de esta sala",
-    "Change the name of this room": "Cambiar el tema de esta sala",
+    "See when the name changes in this room": "Ver cuándo cambia el tema de esta asunto",
+    "Change the name of this room": "Cambiar el asunto de esta sala",
     "Sint Maarten": "San Martín",
     "Singapore": "Singapur",
     "Sierra Leone": "Sierra Leona",
@@ -2845,14 +2445,10 @@
     "Mongolia": "Mongolia",
     "Montenegro": "Montenegro",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web en móviles es un experimento. Para una mejor experiencia y las últimas funcionalidades, usa nuestra aplicación nativa gratuita.",
-    "See when the topic changes in your active room": "Ver cuándo cambia el tema de tu sala actual",
-    "Change the topic of your active room": "Cambiar el tema de tu sala actual",
-    "See when the topic changes in this room": "Ver cuándo cambia el tema de esta sala",
-    "Change the topic of this room": "Cambiar el tema de esta sala",
-    "%(senderName)s declined the call.": "%(senderName)s ha rechazado la llamada.",
-    "(an error occurred)": "(ha ocurrido un error)",
-    "(their device couldn't start the camera / microphone)": "(su dispositivo no ha podido acceder a la cámara o micrófono)",
-    "(connection failed)": "(conexión fallida)",
+    "See when the topic changes in your active room": "Ver cuándo cambia el asunto de la sala en la que estés",
+    "Change the topic of your active room": "Cambiar el asunto de la sala en la que estés",
+    "See when the topic changes in this room": "Ver cuándo cambia el asunto de esta sala",
+    "Change the topic of this room": "Cambiar el asunto de esta sala",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ha cambiado los permisos de la sala.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s ha establecido los permisos de la sala.",
     "Converts the DM to a room": "Convierte el mensaje directo a sala",
@@ -2942,8 +2538,6 @@
     "The call was answered on another device.": "Esta llamada fue respondida en otro dispositivo.",
     "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",
     "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",
@@ -2962,7 +2556,6 @@
     "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 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.",
@@ -3024,61 +2617,33 @@
     "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",
     "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 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.",
@@ -3086,9 +2651,7 @@
     "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.",
@@ -3096,17 +2659,11 @@
     "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": "Crear una nueva sala",
-    "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 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",
@@ -3115,40 +2672,28 @@
     "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.",
     "This room is suggested as a good one to join": "Unirse a esta sala está sugerido",
     "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.": "Esto solo afecta normalmente a cómo el servidor procesa la sala. Si estás teniendo problemas con %(brand)s, por favor, infórmanos del problema.",
     "It's just you at the moment, it will be even better with others.": "Ahora mismo no hay nadie más.",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifica este inicio de sesión para acceder a tus mensajes cifrados y probar a otras personas que realmente eres tú quien está iniciando sesión.",
-    "Verify with another session": "Verificar con otra sesión",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Crearemos salas para cada uno. Puedes añadir más después, incluso salas que ya existan.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Vamos a crear una sala para cada uno. Puedes añadir más después, incluso salas que ya existan.",
     "Make sure the right people have access. You can invite more later.": "Vamos a asegurarnos de que solo la gente adecuada tiene acceso. Puedes invitar a más después.",
     "A private space to organise your rooms": "Un espacio privado para organizar tus salas",
     "Make sure the right people have access to %(name)s": "Vamos a asegurarnos de que solo la gente adecuada tiene acceso a %(name)s",
@@ -3158,24 +2703,16 @@
     "Private space": "Espacio privado",
     "Public space": "Espacio público",
     "<inviter/> invites you": "<inviter/> te ha invitado",
-    "Search names and description": "Buscar nombres y descripciones",
     "You may want to try a different search or check for typos.": "Prueba con otro término de búsqueda o comprueba que no haya erratas.",
-    "Create room": "Crear sala",
     "No results found": "Ningún resultado",
     "Mark as suggested": "Sugerir",
     "Mark as not suggested": "No sugerir",
     "Removing...": "Quitando...",
     "Failed to remove some rooms. Try again later": "No se han podido quitar algunas salas. Prueba de nuevo más tarde",
-    "%(count)s rooms and 1 space|one": "%(count)s sala y 1 espacio",
-    "%(count)s rooms and 1 space|other": "%(count)s salas y 1 espacio",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s sala y %(numSpaces)s espacios",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s salas y %(numSpaces)s espacios",
-    "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 estás buscando, pide que te inviten o <a>crea una nueva</a>.",
     "Suggested": "Sugerencias",
     "%(count)s rooms|one": "%(count)s sala",
     "%(count)s rooms|other": "%(count)s salas",
     "You don't have permission": "No tienes permisos",
-    "Open": "Abrir",
     "%(count)s messages deleted.|one": "%(count)s mensaje eliminado.",
     "%(count)s messages deleted.|other": "%(count)s mensajes eliminados.",
     "Invite to %(roomName)s": "Invitar a %(roomName)s",
@@ -3184,10 +2721,7 @@
     "Invite with email or username": "Invitar correos electrónicos o nombres de usuario",
     "You can change these anytime.": "Puedes cambiar todo esto en cualquier momento.",
     "Add some details to help people recognise it.": "Añade algún detalle para ayudar a que la gente lo reconozca.",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Los espacios son la nueva manera de agrupar personas y salas. Para unirte a un espacio, necesitarás que te inviten.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "De %(deviceName)s (%(deviceId)s) en",
     "Check your devices": "Comprueba tus dispositivos",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Alguien está iniciando sesión a tu cuenta: %(name)s (%(deviceID)s) en %(ip)s",
     "You have unverified logins": "Tienes inicios de sesión sin verificar",
     "Verification requested": "Verificación solicitada",
     "Avatar": "Imagen de perfil",
@@ -3199,33 +2733,26 @@
     "Add existing rooms": "Añadir salas existentes",
     "%(count)s people you know have already joined|one": "%(count)s persona que ya conoces se ha unido",
     "%(count)s people you know have already joined|other": "%(count)s personas que ya conoces se han unido",
-    "Accept on your other login…": "Acepta en tu otro inicio de sesión…",
-    "Stop & send recording": "Parar y enviar grabación",
-    "Record a voice message": "Grabar un mensaje de voz",
+    "Accept on your other login…": "Acepta en otro sitio donde hayas iniciado sesión…",
     "Quick actions": "Acciones rápidas",
     "Invite to just this room": "Invitar solo a esta sala",
     "Warn before quitting": "Avisar antes de salir",
     "Manage & explore rooms": "Gestionar y explorar salas",
     "unknown person": "persona desconocida",
-    "Share decryption keys for room history when inviting users": "Compartir claves para descifrar el historial de la sala al invitar a gente",
-    "Send and receive voice messages (in development)": "Enviar y recibir mensajes de voz (en desarrollo)",
     "%(deviceId)s from %(ip)s": "%(deviceId)s desde %(ip)s",
     "Review to ensure your account is safe": "Revisa que tu cuenta esté segura",
     "Sends the given message as a spoiler": "Envía el mensaje como un spoiler",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultando a %(transferTarget)s. <a>Transferir a %(transferee)s</a>",
-    "Message search initilisation failed": "Ha fallado la inicialización de la búsqueda de mensajes",
     "Reset event store?": "¿Restablecer almacenamiento de eventos?",
     "You most likely do not want to reset your event index store": "Lo más probable es que no quieras restablecer tu almacenamiento de índice de ecentos",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Si lo haces, ten en cuenta que no se borrarán tus mensajes, pero la experiencia de búsqueda será peor durante unos momentos mientras se recrea el índice",
     "Reset event store": "Restablecer el almacenamiento de eventos",
     "What are some things you want to discuss in %(spaceName)s?": "¿De qué quieres hablar en %(spaceName)s?",
     "Let's create a room for each of them.": "Crearemos una sala para cada uno.",
     "You can add more later too, including already existing ones.": "Puedes añadir más después, incluso si ya existen.",
     "Please choose a strong password": "Por favor, elige una contraseña segura",
     "Use another login": "Usar otro inicio de sesión",
-    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifica tu identidad para acceder a mensajes cifrados y probar tu identidad a otros.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifica tu identidad para leer tus mensajes cifrados y probar a las demás personas que realmente eres tú.",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Si no verificas no tendrás acceso a todos tus mensajes y puede que aparezcas como no confiable para otros usuarios.",
-    "Invite messages are hidden by default. Click to show the message.": "Los mensajes de invitación no se muestran por defecto. Haz clic para mostrarlo.",
     "You can select all or individual messages to retry or delete": "Puedes seleccionar uno o todos los mensajes para reintentar o eliminar",
     "Sending": "Enviando",
     "Retry all": "Reintentar todo",
@@ -3248,23 +2775,18 @@
     "%(seconds)ss left": "%(seconds)ss restantes",
     "Failed to send": "No se ha podido mandar",
     "Change server ACLs": "Cambiar los ACLs del servidor",
-    "Show options to enable 'Do not disturb' mode": "Mostrar opciones para activar el modo «no molestar»",
-    "Stop the recording": "Parar grabación",
-    "Delete recording": "Borrar grabación",
+    "Show options to enable 'Do not disturb' mode": "Ver opciones para activar el modo «no molestar»",
     "Enter your Security Phrase a second time to confirm it.": "Escribe tu frase de seguridad de nuevo para confirmarla.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Elige salas o conversaciones para añadirlas. Este espacio es solo para ti, no informaremos a nadie. Puedes añadir más más tarde.",
     "What do you want to organise?": "¿Qué quieres organizar?",
-    "Filter all spaces": "Filtrar todos los espacios",
+    "Filter all spaces": "Filtrar espacios",
     "%(count)s results in all spaces|one": "%(count)s resultado en todos los espacios",
     "%(count)s results in all spaces|other": "%(count)s resultados en todos los espacios",
     "You have no ignored users.": "No has ignorado a nadie.",
     "Pause": "Pausar",
     "Play": "Reproducir",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Esto es una funcionalidad experimental.</b> Por ahora, los usuarios nuevos que reciban una invitación tendrán que abrirla en <link/> para unirse.",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Para ver %(spaceName)s, activa la <a>beta de los espacios</a>",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Para unirte a %(spaceName)s, activa la <a>beta de los espacios</a>",
     "Select a room below first": "Selecciona una sala de abajo primero",
-    "Communities are changing to Spaces": "Las comunidades se van a convertir en espacios",
     "Join the beta": "Unirse a la beta",
     "Leave the beta": "Salir de la beta",
     "Beta": "Beta",
@@ -3274,8 +2796,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Añadiendo salas… (%(progress)s de %(count)s)",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Añadiendo sala…",
     "Not all selected were added": "No se han añadido todas las seleccionadas",
-    "You can add existing spaces to a space.": "Puedes añadir espacios ya existentes dentro de otros espacios.",
-    "Feeling experimental?": "¿Te animas a probar cosas nuevas?",
     "You are not allowed to view this server's rooms list": "No tienes permiso para ver la lista de salas de este servidor",
     "Error processing voice message": "Ha ocurrido un error al procesar el mensaje de voz",
     "We didn't find a microphone on your device. Please check your settings and try again.": "No hemos encontrado un micrófono en tu dispositivo. Por favor, consulta tus ajustes e inténtalo de nuevo.",
@@ -3284,36 +2804,352 @@
     "Unable to access your microphone": "No se ha podido acceder a tu micrófono",
     "Your access token gives full access to your account. Do not share it with anyone.": "Tu token de acceso da acceso completo a tu cuenta. No lo compartas con nadie.",
     "Access Token": "Token de acceso",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Los espacios son una nueva forma de agrupar salas y personas. Para unirte a uno ya existente, necesitarás que te inviten a él.",
     "Please enter a name for the space": "Por favor, elige un nombre para el espacio",
     "Connecting": "Conectando",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Puedes salirte de la beta en cualquier momento desde tus ajustes o pulsando sobre la etiqueta de beta, como la que hay arriba.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s se volverá a cargar con los espacios activados. Las comunidades y etiquetas personalizadas se ocultarán.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Versión beta disponible para web, escritorio y Android. Gracias por usar la beta.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s volverá a cargarse con los espacios desactivados. Las comunidades y etiquetas personalizadas serán visibles de nuevo.",
     "Spaces are a new way to group rooms and people.": "Los espacios son una nueva manera de agrupar salas y gente.",
     "Message search initialisation failed": "Ha fallado la inicialización de la búsqueda de mensajes",
-    "Spaces are a beta feature.": "Los espacios son una funcionalidad en beta.",
     "Search names and descriptions": "Buscar por nombre y descripción",
     "You may contact me if you have any follow up questions": "Os podéis poner en contacto conmigo si tenéis alguna pregunta",
     "To leave the beta, visit your settings.": "Para salir de la beta, ve a tus ajustes.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Tu nombre de usuario y plataforma serán adjuntados, para que podamos interpretar tus comentarios lo mejor posible.",
     "%(featureName)s beta feedback": "Comentarios sobre la funcionalidad beta %(featureName)s",
     "Thank you for your feedback, we really appreciate it.": "Muchas gracias por tus comentarios.",
-    "Beta feedback": "Danos tu opinión sobre la beta",
     "Add reaction": "Reaccionar",
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "¿Te apetece probar cosas nuevas? Los experimentos son la mejor manera de conseguir acceso anticipado a nuevas funcionalidades, probarlas y ayudar a mejorarlas antes de su lanzamiento. <a>Más información</a>.",
-    "Send and receive voice messages": "Enviar y recibir mensajes de voz",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Tus comentarios ayudarán a mejorar los espacios. Cuanto más detalle incluyas, mejor.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta disponible para la versión web, de escritorio o Android. Puede que algunas funcionalidades no estén disponibles en tu servidor base.",
     "Space Autocomplete": "Autocompletar espacios",
     "Go to my space": "Ir a mi espacio",
     "sends space invaders": "enviar space invaders",
     "Sends the given message with a space themed effect": "Envía un mensaje con efectos espaciales",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Si sales, %(brand)s volverá a cargarse con los espacios desactivados. Las comunidades y las etiquetas personalizadas serán visibles de nuevo.",
-    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permitir conexión directa (peer-to-peer) en las llamadas individuales (si lo activas, la otra parte podría ver tu dirección IP)",
+    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permitir conexión directa (peer-to-peer) en las llamadas individuales (si lo activas, la otra persona podría ver tu dirección IP)",
     "See when people join, leave, or are invited to your active room": "Ver cuando alguien se una, salga o se le invite a tu sala activa",
     "Kick, ban, or invite people to this room, and make you leave": "Expulsar, vetar o invitar personas a esta sala, y hacerte salir de ella",
     "Kick, ban, or invite people to your active room, and make you leave": "Expulsar, vetar o invitar a gente a tu sala activa, o hacerte salir",
-    "See when people join, leave, or are invited to this room": "Ver cuando alguien se une, sale o se le invita a la sala"
+    "See when people join, leave, or are invited to this room": "Ver cuando alguien se une, sale o se le invita a la sala",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Prueba con sinónimos o revisa si te has equivocado al escribir. Puede que algunos resultados no sean visibles si son privados y necesites que te inviten para verlos.",
+    "Currently joining %(count)s rooms|one": "Entrando en %(count)s sala",
+    "Currently joining %(count)s rooms|other": "Entrando en %(count)s salas",
+    "No results for \"%(query)s\"": "Ningún resultado para «%(query)s»",
+    "The user you called is busy.": "La persona a la que has llamado está ocupada.",
+    "User Busy": "Persona ocupada",
+    "End-to-end encryption isn't enabled": "El cifrado de extremo a extremo no está activado",
+    "If you can't see who you’re looking for, send them your invite link below.": "Si no encuentras abajo a quien buscas, envíale tu enlace de invitación.",
+    "Teammates might not be able to view or join any private rooms you make.": "Las personas de tu equipo no podrán ver o unirse a ninguna sala privada que crees.",
+    "Or send invite link": "O envía un enlace de invitación",
+    "Some suggestions may be hidden for privacy.": "Puede que se hayan ocultado algunas sugerencias por motivos de privacidad.",
+    "Search for rooms or people": "Busca salas o gente",
+    "Message preview": "Vista previa del mensaje",
+    "Forward message": "Reenviar mensaje",
+    "Open link": "Abrir enlace",
+    "Sent": "Enviado",
+    "You don't have permission to do this": "No tienes permisos para hacer eso",
+    "Error - Mixed content": "Error - Contenido mezclado",
+    "Error loading Widget": "Error al cargar el widget",
+    "Pinned messages": "Mensajes fijados",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Si tienes permisos, abre el menú de cualquier mensaje y selecciona <b>Fijar</b> para colocarlo aquí.",
+    "Nothing pinned, yet": "Nada fijado, todavía",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s se ha quitado el nombre personalizado (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s ha elegido %(displayName)s como su nombre",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s ha cambiado los <a>mensajes fijados</a> de la sala.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s ha echado a %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s ha echado a %(targetName)s: %(reason)s",
+    "Disagree": "No estoy de acuerdo",
+    "[number]": "[número]",
+    "To view %(spaceName)s, you need an invite": "Para ver %(spaceName)s, necesitas que te inviten",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Haz clic sobre una imagen en el panel de filtro para ver solo las salas y personas asociadas con una comunidad.",
+    "Move down": "Bajar",
+    "Move up": "Subir",
+    "Report": "Reportar",
+    "Collapse reply thread": "Ocultar respuestas",
+    "Show preview": "Mostrar vista previa",
+    "View source": "Ver código fuente",
+    "Forward": "Reenviar",
+    "Settings - %(spaceName)s": "Ajustes - %(spaceName)s",
+    "Report the entire room": "Reportar la sala entera",
+    "Spam or propaganda": "Publicidad no deseada o propaganda",
+    "Illegal Content": "Contenido ilegal",
+    "Toxic Behaviour": "Comportamiento tóxico",
+    "Please pick a nature and describe what makes this message abusive.": "Por favor, escoge una categoría y explica por qué el mensaje es abusivo.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Otro motivo. Por favor, describe el problema.\nSe avisará a los moderadores de la sala.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Esta sala está dedicada a un tema ilegal o contenido tóxico, o bien los moderadores no están tomando medidas frente a este tipo de contenido.\nSe avisará a los administradores de %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Esta sala está dedicada a un tema ilegal o contenido tóxico, o los moderadores no están tomando medidas frente a este tipo de contenido.\nSe avisará a los administradores de %(homeserver)s, pero no podrán leer el contenido cifrado de la sala.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Esta persona está mandando publicidad no deseada o propaganda.\nSe avisará a los moderadores de la sala.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Esta persona está comportándose de manera posiblemente ilegal. Por ejemplo, amenazando con violencia física o con revelar datos personales.\nSe avisará a los moderadores de la sala, que podrían denunciar los hechos.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Esta persona está teniendo un comportamiento tóxico. Por ejemplo, insultando al resto, compartiendo contenido explícito en una sala para todos los públicos, o incumpliendo las normas de la sala en general.\nSe avisará a los moderadores de la sala.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Lo que esta persona está escribiendo no está bien.\nSe avisará a los moderadores de la sala.",
+    "Please provide an address": "Por favor, elige una dirección",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s ha cambiado los permisos del servidor",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s ha cambiado los permisos del servidor %(count)s veces",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ha cambiado los permisos del servidor",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ha cambiado los permisos del servidor %(count)s veces",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Ha fallado el sistema de búsqueda de mensajes. Comprueba <a>tus ajustes</a> para más información",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Elige una dirección para este espacio y los usuarios de tu servidor base (%(localDomain)s) podrán encontrarlo a través del buscador",
+    "To publish an address, it needs to be set as a local address first.": "Para publicar una dirección, primero debe ser añadida como dirección local.",
+    "Published addresses can be used by anyone on any server to join your room.": "Las direcciones publicadas pueden usarse por cualquiera para unirse a tu sala, independientemente de su servidor base.",
+    "Published addresses can be used by anyone on any server to join your space.": "Los espacios publicados pueden usarse por cualquiera, independientemente de su servidor base.",
+    "This space has no local addresses": "Este espacio no tiene direcciones locales",
+    "Space information": "Información del espacio",
+    "Collapse": "Colapsar",
+    "Expand": "Expandir",
+    "Recommended for public spaces.": "Recomendado para espacios públicos.",
+    "Allow people to preview your space before they join.": "Permitir que se pueda ver una vista previa del espacio antes de unirse a él.",
+    "Preview Space": "Previsualizar espacio",
+    "Decide who can view and join %(spaceName)s.": "Decide quién puede ver y unirse a %(spaceName)s.",
+    "Visibility": "Visibilidad",
+    "Guests can join a space without having an account.": "Dejar que las personas sin cuenta se unan al espacio.",
+    "This may be useful for public spaces.": "Esto puede ser útil para espacios públicos.",
+    "Enable guest access": "Permitir acceso a personas sin cuenta",
+    "Failed to update the history visibility of this space": "No se ha podido cambiar la visibilidad del historial de este espacio",
+    "Failed to update the guest access of this space": "No se ha podido cambiar el acceso a este espacio",
+    "Failed to update the visibility of this space": "No se ha podido cambiar la visibilidad del espacio",
+    "Address": "Dirección",
+    "e.g. my-space": "ej.: mi-espacio",
+    "Silence call": "Silenciar llamada",
+    "Sound on": "Sonido activado",
+    "Show all rooms in Home": "Mostrar todas las salas en la pantalla de inicio",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototipo de reportes a los moderadores. En las salas que lo permitan, verás el botón «reportar», que te permitirá avisar de mensajes abusivos a los moderadores de la sala",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s ha anulado la invitación a %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s ha anulado la invitación a %(targetName)s: %(reason)s",
+    "%(targetName)s left the room": "%(targetName)s ha salido de la sala",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s ha salido de la sala: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s ha rechazado la invitación",
+    "%(targetName)s joined the room": "%(targetName)s se ha unido a la sala",
+    "%(senderName)s made no change": "%(senderName)s no ha hecho ningún cambio",
+    "%(senderName)s set a profile picture": "%(senderName)s se ha puesto una foto de perfil",
+    "%(senderName)s changed their profile picture": "%(senderName)s ha cambiado su foto de perfil",
+    "%(senderName)s removed their profile picture": "%(senderName)s ha eliminado su foto de perfil",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s ha cambiado su nombre a %(displayName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s ha invitado a %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s ha aceptado una invitación",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s ha aceptado la invitación a %(displayName)s",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Hemos enviado el resto, pero no hemos podido invitar las siguientes personas a la sala <RoomName/>",
+    "Some invites couldn't be sent": "No se han podido enviar algunas invitaciones",
+    "Integration manager": "Gestor de integración",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Tu aplicación %(brand)s no te permite usar un gestor de integración para hacer esto. Por favor, contacta con un administrador.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Al usar este widget puede que se compartan datos <helpIcon /> con %(widgetDomain)s y tu gestor de integraciones.",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los gestores de integraciones reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establecer niveles de poder en tu nombre.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Usa un gestor de integraciones para bots, widgets y paquetes de pegatinas.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usar un gestor de integraciones <b>(%(serverName)s)</b> para gestionar bots, widgets y paquetes de pegatinas.",
+    "Identity server": "Servidor de identidad",
+    "Identity server (%(server)s)": "Servidor de identidad %(server)s",
+    "Could not connect to identity server": "No se ha podido conectar al servidor de identidad",
+    "Not a valid identity server (status code %(code)s)": "No es un servidor de identidad válido (código de estado %(code)s)",
+    "Identity server URL must be HTTPS": "La URL del servidor de identidad debe ser HTTPS",
+    "Unable to copy a link to the room to the clipboard.": "No se ha podido copiar el enlace a la sala.",
+    "Unable to copy room link": "No se ha podido copiar el enlace a la sala",
+    "Unnamed audio": "Audio sin título",
+    "User Directory": "Lista de usuarios",
+    "Error processing audio message": "Error al procesar el mensaje de audio",
+    "Show %(count)s other previews|one": "Ver otras %(count)s vistas previas",
+    "Show %(count)s other previews|other": "Ver %(count)s otra vista previa",
+    "Images, GIFs and videos": "Imágenes, GIFs y vídeos",
+    "Code blocks": "Bloques de código",
+    "To view all keyboard shortcuts, click here.": "Para ver todos los atajos de teclado, haz clic aquí.",
+    "Keyboard shortcuts": "Atajos de teclado",
+    "Identity server is": "El servidor de identidad es",
+    "There was an error loading your notification settings.": "Ha ocurrido un error al cargar tus ajustes de notificaciones.",
+    "Mentions & keywords": "Menciones y palabras clave",
+    "Global": "Global",
+    "New keyword": "Nueva palabra clave",
+    "Keyword": "Palabra clave",
+    "Enable email notifications for %(email)s": "Activar notificaciones por correo electrónico para %(email)s",
+    "Enable for this account": "Activar para esta cuenta",
+    "An error occurred whilst saving your notification preferences.": "Ha ocurrido un error al guardar las tus preferencias de notificaciones.",
+    "Error saving notification preferences": "Error al guardar las preferencias de notificaciones",
+    "Messages containing keywords": "Mensajes que contengan",
+    "Use Command + F to search timeline": "Usa Control + F para buscar",
+    "Transfer Failed": "La transferencia ha fallado",
+    "Unable to transfer call": "No se ha podido transferir la llamada",
+    "Could not connect media": "No se ha podido conectar con los dispositivos multimedia",
+    "Their device couldn't start the camera or microphone": "El dispositivo de la otra persona no ha podido iniciar la cámara o micrófono",
+    "Error downloading audio": "Error al descargar el audio",
+    "Image": "Imagen",
+    "Sticker": "Pegatina",
+    "The call is in an unknown state!": "¡La llamada está en un estado desconocido!",
+    "Call back": "Devolver",
+    "No answer": "Sin respuesta",
+    "An unknown error occurred": "Ha ocurrido un error desconocido",
+    "Connection failed": "Ha fallado la conexión",
+    "Copy Room Link": "Copiar enlace a la sala",
+    "Displaying time": "Mostrando la hora",
+    "IRC": "IRC",
+    "Use Ctrl + F to search timeline": "Usa Control + F para buscar dentro de la conversación",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Ten en cuenta que actualizar crea una nueva versión de la sala</b>. Todos los mensajes hasta ahora quedarán archivados aquí, en esta sala.",
+    "Automatically invite members from this room to the new one": "Invitar a la nueva sala automáticamente a los miembros que tiene ahora",
+    "These are likely ones other room admins are a part of.": "Otros administradores de la sala estarán dentro.",
+    "Other spaces or rooms you might not know": "Otros espacios o salas que puede que no conozcas",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decide qué espacios tienen acceso a esta sala. Si seleccionas un espacio, sus miembros podrán encontrar y unirse a <RoomName/>.",
+    "You're removing all spaces. Access will default to invite only": "Al quitar todos los espacios, el acceso por defecto pasará a ser «solo por invitación»",
+    "Only people invited will be able to find and join this space.": "Solo las personas invitadas podrán encontrar y unirse a este espacio.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Cualquiera podrá encontrar y unirse a este espacio, incluso si no forman parte de <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Cualquiera que forme parte de <SpaceName/> podrá encontrar y unirse.",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s ha quitado el veto a %(targetName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s ha vetado a %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s ha vetado a %(targetName)s: %(reason)s",
+    "New layout switcher (with message bubbles)": "Nuevo menú lateral (con burbujas de mensajes)",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Esto hace que sea fácil tener salas privadas solo para un espacio, permitiendo que cualquier persona que forme parte del espacio pueda unirse a ellas. Todas las nuevas salas dentro del espacio tendrán esta opción disponible.",
+    "User %(userId)s is already invited to the room": "ya se ha invitado a %(userId)s a unirse a la sala",
+    "Screen sharing is here!": "¡Ya puedes compartir tu pantalla!",
+    "People with supported clients will be able to join the room without having a registered account.": "Las personas con una aplicación compatible podrán unirse a la sala sin tener que registrar una cuenta.",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Cualquiera en un espacio puede encontrar y unirse. Puedes seleccionar varios espacios.",
+    "Spaces with access": "Espacios con acceso",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Cualquiera en un espacio puede encontrar y unirse. <a>Ajusta qué espacios pueden acceder desde aquí.</a>",
+    "Currently, %(count)s spaces have access|other": "Ahora mismo, %(count)s espacios tienen acceso",
+    "& %(count)s more|other": "y %(count)s más",
+    "Upgrade required": "Actualización necesaria",
+    "Anyone can find and join.": "Cualquiera puede encontrar y unirse.",
+    "Only invited people can join.": "Solo las personas invitadas pueden unirse.",
+    "Private (invite only)": "Privado (solo por invitación)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Si actualizas, podrás configurar la sala para que los miembros de los espacios que elijas puedan unirse sin que tengas que invitarles.",
+    "Message bubbles": "Burbujas de mensaje",
+    "Show all rooms": "Ver todas las salas",
+    "Give feedback.": "Danos tu opinión.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Gracias por probar los espacios. Tu opinión nos ayudará a tomar decisiones sobre las próximas versiones.",
+    "Spaces feedback": "Danos tu opinión sobre los espacios",
+    "Spaces are a new feature.": "Los espacios son una funcionalidad nueva.",
+    "Your camera is still enabled": "Tu cámara todavía está encendida",
+    "Your camera is turned off": "Tu cámara está apagada",
+    "%(sharerName)s is presenting": "%(sharerName)s está presentando",
+    "You are presenting": "Estás presentando",
+    "All rooms you're in will appear in Home.": "En la página de inicio aparecerán todas las salas a las que te hayas unido.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Para ayudar a los miembros de tus espacios a encontrar y unirse a salas privadas, ve a los ajustes seguridad y privacidad de la sala en cuestión.",
+    "Help space members find private rooms": "Ayuda a los miembros de tus espacios a encontrar salas privadas",
+    "Help people in spaces to find and join private rooms": "Ayuda a la gente en tus espacios a encontrar y unirse a salas privadas",
+    "New in the Spaces beta": "Novedades en la beta de los espacios",
+    "We're working on this, but just want to let you know.": "Todavía estamos trabajando en esto, pero queríamos enseñártelo.",
+    "Search for rooms or spaces": "Buscar salas o espacios",
+    "Add space": "Añadir espacio",
+    "Spaces you know that contain this room": "Espacios que conoces que contienen esta sala",
+    "Search spaces": "Buscar espacios",
+    "Select spaces": "Elegir espacios",
+    "Leave %(spaceName)s": "Salir de %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Eres la única persona con permisos de administración en algunos de los espacios de los que quieres irte. Al salir de ellos, nadie podrá gestionarlos.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Eres la única persona con permisos de administración en el espacio. Al salir, nadie podrá gestionarlo.",
+    "You won't be able to rejoin unless you are re-invited.": "No podrás volverte a unir hasta que te vuelvan a invitar.",
+    "Search %(spaceName)s": "Buscar en %(spaceName)s",
+    "Want to add an existing space instead?": "¿Quieres añadir un espacio que ya exista?",
+    "Private space (invite only)": "Espacio privado (solo por invitación)",
+    "Space visibility": "Visibilidad del espacio",
+    "Add a space to a space you manage.": "Añade un espacio a dentro de otros espacio que gestiones.",
+    "Visible to space members": "Visible para los miembros del espacio",
+    "Public room": "Sala pública",
+    "Private room (invite only)": "Sala privada (solo por invitación)",
+    "Room visibility": "Visibilidad de la sala",
+    "Create a room": "Crear una sala",
+    "Only people invited will be able to find and join this room.": "Solo aquellas personas invitadas podrán encontrar y unirse a esta sala.",
+    "Anyone will be able to find and join this room.": "Todo el mundo podrá encontrar y unirse a esta sala.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Cualquiera podrá encontrar y unirse a esta sala, incluso gente que no sea miembro de <SpaceName/>.",
+    "You can change this at any time from room settings.": "Puedes cambiar esto cuando quieras desde los ajustes de la sala.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Todo el mundo en <SpaceName/> podrá encontrar y unirse a esta sala.",
+    "Adding spaces has moved.": "Hemos cambiado de sitio la creación de espacios.",
+    "Search for rooms": "Buscar salas",
+    "Search for spaces": "Buscar espacios",
+    "Create a new space": "Crear un nuevo espacio",
+    "Want to add a new space instead?": "¿Quieres añadir un espacio nuevo en su lugar?",
+    "Add existing space": "Añadir un espacio ya existente",
+    "Share content": "Compartir contenido",
+    "Application window": "Ventana concreta",
+    "Share entire screen": "Compartir toda la pantalla",
+    "Decrypting": "Descifrando",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Ahora puedes compartir tu pantalla dándole al botón de «compartir pantalla» durante una llamada. ¡Hasta puedes hacerlo en una llamada de voz si ambas partes lo permiten!",
+    "Access": "Acceso",
+    "Decide who can join %(roomName)s.": "Decide quién puede unirse a %(roomName)s.",
+    "Space members": "Miembros del espacio",
+    "Missed call": "Llamada perdida",
+    "Call declined": "Llamada rechazada",
+    "Stop recording": "Dejar de grabar",
+    "Send voice message": "Enviar mensaje de voz",
+    "Olm version:": "Versión de Olm:",
+    "Mute the microphone": "Silenciar el micrófono",
+    "Unmute the microphone": "Activar el micrófono",
+    "Dialpad": "Teclado numérico",
+    "More": "Más",
+    "Show sidebar": "Ver menú lateral",
+    "Hide sidebar": "Ocultar menú lateral",
+    "Start sharing your screen": "Comparte tu pantalla",
+    "Stop sharing your screen": "Dejar de compartir la pantalla",
+    "Stop the camera": "Parar la cámara",
+    "Start the camera": "Iniciar la cámara",
+    "Surround selected text when typing special characters": "Rodear texto seleccionado al escribir caracteres especiales",
+    "Send pseudonymous analytics data": "Enviar datos estadísticos seudonimizados",
+    "Created from <Community />": "Creado a partir de <Community />",
+    "Space created": "Espacio creado",
+    "This community has been upgraded into a Space": "Esta comunidad se ha convertido en un espacio",
+    "Unknown failure: %(reason)s": "Fallo desconocido: %(reason)s",
+    "Show my Communities": "Ver mis comunidades",
+    "Create Space": "Crear espacio",
+    "Open Space": "Abrir espacio",
+    "You can change this later.": "Puedes cambiarlo más tarde.",
+    "What kind of Space do you want to create?": "¿Qué tipo de espacio quieres crear?",
+    "Don't send read receipts": "No enviar confirmaciones de lectura",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Para ver espacios, oculta las comunidades en <a>ajustes</a>",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>No está recomendado activar el cifrado en salas públicas.</b> Cualquiera puede encontrar la sala y unirse, por lo que cualquiera puede leer los mensajes. No disfrutarás de los beneficios del cifrado. Además, activarlo en una sala pública hará que recibir y enviar mensajes tarde más.",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Las comunidades han sido archivadas para dar paso a los espacios, pero puedes convertir tus comunidades a espacios debajo. Al convertirlas, te aseguras de que tus conversaciones tienen acceso a las últimas funcionalidades.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Si nos has avisado de un fallo a través de Github, los registros de depuración nos pueden ayudar a encontrar más fácil el problema. Los registros incluyen datos de uso de la aplicación incluyendo tu nombre de usuario, las IDs o nombres de las salas o grupos que has visitado, los elementos de la interfaz con los que hayas interactuado recientemente, y los nombres de usuario de otras personas. No contienen mensajes.",
+    "Delete avatar": "Borrar avatar",
+    "Flair won't be available in Spaces for the foreseeable future.": "Por ahora no está previsto que las insignias estén disponibles en los espacios.",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Pídele a los <a>admins</a> que conviertan la comunidad en un espacio y espera a que te inviten.",
+    "You can create a Space from this community <a>here</a>.": "Puedes crear un espacio a partir de esta comunidad desde <a>aquí</a>.",
+    "To create a Space from another community, just pick the community in Preferences.": "Para crear un espacio a partir de otra comunidad, escoge la comunidad en ajustes.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, 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 tu nombre de usuario, las IDs o los nombres de las salas o grupos que has visitado, con qué elementos de la interfaz has interactuado recientemente, y nombres de usuario de otras personas. No incluyen mensajes.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Para evitar estos problemas, crea una <a>nueva sala pública</a> para la conversación que planees tener.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s han cambiado los <a>mensajes anclados</a> de la sala %(count)s veces.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s han cambiado los <a>mensajes anclados</a> de la sala %(count)s veces.",
+    "Cross-signing is ready but keys are not backed up.": "La firma cruzada está lista, pero no hay copia de seguridad de las claves.",
+    "Rooms and spaces": "Salas y espacios",
+    "Results": "Resultados",
+    "Communities won't receive further updates.": "Las comunidades no van a recibir actualizaciones.",
+    "Spaces are a new way to make a community, with new features coming.": "Los espacios son una nueva manera de formar una comunidad, con nuevas funcionalidades próximamente.",
+    "Communities can now be made into Spaces": "Ahora puedes convertir comunidades en espacios",
+    "This description will be shown to people when they view your space": "Esta descripción aparecerá cuando alguien vea tu espacio",
+    "All rooms will be added and all community members will be invited.": "Todas las salas se añadirán, e invitaremos a todos los miembros de la comunidad.",
+    "A link to the Space will be put in your community description.": "Pondremos un enlace al espacio en la descripción de tu comunidad.",
+    "Create Space from community": "Crear espacio a partir de una comunidad",
+    "Failed to migrate community": "Fallo al migrar la comunidad",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> ha sido creado, y cualquier persona que formara parte ha sido invitada.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Tus mensajes privados están cifrados normalmente, pero esta sala no lo está. A menudo, esto pasa porque has iniciado sesión con un dispositivo o método no compatible, como las invitaciones por correo.",
+    "Enable encryption in settings.": "Activa el cifrado en los ajustes.",
+    "Are you sure you want to make this encrypted room public?": "¿Seguro que quieres activar el cifrado en esta sala pública?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Para evitar estos problemas, crea una <a>nueva sala cifrada</a> para la conversación que quieras tener.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>No recomendamos activar el cifrado para salas públicas.</b>Cualquiera puede encontrar y unirse a una sala pública, por lo también puede leer los mensajes. No aprovecharás ningún beneficio del cifrado, y no podrás desactivarlo en el futuro. Cifrar mensajes en una sala pública hará que tarden más en enviarse y recibirse.",
+    "If a community isn't shown you may not have permission to convert it.": "Si echas en falta alguna comunidad, es posible que no tengas permisos suficientes para convertirla.",
+    "Are you sure you want to add encryption to this public room?": "¿Seguro que quieres activar el cifrado en esta sala pública?",
+    "Low bandwidth mode (requires compatible homeserver)": "Modo de bajo consumo de datos (el servidor base debe ser compatible)",
+    "Multiple integration managers (requires manual setup)": "Varios gestores de integración (hay que configurarlos manualmente)",
+    "Threaded messaging": "Mensajes en hilos",
+    "Show threads": "Ver hilos",
+    "Thread": "Hilo",
+    "The above, but in any room you are joined or invited to as well": "Lo de arriba, pero en cualquier sala en la que estés o te inviten",
+    "The above, but in <Room /> as well": "Lo de arriba, pero también en <Room />",
+    "Autoplay videos": "Reproducir automáticamente los vídeos",
+    "Autoplay GIFs": "Reproducir automáticamente los GIFs",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s ha anclado un mensaje en esta sala. Mira todos los mensajes anclados.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s ha anclado <a>un mensaje</a> en esta sala. Mira todos los <b>mensajes anclados</b>.",
+    "Some encryption parameters have been changed.": "Algunos parámetros del cifrado han cambiado.",
+    "Role in <RoomName/>": "Rol en <RoomName/>",
+    "Currently, %(count)s spaces have access|one": "Ahora mismo, un espacio tiene acceso",
+    "& %(count)s more|one": "y %(count)s más",
+    "Select the roles required to change various parts of the space": "Selecciona los roles necesarios para cambiar varios ajustes del espacio",
+    "Failed to update the join rules": "Fallo al actualizar las reglas para unirse",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Cualquiera en <spaceName/> puede encontrar y unirse. También puedes seleccionar otros espacios.",
+    "Explore %(spaceName)s": "Explorar %(spaceName)s",
+    "Send a sticker": "Enviar una pegatina",
+    "Reply to encrypted thread…": "Responder al tema cifrado…",
+    "Reply to thread…": "Responder al tema…",
+    "Add emoji": "Añadir emojis",
+    "Unknown failure": "Fallo desconocido",
+    "Change space avatar": "Cambiar la imagen del espacio",
+    "Change space name": "Cambiar el nombre del espacio",
+    "Change main address for the space": "Cambiar dirección principal del espacio",
+    "Change description": "Cambiar descripción",
+    "Private community": "Comunidad privada",
+    "Public community": "Comunidad pública",
+    "Message": "Mensaje",
+    "Joining space …": "Uniéndote al espacio…",
+    "Message didn't send. Click for info.": "Mensaje no enviado. Haz clic para más info.",
+    "Upgrade anyway": "Actualizar de todos modos",
+    "Before you upgrade": "Antes de actualizar",
+    "To join a space you'll need an invite.": "Para unirte a un espacio, necesitas que te inviten a él.",
+    "You can also make Spaces from <a>communities</a>.": "También puedes crear espacios a partir de <a>comunidades</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Ver temporalmente comunidades en vez de espacios durante esta sesión. Esta opción desaparecerá en el futuro. Element se recargará.",
+    "Display Communities instead of Spaces": "Ver comunidades en vez de espacios"
 }
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 5e8d744cca..cb158ad4cf 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -18,8 +18,6 @@
     "Unable to load! Check your network connectivity and try again.": "Laadimine ei õnnestunud! Kontrolli oma võrguühendust ja proovi uuesti.",
     "Dismiss": "Loobu",
     "Call Failed": "Kõne ebaõnnestus",
-    "Call Timeout": "Kõne aegumine",
-    "The remote side failed to pick up": "Teine osapool ei võtnud kõnet vastu",
     "Call failed due to misconfigured server": "Kõne ebaõnnestus valesti seadistatud serveri tõttu",
     "Cancel": "Loobu",
     "Send": "Saada",
@@ -68,7 +66,6 @@
     "Send an encrypted message…": "Saada krüptitud sõnum…",
     "Send a message…": "Saada sõnum…",
     "The conversation continues here.": "Vestlus jätkub siin.",
-    "Recent rooms": "Hiljutised jututoad",
     "No rooms to show": "Ei saa kuvada ühtegi jututuba",
     "Direct Messages": "Isiklikud sõnumid",
     "Start chat": "Alusta vestlust",
@@ -104,19 +101,13 @@
     "collapse": "ahenda",
     "expand": "laienda",
     "Communities": "Kogukonnad",
-    "You cannot delete this image. (%(code)s)": "Sa ei saa seda pilti eemaldada, (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Üles laaditud %(date)s %(user)s poolt",
     "Rotate Left": "Pööra vasakule",
-    "Rotate counter-clockwise": "Pööra vastupäeva",
     "Rotate Right": "Pööra paremale",
-    "Rotate clockwise": "Pööra päripäeva",
     "All rooms": "Kõik jututoad",
     "Enter the name of a new server you want to explore.": "Sisesta uue serveri nimi mida tahad uurida.",
     "Matrix rooms": "Matrix'i jututoad",
     "Explore Room State": "Uuri jututoa olekut",
     "Explore Account Data": "Uuri konto andmeid",
-    "Private Chat": "Omavaheline privaatne vestlus",
-    "Public Chat": "Avalik vestlus",
     "Other users can invite you to rooms using your contact details": "Teades sinu kontaktinfot võivad teised kutsuda sind osalema jututubades",
     "Add rooms to the community summary": "Lisa jututoad kogukonna ülevaatesse",
     "Which rooms would you like to add to this summary?": "Milliseid jututubasid sooviksid lisada sellesse ülevaatesse?",
@@ -124,9 +115,7 @@
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Neid jututubasid kuvatakse kogukonna liikmetele kogukonna lehel. Liikmed saavad nimetatud jututubadega liituda neil klõpsides.",
     "Featured Rooms:": "Esiletõstetud jututoad:",
     "Explore Public Rooms": "Sirvi avalikke jututubasid",
-    "Explore": "Uuri",
-    "Filter rooms…": "Filtreeri jututubasid…",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Liites kokku kasutajaid ja jututubasid loo oma kogukond! Loo kogukonna koduleht, et märkida oma koht Matrix'i universumis.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Liites kokku kasutajaid ja jututubasid loo oma kogukond! Kogukonna kodulehega tähistad oma koha Matrix'i universumis.",
     "Explore rooms": "Uuri jututubasid",
     "If you've joined lots of rooms, this might take a while": "Kui oled liitunud paljude jututubadega, siis see võib natuke aega võtta",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Kui see seadistus pole kasutusel, siis krüptitud jututubade sõnumeid otsing ei vaata.",
@@ -134,15 +123,12 @@
     "Remove": "Eemalda",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Sa peaksid enne ühenduse katkestamisst <b>eemaldama isiklikud andmed</b> id-serverist <idserver />. Kahjuks id-server <idserver /> ei ole hetkel võrgus või pole kättesaadav.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Me soovitame, et eemaldad enne ühenduse katkestamist oma e-posti aadressi ja telefoninumbrid isikutuvastusserverist.",
-    "Remove messages": "Kustuta sõnumeid",
     "Unable to remove contact information": "Kontaktiinfo eemaldamine ebaõnnestus",
     "Remove %(email)s?": "Eemalda %(email)s?",
     "Remove %(phone)s?": "Eemalda %(phone)s?",
     "Remove recent messages by %(user)s": "Eemalda %(user)s hiljutised sõnumid",
     "Replying With Files": "Vasta faili(de)ga",
     "Invite new community members": "Kutsu uusi liikmeid kogukonda",
-    "rooms.": "jututubadest.",
-    "Notify for all other messages/rooms": "Teavita kõikidest teistest sõnumitest/jututubadest",
     "Members only (since the point in time of selecting this option)": "Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)",
     "Members only (since they were invited)": "Ainult liikmetele (alates nende kutsumise ajast)",
     "Members only (since they joined)": "Ainult liikmetele (alates liitumisest)",
@@ -153,7 +139,6 @@
     "Remove recent messages": "Eemalda hiljutised sõnumid",
     "Filter room members": "Filtreeri jututoa liikmeid",
     "Members": "Liikmed",
-    "Files": "Failid",
     "Remove from community": "Eemalda kogukonnast",
     "Remove this user from community?": "Kas eemaldan selle kasutaja kogukonnast?",
     "Failed to remove user from community": "Kasutaja eemaldamine kogukonnast ebaõnnestus",
@@ -165,8 +150,6 @@
     "Failed to remove '%(roomName)s' from %(groupId)s": "Jututoa %(roomName)s eemaldamine %(groupId)s kogukonnast ebaõnnestus",
     "Only visible to community members": "Nähtav ainult kogukonna liikmetele",
     "Filter community rooms": "Filtreeri kogukonna jututubasid",
-    "Failed to remove widget": "Vidina eemaldamine ebaõnnestus",
-    "An error ocurred whilst trying to remove the widget from the room": "Vidina eemaldamisel jututoast tekkis viga",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Kas sa oled kindel et soovid eemadlada <b>%(serverName)s</b>",
     "Remove server": "Eemalda server",
     "%(networkName)s rooms": "%(networkName)s jututoad",
@@ -179,27 +162,13 @@
     "Upload %(count)s other files|other": "Laadi üles %(count)s muud faili",
     "Unable to reject invite": "Ei õnnestu kutset tagasi lükata",
     "Resend": "Saada uuesti",
-    "Resend edit": "Saada muudetud sõnum uuesti",
     "Resend %(unsentCount)s reaction(s)": "Saada uuesti %(unsentCount)s reaktsioon(i)",
-    "Resend removal": "Saada eemaldamine uuesti",
-    "Cancel Sending": "Tühista saatmine",
-    "Forward Message": "Edasta sõnum",
-    "Pin Message": "Klammerda sõnum",
-    "View Decrypted Source": "Vaata dekrüptitud lähtekoodi",
-    "Unhide Preview": "Näita eelvaadet",
-    "Share Permalink": "Jaga püsiviidet",
-    "Share Message": "Jaga sõnumit",
     "Source URL": "Lähteaadress",
-    "Collapse Reply Thread": "Ahenda vastuste jutulõnga",
     "Notification settings": "Teavituste seadistused",
-    "All messages (noisy)": "Kõik sõnumid (lärmakas)",
     "All messages": "Kõik sõnumid",
-    "Mentions only": "Ainult mainimised",
     "Leave": "Lahku",
-    "Forget": "Unusta",
     "Favourite": "Lemmik",
     "Low Priority": "Vähetähtis",
-    "Direct Chat": "Otsevestlus",
     "Clear status": "Eemalda olek",
     "Update status": "Uuenda olek",
     "Set status": "Määra olek",
@@ -208,14 +177,9 @@
     "Hide": "Peida",
     "Home": "Avaleht",
     "Sign in": "Logi sisse",
-    "Help": "Abiteave",
-    "Reload": "Lae uuesti",
-    "Take picture": "Tee foto",
     "Remove for everyone": "Eemalda kõigilt",
-    "Remove for me": "Eemalda minult",
     "User Status": "Kasutaja olek",
     "You must join the room to see its files": "Failide nägemiseks pead jututoaga liituma",
-    "There are no visible files in this room": "Jututoas pole nähtavaid faile",
     "Failed to remove the room from the summary of %(groupId)s": "Jututoa eemaldamine %(groupId)s kogukonna ülevaatelehelt ebaõnnestus",
     "Failed to remove a user from the summary of %(groupId)s": "Kasutaja eemaldamine %(groupId)s kogukonna ülevaatelehelt ebaõnnestus",
     "Create a Group Chat": "Loo rühmavestlus",
@@ -249,7 +213,6 @@
     "Send a bug report with logs": "Saada veakirjeldus koos logikirjetega",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Rühmita ja filtreeri jututubasid kohandatud siltide alusel (muudatuste rakendamiseks värskenda vaade)",
     "Try out new ways to ignore people (experimental)": "Proovi uusi kasutajate eiramise viise (katseline)",
-    "Uploading report": "Laen üles veakirjeldust",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Kui soovid teatada Matrix'iga seotud turvaveast, siis palun tutvu enne Matrix.org <a>Turvalisuse avalikustamise juhendiga</a>.",
     "Server or user ID to ignore": "Serverid või kasutajate tunnused, mida soovid eirata",
     "Ignore": "Eira",
@@ -261,25 +224,19 @@
     "Reject & Ignore user": "Hülga ja eira kasutaja",
     "%(count)s unread messages including mentions.|one": "1 lugemata mainimine.",
     "Filter results": "Filtreeri tulemusi",
-    "Report bugs & give feedback": "Teata vigadest ja anna tagasisidet",
     "Report Content to Your Homeserver Administrator": "Teata sisust Sinu koduserveri haldurile",
     "Send report": "Saada veateade",
-    "(HTTP status %(httpStatus)s)": "(HTTP staatuse kood %(httpStatus)s)",
-    "Please set a password!": "Palun määra salasõna!",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "See võimaldab sul tagasi tulla oma kasutajakonto juurde ka peale väljalogimist ning logida sisse muudesse sessioonidesse.",
     "Share Room": "Jaga jututuba",
     "Link to most recent message": "Viide kõige viimasele sõnumile",
     "Share User": "Jaga viidet kasutaja kohta",
     "Share Community": "Jaga viidet kogukonna kohta",
     "Share Room Message": "Jaga jututoa sõnumit",
     "Link to selected message": "Viide valitud sõnumile",
-    "COPY": "KOPEERI",
     "Command Help": "Abiteave käskude kohta",
     "To help us prevent this in future, please <a>send us logs</a>.": "Tagamaks et sama ei juhtuks tulevikus, palun <a>saada meile salvestatud logid</a>.",
     "Missing session data": "Sessiooni andmed on puudu",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Osa sessiooniandmetest, sealhulgas sõnumi krüptovõtmed, on puudu. Vea parandamiseks logi välja ja sisse, vajadusel taasta võtmed varundusest.",
     "Your browser likely removed this data when running low on disk space.": "On võimalik et sinu brauser kustutas need andmed, sest kõvakettaruumist jäi puudu.",
-    "Integration Manager": "Lõiminguhaldur",
     "Find others by phone or email": "Leia teisi kasutajaid telefoninumbri või e-posti aadressi alusel",
     "Be found by phone or email": "Ole leitav telefoninumbri või e-posti aadressi alusel",
     "Terms of Service": "Kasutustingimused",
@@ -290,7 +247,6 @@
     "Next": "Järgmine",
     "Report Content": "Teata sisust haldurile",
     "powered by Matrix": "põhineb Matrix'il",
-    "Custom Server Options": "Serveri kohaldatud seadistused",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Robotilõksu avalik võti on puudu koduserveri seadistustes. Palun teata sellest oma koduserveri haldurile.",
     "Filter": "Filtreeri",
     "Clear filter": "Eemalda filter",
@@ -308,13 +264,10 @@
     "Encryption": "Krüptimine",
     "Once enabled, encryption cannot be disabled.": "Kui krüptimine on juba kasutusele võetud, siis ei saa seda enam eemaldada.",
     "Encrypted": "Krüptitud",
-    "Who can access this room?": "Kes pääsevad ligi siia jututuppa?",
     "Who can read history?": "Kes võivad lugeda ajalugu?",
     "Encrypted by an unverified session": "Krüptitud verifitseerimata sessiooni poolt",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Sõnumid selles jututoas on läbivalt krüptitud. Uuri lisaks ja verifitseeri see kasutaja tema kasutajaprofiilis.",
     "Encryption not enabled": "Krüptimine ei ole kasutusel",
     "The encryption used by this room isn't supported.": "Selles jututoas kasutatud krüptimine ei ole toetatud.",
-    "Error decrypting audio": "Viga helivoo dekrüptimisel",
     "React": "Reageeri",
     "Reply": "Vasta",
     "Edit": "Muuda",
@@ -343,7 +296,6 @@
     "Error decrypting video": "Viga videovoo dekrüptimisel",
     "Show all": "Näita kõiki",
     "Reactions": "Reageerimised",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reageeris: %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reageeris(id) %(shortName)s</reactedWith>",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutis %(roomName)s jututoa avatari",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eemaldas jututoa avatari.",
@@ -362,8 +314,6 @@
     "Visibility in Room List": "Nähtavus jututubade loendis",
     "Visible to everyone": "Nähtav kõigile",
     "Something went wrong when trying to get your communities.": "Sinu kogukondade laadimisel läks midagi nüüd viltu.",
-    "You are not receiving desktop notifications": "Sa hetkel ei saa oma arvuti töölauakeskkonna teavitusi",
-    "Enable them now": "Võta need nüüd kasutusele",
     "What's New": "Meie uudised",
     "Update": "Uuenda",
     "What's new?": "Mida on meil uut?",
@@ -378,7 +328,6 @@
     "That doesn't look like a valid email address": "See ei tundu olema e-posti aadressi moodi",
     "You have entered an invalid address.": "Sa oled sisestanud vigase e-posti aadressi.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Proovi mõnda nendest sobilikest aadressitüüpidest: %(validTypesList)s.",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Blokeeri teiste matrixi koduserverite kasutajate liitumine selle jututoaga (seda ei saa hiljem enam muuta!)",
     "Create Room": "Loo jututuba",
     "Sign out": "Logi välja",
     "Incompatible Database": "Mitteühilduv andmebaas",
@@ -408,7 +357,6 @@
     "Forget room": "Unusta jututuba",
     "Search": "Otsing",
     "Share room": "Jaga jututuba",
-    "Community Invites": "Kutsed kogukonda",
     "Invites": "Kutsed",
     "Favourites": "Lemmikud",
     "Low priority": "Vähetähtis",
@@ -429,8 +377,6 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Otsi jututuba… (näiteks %(exampleRoom)s)",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida.",
     "Options": "Valikud",
-    "Searches DuckDuckGo for results": "Otsi DuckDuckGo abil",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Turvaliselt puhverda krüptitud sõnumeid kohalikus arvutis selleks, et nad oleks otsitavad kasutades ",
     "this room": "see jututuba",
     "Quote": "Tsiteeri",
     "This Room": "See jututuba",
@@ -445,8 +391,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
     "Encryption upgrade available": "Krüptimise uuendus on saadaval",
-    "Set up encryption": "Seadista krüptimine",
-    "Review where you’re logged in": "Vaata üle, kust sa oled Matrix'i võrku loginud",
     "New login. Was this you?": "Uus sisselogimine. Kas see olid sina?",
     "Who would you like to add to this community?": "Kas sa sooviksid seda lisada kogukonda?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Hoiatus: kõik kogukonda lisatud kasutajad on nähtavad kõigile, kes teavad kogukonna tunnust",
@@ -494,20 +438,14 @@
     "Create a private room": "Loo omavaheline jututuba",
     "Name": "Nimi",
     "Topic (optional)": "Teema (valikuline)",
-    "Make this room public": "Tee see jututuba avalikuks",
     "Hide advanced": "Peida lisaseadistused",
     "Show advanced": "Näita lisaseadistusi",
     "Server did not require any authentication": "Server ei nõudnud mitte mingisugust autentimist",
     "Recent Conversations": "Hiljutised vestlused",
     "Suggestions": "Soovitused",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Alusta vestlust kasutades teise osapoole nime, kasutajanime (näiteks <userId/>) või e-posti aadressi.",
     "Go": "Mine",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Sinu sõnumit ei saadetud, kuna see koduserver on saavutanud igakuise aktiivsete kasutajate piiri. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
     "Add room": "Lisa jututuba",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsus vestlema kasutajat %(targetName)s.",
-    "%(targetName)s joined the room.": "%(targetName)s liitus jututoaga.",
-    "%(senderName)s answered the call.": "%(senderName)s vastas kõnele.",
-    "%(senderName)s ended the call.": "%(senderName)s lõpetas kõne.",
     "%(senderName)s placed a voice call.": "%(senderName)s alustas häälkõnet.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s alustas häälkõnet. (sellel brauseril puudub niisuguste kõnede tugi)",
     "%(senderName)s placed a video call.": "%(senderName)s alustas videokõnet.",
@@ -528,10 +466,6 @@
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutis selle jututoa põhiaadressi ja täiendavat aadressi.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s muutis selle jututoa aadresse.",
     "Someone": "Keegi",
-    "(not supported by this browser)": "(ei ole toetatud selles brauseris)",
-    "(could not connect media)": "(ühendus teise osapoolega ei õnnestunud)",
-    "(no answer)": "(ei ole vastust)",
-    "(unknown failure: %(reason)s)": "(teadmata viga: %(reason)s)",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s võttis %(targetDisplayName)s'lt tagasi jututoaga liitumise kutse.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s saatis %(targetDisplayName)s'le kutse jututoaga liitumiseks.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende kutsumise hetkest.",
@@ -546,15 +480,10 @@
     "This room is end-to-end encrypted": "See jututuba on läbivalt krüptitud",
     "Everyone in this room is verified": "Kõik kasutajad siin nututoas on verifitseeritud",
     "Edit message": "Muuda sõnumit",
-    "%(senderName)s sent an image": "%(senderName)s saatis pildi",
-    "%(senderName)s sent a video": "%(senderName)s saatis video",
-    "%(senderName)s uploaded a file": "%(senderName)s laadis üles faili",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Sinu krüptovõtme jagamise päring on saadetud - palun oma teisi sessioone krüptovõtme jagamise päringu osas.",
     "This message cannot be decrypted": "Seda sõnumit ei sa dekrüptida",
     "Unencrypted": "Krüptimata",
     "Encrypted by a deleted session": "Krüptitud kustutatud sessiooni poolt",
-    "Please select the destination room for this message": "Palun vali jututuba, kuhu soovid seda sõnumit saata",
-    "Invite only": "Ainult kutse",
     "Scroll to most recent messages": "Mine viimaste sõnumite juurde",
     "Close preview": "Sulge eelvaade",
     "Disinvite": "Eemalda kutse",
@@ -567,28 +496,18 @@
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Kui sõnumeid on väga palju, siis võib nüüd aega kuluda. Oodates palun ära tee ühtegi päringut ega andmevärskendust.",
     "Failed to mute user": "Kasutaja summutamine ebaõnnestus",
     "%(creator)s created and configured the room.": "%(creator)s lõi ja seadistas jututoa.",
-    "Click to unmute video": "Klõpsi video heli taastamiseks",
-    "Click to mute video": "Klõpsi video heli summutamiseks",
-    "Click to unmute audio": "Klõpsi heli taastamiseks",
-    "Click to mute audio": "Klõpsi heli summutamiseks",
-    "Your profile": "Sinu profiil",
     "How fast should messages be downloaded.": "Kui kiiresti peaksime sõnumeid alla laadima.",
     "Error downloading theme information.": "Viga teema teabefaili allalaadimisel.",
     "Close": "Sulge",
-    "Add a widget": "Lisa vidin",
-    "Drop File Here": "Lohista fail siia",
     "Drop file here to upload": "Faili üleslaadimiseks lohista ta siia",
-    " (unsupported)": " (ei ole toetatud)",
     "This user has not verified all of their sessions.": "See kasutaja ei ole verifitseerinud kõiki nende sessioone.",
     "You have not verified this user.": "Sa ei ole seda kasutajat verifitseerinud.",
     "You have verified this user. This user has verified all of their sessions.": "Sa oled selle kasutaja verifitseerinud. See kasutaja on verifitseerinud kõik nende sessioonid.",
     "Someone is using an unknown session": "Keegi kasutab tundmatut sessiooni",
     "This event could not be displayed": "Seda sündmust ei õnnestunud kuvada",
     "Downloading update...": "Laadin alla uuendust...",
-    "Download this file": "Laadi see fail alla",
     "You can now close this window or <a>log in</a> to your new account.": "Sa võid nüüd sulgeda selle akna või <a>logida sisse</a> oma uuele kontole.",
     "Download": "Laadi alla",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Sinu taastevõti on sinu <b>Allalaadimised</b> kasutas.",
     "Disable": "Lülita välja",
     "Not currently indexing messages for any room.": "Mitte ainsamagi jututoa sõnumeid hetkel ei indekseerita.",
     "Currently indexing: %(currentRoom)s": "Parasjagu indekseerin: %(currentRoom)s",
@@ -608,10 +527,6 @@
     "Email Address": "E-posti aadress",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Saatsime tekstisõnumi numbrile +%(msisdn)s. Palun sisesta seal kuvatud kontrollkood.",
     "Phone Number": "Telefoninumber",
-    "Cannot add any more widgets": "Rohkem vidinaid ei õnnestu lisada",
-    "The maximum permitted number of widgets have already been added to this room.": "Suurim lubatud vidinate arv on siia jututuppa juba lisatud.",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liitu kas <voiceText>häälkõnega</voiceText> või <videoText>videokõnega</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Toimuv rühmavestlus %(supportedText)s.",
     "Advanced": "Teave arendajatele",
     "Gets or sets the room topic": "Otsib või määrab jututoa teema",
     "Sets the room name": "Määrab jututoa nime",
@@ -676,12 +591,6 @@
     "%(brand)s URL": "%(brand)s'i aadress",
     "Room ID": "Jututoa tunnus",
     "Widget ID": "Vidina tunnus",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s muutis oma kuvatava nime %(displayName)s-ks.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s määras oma kuvatava nime %(displayName)s-ks.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eemaldas oma kuvatava nime (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s eemaldas om profiilipildi.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s muutis oma profiilipilti.",
-    "%(senderName)s set a profile picture.": "%(senderName)s määras oma profiilipildi.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Your browser does not support the required cryptography extensions": "Sinu brauser ei toeta vajalikke krüptoteeke",
     "Not a valid %(brand)s keyfile": "See ei ole sobilik võtmefail %(brand)s'i jaoks",
@@ -726,29 +635,22 @@
     "Add theme": "Lisa teema",
     "Theme": "Teema",
     "Start verification again from their profile.": "Alusta verifitseerimist uuesti nende profiilist.",
-    "Set Password": "Määra salasõna",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Allpool loetletud Matrix'i kasutajatunnustele ei leidunud profiile. Kas sa ikkagi tahaksid neile kutse saata?",
     "To continue, please enter your password:": "Jätkamiseks palun sisesta oma salasõna:",
-    "Your password": "Sinu salasõna",
-    "We recommend you change your password and recovery key in Settings immediately": "Me soovitame et vaheta koheselt Seadistuste lehelt oma salasõna ja taastevõti",
     "Could not load user profile": "Kasutajaprofiili laadimine ei õnnestunud",
-    "Set a display name:": "Määra kuvatav nimi:",
     "Send typing notifications": "Anna märku teisele osapoolele, kui mina sõnumit kirjutan",
     "Show typing notifications": "Anna märku, kui teine osapool sõnumit kirjutab",
     "Automatically replace plain text Emoji": "Automaatelt asenda vormindamata tekst emotikoniga",
     "Mirror local video feed": "Peegelda kohalikku videovoogu",
     "Enable Community Filter Panel": "Kasuta kogukondade filtreerimispaneeli",
-    "Allow Peer-to-Peer for 1:1 calls": "Luba võrdõigusvõrgu loogikat kasutavad omavahelised kõned",
     "Send analytics data": "Saada arendajatele analüütikat",
     "Enable inline URL previews by default": "Luba URL'ide vaikimisi eelvaated",
     "Enable URL previews for this room (only affects you)": "Luba URL'ide eelvaated selle jututoa jaoks (mõjutab vaid sind)",
     "Enable URL previews by default for participants in this room": "Luba URL'ide vaikimisi eelvaated selles jututoas osalejate jaoks",
-    "Room Colour": "Jututoa värv",
     "Enable widget screenshots on supported widgets": "Kui vidin seda toetab, siis luba tal teha ekraanitõmmiseid",
     "Prompt before sending invites to potentially invalid matrix IDs": "Hoiata enne kutse saatmist võimalikule vigasele Matrix'i kasutajatunnusele",
     "Show developer tools": "Näita arendaja tööriistu",
     "Show hidden events in timeline": "Näita peidetud sündmusi ajajoonel",
-    "Low bandwidth mode": "Vähese ribalaiusega režiim",
     "Composer": "Sõnumite kirjutamine",
     "Jump to start/end of the composer": "Hüppa sõnumite kirjutamise algusesse või lõppu",
     "Navigate composer history": "Vaata sõnumite kirjutamise ajalugu",
@@ -764,8 +666,6 @@
     "When I'm invited to a room": "Kui mind kutsutakse jututuppa",
     "Call invitation": "Kõnekutse",
     "Messages sent by bot": "Robotite saadetud sõnumid",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
-    "I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata",
     "URL Previews": "URL'ide eelvaated",
     "You have <a>enabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>võtnud kasutusele</a>.",
     "You have <a>disabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>lülitanud välja</a>.",
@@ -777,15 +677,9 @@
     "Show avatar changes": "Näita avataride muutusi",
     "Show read receipts sent by other users": "Näita teiste kasutajate lugemisteatiseid",
     "Always show message timestamps": "Alati näita sõnumite ajatempleid",
-    "Autoplay GIFs and videos": "Esita GIF-animatsioonid ja videod automaatselt",
-    "Always show encryption icons": "Alati näita krüptimise oleku ikoone",
     "Show avatars in user and room mentions": "Näita avatare kasutajate ja jututubade mainimistes",
     "Manually verify all remote sessions": "Verifitseeri käsitsi kõik välised sessioonid",
     "Collecting app version information": "Kogun teavet rakenduse versiooni kohta",
-    "unknown caller": "tundmatu helistaja",
-    "Incoming voice call from %(name)s": "Saabuv häälkõne kasutajalt %(name)s",
-    "Incoming video call from %(name)s": "Saabuv videokõne kasutajalt %(name)s",
-    "Incoming call from %(name)s": "Saabuv kõne kasutajalt %(name)s",
     "Decline": "Keeldu",
     "Accept": "Võta vastu",
     "The other party cancelled the verification.": "Teine osapool tühistas verifitseerimise.",
@@ -871,16 +765,12 @@
     "Headphones": "Kõrvaklapid",
     "Folder": "Kaust",
     "Pin": "Nööpnõel",
-    "Verify all your sessions to ensure your account & messages are safe": "Selleks et sinu konto ja sõnumid oleks turvatud, verifitseeri kõik oma sessioonid",
     "Later": "Hiljem",
     "Review": "Vaata üle",
-    "Verify yourself & others to keep your chats safe": "Selleks et sinu vestlused oleks turvatud, verifitseeri end ja teisi",
     "Other users may not trust it": "Teised kasutajad ei pruugi seda usaldada",
     "Set up": "Võta kasutusele",
     "Upgrade": "Uuenda",
     "Verify": "Verifitseeri",
-    "Verify the new login accessing your account: %(name)s": "Verifitseeri uus kasutajasessioon, mis pruugib sinu kontot: %(name)s",
-    "From %(deviceName)s (%(deviceId)s)": "Seadmest %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Lükka tagasi (%(counter)s)",
     "Accept <policyLink /> to continue:": "Jätkamiseks nõustu <policyLink />'ga:",
     "Show less": "Näita vähem",
@@ -894,14 +784,11 @@
     "Forgotten your password?": "Kas sa unustasid oma salasõna?",
     "Sign in and regain access to your account.": "Logi sisse ja pääse tagasi oma kasutajakonto juurde.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Sa ei saa oma kasutajakontole sisse logida. Lisateabe saamiseks palun võta ühendust oma koduserveri halduriga.",
-    "Your recovery key": "Sinu taastevõti",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Sinu taastevõti on <b>kopeeritud lõikelauale</b>, aseta ta:",
     "<b>Print it</b> and store it somewhere safe": "<b>Trüki ta välja</b> ja hoia turvalises kohas",
     "<b>Save it</b> on a USB key or backup drive": "<b>Salvesta ta</b> mälupulgale või varunduskettale",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopeeri ta</b> isiklikku andmehoidlasse mis asub pilves",
     "Retry": "Proovi uuesti",
     "Upgrade your encryption": "Uuenda oma krüptimist",
-    "Make a copy of your recovery key": "Tee oma taastevõtmest koopia",
     "Go to Settings": "Ava seadistused",
     "Set up Secure Messages": "Võta kasutusele krüptitud sõnumid",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
@@ -912,8 +799,6 @@
     "Toggle the top left menu": "Lülita ülemine vasak menüü sisse/välja",
     "Activate selected button": "Aktiveeri valitud nupp",
     "Toggle right panel": "Lülita parem paan sisse/välja",
-    "%(count)s of your messages have not been sent.|other": "Mõned sinu sõnumid on saatmata.",
-    "%(count)s of your messages have not been sent.|one": "Sinu sõnum on saatmata.",
     "You seem to be in a call, are you sure you want to quit?": "Tundub, et sul parasjagu on kõne pooleli. Kas sa kindlasti soovid väljuda?",
     "Room": "Jututuba",
     "Failed to reject invite": "Kutse tagasilükkamine ei õnnestunud",
@@ -930,24 +815,18 @@
     "A new password must be entered.": "Palun sisesta uus salasõna.",
     "New passwords must match each other.": "Uued salasõnad peavad omavahel klappima.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu vestluste ajalugu loetamatuks. Palun kindlasti kas sea üles võtmete varundamine või ekspordi mõnest muust sessioonist jututubade võtmed enne senise salasõna tühistamist.",
-    "Your Matrix account on %(serverName)s": "Sinu Matrix'i konto serveris %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Sinu Matrix'i kasutajakonto serveris <underlinedServerName />",
     "This homeserver does not support login using email address.": "See koduserver ei võimalda e-posti aadressi kasutamist sisselogimisel.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Jätkamaks selle teenuse kasutamist palun <a>võta ühendust oma teenuse haldajaga</a>.",
     "This account has been deactivated.": "See kasutajakonto on deaktiveeritud.",
     "Incorrect username and/or password.": "Vigane kasutajanimi ja/või salasõna.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Sa kasutad sisselogimiseks serverit %(hs)s, mitte aga matrix.org'i.",
     "Failed to perform homeserver discovery": "Koduserveri leidmine ebaõnnestus",
-    "The phone number entered looks invalid": "Sisestatud telefoninumber tundub vigane",
     "This homeserver doesn't offer any login flows which are supported by this client.": "See koduserver ei paku ühtegi sisselogimislahendust, mida see klient toetab.",
-    "Error: Problem communicating with the given homeserver.": "Viga: Suhtlusel koduserveriga tekkis probleem.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kui aadressiribal on HTTPS-aadress, siis HTTP-protokolli kasutades ei saa ühendust koduserveriga. Palun pruugi HTTPS-protokolli või <a>luba brauseris ebaturvaliste skriptide kasutamine</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ei sa ühendust koduserveriga. Palun kontrolli, et sinu <a>koduserveri SSL sertifikaat</a> oleks usaldusväärne ning mõni brauseri lisamoodul ei blokeeri päringuid.",
     "Syncing...": "Sünkroniseerin...",
     "Signing In...": "Login sisse...",
     "Create account": "Loo kasutajakonto",
-    "Failed to fetch avatar URL": "Ei õnnestunud laadida profiilipildi ehk avatari aadressi",
-    "Upload an avatar:": "Lae üles profiilipilt ehk avatar:",
     "Unable to query for supported registration methods.": "Ei õnnestunud pärida toetatud registreerimismeetodite loendit.",
     "Registration has been disabled on this homeserver.": "Väline registreerimine ei ole selles koduserveris kasutusel.",
     "This server does not support authentication with a phone number.": "See server ei toeta autentimist telefoninumbri alusel.",
@@ -955,15 +834,10 @@
     "Continue with previous account": "Jätka senise konto kasutamist",
     "<a>Log in</a> to your new account.": "<a>Logi sisse</a> oma uuele kasutajakontole.",
     "Registration Successful": "Registreerimine õnnestus",
-    "Create your account": "Loo endale konto",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni mõnest oma muust sessioonist. Sellega tagad ka ligipääsu krüptitud sõnumitele.",
-    "This requires the latest %(brand)s on your other devices:": "Selleks on sul vaja muudes seadmetes kõige uuemat %(brand)s'i versiooni:",
     "You're signed out": "Sa oled loginud välja",
     "Clear personal data": "Kustuta privaatsed andmed",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Hoiatus: Sinu privaatsed andmed (sealhulgas krüptimisvõtmed) on jätkuvalt salvestatud selles sessioonis. Eemalda nad, kui oled lõpetanud selle sessiooni kasutamise või soovid sisse logida muu kasutajakontoga.",
     "Commands": "Käsud",
-    "Results from DuckDuckGo": "Otsingutulemused DuckDuckGo saidist",
-    "DuckDuckGo Results": "DuckDuckGo otsingutulemused",
     "Emoji": "Emoji",
     "Notify the whole room": "Teavita kogu jututuba",
     "Users": "Kasutajad",
@@ -971,7 +845,6 @@
     "Logout": "Logi välja",
     "Your Communities": "Sinu kogukonnad",
     "Error whilst fetching joined communities": "Viga nende kogukondade laadimisel, millega sa oled liitunud",
-    "You have no visible notifications": "Sul ei ole nähtavaid teavitusi",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s'il ei õnnestunud koduserverist laadida toetatud protokollide loendit. Toetamaks kolmandate osapoolte võrke võib koduserver olla liiga vana.",
     "%(brand)s failed to get the public room list.": "%(brand)s'il ei õnnestunud laadida avalike jututubade loendit.",
     "The homeserver may be unavailable or overloaded.": "Koduserver pole kas saadaval või on ülekoormatud.",
@@ -981,7 +854,6 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Sa ei saa saata ühtego sõnumit enne, kui oled läbi lugenud ja nõustunud <consentLink>meie kasutustingimustega</consentLink>.",
     "Couldn't load page": "Lehe laadimine ei õnnestunud",
     "You must <a>register</a> to use this functionality": "Selle funktsionaalsuse kasutamiseks pead sa <a>registreeruma</a>",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Sinu kogukonna lehe HTML'i näidis - see on pealkiri</h1>\n<p>\n     Tutvustamaks uutele liikmetele kogukonda, kasuta seda pikka kirjeldust\n     või jaga olulist teavet <a href=\"foo\">viidetena</a>\n</p>\n<p>\n     Pildite lisaminseks võid sa isegi kasutada img-märgendit\n</p>\n",
     "Add to summary": "Lisa kokkuvõtte lehele",
     "Add a Room": "Lisa jututuba",
     "The room '%(roomName)s' could not be removed from the summary.": "Valitud %(roomName)s jututoa eemaldamine koondinfost ei õnnestunud.",
@@ -1026,8 +898,6 @@
     "Select the roles required to change various parts of the room": "Vali rollid, mis on vajalikud jututoa eri osade muutmiseks",
     "Enable encryption?": "Kas võtame krüptimise kasutusele?",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Kui kord juba kasutusele võetud, siis krüptimist enam hiljem ära lõpetada ei saa. Krüptitud sõnumeid ei saa lugeda ei vaheapealses veebiliikluses ega serveris ja vaid jututoa liikmed saavad neid lugeda. Krüptimise kasutusele võtmine võib takistada nii robotite kui sõnumisildade tööd. <a>Lisateave krüptimise kohta.</a>",
-    "Guests cannot join this room even if explicitly invited.": "Külalised ei saa selle jututoaga liituda ka siis, kui neid on otseselt kutsutud.",
-    "Click here to fix": "Parandamiseks klõpsi siia",
     "Server error": "Serveri viga",
     "Command error": "Käsu viga",
     "Server unavailable, overloaded, or something else went wrong.": "Server pole kas saadaval, on ülekoormatud või midagi muud läks viltu.",
@@ -1083,17 +953,10 @@
     "%(roomName)s is not accessible at this time.": "Jututuba %(roomName)s ei ole parasjagu kättesaadav.",
     "Try again later, or ask a room admin to check if you have access.": "Proovi hiljem uuesti või küsi jututoa haldurilt, kas sul on ligipääs olemas.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Astumisel jututuppa tekkis viga %(errcode)s. Kui sa arvad, et sellise põhjusega viga ei tohiks tekkida, siis palun <issueLink>koosta veateade</issueLink>.",
-    "Never lose encrypted messages": "Ära kunagi kaota krüptitud sõnumeid",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Sõnumid siin jututoas kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Vältimaks nende kaotamist, varunda turvaliselt oma võtmed. <a>Loe lisateavet.</a>",
-    "Not now": "Mitte praegu",
-    "Don't ask me again": "Ära küsi minult uuesti",
     "%(count)s unread messages including mentions.|other": "%(count)s lugemata sõnumit kaasa arvatud mainimised.",
     "%(count)s unread messages.|other": "%(count)s lugemata teadet.",
     "%(count)s unread messages.|one": "1 lugemata teade.",
-    "Unread mentions.": "Lugemata mainimised.",
     "Unread messages.": "Lugemata sõnumid.",
-    "Add a topic": "Lisa teema",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Selle jututoa versiooni uuendamine sulgeb tema praeguse instantsi ja loob sama nimega uuendatud jututoa.",
     "This room has already been upgraded.": "See jututuba on juba uuendatud.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Selle jututoa versioon on <roomVersion /> ning see koduserver on tema märkinud <i>ebastabiilseks</i>.",
@@ -1101,8 +964,6 @@
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Kirjutades <code>/help</code> saad vaadata käskude loendit. Või soovisid seda saata sõnumina?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vihje: kui soovid alustada sõnumit kaldkriipsuga, siis kirjuta <code>//</code>.",
     "Only people who have been invited": "Vaid kutsutud kasutajad",
-    "Anyone who knows the room's link, apart from guests": "Kõik, kes teavad jututoa viidet, välja arvatud külalised",
-    "Anyone who knows the room's link, including guests": "Kõik, kes teavad jututoa viidet, kaasa arvatud külalised",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Kui muudad seda, kes saavad selle jututoa ajalugu lugeda, siis kehtib see vaid tulevaste sõnumite kohta. Senise ajaloo nähtavus sellega ei muutu.",
     "Unable to revoke sharing for email address": "Ei õnnestu tagasi võtta otsust e-posti aadressi jagamise kohta",
     "Unable to share email address": "Ei õnnestu jagada e-posti aadressi",
@@ -1175,7 +1036,6 @@
     "Failed to find the following users": "Järgnevaid kasutajaid ei õnnestunud leida",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Järgmisi kasutajanimesid pole olemas või on vigaselt kirjas ning seega ei saa neile kutset saata: %(csvNames)s",
     "Recently Direct Messaged": "Viimased otsesõnumite saajad",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Kutsu kedagi tema nime, kasutajanime (nagu <userId/>), e-posti aadressi alusel või <a>jaga seda jututuba</a>.",
     "Upload completed": "Üleslaadimine valmis",
     "%(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 kasutab varasemaga võrreldes 3-5 korda vähem mälu, sest laadib teavet kasutajate kohta vaid siis, kui vaja. Palun oota hetke, kuni sünkroniseerime andmeid serveriga!",
     "Updating %(brand)s": "Uuendan rakendust %(brand)s",
@@ -1186,13 +1046,8 @@
     "Upload %(count)s other files|one": "Laadi üles %(count)s muu fail",
     "Cancel All": "Tühista kõik",
     "Upload Error": "Üleslaadimise viga",
-    "Verify other session": "Verifitseeri teine sessioon",
     "Verification Request": "Verifitseerimispäring",
-    "A widget would like to verify your identity": "Vidin soovib verifitseerida sinu isikut",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Vidin %(widgetUrl)s saidist soovib verifitseerida sinu isikut. Kui sa seda lubad, siis vidin verifitseerib vaid sinu kasutajatunnuse, kuid ei saa teha toiminguid sinuna.",
     "Remember my selection for this widget": "Jäta meelde minu valik selle vidina kohta",
-    "Allow": "Luba",
-    "Deny": "Keela",
     "Unable to restore backup": "Varukoopiast taastamine ei õnnestu",
     "No backup found!": "Varukoopiat ei leidunud!",
     "Keys restored": "Krüptimise võtmed on taastatud",
@@ -1208,65 +1063,32 @@
     "Room list": "Jututubade loend",
     "Timeline": "Ajajoon",
     "Autocomplete delay (ms)": "Viivitus automaatsel sõnalõpetusel (ms)",
-    "Server Name": "Serveri nimi",
     "Enter password": "Sisesta salasõna",
     "Nice, strong password!": "Vahva, see on korralik salasõna!",
     "Password is allowed, but unsafe": "Selline salasõna on küll lubatud, kuid üsna ebaturvaline",
     "Keep going...": "Jätka...",
-    "The email field must not be blank.": "E-posti aadressi väli ei tohi olla tühi.",
-    "The username field must not be blank.": "Kasutajanime väli ei tohi olla tühi.",
-    "The phone number field must not be blank.": "Telefoninumbri väli ei tohi olla tühi.",
-    "The password field must not be blank.": "Salasõna väli ei tohi olla tühi.",
     "Email": "E-posti aadress",
     "Username": "Kasutajanimi",
     "Phone": "Telefon",
-    "Not sure of your password? <a>Set a new one</a>": "Sa ei ole kindel oma salasõnas? <a>Tee uus salasõna</a>",
     "Sign in with": "Logi sisse oma kasutajaga",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ühtegi isikutuvastusserverit pole seadistatud ning sul ei ole võimalik lisada oma e-posti aadressi hilisemaks võimalikuks salasõna muutmiseks.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Kui sa ei sisesta oma e-posti aadressi, siis sa ei saa hiljem oma salasõnamuuta. Kas sa kindlasti soovid seda?",
     "Use an email address to recover your account": "Kasuta e-posti aadressi ligipääsu taastamiseks oma kontole",
     "Enter email address (required on this homeserver)": "Sisesta e-posti aadress (nõutav selles koduserveris)",
     "Doesn't look like a valid email address": "Ei tundu olema korralik e-posti aadress",
     "Passwords don't match": "Salasõnad ei klapi",
     "Enter phone number (required on this homeserver)": "Sisesta telefoninumber (nõutav selles koduserveris)",
-    "Doesn't look like a valid phone number": "Ei tundu olema korralik telefoninumber",
     "Use lowercase letters, numbers, dashes and underscores only": "Palun kasuta vaid väiketähti, numbreid, sidekriipsu ja alakriipsu",
     "Enter username": "Sisesta kasutajanimi",
     "Email (optional)": "E-posti aadress (kui soovid)",
     "Phone (optional)": "Telefoninumber (kui soovid)",
-    "Create your Matrix account on %(serverName)s": "Loo oma Matrixi konto %(serverName)s serveris",
-    "Create your Matrix account on <underlinedServerName />": "Loo oma Matrixi konto <underlinedServerName /> serveris",
     "Register": "Registreeru",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi või telefoninumbrit, et need inimesed, kes sind tunnevad, saaks sind leida.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi, et need inimesed, kes sind tunnevad, saaks sind leida.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Sisesta oma koduserveri aadress <a>Mida see tähendab?</a>",
-    "Homeserver URL": "Koduserveri aadress",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Sisesta kohandatud isikutuvastusserver aadress <a>Mida see tähendab?</a>",
-    "Identity Server URL": "Isikutuvastusserveri aadress",
-    "Other servers": "Muud serverid",
-    "Free": "Tasuta teenus",
     "Join millions for free on the largest public server": "Liitu tasuta nende miljonitega, kas kasutavad suurimat avalikku Matrix'i serverit",
-    "Premium": "Tasuline eriteenus",
-    "Premium hosting for organisations <a>Learn more</a>": "Tasuline Matrix'i majutusteenus organisatsioonidele <a>Loe lisateavet</a>",
-    "Find other public servers or use a custom server": "Otsi muid avalikke Matrix'i servereid või kasuta enda määratud serverit",
-    "Sign in to your Matrix account on %(serverName)s": "Logi sisse on Matrix'i kontole %(serverName)s serveris",
-    "Sign in to your Matrix account on <underlinedServerName />": "Logi sisse on Matrix'i kontole <underlinedServerName /> serveris",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Vabandust, aga %(brand)s <b>ei toimi</b> sinu brauseris.",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid ning mitmed neist kas pole veel olemas või on lahendatud sinu brauseris katselisena.",
-    "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!": "Sinu praeguse brauseriga meie rakenduse välimus ja toimivus võivad olla täitsa valed ning mõni funktsionaalsus ei pruugi toimida üldse. Kui soovid katsetada, siis loomulikult võid jätkata, kuid erinevate tekkivate vigadega pead ise hakkama saama!",
     "Fetching third party location failed": "Kolmanda osapoole asukoha tuvastamine ei õnnestunud",
     "Unable to look up room ID from server": "Jututoa tunnuse otsimine serverist ei õnnestunud",
     "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.": "Sinu sõnumit ei saadetud, kuna see koduserver on ületanud on ületanud ressursipiirangu. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Saada kõik uuesti</resendText> või <cancelText>tühista kõigi saatmine</cancelText>. Samuti võid sa valida saatmiseks või saatmise tühistamiseks üksikuid sõnumeid.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Saada sõnum uuesti</resendText> või <cancelText>tühista sõnumi saatmine</cancelText>.",
     "Connectivity to the server has been lost.": "Ühendus sinu serveriga on katkenud.",
     "Sent messages will be stored until your connection has returned.": "Saadetud sõnumid salvestatakse seniks, kuni võrguühendus on taastunud.",
-    "Active call": "Käsilolev kõne",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Siin ei leidu kedagi teist! Kas sa tahaksid <inviteText>kutsuda kedagi jututuppa</inviteText> või <nowarnText>lõpetada selle tühja jututoa hoiatuse kuvamise</nowarnText>?",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitust.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitus.",
-    "Fill screen": "Täida ekraan",
-    "No identity server is configured: add one in server settings to reset your password.": "Ühtegi isikutuvastusserverit pole seadistatud: salasõna taastamiseks määra see serveri sätetes.",
     "Sign in instead": "Pigem logi sisse",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Kontrollimaks, et just sina ise sisestasid uue salasõna, saadame sulle kinnituskirja.",
     "Send Reset Email": "Saada salasõna taastamise e-kiri",
@@ -1286,7 +1108,6 @@
     "Bulk options": "Masstoimingute seadistused",
     "Accept all %(invitedRooms)s invites": "Võta vastu kõik %(invitedRooms)s kutsed",
     "Reject all %(invitedRooms)s invites": "Lükka tagasi kõik %(invitedRooms)s kutsed",
-    "Key backup": "Võtmete varundus",
     "Cross-signing": "Risttunnustamine",
     "<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>Hoiatus</b>: Jututoa versiooni uuendamine <i>ei koli jututoa liikmeid automaatselt uude jututoa olekusse.</i> Vanas jututoa versioonis saab olema viide uuele versioonile ning kõik liikmed peavad seda viidet klõpsama.",
     "Uploaded sound": "Üleslaaditud heli",
@@ -1294,7 +1115,6 @@
     "Notification sound": "Teavitusheli",
     "Reset": "Taasta algolek",
     "Set a new custom sound": "Seadista uus kohandatud heli",
-    "Jump to message": "Mine sõnumi juurde",
     "were invited %(count)s times|other": "said kutse %(count)s korda",
     "were invited %(count)s times|one": "said kutse",
     "was invited %(count)s times|other": "sai kutse %(count)s korda",
@@ -1313,13 +1133,7 @@
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternatiivina võid sa kasutada avalikku serverit <code>turn.matrix.org</code>, kuid see ei pruugi olla piisavalt töökindel ning sa jagad ka oma IP-aadressi selle serveriga. Täpsemalt saad seda määrata seadistustes.",
     "Try using turn.matrix.org": "Proovi kasutada turn.matrix.org serverit",
     "OK": "Sobib",
-    "Unable to capture screen": "Ekraanipildi hõive ei õnnestunud",
-    "Existing Call": "Käimasolev kõne",
-    "You are already in a call.": "Sinul on juba kõne pooleli.",
     "VoIP is unsupported": "VoIP ei ole toetatud",
-    "Call in Progress": "Kõne on pooleli",
-    "A call is currently being placed!": "Kõne algatamine on just käimas!",
-    "A call is already in progress!": "Kõne on juba pooleli!",
     "Permission Required": "Vaja on täiendavaid õigusi",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Hetkel ei ole võimalik vastata failiga. Kas sa sooviksid seda faili lihtsalt üles laadida?",
     "Continue": "Jätka",
@@ -1329,9 +1143,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server kas pole võrgus või on ülekoormatud, aga võib-olla oled hoopis komistanud süsteemivea otsa.",
     "The server does not support the room version specified.": "See server ei toeta antud jututoa versiooni.",
     "Failure to create room": "Jututoa loomine ei õnnestunud",
-    "If you cancel now, you won't complete verifying the other user.": "Kui sa katkestad nüüd, siis sul jääb teise kasutaja verifitseerimine lõpetamata.",
-    "If you cancel now, you won't complete verifying your other session.": "Kui sa katkestad nüüd, siis sul jääb oma muu sessiooni verifitseerimine lõpetamata.",
-    "If you cancel now, you won't complete your operation.": "Kui sa katkestad nüüd, siis sul jääb pooleliolev tegevus lõpetamata.",
     "Cancel entering passphrase?": "Kas katkestame paroolifraasi sisestamise?",
     "Enter passphrase": "Sisesta paroolifraas",
     "Setting up keys": "Võtame krüptovõtmed kasutusele",
@@ -1339,7 +1150,6 @@
     "Unable to enable Notifications": "Teavituste kasutusele võtmine ei õnnestunud",
     "This email address was not found": "Seda e-posti aadressi ei leidunud",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Sinu e-posti aadress ei tundu olema selles koduserveris seotud Matrixi kasutajatunnusega.",
-    "Add User": "Lisa kasutaja",
     "Enter a server name": "Sisesta serveri nimi",
     "Looks good": "Tundub õige",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "E-posti teel kutse saatmiseks kasuta isikutuvastusserverit. Võid kasutada <default>vaikimisi serverit (%(defaultIdentityServerName)s)</default> või määrata muud serverid <settings>seadistustes</settings>.",
@@ -1348,7 +1158,6 @@
     "Invite anyway and never warn me again": "Kutsu siiski ja ära hoiata mind enam",
     "Invite anyway": "Kutsu siiski",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Palun kirjelda seda, mis läks valesti ja loo GitHub'is veateade.",
-    "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.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Enne logide saatmist sa peaksid <a>GitHub'is looma veateate</a> ja kirjeldama seal tekkinud probleemi.",
     "GitHub issue": "Veateade GitHub'is",
     "Notes": "Märkused",
@@ -1373,12 +1182,8 @@
     "Unable to load session list": "Sessioonide loendi laadimine ei õnnestunud",
     "Identity server URL does not appear to be a valid identity server": "Isikutuvastusserveri aadress ei tundu viitama kehtivale isikutuvastusserverile",
     "Looks good!": "Tundub õige!",
-    "Use Recovery Key or Passphrase": "Kasuta taastevõtit või paroolifraasi",
-    "Use Recovery Key": "Kasuta taastevõtit",
-    "or another cross-signing capable Matrix client": "või mõnda teist Matrix'i klienti, mis oskab risttunnustamist",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sinu uus sessioon on nüüd verifitseeritud. Selles sessioonis saad lugeda oma krüptitud sõnumeid ja teiste kasutajate jaoks on ta usaldusväärne.",
     "Your new session is now verified. Other users will see it as trusted.": "Sinu uus sessioon on nüüd verifitseeritud. Teiste kasutajate jaoks on ta usaldusväärne.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Kui sa pole selle sessiooni turvaprotseduure lõpetanud, siis sul puudub ligipääs oma krüptitud sõnumitele.",
     "Go Back": "Mine tagasi",
     "Failed to re-authenticate due to a homeserver problem": "Uuesti autentimine ei õnnestunud koduserveri vea tõttu",
     "Incorrect password": "Vale salasõna",
@@ -1390,9 +1195,6 @@
     "Notification Autocomplete": "Teavituste automaatne lõpetamine",
     "Room Autocomplete": "Jututubade nimede automaatne lõpetamine",
     "User Autocomplete": "Kasutajanimede automaatne lõpetamine",
-    "Enter recovery key": "Sisesta taastevõti",
-    "This looks like a valid recovery key!": "See tundub olema õige taastevõti!",
-    "Not a valid recovery key": "Ei ole sobilik taastevõti",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Palu, et sinu %(brand)s'u haldur kontrolliks <a>sinu seadistusi</a> võimalike vigaste või topeltkirjete osas.",
     "Cannot reach identity server": "Isikutuvastusserverit ei õnnestu leida",
     "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.": "Sa võid registreeruda, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
@@ -1401,7 +1203,6 @@
     "No homeserver URL provided": "Koduserveri aadress on puudu",
     "Unexpected error resolving homeserver configuration": "Koduserveri seadistustest selguse saamisel tekkis ootamatu viga",
     "Unexpected error resolving identity server configuration": "Isikutuvastusserveri seadistustest selguse saamisel tekkis ootamatu viga",
-    "The message you are trying to send is too large.": "Sõnum, mida sa proovid saata, on liiga suur.",
     "This homeserver has exceeded one of its resource limits.": "See koduserver ületanud ühe oma ressursipiirangutest.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Jätkamaks selle teenuse kasutamist, palun <a>võta ühendust oma serveri haldajaga</a>.",
     "Unable to connect to Homeserver. Retrying...": "Ei saa ühendust koduserveriga. Proovin uuesti...",
@@ -1436,23 +1237,15 @@
     "Straight rows of keys are easy to guess": "Klaviatuuril järjest paiknevaid klahvikombinatsioone on lihtne ära arvata",
     "Help us improve %(brand)s": "Aidake meil täiustada %(brand)s'it",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Saada meile <UsageDataLink>anonüümset kasutusteavet</UsageDataLink>, mis võimaldab meil %(brand)s'it täiustada. Selline teave põhineb <PolicyLink>küpsiste kasutamisel</PolicyLink>.",
-    "I want to help": "Ma soovin aidata",
     "No": "Ei",
-    "Restart": "Käivita uuesti",
-    "Upgrade your %(brand)s": "Uuenda oma %(brand)s'it",
-    "A new version of %(brand)s is available!": "Uus %(brand)s'i versioon on saadaval!",
     "There was an error joining the room": "Jututoaga liitumisel tekkis viga",
     "Sorry, your homeserver is too old to participate in this room.": "Vabandust, sinu koduserver on siin jututoas osalemiseks liiga vana.",
     "Please contact your homeserver administrator.": "Palun võta ühendust koduserveri haldajaga.",
     "Failed to join room": "Jututoaga liitumine ei õnnestunud",
-    "Font scaling": "Fontide skaleerimine",
     "Custom user status messages": "Kasutajate kohandatud olekuteated",
     "Font size": "Fontide suurus",
     "Enable automatic language detection for syntax highlighting": "Kasuta süntaksi esiletõstmisel automaatset keeletuvastust",
     "Cross-signing private keys:": "Privaatvõtmed risttunnustamise jaoks:",
-    "Identity Server URL must be HTTPS": "Isikutuvastusserveri URL peab kasutama HTTPS-protokolli",
-    "Not a valid Identity Server (status code %(code)s)": "See ei ole sobilik isikutuvastusserver (staatuskood %(code)s)",
-    "Could not connect to Identity Server": "Ei saanud ühendust isikutuvastusserveriga",
     "Checking server": "Kontrollin serverit",
     "Change identity server": "Muuda isikutuvastusserverit",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Kas katkestame ühenduse <current /> isikutuvastusserveriga ning selle asemel loome uue ühenduse serveriga <new />?",
@@ -1468,7 +1261,6 @@
     "Disconnect anyway": "Ikkagi katkesta ühendus",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Sa jätkuvalt <b>jagad oma isikuandmeid</b> isikutuvastusserveriga <idserver />.",
     "Go back": "Mine tagasi",
-    "Identity Server (%(server)s)": "Isikutuvastusserver %(server)s",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Sinu serveri haldur on lülitanud läbiva krüptimise omavahelistes jututubades ja otsesõnumites välja.",
     "This room has been replaced and is no longer active.": "See jututuba on asendatud teise jututoaga ning ei ole enam kasutusel.",
     "You do not have permission to post to this room": "Sul ei ole õigusi siia jututuppa kirjutamiseks",
@@ -1481,7 +1273,6 @@
     "List options": "Loendi valikud",
     "Show %(count)s more|other": "Näita veel %(count)s sõnumit",
     "Show %(count)s more|one": "Näita veel %(count)s sõnumit",
-    "This room is private, and can only be joined by invitation.": "See jututuba on vaid omavaheliseks kasutuseks ning liitumine toimub kutse alusel.",
     "Upgrade this room to version %(version)s": "Uuenda jututuba versioonini %(version)s",
     "Upgrade Room Version": "Uuenda jututoa versioon",
     "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:": "Selle jututoa uuendamine eeldab tema praeguse ilmingu tegevuse lõpetamist ja uue jututoa loomist selle asemele. Selleks, et kõik kulgeks jututoas osalejate jaoks ladusalt, toimime nüüd nii:",
@@ -1489,7 +1280,6 @@
     "Update any local room aliases to point to the new room": "uuendame kõik jututoa aliased nii, et nad viitaks uuele jututoale",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "ei võimalda kasutajatel enam vanas jututoas suhelda ning avaldame seal teate, mis soovitab kõigil kolida uude jututuppa",
     "Put a link back to the old room at the start of the new room so people can see old messages": "selleks et saaks vanu sõnumeid lugeda, paneme uue jututoa algusesse viite vanale jututoale",
-    "Automatically invite users": "Kutsu kasutajad automaatselt",
     "Upgrade private room": "Uuenda omavaheline jututuba",
     "Upgrade public room": "Uuenda avalik jututuba",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Jututoa uuendamine on keerukas toiming ning tavaliselt soovitatakse seda teha vaid siis, kui jututuba on vigade tõttu halvasti kasutatav, sealt on puudu vajalikke funktsionaalsusi või seal ilmneb turvavigu.",
@@ -1526,9 +1316,6 @@
     "Integrations are disabled": "Lõimingud ei ole kasutusel",
     "Enable 'Manage Integrations' in Settings to do this.": "Selle tegevuse kasutuselevõetuks lülita seadetes sisse „Halda lõiminguid“ valik.",
     "Integrations not allowed": "Lõimingute kasutamine ei ole lubatud",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Sinu %(brand)s ei võimalda selle tegevuse jaoks kasutada Lõimingute haldurit. Palun küsi lisateavet administraatorilt.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Järgnevate kasutajate vestlema kutsumine ei õnnestunud: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Otsevestluse loomine ei õnnestunud. Palun kontrolli, et kasutajanimed oleks õiged ja proovi uuesti.",
     "a new master key signature": "uus üldvõtme allkiri",
     "a new cross-signing key signature": "uus risttunnustamise võtme allkiri",
     "a device cross-signing signature": "seadme risttunnustamise allkiri",
@@ -1538,55 +1325,32 @@
     "Unable to upload": "Üleslaadimine ei õnnestu",
     "Signature upload success": "Allkirja üleslaadimine õnnestus",
     "Signature upload failed": "Allkirja üleslaadimine ei õnnestunud",
-    "Address (optional)": "Aadress (valikuline)",
     "Reject invitation": "Lükka kutse tagasi",
     "Are you sure you want to reject the invitation?": "Kas sa oled kindel, et soovid lükata kutse tagasi?",
-    "Failed to set Direct Message status of room": "Jututoa otsevestluse oleku seadmine ei õnnestunud",
     "Failed to forget room %(errCode)s": "Jututoa unustamine ei õnnestunud %(errCode)s",
     "This homeserver would like to make sure you are not a robot.": "See server soovib kindlaks teha, et sa ei ole robot.",
     "Country Dropdown": "Riikide valik",
     "Confirm your identity by entering your account password below.": "Tuvasta oma isik sisestades salasõna alljärgnevalt.",
     "Please review and accept all of the homeserver's policies": "Palun vaata üle kõik koduserveri kasutustingimused ja nõustu nendega",
     "Please review and accept the policies of this homeserver:": "Palun vaata üle selle koduserveri kasutustingimused ja nõustu nendega:",
-    "An email has been sent to %(emailAddress)s": "Saatsime e-kirja %(emailAddress)s aadressile",
-    "Please check your email to continue registration.": "Registreerimise jätkamiseks, palun vaata oma e-kirjad.",
     "A text message has been sent to %(msisdn)s": "Saatsime tekstisõnumi telefoninumbrile %(msisdn)s",
     "Please enter the code it contains:": "Palun sisesta seal kuvatud kood:",
     "Code": "Kood",
     "Submit": "Saada",
     "Start authentication": "Alusta autentimist",
-    "Unable to validate homeserver/identity server": "Ei õnnestu valideerida koduserverit/isikutuvastusserverit",
-    "Your Modular server": "Sinu Modular-server",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Sisesta oma Modular'i koduserveri aadress. See võib kasutada nii sinu oma domeeni, kui olla <a>modular.im</a> alamdomeen.",
     "Sign in with SSO": "Logi sisse kasutades SSO'd ehk ühekordset autentimist",
     "Failed to reject invitation": "Kutse tagasi lükkamine ei õnnestunud",
     "This room is not public. You will not be able to rejoin without an invite.": "See ei ole avalik jututuba. Ilma kutseta sa ei saa uuesti liituda.",
-    "Failed to leave room": "Jututoast lahkumine ei õnnestunud",
     "Can't leave Server Notices room": "Serveriteadete jututoast ei saa lahkuda",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Seda jututuba kasutatakse sinu koduserveri oluliste teadete jaoks ja seega sa ei saa sealt lahkuda.",
     "Signed Out": "Välja logitud",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Kasutajanimes võivad olla vaid väiketähed, numbrid ja need viis tähemärki =_-./",
-    "Username not available": "Selline kasutajanimi ei ole saadaval",
-    "Username invalid: %(errMessage)s": "Vigane kasutajanimi: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Tekkis viga: %(error_string)s",
-    "Checking...": "Kontrollin...",
-    "Username available": "Kasutajanimi on saadaval",
-    "To get started, please pick a username!": "Alustamiseks palun vali kasutajanimi!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "See saab olema sinu kasutajanimi <span></span> koduserveris, aga sa võid valida ka <a>mõne teise serveri</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Kui sul juba on olemas Matrix'i konto, siis võid lihtsalt <a>sisse logida</a>.",
-    "You have successfully set a password!": "Salasõna loomine õnnestus!",
-    "You have successfully set a password and an email address!": "Salasõna loomine ja e-posti aadressi salvestamine õnnestus!",
-    "You can now return to your account after signing out, and sign in on other devices.": "Nüüd sa saad peale väljalogimist pöörduda tagasi oma konto juurde või logida sisse muudest seadmetest.",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Jäta meelde, et sa saad alati hiljem määrata kasutajaseadetest oma e-posti aadressi.",
     "Use bots, bridges, widgets and sticker packs": "Kasuta roboteid, sõnumisildu, vidinaid või kleepsupakke",
     "Upload all": "Laadi kõik üles",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "See fail on üleslaadimiseks <b>liiga suur</b>. Üleslaaditavate failide mahupiir on %(limit)s, kuid selle faili suurus on %(sizeOfThisFile)s.",
     "Appearance": "Välimus",
-    "Enter recovery passphrase": "Sisesta taastamise paroolifraas",
     "For security, this session has been signed out. Please sign in again.": "Turvalisusega seotud põhjustel on see sessioon välja logitud. Palun logi uuesti sisse.",
     "Review terms and conditions": "Vaata üle kasutustingimused",
     "Old cryptography data detected": "Tuvastasin andmed, mille puhul on kasutatud vanemat tüüpi krüptimist",
-    "Self-verification request": "Päring enda verifitseerimiseks",
     "Switch to light mode": "Kasuta heledat teemat",
     "Switch to dark mode": "Kasuta tumedat teemat",
     "Switch theme": "Vaheta teemat",
@@ -1610,7 +1374,6 @@
     "Failed to invite": "Kutse saatmine ei õnnestunud",
     "Operation failed": "Toiming ei õnnestunud",
     "Failed to invite users to the room:": "Kasutajate kutsumine jututuppa ei õnnestunud:",
-    "Failed to invite the following users to the %(roomName)s room:": "Järgnevate kasutajate kutsumine %(roomName)s jututuppa ei õnnestunud:",
     "You need to be logged in.": "Sa peaksid olema sisse loginud.",
     "You need to be able to invite users to do that.": "Selle tegevuse jaoks peaks sul olema õigus teistele kasutajatele kutse saatmiseks.",
     "Unable to create widget.": "Vidina loomine ei õnnestunud.",
@@ -1630,58 +1393,18 @@
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Lisa ¯\\_(ツ)_/¯ smaili vormindamata teksti algusesse",
     "Sends a message as plain text, without interpreting it as markdown": "Saadab sõnumi vormindamata tekstina ega tõlgenda seda markdown-vormindusena",
     "Sends a message as html, without interpreting it as markdown": "Saadab sõnumi html'ina ega tõlgenda seda markdown-vormindusena",
-    "/ddg is not a command": "/ddg ei ole käsk",
     "You joined the call": "Sina liitusid kõnega",
     "%(senderName)s joined the call": "%(senderName)s liitus kõnega",
     "Call in progress": "Kõne on pooleli",
-    "You left the call": "Sa lahkusid kõnest",
-    "%(senderName)s left the call": "%(senderName)s lahkus kõnest",
     "Call ended": "Kõne lõppes",
     "You started a call": "Sa alustasid kõnet",
     "%(senderName)s started a call": "%(senderName)s alustas kõnet",
     "Waiting for answer": "Ootan kõnele vastamist",
     "%(senderName)s is calling": "%(senderName)s helistab",
-    "You created the room": "Sa lõid jututoa",
-    "%(senderName)s created the room": "%(senderName)s lõi jututoa",
-    "You made the chat encrypted": "Sina võtsid vestlusel kasutuse krüptimise",
-    "%(senderName)s made the chat encrypted": "%(senderName)s võttis vestlusel kasutuse krüptimise",
-    "You made history visible to new members": "Sina tegid jututoa ajaloo loetavaks uuetele liikmetele",
-    "%(senderName)s made history visible to new members": "%(senderName)s tegi jututoa ajaloo loetavaks uuetele liikmetele",
-    "You made history visible to anyone": "Sina tegi jututoa ajaloo loetavaks kõikidele",
-    "%(senderName)s made history visible to anyone": "%(senderName)s tegi jututoa ajaloo loetavaks kõikidele",
-    "You made history visible to future members": "Sina tegid jututoa ajaloo loetavaks tulevastele liikmetele",
-    "%(senderName)s made history visible to future members": "%(senderName)s tegi jututoa ajaloo loetavaks tulevastele liikmetele",
-    "You were invited": "Sina said kutse",
-    "%(targetName)s was invited": "%(targetName)s sai kutse",
-    "You left": "Sina lahkusid",
-    "%(targetName)s left": "%(targetName)s lahkus",
-    "You were kicked (%(reason)s)": "Sind müksati jututoast välja (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s müksati jututoast välja (%(reason)s)",
-    "You were kicked": "Sind müksati jututoast välja",
-    "%(targetName)s was kicked": "%(targetName)s müksati jututoast välja",
-    "You rejected the invite": "Sa lükkasid kutse tagasi",
-    "%(targetName)s rejected the invite": "%(targetName)s lükkas kutse tagasi",
-    "You were uninvited": "Sinult võeti kutse tagasi",
-    "%(targetName)s was uninvited": "%(targetName)s'lt võeti kutse tagasi",
-    "You joined": "Sina liitusid",
-    "%(targetName)s joined": "%(targetName)s liitus",
-    "You changed your name": "Sa muutsid oma nime",
-    "%(targetName)s changed their name": "%(targetName)s muutis oma nime",
-    "You changed your avatar": "Sa muutsid oma tunnuspilti",
-    "%(targetName)s changed their avatar": "%(targetName)s muutis oma tunnuspilti",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Sina muutsid jututoa nime",
-    "%(senderName)s changed the room name": "%(senderName)s muutis jututoa nime",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Sina võtsid tagasi kutse kasutajalt %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s võttis kutse tagasi kasutajalt %(targetName)s",
-    "You invited %(targetName)s": "Sina kutsusid kasutajat %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s kutsus kasutajat %(targetName)s",
-    "You changed the room topic": "Sina muutsid jututoa teemat",
-    "%(senderName)s changed the room topic": "%(senderName)s muutis jututoa teemat",
-    "Use the improved room list (will refresh to apply changes)": "Kasuta parandaatud jututubade loendit (muudatuse jõustamine eeldab andmete uuesti laadimist)",
     "Use custom size": "Kasuta kohandatud suurust",
     "Use a more compact ‘Modern’ layout": "Kasuta veel kompaktsemat „moodsat“ paigutust",
     "Cross-signing public keys:": "Avalikud võtmed risttunnustamise jaoks:",
@@ -1694,24 +1417,9 @@
     "Last seen": "Viimati nähtud",
     "Manage": "Halda",
     "Enable": "Võta kasutusele",
-    "Error saving email notification preferences": "E-posti teel saadetavate teavituste eelistuste salvestamisel tekkis viga",
-    "An error occurred whilst saving your email notification preferences.": "E-posti teel saadetavate teavituste eelistuste salvestamisel tekkis viga.",
-    "Keywords": "Märksõnad",
-    "Enter keywords separated by a comma:": "Sisesta märksõnad ja kasuta eraldajaks koma:",
-    "Failed to change settings": "Seadistuste muutmine ei õnnestunud",
-    "Can't update user notification settings": "Kasutaja teavistuste eelistusi ei õnnestunud uuendada",
-    "Failed to update keywords": "Märksõnade uuendamine ei õnnestunud",
-    "Messages containing <span>keywords</span>": "Sõnumid, mis sisaldavad <span>märksõnu</span>",
-    "Notify me for anything else": "Teavita mind kõigest muust",
-    "Enable notifications for this account": "Võta sellel kasutajakontol kasutusele teavitused",
     "Clear notifications": "Eemalda kõik teavitused",
-    "All notifications are currently disabled for all targets.": "Kõik teavituste liigid on välja lülitatud.",
-    "Add an email address to configure email notifications": "E-posti teel saadetavate teavituste seadistamiseks lisa e-posti aadress",
-    "Enable email notifications": "Võta kasutusele e-posti teel saadetavad teavitused",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Alljärgnevate märksõnadega seotud teavitused järgivad reegleid, misa siin ei saa kuvada:",
     "Disinvite this user from community?": "Kas võtame sellelt kasutajalt tagasi kutse kogukonnaga liitumiseks?",
     "Failed to withdraw invitation": "Kutse tühistamine ei õnnestunud",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> jututoas %(roomName)s",
     "Failed to change power level": "Õiguste muutmine ei õnnestunud",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Sa ei saa seda muudatust hiljem tagasi pöörata, sest annad teisele kasutajale samad õigused, mis sinul on.",
     "Deactivate user?": "Kas deaktiveerime kasutajakonto?",
@@ -1720,7 +1428,6 @@
     "Failed to deactivate user": "Kasutaja deaktiveerimine ei õnnestunud",
     "This client does not support end-to-end encryption.": "See klient ei toeta läbivat krüptimist.",
     "Security": "Turvalisus",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Selle vidina kasutamisel võidakse jagada andmeid <helpIcon /> saitidega %(widgetDomain)s ning sinu vidinahalduriga.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Selle vidina kasutamisel võidakse jagada andmeid <helpIcon /> saitidega %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Erinevalt sõnumitest vidinad ei kasuta krüptimist.",
     "Widget added by": "Vidina lisaja",
@@ -1728,12 +1435,9 @@
     "Delete Widget": "Kustuta vidin",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidina kustutamisel eemaldatakse ta kõikide selle jututoa kasutajate jaoks. Kas sa kindlasti soovid seda vidinat eemaldada?",
     "Delete widget": "Kustuta vidin",
-    "Minimize apps": "Vähenda rakendused",
-    "Maximize apps": "Suurenda rakendused",
     "Popout widget": "Ava rakendus eraldi aknas",
     "More options": "Täiendavad seadistused",
     "Language Dropdown": "Keelevalik",
-    "Manage Integrations": "Halda lõiminguid",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s liitusid %(count)s korda",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s liitusid",
@@ -1751,16 +1455,11 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s lahkusid ja liitusid uuesti",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s lahkus ja liitus uuesti %(count)s korda",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s lahkus ja liitus uuesti",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Selle kasutamiseks oota, kuni automaatne sõnalõpetus laadib kõik valikud ja sa saad nad läbi lapata.",
     "Bans user with given id": "Keela ligipääs antud tunnusega kasutajale",
     "Unbans user with given ID": "Taasta ligipääs antud tunnusega kasutajale",
     "Ignores a user, hiding their messages from you": "Eirab kasutajat peites kõik tema sõnumid sinu eest",
     "Ignored user": "Eiratud kasutaja",
     "You are now ignoring %(userId)s": "Sa praegu eirad kasutajat %(userId)s",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s keelas ligipääsu kasutajale %(targetName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s taastas ligipääsu kasutajale %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s võttis tagasi %(targetName)s kutse.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s müksas kasutajat %(targetName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s muutis selle jututoa klammerdatud sõnumeid.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eemaldas kasutajate ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eemaldas jututubade ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
@@ -1785,31 +1484,17 @@
     "Contact your <a>server admin</a>.": "Võta ühendust <a>oma serveri haldajaga</a>.",
     "Warning": "Hoiatus",
     "Ok": "Sobib",
-    "Set password": "Määra salasõna",
-    "To return to your account in future you need to set a password": "Selleks, et sa saaksid tulevikus oma konto juurde tagasi pöörduda, peaksid määrama salasõna",
-    "You were banned (%(reason)s)": "Sinule on seatud ligipääsukeeld %(reason)s",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s seati ligipääsukeeld %(reason)s",
-    "You were banned": "Sinule seati ligipääsukeeld",
-    "%(targetName)s was banned": "%(targetName)s'le seati ligipääsukeeld",
-    "New spinner design": "Uus vurri-moodi paigutus",
     "Message Pinning": "Sõnumite klammerdamine",
     "IRC display name width": "IRC kuvatava nime laius",
     "Enable experimental, compact IRC style layout": "Võta kasutusele katseline, IRC-stiilis kompaktne sõnumite paigutus",
     "My Ban List": "Minu poolt seatud ligipääsukeeldude loend",
-    "Active call (%(roomName)s)": "Käsilolev kõne (%(roomName)s)",
     "Unknown caller": "Tundmatu helistaja",
-    "Incoming voice call": "Saabuv häälkõne",
-    "Incoming video call": "Saabuv videokõne",
-    "Incoming call": "Saabuv kõne",
     "Waiting for your other session to verify…": "Ootan, et sinu teine sessioon alustaks verifitseerimist…",
     "This bridge was provisioned by <user />.": "Selle võrgusilla võttis kasutusele <user />.",
     "This bridge is managed by <user />.": "Seda võrgusilda haldab <user />.",
-    "Workspace: %(networkName)s": "Tööruum: %(networkName)s",
-    "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Upload new:": "Laadi üles uus:",
     "Export E2E room keys": "Ekspordi jututubade läbiva krüptimise võtmed",
     "Your homeserver does not support cross-signing.": "Sinu koduserver ei toeta risttunnustamist.",
-    "Cross-signing and secret storage are enabled.": "Risttunnustamine ja turvahoidla on kasutusel.",
     "Connecting to integration manager...": "Ühendan lõiminguhalduriga...",
     "Cannot connect to integration manager": "Ei saa ühendust lõiminguhalduriga",
     "The integration manager is offline or it cannot reach your homeserver.": "Lõiminguhaldur kas ei tööta või ei õnnestu tal teha päringuid sinu koduserveri suunas.",
@@ -1817,7 +1502,6 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Kas sa oled kindel? Kui sul muud varundust pole, siis kaotad ligipääsu oma krüptitud sõnumitele.",
     "Your keys are <b>not being backed up from this session</b>.": "Sinu selle sessiooni krüptovõtmeid <b>ei varundata</b>.",
     "Back up your keys before signing out to avoid losing them.": "Vältimaks nende kaotamist, varunda krüptovõtmed enne väljalogimist.",
-    "Advanced notification settings": "Teavituste lisaseadistused",
     "Enable desktop notifications for this session": "Võta selleks sessiooniks kasutusele töölauakeskkonnale omased teavitused",
     "Show message in desktop notification": "Näita sõnumit töölauakeskkonnale omases teavituses",
     "Enable audible notifications for this session": "Võta selleks sessiooniks kasutusele kuuldavad teavitused",
@@ -1835,7 +1519,6 @@
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Kohandatud fondisuurus peab olema vahemikus %(min)s pt ja %(max)s pt",
     "Use between %(min)s pt and %(max)s pt": "Kasuta suurust vahemikus %(min)s pt ja %(max)s pt",
     "Message layout": "Sõnumite paigutus",
-    "Compact": "Kompaktne",
     "Modern": "Moodne",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Vali sinu seadmes leiduv fondi nimi ning %(brand)s proovib seda kasutada.",
     "Customise your appearance": "Kohenda välimust",
@@ -1847,13 +1530,8 @@
     "FAQ": "Korduma kippuvad küsimused",
     "Versions": "Versioonid",
     "%(brand)s version:": "%(brand)s'i versioon:",
-    "olm version:": "olm'i versioon:",
     "Homeserver is": "Koduserver on",
-    "Identity Server is": "Isikutuvastusserver on",
-    "Access Token:": "Pääsuluba:",
-    "click to reveal": "kuvamiseks klõpsi siin",
     "Labs": "Katsed",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Sa võid täiendada oma kasutuskogemust katseliste funktsionaalsusetega. <a>Vaata lisateavet</a>.",
     "Ignored/Blocked": "Eiratud või ligipääs blokeeritud",
     "Error adding ignored user/server": "Viga eiratud kasutaja või serveri lisamisel",
     "Something went wrong. Please try again or view your console for hints.": "Midagi läks valesti. Proovi uuesti või otsi lisavihjeid konsoolilt.",
@@ -1881,8 +1559,6 @@
     "Room ID or address of ban list": "Ligipääsukeelu reeglite loendi jututoa tunnus või aadress",
     "Show tray icon and minimize window to it on close": "Näita süsteemisalve ikooni ja Element'i akna sulgemisel minimeeri ta salve",
     "Read Marker off-screen lifetime (ms)": "Lugemise markeri iga, kui Element pole fookuses (ms)",
-    "Make this room low priority": "Muuda see jututuba vähetähtsaks",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Vähetähtsad jututoad kuvatakse jututubade loendi lõpus omaette grupina",
     "Failed to unban": "Ligipääsu taastamine ei õnnestunud",
     "Unban": "Taasta ligipääs",
     "Banned by %(displayName)s": "Ligipääs on keelatud %(displayName)s poolt",
@@ -1904,15 +1580,9 @@
     "Invited": "Kutsutud",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (õigused %(powerLevelNumber)s)",
     "Emoji picker": "Emoji'de valija",
-    "No pinned messages.": "Klammerdatud sõnumeid ei ole.",
     "Loading...": "Laadin...",
-    "Pinned Messages": "Klammerdatud sõnumid",
-    "Unpin Message": "Eemalda sõnumi klammerdus",
     "No recently visited rooms": "Hiljuti külastatud jututubasid ei leidu",
-    "Create room": "Loo jututuba",
     "People": "Inimesed",
-    "Unread rooms": "Lugemata jututoad",
-    "Always show first": "Näita alati esimisena",
     "Error creating address": "Viga aadressi loomisel",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Aadressi loomisel tekkis viga. See kas on serveri poolt keelatud või tekkis ajutine tõrge.",
     "You don't have permission to delete the address.": "Sinul pole õigusi selle aadressi kustutamiseks.",
@@ -1921,14 +1591,12 @@
     "This room has no local addresses": "Sellel jututoal puuduvad kohalikud aadressid",
     "Local address": "Kohalik aadress",
     "Published Addresses": "Avaldatud aadressid",
-    "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.": "Avaldatud aadresse saab mis iganes serveri kasutaja pruukida sinu jututoaga liitumiseks. Aadressi avaldamiseks peab ta alustuseks olema määratud kohaliku aadressina.",
     "Other published addresses:": "Muud avaldatud aadressid:",
     "No other published addresses yet, add one below": "Ühtegi muud aadressi pole veel avaldatud, lisa üks alljärgnevalt",
     "Local Addresses": "Kohalikud aadressid",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Et muud kasutajad saaks seda jututuba leida sinu koduserveri (%(localDomain)s) kaudu, lisa sellele jututoale aadresse",
     "Invalid community ID": "Vigane kogukonna tunnus",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ei ole korrektne kogukonna tunnus",
-    "Direct message": "Otsevestlus",
     "Demote yourself?": "Kas vähendad enda õigusi?",
     "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.": "Kuna sa vähendad enda õigusi, siis sul ei pruugi hiljem olla võimalik seda muutust tagasi pöörata. Kui sa juhtumisi oled viimane haldusõigustega kasutaja jututoas, siis hiljem on võimatu samu õigusi tagasi saada.",
     "Demote": "Vähenda enda õigusi",
@@ -1982,13 +1650,10 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ei ole võimalik laadida seda sündmust, millele vastus on tehtud - teda kas pole olemas või sul pole õigusi seda näha.",
     "Room address": "Jututoa aadress",
     "Some characters not allowed": "Mõned tähemärgid ei ole siin lubatud",
-    "Please provide a room address": "Palun kirjuta jututoa aadress",
     "This address is available to use": "See aadress on kasutatav",
     "This address is already in use": "See aadress on juba kasutusel",
-    "Room directory": "Jututubade loend",
     "Sign in with single sign-on": "Logi sisse ühekordse sisselogimise abil",
     "And %(count)s more...|other": "Ja %(count)s muud...",
-    "ex. @bob:example.com": "näiteks @kati:mingidomeen.com",
     "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.": "Kui sul leidub lisateavet, mis võis selle vea analüüsimisel abiks olla, siis palun lisa need ka siia - näiteks mida sa vea tekkimise hetkel tegid, jututoa tunnus, kasutajate tunnused, jne.",
     "Send logs": "Saada logikirjed",
     "Unable to load commit detail: %(msg)s": "Ei õnnestu laadida sõnumi lisateavet: %(msg)s",
@@ -2016,7 +1681,6 @@
     "example": "näiteks",
     "Create": "Loo",
     "Please enter a name for the room": "Palun sisesta jututoa nimi",
-    "Set a room address to easily share your room with other people.": "Jagamaks jututuba teiste kasutajatega, sisesta jututoa aadress.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Seda funktsionaalsust sa ei saa hiljem kinni keerata. Sõnumisillad ja enamus roboteid veel ei oska seda kasutada.",
     "Enable end-to-end encryption": "Võta läbiv krüptimine kasutusele",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Kinnitamaks seda, et soovid oma konto kasutusest eemaldada, kasuta oma isiku tuvastamiseks ühekordset sisselogimist.",
@@ -2037,15 +1701,6 @@
     "If they don't match, the security of your communication may be compromised.": "Kui nad omavahel ei klapi, siis teie suhtluse turvalisus võib olla ohus.",
     "Your homeserver doesn't seem to support this feature.": "Tundub, et sinu koduserver ei toeta sellist funktsionaalsust.",
     "Message edits": "Sõnumite muutmised",
-    "Your account is not secure": "Sinu kasutajakonto ei ole turvaline",
-    "This session, or the other session": "See või teine sessioon",
-    "The internet connection either session is using": "Internetiühendus, mida emb-kumb sessioon kasutab",
-    "New session": "Uus sessioon",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Kasuta seda sessiooni uute sessioonide verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Kui sa pole sellesse sessiooni sisse loginud, siis sinu kasutajakonto andmed võivad olla sattunud valedesse kätesse.",
-    "This wasn't me": "See ei olnud mina",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Kui sa leiad vigu või soovid jagada muud tagasisidet, siis teata sellest GitHub'i vahendusel.",
-    "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.": "Topelt veateadete vältimiseks palun <existingIssuesLink>vaata esmalt olemasolevaid</existingIssuesLink> (ning lisa a + 1), aga kui sa samal teemal viga ei leia, siis <newIssueLink>koosta uus veateade</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.": "Sellest sõnumist teatamine saadab tema unikaalse sõnumi tunnuse sinu koduserveri haldurile. Kui selle jututoa sõnumid on krüptitud, siis sinu koduserveri haldur ei saa lugeda selle sõnumi teksti ega vaadata seal leiduvaid faile ja pilte.",
     "Failed to upgrade room": "Jututoa versiooni uuendamine ei õnnestunud",
     "The room upgrade could not be completed": "Jututoa uuendust ei õnnestunud teha",
@@ -2053,10 +1708,7 @@
     "Email address": "E-posti aadress",
     "This will allow you to reset your password and receive notifications.": "See võimaldab sul luua uue salasõna ning saada teavitusi.",
     "Wrong file type": "Vale failitüüp",
-    "Wrong Recovery Key": "Vale taastevõti",
-    "Invalid Recovery Key": "Vigane taastevõti",
     "Security Phrase": "Turvafraas",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ei õnnestu saada ligipääsu turvahoidlale. Palun kontrolli, et sa oleksid sisestanud õige taastamiseks mõeldud paroolifraasi.",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Jätkamiseks sisesta oma turvafraas või kasuta <button>turvavõtit</button>.",
     "Security Key": "Turvavõti",
     "Use your Security Key to continue.": "Jätkamiseks kasuta turvavõtit.",
@@ -2064,34 +1716,15 @@
     "Fetching keys from server...": "Laen võtmed serverist...",
     "%(completed)s of %(total)s keys restored": "%(completed)s / %(total)s võtit taastatud",
     "Unable to load backup status": "Varunduse oleku laadimine ei õnnestunud",
-    "Recovery key mismatch": "Taastevõtmed ei klapi",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Selle taastevõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.",
-    "Incorrect recovery passphrase": "Vigane taastamiseks mõeldud paroolifraas",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Selle paroolifraasiga ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastamiseks mõeldud paroolifraasi.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Sisestades taastamiseks mõeldud paroolifraasi, saad ligipääsu oma turvatud sõnumitele ning sätid üles krüptitud sõnumivahetuse.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Kui sa oled unudtanud taastamiseks mõeldud paroolifraasi, siis sa saad <button1>kasutada oma taastevõtit</button1> või <button2>seadistada uued taastamise võimalused</button2>",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Hoiatus</b>: Sa peaksid võtmete varundust seadistama vaid arvutist, mida sa usaldad.",
-    "We’re excited to announce Riot is now Element": "Meil on hea meel teatada, et Riot'i uus nimi on nüüd Element",
-    "Riot is now Element!": "Riot'i uus nimi on Element!",
     "Secret storage public key:": "Turvahoidla avalik võti:",
     "Verify User": "Verifitseeri kasutaja",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Lisaturvalisus mõttes verifitseeri see kasutaja võrreldes selleks üheks korraks loodud koodi mõlemas seadmes.",
     "Your messages are not secure": "Sinu sõnumid ei ole turvatud",
-    "Use your account to sign in to the latest version of the app at <a />": "Kasuta oma kontot logimaks sisse rakenduse viimasesse versiooni <a /> serveris",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Sa oled juba sisse loginud ja võid rahumeeli jätkata, kuid alati on hea mõte, kui kasutad viimast rakenduse versiooni, mille erinevate süsteemide jaoks leiad <a>element.io/get-started</a> lehelt.",
-    "Go to Element": "Võta Element kasutusele",
-    "We’re excited to announce Riot is now Element!": "Meil on hea meel teatada, et Riot'i uus nimi on nüüd Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Lisateavet leiad <a>element.io/previously-riot</a> lehelt",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse ligi oma turvatud sõnumitele ning säti üles krüptitud sõnumivahetus.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Kui sa oled unustanud oma taastevõtme, siis sa võid <button>seada üles uued taastamise võimalused</button>",
-    "Custom": "Kohandatud",
-    "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>.": "Sisesta Element Matrix Services kodiserveri aadress. See võib kasutada nii sinu oma domeeni, kui olla <a>element.io</a> alamdomeen.",
-    "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.": "Tõhusamaks kasutuseks seadista filter sikutades kogukonna tunnuspilti filtriribale ekraani vasakus ääres. Sa saad sobival ajal klõpsata filtriribal asuvat tunnuspilti ning näha vaid kasutajaid ja jututubasid, kes on seotud selle kogukonnaga.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Kas kustutame jututoa aadressi %(alias)s ja eemaldame %(name)s kataloogist?",
     "delete the address.": "kustuta aadress.",
     "The server may be unavailable or overloaded": "Server kas pole kättesaadav või on ülekoormatud",
     "Unable to join network": "Võrguga liitumine ei õnnestu",
-    "Search rooms": "Otsi jututube",
     "User menu": "Kasutajamenüü",
     "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.": "Sa oled kõikidest sessioonidest välja logitud ning enam ei saa tõuketeavitusi. Nende taaskuvamiseks logi sisse kõikides oma seadmetes.",
     "Return to login screen": "Mine tagasi sisselogimisvaatele",
@@ -2127,29 +1760,19 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Uuenduse kinnitamiseks pead end autentima serveris.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Teiste sessioonide verifitseerimiseks pead uuendama seda sessiooni. Muud verifitseeritud sessioonid saavad sellega ligipääsu krüptitud sõnumitele ning nad märgitakse usaldusväärseteks ka teiste kasutajate jaoks.",
     "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.": "Andmete kaitsmiseks sisesta turvafraas, mida vaid sina tead. Ole mõistlik ja palun ära kasuta selleks oma tavalist konto salasõna.",
-    "Enter a recovery passphrase": "Sisesta taastamiseks mõeldud paroolifraas",
-    "Great! This recovery passphrase looks strong enough.": "Suurepärane! Taastamiseks mõeldud paroolifraas on piisavalt kange.",
     "That matches!": "Klapib!",
     "Use a different passphrase?": "Kas kasutame muud paroolifraasi?",
     "That doesn't match.": "Ei klapi mitte.",
     "Go back to set it again.": "Mine tagasi ja sisesta nad uuesti.",
-    "Enter your recovery passphrase a second time to confirm it.": "Kinnitamaks sisesta taastamiseks mõeldud paroolifraas teist korda.",
-    "Confirm your recovery passphrase": "Kinnita oma taastamiseks mõeldud paroolifraas",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Kuna seda kasutatakse sinu krüptitud andmete kaitsmiseks, siis hoia oma turvavõtit kaitstud ja turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
     "Unable to query secret storage status": "Ei õnnestu tuvastada turvahoidla olekut",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Kui sa tühistad nüüd, siis sa võid peale viimasest seadmest välja logimist kaotada ligipääsu oma krüptitud sõnumitele ja andmetele.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Samuti võid sa seadetes võtta kasutusse turvalise varunduse ning hallata oma krüptovõtmeid.",
-    "Set up Secure backup": "Võta kasutusele turvaline varundus",
     "Set a Security Phrase": "Määra turvafraas",
     "Confirm Security Phrase": "Kinnita turvafraas",
     "Save your Security Key": "Salvesta turvavõti",
     "Unable to set up secret storage": "Turvahoidla kasutuselevõtmine ei õnnestu",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Me salvestame krüptitud koopia sinu krüptovõtmetest oma serveris. Seades taastamiseks mõeldud paroolifraasi, saad turvata oma varundust.",
     "For maximum security, this should be different from your account password.": "Parima turvalisuse jaoks peaks paroolifraas olema erinev sinu konto salasõnast.",
-    "Set up with a recovery key": "Võta kasutusele taastevõti",
-    "Please enter your recovery passphrase a second time to confirm.": "Kinnitamiseks palun sisesta taastamiseks mõeldud paroolifraas teist korda.",
-    "Repeat your recovery passphrase...": "Korda oma taastamiseks mõeldud paroolifraasi...",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Sinu taastevõti toimib turvavõrguna - juhul, kui sa unustad taastamiseks mõeldud paroolifraasi, siis sa saad seda kasutada taastamaks ligipääsu krüptitud sõnumitele.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Hoia seda turvalises kohas, nagu näiteks salasõnahalduris või vana kooli seifis.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Sinu krüptovõtmeid varundatakse (esimese varukoopia tegemine võib võtta paar minutit).",
     "Autocomplete": "Automaatne sõnalõpetus",
@@ -2158,8 +1781,6 @@
     "Forget Room": "Unusta jututuba ära",
     "Which officially provided instance you are using, if any": "Mis iganes ametlikku klienti sa kasutad, kui üldse kasutad",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Kui kasutad %(brand)s seadmes, kus puuteekraan on põhiline sisestusviis",
-    "Use your account to sign in to the latest version": "Kasuta oma kontot selleks, et sisse logida rakenduse viimasesse versiooni",
-    "Learn More": "Lisateave",
     "Upgrades a room to a new version": "Uuendab jututoa uue versioonini",
     "You do not have the required permissions to use this command.": "Sul ei ole piisavalt õigusi selle käsu käivitamiseks.",
     "Error upgrading room": "Viga jututoa uuendamisel",
@@ -2172,30 +1793,15 @@
     "This room has no topic.": "Sellel jututoal puudub teema.",
     "Invites user with given id to current room": "Kutsub nimetatud kasutajatunnusega kasutaja sellesse jututuppa",
     "Use an identity server": "Kasuta isikutuvastusserverit",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s võttis vastu kutse %(displayName)s nimel.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s võttis kutse vastu.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s soovib alustada VoIP rühmakõnet.",
-    "%(senderName)s made no change.": "%(senderName)s ei teinud muutusi.",
-    "VoIP conference started.": "VoIP rühmakõne algas.",
-    "VoIP conference finished.": "VoIP rühmakõne lõppes.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s lükkas kutse tagasi.",
-    "%(targetName)s left the room.": "%(targetName)s lahkus jututoast.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s õigused muutusid: %(fromPowerLevel)s -> %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutis %(powerLevelDiffText)s õigusi.",
     "Render simple counters in room header": "Näita jututoa päises lihtsaid loendure",
-    "Multiple integration managers": "Mitmed lõiminguhaldurid",
-    "Enable advanced debugging for the room list": "Lülita jututubade loendi jaoks sisse detailne silumine",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Näita krüptitud jututubades meeldetuletust krüptitud sõnumite taastamisvõimaluste kohta",
     "Use a system font": "Kasuta süsteemset fonti",
     "System font name": "Süsteemse fondi nimi",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Kui sinu koduserveris on seadistamata kõnehõlbustusserver, siis luba alternatiivina kasutada avalikku serverit turn.matrix.org (kõne ajal jagatakse nii sinu avalikku, kui privaatvõrgu IP-aadressi)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Saada sõnumite lugemiskinnitusi (selle võimaluse keelamine eeldab, et koduserver sellist funktsionaalsust toetab)",
     "This is your list of users/servers you have blocked - don't leave the room!": "See on sinu serverite ja kasutajate ligipääsukeeldude loend. Palun ära lahku sellest jututoast!",
     "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.": "Kui sa just enne ekspordi selle jututoa võtmed ja impordi need hiljem, siis salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu krüptitud vestluste ajalugu loetamatuks. Tulevaste arenduste käigus tehakse see funktsionaalsus paremaks.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Sinu kontol on turvahoidlas olemas risttunnustamise identiteet, kuid seda veel ei loeta antud sessioonis usaldusväärseks.",
-    "Cross-signing and secret storage are not yet set up.": "Risttunnustamine ja turvahoidla pole veel seadistatud.",
-    "Reset cross-signing and secret storage": "Tühista risttunnustamise tulemused ja turvahoidla sisu",
-    "Bootstrap cross-signing and secret storage": "Võta risttunnustamine ja turvahoidla kasutusele",
     "well formed": "korrektses vormingus",
     "unexpected type": "tundmatut tüüpi",
     "in secret storage": "turvahoidlas",
@@ -2203,7 +1809,6 @@
     "cached locally": "on puhverdatud kohalikus seadmes",
     "not found locally": "ei leidu kohalikus seadmes",
     "User signing private key:": "Kasutaja privaatvõti:",
-    "Session backup key:": "Sessiooni varundusvõti:",
     "in account data": "kasutajakonto andmete hulgas",
     "Homeserver feature support:": "Koduserver on tugi sellele funktsionaalusele:",
     "exists": "olemas",
@@ -2218,7 +1823,7 @@
     "%(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 ei võimalda veebibrauseris töötades krüptitud sõnumeid turvaliselt puhverdada. Selleks, et krüptitud sõnumeid saaks otsida, kasuta <desktopLink>%(brand)s Desktop</desktopLink> rakendust Matrix'i kliendina.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Krüptitud sõnumid kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.",
     "Unable to load key backup status": "Võtmete varunduse oleku laadimine ei õnnestunud",
-    "Restore from Backup": "Taasta varundusest",
+    "Restore from Backup": "Taasta varukoopiast",
     "This session is backing up your keys. ": "See sessioon varundab sinu krüptovõtmeid. ",
     "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.": "See sessioon <b>ei varunda sinu krüptovõtmeid</b>, aga sul on olemas varundus, millest saad taastada ning millele saad võtmeid lisada.",
     "Success": "Õnnestus",
@@ -2229,10 +1834,10 @@
     "Deactivate Account": "Deaktiveeri konto",
     "Discovery": "Leia kasutajaid",
     "Deactivate account": "Deaktiveeri kasutajakonto",
-    "For help with using %(brand)s, click <a>here</a>.": "Kui otsid lisateavet %(brand)s kasutamise kohta, palun vaata <a>siia</a>.",
+    "For help with using %(brand)s, click <a>here</a>.": "Kui otsid lisateavet %(brand)s'i kasutamise kohta, palun vaata <a>siia</a>.",
     "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.": "Lisa siia kasutajad ja serverid, mida sa soovid eirata. Kui soovid, et %(brand)s kasutaks üldist asendamist, siis kasuta tärni. Näiteks <code>@bot:*</code> eirab kõikide serverite kasutajat 'bot'.",
     "Use default": "Kasuta vaikimisi väärtusi",
-    "Mentions & Keywords": "Mainimised ja võtmesõnad",
+    "Mentions & Keywords": "Mainimised ja märksõnad",
     "Notification options": "Teavituste eelistused",
     "Room options": "Jututoa eelistused",
     "This room is public": "See jututuba on avalik",
@@ -2240,7 +1845,6 @@
     "Room avatar": "Jututoa tunnuspilt ehk avatar",
     "Publish this room to the public in %(domain)s's room directory?": "Kas avaldame selle jututoa %(domain)s jututubade loendis?",
     "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.": "Kui keegi lisab oma sõnumisse URL'i, siis võidakse näidata selle URL'i eelvaadet, mis annab lisateavet tema kohta, nagu näiteks pealkiri, kirjeldus ja kuidas ta välja näeb.",
-    "Waiting for you to accept on your other session…": "Ootan, et sa nõustuksid teises sessioonis…",
     "Waiting for %(displayName)s to accept…": "Ootan, et %(displayName)s nõustuks…",
     "Accepting…": "Nõustun …",
     "Start Verification": "Alusta verifitseerimist",
@@ -2269,18 +1873,12 @@
     "Edited at %(date)s": "Muutmise kuupäev %(date)s",
     "Click to view edits": "Muudatuste nägemiseks klõpsi",
     "<a>In reply to</a> <pill>": "<a>Vastuseks kasutajale</a> <pill>",
-    "There are advanced notifications which are not shown here.": "On olemad detailseid teavitusi, mida siin ei kuvata.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Sa võib-olla oled seadistanud nad %(brand)s'ist erinevas kliendis. Sa küll ei saa neid %(brand)s'is muuta, kuid nad kehtivad siiski.",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Sa hetkel kasutad <server></server> serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi. Alljärgnevalt saad sa muuta oma isikutuvastusserverit.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Kui sa ei soovi kasutada <server /> serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi, siis sisesta alljärgnevalt mõni teine isikutuvastusserver.",
-    "Identity Server": "Isikutuvastusserver",
     "Do not use an identity server": "Ära kasuta isikutuvastusserverit",
     "Enter a new identity server": "Sisesta uue isikutuvastusserveri nimi",
     "Change": "Muuda",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Robotite, vidinate ja kleepsupakkide jaoks kasuta lõiminguhaldurit <b>(%(serverName)s)</b>.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Robotite, vidinate ja kleepsupakkide seadistamiseks kasuta lõiminguhaldurit.",
     "Manage integrations": "Halda lõiminguid",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Lõiminguhalduritel on laiad volitused - nad võivad sinu nimel lugeda seadistusi, kohandada vidinaid, saata jututubade kutseid ning määrata õigusi.",
     "Define the power level of a user": "Määra kasutaja õigused",
     "Command failed": "Käsk ei toiminud",
     "Opens the Developer Tools dialog": "Avab arendusvahendite akna",
@@ -2295,9 +1893,6 @@
     "Backup has an <validity>invalid</validity> signature from this session": "Varukoopial on selle sessiooni <validity>vigane</validity> allkiri",
     "Backup is not signed by any of your sessions": "Varunduse andmetel pole mitte ühegi sinu sessiooni allkirja",
     "This backup is trusted because it has been restored on this session": "See varukoopia on usaldusväärne, sest ta on taastatud sellest sessioonist",
-    "Backup version: ": "Varukoopia versioon: ",
-    "Algorithm: ": "Algoritm: ",
-    "Backup key stored: ": "Varukoopia võti on salvestatud: ",
     "Start using Key Backup": "Võta kasutusele krüptovõtmete varundamine",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Sa hetkel ei kasuta isikutuvastusserverit. Et olla leitav ja ise leida sinule teadaolevaid inimesi seadista ta alljärgnevalt.",
     "Show rooms with unread messages first": "Näita lugemata sõnumitega jututubasid esimesena",
@@ -2308,7 +1903,6 @@
     "Jump to first unread room.": "Siirdu esimesse lugemata jututuppa.",
     "Jump to first invite.": "Siirdu esimese kutse juurde.",
     "Recovery Method Removed": "Taastemeetod on eemaldatud",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Oleme tuvastanud, et selles sessioonis ei leidu taastamiseks mõeldud paroolifraas ega krüptitud sõnumite taastevõtit.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Kui sa tegid seda juhuslikult, siis sa võid selles sessioonis uuesti seadistada sõnumite krüptimise, mille tulemusel krüptime uuesti kõik sõnumid ja loome uue taastamise meetodi.",
     "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.": "Kui sa ei ole ise taastamise meetodeid eemaldanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod.",
     "Are you sure you want to cancel entering passphrase?": "Kas oled kindel et sa soovid katkestada paroolifraasi sisestamise?",
@@ -2341,17 +1935,11 @@
     "Submit debug logs": "Saada silumise logid",
     "Custom Tag": "Kohandatud silt",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ei tea kuidas selles võrgus jututoaga liituda",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X Androidi jaoks",
     "Starting backup...": "Alusta varundamist...",
     "Success!": "Õnnestus!",
     "Create key backup": "Tee võtmetest varukoopia",
     "Unable to create key backup": "Ei õnnestu teha võtmetest varukoopiat",
-    "Don't ask again": "Ära küsi uuesti",
     "New Recovery Method": "Uus taastamise meetod",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Tuvastasin krüptitud sõnumite taastamiseks mõeldud uue paroolifraasi ja võtmed.",
     "This session is encrypting history using the new recovery method.": "See sessioon krüptib ajalugu kasutades uut taastamise meetodit.",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Kas sa kasutad või mitte tekstitoimetis kujundatud teksti režiimi",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Kas sa kasutad või mitte leivapuru-funktsionaalsust (tunnuspildid jututubade loendi kohal)",
@@ -2359,15 +1947,10 @@
     "Every page you use in the app": "Iga lehekülg, mida sa rakenduses kasutad",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kui antud lehel leidub isikustatavaid andmeid, nagu jututoa, kasutaja või kogukonna tunnus, siis need andmed eemaldatakse enne serveri poole saatmist.",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
-    " to store messages from ": " salvestamaks sõnumeid ",
-    "Unable to fetch notification target list": "Ei õnnestu laadida teavituste eesmärkide loendit",
     "Notification targets": "Teavituste eesmärgid",
     "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.": "Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix'i kasutajatunnuse alusel.",
-    "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.": "Kui sa oled teatanud meile GitHub'i vahendusel veast, siis silumislogid aitavad meil seda viga kergemini parandada. Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
     "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": "Selleks, et sa ei kaotaks oma vestluste ajalugu, pead sa eksportima jututoa krüptovõtmed enne välja logimist. Küll, aga pead sa selleks kasutama %(brand)s uuemat versiooni",
     "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.": "Sa oled selle sessiooni jaoks varem kasutanud %(brand)s'i uuemat versiooni. Selle versiooni kasutamiseks läbiva krüptimisega, pead sa esmalt logima välja ja siis uuesti logima tagasi sisse.",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Kui sa pole seadistanud krüptitud sõnumite taastamise meetodeid, siis väljalogimisel sa kaotad võimaluse neid krüptitud sõnumeid lugeda.",
-    "If you don't want to set this up now, you can later in Settings.": "Kui sa ei soovi seda teha kohe, siis vastava võimaluse leiad hiljem rakenduse seadistustest.",
     "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.": "Kui sa ei ole ise uusi taastamise meetodeid lisanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod.",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s võttis selles jututoas kasutusele %(groups)s kogukonna rinnamärgi.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s eemaldas selles jututoas kasutuselt %(groups)s kogukonna rinnamärgi.",
@@ -2379,11 +1962,9 @@
     "Showing flair for these communities:": "Näidatakse nende kogukondade rinnasilte:",
     "This room is not showing flair for any communities": "Sellele jututoale ei ole jagatud ühtegi kogukonna rinnasilti",
     "Display your community flair in rooms configured to show it.": "Näita oma kogukonna rinnasilti nendes jututubades, kus selle kuvamine on seadistatud.",
-    "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.": "Kohandatud serveriseadistusi saad kasutada selleks, et logida sisse sinu valitud koduserverisse. See võimaldab sinul kasutada %(brand)s'i mõnes teises koduserveri hallatava kasutajakontoga.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Kas sa teadsid, et sa võid %(brand)s'i parema kasutuskogemuse nimel pruukida kogukondi!",
     "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.": "Kui sa pole seadistanud krüptitud sõnumite taastamise meetodeid, siis väljalogimisel või muu sessiooni kasutamisel sa kaotad võimaluse oma krüptitud sõnumeid lugeda.",
     "Set up Secure Message Recovery": "Võta kasutusele turvaline sõnumivõtmete varundus",
-    "Secure your backup with a recovery passphrase": "Krüpti oma varukoopia taastamiseks mõeldud paroolifraasiga",
     "The person who invited you already left the room.": "See, kes sind jututoa liikmeks kutsus, on juba jututoast lahkunud.",
     "The person who invited you already left the room, or their server is offline.": "See, kes sind jututoa liikmeks kutsus, kas juba on jututoast lahkunud või tema koduserver on võrgust väljas.",
     "Change notification settings": "Muuda teavituste seadistusi",
@@ -2400,10 +1981,8 @@
     "The server is not configured to indicate what the problem is (CORS).": "Server on seadistatud varjama tegelikke veapõhjuseid (CORS).",
     "No files visible in this room": "Selles jututoas pole nähtavaid faile",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Faile saad manuseks lisada kas vastava nupu alt vestlusest või sikutades neid jututoa aknasse.",
-    "You have no visible notifications in this room.": "Jututoas pole nähtavaid teavitusi.",
     "You're all caught up.": "Ei tea... kõik vist on nüüd tehtud.",
     "You’re all caught up": "Ei tea... kõik vist on nüüd tehtud",
-    "%(brand)s Android": "%(brand)s Android",
     "Show message previews for reactions in DMs": "Näita eelvaates otsesõnumitele regeerimisi",
     "Show message previews for reactions in all rooms": "Näita kõikides jututubades eelvaadetes sõnumitele regeerimisi",
     "Master private key:": "Üldine privaatvõti:",
@@ -2443,15 +2022,11 @@
     "Create community": "Loo kogukond",
     "Explore community rooms": "Sirvi kogukonna jututubasid",
     "Create a room in %(communityName)s": "Loo uus jututuba %(communityName)s kogukonda",
-    "Cross-signing and secret storage are ready for use.": "Risttunnustamine ja turvahoidla on kasutamiseks valmis.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Risttunnustamine on kasutamiseks valmis, kuid turvahoidla ei ole hetkel krüptovõtmete varundamiseks kasutusel.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Omavahelisi jututubasid on võimalik leida ning nendega liituda vaid kutse alusel. Avalikke jututubasid saavad kõik leida ning nendega liituda.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Omavahelisi jututubasid on võimalik leida ning nendega liituda vaid kutse alusel. Selles kogukonnas saavad avalikke jututubasid kõik leida ning nendega liituda.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Sa võid sellise võimaluse kasutusele võtta, kui seda jututuba kasutatakse vaid organisatsioonisiseste tiimide ühistööks oma koduserveri piires. Seda ei saa hiljem muuta.",
     "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.": "Sa võid sellise võimaluse jätta kasutusele võtmata, kui seda jututuba kasutatakse erinevate väliste tiimide ühistööks kasutades erinevaid koduservereid. Seda ei saa hiljem muuta.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Keela kõikide niisuguste kasutajate liitumine selle jututoaga, kelle kasutajakonto ei asu %(serverName)s koduserveris.",
     "May include members not in %(communityName)s": "Siin võib leiduda kasutajaid, kes ei ole %(communityName)s kogukonna liikmed",
-    "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>.": "Alusta vestust teise osapoolega tema nime, kasutajanime (näiteks <userId/>) või e-posti aadressi alusel. Sellega aga sa ei kutsu teda %(communityName)s kogukonna liikmeks. Kui soovid kedagi kutsuda %(communityName)s kogukonda, siis vajuta <a>siia</a>.",
     "There was an error updating your community. The server is unable to process your request.": "Sinu kogukonna andmete uuendamisel tekkis viga. Server ei suuda sinu päringut töödelda.",
     "Update community": "Uuenda kogukonda",
     "Failed to find the general chat for this community": "Ei õnnestunud tuvastada selle kogukonna üldist rühmavestlust",
@@ -2463,10 +2038,6 @@
     "Unknown App": "Tundmatu rakendus",
     "%(count)s results|one": "%(count)s tulemus",
     "Room Info": "Jututoa teave",
-    "Apps": "Rakendused",
-    "Unpin app": "Eemalda rakenduse klammerdus",
-    "Edit apps, bridges & bots": "Muuda rakendusi, sõnumisildu ja roboteid",
-    "Add apps, bridges & bots": "Lisa rakendusi, sõnumisildu ja roboteid",
     "Not encrypted": "Krüptimata",
     "About": "Rakenduse teave",
     "%(count)s people|other": "%(count)s inimest",
@@ -2474,26 +2045,17 @@
     "Show files": "Näita faile",
     "Room settings": "Jututoa seadistused",
     "Take a picture": "Tee foto",
-    "Pin to room": "Klammerda jututoa külge",
-    "You can only pin 2 apps at a time": "Sul võib korraga olla vaid kaks klammerdatud rakendust",
     "Unpin": "Eemalda klammerdus",
-    "Group call modified by %(senderName)s": "%(senderName)s muutis rühmakõnet",
-    "Group call started by %(senderName)s": "%(senderName)s algatas rühmakõne",
-    "Group call ended by %(senderName)s": "%(senderName)s lõpetas rühmakõne",
     "Cross-signing is ready for use.": "Risttunnustamine on kasutamiseks valmis.",
     "Cross-signing is not set up.": "Risttunnustamine on seadistamata.",
     "Backup version:": "Varukoopia versioon:",
     "Algorithm:": "Algoritm:",
-    "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.": "Selleks puhuks, kui sa kaotad ligipääsu kõikidele oma sessioonidele, tee varukoopia oma krüptovõtmetest ja kasutajakonto seadistustest. Unikaalse taastevõtmega tagad selle, et sinu varukoopia on turvaline.",
     "Backup key stored:": "Varukoopia võti on salvestatud:",
     "Backup key cached:": "Varukoopia võti on puhverdatud:",
     "Secret storage:": "Turvahoidla:",
     "ready": "valmis",
     "not ready": "ei ole valmis",
     "Secure Backup": "Turvaline varundus",
-    "End Call": "Lõpeta kõne",
-    "Remove the group call from the room?": "Kas eemaldame jututoast rühmakõne?",
-    "You don't have permission to remove the call from the room": "Sinul pole õigusi rühmakõne eemaldamiseks sellest jututoast",
     "Start a conversation with someone using their name or username (like <userId/>).": "Alusta vestlust kasutades teise osapoole nime või kasutajanime (näiteks <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Sellega ei kutsu sa teda %(communityName)s kogukonna liikmeks. %(communityName)s kogukonna kutse saatmiseks klõpsi <a>siin</a>",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Kutsu kedagi tema nime, kasutajanime (nagu <userId/>) alusel või <a>jaga seda jututuba</a>.",
@@ -2502,9 +2064,6 @@
     "Widgets": "Vidinad",
     "Edit widgets, bridges & bots": "Muuda vidinaid, võrgusildu ja roboteid",
     "Add widgets, bridges & bots": "Lisa vidinaid, võrgusildu ja roboteid",
-    "You can only pin 2 widgets at a time": "Korraga saavad kinniklammerdatud olla vaid 2 vidinat",
-    "Minimize widget": "Vähenda vidinat",
-    "Maximize widget": "Suurenda vidinat",
     "Your server requires encryption to be enabled in private rooms.": "Sinu koduserveri seadistused eeldavad, et mitteavalikud jututoad asutavad läbivat krüptimist.",
     "Unable to set up keys": "Krüptovõtmete kasutuselevõtmine ei õnnestu",
     "Use the <a>Desktop app</a> to see all encrypted files": "Kõikide krüptitud failide vaatamiseks kasuta <a>Element Desktop</a> rakendust",
@@ -2525,20 +2084,10 @@
     "Remove messages sent by others": "Kustuta teiste saadetud sõnumid",
     "Failed to save your profile": "Sinu profiili salvestamine ei õnnestunud",
     "The operation could not be completed": "Toimingut ei õnnestunud lõpetada",
-    "Calling...": "Helistan...",
-    "Call connecting...": "Kõne on ühendamisel...",
-    "Starting camera...": "Käivitan kaamerat...",
-    "Starting microphone...": "Lülitan mikrofoni sisse...",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s muutis seda jututuba teenindavate koduserverite loendit.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s seadistas seda jututuba teenindavate koduserverite loendi.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Kõikidel serveritel on keeld seda jututuba teenindada! Seega seda jututuba ei saa enam kasutada.",
-    "(an error occurred)": "(tekkis viga)",
-    "(their device couldn't start the camera / microphone)": "(teise osapoole seadmes ei õnnestunud sisse lülitada kaamerat või mikrofoni)",
-    "(connection failed)": "(ühendus ebaõnnestus)",
     "The call could not be established": "Kõnet ei saa korraldada",
-    "%(senderName)s declined the call.": "%(senderName)s ei võtnud kõnet vastu.",
-    "The other party declined the call.": "Teine osapool ei võtnud kõnet vastu.",
-    "Call Declined": "Kõne on tagasilükatud",
     "Move right": "Liigu paremale",
     "Move left": "Liigu vasakule",
     "Revoke permissions": "Tühista õigused",
@@ -2563,7 +2112,6 @@
     "Feedback sent": "Tagasiside on saadetud",
     "%(senderName)s ended the call": "%(senderName)s lõpetas kõne",
     "You ended the call": "Sina lõpetasid kõne",
-    "Now, lets help you get started": "Nüüd näitame sulle, mida saad järgmiseks teha",
     "Welcome %(name)s": "Tere tulemast, %(name)s",
     "Add a photo so people know it's you.": "Enda tutvustamiseks lisa foto.",
     "Great, that'll help people know it's you": "Suurepärane, nüüd teised teavad et tegemist on sinuga",
@@ -2829,7 +2377,7 @@
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Sõnumid siin jututoas on läbivalt krüptitud. Klõpsides tunnuspilti saad kontrollida kasutaja %(displayName)s profiili.",
     "%(creator)s created this DM.": "%(creator)s alustas seda otsesuhtlust.",
     "This is the start of <roomName/>.": "See on <roomName/> jututoa algus.",
-    "Add a photo, so people can easily spot your room.": "Selle, et teised märkaks sinu jututuba lihtsamini, palun lisa üks pilt.",
+    "Add a photo, so people can easily spot your room.": "Selleks, et teised märkaks sinu jututuba lihtsamini, palun lisa üks pilt.",
     "%(displayName)s created this room.": "%(displayName)s lõi selle jututoa.",
     "You created this room.": "Sa lõid selle jututoa.",
     "<a>Add a topic</a> to help people know what it is about.": "Selleks, et teised teaks millega on tegemist, palun <a>lisa teema</a>.",
@@ -2837,12 +2385,8 @@
     "Topic: %(topic)s (<a>edit</a>)": "Teema: %(topic)s (<a>muudetud</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "See on sinu ja kasutaja <displayName/> otsesuhtluse ajaloo algus.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Seni kuni emb-kumb teist kolmandaid osapooli liituma ei kutsu, olete siin vestluses vaid teie kahekesi.",
-    "Call Paused": "Kõne on ajutiselt peatatud",
     "Takes the call in the current room off hold": "Võtab selles jututoas ootel oleva kõne",
     "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele",
-    "Role": "Roll",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
     "Filter rooms and people": "Otsi jututubasid ja inimesi",
     "Open the link in the email to continue registration.": "Registreerimisega jätkamiseks vajuta e-kirjas olevat linki.",
     "A confirmation email has been sent to %(emailAddress)s": "Saatsime kinnituskirja %(emailAddress)s aadressile",
@@ -2925,9 +2469,7 @@
     "No other application is using the webcam": "Ainsamgi muu rakendus ei kasuta veebikaamerat",
     "Permission is granted to use the webcam": "Rakendusel õigus veebikaamerat kasutada",
     "A microphone and webcam are plugged in and set up correctly": "Veebikaamera ja mikrofon oleks ühendatud ja seadistatud",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "Kuna veebikaamerat või mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et:",
     "Unable to access webcam / microphone": "Puudub ligipääs veebikaamerale ja mikrofonile",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Kuna mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et mikrofon oleks ühendatud ja seadistatud.",
     "Unable to access microphone": "Puudub ligipääs mikrofonile",
     "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.": "Serveri seadistusi muutes võid teise koduserveri aadressi sisestamisel logida sisse muudesse Matrix'i serveritesse. See võimaldab sul vestlusrakenduses Element kasutada olemasolevat kasutajakontot teises koduserveris.",
     "Continuing without email": "Jätka ilma e-posti aadressi seadistamiseta",
@@ -2951,7 +2493,6 @@
     "Learn more": "Loe veel",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "Kui sul on oma koduserveri eelistus olemas, siis kasuta seda. Samuti võid soovi korral oma enda koduserveri püsti panna.",
     "Other homeserver": "Muu koduserver",
-    "We call the places you where you can host your account ‘homeservers’.": "Me nimetame „koduserveriks“ sellist serverit, mis haldab sinu kasutajakontot.",
     "Sign into your homeserver": "Logi sisse oma koduserverisse",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org on maailma suurim avalik koduserver ja see sobib paljude jaoks.",
     "Specify a homeserver": "Sisesta koduserver",
@@ -2964,14 +2505,12 @@
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Kuna mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et mikrofon oleks ühendatud ja seadistatud.",
     "sends confetti": "saatis serpentiine",
     "Sends the given message with confetti": "Lisab sellele sõnumile serpentiine",
-    "Show chat effects": "Näita vestlustes efekte",
     "Effects": "Vahvad täiendused",
     "Hold": "Pane ootele",
     "Resume": "Jätka",
     "%(peerName)s held the call": "%(peerName)s pani kõne ootele",
     "You held the call <a>Resume</a>": "Sa panid kõne ootele. <a>Jätka kõnet</a>",
     "You've reached the maximum number of simultaneous calls.": "Oled jõudnud suurima lubatud samaaegsete kõnede arvuni.",
-    "%(name)s paused": "%(name)s peatas ajutiselt kõne",
     "Too Many Calls": "Liiga palju kõnesid",
     "sends fireworks": "saadab ilutulestiku",
     "Sends the given message with fireworks": "Lisab sellele sõnumile ilutulestiku",
@@ -2988,7 +2527,6 @@
     "There was an error finding this widget.": "Selle vidina leidmisel tekkis viga.",
     "Active Widgets": "Kasutusel vidinad",
     "Open dial pad": "Ava numbriklahvistik",
-    "Start a Conversation": "Alusta vestlust",
     "Dial pad": "Numbriklahvistik",
     "There was an error looking up the phone number": "Telefoninumbri otsimisel tekkis viga",
     "Unable to look up phone number": "Telefoninumbrit ei õnnestu leida",
@@ -3012,7 +2550,6 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Ei õnnestu saada ligipääsu turvahoidlale. Palun kontrolli, et sa oleksid sisestanud õige turvafraasi.",
     "Invalid Security Key": "Vigane turvavõti",
     "Wrong Security Key": "Vale turvavõti",
-    "We recommend you change your password and Security Key in Settings immediately": "Me soovitame, et vaheta Seadistuste lehelt koheselt oma salasõna ja turvavõti",
     "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.": "Selleks puhuks, kui sa kaotad ligipääsu kõikidele oma sessioonidele, tee varukoopia oma krüptovõtmetest ja kasutajakonto seadistustest. Unikaalse turvavõtmega tagad selle, et sinu varukoopia on kaitstud.",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Oleme tuvastanud, et selles sessioonis ei leidu turvafraasi ega krüptitud sõnumite turvavõtit.",
     "A new Security Phrase and key for Secure Messages have been detected.": "Tuvastasin krüptitud sõnumite uue turvafraasi ja turvavõtme.",
@@ -3024,7 +2561,6 @@
     "Your Security Key": "Sinu turvavõti",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Sinu turvavõti toimib julgestusena - juhul, kui sa unustad turvafraasi, siis sa saad seda kasutada taastamaks ligipääsu krüptitud sõnumitele.",
     "Repeat your Security Phrase...": "Korda oma turvafraasi...",
-    "Please enter your Security Phrase a second time to confirm.": "Kinnitamiseks palun sisesta turvafraas teist korda.",
     "Set up with a Security Key": "Võta kasutusele turvavõti",
     "Great! This Security Phrase looks strong enough.": "Suurepärane! Turvafraas on piisavalt kange.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Me salvestame krüptitud koopia sinu krüptovõtmetest oma serveris. Selle koopia krüptimisel kasutame sinu turvafraasi.",
@@ -3034,8 +2570,6 @@
     "Remember this": "Jäta see meelde",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "See vidin verifitseerib sinu kasutajatunnuse, kuid ta ei saa sinu nimel toiminguid teha:",
     "Allow this widget to verify your identity": "Luba sellel vidinal sinu isikut verifitseerida",
-    "Use Ctrl + F to search": "Otsimiseks vajuta Ctrl + F klahve",
-    "Use Command + F to search": "Otsimiseks vajuta Cmd + F klahve",
     "Converts the DM to a room": "Muuda otsevestlus jututoaks",
     "Converts the room to a DM": "Muuda jututuba otsevestluseks",
     "Use app for a better experience": "Rakendusega saad Matrix'is suhelda parimal viisil",
@@ -3048,9 +2582,6 @@
     "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.": "Me sättisime nii, et sinu veebibrauser jätaks järgmiseks sisselogimiseks meelde sinu koduserveri, kuid kahjuks on ta selle unustanud. Palun mine sisselogimise lehele ja proovi uuesti.",
     "We couldn't log you in": "Meil ei õnnestunud sind sisse logida",
     "Show stickers button": "Näita kleepsude nuppu",
-    "Windows": "Aknad",
-    "Screens": "Ekraanid",
-    "Share your screen": "Jaga oma ekraani",
     "Show line numbers in code blocks": "Näita koodiblokkides reanumbreid",
     "Expand code blocks by default": "Vaikimisi kuva koodiblokid tervikuna",
     "Recently visited rooms": "Hiljuti külastatud jututoad",
@@ -3058,7 +2589,6 @@
     "Abort": "Katkesta",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Kas sa oled kindel, et soovid katkestada seoste loomise? Sel juhul me edasi ei jätka.",
     "Confirm abort of host creation": "Kinnita seoste loomise katkestamine",
-    "Upgrade to pro": "Võta kasutusele tasuline teenus",
     "Minimize dialog": "Tee aken väikeseks",
     "Maximize dialog": "Tee aken suureks",
     "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s seadistus",
@@ -3101,9 +2631,7 @@
     "Unable to start audio streaming.": "Audiovoo käivitamine ei õnnestu.",
     "Save Changes": "Salvesta muutused",
     "Saving...": "Salvestan...",
-    "View dev tools": "Näita arendaja töövahendeid",
     "Leave Space": "Lahku kogukonnakeskusest",
-    "Make this space private": "Muuda see kogukonnakeskus privaatseks",
     "Edit settings relating to your space.": "Muuda oma kogukonnakeskuse seadistusi.",
     "Space settings": "Kogukonnakeskuse seadistused",
     "Failed to save space settings.": "Kogukonnakeskuse seadistuste salvestamine ei õnnestunud.",
@@ -3111,19 +2639,12 @@
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Kutsu teist osapoolt tema nime, e-posti aadressi, kasutajanime (nagu <userId/>) alusel või <a>jaga seda kogukonnakeskust</a>.",
     "Unnamed Space": "Nimetu kogukonnakeskus",
     "Invite to %(spaceName)s": "Kutsu kogukonnakeskusesse %(spaceName)s",
-    "Failed to add rooms to space": "Jututubade lisamine kogukonnakeskusesse ei õnnestunud",
-    "Apply": "Rakenda",
-    "Applying...": "Rakendan...",
     "Create a new room": "Loo uus jututuba",
-    "Don't want to add an existing room?": "Kas sa ei soovi lisada olemasolevat jututuba?",
     "Spaces": "Kogukonnakeskused",
-    "Filter your rooms and spaces": "Otsi olemasolevate kogukonnakeskuste ja jututubade seast",
-    "Add existing spaces/rooms": "Lisa olemasolevaid kogukonnakeskuseid ja jututube",
     "Space selection": "Kogukonnakeskuse valik",
     "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.": "Kuna sa vähendad enda õigusi, siis sul ei pruugi hiljem olla võimalik seda muutust tagasi pöörata. Kui sa juhtumisi oled viimane haldusõigustega kasutaja kogukonnakeskuses, siis hiljem on võimatu samu õigusi tagasi saada.",
     "Empty room": "Tühi jututuba",
     "Suggested Rooms": "Soovitatud jututoad",
-    "Explore space rooms": "Tutvu kogukonnakeskuses leiduvate jututubadega",
     "You do not have permissions to add rooms to this space": "Sul pole õigusi siia kogukonnakeskusesse lisada jututubasid",
     "Add existing room": "Lisa olemasolev jututuba",
     "You do not have permissions to create new rooms in this space": "Sul pole õigusi luua siin kogukonnakeskuses uusi jututubasid",
@@ -3134,11 +2655,8 @@
     "Sending your message...": "Saadan sinu sõnumit...",
     "Spell check dictionaries": "Õigekirja sõnastikud",
     "Space options": "Kogukonnakeskus eelistused",
-    "Space Home": "Kogukonnakeskuse avaleht",
-    "New room": "Uus jututuba",
     "Leave space": "Lahku kogukonnakeskusest",
     "Share your public space": "Jaga oma avalikku kogukonnakeskust",
-    "Invite members": "Kutsu uusi osalejaid",
     "Invite people": "Kutsu teisi kasutajaid",
     "Share invite link": "Jaga kutse linki",
     "Click to copy": "Kopeerimiseks klõpsa",
@@ -3147,7 +2665,6 @@
     "Creating...": "Loon...",
     "Your private space": "Sinu privaatne kogukonnakeskus",
     "Your public space": "Sinu avalik kogukonnakeskus",
-    "You can change this later": "Sa võid seda hiljem muuta",
     "Invite only, best for yourself or teams": "Liitumine vaid kutse alusel, sobib sulle ja sinu lähematele kaaslastele",
     "Private": "Privaatne",
     "Open space for anyone, best for communities": "Avaliku ligipääsuga kogukonnakeskus",
@@ -3155,11 +2672,8 @@
     "Create a space": "Loo kogukonnakeskus",
     "Delete": "Kustuta",
     "Jump to the bottom of the timeline when you send a message": "Sõnumi saatmiseks hüppa ajajoone lõppu",
-    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Kogukonnakeskuse prototüüp. Ei ühildu varasemate kogukonnalehtedega ega kohandatud siltidega. Mõned funktsionaalsused eeldavad ühilduva koduserveri kasutamist.",
     "%(count)s members|other": "%(count)s liiget",
     "%(count)s members|one": "%(count)s liige",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Seadmest %(deviceName)s (%(deviceId)s) aadressiga %(ip)s",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Kogukonnakeskused on uus viis inimeste ja jututubade ühendamiseks. Kogukonnakeskusega liitumiseks vajad sa kutset.",
     "Add some details to help people recognise it.": "Tegemaks teiste jaoks äratundmise lihtsamaks, palun lisa natuke teavet.",
     "You can change these anytime.": "Sa võid neid alati muuta.",
     "Invite with email or username": "Kutsu e-posti aadressi või kasutajanime alusel",
@@ -3174,16 +2688,7 @@
     "%(count)s rooms|one": "%(count)s jututuba",
     "This room is suggested as a good one to join": "Teised kasutajad soovitavad liitumist selle jututoaga",
     "Suggested": "Soovitatud",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Kui sa ei leia otsitavat jututuba, siis palu sinna kutset või <a>loo uus jututuba</a>.",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s jututuba ja %(numSpaces)s kogukonnakeskust",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s jututuba ja %(numSpaces)s kogukonnakeskust",
-    "%(count)s rooms and 1 space|other": "%(count)s jututuba ja 1 kogukonnakeskus",
-    "%(count)s rooms and 1 space|one": "%(count)s jututuba ja 1 kogukonnakeskus",
-    "Add existing rooms & spaces": "Lisa olemasolevaid jututubasid ja kogukonnakeskuseid",
-    "Default Rooms": "Vaikimisi jututoad",
     "Your server does not support showing space hierarchies.": "Sinu koduserver ei võimalda kuvada kogukonnakeskuste hierarhiat.",
-    "Your public space <name/>": "Sinu avalik kogukonnakeskus <name/>",
-    "Your private space <name/>": "Sinu privaatne kogukonnakeskus <name/>",
     "Welcome to <name/>": "Tete tulemast <name/> liikmeks",
     "Random": "Juhuslik",
     "Support": "Toeta",
@@ -3198,7 +2703,6 @@
     "Inviting...": "Kutsun...",
     "Invite your teammates": "Kutsu oma kaasteelisi",
     "Invite by username": "Kutsu kasutajanime alusel",
-    "What are some things you want to discuss?": "Mis on need teemad, mida tahaksid arutada?",
     "What projects are you working on?": "Mis ettevõtmistega sa tegeled?",
     "Decrypted event source": "Sündmuse dekrüptitud lähtekood",
     "Original event source": "Algse sündmuse lähtekood",
@@ -3208,7 +2712,6 @@
     "Mark as suggested": "Märgi soovituseks",
     "No results found": "Tulemusi ei ole",
     "You may want to try a different search or check for typos.": "Aga proovi muuta otsingusõna või kontrolli ega neis trükivigu polnud.",
-    "Search names and description": "Otsi nimede ja kirjelduste seast",
     "<inviter/> invites you": "<inviter/> saatis sulle kutse",
     "Public space": "Avalik kogukonnakeskus",
     "Private space": "Privaatne kogukonnakeskus",
@@ -3219,13 +2722,8 @@
     "Just me": "Vaid mina",
     "A private space to organise your rooms": "Privaatne kogukonnakeskus jututubade koondamiseks",
     "Make sure the right people have access. You can invite more later.": "Kontrolli, et vajalikel inimestel oleks siia ligipääs. Teistele võid kutse saata ka hiljem.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Loome nüüd igaühe jaoks jututoa. Sa võid neid ka hiljem lisada, sealhulgas olemasolevaid.",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Ma loome igaühe jaoks jututoa. Sa võid neid ka hiljem lisada, sealhulgas olemasolevaid.",
-    "Verify with another session": "Verifitseeri teise sessiooniga",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Oma krüptitud sõnumite lugemiseks verifitseeri see sisselogimissessioon. Samaga kinnitad ka teistele, et tegemist on tõesti sinuga.",
-    "Open": "Ava",
     "Check your devices": "Kontrolli oma seadmeid",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Uus sisselogimissessioon kasutab sinu Matrixi kontot: %(name)s %(deviceID)s aadressil %(ip)s",
     "You have unverified logins": "Sul on verifitseerimata sisselogimissessioone",
     "Manage & explore rooms": "Halda ja uuri jututubasid",
     "Warn before quitting": "Hoiata enne rakenduse töö lõpetamist",
@@ -3234,12 +2732,8 @@
     "Adding...": "Lisan...",
     "Sends the given message as a spoiler": "Saadab selle sõnumi rõõmurikkujana",
     "unknown person": "tundmatu isik",
-    "Send and receive voice messages (in development)": "Saada ja võta vastu häälsõnumeid (arendusjärgus)",
     "%(deviceId)s from %(ip)s": "%(deviceId)s ip-aadressil %(ip)s",
     "Review to ensure your account is safe": "Tagamaks, et su konto on sinu kontrolli all, vaata andmed üle",
-    "Share decryption keys for room history when inviting users": "Kasutajate kutsumisel jaga jututoa ajaloo võtmeid",
-    "Record a voice message": "Salvesta häälsõnum",
-    "Stop & send recording": "Lõpeta salvestamine ja saada häälsõnum",
     "Add existing rooms": "Lisa olemasolevaid jututubasid",
     "%(count)s people you know have already joined|other": "%(count)s sulle tuttavat kasutajat on juba liitunud",
     "We couldn't create your DM.": "Otsesuhtluse loomine ei õnnestunud.",
@@ -3249,14 +2743,11 @@
     "Reset event store": "Lähtesta sündmuste andmekogu",
     "Verify other login": "Verifitseeri muu sisselogimissessioon",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Suhtlen teise osapoolega %(transferTarget)s. <a>Saadan andmeid kasutajale %(transferee)s</a>",
-    "Message search initilisation failed": "Sõnumite otsingu alustamine ei õnnestunud",
-    "Invite messages are hidden by default. Click to show the message.": "Kutsed on vaikimisi peidetud. Sõnumi nägemiseks klõpsi.",
     "Accept on your other login…": "Nõustu oma teise sisselogimissessiooniga…",
     "Avatar": "Tunnuspilt",
     "Verification requested": "Verifitseerimistaotlus on saadetud",
     "%(count)s people you know have already joined|one": "%(count)s sulle tuttav kasutaja on juba liitunud",
     "You most likely do not want to reset your event index store": "Pigem sa siiski ei taha lähtestada sündmuste andmekogu ja selle indeksit",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Kui sa siiski soovid seda teha, siis sinu sõnumeid me ei kustuta, aga seniks kuni sõnumite indeks taustal uuesti luuakse, toimib otsing aeglaselt ja ebatõhusalt",
     "You can add more later too, including already existing ones.": "Sa võid ka hiljem siia luua uusi jututubasid või lisada olemasolevaid.",
     "What are some things you want to discuss in %(spaceName)s?": "Mida sa sooviksid arutada %(spaceName)s kogukonnakeskuses?",
     "Please choose a strong password": "Palun tee üks korralik salasõna",
@@ -3291,19 +2782,14 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Lisamiseks vali vestlusi ja jututubasid. Hetkel on see kogukonnakeskus vaid sinu jaoks ja esialgu keegi ei saa sellest teada. Teisi saad liituma kutsuda hiljem.",
     "What do you want to organise?": "Mida sa soovid ette võtta?",
     "Filter all spaces": "Otsi kõikides kogukonnakeskustest",
-    "Delete recording": "Kustuta salvestus",
-    "Stop the recording": "Lõpeta salvestamine",
     "%(count)s results in all spaces|one": "%(count)s tulemus kõikides kogukonnakeskustes",
     "%(count)s results in all spaces|other": "%(count)s tulemust kõikides kogukonnakeskustes",
     "You have no ignored users.": "Sa ei ole veel kedagi eiranud.",
     "Play": "Esita",
     "Pause": "Peata",
-    "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Kas sa tahaksid katsetada? Sa tutvud meie rakenduse uuendustega teistest varem ja võib-olla isegi saad mõjutada arenduse lõpptulemust. <a>Lisateavet liad siit</a>.",
+    "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Kas sa tahaksid katsetada? Sa tutvud meie rakenduse uuendustega teistest varem ja võib-olla isegi saad mõjutada arenduse lõpptulemust. <a>Lisateavet leiad siit</a>.",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>See on katseline funktsionaalsus.</b> Seetõttu uued kutse saanud kasutajad peavad tegelikuks liitumiseks avama kutse siin <link/>.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "%(spaceName)s kogukonnakeskusega liitumiseks lülita sisse <a>vastav katseline funktsionaalsus</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "%(spaceName)s kogukonnakeskuse vaatamiseks lülita sisse <a>vastav katseline funktsionaalsus</a>",
     "Select a room below first": "Esmalt vali alljärgnevast üks jututuba",
-    "Communities are changing to Spaces": "Seniste kogukondade asemele tulevad kogukonnakeskused",
     "Join the beta": "Hakka kasutama beetaversiooni",
     "Leave the beta": "Lõpeta beetaversiooni kasutamine",
     "Beta": "Beetaversioon",
@@ -3313,8 +2799,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Lisan jututuba...",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Lisan jututubasid... (%(progress)s/%(count)s)",
     "Not all selected were added": "Kõiki valituid me ei lisanud",
-    "You can add existing spaces to a space.": "Sa võid kogukonnakeskusele lisada ka teisi kogukonnakeskuseid.",
-    "Feeling experimental?": "Kas sa tahaksid natukene katsetada?",
     "You are not allowed to view this server's rooms list": "Sul puuduvad õigused selle serveri jututubade loendi vaatamiseks",
     "Error processing voice message": "Viga häälsõnumi töötlemisel",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Me ei suutnud sinu seadmest leida mikrofoni. Palun kontrolli seadistusi ja proovi siis uuesti.",
@@ -3323,27 +2807,356 @@
     "Unable to access your microphone": "Puudub ligipääs mikrofonile",
     "Your access token gives full access to your account. Do not share it with anyone.": "Sinu pääsuluba annab täismahulise ligipääsu sinu kasutajakontole. Palun ära jaga seda teistega.",
     "Access Token": "Pääsuluba",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Kogukonnakeskused on uus viis inimeste ja jututubade ühendamiseks. Kogukonnakeskusega liitumiseks vajad sa kutset.",
     "Please enter a name for the space": "Palun sisesta kogukonnakeskuse nimi",
     "Connecting": "Kõne on ühendamisel",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Kasuta võrdõigusvõrku 1:1 kõnede jaoks (kui sa P2P-võrgu sisse lülitad, siis teine osapool ilmselt näeb sinu IP-aadressi)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Rakenduse beetaversioon on saadaval veebirakendusena, töölauarakendusena ja Androidi jaoks. Kõik funtsionaalsused ei pruugi sinu koduserveri poolt olla toetatud.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Sa võid beetaversiooni kasutamise lõpetada niipea, kui tahad. Selleks klõpsi beeta-silti, mida näed siin samas ülal.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "Käivitame %(brand)s uuesti nii, et kogukonnakeskused on kasutusel. Vana tüüpi kogukonnad ja kohandatud sildid on siis välja lülitatud.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Käivitame %(brand)s uuesti nii, et kogukonnakeskused ei ole kasutusel. Vana tüüpi kogukonnad ja kohandatud sildid saavad jälle olema kasutusel.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Rakenduse beetaversioon on saadaval veebirakendusena, töölauarakendusena ja Androidi jaoks. Tänud, et oled huviline katsetama meie rakendust.",
     "Spaces are a new way to group rooms and people.": "Kogukonnakeskused on uus viis jututubade ja inimeste ühendamiseks.",
-    "Spaces are a beta feature.": "Kogukonnakeskused on veel katsetamisjärgus funktsionaalsus.",
     "Search names and descriptions": "Otsi nimede ja kirjelduste seast",
     "You may contact me if you have any follow up questions": "Kui sul on lisaküsimusi, siis vastan neile hea meelega",
     "To leave the beta, visit your settings.": "Beetaversiooni saad välja lülitada rakenduse seadistustest.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Lisame sinu kommentaaridele ka kasutajanime ja operatsioonisüsteemi.",
     "%(featureName)s beta feedback": "%(featureName)s testversiooni tagasiside",
     "Thank you for your feedback, we really appreciate it.": "Täname sind nende kommentaaride eest.",
-    "Beta feedback": "Tagasiside testversioonile",
     "Add reaction": "Lisa reaktsioon",
-    "Send and receive voice messages": "Saada ja võta vastu häälsõnumeid",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Sinu tagasiside aitab teha kogukonnakeskuseid paremaks. Mida detailsemalt sa oma arvamust kirjeldad, seda parem.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Kui sa lahkud, siis käivitame %(brand)s uuesti nii, et kogukonnakeskused ei ole kasutusel. Vana tüüpi kogukonnad ja kohandatud sildid saavad jälle olema kasutusel.",
-    "Message search initialisation failed": "Sõnumite otsingu alustamine ei õnnestunud"
+    "Message search initialisation failed": "Sõnumite otsingu alustamine ei õnnestunud",
+    "sends space invaders": "korraldab ühe pisikese tulnukate vallutusretke",
+    "Sends the given message with a space themed effect": "Saadab antud sõnumi kosmoseteemalise efektiga",
+    "Go to my space": "Palun vaata minu kogukonnakeskust",
+    "User Busy": "Kasutaja on hõivatud",
+    "The user you called is busy.": "Kasutaja, kellele sa helistasid, on hõivatud.",
+    "No results for \"%(query)s\"": "Päringule „%(query)s“ pole vastuseid",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Proovi muid otsingusõnu või kontrolli, et neis polnud trükivigu. Kuna mõned otsingutulemused on privaatsed ja sa vajad kutset nende nägemiseks, siis kõiki tulemusi siin ei pruugi näha olla.",
+    "Currently joining %(count)s rooms|other": "Parasjagu liitun %(count)s jututoaga",
+    "Currently joining %(count)s rooms|one": "Parasjagu liitun %(count)s jututoaga",
+    "Teammates might not be able to view or join any private rooms you make.": "Kui muudad jututoa privaatseks, siis sinu kaaslased ei pruugi seda näha ega temaga liituda.",
+    "If you can't see who you’re looking for, send them your invite link below.": "Kui sa ei leia otsitavaid, siis saada neile kutse.",
+    "Or send invite link": "Või saada kutse link",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Kui sul on vastavad õigused olemas, siis ava sõnumi juuresolev menüü ning püsisõnumi tekitamiseks vali <b>Klammerda</b>.",
+    "Pinned messages": "Klammerdatud sõnumid",
+    "Nothing pinned, yet": "Klammerdatud sõnumeid veel pole",
+    "End-to-end encryption isn't enabled": "Läbiv krüptimine pole kasutusel",
+    "Some suggestions may be hidden for privacy.": "Mõned soovitused võivad privaatsusseadistuste tõttu olla peidetud.",
+    "Search for rooms or people": "Otsi jututubasid või inimesi",
+    "Forward message": "Edasta sõnum",
+    "Open link": "Ava link",
+    "Sent": "Saadetud",
+    "You don't have permission to do this": "Sul puuduvad selleks toiminguks õigused",
+    "Error - Mixed content": "Viga - erinev sisu",
+    "Error loading Widget": "Viga vidina laadimisel",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s muutis selle jututoa <a>klammerdatud sõnumeid</a>.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s müksas kasutajat %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s müksas kasutajat %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s võttis tagasi %(targetName)s kutse",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s võttis tagasi %(targetName)s kutse: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s taastas ligipääsu kasutajale %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s lahkus jututoast",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s lahkus jututoast: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s lükkas kutse tagasi",
+    "%(targetName)s joined the room": "%(targetName)s liitus jututoaga",
+    "%(senderName)s made no change": "%(senderName)s ei teinud muutusi",
+    "%(senderName)s set a profile picture": "%(senderName)s määras oma profiilipildi",
+    "%(senderName)s changed their profile picture": "%(senderName)s muutis oma profiilipilti",
+    "%(senderName)s removed their profile picture": "%(senderName)s eemaldas oma profiilipildi",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s eemaldas oma kuvatava nime (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s määras oma kuvatava nime %(displayName)s-ks",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s muutis oma kuvatava nime %(displayName)s-ks",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s keelas ligipääsu kasutajale %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s keelas ligipääsu kasutajale %(targetName)s: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s võttis kutse vastu",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s võttis vastu kutse %(displayName)s nimel",
+    "Some invites couldn't be sent": "Mõnede kutsete saatmine ei õnnestunud",
+    "Visibility": "Nähtavus",
+    "This may be useful for public spaces.": "Seda saad kasutada näiteks avalike kogukonnakeskuste puhul.",
+    "Guests can join a space without having an account.": "Külalised võivad liituda kogukonnakeskusega ilma kasutajakontota.",
+    "Enable guest access": "Luba ligipääs külalistele",
+    "Failed to update the history visibility of this space": "Ei õnnestunud selle kogukonnakekuse ajaloo loetavust uuendada",
+    "Failed to update the guest access of this space": "Ei õnnestunud selle kogukonnakekuse külaliste ligipääsureegleid uuendada",
+    "Failed to update the visibility of this space": "Kogukonnakeskuse nähtavust ei õnnestunud uuendada",
+    "Address": "Aadress",
+    "e.g. my-space": "näiteks minu kogukond",
+    "Silence call": "Vaigista kõne",
+    "Sound on": "Lõlita heli sisse",
+    "To publish an address, it needs to be set as a local address first.": "Aadressi avaldamiseks peab ta esmalt olema määratud kohalikuks aadressiks.",
+    "Published addresses can be used by anyone on any server to join your room.": "Avaldatud aadresse saab igaüks igast serverist kasutada liitumiseks sinu jututoaga.",
+    "Published addresses can be used by anyone on any server to join your space.": "Avaldatud aadresse saab igaüks igast serverist kasutada liitumiseks sinu kogukonnakeskusega.",
+    "This space has no local addresses": "Sellel kogukonnakeskusel puuduvad kohalikud aadressid",
+    "Space information": "Kogukonnakeskuse teave",
+    "Collapse": "ahenda",
+    "Expand": "laienda",
+    "Recommended for public spaces.": "Soovitame avalike kogukonnakeskuste puhul.",
+    "Allow people to preview your space before they join.": "Luba huvilistel enne liitumist näha kogukonnakeskuse eelvaadet.",
+    "Preview Space": "Kogukonnakeskuse eelvaade",
+    "Decide who can view and join %(spaceName)s.": "Otsusta kes saada näha ja liituda %(spaceName)s kogukonnaga.",
+    "Show all rooms in Home": "Näita kõiki jututubasid avalehel",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Selleks et teised kasutajad saaks seda kogukonda leida oma koduserveri kaudu (%(localDomain)s) seadista talle aadressid",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s kasutaja muutis serveri pääsuloendit",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s kasutaja muutis serveri pääsuloendit %(count)s korda",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s kasutajat muutsid serveri pääsuloendit %(count)s korda",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s kasutajat muutsid serveri pääsuloendit",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Sõnumite otsingu ettevalmistamine ei õnnestunud, lisateavet leiad <a>rakenduse seadistustest</a>",
+    "To view %(spaceName)s, you need an invite": "%(spaceName)s kogukonnaga tutvumiseks vajad sa kutset",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Koondvaates võid alati klõpsida tunnuspilti ning näha vaid selle kogukonnaga seotud jututubasid ja inimesi.",
+    "Move down": "Liiguta alla",
+    "Move up": "Liiguta üles",
+    "Report": "Teata sisust",
+    "Collapse reply thread": "Ahenda vastuste jutulõng",
+    "Show preview": "Näita eelvaadet",
+    "View source": "Vaata algset teavet",
+    "Forward": "Edasi",
+    "Settings - %(spaceName)s": "Seadistused - %(spaceName)s",
+    "Toxic Behaviour": "Ebasobilik käitumine",
+    "Report the entire room": "Teata tervest jututoast",
+    "Spam or propaganda": "Spämm või propaganda",
+    "Illegal Content": "Seadustega keelatud sisu",
+    "Disagree": "Ma ei nõustu sisuga",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "See jututuba tundub olema keskendunud seadusevastase või ohtliku sisu levitamisele, kuid võib-olla ka ei suuda moderaatorid sellist sisu kõrvaldada.\n%(homeserver)s koduserveri haldajad saavad selle kohta teate.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "See jututuba tundub olema keskendunud seadusevastase või ohtliku sisu levitamisele, kuid võib-olla ka ei suuda moderaatorid sellist sisu kõrvaldada.\n%(homeserver)s koduserveri haldajad saavad selle kohta teate, aga kuna jututoa sisu on krüptitud, siis nad ei pruugi saada seda lugeda.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Selle kasutaja tegevus on seadusevastane, milleks võib olla doksimine ehk teiste eraeluliste andmete avaldamine või vägivallaga ähvardamine.\nJututoa moderaatorid saavad selle kohta teate ning nad võivad sellest teatada ka ametivõimudele.",
+    "Please pick a nature and describe what makes this message abusive.": "Palun vali rikkumise olemus ja kirjelda mis teeb selle sõnumi kuritahtlikuks.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Mõni muu põhjus. Palun kirjelda seda detailsemalt.\nJututoa moderaatorid saavad selle kohta teate.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Selle kasutaja loodud sisu on vale.\nJututoa moderaatorid saavad selle kohta teate.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "See kasutaja spämmib jututuba reklaamidega, reklaamlinkidega või propagandaga.\nJututoa moderaatorid saavad selle kohta teate.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Selle kasutaja tegevus on äärmiselt ebasobilik, milleks võib olla teiste jututoas osalejate solvamine, peresõbralikku jututuppa täiskasvanutele mõeldud sisu lisamine või muul viisil jututoa reeglite rikkumine.\nJututoa moderaatorid saavad selle kohta teate.",
+    "Please provide an address": "Palun sisesta aadress",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Meie esimene katsetus modereerimisega. Kui jututoas on modereerimine toetatud, siis „Teata moderaatorile“ nupust võid saada teate ebasobiliku sisu kohta",
+    "Unnamed audio": "Nimetu helifail",
+    "Code blocks": "Lähtekoodi lõigud",
+    "Images, GIFs and videos": "Pildid, gif'id ja videod",
+    "Show %(count)s other previews|other": "Näita %(count)s muud eelvaadet",
+    "Show %(count)s other previews|one": "Näita veel %(count)s eelvaadet",
+    "Error processing audio message": "Viga häälsõnumi töötlemisel",
+    "Integration manager": "Lõiminguhaldur",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Sinu %(brand)s ei võimalda selle tegevuse jaoks kasutada lõiminguhaldurit. Palun küsi lisateavet serveri haldajalt.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Selle vidina kasutamisel võidakse jagada andmeid <helpIcon /> %(widgetDomain)s saitidega ning sinu lõiminguhalduriga.",
+    "Identity server is": "Isikutuvastusserver on",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Lõiminguhalduritel on laiad volitused - nad võivad sinu nimel lugeda seadistusi, kohandada vidinaid, saata jututubade kutseid ning määrata õigusi.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Robotite, vidinate ja kleepsupakkide seadistamiseks kasuta lõiminguhaldurit.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Robotite, vidinate ja kleepsupakkide jaoks kasuta lõiminguhaldurit <b>(%(serverName)s)</b>.",
+    "Identity server": "Isikutuvastusserver",
+    "Identity server (%(server)s)": "Isikutuvastusserver %(server)s",
+    "Could not connect to identity server": "Ei saanud ühendust isikutuvastusserveriga",
+    "Not a valid identity server (status code %(code)s)": "See ei ole sobilik isikutuvastusserver (staatuskood %(code)s)",
+    "Identity server URL must be HTTPS": "Isikutuvastusserveri URL peab kasutama HTTPS-protokolli",
+    "User %(userId)s is already invited to the room": "Kasutaja %(userId)s sai juba kutse sellesse jututuppa",
+    "Use Command + F to search timeline": "Ajajoonelt otsimiseks kasuta Command+F klahve",
+    "Use Ctrl + F to search timeline": "Ajajoonelt otsimiseks kasuta Ctrl+F klahve",
+    "Keyboard shortcuts": "Kiirklahvid",
+    "To view all keyboard shortcuts, click here.": "Vaata siit kõiki kiirklahve.",
+    "User Directory": "Kasutajate kataloog",
+    "Unable to copy room link": "Jututoa lingi kopeerimine ei õnnestu",
+    "Unable to copy a link to the room to the clipboard.": "Jututoa lingi kopeerimine lõikelauale ei õnnestunud.",
+    "Messages containing keywords": "Sõnumid, mis sisaldavad märksõnu",
+    "Error saving notification preferences": "Viga teavistuste eelistuste salvestamisel",
+    "An error occurred whilst saving your notification preferences.": "Sinu teavituste eelistuste salvestamisel tekkis viga.",
+    "Enable for this account": "Võta sellel kontol kasutusele",
+    "Enable email notifications for %(email)s": "Saada teavitusi %(email)s e-posti aadressile",
+    "Keyword": "Märksõnad",
+    "Mentions & keywords": "Mainimised ja märksõnad",
+    "New keyword": "Uus märksõna",
+    "Global": "Üldised",
+    "There was an error loading your notification settings.": "Sinu teavituste seadistuste laadimisel tekkis viga.",
+    "Transfer Failed": "Edasisuunamine ei õnnestunud",
+    "Unable to transfer call": "Kõne edasisuunamine ei õnnestunud",
+    "The call is in an unknown state!": "Selle kõne oleks on teadmata!",
+    "Call back": "Helista tagasi",
+    "No answer": "Keegi ei vasta kõnele",
+    "You're removing all spaces. Access will default to invite only": "Sa oled eemaldamas kõiki kogukonnakeskuseid. Edaspidine ligipääs eeldab kutse olemasolu",
+    "Select spaces": "Vali kogukonnakeskused",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Vali missugustel kogukonnakeskustel on sellele jututoale ligipääs. Kui kogukonnakeskus on valitud, siis selle liikmed saavad <RoomName/> jututuba leida ja temaga liituda.",
+    "Search spaces": "Otsi kogukonnakeskusi",
+    "Spaces you know that contain this room": "Sulle teadaolevad kogukonnakeskused, millesse kuulub see jututuba",
+    "Other spaces or rooms you might not know": "Sellised muud jututoad ja kogukonnakeskused, mida sa ei pruugi teada",
+    "Automatically invite members from this room to the new one": "Kutsu jututoa senised liikmed automaatselt uude jututuppa",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Palun arvesta, et uuendusega tehakse jututoast uus variant</b>. Kõik senised sõnumid jäävad sellesse jututuppa arhiveeritud olekus.",
+    "Only people invited will be able to find and join this room.": "See jututuba on leitav vaid kutse olemasolul ning liitumine on võimalik vaid kutse alusel.",
+    "Create a room": "Loo jututuba",
+    "Private room (invite only)": "Privaatne jututuba (kutse alusel)",
+    "Public room": "Avalik jututuba",
+    "Visible to space members": "Nähtav kogukonnakeskuse liikmetele",
+    "Room visibility": "Jututoa nähtavus",
+    "Spaces with access": "Ligipääsuga kogukonnakeskused",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Kõik kogukonnakeskuse liikmed saavad leida ja liituda. Sa võid valida ka mitu kogukonnakeskust.",
+    "Space members": "Kogukonnakeskuse liikmed",
+    "Decide who can join %(roomName)s.": "Vali, kes saavad liituda %(roomName)s jututoaga.",
+    "People with supported clients will be able to join the room without having a registered account.": "Kõik kes kasutavad sobilikke klientrakendusi, saavad jututoaga liituda ilma kasutajakonto registreerimiseta.",
+    "Access": "Ligipääs",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Kõik <SpaceName/> kogukonna liikmed saavad seda jututuba leida ning võivad temaga liituda.",
+    "You can change this at any time from room settings.": "Sa saad seda alati jututoa seadistustest muuta.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Mitte ainult <SpaceName/> kogukonna liikmed, vaid kõik saavad seda jututuba leida ja võivad temaga liituda.",
+    "You are presenting": "Sina esitad",
+    "%(sharerName)s is presenting": "%(sharerName)s esitab",
+    "Your camera is turned off": "Sinu seadme kaamera on välja lülitatud",
+    "Your camera is still enabled": "Sinu seadme kaamera on jätkuvalt kasutusel",
+    "Screen sharing is here!": "Meil on nüüd olemas ekraanijagamine!",
+    "Share entire screen": "Jaga tervet ekraani",
+    "Application window": "Rakenduse aken",
+    "Share content": "Jaga sisu",
+    "Anyone will be able to find and join this room.": "Kõik saavad seda jututuba leida ja temaga liituda.",
+    "Leave %(spaceName)s": "Lahku %(spaceName)s kogukonnakeskusest",
+    "Decrypting": "Dekrüptin sisu",
+    "Search for rooms or spaces": "Otsi jututubasid või kogukondi",
+    "Spaces are a new feature.": "Kogukonnakeskused on uus funktsionaalsus.",
+    "Spaces feedback": "Tagasiside kogukonnakeskuste kohta",
+    "Give feedback.": "Jaga tagasisidet.",
+    "We're working on this, but just want to let you know.": "Me küll alles arendame seda võimalust, kuid soovisime, et tead, mis tulemas on.",
+    "All rooms you're in will appear in Home.": "Kõik sinu jututoad on nähtavad avalehel.",
+    "Show all rooms": "Näita kõiki jututubasid",
+    "Search %(spaceName)s": "Otsi %(spaceName)s kogukonnast",
+    "You won't be able to rejoin unless you are re-invited.": "Ilma uue kutseta sa ei saa uuesti liituda.",
+    "Want to add a new space instead?": "Kas sa selle asemel soovid lisada uut kogukonnakeskust?",
+    "Create a new space": "Loo uus kogukonnakeskus",
+    "Search for spaces": "Otsi kogukonnakeskusi",
+    "Search for rooms": "Otsi jututube",
+    "Adding spaces has moved.": "Kogukondade lisamine asub nüüd uues kohas.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Kõik <SpaceName/> kogukonna liikmed saavad seda leida ning võivad temaga liituda.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Mitte ainult <SpaceName/> kogukonna liikmed, vaid kõik saavad seda kogukonda leida ja võivad temaga liituda.",
+    "Only people invited will be able to find and join this space.": "See kogukond on leitav vaid kutse olemasolul ning liitumine on võimalik vaid kutse alusel.",
+    "Add a space to a space you manage.": "Lisa kogukond sellesse kogukonda, mida sa juba haldad.",
+    "Space visibility": "Kogukonna nähtavus",
+    "Private space (invite only)": "Privaatne kogukond (kutse alusel)",
+    "Want to add an existing space instead?": "Kas sa selle asemel soovid lisada olemasoleva kogukonnakeskuse?",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Tänud, et katsetasid kogukonnakeskuseid. Sinu tagasiside alusel saame neid tulevikus paremaks teha.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Sa oled selle kogukonna ainus haldaja. Kui lahkud, siis ei leidu enam kedagi, kellel oleks seal haldusõigusi.",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Mõnedes jututubades või kogukondades oled sa ainus haldaja. Kuna sa nüüd soovid neist lahkuda, siis jäävad nad haldajata.",
+    "Send pseudonymous analytics data": "Saada analüütilist teavet suvalise nime alt",
+    "Call declined": "Osapool keeldus kõnest",
+    "Missed call": "Vastamata kõne",
+    "Send voice message": "Saada häälsõnum",
+    "Stop recording": "Lõpeta salvestamine",
+    "Start the camera": "Võta kaamera kasutusele",
+    "Stop the camera": "Lõpeta kaamera kasutamine",
+    "Stop sharing your screen": "Lõpeta oma seadme ekraani jagamine",
+    "Start sharing your screen": "Alusta oma seadme ekraani jagamist",
+    "Hide sidebar": "Peida külgpaan",
+    "Show sidebar": "Näita külgpaani",
+    "More": "Veel",
+    "Dialpad": "Numbriklahvistik",
+    "Unmute the microphone": "Eemalda mikrofoni summutamine",
+    "Mute the microphone": "Summuta mikrofon",
+    "You can create a Space from this community <a>here</a>.": "Sellest vana tüüpi kogukonnast saad luua uue kogukonnakeskuse <a>siin</a>.",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Palu et <a>haldaja</a> muudaks vana kogukonna uueks kogukonnakeskuseks ja oota liitumiskutset.",
+    "Communities can now be made into Spaces": "Vanad kogukonnad saab nüüd muuta uuteks kogukonnakeskusteks",
+    "Spaces are a new way to make a community, with new features coming.": "Kogukonnakeskused on nüüd uus ja pidevalt täienev lahendus seniste kogukondade jaoks.",
+    "Communities won't receive further updates.": "Kogukondade vana funktsionaalsus enam ei uuene.",
+    "Created from <Community />": "Loodud kogukonnas: <Community />",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Vajutades kõne ajal „Jaga ekraani“ nuppu saad sa nüüd ekraanivaadet jagada. Kui mõlemad osapooled seda toetavad, siis toimib see ka tavakõne ajal!",
+    "Add space": "Lisa kogukonnakeskus",
+    "Olm version:": "Olm-teegi versioon:",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s muutsid jututoa <a>klammerdatud sõnumeid</a> %(count)s korda.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s muutis jututoa <a>klammerdatud sõnumeid</a> %(count)s korda.",
+    "Don't send read receipts": "Ära saada lugemisteatisi",
+    "Delete avatar": "Kustuta tunnuspilt",
+    "What kind of Space do you want to create?": "Missugust kogukonnakeskust sooviksid sa luua?",
+    "You can change this later.": "Sa võid seda hiljem muuta.",
+    "Open Space": "Ava kogukonnakeskus",
+    "Create Space": "Loo kogukonnakeskus",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Senised kogukonnad on nüüd arhiveeritud ning nende asemel on kogukonnakeskused. Soovi korral võid oma senised kogukonnad muuta uuteks kogukonnakeskusteks ning seeläbi saad kasutada ka viimaseid uuendusi.",
+    "Show my Communities": "Näita minu kogukondi",
+    "If a community isn't shown you may not have permission to convert it.": "Kui sa kogukonda siin loendis ei näe, siis ei pruugi sul olla piisavalt õigusi.",
+    "This community has been upgraded into a Space": "Oleme selle vana kogukonna alusel loonud uue kogukonnakeskuse",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Uute kogukonnakeskuste nägemiseks peida <a>seadistustest</a> vanad kogukonnad",
+    "Space created": "Kogukonnakeskus on loodud",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> on nüüd olemas kõik vanas kogukonnas osalejad said sinna ka kutse.",
+    "To create a Space from another community, just pick the community in Preferences.": "Kui soovid uut kogukonnakeskust luua mõne teise vana kogukonna alusel, siis vali too seadistustest.",
+    "Failed to migrate community": "Vana kogukonna muutmine uueks kogukonnakeskuseks ei õnnestunud",
+    "Create Space from community": "Loo senise kogukonna alusel uus kogukonnakeskus",
+    "A link to the Space will be put in your community description.": "Uue kogukonnakeskuse viite lisame vana kogukonna kirjeldusele.",
+    "All rooms will be added and all community members will be invited.": "Lisame kõik jututoad ja saadame kitse kõikidele senise kogukonna liikmetele.",
+    "Flair won't be available in Spaces for the foreseeable future.": "Me ei plaani lähitulevikus pakkuda kogukondades rinnamärkide funktsionaalsust.",
+    "This description will be shown to people when they view your space": "Seda kirjeldust kuvame kõigile, kes vaatavad sinu kogukonda",
+    "Unknown failure: %(reason)s": "Tundmatu viga: %(reason)s",
+    "Help space members find private rooms": "Aita kogukonnakeskuse liitmetel leida privaatseid jututube",
+    "New in the Spaces beta": "Mida",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Teised kasutajad said kutse, kuid allpool toodud kasutajatele ei õnnestunud saata kutset <RoomName/> jututuppa",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Kui sa oled teatanud meile GitHub'i vahendusel veast, siis silumislogid aitavad meil seda viga kergemini parandada. Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi, viimatikasutatud liidese funktsionaalsusi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi, viimatikasutatud liidese funktsionaalsusi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Sinu isiklikud sõnumid on tavaliselt läbivalt krüptitud, aga see jututuba ei ole. Tavaliselt on põhjuseks, et kasutusel on mõni seade või meetod nagu e-posti põhised kutsed, mis krüptimist veel ei toeta.",
+    "Enable encryption in settings.": "Võta seadistustes krüptimine kasutusele.",
+    "Cross-signing is ready but keys are not backed up.": "Risttunnustamine on töövalmis, aga krüptovõtmed on varundamata.",
+    "New layout switcher (with message bubbles)": "Uue kujunduse valik (koos sõnumimullidega)",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "See muudab lihtsaks, et jututoad jääksid kogukonnakeskuse piires privaatseks, kuid lasevad kogukonnakeskuses viibivatel inimestel need üles leida ja nendega liituda. Kõik kogukonnakeskuse uued jututoad on selle võimalusega.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Selleks, et aidata kogukonnakeskuse liikmetel leida privaatne jututuba ja sellega liituda, minge selle toa turvalisuse ja privaatsuse seadistustesse.",
+    "Help people in spaces to find and join private rooms": "Aita kogukonnakeskuse liikmetel leida privaatseid jututube ning nendega liituda",
+    "See when people join, leave, or are invited to your active room": "Näita, millal teised sinu aktiivse toaga liituvad, sealt lahkuvad või sellesse tuppa kutsutakse",
+    "Kick, ban, or invite people to your active room, and make you leave": "Aktiivsest toast inimeste väljalükkamine, keelamine või tuppa kutsumine",
+    "See when people join, leave, or are invited to this room": "Näita, millal inimesed toaga liituvad, lahkuvad või siia tuppa kutsutakse",
+    "Kick, ban, or invite people to this room, and make you leave": "Sellest toast inimeste väljalükkamine, keelamine või tuppa kutsumine",
+    "Rooms and spaces": "Jututoad ja kogukonnad",
+    "Results": "Tulemused",
+    "Error downloading audio": "Helifaili allalaadimine ei õnnestunud",
+    "These are likely ones other room admins are a part of.": "Ilmselt on tegemist nendega, mille liikmed on teiste jututubade haldajad.",
+    "& %(count)s more|other": "ja veel %(count)s",
+    "Add existing space": "Lisa olemasolev kogukonnakeskus",
+    "Image": "Pilt",
+    "Sticker": "Kleeps",
+    "An unknown error occurred": "Tekkis teadmata viga",
+    "Their device couldn't start the camera or microphone": "Teise osapoole seadmes ei õnnestunud sisse lülitada kaamerat või mikrofoni",
+    "Connection failed": "Ühendus ebaõnnestus",
+    "Could not connect media": "Meediaseadme ühendamine ei õnnestunud",
+    "Copy Room Link": "Kopeeri jututoa link",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Kõik kogukonnakeskuse liikmed saavad jututuba leida ja sellega liituda. <a>Muuda lubatud kogukonnakeskuste loendit.</a>",
+    "Currently, %(count)s spaces have access|other": "Hetkel on ligipääs %(count)s'l kogukonnakeskusel",
+    "Upgrade required": "Vajalik on uuendus",
+    "Anyone can find and join.": "Kõik saavad jututuba leida ja sellega liituda.",
+    "Only invited people can join.": "Liitumine toimub vaid kutse alusel.",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Võimalike probleemide vältimiseks loo oma suhtluse jaoks <a>uus krüptitud jututuba</a>.",
+    "Private (invite only)": "Privaatne jututuba (eeldab kutset)",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Võimalike probleemide vältimiseks loo oma suhtluse jaoks <a>uus avalik jututuba</a>.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Me ei soovita krüptitud jututoa muutmist avalikuks.</b> See tähendaks, et kõik huvilised saavad vabalt seda jututuba leida ning temaga liituda ning seega ka kõiki selles leiduvaid sõnumeid lugeda. Olemuselt puuduvad sellises olukorras krüptimise eelised. Avalike jututubade sõnumite krüptimine teeb ka sõnumite saatmise ja vastuvõtmise aeglasemaks.",
+    "Are you sure you want to make this encrypted room public?": "Kas sa oled kindel, et soovid seda krüptitud jututuba muuta avalikuks?",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Antud uuendusega on valitud kogukonnakeskuste liikmetel võimalik selle jututoaga ilma kutseta liituda.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Me ei soovita avalikes jututubades krüptimise kasutamist.</b> Kuna kõik huvilised saavad vabalt leida avalikke jututube ning nendega liituda, siis saavad nad niikuinii ka neis leiduvaid sõnumeid lugeda. Olemuselt puuduvad sellises olukorras krüptimise eelised ning sa ei saa hiljem krüptimist välja lülitada. Avalike jututubade sõnumite krüptimine teeb ka sõnumite saatmise ja vastuvõtmise aeglasemaks.",
+    "Are you sure you want to add encryption to this public room?": "Kas sa oled kindel, et soovid selles avalikus jututoas kasutada krüptimist?",
+    "Message bubbles": "Jutumullid",
+    "IRC": "IRC",
+    "Low bandwidth mode (requires compatible homeserver)": "Režiim kehva internetiühenduse jaoks (eeldab koduserveripoolset tuge)",
+    "Surround selected text when typing special characters": "Erimärkide sisestamisel märgista valitud tekst",
+    "Multiple integration managers (requires manual setup)": "Mitmed lõiminguhaldurid (eeldab käsitsi seadistamist)",
+    "Thread": "Jutulõng",
+    "Show threads": "Näita jutulõnga",
+    "Threaded messaging": "Sõnumid jutulõngana",
+    "Autoplay videos": "Esita automaatselt videosid",
+    "Autoplay GIFs": "Esita automaatselt liikuvaid pilte",
+    "The above, but in any room you are joined or invited to as well": "Ülaltoodu, aga samuti igas jututoas, millega oled liitunud või kuhu oled kutsutud",
+    "The above, but in <Room /> as well": "Ülaltoodu, aga samuti <Room /> jututoas",
+    "Currently, %(count)s spaces have access|one": "Hetkel sellel kogukonnal on ligipääs",
+    "& %(count)s more|one": "ja veel %(count)s",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s eemaldas siin jututoas klammerduse ühelt sõnumilt. Vaata kõiki klammerdatud sõnumeid.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s eemaldas siin jututoas klammerduse <a>ühelt sõnumilt</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s klammerdas siin jututoas <a>ühe sõnumi</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s klammerdas siin jututoas ühe sõnumi. Vaata kõiki klammerdatud sõnumeid.",
+    "Some encryption parameters have been changed.": "Mõned krüptimise parameetrid on muutunud.",
+    "Role in <RoomName/>": "Roll jututoas <RoomName/>",
+    "Add emoji": "Lisa emoji",
+    "Reply to encrypted thread…": "Vasta krüptitud jutulõngas…",
+    "Reply to thread…": "Vasta jutulõngas…",
+    "Send a sticker": "Saada kleeps",
+    "Explore %(spaceName)s": "Tutvu kogukonnaga - %(spaceName)s",
+    "Unknown failure": "Määratlemata viga",
+    "Failed to update the join rules": "Liitumisreeglite uuendamine ei õnnestunud",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Kõik <spaceName/> kogukonnakeskuse liikmed saavad leida ja liituda. Sa võid valida ka muid kogukonnakeskuseid.",
+    "Select the roles required to change various parts of the space": "Vali rollid, mis on vajalikud kogukonna eri osade muutmiseks",
+    "Change description": "Muuda kirjeldust",
+    "Change main address for the space": "Muuda kogukonna põhiaadressi",
+    "Change space name": "Muuda kogukonna nime",
+    "Change space avatar": "Muuda kogukonna tunnuspilti",
+    "Displaying time": "Aegade kuvamine",
+    "Message didn't send. Click for info.": "Sõnum jäi saatmata. Lisateabe saamiseks klõpsi.",
+    "To join this Space, hide communities in your <a>preferences</a>": "Selle uut tüüpi kogukonnakeskusega liitumiseks peida <a>seadistustest</a> vanad kogukonnad",
+    "To view this Space, hide communities in your <a>preferences</a>": "Selle uut tüüpi kogukonnakeskuse nägemiseks peida <a>seadistustest</a> vanad kogukonnad",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Liitumaks %(communityName)s kogukonnaga võta <a>seadistustes</a> kasutusele vana tüüpi kogukonnad",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Senise %(communityName)s kogukonna nägemiseks võta <a>seadistustes</a> kasutusele vana tüüpi kogukonnad",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "See jututuba on mõne sellise kogukonnakeskuse osa, kus sul pole haldaja õigusi. Selliselt juhul vana jututuba jätkuvalt kuvatakse, kuid selle asutajatele pakutakse võimalust uuega liituda.",
+    "You can also make Spaces from <a>communities</a>.": "Sa võid ka <a>vana kogukonna</a> muuta uueks kogukonnakeskuseks.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Ajutiselt näita selles sessioonis uute kogukonnakeskuste asemel vanu kogukondi. Lähitulevikus selline funktsionaalsus kaob. Eeldab rakenduse taaskäivitamist.",
+    "Display Communities instead of Spaces": "Kuva uute kogukonnakeskuste asemel vanu kogukondi",
+    "[number]": "[number]",
+    "Private community": "Privaatne kogukond",
+    "Public community": "Avalik kogukond",
+    "Message": "Sõnum",
+    "Upgrade anyway": "Uuenda ikkagi",
+    "Before you upgrade": "Enne uuendamist",
+    "To join a space you'll need an invite.": "Kogukonnakeskusega liitumiseks vajad kutset.",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s kasutajat reageeris järgnevalt: %(content)s",
+    "Joining space …": "Liitun kohukonnakeskusega…"
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 2740ea2079..7a4a0b1a91 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1,6 +1,5 @@
 {
     "Accept": "Onartu",
-    "%(targetName)s accepted an invitation.": "%(targetName)s erabiltzaileak gonbidapena onartu du.",
     "Close": "Itxi",
     "Create new room": "Sortu gela berria",
     "Continue": "Jarraitu",
@@ -16,15 +15,12 @@
     "Search": "Bilatu",
     "Settings": "Ezarpenak",
     "unknown error code": "errore kode ezezaguna",
-    "Room directory": "Gelen direktorioa",
     "Start chat": "Hasi txata",
-    "Custom Server Options": "Zerbitzari pertsonalizatuaren aukerak",
     "Dismiss": "Baztertu",
     "powered by Matrix": "Matrix-ekin egina",
     "Room": "Gela",
     "Historical": "Historiala",
     "Save": "Gorde",
-    "Active call": "Dei aktiboa",
     "Sign out": "Amaitu saioa",
     "Home": "Hasiera",
     "Favourites": "Gogokoak",
@@ -69,11 +65,8 @@
     "This email address is already in use": "E-mail helbide hau erabilita dago",
     "This phone number is already in use": "Telefono zenbaki hau erabilita dago",
     "Who can read history?": "Nork irakurri dezake historiala?",
-    "Who can access this room?": "Nor sartu daiteke gelara?",
     "Anyone": "Edonork",
     "Only people who have been invited": "Gonbidatua izan den jendea besterik ez",
-    "Anyone who knows the room's link, apart from guests": "Gelaren esteka dakien edonor, bisitariak ezik",
-    "Anyone who knows the room's link, including guests": "Gelaren esteka dakien edonor, bisitariak barne",
     "Banned users": "Debekatutako erabiltzaileak",
     "Labs": "Laborategia",
     "This room has no local addresses": "Gela honek ez du tokiko helbiderik",
@@ -90,16 +83,11 @@
     "Start authentication": "Hasi autentifikazioa",
     "Success": "Arrakasta",
     "For security, this session has been signed out. Please sign in again.": "Segurtasunagatik saio hau amaitu da. Hasi saioa berriro.",
-    "Guests cannot join this room even if explicitly invited.": "Bisitariak ezin dira gela honetara elkartu ez bazaie zuzenean gonbidatu.",
     "Hangup": "Eseki",
     "Homeserver is": "Hasiera zerbitzaria:",
-    "Identity Server is": "Identitate zerbitzaria:",
     "Moderator": "Moderatzailea",
     "Account": "Kontua",
-    "Access Token:": "Sarbide tokena:",
-    "Active call (%(roomName)s)": "Dei aktiboa (%(roomName)s)",
     "Add": "Gehitu",
-    "Add a topic": "Gehitu mintzagai bat",
     "Admin": "Kudeatzailea",
     "Admin Tools": "Administrazio-tresnak",
     "No Microphones detected": "Ez da mikrofonorik atzeman",
@@ -114,49 +102,31 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Ziur '%(roomName)s' gelatik atera nahi duzula?",
     "Are you sure you want to reject the invitation?": "Ziur gonbidapena baztertu nahi duzula?",
     "Attachment": "Eranskina",
-    "Autoplay GIFs and videos": "Automatikoki erreproduzitu GIFak eta bideoa",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s debekatu du.",
     "Bans user with given id": "Debekatu ID zehatz bat duen erabiltzailea",
-    "Call Timeout": "Deiaren denbora-muga",
     "Change Password": "Aldatu pasahitza",
     "Changes your display nickname": "Zure pantaila-izena aldatzen du",
-    "Click here to fix": "Egin klik hemen konpontzeko",
-    "Click to mute audio": "Egin klik audioa mututzeko",
-    "Click to mute video": "Egin klik bideoa mututzeko",
-    "click to reveal": "egin klik erakusteko",
-    "Click to unmute video": "Egin klik bideoaren audioa gaitzeko",
-    "Click to unmute audio": "Egin klik audioa gaitzeko",
     "Command error": "Aginduaren errorea",
     "Commands": "Aginduak",
     "Confirm password": "Berretsi pasahitza",
     "Create Room": "Sortu gela",
     "Current password": "Oraingo pasahitza",
-    "Custom": "Pertsonalizatua",
     "Custom level": "Maila pertsonalizatua",
-    "/ddg is not a command": "/ddg ez da agindu bat",
     "Deactivate Account": "Itxi kontua",
     "Decline": "Ukatu",
     "Decrypt %(text)s": "Deszifratu %(text)s",
     "Default": "Lehenetsia",
     "Displays action": "Ekintza bistaratzen du",
-    "Drop File Here": "Jaregin fitxategia hona",
     "%(items)s and %(lastItem)s": "%(items)s eta %(lastItem)s",
-    "%(senderName)s answered the call.": "%(senderName)s erabiltzaileak deia erantzun du.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s erabiltzaileak gelaren izena kendu du.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s erabiltzaileak mintzagaia aldatu du beste honetara: \"%(topic)s\".",
     "Disinvite": "Kendu gonbidapena",
     "Download %(text)s": "Deskargatu %(text)s",
     "Emoji": "Emoji",
-    "%(senderName)s ended the call.": "%(senderName)s erabiltzaileak deia amaitu du.",
     "Error decrypting attachment": "Errorea eranskina deszifratzean",
-    "Error: Problem communicating with the given homeserver.": "Errorea: Arazoa emandako hasiera zerbitzariarekin komunikatzeko.",
-    "Existing Call": "Badagoen deia",
     "Failed to ban user": "Huts egin du erabiltzailea debekatzean",
     "Failed to change power level": "Huts egin du botere maila aldatzean",
-    "Failed to fetch avatar URL": "Huts egin du abatarraren URLa jasotzean",
     "Failed to join room": "Huts egin du gelara elkartzean",
     "Failed to kick": "Huts egin du kanporatzean",
-    "Failed to leave room": "Huts egin du gelatik ateratzean",
     "Failed to load timeline position": "Huts egin du denbora-lerroko puntua kargatzean",
     "Failed to mute user": "Huts egin du erabiltzailea mututzean",
     "Failed to reject invite": "Huts egin du gonbidapena baztertzean",
@@ -167,103 +137,71 @@
     "Failed to unban": "Huts egin du debekua kentzean",
     "Failed to upload profile picture!": "Huts egin du profileko argazkia igotzean!",
     "Failure to create room": "Huts egin du gela sortzean",
-    "Fill screen": "Bete pantaila",
     "Forget room": "Ahaztu gela",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s mailatik %(toPowerLevel)s mailara",
-    "Incoming call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
-    "Incoming video call from %(name)s": "%(name)s erabiltzailearen bideo deia jasotzen",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
     "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.": "Ezin da hasiera zerbitzarira konektatu, egiaztatu zure konexioa, ziurtatu zure <a>hasiera zerbitzariaren SSL ziurtagiria</a> fidagarritzat jotzen duela zure gailuak, eta nabigatzailearen pluginen batek ez dituela eskaerak blokeatzen.",
     "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>.": "Ezin zara hasiera zerbitzarira HTTP bidez konektatu zure nabigatzailearen barran dagoen URLa HTTS bada. Erabili HTTPS edo <a>gaitu script ez seguruak</a>.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia aldatu du.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
-    "Incoming voice call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incorrect username and/or password.": "Erabiltzaile-izen edo pasahitz okerra.",
     "Incorrect verification code": "Egiaztaketa kode okerra",
     "Invalid Email Address": "E-mail helbide baliogabea",
     "Invalid file%(extra)s": "Fitxategi %(extra)s baliogabea",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s gonbidatu du.",
     "Invited": "Gonbidatuta",
     "Invites user with given id to current room": "Emandako ID-a duen erabiltzailea gonbidatzen du gelara",
     "Sign in with": "Hasi saioa hau erabilita:",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Elkartu <voiceText>ahotsa</voiceText> edo <videoText>bideoa</videoText> erabiliz.",
-    "%(targetName)s joined the room.": "%(targetName)s erabiltzailea gelara elkartu da.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s kanporatu du.",
     "Kick": "Kanporatu",
     "Kicks user with given id": "Kanporatu emandako ID-a duen erabiltzailea",
-    "%(targetName)s left the room.": "%(targetName)s erabiltzailea gelatik atera da.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
-    "Manage Integrations": "Kudeatu integrazioak",
     "Missing room_id in request": "Gelaren ID-a falta da eskaeran",
     "Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
     "New passwords don't match": "Pasahitz berriak ez datoz bat",
     "New passwords must match each other.": "Pasahitz berriak berdinak izan behar dira.",
     "not specified": "zehaztu gabe",
-    "(not supported by this browser)": "(nabigatzaile honek ez du euskarririk)",
     "<not supported>": "<euskarririk gabe>",
     "No display name": "Pantaila izenik ez",
     "No more results": "Emaitza gehiagorik ez",
     "No users have specific privileges in this room": "Ez dago gela honetan baimen zehatzik duen erabiltzailerik",
-    "olm version:": "olm bertsioa:",
     "Server may be unavailable, overloaded, or you hit a bug.": "Agian zerbitzaria ez dago eskuragarri, edo gainezka dago, edo akats bat aurkitu duzu.",
     "Passwords can't be empty": "Pasahitzak ezin dira hutsik egon",
     "Permissions": "Baimenak",
     "Power level must be positive integer.": "Botere maila osoko zenbaki positibo bat izan behar da.",
-    "Private Chat": "Txat pribatua",
     "Privileged Users": "Baimenak dituzten erabiltzaileak",
     "Profile": "Profila",
-    "Public Chat": "Txat publikoa",
     "Reason": "Arrazoia",
-    "%(targetName)s rejected the invitation.": "%(targetName)s erabiltzaileak gonbidapena baztertu du.",
     "Reject invitation": "Baztertu gonbidapena",
     "Reject all %(invitedRooms)s invites": "Baztertu %(invitedRooms)s gelarako gonbidapen guztiak",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila-izena kendu du (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia kendu du.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s erabiltzaileak VoIP konferentzia bat eskatu du.",
-    "Results from DuckDuckGo": "DuckDuckGo bilatzaileko emaitzak",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)sek ez du zuri jakinarazpenak bidaltzeko baimenik,  egiaztatu nabigatzailearen ezarpenak",
     "%(brand)s was not given permission to send notifications - please try again": "Ez zaio jakinarazpenak bidaltzeko baimena eman %(brand)si, saiatu berriro",
     "%(brand)s version:": "%(brand)s bertsioa:",
     "Room %(roomId)s not visible": "%(roomId)s gela ez dago ikusgai",
-    "Room Colour": "Gelaren kolorea",
     "%(roomName)s does not exist.": "Ez dago %(roomName)s izeneko gela.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ez dago eskuragarri orain.",
     "Search failed": "Bilaketak huts egin du",
-    "Searches DuckDuckGo for results": "DuckDuckGo-n bilatzen ditu emaitzak",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s erabiltzaileak ikusia %(dateTime)s(e)an",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s erabiltzaileak irudi bat bidali du.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
     "Server error": "Zerbitzari-errorea",
     "Server may be unavailable, overloaded, or search timed out :(": "Zerbitzaria eskuraezin edo gainezka egon daiteke, edo bilaketaren denbora muga gainditu da :(",
     "Server unavailable, overloaded, or something else went wrong.": "Zerbitzaria eskuraezin edo gainezka egon daiteke edo zerbaitek huts egin du.",
-    "%(senderName)s set a profile picture.": "%(senderName)s erabiltzaileak profileko argazkia ezarri du.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s erabiltzaileak %(displayName)s ezarri du pantaila izen gisa.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Erakutsi denbora-zigiluak 12 ordutako formatuan (adib. 2:30pm)",
     "Signed Out": "Saioa amaituta",
     "Sign in": "Hasi saioa",
-    "%(count)s of your messages have not been sent.|other": "Zure mezu batzuk ez dira bidali.",
-    "The phone number entered looks invalid": "Sartutako telefono zenbakia ez dirudi baliozkoa",
     "This email address was not found": "Ez da e-mail helbide hau aurkitu",
-    "The remote side failed to pick up": "Urruneko aldeak hartzean huts egin du",
     "This room is not recognised.": "Ez da gela hau ezagutzen.",
     "This doesn't appear to be a valid email address": "Honek ez du baliozko e-mail baten antzik",
     "This room": "Gela hau",
     "This room is not accessible by remote Matrix servers": "Gela hau ez dago eskuragarri urruneko zerbitzarietan",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Erabiltzeko, itxaron osatze automatikoaren emaitzak kargatu arte eta gero tabuladorearekin hautatu.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu zara, baina ez duzu mezu zehatz hori ikusteko baimenik.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu da, baina ezin izan da aurkitu.",
     "Unable to add email address": "Ezin izan da e-mail helbidea gehitu",
     "Unable to remove contact information": "Ezin izan da kontaktuaren informazioa kendu",
     "Unable to verify email address.": "Ezin izan da e-mail helbidea egiaztatu.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s erabiltzaileak debekua kendu dio %(targetName)s erabiltzaileari.",
-    "Unable to capture screen": "Ezin izan da pantaila-argazkia atera",
     "Unable to enable Notifications": "Ezin izan dira jakinarazpenak gaitu",
-    "unknown caller": "deitzaile ezezaguna",
     "Unmute": "Audioa aktibatu",
     "Unnamed Room": "Izen gabeko gela",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s igotzen",
@@ -275,24 +213,15 @@
     "Upload new:": "Igo berria:",
     "Usage": "Erabilera",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Erabiltzaile-izen baliogabea: %(errMessage)s",
     "Users": "Erabiltzaileak",
     "Verified key": "Egiaztatutako gakoa",
     "Video call": "Bideo-deia",
     "Voice call": "Ahots-deia",
-    "VoIP conference finished.": "VoIP konferentzia amaituta.",
-    "VoIP conference started.": "VoIP konferentzia hasita.",
     "VoIP is unsupported": "VoIP ez dago onartuta",
-    "(could not connect media)": "(ezin izan da media konektatu)",
-    "(no answer)": "(erantzunik ez)",
-    "(unknown failure: %(reason)s)": "(hutsegite ezezaguna: %(reason)s)",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s erabiltzaileak atzera bota du %(targetName)s erabiltzailearen gonbidapena.",
-    "You are already in a call.": "Bazaude dei batean.",
     "You cannot place a call with yourself.": "Ezin diozu zure buruari deitu.",
     "You cannot place VoIP calls in this browser.": "Ezin dituzu VoIP deiak egin nabigatzaile honekin.",
     "You have <a>disabled</a> URL previews by default.": "Lehenetsita URLak aurreikustea <a>desgaitu</a> duzu.",
     "You have <a>enabled</a> URL previews by default.": "Lehenetsita URLak aurreikustea <a>gaitu</a> duzu.",
-    "You have no visible notifications": "Ez daukazu jakinarazpen ikusgairik",
     "You must <a>register</a> to use this functionality": "Funtzionaltasun hau erabiltzeko <a>erregistratu</a>",
     "You need to be able to invite users to do that.": "Erabiltzaileak gonbidatzeko baimena behar duzu hori egiteko.",
     "You need to be logged in.": "Saioa hasi duzu.",
@@ -322,15 +251,10 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)sk %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(fullYear)sko %(monthName)sk %(day)s  %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Ezarri pantaila-izena:",
-    "Upload an avatar:": "Igo abatarra:",
     "This server does not support authentication with a phone number.": "Zerbitzari honek ez du telefono zenbakia erabiliz autentifikatzea onartzen.",
-    "An error occurred: %(error_string)s": "Errore bat gertatu da: %(error_string)s",
-    "There are no visible files in this room": "Ez dago fitxategirik ikusgai gela honetan",
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
     "(~%(count)s results)|one": "(~%(count)s emaitza)",
     "(~%(count)s results)|other": "(~%(count)s emaitza)",
-    "Please select the destination room for this message": "Hautatu mezu hau bidaltzeko gela",
     "New Password": "Pasahitz berria",
     "Start automatically after system login": "Hasi automatikoki sisteman saioa hasi eta gero",
     "Analytics": "Estatistikak",
@@ -345,7 +269,6 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Esportatutako fitxategia pasaesaldi batez babestuko da. Pasaesaldia bertan idatzi behar duzu, fitxategia deszifratzeko.",
     "You must join the room to see its files": "Gelara elkartu behar zara bertako fitxategiak ikusteko",
     "Failed to invite": "Huts egin du ganbidapenak",
-    "Failed to invite the following users to the %(roomName)s room:": "Huts egin du honako erabiltzaile hauek %(roomName)s gelara gonbidatzean:",
     "Confirm Removal": "Berretsi kentzea",
     "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.": "Ziur gertaera hau kendu (ezabatu) nahi duzula? Jakin gelaren izenaren edo mintzagaiaren aldaketa ezabatzen baduzu, aldaketa desegin daitekeela.",
     "Unknown error": "Errore ezezaguna",
@@ -353,41 +276,27 @@
     "Unable to restore session": "Ezin izan da saioa berreskuratu",
     "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.": "Aurretik %(brand)s bertsio berriago bat erabili baduzu, zure saioa bertsio honekin bateraezina izan daiteke. Itxi leiho hau eta itzuli bertsio berriagora.",
     "Unknown Address": "Helbide ezezaguna",
-    "ex. @bob:example.com": "adib. @urko:adibidea.eus",
-    "Add User": "Gehitu erabiltzailea",
-    "Please check your email to continue registration.": "Egiaztatu zure e-maila erregistroarekin jarraitzeko.",
     "Token incorrect": "Token okerra",
     "Please enter the code it contains:": "Sartu dakarren kodea:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ez baduzu e-mail helbide bat zehazten, ezin izango duzu zure pasahitza berrezarri. Ziur zaude?",
-    "Error decrypting audio": "Errorea audioa deszifratzean",
     "Error decrypting image": "Errorea audioa deszifratzean",
     "Error decrypting video": "Errorea bideoa deszifratzean",
     "Add an Integration": "Gehitu integrazioa",
     "URL Previews": "URL-en aurrebistak",
     "Drop file here to upload": "Jaregin fitxategia hona igotzeko",
-    " (unsupported)": " (euskarririk gabe)",
-    "Ongoing conference call%(supportedText)s.": "%(supportedText)s konferentzia deia abian.",
     "Check for update": "Bilatu ekuneraketa",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s erabiltzaileak gelaren abatarra aldatu du beste honetara: <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s erabiltzaileak gelaren abatarra ezabatu du.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s erabiltzaileak %(roomName)s gelaren abatarra aldatu du",
-    "Username available": "Erabiltzaile-izena eskuragarri dago",
-    "Username not available": "Erabiltzaile-izena ez dago eskuragarri",
     "Something went wrong!": "Zerk edo zerk huts egin du!",
     "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?": "Kanpo webgune batetara eramango zaizu zure kontua %(integrationsUrl)s helbidearekin erabiltzeko egiaztatzeko. Jarraitu nahi duzu?",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Hau izango da zure izena <span></span> hasiera zerbitzarian, edo <a>hautatu beste zerbitzari bat</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Jada Matrix kontua baduzu <a>saioa hasi</a> dezakezu zuzenean.",
     "Your browser does not support the required cryptography extensions": "Zure nabigatzaileak ez ditu onartzen beharrezkoak diren kriptografia gehigarriak",
     "Not a valid %(brand)s keyfile": "Ez da baliozko %(brand)s gako-fitxategia",
     "Authentication check failed: incorrect password?": "Autentifikazio errorea: pasahitz okerra?",
     "Do you want to set an email address?": "E-mail helbidea ezarri nahi duzu?",
     "This will allow you to reset your password and receive notifications.": "Honek zure pasahitza berrezarri eta jakinarazpenak jasotzea ahalbidetuko dizu.",
     "Deops user with given id": "Emandako ID-a duen erabiltzailea mailaz jaisten du",
-    "Add a widget": "Gehitu trepeta bat",
-    "Allow": "Baimendu",
     "and %(count)s others...|other": "eta beste %(count)s…",
     "and %(count)s others...|one": "eta beste bat…",
-    "Cannot add any more widgets": "Ezin dira trepeta gehiago gehitu",
     "Delete widget": "Ezabatu trepeta",
     "Define the power level of a user": "Zehaztu erabiltzaile baten botere maila",
     "Edit": "Editatu",
@@ -395,8 +304,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "Argitaratu gela hau publikora %(domain)s domeinuko gelen direktorioan?",
     "AM": "AM",
     "PM": "PM",
-    "The maximum permitted number of widgets have already been added to this room.": "Gehienez onartzen diren trepeta kopurua gehitu da gela honetara.",
-    "To get started, please pick a username!": "Hasteko, hautatu erabiltzaile-izen bat!",
     "Unable to create widget.": "Ezin izan da trepeta sortu.",
     "You are not in this room.": "Ez zaude gela honetan.",
     "You do not have permission to do that in this room.": "Ez duzu gela honetan hori egiteko baimenik.",
@@ -421,7 +328,6 @@
     "Stops ignoring a user, showing their messages going forward": "Utzi erabiltzailea ezikusteari, erakutsi bere mezuak",
     "Ignores a user, hiding their messages from you": "Ezikusi erabiltzailea, ezkutatu bere mezuak zuretzat",
     "Banned by %(displayName)s": "%(displayName)s erabiltzaileak debekatuta",
-    "Unpin Message": "Desfinkatu mezua",
     "Add rooms to this community": "Gehitu gelak komunitate honetara",
     "Call Failed": "Deiak huts egin du",
     "Who would you like to add to this community?": "Nor gehitu nahi duzu komunitate honetara?",
@@ -444,19 +350,13 @@
     "Enable inline URL previews by default": "Gailu URL-en aurrebista lehenetsita",
     "Enable URL previews for this room (only affects you)": "Gaitu URLen aurrebista gela honetan (zuretzat bakarrik aldatuko duzu)",
     "Enable URL previews by default for participants in this room": "Gaitu URLen aurrebista lehenetsita gela honetako partaideentzat",
-    "%(senderName)s sent an image": "%(senderName)s erabiltzaileak irudi bat bidali du",
-    "%(senderName)s sent a video": "%(senderName)s erabiltzaileak bideo bat bidali du",
-    "%(senderName)s uploaded a file": "%(senderName)s erabiltzaileak fitxategi bat bidali du",
     "Disinvite this user?": "Kendu gonbidapena erabiltzaile honi?",
     "Kick this user?": "Kanporatu erabiltzaile hau?",
     "Unban this user?": "Kendu debekua erabiltzaile honi?",
     "Ban this user?": "Debekatu erabiltzaile hau?",
     "Mention": "Aipatu",
     "Invite": "Gonbidatu",
-    "Jump to message": "Saltatu mezura",
-    "No pinned messages.": "Finkatutako mezurik ez.",
     "Loading...": "Kargatzen…",
-    "Pinned Messages": "Finkatutako mezuak",
     "%(duration)ss": "%(duration)s s",
     "%(duration)sm": "%(duration)s m",
     "%(duration)sh": "%(duration)s h",
@@ -469,7 +369,6 @@
     "World readable": "Munduak irakurgarria",
     "Guests can join": "Bisitariak elkartu daitezke",
     "No rooms to show": "Ez dago gelarik erakusteko",
-    "Community Invites": "Komunitate gonbidapenak",
     "Members only (since the point in time of selecting this option)": "Kideek besterik ez (aukera hau hautatzen den unetik)",
     "Members only (since they were invited)": "Kideek besterik ez (gonbidatu zaienetik)",
     "Members only (since they joined)": "Kideek besterik ez (elkartu zirenetik)",
@@ -509,7 +408,6 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "Komunitatearen ID berria (adib +izena:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "URLen aurrebistak gaituta daude gela honetako partaideentzat.",
     "URL previews are disabled by default for participants in this room.": "URLen aurrebistak desgaituta daude gela honetako partaideentzat.",
-    "An email has been sent to %(emailAddress)s": "e-maila bidali da hona: %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Testu mezu bat bidali da hona: %(msisdn)s",
     "Remove from community": "Kendu komunitatetik",
     "Disinvite this user from community?": "Desgonbidatu erabiltzailea komunitatetik?",
@@ -551,7 +449,6 @@
     "You have entered an invalid address.": "E-mail helbide baliogabea sartu duzu.",
     "Something went wrong whilst creating your community": "Zerbait ez da behar bezala joan zure komunitatea sortzean",
     "Create Community": "Sortu komunitatea",
-    "<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>Zure komunitate orriaren HTMLa</h1>\n<p>\n    Erabili deskripzio luzea kide berriei komunitatea aurkezteko edo <a href=\"foo\">esteka</a> garrantzitsuetarako\n</p>\n<p>\n    'img' etiketak ere erabili ditzakezu\n</p>\n",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Huts egin du honako gela hauek %(groupId)s komunitatearen laburpenera gehitzean:",
     "Failed to remove the room from the summary of %(groupId)s": "Huts egin du gela %(groupId)s komunitatearen laburpenetik kentzean",
     "Failed to add the following users to the summary of %(groupId)s:": "Huts egin du honako erabiltzaile hauek %(groupId)s komunitatearen laburpenera gehitzean:",
@@ -611,17 +508,12 @@
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunitate IDak a-z, 0-9, edo '=_-./' karaktereak besterik ez ditu onartzen",
     "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.": "%(brand)s bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s helbidera e-mail bat bidali da. Behin dakarren esteka jarraituta, egin klik behean.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",
-    "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
     "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
     "Send an encrypted message…": "Bidali zifratutako mezu bat…",
     "Replying": "Erantzuten",
-    "Minimize apps": "Minimizatu aplikazioak",
     "The platform you're on": "Zauden plataforma",
     "The version of %(brand)s": "%(brand)s bertsioa",
     "Your language of choice": "Zure aukerako hizkuntza",
@@ -636,16 +528,13 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
     "Community IDs cannot be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
     "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
     "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
     "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
     "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
     "Clear filter": "Garbitu iragazkia",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Ba al zenekien? Komunitateak erabili ditzakezu zure %(brand)s esperientzia iragazteko!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Iragazki bat ezartzeko, arrastatu komunitate baten abatarra pantailaren ezkerrean dagoen  iragazki-panelera. Iragazki-paneleko abatar batean klik egin dezakezu komunitate horri lotutako gelak eta pertsonak besterik ez ikusteko.",
     "Key request sent.": "Gako eskaria bidalita.",
     "Code": "Kodea",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "GitHub bidez akats baten berri eman badiguzu, arazte-egunkariek arazoa aurkitzen lagundu gaitzakete. Arazte-egunkariek aplikazioaren erabileraren datuak dauzkate, zure erabiltzaile izena barne, eta bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
     "Submit debug logs": "Bidali arazte-egunkariak",
     "Opens the Developer Tools dialog": "Garatzailearen tresnen elkarrizketa-koadroa irekitzen du",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s)(e)k ikusita %(dateTime)s(e)tan",
@@ -662,12 +551,9 @@
     "Everyone": "Edonor",
     "Fetching third party location failed": "Huts egin du hirugarrengoen kokalekua eskuratzean",
     "Send Account Data": "Bidali kontuaren datuak",
-    "All notifications are currently disabled for all targets.": "Une honetan jakinarazpen guztiak helburu guztietarako desgaituta daude.",
-    "Uploading report": "Txostena igotzen",
     "Sunday": "Igandea",
     "Notification targets": "Jakinarazpenen helburuak",
     "Today": "Gaur",
-    "You are not receiving desktop notifications": "Ez dituzu mahaigaineko jakinarazpenak jasotzen",
     "Friday": "Ostirala",
     "Update": "Eguneratu",
     "What's New": "Zer dago berri",
@@ -675,24 +561,13 @@
     "Changelog": "Aldaketa-egunkaria",
     "Waiting for response from server": "Zerbitzariaren erantzunaren zain",
     "Send Custom Event": "Bidali gertaera pertsonalizatua",
-    "Advanced notification settings": "Jakinarazpen aurreratuen ezarpenak",
     "Failed to send logs: ": "Huts egin du egunkariak bidaltzean: ",
-    "Forget": "Ahaztu",
-    "You cannot delete this image. (%(code)s)": "Ezin duzu irudi hau ezabatu. (%(code)s)",
-    "Cancel Sending": "Utzi bidaltzeari",
     "This Room": "Gela hau",
     "Noisy": "Zaratatsua",
-    "Error saving email notification preferences": "Errorea e-mail jakinarazpenen hobespenak gordetzean",
     "Messages containing my display name": "Nire pantaila-izena duten mezuak",
     "Messages in one-to-one chats": "Biren arteko txatetako mezuak",
     "Unavailable": "Eskuraezina",
-    "View Decrypted Source": "Ikusi deszifratutako iturria",
-    "Failed to update keywords": "Huts egin du hitz gakoak eguneratzean",
     "remove %(name)s from the directory.": "kendu %(name)s direktoriotik.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Hitz gako hauen jakinarazpenak hemen bistaratu ezin daitezkeen arauak jarraitzen dituzte:",
-    "Please set a password!": "Ezarri pasahitza mesedez!",
-    "You have successfully set a password!": "Ongi ezarri duzu pasahitza!",
-    "An error occurred whilst saving your email notification preferences.": "Errore bat gertatu da zure e-mail bidezko jakinarazpenen hobespenak gordetzean.",
     "Explore Room State": "Miatu gelaren egoera",
     "Source URL": "Iturriaren URLa",
     "Messages sent by bot": "Botak bidalitako mezuak",
@@ -700,37 +575,22 @@
     "Members": "Kideak",
     "No update available.": "Ez dago eguneraketarik eskuragarri.",
     "Resend": "Birbidali",
-    "Files": "Fitxategiak",
     "Collecting app version information": "Aplikazioaren bertsio-informazioa biltzen",
-    "Keywords": "Hitz gakoak",
-    "Enable notifications for this account": "Gaitu jakinarazpenak kontu honetarako",
     "Invite to this community": "Gonbidatu komunitate honetara",
-    "Messages containing <span>keywords</span>": "<span>Hitz gakoak</span> dituzten mezuak",
     "Room not found": "Ez da gela aurkitu",
     "Tuesday": "Asteartea",
-    "Enter keywords separated by a comma:": "Idatzi hitz gakoak koma bidez banatuta:",
-    "Forward Message": "Birbidali mezua",
-    "You have successfully set a password and an email address!": "Ondo ezarri dituzu pasahitza eta e-mail helbidea!",
     "Remove %(name)s from the directory?": "Kendu %(name)s direktoriotik?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)sek nabigatzaileen ezaugarri aurreratu ugari erabiltzen ditu, hauetako batzuk ez daude erabilgarri edo esperimentalak dira zure oraingo nabigatzailean.",
     "Event sent!": "Gertaera bidalita!",
     "Preparing to send logs": "Egunkariak bidaltzeko prestatzen",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Gogoratu, e-mail helbide bat ezarri dezakezu erabiltzaile-ezarpenetan iritzia aldatzen baduzu.",
     "Explore Account Data": "Miatu kontuaren datuak",
-    "All messages (noisy)": "Mezu guztiak (ozen)",
     "Saturday": "Larunbata",
-    "I understand the risks and wish to continue": "Arriskuak ulertzen ditut eta jarraitu nahi dut",
-    "Direct Chat": "Txat zuzena",
     "The server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
     "Reject": "Baztertu",
-    "Failed to set Direct Message status of room": "Huts egin du Mezu Zuzena egoera gelan ezartzean",
     "Monday": "Astelehena",
     "Remove from Directory": "Kendu direktoriotik",
-    "Enable them now": "Gaitu orain",
     "Toolbox": "Tresna-kutxa",
     "Collecting logs": "Egunkariak biltzen",
     "You must specify an event type!": "Gertaera mota bat zehaztu behar duzu!",
-    "(HTTP status %(httpStatus)s)": "(HTTP egoera %(httpStatus)s)",
     "All Rooms": "Gela guztiak",
     "Wednesday": "Asteazkena",
     "You cannot delete this message. (%(code)s)": "Ezin duzu mezu hau ezabatu. (%(code)s)",
@@ -742,10 +602,7 @@
     "State Key": "Egoera gakoa",
     "Failed to send custom event.": "Huts egin du gertaera pertsonalizatua bidaltzean.",
     "What's new?": "Zer dago berri?",
-    "Notify me for anything else": "Jakinarazi beste edozer",
     "When I'm invited to a room": "Gela batetara gonbidatzen nautenean",
-    "Can't update user notification settings": "Ezin dira erabiltzailearen jakinarazpenen ezarpenak eguneratu",
-    "Notify for all other messages/rooms": "Jakinarazi beste mezu/gela guztiak",
     "Unable to look up room ID from server": "Ezin izan da gelaren IDa zerbitzarian bilatu",
     "Couldn't find a matching Matrix room": "Ezin izan da bat datorren Matrix gela bat aurkitu",
     "Invite to this room": "Gonbidatu gela honetara",
@@ -755,38 +612,24 @@
     "Back": "Atzera",
     "Reply": "Erantzun",
     "Show message in desktop notification": "Erakutsi mezua mahaigaineko jakinarazpenean",
-    "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.": "Arazte-egunkariek aplikazioak darabilen datuak dauzkate, zure erabiltzaile izena barne, bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
-    "Unhide Preview": "Ez ezkutatu aurrebista",
     "Unable to join network": "Ezin izan da sarera elkartu",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Zure nabigatzaileak <b>ez</b> du %(brand)s erabiltzeko gaitasunik.",
-    "Uploaded on %(date)s by %(user)s": "%(user)s erabiltzaileak %(date)s (e)an igota",
     "Messages in group chats": "Talde txatetako mezuak",
     "Yesterday": "Atzo",
     "Error encountered (%(errorDetail)s).": "Errorea aurkitu da (%(errorDetail)s).",
     "Low Priority": "Lehentasun baxua",
-    "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu",
-    "Set Password": "Ezarri pasahitza",
     "Off": "Ez",
     "%(brand)s does not know how to join a room on this network": "%(brand)sek ez daki nola elkartu gela batetara sare honetan",
-    "Mentions only": "Aipamenak besterik ez",
-    "You can now return to your account after signing out, and sign in on other devices.": "Zure kontura itzuli zaitezke beste gailuetan saioa amaitu eta berriro hastean.",
-    "Enable email notifications": "Gaitu e-mail bidezko jakinarazpenak",
     "Event Type": "Gertaera mota",
-    "Download this file": "Deskargatu fitxategi hau",
-    "Pin Message": "Finkatu mezua",
-    "Failed to change settings": "Huts egin du ezarpenak aldatzean",
     "View Community": "Ikusi komunitatea",
     "Developer Tools": "Garatzaile-tresnak",
     "View Source": "Ikusi iturria",
     "Event Content": "Gertaeraren edukia",
     "Thank you!": "Eskerrik asko!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Zure oraingo nabigatzailearekin aplikazioaren itxura eta portaera guztiz okerra izan daiteke, eta funtzio batzuk ez dira ibiliko. Hala ere aurrera jarraitu dezakezu saiatu nahi baduzu, baina zure erantzukizunaren menpe geratzen dira aurkitu ditzakezun arazoak!",
     "Checking for an update...": "Eguneraketarik dagoen egiaztatzen…",
     "Missing roomId.": "Gelaren ID-a falta da.",
     "Every page you use in the app": "Aplikazioan erabilitako orri oro",
     "e.g. <CurrentPageURL>": "adib. <CurrentPageURL>",
     "Your device resolution": "Zure gailuaren bereizmena",
-    "Always show encryption icons": "Erakutsi beti zifratze ikonoak",
     "Popout widget": "Laster-leiho trepeta",
     "Send Logs": "Bidali egunkariak",
     "Clear Storage and Sign Out": "Garbitu biltegiratzea eta amaitu saioa",
@@ -794,7 +637,6 @@
     "We encountered an error trying to restore your previous session.": "Errore bat aurkitu dugu zure aurreko saioa berrezartzen saiatzean.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Zure nabigatzailearen biltegiratzea garbitzeak arazoa konpon lezake, baina saioa amaituko da eta zifratutako txaten historiala ezin izango da berriro irakurri.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ezin izan da erantzundako gertaera kargatu, edo ez dago edo ez duzu ikusteko baimenik.",
-    "Collapse Reply Thread": "Tolestu erantzun-haria",
     "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak, onartzen duten trepetetan",
     "Send analytics data": "Bidali datu analitikoak",
     "Muted Users": "Mutututako erabiltzaileak",
@@ -817,26 +659,16 @@
     "Share Community": "Partekatu komunitatea",
     "Share Room Message": "Partekatu gelako mezua",
     "Link to selected message": "Esteka hautatutako mezura",
-    "COPY": "KOPIATU",
-    "Share Message": "Partekatu mezua",
     "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
     "Audio Output": "Audio irteera",
     "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.": "Zifratutako gelatan, honetan esaterako, URL-en aurrebistak lehenetsita desgaituta daude zure hasiera-zerbitzariak gela honetan ikusten dituzun estekei buruzko informaziorik jaso ez dezan, hasiera-zerbitzarian sortzen baitira aurrebistak.",
     "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.": "Norbaitek mezu batean URL bat jartzen duenean, URL aurrebista bat erakutsi daiteke estekaren informazio gehiago erakusteko, adibidez webgunearen izenburua, deskripzioa eta irudi bat.",
-    "The email field must not be blank.": "E-mail eremua ezin da hutsik laga.",
-    "The phone number field must not be blank.": "Telefono zenbakia eremua ezin da hutsik laga.",
-    "The password field must not be blank.": "Pasahitza eremua ezin da hutsik laga.",
-    "Call in Progress": "Deia abian",
-    "A call is already in progress!": "Badago dei bat abian!",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Ezin duzu mezurik bidali <consentLink>gure termino eta baldintzak</consentLink> irakurri eta onartu arte.",
     "Demote yourself?": "Jaitsi zure burua mailaz?",
     "Demote": "Jaitzi mailaz",
-    "A call is currently being placed!": "Dei bat ezartzen ari da orain!",
     "Permission Required": "Baimena beharrezkoa",
     "You do not have permission to start a conference call in this room": "Ez duzu baimenik konferentzia dei bat hasteko gela honetan",
     "This event could not be displayed": "Ezin izan da gertakari hau bistaratu",
-    "Failed to remove widget": "Huts egin du trepeta kentzean",
-    "An error ocurred whilst trying to remove the widget from the room": "Trepeta gelatik kentzen saiatzean errore bat gertatu da",
     "System Alerts": "Sistemaren alertak",
     "Sorry, your homeserver is too old to participate in this room.": "Zure hasiera-zerbitzaria zaharregia da gela honetan parte hartzeko.",
     "Please contact your homeserver administrator.": "Jarri zure hasiera-zerbitzariaren administratzailearekin kontaktuan.",
@@ -878,8 +710,6 @@
     "Unable to load! Check your network connectivity and try again.": "Ezin da kargatu! Egiaztatu sare konexioa eta saiatu berriro.",
     "Delete Backup": "Ezabatu babes-kopia",
     "Unable to load key backup status": "Ezin izan da gakoen babes-kopiaren egoera kargatu",
-    "Backup version: ": "Babes-kopiaren bertsioa: ",
-    "Algorithm: ": "Algoritmoa: ",
     "Please review and accept all of the homeserver's policies": "Berrikusi eta onartu hasiera-zerbitzariaren politika guztiak",
     "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": "Zure txaten historiala ez galtzeko, zure gelako gakoak esportatu behar dituzu saioa amaitu aurretik. %(brand)s-en bertsio berriagora bueltatu behar zara hau egiteko",
     "Incompatible Database": "Datu-base bateraezina",
@@ -899,11 +729,6 @@
     "Unable to restore backup": "Ezin izan da babes-kopia berrezarri",
     "No backup found!": "Ez da babes-kopiarik aurkitu!",
     "Failed to decrypt %(failedCount)s sessions!": "Ezin izan dira %(failedCount)s saio deszifratu!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Atzitu zure mezu seguruen historiala eta ezarri mezularitza segurua zure berreskuratze pasa-esaldia sartuz.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Zure berreskuratze pasa-esaldia ahaztu baduzu <button1>berreskuratze gakoa erabili</button1> dezakezu edo <button2>berreskuratze aukera berriak ezarri</button2> ditzakezu",
-    "This looks like a valid recovery key!": "Hau baliozko berreskuratze gako bat dirudi!",
-    "Not a valid recovery key": "Ez da baliozko berreskuratze gako bat",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta ezarri mezularitza segurua zure berreskuratze gakoa sartuz.",
     "Sign in with single sign-on": "Hai saioa urrats batean",
     "Failed to perform homeserver discovery": "Huts egin du hasiera-zerbitzarien bilaketak",
     "Invalid homeserver discovery response": "Baliogabeko hasiera-zerbitzarien bilaketaren erantzuna",
@@ -938,11 +763,7 @@
     "User %(user_id)s does not exist": "Ez dago %(user_id)s erabiltzailerik",
     "Unknown server error": "Zerbitzari errore ezezaguna",
     "Failed to load group members": "Huts egin du taldeko kideak kargatzean",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Erakutsi mezu seguruen berreskuratzea gaitzeko oroigarri bat zifratutako geletan",
-    "Don't ask again": "Ez galdetu berriro",
     "Set up": "Ezarri",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Mezuen berreskuratze segurua ezartzen ez baduzu, mezu seguruen historiala galduko duzu saioa amaitzean.",
-    "If you don't want to set this up now, you can later in Settings.": "Ez baduzu hau orain ezarri nahi, gero ere egin dezakezu ezarpenetan.",
     "Messages containing @room": "@room duten mezuak",
     "Encrypted messages in one-to-one chats": "Zifratutako mezuak bi pertsonen arteko txatetan",
     "Encrypted messages in group chats": "Zifratutako mezuak talde-txatetan",
@@ -950,7 +771,6 @@
     "Straight rows of keys are easy to guess": "Teklatuko errenkadak asmatzeko errazak dira",
     "Short keyboard patterns are easy to guess": "Teklatuko eredu laburrak asmatzeko errazak dira",
     "Custom user status messages": "Erabiltzailearen egoera mezu pertsonalizatuak",
-    "Checking...": "Egiaztatzen…",
     "Set a new status...": "Ezarri egoera berri bat…",
     "Clear status": "Garbitu egoera",
     "General failure": "Hutsegite orokorra",
@@ -1044,29 +864,17 @@
     "Room avatar": "Gelaren abatarra",
     "Room Name": "Gelaren izena",
     "Room Topic": "Gelaren mintzagaia",
-    "Report bugs & give feedback": "Eman akatsen berri eta egin iruzkinak",
     "Go back": "Joan atzera",
     "Update status": "Eguneratu egoera",
     "Set status": "Ezarri egoera",
     "This homeserver would like to make sure you are not a robot.": "Hasiera-zerbitzari honek robota ez zarela egiaztatu nahi du.",
-    "Your Modular server": "Zure Modular zerbitzaria",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Sartu zure Modular hasiera-zerbitzariaren helbidea. Zure domeinua erabili dezake edo  <a>modular.im</a>ren azpi-domeinua izan daiteke.",
-    "Server Name": "Zerbitzariaren izena",
-    "The username field must not be blank.": "Erabiltzaile-izena eremua ezin da hutsik egon.",
     "Username": "Erabiltzaile-izena",
-    "Not sure of your password? <a>Set a new one</a>": "Ez duzu pasahitza gogoratzen? <a>Ezarri beste bat</a>",
     "Change": "Aldatu",
-    "Create your account": "Sortu zure kontua",
     "Email (optional)": "E-mail (aukerakoa)",
     "Phone (optional)": "Telefonoa (aukerakoa)",
     "Confirm": "Berretsi",
-    "Other servers": "Beste zerbitzariak",
-    "Homeserver URL": "Hasiera-zerbitzariaren URLa",
-    "Identity Server URL": "Identitate zerbitzariaren URLa",
-    "Free": "Dohan",
     "Join millions for free on the largest public server": "Elkartu milioika pertsonekin dohain hasiera zerbitzari publiko handienean",
     "Other": "Beste bat",
-    "Find other public servers or use a custom server": "Aurkitu beste zerbitzari publiko bat edo erabili zurea",
     "Couldn't load page": "Ezin izan da orria kargatu",
     "Guest": "Gonbidatua",
     "General": "Orokorra",
@@ -1095,12 +903,9 @@
     "Once enabled, encryption cannot be disabled.": "Behin gaituta, zifratzea ezin da desgaitu.",
     "Encrypted": "Zifratuta",
     "Ignored users": "Ezikusitako erabiltzaileak",
-    "Key backup": "Gakoen babes-kopia",
     "Voice & Video": "Ahotsa eta bideoa",
     "Main address": "Helbide nagusia",
     "Join": "Elkartu",
-    "Premium": "Ordainpekoa",
-    "Premium hosting for organisations <a>Learn more</a>": "Elkarteentzako ordainpeko ostatua  <a>ikasi gehiago</a>",
     "Sign in instead": "Hasi saioa horren ordez",
     "Your password has been reset.": "Zure pasahitza berrezarri da.",
     "Set a new password": "Ezarri pasahitz berria",
@@ -1110,7 +915,6 @@
     "Recovery Method Removed": "Berreskuratze metodoa kendu da",
     "Missing media permissions, click the button below to request.": "Multimedia baimenak falda dira, sakatu beheko botoia baimenak eskatzeko.",
     "Request media permissions": "Eskatu multimedia baimenak",
-    "Allow Peer-to-Peer for 1:1 calls": "Baimendu Peer-to-Peer biren arteko deietan",
     "Start using Key Backup": "Hasi gakoen babes-kopia egiten",
     "Restore from Backup": "Berrezarri babes-kopia",
     "Back up your keys before signing out to avoid losing them.": "Egin gakoen babes-kopia bat saioa amaitu aurretik, galdu nahi ez badituzu.",
@@ -1148,7 +952,6 @@
     "Email Address": "E-mail helbidea",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ziur al zaude? Zure zifratutako mezuak galduko dituzu zure gakoen babes-kopia egoki bat egiten ez bada.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Zifratutako mezuak muturretik muturrerako zifratzearen bidez babestuak daude. Zuk eta hartzaileak edo hartzaileek irakurri ditzakezue mezu horiek, beste inork ez.",
-    "Add an email address to configure email notifications": "Gehitu e-mail helbidea e-mail bidezko jakinarazpenak ezartzeko",
     "Unable to verify phone number.": "Ezin izan da telefono zenbakia egiaztatu.",
     "Verification code": "Egiaztaketa kodea",
     "Phone Number": "Telefono zenbakia",
@@ -1159,14 +962,9 @@
     "Room version": "Gela bertsioa",
     "Room version:": "Gela bertsioa:",
     "Developer options": "Garatzaileen aukerak",
-    "Never lose encrypted messages": "Ez galdu inoiz zifratutako mezuak",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Gela honetako mezuak muturretik muturrerako zifratzeaz babestuak daude. Zuek eta hartzaileek besterik ez daukazue mezu horiek irakurtzeko giltza.",
     "Composer": "Idazlekua",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Historiala nork irakurri dezakeen aldatzea gelak honetara aurrerantzean bidalitako mezuei besterik ez zaie aplikatuko. Badagoen historialaren ikusgaitasuna ez da aldatuko.",
     "Bulk options": "Aukera masiboak",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Egin zure gakoen babes-kopia segurua hauek ez galtzeko. <a>Ikasi gehiago.</a>",
-    "Not now": "Orain ez",
-    "Don't ask me again": "Ez galdetu berriro",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Egiaztatu erabiltzaile hau fidagarritzat markatzeko. Honek bakea ematen dizu muturretik muturrerako zifratutako mezuak erabiltzean.",
     "Waiting for partner to confirm...": "Kideak baieztatzearen zain…",
     "Incoming Verification Request": "Jasotako egiaztaketa eskaria",
@@ -1174,8 +972,6 @@
     "Manually export keys": "Esportatu gakoak eskuz",
     "You'll lose access to your encrypted messages": "Zure zifratutako mezuetara sarbidea galduko duzu",
     "Are you sure you want to sign out?": "Ziur saioa amaitu nahi duzula?",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Akatsen bat aurkitzen baduzu edo iruzkinen bat baduzu, emaguzu berri GitHub bidez.",
-    "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.": "Bikoiztutako txostenak ekiditeko,  <existingIssuesLink>dauden txostenak</existingIssuesLink> aurretik (eta gehitu +1) edo <newIssueLink>sortu txosten berria</newIssueLink> aurkitzen ez baduzu.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Abisua:</b>: Gakoen babeskopia fidagarria den gailu batetik egin beharko zenuke beti.",
     "Hide": "Ezkutatu",
     "This homeserver does not support communities": "Hasiera-zerbitzari honek ez du komunitateetarako euskarria",
@@ -1186,10 +982,8 @@
     "For maximum security, this should be different from your account password.": "Segurtasun hobe baterako, hau eta zure ohiko pasahitza desberdinak izan beharko lirateke.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Zure gakoen babes-kopia egiten ari da (lehen babes-kopiak minutu batzuk behar ditzake).",
     "Success!": "Ongi!",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Berreskuratze pasaesaldi eta mezu seguruen gako berriak antzeman dira.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ez baduzu berreskuratze metodoa kendu, agian erasotzaile bat zure mezuen historialera sarbidea lortu nahi du. Aldatu kontuaren pasahitza eta ezarri berreskuratze metodo berri bat berehala ezarpenetan.",
     "Changes your display nickname in the current room only": "Zure pantailako izena aldatzen du gela honetan bakarrik",
-    "Your Matrix account on %(serverName)s": "Zure %(serverName)s zerbitzariko Matrix kontua",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯\\_(ツ)_/¯ jartzen du testu soileko mezu baten aurrean",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s erabiltzaileak ikurra aktibatu du %(groups)s taldeentzat gela honetan.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s erabiltzaileak ikurra desaktibatu du %(groups)s taldeentzat gela honetan.",
@@ -1213,7 +1007,6 @@
     "Change settings": "Aldatu ezarpenak",
     "Kick users": "Kanporatu erabiltzaileak",
     "Ban users": "Debekatu erabiltzaileak",
-    "Remove messages": "Kendu mezuak",
     "Notify everyone": "Jakinarazi denei",
     "Send %(eventType)s events": "Bidali %(eventType)s gertaerak",
     "Select the roles required to change various parts of the room": "Hautatu gelaren hainbat atal aldatzeko behar diren rolak",
@@ -1225,11 +1018,6 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Errorea gertatu da gela honen ikurra eguneratzean. Agian zerbitzariak ez du baimentzen, edo une bateko hutsegitea izan da.",
     "Power level": "Botere maila",
     "Room Settings - %(roomName)s": "Gelaren ezarpenak - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Erabiltzaile-izenak letra xeheak, zenbakiak eta  '=_-./' karaktereak izan ditzake besterik ez",
-    "Share Permalink": "Partekatu esteka iraunkorra",
-    "Sign in to your Matrix account on %(serverName)s": "Hasi saioa zure %(serverName)s zerbitzariko kontuan",
-    "Create your Matrix account on %(serverName)s": "Sortu zure Matrix kontua %(serverName)s zerbitzarian",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalatu <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, edo <safariLink>Safari</safariLink> esperientzia hobe baterako.",
     "Want more than a community? <a>Get your own server</a>": "Komunitate bat baino gehiago nahi duzu? <a>Eskuratu zure zerbitzari propioa</a>",
     "Could not load user profile": "Ezin izan da erabiltzaile-profila kargatu",
     "You cannot modify widgets in this room.": "Ezin dituzu gela honetako trepetak aldatu.",
@@ -1239,9 +1027,7 @@
     "Failed to revoke invite": "Gonbidapena indargabetzeak huts egin du",
     "Revoke invite": "Indargabetu gonbidapena",
     "Invited by %(sender)s": "%(sender)s erabiltzaileak gonbidatuta",
-    "A widget would like to verify your identity": "Trepeta batek zure identitatea egiaztatu nahi du",
     "Remember my selection for this widget": "Gogoratu nire hautua trepeta honentzat",
-    "Deny": "Ukatu",
     "%(brand)s failed to get the public room list.": "%(brand)s-ek ezin izan du du gelen zerrenda publikoa eskuratu.",
     "The homeserver may be unavailable or overloaded.": "Hasiera-zerbitzaria eskuraezin edo kargatuegia egon daiteke.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Irakurri gabeko %(count)s jakinarazpen dituzu gela honen aurreko bertsio batean.",
@@ -1267,7 +1053,6 @@
     "Unexpected error resolving identity server configuration": "Ustekabeko errorea identitate-zerbitzariaren konfigurazioa ebaztean",
     "The user's homeserver does not support the version of the room.": "Erabiltzailearen hasiera-zerbitzariak ez du gelaren bertsioa onartzen.",
     "Show hidden events in timeline": "Erakutsi gertaera ezkutuak denbora-lerroan",
-    "Low bandwidth mode": "Banda-zabalera gutxiko modua",
     "When rooms are upgraded": "Gelak eguneratzean",
     "this room": "gela hau",
     "View older messages in %(roomName)s.": "Ikusi %(roomName)s gelako mezu zaharragoak.",
@@ -1304,11 +1089,8 @@
     "This room has already been upgraded.": "Gela hau dagoeneko eguneratu da.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Gela honek <roomVersion /> bertsioa du, eta hasiera-zerbitzariak<i>ez egonkor</i> gisa markatu du.",
     "edited": "editatua",
-    "Maximize apps": "Maximizatu aplikazioak",
     "Rotate Left": "Biratu ezkerrera",
-    "Rotate counter-clockwise": "Biratu erlojuaren orratzen zentzuaren kontra",
     "Rotate Right": "Biratu eskumara",
-    "Rotate clockwise": "Biratu erlojuaren orratzen zentzuan",
     "Edit message": "Editatu mezua",
     "GitHub issue": "GitHub arazo-txostena",
     "Notes": "Oharrak",
@@ -1323,8 +1105,6 @@
     "Upload %(count)s other files|one": "Igo beste fitxategi %(count)s",
     "Cancel All": "Ezeztatu dena",
     "Upload Error": "Igoera errorea",
-    "Unable to validate homeserver/identity server": "Ezin izan da hasiera-zerbitzaria edo identitate-zerbitzaria balioztatu",
-    "Sign in to your Matrix account on <underlinedServerName />": "Hasi saioa zure <underlinedServerName /> zerbitzariko Matrix kontuarekin",
     "Use an email address to recover your account": "Erabili e-mail helbidea zure kontua berreskuratzeko",
     "Enter email address (required on this homeserver)": "Sartu zure e-mail helbidea (hasiera-zerbitzari honetan beharrezkoa da)",
     "Doesn't look like a valid email address": "Ez dirudi baliozko e-mail helbide bat",
@@ -1334,14 +1114,10 @@
     "Passwords don't match": "Pasahitzak ez datoz bat",
     "Other users can invite you to rooms using your contact details": "Beste erabiltzaileek geletara gonbidatu zaitzakete zure kontaktu-xehetasunak erabiliz",
     "Enter phone number (required on this homeserver)": "Sartu telefono zenbakia (hasiera zerbitzari honetan beharrezkoa)",
-    "Doesn't look like a valid phone number": "Ez dirudi baliozko telefono zenbaki bat",
     "Use lowercase letters, numbers, dashes and underscores only": "Erabili letra xeheak, zenbakiak, gidoiak eta azpimarrak, besterik ez",
     "Enter username": "Sartu erabiltzaile-izena",
     "Some characters not allowed": "Karaktere batzuk ez dira onartzen",
-    "Create your Matrix account on <underlinedServerName />": "Sortu zure Matrix kontua <underlinedServerName /> zerbitzarian",
     "Add room": "Gehitu gela",
-    "Your profile": "Zure profila",
-    "Your Matrix account on <underlinedServerName />": "Zure <underlinedServerName /> zerbitzariko Matrix kontua",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Hasiera-zerbitzariaren URL-a ez dirudi baliozko hasiera-zerbitzari batena",
     "Identity server URL does not appear to be a valid identity server": "Identitate-zerbitzariaren URL-a ez dirudi baliozko identitate-zerbitzari batena",
     "Cannot reach identity server": "Ezin izan da identitate-zerbitzaria atzitu",
@@ -1356,7 +1132,6 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Fitxategi hau <b>handiegia da</b> igo ahal izateko. Fitxategiaren tamaina-muga %(limit)s da, baina fitxategi honen tamaina %(sizeOfThisFile)s da.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Fitxategi hauek <b>handiegiak dira</b> igotzeko. Fitxategien tamaina-muga %(limit)s da.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Fitxategi batzuk <b>handiegiak dira</b> igotzeko. Fitxategien tamaina-muga %(limit)s da.",
-    "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.": "%(widgetUrl)s helbidean kokatutako trepeta batek zure identitatea egiaztatu nahi du. Hau baimentzen baduzu, trepetak zure erabiltzaile ID-a egiaztatu ahal izango du, baina ez zure izenean ekintzarik egin.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s-ek huts egin du zure hasiera-zerbitzariaren protokoloen zerrenda eskuratzean. Agian hasiera-zerbitzaria zaharregia da hirugarrengoen sareak onartzeko.",
     "Failed to get autodiscovery configuration from server": "Huts egin du aurkikuntza automatikoaren konfigurazioa zerbitzaritik eskuratzean",
     "Invalid base_url for m.homeserver": "Baliogabeko base_url  m.homeserver zerbitzariarentzat",
@@ -1373,7 +1148,6 @@
     "Message edits": "Mezuaren edizioak",
     "Show all": "Erakutsi denak",
     "Changes your avatar in all rooms": "Aldatu zure abatarra gela guztietan",
-    "%(senderName)s made no change.": "%(senderName)s erabiltzaileak ez du aldaketarik egin.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s erabiltzaileek ez dute aldaketarik egin %(count)s aldiz",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s erabiltzaileek ez dute aldaketarik egin",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s erabiltzaileak ez du aldaketarik egin %(count)s aldiz",
@@ -1381,9 +1155,7 @@
     "Removing…": "Kentzen…",
     "Clear all data": "Garbitu datu guztiak",
     "Your homeserver doesn't seem to support this feature.": "Antza zure hasiera-zerbitzariak ez du ezaugarri hau onartzen.",
-    "Resend edit": "Birbidali edizioa",
     "Resend %(unsentCount)s reaction(s)": "Birbidali %(unsentCount)s erreakzio",
-    "Resend removal": "Birbidali kentzeko agindua",
     "Forgotten your password?": "Pasahitza ahaztuta?",
     "Sign in and regain access to your account.": "Hasi saioa eta berreskuratu zure kontua.",
     "You're signed out": "Saioa amaitu duzu",
@@ -1393,7 +1165,6 @@
     "Failed to re-authenticate": "Berriro autentifikatzean huts egin du",
     "Enter your password to sign in and regain access to your account.": "Sartu zure pasahitza saioa hasteko eta berreskuratu zure kontura sarbidea.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Ezin duzu zure kontuan saioa hasi. Jarri kontaktuan zure hasiera zerbitzariko administratzailearekin informazio gehiagorako.",
-    "Identity Server": "Identitate zerbitzaria",
     "Find others by phone or email": "Aurkitu besteak telefonoa edo e-maila erabiliz",
     "Be found by phone or email": "Izan telefonoa edo e-maila erabiliz aurkigarria",
     "Use bots, bridges, widgets and sticker packs": "Erabili botak, zubiak, trepetak eta eranskailu multzoak",
@@ -1408,17 +1179,12 @@
     "Actions": "Ekintzak",
     "Displays list of commands with usages and descriptions": "Aginduen zerrenda bistaratzen du, erabilera eta deskripzioekin",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Baimendu turn.matrix.org deien laguntzarako zerbitzaria erabiltzea zure hasiera-zerbitzariak bat eskaintzen ez duenean (Zure IP helbidea partekatuko da deian zehar)",
-    "Identity Server URL must be HTTPS": "Identitate zerbitzariaren URL-a HTTPS motakoa izan behar du",
-    "Not a valid Identity Server (status code %(code)s)": "Ez da identitate zerbitzari baliogarria (egoera-mezua %(code)s)",
-    "Could not connect to Identity Server": "Ezin izan da identitate-zerbitzarira konektatu",
     "Checking server": "Zerbitzaria egiaztatzen",
     "Disconnect from the identity server <idserver />?": "Deskonektatu <idserver /> identitate-zerbitzaritik?",
     "Disconnect": "Deskonektatu",
-    "Identity Server (%(server)s)": "Identitate-zerbitzaria (%(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.": "<server></server> erabiltzen ari zara kontaktua aurkitzeko eta aurkigarria izateko. Zure identitate-zerbitzaria aldatu dezakezu azpian.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Orain ez duzu identitate-zerbitzaririk erabiltzen. Kontaktuak aurkitzeko eta aurkigarria izateko, gehitu bat azpian.",
     "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.": "Zure identitate-zerbitzaritik deskonektatzean ez zara beste erabiltzaileentzat aurkigarria izango eta ezin izango dituzu besteak gonbidatu e-mail helbidea edo telefono zenbakia erabiliz.",
-    "Integration Manager": "Integrazio-kudeatzailea",
     "Discovery": "Aurkitzea",
     "Deactivate account": "Desaktibatu kontua",
     "Always show the window menu bar": "Erakutsi beti leihoaren menu barra",
@@ -1433,12 +1199,10 @@
     "Discovery options will appear once you have added a phone number above.": "Aurkitze aukerak behin goian telefono zenbaki bat gehitu duzunean agertuko dira.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "SMS mezu bat bidali zaizu +%(msisdn)s zenbakira. Sartu hemen mezu horrek daukan egiaztatze-kodea.",
     "Command Help": "Aginduen laguntza",
-    "No identity server is configured: add one in server settings to reset your password.": "Eza da identitate-zerbitzaririk konfiguratu, gehitu bat zerbitzari-ezarpenetan zure pasahitza berrezartzeko.",
     "This account has been deactivated.": "Kontu hau desaktibatuta dago.",
     "Sends a message as plain text, without interpreting it as markdown": "Bidali mezu bat test arrunt gisa, markdown balitz aztertu gabe",
     "You do not have the required permissions to use this command.": "Ez duzu agindu hau erabiltzeko baimena.",
     "Use an identity server": "Erabili identitate zerbitzari bat",
-    "Multiple integration managers": "Hainbat integrazio kudeatzaile",
     "Accept <policyLink /> to continue:": "Onartu <policyLink /> jarraitzeko:",
     "ID": "ID-a",
     "Public Name": "Izen publikoa",
@@ -1459,7 +1223,6 @@
     "Changes the avatar of the current room": "Uneko gelaren abatarra aldatzen du",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. Sakatu jarraitu lehenetsitakoa erabiltzeko (%(defaultIdentityServerName)s) edo aldatu ezarpenetan.",
     "Use an identity server to invite by email. Manage in Settings.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. Kudeatu ezarpenetan.",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Bidali mezuentzako irakurragiriak (Hasiera-zerbitzari bateragarria behar da desgaitzeko)",
     "Show previews/thumbnails for images": "Erakutsi irudien aurrebista/iruditxoak",
     "Change identity server": "Aldatu identitate-zerbitzaria",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Deskonektatu <current /> identitate-zerbitzaritik eta konektatu <new /> zerbitzarira?",
@@ -1503,7 +1266,6 @@
     "Share this email in Settings to receive invites directly in %(brand)s.": "Partekatu e-mail hau ezarpenetan gonbidapenak zuzenean %(brand)s-en jasotzeko.",
     "%(count)s unread messages including mentions.|other": "irakurri gabeko %(count)s mezu aipamenak barne.",
     "%(count)s unread messages.|other": "irakurri gabeko %(count)s mezu.",
-    "Unread mentions.": "Irakurri gabeko aipamenak.",
     "Show image": "Erakutsi irudia",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Sortu txosten berri bat</newIssueLink> GitHub zerbitzarian arazo hau ikertu dezagun.",
     "e.g. my-room": "adib. nire-gela",
@@ -1511,14 +1273,11 @@
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. Kudeatu <settings>Ezarpenak</settings> atalean.",
     "Close dialog": "Itxi elkarrizketa-koadroa",
     "Please enter a name for the room": "Sartu gelaren izena",
-    "This room is private, and can only be joined by invitation.": "Gela hau pribatua da, eta gonbidapena behar da elkartzeko.",
     "Create a public room": "Sortu gela publikoa",
     "Create a private room": "Sortu gela pribatua",
     "Topic (optional)": "Mintzagaia (aukerakoa)",
-    "Make this room public": "Bihurtu publiko gela hau",
     "Hide advanced": "Ezkutatu aurreratua",
     "Show advanced": "Erakutsi aurreratua",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Eragotzi beste matrix hasiera-zerbitzarietako erabiltzaileak gela honetara elkartzea (Ezarpen hau ezin da gero aldatu!)",
     "Please fill why you're reporting.": "Idatzi zergatik salatzen duzun.",
     "Report Content to Your Homeserver Administrator": "Salatu edukia zure hasiera-zerbitzariko administratzaileari",
     "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.": "Mezu hau salatzeak bere 'gertaera ID'-a bidaliko dio hasiera-zerbitzariko administratzaileari. Gela honetako mezuak zifratuta badaude, zure hasiera-zerbitzariko administratzaileak ezin izango du mezuaren testua irakurri edo irudirik ikusi.",
@@ -1527,13 +1286,7 @@
     "Document": "Dokumentua",
     "Report Content": "Salatu edukia",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Captcha-ren gako publikoa falta da hasiera-zerbitzariaren konfigurazioan. Eman honen berri hasiera-zerbitzariaren administratzaileari.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Ezarri E-mail bat kontua berreskuratzeko. Erabili E-mail edo telefonoa aukeran zure kontaktuek aurkitu zaitzaten.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Ezarri E-mail bat kontua berreskuratzeko. Erabili E-maila aukeran zure kontaktuek aurkitu zaitzaten.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Sartu zure hasiera-zerbitzari pertsonalizatuaren URL-a <a>Zer esan nahi du?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Sartu zure identitate-zerbitzari pertsonalizatuaren URL-a <a>Zer esan nahi du?</a>",
-    "Explore": "Arakatu",
     "Filter": "Iragazi",
-    "Filter rooms…": "Iragazi gelak…",
     "%(creator)s created and configured the room.": "%(creator)s erabiltzaileak gela sortu eta konfiguratu du.",
     "Preview": "Aurrebista",
     "View": "Ikusi",
@@ -1553,7 +1306,6 @@
     "wait and try again later": "itxaron eta berriro saiatu",
     "Show tray icon and minimize window to it on close": "Erakutsi egoera-barrako ikonoa eta minimizatu leihoa itxi ordez",
     "Room %(name)s": "%(name)s gela",
-    "Recent rooms": "Azken gelak",
     "%(count)s unread messages including mentions.|one": "Irakurri gabeko aipamen 1.",
     "%(count)s unread messages.|one": "Irakurri gabeko mezu 1.",
     "Unread messages.": "Irakurri gabeko mezuak.",
@@ -1572,11 +1324,9 @@
     "Flags": "Banderak",
     "Quick Reactions": "Erreakzio azkarrak",
     "Cancel search": "Ezeztatu bilaketa",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ez da identitate-zerbitzaririk konfiguratu, beraz ezin duzu e-mail helbide bat gehitu etorkizunean pasahitza berrezartzeko.",
     "Jump to first unread room.": "Jauzi irakurri gabeko lehen gelara.",
     "Jump to first invite.": "Jauzi lehen gonbidapenera.",
     "Command Autocomplete": "Aginduak auto-osatzea",
-    "DuckDuckGo Results": "DuckDuckGo emaitzak",
     "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.": "Ekintza honek lehenetsitako <server /> identitate-zerbitzaria atzitzea eskatzen du, e-mail helbidea edo telefono zenbakia balioztatzeko, baina zerbitzariak ez du erabilera baldintzarik.",
     "Trust": "Jo fidagarritzat",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
@@ -1604,11 +1354,7 @@
     "Cannot connect to integration manager": "Ezin da integrazio kudeatzailearekin konektatu",
     "The integration manager is offline or it cannot reach your homeserver.": "Integrazio kudeatzailea lineaz kanpo dago edo ezin du zure hasiera-zerbitzaria atzitu.",
     "Clear notifications": "Garbitu jakinarazpenak",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Erabili  <b>(%(serverName)s)</b> integrazio kudeatzailea botak, trepetak eta eranskailu multzoak kudeatzeko.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Erabili integrazio kudeatzaile bat botak, trepetak eta eranskailu multzoak kudeatzeko.",
     "Manage integrations": "Kudeatu integrazioak",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrazio kudeatzaileek konfigurazio datuak jasotzen dituzte, eta trepetak aldatu ditzakete, gelara gonbidapenak bidali, eta botere mailak zure izenean ezarri.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Pertsonalizatu zure esperientzia laborategiko ezaugarri esperimentalekin. <a>Ikasi gehiago</a>.",
     "Ignored/Blocked": "Ezikusia/Blokeatuta",
     "Error adding ignored user/server": "Errorea ezikusitako erabiltzaile edo zerbitzaria gehitzean",
     "Something went wrong. Please try again or view your console for hints.": "Okerren bat egon da. Saiatu berriro edo bilatu aztarnak kontsolan.",
@@ -1639,8 +1385,6 @@
     "Failed to connect to integration manager": "Huts egin du integrazio kudeatzailera konektatzean",
     "Trusted": "Konfiantzazkoa",
     "Not trusted": "Ez konfiantzazkoa",
-    "Direct message": "Mezu zuzena",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> %(roomName)s gelan",
     "Messages in this room are end-to-end encrypted.": "Gela honetako mezuak muturretik muturrera zifratuta daude.",
     "Security": "Segurtasuna",
     "Verify": "Egiaztatu",
@@ -1653,7 +1397,6 @@
     "%(brand)s URL": "%(brand)s URL-a",
     "Room ID": "Gelaren ID-a",
     "Widget ID": "Trepetaren ID-a",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Trepeta hau erabiltzean <helpIcon />  %(widgetDomain)s domeinuarekin eta zure integrazio kudeatzailearekin datuak partekatu daitezke.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Trepeta hau erabiltzean <helpIcon />  %(widgetDomain)s domeinuarekin datuak partekatu daitezke.",
     "Widgets do not use message encryption.": "Trepetek ez dute mezuen zifratzea erabiltzen.",
     "Widget added by": "Trepeta honek gehitu du:",
@@ -1662,11 +1405,7 @@
     "Integrations are disabled": "Integrazioak desgaituta daude",
     "Enable 'Manage Integrations' in Settings to do this.": "Gaitu 'Kudeatu integrazioak' ezarpenetan hau egiteko.",
     "Integrations not allowed": "Integrazioak ez daude baimenduta",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Zure %(brand)s aplikazioak ez dizu hau egiteko integrazio kudeatzaile bat erabiltzen uzten. Kontaktatu administratzaileren batekin.",
-    "Reload": "Birkargatu",
-    "Take picture": "Atera argazkia",
     "Remove for everyone": "Kendu denentzat",
-    "Remove for me": "Kendu niretzat",
     "Verification Request": "Egiaztaketa eskaria",
     "Error upgrading room": "Errorea gela eguneratzean",
     "Double check that your server supports the room version chosen and try again.": "Egiaztatu zure zerbitzariak aukeratutako gela bertsioa onartzen duela eta saiatu berriro.",
@@ -1687,9 +1426,6 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak gelak debekatzen dituen araua aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak zerbitzariak debekatzen dituen araua aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak debeku arau bat aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s",
-    "Cross-signing and secret storage are enabled.": "Zeharkako sinadura eta biltegi sekretua gaituta daude.",
-    "Cross-signing and secret storage are not yet set up.": "Zeharkako sinadura eta biltegi sekretua ez daude oraindik ezarrita.",
-    "Bootstrap cross-signing and secret storage": "Abiatu zeharkako sinadura eta biltegi sekretua",
     "Cross-signing public keys:": "Zeharkako sinaduraren gako publikoak:",
     "not found": "ez da aurkitu",
     "Cross-signing private keys:": "Zeharkako sinaduraren gako pribatuak:",
@@ -1700,7 +1436,6 @@
     "Backup has a <validity>valid</validity> signature from this user": "Babes-kopiak erabiltzaile honen <validity>baliozko</validity> sinadura bat du",
     "Backup has a <validity>invalid</validity> signature from this user": "Babes-kopiak erabiltzaile honen <validity>baliogabeko</validity> sinadura bat du",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen erabiltzaile <verify>ezezagun</verify> baten sinadura du",
-    "Backup key stored: ": "Babes-kopiaren gakoa gordeta: ",
     "Cross-signing": "Zeharkako sinadura",
     "This message cannot be decrypted": "Mezu hau ezin da deszifratu",
     "Unencrypted": "Zifratu gabe",
@@ -1711,24 +1446,16 @@
     "%(count)s verified sessions|other": "%(count)s egiaztatutako saio",
     "%(count)s verified sessions|one": "Egiaztatutako saio 1",
     "Reactions": "Erreakzioak",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/> erabiltzaileak <reactedWith>%(content)s batekin erreakzionatu du</reactedWith>",
-    "Automatically invite users": "Gonbidatu erabiltzaileak automatikoki",
     "Upgrade private room": "Eguneratu gela pribatua",
     "Upgrade public room": "Eguneratu gela publikoa",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gela eguneratzea ekintza aurreratu bat da eta akatsen, falta diren ezaugarrien, edo segurtasun arazoen erruz gela ezegonkorra denean aholkatzen da.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Gela hau <oldVersion /> bertsiotik <newVersion /> bertsiora eguneratuko duzu.",
     "Upgrade": "Eguneratu",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Abisua:</b>: Gakoen babes-kopia fidagarria den gailu batetik egin beharko zenuke beti.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Zure berreskuratze-gakoa ahaztu baduzu <button>berreskuratze aukera berriak ezarri</button> ditzakezu",
     "Notification settings": "Jakinarazpenen ezarpenak",
     "User Status": "Erabiltzaile-egoera",
-    "Set up with a recovery key": "Ezarri berreskuratze gakoarekin",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Zure berreskuratze gakoa <b>arbelera kopiatu da</b>, itsatsi hemen:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Zure berreskuratze gakoa zure <b>Deskargak</b> karpetan dago.",
     "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri",
-    "The message you are trying to send is too large.": "Bidali nahi duzun mezua handiegia da.",
     "Language Dropdown": "Hizkuntza menua",
-    "Help": "Laguntza",
     "Country Dropdown": "Herrialde menua",
     "Show info about bridges in room settings": "Erakutsi zubiei buruzko informazioa gelaren ezarpenetan",
     "This bridge is managed by <user />.": "Zubi hau <user /> erabiltzaileak kudeatzen du.",
@@ -1757,8 +1484,6 @@
     "%(num)s days from now": "hemendik %(num)s egunetara",
     "Other users may not trust it": "Beste erabiltzaile batzuk ez fidagarritzat jo lezakete",
     "Later": "Geroago",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Ezin izan dira honako erabiltzaile hauek gonbidatu txatera: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Ezin izan dugu zure mezu zuena sortu. Egiaztatu gonbidatu nahi dituzun erabiltzaileak eta saiatu berriro.",
     "Something went wrong trying to invite the users.": "Okerren bat egon da erabiltzaileak gonbidatzen saiatzean.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezin izan ditugu erabiltzaile horiek gonbidatu. Egiaztatu gonbidatu nahi dituzun erabiltzaileak eta saiatu berriro.",
     "Recently Direct Messaged": "Berriki mezu zuzena bidalita",
@@ -1769,7 +1494,6 @@
     "Go Back": "Joan atzera",
     "This room is end-to-end encrypted": "Gela hau muturretik muturrera zifratuta dago",
     "Everyone in this room is verified": "Gelako guztiak egiaztatuta daude",
-    "Invite only": "Gonbidapenez besterik ez",
     "Send a reply…": "Bidali erantzuna…",
     "Send a message…": "Bidali mezua…",
     "Reject & Ignore user": "Ukatu eta ezikusi erabiltzailea",
@@ -1784,7 +1508,6 @@
     "Enter your account password to confirm the upgrade:": "Sartu zure kontuaren pasa-hitza eguneraketa baieztatzeko:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Zerbitzariarekin autentifikatu beharko duzu eguneraketa baieztatzeko.",
     "Upgrade your encryption": "Eguneratu zure zifratzea",
-    "Set up encryption": "Ezarri zifratzea",
     "Setting up keys": "Gakoak ezartzen",
     "Verify this session": "Egiaztatu saio hau",
     "Encryption upgrade available": "Zifratze eguneratzea eskuragarri",
@@ -1802,11 +1525,8 @@
     "They match": "Bat datoz",
     "They don't match": "Ez datoz bat",
     "To be secure, do this in person or use a trusted way to communicate.": "Ziurtatzeko, egin hau aurrez aurre edo komunikabide seguru baten bidez.",
-    "Verify yourself & others to keep your chats safe": "Egiaztatu zure burua eta besteak txatak seguru mantentzeko",
     "Review": "Berrikusi",
     "This bridge was provisioned by <user />.": "Zubi hau <user /> erabiltzaileak hornitu du.",
-    "Workspace: %(networkName)s": "Lan eremua: %(networkName)s",
-    "Channel: %(channelName)s": "Kanala: %(channelName)s",
     "Show less": "Erakutsi gutxiago",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pasahitza aldatzean oraingo muturretik muturrerako zifratze gako guztiak ezeztatuko ditu saio guztietan, zifratutako txaten historiala ezin izango da irakurri ez badituzu aurretik zure geletako gakoak esportatzen eta gero berriro inportatzen. Etorkizunean hau hobetuko da.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Zure kontuak zeharkako sinatze identitate bat du biltegi sekretuan, baina saio honek ez du oraindik fidagarritzat.",
@@ -1815,7 +1535,6 @@
     "Unable to load session list": "Ezin izan da saioen zerrenda kargatu",
     "Delete %(count)s sessions|other": "Ezabatu %(count)s saio",
     "Delete %(count)s sessions|one": "Ezabatu saio %(count)s",
-    "rooms.": "gela.",
     "Manage": "Kudeatu",
     "Enable": "Gaitu",
     "This session is backing up your keys. ": "Saio honek zure gakoen babes-kopia egiten du. ",
@@ -1861,7 +1580,6 @@
     "You've successfully verified %(displayName)s!": "Ongi egiaztatu duzu %(displayName)s!",
     "Got it": "Ulertuta",
     "Encryption enabled": "Zifratzea gaituta",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Gela honetako mezuak muturretik muturrera zifratuta daude. Ikasi gehiago eta egiaztatu erabiltzaile hau bere erabiltzaile profilean.",
     "Encryption not enabled": "Zifratzea gaitu gabe",
     "The encryption used by this room isn't supported.": "Gela honetan erabilitako zifratzea ez da onartzen.",
     "Clear all data in this session?": "Garbitu saio honetako datu guztiak?",
@@ -1870,24 +1588,10 @@
     "Session name": "Saioaren izena",
     "Session key": "Saioaren gakoa",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Erabiltzaile hau egiaztatzean bere saioa fidagarritzat joko da, eta zure saioak beretzat fidagarritzat ere.",
-    "New session": "Saio berria",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Erabili saio hau berria egiaztatzeko, honela mezu zifratuetara sarbidea emanez:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Ez baduzu saio hau zuk hasi, agian baten bat zure kontuan sartu da.",
-    "This wasn't me": "Ez naiz ni izan",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Honekin zure kontura itzuli ahalko zara beste saioak amaitu eta berriro hasita.",
-    "Recovery key mismatch": "Berreskuratze gakoak ez datoz bat",
-    "Incorrect recovery passphrase": "Berreskuratze pasa-esaldi okerra",
-    "Enter recovery passphrase": "Sartu berreskuratze pasa-esaldia",
-    "Enter recovery key": "Sartu berreskuratze gakoa",
     "Confirm your identity by entering your account password below.": "Baieztatu zure identitatea zure kontuaren pasahitza azpian idatziz.",
     "Your new session is now verified. Other users will see it as trusted.": "Zure saioa egiaztatuta dago orain. Beste erabiltzaileek fidagarri gisa ikusiko dute.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Saio honetan segurtasuna ezarri ezean, ez du zifratutako mezuetara sarbiderik izango.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gorde kopia bat toki seguruan, esaterako pasahitz kudeatzaile batean edo gordailu kutxan.",
-    "Your recovery key": "Zure berreskuratze gakoa",
     "Copy": "Kopiatu",
-    "Make a copy of your recovery key": "Egin zure berreskuratze gakoaren kopia",
-    "If you cancel now, you won't complete verifying the other user.": "Orain ezeztatzen baduzu, ez duzu beste erabiltzailearen egiaztaketa burutuko.",
-    "If you cancel now, you won't complete verifying your other session.": "Orain ezeztatzen baduzu, ez duzu beste zure beste saioaren egiaztaketa burutuko.",
     "Cancel entering passphrase?": "Ezeztatu pasa-esaldiaren sarrera?",
     "Securely cache encrypted messages locally for them to appear in search results.": "Gorde zifratutako mezuak cachean modu seguruan bilaketen emaitzetan agertu daitezen.",
     "You have verified this user. This user has verified all of their sessions.": "Erabiltzaile hau egiaztatu duzu. Erabiltzaile honek bere saio guztiak egiaztatu ditu.",
@@ -1917,11 +1621,8 @@
     "Show shortcuts to recently viewed rooms above the room list": "Erakutsi ikusitako azken geletara lasterbideak gelen zerrendaren goialdean",
     "Cancelling…": "Ezeztatzen…",
     "Your homeserver does not support cross-signing.": "Zure hasiera-zerbitzariak ez du zeharkako sinatzea onartzen.",
-    "Reset cross-signing and secret storage": "Berrezarri zeharkako sinadura eta biltegi sekretua",
     "Homeserver feature support:": "Hasiera-zerbitzariaren ezaugarrien euskarria:",
     "exists": "badago",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Gorde zifratutako mezuak cachean modu seguruan bilaketen emaitzetan agertu daitezen, hau erabiliz ",
-    " to store messages from ": " hemengo mezuak gordetzeko ",
     "%(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-ek zifratutako mezuak cache lokalean modu seguruan gordetzeko elementu batzuk faltan ditu. Ezaugarri honekin esperimentatu nahi baduzu, konpilatu pertsonalizatutako %(brand)s Desktop <nativeLink> bilaketa osagaiekin</nativeLink>.",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen erabiltzaile <verify>ezezagun</verify> baten sinadura du",
     "Accepting…": "Onartzen…",
@@ -1938,11 +1639,6 @@
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Zeharkako sinatzerako gakoak ezabatzea behin betiko da. Egiaztatu dituzunak segurtasun abisu bat jasoko dute.  Ziur aski ez duzu hau egin nahi, zeharkako sinatzea ahalbidetzen dizun gailu oro galdu ez baduzu.",
     "Clear cross-signing keys": "Garbitu zeharkako sinatzerako gakoak",
     "Verification Requests": "Egiaztatze eskaerak",
-    "Your account is not secure": "Zure kontua ez da segurua",
-    "Your password": "Zure pasahitza",
-    "This session, or the other session": "Saio hau, edo beste saioa",
-    "The internet connection either session is using": "Saioetako batek darabilen internet konexioa",
-    "We recommend you change your password and recovery key in Settings immediately": "Pasahitza eta ezarpenetako berreskuratze gakoa berehala aldatzea aholkatzen dizugu",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Zure pasahitza aldatzeak zure saio guztietako muturretik-muturrerako zifratzerako gakoak berrezarriko ditu, eta aurretik zifratutako mezuen historiala ezin izango da irakurri. Ezarri gakoen babes-kopia edo esportatu zure geletako gakoak beste saio batetik pasahitza aldatu aurretik.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Saio guztiak amaitu dituzu eta ez duzu push jakinarazpenik jasoko. Jakinarazpenak berriro aktibatzeko, hasi saioa gailuetan.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Berreskuratu zure kontura sarbidea eta saio honetan gordetako zifratze gakoak. Horiek gabe, ezin izango dituzu zure mezu seguruak beste saioetan irakurri.",
@@ -1952,7 +1648,6 @@
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Mezuen berreskuratze segurua ezartzen ez baduzu, ezin izango duzu zifratutako mezuen historiala berreskuratu saioa amaitzen baduzu edo beste saio bat erabiltzen baduzu.",
     "Create key backup": "Sortu gakoen babes-kopia",
     "This session is encrypting history using the new recovery method.": "Saio honek historiala zifratzen du berreskuratze metodo berria erabiliz.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Saio honek zure berreskuratze pasa-esaldia eta mezu seguruen gakoa kendu direla antzeman du.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Nahi gabe egin baduzu hau, Mezu seguruak ezarri ditzakezu saio honetan eta saioaren mezuen historiala berriro zifratuko da berreskuratze metodo berriarekin.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Desgaituz gero, zifratutako geletako mezuak ez dira bilaketen emaitzetan agertuko.",
     "Disable": "Desgaitu",
@@ -1984,7 +1679,6 @@
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Errore bat gertatu da gelaren ordezko helbideak eguneratzean. Agian zerbitzariak ez du onartzen edo une bateko akatsa izan da.",
     "Local address": "Helbide lokala",
     "Published Addresses": "Argitaratutako helbideak",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Argitaratutako helbideak edonork erabili ditzake edozein zerbitzaritik zure gelara elkartzeko. Helbide bat argitaratzeko aurretik helbide lokal gisa ezarri behar da.",
     "Other published addresses:": "Argitaratutako beste helbideak:",
     "No other published addresses yet, add one below": "Ez dago argitaratutako beste helbiderik, gehitu bat azpian",
     "New published address (e.g. #alias:server)": "Argitaratutako helbide berria (adib. #ezizena:zerbitzaria)",
@@ -2007,7 +1701,6 @@
     "Manually Verify by Text": "Egiaztatu eskuz testu bidez",
     "Interactively verify by Emoji": "Egiaztatu interaktiboki Emoji bidez",
     "Keyboard Shortcuts": "Teklatu lasterbideak",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Hasi elkarrizketa norbaitekin bere izena, erabiltzaile izena (esaterako <userId/>) edo e-mail helbidea erabiliz.",
     "a new master key signature": "gako nagusiaren sinadura berria",
     "a new cross-signing key signature": "zeharkako sinatze gako sinadura berria",
     "a device cross-signing signature": "gailuz zeharkako sinadura berria",
@@ -2072,7 +1765,6 @@
     "Verified": "Egiaztatuta",
     "Verification cancelled": "Egiaztaketa ezeztatuta",
     "Compare emoji": "Konparatu emojiak",
-    "Session backup key:": "Saioaren babes-kopia gakoa:",
     "Sends a message as html, without interpreting it as markdown": "Bidali mezua html gisa, markdown balitz aztertu gabe",
     "Sign in with SSO": "Hasi saioa SSO-rekin",
     "Cancel replying to a message": "Utzi mezua erantzuteari",
@@ -2088,7 +1780,6 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Baieztatu beheko emojiak bi saioetan ikusten direla, ordena berean:",
     "Verify this session by confirming the following number appears on its screen.": "Egiaztatu saio hau honako zenbakia bere pantailan agertzen dela baieztatuz.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Beste saioaren zain, %(deviceName)s (%(deviceId)s), egiaztatzeko…",
-    "From %(deviceName)s (%(deviceId)s)": "%(deviceName)s (%(deviceId)s) gailutik",
     "well formed": "ongi osatua",
     "unexpected type": "ustekabeko mota",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Berretsi saio hauek ezabatzea Single sign-on bidez zure identitatea frogatuz.",
@@ -2097,7 +1788,6 @@
     "Click the button below to confirm deleting these sessions.|other": "Sakatu beheko botoia saio hauek ezabatzea berresteko.",
     "Click the button below to confirm deleting these sessions.|one": "Sakatu beheko botoia saio hau ezabatzea berresteko.",
     "Delete sessions": "Ezabatu saioak",
-    "Waiting for you to accept on your other session…": "Zu beste saioa onartu bitartean zain…",
     "Almost there! Is your other session showing the same shield?": "Ia amaitu duzu! Zure beste saioak ezkutu bera erakusten du?",
     "Almost there! Is %(displayName)s showing the same shield?": "Ia amaitu duzu! %(displayName)s gailuak ezkutu bera erakusten du?",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ongi egiaztatu duzu %(deviceName)s (%(deviceId)s)!",
@@ -2120,10 +1810,8 @@
     "Send a Direct Message": "Bidali mezu zuzena",
     "Explore Public Rooms": "Arakatu gela publikoak",
     "Create a Group Chat": "Sortu talde-txata",
-    "Self-verification request": "Auto-egiaztaketa eskaria",
     "Delete sessions|other": "Ezabatu saioak",
     "Delete sessions|one": "Ezabatu saioa",
-    "If you cancel now, you won't complete your operation.": "Orain ezeztatzen baduzu, ez duzu eragiketa burutuko.",
     "Failed to set topic": "Ezin izan da mintzagaia ezarri",
     "Command failed": "Aginduak huts egin du",
     "Could not find user in room": "Ezin izan da erabiltzailea gelan aurkitu",
@@ -2133,47 +1821,26 @@
     "Submit logs": "Bidali egunkariak",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Oroigarria: Ez dugu zure nabigatzailearentzako euskarririk, ezin da zure esperientzia nolakoa izango den aurreikusi.",
     "Unable to upload": "Ezin izan da igo",
-    "Verify other session": "Egiaztatu beste saioa",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ezin izan da biltegi sekretura sartu. Egiaztatu berreskuratze pasa-esaldi zuzena sartu duzula.",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Ezin izan da babes-kopia deszifratu berreskuratze-gako honekin: egiaztatu berreskuratze-gako egokia sartu duzula.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Ezin izan da babes-kopia deszifratu berreskuratze pasa-esaldi honekin: egiaztatu berreskuratze berreskuratze pasa-esaldia ondo idatzi duzula.",
     "Verify this login": "Egiaztatu saio hau",
     "Syncing...": "Sinkronizatzen…",
     "Signing In...": "Saioa hasten...",
     "If you've joined lots of rooms, this might take a while": "Gela askotara elkartu bazara, honek denbora behar lezake",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Baieztatu zure identitatea saio hau zure beste saio batetik egiaztatuz, mezu zifratuetara sarbidea emanez.",
-    "This requires the latest %(brand)s on your other devices:": "Honek zure beste gailuetan azken %(brand)s bertsioa eskatzen du:",
-    "or another cross-signing capable Matrix client": "edo zeharkako sinadurarako gai den beste Matrix bezero bat",
-    "Great! This recovery passphrase looks strong enough.": "Bikain! Berreskuratze pasa-esaldi hau sendoa dirudi.",
-    "Enter a recovery passphrase": "Sartu berreskuratze pasa-esaldia",
-    "Enter your recovery passphrase a second time to confirm it.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
-    "Confirm your recovery passphrase": "Berretsi berreskuratze pasa-esaldia",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Zure berreskuratze-gakoa badaezpadakoa da, pasa-esaldia ahazten baduzu zure zifratutako mezuak berreskuratzeko erabili dezakezu.",
     "Unable to query secret storage status": "Ezin izan da biltegi sekretuaren egoera kontsultatu",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Zure gakoen kopia zifratu bat gordeko dugu gure zerbitzarian. Babestu zure babes-kopia berreskuratze pasa-esaldi batekin.",
-    "Please enter your recovery passphrase a second time to confirm.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
-    "Repeat your recovery passphrase...": "Errepikatu zure berreskuratze pasa-esaldia...",
-    "Secure your backup with a recovery passphrase": "Babestu zure babeskopia berreskuratze pasa-esaldi batekin",
     "Currently indexing: %(currentRoom)s": "Orain indexatzen: %(currentRoom)s",
-    "Review where you’re logged in": "Berrikusi non hasi duzun saioa",
     "New login. Was this you?": "Saio berria. Zu izan zara?",
     "Opens chat with the given user": "Erabiltzailearekin txata irekitzen du",
     "Sends a message to the given user": "Erabiltzaileari mezua bidaltzen dio",
     "You signed in to a new session without verifying it:": "Saio berria hasi duzu hau egiaztatu gabe:",
     "Verify your other session using one of the options below.": "Egiaztatu zure beste saioa beheko aukeretako batekin.",
-    "Font scaling": "Letren eskalatzea",
     "Font size": "Letra-tamaina",
     "IRC display name width": "IRC-ko pantaila izenaren zabalera",
     "Waiting for your other session to verify…": "Zure beste saioak egiaztatu bitartean zain…",
-    "Verify all your sessions to ensure your account & messages are safe": "Egiaztatu zure saio guztiak kontua eta mezuak seguru daudela bermatzeko",
-    "Verify the new login accessing your account: %(name)s": "Egiaztatu zure kontuan hasitako saio berria: %(name)s",
     "Size must be a number": "Tamaina zenbaki bat izan behar da",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Letra tamaina pertsonalizatua %(min)s pt eta %(max)s pt bitartean egon behar du",
     "Use between %(min)s pt and %(max)s pt": "Erabili %(min)s pt eta %(max)s pt bitarteko  balioa",
     "Appearance": "Itxura",
     "Where you’re logged in": "Non hasi duzun saioa",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Kudeatu azpiko saioen izenak eta hauek amaitu edo <a>egiaztatu zure erabiltzaile-profilean</a>.",
-    "Create room": "Sortu gela",
     "You've successfully verified your device!": "Ongi egiaztatu duzu zure gailua!",
     "Message deleted": "Mezu ezabatuta",
     "Message deleted by %(name)s": "Mezua ezabatu du %(name)s erabiltzaileak",
@@ -2181,7 +1848,6 @@
     "To continue, use Single Sign On to prove your identity.": "Jarraitzeko, erabili Single Sign On zure identitatea frogatzeko.",
     "Confirm to continue": "Berretsi jarraitzeko",
     "Click the button below to confirm your identity.": "Sakatu azpiko botoia zure identitatea frogatzeko.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Gonbidatu norbait bere izena, erabiltzaile izena (esaterako <userId/>), e-mail helbidea erabiliz, edo <a>partekatu gela hau</a>.",
     "Restoring keys from backup": "Gakoak babes-kopiatik berrezartzen",
     "Fetching keys from server...": "Gakoak zerbitzaritik eskuratzen...",
     "%(completed)s of %(total)s keys restored": "%(completed)s/%(total)s gako berreskuratuta",
@@ -2197,16 +1863,10 @@
     "Unrecognised room address:": "Gela helbide ezezaguna:",
     "Help us improve %(brand)s": "Lagundu gaitzazu %(brand)s hobetzen",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Bidali <UsageDataLink>erabilera datu anonimoak</UsageDataLink> %(brand)s hobetzen laguntzeko. Honek <PolicyLink>cookie</PolicyLink> bat darabil.",
-    "I want to help": "Lagundu nahi dut",
     "Your homeserver has exceeded its user limit.": "Zure hasiera-zerbitzariak erabiltzaile muga gainditu du.",
     "Your homeserver has exceeded one of its resource limits.": "Zure hasiera-zerbitzariak bere baliabide mugetako bat gainditu du.",
     "Contact your <a>server admin</a>.": "Jarri kontaktuan <a>zerbitzariaren administratzailearekin</a>.",
     "Ok": "Ados",
-    "Set password": "Ezarri pasahitza",
-    "To return to your account in future you need to set a password": "Zure kontura etorkizunean itzultzeko pasahitza ezarri behar duzu",
-    "Restart": "Berrasi",
-    "Upgrade your %(brand)s": "Eguneratu zure %(brand)s",
-    "A new version of %(brand)s is available!": "%(brand)s bertsio berria eskuragarri dago!",
     "New version available. <a>Update now.</a>": "Bertsio berri eskuragarri. <a>Eguneratu orain.</a>",
     "Please verify the room ID or address and try again.": "Egiaztatu gelaren ID-a edo helbidea eta saiatu berriro.",
     "Room ID or address of ban list": "Debeku zerrendaren gelaren IDa edo helbidea",
@@ -2218,8 +1878,6 @@
     "Sort by": "Ordenatu honela",
     "Activity": "Jarduera",
     "A-Z": "A-Z",
-    "Unread rooms": "Irakurri gabeko gelak",
-    "Always show first": "Erakutsi lehenbizi",
     "Show": "Erakutsi",
     "Message preview": "Mezu-aurrebista",
     "List options": "Zerrenda-aukerak",
@@ -2234,12 +1892,9 @@
     "Error removing address": "Errorea helbidea kentzean",
     "Categories": "Kategoriak",
     "Room address": "Gelaren helbidea",
-    "Please provide a room address": "Eman gelaren helbidea",
     "This address is available to use": "Gelaren helbide hau erabilgarri dago",
     "This address is already in use": "Gelaren helbide hau erabilita dago",
-    "Set a room address to easily share your room with other people.": "Ezarri gelaren helbide bat zure gela besteekin erraz partekatzeko.",
     "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.": "%(brand)s bertsio berriago bat erabili duzu saio honekin. Berriro bertsio hau muturretik muturrerako zifratzearekin erabiltzeko, saioa amaitu eta berriro hasi beharko duzu.",
-    "Address (optional)": "Helbidea (aukerakoa)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ezabatu %(alias)s gelaren helbidea eta kendu %(name)s direktoriotik?",
     "delete the address.": "ezabatu helbidea.",
     "Switch to light mode": "Aldatu modu argira",
@@ -2249,36 +1904,23 @@
     "All settings": "Ezarpen guztiak",
     "Feedback": "Iruzkinak",
     "Use a different passphrase?": "Erabili pasa-esaldi desberdin bat?",
-    "We’re excited to announce Riot is now Element": "Pozik jakinarazten dizugu: Riot orain Element deitzen da",
-    "Riot is now Element!": "Riot orain Element da!",
-    "Learn More": "Ikasi gehiago",
     "Light": "Argia",
     "The person who invited you already left the room.": "Gonbidatu zaituen pertsonak dagoeneko gela utzi du.",
     "The person who invited you already left the room, or their server is offline.": "Gonbidatu zaituen pertsonak dagoeneko gela utzi du edo bere zerbitzaria lineaz kanpo dago.",
     "You joined the call": "Deira batu zara",
     "%(senderName)s joined the call": "%(senderName)s deira batu da",
-    "You left the call": "Deitik atera zara",
-    "%(senderName)s left the call": "%(senderName)s(e) deitik atera da",
     "Call ended": "Deia amaitu da",
     "You started a call": "Dei bat hasi duzu",
     "%(senderName)s started a call": "%(senderName)s(e)k dei bat hasi du",
     "%(senderName)s is calling": "%(senderName)s deitzen ari da",
-    "%(brand)s Web": "%(brand)s web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X for Android",
     "Change notification settings": "Aldatu jakinarazpenen ezarpenak",
     "Use custom size": "Erabili tamaina pertsonalizatua",
     "Use a more compact ‘Modern’ layout": "Erabili mezuen antolaketa 'Modernoa', konpaktuagoa da",
     "Use a system font": "Erabili sistemako letra-tipoa",
     "System font name": "Sistemaren letra-tipoaren izena",
     "Unknown caller": "Dei-egile ezezaguna",
-    "Incoming voice call": "Sarrerako ahots-deia",
-    "Incoming video call": "Sarrerako bideo-deia",
-    "Incoming call": "Sarrerako deia",
     "Hey you. You're the best!": "Aupa txo. Onena zara!",
     "Message layout": "Mezuen antolaketa",
-    "Compact": "Konpaktua",
     "Modern": "Modernoa",
     "Use default": "Erabili lehenetsia",
     "Notification options": "Jakinarazpen ezarpenak",
@@ -2286,12 +1928,21 @@
     "This room is public": "Gela hau publikoa da",
     "Away": "Kanpoan",
     "Click to view edits": "Klik egin edizioak ikusteko",
-    "Go to Element": "Joan Elementera",
-    "Learn more at <a>element.io/previously-riot</a>": "Ikasi gehiago <a>element.io/previously-riot</a> orrian",
     "The server is offline.": "Zerbitzaria lineaz kanpo dago.",
     "The server has denied your request.": "Zerbitzariak zure eskariari uko egin dio.",
     "Wrong file type": "Okerreko fitxategi-mota",
     "Looks good!": "Itxura ona du!",
-    "Search rooms": "Bilatu gelak",
-    "User menu": "Erabiltzailea-menua"
+    "User menu": "Erabiltzailea-menua",
+    "Integration manager": "Integrazio-kudeatzailea",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Zure %(brand)s aplikazioak ez dizu hau egiteko integrazio kudeatzaile bat erabiltzen uzten. Kontaktatu administratzaileren batekin.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Trepeta hau erabiltzean <helpIcon />  %(widgetDomain)s domeinuarekin eta zure integrazio kudeatzailearekin datuak partekatu daitezke.",
+    "Identity server is": "Identitate zerbitzaria",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrazio kudeatzaileek konfigurazio datuak jasotzen dituzte, eta trepetak aldatu ditzakete, gelara gonbidapenak bidali, eta botere mailak zure izenean ezarri.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Erabili integrazio kudeatzaile bat botak, trepetak eta eranskailu multzoak kudeatzeko.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Erabili <b>(%(serverName)s)</b> integrazio kudeatzailea botak, trepetak eta eranskailu multzoak kudeatzeko.",
+    "Identity server": "Identitate zerbitzaria",
+    "Identity server (%(server)s)": "Identitate-zerbitzaria (%(server)s)",
+    "Could not connect to identity server": "Ezin izan da identitate-zerbitzarira konektatu",
+    "Not a valid identity server (status code %(code)s)": "Ez da identitate zerbitzari baliogarria (egoera-mezua %(code)s)",
+    "Identity server URL must be HTTPS": "Identitate zerbitzariaren URL-a HTTPS motakoa izan behar du"
 }
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 46dde79945..ffaa47660a 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -1,16 +1,12 @@
 {
     "Fetching third party location failed": "تطبیق اطلاعات از منابع‌ دسته سوم با شکست مواجه شد",
     "Messages in one-to-one chats": "پیام‌های درون چت‌های یک‌به‌یک",
-    "Advanced notification settings": "تنظیمات پیشرفته برای آگاه‌سازی‌ها",
-    "Uploading report": "در حال بارگذاری گزارش",
     "Sunday": "یکشنبه",
     "Guests can join": "میهمان‌ها می‌توانند بپیوندند",
     "Messages sent by bot": "پیام‌های ارسال شده توسط ربات",
     "Notification targets": "هدف‌های آگاه‌سازی",
     "Failed to set direct chat tag": "تنظیم تگ برای چت مستقیم موفقیت‌آمیز نبود",
     "Today": "امروز",
-    "Files": "فایل‌ها",
-    "You are not receiving desktop notifications": "آگاهی‌های میزکار را دریافت نمی‌کنید",
     "Friday": "آدینه",
     "Update": "به‌روز رسانی",
     "Notifications": "آگاهی‌ها",
@@ -20,26 +16,16 @@
     "Waiting for response from server": "در انتظار پاسخی از سمت سرور",
     "Leave": "خروج",
     "OK": "باشه",
-    "All notifications are currently disabled for all targets.": "همه‌ی آگاه‌سازی‌ها برای تمام هدف‌ها غیرفعال‌اند.",
     "Operation failed": "عملیات شکست خورد",
-    "Forget": "فراموش کن",
     "World readable": "خواندن جهانی",
     "Mute": "سکوت",
-    "You cannot delete this image. (%(code)s)": "شما نمی‌توانید این تصویر را پاک کنید. (%(code)s)",
-    "Cancel Sending": "فرستادن را لغو کن",
     "Warning": "هشدار",
     "This Room": "این گپ",
     "Resend": "بازفرست",
-    "Error saving email notification preferences": "خطا در ذخیره‌سازی ترجیحات آگاهسازی با ایمیل",
     "Downloading update...": "در حال بارگیریِ به‌روزرسانی...",
-    "Remember, you can always set an email address in user settings if you change your mind.": "به خاطر داشته باشید که اگر نظرتان عوض شد می‌توانید از بخش تنظیمات یک ایمیل را به اکانتتان متصل کنید.",
     "Unavailable": "غیرقابل‌دسترسی",
-    "View Decrypted Source": "دیدن منبع رمزگشایی شده",
-    "Failed to update keywords": "به‌روزرسانی کلیدواژه‌ها موفقیت‌آمیز نبود",
     "remove %(name)s from the directory.": "برداشتن %(name)s از فهرست گپ‌ها.",
-    "Please set a password!": "لطفا یک پسورد اختیار کنید!",
     "powered by Matrix": "قدرت‌یافته از ماتریکس",
-    "You have successfully set a password!": "شما با موفقیت رمزتان را انتخاب کردید!",
     "Favourite": "علاقه‌مندی‌ها",
     "All Rooms": "همه‌ی گپ‌ها",
     "Source URL": "آدرس مبدا",
@@ -49,28 +35,18 @@
     "Noisy": "پرسروصدا",
     "Collecting app version information": "درحال جمع‌آوری اطلاعات نسخه‌ی برنامه",
     "Cancel": "لغو",
-    "Enable notifications for this account": "آگاه سازی با رایانامه را برای این اکانت فعال کن",
-    "Messages containing <span>keywords</span>": "پیا‌م‌های دارای <span> این کلیدواژه‌ها </span>",
     "Room not found": "گپ یافت نشد",
     "Tuesday": "سه‌شنبه",
-    "Enter keywords separated by a comma:": "کلیدواژه‌ها را وارد کنید؛ از کاما(,) برای جدا کردن آنها از یکدیگر استفاده کنید:",
-    "Forward Message": "هدایت پیام",
     "Remove %(name)s from the directory?": "آیا مطمئنید می‌خواهید %(name)s را از فهرست گپ‌ها حذف کنید؟",
     "Unnamed room": "گپ نام‌گذاری نشده",
     "Dismiss": "نادیده بگیر",
     "Remove from Directory": "از فهرستِ گپ‌ها حذف کن",
     "Saturday": "شنبه",
-    "I understand the risks and wish to continue": "از خطرات این کار آگاهم و مایلم که ادامه بدهم",
-    "Direct Chat": "چت مستقیم",
     "The server may be unavailable or overloaded": "این سرور ممکن است ناموجود یا بسیار شلوغ باشد",
     "Reject": "پس زدن",
-    "Failed to set Direct Message status of room": "تنظیم حالت پیام مستقیم برای گپ موفقیت‌آمیز نبود",
     "Monday": "دوشنبه",
-    "All messages (noisy)": "همه‌ی پیام‌ها(بلند)",
-    "Enable them now": "اکنون به کار بیفتند",
     "Collecting logs": "درحال جمع‌آوری گزارش‌ها",
     "Search": "جستجو",
-    "(HTTP status %(httpStatus)s)": "(HTTP وضعیت %(httpStatus)s)",
     "Failed to forget room %(errCode)s": "فراموش کردن اتاق با خطا مواجه شد %(errCode)s",
     "Wednesday": "چهارشنبه",
     "Quote": "نقل قول",
@@ -81,47 +57,29 @@
     "unknown error code": "کد خطای ناشناخته",
     "Call invitation": "دعوت به تماس",
     "Messages containing my display name": "پیام‌های حاوی نمای‌نامِ من",
-    "You have successfully set a password and an email address!": "تخصیص ایمیل و پسوردتان با موفقیت انجام شد!",
     "What's new?": "چه خبر؟",
-    "Notify me for anything else": "مرا برای هرچیز دیگری باخبر کن",
     "When I'm invited to a room": "وقتی من به گپی دعوت میشوم",
     "Close": "بستن",
-    "Can't update user notification settings": "امکان به‌روزرسانی تنظیمات آگاه‌سازی کاربر وجود ندارد",
-    "Notify for all other messages/rooms": "برای همه‌ی پیام‌ها/گپ‌های دیگر آگاه‌سازی کن",
     "Couldn't find a matching Matrix room": "گپ‌گاه مورد نظر در ماتریکس یافت نشد",
     "Invite to this room": "دعوت به این گپ",
     "You cannot delete this message. (%(code)s)": "شما نمی‌توانید این پیام را پاک کنید. (%(code)s)",
     "Thursday": "پنج‌شنبه",
     "Search…": "جستجو…",
-    "Unhide Preview": "پیش‌نمایش را نمایان کن",
     "Unable to join network": "خطا در ورود به شبکه",
-    "Uploaded on %(date)s by %(user)s": "آپلود شده در تاریخ %(date)s توسط %(user)s",
     "Messages in group chats": "پیام‌های درون چت‌های گروهی",
     "Yesterday": "دیروز",
     "Error encountered (%(errorDetail)s).": "خطای رخ داده (%(errorDetail)s).",
-    "Keywords": "کلیدواژه‌ها",
     "Low Priority": "کم اهمیت",
-    "Unable to fetch notification target list": "ناتوانی در تطبیق لیست آگاه‌سازی‌های هدف",
-    "Set Password": "تنظیم گذرواژه",
-    "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.",
     "Off": "خاموش",
-    "Mentions only": "فقط نام‌بردن‌ها",
     "Failed to remove tag %(tagName)s from room": "خطا در حذف کلیدواژه‌ی %(tagName)s از گپ",
     "Remove": "حذف کن",
-    "You can now return to your account after signing out, and sign in on other devices.": "اکنون می‌توانید پس از خروج به اکانتتان بازگردید و با دستگاه‌های دیگری وارد شوید.",
     "Continue": "ادامه",
-    "Enable email notifications": "آگاه‌سازی با رایانامه را فعال کن",
     "No rooms to show": "هیچ گپی برای نشان دادن موجود نیست",
-    "Download this file": "بارگیری کن",
-    "Failed to change settings": "تغییر تنظیمات موفقیت‌آمیز نبود",
     "Failed to change password. Is your password correct?": "خطا در تغییر گذرواژه. آیا از درستی گذرواژه‌تان اطمینان دارید؟",
     "View Source": "دیدن منبع",
-    "Custom Server Options": "تنظیمات سفارشی برای سرور",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "با مرورگر کنونی شما، ظاهر و حس استفاده از برنامه ممکن است کاملا اشتباه باشد و برخی یا همه‌ی ویژگی‌ها ممکن است کار نکنند. می‌توانید به استفاده ادامه دهید اما مسئولیت هر مشکلی که به آن بربخورید بر عهده‌ی خودتان است!",
     "Checking for an update...": "درحال بررسی به‌روزرسانی‌ها...",
     "This email address is already in use": "این آدرس ایمیل در حال حاضر در حال استفاده است",
     "This phone number is already in use": "این شماره تلفن در حال استفاده است",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "لطفا برای تجربه بهتر <chromeLink>کروم</chromeLink>، <firefoxLink>فایرفاکس</firefoxLink>، یا <safariLink>سافاری</safariLink> را نصب کنید.",
     "Use Single Sign On to continue": "برای ادامه، از ورود یکپارچه استفاده کنید",
     "Single Sign On": "ورود یکپارچه",
     "Confirm adding email": "تأیید افزودن رایانامه",
@@ -132,23 +90,16 @@
     "The platform you're on": "بن‌سازه‌ای که رویش هستید",
     "The version of %(brand)s": "نگارش %(brand)s",
     "Your language of choice": "زبان انتخابیتان",
-    "I want to help": "می‌خواهم کمک کنم",
     "No": "خیر",
     "Review": "بازبینی",
     "Later": "بعداً",
     "Contact your <a>server admin</a>.": "تماس با <a>مدیر کارسازتان</a>.",
     "Ok": "تأیید",
-    "Set password": "تنظیم گذرواژه",
-    "To return to your account in future you need to set a password": "برای بازگشت به حسابتان در آینده، نیاز به تنظیم یک گذرواژه دارید",
-    "Set up encryption": "برپایی رمزنگاری",
     "Encryption upgrade available": "ارتقای رمزنگاری ممکن است",
     "Verify this session": "تأیید این نشست",
     "Set up": "برپایی",
     "Upgrade": "ارتقا",
     "Verify": "تأیید",
-    "Restart": "شروع دوباره",
-    "Upgrade your %(brand)s": "ارتقای %(brand)s تان",
-    "A new version of %(brand)s is available!": "نگارشی جدید از %(brand)s موجود است!",
     "Guest": "مهمان",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "برای تأیید هویتتان، این نشانی رایانامه را با ورود یکپارچه تأیید کنید.",
     "Click the button below to confirm adding this email address.": "برای تأیید افزودن این نشانی رایانامه، دکمهٔ زیر را بزنید.",
@@ -170,39 +121,30 @@
     "Failed to join room": "پیوستن به اتاق انجام نشد",
     "Failed to ban user": "کاربر مسدود نشد",
     "Error decrypting attachment": "خطا در رمزگشایی پیوست",
-    "%(senderName)s ended the call.": "%(senderName)s به تماس پایان داد.",
     "Emoji": "شکلک",
     "Email address": "آدرس ایمیل",
     "Email": "ایمیل",
-    "Drop File Here": "پرونده را اینجا رها کنید",
     "Download %(text)s": "دانلود 2%(text)s",
     "Disinvite": "پس‌گرفتن دعوت",
     "Default": "پیشفرض",
     "Deops user with given id": "کاربر را با شناسه داده شده را از بین می برد",
     "Decrypt %(text)s": "رمزگشایی %(text)s",
     "Deactivate Account": "غیرفعال کردن حساب",
-    "/ddg is not a command": "/ddg یک فرمان نیست",
     "Current password": "گذرواژه فعلی",
     "Cryptography": "رمزنگاری",
     "Create Room": "ایجاد اتاق",
     "Confirm password": "تأیید گذرواژه",
     "Commands": "فرمان‌ها",
     "Command error": "خطای فرمان",
-    "Click here to fix": "برای رفع مشکل اینجا کلیک کنید",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s نام اتاق را حذف کرد.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s عکس پروفایل خود را تغییر داد.",
     "Change Password": "تغییر گذواژه",
     "Banned users": "کاربران مسدود شده",
-    "Autoplay GIFs and videos": "پخش خودکار GIF و فیلم",
     "Attachment": "پیوست",
     "Are you sure you want to reject the invitation?": "آیا مطمئن هستید که می خواهید دعوت را رد کنید؟",
     "Are you sure you want to leave the room '%(roomName)s'?": "آیا مطمئن هستید که می خواهید از اتاق '2%(roomName)s' خارج شوید؟",
     "Are you sure?": "مطمئنی؟",
-    "Anyone who knows the room's link, including guests": "هرکسی که لینک اتاق را می داند و کاربران مهمان",
-    "Anyone who knows the room's link, apart from guests": "هرکسی که لینک اتاق را می‌داند، غیر از کاربران مهمان",
     "Anyone": "هر کس",
     "An error has occurred.": "خطایی رخ داده است.",
-    "%(senderName)s answered the call.": "%(senderName)s تماس را پاسخ داد.",
     "A new password must be entered.": "گذواژه جدید باید وارد شود.",
     "Authentication": "احراز هویت",
     "Always show message timestamps": "همیشه مهر زمان‌های پیام را نشان بده",
@@ -215,7 +157,6 @@
     "No Microphones detected": "هیچ میکروفونی شناسایی نشد",
     "Admin": "ادمین",
     "Add": "افزودن",
-    "Access Token:": "توکن دسترسی:",
     "Account": "حساب کابری",
     "Incorrect verification code": "کد فعال‌سازی اشتباه است",
     "Incorrect username and/or password.": "نام کاربری و یا گذرواژه اشتباه است.",
@@ -278,8 +219,6 @@
     "End conference": "جلسه را پایان بده",
     "You do not have permission to start a conference call in this room": "شما اجازه‌ی شروع جلسه‌ی تصویری در این اتاق را ندارید",
     "Permission Required": "اجازه نیاز است",
-    "A call is currently being placed!": "یک تماس هم‌اکنون برقرار است!",
-    "Call in Progress": "تماس در جریان است",
     "You cannot place a call with yourself.": "امکان برقراری تماس با خودتان وجود ندارد.",
     "You're already in a call with this person.": "شما هم‌اکنون با این فرد در تماس هستید.",
     "Already in call": "هم‌اکنون در تماس هستید",
@@ -287,7 +226,6 @@
     "Too Many Calls": "تعداد زیاد تماس",
     "You cannot place VoIP calls in this browser.": "امکان برقراری تماس بر بستر VoIP در این مرورگر وجود ندارد.",
     "VoIP is unsupported": "قابلیت VoIP پشتیبانی نمی‌شود",
-    "Unable to capture screen": "امکان ضبط صفحه‌ی نمایش وجود ندارد",
     "No other application is using the webcam": "برنامه‌ی دیگری از دوربین استفاده نکند",
     "Permission is granted to use the webcam": "دسترسی مورد نیاز به دوربین داده شده باشد",
     "A microphone and webcam are plugged in and set up correctly": "میکروفون و دوربین به درستی تنظیم شده باشند",
@@ -302,8 +240,6 @@
     "The call was answered on another device.": "تماس بر روی دستگاه دیگری پاسخ داده شد.",
     "Answered Elsewhere": "در جای دیگری پاسخ داده شد",
     "The call could not be established": "امکان برقراری تماس وجود ندارد",
-    "The other party declined the call.": "طرف مقابل تماس را رد کرد.",
-    "Call Declined": "تماس رد شد",
     "Call Failed": "تماس موفقیت‌آمیز نبود",
     "Unable to load! Check your network connectivity and try again.": "امکان بارگیری محتوا وجود ندارد! لطفا وضعیت اتصال خود به اینترنت را بررسی کرده و مجددا اقدام نمائید.",
     "The information being sent to us to help make %(brand)s better includes:": "اطلاعاتی که به ما برای افزایش کیفیت %(brand)s ارسال می‌شوند عبارتند از:",
@@ -330,8 +266,6 @@
     "Error upgrading room": "خطا در ارتقاء نسخه اتاق",
     "You do not have the required permissions to use this command.": "شما مجوزهای لازم را برای استفاده از این دستور ندارید.",
     "Upgrades a room to a new version": "یک اتاق را به نسخه جدید ارتقا دهید",
-    "To use it, just wait for autocomplete results to load and tab through them.": "برای استفاده از آن ، لطفا منتظر بمانید تا نتایج تکمیل خودکار بارگیری شده و آنها را مرور کنید.",
-    "Searches DuckDuckGo for results": "در سایت DuckDuckGo جستجو می‌کند",
     "Sends a message as html, without interpreting it as markdown": "پیام را به صورت html می فرستد ، بدون اینکه آن را به عنوان markdown تفسیر کند",
     "Sends a message as plain text, without interpreting it as markdown": "پیام را به صورت متن ساده و بدون تفسیر آن به عنوان markdown ارسال می کند",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "(͡ ° ͜ʖ ͡ °) را به ابتدای یک پیام متنی ساده اضافه می‌کند",
@@ -359,7 +293,6 @@
     "Unable to create widget.": "ایجاد ابزارک امکان پذیر نیست.",
     "You need to be able to invite users to do that.": "نیاز است که شما قادر به دعوت کاربران به آن باشید.",
     "You need to be logged in.": "شما باید وارد شوید.",
-    "Failed to invite the following users to the %(roomName)s room:": "دعوت کاربران زیر به اتاق %(roomName)s موفقیت‌آمیز نبود:",
     "Failed to invite users to the room:": "دعوت کاربران به اتاق موفقیت‌آمیز نبود:",
     "Failed to invite": "دعوت موفقیت‌آمیز نبود",
     "Custom (%(level)s)": "%(level)s دلخواه",
@@ -628,7 +561,6 @@
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "این که شما از %(brand)s روی دستگاهی استفاده می‌کنید که در آن لامسه مکانیزم اصلی ورودی است",
     "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.": "ما از مرورگر خواستیم تا سروری را که شما برای ورود استفاده می‌کنید به خاطر بسپارد، اما متاسفانه مرورگر شما آن را فراموش کرده‌است. به صفحه‌ی ورود بروید و دوباره امتحان کنید.",
     "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 /> برای تایید آدرس ایمیل یا شماره تماس دارد، اما کارگزار هیچ گونه شرایط خدماتی (terms of service) ندارد.",
-    "The remote side failed to pick up": "طرف دیگر قادر به پاسخ‌دادن نیست",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "هرگاه این صفحه شامل اطلاعات قابل شناسایی مانند شناسه‌ی اتاق ، کاربر یا گروه باشد ، این داده‌ها قبل از ارسال به سرور حذف می شوند.",
     "Your user agent": "نماینده کاربری شما",
     "Whether you're using %(brand)s as an installed Progressive Web App": "این که آیا شما از%(brand)s به عنوان یک PWA استفاده می‌کنید یا نه",
@@ -667,15 +599,11 @@
     "Displays list of commands with usages and descriptions": "لیست دستورات را با کاربردها و توضیحات نمایش می دهد",
     "Sends the given message coloured as a rainbow": "پیام داده شده را به صورت رنگین کمان ارسال می کند",
     "Forces the current outbound group session in an encrypted room to be discarded": "جلسه گروه خروجی فعلی را در یک اتاق رمزگذاری شده مجبور می کند که کنار گذاشته شود",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s دعوتنامه %(displayName)s را پذیرفت.",
     "Reason": "دلیل",
     "Displays action": "عملکرد را نمایش می دهد",
     "Places the call in the current room on hold": "تماس را در اتاق فعلی در حالت تعلیق قرار می دهد",
     "Sends a message to the given user": "برای کاربر داده شده پیامی ارسال می کند",
     "Opens chat with the given user": "گپ با کاربر داده شده را باز می کند",
-    "%(targetName)s accepted an invitation.": "%(targetName)s دعوتنامه را پذیرفت.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s را دعوت کرد.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s %(targetName)s را ممنوع کرد.",
     "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": "زمان نصب برچسب در این اتاق را ببینید",
@@ -683,18 +611,6 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s نام اتاق را به %(roomName)s تغییر داد.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s نام اتاق را از %(oldRoomName)s به %(newRoomName)s تغییر داد.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s موضوع را به %(topic)s تغییر داد.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s را اخراج کرد.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s دعوت %(targetName)s را پس گرفت.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s از %(targetName)s رفع مسدودیت کرد.",
-    "%(targetName)s left the room.": "%(targetName)s اتاق را ترک کرد.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s دعوت را رد کرد.",
-    "%(targetName)s joined the room.": "%(targetName)s به اتاق پیوست.",
-    "%(senderName)s made no change.": "%(senderName)s تغییری نداد.",
-    "%(senderName)s set a profile picture.": "%(senderName)s عکس نمایه ای تنظیم کرد.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s عکس نمایه خود را حذف کرد.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s نام نمایشی خود %(oldDisplayName)s را حذف کرد.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s نام نمایشی خود را به %(displayName)s تنظیم کرد.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s نام نمایشی خود را به %(displayName)s تغییر داد.",
     "Repeats like \"aaa\" are easy to guess": "تکرارهایی مانند بببب به راحتی قابل حدس هستند",
     "with an empty state key": "با یک کلید حالت خالی",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 شرکت همه سرورها ممنوع است! دیگر نمی توان از این اتاق استفاده کرد.",
@@ -727,8 +643,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s تماس تصویری برقرار کرد.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s تماس صوتی برقرار کرد. (توسط این مرورگر پشتیبانی نمی شود)",
     "%(senderName)s placed a voice call.": "%(senderName)s تماس صوتی برقرار کرد.",
-    "%(senderName)s declined the call.": "%(senderName)s تماس را رد کرد.",
-    "(unknown failure: %(reason)s)": "(خطای ناشناخته: %(reason)s)",
     "%(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 آدرس های جایگزین این اتاق را تغییر داد.",
@@ -739,12 +653,6 @@
     "%(senderName)s removed the main address for this room.": "%(senderName)s آدرس اصلی این اتاق را حذف کرد.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s آدرس اصلی این اتاق را روی %(address)s تنظیم کرد.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s تصویری ارسال کرد.",
-    "(no answer)": "(بدون پاسخ)",
-    "(an error occurred)": "(خطایی رخ داده است)",
-    "(their device couldn't start the camera / microphone)": "(دستگاه آنها نمی تواند دوربین / میکروفون را راه اندازی کند)",
-    "(connection failed)": "(ارتباط ناموفق بود)",
-    "(could not connect media)": "(امکان اتصال رسانه وجود ندارد)",
-    "(not supported by this browser)": "(توسط این مرورگر پشتیبانی نمی شود)",
     "Someone": "کسی",
     "Your %(brand)s is misconfigured": "%(brand)s‌ی شما به درستی پیکربندی نشده‌است",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "از اتصال اینترنت پایدار اطمینان حاصل‌کرده و سپس با مدیر سرور ارتباط بگیرید",
@@ -829,7 +737,6 @@
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s قابلیت flair را در این اتاق برای %(newGroups)s فعال و برای %(oldGroups)s غیر فعال کرد.",
     "The server has denied your request.": "سرور درخواست شما را رد کرده است.",
     "Use your Security Key to continue.": "برای ادامه از کلید امنیتی خود استفاده کنید.",
-    "This session, or the other session": "این نشست، یا نشست دیگر",
     "%(creator)s created and configured the room.": "%(creator)s اتاق را ایجاد و پیکربندی کرد.",
     "Report Content to Your Homeserver Administrator": "گزارش محتوا به مدیر سرور خود",
     "Be found by phone or email": "از طریق تلفن یا ایمیل پیدا شوید",
@@ -847,7 +754,6 @@
     "a new cross-signing key signature": "یک کلید امضای متقابل جدید",
     "a new master key signature": "یک شاه‌کلید جدید",
     "Close dialog or context menu": "بستن پنجره یا منو",
-    "Your account is not secure": "حساب کاربری شما امن نیست",
     "Please fill why you're reporting.": "لطفا توضیح دهید که چرا گزارش می‌دهید.",
     "Password is allowed, but unsafe": "گذرواژه مجاز است ، اما ناامن است",
     "Upload files (%(current)s of %(total)s)": "بارگذاری فایل‌ها (%(current)s از %(total)s)",
@@ -856,7 +762,6 @@
     "Link to most recent message": "پیوند به آخرین پیام",
     "Clear Storage and Sign Out": "فضای ذخیره‌سازی را پاک کرده و از حساب کاربری خارج شوید",
     "Error whilst fetching joined communities": "هنگام واکشی اجتماع‌هایی که عضو آن‌ها هستید، خطایی رخ داد",
-    "Make this space private": "این فضای کاری را خصوصی کن",
     "Unable to validate homeserver": "تأیید اعتبار سرور امکان‌پذیر نیست",
     "Sign into your homeserver": "وارد سرور خود شوید",
     "%(creator)s created this DM.": "%(creator)s این گفتگو را ایجاد کرد.",
@@ -886,7 +791,6 @@
     "%(count)s messages deleted.|one": "%(count)s پیام پاک شد.",
     "%(count)s messages deleted.|other": "%(count)s پیام پاک شد.",
     "Invite to %(roomName)s": "دعوت به %(roomName)s",
-    "View dev tools": "مشاهده ابزارهای توسعه",
     "Upgrade to %(hostSignupBrand)s": "ارتقاء به %(hostSignupBrand)s",
     "Enter Security Key": "کلید امنیتی را وارد کنید",
     "Enter Security Phrase": "عبارت امنیتی را وارد کنید",
@@ -905,11 +809,9 @@
     "a key signature": "یک امضای کلیدی",
     "Clear cross-signing keys": "کلیدهای امضای متقابل را پاک کن",
     "Destroy cross-signing keys?": "کلیدهای امضای متقابل نابود شود؟",
-    "This wasn't me": "این من نبودم",
     "Recently Direct Messaged": "گفتگوهای خصوصی اخیر",
     "Upgrade public room": "ارتقاء اتاق عمومی",
     "Upgrade private room": "ارتقاء اتاق خصوصی",
-    "Automatically invite users": "به طور خودکار کاربران را دعوت کن",
     "Resend %(unsentCount)s reaction(s)": "بازارسال %(unsentCount)s واکنش",
     "Missing session data": "داده‌های نشست از دست رفته است",
     "Manually export keys": "کلیدها را به صورت دستی استخراج (Export)کن",
@@ -917,7 +819,6 @@
     "Incompatible local cache": "حافظه‌ی محلی ناسازگار",
     "Upgrade Room Version": "ارتقاء نسخه‌ی اتاق",
     "Share Room Message": "به اشتراک گذاشتن پیام اتاق",
-    "Collapse Reply Thread": "جمع کردن ریسه‌ی پاسخ",
     "Reset everything": "همه چیز را بازراه‌اندازی (reset) کنید",
     "Consult first": "ابتدا مشورت کنید",
     "Save Changes": "ذخیره تغییرات",
@@ -937,16 +838,13 @@
     "Security Phrase": "عبارت امنیتی",
     "Keys restored": "کلیدها بازیابی شدند",
     "Upload completed": "بارگذاری انجام شد",
-    "Your password": "گذرواژه شما",
     "Not Trusted": "قابل اعتماد نیست",
     "Session key": "کلید نشست",
     "Session name": "نام نشست",
     "Verify session": "تائید نشست",
-    "New session": "نشست جدید",
     "Country Dropdown": "لیست کشور",
     "Verification Request": "درخواست تأیید",
     "Send report": "ارسال گزارش",
-    "Integration Manager": "مدیر یکپارچه‌سازی",
     "Command Help": "راهنمای دستور",
     "Message edits": "ویرایش پیام",
     "Upload all": "بارگذاری همه",
@@ -968,12 +866,10 @@
     "We couldn't invite those users. Please check the users you want to invite and try again.": "ما نتوانستیم آن کاربران را دعوت کنیم. لطفاً کاربرانی را که می خواهید دعوت کنید بررسی کرده و دوباره امتحان کنید.",
     "Something went wrong trying to invite the users.": "در تلاش برای دعوت از کاربران مشکلی پیش آمد.",
     "We couldn't create your DM.": "نتوانستیم گفتگوی خصوصی مد نظرتان را ایجاد کنیم.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "دعوت از این کاربران برای شروع گفتگو موفقیت‌آمیز نبود: %(csvUsers)s",
     "Invite by email": "دعوت از طریق ایمیل",
     "Click the button below to confirm your identity.": "برای تأیید هویت خود بر روی دکمه زیر کلیک کنید.",
     "Confirm to continue": "برای ادامه تأیید کنید",
     "To continue, use Single Sign On to prove your identity.": "برای ادامه از احراز هویت یکپارچه جهت اثبات هویت خود استفاده نمائید.",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s شما اجازه استفاده از سیستم مدیریت ادغام را برای این کار نمی دهد. لطفا با ادمین تماس بگیرید.",
     "Integrations not allowed": "یکپارچه‌سازی‌ها اجازه داده نشده‌اند",
     "Enable 'Manage Integrations' in Settings to do this.": "برای انجام این کار 'مدیریت پکپارچه‌سازی‌ها' را در تنظیمات فعال نمائید.",
     "Integrations are disabled": "پکپارچه‌سازی‌ها غیر فعال هستند",
@@ -1033,9 +929,6 @@
     "There was an error finding this widget.": "هنگام یافتن این ابزارک خطایی روی داد.",
     "Active Widgets": "ابزارک‌های فعال",
     "Search names and descriptions": "جستجوی نام‌ها و توضیحات",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "اگر نمی‌توانید اتاقی را که به دنبال آن می‌گردید پیدا کنید ، بخواهید که شما را به آن دعوت کنند یا <a>یک اتاق جدید بسازید</a>.",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "برای مشاهده %(spaceName)s، قابلیت <a>فضای کاری بتا</a> را فعال نمائید",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "برای پیوستن به %(spaceName)s، قابلیت <a>فضای کاری بتا</a> را فعال نمائید",
     "Failed to create initial space rooms": "ایجاد اتاق‌های اولیه در فضای کاری موفق نبود",
     "What do you want to organise?": "چه چیزی را می‌خواهید سازماندهی کنید؟",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "اگر اتاق فقط برای همکاری با تیم های داخلی در سرور خانه شما استفاده شود ، ممکن است این قابلیت را فعال کنید. این بعدا نمی تواند تغییر کند.",
@@ -1047,7 +940,6 @@
     "It's just you at the moment, it will be even better with others.": "در حال حاضر فقط شما حضور دارید ، با دیگران حتی بهتر هم خواهد بود.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "اتاق‌های خصوصی را فقط با دعوت می‌توان یافت و به آن‌ها پیوست. اتاق‌های عمومی را هر کسی در این اجتماع می‌تواند بیابد و به آن بپیوندد.",
     "Go to my first room": "برو به اتاق اول من",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "اتاق‌های خصوصی را فقط با دعوت می‌توان یافت و به آن‌ها پیوست. اما اتاق‌های عمومی را هر کسی می تواند را پیدا کند و به آن‌ها ملحق شود.",
     "Please enter a name for the room": "لطفاً نامی برای اتاق وارد کنید",
     "Community ID": "شناسه اجتماع",
     "Community Name": "نام اجتماع",
@@ -1102,7 +994,6 @@
     "Download logs": "دانلود گزارش‌ها",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "قبل از ارسال گزارش‌ها، برای توصیف مشکل خود باید <a>یک مسئله در GitHub ایجاد کنید</a>.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "سعی شد یک نقطه‌ی زمانی خاص در پیام‌های این اتاق بارگیری و نمایش داده شود، اما پیداکردن آن میسر نیست.",
-    "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.": "گزارش‌های اشکال زدایی حاوی داده‌های استفاده از برنامه شامل نام کاربری شما، شناسه‌ها یا نام مستعار اتاق‌ها یا گروه‌هایی است که بازدید کرده‌اید و همچنین نام‌ کاربری کاربران دیگر. این گزارش‌ها حاوی پیام‌های شما نمی‌باشند.",
     "Failed to load timeline position": "بارگیری و نمایش پیام‌ها با مشکل مواجه شد",
     "Uploading %(filename)s and %(count)s others|other": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر",
     "Uploading %(filename)s and %(count)s others|zero": "در حال بارگذاری %(filename)s",
@@ -1129,7 +1020,6 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "یک ایمیل به %(emailAddress)s ارسال شده‌است. بعد از کلیک بر روی لینک داخل آن ایمیل، روی مورد زیر کلیک کنید.",
     "Done": "انجام شد",
     "Thank you for your feedback, we really appreciate it.": "از بازخورد شما متشکریم ، ما واقعاً از آن استقبال می کنیم.",
-    "Beta feedback": "بازخورد بتا",
     "Close dialog": "بستن گفتگو",
     "Invite anyway": "به هر حال دعوت کن",
     "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.": "شما از همه نشست‌ها خارج شده و دیگر اعلان پیام‌ها را دریافت نخواهید کرد. برای فعال کردن مجدد اعلان‌ها در هر دستگاه، دوباره وارد شوید.",
@@ -1163,7 +1053,6 @@
     "Add existing rooms": "افزودن اتاق‌های موجود",
     "Space selection": "انتخاب فضای کاری",
     "There was a problem communicating with the homeserver, please try again later.": "در برقراری ارتباط با سرور مشکلی پیش آمده، لطفاً چند لحظه‌ی دیگر مجددا امتحان کنید.",
-    "Filter your rooms and spaces": "اتاق‌ها و فضاهای کاری خود را فیلتر کنید",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "در حال افزودن اتاق‌ها...",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "امکان اتصال به سرور از طریق پروتکل‌های HTTP و HTTPS در مروگر شما میسر نیست. یا از HTTPS استفاده کرده و یا <a>حالت اجرای غیرامن اسکریپت‌ها</a> را فعال کنید.",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "در حال افزودن اتاق‌ها... (%(progress)s از %(count)s)",
@@ -1205,15 +1094,12 @@
     "This address is already in use": "این آدرس قبلاً استفاده شده‌است",
     "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.": "هشدار: داده های شخصی شما (از جمله کلیدهای رمزنگاری) هنوز در این نشست ذخیره می شوند. اگر استفاده از این نشست را به پایان رسانده‌اید یا می‌خواهید وارد حساب کاربری دیگری شوید ، آن را پاک کنید.",
     "This address is available to use": "این آدرس برای استفاده در دسترس است",
-    "Please provide a room address": "لطفاً آدرس اتاق را ارائه تعیین کنید",
     "e.g. my-room": "به عنوان مثال، my-room",
     "Some characters not allowed": "برخی از کاراکترها مجاز نیستند",
     "Command Autocomplete": "تکمیل خودکار دستور",
     "Community Autocomplete": "تکمیل خودکار اجتماع",
     "Room address": "آدرس اتاق",
-    "Results from DuckDuckGo": "نتایج از موتور جستجوی DuckDuckGo",
     "<a>In reply to</a> <pill>": "<a>در پاسخ به</a><pill>",
-    "DuckDuckGo Results": "نتایج موتور جستجوی DuckDuckGo",
     "Emoji Autocomplete": "تکمیل خودکار شکلک",
     "Notify the whole room": "به کل اتاق اطلاع بده",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "بارگیری رویدادی که به آن پاسخ داده شد امکان پذیر نیست، یا وجود ندارد یا شما اجازه مشاهده آن را ندارید.",
@@ -1307,7 +1193,6 @@
     "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": "برای جلوگیری از دست دادن تاریخچه‌ی گفتگوی خود باید قبل از ورود به برنامه ، کلیدهای اتاق خود را استخراج (Export) کنید. برای این کار باید از نسخه جدیدتر %(brand)s استفاده کنید",
     "Sign out": "خروج از حساب کاربری",
     "Block anyone not part of %(serverName)s from ever joining this room.": "از عضوشدن کاربرانی در این اتاق که حساب آن‌ها متعلق به سرور %(serverName)s است، جلوگیری کن.",
-    "Make this room public": "این اتاق را عمومی کنید",
     "Topic (optional)": "موضوع (اختیاری)",
     "Create a room in %(communityName)s": "یک اتاق در %(communityName)s بسازید",
     "Create a private room": "ساختن اتاق خصوصی",
@@ -1331,10 +1216,6 @@
     "This room is suggested as a good one to join": "این اتاق به عنوان یک گزینه‌ی خوب برای عضویت پیشنهاد می شود",
     "Suggested": "پیشنهادی",
     "Your server does not support showing space hierarchies.": "سرور شما از نمایش سلسله مراتبی فضاهای کاری پشتیبانی نمی کند.",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s اتاق و %(numSpaces)s فضای کاری",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s اتاق و %(numSpaces)s فضای کاری",
-    "%(count)s rooms and 1 space|other": "%(count)s اتاق و یک فضای کاری",
-    "%(count)s rooms and 1 space|one": "%(count)s اتاق و یک فضای‌کاری",
     "Select a room below first": "ابتدا یک اتاق از لیست زیر انتخاب کنید",
     "Failed to remove some rooms. Try again later": "حذف برخی اتاق‌ها با مشکل همراه بود. لطفا بعدا تلاش فرمائید",
     "Mark as not suggested": "علامت‌گذاری به عنوان پیشنهاد‌نشده",
@@ -1372,7 +1253,6 @@
     "Retry": "تلاش مجدد",
     "Edit": "ویرایش",
     "React": "واکنش",
-    "Error decrypting audio": "خطا در رمزگشایی صدا",
     "The encryption used by this room isn't supported.": "رمزگذاری استفاده شده توسط این اتاق پشتیبانی نمی شود.",
     "Encryption not enabled": "رمزگذاری فعال نیست",
     "Ignored attempt to disable encryption": "تلاش برای غیرفعال کردن رمزگذاری نادیده گرفته شد",
@@ -1405,7 +1285,6 @@
     "Security": "امنیت",
     "Edit devices": "ویرایش دستگاه‌ها",
     "This client does not support end-to-end encryption.": "این کلاینت از رمزگذاری سرتاسر پشتیبانی نمی کند.",
-    "Role": "نقش",
     "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?": "با غیرفعال کردن این کاربر، او از سیستم خارج شده و از ورود مجدد وی جلوگیری می‌شود. علاوه بر این، او تمام اتاق هایی را که در آن هست ترک می کند. این عمل قابل برگشت نیست. آیا مطمئن هستید که می خواهید این کاربر را غیرفعال کنید؟",
@@ -1439,7 +1318,6 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "شما نمی توانید این تغییر را لغو کنید زیرا در حال تنزل خود هستید، اگر آخرین کاربر ممتاز در اتاق باشید بازپس گیری امتیازات غیرممکن است.",
     "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.": "شما نمی توانید این تغییر را لغو کنید زیرا در حال تنزل خود هستید، اگر آخرین کاربر ممتاز در فضای کاری باشید، بازپس گیری امتیازات غیرممکن است.",
     "Demote yourself?": "خودتان را تنزل می‌دهید؟",
-    "Direct message": "پیام مستقیم",
     "Share Link to User": "اشتراک لینک برای کاربر",
     "Invite": "دعوت",
     "Mention": "اشاره",
@@ -1481,9 +1359,7 @@
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "پیام‌های شما امن هستند و فقط شما و گیرنده کلیدهای منحصر به فرد برای باز کردن قفل آنها را دارید.",
     "Failed to perform homeserver discovery": "جستجوی سرور با موفقیت انجام نشد",
     "Direct Messages": "پیام مستقیم",
-    "You can add existing spaces to a space.": "شما می‌توانید فضاهای کاری موجود را به یک فضای کاری اضافه کنید.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "این سرور هیچ سازوکار ورودی را که توسط این کلاینت پشتیبانی شود، ارائه نمی‌دهد.",
-    "Feeling experimental?": "آیا می‌خواهید قابلیت‌های آزمایشی را تجربه کنید؟",
     "Messages in this room are end-to-end encrypted.": "پیام‌های موجود در این اتاق به صورت سرتاسر رمزگذاری شده‌اند.",
     "Start Verification": "شروع تایید هویت",
     "Accepting…": "پذیرش…",
@@ -1573,7 +1449,6 @@
     "Favourites": "موردعلاقه‌ها",
     "Invites": "دعوت‌ها",
     "Open dial pad": "باز کردن صفحه شماره‌گیری",
-    "Start a Conversation": "شروع مکالمه",
     "Video call": "تماس تصویری",
     "Voice call": "تماس صوتی",
     "Show Widgets": "نمایش ابزارک‌ها",
@@ -1599,11 +1474,7 @@
     "%(duration)sh": "%(duration)s ساعت",
     "%(duration)sm": "%(duration)s دقیقه",
     "%(duration)ss": "%(duration)s ثانیه",
-    "Jump to message": "رفتن به پیام",
-    "Unpin Message": "لغو پین پیام",
-    "Pinned Messages": "پیام‌های پین شده",
     "Loading...": "بارگذاری...",
-    "No pinned messages.": "هیچ پیام پین شده‌ای وجود ندارد.",
     "This is the start of <roomName/>.": "این شروع <roomName/> است.",
     "Add a photo, so people can easily spot your room.": "عکس اضافه کنید تا افراد بتوانند به راحتی اتاق شما را ببینند.",
     "Invite to just this room": "فقط به این اتاق دعوت کنید",
@@ -1637,7 +1508,6 @@
     "and %(count)s others...|other": "و %(count)s مورد دیگر ...",
     "Close preview": "بستن پیش نمایش",
     "Scroll to most recent messages": "به جدیدترین پیام‌ها بروید",
-    "Please select the destination room for this message": "لطفاً اتاق مقصد را برای این پیام انتخاب کنید",
     "Failed to send": "ارسال با خطا مواجه شد",
     "Your message was sent": "پیام شما ارسال شد",
     "Encrypting your message...": "رمزگذاری پیام شما ...",
@@ -1671,10 +1541,7 @@
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "لطفا در GitHub <newIssueLink>یک مسئله جدید ایجاد کنید</newIssueLink> تا بتوانیم این اشکال را بررسی کنیم.",
     "No results": "بدون نتیجه",
     "Join": "پیوستن",
-    "Windows": "پنجره‌ها",
     "Enter passphrase": "عبارت امنیتی را وارد کنید",
-    "Screens": "صفحه نمایش‌ها",
-    "Share your screen": "به اشتراک‌گذاری صفحه نمایش",
     "Confirm passphrase": "عبارت امنیتی را تائید کنید",
     "This version of %(brand)s does not support searching encrypted messages": "این نسخه از %(brand)s از جستجوی پیام های رمزگذاری شده پشتیبانی نمی کند",
     "Import room keys": "واردکردن (Import) کلیدهای اتاق",
@@ -1691,7 +1558,6 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "استفاده از این ابزارک ممکن است داده‌هایی <helpIcon /> را با %(widgetDomain)s به اشتراک بگذارد.",
     "New Recovery Method": "روش بازیابی جدید",
     "A new Security Phrase and key for Secure Messages have been detected.": "یک عبارت امنیتی و کلید جدید برای پیام‌رسانی امن شناسایی شد.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "استفاده از این ابزارک ممکن است داده‌هایی <helpIcon /> را با %(widgetDomain)s و سیستم مدیریت ادغام به اشتراک بگذارد.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "اگر روش بازیابی جدیدی را تنظیم نکرده‌اید، ممکن است حمله‌کننده‌ای تلاش کند به حساب کاربری شما دسترسی پیدا کند. لطفا گذرواژه حساب کاربری خود را تغییر داده و فورا یک روش جدیدِ بازیابی در بخش تنظیمات انتخاب کنید.",
     "Widget ID": "شناسه ابزارک",
     "Room ID": "شناسه اتاق",
@@ -1771,7 +1637,6 @@
     "Message deleted by %(name)s": "پیام توسط %(name)s حذف شد",
     "Message deleted": "پیغام پاک شد",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> واکنش نشان داد با %(shortName)s</reactedWith>",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> واکنش نشان داد با %(content)s</reactedWith>",
     "Reactions": "واکنش ها",
     "Show all": "نمایش همه",
     "Add reaction": "افزودن واکنش",
@@ -1792,7 +1657,6 @@
     "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> استفاده کنید. آیا قصد داشتید این پیام را به عنوان متم ارسال کنید؟",
     "Read Marker off-screen lifetime (ms)": "خواندن نشانگر طول عمر خارج از صفحه نمایش (میلی ثانیه)",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "اعلان‌های مخصوص کلمات کلیدی زیر از قوانینی پیروی می کنند که نمی توانند در اینجا نمایش داده شوند:",
     "sends space invaders": "ارسال مهاجمان فضایی",
     "Sends the given message with a space themed effect": "پیام داده شده را به صورت مضمون فضای کاری ارسال می کند",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "ارسال <UsageDataLink> داده‌ها به صورت ناشناس </UsageDataLink> به ما در بهبود %(brand)s کمک می‌کند. برای این مورد از <PolicyLink> کوکی </PolicyLink> استفاده می‌شود.",
@@ -1871,7 +1735,6 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "تمایل به آزمایش‌کردن دارید؟ آزمایشگاه بهترین مکان برای دریافت چیزهای جدید، تست قابلیت‌های نو و کمک به رفع مشکلات آن‌ها قبل از انتشار نهایی است. <a>بیشتر بدانید</a>.",
     "%(brand)s version:": "نسخه‌ی %(brand)s:",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "برای گزارش مشکلات امنیتی مربوط به ماتریکس، لطفا سایت Matrix.org بخش <a>Security Disclosure Policy</a> را مطالعه فرمائید.",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "اگر از طریق گیتهاب مشکلی را ثبت کرده‌اید، لاگ این مشکلات می‌تواند به ما در جهت کشف و حل آن‌ها کمک کند. لاگ مشکلات حاوی داده‌های مورد استفاده برنامه نظیر نام کاربری، شناسه یا نام مستعار اتاق‌ها یا فضاهای کاری که به آن‌ها سر زده‌اید و یا نام کاربری سایر کاربران می‌شود. این داده‌ها حاوی پیام‌های شما نمی‌شوند.",
     "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> کلید کرده یا با استفاده از دکمه‌ی زیر اقدام به شروع گفتگو با بات ما نمائید.",
     "For help with using %(brand)s, click <a>here</a>.": "برای گرفتن کمک در استفاده از %(brand)s، <a>اینجا</a> کلیک کنید.",
@@ -1882,14 +1745,11 @@
     "Use between %(min)s pt and %(max)s pt": "از عددی بین %(min)s pt و %(max)s pt استفاده کنید",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "اندازه فونت دلخواه تنها می‌تواند عددی بین %(min)s pt و %(max)s pt باشد",
     "New version available. <a>Update now.</a>": "نسخه‌ی جدید موجود است. <a>هم‌اکنون به‌روزرسانی کنید.</a>",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "از یک مدیر پکپارچه‌سازی <b>(%(serverName)s)</b> برای مدیریت بات‌ها، ویجت‌ها و پک‌های استیکر استفاده کنید.",
     "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.": "استفاده از سرور هویت‌سنجی اختیاری است. اگر تصمیم بگیرید از سرور هویت‌سنجی استفاده نکنید، شما با استفاده از آدرس ایمیل و شماره تلفن قابل یافته‌شدن و دعوت‌شدن توسط سایر کاربران نخواهید بود.",
     "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.": "قطع ارتباط با سرور هویت‌سنجی به این معناست که شما از طریق ادرس ایمیل و شماره تلفن، بیش از این قابل یافته‌شدن و دعوت‌شدن توسط کاربران دیگر نیستید.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "در حال حاضر از سرور هویت‌سنجی استفاده نمی‌کنید. برای یافتن و یافته‌شدن توسط مخاطبان موجود که شما آن‌ها را می‌شناسید، یک مورد در پایین اضافه کنید.",
-    "Identity Server": "سرور هویت‌سنجی",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "اگر تمایل به استفاده از <server /> برای یافتن و یافته‌شدن توسط مخاطبان خود را ندارید، سرور هویت‌سنجی دیگری را در پایین وارد کنید.",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "در حال حاضر شما از <server></server> برای یافتن و یافته‌شدن توسط مخاطبانی که می‌شناسید، استفاده می‌کنید. می‌توانید سرور هویت‌سنجی خود را در زیر تغییر دهید.",
-    "Identity Server (%(server)s)": "سرور هویت‌سنجی (%(server)s)",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "توصیه می‌کنیم آدرس‌های ایمیل و شماره تلفن‌های خود را پیش از قطع ارتباط با سرور هویت‌سنجی از روی آن پاک کنید.",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "شما هم‌چنان <b>داده‌های شخصی خودتان</b> را بر روی سرور هویت‌سنجی <idserver /> به اشتراک می‌گذارید.",
     "Disconnect anyway": "در هر صورت قطع کن",
@@ -1906,9 +1766,6 @@
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "ارتباط با سرور هویت‌سنجی <current /> قطع شده و در عوض به <new /> متصل شوید؟",
     "Change identity server": "تغییر سرور هویت‌سنجی",
     "Checking server": "در حال بررسی سرور",
-    "Could not connect to Identity Server": "اتصال به سرور هیوت‌سنجی امکان پذیر نیست",
-    "Not a valid Identity Server (status code %(code)s)": "سرور هویت‌سنجی معتبر نیست (کد وضعیت %(code)s)",
-    "Identity Server URL must be HTTPS": "پروتکل آدرس سرور هویت‌سنجی باید HTTPS باشد",
     "not ready": "آماده نیست",
     "ready": "آماده",
     "Secret storage:": "حافظه نهان:",
@@ -1956,9 +1813,6 @@
     "Enable audible notifications for this session": "فعال‌سازی اعلان‌های صدادار برای این نشست",
     "Show message in desktop notification": "پیام‌ها را در اعلان دسکتاپ نشان بده",
     "Enable desktop notifications for this session": "فعال‌سازی اعلان‌های دسکتاپ برای این نشست",
-    "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.": "اعلان‌های پیشرفته‌ای وجود دارد که در این‌جا نمایش داده نمی‌شود.",
-    "Add an email address to configure email notifications": "برای راه‌اندازی اعلان‌های ایمیلی یک آدرس ایمیل اضافه کنید",
     "Clear notifications": "پاک‌کردن اعلان‌ها",
     "The integration manager is offline or it cannot reach your homeserver.": "مدیر یکپارچه‌سازی‌ یا آفلاین است و یا نمی‌تواند به سرور شما متصل شود.",
     "Cannot connect to integration manager": "امکان اتصال به مدیر یکپارچه‌سازی‌ها وجود ندارد",
@@ -2020,7 +1874,6 @@
     "New published address (e.g. #alias:server)": "آدرس جدید منتشر شده (به عنوان مثال #alias:server)",
     "No other published addresses yet, add one below": "آدرس دیگری منتشر نشده است، در زیر اضافه کنید",
     "Other published addresses:": "دیگر آدرس‌های منتشر شده:",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "آدرس‌های منتشرشده را می توان در هر سرور برای پیوستن به اتاق شما استفاده کرد. برای انتشار آدرس، ابتدا باید آن را به عنوان آدرس محلی تنظیم کنید.",
     "Published Addresses": "آدرس‌های منتشر شده",
     "Local address": "آدرس محلی",
     "This room has no local addresses": "این اتاق آدرس محلی ندارد",
@@ -2034,9 +1887,6 @@
     "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": "خطا در به روزرسانی آدرس اصلی",
-    "Delete recording": "حذف پیام ضبط شده",
-    "Stop the recording": "توقف ضبط",
-    "Record a voice message": "ضبط پیام صوتی",
     "We didn't find a microphone on your device. Please check your settings and try again.": "ما میکروفونی در دستگاه شما پیدا نکردیم. لطفاً تنظیمات خود را بررسی کنید و دوباره امتحان کنید.",
     "No microphone found": "میکروفونی یافت نشد",
     "We were unable to access your microphone. Please check your browser settings and try again.": "ما نتوانستیم به میکروفون شما دسترسی پیدا کنیم. لطفا تنظیمات مرورگر خود را بررسی کنید و دوباره سعی کنید.",
@@ -2099,12 +1949,10 @@
     "in memory": "بر روی حافظه",
     "Cross-signing public keys:": "کلیدهای عمومی امضاء متقابل:",
     "Go back": "بازگشت",
-    "You can change this later": "می‌توانید بعدا این را تغییر دهید",
     "Invite only, best for yourself or teams": "فقط با دعوتنامه، مناسب برای خودتان یا تیم‌ها یا جمع‌های خصوصی",
     "Private": "خصوصی",
     "Open space for anyone, best for communities": "محیط باز برای همه، مناسب برای جمع عمومی",
     "Public": "عمومی",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "محیط‌ها یک روش جدید برای دسته‌بندی کاربران و اتاق‌ها هستند. برای پیوستن به یک محیط موجود، نیاز به یک دعوتنامه دارید.",
     "Create a space": "ساختن یک محیط",
     "Please enter a name for the space": "لطفا یک نام برای محیط وارد کنید",
     "Description": "توضیحات",
@@ -2205,9 +2053,6 @@
     "Pause": "متوقف‌کردن",
     "Accept": "پذیرفتن",
     "Decline": "رد کردن",
-    "Incoming call": "تماس ورودی",
-    "Incoming video call": "تماس تصویری ورودی",
-    "Incoming voice call": "تماس صوتی ورودی",
     "Unknown caller": "تماس‌گیرنده‌ی ناشناس",
     "Dial pad": "صفحه شماره‌گیری",
     "There was an error looking up the phone number": "هنگام یافتن شماره تلفن خطایی رخ داد",
@@ -2245,7 +2090,6 @@
     "Enable message search in encrypted rooms": "فعال‌سازی قابلیت جستجو در اتاق‌های رمزشده",
     "Show previews/thumbnails for images": "پیش‌نمایش تصاویر را نشان بده",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "زمانی که سرور شما پیشنهادی ندارد، از سرور کمکی turn.hivaa.im برای برقراری تماس استفاده کنید (در این صورت آدرس IP شما برای سرور turn.hivaa.im آشکار خواهد شد)",
-    "Low bandwidth mode": "حالت پهنای باند کم",
     "Show hidden events in timeline": "نمایش رخدادهای مخفی در گفتگو‌ها",
     "Show shortcuts to recently viewed rooms above the room list": "نمایش میانبر در بالای لیست اتاق‌ها برای مشاهده‌ی اتاق‌هایی که اخیرا باز کرده‌اید",
     "Show rooms with unread notifications first": "اتاق‌های با پیام‌های خوانده‌نشده را ابتدا نشان بده",
@@ -2253,7 +2097,6 @@
     "Show developer tools": "نمایش ابزار توسعه‌دهندگان",
     "Prompt before sending invites to potentially invalid matrix IDs": "قبل از ارسال دعوت‌نامه برای کاربری که شناسه‌ی او احتمالا معتبر نیست، هشدا بده",
     "Enable widget screenshots on supported widgets": "فعال‌سازی امکان اسکرین‌شات برای ویجت‌های پشتیبانی‌شده",
-    "Room Colour": "رنگ اتاق",
     "Enable URL previews by default for participants in this room": "امکان پیش‌نمایش URL را به صورت پیش‌فرض برای اعضای این اتاق فعال کن",
     "Enable URL previews for this room (only affects you)": "فعال‌سازی پیش‌نمایش URL برای این اتاق (تنها شما را تحت تاثیر قرار می‌دهد)",
     "Enable inline URL previews by default": "فعال‌سازی پیش‌نمایش URL به صورت پیش‌فرض",
@@ -2269,8 +2112,6 @@
     "Automatically replace plain text Emoji": "متن ساده را به صورت خودکار با شکلک جایگزین کن",
     "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 برای جستجو",
     "Show typing notifications": "نمایش اعلان «در حال نوشتن»",
     "Send typing notifications": "ارسال اعلان «در حال نوشتن»",
     "Enable big emoji in chat": "نمایش شکلک‌های بزرگ در گفتگوها را فعال کن",
@@ -2340,13 +2181,11 @@
     "Use custom size": "از اندازه‌ی دلخواه استفاده کنید",
     "Font size": "اندازه فونت",
     "Show info about bridges in room settings": "اطلاعات پل‌های ارتباطی را در تنظیمات اتاق نمایش بده",
-    "Enable advanced debugging for the room list": "فعال‌سازی قابلیت رفع‌مشکل پیشرفته برای لیست اتاق‌ها",
     "Offline encrypted messaging using dehydrated devices": "ارسال پیام رمزشده به شکل آفلاین با استفاده از دستگاه‌های خاص",
     "Show message previews for reactions in all rooms": "پیش‌نمایش احساسات و شکلک‌ها را برای همه اتاق‌ها نشان بده",
     "Show message previews for reactions in DMs": "پیش‌نمایش احساسات و شکلک‌ها را برای گفتگوهای خصوصی نشان بده",
     "Support adding custom themes": "پشتیبانی از افزودن پوسته‌های ظاهری دلخواه",
     "Try out new ways to ignore people (experimental)": "روش‌های جدید برای نادیده‌گرفتن افراد را امتحان کنید (آزمایشی)",
-    "Multiple integration managers": "چند مدیر پکپارچه‌سازی",
     "Render simple counters in room header": "شمارنده‌های ساده‌ای در سرآیند اتاق نمایش بده",
     "Group & filter rooms by custom tags (refresh to apply changes)": "دسته‌بندی و پالایش اتاق‌ها با استفاده از تگ‌های دلخواه (برای اعمال تغییرات صفحه را رفرش کنید)",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "تکرارهایی مانند \"abcabcabc\" تنها مقداری سخت‌تر از \"abc\" قابل حدس‌زدن هستند",
@@ -2471,8 +2310,6 @@
     "<inviter/> invites you": "<inviter/> شما را دعوت کرد",
     "Private space": "محیط خصوصی",
     "Public space": "محیط عمومی",
-    "Spaces are a beta feature.": "فضای کاری یک قابلیت بتا است.",
-    "Create room": "ساختن اتاق",
     "No results found": "نتیجه‌ای یافت نشد",
     "Removing...": "در حال حذف...",
     "You don't have permission": "شما دسترسی ندارید",
@@ -2498,7 +2335,6 @@
     "delete the address.": "آدرس را حذف کنید.",
     "The homeserver may be unavailable or overloaded.": "احتمالا سرور در دسترس نباشد و یا بار زیادی روی آن قرار گرفته باشد.",
     "You have no visible notifications.": "اعلان قابل مشاهده‌ای ندارید.",
-    "Communities are changing to Spaces": "فضای کاری به محیط تغییر پیدا کرد",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "برای دسته‌بندی اتاق‌ها و کاربران، فضای کاری بسازید!",
     "Create a new community": "ساختن فضای کاری جدید",
     "Your Communities": "فضاهای کاری شما",
@@ -2641,9 +2477,6 @@
     "Update status": "به‌روزرسانی وضعیت",
     "Clear status": "پاک‌کردن وضعیت",
     "Report Content": "گزارش محتوا",
-    "Share Message": "به اشتراک‌گذاری پیام",
-    "Share Permalink": "اشتراک لینک پیام",
-    "Pin Message": "پین‌کردن پیام",
     "Unable to reject invite": "رد کردن دعوت امکان‌پذیر نیست",
     "Reject invitation": "ردکردن دعوت",
     "Hold": "نگه‌داشتن",
@@ -2658,7 +2491,6 @@
     "Your email address hasn't been verified yet": "آدرس ایمیل شما هنوز تائید نشده‌است",
     "Unable to share email address": "به اشتراک‌گذاری آدرس ایمیل ممکن نیست",
     "Unable to revoke sharing for email address": "لغو اشتراک گذاری برای آدرس ایمیل ممکن نیست",
-    "Who can access this room?": "چه افرادی بتوانند به این اتاق دسترسی داشته باشند؟",
     "Encrypted": "رمزشده",
     "Once enabled, encryption cannot be disabled.": "زمانی که رمزنگاری فعال شود، امکان غیرفعال‌کردن آن برای اتاق وجود ندارد.",
     "Security & Privacy": "امنیت و محرمانگی",
@@ -2668,7 +2500,6 @@
     "Members only (since the point in time of selecting this option)": "فقط اعضاء (از زمانی که این تنظیم اعمال می‌شود)",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "تغییر تنظیمات اینکه چه کاربرانی سابقه‌ی پیام‌ها را مشاهده کنند، تنها برای پیام‌های آتی اتاق اعمال میشود. پیام‌های قبلی متناسب با تنظیمات گذشته نمایش داده می‌شوند.",
     "Only people who have been invited": "تنها کاربرانی که دعوت شده‌اند",
-    "Guests cannot join this room even if explicitly invited.": "کاربران مهمان حتی در صورتی که صراحتا به گروه دعوت شوند، امکان پیوستن به اتاق را نخواهند داشت.",
     "Enable encryption?": "رمزنگاری را فعال می‌کنید؟",
     "Select the roles required to change various parts of the room": "برای تغییر هر یک از بخش‌های اتاق، خداقل نقش مورد نیاز را انتخاب کنید",
     "Permissions": "دسترسی‌ها",
@@ -2761,9 +2592,7 @@
     "Copy": "رونوشت",
     "Your access token gives full access to your account. Do not share it with anyone.": "توکن دسترسی شما، دسترسی کامل به حساب کاربری شما را میسر می‌سازد. لطفا آن را در اختیار فرد دیگری قرار ندهید.",
     "Access Token": "توکن دسترسی",
-    "Identity Server is": "سرور هویت‌سنجی شما عبارت است از",
     "Homeserver is": "سرور ما عبارت است از",
-    "olm version:": "نسخه‌ی olm:",
     "Versions": "نسخه‌ها",
     "Keyboard Shortcuts": "کلیدهای میانبر",
     "FAQ": "سوالات پرتکرار",
@@ -2777,22 +2606,13 @@
     "Deactivate account": "غیرفعال‌کردن حساب کاربری",
     "Deactivating your account is a permanent action - be careful!": "غیرفعال‌سازی حساب کاربری یک عمل دائمی و غیرقابل بازگشت است - لطفا مراقب باشید!",
     "Account management": "مدیریت حساب کاربری",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "شما می‌توانید هر زمان که خواستید، در قسمت تنظیمات و یا با کلیک بر روی علامت بتا از محیط بتا خارج شوید.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "اگر ترک کنید، %(brand)s بعد از غیرفعال کردن قابلیت محیط بازراه‌اندازی خواهد شد. قابلیت‌های فضای کاری و تگ‌های دلخواه مجددا قابل مشاهده خواهند بود.",
     "Custom user status messages": "پیام‌های وضعیت کاربر دلخواه",
     "Message Pinning": "پین کردن پیام",
-    "New spinner design": "طرح اسپینر جدید",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "نسخه‌ی ۲ فضای کاری. نیاز به سرور سازگار دارد. به شدت ازمایشی و ناپایدار است - با احتباط استفاده کنید.",
     "Render LaTeX maths in messages": "نمایش لاتکس ریاضیات در پیام‌ها",
-    "Send and receive voice messages": "ارسال و دریافت پیام‌های صوتی",
     "Show options to enable 'Do not disturb' mode": "گزینه‌ها را برای فعال‌کردن حالت 'مزاحم نشوید' نشان بده",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "بازخورد شما به بهبود قابلیت محیط کمک خواهد کرد. هر چقدر وارد جزئیات بیشتری شوید، بهتر خواهد بود.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "نسخه‌ی بتا برای وب، دسکتاپ و اندروید در دسترس است. بعضی از قابلیت‌ها ممکن است بر روی سرور شما در دسترس نباشند.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s با فعال‌شدن قابلیت محیط‌ها بازراه‌اندازی خواهد شد. فضای کاری و تگ‌های دلخواه ناپدید خواهند شد.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "نسخه‌ی بتا برای کلاینت‌های وب، دسکتاپ و اندروید موجود است. از بابت امتحان‌کردن نسخه‌ی بتا سپاس‌گزاریم.",
     "Spaces are a new way to group rooms and people.": "محیط‌ها روش جدیدی برای دسته‌بندی اتاق‌ها و کاربران است.",
     "Spaces": "محیط‌ها",
-    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "نمونه اولیه قابلیت محیط. با نسخه‌های ۱ و ۲ فضای کاری، و تگ‌های دلخواه سازگار نیست. برای برخی از قابلیت‌ها نیاز به سرور سازگار دارد.",
     "Change notification settings": "تنظیمات اعلان را تغییر دهید",
     "%(senderName)s: %(stickerName)s": "%(senderName)s:%(stickerName)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s:%(reaction)s",
@@ -2864,9 +2684,7 @@
     "Size must be a number": "سایز باید یک عدد باشد",
     "Hey you. You're the best!": "سلام. حال شما خوبه؟",
     "Check for update": "بررسی برای به‌روزرسانی جدید",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "مدیرهای یکپارچه‌سازی، داده‌های مربوط به پیکربندی را دریافت کرده و امکان تغییر ویجت‌ها، ارسال دعوتنامه برای اتاق و تنظیم سطح دسترسی از طرف شما را دارا هستند.",
     "Manage integrations": "مدیریت پکپارچه‌سازی‌ها",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "از یک مدیر پکپارچه‌سازی برای مدیریت بات‌ها، ویجت‌ها و پک‌های استیکر مورد نظرتان استفاده نمائید.",
     "Change": "تغییر بده",
     "Enter a new identity server": "یک سرور هویت‌سنجی جدید وارد کنید",
     "Do not use an identity server": "از سرور هویت‌سنجی استفاده نکن",
@@ -2963,7 +2781,6 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "به‌روزرسانی اتاق اقدامی پیشرفته بوده و معمولاً در صورتی توصیه می‌شود که اتاق به دلیل اشکالات، فقدان قابلیت‌ها یا آسیب پذیری‌های امنیتی، پایدار و قابل استفاده نباشد.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "آیا می دانید: برای فیلتر کردن تجربیات خود در %(brand)s می توانید از اجتماع‌ها استفاده کنید!",
     "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)s خود مشکلی دارید، لطفاً <a>اشکال را گزارش کنید</a>.",
-    "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.": "برای تنظیم فیلتر، آواتار یک اجتماع را به صفحه فیلتر در سمت چپ صفحه بکشید. همواره می‌توانید با کلیک برر روی آواتار در صفحه فیلتر، فقط اتاق ها و افراد مرتبط با آن انجمن را مشاهده کنید.",
     "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)s خود مشکلی دارید ، لطفاً یک اشکال گزارش دهید.",
     "Put a link back to the old room at the start of the new room so people can see old messages": "در ابتدای اتاق جدید پیوندی به اتاق قدیمی قرار دهید تا افراد بتوانند پیام‌های موجود در اتاق قدیمی را ببینند",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "از گفتگوی کاربران در نسخه قدیمی اتاق جلوگیری کرده و با ارسال پیامی به کاربران توصیه کنید به اتاق جدید منتقل شوند",
@@ -2976,12 +2793,8 @@
     "Doesn't look like a valid email address": "به نظر نمی‌رسد یک آدرس ایمیل معتبر باشد",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s نتوانست لیست پروتکل را از سرور میزبان دریافت کند. ممکن است سرور برای پشتیبانی از شبکه های شخص ثالث خیلی قدیمی باشد.",
     "If they don't match, the security of your communication may be compromised.": "اگر آنها مطابقت نداشته‌باشند ، ممکن است امنیت ارتباطات شما به خطر افتاده باشد.",
-    "If you didn’t sign in to this session, your account may be compromised.": "اگر وارد این نشست نشده‌اید ، ممکن است حساب کاربری شما به خطر افتاد باشد.",
     "%(brand)s failed to get the public room list.": "%(brand)s نتوانست لیست اتاق‌های عمومی را دریافت کند.",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "از این نشست برای تائید نشست‌های جدید خود و اعطای دسترسی به پیام‌های رمزشده استفاده کنید:",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "اتاق با آدرس %(alias)s حذف شده و نام %(name)s از فهرست اتاق‌ها نیز پاک شود؟",
-    "We recommend you change your password and Security Key in Settings immediately": "ما به شما توصیه می‌کنیم بلافاصله گذرواژه و کلید امنیتی خود را در تنظیمات تغییر دهید",
-    "The internet connection either session is using": "اتصال اینترنت و یا نشست در حال استفاده است",
     "%(brand)s does not know how to join a room on this network": "%(brand)s نمی‌تواند به اتاقی در این شبکه بپیوندد",
     "Data on this screen is shared with %(widgetDomain)s": "داده‌های این صفحه با %(widgetDomain)s به اشتراک گذاشته می‌شود",
     "Your homeserver doesn't seem to support this feature.": "به نظر نمی‌رسد که سرور شما از این قابلیت پشتیبانی کند.",
@@ -3007,5 +2820,19 @@
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "این کار آنها را به %(communityName)s دعوت نمی‌کند. برای دعوت افراد به %(communityName)s،<a>اینجا</a> کلیک کنید",
     "Start a conversation with someone using their name or username (like <userId/>).": "با استفاده از نام یا نام کاربری (مانند <userId/>)، گفتگوی جدیدی را با دیگران شروع کنید.",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "با استفاده از نام، آدرس ایمیل و یا نام کاربری (مانند <userId/>)، یک گفتگوی جدید را شروع کنید.",
-    "May include members not in %(communityName)s": "ممکن شامل اعضایی که در %(communityName)s نیستند نیز شود"
+    "May include members not in %(communityName)s": "ممکن شامل اعضایی که در %(communityName)s نیستند نیز شود",
+    "Integration manager": "مدیر یکپارچگی",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s شما اجازهٔ استفاده از یک مدیر یکپارچگی را برای این کار نمی دهد. لطفاً با مدیری تماس بگیرید.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "استفاده از این ابزارک ممکن است داده‌هایی <helpIcon /> را با %(widgetDomain)s و مدیر یکپارچگیتان هم رسانی کند.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "برای مدیریت بات‌ها، ابزارک‌ها و بسته‌های برچسب، از یک مدیر پکپارچه‌سازی استفاده کنید.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "برای مدیریت بات‌ها، ابزارک‌ها و بسته‌های برچسب، از یک مدیر پکپارچه‌سازی <b>(%(serverName)s)</b> استفاده کنید.",
+    "Identity server": "کارساز هویت",
+    "Identity server (%(server)s)": "کارساز هویت (%(server)s)",
+    "Could not connect to identity server": "نتوانست به کارساز هویت وصل شود",
+    "Not a valid identity server (status code %(code)s)": "کارساز هویت معتبر نیست (کد وضعیت %(code)s)",
+    "Identity server URL must be HTTPS": "نشانی کارساز هویت باید HTTPS باشد",
+    "Transfer Failed": "انتقال شکست خورد",
+    "Unable to transfer call": "ناتوان در انتقال تماس",
+    "The user you called is busy.": "کاربر موردنظر مشغول است.",
+    "User Busy": "کاربر مشغول"
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 23140846b3..e2ca967980 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -3,7 +3,6 @@
     "Cancel": "Peruuta",
     "Close": "Sulje",
     "Create new room": "Luo uusi huone",
-    "Custom Server Options": "Palvelinasetukset",
     "Dismiss": "Hylkää",
     "Error": "Virhe",
     "Failed to forget room %(errCode)s": "Huoneen unohtaminen epäonnistui %(errCode)s",
@@ -12,7 +11,6 @@
     "Notifications": "Ilmoitukset",
     "Operation failed": "Toiminto epäonnistui",
     "Remove": "Poista",
-    "Room directory": "Huoneluettelo",
     "Search": "Haku",
     "Settings": "Asetukset",
     "Start chat": "Aloita keskustelu",
@@ -20,11 +18,8 @@
     "Failed to change password. Is your password correct?": "Salasanan vaihtaminen epäonnistui. Onko salasanasi oikein?",
     "Continue": "Jatka",
     "powered by Matrix": "moottorina Matrix",
-    "Active call (%(roomName)s)": "Aktiivinen puhelu (%(roomName)s)",
     "Add": "Lisää",
-    "Add a topic": "Lisää aihe",
     "Admin": "Ylläpitäjä",
-    "Allow": "Salli",
     "No Microphones detected": "Mikrofonia ei löytynyt",
     "No Webcams detected": "Kameroita ei löytynyt",
     "No media permissions": "Ei mediaoikeuksia",
@@ -37,23 +32,15 @@
     "Authentication": "Autentikointi",
     "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
     "A new password must be entered.": "Sinun täytyy syöttää uusi salasana.",
-    "%(senderName)s answered the call.": "%(senderName)s vastasi puheluun.",
     "An error has occurred.": "Tapahtui virhe.",
     "Anyone": "Kaikki",
-    "Anyone who knows the room's link, apart from guests": "Kaikki joilla on huoneen linkki, paitsi vieraat",
-    "Anyone who knows the room's link, including guests": "Kaikki joilla on huoneen linkki, mukaan lukien vieraat",
     "Are you sure?": "Oletko varma?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Oletko varma että haluat poistua huoneesta '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Oletko varma että haluat hylätä kutsun?",
     "Attachment": "Liite",
-    "Autoplay GIFs and videos": "Toista GIF-animaatiot ja videot automaattisesti",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s antoi porttikiellon käyttäjälle %(targetName)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.": "Kotipalvelimeen ei saada yhteyttä. Tarkista verkkoyhteytesi, varmista että <a>kotipalvelimesi SSL-sertifikaatti</a> on luotettu, ja että mikään selaimen lisäosa ei estä pyyntöjen lähettämistä.",
     "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>.": "Yhdistäminen kotipalvelimeen HTTP:n avulla ei ole mahdollista, kun selaimen osoitepalkissa on HTTPS-osoite. Käytä joko HTTPS:ää tai <a>salli turvattomat komentosarjat</a>.",
     "Change Password": "Vaihda salasana",
-    "%(senderName)s changed their profile picture.": "%(senderName)s vaihtoi profiilikuvansa.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s hyväksyi kutsun.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hyväksyi kutsun käyttäjän %(displayName)s puolesta.",
     "Account": "Tili",
     "and %(count)s others...|other": "ja %(count)s muuta...",
     "and %(count)s others...|one": "ja yksi muu...",
@@ -61,27 +48,18 @@
     "Banned users": "Porttikiellon saaneet käyttäjät",
     "Bans user with given id": "Antaa porttikiellon tunnuksen mukaiselle käyttäjälle",
     "Changes your display nickname": "Vaihtaa näyttönimesi",
-    "Click here to fix": "Paina tästä korjataksesi",
-    "Click to mute audio": "Paina mykistääksesi äänet",
-    "Click to mute video": "Paina mykistääksesi videon",
-    "click to reveal": "paina näyttääksesi",
-    "Click to unmute video": "Paina poistaaksesi videomykistyksen",
-    "Click to unmute audio": "Paina poistaaksesi äänimykistyksen",
     "Command error": "Komentovirhe",
     "Commands": "Komennot",
     "Confirm password": "Varmista salasana",
     "Create Room": "Luo huone",
     "Cryptography": "Salaus",
     "Current password": "Nykyinen salasana",
-    "Custom": "Mukautettu",
     "Custom level": "Mukautettu taso",
-    "/ddg is not a command": "/ddg ei ole komento",
     "Deactivate Account": "Poista tili pysyvästi",
     "Decline": "Hylkää",
     "Default": "Oletus",
     "Disinvite": "Peru kutsu",
     "Download %(text)s": "Lataa %(text)s",
-    "Drop File Here": "Pudota tiedosto tähän",
     "Edit": "Muokkaa",
     "Email": "Sähköposti",
     "Email address": "Sähköpostiosoite",
@@ -91,10 +69,8 @@
     "Export": "Vie",
     "Export E2E room keys": "Tallenna osapuolten välisen salauksen huoneavaimet",
     "Failed to ban user": "Porttikiellon antaminen epäonnistui",
-    "Failed to fetch avatar URL": "Profiilikuvan URL:n haku epäonnistui",
     "Failed to join room": "Huoneeseen liittyminen epäonnistui",
     "Failed to kick": "Huoneesta poistaminen epäonnistui",
-    "Failed to leave room": "Huoneesta poistuminen epäonnistui",
     "Failed to load timeline position": "Aikajanapaikan lataaminen epäonnistui",
     "Failed to mute user": "Käyttäjän mykistäminen epäonnistui",
     "Failed to reject invite": "Kutsun hylkääminen epäonnistui",
@@ -107,18 +83,13 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Sähköpostin vahvistus epäonnistui: varmista, että klikkasit sähköpostissa olevaa linkkiä",
     "Failure to create room": "Huoneen luominen epäonnistui",
     "Favourites": "Suosikit",
-    "Fill screen": "Täytä näyttö",
     "Filter room members": "Suodata huoneen jäseniä",
     "Forget room": "Unohda huone",
     "For security, this session has been signed out. Please sign in again.": "Turvallisuussyistä tämä istunto on kirjattu ulos. Ole hyvä ja kirjaudu uudestaan.",
     "Homeserver is": "Kotipalvelin on",
-    "Identity Server is": "Identiteettipalvelin on",
     "I have verified my email address": "Olen varmistanut sähköpostiosoitteeni",
     "Import": "Tuo",
     "Import E2E room keys": "Tuo olemassaolevat osapuolten välisen salauksen huoneavaimet",
-    "Incoming call from %(name)s": "Saapuva puhelu käyttäjältä %(name)s",
-    "Incoming video call from %(name)s": "Saapuva videopuhelu käyttäjältä %(name)s",
-    "Incoming voice call from %(name)s": "Saapuva äänipuhelu käyttäjältä %(name)s",
     "Incorrect username and/or password.": "Virheellinen käyttäjätunnus ja/tai salasana.",
     "Incorrect verification code": "Virheellinen varmennuskoodi",
     "Invalid Email Address": "Virheellinen sähköpostiosoite",
@@ -135,13 +106,11 @@
     "Leave room": "Poistu huoneesta",
     "Logout": "Kirjaudu ulos",
     "Low priority": "Matala prioriteetti",
-    "Manage Integrations": "Hallinnoi integraatioita",
     "Moderator": "Valvoja",
     "Name": "Nimi",
     "New passwords don't match": "Uudet salasanat eivät täsmää",
     "New passwords must match each other.": "Uusien salasanojen on vastattava toisiaan.",
     "not specified": "ei määritetty",
-    "(not supported by this browser)": "(ei tuettu tässä selaimessa)",
     "<not supported>": "<ei tuettu>",
     "AM": "ap.",
     "PM": "ip.",
@@ -149,74 +118,53 @@
     "No more results": "Ei enempää tuloksia",
     "No results": "Ei tuloksia",
     "OK": "OK",
-    "olm version:": "olmin versio:",
     "Only people who have been invited": "Vain kutsutut käyttäjät",
     "Password": "Salasana",
     "Passwords can't be empty": "Salasanat eivät voi olla tyhjiä",
     "Permissions": "Oikeudet",
     "Phone": "Puhelin",
-    "Private Chat": "Yksityinen keskustelu",
     "Profile": "Profiili",
-    "Public Chat": "Julkinen keskustelu",
     "Reason": "Syy",
     "Register": "Rekisteröidy",
     "Reject invitation": "Hylkää kutsu",
-    "Results from DuckDuckGo": "DuckDuckGo:n tulokset",
     "Return to login screen": "Palaa kirjautumissivulle",
     "%(brand)s version:": "%(brand)s-webin versio:",
-    "Room Colour": "Huoneen väri",
     "Rooms": "Huoneet",
     "Save": "Tallenna",
     "Search failed": "Haku epäonnistui",
-    "Searches DuckDuckGo for results": "Hakee DuckDuckGo:n avulla",
     "Server error": "Palvelinvirhe",
     "Session ID": "Istuntotunniste",
     "Sign in": "Kirjaudu sisään",
     "Sign out": "Kirjaudu ulos",
-    "%(count)s of your messages have not been sent.|other": "Osaa viesteistäsi ei ole lähetetty.",
     "Someone": "Joku",
     "Submit": "Lähetä",
     "This email address is already in use": "Tämä sähköpostiosoite on jo käytössä",
     "This email address was not found": "Sähköpostiosoitetta ei löytynyt",
-    "The remote side failed to pick up": "Toinen osapuoli ei vastannut",
     "This room has no local addresses": "Tällä huoneella ei ole paikallista osoitetta",
     "This room": "Tämä huone",
     "This room is not accessible by remote Matrix servers": "Tähän huoneeseen ei pääse ulkopuolisilta Matrix-palvelimilta",
     "Unban": "Poista porttikielto",
-    "unknown caller": "tuntematon soittaja",
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
     "Uploading %(filename)s and %(count)s others|zero": "Lähetetään %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Lähetetään %(filename)s ja %(count)s muuta",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimeksi %(roomName)s.",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön syntaksikorostusta varten",
-    "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.",
-    "Guests cannot join this room even if explicitly invited.": "Vierailijat eivät voi liittyä tähän huoneeseen erikseen kutsuttuinakaan.",
     "Hangup": "Lopeta",
     "Historical": "Vanhat",
     "Home": "Etusivu",
     "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.",
     "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP-konferenssia.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.",
     "This room is not recognised.": "Huonetta ei tunnistettu.",
     "This doesn't appear to be a valid email address": "Tämä ei vaikuta olevan kelvollinen sähköpostiosoite",
     "This phone number is already in use": "Puhelinnumero on jo käytössä",
-    "Username invalid: %(errMessage)s": "Käyttäjätunnus ei kelpaa: %(errMessage)s",
     "Users": "Käyttäjät",
     "Verified key": "Varmennettu avain",
     "Video call": "Videopuhelu",
     "Voice call": "Äänipuhelu",
-    "VoIP conference finished.": "VoIP-konferenssi loppui.",
-    "VoIP conference started.": "VoIP-konferenssi alkoi.",
     "VoIP is unsupported": "VoIP ei ole tuettu",
-    "(no answer)": "(ei vastausta)",
-    "(unknown failure: %(reason)s)": "(tuntematon virhe: %(reason)s)",
     "Warning!": "Varoitus!",
-    "Who can access this room?": "Ketkä pääsevät tähän huoneeseen?",
     "Who can read history?": "Ketkä voivat lukea historiaa?",
-    "You are already in a call.": "Sinulla on jo puhelu käynnissä.",
     "You are not in this room.": "Et ole tässä huoneessa.",
     "You do not have permission to do that in this room.": "Sinulla ei ole oikeutta tehdä tuota tässä huoneessa.",
     "You cannot place a call with yourself.": "Et voi soittaa itsellesi.",
@@ -224,7 +172,6 @@
     "You do not have permission to post to this room": "Sinulla ei ole oikeutta kirjoittaa tässä huoneessa",
     "You have <a>disabled</a> URL previews by default.": "Olet oletusarvoisesti ottanut URL-esikatselut <a>pois käytöstä</a>.",
     "You have <a>enabled</a> URL previews by default.": "Olet oletusarvoisesti ottanut URL-esikatselut <a>käyttöön</a>.",
-    "You have no visible notifications": "Sinulla ei ole näkyviä ilmoituksia",
     "You must <a>register</a> to use this functionality": "Sinun pitää <a>rekisteröityä</a> käyttääksesi tätä toiminnallisuutta",
     "You need to be able to invite users to do that.": "Sinun pitää pystyä kutsua käyttäjiä voidaksesi tehdä tuon.",
     "You need to be logged in.": "Sinun pitää olla kirjautunut.",
@@ -236,10 +183,7 @@
     "Thu": "to",
     "Fri": "pe",
     "Sat": "la",
-    "Set a display name:": "Aseta näyttönimi:",
     "This server does not support authentication with a phone number.": "Tämä palvelin ei tue autentikointia puhelinnumeron avulla.",
-    "An error occurred: %(error_string)s": "Virhe: %(error_string)s",
-    "There are no visible files in this room": "Tässä huoneessa ei tiedostoja näkyvissä",
     "Room": "Huone",
     "Copied!": "Kopioitu!",
     "Failed to copy": "Kopiointi epäonnistui",
@@ -247,8 +191,6 @@
     "Sent messages will be stored until your connection has returned.": "Lähetetyt viestit tallennetaan kunnes yhteys on taas muodostettu.",
     "(~%(count)s results)|one": "(~%(count)s tulos)",
     "(~%(count)s results)|other": "(~%(count)s tulosta)",
-    "Active call": "Aktiivinen puhelu",
-    "Please select the destination room for this message": "Ole hyvä ja valitse vastaanottava huone tälle viestille",
     "New Password": "Uusi salasana",
     "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
     "Analytics": "Analytiikka",
@@ -263,7 +205,6 @@
     "You must join the room to see its files": "Sinun pitää liittyä huoneeseen voidaksesi nähdä sen sisältämät tiedostot",
     "Reject all %(invitedRooms)s invites": "Hylkää kaikki %(invitedRooms)s kutsut",
     "Failed to invite": "Kutsu epäonnistui",
-    "Failed to invite the following users to the %(roomName)s room:": "Seuraavien käyttäjien kutsuminen huoneeseen %(roomName)s epäonnistui:",
     "Confirm Removal": "Varmista poistaminen",
     "Unknown error": "Tuntematon virhe",
     "Incorrect password": "Virheellinen salasana",
@@ -271,17 +212,9 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s poisti huoneen nimen.",
     "Decrypt %(text)s": "Pura %(text)s",
     "Displays action": "Näyttää toiminnan",
-    "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.",
-    "Existing Call": "Käynnissä oleva puhelu",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liity käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>.",
-    "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.",
-    "%(targetName)s left the room.": "%(targetName)s poistui huoneesta.",
     "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone verkkotunnuksen %(domain)s huoneluettelossa?",
     "Missing room_id in request": "room_id puuttuu kyselystä",
     "Missing user_id in request": "user_id puuttuu kyselystä",
-    "%(targetName)s rejected the invitation.": "%(targetName)s hylkäsi kutsun.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s poisti näyttönimensä (%(oldDisplayName)s).",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)silla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ei saanut lupaa lähettää ilmoituksia - yritä uudelleen",
     "Room %(roomId)s not visible": "Huone %(roomId)s ei ole näkyvissä",
@@ -295,12 +228,9 @@
     "Signed Out": "Uloskirjautunut",
     "Start authentication": "Aloita tunnistus",
     "Success": "Onnistui",
-    "The phone number entered looks invalid": "Syötetty puhelinnumero näyttää virheelliseltä",
     "Unable to add email address": "Sähköpostiosoitteen lisääminen epäonnistui",
     "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
     "Unable to verify email address.": "Sähköpostin vahvistaminen epäonnistui.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s poisti porttikiellon käyttäjältä %(targetName)s.",
-    "Unable to capture screen": "Ruudun kaappaus epäonnistui",
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
     "Uploading %(filename)s and %(count)s others|other": "Lähetetään %(filename)s ja %(count)s muuta",
     "Upload Failed": "Lähetys epäonnistui",
@@ -316,14 +246,10 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu tai olet törmännyt virheeseen.",
     "Server unavailable, overloaded, or something else went wrong.": "Palvelin on saavuttamattomissa, ylikuormitettu tai jotain muuta meni vikaan.",
     "The email address linked to your account must be entered.": "Sinun pitää syöttää tiliisi liitetty sähköpostiosoite.",
-    "To get started, please pick a username!": "Aloita valitsemalla käyttäjätunnus!",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Käyttääksesi sitä odota vain automaattitäydennyksiä ja selaa niiden läpi.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Aikajanan tietty hetki yritettiin ladata, mutta sinulla ei ole oikeutta nähdä kyseistä viestiä.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Huoneen aikajanan tietty hetki yritettiin ladata, mutta sitä ei löytynyt.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oikeustaso %(powerLevelNumber)s)",
     "Verification Pending": "Varmennus odottaa",
-    "(could not connect media)": "(mediaa ei voitu yhdistää)",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun.",
     "You seem to be in a call, are you sure you want to quit?": "Sinulla näyttää olevan puhelu kesken. Haluatko varmasti lopettaa?",
     "You seem to be uploading files, are you sure you want to quit?": "Näytät lähettävän tiedostoja. Oletko varma että haluat lopettaa?",
     "Jan": "tammi",
@@ -339,23 +265,14 @@
     "Nov": "marras",
     "Dec": "joulu",
     "Unknown Address": "Tuntematon osoite",
-    "ex. @bob:example.com": "esim. @erkki:esimerkki.com",
-    "Add User": "Lisää käyttäjä",
     "Please enter the code it contains:": "Ole hyvä ja syötä sen sisältämä koodi:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jos et syötä sähköpostiosoitetta et voi uudelleenalustaa salasanasi myöhemmin. Oletko varma?",
-    "Error decrypting audio": "Virhe purettaessa äänen salausta",
     "Error decrypting image": "Virhe purettaessa kuvan salausta",
     "Error decrypting video": "Virhe purettaessa videon salausta",
     "Add an Integration": "Lisää integraatio",
     "URL Previews": "URL-esikatselut",
     "Drop file here to upload": "Pudota tiedosto tähän lähettääksesi sen palvelimelle",
-    " (unsupported)": " (ei tuettu)",
     "Check for update": "Tarkista päivitykset",
-    "Username available": "Käyttäjätunnus saatavilla",
-    "Username not available": "Käyttäjätunnus ei ole saatavissa",
     "Something went wrong!": "Jokin meni vikaan!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tästä tulee tilisi nimi <span></span>-kotipalvelimella, tai voit valita <a>toisen palvelimen</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Jos sinulla on jo Matrix-tili, voit <a>kirjautua</a>.",
     "Your browser does not support the required cryptography extensions": "Selaimesi ei tue vaadittuja kryptografisia laajennuksia",
     "Not a valid %(brand)s keyfile": "Ei kelvollinen %(brand)s-avaintiedosto",
     "Authentication check failed: incorrect password?": "Autentikointi epäonnistui: virheellinen salasana?",
@@ -365,10 +282,7 @@
     "Example": "Esimerkki",
     "Create": "Luo",
     "Failed to upload image": "Kuvan lähetys epäonnistui",
-    "Add a widget": "Lisää sovelma",
-    "Cannot add any more widgets": "Enempää sovelmia ei voida lisätä",
     "Delete widget": "Poista sovelma",
-    "The maximum permitted number of widgets have already been added to this room.": "Maksimimäärä sovelmia on jo lisätty tähän huoneeseen.",
     "Unable to create widget.": "Sovelman luominen epäonnistui.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Et voi kumota tätä muutosta, koska olet ylentämässä käyttäjää samalle oikeustasolle kuin itsesi.",
     "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.": "Tämä prosessi mahdollistaa salatuissa huoneissa vastaanottamiesi viestien salausavainten viemisen tiedostoon. Voit myöhemmin tuoda ne toiseen Matrix-asiakasohjelmaan, jolloin myös se voi purkaa viestit.",
@@ -389,8 +303,6 @@
     "Restricted": "Rajoitettu",
     "You are now ignoring %(userId)s": "Et enää huomioi käyttäjää %(userId)s",
     "You are no longer ignoring %(userId)s": "Huomioit jälleen käyttäjän %(userId)s",
-    "%(senderName)s removed their profile picture.": "%(senderName)s poisti profiilikuvansa.",
-    "%(senderName)s set a profile picture.": "%(senderName)s asetti profiilikuvan.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s muutti tulevan huonehistorian näkyväksi kaikille huoneen jäsenille heidän kutsumisestaan alkaen.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, heidän liittymisestään alkaen.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
@@ -403,9 +315,6 @@
     "Enable inline URL previews by default": "Ota linkkien esikatselu käyttöön oletusarvoisesti",
     "Enable URL previews for this room (only affects you)": "Ota linkkien esikatselut käyttöön tässä huoneessa (koskee ainoastaan sinua)",
     "Enable URL previews by default for participants in this room": "Ota linkkien esikatselu käyttöön kaikille huoneen jäsenille",
-    "%(senderName)s sent an image": "%(senderName)s lähetti kuvan",
-    "%(senderName)s sent a video": "%(senderName)s lähetti videon",
-    "%(senderName)s uploaded a file": "%(senderName)s lähetti tiedoston",
     "Disinvite this user?": "Peru tämän käyttäjän kutsu?",
     "Kick this user?": "Poista tämä käyttäjä?",
     "Unban this user?": "Poista tämän käyttäjän porttikielto?",
@@ -416,17 +325,12 @@
     "Mention": "Mainitse",
     "Invite": "Kutsu",
     "Admin Tools": "Ylläpitotyökalut",
-    "Unpin Message": "Poista viestin kiinnitys",
-    "Jump to message": "Hyppää viestiin",
-    "No pinned messages.": "Ei kiinnitettyjä viestejä.",
     "Loading...": "Lataa...",
-    "Pinned Messages": "Kiinnitetyt viestit",
     "Unnamed room": "Nimetön huone",
     "World readable": "Täysin julkinen",
     "Guests can join": "Vierailijat voivat liittyä",
     "No rooms to show": "Ei näytettäviä huoneita",
     "Upload avatar": "Lähetä profiilikuva",
-    "Community Invites": "Yhteisökutsut",
     "Banned by %(displayName)s": "%(displayName)s antoi porttikiellon",
     "Privileged Users": "Etuoikeutetut käyttäjät",
     "Members only (since the point in time of selecting this option)": "Vain jäsenet (tämän valinnan tekemisestä lähtien)",
@@ -439,8 +343,6 @@
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen kuvan.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vaihtoi huoneen kuvaksi <img/>",
     "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?": "Sinut ohjataan kolmannen osapuolen sivustolle, jotta voit autentikoida tilisi käyttääksesi palvelua %(integrationsUrl)s. Haluatko jatkaa?",
-    "An email has been sent to %(emailAddress)s": "Sähköpostia lähetetty osoitteeseen %(emailAddress)s",
-    "Please check your email to continue registration.": "Ole hyvä ja tarkista sähköpostisi jatkaaksesi.",
     "A text message has been sent to %(msisdn)s": "Tekstiviesti lähetetty numeroon %(msisdn)s",
     "Remove from community": "Poista yhteisöstä",
     "Disinvite this user from community?": "Peruuta tämän käyttäjän kutsu yhteisöön?",
@@ -510,14 +412,12 @@
     "Create a new community": "Luo uusi yhteisö",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Viesti on lähetetty osoitteeseen %(emailAddress)s. Klikkaa alla sen jälkeen kun olet seurannut viestin sisältämää linkkiä.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Huomaa että olet kirjautumassa palvelimelle %(hs)s, etkä palvelimelle matrix.org.",
-    "Upload an avatar:": "Lataa profiilikuva:",
     "Deops user with given id": "Poistaa tunnuksen mukaiselta käyttäjältä ylläpito-oikeudet",
     "Ignores a user, hiding their messages from you": "Sivuuttaa käyttäjän, eli hänen viestejään ei näytetä sinulle",
     "Stops ignoring a user, showing their messages going forward": "Lopettaa käyttäjän huomiotta jättämisen, jotta hänen viestinsä näytetään sinulle",
     "Notify the whole room": "Ilmoita koko huoneelle",
     "Room Notification": "Huoneilmoitus",
     "Call Failed": "Puhelu epäonnistui",
-    "Call Timeout": "Puhelun aikakatkaisu",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s. %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s. %(monthName)s %(fullYear)s %(time)s",
@@ -529,7 +429,6 @@
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisäsi sovelman %(widgetName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s poisti sovelman %(widgetName)s",
     "Send": "Lähetä",
-    "Ongoing conference call%(supportedText)s.": "Menossa oleva ryhmäpuhelu %(supportedText)s.",
     "%(duration)ss": "%(duration)s s",
     "%(duration)sm": "%(duration)s m",
     "%(duration)sh": "%(duration)s h",
@@ -605,18 +504,13 @@
     "%(items)s and %(count)s others|one": "%(items)s ja yksi muu",
     "Old cryptography data detected": "Vanhaa salaustietoa havaittu",
     "Warning": "Varoitus",
-    "Access Token:": "Pääsykoodi:",
     "Fetching third party location failed": "Kolmannen osapuolen paikan haku epäonnistui",
     "Send Account Data": "Lähetä tilin tiedot",
-    "All notifications are currently disabled for all targets.": "Tällä hetkellä kaikki ilmoitukset on kytketty pois kaikilta kohteilta.",
-    "Uploading report": "Ladataan raporttia",
     "Sunday": "Sunnuntai",
     "Failed to add tag %(tagName)s to room": "Tagin %(tagName)s lisääminen huoneeseen epäonnistui",
     "Notification targets": "Ilmoituksen kohteet",
     "Failed to set direct chat tag": "Suoran keskustelun tagin asettaminen epäonnistui",
     "Today": "Tänään",
-    "Files": "Tiedostot",
-    "You are not receiving desktop notifications": "Et vastaanota työpöytäilmoituksia",
     "Friday": "Perjantai",
     "Update": "Päivitä",
     "What's New": "Mitä uutta",
@@ -624,22 +518,12 @@
     "Changelog": "Muutosloki",
     "Waiting for response from server": "Odotetaan vastausta palvelimelta",
     "Send Custom Event": "Lähetä mukautettu tapahtuma",
-    "Advanced notification settings": "Lisäasetukset ilmoituksille",
-    "Forget": "Unohda",
-    "You cannot delete this image. (%(code)s)": "Et voi poistaa tätä kuvaa. (%(code)s)",
-    "Cancel Sending": "Peruuta lähetys",
     "This Room": "Tämä huone",
     "Noisy": "Äänekäs",
     "Room not found": "Huonetta ei löytynyt",
     "Downloading update...": "Ladataan päivitystä...",
     "Messages in one-to-one chats": "Viestit kahdenkeskisissä keskusteluissa",
     "Unavailable": "Ei saatavilla",
-    "Error saving email notification preferences": "Virhe tallennettaessa sähköposti-ilmoitusasetuksia",
-    "View Decrypted Source": "Näytä purettu lähde",
-    "Failed to update keywords": "Avainsanojen päivittäminen epäonnistui",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Seuraaviin avainsanoihin liittyvät ilmoitukset seuraavat sääntöjä joita ei voida näyttää tässä:",
-    "Please set a password!": "Ole hyvä ja aseta salasana!",
-    "You have successfully set a password!": "Olet asettanut salasanan!",
     "Explore Room State": "Huoneen tila",
     "Source URL": "Lähdeosoite",
     "Messages sent by bot": "Bottien lähettämät viestit",
@@ -648,34 +532,21 @@
     "No update available.": "Ei päivityksiä saatavilla.",
     "Resend": "Lähetä uudelleen",
     "Collecting app version information": "Haetaan sovelluksen versiotietoja",
-    "Keywords": "Avainsanat",
-    "Enable notifications for this account": "Ota käyttöön ilmoitukset tälle tilille",
     "Invite to this community": "Kutsu tähän yhteisöön",
-    "Messages containing <span>keywords</span>": "<span>Avainsanoja</span> sisältävät viestit",
     "View Source": "Näytä lähdekoodi",
     "Tuesday": "Tiistai",
-    "Enter keywords separated by a comma:": "Anna avainsanat pilkuin eroteltuna:",
     "Search…": "Haku…",
-    "You have successfully set a password and an email address!": "Olet asettanut salasanan ja sähköpostiosoitteen!",
     "Remove %(name)s from the directory?": "Poista %(name)s luettelosta?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s käyttää monia edistyneitä ominaisuuksia, joista osaa selaimesi ei tue tai ne ovat kokeellisia.",
     "Developer Tools": "Kehittäjätyökalut",
     "Explore Account Data": "Tilitiedot",
-    "All messages (noisy)": "Kaikki viestit (meluisa)",
     "Saturday": "Lauantai",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Muista, että voit aina asettaa sähköpostiosoitteen käyttäjäasetuksissa, jos muutat mielesi.",
-    "Direct Chat": "Suora keskustelu",
     "The server may be unavailable or overloaded": "Palvelin saattaa olla tavoittamattomissa tai ylikuormitettu",
     "Reject": "Hylkää",
-    "Failed to set Direct Message status of room": "Huoneen yksityisviestitilan asettaminen epäonnistui",
     "Monday": "Maanantai",
     "Remove from Directory": "Poista luettelosta",
-    "Enable them now": "Ota käyttöön nyt",
-    "Forward Message": "Edelleenlähetä viesti",
     "Toolbox": "Työkalut",
     "Collecting logs": "Haetaan lokeja",
     "You must specify an event type!": "Sinun on määritettävä tapahtuman tyyppi!",
-    "(HTTP status %(httpStatus)s)": "(HTTP-tila %(httpStatus)s)",
     "All Rooms": "Kaikki huoneet",
     "Quote": "Lainaa",
     "Send logs": "Lähetä lokit",
@@ -685,47 +556,30 @@
     "State Key": "Tila-avain",
     "Failed to send custom event.": "Mukautetun tapahtuman lähettäminen epäonnistui.",
     "What's new?": "Mitä uutta?",
-    "Notify me for anything else": "Ilmoita minulle kaikesta muusta",
     "When I'm invited to a room": "Kun minut kutsutaan huoneeseen",
-    "Can't update user notification settings": "Käyttäjän ilmoitusasetusten päivittäminen epäonnistui",
-    "Notify for all other messages/rooms": "Ilmoita kaikista muista viesteistä/huoneista",
     "Unable to look up room ID from server": "Huone-ID:n haku palvelimelta epäonnistui",
     "Couldn't find a matching Matrix room": "Vastaavaa Matrix-huonetta ei löytynyt",
     "Invite to this room": "Kutsu käyttäjiä",
     "You cannot delete this message. (%(code)s)": "Et voi poistaa tätä viestiä. (%(code)s)",
     "Thursday": "Torstai",
-    "I understand the risks and wish to continue": "Ymmärrän riskit ja haluan jatkaa",
     "Back": "Takaisin",
     "Reply": "Vastaa",
     "Show message in desktop notification": "Näytä viestit ilmoituskeskuksessa",
-    "Unhide Preview": "Näytä esikatselu",
     "Unable to join network": "Verkkoon liittyminen epäonnistui",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Valitettavasti %(brand)s <b>ei</b> toimi selaimessasi.",
-    "Uploaded on %(date)s by %(user)s": "Lähetetty %(date)s käyttäjän %(user)s toimesta",
     "Messages in group chats": "Viestit ryhmissä",
     "Yesterday": "Eilen",
     "Error encountered (%(errorDetail)s).": "Virhe: %(errorDetail)s.",
     "Low Priority": "Matala prioriteetti",
-    "Unable to fetch notification target list": "Ilmoituskohdelistan haku epäonnistui",
-    "Set Password": "Aseta salasana",
-    "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
     "remove %(name)s from the directory.": "poista %(name)s luettelosta.",
     "Off": "Ei päällä",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ei tiedä miten liittyä huoneeseen tässä verkossa",
-    "Mentions only": "Vain maininnat",
     "Failed to remove tag %(tagName)s from room": "Tagin %(tagName)s poistaminen huoneesta epäonnistui",
     "Wednesday": "Keskiviikko",
-    "You can now return to your account after signing out, and sign in on other devices.": "Voit nyt palata tilillesi kirjauduttuasi ulos, sekä kirjautua muilla laitteilla.",
-    "Enable email notifications": "Ota käyttöön sähköposti-ilmoitukset",
     "Event Type": "Tapahtuman tyyppi",
-    "Download this file": "Lataa tiedosto",
-    "Pin Message": "Kiinnitä viesti",
-    "Failed to change settings": "Asetusten muuttaminen epäonnistui",
     "View Community": "Näytä yhteisö",
     "Event sent!": "Tapahtuma lähetetty!",
     "Event Content": "Tapahtuman sisältö",
     "Thank you!": "Kiitos!",
-    "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!": "Nykyisellä selaimellasi ohjelman ulkonäkö voi olla täysin virheellinen, ja jotkut tai kaikki ominaisuudet eivät vättämättä toimi. Voit jatkaa jos haluat kokeilla, mutta et voi odottaa saavasi apua mahdollisesti ilmeneviin ongelmiin!",
     "Checking for an update...": "Tarkistetaan päivityksen saatavuutta...",
     "Your language of choice": "Kielivalintasi",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Yksityisyydensuoja on meille tärkeää, joten emme kerää mitään henkilökohtaista tai yksilöivää tietoa analytiikkaamme varten.",
@@ -733,10 +587,7 @@
     "Send an encrypted message…": "Lähetä salattu viesti…",
     "<a>In reply to</a> <pill>": "<a>Vastauksena käyttäjälle</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Tämä huone ei ole julkinen. Tarvitset kutsun liittyäksesi huoneeseen.",
-    "%(count)s of your messages have not been sent.|one": "Viestiäsi ei lähetetty.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s vaihtoi näyttönimekseen %(displayName)s.",
     "Learn more about how we use analytics.": "Lue lisää analytiikkakäytännöistämme.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Täällä ei ole muita! Haluaisitko <inviteText>kutsua muita</inviteText> tai <nowarnText>poistaa varoituksen tyhjästä huoneesta</nowarnText>?",
     "The version of %(brand)s": "%(brand)sin versio",
     "Your homeserver's URL": "Kotipalvelimesi osoite",
     "e.g. %(exampleValue)s": "esim. %(exampleValue)s",
@@ -832,7 +683,6 @@
     "Headphones": "Kuulokkeet",
     "Folder": "Kansio",
     "Pin": "Nuppineula",
-    "Call in Progress": "Puhelu meneillään",
     "General": "Yleiset",
     "Security & Privacy": "Tietoturva ja yksityisyys",
     "Roles & Permissions": "Roolit ja oikeudet",
@@ -845,15 +695,12 @@
     "Room Addresses": "Huoneen osoitteet",
     "Share room": "Jaa huone",
     "Share Room": "Jaa huone",
-    "Report bugs & give feedback": "Ilmoita ongelmista ja anna palautetta",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jos törmäsit ongelmiin tai haluat antaa palautetta, ota meihin yhteys GitHubin kautta.",
     "Go back": "Takaisin",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Luo yhteisö tuodaksesi yhteen käyttäjät ja huoneet! Luo mukautettu kotisivu rajataksesi paikkasi Matrix-universumissa.",
     "Room avatar": "Huoneen kuva",
     "Main address": "Pääosoite",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Kun joku asettaa osoitteen linkiksi viestiinsä, URL-esikatselu voi näyttää tietoja linkistä kuten otsikon, kuvauksen ja kuvan verkkosivulta.",
     "Link to most recent message": "Linkitä viimeisimpään viestiin",
-    "Always show encryption icons": "Näytä aina salauskuvakkeet",
     "Encryption": "Salaus",
     "Once enabled, encryption cannot be disabled.": "Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä.",
     "Continue With Encryption Disabled": "Jatka salaus poistettuna käytöstä",
@@ -867,7 +714,6 @@
     "Profile picture": "Profiilikuva",
     "Set a new account password...": "Aseta uusi salasana tilille...",
     "Set a new status...": "Aseta uusi tila...",
-    "Not sure of your password? <a>Set a new one</a>": "Etkö ole varma salasanastasi? <a>Aseta uusi salasana</a>",
     "Set a new password": "Aseta uusi salasana",
     "Email addresses": "Sähköpostiosoitteet",
     "Phone numbers": "Puhelinnumerot",
@@ -888,7 +734,6 @@
     "Room list": "Huoneluettelo",
     "Deactivating your account is a permanent action - be careful!": "Tilin deaktivointi on peruuttamaton toimenpide - ole varovainen!",
     "Go to Settings": "Siirry asetuksiin",
-    "Don't ask again": "Älä kysy uudestaan",
     "Retry": "Yritä uudelleen",
     "Success!": "Onnistui!",
     "Starting backup...": "Aloitetaan varmuuskopiointia...",
@@ -903,28 +748,17 @@
     "Join this community": "Liity tähän yhteisöön",
     "Leave this community": "Poistu tästä yhteisöstä",
     "Couldn't load page": "Sivun lataaminen ei onnistunut",
-    "Identity Server URL": "Identiteettipalvelimen osoite",
-    "Homeserver URL": "Kotipalvelimen osoite",
     "Email (optional)": "Sähköposti (valinnainen)",
     "Phone (optional)": "Puhelin (valinnainen)",
-    "Create your account": "Luo oma tili",
-    "The password field must not be blank.": "Salasanakenttä ei voi olla tyhjä.",
-    "The phone number field must not be blank.": "Puhelinnumerokenttä ei voi olla tyhjä.",
-    "The email field must not be blank.": "Sähköpostiosoitekenttä ei voi olla tyhjä.",
-    "Server Name": "Palvelimen nimi",
     "This homeserver would like to make sure you are not a robot.": "Tämä kotipalvelin haluaa varmistaa, ettet ole robotti.",
     "Hide": "Piilota",
     "Set status": "Aseta tila",
     "Update status": "Päivitä tila",
     "Clear status": "Tyhjennä tila",
-    "Share Message": "Jaa viesti",
-    "Not a valid recovery key": "Ei kelvollinen palautusavain",
-    "This looks like a valid recovery key!": "Tämä vaikuttaa kelvolliselta palautusavaimelta!",
     "Next": "Seuraava",
     "No backup found!": "Varmuuskopiota ei löytynyt!",
     "Unable to restore backup": "Varmuuskopion palauttaminen ei onnistu",
     "Link to selected message": "Linkitä valittuun viestiin",
-    "Checking...": "Tarkistetaan...",
     "Refresh": "Päivitä",
     "Send Logs": "Lähetä lokit",
     "Upgrade this room to version %(version)s": "Päivitä tämä huone versioon %(version)s",
@@ -945,8 +779,6 @@
     "Failed to load group members": "Ryhmän jäsenten lataaminen epäonnistui",
     "Click here to see older messages.": "Napsauta tästä nähdäksesi vanhemmat viestit.",
     "This room is a continuation of another conversation.": "Tämä huone on jatkumo toisesta keskustelusta.",
-    "Don't ask me again": "Älä kysy uudelleen",
-    "Not now": "Ei nyt",
     "The conversation continues here.": "Keskustelu jatkuu täällä.",
     "Share Link to User": "Jaa linkki käyttäjään",
     "Muted Users": "Mykistetyt käyttäjät",
@@ -960,7 +792,6 @@
     "Yes": "Kyllä",
     "No": "Ei",
     "Elephant": "Norsu",
-    "Add an email address to configure email notifications": "Lisää sähköpostiosoite määrittääksesi sähköposti-ilmoitukset",
     "Chat with %(brand)s Bot": "Keskustele %(brand)s-botin kanssa",
     "You'll lose access to your encrypted messages": "Menetät pääsyn salattuihin viesteihisi",
     "Create a new room with the same name, description and avatar": "luomme uuden huoneen samalla nimellä, kuvauksella ja kuvalla",
@@ -974,8 +805,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Käytätkö muotoillun tekstin tilaa muotoilueditorissa vai et",
     "The information being sent to us to help make %(brand)s better includes:": "Tietoihin, joita lähetetään %(brand)sin kehittäjille sovelluksen kehittämiseksi sisältyy:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kohdissa, joissa tämä sivu sisältää yksilöivää tietoa, kuten huoneen, käyttäjän tai ryhmän tunnuksen, kyseinen tieto poistetaan ennen palvelimelle lähettämistä.",
-    "A call is currently being placed!": "Puhelua ollaan aloittamassa!",
-    "A call is already in progress!": "Puhelu on jo meneillään!",
     "Permission Required": "Lisäoikeuksia tarvitaan",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Tiedoston '%(fileName)s' koko ylittää tämän kotipalvelimen lähetettyjen tiedostojen ylärajan",
     "Unable to load! Check your network connectivity and try again.": "Lataaminen epäonnistui! Tarkista verkkoyhteytesi ja yritä uudelleen.",
@@ -1022,7 +851,6 @@
     "Show display name changes": "Näytä näyttönimien muutokset",
     "Enable big emoji in chat": "Ota käyttöön suuret emojit keskusteluissa",
     "Enable Community Filter Panel": "Ota käyttöön yhteisön suodatinpaneeli",
-    "Allow Peer-to-Peer for 1:1 calls": "Salli vertaisten väliset yhteydet kahdenkeskisissä puheluissa",
     "Prompt before sending invites to potentially invalid matrix IDs": "Kysy varmistus ennen kutsujen lähettämistä mahdollisesti epäkelpoihin Matrix ID:hin",
     "Messages containing my username": "Viestit, jotka sisältävät käyttäjätunnukseni",
     "Messages containing @room": "Viestit, jotka sisältävät sanan ”@room”",
@@ -1035,8 +863,6 @@
     "Back up your keys before signing out to avoid losing them.": "Varmuuskopioi avaimesi ennen kuin kirjaudut ulos välttääksesi avainten menetyksen.",
     "Backing up %(sessionsRemaining)s keys...": "Varmuuskopioidaan %(sessionsRemaining)s avainta…",
     "All keys backed up": "Kaikki avaimet on varmuuskopioitu",
-    "Backup version: ": "Varmuuskopion versio: ",
-    "Algorithm: ": "Algoritmi: ",
     "Start using Key Backup": "Aloita avainvarmuuskopion käyttö",
     "Unable to verify phone number.": "Puhelinnumeron vahvistaminen epäonnistui.",
     "Verification code": "Varmennuskoodi",
@@ -1045,11 +871,9 @@
     "For help with using %(brand)s, click <a>here</a>.": "Saadaksesi apua %(brand)sin käyttämisessä, klikkaa <a>tästä</a>.",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Saadaksesi apua %(brand)sin käytössä, klikkaa <a>tästä</a> tai aloita keskustelu bottimme kanssa alla olevasta painikkeesta.",
     "Bug reporting": "Virheiden raportointi",
-    "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.": "Jos olet ilmoittanut virheestä Githubin kautta, debug-lokit voivat auttaa meitä ongelman jäljittämisessä. Debug-lokit sisältävät sovelluksen käyttödataa sisältäen käyttäjätunnuksen, vierailemiesi huoneiden tai ryhmien tunnukset tai aliakset ja muiden käyttäjien käyttäjätunnukset. Debug-lokit eivät sisällä viestejä.",
     "Autocomplete delay (ms)": "Automaattisen täydennyksen viive (ms)",
     "Ignored users": "Sivuutetut käyttäjät",
     "Bulk options": "Massatoimintoasetukset",
-    "Key backup": "Avainvarmuuskopio",
     "Missing media permissions, click the button below to request.": "Mediaoikeuksia puuttuu. Klikkaa painikkeesta pyytääksesi oikeuksia.",
     "Request media permissions": "Pyydä mediaoikeuksia",
     "Manually export keys": "Vie avaimet käsin",
@@ -1063,7 +887,6 @@
     "Show a placeholder for removed messages": "Näytä paikanpitäjä poistetuille viesteille",
     "Show avatar changes": "Näytä profiilikuvien muutokset",
     "Show read receipts sent by other users": "Näytä muiden käyttäjien lukukuittaukset",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Näytä muistutus suojatun viestien palautuksen käyttöönotosta salatuissa huoneissa",
     "Show avatars in user and room mentions": "Näytä profiilikuvat käyttäjä- ja huonemaininnoissa",
     "Got It": "Ymmärretty",
     "Scissors": "Sakset",
@@ -1085,9 +908,6 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) näki %(dateTime)s",
     "Replying": "Vastataan",
     "System Alerts": "Järjestelmähälytykset",
-    "Never lose encrypted messages": "Älä hukkaa salattuja viestejäsi",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Tämän huoneen viestit on turvattu osapuolten välisellä salauksella. Vain sinä ja viestien vastaanottaja(t) omaavat avaimet näiden viestien lukemiseen.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Varmuuskopioi avaimesi, jotta et menetä niitä. <a>Lue lisää.</a>",
     "Only room administrators will see this warning": "Vain huoneen ylläpitäjät näkevät tämän varoituksen",
     "Add some now": "Lisää muutamia",
     "Error updating main address": "Pääosoitteen päivityksessä tapahtui virhe",
@@ -1095,9 +915,6 @@
     "Error updating flair": "Tyylin päivittämisessä tapahtui virhe",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Huoneen tyylin päivittämisessä tapahtui virhe. Palvelin ei välttämättä salli sitä tai kyseessä on tilapäinen virhe.",
     "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.": "Salatuissa huoneissa, kuten tässä, osoitteiden esikatselut ovat oletuksena pois käytöstä, jotta kotipalvelimesi (missä osoitteiden esikatselut luodaan) ei voi kerätä tietoa siitä, mitä linkkejä näet tässä huoneessa.",
-    "Failed to remove widget": "Sovelman poisto epäonnistui",
-    "An error ocurred whilst trying to remove the widget from the room": "Poistaessa sovelmaa huoneesta tapahtui virhe",
-    "Minimize apps": "Pienennä sovellukset",
     "Popout widget": "Avaa sovelma omassa ikkunassaan",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Lisää ¯\\_(ツ)_/¯ viestin alkuun",
     "User %(userId)s is already in the room": "Käyttäjä %(userId)s on jo huoneessa",
@@ -1117,7 +934,6 @@
     "Change settings": "Vaihda asetuksia",
     "Kick users": "Poista käyttäjiä",
     "Ban users": "Anna porttikieltoja",
-    "Remove messages": "Poista viestejä",
     "Notify everyone": "Kiinnitä kaikkien huomio",
     "Send %(eventType)s events": "Lähetä %(eventType)s-tapahtumat",
     "Select the roles required to change various parts of the room": "Valitse roolit, jotka vaaditaan huoneen eri osioiden muuttamiseen",
@@ -1127,7 +943,6 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Tapahtuman, johon oli vastattu, lataaminen epäonnistui. Se joko ei ole olemassa tai sinulla ei ole oikeutta katsoa sitä.",
     "The following users may not exist": "Seuraavat käyttäjät eivät välttämättä ole olemassa",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Alla luetelluille Matrix ID:ille ei löytynyt profiileja. Haluaisitko kutsua ne siitä huolimatta?",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug-lokit sisältävät sovelluksen käyttödataa, kuten käyttäjätunnuksesi, vierailemiesi huoneiden ja ryhmien tunnukset tai aliakset, sekä muiden käyttäjien käyttäjätunnukset. Ne eivät sisällä viestejä.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Ennen lokien lähettämistä sinun täytyy <a>luoda Githubiin issue (kysymys/ongelma)</a>, joka sisältää kuvauksen ongelmastasi.",
     "Unable to load commit detail: %(msg)s": "Commitin tietojen hakeminen epäonnistui: %(msg)s",
     "Community IDs cannot be empty.": "Yhteisön tunnukset eivät voi olla tyhjänä.",
@@ -1145,40 +960,20 @@
     "Clear cache and resync": "Tyhjennä välimuisti ja hae tiedot uudelleen",
     "%(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 käyttää nyt 3-5 kertaa vähemmän muistia, koska se lataa tietoa muista käyttäjistä vain tarvittaessa. Odotathan, kun haemme tarvittavat tiedot palvelimelta!",
     "I don't want my encrypted messages": "En halua salattuja viestejäni",
-    "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.": "Välttääksesi saman ongelman ilmoittamista kahdesti, <existingIssuesLink>katso ensin olemassaolevat issuet</existingIssuesLink> (ja lisää +1, mikäli löydät issuen joka koskee sinuakin) tai <newIssueLink>luo uusi issue</newIssueLink> mikäli et löydä ongelmaasi.",
     "Room Settings - %(roomName)s": "Huoneen asetukset — %(roomName)s",
     "Clear Storage and Sign Out": "Tyhjennä varasto ja kirjaudu ulos",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Selaimen varaston tyhjentäminen saattaa korjata ongelman, mutta kirjaa sinut samalla ulos ja estää sinua lukemasta salattuja keskusteluita.",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Käyttäjätunnus voi sisältää vain pieniä kirjaimia, numeroita ja merkkejä ”=_-./”",
-    "COPY": "Kopioi",
     "Unable to load backup status": "Varmuuskopioinnin tilan lataaminen epäonnistui",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s istunnon purkaminen epäonnistui!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainvarmuuskopio käyttöön vain luotetulla tietokoneella.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautuksen salalauseesi.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jos olet unohtanut palautuksen salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>ottaa käyttöön uuden palautustavan</button2>",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautusavaimesi.",
-    "Share Permalink": "Jaa ikilinkki",
-    "Collapse Reply Thread": "Supista vastaussäie",
     "Please review and accept all of the homeserver's policies": "Tarkistathan tämän kotipalvelimen käytännöt",
     "Please review and accept the policies of this homeserver:": "Tarkistathan tämän kotipalvelimen käytännöt:",
     "Code": "Koodi",
-    "Your Modular server": "Modular-palvelimesi",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Syötä Modular-kotipalvelimesi sijainti. Se voi käyttää omaa verkkotunnustasi tai olla <a>modular.im</a>:n aliverkkotunnus.",
-    "The username field must not be blank.": "Käyttäjätunnus ei voi olla tyhjä.",
     "Username": "Käyttäjätunnus",
-    "Sign in to your Matrix account on %(serverName)s": "Kirjaudu sisään Matrix-tilillesi palvelimella %(serverName)s",
     "Change": "Muuta",
-    "Create your Matrix account on %(serverName)s": "Luo Matrix-tili palvelimelle %(serverName)s",
     "Confirm": "Varmista",
-    "Other servers": "Muut palvelimet",
-    "Free": "Ilmainen",
     "Join millions for free on the largest public server": "Liity ilmaiseksi miljoonien joukkoon suurimmalla julkisella palvelimella",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium-ylläpitoa organisaatioille. <a>Lue lisää</a>",
     "Other": "Muut",
-    "Find other public servers or use a custom server": "Etsi muita julkisia palvelimia tai käytä mukautettua palvelinta",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML-kuvaus yhteisösi etusivulle</h1>\n<p>\n    Käytä pitkää kuvausta esitelläksesi yhteisöäsi uusille jäsenille tai jakaaksesi tärkeitä\n    <a href=\"foo\">linkkejä</a>\n</p>\n<p>\n    Voit jopa käyttää 'img'-tageja\n</p>\n",
     "Unable to join community": "Yhteisöön liittyminen epäonnistui",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Olet tämän yhteisön ylläpitäjä. Et voi liittyä uudelleen ilman kutsua toiselta ylläpitäjältä.",
     "Unable to leave community": "Yhteisöstä poistuminen ei onnistu",
@@ -1190,14 +985,10 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Jatkaaksesi kotipalvelimen %(homeserverDomain)s käyttöä, sinun täytyy lukea ja hyväksyä käyttöehtomme.",
     "Review terms and conditions": "Lue käyttöehdot",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Tiesitkö: voit käyttää yhteisöjä suodattaaksesi %(brand)s-kokemustasi!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Asettaaksesi suodattimen, vedä yhteisön kuva vasemmalla olevan suodatinpaneelin päälle. Voit klikata suodatinpaneelissa olevaa yhteisön kuvaa, jotta näet vain huoneet ja henkilöt, jotka liittyvät kyseiseen yhteisöön.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Et voi lähettää viestejä ennen kuin luet ja hyväksyt <consentLink>käyttöehtomme</consentLink>.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Viestiäsi ei lähetetty, koska tämä kotipalvelin on saavuttanut kuukausittaisten aktiivisten käyttäjien rajan. <a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttämistä.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Viestiäsi ei lähetetty, koska tämä kotipalvelin on ylittänyt resurssirajan. <a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttämistä.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Lähetä kaikki uudelleen</resendText> tai <cancelText>peruuta kaikki</cancelText>. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai peruutettavaksi.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Lähetä viesti uudelleen</resendText> tai <cancelText>peruuta viesti</cancelText>.",
     "Could not load user profile": "Käyttäjäprofiilia ei voitu ladata",
-    "Your Matrix account on %(serverName)s": "Matrix-tilisi palvelimella %(serverName)s",
     "General failure": "Yleinen virhe",
     "This homeserver does not support login using email address.": "Tämä kotipalvelin ei tue sähköpostiosoitteella kirjautumista.",
     "Please <a>contact your service administrator</a> to continue using this service.": "<a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttöä.",
@@ -1227,11 +1018,7 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kutsun kumoaminen epäonnistui. Kyseessä saattaa olla väliaikainen ongelma tai sinulla ei ole tarvittavia oikeuksia kutsun kumoamiseen.",
     "Revoke invite": "Kumoa kutsu",
     "Invited by %(sender)s": "Kutsuttu henkilön %(sender)s toimesta",
-    "Maximize apps": "Suurenna sovellukset",
-    "A widget would like to verify your identity": "Sovelma haluaisi vahvistaa identiteettisi",
-    "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.": "Sovelma osoitteessa %(widgetUrl)s haluaisi todentaa henkilöllisyytesi. Jos sallit tämän, sovelma pystyy todentamaan käyttäjätunnuksesi, muttei voi toimia nimissäsi.",
     "Remember my selection for this widget": "Muista valintani tälle sovelmalle",
-    "Deny": "Kiellä",
     "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.": "Tunnistimme dataa, joka on lähtöisin vanhasta %(brand)sin versiosta. Tämä aiheuttaa toimintahäiriöitä päästä päähän -salauksessa vanhassa versiossa. Viestejä, jotka on salattu päästä päähän -salauksella vanhalla versiolla, ei välttämättä voida purkaa tällä versiolla. Tämä voi myös aiheuttaa epäonnistumisia viestien välityksessä tämän version kanssa. Jos kohtaat ongelmia, kirjaudu ulos ja takaisin sisään. Säilyttääksesi viestihistoriasi, vie salausavaimesi ja tuo ne uudelleen.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s epäonnistui protokollalistan hakemisessa kotipalvelimelta. Kotipalvelin saattaa olla liian vanha tukeakseen kolmannen osapuolen verkkoja.",
     "%(brand)s failed to get the public room list.": "%(brand)s ei onnistunut hakemaan julkista huoneluetteloa.",
@@ -1246,11 +1033,8 @@
     "Failed to perform homeserver discovery": "Kotipalvelimen etsinnän suoritus epäonnistui",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tämä kotipalvelin ei tarjoa yhtään kirjautumistapaa, jota tämä asiakasohjelma tukisi.",
     "Set up Secure Message Recovery": "Ota käyttöön salattujen viestien palautus",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Mikäli et ota käyttöön salattujen viestien palautusta, menetät salatun viestihistoriasi, kun kirjaudut ulos.",
-    "If you don't want to set this up now, you can later in Settings.": "Jos et halua ottaa tätä käyttöön nyt, voit tehdä sen myöhemmin asetuksissa.",
     "Set up": "Ota käyttöön",
     "New Recovery Method": "Uusi palautustapa",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Uusi palautuksen salasana ja avain salatuille viesteille on löydetty.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jos et ottanut käyttöön uutta palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.",
     "Set up Secure Messages": "Ota käyttöön salatut viestit",
     "Recovery Method Removed": "Palautustapa poistettu",
@@ -1288,9 +1072,7 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Tätä huonetta ei ole olemassa. Oletko varma, että olet oikeassa paikassa?",
     "This room has already been upgraded.": "Tämä huone on jo päivitetty.",
     "Rotate Left": "Kierrä vasempaan",
-    "Rotate counter-clockwise": "Kierrä vastapäivään",
     "Rotate Right": "Kierrä oikeaan",
-    "Rotate clockwise": "Kierrä myötäpäivään",
     "View Servers in Room": "Näytä huoneessa olevat palvelimet",
     "Sign out and remove encryption keys?": "Kirjaudu ulos ja poista salausavaimet?",
     "Missing session data": "Istunnon dataa puuttuu",
@@ -1313,7 +1095,6 @@
     "Passwords don't match": "Salasanat eivät täsmää",
     "Other users can invite you to rooms using your contact details": "Muut voivat kutsua sinut huoneisiin yhteystietojesi avulla",
     "Enter phone number (required on this homeserver)": "Syötä puhelinnumero (vaaditaan tällä kotipalvelimella)",
-    "Doesn't look like a valid phone number": "Ei näytä kelvolliselta puhelinnumerolta",
     "Enter username": "Syötä käyttäjätunnus",
     "Some characters not allowed": "Osaa merkeistä ei sallita",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Kotipalvelimen osoite ei näytä olevan kelvollinen Matrix-kotipalvelin",
@@ -1329,16 +1110,11 @@
     "No homeserver URL provided": "Kotipalvelimen osoite puuttuu",
     "Unexpected error resolving homeserver configuration": "Odottamaton virhe selvitettäessä kotipalvelimen asetuksia",
     "Edit message": "Muokkaa viestiä",
-    "Sign in to your Matrix account on <underlinedServerName />": "Kirjaudu Matrix-tilillesi palvelimella <underlinedServerName />",
     "Show hidden events in timeline": "Näytä piilotetut tapahtumat aikajanalla",
     "GitHub issue": "GitHub-issue",
     "Notes": "Huomautukset",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Sisällytä tähän lisätiedot, joista voi olla apua ongelman analysoinnissa, kuten mitä olit tekemässä, huoneen tunnukset, käyttäjätunnukset, jne.",
-    "Unable to validate homeserver/identity server": "Kotipalvelinta/identiteettipalvelinta ei voida validoida",
-    "Create your Matrix account on <underlinedServerName />": "Luo Matrix-tili palvelimelle <underlinedServerName />",
     "Add room": "Lisää huone",
-    "Your profile": "Oma profiilisi",
-    "Your Matrix account on <underlinedServerName />": "Matrix-tilisi palvelimella <underlinedServerName />",
     "Cannot reach homeserver": "Kotipalvelinta ei voida tavoittaa",
     "Your %(brand)s is misconfigured": "%(brand)sin asetukset ovat pielessä",
     "Cannot reach identity server": "Identiteettipalvelinta ei voida tavoittaa",
@@ -1348,7 +1124,6 @@
     "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.": "Voit palauttaa salasanasi, mutta osa toiminnoista on pois käytöstä kunnes identiteettipalvelin on jälleen toiminnassa. Jos tämä varoitus toistuu, tarkista asetuksesi tai ota yhteyttä palvelimen ylläpitäjään.",
     "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.": "Voit kirjautua, mutta osa toiminnoista on pois käytöstä kunnes identiteettipalvelin on jälleen toiminnassa. Jos tämä varoitus toistuu, tarkista asetuksesi tai ota yhteyttä palvelimen ylläpitäjään.",
     "Unexpected error resolving identity server configuration": "Odottamaton virhe selvitettäessä identiteettipalvelimen asetuksia",
-    "Low bandwidth mode": "Matalan kaistanleveyden tila",
     "Uploaded sound": "Asetettu ääni",
     "Sounds": "Äänet",
     "Notification sound": "Ilmoitusääni",
@@ -1370,16 +1145,13 @@
     "Upload all": "Lähetä kaikki palvelimelle",
     "Upload": "Lähetä",
     "Changes your avatar in all rooms": "Vaihtaa kuvasi kaikissa huoneissa",
-    "%(senderName)s made no change.": "%(senderName)s ei tehnyt muutoksia.",
     "Show all": "Näytä kaikki",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s eivät tehneet muutoksia %(count)s kertaa",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s eivät tehneet muutoksia",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s ei tehnyt muutoksia %(count)s kertaa",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s ei tehnyt muutoksia",
     "Your homeserver doesn't seem to support this feature.": "Kotipalvelimesi ei näytä tukevan tätä ominaisuutta.",
-    "Resend edit": "Lähetä muokkaus uudelleen",
     "Resend %(unsentCount)s reaction(s)": "Lähetä %(unsentCount)s reaktio(ta) uudelleen",
-    "Resend removal": "Lähetä poistaminen uudelleen",
     "You're signed out": "Sinut on kirjattu ulos",
     "Clear all data": "Poista kaikki tiedot",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Kerro mikä meni pieleen, tai, mikä parempaa, luo GitHub-issue joka kuvailee ongelman.",
@@ -1391,7 +1163,6 @@
     "Sign in and regain access to your account.": "Kirjaudu ja pääse takaisin tilillesi.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Et voi kirjautua tilillesi. Ota yhteyttä kotipalvelimesi ylläpitäjään saadaksesi lisätietoja.",
     "Clear personal data": "Poista henkilökohtaiset tiedot",
-    "Identity Server": "Identiteettipalvelin",
     "Find others by phone or email": "Löydä muita käyttäjiä puhelimen tai sähköpostin perusteella",
     "Be found by phone or email": "Varmista, että sinut löydetään puhelimen tai sähköpostin perusteella",
     "Use bots, bridges, widgets and sticker packs": "Käytä botteja, siltoja, sovelmia ja tarrapaketteja",
@@ -1406,14 +1177,9 @@
     "Unable to share email address": "Sähköpostiosoitetta ei voi jakaa",
     "Share": "Jaa",
     "Unable to share phone number": "Puhelinnumeroa ei voi jakaa",
-    "No identity server is configured: add one in server settings to reset your password.": "Identiteettipalvelinta ei ole määritetty: lisää se palvelinasetuksissa, jotta voi palauttaa salasanasi.",
-    "Identity Server URL must be HTTPS": "Identiteettipalvelimen URL-osoitteen täytyy olla HTTPS-alkuinen",
-    "Not a valid Identity Server (status code %(code)s)": "Ei kelvollinen identiteettipalvelin (tilakoodi %(code)s)",
-    "Could not connect to Identity Server": "Identiteettipalvelimeen ei saatu yhteyttä",
     "Checking server": "Tarkistetaan palvelinta",
     "Disconnect from the identity server <idserver />?": "Katkaise yhteys identiteettipalvelimeen <idserver />?",
     "Disconnect": "Katkaise yhteys",
-    "Identity Server (%(server)s)": "Identiteettipalvelin (%(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.": "Käytät palvelinta <server></server> tuntemiesi henkilöiden löytämiseen ja löydetyksi tulemiseen. Voit vaihtaa identiteettipalvelintasi alla.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Et käytä tällä hetkellä identiteettipalvelinta. Lisää identiteettipalvelin alle löytääksesi tuntemiasi henkilöitä ja tullaksesi löydetyksi.",
     "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.": "Yhteyden katkaiseminen identiteettipalvelimeesi tarkoittaa, että muut käyttäjät eivät löydä sinua etkä voi kutsua muita sähköpostin tai puhelinnumeron perusteella.",
@@ -1443,11 +1209,6 @@
     "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.": "Identiteettipalvelimen käyttäminen on valinnaista. Jos päätät olla käyttämättä identiteettipalvelinta, muut käyttäjät eivät löydä sinua etkä voi kutsua muita sähköpostin tai puhelinnumeron perusteella.",
     "Do not use an identity server": "Älä käytä identiteettipalvelinta",
     "This invite to %(roomName)s was sent to %(email)s": "Tämä kutsu huoneeseen %(roomName)s lähetettiin sähköpostiosoitteeseen %(email)s",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Aseta sähköpostiosoite tilin palauttamista varten. Sähköpostiosoitetta tai puhelinnumeroa voi valinnaisesti käyttää siihen, että tuntemasi ihmiset voivat löytää sinut.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Aseta sähköpostiosoite tilin palauttamista varten. Sähköpostiosoitetta voi valinnaisesti käyttää siihen, että tuntemasi ihmiset voivat löytää sinut.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Syötä mukautettu kotipalvelimen URL-osoite <a>Mitä tämä tarkoittaa?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Syötä mukautettu identiteettipalvelimen URL-osoite <a>Mitä tämä tarkoittaa?</a>",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Lähetä lukukuittaukset viesteistä (käytöstä poistaminen vaatii yhteensopivan kotipalvelimen)",
     "Change identity server": "Vaihda identiteettipalvelinta",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Katkaise yhteys identiteettipalvelimeen <current /> ja yhdistä sen sijaan identiteettipalvelimeen <new />?",
     "Disconnect identity server": "Katkaise yhteys identiteettipalvelimeen",
@@ -1468,7 +1229,6 @@
     "Code block": "Ohjelmakoodia",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Kutsu huoneeseen %(roomName)s lähetettiin osoitteeseen %(email)s, joka ei ole yhteydessä tiliisi",
     "Filter": "Haku",
-    "Filter rooms…": "Suodata huoneita…",
     "Changes the avatar of the current room": "Vaihtaa nykyisen huoneen kuvan",
     "Error changing power level requirement": "Virhe muutettaessa oikeustasovaatimusta",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Huoneen oikeustasovaatimuksia muutettaessa tapahtui virhe. Varmista, että sinulla on riittävät oikeudet ja yritä uudelleen.",
@@ -1483,7 +1243,6 @@
     "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.": "Tämän viestin ilmoittaminen lähettää sen yksilöllisen tapahtumatunnuksen (event ID) kotipalvelimesi ylläpitäjälle. Jos tämän huoneen viestit on salattu, kotipalvelimesi ylläpitäjä ei voi lukea viestin tekstiä tai nähdä tiedostoja tai kuvia.",
     "Send report": "Lähetä ilmoitus",
     "Report Content": "Ilmoita sisällöstä",
-    "Explore": "Selaa",
     "Preview": "Esikatsele",
     "View": "Näytä",
     "Find a room…": "Etsi huonetta…",
@@ -1498,17 +1257,13 @@
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Linkitä tämä sähköposti tilisi kanssa asetuksissa, jotta voit saada kutsuja suoraan %(brand)sissa.",
     "e.g. my-room": "esim. oma-huone",
     "Please enter a name for the room": "Syötä huoneelle nimi",
-    "This room is private, and can only be joined by invitation.": "Tämä huone on yksityinen ja siihen voi liittyä vain kutsulla.",
     "Create a public room": "Luo julkinen huone",
     "Create a private room": "Luo yksityinen huone",
     "Topic (optional)": "Aihe (valinnainen)",
-    "Make this room public": "Tee tästä huoneesta julkinen",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Estä muiden Matrix-kotipalvelimien käyttäjiä liittymästä tähän huoneeseen (Tätä valintaa ei voi muuttaa jälkikäteen!)",
     "Show previews/thumbnails for images": "Näytä kuvien esikatselut/pienoiskuvat",
     "Clear cache and reload": "Tyhjennä välimuisti ja lataa uudelleen",
     "%(count)s unread messages including mentions.|other": "%(count)s lukematonta viestiä, sisältäen maininnat.",
     "%(count)s unread messages.|other": "%(count)s lukematonta viestiä.",
-    "Unread mentions.": "Lukemattomat maininnat.",
     "Show image": "Näytä kuva",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Luo uusi issue</newIssueLink> GitHubissa, jotta voimme tutkia tätä ongelmaa.",
     "Close dialog": "Sulje dialogi",
@@ -1523,7 +1278,6 @@
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Olet poistamassa yhtä käyttäjän %(user)s kirjoittamaa viestiä. Tätä toimintoa ei voi kumota. Haluatko jatkaa?",
     "Remove %(count)s messages|one": "Poista yksi viesti",
     "Room %(name)s": "Huone %(name)s",
-    "Recent rooms": "Viimeaikaiset huoneet",
     "React": "Reagoi",
     "Frequently Used": "Usein käytetyt",
     "Smileys & People": "Hymiöt ja ihmiset",
@@ -1539,14 +1293,12 @@
     "%(creator)s created and configured the room.": "%(creator)s loi ja määritti huoneen.",
     "Jump to first unread room.": "Siirry ensimmäiseen lukemattomaan huoneeseen.",
     "Jump to first invite.": "Siirry ensimmäiseen kutsuun.",
-    "DuckDuckGo Results": "DuckDuckGo-tulokset",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Tekstiviesti on lähetetty numeroon +%(msisdn)s. Syötä siinä oleva varmistuskoodi.",
     "Failed to deactivate user": "Käyttäjän poistaminen epäonnistui",
     "Hide advanced": "Piilota edistyneet",
     "Show advanced": "Näytä edistyneet",
     "Document": "Asiakirja",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Captchan julkinen avain puuttuu kotipalvelimen asetuksista. Ilmoita tämä kotipalvelimesi ylläpitäjälle.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Identiteettipalvelinta ei ole määritetty, joten et voi lisätä sähköpostiosoitetta palauttaaksesi salasanasi vastaisuudessa.",
     "Command Autocomplete": "Komentojen automaattinen täydennys",
     "Community Autocomplete": "Yhteisöjen automaattinen täydennys",
     "Emoji Autocomplete": "Emojien automaattinen täydennys",
@@ -1573,8 +1325,6 @@
     "Unsubscribe": "Lopeta tilaus",
     "View rules": "Näytä säännöt",
     "Subscribe": "Tilaa",
-    "Direct message": "Yksityisviesti",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> huoneessa %(roomName)s",
     "Security": "Tietoturva",
     "Any of the following data may be shared:": "Seuraavat tiedot saatetaan jakaa:",
     "Your display name": "Näyttönimesi",
@@ -1590,17 +1340,13 @@
     "Trust": "Luota",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Voit käyttää identiteettipalvelinta lähettääksesi sähköpostikutsuja. Klikkaa Jatka käyttääksesi oletuspalvelinta (%(defaultIdentityServerName)s) tai syötä eri palvelin asetuksissa.",
     "Use an identity server to invite by email. Manage in Settings.": "Voit käyttää identiteettipalvelinta sähköpostikutsujen lähettämiseen.",
-    "Multiple integration managers": "Useita integraatiolähteitä",
     "Try out new ways to ignore people (experimental)": "Kokeile uusia tapoja käyttäjien sivuuttamiseen (kokeellinen)",
     "Match system theme": "Käytä järjestelmän teemaa",
     "Decline (%(counter)s)": "Hylkää (%(counter)s)",
     "Connecting to integration manager...": "Yhdistetään integraatioiden lähteeseen...",
     "Cannot connect to integration manager": "Integraatioiden lähteeseen yhdistäminen epäonnistui",
     "The integration manager is offline or it cannot reach your homeserver.": "Integraatioiden lähde on poissa verkosta, tai siihen ei voida yhdistää kotipalvelimeltasi.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Käytä integraatioiden lähdettä <b>(%(serverName)s)</b> bottien, sovelmien ja tarrapakettien hallintaan.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Käytä integraatioiden lähdettä bottien, sovelmien ja tarrapakettien hallintaan.",
     "Manage integrations": "Hallitse integraatioita",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integraatioiden lähteet vastaanottavat asetusdataa ja voivat muokata sovelmia, lähettää kutsuja huoneeseen ja asettaa oikeustasoja puolestasi.",
     "Discovery": "Käyttäjien etsintä",
     "Ignored/Blocked": "Sivuutettu/estetty",
     "Error adding ignored user/server": "Virhe sivuutetun käyttäjän/palvelimen lisäämisessä",
@@ -1621,7 +1367,6 @@
     "Subscribed lists": "Tilatut listat",
     "Subscribing to a ban list will cause you to join it!": "Estolistan käyttäminen saa sinut liittymään listalle!",
     "If this isn't what you want, please use a different tool to ignore users.": "Jos et halua tätä, käytä eri työkalua käyttäjien sivuuttamiseen.",
-    "Integration Manager": "Integraatioiden lähde",
     "Read Marker lifetime (ms)": "Viestin luetuksi merkkaamisen kesto (ms)",
     "Click the link in the email you received to verify and then click continue again.": "Klikkaa lähettämässämme sähköpostissa olevaa linkkiä vahvistaaksesi tunnuksesi. Klikkaa sen jälkeen tällä sivulla olevaa painiketta ”Jatka”.",
     "Complete": "Valmis",
@@ -1646,7 +1391,6 @@
     "%(name)s cancelled": "%(name)s peruutti",
     "%(name)s wants to verify": "%(name)s haluaa varmentaa",
     "You sent a verification request": "Lähetit varmennuspyynnön",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Tämän sovelman käyttäminen saattaa jakaa tietoa <helpIcon /> osoitteille %(widgetDomain)s ja käyttämällesi integraatioiden lähteelle.",
     "Widgets do not use message encryption.": "Sovelmat eivät käytä viestien salausta.",
     "More options": "Lisää asetuksia",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Käytä identiteettipalvelinta kutsuaksesi henkilöitä sähköpostilla. <default>Käytä oletusta (%(defaultIdentityServerName)s)</default> tai aseta toinen palvelin <settings>asetuksissa</settings>.",
@@ -1654,11 +1398,7 @@
     "Integrations are disabled": "Integraatiot ovat pois käytöstä",
     "Enable 'Manage Integrations' in Settings to do this.": "Ota integraatiot käyttöön asetuksista kohdasta ”Hallitse integraatioita”.",
     "Integrations not allowed": "Integraatioiden käyttö on kielletty",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s-instanssisi ei salli sinun käyttävän integraatioiden lähdettä tämän tekemiseen. Ota yhteys ylläpitäjääsi.",
-    "Reload": "Lataa uudelleen",
-    "Take picture": "Ota kuva",
     "Remove for everyone": "Poista kaikilta",
-    "Remove for me": "Poista minulta",
     "Verification Request": "Varmennuspyyntö",
     "Failed to get autodiscovery configuration from server": "Automaattisen etsinnän asetusten hakeminen palvelimelta epäonnistui",
     "Invalid base_url for m.homeserver": "Epäkelpo base_url palvelimelle m.homeserver",
@@ -1668,7 +1408,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s soitti videopuhelun.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s soitti videopuhelun (selaimesi ei tue videopuheluita)",
     "Clear notifications": "Tyhjennä ilmoitukset",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Muokkaa kokemustasi kokeellisilla laboratio-ominaisuuksia. <a>Tutki vaihtoehtoja</a>.",
     "Error upgrading room": "Virhe päivitettäessä huonetta",
     "Double check that your server supports the room version chosen and try again.": "Tarkista, että palvelimesi tukee valittua huoneversiota ja yritä uudelleen.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s poisti porttikiellon käyttäjiltä, jotka täsmäsivät sääntöön %(glob)s",
@@ -1688,10 +1427,6 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti huoneita säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti palvelimia säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti estosääntöä muodosta %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
-    "The message you are trying to send is too large.": "Lähettämäsi viesti on liian suuri.",
-    "Cross-signing and secret storage are enabled.": "Ristivarmennus ja salavarasto on käytössä.",
-    "Cross-signing and secret storage are not yet set up.": "Ristivarmennusta ja salavarastoa ei ole vielä otettu käyttöön.",
-    "Bootstrap cross-signing and secret storage": "Ota käyttöön ristivarmennus ja salavarasto",
     "Cross-signing public keys:": "Ristiinvarmennuksen julkiset avaimet:",
     "not found": "ei löydetty",
     "Cross-signing private keys:": "Ristiinvarmennuksen salaiset avaimet:",
@@ -1703,7 +1438,6 @@
     "Backup has a <validity>valid</validity> signature from this user": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus tältä käyttäjältä",
     "Backup has a <validity>invalid</validity> signature from this user": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus tältä käyttäjältä",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Varmuuskopiossa on <verify>tuntematon</verify> allekirjoitus käyttäjältä, jonka ID on %(deviceId)s",
-    "Backup key stored: ": "Vara-avain on tallennettu: ",
     "This message cannot be decrypted": "Tätä viestiä ei voida avata luettavaksi",
     "Unencrypted": "Suojaamaton",
     "Close preview": "Sulje esikatselu",
@@ -1713,9 +1447,7 @@
     "%(count)s verified sessions|other": "%(count)s varmennettua istuntoa",
     "%(count)s verified sessions|one": "1 varmennettu istunto",
     "Reactions": "Reaktiot",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagoi: %(content)s</reactedWith>",
     "Language Dropdown": "Kielipudotusvalikko",
-    "Automatically invite users": "Kutsu käyttäjät automaattisesti",
     "Upgrade private room": "Päivitä yksityinen huone",
     "Upgrade public room": "Päivitä julkinen huone",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Huoneen päivittäminen on monimutkainen toimenpide ja yleensä sitä suositellaan, kun huone on epävakaa bugien, puuttuvien ominaisuuksien tai tietoturvaongelmien takia.",
@@ -1723,14 +1455,9 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Olat päivittämässä tätä huonetta versiosta <oldVersion/> versioon <newVersion/>.",
     "Upgrade": "Päivitä",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainten varmuuskopiointi käyttöön vain luotetulla tietokoneella.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>",
     "Notification settings": "Ilmoitusasetukset",
-    "Help": "Ohje",
     "User Status": "Käyttäjän tila",
     "Country Dropdown": "Maapudotusvalikko",
-    "Set up with a recovery key": "Ota käyttöön palautusavaimella",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Palautusavaimesi on <b>kopioitu leikepöydällesi</b>. Liitä se:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Palautusavaimesi on <b>Lataukset</b>-kansiossasi.",
     "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui",
     "Show more": "Näytä lisää",
     "Recent Conversations": "Viimeaikaiset keskustelut",
@@ -1786,7 +1513,6 @@
     "Clear all data in this session?": "Poista kaikki tämän istunnon tiedot?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Kaikkien tämän istunnon tietojen poistaminen on pysyvää. Salatut viestit menetetään, ellei niiden avaimia ole varmuuskopioitu.",
     "Session name": "Istunnon nimi",
-    "New session": "Uusi istunto",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Raportoidaksesi Matrixiin liittyvän tietoturvaongelman, lue Matrix.orgin <a>tietoturvaongelmien julkaisukäytäntö</a>.",
     "Message search": "Viestihaku",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Tämä huone siltaa viestejä seuraaville alustoille. <a>Lue lisää.</a>",
@@ -1802,21 +1528,13 @@
     "The encryption used by this room isn't supported.": "Tämän huoneen käyttämää salausta ei tueta.",
     "You declined": "Kieltäydyit",
     "%(name)s declined": "%(name)s kieltäytyi",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Seuraavien käyttäjien kutsuminen keskusteluun epäonnistui: %(csvUsers)s",
     "Something went wrong trying to invite the users.": "Käyttäjien kutsumisessa meni jotain pieleen.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Emme voineet kutsua kyseisiä käyttäjiä. Tarkista käyttäjät, jotka haluat kutsua ja yritä uudelleen.",
     "Suggestions": "Ehdotukset",
-    "Your account is not secure": "Tilisi ei ole turvallinen",
-    "Your password": "Salasanasi",
-    "Incorrect recovery passphrase": "Virheellinen palautussalasana",
-    "Enter recovery passphrase": "Syötä palautuksen salalause",
-    "Enter recovery key": "Syötä palautusavain",
     "Confirm your identity by entering your account password below.": "Vahvista henkilöllisyytesi syöttämällä tilisi salasana alle.",
     "Enter your account password to confirm the upgrade:": "Syötä tilisi salasana vahvistaaksesi päivityksen:",
     "Restore": "Palauta",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Säilytä sitä turvallisessa paikassa, kuten salasanojen hallintaohjelmassa tai jopa kassakaapissa.",
-    "Your recovery key": "Palautusavaimesi",
-    "Make a copy of your recovery key": "Tee kopio palautusavaimestasi",
     "Not currently indexing messages for any room.": "Minkään huoneen viestejä ei tällä hetkellä indeksoida.",
     "Space used:": "Käytetty tila:",
     "Indexed messages:": "Indeksoidut viestit:",
@@ -1824,7 +1542,6 @@
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
     "Your user agent": "Käyttäjäagenttisi",
     "Verify this session": "Vahvista tämä istunto",
-    "Set up encryption": "Ota salaus käyttöön",
     "Sign In or Create Account": "Kirjaudu sisään tai luo tili",
     "Use your account or create a new one to continue.": "Käytä tiliäsi tai luo uusi jatkaaksesi.",
     "Create Account": "Luo tili",
@@ -1842,8 +1559,6 @@
     "Never send encrypted messages to unverified sessions from this session": "Älä koskaan lähetä salattuja viestejä vahvistamattomiin istuntoihin tästä istunnosta",
     "Never send encrypted messages to unverified sessions in this room from this session": "Älä lähetä salattuja viestejä vahvistamattomiin istuntoihin tässä huoneessa tässä istunnossa",
     "Order rooms by name": "Suodata huoneet nimellä",
-    "If you cancel now, you won't complete verifying the other user.": "Jo peruutat nyt, toista käyttäjää ei varmenneta.",
-    "If you cancel now, you won't complete verifying your other session.": "Jos peruutat nyt, toista istuntoasi ei varmenneta.",
     "Setting up keys": "Otetaan avaimet käyttöön",
     "Verifies a user, session, and pubkey tuple": "Varmentaa käyttäjän, istunnon ja julkiset avaimet",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROITUS: AVAIMEN VARMENTAMINEN EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s istunnon allekirjoitusavain on ”%(fprint)s”, mikä ei täsmää annettuun avaimeen ”%(fingerprint)s”. Tämä voi tarkoittaa, että viestintäänne siepataan!",
@@ -1871,13 +1586,10 @@
     "Cancelling…": "Peruutetaan…",
     "They match": "Ne täsmäävät",
     "They don't match": "Ne eivät täsmää",
-    "Verify yourself & others to keep your chats safe": "Varmenna itsesi ja muut pitääksesi keskustelunne suojassa",
     "Other users may not trust it": "Muut eivät välttämättä luota siihen",
     "Review": "Katselmoi",
     "This bridge was provisioned by <user />.": "Tämän sillan tarjoaa käyttäjä <user />.",
     "This bridge is managed by <user />.": "Tätä siltaa hallinnoi käyttäjä <user />.",
-    "Workspace: %(networkName)s": "Työtila: %(networkName)s",
-    "Channel: %(channelName)s": "Kanava: %(channelName)s",
     "Delete %(count)s sessions|other": "Poista %(count)s istuntoa",
     "Enable": "Ota käyttöön",
     "Backup is not signed by any of your sessions": "Mikään istuntosi ei ole allekirjoittanut varmuuskopiota",
@@ -1902,8 +1614,6 @@
     "Add a new server": "Lisää uusi palvelin",
     "Server name": "Palvelimen nimi",
     "Add a new server...": "Lisää uusi palvelin...",
-    "If you didn’t sign in to this session, your account may be compromised.": "Jos et kirjautunut tähän istuntoon, käyttäjätilisi saattaa olla vaarantunut.",
-    "This wasn't me": "Tämä en ollut minä",
     "Disable": "Poista käytöstä",
     "Calls": "Puhelut",
     "Room List": "Huoneluettelo",
@@ -1933,7 +1643,6 @@
     "Confirm adding email": "Vahvista sähköpostin lisääminen",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Vahvista tämän puhelinnumeron lisääminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
     "Confirm adding phone number": "Vahvista puhelinnumeron lisääminen",
-    "From %(deviceName)s (%(deviceId)s)": "Laitteelta %(deviceName)s (%(deviceId)s)",
     "cached locally": "paikallisessa välimuistissa",
     "not found locally": "ei paikallisessa välimuistissa",
     "exists": "on olemassa",
@@ -1944,13 +1653,11 @@
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code> näyttää luettelon käytettävissä olevista komennoista. Oliko tarkoituksesi lähettää se viestinä?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vinkki: <code>//</code> aloittaa viestin kauttaviivalla.",
     "Published Addresses": "Julkaistut osoitteet",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Kuka tahansa millä tahansa palvelimella voi käyttää julkaistuja osoitteita liittyäksesi huoneeseesi. Osoitteen julkaisemiseksi se on ensin asetettava paikalliseksi osoitteeksi.",
     "Other published addresses:": "Muut julkaistut osoitteet:",
     "No other published addresses yet, add one below": "Toistaiseksi ei muita julkaistuja osoitteita, lisää alle",
     "New published address (e.g. #alias:server)": "Uusi julkaistu osoite (esim. #alias:palvelin)",
     "Ask %(displayName)s to scan your code:": "Pyydä käyttäjää %(displayName)s lukemaan koodisi:",
     "Matrix rooms": "Matrix-huoneet",
-    "The internet connection either session is using": "Jomman kumman istunnon käyttämä internet-yhteys",
     "Sign in with SSO": "Kirjaudu kertakirjautumista käyttäen",
     "Welcome to %(appName)s": "Tervetuloa %(appName)s-sovellukseen",
     "Liberate your communication": "Vapauta viestintäsi",
@@ -1977,8 +1684,6 @@
     "If you've joined lots of rooms, this might take a while": "Jos olet liittynyt moniin huoneisiin, tässä voi kestää hetken",
     "Click the button below to confirm adding this email address.": "Klikkaa alapuolella olevaa painiketta lisätäksesi tämän sähköpostiosoitteen.",
     "Click the button below to confirm adding this phone number.": "Klikkaa alapuolella olevaa painiketta lisätäksesi tämän puhelinnumeron.",
-    "If you cancel now, you won't complete your operation.": "Jos peruutat, toimintoa ei suoriteta loppuun.",
-    "Review where you’re logged in": "Tarkasta missä olet sisäänkirjautuneena",
     "New login. Was this you?": "Uusi sisäänkirjautuminen. Olitko se sinä?",
     "%(name)s is requesting verification": "%(name)s pyytää varmennusta",
     "Sends a message as html, without interpreting it as markdown": "Lähettää viestin HTML-muodossa, tulkitsematta sitä markdownina",
@@ -1989,7 +1694,6 @@
     "Click the button below to confirm deleting these sessions.|one": "Napsauta alla olevaa painiketta vahvistaaksesi tämän istunnon poistamisen.",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Varmuuskopiossa on allekirjoitus <verify>tuntemattomasta</verify> istunnosta tunnuksella %(deviceId)s",
     "Error downloading theme information.": "Virhe ladattaessa teematietoa.",
-    "Waiting for you to accept on your other session…": "Odotetaan, että hyväksyt toisen istunnon…",
     "Almost there! Is your other session showing the same shield?": "Melkein valmista! Näyttääkö toinen istuntosi saman kilven?",
     "Almost there! Is %(displayName)s showing the same shield?": "Melkein valmista! Näyttääkö %(displayName)s saman kilven?",
     "Message deleted": "Viesti poistettu",
@@ -1997,14 +1701,11 @@
     "QR Code": "QR-koodi",
     "To continue, use Single Sign On to prove your identity.": "Todista henkilöllisyytesi kertakirjautumisen avulla jatkaaksesi.",
     "If they don't match, the security of your communication may be compromised.": "Jos ne eivät täsmää, viestinnän turvallisuus saattaa olla vaarantunut.",
-    "This session, or the other session": "Tämä tai toinen istunto",
-    "We recommend you change your password and recovery key in Settings immediately": "Suosittelemme, että vaihdat salasanasi ja palautusavaimesi asetuksissa välittömästi",
     "Restoring keys from backup": "Palautetaan avaimia varmuuskopiosta",
     "Fetching keys from server...": "Noudetaan avaimia palvelimelta...",
     "%(completed)s of %(total)s keys restored": "%(completed)s / %(total)s avainta palautettu",
     "Keys restored": "Avaimet palautettu",
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s avaimen palautus onnistui",
-    "This requires the latest %(brand)s on your other devices:": "Tämä vaatii uusimman %(brand)sin muilla laitteillasi:",
     "Currently indexing: %(currentRoom)s": "Indeksoidaan huonetta: %(currentRoom)s",
     "Jump to oldest unread message": "Siirry vanhimpaan lukemattomaan viestiin",
     "Opens chat with the given user": "Avaa keskustelun annetun käyttäjän kanssa",
@@ -2016,12 +1717,9 @@
     "Verify this session by confirming the following number appears on its screen.": "Varmenna tämä istunto varmistamalla, että seuraava numero ilmestyy sen näytölle.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Odotetaan toista istuntoasi, %(deviceName)s (%(deviceId)s), varmennukseen…",
     "Waiting for your other session to verify…": "odotetaan toista istuntoasi varmennukseen…",
-    "Verify all your sessions to ensure your account & messages are safe": "Varmenna kaikki istuntosi varmistaaksesi, että käyttäjätilisi ja viestisi ovat turvassa",
-    "Verify the new login accessing your account: %(name)s": "Varmenna uusi kirjautuminen tilillesi: %(name)s",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Tällä hetkellä salasanan vaihtaminen nollaa kaikki päästä päähän -salauksen avaimet kaikissa istunnoissa, tehden salatusta keskusteluhistoriasta lukukelvotonta, ellet ensin vie kaikkia huoneavaimiasi ja tuo niitä salasanan vaihtamisen jäkeen takaisin. Tulevaisuudessa tämä tulee toimimaan paremmin.",
     "Your homeserver does not support cross-signing.": "Kotipalvelimesi ei tue ristiinvarmennusta.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Tililläsi on ristiinvarmennuksen identiteetti salaisessa tallennustilassa, mutta tämä istunto ei vielä luota siihen.",
-    "Reset cross-signing and secret storage": "Nollaa ristivarmennus ja salavarasto",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Varmenna jokainen istunto erikseen, äläkä luota ristiinvarmennettuihin laitteisiin.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa.",
     "%(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)sissa ei ole joitain komponentteja, joita tarvitaan viestien turvalliseen välimuistitallennukseen. Jos haluat kokeilla tätä ominaisuutta, käännä mukautettu %(brand)s Desktop, jossa on mukana <nativeLink>hakukomponentit</nativeLink>.",
@@ -2053,7 +1751,6 @@
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Jos muissa laitteissasi ei ole avainta tämän viestin purkamiseen, niillä istunnoilla ei voi lukea tätä viestiä.",
     "Encrypted by an unverified session": "Salattu varmentamattoman istunnon toimesta",
     "Encrypted by a deleted session": "Salattu poistetun istunnon toimesta",
-    "Create room": "Luo huone",
     "Reject & Ignore user": "Hylkää ja sivuuta käyttäjä",
     "Start Verification": "Aloita varmennus",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Viestisi ovat turvattu, ja vain sinulla ja vastaanottajalla on avaimet viestien lukemiseen.",
@@ -2090,7 +1787,6 @@
     "%(displayName)s cancelled verification.": "%(displayName)s peruutti varmennuksen.",
     "You cancelled verification.": "Peruutit varmennuksen.",
     "Verification cancelled": "Varmennus peruutettu",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Tämän huoneen viestit ovat salattuja osapuolten välisellä salauksella. Lue lisää ja varmenna tämä käyttäjä hänen profiilistaan.",
     "Enter the name of a new server you want to explore.": "Syötä sen uuden palvelimen nimi, jota hauat tutkia.",
     "%(networkName)s rooms": "Verkon %(networkName)s huoneet",
     "Destroy cross-signing keys?": "Tuhoa ristiinvarmennuksen avaimet?",
@@ -2104,11 +1800,8 @@
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Tämän laitteen varmentaminen merkkaa sen luotetuksi, ja sinut varmentaneet käyttäjät luottavat automaattisesti tähän laitteeseen.",
     "Confirm to continue": "Haluan jatkaa",
     "Click the button below to confirm your identity.": "Paina alapuolella olevaa painiketta varmistaaksesi identiteettisi.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Emme onnistuneet luomaan yksityisviestiä. Tarkista, että kutsumasi henkilöt haluavat kutsusi ja yritä uudelleen.",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Seuraavat käyttäjät eivät välttämättä ole olemassa tai ne ovat epäkelpoja, joten niitä ei voida kutsua: %(csvNames)s",
     "Recently Direct Messaged": "Viimeaikaiset yksityisviestit",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Aloita keskustelu jonkun kanssa käyttäen hänen nimeä, käyttäjätunnus (kuten <userId/>) tai sähköpostiosoitetta.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Kutsu tähän huoneeseen käyttäen nimeä, käyttäjätunnusta (kuten <userId/>), sähköpostiosoitetta tai <a>jaa tämä huone</a>.",
     "%(brand)s encountered an error during upload of:": "%(brand)s kohtasi virheen lähettäessään:",
     "Upload completed": "Lähetys valmis",
     "Cancelled signature upload": "Allekirjoituksen lähetys peruutettu",
@@ -2120,16 +1813,10 @@
     "Unrecognised room address:": "Tunnistamaton huoneen osoite:",
     "Help us improve %(brand)s": "Auta parantamaan %(brand)sia",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Lähetä <UsageDataLink>anonyymiä käyttötietoa</UsageDataLink>, joka auttaa %(brand)sin kehittämisessä. Toiminto käyttää <PolicyLink>evästettä</PolicyLink>.",
-    "I want to help": "Haluan auttaa",
     "Your homeserver has exceeded its user limit.": "Kotipalvelimesi on ylittänyt käyttäjärajansa.",
     "Your homeserver has exceeded one of its resource limits.": "Kotipalvelimesi on ylittänyt jonkin resurssirajansa.",
     "Contact your <a>server admin</a>.": "Ota yhteyttä <a>palvelimesi ylläpitäjään</a>.",
     "Ok": "OK",
-    "Set password": "Aseta salasana",
-    "To return to your account in future you need to set a password": "Päästäksesi jatkossa takaisin tilillesi sinun täytyy asettaa salasana",
-    "Restart": "Käynnistä uudelleen",
-    "Upgrade your %(brand)s": "Päivitä %(brand)s",
-    "A new version of %(brand)s is available!": "Uusi %(brand)sin versio on saatavilla!",
     "New version available. <a>Update now.</a>": "Uusi versio saatavilla. <a>Päivitä nyt.</a>",
     "To link to this room, please add an address.": "Lisää osoite linkittääksesi tähän huoneeseen.",
     "Error creating address": "Virhe osoitetta luotaessa",
@@ -2140,16 +1827,12 @@
     "Categories": "Luokat",
     "This address is available to use": "Tämä osoite on käytettävissä",
     "This address is already in use": "Tämä osoite on jo käytössä",
-    "Set a room address to easily share your room with other people.": "Aseta huoneelle osoite, jotta voit jakaa huoneen helposti muille.",
-    "Address (optional)": "Osoite (valinnainen)",
     "Light": "Vaalea",
     "Dark": "Tumma",
     "Emoji picker": "Emojit",
     "No recently visited rooms": "Ei hiljattain vierailtuja huoneita",
     "People": "Ihmiset",
     "Sort by": "Lajittelutapa",
-    "Unread rooms": "Lukemattomat huoneet",
-    "Always show first": "Näytä aina ensin",
     "Show": "Näytä",
     "Leave Room": "Poistu huoneesta",
     "Switch to light mode": "Vaihda vaaleaan teemaan",
@@ -2158,69 +1841,29 @@
     "All settings": "Kaikki asetukset",
     "Feedback": "Palaute",
     "Looks good!": "Hyvältä näyttää!",
-    "Use Recovery Key or Passphrase": "Käytä palautusavainta tai salalausetta",
-    "Use Recovery Key": "Käytä palautusavainta",
     "You joined the call": "Liityit puheluun",
     "%(senderName)s joined the call": "%(senderName)s liittyi puheluun",
     "Call in progress": "Puhelu käynnissä",
-    "You left the call": "Poistuit puhelusta",
-    "%(senderName)s left the call": "%(senderName)s poistui puhelusta",
     "Call ended": "Puhelu päättyi",
     "You started a call": "Aloitit puhelun",
     "%(senderName)s started a call": "%(senderName)s aloitti puhelun",
     "Waiting for answer": "Odotetaan vastausta",
     "%(senderName)s is calling": "%(senderName)s soittaa",
-    "You created the room": "Loit huoneen",
-    "%(senderName)s created the room": "%(senderName)s loi huoneen",
-    "You made the chat encrypted": "Otit salauksen käyttöön keskustelussa",
-    "%(senderName)s made the chat encrypted": "%(senderName)s otti salauksen käyttöön keskustelussa",
-    "You made history visible to new members": "Teit historiasta näkyvän uusille jäsenille",
-    "%(senderName)s made history visible to new members": "%(senderName)s teki historiasta näkyvän uusille jäsenille",
-    "You made history visible to anyone": "Teit historiasta näkyvän kaikille",
-    "%(senderName)s made history visible to anyone": "%(senderName)s teki historiasta näkyvän kaikille",
-    "You made history visible to future members": "Teit historiasta näkyvän tuleville jäsenille",
-    "%(senderName)s made history visible to future members": "%(senderName)s teki historiasta näkyvän tuleville jäsenille",
-    "You were invited": "Sinut kutsuttiin",
-    "%(targetName)s was invited": "%(targetName)s kutsuttiin",
-    "You left": "Poistuit",
-    "%(targetName)s left": "%(targetName)s poistui",
-    "You rejected the invite": "Hylkäsit kutsun",
-    "%(targetName)s rejected the invite": "%(targetName)s hylkäsi kutsun",
-    "You were banned (%(reason)s)": "Sait porttikiellon (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s sai porttikiellon (%(reason)s)",
-    "You were banned": "Sait porttikiellon",
-    "%(targetName)s was banned": "%(targetName)s sai porttikiellon",
-    "You joined": "Liityit",
-    "%(targetName)s joined": "%(targetName)s liittyi",
-    "You changed your name": "Vaihdoit nimeäsi",
-    "%(targetName)s changed their name": "%(targetName)s vaihtoi nimeään",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Vaihdoit huoneen nimeä",
-    "%(senderName)s changed the room name": "%(senderName)s vaihtoi huoneen nimeä",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You invited %(targetName)s": "Kutsuit käyttäjän %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s kutsui käyttäjän %(targetName)s",
-    "You changed the room topic": "Vaihdoit huoneen aiheen",
-    "%(senderName)s changed the room topic": "%(senderName)s vaihtoi huoneen aiheen",
     "Use custom size": "Käytä mukautettua kokoa",
     "Use a more compact ‘Modern’ layout": "Käytä tiiviimpää 'modernia' asettelua",
     "Use a system font": "Käytä järjestelmän fonttia",
     "System font name": "Järjestelmän fontin nimi",
     "Message layout": "Viestiasettelu",
-    "Compact": "Tiivis",
     "Modern": "Moderni",
-    "We’re excited to announce Riot is now Element": "Meillä on ilo ilmoittaa, että Riot on nyt Element",
-    "Riot is now Element!": "Riot on nyt Element!",
-    "Learn More": "Lue lisää",
     "Use default": "Käytä oletusta",
     "Mentions & Keywords": "Maininnat ja avainsanat",
     "Notification options": "Ilmoitusasetukset",
     "Room options": "Huoneen asetukset",
     "This room is public": "Tämä huone on julkinen",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Olet jo kirjautuneena eikä sinun tarvitse tehdä mitään, mutta voit myös hakea sovelluksen uusimman version kaikille alustoille osoitteesta <a>element.io/get-started</a>.",
-    "We’re excited to announce Riot is now Element!": "Meillä on ilo ilmoittaa, että Riot on nyt Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Lue lisää osoitteessa <a>element.io/previously-riot</a>",
     "Security & privacy": "Tietoturva ja -suoja",
     "User menu": "Käyttäjän valikko",
     "Video conference started by %(senderName)s": "%(senderName)s aloitti ryhmävideopuhelun",
@@ -2230,18 +1873,13 @@
     "Join the conference at the top of this room": "Liity ryhmäpuheluun huoneen ylälaidassa",
     "This will end the conference for everyone. Continue?": "Tämä päättää ryhmäpuhelun kaikilta. Jatka?",
     "End conference": "Päätä ryhmäpuhelu",
-    "Wrong Recovery Key": "Väärä palautusavain",
     "Wrong file type": "Väärä tiedostotyyppi",
-    "Please provide a room address": "Anna huoneen osoite",
     "Room address": "Huoneen osoite",
     "Message deleted on %(date)s": "Viesti poistettu %(date)s",
     "Show %(count)s more|one": "Näytä %(count)s lisää",
     "Show %(count)s more|other": "Näytä %(count)s lisää",
     "Mod": "Valvoja",
     "Read Marker off-screen lifetime (ms)": "Viestin luetuksi merkkaamisen kesto, kun Element ei ole näkyvissä (ms)",
-    "Maximize widget": "Suurenna sovelma",
-    "Minimize widget": "Pienennä sovelma",
-    "You can only pin 2 widgets at a time": "Vain kaksi sovelmaa voi olla kiinnitettynä samaan aikaan",
     "Add widgets, bridges & bots": "Lisää sovelmia, siltoja ja botteja",
     "Edit widgets, bridges & bots": "Muokkaa sovelmia, siltoja ja botteja",
     "Widgets": "Sovelmat",
@@ -2252,24 +1890,12 @@
     "Unknown App": "Tuntematon sovellus",
     "Error leaving room": "Virhe poistuessa huoneesta",
     "Unexpected server error trying to leave the room": "Huoneesta poistuessa tapahtui odottamaton palvelinvirhe",
-    "%(senderName)s declined the call.": "%(senderName)s hylkäsi puhelun.",
-    "(an error occurred)": "(tapahtui virhe)",
-    "(their device couldn't start the camera / microphone)": "(hänen laitteensa ei voinut käynnistää kameraa tai mikrofonia)",
-    "(connection failed)": "(yhteys katkesi)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "Kaikki palvelimet ovat saaneet porttikiellon huoneeseen! Tätä huonetta ei voi enää käyttää.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Lisää ( ͡° ͜ʖ ͡°) viestin alkuun",
     "Are you sure you want to cancel entering passphrase?": "Haluatko varmasti peruuttaa salasanan syöttämisen?",
     "The call was answered on another device.": "Puheluun vastattiin toisessa laitteessa.",
     "Answered Elsewhere": "Vastattu muualla",
     "The call could not be established": "Puhelua ei voitu muodostaa",
-    "The other party declined the call.": "Toinen osapuoli hylkäsi puhelun.",
-    "Call Declined": "Puhelu hylätty",
-    "%(brand)s Android": "%(brand)s Android",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "Starting microphone...": "Käynnistetään mikrofonia...",
-    "Starting camera...": "Käynnistetään kameraa...",
-    "Call connecting...": "Yhdistetään puhelua...",
-    "Calling...": "Soitetaan...",
     "%(creator)s created this DM.": "%(creator)s loi tämän yksityisviestin.",
     "You do not have permission to create rooms in this community.": "Sinulla ei ole lupaa luoda huoneita tähän yhteisöön.",
     "Cannot create rooms in this community": "Tähän yhteisöön ei voi luoda huoneita",
@@ -2293,7 +1919,6 @@
     "Add another email": "Lisää toinen sähköposti",
     "Click to view edits": "Napsauta nähdäksesi muokkaukset",
     "Edited at %(date)s": "Muokattu %(date)s",
-    "Role": "Rooli",
     "Show files": "Näytä tiedostot",
     "%(count)s people|one": "%(count)s henkilö",
     "%(count)s people|other": "%(count)s ihmistä",
@@ -2320,9 +1945,6 @@
     "Algorithm:": "Algoritmi:",
     "Failed to save your profile": "Profiilisi tallentaminen ei onnistunut",
     "Your server isn't responding to some <a>requests</a>.": "Palvelimesi ei vastaa joihinkin <a>pyyntöihin</a>.",
-    "Incoming call": "Saapuva puhelu",
-    "Incoming video call": "Saapuva videopuhelu",
-    "Incoming voice call": "Saapuva äänipuhelu",
     "Unknown caller": "Tuntematon soittaja",
     "Enable experimental, compact IRC style layout": "Ota käyttöön kokeellinen, IRC-tyylinen asettelu",
     "Use Ctrl + Enter to send a message": "Ctrl + Enter lähettää viestin",
@@ -2362,7 +1984,6 @@
     "Appearance Settings only affect this %(brand)s session.": "Ulkoasuasetukset vaikuttavat vain tähän %(brand)s-istuntoon.",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Aseta käyttöjärjestelmääsi asennetun fontin nimi, niin %(brand)s pyrkii käyttämään sitä.",
     "The operation could not be completed": "Toimintoa ei voitu tehdä loppuun asti",
-    "There are advanced notifications which are not shown here.": "On edistyneitä ilmoituksia, joita ei näytetä tässä.",
     "Return to call": "Palaa puheluun",
     "Voice Call": "Äänipuhelu",
     "Video Call": "Videopuhelu",
@@ -2535,12 +2156,10 @@
     "Moldova": "Moldova",
     "You’re all caught up": "Olet ajan tasalla",
     "Room settings": "Huoneen asetukset",
-    "or another cross-signing capable Matrix client": "tai muu ristiinvarmentava Matrix-asiakas",
     "a device cross-signing signature": "laitteen ristiinvarmennuksen allekirjoitus",
     "a new cross-signing key signature": "Uusi ristiinvarmennuksen allekirjoitus",
     "Cross-signing is not set up.": "Ristiinvarmennusta ei ole asennettu.",
     "Cross-signing is ready for use.": "Ristiinvarmennus on käyttövalmis.",
-    "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.": "Varmuuskopioi tilitietojesi salausavaimet, istuntojen menettämisen varalta. Avaimet varmistetaan ainutlaatuisella Palatusavaimella.",
     "well formed": "hyvin muotoiltu",
     "Backup version:": "Varmuuskopiointiversio:",
     "Backup key stored:": "Varmuuskopioavain tallennettu:",
@@ -2669,7 +2288,6 @@
     "Sign into your homeserver": "Kirjaudu sisään kotipalvelimellesi",
     "About homeservers": "Tietoa kotipalvelimista",
     "Not encrypted": "Ei salattu",
-    "You have no visible notifications in this room.": "Olet nähnyt tämän huoneen kaikki ilmoitukset.",
     "Session verified": "Istunto vahvistettu",
     "Verify this login": "Vahvista tämä sisäänkirjautuminen",
     "User settings": "Käyttäjäasetukset",
@@ -2679,7 +2297,6 @@
     "Failed to find the general chat for this community": "Tämän yhteisön yleisen keskustelun löytäminen epäonnistui",
     "Explore rooms in %(communityName)s": "Tutki %(communityName)s -yhteisön huoneita",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Poistetaanko huoneosoite %(alias)s ja %(name)s hakemisto?",
-    "Self-verification request": "Itsevarmennuspyyntö",
     "Add a photo so people know it's you.": "Lisää kuva, jotta ihmiset tietävät, että se olet sinä.",
     "Great, that'll help people know it's you": "Hienoa, tämä auttaa ihmisiä tietämään, että se olet sinä",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Liitä tiedostoja alalaidan klemmarilla, tai raahaa ja pudota ne mihin tahansa huoneen kohtaan.",
@@ -2720,7 +2337,6 @@
     "The server has denied your request.": "Palvelin eväsi pyyntösi.",
     "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>.": "Huomio: jos et lisää sähköpostia ja unohdat salasanasi, saatat <b>menettää pääsyn tiliisi pysyvästi</b>.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Yksityiset huoneet ovat löydettävissä ja liityttävissä vain kutsulla. Julkiset huoneet ovat kenen tahansa tämän yhteisön jäsenen löydettävissä ja liityttävissä.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Yksityiset huoneet ovat löydettävissä ja liityttävissä vain kutsulla. Julkiset huoneet ovat kenen tahansa löydettävissä ja liityttävissä.",
     "Homeserver": "Kotipalvelin",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Palvelimesi ylläpitäjä on poistanut päästä päähän -salauksen oletuksena käytöstä yksityisissä huoneissa ja yksityisviesteissä.",
     "%(peerName)s held the call": "%(peerName)s piti puhelua pidossa",
@@ -2736,13 +2352,10 @@
     "Send messages as you in this room": "Lähetä tähän huoneeseen viestejä itsenäsi",
     "Show message previews for reactions in DMs": "Näytä reaktioille esikatselu yksityisviesteissä",
     "Show message previews for reactions in all rooms": "Näytä reaktioille esikatselu kaikissa huoneissa",
-    "New spinner design": "Uusi kehrääjä tyyli",
     "Render LaTeX maths in messages": "Piirrä LaTeX-matematiikka viesteissä",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Downloading logs": "Ladataan lokeja",
     "Uploading logs": "Lähetetään lokeja",
-    "Show chat effects": "Näytä keskustelutehosteet",
-    "Enable advanced debugging for the room list": "Ota huoneluettelon edistynyt virheenkorjaus käyttöön",
     "A connection error occurred while trying to contact the server.": "Yhteysvirhe yritettäessä ottaa yhteyttä palvelimeen.",
     "The <b>%(capability)s</b> capability": "<b>%(capability)s</b>-ominaisuus",
     "See when the avatar changes in this room": "Näe, milloin kuva vaihtuu tässä huoneessa",
@@ -2755,26 +2368,20 @@
     "Continuing without email": "Jatka ilman sähköpostia",
     "Invite by email": "Kutsu sähköpostilla",
     "Report a bug": "Raportoi virheestä",
-    "Invalid Recovery Key": "Virheellinen palautusavain",
     "Confirm Security Phrase": "Vahvista turvalause",
     "Upload a file": "Lähetä tiedosto",
     "Confirm encryption setup": "Vahvista salauksen asetukset",
-    "Verify other session": "Vahvista toinen istunto",
     "Confirm account deactivation": "Vahvista tilin deaktivointi",
     "Toggle right panel": "Vaihda oikea paneeli",
     "Navigate composer history": "Selaa kirjoittimen historiaa",
     "a key signature": "avaimen allekirjoitus",
     "Homeserver feature support:": "Kotipalvelimen ominaisuuksien tuki:",
     "Create key backup": "Luo avaimen varmuuskopio",
-    "Recovery key mismatch": "Palautusavain ei täsmää",
-    "%(name)s paused": "%(name)s keskeytetty",
     "Invalid URL": "Virheellinen URL",
     "Reason (optional)": "Syy (valinnainen)",
     "Fill Screen": "Täytä näyttö",
     "Send feedback": "Lähetä palautetta",
     "Rate %(brand)s": "Arvioi %(brand)s",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s Web": "%(brand)s Web",
     "Security Phrase": "Turvalause",
     "Security Key": "Turva-avain",
     "Verify session": "Vahvista istunto",
@@ -2810,16 +2417,10 @@
     "Decide where your account is hosted": "Päätä, missä tiliäsi isännöidään",
     "Your new session is now verified. Other users will see it as trusted.": "Uusi istuntosi on vahvistettu. Muut käyttäjät näkevät sen luotettavana.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uusi istuntosi on vahvistettu. Sillä on nyt pääsy salattuihin viesteihisi, ja muut käyttäjät näkevät sen luotettavana.",
-    "Enter a recovery passphrase": "Syötä palautuksen salasana",
-    "Great! This recovery passphrase looks strong enough.": "Hienoa! Tämä palautuksen salasana näyttää riittävän vahvalta.",
-    "Please enter your recovery passphrase a second time to confirm.": "Vahvista antamalla palautuksen salasana uudelleen.",
-    "Repeat your recovery passphrase...": "Toista palautuksen salasana...",
     "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.": "Syötä salasana, jonka tiedät vain sinä, koska sitä käytetään tietojesi suojaamiseen. Turvallisuuden takaamiseksi älä käytä samaa salasanaa muualla.",
-    "Enter your recovery passphrase a second time to confirm it.": "Vahvista antamalla palautuksen salasana uudelleen.",
     "Message downloading sleep time(ms)": "Viestin lataamisen odotusaika (ms)",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Lisää ┬──┬ ノ( ゜-゜ノ) viestin alkuun",
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Lisää (╯°□°）╯︵ ┻━┻ viestin alkuun",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Salaisen tallenustilan avaaminen epäonnistui. Varmista, että syötit oikean palautuksen salasanan.",
     "Enter a Security Phrase": "Kirjoita turvalause",
     "Set a Security Phrase": "Aseta turvalause",
     "Unable to query secret storage status": "Salaisen tallennustilan tilaa ei voi kysellä",
@@ -2827,7 +2428,6 @@
     "You can also set up Secure Backup & manage your keys in Settings.": "Voit myös ottaa käyttöön suojatun varmuuskopioinnin ja hallita avaimia asetuksista.",
     "Save your Security Key": "Tallenna turva-avain",
     "This session is encrypting history using the new recovery method.": "Tämä istunto salaa historiansa käyttäen uutta palautustapaa.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tämä istunto on havainnut, että palauttamisen salauslause ja salattujen viestien avain on poistettu.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "",
     "Close dialog or context menu": "Sulje valintaikkuna tai pikavalikko",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s tallentaa turvallisesti salattuja viestejä välimuistiin, jotta ne näkyvät hakutuloksissa:",
@@ -2840,12 +2440,9 @@
     "Block anyone not part of %(serverName)s from ever joining this room.": "Estä muita kuin palvelimen %(serverName)s jäseniä liittymästä tähän huoneeseen.",
     "Continue with %(provider)s": "Jatka käyttäen palveluntarjoajaa %(provider)s",
     "Open dial pad": "Avaa näppäimistö",
-    "Start a Conversation": "Aloita keskustelu",
     "Dial pad": "Näppäimistö",
     "There was an error looking up the phone number": "Puhelinnumeron haussa tapahtui virhe",
     "Unable to look up phone number": "Puhelinnumeroa ei voi hakea",
-    "Use Ctrl + F to search": "Etsi painamalla Ctrl + F",
-    "Use Command + F to search": "Etsi painamalla Komento + F",
     "Use app": "Käytä sovellusta",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web on mobiililaitteilla kokeellinen. Ilmainen sovelluksemme tarjoaa paremman kokemuksen ja uusimmat ominaisuudet.",
     "Use app for a better experience": "Parempi kokemus sovelluksella",
@@ -2860,8 +2457,6 @@
     "Expand code blocks by default": "Laajenna koodilohkot oletuksena",
     "Show line numbers in code blocks": "Näytä rivinumerot koodilohkoissa",
     "Recently visited rooms": "Hiljattain vieraillut huoneet",
-    "Screens": "Näytöt",
-    "Share your screen": "Jaa näyttösi",
     "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.": "Voit kirjautua muille Matrix-palvelimille antamalla eri kotipalvelimen URL-osoitteen palvelinasetuksissa. Näin voit käyttää Elementiä eri kotipalvelimella olevan Matrix-tilin kanssa.",
     "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.": "Voi olla paikallaan poistaa tämä käytöstä, jos huonetta käyttävät myös ulkoiset tiimit joilla on oma kotipalvelimensa. Asetusta ei voi muuttaa myöhemmin.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Voi olla paikallaan ottaa tämä käyttöön, jos huonetta käyttävät vain sisäiset tiimit kotipalvelimellasi. Asetusta ei voi muuttaa myöhemmin.",
@@ -2872,26 +2467,20 @@
     "Recent changes that have not yet been received": "Tuoreet muutokset, joita ei ole vielä otettu vastaan",
     "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.": "Pyysimme selainta muistamaan kirjautumista varten mitä kotipalvelinta käytät, mutta selain on unohtanut sen. Mene kirjautumissivulle ja yritä uudelleen.",
     "Search (must be enabled)": "Haku (pitää olla käytössä)",
-    "Apply": "Käytä",
-    "Applying...": "Käytetään...",
     "Channel: <channelLink/>": "Kanava: <channelLink/>",
     "This homeserver has been blocked by it's administrator.": "Tämän kotipalvelimen ylläpitäjä on estänyt sen.",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Tehdään huone jokaiselle. Voit myös lisätä niitä myöhemmin, mukaan lukien olemassa olevia.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Tehdään huone jokaiselle. Voit myös lisätä niitä myöhemmin, mukaan lukien olemassa olevia.",
-    "What are some things you want to discuss?": "Mistä asioista haluat keskustella?",
     "Inviting...": "Kutsutaan...",
     "Share %(name)s": "Jaa %(name)s",
     "Creating rooms...": "Luodaan huoneita...",
     "Skip for now": "Ohita tältä erää",
     "Room name": "Huoneen nimi",
-    "Default Rooms": "Oletushuoneet",
     "<inviter/> invites you": "<inviter/> kutsuu sinut",
     "You may want to try a different search or check for typos.": "Kokeile eri hakua tai tarkista haku kirjoitusvirheiden varalta.",
     "No results found": "Tuloksia ei löytynyt",
     "Mark as not suggested": "Merkitse ei-ehdotetuksi",
     "Mark as suggested": "Merkitse ehdotetuksi",
     "Removing...": "Poistetaan...",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Jos et löydä etsimääsi huonetta, pyydä kutsua tai <a>luo uusi huone</a>.",
     "%(count)s rooms|one": "%(count)s huone",
     "%(count)s rooms|other": "%(count)s huonetta",
     "%(count)s members|one": "%(count)s jäsen",
@@ -2902,7 +2491,6 @@
     "Remember this": "Muista tämä",
     "Save Changes": "Tallenna muutokset",
     "Saving...": "Tallennetaan...",
-    "View dev tools": "Näytä kehitystyökalut",
     "Invite to %(roomName)s": "Kutsu huoneeseen %(roomName)s",
     "Minimize dialog": "Pienennä ikkuna",
     "Maximize dialog": "Suurenna ikkuna",
@@ -2921,7 +2509,6 @@
     "Value": "Arvo",
     "Failed to save settings": "Asetusten tallentaminen epäonnistui",
     "Create a new room": "Luo uusi huone",
-    "Don't want to add an existing room?": "Etkö halua lisätä olemassa olevaa huonetta?",
     "Edit devices": "Muokkaa laitteita",
     "Invite People": "Kutsu ihmisiä",
     "Empty room": "Tyhjä huone",
@@ -2932,22 +2519,17 @@
     "Encrypting your message...": "Viestiäsi salataan...",
     "Sending your message...": "Viestiäsi lähetetään...",
     "Spell check dictionaries": "Oikolukusanastot",
-    "New room": "Uusi huone",
-    "Invite members": "Kutsu jäseniä",
     "Invite people": "Kutsu ihmisiä",
     "Share invite link": "Jaa kutsulinkki",
     "Click to copy": "Kopioi napsauttamalla",
     "Creating...": "Luodaan...",
     "You can change these anytime.": "Voit muuttaa näitä koska tahansa.",
-    "You can change this later": "Voit muuttaa tätä myöhemmin",
     "Private": "Yksityinen",
     "Public": "Julkinen",
     "Delete": "Poista",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Laitteelta %(deviceName)s (%(deviceId)s) osoitteesta %(ip)s",
     "Show chat effects (animations when receiving e.g. confetti)": "Näytä keskustelutehosteet (animaatiot, kun saat esim. konfettia)",
     "Jump to the bottom of the timeline when you send a message": "Siirry aikajanan pohjalle, kun lähetät viestin",
     "Check your devices": "Tarkista laitteesi",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Uusi kirjautuminen tilillesi: %(name)s (%(deviceID)s) osoitteesta %(ip)s",
     "This homeserver has been blocked by its administrator.": "Tämä kotipalvelin on ylläpitäjänsä estämä.",
     "You're already in a call with this person.": "Olet jo puhelussa tämän henkilön kanssa.",
     "Already in call": "Olet jo puhelussa",
@@ -2971,7 +2553,6 @@
     "Invited people will be able to read old messages.": "Kutsutut ihmiset voivat lukea vanhoja viestejä.",
     "We couldn't create your DM.": "Yksityisviestiä ei voitu luoda.",
     "Thank you for your feedback, we really appreciate it.": "Kiitos palautteesta, arvostamme sitä.",
-    "Beta feedback": "Palautetta beetaversiosta",
     "Want to add a new room instead?": "Haluatko kuitenkin lisätä uuden huoneen?",
     "Add existing rooms": "Lisää olemassa olevia huoneita",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Lisätään huonetta...",
@@ -2985,9 +2566,6 @@
     "View all %(count)s members|other": "Näytä kaikki %(count)s jäsentä",
     "Add reaction": "Lisää reaktio",
     "Error processing voice message": "Virhe ääniviestin käsittelyssä",
-    "Delete recording": "Poista äänitys",
-    "Stop the recording": "Lopeta äänitys",
-    "Record a voice message": "Äänitä viesti",
     "We were unable to access your microphone. Please check your browser settings and try again.": "Mikrofoniasi ei voitu käyttää. Tarkista selaimesi asetukset ja yritä uudelleen.",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Laitteestasi ei löytynyt mikrofonia. Tarkista asetuksesi ja yritä uudelleen.",
     "No microphone found": "Mikrofonia ei löytynyt",
@@ -3001,7 +2579,18 @@
     "Connecting": "Yhdistetään",
     "unknown person": "tuntematon henkilö",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Salli vertaisyhteydet 1:1-puheluille (jos otat tämän käyttöön, toinen osapuoli saattaa nähdä IP-osoitteesi)",
-    "Send and receive voice messages": "Lähetä ja vastaanota ääniviestejä",
     "Show options to enable 'Do not disturb' mode": "Näytä asetukset Älä häiritse -tilan ottamiseksi käyttöön",
-    "%(deviceId)s from %(ip)s": "%(deviceId)s osoitteesta %(ip)s"
+    "%(deviceId)s from %(ip)s": "%(deviceId)s osoitteesta %(ip)s",
+    "Integration manager": "Integraatioiden lähde",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s-instanssisi ei salli sinun käyttävän integraatioiden lähdettä tämän tekemiseen. Ota yhteys ylläpitäjääsi.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Tämän sovelman käyttäminen saattaa jakaa tietoa <helpIcon /> osoitteille %(widgetDomain)s ja käyttämällesi integraatioiden lähteelle.",
+    "Identity server is": "Identiteettipalvelin on",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integraatioiden lähteet vastaanottavat asetusdataa ja voivat muokata sovelmia, lähettää kutsuja huoneeseen ja asettaa oikeustasoja puolestasi.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Käytä integraatioiden lähdettä bottien, sovelmien ja tarrapakettien hallintaan.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Käytä integraatioiden lähdettä <b>(%(serverName)s)</b> bottien, sovelmien ja tarrapakettien hallintaan.",
+    "Identity server": "Identiteettipalvelin",
+    "Identity server (%(server)s)": "Identiteettipalvelin (%(server)s)",
+    "Could not connect to identity server": "Identiteettipalvelimeen ei saatu yhteyttä",
+    "Not a valid identity server (status code %(code)s)": "Ei kelvollinen identiteettipalvelin (tilakoodi %(code)s)",
+    "Identity server URL must be HTTPS": "Identiteettipalvelimen URL-osoitteen täytyy olla HTTPS-alkuinen"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5a8208f50b..6b6bc98a9e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -3,9 +3,7 @@
     "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.",
     "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 ?",
@@ -15,7 +13,6 @@
     "Favourite": "Favoris",
     "Notifications": "Notifications",
     "Settings": "Paramètres",
-    "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
     "Account": "Compte",
     "Admin": "Administrateur",
     "Advanced": "Avancé",
@@ -23,30 +20,18 @@
     "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 ?",
     "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.",
     "Ban": "Bannir",
     "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 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": "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",
-    "click to reveal": "cliquer pour dévoiler",
-    "Click to unmute video": "Cliquer pour rétablir la vidéo",
-    "Click to unmute audio": "Cliquer pour rétablir le son",
     "Command error": "Erreur de commande",
     "Commands": "Commandes",
     "Confirm password": "Confirmer le mot de passe",
@@ -54,13 +39,11 @@
     "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",
     "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",
     "Failed to join room": "Échec de l’inscription au salon",
     "Failed to kick": "Échec de l’expulsion",
-    "Failed to leave room": "Échec du départ du salon",
     "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",
@@ -68,18 +51,14 @@
     "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 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",
     "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",
     "Failure to create room": "Échec de création du salon",
     "Favourites": "Favoris",
-    "Fill screen": "Plein écran",
     "Filter room members": "Filtrer les membres du salon",
     "Forget room": "Oublier le salon",
     "For security, this session has been signed out. Please sign in again.": "Par mesure de sécurité, la session a expiré. Merci de vous authentifier à nouveau.",
@@ -87,24 +66,19 @@
     "Hangup": "Raccrocher",
     "Historical": "Historique",
     "Homeserver is": "Le serveur d’accueil est",
-    "Identity Server is": "Le serveur d’identité est",
     "I have verified my email address": "J’ai vérifié mon adresse e-mail",
     "Import E2E room keys": "Importer les clés de chiffrement de bout en bout",
     "Incorrect verification code": "Code de vérification incorrect",
     "Invalid Email Address": "Adresse e-mail non valide",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
     "Invited": "Invités",
     "Invites": "Invitations",
     "Invites user with given id to current room": "Invite un utilisateur dans le salon actuel à partir de son identifiant",
     "Sign in with": "Se connecter avec",
     "Join Room": "Rejoindre le salon",
-    "%(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",
     "Labs": "Expérimental",
     "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.",
@@ -112,7 +86,6 @@
     "%(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",
     "Moderator": "Modérateur",
@@ -120,7 +93,6 @@
     "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 pris en charge par ce navigateur)",
     "<not supported>": "<non pris en charge>",
     "No more results": "Fin des résultats",
     "No results": "Pas de résultat",
@@ -135,31 +107,23 @@
     "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.",
     "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 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 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 :",
     "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",
     "%(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.",
@@ -168,34 +132,27 @@
     "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.",
-    "%(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",
     "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",
     "Submit": "Soumettre",
     "Success": "Succès",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
     "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 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é 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",
-    "%(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",
     "Unmute": "Activer le son",
     "Upload avatar": "Envoyer un avatar",
@@ -206,18 +163,12 @@
     "Verification Pending": "Vérification en attente",
     "Video call": "Appel vidéo",
     "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 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 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.",
@@ -246,17 +197,11 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Définir le nom affiché :",
-    "Upload an avatar:": "Envoyer un avatar :",
     "This server does not support authentication with a phone number.": "Ce serveur ne prend pas en charge l’authentification avec un numéro de téléphone.",
-    "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 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",
-    "Please select the destination room for this message": "Merci de sélectionner le salon de destination pour ce message",
     "%(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.",
@@ -274,7 +219,6 @@
     "You must join the room to see its files": "Vous devez rejoindre le salon pour voir ses fichiers",
     "Reject all %(invitedRooms)s invites": "Rejeter la totalité des %(invitedRooms)s invitations",
     "Failed to invite": "Échec de l’invitation",
-    "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é.",
     "Unknown error": "Erreur inconnue",
@@ -282,23 +226,15 @@
     "Unable to restore session": "Impossible de restaurer la session",
     "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.": "Si vous avez utilisé une version plus récente de %(brand)s précédemment, votre session risque d’être incompatible avec cette version. Fermez cette fenêtre et retournez à la version plus récente.",
     "Unknown Address": "Adresse inconnue",
-    "ex. @bob:example.com": "ex. @bob:exemple.com",
-    "Add User": "Ajouter l'utilisateur",
-    "Custom Server Options": "Options de serveur personnalisées",
     "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 :",
     "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",
     "Error decrypting image": "Erreur lors du déchiffrement de l’image",
     "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": "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",
     "Offline": "Hors ligne",
     "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système",
@@ -312,7 +248,6 @@
     "Export": "Exporter",
     "Import": "Importer",
     "Incorrect username and/or password.": "Nom d’utilisateur et/ou mot de passe incorrect.",
-    "Results from DuckDuckGo": "Résultats de DuckDuckGo",
     "Verified key": "Clé vérifiée",
     "No Microphones detected": "Aucun micro détecté",
     "No Webcams detected": "Aucune caméra détectée",
@@ -321,7 +256,6 @@
     "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 » ?",
     "Custom level": "Rang personnalisé",
@@ -330,54 +264,32 @@
     "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.",
     "Add": "Ajouter",
-    "Error: Problem communicating with the given homeserver.": "Erreur : problème de communication avec le homeserver.",
-    "Failed to fetch avatar URL": "Échec lors de la récupération de l’URL de l’avatar",
-    "The phone number entered looks invalid": "Le numéro de téléphone entré semble être invalide",
     "Uploading %(filename)s and %(count)s others|zero": "Envoi de %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Envoi de %(filename)s et %(count)s autre",
     "Uploading %(filename)s and %(count)s others|other": "Envoi de %(filename)s et %(count)s autres",
     "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 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 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",
-    "Active call (%(roomName)s)": "Appel en cours (%(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.": "Impossible de se connecter au serveur d’accueil - veuillez vérifier votre connexion, assurez-vous que le <a>certificat SSL de votre serveur d’accueil</a> est un certificat de confiance, et qu’aucune extension du navigateur ne bloque les requêtes.",
     "Close": "Fermer",
-    "Custom": "Personnaliser",
     "Decline": "Refuser",
-    "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 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 joignable pour le moment.",
     "Seen by %(userName)s at %(dateTime)s": "Vu par %(userName)s à %(dateTime)s",
     "Start authentication": "Commencer l’authentification",
     "This room": "Ce salon",
-    "unknown caller": "appelant inconnu",
     "Unnamed Room": "Salon anonyme",
-    "Username invalid: %(errMessage)s": "Nom d'utilisateur non valide : %(errMessage)s",
     "(~%(count)s results)|one": "(~%(count)s résultat)",
     "(~%(count)s results)|other": "(~%(count)s résultats)",
     "Home": "Accueil",
     "Upload new:": "Envoyer un nouveau :",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Rejoindre en <voiceText>audio</voiceText> ou en <videoText>vidéo</videoText>.",
     "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 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 ?",
@@ -385,13 +297,10 @@
     "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",
-    "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",
     "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 l’autorisation d’effectuer cette action dans ce salon.",
@@ -404,8 +313,6 @@
     "%(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 ?",
-    "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",
     "PM": "PM",
     "Copied!": "Copié !",
@@ -427,17 +334,13 @@
     "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",
+    "Message Pinning": "Messages épinglés",
     "Mention": "Mentionner",
     "Unignore": "Ne plus ignorer",
     "Ignore": "Ignorer",
     "Invite": "Inviter",
     "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…",
-    "Pinned Messages": "Messages épinglés",
     "Unknown": "Inconnu",
     "Unnamed room": "Salon sans nom",
     "No rooms to show": "Aucun salon à afficher",
@@ -448,9 +351,6 @@
     "Guests can join": "Accessible aux visiteurs",
     "Invalid community ID": "Identifiant de communauté non valide",
     "'%(groupId)s' is not a valid community ID": "« %(groupId)s » n’est pas un identifiant de communauté valide",
-    "%(senderName)s sent an image": "%(senderName)s a envoyé une image",
-    "%(senderName)s sent a video": "%(senderName)s a envoyé une vidéo",
-    "%(senderName)s uploaded a file": "%(senderName)s a transféré un fichier",
     "Disinvite this user?": "Désinviter l’utilisateur ?",
     "Kick this user?": "Expulser cet utilisateur ?",
     "Unban this user?": "Révoquer le bannissement de cet utilisateur ?",
@@ -459,7 +359,6 @@
     "Members only (since they were invited)": "Seulement les membres (depuis leur invitation)",
     "Members only (since they joined)": "Seulement les membres (depuis leur arrivée)",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nouvel identifiant de communauté (par ex. +foo:%(localDomain)s)",
-    "An email has been sent to %(emailAddress)s": "Un e-mail a été envoyé à %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Un message a été envoyé à %(msisdn)s",
     "Remove from community": "Supprimer de la communauté",
     "Disinvite this user from community?": "Désinviter cet utilisateur de la communauté ?",
@@ -578,11 +477,9 @@
     "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é",
-    "Community Invites": "Invitations de communauté",
     "Notify the whole room": "Notifier tout le salon",
     "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 !",
     "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.",
@@ -592,7 +489,6 @@
     "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> ?",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -615,13 +511,9 @@
     "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 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é…",
     "Replying": "Répond",
-    "Minimize apps": "Minimiser les applications",
     "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 :",
@@ -636,17 +528,14 @@
     "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 modifié son nom d’affichage en %(displayName)s.",
     "Failed to set direct chat tag": "Échec de l’ajout de l’étiquette de conversation privée",
     "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é.",
     "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.",
     "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é",
@@ -662,13 +551,9 @@
     "Everyone": "Tout le monde",
     "Fetching third party location failed": "Échec de la récupération de la localisation tierce",
     "Send Account Data": "Envoyer les données du compte",
-    "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
-    "Uploading report": "Envoi du rapport",
     "Sunday": "Dimanche",
     "Notification targets": "Appareils recevant les notifications",
     "Today": "Aujourd’hui",
-    "Files": "Fichiers",
-    "You are not receiving desktop notifications": "Vous ne recevez pas les notifications sur votre bureau",
     "Friday": "Vendredi",
     "Update": "Mettre à jour",
     "What's New": "Nouveautés",
@@ -676,23 +561,13 @@
     "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é",
-    "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",
     "This Room": "Ce salon",
     "Noisy": "Sonore",
     "Room not found": "Salon non trouvé",
     "Messages containing my display name": "Messages contenant mon nom d’affichage",
     "Messages in one-to-one chats": "Messages dans les conversations privées",
     "Unavailable": "Indisponible",
-    "View Decrypted Source": "Voir la source déchiffrée",
-    "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 :",
-    "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",
     "Source URL": "URL de la source",
     "Messages sent by bot": "Messages envoyés par des robots",
@@ -701,34 +576,20 @@
     "No update available.": "Aucune mise à jour disponible.",
     "Resend": "Renvoyer",
     "Collecting app version information": "Récupération des informations de version de l’application",
-    "Keywords": "Mots-clés",
-    "Enable notifications for this account": "Activer les notifications pour ce compte",
     "Invite to this community": "Inviter à cette communauté",
-    "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 :",
     "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 ?",
-    "%(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": "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",
-    "Direct Chat": "Discussion directe",
     "The server may be unavailable or overloaded": "Le serveur est indisponible ou surchargé",
     "Reject": "Rejeter",
-    "Failed to set Direct Message status of room": "Échec du réglage de l'état du salon en Discussion directe",
     "Monday": "Lundi",
-    "All messages (noisy)": "Tous les messages (sonore)",
-    "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 indiquer un type d’événement !",
-    "(HTTP status %(httpStatus)s)": "(état HTTP %(httpStatus)s)",
     "Invite to this room": "Inviter dans ce salon",
     "Wednesday": "Mercredi",
     "You cannot delete this message. (%(code)s)": "Vous ne pouvez pas supprimer ce message. (%(code)s)",
@@ -740,46 +601,29 @@
     "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",
-    "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’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",
-    "Forward Message": "Transférer le message",
     "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",
     "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",
     "Messages in group chats": "Messages dans les discussions de groupe",
     "Yesterday": "Hier",
     "Error encountered (%(errorDetail)s).": "Erreur rencontrée (%(errorDetail)s).",
     "Low Priority": "Priorité basse",
-    "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
-    "Set Password": "Définir un mot de passe",
     "Off": "Désactivé",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ne peut pas joindre un salon sur ce réseau",
-    "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",
-    "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 !",
     "When I'm invited to a room": "Quand je suis invité dans un salon",
     "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 de l’envoi des journaux",
     "Missing roomId.": "Identifiant de salon manquant.",
@@ -787,14 +631,12 @@
     "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",
     "Send Logs": "Envoyer les journaux",
     "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. 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 pour les widgets pris en charge",
     "Send analytics data": "Envoyer les données de télémétrie",
     "Muted Users": "Utilisateurs ignorés",
@@ -807,7 +649,7 @@
     "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 au serveur",
+    "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, vous ne pouvez donc pas en partir.",
     "No Audio Outputs detected": "Aucune sortie audio détectée",
     "Audio Output": "Sortie audio",
@@ -819,24 +661,14 @@
     "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.",
-    "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>.",
     "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": "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",
     "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.",
@@ -884,8 +716,6 @@
     "Unable to load! Check your network connectivity and try again.": "Chargement impossible ! Vérifiez votre connexion au réseau et réessayez.",
     "Delete Backup": "Supprimer la sauvegarde",
     "Unable to load key backup status": "Impossible de charger l’état de sauvegarde des clés",
-    "Backup version: ": "Version de la sauvegarde : ",
-    "Algorithm: ": "Algorithme : ",
     "Next": "Suivant",
     "That matches!": "Ça correspond !",
     "That doesn't match.": "Ça ne correspond pas.",
@@ -901,11 +731,6 @@
     "Unable to restore backup": "Impossible de restaurer la sauvegarde",
     "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",
     "Use a few words, avoid common phrases": "Utilisez quelques mots, évitez les phrases courantes",
@@ -939,16 +764,11 @@
     "You do not have permission to invite people to this room.": "Vous n’avez pas la permission d’inviter des personnes 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",
     "Set up": "Configurer",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Si vous ne configurez pas la récupération de messages sécurisée, vous perdrez l'historique de vos messages sécurisés quand vous vous déconnectez.",
-    "If you don't want to set this up now, you can later in Settings.": "Si vous ne voulez pas le configurer maintenant, vous pouvez le faire plus tard dans les paramètres.",
     "Messages containing @room": "Messages contenant @room",
     "Encrypted messages in one-to-one chats": "Messages chiffrés dans les conversations privées",
     "Encrypted messages in group chats": "Messages chiffrés dans les discussions de groupe",
     "That doesn't look like a valid email address": "Cela ne ressemble pas à une adresse e-mail valide",
-    "Checking...": "Vérification…",
     "Invalid identity server discovery response": "Réponse non valide lors de la découverte du serveur d'identité",
     "General failure": "Erreur générale",
     "New Recovery Method": "Nouvelle méthode de récupération",
@@ -977,7 +797,7 @@
     "%(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",
+    "Render simple counters in room header": "Afficher des compteurs simplifiés 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",
@@ -999,7 +819,6 @@
     "Email Address": "Adresse e-mail",
     "Backing up %(sessionsRemaining)s keys...": "Sauvegarde de %(sessionsRemaining)s clés…",
     "All keys backed up": "Toutes les clés ont été sauvegardées",
-    "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",
@@ -1039,7 +858,6 @@
     "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": "Audio et vidéo",
@@ -1052,36 +870,20 @@
     "Waiting for partner to confirm...": "Nous attendons que le partenaire confirme…",
     "Incoming Verification Request": "Demande de vérification entrante",
     "Go back": "Revenir en arrière",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Pour éviter la duplication de problèmes, veuillez <existingIssuesLink>voir les problèmes existants</existingIssuesLink> d'abord (et ajouter un +1) ou <newIssueLink>créer un nouveau problème</newIssueLink> si vous ne le trouvez pas.",
-    "Report bugs & give feedback": "Rapporter des anomalies & Donner son avis",
     "Update status": "Mettre à jour le statut",
     "Set status": "Définir le statut",
-    "Your Modular server": "Votre serveur Modular",
-    "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",
-    "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)",
     "Phone (optional)": "Téléphone (facultatif)",
     "Confirm": "Confirmer",
-    "Other servers": "Autres serveurs",
-    "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",
-    "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 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.",
     "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",
@@ -1172,11 +974,6 @@
     "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.",
     "Start using Key Backup": "Commencer à utiliser la sauvegarde de clés",
-    "Never lose encrypted messages": "Ne perdez jamais vos messages chiffrés",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Les messages de ce salon sont sécurisés avec le chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) avez les clés pour lire ces messages.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Sauvegardez vos clés de façon sécurisée pour éviter de les perdre. <a>En savoir plus.</a>",
-    "Not now": "Pas maintenant",
-    "Don't ask me again": "Ne plus me demander",
     "I don't want my encrypted messages": "Je ne veux pas de mes messages chiffrés",
     "Manually export keys": "Exporter manuellement les clés",
     "You'll lose access to your encrypted messages": "Vous perdrez l’accès à vos messages chiffrés",
@@ -1186,9 +983,7 @@
     "For maximum security, this should be different from your account password.": "Pour une sécurité maximale, ceci devrait être différent du mot de passe de votre compte.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Vous clés sont en cours de sauvegarde (la première sauvegarde peut prendre quelques minutes).",
     "Success!": "Terminé !",
-    "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": "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.",
@@ -1200,12 +995,7 @@
     "Error updating flair": "Erreur lors de la mise à jour du badge",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Une erreur est survenue lors de la mise à jour du badge pour ce salon. Ce serveur ne l’autorise peut-être pas ou une erreur temporaire est survenue.",
     "Room Settings - %(roomName)s": "Paramètres du salon – %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Un nom d'utilisateur ne peut être composé que de lettres minuscules, de chiffres et de « =_-./ »",
-    "Share Permalink": "Partager le permalien",
-    "Sign in to your Matrix account on %(serverName)s": "Connectez-vous à votre compte Matrix sur %(serverName)s",
-    "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 ¯\\_(ツ)_/¯ 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.",
@@ -1224,7 +1014,6 @@
     "Change settings": "Changer les paramètres",
     "Kick users": "Expulser des utilisateurs",
     "Ban users": "Bannir des utilisateurs",
-    "Remove messages": "Supprimer des messages",
     "Notify everyone": "Avertir tout le monde",
     "Send %(eventType)s events": "Envoyer %(eventType)s évènements",
     "Select the roles required to change various parts of the room": "Sélectionner les rôles nécessaires pour modifier les différentes parties du salon",
@@ -1232,7 +1021,6 @@
     "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>": "Le chiffrement du salon ne peut pas être désactivé après son activation. Les messages d’un salon chiffré ne peuvent pas être vus par le serveur, seulement par les membres du salon. Activer le chiffrement peut empêcher certains robots et certaines passerelles de fonctionner correctement. <a>En savoir plus sur le chiffrement.</a>",
     "Power level": "Rang",
     "Want more than a community? <a>Get your own server</a>": "Vous voulez plus qu’une communauté ? <a>Obtenez votre propre serveur</a>",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Veuillez installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ou <safariLink>Safari</safariLink> pour une expérience optimale.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Attention</b> : La mise à niveau du salon <i>ne migrera pas automatiquement les membres du salon vers la nouvelle version du salon.</i> Nous enverrons un lien vers le nouveau salon dans l’ancienne version du salon. Les participants au salon devront cliquer sur ce lien pour rejoindre le nouveau salon.",
     "Adds a custom widget by URL to the room": "Ajoute un widget personnalisé par URL au salon",
     "Please supply a https:// or http:// widget URL": "Veuillez fournir une URL du widget en https:// ou http://",
@@ -1245,11 +1033,7 @@
     "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",
-    "A widget would like to verify your identity": "Un widget voudrait vérifier votre identité",
-    "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 provenant de %(widgetUrl)s souhaite vérifier votre identité. Si vous acceptez cela, le widget pourra vérifier votre identifiant d’utilisateur mais il ne pourra rien faire en se faisant passer pour vous.",
     "Remember my selection for this widget": "Se souvenir de mon choix pour ce widget",
-    "Deny": "Refuser",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s n’a pas pu récupérer la liste des protocoles depuis le serveur d’accueil. Ce serveur d’accueil est peut-être trop vieux pour prendre en charge les réseaux tiers.",
     "%(brand)s failed to get the public room list.": "%(brand)s n’a pas pu récupérer la liste des salons publics.",
     "The homeserver may be unavailable or overloaded.": "Le serveur d’accueil est peut-être indisponible ou surchargé.",
@@ -1259,8 +1043,6 @@
     "Replying With Files": "Répondre avec des fichiers",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Pour le moment, il n’est pas possible de répondre avec un fichier. Souhaitez-vous envoyer ce fichier sans répondre ?",
     "The file '%(fileName)s' failed to upload.": "Le fichier « %(fileName)s » n’a pas pu être envoyé.",
-    "Rotate counter-clockwise": "Pivoter dans le sens inverse des aiguilles d’une montre",
-    "Rotate clockwise": "Pivoter dans le sens des aiguilles d’une montre",
     "GitHub issue": "Rapport GitHub",
     "Notes": "Notes",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "S’il y a des informations supplémentaires qui pourraient nous aider à analyser le problème, comme ce que vous faisiez, l’identifiant du salon ou des utilisateurs etc, veuillez les préciser ici.",
@@ -1328,7 +1110,6 @@
     "Passwords don't match": "Les mots de passe ne correspondent pas",
     "Other users can invite you to rooms using your contact details": "D’autres utilisateurs peuvent vous inviter à des salons grâce à vos informations de contact",
     "Enter phone number (required on this homeserver)": "Saisir le numéro de téléphone (obligatoire sur ce serveur d’accueil)",
-    "Doesn't look like a valid phone number": "Cela ne ressemble pas à un numéro de téléphone valide",
     "Enter username": "Saisir le nom d’utilisateur",
     "Some characters not allowed": "Certains caractères ne sont pas autorisés",
     "Failed to get autodiscovery configuration from server": "Échec de la découverte automatique de la configuration depuis le serveur",
@@ -1337,16 +1118,10 @@
     "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 le fil de discussion",
-    "Your profile": "Votre profil",
     "Add room": "Ajouter un salon",
     "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é",
-    "Sign in to your Matrix account on <underlinedServerName />": "Connectez-vous à votre compte Matrix sur <underlinedServerName />",
-    "Create your Matrix account on <underlinedServerName />": "Créez votre compte Matrix sur <underlinedServerName />",
-    "Your Matrix account on <underlinedServerName />": "Votre compte Matrix sur <underlinedServerName />",
-    "Low bandwidth mode": "Mode faible bande passante",
     "Uploaded sound": "Son téléchargé",
     "Sounds": "Sons",
     "Notification sound": "Son de notification",
@@ -1374,14 +1149,11 @@
     "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",
-    "%(senderName)s made no change.": "%(senderName)s n’a fait aucun changement.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s n’a fait aucun changement %(count)s fois",
     "%(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 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": "Modifie votre avatar dans tous les salons",
     "You're signed out": "Vous êtes déconnecté",
@@ -1395,7 +1167,6 @@
     "Sign in and regain access to your account.": "Connectez-vous et ré-accédez à votre compte.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Vous ne pouvez pas vous connecter à votre compte. Contactez l’administrateur de votre serveur d’accueil pour plus d’informations.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Dites-nous ce qui s’est mal passé ou, encore mieux, créez un rapport d’erreur sur GitHub qui décrit le problème.",
-    "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é 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",
@@ -1420,18 +1191,12 @@
     "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 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": "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.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvert par les contacts existants que vous connaissez, ajoutez-en un ci-dessous.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "La déconnexion de votre serveur d’identité signifie que vous ne serez plus découvrable par d’autres utilisateurs et que vous ne pourrez plus faire d’invitation par e-mail ou téléphone.",
-    "Integration Manager": "Gestionnaire d’intégration",
     "Call failed due to misconfigured server": "L’appel a échoué à cause d’un serveur mal configuré",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Demandez à l’administrateur de votre serveur d’accueil (<code>%(homeserverDomain)s</code>) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Vous pouvez sinon essayer d’utiliser le serveur public <code>turn.matrix.org</code>, mais ça ne sera pas aussi fiable et votre adresse IP sera partagée avec ce serveur. Vous pouvez aussi gérer ce réglage dans les paramètres.",
@@ -1448,16 +1213,11 @@
     "Public Name": "Nom public",
     "Accept <policyLink /> to continue:": "Acceptez <policyLink /> pour continuer :",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Acceptez les conditions de service du serveur d’identité (%(serverName)s) pour vous permettre d’être découvrable par votre adresse e-mail ou votre numéro de téléphone.",
-    "Multiple integration managers": "Gestionnaires d’intégration multiples",
     "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 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.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Saisissez l’URL de votre serveur d’accueil personnalisé <a>Qu’est-ce que ça veut dire ?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Saisissez l’URL de votre serveur d’identité personnalisé <a>Qu’est-ce que ça veut dire ?</a>",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Utilisez un serveur d’identité pour inviter avec un e-mail. <default>Utilisez le serveur par défaut (%(defaultIdentityServerName)s)</default> ou gérez-le dans les <settings>Paramètres</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Utilisez un serveur d’identité pour inviter par e-mail. Gérez-le dans les <settings>Paramètres</settings>.",
     "Enable room encryption": "Activer le chiffrement du salon",
@@ -1495,10 +1255,7 @@
     "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.",
     "Remove %(count)s messages|other": "Supprimer %(count)s messages",
     "Remove recent messages": "Supprimer les messages récents",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Envoyer des accusés de lecture pour les messages (nécessite un serveur d’accueil compatible pour le désactiver)",
-    "Explore": "Explorer",
     "Filter": "Filtrer",
-    "Filter rooms…": "Filtrer les salons…",
     "Preview": "Aperçu",
     "View": "Afficher",
     "Find a room…": "Trouver un salon…",
@@ -1518,14 +1275,11 @@
     "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",
-    "This room is private, and can only be joined by invitation.": "Ce salon est privé et ne peut être rejoint que sur invitation.",
     "Create a public room": "Créer un salon public",
     "Create a private room": "Créer un salon privé",
     "Topic (optional)": "Sujet (facultatif)",
-    "Make this room public": "Rendre ce salon public",
-    "Hide advanced": "Masquer les informations avancées",
-    "Show advanced": "Afficher les informations avancées",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Empêcher les utilisateurs d’autres serveurs d’accueil matrix de rejoindre ce salon (Ce paramètre ne peut pas être modifié plus tard !)",
+    "Hide advanced": "Masquer les paramètres avancés",
+    "Show advanced": "Afficher les paramètres avancés",
     "To continue you need to accept the terms of this service.": "Pour continuer vous devez accepter les conditions de ce service.",
     "Document": "Document",
     "Community Autocomplete": "Autocomplétion de communauté",
@@ -1538,7 +1292,6 @@
     "Clear cache and reload": "Vider le cache et recharger",
     "%(count)s unread messages including mentions.|other": "%(count)s messages non lus y compris les mentions.",
     "%(count)s unread messages.|other": "%(count)s messages non lus.",
-    "Unread mentions.": "Mentions non lues.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Veuillez <newIssueLink>créer un nouveau rapport</newIssueLink> sur GitHub afin que l’on enquête sur cette erreur.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Clé public du captcha manquante dans la configuration du serveur d’accueil. Veuillez le signaler à l’administrateur de votre serveur d’accueil.",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Vous êtes sur le point de supprimer 1 message de %(user)s. Ça ne peut pas être annulé. Voulez-vous continuer ?",
@@ -1554,7 +1307,6 @@
     "contact the administrators of identity server <idserver />": "contacter les administrateurs du serveur d’identité <idserver />",
     "wait and try again later": "attendre et réessayer plus tard",
     "Command Autocomplete": "Autocomplétion de commande",
-    "DuckDuckGo Results": "Résultats de DuckDuckGo",
     "Quick Reactions": "Réactions rapides",
     "Frequently Used": "Utilisé fréquemment",
     "Smileys & People": "Visages et personnes",
@@ -1573,8 +1325,6 @@
     "Jump to first unread room.": "Sauter au premier salon non lu.",
     "Jump to first invite.": "Sauter à la première invitation.",
     "Room %(name)s": "Salon %(name)s",
-    "Recent rooms": "Salons récents",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Aucun serveur d’identité n’est configuré donc vous ne pouvez pas ajouter une adresse e-mail afin de réinitialiser votre mot de passe dans l’avenir.",
     "%(count)s unread messages including mentions.|one": "1 mention non lue.",
     "%(count)s unread messages.|one": "1 message non lu.",
     "Unread messages.": "Messages non lus.",
@@ -1626,8 +1376,6 @@
     "Custom (%(level)s)": "Personnalisé (%(level)s)",
     "Trusted": "Fiable",
     "Not trusted": "Non fiable",
-    "Direct message": "Conversation privée",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> dans %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Les messages dans ce salon sont chiffrés de bout en bout.",
     "Security": "Sécurité",
     "Verify": "Vérifier",
@@ -1639,27 +1387,19 @@
     "%(brand)s URL": "URL de %(brand)s",
     "Room ID": "Identifiant du salon",
     "Widget ID": "Identifiant du widget",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s et votre gestionnaire d’intégrations.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s.",
     "Widget added by": "Widget ajouté par",
     "This widget may use cookies.": "Ce widget pourrait utiliser des cookies.",
     "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 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.",
     "More options": "Plus d’options",
     "Integrations are disabled": "Les intégrations sont désactivées",
     "Enable 'Manage Integrations' in Settings to do this.": "Activez « Gérer les intégrations » dans les paramètres pour faire ça.",
     "Integrations not allowed": "Les intégrations ne sont pas autorisées",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Votre %(brand)s ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Contactez un administrateur.",
-    "Reload": "Recharger",
-    "Take picture": "Prendre une photo",
     "Remove for everyone": "Supprimer pour tout le monde",
-    "Remove for me": "Supprimer pour moi",
     "Decline (%(counter)s)": "Refuser (%(counter)s)",
     "Manage integrations": "Gérer les intégrations",
     "Verification Request": "Demande de vérification",
@@ -1669,12 +1409,10 @@
     "%(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",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personnalisez votre expérience avec des fonctionnalités expérimentales. <a>En savoir plus</a>.",
     "Error upgrading room": "Erreur lors de la mise à niveau du salon",
     "Double check that your server supports the room version chosen and try again.": "Vérifiez que votre serveur prend en charge la version de salon choisie et réessayez.",
     "This message cannot be decrypted": "Ce message ne peut pas être déchiffré",
     "Unencrypted": "Non chiffré",
-    "Automatically invite users": "Inviter automatiquement les utilisateurs",
     "Upgrade private room": "Mettre à niveau le salon privé",
     "Upgrade public room": "Mettre à niveau le salon public",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "La mise à niveau d’un salon est une action avancée et qui est généralement recommandée quand un salon est instable à cause d’anomalies, de fonctionnalités manquantes ou de failles de sécurité.",
@@ -1684,7 +1422,6 @@
     "Notification settings": "Paramètres de notification",
     "User Status": "Statut de l’utilisateur",
     "Reactions": "Réactions",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> ont réagi avec %(content)s</reactedWith>",
     "<userName/> wants to chat": "<userName/> veut discuter",
     "Start chatting": "Commencer à discuter",
     "Cross-signing public keys:": "Clés publiques de signature croisée :",
@@ -1712,27 +1449,17 @@
     "in account data": "dans les données du compte",
     "Cross-signing": "Signature croisée",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attention</b> : Vous ne devriez configurer la sauvegarde de clés que depuis un ordinateur de confiance.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si vous avez oublié votre clé de récupération, vous pouvez <button>définir de nouvelles options de récupération</button>",
-    "Set up with a recovery key": "Configurer avec une clé de récupération",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Votre clé de récupération a été <b>copiée dans votre presse-papiers</b>, collez-la pour :",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Votre clé de récupération est dans votre dossier de <b>Téléchargements</b>.",
     "Unable to set up secret storage": "Impossible de configurer le coffre secret",
-    "Cross-signing and secret storage are enabled.": "La signature croisée et le coffre secret sont activés.",
-    "Cross-signing and secret storage are not yet set up.": "La signature croisée et le coffre secret ne sont pas encore configurés.",
-    "Bootstrap cross-signing and secret storage": "Initialiser la signature croisée et le coffre secret",
     "not stored": "non sauvegardé",
     "Backup has a <validity>valid</validity> signature from this user": "La sauvegarde a une signature <validity>valide</validity> de cet utilisateur",
     "Backup has a <validity>invalid</validity> signature from this user": "La sauvegarde a une signature <validity>non valide</validity> de cet utilisateur",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "La sauvegarde a une signature de l’utilisateur <verify>inconnu</verify> ayant pour identifiant %(deviceId)s",
-    "Backup key stored: ": "Clé de sauvegarde stockée : ",
     "Hide verified sessions": "Masquer les sessions vérifiées",
     "%(count)s verified sessions|other": "%(count)s sessions vérifiées",
     "%(count)s verified sessions|one": "1 session vérifiée",
     "Close preview": "Fermer l’aperçu",
     "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 grand.",
-    "Help": "Aide",
     "Show more": "En voir plus",
     "Recent Conversations": "Conversations récentes",
     "Direct Messages": "Conversations privées",
@@ -1758,8 +1485,6 @@
     "%(num)s hours from now": "dans %(num)s heures",
     "about a day from now": "dans un jour environ",
     "%(num)s days from now": "dans %(num)s jours",
-    "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 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 quels utilisateurs que vous souhaitez inviter et réessayez.",
     "Recently Direct Messaged": "Conversations privées récentes",
@@ -1782,19 +1507,14 @@
     "Enter your account password to confirm the upgrade:": "Saisissez le mot de passe de votre compte pour confirmer la mise à niveau :",
     "You'll need to authenticate with the server to confirm the upgrade.": "Vous devrez vous identifier avec le serveur pour confirmer la mise à niveau.",
     "Upgrade your encryption": "Mettre à niveau votre chiffrement",
-    "Set up encryption": "Configurer le chiffrement",
     "This room is end-to-end encrypted": "Ce salon est chiffré de bout en bout",
     "Everyone in this room is verified": "Tout le monde dans ce salon est vérifié",
-    "Invite only": "Uniquement sur invitation",
     "Send a reply…": "Envoyer une réponse…",
     "Send a message…": "Envoyer un message…",
     "Verify this session": "Vérifier cette session",
     "Encryption upgrade available": "Mise à niveau du chiffrement disponible",
     "Enable message search in encrypted rooms": "Activer la recherche de messages dans les salons chiffrés",
     "Review": "Examiner",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche, en utilisant ",
-    " to store messages from ": " pour stocker des messages de ",
-    "rooms.": "salons.",
     "Manage": "Gérer",
     "Securely cache encrypted messages locally for them to appear in search results.": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche.",
     "Enable": "Activer",
@@ -1809,8 +1529,6 @@
     "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 />.",
-    "Workspace: %(networkName)s": "Espace de travail : %(networkName)s",
-    "Channel: %(channelName)s": "Canal : %(channelName)s",
     "Show less": "En voir moins",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ce salon transmet les messages vers les plateformes suivantes. <a>En savoir plus.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ce salon ne transmet les messages à aucune plateforme. <a>En savoir plus.</a>",
@@ -1828,10 +1546,6 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Si vous ne pouvez pas scanner le code ci-dessus, vérifiez en comparant des émojis uniques.",
     "You've successfully verified %(displayName)s!": "Vous avez vérifié %(displayName)s !",
     "Got it": "Compris",
-    "New session": "Nouvelle session",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Utilisez cette session pour vérifier la nouvelle, ce qui lui permettra d’accéder aux messages chiffrés :",
-    "If you didn’t sign in to this session, your account may be compromised.": "Si vous ne vous êtes pas connecté à cette session, votre compte est peut-être compromis.",
-    "This wasn't me": "Ce n’était pas moi",
     "Your new session is now verified. Other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Les autres utilisateurs la verront comme fiable.",
     "Restore your key backup to upgrade your encryption": "Restaurez votre sauvegarde de clés pour mettre à niveau votre chiffrement",
     "Verifies a user, session, and pubkey tuple": "Vérifie un utilisateur, une session et une collection de clés publiques",
@@ -1873,7 +1587,7 @@
     "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",
-    "Mod": "Modo",
+    "Mod": "Modérateur",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Votre demande de partage de clé a été envoyée − vérifiez les demandes de partage de clé sur vos autres sessions.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Les demandes de partage de clé sont envoyées à vos autres sessions automatiquement. Si vous avez rejeté ou ignoré la demande de partage de clé sur vos autres sessions, cliquez ici pour redemander les clés pour cette session.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Si vos autres sessions n’ont pas la clé pour ce message vous ne pourrez pas le déchiffrer.",
@@ -1885,7 +1599,6 @@
     "%(count)s sessions|one": "%(count)s session",
     "Hide sessions": "Masquer les sessions",
     "Encryption enabled": "Chiffrement activé",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Les messages dans ce salon sont chiffrés de bout en bout. Apprenez-en plus et vérifiez cet utilisateur dans son profil utilisateur.",
     "Encryption not enabled": "Chiffrement non activé",
     "The encryption used by this room isn't supported.": "Le chiffrement utilisé par ce salon n’est pas pris en charge.",
     "Clear all data in this session?": "Supprimer toutes les données de cette session ?",
@@ -1896,8 +1609,6 @@
     "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 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.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Modifier votre mot de passe réinitialisera toutes les clés de chiffrement de bout en bout sur toutes vos sessions, ce qui rendra l’historique de vos messages chiffrés illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Vous avez été déconnecté de toutes les sessions et vous ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Récupérez l’accès à votre compte et restaurez les clés de chiffrement dans cette session. Sans elles, vous ne pourrez pas lire tous vos messages chiffrés dans n’importe quelle session.",
@@ -1905,29 +1616,18 @@
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cette session pour l’autoriser à vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",
     "This session is encrypting history using the new recovery method.": "Cette session chiffre l’historique en utilisant la nouvelle méthode de récupération.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre mot de passe et votre clé de récupération pour les messages chiffrés ont été supprimés.",
     "Setting up keys": "Configuration des clés",
-    "Verify yourself & others to keep your chats safe": "Vérifiez-vous et vérifiez les autres afin que vos discussions restent sûres",
     "You have not verified this user.": "Vous n’avez pas vérifié cet utilisateur.",
-    "Recovery key mismatch": "La clé de récupération ne correspond pas",
-    "Incorrect recovery passphrase": "Mot de passe de récupération incorrecte",
-    "Enter recovery passphrase": "Saisir le mot de passe de récupération",
-    "Enter recovery key": "Saisir la clé de récupération",
     "Confirm your identity by entering your account password below.": "Confirmez votre identité en saisissant le mot de passe de votre compte ci-dessous.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gardez-en une copie en lieu sûr, comme un gestionnaire de mots de passe ou même un coffre.",
-    "Your recovery key": "Votre clé de récupération",
     "Copy": "Copier",
-    "Make a copy of your recovery key": "Faire une copie de votre clé de récupération",
     "Create key backup": "Créer une sauvegarde de clé",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Si vous l’avez fait accidentellement, vous pouvez configurer les messages sécurisés sur cette session ce qui re-chiffrera l’historique des messages de cette session avec une nouvelle méthode de récupération.",
     "How fast should messages be downloaded.": "À quelle fréquence les messages doivent être téléchargés.",
     "Message downloading sleep time(ms)": "Temps d’attente de téléchargement des messages (ms)",
     "Cancel entering passphrase?": "Annuler la saisie du mot de passe ?",
     "Indexed rooms:": "Salons indexés :",
-    "If you cancel now, you won't complete verifying the other user.": "Si vous annuler maintenant, vous ne terminerez pas la vérification de l’autre utilisateur.",
-    "If you cancel now, you won't complete verifying your other session.": "Si vous annulez maintenant, vous ne terminerez pas la vérification de votre autre session.",
     "Show typing notifications": "Afficher les notifications de saisie",
-    "Reset cross-signing and secret storage": "Réinitialiser la signature croisée et le coffre secret",
     "Destroy cross-signing keys?": "Détruire les clés de signature croisée ?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La suppression des clés de signature croisée est permanente. Tous ceux que vous avez vérifié vont voir des alertes de sécurité. Il est peu probable que ce soit ce que vous voulez faire, sauf si vous avez perdu tous les appareils vous permettant d’effectuer une signature croisée.",
     "Clear cross-signing keys": "Vider les clés de signature croisée",
@@ -1954,11 +1654,6 @@
     "Accepting…": "Acceptation…",
     "Accepting …": "Acceptation…",
     "Declining …": "Refus…",
-    "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 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.",
     "Create Account": "Créer un compte",
@@ -1988,7 +1683,6 @@
     "Scroll to most recent messages": "Sauter aux messages les plus récents",
     "Local address": "Adresse locale",
     "Published Addresses": "Adresses publiées",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Les adresses publiées peuvent être utilisées par n’importe qui sur n’importe quel serveur pour rejoindre votre salon. Pour publier une adresse, elle doit d’abord être définie comme adresse locale.",
     "Other published addresses:": "Autres adresses 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)",
@@ -2009,7 +1703,6 @@
     "%(networkName)s rooms": "%(networkName)s salons",
     "Matrix rooms": "Salons Matrix",
     "Keyboard Shortcuts": "Raccourcis clavier",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Commencez une conversation avec quelqu'un en utilisant son nom, son nom d’utilisateur (comme <userId/>) ou son adresse e-mail.",
     "a new master key signature": "une nouvelle signature de clé principale",
     "a new cross-signing key signature": "une nouvelle signature de clé de signature croisée",
     "a device cross-signing signature": "une signature de signature croisée d’un appareil",
@@ -2069,7 +1762,6 @@
     "cached locally": "mise en cache localement",
     "not found locally": "non trouvée localement",
     "User signing private key:": "Clé privée de signature de l’utilisateur :",
-    "Session backup key:": "Clé de sauvegarde de session :",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Vérifiez individuellement chaque session utilisée par un utilisateur pour la marquer comme fiable, sans faire confiance aux appareils signés avec la signature croisée.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Dans les salons chiffrés, vos messages sont sécurisés et seuls vous et le destinataire avez les clés uniques pour les déchiffrer.",
     "Verify all users in a room to ensure it's secure.": "Vérifiez tous les utilisateurs d’un salon pour vous assurer qu’il est sécurisé.",
@@ -2095,8 +1787,6 @@
     "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…": "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 ?",
     "Almost there! Is %(displayName)s showing the same shield?": "On y est presque ! Est-ce que %(displayName)s affiche le même bouclier ?",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Vous avez bien vérifié %(deviceName)s (%(deviceId)s) !",
@@ -2106,7 +1796,6 @@
     "You cancelled verification on your other session.": "Vous avez annulé la vérification dans votre autre session.",
     "%(displayName)s cancelled verification.": "%(displayName)s a annulé la vérification.",
     "You cancelled verification.": "Vous avez annulé la vérification.",
-    "Self-verification request": "Demande d’auto-vérification",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirmez la suppression de ces sessions en utilisant l’authentification unique pour prouver votre identité.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirmez la suppression de cette session en utilisant l’authentification unique pour prouver votre identité.",
     "Click the button below to confirm deleting these sessions.|other": "Cliquez sur le bouton ci-dessous pour confirmer la suppression de ces sessions.",
@@ -2135,20 +1824,6 @@
     "Syncing...": "Synchronisation…",
     "Signing In...": "Authentification…",
     "If you've joined lots of rooms, this might take a while": "Si vous avez rejoint beaucoup de salons, cela peut prendre du temps",
-    "If you cancel now, you won't complete your operation.": "Si vous annulez maintenant, vous ne pourrez par terminer votre opération.",
-    "Verify other session": "Vérifier une autre session",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez renseigné la bonne phrase secrète de récupération.",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : vérifiez que vous avez renseigné la bonne clé de récupération.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n’a pas pu être déchiffrée avec cette phrase secrète de récupération : vérifiez que vous avez renseigné la bonne phrase secrète de récupération.",
-    "Great! This recovery passphrase looks strong enough.": "Super ! Cette phrase secrète de récupération a l’air suffisamment robuste.",
-    "Enter a recovery passphrase": "Saisir une phrase secrète de récupération",
-    "Enter your recovery passphrase a second time to confirm it.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
-    "Confirm your recovery passphrase": "Confirmer votre phrase secrète de récupération",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Votre clé de récupération est un filet de sécurité : vous pouvez l’utiliser pour récupérer l’accès à vos messages chiffrés si vous oubliez votre phrase secrète de récupération.",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec une phrase secrète de récupération.",
-    "Please enter your recovery passphrase a second time to confirm.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
-    "Repeat your recovery passphrase...": "Répéter votre phrase secrète de récupération…",
-    "Secure your backup with a recovery passphrase": "Protégez votre sauvegarde avec une phrase secrète de récupération",
     "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 aléatoire.",
@@ -2158,15 +1833,9 @@
     "Send a bug report with logs": "Envoyer un rapport d’anomalie avec les journaux",
     "Unable to query secret storage status": "Impossible de demander le statut du coffre secret",
     "Verify this login": "Vérifier cette connexion",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirmez votre identité en vérifiant cette connexion depuis une de vos autres sessions, cela lui permettra d’avoir accès aux messages chiffrés.",
-    "This requires the latest %(brand)s on your other devices:": "Ceci nécessite la dernière version de %(brand)s sur vos autres appareils :",
-    "or another cross-signing capable Matrix client": "ou un autre client Matrix compatible avec la signature croisée",
     "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 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",
@@ -2174,7 +1843,6 @@
     "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é à 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é",
     "Message deleted by %(name)s": "Message supprimé par %(name)s",
     "Opens chat with the given user": "Ouvre une discussion avec l’utilisateur fourni",
@@ -2191,8 +1859,6 @@
     "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 d’affichage IRC",
-    "Create room": "Créer un salon",
-    "Font scaling": "Mise à l’échelle de la police",
     "Font size": "Taille de la police",
     "Size must be a number": "La taille doit être un nombre",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "La taille de police personnalisée doit être comprise entre %(min)s pt et %(max)s pt",
@@ -2211,27 +1877,18 @@
     "Error removing address": "Erreur lors de la suppression de l’adresse",
     "Categories": "Catégories",
     "Room address": "Adresse du salon",
-    "Please provide a room address": "Veuillez fournir une adresse de salon",
     "This address is available to use": "Cette adresse est disponible",
     "This address is already in use": "Cette adresse est déjà utilisée",
-    "Set a room address to easily share your room with other people.": "Définissez une adresse de salon pour le partager facilement avec d’autres personnes.",
     "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.": "Vous avez précédemment utilisé une version plus récente de %(brand)s avec cette session. Pour réutiliser cette version avec le chiffrement de bout en bout, vous devrez vous déconnecter et vous reconnecter.",
-    "Address (optional)": "Adresse (optionnel)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Supprimer l’adresse du salon %(alias)s et supprimer %(name)s du répertoire ?",
     "delete the address.": "supprimer l’adresse.",
     "Use a different passphrase?": "Utiliser une phrase secrète différente ?",
     "Help us improve %(brand)s": "Aidez-nous à améliorer %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Envoyez des <UsageDataLink>données anonymes d’utilisation</UsageDataLink> qui nous aident à améliorer %(brand)s. Cela utilisera un <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "Je veux aider",
     "Your homeserver has exceeded its user limit.": "Votre serveur d’accueil a dépassé ses limites d’utilisateurs.",
     "Your homeserver has exceeded one of its resource limits.": "Votre serveur d’accueil a dépassé une de ses limites de ressources.",
     "Contact your <a>server admin</a>.": "Contactez <a>l’administrateur de votre serveur</a>.",
     "Ok": "OK",
-    "Set password": "Définir le mot de passe",
-    "To return to your account in future you need to set a password": "Pour réutiliser votre compte à l’avenir, vous devez définir un mot de passe",
-    "Restart": "Redémarrer",
-    "Upgrade your %(brand)s": "Mettre à niveau votre %(brand)s",
-    "A new version of %(brand)s is available!": "Une nouvelle version de %(brand)s est disponible !",
     "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>",
     "Emoji picker": "Sélecteur d’émojis",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les conversations privées.",
@@ -2244,8 +1901,6 @@
     "Feedback": "Commentaire",
     "No recently visited rooms": "Aucun salon visité récemment",
     "Sort by": "Trier par",
-    "Unread rooms": "Salons non lus",
-    "Always show first": "Toujours afficher en premier",
     "Show": "Afficher",
     "Message preview": "Aperçu de message",
     "List options": "Options de liste",
@@ -2260,13 +1915,9 @@
     "Customise your appearance": "Personnalisez l’apparence",
     "Appearance Settings only affect this %(brand)s session.": "Les paramètres d’apparence affecteront uniquement cette session de %(brand)s.",
     "Looks good!": "Ça a l’air correct !",
-    "Use Recovery Key or Passphrase": "Utiliser la clé ou la phrase secrète de récupération",
-    "Use Recovery Key": "Utiliser la clé de récupération",
-    "Use the improved room list (will refresh to apply changes)": "Utiliser la liste de salons améliorée (actualisera pour appliquer les changements)",
     "Use custom size": "Utiliser une taille personnalisée",
     "Hey you. You're the best!": "Hé vous. Vous êtes le meilleur !",
     "Message layout": "Mise en page des messages",
-    "Compact": "Compacte",
     "Modern": "Moderne",
     "Use a system font": "Utiliser une police du système",
     "System font name": "Nom de la police du système",
@@ -2275,62 +1926,17 @@
     "You joined the call": "Vous avez rejoint l’appel",
     "%(senderName)s joined the call": "%(senderName)s a rejoint l’appel",
     "Call in progress": "Appel en cours",
-    "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 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",
-    "%(senderName)s created the room": "%(senderName)s a créé le salon",
-    "You made the chat encrypted": "Vous avez activé le chiffrement de la discussion",
-    "%(senderName)s made the chat encrypted": "%(senderName)s a activé le chiffrement de la discussion",
-    "You made history visible to new members": "Vous avez rendu l’historique visible aux nouveaux membres",
-    "%(senderName)s made history visible to new members": "%(senderName)s a rendu l’historique visible aux nouveaux membres",
-    "You made history visible to anyone": "Vous avez rendu l’historique visible à tout le monde",
-    "%(senderName)s made history visible to anyone": "%(senderName)s a rendu l’historique visible à tout le monde",
-    "You made history visible to future members": "Vous avez rendu l’historique visible aux futurs membres",
-    "%(senderName)s made history visible to future members": "%(senderName)s a rendu l’historique visible aux futurs membres",
-    "You were invited": "Vous avez été invité",
-    "%(targetName)s was invited": "%(targetName)s a été invité·e",
-    "You left": "Vous êtes parti·e",
-    "%(targetName)s left": "%(targetName)s est parti·e",
-    "You were kicked (%(reason)s)": "Vous avez été expulsé·e (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s a été expulsé·e (%(reason)s)",
-    "You were kicked": "Vous avez été expulsé·e",
-    "%(targetName)s was kicked": "%(targetName)s a été expulsé·e",
-    "You rejected the invite": "Vous avez rejeté l’invitation",
-    "%(targetName)s rejected the invite": "%(targetName)s a rejeté l’invitation",
-    "You were uninvited": "Votre invitation a été révoquée",
-    "%(targetName)s was uninvited": "L’invitation de %(targetName)s a été révoquée",
-    "You were banned (%(reason)s)": "Vous avez été banni·e (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s a été banni·e (%(reason)s)",
-    "You were banned": "Vous avez été banni·e",
-    "%(targetName)s was banned": "%(targetName)s a été banni·e",
-    "You joined": "Vous avez rejoint le salon",
-    "%(targetName)s joined": "%(targetName)s a rejoint le salon",
-    "You changed your name": "Vous avez changé votre nom",
-    "%(targetName)s changed their name": "%(targetName)s a changé son nom",
-    "You changed your avatar": "Vous avez changé votre avatar",
-    "%(targetName)s changed their avatar": "%(targetName)s a changé son avatar",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s : %(message)s",
-    "You changed the room name": "Vous avez changé le nom du salon",
-    "%(senderName)s changed the room name": "%(senderName)s a changé le nom du salon",
     "%(senderName)s: %(reaction)s": "%(senderName)s : %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s : %(stickerName)s",
-    "You uninvited %(targetName)s": "Vous avez révoqué l’invitation de %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s a révoqué l’invitation de %(targetName)s",
-    "You invited %(targetName)s": "Vous avez invité %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s a invité %(targetName)s",
-    "You changed the room topic": "Vous avez changé le sujet du salon",
-    "%(senderName)s changed the room topic": "%(senderName)s a changé le sujet du salon",
-    "New spinner design": "Nouveau design du spinner",
     "Message deleted on %(date)s": "Message supprimé le %(date)s",
     "Wrong file type": "Mauvais type de fichier",
-    "Wrong Recovery Key": "Mauvaise clé de récupération",
-    "Invalid Recovery Key": "Clé de récupération non valide",
     "Security Phrase": "Phrase de sécurité",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Saisissez votre phrase de sécurité ou <button>utilisez votre clé de sécurité</button> pour continuer.",
     "Security Key": "Clé de sécurité",
@@ -2344,20 +1950,10 @@
     "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.",
-    "Set up Secure backup": "Configurer la sauvegarde sécurisée",
     "Set a Security Phrase": "Définir une phrase de sécurité",
     "Confirm Security Phrase": "Confirmer la phrase de sécurité",
     "Save your Security Key": "Sauvegarder votre clé de sécurité",
-    "Use your account to sign in to the latest version": "Connectez-vous à la nouvelle version",
-    "We’re excited to announce Riot is now Element": "Nous sommes heureux de vous annoncer que Riot est désormais Element",
-    "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 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",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Les salons de priorité basse s'affichent en bas de votre liste de salons, dans une section dédiée",
     "Show rooms with unread messages first": "Afficher les salons non lus en premier",
     "Show previews of messages": "Afficher un aperçu des messages",
     "Use default": "Utiliser la valeur par défaut",
@@ -2369,15 +1965,7 @@
     "This room is public": "Ce salon est public",
     "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",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X pour Android",
+    "User menu": "Menu utilisateur",
     "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",
@@ -2387,22 +1975,15 @@
     "Change notification settings": "Modifier les paramètres de notification",
     "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": "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 :",
     "%(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 profil",
     "Unknown App": "Application inconnue",
-    "%(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 ( ͡° ͜ʖ ͡°) en préfixe du message",
@@ -2411,24 +1992,19 @@
     "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.",
     "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 :",
-    "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.",
     "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 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 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.",
@@ -2484,25 +2060,17 @@
     "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 settings": "Paramètres de la 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 …",
-    "Calling...": "Appel en cours …",
     "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é.",
     "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 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.",
     "Away": "Absent",
     "Move right": "Aller à droite",
     "Move left": "Aller à gauche",
@@ -2530,7 +2098,7 @@
     "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 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",
+    "Report a bug": "Signaler 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",
@@ -2545,7 +2113,6 @@
     "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",
@@ -2842,7 +2409,7 @@
     "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 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",
+    "Remain on your screen when viewing another room, when running": "Reste sur votre écran lors de l’appel quand vous regardez un autre 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",
@@ -2856,19 +2423,19 @@
     "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",
+    "See videos posted to this room": "Voir les vidéos envoyées 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 this room": "Voir les images envoyé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",
+    "See messages posted to your active room": "Voir les messages envoyés dans le salon actuel",
+    "See messages posted to this room": "Voir les messages envoyés 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> 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",
+    "See <b>%(eventType)s</b> events posted to this room": "Voir les événements <b>%(eventType)s</b> envoyés dans ce salon",
     "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",
@@ -2896,7 +2463,6 @@
     "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 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.",
@@ -2921,19 +2487,18 @@
     "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": "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> sous votre nom dans ce salon",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Voir les messages de type <b>%(msgtype)s</b> envoyés dans le salon actuel",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Voir les messages de type <b>%(msgtype)s</b> envoyés dans ce salon",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Envoie les 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",
+    "See general files posted to this room": "Voir les fichiers envoyés 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)",
@@ -2947,14 +2512,12 @@
     "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",
     "<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 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 ajouter des images avec des URL Matrix <img src=\"mxc://url\" />\n</p>\n",
     "Use email to optionally be discoverable by existing contacts.": "Utiliser une adresse e-mail pour pouvoir être découvert par des contacts existants.",
@@ -2991,7 +2554,6 @@
     "Approve": "Approuver",
     "This widget would like to:": "Le widget voudrait :",
     "Approve widget permissions": "Approuver les permissions du widget",
-    "We recommend you change your password and Security Key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et Clé de Sécurité dans les Paramètres immédiatement",
     "Minimize dialog": "Réduire la modale",
     "Maximize dialog": "Maximiser la modale",
     "%(hostSignupBrand)s Setup": "Configuration de %(hostSignupBrand)s",
@@ -3005,12 +2567,8 @@
     "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",
-    "Screens": "Écrans",
-    "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": "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 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.",
@@ -3020,8 +2578,6 @@
     "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 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évelopper les blocs de code par défaut",
     "Show stickers button": "Afficher le bouton des autocollants",
@@ -3034,8 +2590,8 @@
     "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",
+    "Change which room you're viewing": "Changer le salon que vous êtes en train de lire",
+    "Remain on your screen while running": "Reste sur votre écran pendant l’appel",
     "%(senderName)s has updated the widget layout": "%(senderName)s a mis à jour la disposition du widget",
     "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",
@@ -3070,22 +2626,14 @@
     "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",
@@ -3093,25 +2641,10 @@
     "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.",
+    "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é bloqué par son administrateur. Merci de <a>contacter votre administrateur de service</a> pour continuer à utiliser le 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",
@@ -3119,26 +2652,17 @@
     "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 recommandé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",
@@ -3149,47 +2673,34 @@
     "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é bloqué par son administrateur.",
     "This homeserver has been blocked by its administrator.": "Ce serveur d’accueil a été bloqué par son administrateur.",
     "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",
     "Space selection": "Sélection d’un espace",
-    "Search names and description": "Rechercher par nom ou description",
     "Go to my first room": "Rejoindre mon premier salon",
     "Mark as suggested": "Marquer comme recommandé",
     "Mark as not suggested": "Marquer comme non recommandé",
     "Suggested": "Recommandé",
     "This room is suggested as a good one to join": "Ce salon recommandé peut être intéressant à rejoindre",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Vérifiez cette connexion pour accéder à vos messages chiffrés et prouver aux autres qu’il s’agit bien de vous.",
-    "Verify with another session": "Vérifier avec une autre session",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Nous allons créer un salon pour chacun d’entre eux. Vous pourrez aussi en ajouter plus tard, y compris certains déjà existant.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Créons un salon pour chacun d’entre eux. Vous pourrez en ajouter plus tard, y compris certains déjà existant.",
     "Make sure the right people have access. You can invite more later.": "Assurez-vous que les accès sont accordés aux bonnes personnes. Vous pourrez en inviter d’autres plus tard.",
     "A private space to organise your rooms": "Un espace privé pour organiser vos salons",
     "Just me": "Seulement moi",
@@ -3203,15 +2714,9 @@
     "No results found": "Aucun résultat",
     "Removing...": "Suppression…",
     "Failed to remove some rooms. Try again later": "Échec de la suppression de certains salons. Veuillez réessayez plus tard",
-    "%(count)s rooms and 1 space|one": "%(count)s salon et 1 espace",
-    "%(count)s rooms and 1 space|other": "%(count)s salons et 1 espace",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s salon et %(numSpaces)s espaces",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s salons et %(numSpaces)s espaces",
-    "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>.",
     "%(count)s rooms|one": "%(count)s salon",
     "%(count)s rooms|other": "%(count)s salons",
     "You don't have permission": "Vous n’avez pas l’autorisation",
-    "Open": "Ouvrir",
     "%(count)s messages deleted.|one": "%(count)s message supprimé.",
     "%(count)s messages deleted.|other": "%(count)s messages supprimés.",
     "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.": "Cela n’affecte généralement que la façon dont le salon est traité sur le serveur. Si vous avez des problèmes avec votre %(brand)s, signalez une anomalie.",
@@ -3221,14 +2726,11 @@
     "Invite with email or username": "Inviter par e-mail ou nom d’utilisateur",
     "You can change these anytime.": "Vous pouvez les changer à n’importe quel moment.",
     "Add some details to help people recognise it.": "Ajoutez des informations pour aider les personnes à l’identifier.",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Les espaces permettent de grouper les salons et les personnes. Pour rejoindre un espace existant, il vous faut une invitation.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Sur %(deviceName)s %(deviceId)s depuis %(ip)s",
     "Check your devices": "Vérifiez vos appareils",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Une nouvelle session a accès à votre compte : %(name)s %(deviceID)s depuis %(ip)s",
     "You have unverified logins": "Vous avez des sessions non-vérifiées",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Sans vérification vous n’aurez pas accès à tous vos messages et n’apparaîtrez pas comme de confiance aux autres.",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Vérifiez votre identité pour accéder aux messages chiffrés et prouver votre identité aux autres.",
-    "Use another login": "Utiliser un autre identifiant",
+    "Use another login": "Utiliser une autre session",
     "Please choose a strong password": "Merci de choisir un mot de passe fort",
     "You can add more later too, including already existing ones.": "Vous pourrez en ajouter plus tard, y compris certains déjà existant.",
     "Let's create a room for each of them.": "Créons un salon pour chacun d’entre eux.",
@@ -3237,7 +2739,6 @@
     "Avatar": "Avatar",
     "Verify other login": "Vérifier l’autre connexion",
     "Reset event store": "Réinitialiser le magasin d’événements",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Si vous le faites, notes qu’aucun de vos messages ne sera supprimé, mais la recherche pourrait être dégradée pendant quelques instants, le temps de recréer l’index",
     "You most likely do not want to reset your event index store": "Il est probable que vous ne vouliez pas réinitialiser votre magasin d’index d’événements",
     "Reset event store?": "Réinitialiser le magasin d’événements ?",
     "Consult first": "Consulter d’abord",
@@ -3248,18 +2749,12 @@
     "%(count)s people you know have already joined|one": "%(count)s personne que vous connaissez en fait déjà partie",
     "%(count)s people you know have already joined|other": "%(count)s personnes que vous connaissez en font déjà partie",
     "Accept on your other login…": "Acceptez sur votre autre connexion…",
-    "Stop & send recording": "Terminer et envoyer l’enregistrement",
-    "Record a voice message": "Enregistrer un message vocal",
-    "Invite messages are hidden by default. Click to show the message.": "Les messages d’invitation sont masqués par défaut. Cliquez pour voir le message.",
     "Quick actions": "Actions rapides",
     "Invite to just this room": "Inviter seulement dans ce salon",
     "Warn before quitting": "Avertir avant de quitter",
-    "Message search initilisation failed": "Échec de l’initialisation de la recherche de message",
     "Manage & explore rooms": "Gérer et découvrir les salons",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultation avec %(transferTarget)s. <a>Transfert à %(transferee)s</a>",
     "unknown person": "personne inconnue",
-    "Share decryption keys for room history when inviting users": "Partager les clés de déchiffrement lors de l’invitation d’utilisateurs",
-    "Send and receive voice messages (in development)": "Envoyez et recevez des messages vocaux (en développement)",
     "%(deviceId)s from %(ip)s": "%(deviceId)s depuis %(ip)s",
     "Review to ensure your account is safe": "Vérifiez pour assurer la sécurité de votre compte",
     "Sends the given message as a spoiler": "Envoie le message flouté",
@@ -3292,17 +2787,12 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Choisissez des salons ou conversations à ajouter. C’est un espace rien que pour vous, personne n’en sera informé. Vous pourrez en ajouter plus tard.",
     "What do you want to organise?": "Que voulez-vous organiser ?",
     "Filter all spaces": "Filtrer tous les espaces",
-    "Delete recording": "Supprimer l’enregistrement",
-    "Stop the recording": "Arrêter l’enregistrement",
     "%(count)s results in all spaces|one": "%(count)s résultat dans tous les espaces",
     "%(count)s results in all spaces|other": "%(count)s résultats dans tous les espaces",
     "You have no ignored users.": "Vous n’avez ignoré personne.",
     "Your access token gives full access to your account. Do not share it with anyone.": "Votre jeton d’accès donne un accès intégral à votre compte. Ne le partagez avec personne.",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Ceci est une fonctionnalité expérimentale.</b> Pour l’instant, les nouveaux utilisateurs recevant une invitation devront l’ouvrir sur <link/> pour poursuivre.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Pour rejoindre %(spaceName)s, activez <a>les espaces en bêta</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Pour visualiser %(spaceName)s, activez <a>les espaces en bêta</a>",
     "Select a room below first": "Sélectionnez un salon ci-dessous d’abord",
-    "Communities are changing to Spaces": "Les communautés deviennent des espaces",
     "Join the beta": "Rejoindre la bêta",
     "Leave the beta": "Quitter la bêta",
     "Beta": "Bêta",
@@ -3312,8 +2802,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Ajout du salon…",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Ajout des salons… (%(progress)s sur %(count)s)",
     "Not all selected were added": "Toute la sélection n’a pas été ajoutée",
-    "You can add existing spaces to a space.": "Vous pouvez ajouter des espaces existants à un espace.",
-    "Feeling experimental?": "L’esprit aventurier ?",
     "You are not allowed to view this server's rooms list": "Vous n’avez pas l’autorisation d’accéder à la liste des salons de ce serveur",
     "Error processing voice message": "Erreur lors du traitement du message vocal",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Nous n’avons pas détecté de microphone sur votre appareil. Merci de vérifier vos paramètres et de réessayer.",
@@ -3322,29 +2810,18 @@
     "Unable to access your microphone": "Impossible d’accéder à votre microphone",
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "L’esprit aventurier ? Les fonctionnalités expérimentales vous permettent de tester les nouveautés et aider à les polir avant leur lancement. <a>En apprendre plus</a>.",
     "Access Token": "Jeton d’accès",
-    "Spaces are a new way 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.",
     "Please enter a name for the space": "Veuillez renseigner un nom pour l’espace",
     "Connecting": "Connexion",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Autoriser le pair-à-pair (p2p) pour les appels individuels (si activé, votre correspondant pourra voir votre adresse IP)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Bêta disponible pour l’application web, de bureau et Android. Certains fonctionnalités pourraient ne pas être disponibles sur votre serveur d’accueil.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Vous pouvez quitter la bêta n’importe quand à partir des paramètres, ou en appuyant sur le badge bêta comme celui ci-dessus.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s va être redémarré avec les espaces activés. Les communautés et les étiquettes personnalisées seront cachés.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Bêta disponible pour l’application web, de bureau et Android. Merci d’essayer la bêta.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s va être redémarré avec les espaces désactivés. Les communautés et les étiquettes personnalisées seront de nouveau visibles.",
     "Spaces are a new way to group rooms and people.": "Les espaces sont un nouveau moyen de regrouper les salons et les personnes.",
     "Message search initialisation failed": "Échec de l’initialisation de la recherche de message",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Vos commentaires aideront à améliorer les espaces. N’hésitez pas à entrer dans les détails.",
     "%(featureName)s beta feedback": "Commentaires sur la bêta de %(featureName)s",
     "Thank you for your feedback, we really appreciate it.": "Merci pour vos commentaires, nous en sommes vraiment reconnaissants.",
-    "Beta feedback": "Commentaires sur la bêta",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Si vous quittez, %(brand)s sera rechargé avec les espaces désactivés. Les communautés et les étiquettes personnalisées seront à nouveau visibles.",
-    "Spaces are a beta feature.": "Les espaces sont une fonctionnalité en bêta.",
     "Search names and descriptions": "Rechercher par nom et description",
     "You may contact me if you have any follow up questions": "Vous pouvez me contacter si vous avez des questions par la suite",
     "To leave the beta, visit your settings.": "Pour quitter la bêta, consultez les paramètres.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Votre plateforme et nom d’utilisateur seront consignés pour nous aider à tirer le maximum de vos retours.",
     "Add reaction": "Ajouter une réaction",
-    "Send and receive voice messages": "Envoyer et recevoir des messages vocaux",
     "See when people join, leave, or are invited to this room": "Voir quand une personne rejoint, quitte ou est invitée sur ce salon",
     "Kick, ban, or invite people to this room, and make you leave": "Exclure, bannir ou inviter une personne dans ce salon et vous permettre de partir",
     "Space Autocomplete": "Autocomplétion d’espace",
@@ -3352,5 +2829,338 @@
     "sends space invaders": "Envoie les Space Invaders",
     "Sends the given message with a space themed effect": "Envoyer le message avec un effet lié au thème de l’espace",
     "See when people join, leave, or are invited to your active room": "Afficher quand des personnes rejoignent, partent, ou sont invités dans votre salon actif",
-    "Kick, ban, or invite people to your active room, and make you leave": "Expulser, bannir ou inviter des personnes dans votre salon actif et en partir"
+    "Kick, ban, or invite people to your active room, and make you leave": "Expulser, bannir ou inviter des personnes dans votre salon actif et en partir",
+    "Currently joining %(count)s rooms|one": "Vous êtes en train de rejoindre %(count)s salon",
+    "Currently joining %(count)s rooms|other": "Vous êtes en train de rejoindre %(count)s salons",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Essayez d'autres mots ou vérifiez les fautes de frappe. Certains salons peuvent ne pas être visibles car ils sont privés et vous devez être invité pour les rejoindre.",
+    "No results for \"%(query)s\"": "Aucun résultat pour « %(query)s »",
+    "The user you called is busy.": "L’utilisateur que vous avez appelé est indisponible.",
+    "User Busy": "Utilisateur indisponible",
+    "Teammates might not be able to view or join any private rooms you make.": "Votre équipe pourrait ne pas voir ou rejoindre les salons privés que vous créez.",
+    "Or send invite link": "Ou envoyer le lien d’invitation",
+    "If you can't see who you’re looking for, send them your invite link below.": "Si vous ne trouvez pas la personne que vous cherchez, envoyez leur le lien d’invitation ci-dessous.",
+    "Some suggestions may be hidden for privacy.": "Certaines suggestions pourraient être masquées pour votre confidentialité.",
+    "Search for rooms or people": "Rechercher des salons ou des gens",
+    "Forward message": "Transférer le message",
+    "Open link": "Ouvrir le lien",
+    "Sent": "Envoyé",
+    "You don't have permission to do this": "Vous n’avez pas les permissions nécessaires pour effectuer cette action",
+    "Error - Mixed content": "Erreur - Contenu mixte",
+    "Error loading Widget": "Erreur lors du chargement du widget",
+    "Pinned messages": "Messages épinglés",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Si vous avez les permissions, ouvrez le menu de n’importe quel message et sélectionnez <b>Épingler</b> pour les afficher ici.",
+    "Nothing pinned, yet": "Rien d’épinglé, pour l’instant",
+    "End-to-end encryption isn't enabled": "Le chiffrement de bout en bout n’est pas activé",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Toute autre raison. Veuillez décrire le problème.\nCeci sera signalé aux modérateurs du salon.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Cet utilisateur inonde le salon de publicités ou liens vers des publicités, ou vers de la propagande.\nCeci sera signalé aux modérateurs du salon.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Cet utilisateur fait preuve d’un comportement illicite, par exemple en publiant des informations personnelles d’autres ou en proférant des menaces.\nCeci sera signalé aux modérateurs du salon qui pourront l’escalader aux autorités.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Cet utilisateur fait preuve d’un comportement toxique, par exemple en insultant les autres ou en partageant du contenu pour adultes dans un salon familial, ou en violant les règles de ce salon.\nCeci sera signalé aux modérateurs du salon.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Ce que cet utilisateur écrit est déplacé.\nCeci sera signalé aux modérateurs du salon.",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototype de signalement aux modérateurs. Dans les salons qui prennent en charge la modération, le bouton `Signaler` vous permettra de dénoncer les abus aux modérateurs du salon",
+    "[number]": "[numéro]",
+    "To view %(spaceName)s, you need an invite": "Pour afficher %(spaceName)s, vous avez besoin d’une invitation",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Vous pouvez cliquer sur un avatar dans le panneau de filtrage à n’importe quel moment pour n’afficher que les salons et personnes associés à cette communauté.",
+    "Move down": "Descendre",
+    "Move up": "Remonter",
+    "Report": "Signaler",
+    "Collapse reply thread": "Masquer le fil de réponse",
+    "Show preview": "Afficher l’aperçu",
+    "View source": "Afficher la source",
+    "Forward": "Transférer",
+    "Settings - %(spaceName)s": "Paramètres - %(spaceName)s",
+    "Report the entire room": "Signaler le salon entier",
+    "Spam or propaganda": "Publicité ou propagande",
+    "Illegal Content": "Contenu illicite",
+    "Toxic Behaviour": "Comportement toxique",
+    "Disagree": "Désaccord",
+    "Please pick a nature and describe what makes this message abusive.": "Veuillez choisir la nature du rapport et décrire ce qui rend ce message abusif.",
+    "Please provide an address": "Veuillez fournir une adresse",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s a changé les listes de contrôle d’accès (ACLs) du serveur",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s a changé les liste de contrôle d’accès (ACLs) %(count)s fois",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ont changé les listes de contrôle d’accès (ACLs) du serveur",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ont changé les liste de contrôle d’accès (ACLs) %(count)s fois",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Échec de l’initialisation de la recherche de messages, vérifiez <a>vos paramètres</a> pour plus d’information",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Définissez les adresses de cet espace pour que les utilisateurs puissent le trouver avec votre serveur d’accueil (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Pour publier une adresse, elle doit d’abord être définie comme adresse locale.",
+    "Published addresses can be used by anyone on any server to join your room.": "Les adresses publiées peuvent être utilisées par tout le monde sur tous les serveurs pour rejoindre votre salon.",
+    "Published addresses can be used by anyone on any server to join your space.": "Les adresses publiées peuvent être utilisées par tout le monde sur tous les serveurs pour rejoindre votre espace.",
+    "This space has no local addresses": "Cet espace n’a pas d’adresse locale",
+    "Space information": "Informations de l’espace",
+    "Collapse": "Réduire",
+    "Expand": "Développer",
+    "Recommended for public spaces.": "Recommandé pour les espaces publics.",
+    "Allow people to preview your space before they join.": "Permettre aux personnes d’avoir un aperçu de l’espace avant de le rejoindre.",
+    "Preview Space": "Aperçu de l’espace",
+    "Decide who can view and join %(spaceName)s.": "Décider qui peut visualiser et rejoindre %(spaceName)s.",
+    "Visibility": "Visibilité",
+    "This may be useful for public spaces.": "Ceci peut être utile pour les espaces publics.",
+    "Guests can join a space without having an account.": "Les visiteurs peuvent rejoindre un espace sans disposer d’un compte.",
+    "Enable guest access": "Activer l’accès visiteur",
+    "Failed to update the history visibility of this space": "Échec de la mise à jour de la visibilité de l’historique pour cet espace",
+    "Failed to update the guest access of this space": "Échec de la mise à jour de l’accès visiteur de cet espace",
+    "Failed to update the visibility of this space": "Échec de la mise à jour de la visibilité de cet espace",
+    "Address": "Adresse",
+    "e.g. my-space": "par ex. mon-espace",
+    "Silence call": "Mettre l’appel en sourdine",
+    "Sound on": "Son activé",
+    "Show all rooms in Home": "Afficher tous les salons dans Accueil",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s a changé <a>les messages épinglés</a> du salon.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s a expulsé %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s a expulsé %(targetName)s : %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s a annulé l’invitation de %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s a annulé l’invitation de %(targetName)s : %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s a révoqué le bannissement de %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s a quitté le salon",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s a quitté le salon : %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s a rejeté l’invitation",
+    "%(targetName)s joined the room": "%(targetName)s a rejoint le salon",
+    "%(senderName)s made no change": "%(senderName)s n’a fait aucun changement",
+    "%(senderName)s set a profile picture": "%(senderName)s a défini une image de profil",
+    "%(senderName)s changed their profile picture": "%(senderName)s a changé son image de profil",
+    "%(senderName)s removed their profile picture": "%(senderName)s a supprimé son image de profil",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s a supprimé son nom d’affichage (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s a défini son nom affiché comme %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s a changé son nom d’affichage en %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s a banni %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s a banni %(targetName)s : %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s a accepté une invitation",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s a accepté l’invitation pour %(displayName)s",
+    "Some invites couldn't be sent": "Certaines invitations n’ont pas pu être envoyées",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Nous avons envoyé les invitations, mais les personnes ci-dessous n’ont pas pu être invitées à rejoindre <RoomName/>",
+    "Integration manager": "Gestionnaire d’intégration",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Votre %(brand)s ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Contactez un administrateur.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s et votre gestionnaire d’intégrations.",
+    "Identity server is": "Le serveur d'identité est",
+    "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.",
+    "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.",
+    "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.",
+    "Identity server": "Serveur d’identité",
+    "Identity server (%(server)s)": "Serveur d’identité (%(server)s)",
+    "Could not connect to identity server": "Impossible de se connecter au serveur d’identité",
+    "Not a valid identity server (status code %(code)s)": "Serveur d’identité non valide (code de statut %(code)s)",
+    "Identity server URL must be HTTPS": "L’URL du serveur d’identité doit être en HTTPS",
+    "User Directory": "Répertoire utilisateur",
+    "Error processing audio message": "Erreur lors du traitement du message audio",
+    "Show %(count)s other previews|one": "Afficher %(count)s autre aperçu",
+    "Show %(count)s other previews|other": "Afficher %(count)s autres aperçus",
+    "Images, GIFs and videos": "Images, GIF et vidéos",
+    "Code blocks": "Blocs de code",
+    "Displaying time": "Affichage de l’heure",
+    "To view all keyboard shortcuts, click here.": "Pour afficher tous les raccourcis clavier, cliquez ici.",
+    "Keyboard shortcuts": "Raccourcis clavier",
+    "There was an error loading your notification settings.": "Une erreur est survenue lors du chargement de vos paramètres de notification.",
+    "Mentions & keywords": "Mentions et mots-clés",
+    "Global": "Global",
+    "New keyword": "Nouveau mot-clé",
+    "Keyword": "Mot-clé",
+    "Enable email notifications for %(email)s": "Activer les notifications par e-mail pour %(email)s",
+    "Enable for this account": "Activer pour ce compte",
+    "An error occurred whilst saving your notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notification.",
+    "Error saving notification preferences": "Erreur lors de la sauvegarde des préférences de notification",
+    "Messages containing keywords": "Message contenant les mots-clés",
+    "Use Ctrl + F to search timeline": "Utilisez Ctrl + F pour rechercher dans le fil de discussion",
+    "Use Command + F to search timeline": "Utilisez Commande + F pour rechercher dans le fil de discussion",
+    "User %(userId)s is already invited to the room": "L’utilisateur %(userId)s est déjà invité dans le salon",
+    "Transfer Failed": "Échec du transfert",
+    "Unable to transfer call": "Impossible de transférer l’appel",
+    "Send pseudonymous analytics data": "Envoyer des données de télémétrie pseudonymisées",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Pour aider les membres de l’espace à trouver et rejoindre un salon privé, allez dans les paramètres de confidentialité de ce salon.",
+    "Help space members find private rooms": "Aidez les membres de l’espace à trouver des salons privés",
+    "Help people in spaces to find and join private rooms": "Aidez les personnes dans les espaces à trouver et rejoindre des salons privés",
+    "New in the Spaces beta": "Nouveautés dans les espaces en bêta",
+    "Decide who can join %(roomName)s.": "Choisir qui peut rejoindre %(roomName)s.",
+    "Space members": "Membres de l’espace",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Tout le monde dans un espace peut trouver et venir. Vous pouvez sélectionner plusieurs espaces.",
+    "Spaces with access": "Espaces avec accès",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Tout le monde dans un espace peut trouver et venir. <a>Éditer les accès des espaces ici.</a>",
+    "Currently, %(count)s spaces have access|other": "%(count)s espaces ont actuellement l’accès",
+    "& %(count)s more|other": "& %(count)s de plus",
+    "Upgrade required": "Mise-à-jour nécessaire",
+    "Anyone can find and join.": "Tout le monde peut trouver et venir.",
+    "Only invited people can join.": "Seules les personnes invitées peuvent venir.",
+    "Private (invite only)": "Privé (sur invitation)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Cette mise-à-jour permettra aux membres des espaces sélectionnés d’accéder à ce salon sans invitation.",
+    "Message bubbles": "Message en bulles",
+    "IRC": "IRC",
+    "Show all rooms": "Afficher tous les salons",
+    "Give feedback.": "Écrire un commentaire.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Merci d’essayer les espaces. Vos commentaires permettront d’améliorer les prochaines versions.",
+    "Spaces feedback": "Commentaires sur les espaces",
+    "Spaces are a new feature.": "Les espaces sont une fonctionnalité nouvelle.",
+    "Your camera is still enabled": "Votre caméra est toujours allumée",
+    "Your camera is turned off": "Votre caméra est éteinte",
+    "%(sharerName)s is presenting": "%(sharerName)s est à l’écran",
+    "You are presenting": "Vous êtes à l’écran",
+    "All rooms you're in will appear in Home.": "Tous les salons dans lesquels vous vous trouvez apparaîtront sur l’Accueil.",
+    "New layout switcher (with message bubbles)": "Nouveau sélecteur de disposition (avec les messages en bulles)",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Cela permet de garder facilement un salon privé dans un espace, tout en laissant la possibilité aux gens de trouver l’espace et de le rejoindre. Tous les nouveaux salons de cet espace auront cette option disponible.",
+    "Adding spaces has moved.": "L’ajout d’espaces a été déplacé.",
+    "Search for rooms": "Rechercher des salons",
+    "Search for spaces": "Rechercher des espaces",
+    "Create a new space": "Créer un nouvel espace",
+    "Want to add a new space instead?": "Vous voulez plutôt ajouter un nouvel espace ?",
+    "Add existing space": "Ajouter un espace existant",
+    "Share content": "Partager le contenu",
+    "Application window": "Fenêtre d’application",
+    "Share entire screen": "Partager l’écran entier",
+    "Image": "Image",
+    "Sticker": "Autocollant",
+    "Decrypting": "Déchiffrement",
+    "The call is in an unknown state!": "Cet appel est dans un état inconnu !",
+    "An unknown error occurred": "Une erreur inconnue s’est produite",
+    "Their device couldn't start the camera or microphone": "Leur appareil n’a pas pu démarrer la caméra ou le microphone",
+    "Connection failed": "Connexion échouée",
+    "Could not connect media": "Impossible de se connecter au média",
+    "Call back": "Rappeler",
+    "Copy Room Link": "Copier le lien du salon",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Vous pouvez désormais partager votre écran à l’aide du bouton « partager l’écran » pendant un appel. Il est même possible de le faire pendant un appel audio si les deux parties le prennent en charge !",
+    "Screen sharing is here!": "Le partage d’écran est arrivé !",
+    "Access": "Accès",
+    "People with supported clients will be able to join the room without having a registered account.": "Les personnes utilisant un client pris en charge pourront rejoindre le salon sans compte.",
+    "We're working on this, but just want to let you know.": "Nous travaillons dessus, mais c'est juste pour vous le faire savoir.",
+    "Search for rooms or spaces": "Rechercher des salons ou des espaces",
+    "Unable to copy a link to the room to the clipboard.": "Impossible de copier le lien du salon dans le presse-papier.",
+    "Unable to copy room link": "Impossible de copier le lien du salon",
+    "Error downloading audio": "Erreur lors du téléchargement de l’audio",
+    "Unnamed audio": "Audio sans nom",
+    "Add space": "Ajouter un espace",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Veuillez notez que la mise-à-jour va créer une nouvelle version de ce salon</b>. Tous les messages actuels resteront dans ce salon archivé.",
+    "Automatically invite members from this room to the new one": "Inviter automatiquement les membres de ce salon dans le nouveau",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Ce salon est utilisé pour du contenu toxique ou illégal, ou les modérateurs ont échoué à modérer le contenu toxique ou illégal.\n Cela sera signalé aux administrateurs de %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Ce salon est utilisé pour du contenu toxique ou illégal, ou les modérateurs ont échoué à modérer le contenu toxique ou illégal.\nCela sera signalé aux administrateurs de %(homeserver)s. Les administrateurs ne pourront PAS lire le contenu chiffré ce salon.",
+    "These are likely ones other room admins are a part of.": "Ces autres administrateurs du salon en font probablement partie.",
+    "Other spaces or rooms you might not know": "Autres espaces ou salons que vous pourriez ne pas connaître",
+    "Spaces you know that contain this room": "Les espaces connus qui contiennent ce salon",
+    "Search spaces": "Rechercher des espaces",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Choisir quels espaces peuvent accéder à ce salon. Si un espace est sélectionné, ses membres pourront trouver et rejoindre <RoomName/>.",
+    "Select spaces": "Sélectionner des espaces",
+    "You're removing all spaces. Access will default to invite only": "Vous allez supprimer tous les espaces. L’accès se fera sur invitation uniquement par défaut",
+    "Leave %(spaceName)s": "Quitter %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Vous êtes le seul administrateur de certains salons ou espaces que vous souhaitez quitter. En les quittant, vous les laisserez sans aucun administrateur.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Vous êtes le seul administrateur de cet espace. En le quittant, plus personne n’aura le contrôle dessus.",
+    "You won't be able to rejoin unless you are re-invited.": "Il vous sera impossible de revenir à moins d’y être réinvité.",
+    "Search %(spaceName)s": "Rechercher %(spaceName)s",
+    "Want to add an existing space instead?": "Vous voulez plutôt ajouter un espace existant ?",
+    "Private space (invite only)": "Espace privé (uniquement sur invitation)",
+    "Space visibility": "Visibilité de l’espace",
+    "Add a space to a space you manage.": "Ajouter un espace à l’espace que vous gérez.",
+    "Only people invited will be able to find and join this space.": "Seules les personnes invitées pourront trouver et rejoindre cet espace.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Quiconque pourra trouver et rejoindre cet espace, pas seulement les membres de <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Tous les membres de <SpaceName/> pourront trouver et venir.",
+    "Visible to space members": "Visible pour les membres de l'espace",
+    "Public room": "Salon public",
+    "Private room (invite only)": "Salon privé (uniquement sur invitation)",
+    "Room visibility": "Visibilité du salon",
+    "Create a room": "Créer un salon",
+    "Only people invited will be able to find and join this room.": "Seules les personnes invitées pourront trouver et rejoindre ce salon.",
+    "Anyone will be able to find and join this room.": "Quiconque pourra trouver et rejoindre ce salon.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Quiconque pourra trouver et rejoindre ce salon, pas seulement les membres de <SpaceName/>.",
+    "You can change this at any time from room settings.": "Vous pouvez changer ceci n’importe quand depuis les paramètres du salon.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Tout le monde dans <SpaceName/> pourra trouver et rejoindre ce salon.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s a changé %(count)s fois les <a>messages épinglés</a> du salon.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s ont changé %(count)s fois les <a>messages épinglés</a> du salon.",
+    "Missed call": "Appel manqué",
+    "Call declined": "Appel rejeté",
+    "Stop recording": "Arrêter l’enregistrement",
+    "Send voice message": "Envoyer un message vocal",
+    "Olm version:": "Version de Olm :",
+    "Mute the microphone": "Désactiver le microphone",
+    "Unmute the microphone": "Activer le microphone",
+    "Dialpad": "Pavé numérique",
+    "More": "Plus",
+    "Show sidebar": "Afficher la barre latérale",
+    "Hide sidebar": "Masquer la barre latérale",
+    "Start sharing your screen": "Commencer à partager mon écran",
+    "Stop sharing your screen": "Arrêter de partager mon écran",
+    "Stop the camera": "Arrêter la caméra",
+    "Start the camera": "Démarrer la caméra",
+    "Surround selected text when typing special characters": "Entourer le texte sélectionné lors de la saisie de certains caractères",
+    "Created from <Community />": "Créé à partir de <Community />",
+    "Communities won't receive further updates.": "Les communautés ne recevront plus de mises-à-jour.",
+    "Spaces are a new way to make a community, with new features coming.": "Les espaces sont une nouvelle manière de créer une communauté, avec l’apparition de nouvelles fonctionnalités.",
+    "Communities can now be made into Spaces": "Les communautés peuvent maintenant être transformées en espaces",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Demandez aux <a>administrateurs</a> de cette communauté de la transformer en espace et attendez l’invitation.",
+    "You can create a Space from this community <a>here</a>.": "Vous pouvez créer un espace à partir de cette communauté <a>ici</a>.",
+    "This description will be shown to people when they view your space": "Cette description sera affichée aux personnes qui verront votre espace",
+    "Flair won't be available in Spaces for the foreseeable future.": "Les badges ne seront pas disponibles pour les espaces dans un futur proche.",
+    "All rooms will be added and all community members will be invited.": "Tous les salons seront ajoutés et tous les membres de la communauté seront invités.",
+    "A link to the Space will be put in your community description.": "A lien vers l’espace sera ajouté dans la description de votre communauté.",
+    "Create Space from community": "Créer un espace à partir d’une communauté",
+    "Failed to migrate community": "Échec lors de la migration de la communauté",
+    "To create a Space from another community, just pick the community in Preferences.": "Pour créer un espace à partir d’une autre communauté, choisissez là simplement dans les préférences.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> a été créé et tous ceux qui faisaient partie de la communauté y ont été invités.",
+    "Space created": "Espace créé",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Pour voir les espaces, cachez les communautés dans les <a>préférences</a>",
+    "This community has been upgraded into a Space": "Cette communauté a été mise-à-jour vers un espace",
+    "Unknown failure: %(reason)s": "Erreur inconnue : %(reason)s",
+    "No answer": "Pas de réponse",
+    "If a community isn't shown you may not have permission to convert it.": "Si une communauté n’est pas affichée, vous n’avez peut-être pas le droit de la convertir.",
+    "Show my Communities": "Afficher mes communautés",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Les communautés ont été archivés pour faire place aux espaces mais il est possible de convertir vos communautés en espaces ci-dessous. La conversion garantira à vos conversions l’accès aux fonctionnalités les plus récentes.",
+    "Create Space": "Créer l’espace",
+    "Open Space": "Ouvrir l’espace",
+    "You can change this later.": "Vous pourrez changer ceci plus tard.",
+    "What kind of Space do you want to create?": "Quel type d’espace voulez-vous créer ?",
+    "Delete avatar": "Supprimer l’avatar",
+    "Don't send read receipts": "Ne pas envoyer les accusés de réception",
+    "Rooms and spaces": "Salons et espaces",
+    "Results": "Résultats",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Les journaux de débogage contiennent les données d’utilisation de l’application incluant votre nom d’utilisateur, les identifiants ou les alias des salons ou groupes que vous avez visités, les derniers élément de l’interface avec lesquels vous avez interagis, et les noms d’utilisateurs des autres utilisateurs. Ils ne contiennent pas de messages.",
+    "Thread": "Discussion",
+    "Show threads": "Afficher les fils de discussion",
+    "Enable encryption in settings.": "Activer le chiffrement dans les paramètres.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Vos messages privés sont normalement chiffrés, mais ce salon ne l’est pas. Cela est généralement dû à un périphérique non supporté, ou à un moyen de communication non supporté comme les invitations par e-mail.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Pour éviter ces problèmes, créez un <a>nouveau salon public</a> pour la conversation que vous souhaitez avoir.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Il n’est pas recommandé de rendre public les salons chiffrés.</b> Cela veut dire que quiconque pourra trouver et rejoindre le salon, donc tout le monde pourra lire les messages. Vous n’aurez plus aucun avantage lié au chiffrement. Chiffrer les messages dans un salon public ralentira la réception et l’envoi de messages.",
+    "Are you sure you want to make this encrypted room public?": "Êtes-vous sûr de vouloir rendre public ce salon chiffré ?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Pour éviter ces problèmes, créez un <a>nouveau salon chiffré</a> pour la conversation que vous souhaitez avoir.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Il n'est pas recommandé d’ajouter le chiffrement aux salons publics.</b> Tout le monde peut trouver et rejoindre les salons publics, donc tout le monde peut lire les messages qui s’y trouvent. Vous n’aurez aucun des avantages du chiffrement, et vous ne pourrez pas le désactiver plus tard. Chiffrer les messages dans un salon public ralentira la réception et l’envoi de messages.",
+    "Are you sure you want to add encryption to this public room?": "Êtes-vous sûr de vouloir ajouter le chiffrement dans ce salon public ?",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Si vous avez soumis un rapport d’anomalie via GitHub, les journaux de débogage nous aiderons à localiser le problème. Les journaux de débogage contiennent les données d’utilisation de l’application incluant votre nom d’utilisateur, les identifiants ou les alias des salons ou groupes que vous avez visités, les derniers élément de l’interface avec lesquels vous avez interagis, et les noms d’utilisateurs des autres utilisateurs. Ils ne contiennent pas de messages.",
+    "Cross-signing is ready but keys are not backed up.": "La signature croisée est prête mais les clés ne sont pas sauvegardées.",
+    "Low bandwidth mode (requires compatible homeserver)": "Mode faible bande passante (nécessite un serveur d’accueil compatible)",
+    "Autoplay videos": "Jouer automatiquement les vidéos",
+    "Autoplay GIFs": "Jouer automatiquement les GIFs",
+    "Multiple integration managers (requires manual setup)": "Multiple gestionnaires d’intégration (nécessite un réglage manuel)",
+    "Threaded messaging": "Fils de discussion",
+    "The above, but in <Room /> as well": "Comme ci-dessus, mais également dans <Room />",
+    "The above, but in any room you are joined or invited to as well": "Comme ci-dessus, mais également dans tous les salons dans lesquels vous avez été invité ou que vous avez rejoint",
+    "Currently, %(count)s spaces have access|one": "Actuellement, un espace a accès",
+    "& %(count)s more|one": "& %(count)s autres",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s a désépinglé un message de ce salon. Voir tous les messages épinglés.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s a désépinglé <a>un message</a> de ce salon. Voir tous les <b>messages épinglés</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s a épinglé un message dans ce salon. Voir tous les messages épinglés.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s a épinglé <a>un message</a> dans ce salon. Voir tous les <b>messages épinglés</b>.",
+    "Some encryption parameters have been changed.": "Certains paramètres de chiffrement ont été changés.",
+    "Role in <RoomName/>": "Rôle dans <RoomName/>",
+    "Explore %(spaceName)s": "Explorer %(spaceName)s",
+    "Send a sticker": "Envoyer un autocollant",
+    "Reply to thread…": "Répondre au fil…",
+    "Reply to encrypted thread…": "Répondre au fil chiffré…",
+    "Add emoji": "Ajouter une émoticône",
+    "To join this Space, hide communities in your <a>preferences</a>": "Pour rejoindre cet espace, cachez les communautés dans vos <a>préférences</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "Pour voir cet espace, cachez les communautés dans vos <a>préférences</a>",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Pour rejoindre %(communityName)s, changez pour les communautés dans vos <a>préférences</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Pour voir %(communityName)s, changez pour les communautés dans vos <a>préférences</a>",
+    "Private community": "Communauté privée",
+    "Public community": "Communauté publique",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s ont réagi avec %(content)s",
+    "Message": "Message",
+    "Joining space …": "Entrée dans l’espace…",
+    "Message didn't send. Click for info.": "Le message n’a pas été envoyé. Cliquer pour plus d’info.",
+    "Unknown failure": "Erreur inconnue",
+    "Failed to update the join rules": "Échec de mise-à-jour des règles pour rejoindre le salon",
+    "Select the roles required to change various parts of the space": "Sélectionner les rôles nécessaires pour modifier les différentes parties de l’espace",
+    "Change description": "Changer la description",
+    "Change main address for the space": "Changer l’adresse principale de l’espace",
+    "Change space name": "Changer le nom de l’espace",
+    "Change space avatar": "Changer l’avatar de l’espace",
+    "Upgrade anyway": "Mettre-à-jour quand même",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Ce salon se trouve dans certains espaces pour lesquels vous n’êtes pas administrateur. Dans ces espaces, l’ancien salon sera toujours afficher, mais un message sera affiché pour inciter les personnes à rejoindre le nouveau salon.",
+    "Before you upgrade": "Avant de mettre-à-jour",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Quiconque dans <spaceName/> peut trouver et rejoindre. Vous pouvez également choisir d’autres espaces.",
+    "To join a space you'll need an invite.": "Vous avez besoin d’une invitation pour rejoindre un espace.",
+    "You can also make Spaces from <a>communities</a>.": "Vous pouvez également créer des espaces à partir de <a>communautés</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Montre temporairement les communautés au lieu des espaces pour cette session. Il ne sera plus possible de le faire dans un futur proche. Cela va recharger Element.",
+    "Display Communities instead of Spaces": "Afficher les communautés au lieu des espaces"
 }
diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json
index c98107b767..b27a22babf 100644
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@@ -25,14 +25,10 @@
     "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í",
@@ -41,16 +37,12 @@
     "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",
@@ -59,9 +51,6 @@
     "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:",
@@ -85,7 +74,6 @@
     "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",
@@ -102,13 +90,9 @@
     "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",
@@ -120,8 +104,6 @@
     "Setting:": "Socrú:",
     "Value": "Luach",
     "Abort": "Tobscoir",
-    "Windows": "Fuinneoga",
-    "Screens": "Scáileáin",
     "Transfer": "Aistrigh",
     "Hold": "Fan",
     "Resume": "Tosaigh arís",
@@ -129,7 +111,6 @@
     "Homeserver": "Freastalaí baile",
     "Approve": "Ceadaigh",
     "Filter": "Scag",
-    "Role": "Ról",
     "Zimbabwe": "an tSiombáib",
     "Zambia": "an tSaimbia",
     "Yemen": "Éimin",
@@ -495,7 +476,6 @@
     "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",
@@ -504,14 +484,14 @@
     "Invite": "Tabhair cuireadh",
     "Mention": "Luaigh",
     "Demote": "Bain ceadanna",
-    "Ban": "Coisc",
+    "Ban": "Toirmisc",
     "Kick": "Caith amach",
     "Disinvite": "Tarraing siar cuireadh",
     "Encrypted": "Criptithe",
     "Encryption": "Criptiúchán",
     "Anyone": "Aon duine",
     "Permissions": "Ceadanna",
-    "Unban": "Bain an coisc",
+    "Unban": "Bain an cosc",
     "Browse": "Brabhsáil",
     "Reset": "Athshocraigh",
     "Sounds": "Fuaimeanna",
@@ -537,7 +517,6 @@
     "Noisy": "Callánach",
     "On": "Ar siúl",
     "Off": "Múchta",
-    "Keywords": "Eochairfhocail",
     "Advanced": "Forbartha",
     "Add": "Cuir",
     "Remove": "Bain",
@@ -671,5 +650,156 @@
     "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ú"
+    "Create account": "Déan cuntas a chruthú",
+    "Deactivate Account": "Cuir cuntas as feidhm",
+    "Account management": "Bainistíocht cuntais",
+    "Phone numbers": "Uimhreacha guthán",
+    "Email addresses": "Seoltaí r-phost",
+    "Display Name": "Ainm Taispeána",
+    "Profile picture": "Pictiúr próifíle",
+    "Phone Number": "Uimhir Fóin",
+    "Verification code": "Cód fíoraithe",
+    "Notification targets": "Spriocanna fógraí",
+    "Results": "Torthaí",
+    "Hangup": "Cuir síos",
+    "Dialpad": "Eochaircheap",
+    "More": "Níos mó",
+    "Decrypting": "Ag Díchriptiú",
+    "Adding...": "Ag Cur...",
+    "Access": "Rochtain",
+    "Image": "Íomhá",
+    "Sticker": "Greamán",
+    "IRC": "IRC",
+    "Modern": "Comhaimseartha",
+    "Global": "Uilíoch",
+    "Keyword": "Eochairfhocal",
+    "[number]": "[uimhir]",
+    "Report": "Tuairiscigh",
+    "Forward": "Seol ar aghaidh",
+    "Disagree": "Easaontaigh",
+    "Collapse": "Cumaisc",
+    "Expand": "Leath",
+    "Visibility": "Léargas",
+    "Address": "Seoladh",
+    "Sent": "Seolta",
+    "Beta": "Béite",
+    "Connecting": "Ag Ceangal",
+    "Play": "Cas",
+    "Pause": "Cuir ar sos",
+    "Sending": "Ag Seoladh",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "Avatar": "Abhatár",
+    "Removing...": "Ag Baint...",
+    "Suggested": "Moltaí",
+    "The file '%(fileName)s' failed to upload.": "Níor éirigh leis an gcomhad '%(fileName)s' a uaslódáil.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Ag an am seo ní féidir freagra a thabhairt le comhad. Ar mhaith leat an comhad seo a uaslódáil gan freagra a thabhairt?",
+    "Replying With Files": "Ag Freagairt le Comhaid",
+    "You do not have permission to start a conference call in this room": "Níl cead agat glao comhdhála a thosú sa seomra seo",
+    "You cannot place a call with yourself.": "Ní féidir leat glaoch ort féin.",
+    "The user you called is busy.": "Tá an t-úsáideoir ar a ghlaoigh tú gnóthach.",
+    "User Busy": "Úsáideoir Gnóthach",
+    "Share your public space": "Roinn do spás poiblí",
+    "Invite to %(spaceName)s": "Tabhair cuireadh chun %(spaceName)s",
+    "Unnamed room": "Seomra gan ainm",
+    "Command error": "Earráid ordaithe",
+    "Server error": "Earráid freastalaí",
+    "Upload file": "Uaslódáil comhad",
+    "Video call": "Físghlao",
+    "Voice call": "Glao gutha",
+    "Admin Tools": "Uirlisí Riaracháin",
+    "Demote yourself?": "Tabhair ísliú céime duit féin?",
+    "Enable encryption?": "Cumasaigh criptiú?",
+    "Banned users": "Úsáideoirí toirmiscthe",
+    "Muted Users": "Úsáideoirí Fuaim",
+    "Privileged Users": "Úsáideoirí Pribhléideacha",
+    "Notify everyone": "Tabhair fógraí do gach duine",
+    "Ban users": "Toirmisc úsáideoirí",
+    "Kick users": "Caith úsáideoirí amach",
+    "Change settings": "Athraigh socruithe",
+    "Invite users": "Tabhair cuirí d'úsáideoirí",
+    "Send messages": "Seol teachtaireachtaí",
+    "Default role": "Gnáth-ról",
+    "Modify widgets": "Mionathraigh giuirléidí",
+    "Change topic": "Athraigh ábhar",
+    "Change permissions": "Athraigh ceadanna",
+    "Notification sound": "Fuaim fógra",
+    "Uploaded sound": "Fuaim uaslódáilte",
+    "URL Previews": "Réamhamhairc URL",
+    "Room Addresses": "Seoltaí Seomra",
+    "Open Devtools": "Oscail Devtools",
+    "Developer options": "Roghanna forbróra",
+    "Room version:": "Leagan seomra:",
+    "Room version": "Leagan seomra",
+    "Too Many Calls": "Barraíocht Glaonna",
+    "You cannot place VoIP calls in this browser.": "Ní féidir leat glaonna VoIP a chur sa brabhsálaí seo.",
+    "VoIP is unsupported": "Tá VoIP gan tacaíocht",
+    "No other application is using the webcam": "Níl aon fheidhmchlár eile ag úsáid an cheamara gréasáin",
+    "Permission is granted to use the webcam": "Tugtar cead an ceamara gréasáin a úsáid",
+    "A microphone and webcam are plugged in and set up correctly": "Tá micreafón agus ceamara gréasáin plugáilte isteach agus curtha ar bun i gceart",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Níor glaodh toisc nach raibh rochtain ar ceamara gréasáin nó mhicreafón. Seiceáil go:",
+    "Unable to access webcam / microphone": "Ní féidir rochtain a fháil ar ceamara gréasáin / mhicreafón",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Níor glaodh toisc nach raibh rochtain ar mhicreafón. Seiceáil go bhfuil micreafón plugáilte isteach agus curtha ar bun i gceart.",
+    "Which rooms would you like to add to this community?": "Cé na seomraí ar mhaith leat a chur leis an bpobal seo?",
+    "Invite to Community": "Tabhair cuireadh chun an pobal",
+    "Name or Matrix ID": "Ainm nó ID Matrix",
+    "Invite new community members": "Tabhair cuireadh do baill nua chun an phobail",
+    "Who would you like to add to this community?": "Cé ba mhaith leat a chur leis an bpobal seo?",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "Failure to create room": "Níorbh fhéidir an seomra a chruthú",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Sáraíonn an comhad '%(fileName)s' teorainn méide an freastalaí baile seo le haghaidh uaslódálacha",
+    "The server does not support the room version specified.": "Ní thacaíonn an freastalaí leis an leagan seomra a shonraítear.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "D’fhéadfadh nach mbeadh an freastalaí ar fáil, ró-ualaithe, nó fuair tú fabht.",
+    "Rooms and spaces": "Seomraí agus spásanna",
+    "Collapse reply thread": "Cuir na freagraí i bhfolach",
+    "Threaded messaging": "Teachtaireachtaí i snáitheanna",
+    "Thread": "Snáithe",
+    "Show threads": "Taispeáin snáitheanna",
+    "Low priority": "Tosaíocht íseal",
+    "Start chat": "Tosaigh comhrá",
+    "Share room": "Roinn seomra",
+    "Forget room": "Déan dearmad ar an seomra",
+    "Join Room": "Téigh isteach an seomra",
+    "(~%(count)s results)|one": "(~%(count)s toradh)",
+    "(~%(count)s results)|other": "(~%(count)s torthaí)",
+    "World readable": "Inléite ag gach duine",
+    "Communities can now be made into Spaces": "Is féidir Pobail a dhéanamh ina Spásanna anois",
+    "Spaces are a new way to make a community, with new features coming.": "Is bealach nua iad spásanna chun pobal a dhéanamh, le gnéithe nua ag teacht.",
+    "Communities won't receive further updates.": "Ní bhfaighidh pobail nuashonruithe breise.",
+    "Created from <Community />": "Cruthaithe ó <Community />",
+    "No answer": "Gan freagair",
+    "Unknown failure: %(reason)s": "Teip anaithnid: %(reason)s",
+    "Low bandwidth mode (requires compatible homeserver)": "Modh bandaleithid íseal (teastaíonn freastalaí comhoiriúnach)",
+    "Enable encryption in settings.": "Tosaigh criptiú sna socruithe.",
+    "Cross-signing is ready but keys are not backed up.": "Tá tras-sínigh réidh ach ní dhéantar cóip chúltaca d'eochracha.",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "",
+    "You can create a Space from this community <a>here</a>.": "",
+    "Bans user with given id": "Toirmisc úsáideoir leis an ID áirithe",
+    "Failed to reject invitation": "Níorbh fhéidir an cuireadh a dhiúltú",
+    "Failed to reject invite": "Níorbh fhéidir an cuireadh a dhiúltú",
+    "Failed to mute user": "Níor ciúnaíodh an úsáideoir",
+    "Failed to load timeline position": "Níor lódáladh áit amlíne",
+    "Failed to kick": "Níor caitheadh amach é",
+    "Failed to forget room %(errCode)s": "Níor dhearnadh dearmad ar an seomra %(errCode)s",
+    "Failed to join room": "Níor éiríodh le dul isteach an seomra",
+    "Failed to change power level": "Níor éiríodh leis an leibhéal cumhachta a hathrú",
+    "Failed to change password. Is your password correct?": "Níor éiríodh leis do phasfhocal a hathrú. An bhfuil do phasfhocal ceart?",
+    "Failed to ban user": "Níor éiríodh leis an úsáideoir a thoirmeasc",
+    "Export E2E room keys": "Easpórtáil eochracha an tseomra le criptiú ó dheireadh go deireadh",
+    "Error decrypting attachment": "Earráid le ceangaltán a dhíchriptiú",
+    "Enter passphrase": "Iontráil pasfrása",
+    "Email address": "Seoladh ríomhphoist",
+    "Download %(text)s": "Íoslódáil %(text)s",
+    "Deops user with given id": "Bain an cumhacht oibritheora ó úsáideoir leis an ID áirithe",
+    "Decrypt %(text)s": "Díchriptigh %(text)s",
+    "Custom level": "Leibhéal saincheaptha",
+    "Create Room": "Déan Seomra",
+    "Changes your display nickname": "Athraíonn sé d'ainm taispeána",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "D'athraigh %(senderDisplayName)s an ábhar go \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "Bhain %(senderDisplayName)s ainm an tseomra.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "D'athraigh %(senderDisplayName)s ainm an tseomra go %(roomName)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "D'athraigh %(senderName)s an leibhéal cumhachta %(powerLevelDiffText)s.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Ní féidir ceangal leis an bhfreastalaí baile trí HTTP nuair a bhíonn URL HTTPS i mbarra do bhrabhsálaí. Bain úsáid as HTTPS nó <a> scripteanna neamhshábháilte a chumasú </a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ní féidir ceangal leis an bhfreastalaí baile - seiceáil do nascacht le do thoil, déan cinnte go bhfuil muinín i dteastas <a>SSL do fhreastalaí baile</a>, agus nach bhfuil síneadh brabhsálaí ag cur bac ar iarratais."
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 12a2dcd8c3..82c01da943 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -2,16 +2,11 @@
     "This email address is already in use": "Xa se está a usar este email",
     "This phone number is already in use": "Xa se está a usar este teléfono",
     "Failed to verify email address: make sure you clicked the link in the email": "Fallo na verificación do enderezo de correo: asegúrese de ter picado na ligazón do correo",
-    "The remote side failed to pick up": "O correspondente non respondeu",
-    "Unable to capture screen": "Non se puido capturar a pantalla",
-    "Existing Call": "Rexistro de chamadas",
-    "You are already in a call.": "Xa estás nunha chamada.",
     "VoIP is unsupported": "Sen soporte para VoIP",
     "You cannot place VoIP calls in this browser.": "Non poden establecer chamadas VoIP neste navegador.",
     "You cannot place a call with yourself.": "Non podes facer unha chamada a ti mesma.",
     "Warning!": "Aviso!",
     "Call Failed": "Fallou a chamada",
-    "Call Timeout": "Tempo de resposta de chamada",
     "Upload Failed": "Fallou o envío",
     "Sun": "Dom",
     "Mon": "Lun",
@@ -60,7 +55,6 @@
     "Admin": "Administrador",
     "Operation failed": "Fallou a operación",
     "Failed to invite": "Fallou o convite",
-    "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando as seguintes usuarias á sala %(roomName)s:",
     "You need to be logged in.": "Precisa estar conectada.",
     "You need to be able to invite users to do that.": "Precisa autorización para convidar a outros usuarias para poder facer iso.",
     "Unable to create widget.": "Non se puido crear o trebello.",
@@ -73,43 +67,17 @@
     "Room %(roomId)s not visible": "A sala %(roomId)s non é visible",
     "Missing user_id in request": "Falta o user_id na petición",
     "Usage": "Uso",
-    "/ddg is not a command": "/ddg non é unha orde",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para utilizala, agarda a que carguen os resultados de autocompletado e escolle entre eles.",
     "Ignored user": "Usuaria ignorada",
     "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
     "Unignored user": "Usuarias non ignoradas",
     "You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s",
     "Verified key": "Chave verificada",
     "Reason": "Razón",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceptou o convite.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitou unha conferencia VoIP.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou a %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bloqueou a %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableceu o seu nome público a %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminou o seu nome público (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s eliminou a súa imaxe de perfil.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.",
-    "%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.",
-    "VoIP conference started.": "Comezou a conferencia VoIP.",
-    "%(targetName)s joined the room.": "%(targetName)s uniuse a sala.",
-    "VoIP conference finished.": "Rematou a conferencia VoIP.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.",
-    "%(targetName)s left the room.": "%(targetName)s deixou a sala.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desbloqueou a %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsou a %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s rexeitou o convite de %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambiou o asunto a \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminou o nome da sala.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambiou o nome da sala a %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou unha imaxe.",
     "Someone": "Alguén",
-    "(not supported by this browser)": "(non soportado por este navegador)",
-    "%(senderName)s answered the call.": "%(senderName)s respondeu a chamada.",
-    "(could not connect media)": "(non puido conectar os medios)",
-    "(no answer)": "(sen resposta)",
-    "(unknown failure: %(reason)s)": "(fallo descoñecido: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s rematou a chamada.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
@@ -133,18 +101,11 @@
     "Message Pinning": "Fixando mensaxe",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas de tempo con formato 12 horas (ex. 2:30pm)",
     "Always show message timestamps": "Mostrar sempre marcas de tempo",
-    "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
     "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe",
     "Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano",
     "Enable inline URL previews by default": "Activar por defecto as vistas previas en liña de URL",
     "Enable URL previews for this room (only affects you)": "Activar vista previa de URL nesta sala (só che afecta a ti)",
     "Enable URL previews by default for participants in this room": "Activar a vista previa de URL por defecto para as participantes nesta sala",
-    "Room Colour": "Cor da sala",
-    "Active call (%(roomName)s)": "Chamada activa (%(roomName)s)",
-    "unknown caller": "interlocutora descoñecida",
-    "Incoming voice call from %(name)s": "Chamada de voz entrante de %(name)s",
-    "Incoming video call from %(name)s": "Chamada de vídeo entrante de %(name)s",
-    "Incoming call from %(name)s": "Chamada entrante de %(name)s",
     "Decline": "Rexeitar",
     "Accept": "Aceptar",
     "Error": "Fallo",
@@ -170,19 +131,8 @@
     "Failed to set display name": "Fallo ao establecer o nome público",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Mirror local video feed": "Replicar a fonte de vídeo local",
-    "Cannot add any more widgets": "Non pode engadir máis trebellos",
-    "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.",
-    "Add a widget": "Engadir un trebello",
-    "Drop File Here": "Solte aquí o ficheiro",
     "Drop file here to upload": "Solte aquí o ficheiro para subilo",
-    " (unsupported)": " (non soportado)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Únete como <voiceText>voz</voiceText> ou <videoText>vídeo</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Chamada de conferencia en curso%(supportedText)s.",
-    "%(senderName)s sent an image": "%(senderName)s enviou unha imaxe",
-    "%(senderName)s sent a video": "%(senderName)s enviou un vídeo",
-    "%(senderName)s uploaded a file": "%(senderName)s subiu un ficheiro",
     "Options": "Axustes",
-    "Please select the destination room for this message": "Escolla por favor a sala de destino para esta mensaxe",
     "Disinvite": "Retirar convite",
     "Kick": "Expulsar",
     "Disinvite this user?": "Retirar convite a esta usuaria?",
@@ -221,11 +171,7 @@
     "Server error": "Fallo no servidor",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.",
     "Command error": "Erro na orde",
-    "Unpin Message": "Desfixar mensaxe",
-    "Jump to message": "Ir a mensaxe",
-    "No pinned messages.": "Sen mensaxes fixadas.",
     "Loading...": "Cargando...",
-    "Pinned Messages": "Mensaxes fixadas",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -253,7 +199,6 @@
     "Forget room": "Esquecer sala",
     "Search": "Busca",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, se é a única persoa con autorización na sala será imposible volver a obter privilexios.",
-    "Community Invites": "Convites da comunidade",
     "Invites": "Convites",
     "Favourites": "Favoritas",
     "Rooms": "Salas",
@@ -272,12 +217,7 @@
     "This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos",
     "Leave room": "Deixar a sala",
     "Favourite": "Favorita",
-    "Guests cannot join this room even if explicitly invited.": "As convidadas non se poden unir a esta sala ainda que fosen convidadas explicitamente.",
-    "Click here to fix": "Preme aquí para solucionar",
-    "Who can access this room?": "Quen pode acceder a esta sala?",
     "Only people who have been invited": "Só persoas que foron convidadas",
-    "Anyone who knows the room's link, apart from guests": "Calquera que coñeza o enderezo da sala, aparte das convidadas",
-    "Anyone who knows the room's link, including guests": "Calquera que coñeza a ligazón a sala, incluíndo as convidadas",
     "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?",
     "Who can read history?": "Quen pode ler o histórico?",
     "Anyone": "Calquera",
@@ -286,7 +226,6 @@
     "Members only (since they joined)": "Só participantes (desde que se uniron)",
     "Permissions": "Permisos",
     "Advanced": "Avanzado",
-    "Add a topic": "Engadir asunto",
     "Cancel": "Cancelar",
     "Jump to first unread message.": "Ir a primeira mensaxe non lida.",
     "Close": "Pechar",
@@ -300,7 +239,6 @@
     "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están activas por defecto para os participantes desta sala.",
     "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para as participantes desta sala.",
     "URL Previews": "Vista previa de URL",
-    "Error decrypting audio": "Fallo ao descifrar audio",
     "Error decrypting attachment": "Fallo descifrando o anexo",
     "Decrypt %(text)s": "Descifrar %(text)s",
     "Download %(text)s": "Baixar %(text)s",
@@ -314,10 +252,7 @@
     "Failed to copy": "Fallo ao copiar",
     "Add an Integration": "Engadir unha 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?": "Vai ser redirixido a unha web de terceiros para poder autenticar a súa conta e así utilizar %(integrationsUrl)s. Quere continuar?",
-    "Custom Server Options": "Opcións personalizadas do servidor",
     "Dismiss": "Rexeitar",
-    "An email has been sent to %(emailAddress)s": "Enviouse un correo a %(emailAddress)s",
-    "Please check your email to continue registration.": "Comprobe o seu correo para continuar co rexistro.",
     "Token incorrect": "Testemuño incorrecto",
     "A text message has been sent to %(msisdn)s": "Enviouse unha mensaxe de texto a %(msisdn)s",
     "Please enter the code it contains:": "Por favor introduza o código que contén:",
@@ -326,7 +261,6 @@
     "Sign in with": "Conectarse con",
     "Email address": "Enderezo de correo",
     "Sign in": "Conectar",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se non indica un enderezo de correo non poderá restablecer o contrasinal, está seguro?",
     "Register": "Rexistrar",
     "Remove from community": "Eliminar da comunidade",
     "Disinvite this user from community?": "Retirar o convite a comunidade a esta usuaria?",
@@ -348,17 +282,14 @@
     "Something went wrong when trying to get your communities.": "Algo fallou ao intentar obter as súas comunidades.",
     "You're not currently a member of any communities.": "Ate o momento non es participante en ningunha comunidade.",
     "Unknown Address": "Enderezo descoñecido",
-    "Allow": "Permitir",
     "Delete Widget": "Eliminar widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un trebello elimínalo para todas as usuarias desta sala. ¿tes certeza de querer eliminar este widget?",
     "Delete widget": "Eliminar widget",
-    "Minimize apps": "Minimizar apps",
     "Edit": "Editar",
     "Create new room": "Crear unha nova sala",
     "No results": "Sen resultados",
     "Communities": "Comunidades",
     "Home": "Inicio",
-    "Manage Integrations": "Xestionar integracións",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s uníronse %(count)s veces",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s uníronse",
@@ -414,11 +345,8 @@
     "collapse": "comprimir",
     "expand": "expandir",
     "Custom level": "Nivel personalizado",
-    "Room directory": "Directorio de salas",
     "Start chat": "Iniciar conversa",
     "And %(count)s more...|other": "E %(count)s máis...",
-    "ex. @bob:example.com": "ex. @pepe:exemplo.com",
-    "Add User": "Engadir usuaria",
     "Matrix ID": "ID Matrix",
     "Matrix Room ID": "ID sala Matrix",
     "email address": "enderezo de correo",
@@ -451,21 +379,9 @@
     "Unable to verify email address.": "Non se puido verificar enderezo de correo electrónico.",
     "This will allow you to reset your password and receive notifications.": "Isto permitiralle restablecer o seu contrasinal e recibir notificacións.",
     "Skip": "Saltar",
-    "Username not available": "Nome de usuaria non dispoñible",
-    "Username invalid: %(errMessage)s": "Nome de usuaria non válido: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Algo fallou: %(error_string)s",
-    "Username available": "Nome de usuaria dispoñible",
-    "To get started, please pick a username!": "Para comezar, escolla un nome de usuaria!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será o nome da súa conta no <span></span> servidor, ou pode escoller un <a>servidor diferente</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Se xa ten unha conta Matrix entón pode <a>conectarse</a>.",
-    "Private Chat": "Conversa privada",
-    "Public Chat": "Conversa pública",
-    "Custom": "Personalizada",
     "Name": "Nome",
     "You must <a>register</a> to use this functionality": "Debe <a>rexistrarse</a> para utilizar esta función",
     "You must join the room to see its files": "Debes unirte a sala para ver os seus ficheiros",
-    "There are no visible files in this room": "Non hai ficheiros visibles nesta 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": "<h1>HTML para a páxina da túa comunidade</h1>\n<p>\n    Utiliza a descrición longa para presentalle a comunidade ás novas participantes, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén podes usar etiquetas 'img'\n</p>\n",
     "Add rooms to the community summary": "Engadir salas ao resumo da comunidade",
     "Which rooms would you like to add to this summary?": "Que salas desexa engadir a este resumo?",
     "Add to summary": "Engadir ao resumo",
@@ -503,7 +419,6 @@
     "Are you sure you want to reject the invitation?": "Seguro que desexa rexeitar o convite?",
     "Failed to reject invitation": "Fallo ao rexeitar o convite",
     "Are you sure you want to leave the room '%(roomName)s'?": "Seguro que desexa saír da sala '%(roomName)s'?",
-    "Failed to leave room": "Algo fallou ao saír da sala",
     "Signed Out": "Desconectada",
     "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctate outra vez.",
     "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos",
@@ -512,16 +427,9 @@
     "Error whilst fetching joined communities": "Fallo mentres se obtiñas as comunidades unidas",
     "Create a new community": "Crear unha nova comunidade",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea unha comunidade para agrupar usuarias e salas! Pon unha páxina de inicio personalizada para destacar o teu lugar no universo Matrix.",
-    "You have no visible notifications": "Non ten notificacións visibles",
-    "%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.",
-    "%(count)s of your messages have not been sent.|one": "A súa mensaxe non foi enviada.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> ou ben<cancelText>cancelar todo</cancelText>. Tamén pode seleccionar mensaxes individuais para reenviar ou cancelar.",
-    "%(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 mensaxe</resendText> ou <cancelText>cancelar mensaxe</cancelText> agora.",
     "Warning": "Aviso",
     "Connectivity to the server has been lost.": "Perdeuse a conexión ao servidor.",
     "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaranse ate que retome a conexión.",
-    "Active call": "Chamada activa",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Non hai ninguén por aquí! Desexa convidar <inviteText>a outras</inviteText> ou <nowarnText>deixar de informar sobre a sala baldeira</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Semella estar a subir ficheiros, seguro que desexa deixalo?",
     "You seem to be in a call, are you sure you want to quit?": "Semella estar en unha chamada, seguro que quere saír?",
     "Search failed": "Fallou a busca",
@@ -529,11 +437,6 @@
     "No more results": "Sen máis resultados",
     "Room": "Sala",
     "Failed to reject invite": "Fallo ao rexeitar o convite",
-    "Fill screen": "Encher pantalla",
-    "Click to unmute video": "Preme para escoitar vídeo",
-    "Click to mute video": "Preme para acalar video",
-    "Click to unmute audio": "Preme para escoitar audio",
-    "Click to mute audio": "Preme para acalar audio",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non tes permiso para ver a mensaxe en cuestión.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.",
     "Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
@@ -566,12 +469,8 @@
     "Notifications": "Notificacións",
     "Profile": "Perfil",
     "Account": "Conta",
-    "Access Token:": "Testemuño de acceso:",
-    "click to reveal": "Preme para mostrar",
     "Homeserver is": "O servidor de inicio é",
-    "Identity Server is": "O servidor de identidade é",
     "%(brand)s version:": "versión %(brand)s:",
-    "olm version:": "versión olm:",
     "Failed to send email": "Fallo ao enviar correo electrónico",
     "The email address linked to your account must be entered.": "Debe introducir o correo electrónico ligado a súa conta.",
     "A new password must be entered.": "Debe introducir un novo contrasinal.",
@@ -583,14 +482,9 @@
     "Send Reset Email": "Enviar email de restablecemento",
     "Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.",
-    "The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor non ofrece ningún sistema de conexión que soporte este cliente.",
-    "Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
     "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>.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou <a>active scripts non seguros</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de que o<a>certificado SSL do servidor</a> sexa de confianza, e que ningún engadido do navegador estea bloqueando as peticións.",
-    "Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
-    "Set a display name:": "Establecer nome público:",
-    "Upload an avatar:": "Suba un avatar:",
     "This server does not support authentication with a phone number.": "O servidor non soporta a autenticación con número de teléfono.",
     "Displays action": "Mostra acción",
     "Bans user with given id": "Prohibe a usuaria co ID indicado",
@@ -598,11 +492,9 @@
     "Invites user with given id to current room": "Convida a usuaria co id proporcionado a sala actual",
     "Kicks user with given id": "Expulsa usuaria co id proporcionado",
     "Changes your display nickname": "Cambia o alcume mostrado",
-    "Searches DuckDuckGo for results": "Buscar en DuckDuckGo por resultados",
     "Ignores a user, hiding their messages from you": "Ignora unha usuaria, agochándolle as súas mensaxes",
     "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar unha usuaria, mostrándolles as súas mensaxes a partir de agora",
     "Commands": "Comandos",
-    "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
     "Emoji": "Emoji",
     "Notify the whole room": "Notificar a toda a sala",
     "Room Notification": "Notificación da sala",
@@ -632,7 +524,6 @@
     "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.",
     "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.",
     "Clear filter": "Quitar filtro",
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
@@ -642,7 +533,6 @@
     "Showing flair for these communities:": "Mostrando a popularidade destas comunidades:",
     "Display your community flair in rooms configured to show it.": "Mostrar a popularidade da túa comunidade nas salas configuradas para que a mostren.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sabías que podes usar as comunidades para filtrar a túa experiencia en %(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.": "Para establecer un filtro, arrastra un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Podes premer nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
     "Deops user with given id": "Degrada usuaria co id proporcionado",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
     "Code": "Código",
@@ -651,7 +541,6 @@
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados á túa comunidade <bold1>nome</bold1> e <bold2>avatar</bold2> poida que non os vexan outras usuarias ate dentro de 30 minutos.",
     "Join this community": "Únete a esta comunidade",
     "Leave this community": "Deixar esta comunidade",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Se enviaches un informe de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso da aplicación incluíndo o teu nome de usuaria, os IDs ou alcumes das salas e grupos que visitaches e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
     "Submit debug logs": "Enviar informes de depuración",
     "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de desenvolvemento",
     "Stickerpack": "Iconas",
@@ -662,12 +551,9 @@
     "Everyone": "Todo o mundo",
     "Fetching third party location failed": "Fallo ao obter a localización de terceiros",
     "Send Account Data": "Enviar datos da conta",
-    "All notifications are currently disabled for all targets.": "Todas as notificacións están desactivadas para todos os destinos.",
-    "Uploading report": "Informe da subida",
     "Sunday": "Domingo",
     "Notification targets": "Obxectivos das notificacións",
     "Today": "Hoxe",
-    "You are not receiving desktop notifications": "Non está a recibir notificacións de escritorio",
     "Friday": "Venres",
     "Update": "Actualizar",
     "What's New": "Que hai de novo",
@@ -675,24 +561,13 @@
     "Changelog": "Rexistro de cambios",
     "Waiting for response from server": "Agardando pola resposta do servidor",
     "Send Custom Event": "Enviar evento personalizado",
-    "Advanced notification settings": "Axustes avanzados de notificación",
     "Failed to send logs: ": "Fallo ao enviar os informes: ",
-    "Forget": "Esquecer",
-    "You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)",
-    "Cancel Sending": "Cancelar o envío",
     "This Room": "Esta sala",
     "Noisy": "Ruidoso",
-    "Error saving email notification preferences": "Fallo ao cargar os axustes de notificacións",
     "Messages containing my display name": "Mensaxes que conteñen o meu nome público",
     "Messages in one-to-one chats": "Mensaxes en chats un-a-un",
     "Unavailable": "Non dispoñible",
-    "View Decrypted Source": "Ver a fonte descifrada",
-    "Failed to update keywords": "Fallo ao actualizar as palabras chave",
     "remove %(name)s from the directory.": "eliminar %(name)s do directorio.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das regras de seguimento das seguintes palabras que non se mostrarán aquí:",
-    "Please set a password!": "Por favor estableza un contrasinal!",
-    "You have successfully set a password!": "Mudou con éxito o seu contrasinal!",
-    "An error occurred whilst saving your email notification preferences.": "Algo fallou mentres se gardaban as súas preferencias de notificación.",
     "Explore Room State": "Ollar estado da sala",
     "Source URL": "URL fonte",
     "Messages sent by bot": "Mensaxes enviadas por bot",
@@ -700,36 +575,23 @@
     "Members": "Participantes",
     "No update available.": "Sen actualizacións.",
     "Resend": "Volver a enviar",
-    "Files": "Ficheiros",
     "Collecting app version information": "Obtendo información sobre a versión da app",
-    "Keywords": "Palabras chave",
-    "Enable notifications for this account": "Activar notificacións para esta conta",
     "Invite to this community": "Convidar a esta comunidade",
-    "Messages containing <span>keywords</span>": "Mensaxes que conteñen <span>palabras chave</span>",
     "Room not found": "Non se atopou a sala",
     "Tuesday": "Martes",
-    "Enter keywords separated by a comma:": "Introduza palabras chave separadas por vírgulas:",
     "Search…": "Buscar…",
     "Remove %(name)s from the directory?": "Eliminar %(name)s do directorio?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentais no seu navegador actual.",
     "Developer Tools": "Ferramentas para desenvolver",
     "Preparing to send logs": "Preparándose para enviar informe",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Lembra que sempre poderás poñer un enderezo de email nos axustes de usuaria se cambiases de idea.",
     "Explore Account Data": "Ollar datos da conta",
-    "All messages (noisy)": "Todas as mensaxes (alto)",
     "Saturday": "Sábado",
-    "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar",
-    "Direct Chat": "Chat directo",
     "The server may be unavailable or overloaded": "O servidor podería non estar dispoñible ou sobrecargado",
     "Reject": "Rexeitar",
-    "Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala",
     "Monday": "Luns",
     "Remove from Directory": "Eliminar do directorio",
-    "Enable them now": "Activalas agora",
     "Toolbox": "Ferramentas",
     "Collecting logs": "Obtendo rexistros",
     "You must specify an event type!": "Debe indicar un tipo de evento!",
-    "(HTTP status %(httpStatus)s)": "(Estado HTTP %(httpStatus)s)",
     "All Rooms": "Todas as Salas",
     "State Key": "Chave do estado",
     "Wednesday": "Mércores",
@@ -738,55 +600,36 @@
     "All messages": "Todas as mensaxes",
     "Call invitation": "Convite de chamada",
     "Downloading update...": "Descargando actualización...",
-    "You have successfully set a password and an email address!": "Estableceu correctamente un contrasinal e enderezo de correo!",
     "Failed to send custom event.": "Fallo ao enviar evento personalizado.",
     "What's new?": "Que hai de novo?",
-    "Notify me for anything else": "Notificarme todo o demais",
     "When I'm invited to a room": "Cando son convidado a unha sala",
-    "Can't update user notification settings": "Non se poden actualizar os axustes de notificación",
-    "Notify for all other messages/rooms": "Notificar para todas as outras mensaxes/salas",
     "Unable to look up room ID from server": "Non se puido atopar o ID da sala do servidor",
     "Couldn't find a matching Matrix room": "Non coincide con ningunha sala de Matrix",
     "Invite to this room": "Convidar a esta sala",
     "You cannot delete this message. (%(code)s)": "Non pode eliminar esta mensaxe. (%(code)s)",
     "Thursday": "Xoves",
-    "Forward Message": "Reenviar mensaxe",
     "Logs sent": "Informes enviados",
     "Back": "Atrás",
     "Reply": "Resposta",
     "Show message in desktop notification": "Mostrar mensaxe nas notificacións 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.": "Os informes de depuración conteñen datos de utilización da aplicación como o teu nome de usuaria, os IDs ou alias de salas e grupos que visitachese os nomes de usuaria doutras usuarias. Non conteñen mensaxes.",
-    "Unhide Preview": "Desagochar a vista previa",
     "Unable to join network": "Non se puido conectar ca rede",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Desculpe, o seu navegador <b>non pode</b> executar %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Subido a %(date)s por %(user)s",
     "Messages in group chats": "Mensaxes en grupos de chat",
     "Yesterday": "Onte",
     "Error encountered (%(errorDetail)s).": "Houbo un erro (%(errorDetail)s).",
     "Low Priority": "Baixa prioridade",
-    "Unable to fetch notification target list": "Non se puido procesar a lista de obxectivo de notificacións",
-    "Set Password": "Establecer contrasinal",
     "Off": "Off",
     "%(brand)s does not know how to join a room on this network": "%(brand)s non sabe como conectar cunha sala nesta rede",
-    "Mentions only": "Só mencións",
-    "You can now return to your account after signing out, and sign in on other devices.": "Podes voltar a túa conta tras desconectarte, e conectarte noutros dispositivos.",
-    "Enable email notifications": "Activar notificacións de correo",
     "Event Type": "Tipo de evento",
-    "Download this file": "Descargue este ficheiro",
-    "Pin Message": "Fixar mensaxe",
-    "Failed to change settings": "Fallo ao cambiar os axustes",
     "View Community": "Ver Comunidade",
     "Event sent!": "Evento enviado!",
     "View Source": "Ver fonte",
     "Event Content": "Contido do evento",
     "Thank you!": "Grazas!",
-    "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!": "Co teu navegador actual a aparencia e uso da aplicación poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se queres podes continuar, pero debes ser consciente de que pode haber fallos!",
     "Checking for an update...": "Comprobando as actualizacións...",
     "Every page you use in the app": "Cada páxina que use na aplicación",
     "e.g. <CurrentPageURL>": "p.ex. <CurrentPageURL>",
     "Your device resolution": "Resolución do dispositivo",
     "Missing roomId.": "Falta o ID da sala.",
-    "Always show encryption icons": "Mostra sempre iconas de cifrado",
     "Popout widget": "trebello emerxente",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respondía, ou non existe ou non ten permiso para velo.",
     "Send Logs": "Enviar informes",
@@ -794,7 +637,6 @@
     "Refresh": "Actualizar",
     "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarate e non poderás ler o historial cifrado da conversa.",
-    "Collapse Reply Thread": "Comprimir o fío de respostas",
     "e.g. %(exampleValue)s": "p.ex. %(exampleValue)s",
     "Send analytics data": "Enviar datos de análises",
     "Enable widget screenshots on supported widgets": "Activar as capturas de trebellos para aqueles que as permiten",
@@ -812,8 +654,6 @@
     "Share Community": "Compartir comunidade",
     "Share Room Message": "Compartir unha mensaxe da sala",
     "Link to selected message": "Ligazón á mensaxe escollida",
-    "COPY": "Copiar",
-    "Share Message": "Compartir mensaxe",
     "Can't leave Server Notices room": "Non se pode saír da sala de información do servidor",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Esta sala emprégase para mensaxes importantes do servidor da sala, as que non pode saír dela.",
     "Terms and Conditions": "Termos e condicións",
@@ -821,8 +661,6 @@
     "Review terms and conditions": "Revise os termos e condicións",
     "No Audio Outputs detected": "Non se detectou unha saída de audio",
     "Audio Output": "Saída de audio",
-    "Call in Progress": "Chamada en progreso",
-    "A call is already in progress!": "Xa hai unha chamada en progreso!",
     "Permission Required": "Precísanse permisos",
     "You do not have permission to start a conference call in this room": "Non tes permisos para comezar unha chamada de conferencia nesta sala",
     "This event could not be displayed": "Non se puido amosar este evento",
@@ -830,19 +668,13 @@
     "Demote": "Baixar de rango",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Nas salas cifradas, como é esta, está desactivado por defecto a previsualización das URL co fin de asegurarse de que o servidor local (que é onde se gardan as previsualizacións) non poida recoller información sobre das ligazóns que se ven nesta sala.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cando alguén pon unha URL na mensaxe, esta previsualízarase para que así se coñezan xa cousas delas como o título, a descrición ou as imaxes que inclúe ese sitio web.",
-    "The email field must not be blank.": "Este campo de correo non pode quedar en branco.",
-    "The phone number field must not be blank.": "O número de teléfono non pode quedar en branco.",
-    "The password field must not be blank.": "O campo do contrasinal non pode quedar en branco.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non vas poder enviar mensaxes ata que revises e aceptes <consentLink>os nosos termos e condicións</consentLink>.",
-    "A call is currently being placed!": "Xa se estableceu a chamada!",
     "Sorry, your homeserver is too old to participate in this room.": "Lametámolo, o seu servidor de inicio é vello de máis para participar en esta sala.",
     "Please contact your homeserver administrator.": "Por favor, contacte coa administración do seu servidor.",
     "System Alerts": "Alertas do Sistema",
     "Please <a>contact your service administrator</a> to continue using the service.": "Por favor <a>contacte coa administración do servizo</a> para seguir utilizando o servizo.",
     "This homeserver has hit its Monthly Active User limit.": "Este servidor acadou o límite mensual de usuarias activas.",
     "This homeserver has exceeded one of its resource limits.": "Este servidor excedeu un dos seus límites de recursos.",
-    "Failed to remove widget": "Fallo ao eliminar o widget",
-    "An error ocurred whilst trying to remove the widget from the room": "Algo fallou mentras se intentaba eliminar o widget da sala",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "A súa mensaxe non foi enviada porque este servidor acadou o Límite Mensual de Usuaria Activa. Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "A súa mensaxe non foi enviada porque o servidor superou o límite de recursos. Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
     "Legal": "Legal",
@@ -862,7 +694,6 @@
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Se estás conectada utilizando %(brand)s nun dispositivo maiormente táctil",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Se estás a usar %(brand)s como unha Progressive Web App instalada",
     "Your user agent": "User Agent do navegador",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia.",
     "Sign In or Create Account": "Conéctate ou Crea unha Conta",
     "Sign In": "Conectar",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirma o borrado destas sesións ao usar Single Sign On como proba da túa identidade.",
@@ -874,11 +705,7 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirma a desactivación da túa conta usando Single Sign On para probar a túa identidade.",
     "To continue, use Single Sign On to prove your identity.": "Para continuar, usa Single Sign On para probar a túa identidade.",
     "Are you sure you want to sign out?": "Tes a certeza de querer desconectar?",
-    "If you didn’t sign in to this session, your account may be compromised.": "Se ti non iniciaches esta sesión a túa conta podería estar comprometida.",
     "Sign out and remove encryption keys?": "Desconectar e eliminar as chaves de cifrado?",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Esto permitirache voltar a túa conta tras desconectar, e conectarte noutras sesións.",
-    "Sign in to your Matrix account on %(serverName)s": "Conecta a túa conta Matrix en %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Conecta a túa conta Matrix en <underlinedServerName />",
     "Sign in with SSO": "Conecta utilizando SSO",
     "Sign in instead": "Conectar",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Ímosche enviar un email para confirmar o teu novo contrasinal.",
@@ -897,15 +724,10 @@
     "The file '%(fileName)s' failed to upload.": "Fallou a subida do ficheiro '%(fileName)s'.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "O ficheiro '%(fileName)s' supera o tamaño máximo permitido polo servidor",
     "The server does not support the room version specified.": "O servidor non soporta a versión da sala indicada.",
-    "If you cancel now, you won't complete verifying the other user.": "Se cancelas agora non completarás a verificación da outra usuaria.",
-    "If you cancel now, you won't complete verifying your other session.": "Se cancelas agora non completarás o proceso de verificación da outra sesión.",
-    "If you cancel now, you won't complete your operation.": "Se cancelas agora, non completarás a operación.",
     "Cancel entering passphrase?": "Cancelar a escrita da frase de paso?",
     "Setting up keys": "Configurando as chaves",
     "Verify this session": "Verificar esta sesión",
     "Encryption upgrade available": "Mellora do cifrado dispoñible",
-    "Set up encryption": "Configurar cifrado",
-    "Review where you’re logged in": "Revisar onde estás conectada",
     "New login. Was this you?": "Nova conexión. Foches ti?",
     "Name or Matrix ID": "Nome ou ID Matrix",
     "Identity server has no terms of service": "O servidor de identidade non ten termos dos servizo",
@@ -960,7 +782,6 @@
     "Send a bug report with logs": "Envía un informe de fallos con rexistros",
     "Opens chat with the given user": "Abre unha conversa coa usuaria",
     "Sends a message to the given user": "Envía unha mensaxe a usuaria",
-    "%(senderName)s made no change.": "%(senderName)s non fixo cambios.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambiou o nome da sala de %(oldRoomName)s a %(newRoomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizou esta sala.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s converteu en pública a sala para calquera que teña a ligazón.",
@@ -987,22 +808,16 @@
     "Change room name": "Cambiar nome da sala",
     "Roles & Permissions": "Roles & Permisos",
     "Room %(name)s": "Sala %(name)s",
-    "Recent rooms": "Salas recentes",
     "Direct Messages": "Mensaxes Directas",
-    "Create room": "Crear sala",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Podes usar <code>axuda</code> para ver os comandos dispoñibles. ¿Querías mellor enviar esto como unha mensaxe?",
     "Error updating flair": "Fallo ao actualizar popularidade",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Algo fallou cando se actualizaba a popularidade da sala. Pode ser un fallo temporal ou que o servidor non o permita.",
     "Enter the name of a new server you want to explore.": "Escribe o nome do novo servidor que queres explorar.",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Se hai contexto que cres que axudaría a analizar o problema, como o que estabas a facer, ID da sala, ID da usuaria, etc., por favor inclúeo aquí.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para evitar informes duplicados, mira <existingIssuesLink>os informes existentes</existingIssuesLink> primeiro (e engade un +1) ou <newIssueLink>crea un novo informe</newIssueLink> se non o atopas.",
     "Command Help": "Comando Axuda",
     "To help us prevent this in future, please <a>send us logs</a>.": "Para axudarnos a evitar esto no futuro, envíanos <a>o rexistro</a>.",
-    "Help": "Axuda",
     "Explore Public Rooms": "Explorar Salas Públicas",
-    "Explore": "Explorar",
     "Filter": "Filtrar",
-    "Filter rooms…": "Filtrar salas…",
     "%(creator)s created and configured the room.": "%(creator)s creou e configurou a sala.",
     "Explore rooms": "Explorar salas",
     "General failure": "Fallo xeral",
@@ -1034,7 +849,6 @@
     "Show info about bridges in room settings": "Mostrar info sobre pontes nos axustes da sala",
     "Room Addresses": "Enderezos da sala",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao actualizar os enderezos alternativos da sala. É posible que o servidor non o permita ou acontecese un fallo temporal.",
-    "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.": "Os enderezos publicados poden ser usados por calquera persoa ou servidor para unirse a sala. Para publicar un enderezo, primeiro debe establecerse como enderezo local.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establecer enderezos para a sala para que poida ser atopada no teu servidor local (%(localDomain)s)",
     "Room Settings - %(roomName)s": "Axustes da sala - %(roomName)s",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Eliminar o enderezo da sala %(alias)s e eliminar %(name)s do directorio?",
@@ -1065,7 +879,6 @@
     "No homeserver URL provided": "Non se estableceu URL do servidor",
     "Unexpected error resolving homeserver configuration": "Houbo un fallo ao acceder a configuración do servidor",
     "Unexpected error resolving identity server configuration": "Houbo un fallo ao acceder a configuración do servidor de identidade",
-    "The message you are trying to send is too large.": "A mensaxe a enviar é demasiado grande.",
     "Unable to connect to Homeserver. Retrying...": "Non se conectou co Servidor. Reintentando...",
     "a few seconds ago": "fai uns segundos",
     "about a minute ago": "fai un minuto",
@@ -1090,7 +903,6 @@
     "The user must be unbanned before they can be invited.": "A usuria debe ser desbloqueada antes de poder convidala.",
     "Messages in this room are end-to-end encrypted.": "As mensaxes desta sala están cifradas de extremo-a-extremo.",
     "Messages in this room are not end-to-end encrypted.": "As mensaxes desta sala non están cifradas de extremo-a-extremo.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "As mensaxes desta sala están cifradas de extremo-a-extremo. No perfil da usuaria tes máis info e podes verificala.",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra bloqueando salas con %(glob)s por %(reason)s",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra bloqueando servidores con %(glob)s por %(reason)s",
     "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra de bloqueo con %(glob)s por %(reason)s",
@@ -1125,31 +937,20 @@
     "Common names and surnames are easy to guess": "Os nomes e alcumes son fáciles de adiviñar",
     "Help us improve %(brand)s": "Axúdanos a mellorar %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Envía <UsageDataLink>datos de uso anónimos</UsageDataLink> que nos axudarán a mellorar %(brand)s. Esto precisa usar unha <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "Quero axudar",
     "No": "Non",
-    "Verify all your sessions to ensure your account & messages are safe": "Verifica todas as outras sesións para asegurar que a túa conta e mensaxes están seguros",
     "Review": "Revisar",
     "Later": "Máis tarde",
     "Your homeserver has exceeded its user limit.": "O teu servidor superou o seu límite de usuaras.",
     "Your homeserver has exceeded one of its resource limits.": "O teu servidor superou un dous seus límites de recursos.",
     "Contact your <a>server admin</a>.": "Contacta coa <a>administración</a>.",
     "Ok": "Ok",
-    "Set password": "Establecer contrasinal",
-    "To return to your account in future you need to set a password": "Para voltar a túa conta no futuro debes establecer un contrasinal",
     "Set up": "Configurar",
     "Upgrade": "Mellorar",
     "Verify": "Verificar",
-    "Verify yourself & others to keep your chats safe": "Verifica a túa conta e a de outras para ter conversas seguras",
     "Other users may not trust it": "Outras usuarias poderían non confiar",
-    "Verify the new login accessing your account: %(name)s": "Verifica a conexión accedendo a túa conta: %(name)s",
-    "Restart": "Reiniciar",
-    "Upgrade your %(brand)s": "Mellora o teu %(brand)s",
-    "A new version of %(brand)s is available!": "Hai unha nova versión de %(brand)s!",
     "There was an error joining the room": "Houbo un fallo ao unirte a sala",
-    "Font scaling": "Escalado da tipografía",
     "Custom user status messages": "Mensaxes de estado personalizados",
     "Render simple counters in room header": "Mostrar contadores simples na cabeceira da sala",
-    "Multiple integration managers": "Múltiples xestores da integración",
     "Try out new ways to ignore people (experimental)": "Novos xeitos de ignorar persoas (experimental)",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensaxes de entrada/saída (mais non convites/expulsións/bloqueos)",
     "Subscribing to a ban list will cause you to join it!": "Subscribíndote a unha lista de bloqueo fará que te unas a ela!",
@@ -1183,12 +984,10 @@
     "Show avatar changes": "Mostrar cambios de avatar",
     "Show display name changes": "Mostrar cambios do nome mostrado",
     "Show read receipts sent by other users": "Mostrar resgardo de lectura enviados por outras usuarias",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar recordatorio para activar Recuperación Segura de Mensaxes en salas cifradas",
     "Show avatars in user and room mentions": "Mostrar avatares nas mencións de salas e usuarias",
     "Enable big emoji in chat": "Activar Emojis grandes na conversa",
     "Send typing notifications": "Enviar notificación de escritura",
     "Show typing notifications": "Mostrar notificacións de escritura",
-    "Allow Peer-to-Peer for 1:1 calls": "Permitir Par-a-Par para chamadas 1:1",
     "Never send encrypted messages to unverified sessions from this session": "Non enviar nunca desde esta sesión mensaxes cifradas a sesións non verificadas",
     "Never send encrypted messages to unverified sessions in this room from this session": "Non enviar mensaxes cifradas desde esta sesión a sesións non verificadas nesta sala",
     "Prompt before sending invites to potentially invalid matrix IDs": "Avisar antes de enviar convites a IDs de Matrix potencialmente incorrectos",
@@ -1197,11 +996,9 @@
     "Show rooms with unread notifications first": "Mostrar primeiro as salas que teñen notificacións sen ler",
     "Show shortcuts to recently viewed rooms above the room list": "Mostrar atallos a salas vistas recentemente enriba da lista de salas",
     "Show hidden events in timeline": "Mostrar na cronoloxía eventos ocultos",
-    "Low bandwidth mode": "Modo de ancho de banda reducido",
     "Straight rows of keys are easy to guess": "Palabras de letras contiguas son doadas de adiviñar",
     "Short keyboard patterns are easy to guess": "Patróns curtos de teclas son doados de adiviñar",
     "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 o servidor de apoio para chamadas turn.matrix.org cando o servidor propio non ofreza un (o teu IP compartirase durante a chamada)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar resgardos de lectura para as mensaxes (require servidor compatible para desactivar)",
     "Show previews/thumbnails for images": "Mostrar miniaturas/vista previa das imaxes",
     "Enable message search in encrypted rooms": "Activar a busca de mensaxes en salas cifradas",
     "How fast should messages be downloaded.": "Velocidade á que deberían descargarse as mensaxes.",
@@ -1301,23 +1098,16 @@
     "Headphones": "Auriculares",
     "Folder": "Cartafol",
     "Pin": "Pin",
-    "From %(deviceName)s (%(deviceId)s)": "Desde %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Rexeitar (%(counter)s)",
     "Accept <policyLink /> to continue:": "Acepta <policyLink /> para continuar:",
     "Upload": "Subir",
     "This bridge was provisioned by <user />.": "Esta ponte está proporcionada por <user />.",
     "This bridge is managed by <user />.": "Esta ponte está xestionada por <user />.",
-    "Workspace: %(networkName)s": "Espazo de traballo: %(networkName)s",
-    "Channel: %(channelName)s": "Canal: %(channelName)s",
     "Show less": "Mostrar menos",
     "Show more": "Mostrar máis",
     "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.": "Ao cambiar o contrasinal vas restablecer todas as chaves de cifrado extremo-a-extremo en tódalas sesións, facendo que o historial de conversa cifrado non sexa lexible, a menos que primeiro exportes todas as chaves das salas e as importes posteriormente. No futuro melloraremos o procedemento.",
     "Your homeserver does not support cross-signing.": "O teu servidor non soporta a sinatura cruzada.",
-    "Cross-signing and secret storage are enabled.": "A sinatura cruzada e o almacenaxe segredo está activados.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A túa conta ten unha identidade de sinatura cruzada no almacenaxe segredo, pero aínda non confiaches nela nesta sesión.",
-    "Cross-signing and secret storage are not yet set up.": "A sinatura cruzada e almacenaxe segredo aínda non se configuraron.",
-    "Reset cross-signing and secret storage": "Restablecer sinatura cruzada e almacenaxe segredo",
-    "Bootstrap cross-signing and secret storage": "Configurar sinatura cruzada e almacenaxe segredo",
     "well formed": "ben formado",
     "unexpected type": "tipo non agardado",
     "Cross-signing public keys:": "Chaves públicas da sinatura cruzada:",
@@ -1329,7 +1119,6 @@
     "cached locally": "na caché local",
     "not found locally": "non se atopa localmente",
     "User signing private key:": "Chave privada de sinatura da usuaria:",
-    "Session backup key:": "Chave de apoio da sesión:",
     "Secret storage public key:": "Chave pública da almacenaxe segreda:",
     "in account data": "nos datos da conta",
     "Homeserver feature support:": "Soporte de funcións do servidor:",
@@ -1346,9 +1135,6 @@
     "ID": "ID",
     "Public Name": "Nome público",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sesión utilizada pola usuaria para marcala como confiable, non confiando en dispositivos con sinatura cruzada.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Gardar de xeito seguro na caché mensaxes cifradas para que aparezan nos resultados de busca, usando ",
-    " to store messages from ": " para gardar mensaxes de ",
-    "rooms.": "salas.",
     "Manage": "Xestionar",
     "Securely cache encrypted messages locally for them to appear in search results.": "Gardar de xeito seguro mensaxes cifradas na caché local para que aparezan nos resultados de buscas.",
     "Enable": "Activar",
@@ -1380,22 +1166,15 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "A copia ten unha sinatura <validity>non válida</validity> desde a sesión <verify>non verificada</verify> en <device></device>",
     "Backup is not signed by any of your sessions": "A copia non está asinada por ningunha das túas sesións",
     "This backup is trusted because it has been restored on this session": "Esta copia é de confianza porque foi restaurada nesta sesión",
-    "Backup version: ": "Versión da copia: ",
-    "Algorithm: ": "Algoritmo: ",
-    "Backup key stored: ": "Chave de apoio gardada: ",
     "Your keys are <b>not being backed up from this session</b>.": "As túas chaves <b>non están a ser copiadas desde esta sesión</b>.",
     "Back up your keys before signing out to avoid losing them.": "Fai unha copia de apoio das chaves antes de desconectarte para evitar perdelas.",
     "Start using Key Backup": "Fai unha Copia de apoio das chaves",
     "Clear notifications": "Eliminar notificacións",
-    "Add an email address to configure email notifications": "Engade un enderezo de email para configurar as notificacións por email",
     "Enable desktop notifications for this session": "Activa as notificacións de escritorio para esta sesión",
     "Enable audible notifications for this session": "Activa as notificacións por son para esta sesión",
     "<a>Upgrade</a> to your own domain": "<a>Mellora</a> e usa un dominio propio",
     "Display Name": "Nome mostrado",
     "Profile picture": "Imaxe de perfil",
-    "Identity Server URL must be HTTPS": "O URL do servidor de identidade debe comezar HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Servidor de Identidade non válido (código de estado %(code)s)",
-    "Could not connect to Identity Server": "Non hai conexión co Servidor de Identidade",
     "Checking server": "Comprobando servidor",
     "Change identity server": "Cambiar de servidor de identidade",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Desconectar do servidor de identidade <current /> e conectar con <new />?",
@@ -1413,20 +1192,15 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Aínda estás <b>compartindo datos personais</b> no servidor de identidade <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Recomendámosche que elimines os teus enderezos de email e números de teléfono do servidor de identidade antes de desconectar del.",
     "Go back": "Atrás",
-    "Identity Server (%(server)s)": "Servidor de Identidade (%(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.": "Neste intre usas <server></server> para atopar e ser atopado polos contactos existentes que coñeces. Aquí abaixo podes cambiar de servidor de identidade.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se non queres usar <server /> para atopar e ser atopado polos contactos existentes que coñeces, escribe embaixo outro servidor de identidade.",
-    "Identity Server": "Servidor de Identidade",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Non estás a usar un servidor de identidade. Para atopar e ser atopado polos contactos existentes que coñeces, engade un embaixo.",
     "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.": "Ao desconectar do teu servidor de identidade non te poderán atopar as outras usuarias e non poderás convidar a outras polo seu email ou 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 identidade é optativo. Se escolles non usar un, non poderás ser atopado por outras usuarias e non poderás convidar a outras polo seu email ou teléfono.",
     "Do not use an identity server": "Non usar un servidor de identidade",
     "Enter a new identity server": "Escribe o novo servidor de identidade",
     "Change": "Cambiar",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integración <b>(%(serverName)s)</b> para xestionar bots, widgets e paquetes de pegatinas.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integracións para xestionar bots, widgets e paquetes de pegatinas.",
     "Manage integrations": "Xestionar integracións",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Os xestores de integracións reciben datos de configuración, e poden modificar os widgets, enviar convites das salas, e establecer roles no teu nome.",
     "New version available. <a>Update now.</a>": "Nova versión dispoñible. <a>Actualiza.</a>",
     "Size must be a number": "O tamaño ten que ser un número",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "O tamaño da fonte só pode estar entre %(min)s pt e %(max)s pt",
@@ -1447,7 +1221,6 @@
     "FAQ": "PMF",
     "Keyboard Shortcuts": "Atallos de teclado",
     "Versions": "Versións",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliza a túa experiencia con características experimentais. <a>Coñecer máis</a>.",
     "Ignored/Blocked": "Ignorado/Bloqueado",
     "Error adding ignored user/server": "Fallo ao engadir a ignorado usuaria/servidor",
     "Something went wrong. Please try again or view your console for hints.": "Algo fallou. Inténtao outra vez o mira na consola para ter algunha pista.",
@@ -1491,7 +1264,6 @@
     "Session key:": "Chave da sesión:",
     "Bulk options": "Opcións agrupadas",
     "Accept all %(invitedRooms)s invites": "Aceptar os %(invitedRooms)s convites",
-    "Key backup": "Copia da Chave",
     "Message search": "Buscar mensaxe",
     "Cross-signing": "Sinatura cruzada",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "A administración do servidor desactivou por defecto o cifrado extremo-a-extremo en salas privadas e Mensaxes Directas.",
@@ -1535,7 +1307,6 @@
     "Change settings": "Cambiar axustes",
     "Kick users": "Expulsar usuarias",
     "Ban users": "Bloquear usuarias",
-    "Remove messages": "Eliminar mensaxes",
     "Notify everyone": "Notificar a todas",
     "Send %(eventType)s events": "Enviar %(eventType)s eventos",
     "Select the roles required to change various parts of the room": "Escolle os roles requeridos para cambiar determinadas partes da sala",
@@ -1587,7 +1358,6 @@
     "Encrypted by an unverified session": "Cifrada por unha sesión non verificada",
     "Unencrypted": "Non cifrada",
     "Encrypted by a deleted session": "Cifrada por unha sesión eliminada",
-    "Invite only": "Só por convite",
     "Scroll to most recent messages": "Ir ás mensaxes máis recentes",
     "Close preview": "Pechar vista previa",
     "Emoji picker": "Selector Emoticona",
@@ -1623,16 +1393,9 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala non existe. ¿Tes a certeza de estar no lugar correcto?",
     "Try again later, or ask a room admin to check if you have access.": "Inténtao máis tarde, ou pídelle á administración da instancia que comprobe se tes acceso.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s foi devolto ao intentar acceder a sala. Se cres que esta mensaxe non é correcta, por favor <issueLink>envía un informe de fallo</issueLink>.",
-    "Never lose encrypted messages": "Non perdas nunca acceso ás mensaxes cifradas",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensaxes nesta sala están aseguradas con cifrado extremo-a-extremo. Só ti e o correspondente(s) tedes as chaves para ler as mensaxes.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Fai unha copia das chaves para evitar perdelas. <a>Saber máis.</a>",
-    "Not now": "Agora non",
-    "Don't ask me again": "Non preguntarme outra vez",
     "Sort by": "Orde por",
     "Activity": "Actividade",
     "A-Z": "A-Z",
-    "Unread rooms": "Salas non lidas",
-    "Always show first": "Mostrar sempre primeiro",
     "Show": "Mostrar",
     "Message preview": "Vista previa da mensaxe",
     "List options": "Opcións da listaxe",
@@ -1643,7 +1406,6 @@
     "%(count)s unread messages including mentions.|one": "1 mención non lida.",
     "%(count)s unread messages.|other": "%(count)s mensaxe non lidas.",
     "%(count)s unread messages.|one": "1 mensaxe non lida.",
-    "Unread mentions.": "Mencións non lidas.",
     "Unread messages.": "Mensaxes non lidas.",
     "Leave Room": "Deixar a Sala",
     "Room options": "Opcións da Sala",
@@ -1679,7 +1441,6 @@
     "Room Name": "Nome da sala",
     "Room Topic": "Asunto da sala",
     "Room avatar": "Avatar da sala",
-    "Waiting for you to accept on your other session…": "Agardando a que aceptes na túa outra sesión…",
     "Waiting for %(displayName)s to accept…": "Agardando a que %(displayName)s acepte…",
     "Accepting…": "Aceptando…",
     "Start Verification": "Comezar a Verificación",
@@ -1701,7 +1462,6 @@
     "%(count)s sessions|other": "%(count)s sesións",
     "%(count)s sessions|one": "%(count)s sesión",
     "Hide sessions": "Agochar sesións",
-    "Direct message": "Mensaxe directa",
     "No recent messages by %(user)s found": "Non se atoparon mensaxes recentes de %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Desprázate na cronoloxía para ver se hai algúns máis recentes.",
     "Remove recent messages by %(user)s": "Eliminar mensaxes recentes de %(user)s",
@@ -1711,7 +1471,6 @@
     "Remove %(count)s messages|other": "Eliminar %(count)s mensaxes",
     "Remove %(count)s messages|one": "Eliminar 1 mensaxe",
     "Remove recent messages": "Eliminar mensaxes recentes",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
     "Deactivate user?": "¿Desactivar usuaria?",
     "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?": "Ao desactivar esta usuaria ficará desconectada e non poderá volver a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
     "Deactivate user": "Desactivar usuaria",
@@ -1728,7 +1487,6 @@
     "Almost there! Is %(displayName)s showing the same shield?": "Case feito! ¿está %(displayName)s mostrando as mesmas emoticonas?",
     "Yes": "Si",
     "Verify all users in a room to ensure it's secure.": "Verificar todas as usuarias da sala para asegurar que é segura.",
-    "Use the improved room list (will refresh to apply changes)": "Usa a lista de salas mellorada (actualizará para aplicar)",
     "Strikethrough": "Sobrescrito",
     "In encrypted rooms, verify all users to ensure it’s secure.": "En salas cifradas, verifica todas as usuarias para asegurar que é segura.",
     "You've successfully verified your device!": "Verificaches correctamente o teu dispositivo!",
@@ -1766,7 +1524,6 @@
     "You sent a verification request": "Enviaches unha solicitude de verificación",
     "Show all": "Mostrar todo",
     "Reactions": "Reaccións",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reaccionaron con %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reaccionaron con %(shortName)s</reactedWith>",
     "Message deleted": "Mensaxe eliminada",
     "Message deleted by %(name)s": "Mensaxe eliminada por %(name)s",
@@ -1796,18 +1553,14 @@
     "%(brand)s URL": "URL %(brand)s",
     "Room ID": "ID da sala",
     "Widget ID": "ID do widget",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s e o teu Xestor de integracións.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Os Widgets non usan cifrado de mensaxes.",
     "Widget added by": "Widget engadido por",
     "This widget may use cookies.": "Este widget podería usar cookies.",
-    "Maximize apps": "Maximizar apps",
     "More options": "Máis opcións",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Por favor <newIssueLink>abre un novo informe</newIssueLink> en GitHub para poder investigar o problema.",
     "Rotate Left": "Rotar á esquerda",
-    "Rotate counter-clockwise": "Rotar sentido contra-horario",
     "Rotate Right": "Rotar á dereita",
-    "Rotate clockwise": "Rotar sentido horario",
     "Language Dropdown": "Selector de idioma",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s non fixeron cambios %(count)s veces",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s non fixeron cambios",
@@ -1817,7 +1570,6 @@
     "Room address": "Enderezo da sala",
     "e.g. my-room": "ex. a-miña-sala",
     "Some characters not allowed": "Algúns caracteres non permitidos",
-    "Please provide a room address": "Proporciona un enderezo para a sala",
     "This address is available to use": "Este enderezo está dispoñible",
     "This address is already in use": "Este enderezo xa se está a utilizar",
     "Enter a server name": "Escribe un nome de servidor",
@@ -1853,17 +1605,13 @@
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "O baleirado dos datos da sesión é permanente. As mensaxes cifradas perderánse a menos que as súas chaves estiveren nunha copia de apoio.",
     "Clear all data": "Eliminar todos os datos",
     "Please enter a name for the room": "Escribe un nome para a sala",
-    "Set a room address to easily share your room with other people.": "Establece un enderezo para a sala fácil de compartir con outras persoas.",
-    "This room is private, and can only be joined by invitation.": "Esta sala é privada, e só te podes unir a través dun convite.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Podes desactivar esto posteriormente. As pontes e maioría de bots aínda non funcionarán.",
     "Enable end-to-end encryption": "Activar cifrado extremo-a-extremo",
     "Create a public room": "Crear sala pública",
     "Create a private room": "Crear sala privada",
     "Topic (optional)": "Asunto (optativo)",
-    "Make this room public": "Facer pública esta sala",
     "Hide advanced": "Ocultar Avanzado",
     "Show advanced": "Mostrar Avanzado",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarias de outros servidores matrix se unan a esta sala (Este axuste non se pode cambiar máis tarde!)",
     "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 o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás volver á nova versión de %(brand)s para facer esto",
     "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.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e volver a conectar.",
     "Incompatible Database": "Base de datos non compatible",
@@ -1882,7 +1630,6 @@
     "System font name": "Nome da letra do sistema",
     "Hey you. You're the best!": "Ei ti. Es grande!",
     "Message layout": "Disposición da mensaxe",
-    "Compact": "Compacta",
     "Modern": "Moderna",
     "Power level": "Nivel responsabilidade",
     "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 marcalo como confiable. Confiando neste dispositivo permite que ti e outras usuarias estedes máis tranquilas ao utilizar mensaxes cifradas.",
@@ -1892,11 +1639,8 @@
     "Integrations are disabled": "As Integracións están desactivadas",
     "Enable 'Manage Integrations' in Settings to do this.": "Activa 'Xestionar Integracións' nos Axustes para facer esto.",
     "Integrations not allowed": "Non se permiten Integracións",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "O teu %(brand)s non permite que uses o Xestor de Integracións, contacta coa administración.",
     "Confirm to continue": "Confirma para continuar",
     "Click the button below to confirm your identity.": "Preme no botón inferior para confirmar a túa identidade.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Fallo ao convidar as seguintes usuarias a conversa: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Non puidemos crear o teu MD. Comproba as usuarias que queres convidar e inténtao outra vez.",
     "Something went wrong trying to invite the users.": "Algo fallou ao convidar as usuarias.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Non puidemos invitar esas usuarias. Comprobas que son correctas e intenta convidalas outra vez.",
     "Failed to find the following users": "Non atopamos as seguintes usuarias",
@@ -1904,9 +1648,7 @@
     "Recent Conversations": "Conversas recentes",
     "Suggestions": "Suxestións",
     "Recently Direct Messaged": "Mensaxes Directas recentes",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Inicia a conversa con alguén usando o seu nome, nome de usuaria (como <userId/>) ou enderezo de email.",
     "Go": "Ir",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Convida alguén usando o seu nome, nome de usuaria (como <userId/>), enderezo de email ou <a>comparte esta sala</a>.",
     "a new master key signature": "unha nova firma con chave mestra",
     "a new cross-signing key signature": "unha nova firma con chave de sinatura-cruzada",
     "a device cross-signing signature": "unha sinatura sinatura-cruzada de dispositivo",
@@ -1935,16 +1677,6 @@
     "Your homeserver doesn't seem to support this feature.": "O servidor non semella soportar esta característica.",
     "Guest": "Convidada",
     "Message edits": "Edicións da mensaxe",
-    "Your account is not secure": "A túa conta non é segura",
-    "Your password": "O teu contrasinal",
-    "This session, or the other session": "Esta sesión, ou a outra sesión",
-    "The internet connection either session is using": "A conexión a internet que está a usar cada sesión",
-    "We recommend you change your password and recovery key in Settings immediately": "Recomendámosche cambiar inmediatamente o contrasinal e chave de recuperación nos Axustes",
-    "New session": "Nova sesión",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta seseión para verificar a nova, dándolle acceso ás mensaxes cifradas:",
-    "This wasn't me": "Non fun eu",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Se atopas fallos ou queres compartir a túa experiencia, compárteos con nós en GitHub.",
-    "Report bugs & give feedback": "Informe de fallos & opinión",
     "Please fill why you're reporting.": "Escribe a razón do informe.",
     "Report Content to Your Homeserver Administrator": "Denuncia sobre contido á Administración do teu servidor",
     "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.": "Ao denunciar esta mensaxe vasnos enviar o seu 'event ID' único á administración do servidor. Se as mensaxes da sala están cifradas, a administración do servidor non poderá ler o texto da mensaxe ou ver imaxes ou ficheiros.",
@@ -1958,18 +1690,14 @@
     "Update any local room aliases to point to the new room": "Actualizar calquera alias local da sala para que apunte á nova sala",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Evitar que as usuarias conversen na sala antiga e publicar unha mensaxe avisando ás usuarias para que veñan á nova sala",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Poñer unha ligazón na nova sala cara a antiga para que as persoas poidan ver as mensaxes antigas",
-    "Automatically invite users": "Convidar automáticamente ás usuarias",
     "Upgrade private room": "Actualizar sala privada",
     "Upgrade public room": "Actualizar sala pública",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "A actualización da sala é unha acción avanzada e recomendada cando unha sala se volta inestable debido aos fallos, características obsoletas e vulnerabilidades da seguridade.",
     "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>.": "Esto normalmente só afecta ao xeito en que a sala se procesa no servidor. Se tes problemas con %(brand)s, <a>informa do problema</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vas actualizar a sala da versión <oldVersion /> á <newVersion />.",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Un nome de usuaria só pode ter minúsculas, números e  '=_-./'",
-    "Checking...": "Comprobando...",
     "Missing session data": "Faltan datos da sesión",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Faltan algúns datos da sesión, incluíndo chaves de mensaxes cifradas. Desconecta e volve a conectar para arranxalo, restaurando as chaves desde a copia.",
     "Your browser likely removed this data when running low on disk space.": "O navegador probablemente eliminou estos datos ao quedar con pouco espazo de disco.",
-    "Integration Manager": "Xestor de Integracións",
     "Find others by phone or email": "Atopa a outras por teléfono ou email",
     "Be found by phone or email": "Permite ser atopada polo email ou teléfono",
     "Use bots, bridges, widgets and sticker packs": "Usa bots, pontes, widgets e paquetes de adhesivos",
@@ -1989,41 +1717,20 @@
     "Upload %(count)s other files|one": "Subir %(count)s ficheiro máis",
     "Cancel All": "Cancelar todo",
     "Upload Error": "Fallo ao subir",
-    "Verify other session": "Verificar outra sesión",
     "Verification Request": "Solicitude de Verificación",
-    "A widget would like to verify your identity": "Un widget quere verificar a túa indentidade",
-    "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 quere verificar a túa identidade. Se o permites, o widget poderá verificar o teu ID de usuaria, pero non realizar accións por ti.",
     "Remember my selection for this widget": "Lembrar a miña decisión para este widget",
-    "Deny": "Denegar",
-    "Enter recovery passphrase": "Escribe a frase de paso de recuperación",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Non se pode acceder ao almacenaxe segredo. Verifica que escribiches a frase de paso correta.",
-    "Enter recovery key": "Escribe a chave de recuperación",
-    "This looks like a valid recovery key!": "Semella unha chave de recuperación válida!",
-    "Not a valid recovery key": "Non é unha chave de recuperación válida",
     "Restoring keys from backup": "Restablecendo chaves desde a copia",
     "Fetching keys from server...": "Obtendo chaves desde o servidor...",
     "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s chaves restablecidas",
     "Unable to load backup status": "Non cargou o estado da copia",
-    "Recovery key mismatch": "A chave de recuperación non concorda",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "A copia non se puido descifrar con esta chave de recuperación: comproba que introduciches a chave de recuperación correcta.",
-    "Incorrect recovery passphrase": "Frase da paso de recuperación incorrecta",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "A copia non se descifrou con esta frase de paso: comproba que escribiches a frase de paso correcta.",
     "Unable to restore backup": "Non se restableceu a copia",
     "No backup found!": "Non se atopou copia!",
     "Keys restored": "Chaves restablecidas",
     "Failed to decrypt %(failedCount)s sessions!": "Fallo ao descifrar %(failedCount)s sesións!",
     "Successfully restored %(sessionCount)s keys": "Restablecidas correctamente %(sessionCount)s chaves",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Aviso</b>: só deberías realizar a copia de apoio desde un ordenador de confianza.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accede ó historial de mensaxes seguras escribindo a frase de paso de recuperación.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se esqueceches a frase de paso de recuperación pode <button1>usar a chave de recuperación</button1> ou establecer <button2>novas opcións de recuperación</button2>",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Aviso</b>: só deberías configurar a copia das chaves desde un ordenador de confianza.",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Accede ó teu historial de mensaxes seguras e configura a comunicación segura escribindo a chave de recuperación.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se esqueceches a chave de recuperación podes <button>establecer novas opcións de recuperación</button>",
-    "Address (optional)": "Enderezo (optativo)",
-    "Resend edit": "Editar reenvío",
     "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s reacción(s)",
-    "Resend removal": "Reenviar retirada",
-    "Share Permalink": "Comparte ligazón permanente",
     "Report Content": "Denunciar contido",
     "Notification settings": "Axustes de notificacións",
     "Clear status": "Baleirar estado",
@@ -2031,10 +1738,7 @@
     "Set status": "Establecer estado",
     "Set a new status...": "Establecer novo estado...",
     "Hide": "Agochar",
-    "Reload": "Recargar",
-    "Take picture": "Tomar foto",
     "Remove for everyone": "Eliminar para todas",
-    "Remove for me": "Eliminar para min",
     "User Status": "Estado da usuaria",
     "This homeserver would like to make sure you are not a robot.": "Este servidor quere asegurarse de que non es un robot.",
     "Country Dropdown": "Despregable de países",
@@ -2042,42 +1746,21 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta a chave pública do captcha na configuración do servidor. Informa desto á administración do teu servidor.",
     "Please review and accept all of the homeserver's policies": "Revisa e acepta todas as cláusulas do servidor",
     "Please review and accept the policies of this homeserver:": "Revisa e acepta as cláusulas deste servidor:",
-    "Unable to validate homeserver/identity server": "Non se puido validar o servidor de inicio/servidor de identidade",
-    "Your Modular server": "O teu servidor Modular",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Escribe a localización do teu servidor Modular. Podería utilizar o teu propio nome de dominio ou ser un subdominio de <a>modular.im</a>.",
-    "Server Name": "Nome do Servidor",
     "Enter password": "Escribe contrasinal",
     "Nice, strong password!": "Ben, bo contrasinal!",
     "Password is allowed, but unsafe": "O contrasinal é admisible, pero inseguro",
     "Keep going...": "Segue intentándoo...",
-    "The username field must not be blank.": "O campo de nome de usuaria non pode estar baleiro.",
     "Username": "Nome de usuaria",
-    "Not sure of your password? <a>Set a new one</a>": "¿Non estás segura do contrasinal? <a>Crea un novo</a>",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Non hai un servidor de identidade configurado polo que non poderás engadir enderezos de email para poder restablecer o contrasinal no futuro.",
     "Use an email address to recover your account": "Usa un enderezo de email para recuperar a túa conta",
     "Enter email address (required on this homeserver)": "Escribe o enderzo de email (requerido neste servidor)",
     "Doesn't look like a valid email address": "Non semella un enderezo válido",
     "Passwords don't match": "Non concordan os contrasinais",
     "Other users can invite you to rooms using your contact details": "Outras usuarias poden convidarte ás salas usando os teus detalles de contacto",
     "Enter phone number (required on this homeserver)": "Escribe un número de teléfono (requerido neste servidor)",
-    "Doesn't look like a valid phone number": "Non semella un número de teléfono válido",
     "Use lowercase letters, numbers, dashes and underscores only": "Usa só minúsculas, números, trazos e trazos baixos",
     "Enter username": "Escribe nome de usuaria",
     "Email (optional)": "Email (optativo)",
     "Phone (optional)": "Teléfono (optativo)",
-    "Create your Matrix account on %(serverName)s": "Crea a conta Matrix en %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Crea a túa conta Matrix en <underlinedServerName />",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Establece un email para recuperación da conta. Usa un email ou teléfono de xeito optativo para que poidan atoparte os contactos.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Establece un email para recuperación da conta. Optativamente usa un email para que poidan atoparte os contactos existentes.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Escribe o URL do servidor personalizado <a>¿Qué significa esto?</a>",
-    "Homeserver URL": "URL do servidor",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Escribe o URL do servidor de identidade personalizado <a>¿Que significa esto?</a>",
-    "Identity Server URL": "URL do servidor de identidade",
-    "Other servers": "Outros servidores",
-    "Free": "Gratuíto",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Hospedaxe Premium para organizacións <a>Saber máis</a>",
-    "Find other public servers or use a custom server": "Atopa outros servidores públicos ou usa un servidor personalizado",
     "Couldn't load page": "Non se puido cargar a páxina",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás volver a unirte sen un convite doutra persoa administradora.",
     "Want more than a community? <a>Get your own server</a>": "¿Queres algo máis que unha comunidade? <a>Monta o teu propio servidor</a>",
@@ -2086,7 +1769,6 @@
     "Liberate your communication": "Libera as túas comunicacións",
     "Send a Direct Message": "Envía unha Mensaxe Directa",
     "Create a Group Chat": "Crear unha Conversa en Grupo",
-    "Self-verification request": "Solicitude de auto-verificación",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s non puido obter a lista de protocolos desde o servidor. O servidor podería ser moi antigo para soportar redes de terceiros.",
     "%(brand)s failed to get the public room list.": "%(brand)s non puido obter a lista de salas públicas.",
     "The homeserver may be unavailable or overloaded.": "O servidor podería non estar dispoñible ou con sobrecarga.",
@@ -2099,7 +1781,6 @@
     "Jump to first invite.": "Vai ó primeiro convite.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
-    "Your profile": "Perfil",
     "Switch to light mode": "Cambiar a decorado claro",
     "Switch to dark mode": "Cambiar a decorado escuro",
     "Switch theme": "Cambiar decorado",
@@ -2110,9 +1791,6 @@
     "Verify this login": "Verifcar esta conexió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.": "Ao cambiar o contrasinal vas restablecer todas as chaves de cifrado das túas sesións, impedindo ler o historial de conversa. Configura a Copia de Apoio das Chaves ou exporta as chaves da sala desde outra sesión antes de restablecer o contrasinal.",
-    "Your Matrix account on %(serverName)s": "A túa conta Matrix en %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "A túa conta Matrix en <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "Non hai un Servidor de Identidade configurado: engade un nos axustes para restablecer o contrasinal.",
     "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.": "Desconectaches todas as sesións e non recibirás notificacións push. Para reactivalas, conéctate outra vez nos dispositivos.",
     "Set a new password": "Novo contrasinal",
     "Invalid homeserver discovery response": "Resposta de descubrimento do servidor non válida",
@@ -2136,15 +1814,8 @@
     "<a>Log in</a> to your new account.": "<a>Conecta</a> usando a conta nova.",
     "You can now close this window or <a>log in</a> to your new account.": "Podes pechar esta ventá ou <a>conectar</a> usando a conta nova.",
     "Registration Successful": "Rexistro correcto",
-    "Create your account": "Crea a túa conta",
-    "Use Recovery Key or Passphrase": "Usa a Chave de recuperación ou Frase de paso",
-    "Use Recovery Key": "Usa chave de recuperación",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirma a túa identidade verificando esta conexión desde unha das outras sesións, permitindo así acceder ás mensaxes cifradas.",
-    "This requires the latest %(brand)s on your other devices:": "Require a última versión de %(brand)s nos outros dispositivos:",
-    "or another cross-signing capable Matrix client": "ou outro cliente Matrix que permita a sinatura-cruzada",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "A nova sesión foi verificada. Tes acceso ás mensaxes cifradas, e outras persoas verante como confiable.",
     "Your new session is now verified. Other users will see it as trusted.": "A nova sesión foi verificada. Outras persoas verante como confiable.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Sen non garantes a seguridade para esta sesión non poderá acceder a mensaxes cifradas.",
     "Go Back": "Atrás",
     "Failed to re-authenticate due to a homeserver problem": "Fallo ó reautenticar debido a un problema no servidor",
     "Failed to re-authenticate": "Fallo na reautenticación",
@@ -2154,7 +1825,6 @@
     "Clear personal data": "Baleirar datos personais",
     "Command Autocomplete": "Autocompletado de comandos",
     "Community Autocomplete": "Autocompletado de comunidade",
-    "DuckDuckGo Results": "Resultados DuckDuckGo",
     "Emoji Autocomplete": "Autocompletado emoticonas",
     "Notification Autocomplete": "Autocompletado de notificacións",
     "Room Autocomplete": "Autocompletado de Salas",
@@ -2166,53 +1836,34 @@
     "Restore": "Restablecer",
     "You'll need to authenticate with the server to confirm the upgrade.": "Debes autenticarte no servidor para confirmar a actualización.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Actualiza esta sesión para permitirlle que verifique as outras sesións, outorgándolles acceso ás mensaxes cifradas e marcándoas como confiables para outras usuarias.",
-    "Enter a recovery passphrase": "Escribe a frase de paso de recuperación",
-    "Great! This recovery passphrase looks strong enough.": "Ben! Esta frase de paso de recuperación semella ser forte.",
-    "Set up with a recovery key": "Configura cunha chave de recuperación",
     "That matches!": "Concorda!",
     "Use a different passphrase?": "¿Usar unha frase de paso diferente?",
     "That doesn't match.": "Non concorda.",
     "Go back to set it again.": "Vai atrás e volve a escribila.",
-    "Enter your recovery passphrase a second time to confirm it.": "Escribe a frase de paso de recuperación por segunda vez para confirmala.",
-    "Confirm your recovery passphrase": "Confirma a frase de paso de recuperación",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "A chave de recuperación é unha rede de seguridade - podes usala para recuperar o acceso ás mensaxes cifradas se esqueces a frase de paso de recuperación.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Garda unha copia nun lugar seguro, como un xestor de contrasinais ou nun lugar aínda máis seguro.",
-    "Your recovery key": "A chave de recuperación",
     "Copy": "Copiar",
     "Download": "Descargar",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "A chave de recuperación foi <b>copiada no portapapeis</b>, pégaa en:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "A chave de recuperación está no teu cartafol de <b>Descargas</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Imprímea</b> e gárdaa nun lugar seguro",
     "<b>Save it</b> on a USB key or backup drive": "<b>Gárdaa</b> nunha memoria USB ou disco duro",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copiaa</b> no almacenaxe personal na nube",
     "Unable to query secret storage status": "Non se obtivo o estado do almacenaxe segredo",
     "Retry": "Reintentar",
     "Upgrade your encryption": "Mellora o teu cifrado",
-    "Make a copy of your recovery key": "Fai unha copia da túa chave de recuperación",
     "Unable to set up secret storage": "Non se configurou un almacenaxe segredo",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Imos gardar unha copia cifrada das túas chaves no noso servidor. Asegura a copia cunha frase de paso de recuperación.",
     "For maximum security, this should be different from your account password.": "Para máxima seguridade, esta debería ser diferente ó contrasinal da túa conta.",
-    "Please enter your recovery passphrase a second time to confirm.": "Escribe a frase de paso de recuperación outra vez para confirmala.",
-    "Repeat your recovery passphrase...": "Repite a frase de paso de recuperación...",
     "Your keys are being backed up (the first backup could take a few minutes).": "As chaves estanse a copiar (a primeira copia podería tardar un anaco).",
     "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.": "Se non configuras Recuperación de Mensaxes Seguras, non poderás restablecer o historial de mensaxes cifradas se te desconectas ou usas outra sesión.",
     "Set up Secure Message Recovery": "Cofigurar Recuperación de Mensaxes Seguras",
-    "Secure your backup with a recovery passphrase": "Asegura a túa copia cunha frase de paso de recuperación",
     "Starting backup...": "Iniciando a copia...",
     "Success!": "Feito!",
     "Create key backup": "Crear copia da chave",
     "Unable to create key backup": "Non se creou a copia da chave",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Se non configuras a Recuperación de Mensaxes Seguras, perderás o acceso ó historial de mensaxes seguras cando te desconectes.",
-    "If you don't want to set this up now, you can later in Settings.": "Se non queres configurar esto agora, pódelo facer posteriormente nos Axustes.",
-    "Don't ask again": "Non preguntar outra vez",
     "New Recovery Method": "Novo Método de Recuperación",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Detectouse unha nova frase de paso de recuperación e chave para Mensaxes Seguras.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se non configuras o novo método de recuperación, un atacante podería intentar o acceso á túa conta. Cambia inmediatamente o contrasinal da conta e configura un novo método de recuperación nos Axustes.",
     "This session is encrypting history using the new recovery method.": "Esta sesión está cifrando o historial usando o novo método de recuperación.",
     "Go to Settings": "Ir a Axustes",
     "Set up Secure Messages": "Configurar Mensaxes Seguras",
     "Recovery Method Removed": "Método de Recuperación eliminado",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Esta sesión detectou que a túa frase de paso de recuperación e chave para Mensaxes Seguras foron eliminadas.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Se fixeches esto sen querer, podes configurar Mensaxes Seguras nesta sesión e volverá a cifrar as mensaxes da sesión cun novo método de recuperación.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se non eliminaches o método de recuperación, un atacante podería estar a intentar acceder á túa conta. Cambia inmediatamente o contrasinal da conta e establece un novo método de recuperación nos Axustes.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Se está desactivado, as mensaxes das salas cifradas non aparecerán nos resultados das buscas.",
@@ -2224,7 +1875,6 @@
     "Indexed messages:": "Mensaxes indexadas:",
     "Indexed rooms:": "Salas indexadas:",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s de %(totalRooms)s",
-    "New spinner design": "Novo deseño da roda",
     "Message downloading sleep time(ms)": "Tempo de espera da mensaxe de descarga(ms)",
     "Navigation": "Navegación",
     "Calls": "Chamadas",
@@ -2272,62 +1922,18 @@
     "You joined the call": "Unícheste á chamada",
     "%(senderName)s joined the call": "%(senderName)s uniuse á chamada",
     "Call in progress": "Chamada en curso",
-    "You left the call": "Deixáchela chamada",
-    "%(senderName)s left the call": "%(senderName)s deixou a chamada",
     "Call ended": "Chamada rematada",
     "You started a call": "Iniciaches unha chamada",
     "%(senderName)s started a call": "%(senderName)s iniciou unha chamada",
     "Waiting for answer": "Agardando resposta",
     "%(senderName)s is calling": "%(senderName)s está chamando",
-    "You created the room": "Creaches a sala",
-    "%(senderName)s created the room": "%(senderName)s creou a sala",
-    "You made the chat encrypted": "Cifraches a conversa",
-    "%(senderName)s made the chat encrypted": "%(senderName)s cifrou a conversa",
-    "You made history visible to new members": "Fixeches visible o historial para novos membros",
-    "%(senderName)s made history visible to new members": "%(senderName)s fixo o historial visible para novos membros",
-    "You made history visible to anyone": "Fixeches que o historial sexa visible para todas",
-    "%(senderName)s made history visible to anyone": "%(senderName)s fixo o historial visible para todas",
-    "You made history visible to future members": "Fixeches o historial visible para membros futuros",
-    "%(senderName)s made history visible to future members": "%(senderName)s fixo o historial visible para futuros membros",
-    "You were invited": "Foches convidada",
-    "%(targetName)s was invited": "%(targetName)s foi convidada",
-    "You left": "Saíches",
-    "%(targetName)s left": "%(targetName)s saíu",
-    "You were kicked (%(reason)s)": "Expulsáronte (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s foi expulsada (%(reason)s)",
-    "You were kicked": "Foches expulsada",
-    "%(targetName)s was kicked": "%(targetName)s foi expulsada",
-    "You rejected the invite": "Rexeitaches o convite",
-    "%(targetName)s rejected the invite": "%(targetName)s rexeitou o convite",
-    "You were uninvited": "Retiraronche o convite",
-    "%(targetName)s was uninvited": "Retirouse o convite para %(targetName)s",
-    "You were banned (%(reason)s)": "Foches bloqueada (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s foi bloqueada (%(reason)s)",
-    "You were banned": "Foches bloqueada",
-    "%(targetName)s was banned": "%(targetName)s foi bloqueada",
-    "You joined": "Unícheste",
-    "%(targetName)s joined": "%(targetName)s uneuse",
-    "You changed your name": "Cambiaches o nome",
-    "%(targetName)s changed their name": "%(targetName)s cambiou o seu nome",
-    "You changed your avatar": "Cambiáchelo avatar",
-    "%(targetName)s changed their avatar": "%(targetName)s cambiou o seu avatar",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Cambiaches o nome da sala",
-    "%(senderName)s changed the room name": "%(senderName)s cambiou o nome da sala",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Retiraches o convite para %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s retiroulle o convite a %(targetName)s",
-    "You invited %(targetName)s": "Convidaches a %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s convidou a %(targetName)s",
-    "You changed the room topic": "Cambiaches o tema da sala",
-    "%(senderName)s changed the room topic": "%(senderName)s cambiou o asunto da sala",
     "Message deleted on %(date)s": "Mensaxe eliminada o %(date)s",
     "Wrong file type": "Tipo de ficheiro erróneo",
     "Looks good!": "Pinta ben!",
-    "Wrong Recovery Key": "Chave de recuperación errónea",
-    "Invalid Recovery Key": "Chave de recuperación non válida",
     "Security Phrase": "Frase de seguridade",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Escribe a túa Frase de Seguridade ou <button>Utiliza a Chave de Seguridade</button> para continuar.",
     "Security Key": "Chave de Seguridade",
@@ -2341,47 +1947,22 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Garda a Chave de Seguridade nalgún lugar seguro, como un xestor de contrasinais ou caixa de seguridade, será utiizada para protexer os teus datos cifrados.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se cancelas agora, poderías perder mensaxes e datos cifrados se perdes o acceso ós datos de conexión.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Podes configurar a Copia de apoio Segura e xestionar as chaves en Axustes.",
-    "Set up Secure backup": "Configurar Copia de apoio Segura",
     "Set a Security Phrase": "Establece a Frase de Seguridade",
     "Confirm Security Phrase": "Confirma a Frase de Seguridade",
     "Save your Security Key": "Garda a Chave de Seguridade",
-    "Use your account to sign in to the latest version": "Usa a túa conta para conectarte á última versión",
-    "We’re excited to announce Riot is now Element": "Emociónanos anunciar que Riot agora chámase Element",
-    "Riot is now Element!": "Riot agora é Element!",
-    "Learn More": "Saber máis",
     "Enable experimental, compact IRC style layout": "Activar o estilo experimental IRC compacto",
     "Unknown caller": "Descoñecido",
-    "Incoming voice call": "Chamada de voz entrante",
-    "Incoming video call": "Chamada de vídeo entrante",
-    "Incoming call": "Chamada entrante",
     "%(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 non pode por na caché local de xeito as mensaxes cifradas cando usa un navegador web. Usa <desktopLink>%(brand)s Desktop</desktopLink> para que as mensaxes cifradas aparezan nos resultados.",
-    "There are advanced notifications which are not shown here.": "Existen notificacións avanzadas que non aparecen aquí.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Deberialas ter configurado nun cliente diferente de %(brand)s. Non podes modificalas en %(brand)s pero aplícanse igualmente.",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Escolle unha das tipografías instaladas no teu sistema e %(brand)s intentará utilizalas.",
-    "Make this room low priority": "Marcar a sala como de baixa prioridade",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "As salas de baixa prioridade aparecen abaixo na lista de salas, nunha sección dedicada no final da lista",
     "Use default": "Usar por defecto",
     "Mentions & Keywords": "Mencións e Palabras chave",
     "Notification options": "Opcións de notificación",
     "Favourited": "Con marca de Favorita",
     "Forget Room": "Esquecer sala",
     "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.": "Se a outra versión de %(brand)s aínda está aberta noutra lapela, péchaa xa que usar %(brand)s no mesmo servidor con carga preguiceira activada e desactivada ao mesmo tempo causará problemas.",
-    "Use your account to sign in to the latest version of the app at <a />": "Usa a túa conta para conectarte á última versión da app en <a />",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Xa estás conectada e podes ir alá, pero tamén podes ir á última versión da app en tódalas plataformas en <a>element.io/get-started</a>.",
-    "Go to Element": "Ir a Element",
-    "We’re excited to announce Riot is now Element!": "Emociónanos comunicar que Riot agora é Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Coñece máis en <a>element.io/previously-riot</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.": "Podes usar as opcións de servidor personalizado para conectar con outros servidores Matrix indicando un URL diferente para o servidor. Poderás usar %(brand)s cunha conta Matrix existente noutro servidor de inicio.",
-    "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>.": "Escribe a localización do teu servidor Element Matrix Services. Podería ser o teu propio dominio ou un subdominio de <a>element.io</a>.",
-    "Search rooms": "Buscar salas",
     "User menu": "Menú de usuaria",
-    "%(brand)s Web": "Web %(brand)s",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X para Android",
     "This room is public": "Esta é unha sala pública",
     "Away": "Fóra",
-    "Enable advanced debugging for the room list": "Activar depuración avanzada para a lista da sala",
     "Show rooms with unread messages first": "Mostrar primeiro as salas con mensaxes sen ler",
     "Show previews of messages": "Mostrar vista previa das mensaxes",
     "Edited at %(date)s": "Editado o %(date)s",
@@ -2408,8 +1989,6 @@
     "No files visible in this room": "Non hai ficheiros visibles na sala",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Anexa filecheiros desde a conversa ou arrastra e sóltaos onde queiras nunha sala.",
     "You’re all caught up": "Xa estás ó día",
-    "You have no visible notifications in this room.": "Non tes notificacións visibles nesta sala.",
-    "%(brand)s Android": "%(brand)s Android",
     "Master private key:": "Chave mestra principal:",
     "Show message previews for reactions in DMs": "Mostrar vista previa das mensaxes para reaccións en MDs",
     "Show message previews for reactions in all rooms": "Mostrar vista previa das mensaxes para reaccións en todas as salas",
@@ -2426,8 +2005,6 @@
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototipos de Comunidades v2. Require un servidor compatible. Característica experimental - usa con tino.",
     "Explore rooms in %(communityName)s": "Explorar salas en %(communityName)s",
     "Set up Secure Backup": "Configurar Copia de apoio Segura",
-    "Cross-signing and secret storage are ready for use.": "A Sinatura-Cruzada e o almacenaxe segredo están listos para usar.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "A Sinatura-Cruzada está preparada para usala, mais o almacenaxe segredo aínda non foi usado para facer copia das chaves.",
     "Explore community rooms": "Explorar salas da comunidade",
     "Information": "Información",
     "Add another email": "Engadir outro email",
@@ -2443,7 +2020,6 @@
     "Enter name": "Escribe o nome",
     "Add image (optional)": "Engade unha imaxe (optativo)",
     "An image will help people identify your community.": "Unha imaxe axudaralle á xente a identificar a túa comunidade.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "As salas privadas só se poden atopar e unirse por convite. As salas públicas son accesibles para calquera.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "As salas privadas só poden ser atopadas e unirse por convite. As salas públicas son accesibles para calquera nesta comunidade.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Pode resultar útil se a sala vai ser utilizada só polo equipo de xestión interna do servidor. Non se pode cambiar máis tarde.",
     "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.": "Poderías desactivalo se a sala vai ser utilizada para colaborar con equipos externos que teñen o seu propio servidor. Esto non se pode cambiar máis tarde.",
@@ -2454,7 +2030,6 @@
     "There was an error updating your community. The server is unable to process your request.": "Algo fallou ó actualizar a comunidade. O servidor non é quen de procesar a solicitude.",
     "Update community": "Actualizar comunidade",
     "May include members not in %(communityName)s": "Podería incluir participantes que non 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>.": "Iniciar unha conversa con alguén utilizando o seu nome, nome de usuaria (como <userId/>) ou enderezo de email. Esto non as convidará a %(communityName)s. Para convidar a alguén a %(communityName)s, preme <a>aquí</a>.",
     "Failed to find the general chat for this community": "Non se atopou o chat xenérico para esta comunidade",
     "Community settings": "Axustes da comunidade",
     "User settings": "Axustes de usuaria",
@@ -2463,10 +2038,6 @@
     "Unknown App": "App descoñecida",
     "%(count)s results|one": "%(count)s resultado",
     "Room Info": "Info da sala",
-    "Apps": "Apps",
-    "Unpin app": "Desafixar app",
-    "Edit apps, bridges & bots": "Editar apps, pontes e bots",
-    "Add apps, bridges & bots": "Engadir apps, pontes e bots",
     "Not encrypted": "Sen cifrar",
     "About": "Acerca de",
     "%(count)s people|other": "%(count)s persoas",
@@ -2474,26 +2045,17 @@
     "Show files": "Mostrar ficheiros",
     "Room settings": "Axustes da sala",
     "Take a picture": "Tomar unha foto",
-    "Pin to room": "Fixar a sala",
-    "You can only pin 2 apps at a time": "Só podes fixar 2 apps ó tempo",
     "Unpin": "Desafixar",
-    "Group call modified by %(senderName)s": "Chamada en grupo modificada por %(senderName)s",
-    "Group call started by %(senderName)s": "Chamada en grupo iniciada por %(senderName)s",
-    "Group call ended by %(senderName)s": "Chamada en grupo rematada por %(senderName)s",
     "Cross-signing is ready for use.": "A Sinatura-Cruzada está lista para usar.",
     "Cross-signing is not set up.": "Non está configurada a Sinatura-Cruzada.",
     "Backup version:": "Versión da copia:",
     "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.": "Fai copia de apoio das chaves de cifrado para a continxencia de perder o acceso a todas as sesións. As chaves quedarán aseguradas cunha Chave de Recuperación única.",
     "Backup key stored:": "Chave da copia gardada:",
     "Backup key cached:": "Chave da copia na caché:",
     "Secret storage:": "Almacenaxe segreda:",
     "ready": "lista",
     "not ready": "non lista",
     "Secure Backup": "Copia Segura",
-    "End Call": "Finalizar chamada",
-    "Remove the group call from the room?": "Eliminar a chamada en grupo da sala?",
-    "You don't have permission to remove the call from the room": "Non tes permiso para eliminar a chamada da sala",
     "Safeguard against losing access to encrypted messages & data": "Protéxete de perder o acceso a mensaxes e datos cifrados",
     "not found in storage": "non atopado no almacenaxe",
     "Start a conversation with someone using their name or username (like <userId/>).": "Inicia unha conversa con alguén usando o seu nome ou nome de usuaria (como <userId/>).",
@@ -2503,9 +2065,6 @@
     "Widgets": "Widgets",
     "Edit widgets, bridges & bots": "Editar widgets, pontes e bots",
     "Add widgets, bridges & bots": "Engade widgets, pontes e bots",
-    "You can only pin 2 widgets at a time": "Só podes fixar 2 widgets ó mesmo tempo",
-    "Minimize widget": "Minimizar widget",
-    "Maximize widget": "Maximizar widget",
     "Your server requires encryption to be enabled in private rooms.": "O servidor require que actives o cifrado nas salas privadas.",
     "Use the <a>Desktop app</a> to see all encrypted files": "Usa a <a>app de Escritorio</a> para ver todos os ficheiros cifrados",
     "Use the <a>Desktop app</a> to search encrypted messages": "Usa a <a>app de Escritorio</a> para buscar mensaxes cifradas",
@@ -2524,20 +2083,10 @@
     "Failed to save your profile": "Non se gardaron os cambios",
     "The operation could not be completed": "Non se puido realizar a acción",
     "Remove messages sent by others": "Eliminar mensaxes enviadas por outras",
-    "Calling...": "Chamando...",
-    "Call connecting...": "Conectando a chamada...",
-    "Starting camera...": "Iniciando a cámara...",
-    "Starting microphone...": "Iniciando o micrófono...",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tódolos servidores están prohibidos! Esta sala xa non pode ser utilizada.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s cambiou ACLs de servidor para esta sala.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s estableceu ACLs de servidor para esta sala.",
-    "%(senderName)s declined the call.": "%(senderName)s rexeitou a chamada.",
-    "(an error occurred)": "(algo fallou)",
-    "(their device couldn't start the camera / microphone)": "(o dispositivo deles non puido iniciar a cámara / micrófono)",
-    "(connection failed)": "(fallou a conexión)",
     "The call could not be established": "Non se puido establecer a chamada",
-    "The other party declined the call.": "A outra persoa rexeitou a chamada.",
-    "Call Declined": "Chamada rexeitada",
     "Move right": "Mover á dereita",
     "Move left": "Mover á esquerda",
     "Revoke permissions": "Revogar permisos",
@@ -2648,7 +2197,6 @@
     "%(creator)s created this DM.": "%(creator)s creou esta MD.",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "As mensaxes desta sala están cifradas de extremo-a-extremo. Cando se unan, podes verificar as persoas no seu perfil, tocando no seu avatar.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Aquí as mensaxes están cifradas de extremo-a-extre. Verifica a %(displayName)s no seu perfil - toca no seu avatar.",
-    "Role": "Rol",
     "This is the start of <roomName/>.": "Este é o comezo de <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Engade unha foto para que se poida identificar a sala facilmente.",
     "%(displayName)s created this room.": "%(displayName)s creou esta sala.",
@@ -2658,7 +2206,6 @@
     "Topic: %(topic)s (<a>edit</a>)": "Asunto: %(topic)s (<a>editar</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Este é o comezo do teu historial de conversa con <displayName/>.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Só vós as dúas estades nesta conversa, a non ser que convidedes a alguén máis.",
-    "Call Paused": "Chamada en pausa",
     "Zimbabwe": "Zimbabue",
     "Zambia": "Zambia",
     "Yemen": "Yemen",
@@ -2840,8 +2387,6 @@
     "Equatorial Guinea": "Guinea Ecuatorial",
     "El Salvador": "O Salvador",
     "Egypt": "Exipto",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s sala.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s salas.",
     "Filter rooms and people": "Fitrar salas e persoas",
     "Open the link in the email to continue registration.": "Abre a ligazón que hai no email para continuar co rexistro.",
     "A confirmation email has been sent to %(emailAddress)s": "Enviouse un email de confirmación a %(emailAddress)s",
@@ -2924,9 +2469,7 @@
     "No other application is using the webcam": "Outra aplicación non está usando a cámara",
     "Permission is granted to use the webcam": "Tes permiso para acceder ó uso da cámara",
     "A microphone and webcam are plugged in and set up correctly": "O micrófono e a cámara están conectados e correctamente configurados",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "A chamada fallou porque non están accesibles a cámara ou o micrófono. Comproba que:",
     "Unable to access webcam / microphone": "Non se puido acceder a cámara / micrófono",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada fallou porque non se puido acceder a un micrófono. Comproba que o micrófono está conectado e correctamente configurado.",
     "Unable to access microphone": "Non se puido acceder ó micrófono",
     "Decide where your account is hosted": "Decide onde queres crear a túa conta",
     "Host account on": "Crea a conta en",
@@ -2945,7 +2488,6 @@
     "Learn more": "Saber máis",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "Usa o teu servidor de inicio Matrix preferido, ou usa o teu propio.",
     "Other homeserver": "Outro servidor de inicio",
-    "We call the places you where you can host your account ‘homeservers’.": "Chamámoslle 'Servidores de inicio' ós servidores onde poderías ter a túa conta.",
     "Sign into your homeserver": "Conecta co teu servidor de inicio",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org é o servidor de inicio máis grande de todos, polo que é lugar común para moitas persoas.",
     "Specify a homeserver": "Indica un servidor de inicio",
@@ -2961,7 +2503,6 @@
     "Unable to validate homeserver": "Non se puido validar o servidor de inicio",
     "sends confetti": "envía confetti",
     "Sends the given message with confetti": "Envía a mensaxe con confetti",
-    "Show chat effects": "Mostrar efectos do chat",
     "Effects": "Efectos",
     "Call failed because webcam or microphone could not be accessed. Check that:": "A chamada fallou porque non tiñas acceso á cámara ou ó micrófono. Comproba:",
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada fallou porque non tiñas acceso ó micrófono. Comproba que o micrófono está conectado e correctamente configurado.",
@@ -2971,7 +2512,6 @@
     "You held the call <a>Resume</a>": "Colgaches a chamada, <a>Retomar</a>",
     "You've reached the maximum number of simultaneous calls.": "Acadaches o número máximo de chamadas simultáneas.",
     "Too Many Calls": "Demasiadas chamadas",
-    "%(name)s paused": "detido por %(name)s",
     "sends fireworks": "envía fogos de artificio",
     "Sends the given message with fireworks": "Envia a mensaxe dada con fogos de artificio",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Antecede con ┬──┬ ノ( ゜-゜ノ) a unha mensaxe de texto plano",
@@ -2987,7 +2527,6 @@
     "There was an error finding this widget.": "Houbo un fallo ao buscar o widget.",
     "Active Widgets": "Widgets activos",
     "Open dial pad": "Abrir marcador",
-    "Start a Conversation": "Iniciar unha Conversa",
     "Dial pad": "Marcador",
     "There was an error looking up the phone number": "Houbo un erro buscando o número de teléfono",
     "Unable to look up phone number": "Non atopamos o número de teléfono",
@@ -3004,7 +2543,6 @@
     "Your Security Key": "A túa Chave de Seguridade",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "A túa Chave de Seguridade é unha rede de seguridade - podes utilizala para restablecer o acceso ás mensaxes cifradas se esqueceches a Frase de Seguridade.",
     "Repeat your Security Phrase...": "Repite a Frase de Seguridade...",
-    "Please enter your Security Phrase a second time to confirm.": "Escribe outra vez a Frase de Seguridade para confirmala.",
     "Set up with a Security Key": "Configurar cunha Chave de Seguridade",
     "Great! This Security Phrase looks strong enough.": "Ben! Esta Frase de Seguridade semella ser forte abondo.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Gardaremos unha copia cifrada das túas chaves no noso servidor. Asegura a túa copia cunha Frase de Seguridade.",
@@ -3025,14 +2563,11 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Non se puido acceder ao almacenaxe segredo. Comproba que escribiches correctamente a Frase de Seguridade.",
     "Invalid Security Key": "Chave de Seguridade non válida",
     "Wrong Security Key": "Chave de Seguridade incorrecta",
-    "We recommend you change your password and Security Key in Settings immediately": "Recomendámosche cambiar o teu contrasinal e Chave de Seguridade inmediatamente nos Axustes",
     "Set my room layout for everyone": "Establecer a miña disposición da sala para todas",
     "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.": "Fai unha copia de apoio das chaves de cifrado da túa conta en caso de perder o acceso ás túas sesións. As chaves estarán seguras cunha única Chave de Seguridade.",
     "%(senderName)s has updated the widget layout": "%(senderName)s actualizou a disposición dos widgets",
     "Converts the room to a DM": "Converte a sala en MD",
     "Converts the DM to a room": "Converte a MD nunha sala",
-    "Use Command + F to search": "Usa Command + F para buscar",
-    "Use Ctrl + F to search": "Usa Ctrl + F para buscar",
     "Use app for a better experience": "Para ter unha mellor experiencia usa a app",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web en móbiles está en fase experimental. Para ter unha mellor experiencia e máis funcións utiliza a app nativa gratuíta.",
     "Use app": "Usa a app",
@@ -3047,13 +2582,9 @@
     "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.": "Pedíramoslle ao teu navegador que lembrase o teu servidor de inicio para conectarte, pero o navegador esqueceuno. Vaite á páxina de conexión e inténtao outra vez.",
     "We couldn't log you in": "Non puidemos conectarte",
     "Show stickers button": "Mostrar botón dos adhesivos",
-    "Windows": "Ventás",
-    "Screens": "Pantallas",
-    "Share your screen": "Compartir a túa pantalla",
     "Recently visited rooms": "Salas visitadas recentemente",
     "Show line numbers in code blocks": "Mostrar números de liña nos bloques de código",
     "Expand code blocks by default": "Por omsión despregar bloques de código",
-    "Upgrade to pro": "Mellorar a pro",
     "Minimize dialog": "Minimizar ventá",
     "Maximize dialog": "Maximizar ventá",
     "%(hostSignupBrand)s Setup": "Configurar %(hostSignupBrand)s",
@@ -3090,22 +2621,14 @@
     "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",
@@ -3113,25 +2636,9 @@
     "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.",
@@ -3140,9 +2647,7 @@
     "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.",
@@ -3150,19 +2655,12 @@
     "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",
@@ -3173,40 +2671,28 @@
     "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",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifica esta conexión para acceder ás túas mensaxes cifradas e demostrarlle a outras persoas que es ti realmente.",
-    "Verify with another session": "Verificar con outra sesión",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Crearemos salas para cada un. Podes engadir outras máis tarde, incluíndo as xa existentes.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Crea unha sala para cada un. Podes engadir outras máis tarde, incluíndo as xa existentes.",
     "Make sure the right people have access. You can invite more later.": "Asegúrate de que as persoas axeitadas teñen acceso. Podes convidar a outras máis tarde.",
     "A private space to organise your rooms": "Un espazo privado para organizar as túas salas",
     "Just me": "Só eu",
@@ -3217,24 +2703,17 @@
     "Private space": "Espazo privado",
     "Public space": "Espazo público",
     "<inviter/> invites you": "<inviter/> convídate",
-    "Search names and description": "Busca por nomes e descrición",
     "You may want to try a different search or check for typos.": "Podes intentar unha busca diferente ou comprobar o escrito.",
     "No results found": "Sen resultados",
     "Mark as suggested": "Marcar como suxerida",
     "Mark as not suggested": "Marcar como non suxerida",
     "Removing...": "Eliminando...",
     "Failed to remove some rooms. Try again later": "Fallou a eliminación de algunhas salas. Inténtao máis tarde",
-    "%(count)s rooms and 1 space|one": "%(count)s sala e 1 espazo",
-    "%(count)s rooms and 1 space|other": "%(count)s salas e 1 espazo",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s sala e %(numSpaces)s espazos",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s salas e %(numSpaces)s espazos",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Se non atopas a sala que buscas, pide un convite ou <a>crea unha nova sala</a>.",
     "Suggested": "Recomendada",
     "This room is suggested as a good one to join": "Esta sala é recomendada como apropiada para unirse",
     "%(count)s rooms|one": "%(count)s sala",
     "%(count)s rooms|other": "%(count)s salas",
     "You don't have permission": "Non tes permiso",
-    "Open": "Abrir",
     "%(count)s messages deleted.|one": "%(count)s mensaxe eliminada.",
     "%(count)s messages deleted.|other": "%(count)s mensaxes eliminadas.",
     "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.": "Normalmente esto só afecta a como se xestiona a sala no servidor. Se tes problemas co teu %(brand)s, informa do fallo.",
@@ -3243,36 +2722,26 @@
     "Invite People": "Convida a persoas",
     "Invite with email or username": "Convida con email ou nome de usuaria",
     "You can change these anytime.": "Poderás cambialo en calquera momento.",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Espazos é un novo xeito de agrupar salas e persoas. Para unirte a un espazo existente precisarás un convite.",
     "Add some details to help people recognise it.": "Engade algún detalle para que sexa recoñecible.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Desde %(deviceName)s%(deviceId)s en %(ip)s",
     "Check your devices": "Comproba os teus dispositivos",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Hai unha nova conexión á túa conta: %(name)s %(deviceID)s desde %(ip)s",
     "You have unverified logins": "Tes conexións sen verificar",
     "Sends the given message as a spoiler": "Envía a mensaxe dada como un spoiler",
     "Review to ensure your account is safe": "Revisa para asegurarte de que a túa conta está protexida",
-    "Share decryption keys for room history when inviting users": "Comparte chaves de descifrado para o historial da sala ao convidar usuarias",
     "Warn before quitting": "Aviso antes de saír",
     "Invite to just this room": "Convida só a esta sala",
-    "Stop & send recording": "Deter e enviar e a gravación",
     "We couldn't create your DM.": "Non puidemos crear o teu MD.",
     "Invited people will be able to read old messages.": "As persoas convidadas poderán ler as mensaxes antigas.",
     "Reset event store?": "Restablecer almacenaxe do evento?",
     "You most likely do not want to reset your event index store": "Probablemente non queiras restablecer o índice de almacenaxe do evento",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Se o fas, ten en conta que ningunha das mensaxes será eliminada, pero a experiencia de busca podería degradarse durante o tempo en que o índice volve a crearse",
     "Avatar": "Avatar",
     "Please choose a strong password": "Escolle un contrasinal forte",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Verifica a túa identidade para acceder a mensaxes cifradas e acreditar a túa identidade ante outras.",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Sen verificación, non terás acceso a tódalas túas mensaxes e poderías aparecer antes outras como non confiable.",
     "%(deviceId)s from %(ip)s": "%(deviceId)s desde %(ip)s",
-    "Send and receive voice messages (in development)": "Enviar e recibir mensaxes de voz (en desenvolvemento)",
     "unknown person": "persoa descoñecida",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultando con %(transferTarget)s. <a>Transferir a %(transferee)s</a>",
     "Manage & explore rooms": "Xestionar e explorar salas",
-    "Message search initilisation failed": "Fallo a inicialización da busca de mensaxes",
     "Quick actions": "Accións rápidas",
-    "Invite messages are hidden by default. Click to show the message.": "As mensaxes de convite están agochadas por defecto. Preme para amosar a mensaxe.",
-    "Record a voice message": "Gravar mensaxe de voz",
     "Accept on your other login…": "Acepta na túa outra sesión…",
     "%(count)s people you know have already joined|other": "%(count)s persoas que coñeces xa se uniron",
     "%(count)s people you know have already joined|one": "%(count)s persoa que coñeces xa se uniu",
@@ -3313,18 +2782,13 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Elixe salas ou conversas para engadilas. Este é un espazo para ti, ninguén será notificado. Podes engadir máis posteriormente.",
     "What do you want to organise?": "Que queres organizar?",
     "Filter all spaces": "Filtrar os espazos",
-    "Delete recording": "Eliminar a gravación",
-    "Stop the recording": "Deter a gravación",
     "%(count)s results in all spaces|one": "%(count)s resultado en tódolos espazos",
     "%(count)s results in all spaces|other": "%(count)s resultados en tódolos espazos",
     "You have no ignored users.": "Non tes usuarias ignoradas.",
     "Play": "Reproducir",
     "Pause": "Deter",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Esta é unha característica experimental.</b> Por agora as novas usuarias convidadas deberán abrir o convite en <link/> para poder unirse.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Para unirte a %(spaceName)s, activa a <a>beta de Espazos</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Para ver %(spaceName)s, cambia á <a>beta de Espazos</a>",
     "Select a room below first": "Primeiro elixe embaixo unha sala",
-    "Communities are changing to Spaces": "Comunidades cambia a Espazos",
     "Join the beta": "Unirse á beta",
     "Leave the beta": "Saír da beta",
     "Beta": "Beta",
@@ -3334,8 +2798,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Engadindo sala...",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Engadindo salas... (%(progress)s de %(count)s)",
     "Not all selected were added": "Non se engadiron tódolos seleccionados",
-    "You can add existing spaces to a space.": "Podes engadir espazos existentes a un espazo.",
-    "Feeling experimental?": "Sínteste aventureira?",
     "You are not allowed to view this server's rooms list": "Non tes permiso para ver a lista de salas deste servidor",
     "Error processing voice message": "Erro ao procesar a mensaxe de voz",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Non atopamos ningún micrófono no teu dispositivo. Comproba os axustes e proba outra vez.",
@@ -3345,28 +2807,17 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Gañas de experimentar? Labs é o mellor xeito para un acceso temperá e probar novas funcións e axudar a melloralas antes de ser publicadas. <a>Coñece máis</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "O teu token de acceso da acceso completo á túa conta. Non o compartas con ninguén.",
     "Access Token": "Token de acceso",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Espazos é un novo xeito de agrupar salas e persoas. Precisas un convite para unirte a un espazo existente.",
     "Please enter a name for the space": "Escribe un nome para o espazo",
     "Connecting": "Conectando",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permitir Peer-to-Peer en chamadas 1:1 (se activas isto a outra parte podería coñecer o teu enderezo IP)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta dispoñible para web, escritorio e Android. Algunhas características poderían non estar dispoñibles no teu servidor de inicio.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Podes saír da beta desde os axustes cando queiras ou tocando na insignia beta, como a superior.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s cargará con Espazos activado. Comunidades e etiquetas personais estarán agochadas.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta dispoñible para web, escritorio e Android. Grazas por probar a beta.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s volverá a cargar con Espazos desactivado. Comunidade e etiquetas personalizadas estarán visibles de volta.",
     "Spaces are a new way to group rooms and people.": "Espazos é un novo xeito de agrupar salas e persoas.",
-    "Spaces are a beta feature.": "Espazos é unha ferramenta en beta.",
     "Search names and descriptions": "Buscar nome e descricións",
     "You may contact me if you have any follow up questions": "Podes contactar conmigo se tes algunha outra suxestión",
     "To leave the beta, visit your settings.": "Para saír da beta, vai aos axustes.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "A túa plataforma e nome de usuaria serán notificados para axudarnos a utilizar a túa opinión do mellor xeito posible.",
     "%(featureName)s beta feedback": "Opinión acerca de %(featureName)s beta",
     "Thank you for your feedback, we really appreciate it.": "Grazas pola túa opinión, realmente apreciámola.",
-    "Beta feedback": "Opinión sobre a beta",
     "Add reaction": "Engadir reacción",
-    "Send and receive voice messages": "Enviar e recibir mensaxes de voz",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "A túa opinión axudaranos a mellorar os espazos. Canto máis detallada sexa moito mellor para nós.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Se saes, %(brand)s volverá a cargar con Espazos desactivados. Comunidades e etiquetas personais serán visibles outra vez.",
     "Message search initialisation failed": "Fallou a inicialización da busca de mensaxes",
     "Space Autocomplete": "Autocompletado do espazo",
     "Go to my space": "Ir ao meu espazo",
@@ -3375,5 +2826,336 @@
     "See when people join, leave, or are invited to your active room": "Mira cando alguén se une, sae ou é convidada á túa sala activa",
     "Kick, ban, or invite people to your active room, and make you leave": "Expulsa, veta ou convida a persoas á túa sala activa, e fai que saias",
     "See when people join, leave, or are invited to this room": "Mira cando se une alguén, sae ou é convidada a esta sala",
-    "Kick, ban, or invite people to this room, and make you leave": "Expulsa, veta, ou convida persoas a esta sala, e fai que saias"
+    "Kick, ban, or invite people to this room, and make you leave": "Expulsa, veta, ou convida persoas a esta sala, e fai que saias",
+    "Currently joining %(count)s rooms|one": "Neste intre estás en %(count)s sala",
+    "Currently joining %(count)s rooms|other": "Neste intre estás en %(count)s salas",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Intentao con outras palabras e fíxate nos erros de escritura. Algúns resultados poderían non ser visibles porque son privados e precisas un convite.",
+    "No results for \"%(query)s\"": "Sen resultados para \"%(query)s\"",
+    "The user you called is busy.": "A persoa á que chamas está ocupada.",
+    "User Busy": "Usuaria ocupada",
+    "Teammates might not be able to view or join any private rooms you make.": "As outras compañeiras de grupo poderían non ver ou unirse ás salas privadas que creas.",
+    "Or send invite link": "Ou envía ligazón de convite",
+    "If you can't see who you’re looking for, send them your invite link below.": "Se non podes a quen estás a buscar, envíalle ti esta ligazón de convite.",
+    "Some suggestions may be hidden for privacy.": "Algunhas suxestións poderían estar agochadas por privacidade.",
+    "Search for rooms or people": "Busca salas ou persoas",
+    "Forward message": "Reenviar mensaxe",
+    "Open link": "Abrir ligazón",
+    "Sent": "Enviado",
+    "You don't have permission to do this": "Non tes permiso para facer isto",
+    "Error - Mixed content": "Erro - Contido variado",
+    "Error loading Widget": "Erro ao cargar o Widget",
+    "Pinned messages": "Mensaxes fixadas",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Se tes permisos, abre o menú en calquera mensaxe e elixe <b>Fixar</b> para pegalos aquí.",
+    "Nothing pinned, yet": "Nada fixado, por agora",
+    "End-to-end encryption isn't enabled": "Non está activado o cifrado de extremo-a-extremo",
+    "Integration manager": "Xestor de Integracións",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "O teu %(brand)s non permite que uses o Xestor de Integracións, contacta coa administración.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s e o teu Xestor de integracións.",
+    "Identity server is": "O servidor de identidade é",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Os xestores de integracións reciben datos de configuración, e poden modificar os widgets, enviar convites das salas, e establecer roles no teu nome.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integracións para xestionar bots, widgets e paquetes de adhesivos.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integración <b>(%(serverName)s)</b> para xestionar bots, widgets e paquetes de adhesivos.",
+    "Identity server": "Servidor de identidade",
+    "Identity server (%(server)s)": "Servidor de Identidade (%(server)s)",
+    "Could not connect to identity server": "Non hai conexión co Servidor de Identidade",
+    "Not a valid identity server (status code %(code)s)": "Servidor de Identidade non válido (código de estado %(code)s)",
+    "Identity server URL must be HTTPS": "O URL do servidor de identidade debe comezar HTTPS",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Esta sala está dedicada a contido ilegal ou tóxico ou a moderación non modera os contidos tóxicos ou ilegais.\nEsto vaise denunciar ante a administración de %(homeserver)s. As administradoras NON poderán ler o contido cifrado desta sala.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Esta usuaria está facendo spam na sala con anuncios, ligazóns a anuncios ou propaganda.\nEsto vai ser denunciado ante a moderación da sala.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Esta usuaria está a comportarse dun xeito ilegal, por exemplo ameazando a persoas ou exhibindo violencia.\nEsto vaise denunciar ante a moderación da sala que podería presentar o caso ante as autoridades legais.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Esta usuaria ten un comportamento tóxico, por exemplo insultar a outras usuarias o compartir contido adulto nunha sala de contido familiar ou faltando doutro xeito ás regras desta sala.\nVai ser denunciada ante a moderación da sala.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "O que escribe esta usuaria non é correcto.\nSerá denunciado á moderación da sala.",
+    "User Directory": "Directorio de Usuarias",
+    "Please provide an address": "Proporciona un enderezo",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s cambiou ACLs do servidor",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s cambiou o ACLs do servidor %(count)s veces",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s cambiaron o ACLs do servidor",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s cambiaron ACLs do servidor %(count)s veces",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Fallou a inicialización da busca de mensaxes, comproba <a>os axustes</a> para máis información",
+    "Error processing audio message": "Erro ao procesar a mensaxe de audio",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Establecer enderezos para este espazo para que as usuarias poidan atopar o espazo no servidor (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Para publicar un enderezo, primeiro debe establecerse como enderezo local.",
+    "Published addresses can be used by anyone on any server to join your room.": "Os enderezos publicados poden ser utilizados por calquera en calquera servidor para unirse á túa sala.",
+    "Published addresses can be used by anyone on any server to join your space.": "Os enderezos publicados podense usar por calquera en calquera servidor para unirse ao teu espazo.",
+    "This space has no local addresses": "Este espazo non ten enderezos locais",
+    "Show %(count)s other previews|one": "Mostrar %(count)s outra vista previa",
+    "Show %(count)s other previews|other": "Mostrar outras %(count)s vistas previas",
+    "Space information": "Información do Espazo",
+    "Images, GIFs and videos": "Imaxes, GIFs e vídeos",
+    "Code blocks": "Bloques de código",
+    "Displaying time": "Mostrar hora",
+    "To view all keyboard shortcuts, click here.": "Para ver os atallos do teclado preme aquí.",
+    "Keyboard shortcuts": "Atallos de teclado",
+    "There was an error loading your notification settings.": "Houbo un erro ao cargar os axustes de notificación.",
+    "Mentions & keywords": "Mencións e palabras chave",
+    "Global": "Global",
+    "New keyword": "Nova palabra chave",
+    "Keyword": "Palabra chave",
+    "Enable email notifications for %(email)s": "Activar notificacións de email para %(email)s",
+    "Enable for this account": "Activar para esta conta",
+    "An error occurred whilst saving your notification preferences.": "Algo fallou ao gardar as túas preferencias de notificación.",
+    "Error saving notification preferences": "Erro ao gardar os axustes de notificación",
+    "Messages containing keywords": "Mensaxes coas palabras chave",
+    "Collapse": "Pechar",
+    "Expand": "Despregar",
+    "Recommended for public spaces.": "Recomendado para espazos públicos.",
+    "Allow people to preview your space before they join.": "Permitir que sexa visible o espazo antes de unirte a el.",
+    "Preview Space": "Vista previa do Espazo",
+    "Decide who can view and join %(spaceName)s.": "Decidir quen pode ver e unirse a %(spaceName)s.",
+    "Visibility": "Visibilidade",
+    "This may be useful for public spaces.": "Esto podería ser útil para espazos públicos.",
+    "Guests can join a space without having an account.": "As convidadas poden unirse ao espazo sen ter unha conta.",
+    "Enable guest access": "Activar acceso de convidadas",
+    "Failed to update the history visibility of this space": "Fallou a actualización da visibilidade do historial do espazo",
+    "Failed to update the guest access of this space": "Fallou a actualización do acceso de convidadas ao espazo",
+    "Failed to update the visibility of this space": "Fallou a actualización da visibilidade do espazo",
+    "Address": "Enderezo",
+    "e.g. my-space": "ex. o-meu-espazo",
+    "Silence call": "Acalar chamada",
+    "Sound on": "Son activado",
+    "Use Ctrl + F to search timeline": "Usar Ctrl + F para buscar na cronoloxía",
+    "Use Command + F to search timeline": "Usar Command + F para buscar na cronoloxía",
+    "Show all rooms in Home": "Mostrar tódalas salas no Inicio",
+    "User %(userId)s is already invited to the room": "A usuaria %(userId)s xa ten un convite para a sala",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s cambiou a <a>mensaxe fixada</a> da sala.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s expulsou a %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s expulsou a %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s retirou o convite para %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s retirou o convite para %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s retiroulle o veto a %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s saíu da sala",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s saíu da sala: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s rexeitou o convite",
+    "%(targetName)s joined the room": "%(targetName)s uniuse á sala",
+    "%(senderName)s made no change": "%(senderName)s non fixo cambios",
+    "%(senderName)s set a profile picture": "%(senderName)s estableceu a foto de perfil",
+    "%(senderName)s changed their profile picture": "%(senderName)s cambiou a súa foto de perfil",
+    "%(senderName)s removed their profile picture": "%(senderName)s eliminou a súa foto de perfil",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s eliminou o seu nome público (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s estableceu o seu nome público como %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s cambiou o seu nome público a %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s vetou %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s vetou %(targetName)s: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s aceptou o convite",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s aceptou o convite a %(displayName)s",
+    "Some invites couldn't be sent": "Non se puideron enviar algúns convites",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Convidamos as outras, pero as persoas de aquí embaixo non foron convidadas a <RoomName/>",
+    "Transfer Failed": "Fallou a transferencia",
+    "Unable to transfer call": "Non se puido transferir a chamada",
+    "[number]": "[número]",
+    "To view %(spaceName)s, you need an invite": "Para ver %(spaceName)s precisas un convite",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Podes premer en calquera momento nun avatar no panel de filtros para ver só salas e persoas asociadas con esa comunidade.",
+    "Unable to copy a link to the room to the clipboard.": "Non se copiou a ligazón da sala ao portapapeis.",
+    "Unable to copy room link": "Non se puido copiar ligazón da sala",
+    "Unnamed audio": "Audio sen nome",
+    "Move down": "Ir abaixo",
+    "Move up": "Ir arriba",
+    "Report": "Denunciar",
+    "Collapse reply thread": "Contraer fío de resposta",
+    "Show preview": "Ver vista previa",
+    "View source": "Ver fonte",
+    "Forward": "Reenviar",
+    "Settings - %(spaceName)s": "Axustes - %(spaceName)s",
+    "Report the entire room": "Denunciar a toda a sala",
+    "Spam or propaganda": "Spam ou propaganda",
+    "Illegal Content": "Contido ilegal",
+    "Toxic Behaviour": "Comportamento tóxico",
+    "Disagree": "En desacordo",
+    "Please pick a nature and describe what makes this message abusive.": "Escolle unha opción e describe a razón pola que esta é unha mensaxe abusiva.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Outra razón. Por favor, describe o problema.\nInformaremos disto á moderación da sala.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Esta sala está dedicada a contido tóxico ou ilegal ou a moderación non é quen de moderar contido ilegal ou tóxico.\nImos informar disto á administración de %(homeserver)s.",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Modelo de denuncia ante a moderación. Nas salas que teñen moderación, o botón `denuncia`permíteche denunciar un abuso á moderación da sala",
+    "Copy Room Link": "Copiar Ligazón da sala",
+    "The call is in an unknown state!": "Esta chamada ten un estado descoñecido!",
+    "Call back": "Devolver a chamada",
+    "No answer": "Sen resposta",
+    "An unknown error occurred": "Aconteceu un fallo descoñecido",
+    "Their device couldn't start the camera or microphone": "O seu dispositivo non puido acender a cámara ou micrófono",
+    "Connection failed": "Fallou a conexión",
+    "Could not connect media": "Non se puido conectar o multimedia",
+    "Message bubbles": "Burbullas con mensaxes",
+    "IRC": "IRC",
+    "New layout switcher (with message bubbles)": "Nova disposición do control (con burbullas con mensaxes)",
+    "Image": "Imaxe",
+    "Sticker": "Adhesivo",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Axudarlle aos membros do espazo a que atopen e se unan a salas privadas, vaite aos axustes de Seguridade e Privacidade desa sala.",
+    "Help space members find private rooms": "Axudarlle aos membros do espazo a que atopen salas privadas",
+    "Help people in spaces to find and join private rooms": "Axudarlle ás persoas en espazos que atopen e se unan a salas privadas",
+    "New in the Spaces beta": "Novo na beta de Espazos",
+    "Error downloading audio": "Erro ao descargar o audio",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Ten en conta que a actualización creará unha nova versión da sala</b>. Tódalas mensaxes actuais permanecerán nesta sala arquivada.",
+    "Automatically invite members from this room to the new one": "Convidar automáticamente membros desta sala á nova sala",
+    "These are likely ones other room admins are a part of.": "Probablemente estas son salas das que forman parte outras administradoras da sala.",
+    "Other spaces or rooms you might not know": "Outros espazos ou salas que poderías coñecer",
+    "Spaces you know that contain this room": "Espazos que coñeces que conteñen a esta sala",
+    "Search spaces": "Buscar espazos",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decide que espazos poderán acceder a esta sala. Se un espazo é elexido, os seus membros poderán atopar e unirse a <RoomName/>.",
+    "Select spaces": "Elixe espazos",
+    "You're removing all spaces. Access will default to invite only": "Vas eliminar tódolos espazos. Por defecto o acceso cambiará a só por convite",
+    "Room visibility": "Visibilidade da sala",
+    "Visible to space members": "Visible para membros do espazo",
+    "Public room": "Sala pública",
+    "Private room (invite only)": "Sala privada (só con convite)",
+    "Create a room": "Crear unha sala",
+    "Only people invited will be able to find and join this room.": "Só as persoas convidadas poderán atopar e unirse a esta sala.",
+    "Anyone will be able to find and join this room.": "Calquera poderá atopar e unirse a esta sala.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Calquera poderá atopar e unirse a esta sala, non só os membros de <SpaceName/>.",
+    "You can change this at any time from room settings.": "Podes cambiar isto en calquera momento nos axustes da sala.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Todas en <SpaceName/> poderán atopar e unirse a esta sala.",
+    "Share content": "Compartir contido",
+    "Application window": "Ventá da aplicación",
+    "Share entire screen": "Compartir pantalla completa",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Podes compartir a túa pantalla premendo no botón \"compartir pantalla\" durante unha chamada. Incluso podes facelo nas chamadas de audio se as dúas partes teñen soporte!",
+    "Screen sharing is here!": "Aquí tes a compartición de pantalla!",
+    "Access": "Acceder",
+    "People with supported clients will be able to join the room without having a registered account.": "As persoas con clientes habilitados poderán unirse a sala sen ter que posuir unha conta rexistrada.",
+    "Decide who can join %(roomName)s.": "Decidir quen pode unirse a %(roomName)s.",
+    "Space members": "Membros do espazo",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Calquera nun espazo pode atopar e unirse. Podes elexir múltiples espazos.",
+    "Spaces with access": "Espazos con acceso",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Calquera nun espazo pode atopala e unirse. <a>Editar que espazos poden acceder aquí.</a>",
+    "Currently, %(count)s spaces have access|other": "Actualmente, %(count)s espazos teñen acceso",
+    "& %(count)s more|other": "e %(count)s máis",
+    "Upgrade required": "Actualización requerida",
+    "Anyone can find and join.": "Calquera pode atopala e unirse.",
+    "Only invited people can join.": "Só se poden unir persoas con convite.",
+    "Private (invite only)": "Privada (só con convite)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Esta actualización permitirá que os membros dos espazos seleccionados teñan acceso á sala sen precisar convite.",
+    "Your camera is still enabled": "A túa cámara aínda está acendida",
+    "Your camera is turned off": "A túa cámara está apagada",
+    "%(sharerName)s is presenting": "%(sharerName)s estase presentando",
+    "You are presenting": "Estaste a presentar",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Esto facilita que as salas permanezan privadas respecto do espazo, mais permitindo que as persoas do espazo as atopen e se unan a elas. Tódalas novas salas do espazo terán esta opción dispoñible.",
+    "We're working on this, but just want to let you know.": "Estamos a traballar nisto, só queriamos facercho saber.",
+    "Search for rooms or spaces": "Buscar salas ou espazos",
+    "Want to add an existing space instead?": "Queres engadir un espazo xa existente?",
+    "Private space (invite only)": "Espazo privado (só convidadas)",
+    "Space visibility": "Visibilidade do espazo",
+    "Add a space to a space you manage.": "Engade un espazo ao espazo que ti xestionas.",
+    "Only people invited will be able to find and join this space.": "Só as persoas convidadas poderán atopar e unirse a este espazo.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Calquera poderá atopar e unirse a este espazo, non só os membros de <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Calquera en <SpaceName/> poderá atopar e unirse.",
+    "Adding spaces has moved.": "Engadir espazos moveuse.",
+    "Search for rooms": "Buscar salas",
+    "Search for spaces": "Buscar espazos",
+    "Create a new space": "Crear un novo espazo",
+    "Want to add a new space instead?": "Queres engadir un espazo no seu lugar?",
+    "Add existing space": "Engadir un espazo existente",
+    "Add space": "Engadir espazo",
+    "Give feedback.": "Dar opinión.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Grazas por probar Espazos. A túa opinión vainos axudar as próximas versións.",
+    "Spaces feedback": "Infórmanos sobre Espazos",
+    "Spaces are a new feature.": "Espazos é o futuro.",
+    "Leave %(spaceName)s": "Saír de %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Es a única administradora dalgunhas salas ou espazos dos que queres sair. Ao sair deles deixaralos sen administración.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Ti es a única administradora deste espazo. Ao sair farás que a ninguén teña control sobre el.",
+    "You won't be able to rejoin unless you are re-invited.": "Non poderás volver a unirte se non te volven a convidar.",
+    "Search %(spaceName)s": "Buscar %(spaceName)s",
+    "Decrypting": "Descifrando",
+    "Show all rooms": "Mostar tódalas salas",
+    "All rooms you're in will appear in Home.": "Tódalas salas nas que estás aparecerán en Inicio.",
+    "Send pseudonymous analytics data": "Enviar datos anónimos de uso",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala %(count)s veces.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala %(count)s veces.",
+    "Missed call": "Chamada perdida",
+    "Call declined": "Chamada rexeitada",
+    "Stop recording": "Deter a gravación",
+    "Send voice message": "Enviar mensaxe de voz",
+    "Olm version:": "Version olm:",
+    "Mute the microphone": "Apagar o micrófono",
+    "Unmute the microphone": "Reactivar o micrófono",
+    "Dialpad": "Teclado",
+    "More": "Máis",
+    "Show sidebar": "Mostrar a barra lateral",
+    "Hide sidebar": "Agochar barra lateral",
+    "Start sharing your screen": "Comparte a túa pantalla",
+    "Stop sharing your screen": "Deixar de compartir a pantalla",
+    "Stop the camera": "Pechar a cámara",
+    "Start the camera": "Abrir a cámara",
+    "Surround selected text when typing special characters": "Rodea o texto seleccionado ao escribir caracteres especiais",
+    "Delete avatar": "Eliminar avatar",
+    "Don't send read receipts": "Non enviar confirmación de lectura",
+    "Flair won't be available in Spaces for the foreseeable future.": "Non agardamos que Aura esté dispoñible en Espazos no futuro.",
+    "Created from <Community />": "Creado desde <Community />",
+    "Communities won't receive further updates.": "As Comunidades non van recibir máis actualizacións.",
+    "Spaces are a new way to make a community, with new features coming.": "Os Espazos son un novo xeito de crear comunidade, con novas características por chegar.",
+    "Communities can now be made into Spaces": "Xa podes convertir as Comunidades en Espazos",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Pídelle á <a>administración</a> da comunidade que a converta nun Espazo e agarda polo convite.",
+    "You can create a Space from this community <a>here</a>.": "Podes crear <a>aquí</a> un Espazo a partir desta comunidade.",
+    "This description will be shown to people when they view your space": "Esta descrición váiselle mostrar ás persoas que vexan o teu espazo",
+    "All rooms will be added and all community members will be invited.": "Vanse engadir tódalas salas e tódolos membros da comunidade serán convidados.",
+    "A link to the Space will be put in your community description.": "Vaise pór unha ligazón ao Espazo na descrición da comunidade.",
+    "Create Space from community": "Crear Esapazo desde a comunidade",
+    "Failed to migrate community": "Fallou a migración da comunidade",
+    "To create a Space from another community, just pick the community in Preferences.": "Para crear un Espazo desde outra comunidade, só tes que elexir a comunidade nas Preferencias.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> foi creado e calquera que fose parte da comunidade foi convidada a el.",
+    "Space created": "Espazo creado",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Para ver Espazos, agocha as comunidades en <a>Preferencias</a>",
+    "This community has been upgraded into a Space": "Esta comunidade foi convertida a un Espazo",
+    "If a community isn't shown you may not have permission to convert it.": "Se unha comunidade non aparece pode que non teñas permiso para convertila.",
+    "Show my Communities": "Mostrar as miñas Comunidades",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "As Comunidades foron arquivadas para facerlle sitio a Espazos pero podes convertir as túas comunidades en Espazos. Ao convertilas permites que as túas conversas teñan as últimas ferramentas.",
+    "Create Space": "Crear Espazo",
+    "Open Space": "Abrir Espazo",
+    "You can change this later.": "Esto poderalo cambiar máis tarde.",
+    "What kind of Space do you want to create?": "Que tipo de Espazo queres crear?",
+    "Unknown failure: %(reason)s": "Fallo descoñecido: %(reason)s",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Os rexistros de depuración conteñen datos de uso da aplicación incluíndo o teu nome de usuaria, IDs ou alias das salas e grupos que visitaches, os últimos elementos da interface cos que interactuaches así como nomes de usuaria de outras usuarias. Non conteñen mensaxes.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se informaches dun fallo en GitHub, os rexistros de depuración poden axudarnos a solucionar o problema. Estos rexistros conteñen datos de uso da aplicación incluíndo o nome de usuaria, IDs ou alias das salas ou grupos que visitaches, os últimos elementos da interface cos que interactuaches así como nomes de usuaria de outras usuarias. Non conteñen mensaxes.",
+    "Rooms and spaces": "Salas e espazos",
+    "Results": "Resultados",
+    "Enable encryption in settings.": "Activar cifrado non axustes.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "As túas mensaxes privadas normalmente están cifradas, pero esta sala non o está. Normalmente esto é debido a que estás a usar un dispositivo ou método non soportados, como convites por email.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Par evitar estos problemas, crea unha <a>nova sala pública</a> para a conversa que pretendes manter.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non se recomenda converter salas cifradas en salas públicas.</b> Significará que calquera pode atopar e unirse á sala, e calquera poderá ler as mensaxes. Non terás ningún dos beneficios do cifrado. Cifrar mensaxes nunha sala pública fará máis lenta a entrega e recepción das mensaxes.",
+    "Are you sure you want to make this encrypted room public?": "Tes a certeza de querer convertir en pública esta sala cifrada?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Para evitar estos problemas, crea unha <a>nova sala cifrada</a> para a conversa que pretendes manter.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non se recomenda engadir cifrado a salas públicas.</b> Calquera pode atopar e unirse a salas públicas, polo que tamén ler as mensaxes. Non vas ter ningún dos beneficios do cifrado, e máis tarde non poderás desactivalo. Cifrar as mensaxes nunha sala pública tamén fará máis lenta a entrega e recepción das mensaxes.",
+    "Are you sure you want to add encryption to this public room?": "Tes a certeza de querer engadir cifrado a esta sala pública?",
+    "Cross-signing is ready but keys are not backed up.": "A sinatura-cruzada está preparada pero non hai copia das chaves.",
+    "Low bandwidth mode (requires compatible homeserver)": "Modo de ancho de banda limitado (require servidor de inicio compatible)",
+    "Multiple integration managers (requires manual setup)": "Varios xestores de integración (require configuración manual)",
+    "Thread": "Tema",
+    "Show threads": "Mostrar temas",
+    "Currently, %(count)s spaces have access|one": "Actualmente, un espazo ten acceso",
+    "& %(count)s more|one": "e %(count)s máis",
+    "Autoplay GIFs": "Reprod. automática GIFs",
+    "Autoplay videos": "Reprod. automática vídeo",
+    "Threaded messaging": "Mensaxes fiadas",
+    "The above, but in <Room /> as well": "O de arriba, pero tamén en <Room />",
+    "The above, but in any room you are joined or invited to as well": "O de enriba, pero en calquera sala á que te uniches ou foches convidada",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s desafixou unha mensaxe desta sala. Mira tódalas mensaxes fixadas.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s deafixou <a>unha mensaxe</a> desta sala. Mira tódalas <b>mensaxes fixadas</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fixou unha mensaxe nesta sala. Mira tódalas mensaxes fixadas.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fixou <a>unha mensaxe</a> nesta sala. Mira tódalas <b>mensaxes fixadas</b>.",
+    "Some encryption parameters have been changed.": "Algún dos parámetros de cifrado foron cambiados.",
+    "Role in <RoomName/>": "Rol en <RoomName/>",
+    "Explore %(spaceName)s": "Explora %(spaceName)s",
+    "Send a sticker": "Enviar un adhesivo",
+    "Reply to thread…": "Responder á conversa…",
+    "Reply to encrypted thread…": "Responder á conversa cifrada…",
+    "Add emoji": "Engadir emoji",
+    "Unknown failure": "Fallo descoñecido",
+    "Failed to update the join rules": "Fallou a actualización das normas para unirse",
+    "Select the roles required to change various parts of the space": "Elexir os roles requeridos para cambiar varias partes do espazo",
+    "Change description": "Cambiar a descrición",
+    "Change main address for the space": "Cambiar o enderezo principal do espazo",
+    "Change space name": "Cambiar o nome do espazo",
+    "Change space avatar": "Cambiar o avatar do espazo",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Calquera en <spaceName/> pode atopar e unirse. Tamén podes elexir outros espazos.",
+    "Message didn't send. Click for info.": "Non se enviou a mensaxe. Click para info.",
+    "To join this Space, hide communities in your <a>preferences</a>": "Para unirte a este Espazo, oculta as comunidades nas túas <a>preferencias</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "Para ver este Espazo, oculta as comunidades nas túas <a>preferencias</a>",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Para unirte a %(communityName)s, cambia a comunidades nas túas <a>preferencias</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Para ver %(communityName)s, cambia a comunidades nas túas <a>preferencias</a>",
+    "Private community": "Comunidade privada",
+    "Public community": "Comunidade pública",
+    "Message": "Mensaxe",
+    "Upgrade anyway": "Actualizar igualmente",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Esta sala está nalgúns espazos dos que non es admin. Nesos espazos, a antiga sala seguirá mostrándose, pero as persoas serán convidadas a unirse á nova.",
+    "Before you upgrade": "Antes de actualizar",
+    "To join a space you'll need an invite.": "Para unirte a un espazo precisas un convite.",
+    "You can also make Spaces from <a>communities</a>.": "Tamén podes crear Espazos a partir de <a>comunidades</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "De xeito temporal, mostrar comunidades no lugar de Espazos durante esta sesión. Esta función vai ser eliminada en próximas versións. Reiniciará Element.",
+    "Display Communities instead of Spaces": "Mostrar Comunidades no lugar de Espazos"
 }
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 5baa1d7c67..76e4c7d418 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -3,10 +3,6 @@
     "This phone number is already in use": "מספר הטלפון הזה כבר בשימוש",
     "Failed to verify email address: make sure you clicked the link in the email": "אימות כתובת הדוא\"ל נכשלה: וודא שלחצת על הקישור בדוא\"ל",
     "Call Failed": "השיחה נכשלה",
-    "The remote side failed to pick up": "הצד המרוחק לא ענה",
-    "Unable to capture screen": "כישלון בצילום המסך",
-    "Existing Call": "שיחה קיימת",
-    "You are already in a call.": "אתה כבר נמצא בשיחה.",
     "VoIP is unsupported": "שיחה מעל IP לא נתמכת",
     "You cannot place VoIP calls in this browser.": "אין אפשרות ליצור שיחה מעל IP בדפדפן זה.",
     "You cannot place a call with yourself.": "אין אפשרות ליצור שיחה עם עצמך.",
@@ -43,7 +39,6 @@
     "Warning": "התראה",
     "Submit debug logs": "הזן יומני ניפוי שגיאה (דבאג)",
     "Edit": "ערוך",
-    "Unpin Message": "שחרר צימוד הודעה",
     "Online": "מקוון",
     "Register": "רשום",
     "Rooms": "חדרים",
@@ -51,7 +46,6 @@
     "OK": "בסדר",
     "Operation failed": "פעולה נכשלה",
     "Search": "חפש",
-    "Custom Server Options": "הגדרות שרת מותאמות אישית",
     "Dismiss": "התעלם",
     "powered by Matrix": "מופעל ע\"י Matrix",
     "Error": "שגיאה",
@@ -73,15 +67,11 @@
     "No rooms to show": "אין חדרים להצגה",
     "Fetching third party location failed": "נסיון להביא מיקום צד שלישי נכשל",
     "Send Account Data": "שלח נתוני משתמש",
-    "All notifications are currently disabled for all targets.": "התראות מנוטרלות לכלל המערכת.",
-    "Uploading report": "מעדכן דוח",
     "Sunday": "ראשון",
     "Failed to add tag %(tagName)s to room": "נכשל בעת הוספת תג %(tagName)s לחדר",
     "Notification targets": "יעדי התראה",
     "Failed to set direct chat tag": "נכשל בעת סימון תג לשיחה ישירה",
     "Today": "היום",
-    "Files": "קבצים",
-    "You are not receiving desktop notifications": "אתה לא מקבל התראות משולחן העבודה",
     "Friday": "שישי",
     "Update": "עדכון",
     "What's New": "מה חדש",
@@ -89,24 +79,13 @@
     "Changelog": "דו\"ח שינויים",
     "Waiting for response from server": "ממתין לתשובה מהשרת",
     "Send Custom Event": "שלח אירוע מותאם אישית",
-    "Advanced notification settings": "הגדרות מתקדמות להתראות",
     "Failed to send logs: ": "כשל במשלוח יומנים: ",
-    "Forget": "שכח",
-    "You cannot delete this image. (%(code)s)": "אי אפשר למחוק את התמונה. (%(code)s)",
-    "Cancel Sending": "ביטול שליחה",
     "This Room": "החדר הזה",
     "Noisy": "רועש",
-    "Error saving email notification preferences": "שגיאה בעת שמירת הגדרות התראה באמצעות הדואר האלקטרוני",
     "Messages containing my display name": "הודעות המכילות את שם התצוגה שלי",
     "Messages in one-to-one chats": "הודעות בשיחות פרטיות",
     "Unavailable": "לא זמין",
-    "View Decrypted Source": "הצג מקור מפוענח",
-    "Failed to update keywords": "נכשל עדכון מילים",
     "remove %(name)s from the directory.": "הסר את %(name)s מהרשימה.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "התראה על מילות המפתח הבאות עוקבת אחר החוקים שאינם יכולים להיות מוצגים כאן:",
-    "Please set a password!": "נא להגדיר סיסמא!",
-    "You have successfully set a password!": "שינוי סיסמא בוצע בהצלחה!",
-    "An error occurred whilst saving your email notification preferences.": "קרתה שגיאה בזמן שמירת הגדרות התראה באמצעות הדואר האלקטרוני.",
     "Explore Room State": "גלה מצב החדר",
     "Source URL": "כתובת URL אתר המקור",
     "Messages sent by bot": "הודעות שנשלחו באמצעות בוט",
@@ -115,34 +94,20 @@
     "No update available.": "אין עדכון זמין.",
     "Resend": "שלח מחדש",
     "Collecting app version information": "אוסף מידע על גרסת היישום",
-    "Keywords": "מילות מפתח",
-    "Enable notifications for this account": "אפשר התראות לחשבון זה",
     "Invite to this community": "הזמן לקהילה זו",
-    "Messages containing <span>keywords</span>": "הודעות המכילות <span> מילות מפתח </span>",
     "Room not found": "חדר לא נמצא",
     "Tuesday": "שלישי",
-    "Enter keywords separated by a comma:": "הכנס מילים מופרדות באמצעות פסיק:",
-    "Forward Message": "העבר הודעה",
     "Remove %(name)s from the directory?": "הסר את %(name)s מהרשימה?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s משתמש במספר רב של אפשרויות מתקדמות בדפדפן, חלק מהן לא זמינות או בשלבי נסיון בדפדפן שבשימושך כרגע.",
     "Event sent!": "ארוע נשלח!",
     "Preparing to send logs": "מתכונן לשלוח יומנים",
-    "Remember, you can always set an email address in user settings if you change your mind.": "להזכירך: תמיד ניתן לשנות כתובת אימייל בהגדרות משתש. למקרה שתתחרט/י.",
     "Explore Account Data": "גלה פרטי משתמש",
-    "All messages (noisy)": "כל ההודעות (רועש)",
     "Saturday": "שבת",
-    "I understand the risks and wish to continue": "אני מבין את הסיכונים אבל מבקש להמשיך",
-    "Direct Chat": "שיחה ישירה",
     "The server may be unavailable or overloaded": "השרת אינו זמין או עמוס",
     "Reject": "דחה",
-    "Failed to set Direct Message status of room": "נכשל בעת סימון מצב הודעה ישירה של החדר",
     "Monday": "שני",
     "Remove from Directory": "הסר מהרשימה",
-    "Enable them now": "אפשר אותם כעת",
     "Toolbox": "תיבת כלים",
     "Collecting logs": "אוסף יומנים לנפוי שגיאה (דבאג)",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "יומני ניפוי שגיאה (דבאג) מכילים מידע על שימוש ביישום, כולל שם משתמש, מזהים או כינויים שהתמשת בהם. בחדרי שיחוח, או קבוצות בהם השתתפת. וגם שמות משתמשים אחרים. אך אינם כוללים הודעות.",
-    "(HTTP status %(httpStatus)s)": "(מצב    HTTP     %(httpStatus)s   )",
     "All Rooms": "כל החדרים",
     "State Key": "מקש מצב",
     "Wednesday": "רביעי",
@@ -151,13 +116,9 @@
     "All messages": "כל ההודעות",
     "Call invitation": "הזמנה לשיחה",
     "Downloading update...": "מוריד עדכון...",
-    "You have successfully set a password and an email address!": "הצלחת להגדיר סיסמא וכתובת אימייל!",
     "Failed to send custom event.": "כשל במשלוח ארוע מותאם אישית.",
     "What's new?": "מה חדש?",
-    "Notify me for anything else": "התראה לי על כל דבר אחר",
     "When I'm invited to a room": "מתי אני מוזמן לחדר",
-    "Can't update user notification settings": "לא ניתן לעדכן הגדרות התראה למשתמש",
-    "Notify for all other messages/rooms": "התראה לכל שאר ההודעות/החדרים",
     "Unable to look up room ID from server": "לא ניתן לאתר מזהה חדר על השרת",
     "Couldn't find a matching Matrix room": "לא נמצא חדר כזה ב מטריקס",
     "Invite to this room": "הזמן לחדר זה",
@@ -169,32 +130,20 @@
     "Reply": "תשובה",
     "Show message in desktop notification": "הצג הודעה בהתראות שולחן עבודה",
     "You must specify an event type!": "חובה להגדיר סוג ארוע!",
-    "Unhide Preview": "הצג מחדש תצוגה מקדימה",
     "Unable to join network": "לא ניתן להצטרף לרשת",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "מצטערים, הדפדפן שלך הוא <b> אינו</b> יכול להריץ את %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "עודכן ב %(date)s ע\"י %(user)s",
     "Messages in group chats": "הודעות בקבוצות השיחה",
     "Yesterday": "אתמול",
     "Error encountered (%(errorDetail)s).": "ארעה שגיעה %(errorDetail)s .",
     "Low Priority": "עדיפות נמוכה",
-    "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה",
-    "Set Password": "הגדר סיסמא",
     "Off": "סגור",
     "%(brand)s does not know how to join a room on this network": "%(brand)s אינו יודע כיצד להצטרף לחדר ברשת זו",
-    "Mentions only": "מאזכר בלבד",
     "Failed to remove tag %(tagName)s from room": "נכשל בעת נסיון הסרת תג %(tagName)s מהחדר",
-    "You can now return to your account after signing out, and sign in on other devices.": "תוכל עתה לחזור לחשבון שלך רק אחרי התנתקות וחיבור מחדש לחשבון ממכשיר אחר.",
-    "Enable email notifications": "אפשר התראות באמצעות הדואר האלקטרוני",
     "Event Type": "סוג ארוע",
-    "Download this file": "הורד את הקובץ",
-    "Pin Message": "הצמד הודעה",
-    "Failed to change settings": "נכשל בעת שינוי הגדרות",
     "View Community": "הצג קהילה",
     "Developer Tools": "כלי מפתחים",
     "View Source": "הצג מקור",
     "Event Content": "תוכן הארוע",
     "Thank you!": "רב תודות!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "באמצעות הדפדפן הנוכחי שלך המראה של היישום יכול להיות שגוי לחלוטין וחלק מהאפשרויות לא תתפקדנה. אם תרצה לנסות בכל זאת תוכל אבל אז כל האחריות עליך!",
     "Checking for an update...": "בודק עדכונים...",
     "Your %(brand)s is misconfigured": "ה %(brand)s שלך מוגדר באופן שגוי",
     "Which officially provided instance you are using, if any": "איזה אינסטנס רשמי אתם משתמשים אם בכללאיזה אינסטנס רשמי אתם משתמשים אם בכלל",
@@ -263,9 +212,6 @@
     "Error upgrading room": "שגיאה בשדרוג חדר",
     "You do not have the required permissions to use this command.": "אין לכם הרשאות להשתמש בפקודה זו.",
     "Upgrades a room to a new version": "משדרג את החדר לגרסא חדשה",
-    "To use it, just wait for autocomplete results to load and tab through them.": "בכדי להשתמש אנא המתינו לתוצאות האוטומטיות להראות והשתמשו בטאב לעבור עליהן.",
-    "/ddg is not a command": "/ddg אינה פקודה",
-    "Searches DuckDuckGo for results": "חיפוש תוצאות ב DuckDuckGo",
     "Sends a message as html, without interpreting it as markdown": "שלח הודעות כ HTML ללא תרגום שלהם כ MARKDOWN",
     "Sends a message as plain text, without interpreting it as markdown": "שלח הודעה כטקסט פשוט ללא תרגום כקוד MARKDOWN",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "הוסף לפני הודעת טקסט ( ͡° ͜ʖ ͡°)",
@@ -295,7 +241,6 @@
     "Unable to create widget.": "לא ניתן היה ליצור ווידג'ט.",
     "You need to be able to invite users to do that.": "עליכם להיות מאושרים להזמין משתמשים על מנת לבצע פעולה זו.",
     "You need to be logged in.": "עליכם להיות מחוברים.",
-    "Failed to invite the following users to the %(roomName)s room:": "הזמנת המשתמשים הבאים לחדר %(roomName)s נכשלה:",
     "Failed to invite users to the room:": "הזמנת משתמשים לחדר נכשלה:",
     "Failed to invite": "הזמנה נכשלה",
     "Custom (%(level)s)": "ידני %(level)s",
@@ -318,8 +263,6 @@
     "End conference": "סיום ועידה",
     "You do not have permission to start a conference call in this room": "אין לכם הרשאות להתחיל ועידה בחדר זה",
     "Permission Required": "הרשאה דרושה",
-    "A call is currently being placed!": "כרגע מתבצעת התחברות לשיחה!",
-    "Call in Progress": "שיחה פעילה",
     "You've reached the maximum number of simultaneous calls.": "הגעתם למקסימום שיחות שניתן לבצע בו זמנית.",
     "Too Many Calls": "יותר מדי שיחות",
     "No other application is using the webcam": "שום אפליקציה אחרת אינה משתמשת במצלמה",
@@ -336,8 +279,6 @@
     "The call was answered on another device.": "השיחה נענתה במכשיר אחר.",
     "Answered Elsewhere": "נענה במקום אחר",
     "The call could not be established": "לא ניתן להתקשר",
-    "The other party declined the call.": "הצד השני דחה את השיחה.",
-    "Call Declined": "שיחה נדחתה",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "כאשר הדף הזה מכיל מידע מזהה כגון, שם חדר, משתמש או קבוצה, המידע הזה מוסר לפני שהוא נשלח אל השרת.",
     "The information being sent to us to help make %(brand)s better includes:": "המידע אשר נשלח אלינו על מנת לשפר את %(brand)s מכיל:",
     "Analytics": "אנליטיקה",
@@ -658,7 +599,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "אנא <a>צרו קשר עם אדמין השרת</a> על מנת להמשיך להשתמש בשרות.",
     "This homeserver has exceeded one of its resource limits.": "השרת הזה חרג מאחד ממגבלות המשאבים שלו.",
     "This homeserver has hit its Monthly Active User limit.": "השרת הזה הגיע לקצה מספר המשתמשים הפעילים לחודש.",
-    "The message you are trying to send is too large.": "ההודעה שהנכם מנסים לשלוח גדולה מדי.",
     "Unexpected error resolving identity server configuration": "שגיאה לא צפויה בהתחברות אל שרת הזיהוי",
     "Unexpected error resolving homeserver configuration": "שגיאה לא צפוייה של התחברות לשרת הראשי",
     "No homeserver URL provided": "לא סופקה כתובת של שרת הראשי",
@@ -773,16 +713,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s התחיל שיחת וידאו.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s התחיל שיחה קולית. (אינו נתמך בדפדפן זה)",
     "%(senderName)s placed a voice call.": "%(senderName)s התחיל שיחה קולית.",
-    "%(senderName)s declined the call.": "%(senderName)s דחה את השיחה.",
-    "%(senderName)s ended the call.": "%(senderName)s סיים את השיחה.",
-    "(unknown failure: %(reason)s)": "(תקלה לא ידועה: %(reason)s)",
-    "(no answer)": "(אין תשובה)",
-    "(an error occurred)": "(שגיאה קרתה)",
-    "(their device couldn't start the camera / microphone)": "(המכשיר שלהם לא הצליח להתחיל מצלמה \\ מיקרופון)",
-    "(connection failed)": "(התקשרות נכשלה)",
-    "(could not connect media)": "(לא ניתן לחבר מדיה)",
-    "%(senderName)s answered the call.": "%(senderName)s ענה לשיחה.",
-    "(not supported by this browser)": "(אינו נתמך בדפדפן זה)",
     "Someone": "משהו",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s שינה את הכתובות של חדר זה.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s שינה את הכתובת הראשית והמשנית של חדר זה.",
@@ -811,23 +741,6 @@
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s שינה את שם החדר מ-%(oldRoomName)s ל%(newRoomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s הסיר את שם החדר.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s שינה את שם הנושא ל-\"%(topic)s\".",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s בעט החוצה את %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s משך את ההזמנה מ %(targetName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s הסיר חסימה מ %(targetName)s.",
-    "%(targetName)s left the room.": "%(targetName)s עזב\\ה את החדר.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s דחו את ההזמנה.",
-    "%(targetName)s joined the room.": "%(targetName)s הצטרף אל החדר.",
-    "%(senderName)s made no change.": "%(senderName)s לא עשה שום שינוי.",
-    "%(senderName)s set a profile picture.": "%(senderName)s הגדירו תמונת פרופיל.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s שינו את תמונת הפרופיל שלהם.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s הסירו את תמונת הפרופיל שלהם.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s הסירו את השם הישן שלהם %(oldDisplayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s הגדירו את שמם ל %(displayName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s שינו את שמם ל %(displayName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s חסם את %(targetName)s.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s הזמין את %(targetName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s קיבל את ההזמנה.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s קיבל את ההזמנה עבור %(displayName)s.",
     "Reason": "סיבה",
     "Displays action": "הצג פעולה",
     "Takes the call in the current room off hold": "מחזיר את השיחה הנוכחית ממצב המתנה",
@@ -867,9 +780,6 @@
     "Failed to save your profile": "שמירת הפרופיל שלכם נכשלה",
     "Enable audible notifications for this session": "אפשר התראות נשמעות עבור התחברות זו",
     "Enable desktop notifications for this session": "החל התראות עבור התחברות זו",
-    "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.": "ישנן התראות מתקדמות שלא מוצגות כאן.",
-    "Add an email address to configure email notifications": "הוסף כתובת דוא\"ל להגדרת התראות דוא\"ל",
     "Clear notifications": "נקה התראות",
     "The integration manager is offline or it cannot reach your homeserver.": "מנהל האינטגרציה לא מקוון או שהוא לא יכול להגיע לשרת הבית שלך.",
     "Cannot connect to integration manager": "לא ניתן להתחבר אל מנהל האינטגרציה",
@@ -931,14 +841,11 @@
     "Failed to upload profile picture!": "העלאת תמונת פרופיל נכשלה!",
     "Show more": "הצג יותר",
     "Show less": "הצג פחות",
-    "Channel: %(channelName)s": "ערוץ: %(channelName)s",
-    "Workspace: %(networkName)s": "סביבת עבודה: %(networkName)s",
     "This bridge is managed by <user />.": "הגשר הזה מנוהל על ידי משתמש <user />.",
     "This bridge was provisioned by <user />.": "הגשר הזה נוצר על ידי משתמש <user />.",
     "Upload": "העלאה",
     "Accept <policyLink /> to continue:": "קבל <policyLink /> להמשך:",
     "Decline (%(counter)s)": "סרב %(counter)s",
-    "From %(deviceName)s (%(deviceId)s)": "מ- %(deviceName)s %(deviceId)s",
     "Your server isn't responding to some <a>requests</a>.": "השרת שלכם אינו מגיב לבקשות מסויימות <a>בקשות</a>.",
     "Pin": "נעץ",
     "Folder": "תקיה",
@@ -1029,9 +936,6 @@
     "The other party cancelled the verification.": "הצד השני ביטל את האימות.",
     "Accept": "קבל",
     "Decline": "סרב",
-    "Incoming call": "שיחה נכנסת",
-    "Incoming video call": "שיחת וידאו נכנסת",
-    "Incoming voice call": "שיחה קולית נכנסת",
     "Unknown caller": "מתקשר לא ידוע",
     "%(name)s on hold": "%(name)s במצב המתנה",
     "You held the call <a>Switch</a>": "שמם את השיחה על המתנה <a>להחליף</a>",
@@ -1060,7 +964,6 @@
     "Messages containing my username": "הודעות שמכילות את שם המשתמש שלי",
     "Downloading logs": "מוריד לוגים",
     "Uploading logs": "מעלה לוגים",
-    "Show chat effects": "הצג אפקטים של צאט",
     "Enable experimental, compact IRC style layout": "אפשר באופן נסיוני תצוגה ממוזערת בסגנון של IRC",
     "IRC display name width": "רוחב תצוגת השם של IRC",
     "Manually verify all remote sessions": "אמת באופן ידני את כל ההתחברויות",
@@ -1068,7 +971,6 @@
     "Enable message search in encrypted rooms": "אפשר חיפוש הודעות בחדרים מוצפנים",
     "Show previews/thumbnails for images": "הראה תצוגה מקדימה\\ממוזערת של תמונות",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "אפשר שימוש בשרת של מטריקס כאשר השרת שלכם לא פעיל (כתובת ה-IP שלכם תשותף במהלך השיחה)",
-    "Low bandwidth mode": "תצורת התחברות איטית",
     "Show hidden events in timeline": "הצג ארועים מוסתרים בקו הזמן",
     "Show shortcuts to recently viewed rooms above the room list": "הצג קיצורים אל חדרים שנצפו לאחרונה מעל לרשימת החדרים",
     "Show rooms with unread notifications first": "הצג קודם חדרים עם התרעות שלא נקראו",
@@ -1076,14 +978,12 @@
     "Show developer tools": "הצג כלי מפתחים",
     "Prompt before sending invites to potentially invalid matrix IDs": "שאלו אותי לפני שאתם שולחים הזמנה אל קוד זיהוי אפשרי של משתמש מערכת",
     "Enable widget screenshots on supported widgets": "אפשר צילומי מסך של ישומונים עבור ישומונים נתמכים",
-    "Room Colour": "צבע החדר",
     "Enable URL previews by default for participants in this room": "אפשר לחברים בחדר זה לצפות בתצוגת קישורים",
     "Enable URL previews for this room (only affects you)": "אפשר תצוגת קישורים בחדר זה בלבד (רק משפיע עליכם)",
     "Enable inline URL previews by default": "אפשר צפייה של תצוגת קישורים בצאט כברירת מחדל",
     "Never send encrypted messages to unverified sessions in this room from this session": "לעולם אל תשלח הודעות מוצפנות אל התחברות שאינה מאומתת בחדר זה, מהתחברות זו",
     "Never send encrypted messages to unverified sessions from this session": "לעולם אל תשלח הודעות מוצפנות אל התחברות שאינה מאומתת מהתחברות זו",
     "Send analytics data": "שלח מידע אנליטי",
-    "Allow Peer-to-Peer for 1:1 calls": "אפשר התקשרות ישירה 1:1",
     "System font name": "שם גופן מערכת",
     "Use a system font": "השתמש בגופן מערכת",
     "Match system theme": "התאם לתבנית המערכת",
@@ -1097,7 +997,6 @@
     "Enable big emoji in chat": "החל סמלים גדולים בצאט",
     "Show avatars in user and room mentions": "הצג אווטארים באזכורים של משתמשים וחדרים",
     "Enable automatic language detection for syntax highlighting": "החל זיהוי שפה אוטומטי עבור הדגשת מבנה הכתיבה",
-    "Autoplay GIFs and videos": "נגן אנימציות וסרטונים",
     "Always show message timestamps": "תמיד הצג חותמות זמן של הודעות",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "הצג חותמות זמן של 12 שעות (כלומר 2:30pm)",
     "Show read receipts sent by other users": "הצג הודעות שנקראו בידי משתמשים אחרים",
@@ -1110,18 +1009,15 @@
     "Use custom size": "השתמש בגודל מותאם אישית",
     "Font size": "גודל אותיות",
     "Show info about bridges in room settings": "הצג מידע אודות גשרים בהגדרות של החדרים",
-    "Enable advanced debugging for the room list": "החל דיבאגין מתקדם עבור רשימת החדרים",
     "Offline encrypted messaging using dehydrated devices": "שליחת הודעות מוצפנות במצב אופליין עם שימוש במכשיר מיובש",
     "Show message previews for reactions in all rooms": "הראה תצוגה מקדימה של הודעות עבור תגובות בכל החדרים",
     "Show message previews for reactions in DMs": "הראה תצוגת הודעות מוקדמת עבור תגובות במצב דינאמי",
     "Support adding custom themes": "מיכה להוספת תבניות מותאמות אישית",
     "Try out new ways to ignore people (experimental)": "נסו דרכים חדשות להתעלם מאנשים (נסיוני)",
-    "Multiple integration managers": "מנהלי אנטגרציות מרובות",
     "Render simple counters in room header": "הצג ספירה בראש החדר",
     "Group & filter rooms by custom tags (refresh to apply changes)": "סינון קבוצות וחדרים על פי תגיות מנוסחות (ריפרש להחיל שינויים)",
     "Custom user status messages": "נוסח הודעות מצב של משתמשים",
     "Message Pinning": "נעיצת הודעות",
-    "New spinner design": "עיצוב מסובב חדש",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "גירסת קהילות 2. דורש שרת תואם. מאוד נסיוני - השתמשו בזהירות.",
     "Render LaTeX maths in messages": "בצע מתמטיקה של LaTeX בהודעות",
     "Change notification settings": "שינוי הגדרת התרעות",
@@ -1148,7 +1044,6 @@
     "Guest": "אורח",
     "New version of %(brand)s is available": "גרסה חדשה של %(brand)s קיימת",
     "Update %(brand)s": "עדכן %(brand)s",
-    "Verify the new login accessing your account: %(name)s": "אמתו את הכניסה החדשה לחשבונכם: %(name)s",
     "New login. Was this you?": "כניסה חדשה. האם זה אתם?",
     "Other users may not trust it": "יתכן משתמשים אחרים לא יבטחו בזה",
     "Safeguard against losing access to encrypted messages & data": "שמור מפני איבוד גישה אל הודעות ומידע מוצפן",
@@ -1165,9 +1060,7 @@
     "Enable desktop notifications": "אשרו התרעות שולחן עבודה",
     "Don't miss a reply": "אל תפספסו תגובה",
     "Later": "מאוחר יותר",
-    "Review where you’re logged in": "סקור מהיכן כבר התחברת",
     "Review": "סקירה",
-    "Verify all your sessions to ensure your account & messages are safe": "אשרו את כל ההתחברויות שלך על מנת לוודא שהחשבון וההודעות שלכם מאובטחים",
     "No": "לא",
     "Yes": "כן",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "שלח <UsageDataLink>מידע שימוש אנונימי</UsageDataLink> אשר עוזר לנו לשפר את %(brand)s. זה ישתמש ב <PolicyLink>עוגייה</PolicyLink>.",
@@ -1220,7 +1113,6 @@
     "Sign out": "יציאה",
     "Create Room": "צור חדר",
     "Block anyone not part of %(serverName)s from ever joining this room.": "חסום ממישהו שאינו חלק מ- %(serverName)s מלהצטרף אי פעם לחדר זה.",
-    "Make this room public": "הפוך חדר זה לציבורי",
     "Topic (optional)": "נושא (לא חובה)",
     "Name": "שם",
     "Create a room in %(communityName)s": "צור חדר בקהילה %(communityName)s",
@@ -1232,7 +1124,6 @@
     "Your server requires encryption to be enabled in private rooms.": "השרת שלכם דורש הפעלת הצפנה בחדרים פרטיים.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "אינך יכול להשבית זאת מאוחר יותר. גשרים ורוב הרובוטים עדיין לא יעבדו.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "ניתן למצוא חדרים פרטיים ולהצטרף אליהם בהזמנה בלבד. חדרים ציבוריים יכולים למצוא ולהצטרף לכל אחד בקהילה זו.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "ניתן למצוא חדרים פרטיים ולהצטרף אליהם בהזמנה בלבד. חדרים ציבוריים יכולים למצוא ולהצטרף לכל אחד.",
     "Please enter a name for the room": "אנא הזינו שם לחדר",
     "example": "דוגמא",
     "Community ID": "זהות קהילה",
@@ -1311,10 +1202,8 @@
     "Join millions for free on the largest public server": "הצטרפו למיליונים בחינם בשרת הציבורי הגדול ביותר",
     "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.": "באפשרותך להשתמש באפשרויות השרת המותאמות אישית כדי להיכנס לשרתי מטריקס אחרים על ידי ציון כתובת URL אחרת של שרת בית. זה מאפשר לך להשתמש ב- Element עם חשבון מטריקס קיים בשרת בית אחר.",
     "Server Options": "אפשרויות שרת",
-    "Room directory": "מדריך חדרים",
     "This address is already in use": "כתובת זו נמצאת בשימוש",
     "This address is available to use": "כתובת זו זמינה לשימוש",
-    "Please provide a room address": "אנא ספקו כתובת לחדר",
     "Some characters not allowed": "חלק מהתווים אינם מורשים",
     "e.g. my-room": "כגון החדר-שלי",
     "Room address": "כתובת חדר",
@@ -1378,9 +1267,7 @@
     "%(nameList)s %(transitionList)s": "%(nameList)s-%(transitionList)s",
     "Language Dropdown": "תפריט שפות",
     "Information": "מידע",
-    "Rotate clockwise": "סובב עם כיוון השעון",
     "Rotate Right": "סובב ימינה",
-    "Rotate counter-clockwise": "סובב נגד כיוון השעון",
     "Rotate Left": "סובב שמאלה",
     "collapse": "כווץ",
     "expand": "הרחב",
@@ -1394,7 +1281,6 @@
     "Popout widget": "יישומון קופץ",
     "Message deleted": "הודעה נמחקה",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> הגיבו עם %(shortName)s</reactedWith>",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> הגיבו עם %(content)s</reactedWith>",
     "Reactions": "תגובות",
     "Show all": "הצג הכל",
     "Error decrypting video": "שגיאה בפענוח וידאו",
@@ -1426,7 +1312,6 @@
     "Attachment": "נספחים",
     "Message Actions": "פעולות הודעה",
     "React": "הגב",
-    "Error decrypting audio": "שגיאה בפענוח שמע",
     "The encryption used by this room isn't supported.": "ההצפנה בה משתמשים בחדר זה אינה נתמכת.",
     "Encryption not enabled": "ההצפנה לא מופעלת",
     "Ignored attempt to disable encryption": "התעלם מהניסיון להשבית את ההצפנה",
@@ -1458,7 +1343,6 @@
     "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. נסה עם לקוח אחר.",
     "Security": "אבטחה",
     "This client does not support end-to-end encryption.": "לקוח זה אינו תומך בהצפנה מקצה לקצה.",
-    "Role": "תפקיד",
     "Failed to deactivate user": "השבתת משתמש נכשלה",
     "Deactivate user?": "השבת משתמש?",
     "Deactivate user": "השבת משתמש",
@@ -1494,7 +1378,6 @@
     "Demote": "הורד",
     "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 yourself?": "להוריד את עצמך?",
-    "Direct message": "הודעה ישירה",
     "Share Link to User": "שתף קישור למשתמש",
     "Invite": "הזמן",
     "Mention": "אזכר",
@@ -1537,7 +1420,6 @@
     "Start Verification": "התחל אימות",
     "Accepting…": "מקבל…",
     "Waiting for %(displayName)s to accept…": "ממתין לקבלת %(displayName)s …",
-    "Waiting for you to accept on your other session…": "מחכה שתסכים בפגישה השנייה שלך …",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "כאשר מישהו מכניס כתובת URL להודעה שלו, ניתן להציג תצוגה מקדימה של כתובת אתר כדי לתת מידע נוסף על קישור זה, כמו הכותרת, התיאור והתמונה מהאתר.",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "בחדרים מוצפנים, כמו זה, תצוגות מקדימות של כתובות אתרים מושבתות כברירת מחדל כדי להבטיח ששרת הבית שלך (במקום בו נוצרות התצוגות המקדימות) אינו יכול לאסוף מידע על קישורים שאתה רואה בחדר זה.",
     "URL previews are disabled by default for participants in this room.": "תצוגות מקדימות של כתובות אתרים מושבתות כברירת מחדל עבור משתתפים בחדר זה.",
@@ -1560,7 +1442,6 @@
     "New published address (e.g. #alias:server)": "כתובת חדשה שפורסמה (למשל #alias:server)",
     "No other published addresses yet, add one below": "עדיין אין כתובות שפורסמו, הוסף כתובת למטה",
     "Other published addresses:": "כתובות מפורסמות אחרות:",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "כל אחד מהשרתים יכול להשתמש בכתובות שפורסמו כדי להצטרף לחדר שלך. כדי לפרסם כתובת, תחילה יש להגדיר אותה ככתובת מקומית.",
     "Published Addresses": "כתובות מפורסמות",
     "Local address": "כתובות מקומיות",
     "This room has no local addresses": "לחדר זה אין כתובות מקומיות",
@@ -1651,10 +1532,7 @@
     "%(duration)sh": "%(duration)s (שעות)",
     "%(duration)sm": "%(duration)s (דקות)",
     "%(duration)ss": "(שניות) %(duration)s",
-    "Jump to message": "קפוץ להודעה",
-    "Pinned Messages": "הודעות מוצמדות",
     "Loading...": "טוען...",
-    "No pinned messages.": "אין הודעות מוצמדות.",
     "This is the start of <roomName/>.": "זוהי התחלת חדר <roomName/>.",
     "Add a photo, so people can easily spot your room.": "הוסף תמונה, כך שאנשים יוכלו לזהות את החדר שלך בקלות.",
     "%(displayName)s created this room.": "%(displayName)s יצר את החדר הזה.",
@@ -1687,7 +1565,6 @@
     "and %(count)s others...|other": "ו %(count)s אחרים...",
     "Close preview": "סגור תצוגה מקדימה",
     "Scroll to most recent messages": "גלול להודעות האחרונות",
-    "Please select the destination room for this message": "אנא בחר בחדר היעד להודעה זו",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "לא ניתן להבטיח את האותנטיות של הודעה מוצפנת זו במכשיר זה.",
     "Encrypted by a deleted session": "הוצפן על ידי מושב שנמחק",
     "Unencrypted": "לא מוצפן",
@@ -1698,9 +1575,6 @@
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "אם למפגשים האחרים שלך אין מפתח להודעה זו לא תוכל לפענח אותם.",
     "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.": "בקשת שיתוף המפתח שלך נשלחה - אנא בדוק אם קיימות בקשות לשיתוף מפתח בהפעלות האחרות שלך.",
-    "%(senderName)s uploaded a file": "%(senderName)s העלה תמונה",
-    "%(senderName)s sent a video": "%(senderName)s שלח\\ה סרטון",
-    "%(senderName)s sent an image": "%(senderName)s שלח\\ה תמונה",
     "This event could not be displayed": "לא ניתן להציג את הארוע הזה",
     "Mod": "ממתן",
     "Edit message": "ערוך הודעה",
@@ -1711,7 +1585,6 @@
     "You have not verified this user.": "לא אימתת משתמש זה.",
     "This user has not verified all of their sessions.": "משתמש זה לא אימת את כל ההפעלות שלו.",
     "Drop file here to upload": "גרור קובץ לכאן בכדי להעלות",
-    "Drop File Here": "גרור קובץ לכאן",
     "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 ?",
@@ -1740,7 +1613,6 @@
     "Your email address hasn't been verified yet": "כתובת הדוא\"ל שלך עדיין לא אומתה",
     "Unable to share email address": "לא ניתן לשתף את כתובת הדוא\"ל",
     "Unable to revoke sharing for email address": "לא ניתן לבטל את השיתוף לכתובת הדוא\"ל",
-    "Who can access this room?": "למי מותר להכנס לחדר זה?",
     "Encrypted": "מוצפן",
     "Once enabled, encryption cannot be disabled.": "לאחר הפעלתו, לא ניתן לבטל את ההצפנה.",
     "Security & Privacy": "אבטחה ופרטיות",
@@ -1750,12 +1622,8 @@
     "Members only (since the point in time of selecting this option)": "חברים בלבד (מאז נקודת הזמן לבחירת אפשרות זו)",
     "Anyone": "כולם",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "שינויים במי שיכול לקרוא היסטוריה יחולו רק על הודעות עתידיות בחדר זה. נראות ההיסטוריה הקיימת לא תשתנה.",
-    "Anyone who knows the room's link, including guests": "כל מי שמכיר את קישור החדר, כולל אורחים",
-    "Anyone who knows the room's link, apart from guests": "כל מי שמכיר את קישור החדר, מלבד האורחים",
     "Only people who have been invited": "רק משתמשים אשר הוזמנו",
     "To link to this room, please add an address.": "לקישור לחדר זה, אנא הוסף כתובת.",
-    "Click here to fix": "לחץ כאן לתקן",
-    "Guests cannot join this room even if explicitly invited.": "אורחים אינם יכולים להצטרף לחדר זה גם אם הם מוזמנים במפורש.",
     "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>",
     "Enable encryption?": "הפעל הצפנה?",
     "Select the roles required to change various parts of the room": "בחר את התפקידים הנדרשים לשינוי חלקים שונים של החדר",
@@ -1790,7 +1658,6 @@
     "Widget added by": "ישומון נוסף על ידי",
     "Widgets do not use message encryption.": "יישומונים אינם משתמשים בהצפנת הודעות.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "שימוש ביישומון זה עשוי לשתף נתונים <helpIcon /> עם %(widgetDomain)s.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "שימוש ביישומון זה עשוי לשתף נתונים <helpIcon /> עם %(widgetDomain)s ומנהל האינטגרציה שלך.",
     "Widget ID": "קוד זהות הישומון",
     "Room ID": "קוד זהות החדר",
     "%(brand)s URL": "קישור %(brand)s",
@@ -1943,21 +1810,15 @@
     "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>.",
     "Labs": "מעבדות",
     "Clear cache and reload": "נקה מטמון ואתחל",
-    "click to reveal": "לחץ בשביל לחשוף",
-    "Access Token:": "אסימון גישה:",
-    "Identity Server is": "שרת ההזדהות הינו",
     "Homeserver is": "שרת הבית הינו",
-    "olm version:": "גרסת OLM:",
     "%(brand)s version:": "גרסאת %(brand)s:",
     "Versions": "גרסאות",
     "Keyboard Shortcuts": "קיצורי מקלדת",
     "FAQ": "שאלות",
     "Help & About": "עזרה ואודות",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "כדי לדווח על בעיית אבטחה הקשורה למטריקס, אנא קראו את <a> מדיניות גילוי האבטחה של Matrix.org </a>.",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "אם הגשת באג באמצעות GitHub, יומני איתור באגים יכולים לעזור לנו לאתר את הבעיה. יומני איתור באגים מכילים נתוני שימוש ביישומים הכוללים את שם המשתמש שלך, המזהים או הכינויים של החדרים או הקבוצות שבהם ביקרת ושמות המשתמשים של משתמשים אחרים. הם אינם מכילים הודעות.",
     "Bug reporting": "דיווח על תקלות ובאגים",
     "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> או התחל צ'אט עם הבוט שלנו באמצעות הלחצן למטה.",
@@ -1985,7 +1846,6 @@
     "Show advanced": "הצג מתקדם",
     "Hide advanced": "הסתר מתקדם",
     "Modern": "מודרני",
-    "Compact": "ממוזער",
     "Message layout": "תבנית הודעה",
     "Theme": "ערכת נושא",
     "Add theme": "הוסף ערכת נושא חדשה",
@@ -1999,20 +1859,15 @@
     "Hey you. You're the best!": "היי, אתם אלופים!",
     "Check for update": "בדוק עדכונים",
     "New version available. <a>Update now.</a>": "גרסא חדשה קיימת. <a>שדרגו עכשיו.</a>",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "מנהלי שילוב מקבלים נתוני תצורה ויכולים לשנות ווידג'טים, לשלוח הזמנות לחדר ולהגדיר רמות הספק מטעמכם.",
     "Manage integrations": "נהל שילובים",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "השתמש במנהל שילוב לניהול בוטים, ווידג'טים וחבילות מדבקות.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "השתמש במנהל שילוב <b> (%(serverName)s) </b> לניהול בוטים, ווידג'טים וחבילות מדבקות.",
     "Change": "שנה",
     "Enter a new identity server": "הכנס שרת הזדהות חדש",
     "Do not use an identity server": "אל תשתמש בשרת הזדהות",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "השימוש בשרת זהות הוא אופציונלי. אם תבחר לא להשתמש בשרת זהות, משתמשים אחרים לא יוכלו לגלות ולא תוכל להזמין אחרים בדוא\"ל או בטלפון.",
     "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.": "ההתנתקות משרת הזהות שלך פירושה שלא תגלה משתמשים אחרים ולא תוכל להזמין אחרים בדוא\"ל או בטלפון.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "אינך משתמש כרגע בשרת זהות. כדי לגלות ולהיות נגלים על ידי אנשי קשר קיימים שאתה מכיר, הוסף אחד למטה.",
-    "Identity Server": "שרת הזדהות",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "אם אינך רוצה להשתמש ב- <server /> כדי לגלות ולהיות נגלה על ידי אנשי קשר קיימים שאתה מכיר, הזן שרת זהות אחר למטה.",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "אתה משתמש כרגע ב <server></server> די לגלות ולהיות נגלה על ידי אנשי קשר קיימים שאתה מכיר. תוכל לשנות את שרת הזהות שלך למטה.",
-    "Identity Server (%(server)s)": "שרת הזדהות (%(server)s)",
     "Go back": "חזרה",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "אנו ממליצים שתסיר את כתובות הדוא\"ל ומספרי הטלפון שלך משרת הזהות לפני שתתנתק.",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "אתה עדיין <b> משתף את הנתונים האישיים שלך </b> בשרת הזהות <idserver />.",
@@ -2030,9 +1885,6 @@
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "התנתק משרת זיהוי עכשווי <current /> והתחבר אל <new /> במקום?",
     "Change identity server": "שנה כתובת של שרת הזיהוי",
     "Checking server": "בודק שרת",
-    "Could not connect to Identity Server": "לא ניתן להתחבר אל שרת הזיהוי",
-    "Not a valid Identity Server (status code %(code)s)": "שרת זיהוי לא מאושר(קוד סטטוס %(code)s)",
-    "Identity Server URL must be HTTPS": "הזיהוי של כתובת השרת חייבת להיות מאובטחת ב- HTTPS",
     "not ready": "לא מוכן",
     "ready": "מוכן",
     "Secret storage:": "אחסון סודי:",
@@ -2041,7 +1893,6 @@
     "Backup key cached:": "גבה מפתח במטמון:",
     "not stored": "לא שמור",
     "Backup key stored:": "גבה מפתח שמור:",
-    "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.": "גבה את מפתחות ההצפנה שלך עם נתוני חשבונך במקרה שתאבד גישה למפגשים שלך. המפתחות שלך מאובטחים באמצעות מפתח שחזור ייחודי.",
     "unexpected type": "סוג בלתי צפוי",
     "well formed": "מעוצב היטב",
     "Back up your keys before signing out to avoid losing them.": "גבה את המפתחות שלך לפני היציאה כדי להימנע מלאבד אותם.",
@@ -2097,7 +1948,7 @@
     "You do not have permission to create rooms in this community.": "אין לך הרשאה ליצור חדרים בקהילה זו.",
     "Cannot create rooms in this community": "לא ניתן ליצור חדרים בקהילה זו",
     "Failed to reject invitation": "דחיית ההזמנה נכשלה",
-    "Explore rooms": "שיטוט בחדרים",
+    "Explore rooms": "גלה חדרים",
     "Create a Group Chat": "צור צ'אט קבוצתי",
     "Explore Public Rooms": "חקור חדרים ציבוריים",
     "Send a Direct Message": "שלח הודעה ישירה",
@@ -2211,36 +2062,19 @@
     "Update status": "עדכן סטטוס",
     "Clear status": "נקה סטטוס",
     "Report Content": "דווח על תוכן",
-    "Collapse Reply Thread": "כווץ התשובה",
-    "Share Message": "שתף הודעה",
-    "Share Permalink": "שתף קישור קבוע",
-    "Resend removal": "שלח את ההסרה מחדש",
     "Resend %(unsentCount)s reaction(s)": "שלח שוב תגובות %(unsentCount)s",
-    "Resend edit": "שלח שוב את העריכה",
     "Unable to reject invite": "לא ניתן לדחות את ההזמנה",
     "Are you sure you want to reject the invitation?": "האם אתם בטוחים שברצונכם לדחות את ההזמנה?",
     "Reject invitation": "דחה הזמנה",
     "Hold": "החזק",
     "Resume": "תקציר",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "אם שכחת את מפתח השחזור שלך, תוכל <button> להגדיר אפשרויות שחזור חדשות </button>",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "גש להיסטוריית ההודעות המאובטחות שלך והגדר הודעות מאובטחות על ידי הזנת מפתח השחזור שלך.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b> אזהרה </b>: עליך להגדיר גיבוי מקשים רק ממחשב מהימן.",
-    "Not a valid recovery key": "לא מפתח שחזור תקף",
-    "This looks like a valid recovery key!": "זה נראה כמו מפתח שחזור תקף!",
-    "Enter recovery key": "הזן מפתח שחזור",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "אם שכחת את ביטוי סיסמת ההתאוששות שלך, תוכל <button1> להשתמש במפתח השחזור </button1> או <button2> להגדיר אפשרויות שחזור חדשות </button2>",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "גש להיסטוריית ההודעות המאובטחות שלך והגדר הודעות מאובטחות על ידי הזנת משפט סיסמה לשחזור שלך.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b> אזהרה </b>: עליך להגדיר גיבוי מקשים רק ממחשב מהימן.",
-    "Enter recovery passphrase": "הזן ביטוי סיסמה לשחזור",
     "Successfully restored %(sessionCount)s keys": "שוחזר בהצלחה %(sessionCount)s מפתחות",
     "Failed to decrypt %(failedCount)s sessions!": "הפענוח של %(failedCount)s שניות נכשל!",
     "Keys restored": "מפתחות משוחזרים",
     "No backup found!": "לא נמצא גיבוי!",
     "Unable to restore backup": "לא ניתן לשחזר את הגיבוי",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "לא ניתן היה לפענח גיבוי עם ביטוי סיסמה לשחזור זה: ודא שהזנת את משפט סיסמת השחזור הנכון.",
-    "Incorrect recovery passphrase": "משפט סיסמה שגוי לשחזור",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "לא ניתן היה לפענח גיבוי באמצעות מפתח שחזור זה: ודא שהזנת את מפתח השחזור הנכון.",
-    "Recovery key mismatch": "אי התאמה בין מפתח השחזור",
     "Unable to load backup status": "לא ניתן לטעון את מצב הגיבוי",
     "%(completed)s of %(total)s keys restored": "%(completed)s שניות מתוך %(total)s מפתחות שוחזרו",
     "Fetching keys from server...": "מאחזר מפתחות מהשרת ...",
@@ -2255,23 +2089,15 @@
     "Use your Security Key to continue.": "השתמש במפתח האבטחה שלך כדי להמשיך.",
     "Security Key": "מפתח אבטחה",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "הזן את ביטוי האבטחה שלך או <button> השתמש במפתח האבטחה שלך </button> כדי להמשיך.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "אין אפשרות לגשת לאחסון סודי. אנא ודא שהזנת את משפט סיסמת השחזור הנכון.",
     "Security Phrase": "ביטוי אבטחה",
-    "Invalid Recovery Key": "מפתח שחזור לא תקין",
-    "Wrong Recovery Key": "מפתח שחזור שגוי",
     "Looks good!": "נראה טוב!",
     "Wrong file type": "סוג קובץ שגוי",
-    "Deny": "סרב",
-    "Allow": "אפשר",
-    "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.": "יישומון שנמצא ב- %(widgetUrl)s מעוניין לאמת את זהותך. בכך שתאפשר זאת, היישומון יוכל לאמת את מזהה המשתמש שלך, אך לא לבצע פעולות כמוך.",
-    "A widget would like to verify your identity": "יישומון רוצה לאמת את זהותך",
     "Remember my selection for this widget": "זכור את הבחירה שלי עבור יישומון זה",
     "Decline All": "סרב להכל",
     "Approve": "אישור",
     "This widget would like to:": "יישומון זה רוצה:",
     "Approve widget permissions": "אשר הרשאות יישומון",
     "Verification Request": "בקשת אימות",
-    "Verify other session": "אמת מושבים אחרים",
     "Upload Error": "שגיאת העלאה",
     "Cancel All": "בטל הכל",
     "Upload %(count)s other files|one": "העלה %(count)s של קובץ אחר",
@@ -2291,7 +2117,6 @@
     "Use bots, bridges, widgets and sticker packs": "השתמש בבוטים, גשרים, ווידג'טים וחבילות מדבקות",
     "Be found by phone or email": "להימצא בטלפון או בדוא\"ל",
     "Find others by phone or email": "מצא אחרים בטלפון או בדוא\"ל",
-    "Integration Manager": "מנהל אינטגרציה",
     "Your browser likely removed this data when running low on disk space.": "סביר להניח שהדפדפן שלך הסיר נתונים אלה כאשר שטח הדיסק שלהם נמוך.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "חלק מנתוני ההפעלה, כולל מפתחות הודעות מוצפנים, חסרים. צא והיכנס כדי לתקן זאת, ושחזר את המפתחות מהגיבוי.",
     "Missing session data": "חסרים נתוני הפעלות",
@@ -2342,7 +2167,6 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "שדרוג חדר הוא פעולה מתקדמת ומומלץ בדרך כלל כאשר החדר אינו יציב עקב באגים, תכונות חסרות או פרצות אבטחה.",
     "Upgrade public room": "שדרג חדר ציבורי",
     "Upgrade private room": "שדרג חדר פרטי",
-    "Automatically invite users": "הזמן משתמשים באופן אוטומטי",
     "Put a link back to the old room at the start of the new room so people can see old messages": "החזירו קישור לחדר הישן בתחילת החדר החדש כדי שאנשים יוכלו לראות הודעות ישנות",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "עצור מהמשתמשים לדבר בגרסה הישנה של החדר, ושלח הודעה הממליצה למשתמשים לעבור לחדר החדש",
     "Update any local room aliases to point to the new room": "עדכן את כינויי החדר המקומיים בכדי להצביע על החדר החדש",
@@ -2361,15 +2185,6 @@
     "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>.": "רק קדימה, אם לא תוסיף דוא\"ל ושכחת את הסיסמה שלך, אתה יכול <b> לאבד לצמיתות את הגישה לחשבונך </b>.",
     "Continuing without email": "ממשיך ללא דוא\"ל",
     "Doesn't look like a valid email address": "לא נראה כמו כתובת דוא\"ל תקפה",
-    "This wasn't me": "זה לא הייתי אני",
-    "If you didn’t sign in to this session, your account may be compromised.": "אם לא נכנסת למפגש זה, ייתכן שחשבונך נפגע.",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "השתמש בפגישה זו כדי לאמת את הפגישה החדשה שלך, והעניק לה גישה להודעות מוצפנות:",
-    "New session": "מושב חדש",
-    "We recommend you change your password and recovery key in Settings immediately": "אנו ממליצים לך לשנות את הסיסמה ומפתח השחזור שלך בהגדרות באופן מיידי",
-    "The internet connection either session is using": "חיבור האינטרנט או כל מושב משתמש",
-    "This session, or the other session": "המושב הזה או המושב האחר",
-    "Your password": "הסיסמה שלכם",
-    "Your account is not secure": "חשבונכם אינו מאובטח",
     "Data on this screen is shared with %(widgetDomain)s": "הנתונים על המסך הזה משותפים עם %(widgetDomain)s",
     "Modal Widget": "יישומון מודאלי",
     "Message edits": "עריכת הודעות",
@@ -2418,13 +2233,10 @@
     "Failed to find the following users": "מציאת המשתמשים הבאים נכשלה",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "לא יכולנו להזמין את המשתמשים האלה. אנא בדוק את המשתמשים שברצונך להזמין ונסה שוב.",
     "Something went wrong trying to invite the users.": "משהו השתבש בניסיון להזמין את המשתמשים.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "לא הצלחנו ליצור את ה- DM שלך. אנא בדוק את המשתמשים שברצונך להזמין ונסה שוב.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "הזמנת המשתמשים הבאים לצ'אט נכשלה: %(csvUsers)s",
     "Invite by email": "הזמנה באמצעות דוא\"ל",
     "Click the button below to confirm your identity.": "לחץ על הלחצן למטה כדי לאשר את זהותך.",
     "Confirm to continue": "אשרו בכדי להמשיך",
     "To continue, use Single Sign On to prove your identity.": "כדי להמשיך, השתמש בכניסה יחידה כדי להוכיח את זהותך.",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s שלכם אינו מאפשר לך להשתמש במנהל שילוב לשם כך. אנא צרו קשר עם מנהל מערכת.",
     "Integrations not allowed": "שילובים אינם מורשים",
     "Enable 'Manage Integrations' in Settings to do this.": "אפשר 'ניהול אינטגרציות' בהגדרות כדי לעשות זאת.",
     "Integrations are disabled": "שילובים מושבתים",
@@ -2509,13 +2321,11 @@
     "If disabled, messages from encrypted rooms won't appear in search results.": "אם מושבת, הודעות מחדרים מוצפנים לא יופיעו בתוצאות החיפוש.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "אם לא הסרת את שיטת השחזור, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "אם עשית זאת בטעות, באפשרותך להגדיר הודעות מאובטחות בהפעלה זו אשר תצפין מחדש את היסטוריית ההודעות של הפגישה בשיטת שחזור חדשה.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "בפגישה זו זוהה כי ביטוי הסיסמה והמפתח לשחזור שלך עבור הודעות מאובטחות הוסר.",
     "Recovery Method Removed": "שיטת השחזור הוסרה",
     "Set up Secure Messages": "הגדר הודעות מאובטחות",
     "Go to Settings": "עבור להגדרות",
     "This session is encrypting history using the new recovery method.": "הפעלה זו היא הצפנת היסטוריה בשיטת השחזור החדשה.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "אם לא הגדרת את שיטת השחזור החדשה, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות.",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "ביטוי סיסמה ומפתח שחזור חדשים עבור הודעות מאובטחות זוהו.",
     "New Recovery Method": "שיטת שחזור חדשה",
     "Import": "יבא",
     "File to import": "קובץ ליבא",
@@ -2540,7 +2350,6 @@
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "אם תבטל עכשיו, אתה עלול לאבד הודעות ונתונים מוצפנים אם תאבד את הגישה לכניסות שלך.",
     "Unable to query secret storage status": "לא ניתן לשאול על סטטוס האחסון הסודי",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "אחסן את מפתח האבטחה שלך במקום בטוח, כמו מנהל סיסמאות או כספת, מכיוון שהוא משמש כדי להגן על הנתונים המוצפנים שלך.",
-    "Enter your recovery passphrase a second time to confirm it.": "הזן את משפט סיסמת ההתאוששות שלך בפעם השנייה כדי לאשר זאת.",
     "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.": "הזן ביטוי אבטחה רק אתה מכיר, מכיוון שהוא משמש כדי להגן על הנתונים שלך. כדי להיות בטוח, אתה לא צריך להשתמש מחדש בסיסמת החשבון שלך.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "שדרג את ההפעלה הזו כדי לאפשר לה לאמת פעילויות אחרות, הענק להם גישה להודעות מוצפנות וסמן אותן כאמינות עבור משתמשים אחרים.",
     "You'll need to authenticate with the server to confirm the upgrade.": "יהיה עליך לבצע אימות מול השרת כדי לאשר את השדרוג.",
@@ -2556,32 +2365,19 @@
     "Create key backup": "צור מפתח גיבוי",
     "Success!": "הצלחה!",
     "Starting backup...": "מתחיל גיבוי...",
-    "Make a copy of your recovery key": "צור עותק של מפתח השחזור שלך",
-    "Confirm your recovery passphrase": "אשר את משפט סיסמת ההתאוששות שלך",
-    "Secure your backup with a recovery passphrase": "אבטח את הגיבוי שלך עם משפט סיסמה לשחזור",
     "Set up Secure Message Recovery": "הגדר שחזור הודעות מאובטח",
     "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.": "מבלי להגדיר שחזור הודעות מאובטח, לא תוכל לשחזר את היסטוריית ההודעות המוצפנת שלך אם אתה מתנתק או משתמש בהפעלה אחרת.",
     "Your keys are being backed up (the first backup could take a few minutes).": "גיבוי המפתחות שלך (הגיבוי הראשון יכול לקחת מספר דקות).",
     "<b>Copy it</b> to your personal cloud storage": "<b> העתק אותו </b> לאחסון הענן האישי שלך",
     "<b>Save it</b> on a USB key or backup drive": "<b> שמור אותו </b> במפתח USB או בכונן גיבוי",
     "<b>Print it</b> and store it somewhere safe": "<b> הדפיסו אותו </b> ואחסנו במקום בטוח",
-    "Your recovery key is in your <b>Downloads</b> folder.": "מפתח השחזור שלך נמצא בתיקיה <b> הורדות </b>.",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "מפתח השחזור שלך הועתק <b> אל הלוח שלך </b>, הדבק אותו ל:",
     "Download": "הורדה",
-    "Your recovery key": "מפתח ההתאוששות שלך",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "שמור עותק ממנו במקום מאובטח, כמו מנהל סיסמאות או אפילו כספת.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "מפתח השחזור שלך הוא רשת ביטחון - אתה יכול להשתמש בו כדי להחזיר את הגישה להודעות המוצפנות שלך אם תשכח את משפט הסיסמה לשחזור שלך.",
-    "Repeat your recovery passphrase...": "חזור על משפט סיסמת ההתאוששות שלך ...",
-    "Please enter your recovery passphrase a second time to confirm.": "אנא הזן את משפט סיסמת השחזור שלך בפעם השנייה כדי לאשר.",
     "Go back to set it again.": "חזור להגדיר אותו שוב.",
     "That doesn't match.": "זה לא תואם.",
     "Use a different passphrase?": "להשתמש בביטוי סיסמה אחר?",
     "That matches!": "זה מתאים!",
-    "Set up with a recovery key": "הגדר עם מפתח שחזור",
-    "Great! This recovery passphrase looks strong enough.": "גדול! ביטוי סיסמה לשחזור זה נראה מספיק חזק.",
-    "Enter a recovery passphrase": "הזן ביטוי סיסמה לשחזור",
     "For maximum security, this should be different from your account password.": "ליתר ביטחון, זה צריך להיות שונה מסיסמת החשבון שלך.",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "נאחסן עותק מוצפן של המפתחות שלך בשרת שלנו. אבטח את הגיבוי שלך עם משפט סיסמה לשחזור.",
     "User Autocomplete": "השלמה אוטומטית למשתמשים",
     "Users": "משתמשים",
     "Room Autocomplete": "השלמה אוטומטית לחדרים",
@@ -2590,8 +2386,6 @@
     "Notify the whole room": "הודע לכל החדר",
     "Emoji Autocomplete": "השלמה אוטומטית של אימוג'י",
     "Emoji": "אימוג'י",
-    "DuckDuckGo Results": "תוצאות DuckDuckGo",
-    "Results from DuckDuckGo": "תוצאות מ- DuckDuckGo",
     "Community Autocomplete": "השלמה אוטומטית של קהילות",
     "Command Autocomplete": "השלמה אוטומטית של פקודות",
     "Commands": "פקודות",
@@ -2606,18 +2400,8 @@
     "Failed to re-authenticate": "האימות מחדש נכשל",
     "Incorrect password": "סיסמה שגויה",
     "Failed to re-authenticate due to a homeserver problem": "האימות מחדש נכשל עקב בעיית שרת בית",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "מבלי להשלים את האבטחה במפגש זה, לא תהיה לו גישה להודעות מוצפנות.",
     "Your new session is now verified. 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.": "ההפעלה החדשה שלך אומתה. יש לו גישה להודעות המוצפנות שלך, ומשתמשים אחרים יראו בכך אמינים.",
-    "or another cross-signing capable Matrix client": "או לקוח מטריקס אחר עם יכולת חתימה צולבת",
-    "%(brand)s Android": "%(brand)s אנדרויד",
-    "%(brand)s iOS": "%(brand)s אפל",
-    "%(brand)s Desktop": "%(brand)s למחשב דסקטופ",
-    "%(brand)s Web": "%(brand)s ברשת",
-    "This requires the latest %(brand)s on your other devices:": "לשם כך נדרשים האחוזים האחרונים %(brand)s במכשירים האחרים שלך:",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "אשר את זהותך על ידי אימות התחברות זו מאחד מהפגישות האחרות שלך, והעניק לה גישה להודעות מוצפנות.",
-    "Use Recovery Key": "השתמש במפתח שחזור",
-    "Use Recovery Key or Passphrase": "השתמש במפתח השחזור או בביטוי הסיסמה",
     "Decide where your account is hosted": "החלט היכן מתארח חשבונך",
     "Host account on": "חשבון מארח ב",
     "Create account": "צור חשבון",
@@ -2703,10 +2487,6 @@
     "You seem to be uploading files, are you sure you want to quit?": "נראה שאתה מעלה קבצים, האם אתה בטוח שברצונך להפסיק?",
     "Sent messages will be stored until your connection has returned.": "הודעות שנשלחו יאוחסנו עד שהחיבור שלך יחזור.",
     "Connectivity to the server has been lost.": "הקישוריות לשרת אבדה.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText> שלח הכל מחדש </resendText> או <cancelText> בטל הכל </cancelText> עכשיו. אתה יכול גם לבחור הודעות בודדות לשליחה מחדש או לביטול.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText> שלח הכל מחדש </resendText> או <cancelText> בטל הכל </cancelText> עכשיו. אתה יכול גם לבחור הודעות בודדות לשליחה מחדש או לביטול.",
-    "%(count)s of your messages have not been sent.|one": "ההודעה שלך לא נשלחה.",
-    "%(count)s of your messages have not been sent.|other": "חלק מההודעות שלך לא נשלחו.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "ההודעה שלך לא נשלחה מכיוון ששרת הבית הזה חרג ממגבלת המשאבים. אנא <a> פנה למנהל השירות שלך </a> כדי להמשיך להשתמש בשירות.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "ההודעה שלך לא נשלחה מכיוון ששרת הבתים הזה הגיע למגבלת המשתמשים הפעילים החודשיים שלה. אנא <a> פנה למנהל השירות שלך </a> כדי להמשיך להשתמש בשירות.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "אינך יכול לשלוח שום הודעה עד שתבדוק ותסכים ל <consentLink> התנאים וההגבלות שלנו </consentLink>.",
@@ -2729,13 +2509,11 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "צור קהילה שתקבץ משתמשים וחדרים! בנה דף בית מותאם אישית כדי לסמן את החלל שלך ביקום מטריקס.",
     "Create a new community": "צור קהילה חדשה",
     "Error whilst fetching joined communities": "שגיאה בעת אחזור קהילות שהצטרפו",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "להגדרת מסנן, גרור אווטאר קהילתי לחלונית המסנן בצד שמאל הקיצוני של המסך. אתה יכול ללחוץ על אווטאר בחלונית המסנן בכל עת כדי לראות רק את החדרים והאנשים המשויכים לקהילה זו.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "האם ידעת: תוכל להשתמש בקהילות כדי לסנן את חוויית %(brand)s שלך!",
     "Your Communities": "הקהילות שלכם",
     "%(creator)s created and configured the room.": "%(creator)s יצא והגדיר את החדר.",
     "%(creator)s created this DM.": "%(creator)s יצר את DM הזה.",
     "Logout": "יציאה",
-    "Self-verification request": "בקשה לאימות עצמי",
     "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.": "נתגלו גרסאות ישנות יותר של %(brand)s. זה יגרום לתקלה בקריפטוגרפיה מקצה לקצה בגרסה הישנה יותר. הודעות מוצפנות מקצה לקצה שהוחלפו לאחרונה בעת השימוש בגרסה הישנה עשויות שלא להיות ניתנות לפענוח בגירסה זו. זה עלול גם לגרום להודעות שהוחלפו עם גרסה זו להיכשל. אם אתה נתקל בבעיות, צא וחזור שוב. כדי לשמור על היסטוריית ההודעות, ייצא וייבא מחדש את המפתחות שלך.",
     "Old cryptography data detected": "נתגלו נתוני הצפנה ישנים",
     "Terms and Conditions": "תנאים והגבלות",
@@ -2769,11 +2547,7 @@
     "Remember this": "זכור את זה",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "היישומון יאמת את מזהה המשתמש שלך, אך לא יוכל לבצע פעולות עבורך:",
     "Allow this widget to verify your identity": "אפשר לווידג'ט זה לאמת את זהותך",
-    "We recommend you change your password and Security Key in Settings immediately": "אנו ממליצים לך לשנות את הסיסמה ומפתח האבטחה שלך בהגדרות באופן מיידי",
-    "Start a Conversation": "התחל שיחה",
     "Workspace: <networkLink/>": "סביבת עבודה: <networkLink/>",
-    "Use Ctrl + F to search": "השתמש ב- Ctrl + F כדי לחפש",
-    "Use Command + F to search": "השתמש ב- Command + F כדי לחפש",
     "Change which room, message, or user you're viewing": "שנה את החדר, ההודעה או המשתמש שאתה צופה בו",
     "Expand code blocks by default": "הרחב את בלוקי הקוד כברירת מחדל",
     "Show stickers button": "הצג את לחצן הסטיקרים",
@@ -2785,5 +2559,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": "לא הצלחנו להתחבר אליך",
+    "Integration manager": "מנהל אינטגרציה",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s שלכם אינו מאפשר לך להשתמש במנהל שילוב לשם כך. אנא צרו קשר עם מנהל מערכת.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "שימוש ביישומון זה עשוי לשתף נתונים <helpIcon /> עם %(widgetDomain)s ומנהל האינטגרציה שלך.",
+    "Identity server is": "שרת ההזדהות הינו",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "מנהלי שילוב מקבלים נתוני תצורה ויכולים לשנות ווידג'טים, לשלוח הזמנות לחדר ולהגדיר רמות הספק מטעמכם.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "השתמש במנהל שילוב לניהול בוטים, ווידג'טים וחבילות מדבקות.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "השתמש במנהל שילוב <b> (%(serverName)s) </b> לניהול בוטים, ווידג'טים וחבילות מדבקות.",
+    "Identity server": "שרת הזדהות",
+    "Identity server (%(server)s)": "שרת הזדהות (%(server)s)",
+    "Could not connect to identity server": "לא ניתן להתחבר אל שרת הזיהוי",
+    "Not a valid identity server (status code %(code)s)": "שרת זיהוי לא מאושר(קוד סטטוס %(code)s)",
+    "Identity server URL must be HTTPS": "הזיהוי של כתובת השרת חייבת להיות מאובטחת ב- HTTPS",
+    "Enter Security Phrase": "הזן ביטוי אבטחה",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "לא ניתן לפענח גיבוי עם ביטוי אבטחה זה: אנא ודא שהזנת את ביטוי האבטחה הנכון.",
+    "Incorrect Security Phrase": "ביטוי אבטחה שגוי"
 }
diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index f71c024342..d5826983c8 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -1,9 +1,7 @@
 {
     "All messages": "सारे संदेश",
     "All Rooms": "सारे कमरे",
-    "Please set a password!": "कृपया एक पासवर्ड सेट करें!",
     "Continue": "आगे बढ़ें",
-    "You have successfully set a password and an email address!": "आपने सफलतापूर्वक एक पासवर्ड और एक ईमेल एड्रेस सेट कर लिया है!",
     "This email address is already in use": "यह ईमेल आईडी पहले से इस्तेमाल में है",
     "This phone number is already in use": "यह फ़ोन नंबर पहले से इस्तेमाल में है",
     "Failed to verify email address: make sure you clicked the link in the email": "ईमेल आईडी सत्यापित नही हो पाया: कृपया सुनिश्चित कर लें कि आपने ईमेल में मौजूद लिंक पर क्लिक किया है",
@@ -12,7 +10,6 @@
     "Which officially provided instance you are using, if any": "क्या आप कोई अधिकृत संस्करण इस्तेमाल कर रहे हैं? अगर हां, तो कौन सा",
     "Your homeserver's URL": "आपके होमसर्वर का यूआरएल",
     "Every page you use in the app": "हर पृष्ठ जिसका आप इस एप में इस्तेमाल करते हैं",
-    "Custom Server Options": "कस्टम सर्वर विकल्प",
     "Dismiss": "खारिज",
     "powered by Matrix": "मैट्रिक्स द्वारा संचालित",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "चाहे आप रिच टेक्स्ट एडिटर के रिच टेक्स्ट मोड का उपयोग कर रहे हों या नहीं",
@@ -23,17 +20,9 @@
     "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.": "जहां इस पृष्ठ में पहचान योग्य जानकारी शामिल है, जैसे कि रूम, यूजर या समूह आईडी, वह डाटा सर्वर को भेजे से पहले हटा दिया जाता है।",
     "Call Failed": "कॉल विफल",
-    "Call Timeout": "कॉल टाइमआउट",
-    "The remote side failed to pick up": "दूसरी पार्टी ने जवाब नहीं दिया",
-    "Unable to capture screen": "स्क्रीन कैप्चर करने में असमर्थ",
-    "Existing Call": "मौजूदा कॉल",
-    "You are already in a call.": "आप पहले से ही एक कॉल में हैं।",
     "VoIP is unsupported": "VoIP असमर्थित है",
     "You cannot place VoIP calls in this browser.": "आप इस ब्राउज़र में VoIP कॉल नहीं कर सकते हैं।",
     "You cannot place a call with yourself.": "आप अपने साथ कॉल नहीं कर सकते हैं।",
-    "Call in Progress": "कॉल चालू हैं",
-    "A call is currently being placed!": "वर्तमान में एक कॉल किया जा रहा है!",
-    "A call is already in progress!": "कॉल पहले ही प्रगति पर है!",
     "Permission Required": "अनुमति आवश्यक है",
     "You do not have permission to start a conference call in this room": "आपको इस रूम में कॉन्फ़्रेंस कॉल शुरू करने की अनुमति नहीं है",
     "Upload Failed": "अपलोड विफल",
@@ -84,7 +73,6 @@
     "Admin": "व्यवस्थापक",
     "Operation failed": "कार्रवाई विफल",
     "Failed to invite": "आमंत्रित करने में विफल",
-    "Failed to invite the following users to the %(roomName)s room:": "निम्नलिखित उपयोगकर्ताओं को %(roomName)s रूम में आमंत्रित करने में विफल:",
     "You need to be logged in.": "आपको लॉग इन करने की जरूरत है।",
     "Unable to load! Check your network connectivity and try again.": "लोड नहीं किया जा सकता! अपनी नेटवर्क कनेक्टिविटी जांचें और पुनः प्रयास करें।",
     "You need to be able to invite users to do that.": "आपको उपयोगकर्ताओं को ऐसा करने के लिए आमंत्रित करने में सक्षम होना चाहिए।",
@@ -99,9 +87,6 @@
     "Room %(roomId)s not visible": "%(roomId)s रूम दिखाई नहीं दे रहा है",
     "Missing user_id in request": "अनुरोध में user_id गुम है",
     "Usage": "प्रयोग",
-    "Searches DuckDuckGo for results": "परिणामों के लिए DuckDuckGo खोजें",
-    "/ddg is not a command": "/ddg एक कमांड नहीं है",
-    "To use it, just wait for autocomplete results to load and tab through them.": "इसका उपयोग करने के लिए, बस स्वत: पूर्ण परिणामों को लोड करने और उनके माध्यम से टैब के लिए प्रतीक्षा करें।",
     "Changes your display nickname": "अपना प्रदर्शन उपनाम बदलता है",
     "Invites user with given id to current room": "दिए गए आईडी के साथ उपयोगकर्ता को वर्तमान रूम में आमंत्रित करता है",
     "Leave room": "रूम छोड़ें",
@@ -120,25 +105,6 @@
     "Displays action": "कार्रवाई प्रदर्शित करता है",
     "Forces the current outbound group session in an encrypted room to be discarded": "एक एन्क्रिप्टेड रूम में मौजूदा आउटबाउंड समूह सत्र को त्यागने के लिए मजबूर करता है",
     "Reason": "कारण",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ने %(displayName)s के लिए निमंत्रण को स्वीकार कर लिया है।",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ने एक निमंत्रण स्वीकार कर लिया।",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ने एक वीओआईपी सम्मेलन का अनुरोध किया।",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ने %(targetName)s को आमंत्रित किया।",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ने %(targetName)s को प्रतिबंधित किया।",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ने अपना प्रदर्शन नाम %(displayName)s में बदल दिया।",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s अपना प्रदर्शन नाम %(displayName)s पर सेट किया।",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ने अपना प्रदर्शन नाम हटा दिया (%(oldDisplayName)s)।",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ने अपनी प्रोफाइल तस्वीर हटा दी।",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ने अपनी प्रोफाइल तस्वीर बदल दी।",
-    "%(senderName)s set a profile picture.": "%(senderName)s ने प्रोफाइल तस्वीर सेट कया।",
-    "VoIP conference started.": "वीओआईपी सम्मेलन शुरू हुआ।",
-    "%(targetName)s joined the room.": "%(targetName)s रूम में शामिल हो गया।",
-    "VoIP conference finished.": "वीओआईपी सम्मेलन समाप्त हो गया।",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ने निमंत्रण को खारिज कर दिया।",
-    "%(targetName)s left the room.": "%(targetName)s ने रूम छोर दिया।",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ने %(targetName)s को अप्रतिबंधित कर दिया।",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ने %(targetName)s को किक कर दिया।",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ने %(targetName)s की निमंत्रण वापस ले लिया।",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ने विषय को \"%(topic)s\" में बदल दिया।",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ने रूम का नाम हटा दिया।",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s कमरे का नाम बदलकर %(roomName)s कर दिया।",
@@ -146,12 +112,6 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ने इस कमरे के लिए मुख्य पता %(address)s पर सेट किया।",
     "%(senderName)s removed the main address for this room.": "%(senderName)s ने इस कमरे के लिए मुख्य पता हटा दिया।",
     "Someone": "कोई",
-    "(not supported by this browser)": "(इस ब्राउज़र द्वारा समर्थित नहीं है)",
-    "%(senderName)s answered the call.": "%(senderName)s ने कॉल का जवाब दिया।",
-    "(could not connect media)": "(मीडिया कनेक्ट नहीं कर सका)",
-    "(no answer)": "(कोई जवाब नहीं)",
-    "(unknown failure: %(reason)s)": "(अज्ञात विफलता: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ने कॉल समाप्त कर दिया।",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s रूम में शामिल होने के लिए %(targetDisplayName)s को निमंत्रण भेजा।",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ने भविष्य के रूम का इतिहास सभी रूम के सदस्यों के लिए प्रकाशित कर दिया जिस बिंदु से उन्हें आमंत्रित किया गया था।",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ने भविष्य के रूम का इतिहास सभी रूम के सदस्यों के लिए दृश्यमान किया, जिस बिंदु में वे शामिल हुए थे।",
@@ -180,8 +140,6 @@
     "Message Pinning": "संदेश पिनिंग",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "१२ घंटे प्रारूप में टाइमस्टैम्प दिखाएं (उदहारण:२:३० अपराह्न बजे)",
     "Always show message timestamps": "हमेशा संदेश टाइमस्टैम्प दिखाएं",
-    "Autoplay GIFs and videos": "जीआईएफ और वीडियो को स्वत: प्ले करें",
-    "Always show encryption icons": "हमेशा एन्क्रिप्शन आइकन दिखाएं",
     "Enable automatic language detection for syntax highlighting": "वाक्यविन्यास हाइलाइटिंग के लिए स्वत: भाषा का पता प्रणाली सक्षम करें",
     "Automatically replace plain text Emoji": "स्वचालित रूप से सादा पाठ इमोजी को प्रतिस्थापित करें",
     "Mirror local video feed": "स्थानीय वीडियो फ़ीड को आईना करें",
@@ -189,12 +147,10 @@
     "Enable inline URL previews by default": "डिफ़ॉल्ट रूप से इनलाइन यूआरएल पूर्वावलोकन सक्षम करें",
     "Enable URL previews for this room (only affects you)": "इस रूम के लिए यूआरएल पूर्वावलोकन सक्षम करें (केवल आपको प्रभावित करता है)",
     "Enable URL previews by default for participants in this room": "इस रूम में प्रतिभागियों के लिए डिफ़ॉल्ट रूप से यूआरएल पूर्वावलोकन सक्षम करें",
-    "Room Colour": "रूम का रंग",
     "Enable widget screenshots on supported widgets": "समर्थित विजेट्स पर विजेट स्क्रीनशॉट सक्षम करें",
     "Show developer tools": "डेवलपर टूल दिखाएं",
     "Collecting app version information": "ऐप संस्करण जानकारी एकत्रित कर रहा हैं",
     "Collecting logs": "लॉग एकत्रित कर रहा हैं",
-    "Uploading report": "रिपोर्ट अपलोड हो रहा है",
     "Waiting for response from server": "सर्वर से प्रतिक्रिया की प्रतीक्षा कर रहा है",
     "Messages containing my display name": "मेरे प्रदर्शन नाम वाले संदेश",
     "Messages in one-to-one chats": "एक-से-एक चैट में संदेश",
@@ -202,11 +158,6 @@
     "When I'm invited to a room": "जब मुझे एक रूम में आमंत्रित किया जाता है",
     "Call invitation": "कॉल आमंत्रण",
     "Messages sent by bot": "रोबॉट द्वारा भेजे गए संदेश",
-    "Active call (%(roomName)s)": "सक्रिय कॉल (%(roomName)s)",
-    "unknown caller": "अज्ञात फ़ोन करने वाला",
-    "Incoming voice call from %(name)s": "%(name)s से आने वाली ध्वनि कॉल",
-    "Incoming video call from %(name)s": "%(name)s से आने वाली वीडियो कॉल",
-    "Incoming call from %(name)s": "%(name)s से आने वाली कॉल",
     "Decline": "पतन",
     "Accept": "स्वीकार",
     "Error": "त्रुटि",
@@ -232,26 +183,8 @@
     "Failed to set display name": "प्रदर्शन नाम सेट करने में विफल",
     "Delete Backup": "बैकअप हटाएं",
     "Unable to load key backup status": "कुंजी बैकअप स्थिति लोड होने में असमर्थ",
-    "Backup version: ": "बैकअप संस्करण: ",
-    "Algorithm: ": "कलन विधि: ",
-    "Error saving email notification preferences": "ईमेल अधिसूचना प्राथमिकताओं को सहेजने में त्रुटि",
-    "An error occurred whilst saving your email notification preferences.": "आपकी ईमेल अधिसूचना वरीयताओं को सहेजते समय एक त्रुटि हुई।",
-    "Keywords": "कीवर्ड",
-    "Enter keywords separated by a comma:": "अल्पविराम से अलग करके कीवर्ड दर्ज करें:",
     "OK": "ठीक",
-    "Failed to change settings": "सेटिंग्स बदलने में विफल",
-    "Can't update user notification settings": "उपयोगकर्ता अधिसूचना सेटिंग्स अद्यतन नहीं कर सकते हैं",
-    "Failed to update keywords": "कीवर्ड अपडेट करने में विफल",
-    "Messages containing <span>keywords</span>": "<span>कीवर्ड</ span> युक्त संदेश",
-    "Notify for all other messages/rooms": "अन्य सभी संदेशों/रूम के लिए सूचित करें",
-    "Notify me for anything else": "मुझे किसी और चीज़ के लिए सूचित करें",
-    "Enable notifications for this account": "इस खाते के लिए अधिसूचनाएं सक्षम करें",
-    "All notifications are currently disabled for all targets.": "सभी सूचनाएं वर्तमान में सभी लक्ष्यों के लिए अक्षम हैं।",
-    "Enable email notifications": "ईमेल अधिसूचनाएं सक्षम करें",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "निम्नलिखित कीवर्ड पर अधिसूचनाएं नियमों का पालन करती हैं जिन्हें यहां प्रदर्शित नहीं किया जा सकता है:",
-    "Unable to fetch notification target list": "अधिसूचना लक्ष्य सूची लाने में असमर्थ",
     "Notification targets": "अधिसूचना के लक्ष्य",
-    "Advanced notification settings": "उन्नत अधिसूचना सेटिंग्स",
     "Failed to invite users to the room:": "रूम में उपयोगकर्ताओं को आमंत्रित करने में विफल:",
     "There was an error joining the room": "रूम में शामिल होने में एक त्रुटि हुई",
     "Use a few words, avoid common phrases": "कम शब्दों का प्रयोग करें, सामान्य वाक्यांशों से बचें",
@@ -282,7 +215,6 @@
     "A word by itself is easy to guess": "सिर्फ एक शब्द अनुमान लगाना आसान है",
     "Names and surnames by themselves are easy to guess": "खुद के नाम और उपनाम अनुमान लगाना आसान है",
     "Common names and surnames are easy to guess": "सामान्य नाम और उपनाम अनुमान लगाना आसान है",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "एन्क्रिप्टेड रूम में सुरक्षित संदेश रिकवरी सक्षम करने के लिए एक अनुस्मारक दिखाएं",
     "Messages containing @room": "@Room युक्त संदेश",
     "Encrypted messages in one-to-one chats": "एक एक के साथ चैट में एन्क्रिप्टेड संदेश",
     "Encrypted messages in group chats": "समूह चैट में एन्क्रिप्टेड संदेश",
@@ -290,21 +222,10 @@
     "Off": "बंद",
     "On": "चालू",
     "Noisy": "शोरगुल",
-    "Cannot add any more widgets": "विजेट और जोड़ नहीं सकते हैं",
-    "The maximum permitted number of widgets have already been added to this room.": "इस रूम में विजेट की अधिकतम अनुमत संख्या पहले से ही जोड़ दी गई है।",
-    "Add a widget": "विजेट जोड़ें",
-    "Drop File Here": "यहां फ़ाइल ड्रॉप करें",
     "Drop file here to upload": "अपलोड करने के लिए यहां फ़ाइल ड्रॉप करें",
-    " (unsupported)": " (असमर्थित)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<VoiceText>आवाज</voiceText> या <videoText>वीडियो</ videoText> के रूप में शामिल हों।",
-    "Ongoing conference call%(supportedText)s.": "चल रहे सम्मेलन कॉल %(supportedText)s।",
     "This event could not be displayed": "यह घटना प्रदर्शित नहीं की जा सकी",
-    "%(senderName)s sent an image": "%(senderName)s ने एक छवि भेजी",
-    "%(senderName)s sent a video": "%(senderName)s ने एक वीडियो भेजा",
-    "%(senderName)s uploaded a file": "%(senderName)s ने एक फाइल अपलोड की",
     "Options": "विकल्प",
     "Key request sent.": "कुंजी अनुरोध भेजा गया।",
-    "Please select the destination room for this message": "कृपया इस संदेश के लिए गंतव्य रूम का चयन करें",
     "Disinvite": "आमंत्रित नहीं करना",
     "Kick": "किक",
     "Disinvite this user?": "इस उपयोगकर्ता को आमंत्रित नहीं करें?",
@@ -350,11 +271,7 @@
     "Server error": "सर्वर त्रुटि",
     "Server unavailable, overloaded, or something else went wrong.": "सर्वर अनुपलब्ध, अधिभारित, या कुछ और गलत हो गया।",
     "Command error": "कमांड त्रुटि",
-    "No pinned messages.": "कोई पिन संदेश नहीं।",
     "Loading...": "लोड हो रहा है...",
-    "Pinned Messages": "पिन किए गए संदेश",
-    "Unpin Message": "संदेश अनपिन करें",
-    "Jump to message": "संदेश पर कूदें",
     "%(duration)ss": "%(duration)s सेकंड",
     "%(duration)sm": "%(duration)s मिनट",
     "%(duration)sh": "%(duration)s घंटा",
@@ -400,7 +317,6 @@
     "Enable big emoji in chat": "चैट में बड़े इमोजी सक्षम करें",
     "Send typing notifications": "टाइपिंग सूचनाएं भेजें",
     "Enable Community Filter Panel": "सामुदायिक फ़िल्टर पैनल सक्षम करें",
-    "Allow Peer-to-Peer for 1:1 calls": "१ : १ कॉल के लिए पीयर-टू-पीयर की अनुमति दें",
     "Prompt before sending invites to potentially invalid matrix IDs": "संभावित अवैध मैट्रिक्स आईडी को निमंत्रण भेजने से पहले सूचित करें",
     "Messages containing my username": "मेरे उपयोगकर्ता नाम वाले संदेश",
     "The other party cancelled the verification.": "दूसरे पक्ष ने सत्यापन रद्द कर दिया।",
@@ -492,7 +408,6 @@
     "All keys backed up": "सभी कुंजियाँ वापस आ गईं",
     "Advanced": "उन्नत",
     "Start using Key Backup": "कुंजी बैकअप का उपयोग करना शुरू करें",
-    "Add an email address to configure email notifications": "ईमेल सूचनाओं को कॉन्फ़िगर करने के लिए एक ईमेल पता जोड़ें",
     "Unable to verify phone number.": "फ़ोन नंबर सत्यापित करने में असमर्थ।",
     "Verification code": "पुष्टि संख्या",
     "Phone Number": "फ़ोन नंबर",
@@ -528,15 +443,10 @@
     "Check for update": "अपडेट के लिये जांचें",
     "Help & About": "सहायता और के बारे में",
     "Bug reporting": "बग रिपोर्टिंग",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "यदि आपने GitHub के माध्यम से बग सबमिट किया है, तो डिबग लॉग हमें समस्या को ट्रैक करने में मदद कर सकते हैं। डीबग लॉग में आपके उपयोगकर्ता नाम, आपके द्वारा देखे गए कमरों या समूहों के आईडी या उपनाम और अन्य उपयोगकर्ताओं के उपयोगकर्ता नाम सहित एप्लिकेशन उपयोग डेटा होता है। उसमे व्यक्तिगत सन्देश नहीं रहते हैं।",
     "Submit debug logs": "डिबग लॉग जमा करें",
     "FAQ": "सामान्य प्रश्न",
     "Versions": "संस्करण",
-    "olm version:": "olm संस्करण:",
     "Homeserver is": "होमेसेर्वेर हैं",
-    "Identity Server is": "आइडेंटिटी सर्वर हैं",
-    "Access Token:": "एक्सेस टोकन:",
-    "click to reveal": "देखने की लिए क्लिक करें",
     "Labs": "लैब्स",
     "Notifications": "सूचनाएं",
     "Start automatically after system login": "सिस्टम लॉगिन के बाद स्वचालित रूप से प्रारंभ करें",
@@ -556,7 +466,6 @@
     "Ignored users": "अनदेखी उपयोगकर्ताओं",
     "Bulk options": "थोक विकल्प",
     "Reject all %(invitedRooms)s invites": "सभी %(invitedRooms)s की आमंत्रण को अस्वीकार करें",
-    "Key backup": "कुंजी बैकअप",
     "Security & Privacy": "सुरक्षा और गोपनीयता",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "गोपनीयता हमारे लिए महत्वपूर्ण है, इसलिए हम अपने विश्लेषिकी के लिए कोई व्यक्तिगत या पहचान योग्य डेटा एकत्र नहीं करते हैं।",
     "Learn more about how we use analytics.": "हम एनालिटिक्स का उपयोग कैसे करते हैं, इसके बारे में और जानें।",
@@ -588,5 +497,6 @@
     "The user must be unbanned before they can be invited.": "उपयोगकर्ता को आमंत्रित करने से पहले उन्हें प्रतिबंधित किया जाना चाहिए।",
     "Explore rooms": "रूम का अन्वेषण करें",
     "Sign In": "साइन करना",
-    "Create Account": "खाता बनाएं"
+    "Create Account": "खाता बनाएं",
+    "Identity server is": "आइडेंटिटी सर्वर हैं"
 }
diff --git a/src/i18n/strings/hr.json b/src/i18n/strings/hr.json
index 2511771578..ce77b7c4f9 100644
--- a/src/i18n/strings/hr.json
+++ b/src/i18n/strings/hr.json
@@ -5,5 +5,202 @@
     "The platform you're on": "Platforma na kojoj se nalazite",
     "The version of %(brand)s": "Verzija %(brand)s",
     "Your language of choice": "Izabrani jezik",
-    "Dismiss": "Odbaci"
+    "Dismiss": "Odbaci",
+    "France": "Francuska",
+    "Finland": "Finska",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Farski otoci",
+    "Falkland Islands": "Falklandski otoci",
+    "Ethiopia": "Etiopija",
+    "Estonia": "Estonija",
+    "Eritrea": "Eritreja",
+    "Equatorial Guinea": "Ekvatorska Gvineja",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egipat",
+    "Ecuador": "Ekvador",
+    "Dominican Republic": "Dominikanska Republika",
+    "Dominica": "Dominika",
+    "Djibouti": "Džibuti",
+    "Denmark": "Danska",
+    "Côte d’Ivoire": "Obala Bjelokosti",
+    "Czech Republic": "Češka",
+    "Cyprus": "Cipar",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Hrvatska",
+    "Costa Rica": "Kostarika",
+    "Cook Islands": "Cookovo Otočje",
+    "Congo - Kinshasa": "Kongo - Kinshasa",
+    "Congo - Brazzaville": "Republika Kongo",
+    "Comoros": "Komori",
+    "Colombia": "Kolumbija",
+    "Cocos (Keeling) Islands": "Kokosovi (Keeling) otoci",
+    "Christmas Island": "Uskršnji otoci",
+    "China": "Kina",
+    "Chile": "Čile",
+    "Chad": "Čad",
+    "Central African Republic": "Srednjoafrička Republika",
+    "Cayman Islands": "Kajmanski otoci",
+    "Caribbean Netherlands": "Karipska Nizozemska",
+    "Cape Verde": "Zelenortski Otoci",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bugarska",
+    "Brunei": "Brunej",
+    "British Virgin Islands": "Britanski djevičanski otoci",
+    "British Indian Ocean Territory": "Britanski teritorij Indijskog oceana",
+    "Brazil": "Brazil",
+    "Bouvet Island": "Otok Bouvet",
+    "Botswana": "Bocvana",
+    "Bosnia": "Bosna i Hercegovina",
+    "Bolivia": "Bolivija",
+    "Bhutan": "Butan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgija",
+    "Belarus": "Bjelorusija",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladeš",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahami",
+    "Azerbaijan": "Azerbejdžan",
+    "Austria": "Austrija",
+    "Australia": "Australija",
+    "Aruba": "Aruba",
+    "Armenia": "Armenija",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigva i Barbuda",
+    "Antarctica": "Antartika",
+    "Anguilla": "Angvila",
+    "Angola": "Angola",
+    "Andorra": "Andora",
+    "American Samoa": "Američka Samoa",
+    "Algeria": "Alžir",
+    "Albania": "Albanija",
+    "Åland Islands": "Alandski otoci",
+    "Afghanistan": "Afganistan",
+    "United States": "Sjedinjene Države",
+    "United Kingdom": "Ujedinjeno Kraljevstvo",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Čini se da Vaša email adresa nije povezana s Matrix ID-om na ovom kućnom poslužitelju.",
+    "This email address was not found": "Ova email adresa nije pronađena",
+    "Unable to enable Notifications": "Omogućavanje notifikacija nije uspjelo",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nema dopuštenje slati Vam notifikacije - molimo pokušajte ponovo",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nema dopuštenje slati Vam notifikacije - molimo provjerite postavke pretraživača",
+    "%(name)s is requesting verification": "%(name)s traži potvrdu",
+    "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.": "Vaš je kućni poslužitelj odbio vaš pokušaj prijave. Razlog je možda da je jednostavno sve predugo trajalo. Molimo pokušajte ponovno. Ako se ovo nastavi, obratite se administratoru kućnog poslužitelja.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Vaš kućni poslužitelj nije bio dostupan i nije vas mogao prijaviti. Pokušajte ponovo. Ako se ovo nastavi, obratite se administratoru kućnog poslužitelja.",
+    "Try again": "Pokušaj ponovo",
+    "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.": "Tražili smo od preglednika da zapamti koji kućni poslužitelj koristite za prijavu, ali ga je Vaš preglednik nažalost zaboravio. Idite na stranicu za prijavu i pokušajte ponovo.",
+    "We couldn't log you in": "Nismo Vas mogli ulogirati",
+    "Trust": "Vjeruj",
+    "Only continue if you trust the owner of the server.": "Nastavite samo ako vjerujete vlasniku poslužitelja.",
+    "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.": "Ova radnja zahtijeva pristup zadanom poslužitelju identiteta <server /> radi provjere adrese e-pošte ili telefonskog broja, no poslužitelj nema nikakve uvjete usluge.",
+    "Identity server has no terms of service": "Poslužitelj identiteta nema uvjete usluge",
+    "Unnamed Room": "Neimenovana soba",
+    "Failed to add the following rooms to %(groupId)s:": "Neuspješno dodavanje sljedećih soba u %(groupId)s:",
+    "Failed to invite users to %(groupId)s": "Neuspješno dodavanje korisnika u %(groupId)s",
+    "Failed to invite users to community": "Dodavanje korisnika u zajednicu nije uspjelo",
+    "Failed to invite the following users to %(groupId)s:": "Neuspješno dodavanje sljedećih korisnika u %(groupId)s:",
+    "Add to community": "Dodaj u zajednicu",
+    "Room name or address": "Ime ili adresa sobe",
+    "Add rooms to the community": "Dodaj sobe zajednici",
+    "Show these rooms to non-members on the community page and room list?": "Prikaži ove sobe osobama koje nisu članovi na stranici zajednice i popisu soba?",
+    "Which rooms would you like to add to this community?": "Koju sobu biste željeli dodati u ovu zajednicu?",
+    "Invite to Community": "Pozovi u zajednicu",
+    "Name or Matrix ID": "Ime ili Matrix ID",
+    "Invite new community members": "Pozovite nove članove zajednice",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Upozorenje: svaka osoba koju dodate u zajednicu bit će javno vidljiva svima koji znaju ID zajednice",
+    "Who would you like to add to this community?": "Koga biste željeli dodati u ovu zajednicu?",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s, %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s, %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "AM": "Prijepodne",
+    "PM": "Poslijepodne",
+    "Dec": "Pro",
+    "Nov": "Stu",
+    "Oct": "Lis",
+    "Sep": "Ruj",
+    "Aug": "Kol",
+    "Jul": "Srp",
+    "Jun": "Lip",
+    "May": "Svi",
+    "Apr": "Tra",
+    "Mar": "Ožu",
+    "Feb": "Velj",
+    "Jan": "Sij",
+    "Sat": "Sub",
+    "Fri": "Pet",
+    "Thu": "Čet",
+    "Wed": "Sri",
+    "Tue": "Uto",
+    "Mon": "Pon",
+    "Sun": "Ned",
+    "Failure to create room": "Stvaranje sobe neuspješno",
+    "The server does not support the room version specified.": "Poslužitelj ne podržava navedenu verziju sobe.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Poslužitelj je možda nedostupan, preopterećen, ili ste pronašli grešku u aplikaciji.",
+    "Upload Failed": "Prijenos neuspješan",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Datoteka '%(fileName)s' premašuje maksimalnu veličinu ovog kućnog poslužitelja za prijenose",
+    "The file '%(fileName)s' failed to upload.": "Prijenos datoteke '%(fileName)s' nije uspio.",
+    "Continue": "Nastavi",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Trenutno nije moguće odgovoriti datotekom. Želite li prenijeti ovu datoteku bez odgovora?",
+    "Replying With Files": "Odgovaranje datotekama",
+    "This will end the conference for everyone. Continue?": "To će prekinuti konferenciju za sve. Nastaviti?",
+    "End conference": "Završi konferenciju",
+    "You do not have permission to start a conference call in this room": "Nemate dopuštenje uspostaviti konferencijski poziv u ovoj sobi",
+    "Permission Required": "Potrebno dopuštenje",
+    "You cannot place a call with yourself.": "Ne možete uspostaviti poziv sami sa sobom.",
+    "You're already in a call with this person.": "Već ste u pozivu sa tom osobom.",
+    "Already in call": "Već u pozivu",
+    "You've reached the maximum number of simultaneous calls.": "Dosegli ste maksimalan broj istodobnih poziva.",
+    "Too Many Calls": "Previše poziva",
+    "You cannot place VoIP calls in this browser.": "Ne možete uspostaviti VoIP pozive u ovom pretraživaču.",
+    "VoIP is unsupported": "VoIP nije podržan",
+    "No other application is using the webcam": "Da ni jedna druga aplikacija već ne koristi web kameru",
+    "Permission is granted to use the webcam": "Jeli dopušteno korištenje web kamere",
+    "A microphone and webcam are plugged in and set up correctly": "Jesu li mikrofon i web kamera priključeni i pravilno postavljeni",
+    "Unable to access webcam / microphone": "Nije moguće pristupiti web kameri / mikrofonu",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Poziv nije uspio jer nije bilo moguće pristupiti web kameri ili mikrofonu. Provjerite:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Poziv nije uspio jer nije bilo moguće pristupiti mikrofonu. Provjerite je li mikrofon priključen i ispravno postavljen.",
+    "Unable to access microphone": "Nije moguće pristupiti mikrofonu",
+    "OK": "OK",
+    "Try using turn.matrix.org": "Pokušajte koristiti turn.matrix.org",
+    "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.": "Alternativno, možete pokušati koristiti javni poslužitelj na <code>turn.matrix.org</code>, no to bi moglo biti manje pouzdano i Vaša IP adresa će biti podijeljena s tim poslužiteljem. Time također možete upravljati u Postavkama.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Zamolite administratora Vašeg kućnog poslužitelja (<code>%(homeserverDomain)s</code>) da konfigurira TURN poslužitelj kako bi pozivi mogli pouzdano funkcionirati.",
+    "Call failed due to misconfigured server": "Poziv neuspješan radi pogrešno konfiguriranog poslužitelja",
+    "The call was answered on another device.": "Na poziv je odgovoreno sa drugog uređaja.",
+    "Answered Elsewhere": "Odgovoreno je drugdje",
+    "The call could not be established": "Poziv se nije mogao uspostaviti",
+    "The user you called is busy.": "Pozvani korisnik je zauzet.",
+    "User Busy": "Korisnik zauzet",
+    "Call Failed": "Poziv neuspješan",
+    "Unable to load! Check your network connectivity and try again.": "Učitavanje nije moguće! Provjerite mrežnu povezanost i pokušajte ponovo.",
+    "Error": "Geška",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Gdje ova stranica uključuje identificirajuće podatke, poput ID-a sobe, korisnika ili grupe, ti se podaci uklanjaju prije slanja na poslužitelj.",
+    "The information being sent to us to help make %(brand)s better includes:": "Podaci koji nam se šalju radi poboljšanja %(brand)s uključuju:",
+    "Analytics": "Analitika",
+    "Your device resolution": "Razlučivost vašeg uređaja",
+    "Your user agent": "Vaš korisnički agent",
+    "e.g. <CurrentPageURL>": "npr. <CurrentPageURL>",
+    "Every page you use in the app": "Svaka stranica koju upotrebljavate u aplikaciji",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Bez obzira upotrebljavate li %(brand)s na uređaju na kojem je dodir primarni mehanizam unosa",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potvrdite dodavanje ovog telefonskog broja koristeći jedinstvenu prijavu (SSO) da biste dokazali Vaš identitet.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Potvrdite dodavanje ove email adrese koristeći jedinstvenu prijavu (SSO) da biste dokazali Vaš identitet.",
+    "Single Sign On": "Jedinstvena prijava (SSO)",
+    "Use Single Sign On to continue": "Koristite jedinstvenu prijavu (SSO) za nastavak",
+    "Whether or not you're logged in (we don't record your username)": "Bez obzira jeste li ulogirani ili ne (ne snimamo vaše korisničko ime)",
+    "Add Phone Number": "Dodaj telefonski broj",
+    "Click the button below to confirm adding this phone number.": "Kliknite gumb ispod da biste potvrdili dodavanje ovog telefonskog broja.",
+    "Confirm adding phone number": "Potvrdite dodavanje telefonskog broja",
+    "Add Email Address": "Dodaj email adresu",
+    "Confirm": "Potvrdi",
+    "Click the button below to confirm adding this email address.": "Kliknite gumb ispod da biste potvrdili dodavanje ove email adrese.",
+    "Confirm adding email": "Potvrdite dodavanje email adrese",
+    "Integration manager": "Upravitelj integracijama",
+    "Identity server": "Poslužitelj identiteta",
+    "Could not connect to identity server": "Nije moguće spojiti se na poslužitelja identiteta"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index a6e9992866..a547f99c74 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2,7 +2,6 @@
     "Cancel": "Mégse",
     "Search": "Keresés",
     "OK": "Rendben",
-    "Custom Server Options": "Egyéni kiszolgálóbeállítások",
     "Dismiss": "Eltüntetés",
     "Error": "Hiba",
     "Failed to forget room %(errCode)s": "A szobát nem sikerült elfelejtetni: %(errCode)s",
@@ -15,74 +14,53 @@
     "Settings": "Beállítások",
     "unknown error code": "ismeretlen hibakód",
     "Accept": "Elfogad",
-    "%(targetName)s accepted an invitation.": "%(targetName)s elfogadta a meghívást.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s elfogadta a meghívást ide: %(displayName)s.",
     "Account": "Fiók",
-    "Access Token:": "Elérési kulcs:",
-    "Active call (%(roomName)s)": "Hívás folyamatban (%(roomName)s)",
     "Add": "Hozzáadás",
-    "Add a topic": "Téma megadása",
     "Admin": "Admin",
     "Admin Tools": "Admin. Eszközök",
     "No Microphones detected": "Nem található mikrofon",
     "No Webcams detected": "Nem található webkamera",
-    "No media permissions": "Nincs media jogosultság",
+    "No media permissions": "Nincs média jogosultság",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Lehet hogy kézileg kell engedélyeznie a %(brand)snak, hogy hozzáférjen a mikrofonjához és webkamerájához",
     "Default Device": "Alapértelmezett eszköz",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Advanced": "Haladó",
+    "Advanced": "Speciális",
     "Always show message timestamps": "Üzenet időbélyeg folyamatos megjelenítése",
     "Authentication": "Azonosítás",
     "Failed to change password. Is your password correct?": "Nem sikerült megváltoztatni a jelszót. Helyesen írtad be a jelszavadat?",
     "Continue": "Folytatás",
     "Create new room": "Új szoba létrehozása",
     "Close": "Bezárás",
-    "Room directory": "Szobák listája",
     "Start chat": "Csevegés indítása",
     "%(items)s and %(lastItem)s": "%(items)s és %(lastItem)s",
     "and %(count)s others...|other": "és még: %(count)s ...",
     "and %(count)s others...|one": "és még egy...",
     "A new password must be entered.": "Új jelszót kell megadni.",
-    "%(senderName)s answered the call.": "%(senderName)s felvette a telefont.",
     "An error has occurred.": "Hiba történt.",
     "Anyone": "Bárki",
-    "Anyone who knows the room's link, apart from guests": "A vendégeken kívül bárki aki ismeri a szoba link-jét",
-    "Anyone who knows the room's link, including guests": "Bárki aki tudja a szoba link-jét, még a vendégek is",
     "Are you sure?": "Biztos?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Biztos, hogy elhagyja a(z) „%(roomName)s” szobát?",
     "Are you sure you want to reject the invitation?": "Biztos, hogy elutasítja a meghívást?",
     "Attachment": "Csatolmány",
-    "Autoplay GIFs and videos": "GIF-ek és videók automatikus lejátszása",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s kitiltotta őt: %(targetName)s.",
     "Ban": "Kitiltás",
     "Banned users": "Kitiltott felhasználók",
     "Bans user with given id": "Kitiltja a megadott azonosítójú felhasználót",
-    "Call Timeout": "Hívás időtúllépés",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nem lehet kapcsolódni a Matrix szerverhez - ellenőrizd a kapcsolatot, biztosítsd, hogy a <a>Matrix szerver tanúsítványa</a> hiteles legyen, és a böngésző kiterjesztések ne blokkolják a kéréseket.",
     "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>.": "Nem lehet csatlakozni a Matrix szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy <a>engedélyezd a nem biztonságos script-et</a>.",
     "Change Password": "Jelszó megváltoztatása",
-    "%(senderName)s changed their profile picture.": "%(senderName)s megváltoztatta a profil képét.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s megváltoztatta a hozzáférési szintjét erre: %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erre: %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s törölte a szoba nevét.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre: „%(topic)s”.",
     "Changes your display nickname": "Megváltoztatja a becenevedet",
-    "Click here to fix": "A javításhoz kattints ide",
-    "Click to mute audio": "Hang némításához kattints ide",
-    "Click to mute video": "A videó kikapcsoláshoz kattints ide",
-    "click to reveal": "Megjelenítéshez kattints ide",
-    "Click to unmute video": "Videó bekapcsoláshoz kattints ide",
-    "Click to unmute audio": "Hang visszakapcsoláshoz kattints ide",
     "Command error": "Parancs hiba",
     "Commands": "Parancsok",
     "Confirm password": "Jelszó megerősítése",
-    "Create Room": "Szoba készítése",
+    "Create Room": "Szoba létrehozása",
     "Cryptography": "Titkosítás",
     "Current password": "Jelenlegi jelszó",
-    "Custom": "Egyedi",
     "Custom level": "Egyedi szint",
-    "/ddg is not a command": "A /ddg nem egy parancs",
     "Deactivate Account": "Fiók bezárása",
     "Decline": "Elutasít",
     "Decrypt %(text)s": "%(text)s visszafejtése",
@@ -90,23 +68,17 @@
     "Disinvite": "Meghívás visszavonása",
     "Displays action": "Tevékenységek megjelenítése",
     "Download %(text)s": "%(text)s letöltése",
-    "Drop File Here": "Ide húzd a fájlt",
     "Email": "E-mail",
     "Email address": "E-mail cím",
     "Emoji": "Emodzsi",
-    "%(senderName)s ended the call.": "%(senderName)s befejezte a hívást.",
     "Enter passphrase": "Jelmondat megadása",
     "Error decrypting attachment": "Csatolmány visszafejtése sikertelen",
-    "Error: Problem communicating with the given homeserver.": "Hiba: Probléma van a Matrix szerverrel való kommunikációval.",
-    "Existing Call": "Hívás folyamatban",
     "Export": "Mentés",
     "Export E2E room keys": "E2E szoba kulcsok mentése",
     "Failed to ban user": "A felhasználót nem sikerült kizárni",
     "Failed to change power level": "A hozzáférési szintet nem sikerült megváltoztatni",
-    "Failed to fetch avatar URL": "Avatar képet nem sikerült letölteni",
     "Failed to join room": "A szobába nem sikerült belépni",
     "Failed to kick": "Kirúgás nem sikerült",
-    "Failed to leave room": "A szobát nem sikerült elhagyni",
     "Failed to load timeline position": "Az idővonal pozíciót nem sikerült betölteni",
     "Failed to mute user": "A felhasználót némítása sikertelen",
     "Failed to reject invite": "A meghívót nem sikerült elutasítani",
@@ -116,46 +88,35 @@
     "Failed to set display name": "Megjelenítési nevet nem sikerült beállítani",
     "Failed to unban": "Kizárás visszavonása sikertelen",
     "Failed to upload profile picture!": "Profil kép feltöltése sikertelen!",
-    "Failed to verify email address: make sure you clicked the link in the email": "E-mail cím ellenőrzése sikertelen: ellenőrizze, hogy az e-mailben lévő hivatkozásra kattintott-e",
+    "Failed to verify email address: make sure you clicked the link in the email": "Az e-mail-cím ellenőrzése sikertelen: ellenőrizze, hogy az e-mailben lévő hivatkozásra kattintott-e",
     "Failure to create room": "Szoba létrehozása sikertelen",
     "Favourites": "Kedvencek",
-    "Fill screen": "Képernyő kitöltése",
     "Filter room members": "Szoba tagság szűrése",
     "Forget room": "Szoba elfelejtése",
     "For security, this session has been signed out. Please sign in again.": "A biztonság érdekében ez a kapcsolat le lesz bontva. Légy szíves jelentkezz be újra.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s : %(fromPowerLevel)s -> %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Vendégek akkor sem csatlakozhatnak ehhez a szobához ha külön meghívók kaptak.",
     "Hangup": "Megszakít",
     "Historical": "Archív",
     "Home": "Kezdőlap",
     "Homeserver is": "Matrix-kiszolgáló:",
-    "Identity Server is": "Azonosítási kiszolgáló:",
     "I have verified my email address": "Ellenőriztem az e-mail címemet",
     "Import": "Betöltés",
     "Import E2E room keys": "E2E szoba kulcsok betöltése",
-    "Incoming call from %(name)s": "Beérkező hivás: %(name)s",
-    "Incoming video call from %(name)s": "Bejövő videóhívás: %(name)s",
-    "Incoming voice call from %(name)s": "Bejövő hívás: %(name)s",
     "Incorrect username and/or password.": "Helytelen felhasználó és/vagy jelszó.",
     "Incorrect verification code": "Hibás azonosítási kód",
     "Invalid Email Address": "Érvénytelen e-mail-cím",
     "Invalid file%(extra)s": "Hibás fájl%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
     "Invited": "Meghívva",
     "Invites": "Meghívók",
     "Invites user with given id to current room": "A megadott azonosítójú felhasználó meghívása a jelenlegi szobába",
     "Sign in with": "Belépés ezzel:",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hanggal</voiceText> vagy <videoText>videóval</videoText>.",
     "Join Room": "Belépés a szobába",
-    "%(targetName)s joined the room.": "%(targetName)s belépett a szobába.",
     "Jump to first unread message.": "Ugrás az első olvasatlan üzenetre.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kizárta: %(targetName)s.",
     "Kick": "Elküld",
     "Kicks user with given id": "Az adott azonosítójú felhasználó kirúgása",
     "Labs": "Labor",
     "Last seen": "Utoljára láttuk",
     "Leave room": "Szoba elhagyása",
-    "%(targetName)s left the room.": "%(targetName)s elhagyta a szobát.",
     "Logout": "Kilép",
     "Low priority": "Alacsony prioritás",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s láthatóvá tette a szoba új üzeneteit nekik minden szoba tagnak, a meghívásuk idejétől kezdve.",
@@ -163,7 +124,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szoba tagnak.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s mindenki számára láthatóvá tette a szoba új üzeneteit.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
-    "Manage Integrations": "Integrációk kezelése",
     "Missing room_id in request": "A kérésből hiányzik a room_id",
     "Missing user_id in request": "A kérésből hiányzik a user_id",
     "Moderator": "Moderátor",
@@ -171,13 +131,11 @@
     "New passwords don't match": "Az új jelszavak nem egyeznek",
     "New passwords must match each other.": "Az új jelszavaknak meg kell egyezniük egymással.",
     "not specified": "nincs meghatározva",
-    "(not supported by this browser)": "(ebben a böngészőben nem támogatott)",
     "<not supported>": "<nem támogatott>",
     "No display name": "Nincs megjelenítési név",
     "No more results": "Nincs több találat",
     "No results": "Nincs találat",
     "No users have specific privileges in this room": "Egy felhasználónak sincsenek specifikus jogosultságai ebben a szobában",
-    "olm version:": "olm verzió:",
     "Only people who have been invited": "Csak akiket meghívtak",
     "Password": "Jelszó",
     "Passwords can't be empty": "A jelszó nem lehet üres",
@@ -185,30 +143,21 @@
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ellenőrizd az e-mail-edet és kattints a benne lévő linkre! Ha ez megvan, kattints a folytatásra!",
     "Power level must be positive integer.": "A szintnek pozitív egésznek kell lennie.",
-    "Private Chat": "Privát csevegés",
     "Privileged Users": "Privilegizált felhasználók",
     "Profile": "Profil",
-    "Public Chat": "Nyilvános csevegés",
     "Reason": "Ok",
     "Register": "Regisztráció",
-    "%(targetName)s rejected the invitation.": "%(targetName)s elutasította a meghívót.",
     "Reject invitation": "Meghívó elutasítása",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s törölte a megjelenítési nevet (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s törölte a profil képét.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konferenciát kezdeményez.",
-    "Results from DuckDuckGo": "Eredmények a DuckDuckGo-ból",
     "Return to login screen": "Vissza a bejelentkezési képernyőre",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "A %(brand)snak nincs jogosultsága értesítést küldeni neked – ellenőrizd a böngésző beállításait",
     "%(brand)s was not given permission to send notifications - please try again": "A %(brand)snak nincs jogosultsága értesítést küldeni neked – próbáld újra",
     "%(brand)s version:": "%(brand)s verzió:",
     "Room %(roomId)s not visible": "%(roomId)s szoba nem látható",
-    "Room Colour": "Szoba színe",
     "%(roomName)s does not exist.": "%(roomName)s nem létezik.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s jelenleg nem érhető el.",
     "Rooms": "Szobák",
     "Save": "Mentés",
     "Search failed": "Keresés sikertelen",
-    "Searches DuckDuckGo for results": "Keresés DuckDuckGóval",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s %(dateTime)s időpontban látta",
     "Send Reset Email": "Visszaállítási e-mail küldése",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s képet küldött.",
@@ -218,39 +167,30 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "A kiszolgáló elérhetetlen, túlterhelt vagy hibára futott.",
     "Server unavailable, overloaded, or something else went wrong.": "A szerver elérhetetlen, túlterhelt vagy valami más probléma van.",
     "Session ID": "Kapcsolat azonosító",
-    "%(senderName)s set a profile picture.": "%(senderName)s profil képet állított be.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s erre változtatta a megjelenítési nevét: %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Az időbélyegek 12 órás formátumban mutatása (pl.: 2:30pm)",
     "Signed Out": "Kijelentkezett",
     "Sign in": "Bejelentkezés",
     "Sign out": "Kijelentkezés",
-    "%(count)s of your messages have not been sent.|other": "Néhány üzenete nem lett elküldve.",
     "Someone": "Valaki",
     "Start authentication": "Hitelesítés indítása",
     "Submit": "Elküld",
     "Success": "Sikeres",
-    "The phone number entered looks invalid": "A megadott telefonszám érvénytelennek tűnik",
-    "This email address is already in use": "Ez az e-mail cím már használatban van",
+    "This email address is already in use": "Ez az e-mail-cím már használatban van",
     "This email address was not found": "Az e-mail cím nem található",
     "The email address linked to your account must be entered.": "A fiókodhoz kötött e-mail címet add meg.",
-    "The remote side failed to pick up": "A hívott fél nem vette fel",
     "This room has no local addresses": "Ennek a szobának nincs helyi címe",
     "This room is not recognised.": "Ez a szoba nem ismerős.",
     "This doesn't appear to be a valid email address": "Ez nem tűnik helyes e-mail címnek",
     "This phone number is already in use": "Ez a telefonszám már használatban van",
     "This room": "Ebben a szobában",
     "This room is not accessible by remote Matrix servers": "Ez a szoba távoli Matrix szerverről nem érhető el",
-    "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítési találatok betöltését, majd Tabbal választhatsz közülük.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Megpróbálta betölteni a szoba megadott időpontjának megfelelő adatait, de nincs joga a kérdéses üzenetek megjelenítéséhez.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbálta betölteni a szoba megadott időpontjának megfelelő adatait, de az nem található.",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
     "Unable to remove contact information": "A névjegy információkat nem sikerült törölni",
     "Unable to verify email address.": "Az e-mail cím ellenőrzése sikertelen.",
     "Unban": "Kitiltás visszavonása",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s visszaengedte %(targetName)s felhasználót.",
-    "Unable to capture screen": "A képernyő felvétele sikertelen",
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
-    "unknown caller": "ismeretlen hívó",
     "Unmute": "Némítás visszavonása",
     "Unnamed Room": "Névtelen szoba",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s feltöltése",
@@ -262,29 +202,19 @@
     "Upload new:": "Új feltöltése:",
     "Usage": "Használat",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (szint: %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Felhasználói név érvénytelen: %(errMessage)s",
     "Users": "Felhasználók",
     "Verification Pending": "Ellenőrzés függőben",
     "Verified key": "Ellenőrzött kulcs",
     "Video call": "Videóhívás",
     "Voice call": "Hang hívás",
-    "VoIP conference finished.": "VoIP konferencia befejeződött.",
-    "VoIP conference started.": "VoIP konferencia elkezdődött.",
     "VoIP is unsupported": "A VoIP nem támogatott",
-    "(could not connect media)": "(média kapcsolat nem hozható létre)",
-    "(no answer)": "(nincs válasz)",
-    "(unknown failure: %(reason)s)": "(ismeretlen hiba: %(reason)s)",
     "Warning!": "Figyelem!",
-    "Who can access this room?": "Ki éri el ezt a szobát?",
     "Who can read history?": "Ki olvashatja a régi üzeneteket?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s visszavonta %(targetName)s meghívóját.",
-    "You are already in a call.": "Már hívásban vagy.",
     "You cannot place a call with yourself.": "Nem hívhatja fel saját magát.",
     "You cannot place VoIP calls in this browser.": "Nem indíthat VoIP hívást ebben a böngészőben.",
     "You do not have permission to post to this room": "Nincs jogod üzenetet küldeni ebbe a szobába",
     "You have <a>disabled</a> URL previews by default.": "Az URL előnézet alapból <a>tiltva</a> van.",
     "You have <a>enabled</a> URL previews by default.": "Az URL előnézet alapból <a>engedélyezve</a> van.",
-    "You have no visible notifications": "Nincsenek látható értesítéseid",
     "You must <a>register</a> to use this functionality": "<a>Regisztrálnod kell</a> hogy ezt használhasd",
     "You need to be able to invite users to do that.": "Hogy ezt tehesd, meg kell tudnod hívni felhasználókat.",
     "You need to be logged in.": "Be kell jelentkezz.",
@@ -314,18 +244,12 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s, %(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Megjelenítési név beállítása:",
-    "Upload an avatar:": "Avatar kép feltöltése:",
     "This server does not support authentication with a phone number.": "Ez a szerver nem támogatja a telefonszámmal való azonosítást.",
-    "An error occurred: %(error_string)s": "Hiba történt: %(error_string)s",
-    "There are no visible files in this room": "Ebben a szobában láthatólag nincsenek fájlok",
     "Room": "Szoba",
     "Connectivity to the server has been lost.": "A szerverrel a kapcsolat megszakadt.",
     "Sent messages will be stored until your connection has returned.": "Az elküldött üzenetek addig lesznek tárolva amíg a kapcsolatod újra elérhető lesz.",
     "(~%(count)s results)|one": "(~%(count)s db eredmény)",
     "(~%(count)s results)|other": "(~%(count)s db eredmény)",
-    "Active call": "Folyamatban lévő hívás",
-    "Please select the destination room for this message": "Kérlek add meg az üzenet cél szobáját",
     "New Password": "Új jelszó",
     "Start automatically after system login": "Rendszerindításkor automatikus elindítás",
     "Analytics": "Analitika",
@@ -341,35 +265,25 @@
     "You must join the room to see its files": "Ahhoz hogy lásd a fájlokat be kell lépned a szobába",
     "Reject all %(invitedRooms)s invites": "Mind a(z) %(invitedRooms)s meghívó elutasítása",
     "Failed to invite": "Meghívás sikertelen",
-    "Failed to invite the following users to the %(roomName)s room:": "Az alábbi felhasználókat nem sikerült meghívni a(z) %(roomName)s szobába:",
     "Confirm Removal": "Törlés megerősítése",
     "Unknown error": "Ismeretlen hiba",
     "Incorrect password": "Helytelen jelszó",
     "Unable to restore session": "A kapcsolatot nem lehet visszaállítani",
     "Unknown Address": "Ismeretlen cím",
-    "ex. @bob:example.com": "pl.: @bob:example.com",
-    "Add User": "Felhasználó hozzáadás",
-    "Please check your email to continue registration.": "Ellenőrizd az e-mailedet a regisztráció folytatásához.",
     "Token incorrect": "Helytelen token",
     "Please enter the code it contains:": "Add meg a benne lévő kódot:",
-    "Error decrypting audio": "Hiba a hang visszafejtésénél",
     "Error decrypting image": "Hiba a kép visszafejtésénél",
     "Error decrypting video": "Hiba a videó visszafejtésénél",
     "Add an Integration": "Integráció hozzáadása",
     "URL Previews": "URL előnézet",
     "Drop file here to upload": "Feltöltéshez húzz ide egy fájlt",
-    " (unsupported)": " (nem támogatott)",
-    "Ongoing conference call%(supportedText)s.": "Folyamatban lévő konferencia hívás %(supportedText)s.",
     "Online": "Online",
     "Idle": "Várakozik",
     "Offline": "Nem érhető el",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s megváltoztatta a szoba avatar képét: <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s törölte a szoba avatar képét.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s megváltoztatta %(roomName)s szoba avatar képét",
-    "Username available": "Szabad felhasználói név",
-    "Username not available": "A felhasználói név foglalt",
     "Something went wrong!": "Valami tönkrement!",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Ha már van Matrix fiókod, akkor <a>beléphetsz</a> helyette.",
     "Your browser does not support the required cryptography extensions": "A böngésződ nem támogatja a szükséges titkosítási kiterjesztést",
     "Not a valid %(brand)s keyfile": "Nem érvényes %(brand)s kulcsfájl",
     "Authentication check failed: incorrect password?": "Azonosítás sikertelen: hibás jelszó?",
@@ -381,20 +295,15 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ezzel a folyamattal lehetőséged van betölteni a titkosítási kulcsokat amiket egy másik Matrix kliensből mentettél ki. Ez után minden üzenetet vissza tudsz fejteni amit a másik kliens tudott.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Biztos hogy eltávolítod (törlöd) ezt az eseményt? Figyelem, ha törlöd, vagy megváltoztatod a szoba nevét vagy a témát ez a változtatás érvényét vesztheti.",
     "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.": "Ha egy újabb %(brand)s verziót használtál valószínűleg ez kapcsolat nem lesz kompatibilis vele. Zárd be az ablakot és térj vissza az újabb verzióhoz.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ha nem állítasz be e-mail címet nem fogod tudni a jelszavadat alaphelyzetbe állítani. Biztos vagy benne?",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Azonosítás céljából egy harmadik félhez leszel irányítva (%(integrationsUrl)s). Folytatod?",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ez lesz a felhasználói neved a <span></span> Matrix szerveren, vagy választhatsz egy <a>másik szervert</a>.",
     "Skip": "Kihagy",
     "Check for update": "Frissítések keresése",
-    "Add a widget": "Kisalkalmazás hozzáadása",
-    "Allow": "Engedélyez",
     "Delete widget": "Kisalkalmazás törlése",
     "Define the power level of a user": "A felhasználó szintjének meghatározása",
     "Edit": "Szerkeszt",
     "Enable automatic language detection for syntax highlighting": "Nyelv automatikus felismerése szintaxis kiemeléshez",
     "AM": "de.",
     "PM": "du.",
-    "To get started, please pick a username!": "Az induláshoz válassz egy felhasználói nevet!",
     "Unable to create widget.": "Nem lehet kisalkalmazást létrehozni.",
     "You are not in this room.": "Nem vagy tagja ennek a szobának.",
     "You do not have permission to do that in this room.": "Nincs jogsultságod ezt tenni ebben a szobában.",
@@ -404,9 +313,7 @@
     "Featured Users:": "Kiemelt felhasználók:",
     "Automatically replace plain text Emoji": "Egyszerű szöveg automatikus cseréje Emodzsira",
     "Failed to upload image": "Kép feltöltése sikertelen",
-    "Cannot add any more widgets": "Nem lehet több kisalkalmazást hozzáadni",
     "Publish this room to the public in %(domain)s's room directory?": "Publikálod a szobát a(z) %(domain)s szoba listájába?",
-    "The maximum permitted number of widgets have already been added to this room.": "A maximálisan megengedett számú kisalkalmazás már hozzá van adva a szobához.",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s hozzáadta",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s eltávolította",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s módosította",
@@ -450,7 +357,6 @@
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Biztos, hogy törlöd a(z) %(roomName)s szobát a(z) %(groupId)s csoportból?",
     "Jump to read receipt": "Olvasási visszaigazolásra ugrás",
     "Message Pinning": "Üzenet kitűzése",
-    "Pinned Messages": "Kitűzött üzenetek",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s megváltoztatta a szoba kitűzött szövegeit.",
     "Who would you like to add to this community?": "Kit szeretnél hozzáadni ehhez a közösséghez?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden személy akit hozzáadsz a közösséghez mindenki számára látható lesz, aki ismeri a közösség azonosítóját",
@@ -461,9 +367,6 @@
     "Add to community": "Hozzáadás a közösséghez",
     "Failed to invite users to community": "A felhasználók meghívása a közösségbe sikertelen",
     "Communities": "Közösségek",
-    "Unpin Message": "Üzenet levétele",
-    "Jump to message": "Ugrás az üzenetre",
-    "No pinned messages.": "Nincsenek kitűzött üzenetek.",
     "Loading...": "Betöltés...",
     "Unnamed room": "Névtelen szoba",
     "World readable": "Nyilvános",
@@ -508,9 +411,6 @@
     "Mirror local video feed": "Helyi videó folyam tükrözése",
     "Failed to withdraw invitation": "Nem sikerült visszavonni a meghívót",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "A közösségi azonosítók csak az alábbi karaktereket tartalmazhatják: a-z, 0-9 vagy '=_-./'",
-    "%(senderName)s sent an image": "%(senderName)s küldött egy képet",
-    "%(senderName)s sent a video": "%(senderName)s küldött egy videót",
-    "%(senderName)s uploaded a file": "%(senderName)s feltöltött egy fájlt",
     "Disinvite this user?": "Visszavonod a felhasználó meghívását?",
     "Kick this user?": "Kirúgod a felhasználót?",
     "Unban this user?": "Visszaengeded a felhasználót?",
@@ -518,7 +418,6 @@
     "Members only (since the point in time of selecting this option)": "Csak tagok számára (a beállítás kiválasztásától)",
     "Members only (since they were invited)": "Csak tagoknak (a meghívásuk idejétől)",
     "Members only (since they joined)": "Csak tagoknak (amióta csatlakoztak)",
-    "An email has been sent to %(emailAddress)s": "E-mail-t neki küldtünk: %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Szöveges üzenetet küldtünk neki: %(msisdn)s",
     "Disinvite this user from community?": "Visszavonod a felhasználó meghívóját a közösségből?",
     "Remove this user from community?": "Eltávolítod a felhasználót a közösségből?",
@@ -578,8 +477,6 @@
     "Visibility in Room List": "Láthatóság a szoba listában",
     "Visible to everyone": "Mindenki számára látható",
     "Only visible to community members": "Csak a közösség számára látható",
-    "Community Invites": "Közösségi meghívók",
-    "<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 a közösségi oldalhoz</h1>\n<p>\n    Használj hosszú leírást az tagok közösségbe való bemutatásához vagy terjessz\n   hasznos  <a href=\"foo\">linkeket</a>\n</p>\n<p>\n    Még 'img' tagokat is használhatsz\n</p>\n",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Ezek a szobák megjelennek a közösség tagjainak a közösségi oldalon. A közösség tagjai kattintással csatlakozhatnak a szobákhoz.",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A közösségednek nincs bő leírása, HTML oldala ami megjelenik a közösség tagjainak.<br />A létrehozáshoz kattints ide!",
     "Notify the whole room": "Az egész szoba értesítése",
@@ -592,7 +489,6 @@
     "Enable URL previews by default for participants in this room": "URL előnézet alapértelmezett engedélyezése a szoba tagságának",
     "URL previews are enabled by default for participants in this room.": "Az URL előnézetek alapértelmezetten engedélyezve vannak a szobában jelenlévőknek.",
     "URL previews are disabled by default for participants in this room.": "Az URL előnézet alapértelmezetten tiltva van a szobában jelenlévőknek.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Senki más nincs itt! Szeretnél <inviteText>meghívni másokat</inviteText> vagy <nowarnText>leállítod a figyelmeztetést az üres szobára</nowarnText>?",
     "%(duration)ss": "%(duration)s mp",
     "%(duration)sm": "%(duration)s p",
     "%(duration)sh": "%(duration)s ó",
@@ -615,13 +511,9 @@
     "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.": "Régebbi %(brand)s verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
     "Warning": "Figyelmeztetés",
     "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.": "Ahogy lefokozod magad a változás visszafordíthatatlan, ha te vagy az utolsó jogosultságokkal bíró felhasználó a szobában a jogok már nem szerezhetők vissza.",
-    "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Újraküldöd mind</resendText> vagy <cancelText>elveted mind</cancelText>. Az üzeneteket egyenként is elküldheted vagy elvetheted.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most.",
     "Send an encrypted reply…": "Titkosított válasz küldése…",
     "Send an encrypted message…": "Titkosított üzenet küldése…",
     "Replying": "Válaszolni",
-    "Minimize apps": "Alkalmazás összecsukása",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A személyes adatok védelme fontos számunkra, így mi nem gyűjtünk személyes és személyhez köthető adatokat az analitikánkhoz.",
     "Learn more about how we use analytics.": "Tudj meg többet arról hogyan használjuk az analitikai adatokat.",
     "The information being sent to us to help make %(brand)s better includes:": "Az alábbi információk kerülnek elküldésre, amivel jobbá tehetjük a %(brand)sot:",
@@ -636,16 +528,13 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
     "Community IDs cannot be empty.": "A közösségi azonosító nem lehet üres.",
     "<a>In reply to</a> <pill>": "<a>Válasz neki</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
     "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
     "Clear filter": "Szűrő törlése",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Tudtad, hogy a %(brand)s élmény fokozásához használhatsz közösségeket!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "A szűrő beállításához húzd a közösség avatarját a szűrő panel fölé a képernyő bal szélén. A szűrő panelen az avatarra kattintva bármikor leszűrheted azokat a szobákat és embereket akik a megadott közösséghez tartoznak.",
     "Key request sent.": "Kulcs kérés elküldve.",
     "Code": "Kód",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz, mint például a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
     "Submit debug logs": "Hibakeresési napló küldése",
     "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) az alábbi időpontban látta: %(dateTime)s",
@@ -662,13 +551,9 @@
     "Everyone": "Mindenki",
     "Fetching third party location failed": "Nem sikerült lekérdezni a harmadik fél helyét",
     "Send Account Data": "Fiókadatok küldése",
-    "All notifications are currently disabled for all targets.": "Minden céleszközön minden értesítés tiltva van.",
-    "Uploading report": "Jelentés feltöltése",
     "Sunday": "Vasárnap",
     "Notification targets": "Értesítések célpontja",
     "Today": "Ma",
-    "Files": "Fájlok",
-    "You are not receiving desktop notifications": "Nem fogadsz asztali értesítéseket",
     "Friday": "Péntek",
     "Update": "Frissítés",
     "What's New": "Újdonságok",
@@ -676,24 +561,14 @@
     "Changelog": "Változások",
     "Waiting for response from server": "Várakozás a szerver válaszára",
     "Send Custom Event": "Egyéni esemény elküldése",
-    "Advanced notification settings": "Haladó értesítési beállítások",
     "Failed to send logs: ": "Hiba a napló küldésénél: ",
-    "Forget": "Elfelejt",
-    "You cannot delete this image. (%(code)s)": "Nem törölheted ezt a képet. (%(code)s)",
-    "Cancel Sending": "Küldés megszakítása",
     "This Room": "Ebben a szobában",
     "Resend": "Küldés újra",
     "Room not found": "A szoba nem található",
     "Messages containing my display name": "A profilnevemet tartalmazó üzenetek",
     "Messages in one-to-one chats": "Közvetlen beszélgetések üzenetei",
     "Unavailable": "Elérhetetlen",
-    "View Decrypted Source": "Visszafejtett forrás megjelenítése",
-    "Failed to update keywords": "Nem lehet frissíteni a kulcsszavakat",
     "remove %(name)s from the directory.": "%(name)s szoba törlése a listából.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Az alábbi kulcsszavakról jövő értesítések szabályait nem lehet itt megjeleníteni:",
-    "Please set a password!": "Állíts be egy jelszót!",
-    "You have successfully set a password!": "Sikerült beállítani a jelszót!",
-    "An error occurred whilst saving your email notification preferences.": "Hiba történt az e-mail értesítési beállításaid mentése közben.",
     "Explore Room State": "Szoba állapot felderítése",
     "Source URL": "Forrás URL",
     "Messages sent by bot": "Botok üzenetei",
@@ -702,35 +577,20 @@
     "No update available.": "Nincs elérhető frissítés.",
     "Noisy": "Hangos",
     "Collecting app version information": "Alkalmazás verzió információk összegyűjtése",
-    "Keywords": "Kulcsszavak",
-    "Enable notifications for this account": "Értesítések engedélyezése ehhez a fiókhoz",
     "Invite to this community": "Meghívás ebbe a közösségbe",
-    "Messages containing <span>keywords</span>": "<span>Kulcsszavakat</span> tartalmazó üzenetek",
-    "Error saving email notification preferences": "Hiba az e-mail értesítési beállítások mentésekor",
     "Tuesday": "Kedd",
-    "Enter keywords separated by a comma:": "Kulcsszavak vesszővel elválasztva:",
-    "Forward Message": "Üzenet továbbítása",
-    "You have successfully set a password and an email address!": "Sikerült beállítani a jelszavad és e-mail címed!",
     "Remove %(name)s from the directory?": "Törlöd ezt a szobát a listából: %(name)s?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "A %(brand)s sok fejlett böngészőfunkciót használ, amelyeknek egy része egyáltalán nem, vagy csak kísérleti jelleggel érhető el a jelenlegi böngésződben.",
     "Developer Tools": "Fejlesztői eszközök",
     "Preparing to send logs": "Előkészülés napló küldéshez",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál.",
     "Explore Account Data": "Fiókadatok felderítése",
     "Remove from Directory": "Törlés a listából",
     "Saturday": "Szombat",
-    "I understand the risks and wish to continue": "Megértettem a kockázatot és folytatom",
-    "Direct Chat": "Közvetlen csevegés",
     "The server may be unavailable or overloaded": "A szerver nem elérhető vagy túlterhelt",
     "Reject": "Elutasítás",
-    "Failed to set Direct Message status of room": "Nem lehet beállítani a szoba közvetlen beszélgetés státuszát",
     "Monday": "Hétfő",
-    "All messages (noisy)": "Minden üzenet (hangos)",
-    "Enable them now": "Engedélyezés most",
     "Toolbox": "Eszköztár",
     "Collecting logs": "Naplók összegyűjtése",
     "You must specify an event type!": "Meg kell jelölnöd az eseménytípust!",
-    "(HTTP status %(httpStatus)s)": "(HTTP állapot: %(httpStatus)s)",
     "Invite to this room": "Meghívás a szobába",
     "Quote": "Idéz",
     "Send logs": "Naplófájlok elküldése",
@@ -740,10 +600,7 @@
     "State Key": "Állapotkulcs",
     "Failed to send custom event.": "Nem sikerült elküldeni az egyéni eseményt.",
     "What's new?": "Mik az újdonságok?",
-    "Notify me for anything else": "Értesíts minden egyéb esetben",
     "When I'm invited to a room": "Amikor meghívnak egy szobába",
-    "Can't update user notification settings": "Nem lehet frissíteni az értesítési beállításokat",
-    "Notify for all other messages/rooms": "Értesítés minden más üzenethez/szobához",
     "Unable to look up room ID from server": "Nem lehet a szoba azonosítóját megkeresni a szerveren",
     "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba",
     "All Rooms": "Minden szobában",
@@ -754,47 +611,32 @@
     "Back": "Vissza",
     "Reply": "Válasz",
     "Show message in desktop notification": "Üzenetek megjelenítése az asztali értesítéseknél",
-    "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.": "A hibakereső napló alkalmazás használati adatokat tartalmaz beleértve a felhasználói nevedet, az általad meglátogatott szobák és csoportok azonosítóit alternatív neveit és más felhasználói neveket. Csevegés üzenetek szövegét nem tartalmazza.",
-    "Unhide Preview": "Előnézet mutatása",
     "Unable to join network": "Nem sikerült kapcsolódni a hálózathoz",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Elnézést, a böngésződben <b>nem</b> fut a %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Feltöltötte %(user)s ekkor: %(date)s",
     "Messages in group chats": "Csoportszobák üzenetei",
     "Yesterday": "Tegnap",
     "Error encountered (%(errorDetail)s).": "Hiba történt (%(errorDetail)s).",
     "Low Priority": "Alacsony prioritás",
-    "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
-    "Set Password": "Jelszó beállítása",
     "Off": "Ki",
     "%(brand)s does not know how to join a room on this network": "A %(brand)s nem tud csatlakozni szobához ezen a hálózaton",
-    "Mentions only": "Csak ha megemlítenek",
     "Wednesday": "Szerda",
-    "You can now return to your account after signing out, and sign in on other devices.": "Most már kijelentkezés után is vissza tudsz lépni a fiókodba, és más készülékekről is be tudsz lépni.",
-    "Enable email notifications": "E-mail értesítések engedélyezése",
     "Event Type": "Esemény típusa",
-    "Download this file": "Fájl letöltése",
-    "Pin Message": "Üzenet rögzítése",
-    "Failed to change settings": "A beállítások megváltoztatása nem sikerült",
     "View Community": "Közösség megtekintése",
     "Event sent!": "Az esemény elküldve!",
     "View Source": "Forrás megjelenítése",
     "Event Content": "Esemény tartalma",
     "Thank you!": "Köszönjük!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Ebben a böngészőben az alkalmazás felülete tele lehet hibával, és az is lehet, hogy egyáltalán nem működik. Ha így is ki szeretnéd próbálni, megteheted, de ha valami gondod van, nem tudunk segíteni!",
     "Checking for an update...": "Frissítés keresése...",
     "Missing roomId.": "Hiányzó szobaazonosító.",
     "Popout widget": "Kiugró kisalkalmazás",
     "Every page you use in the app": "Minden oldal, amit az alkalmazásban használ",
     "e.g. <CurrentPageURL>": "pl.: <CurrentPageURL>",
     "Your device resolution": "Eszköz felbontása",
-    "Always show encryption icons": "Titkosítási ikon folyamatos megjelenítése",
     "Send Logs": "Naplók küldése",
     "Clear Storage and Sign Out": "Tárhely törlése és kijelentkezés",
     "Refresh": "Frissítés",
     "We encountered an error trying to restore your previous session.": "Hibába ütköztünk megpróbáljuk visszaállítani az előző munkamenetet.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "A böngésződ tárhelyének a törlése megoldhatja a problémát, de ezzel kijelentkezel és a titkosított beszélgetések előzményei olvashatatlanná válnak.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nem lehet betölteni azt az eseményt amire válaszoltál, mert vagy nem létezik, vagy nincs jogod megnézni.",
-    "Collapse Reply Thread": "Beszélgetés szál becsukása",
     "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott, ott engedélyezze a képernyőképeket",
     "Send analytics data": "Analitikai adatok küldése",
     "Muted Users": "Elnémított felhasználók",
@@ -819,24 +661,14 @@
     "Share Community": "Közösség megosztás",
     "Share Room Message": "Szoba üzenet megosztás",
     "Link to selected message": "Hivatkozás a kijelölt üzenetre",
-    "COPY": "Másol",
-    "Share Message": "Üzenet megosztása",
     "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.": "A titkosított szobákban, mint például ez is, az URL előnézet alapértelmezetten ki van kapcsolva, hogy biztosított legyen, hogy a Matrix szerver (ahol az előnézet készül) ne tudjon információt gyűjteni arról, hogy milyen linkeket látsz ebben a szobában.",
     "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.": "Ha valaki URL linket helyez az üzenetébe, lehetőség van egy előnézet megjelenítésére amivel további információt kaphatunk a linkről, mint cím, leírás és a weboldal képe.",
-    "The email field must not be blank.": "Az e-mail mező nem lehet üres.",
-    "The phone number field must not be blank.": "A telefonszám mező nem lehet üres.",
-    "The password field must not be blank.": "A jelszó mező nem lehet üres.",
-    "Call in Progress": "Hívás folyamatban",
-    "A call is already in progress!": "A hívás már folyamatban van!",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>.",
     "Demote yourself?": "Lefokozod magad?",
     "Demote": "Lefokozás",
     "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
     "Permission Required": "Jogosultság szükséges",
     "You do not have permission to start a conference call in this room": "Nincs jogosultsága konferencia hívást kezdeményezni ebben a szobában",
-    "A call is currently being placed!": "A hívás indítás alatt!",
-    "Failed to remove widget": "A kisalkalmazás törlése sikertelen",
-    "An error ocurred whilst trying to remove the widget from the room": "A kisalkalmazás szobából való törlése közben hiba történt",
     "System Alerts": "Rendszer figyelmeztetések",
     "Only room administrators will see this warning": "Csak a szoba adminisztrátorai látják ezt a figyelmeztetést",
     "Please <a>contact your service administrator</a> to continue using the service.": "A szolgáltatás további használata érdekében kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
@@ -884,8 +716,6 @@
     "Unable to load! Check your network connectivity and try again.": "A betöltés sikertelen! Ellenőrizze a hálózati kapcsolatot és próbálja újra.",
     "Delete Backup": "Mentés törlése",
     "Unable to load key backup status": "A mentett kulcsok állapotát nem lehet lekérdezni",
-    "Backup version: ": "Mentés verzió: ",
-    "Algorithm: ": "Algoritmus: ",
     "Next": "Következő",
     "That matches!": "Egyeznek!",
     "That doesn't match.": "Nem egyeznek.",
@@ -901,11 +731,6 @@
     "Unable to restore backup": "A mentést nem lehet visszaállítani",
     "No backup found!": "Mentés nem található!",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s kapcsolatot nem lehet visszafejteni!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "A helyreállítási jelmondattal hozzáférsz a régi titkosított üzeneteidhez és beállíthatod a biztonságos üzenetküldést.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Ha elfelejtetted a helyreállítási jelmondatodat használhatod a <button1>helyreállítási kulcsodat</button1> vagy <button2>új helyreállítási paramétereket állíthatsz be</button2>",
-    "This looks like a valid recovery key!": "Ez érvényes helyreállítási kulcsnak tűnik!",
-    "Not a valid recovery key": "Nem helyreállítási kulcs",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "A helyreállítási kulcs megadásával hozzáférhetsz a régi biztonságos üzeneteidhez és beállíthatod a biztonságos üzenetküldést.",
     "Failed to perform homeserver discovery": "A Matrix szerver felderítése sikertelen",
     "Invalid homeserver discovery response": "A Matrix szerver felderítésére kapott válasz érvénytelen",
     "Use a few words, avoid common phrases": "Néhány szót használj és kerüld el a szokásos szövegeket",
@@ -939,16 +764,11 @@
     "User %(user_id)s does not exist": "%(user_id)s felhasználó nem létezik",
     "Unknown server error": "Ismeretlen szerver hiba",
     "There was an error joining the room": "A szobába való belépésnél hiba történt",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mutass emlékeztetőt a Biztonságos Üzenet Visszaállítás bekapcsolásához a titkosított szobákban",
-    "Don't ask again": "Ne kérdezd többet",
     "Set up": "Beállítás",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül kijelentkezés után elveszted a hozzáférést a titkosított üzeneteidhez.",
-    "If you don't want to set this up now, you can later in Settings.": "Ha most nem akarod beállítani, később a Beállításoknál megteheted.",
     "Messages containing @room": "Az üzenetek „@room”-ot tartalmaznak",
     "Encrypted messages in one-to-one chats": "Titkosított üzenetek közvetlen csevegésekben",
     "Encrypted messages in group chats": "Titkosított üzenetek a csoportos beszélgetésekben",
     "That doesn't look like a valid email address": "Ez nem úgy néz ki, mint egy érvényes e-mail cím",
-    "Checking...": "Ellenőrzés...",
     "Invalid identity server discovery response": "Azonosító szerver felderítésére érkezett válasz érvénytelen",
     "General failure": "Általános hiba",
     "New Recovery Method": "Új Visszaállítási Eljárás",
@@ -999,7 +819,6 @@
     "Email Address": "E-mail cím",
     "Backing up %(sessionsRemaining)s keys...": "Kulcsok biztonsági mentése... (%(sessionsRemaining)s)",
     "All keys backed up": "Minden kulcs elmentve",
-    "Add an email address to configure email notifications": "E-mail értesítésekhez e-mail cím hozzáadása",
     "Unable to verify phone number.": "A telefonszámot nem sikerült ellenőrizni.",
     "Verification code": "Ellenőrző kód",
     "Phone Number": "Telefonszám",
@@ -1030,7 +849,7 @@
     "Room list": "Szoba lista",
     "Timeline": "Idővonal",
     "Autocomplete delay (ms)": "Automatikus kiegészítés késleltetése (ms)",
-    "Roles & Permissions": "Szerepek & Jogosultságok",
+    "Roles & Permissions": "Szerepek és jogosultságok",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "A üzenetek olvashatóságának változtatása csak az új üzenetekre lesz érvényes. A régi üzenetek láthatósága nem fog változni.",
     "Security & Privacy": "Biztonság és adatvédelem",
     "Encryption": "Titkosítás",
@@ -1038,7 +857,6 @@
     "Encrypted": "Titkosítva",
     "Ignored users": "Mellőzött felhasználók",
     "Bulk options": "Tömeges beállítások",
-    "Key backup": "Kulcsok biztonsági mentése",
     "Missing media permissions, click the button below to request.": "Hiányzó média jogosultságok, kattints a gombra alul a jogok megadásához.",
     "Request media permissions": "Média jogosultságok megkérése",
     "Voice & Video": "Hang és videó",
@@ -1050,37 +868,21 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Ellenőrizd ezt a felhasználót, hogy megbízhatónak lehessen tekinteni. Megbízható felhasználók további nyugalmat jelenthetnek ha végpontól végpontig titkosítást használsz.",
     "Waiting for partner to confirm...": "Várakozás a partner megerősítésére...",
     "Incoming Verification Request": "Bejövő Hitelesítési Kérés",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "A duplikált jegyek elkerülése végett kérünk <existingIssuesLink>nézd meg a létező jegyeket</existingIssuesLink> először (és adj neki +1-et) vagy <newIssueLink>készíts egy új jegyet</newIssueLink> ha nem találsz hasonlót.",
-    "Report bugs & give feedback": "Hibajelentés & visszajelzés küldése",
     "Go back": "Vissza",
     "Update status": "Állapot frissítése",
     "Set status": "Állapot beállítása",
-    "Your Modular server": "A te Modular servered",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Add meg a Modular Matrix szerveredet. Ami vagy saját domaint használ vagy a <a>modular.im</a> aldomainját.",
-    "Server Name": "Szerver neve",
-    "The username field must not be blank.": "A felhasználói név mező nem lehet üres.",
     "Username": "Felhasználói név",
-    "Not sure of your password? <a>Set a new one</a>": "Nem biztos a jelszavában? <a>Adjon meg újat</a>",
-    "Create your account": "Felhasználói fiók létrehozása",
     "Email (optional)": "E-mail (nem kötelező)",
     "Phone (optional)": "Telefonszám (nem kötelező)",
     "Confirm": "Megerősítés",
-    "Other servers": "Más szerverek",
-    "Homeserver URL": "Matrixszerver URL",
-    "Identity Server URL": "Azonosítási Szerver URL",
-    "Free": "Szabad",
     "Join millions for free on the largest public server": "Csatlakozzon több millió felhasználóhoz ingyen a legnagyobb nyilvános szerveren",
-    "Premium": "Prémium",
-    "Premium hosting for organisations <a>Learn more</a>": "Prémium üzemeltetés szervezetek részére <a>Tudj meg többet</a>",
     "Other": "Más",
-    "Find other public servers or use a custom server": "Találj más nyilvános szervereket vagy használj egyedi szervert",
     "Guest": "Vendég",
     "Sign in instead": "Inkább bejelentkezek",
     "Set a new password": "Új jelszó beállítása",
     "Create account": "Fiók létrehozása",
     "Keep going...": "Így tovább...",
     "Starting backup...": "Mentés indul...",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "A Biztonságos üzenetekhez új visszaállítási jelmondatot és kulcsot észleltünk.",
     "Recovery Method Removed": "Visszaállítási eljárás törölve",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem Ön törölte a visszaállítási módot, akkor egy támadó hozzá akar férni a fiókjához. Azonnal változtassa meg a jelszavát, és állítson be egy visszaállítási módot a Beállításokban.",
     "Chat with %(brand)s Bot": "Csevegés a %(brand)s Robottal",
@@ -1172,11 +974,6 @@
     "Restore from Backup": "Visszaállítás mentésből",
     "Back up your keys before signing out to avoid losing them.": "Töltsd fel kulcsaidat a szerverre mielőtt kijelentkezel, hogy ne veszítsd el őket.",
     "Start using Key Backup": "Kulcs mentés használatának megkezdése",
-    "Never lose encrypted messages": "Soha ne veszíts el titkosított üzenetet",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A szobában az üzenetek végponttól végpontig titkosítva vannak. Csak neked és a címzetteknek vannak meg a kulcsok az üzenetek visszafejtéséhez.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Mentsd el megfelelően a kulcsaidat a szerverre, hogy ne vesszenek el. <a>Tudj meg erről többet.</a>",
-    "Not now": "Most nem",
-    "Don't ask me again": "Ne kérdezz többet",
     "I don't want my encrypted messages": "Nincs szükségem a titkosított üzeneteimre",
     "Manually export keys": "Kulcsok kézi mentése",
     "You'll lose access to your encrypted messages": "Elveszted a hozzáférést a titkosított üzeneteidhez",
@@ -1186,9 +983,7 @@
     "For maximum security, this should be different from your account password.": "A maximális biztonság érdekében ez térjen el a felhasználói fióknál használt jelszótól.",
     "Your keys are being backed up (the first backup could take a few minutes).": "A kulcsaid mentése folyamatban van (az első mentés több percig is eltarthat).",
     "Success!": "Sikeres!",
-    "Allow Peer-to-Peer for 1:1 calls": "Egyenrangú kapcsolat engedélyezése az 1:1 hívásokban",
     "Credits": "Közreműködők",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ha bármilyen hibába botlasz vagy szeretnél visszajelzést küldeni nekünk, kérjük oszd meg velünk a GitHub-on.",
     "Changes your display nickname in the current room only": "Csak ebben a szobában változtatja meg a becenevedet",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s engedélyezte a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s kikapcsolta a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
@@ -1200,12 +995,7 @@
     "Error updating flair": "Kitűző frissítése sikertelen",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "A kitűző a szobában való frissítésekor hiba történt. Lehet, hogy a szerver nem engedélyezi vagy átmeneti hiba történt.",
     "Room Settings - %(roomName)s": "Szoba beállítások: %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "A felhasználói név csak kisbetűket, számokat és „=_-./” karaktereket tartalmazhat",
-    "Share Permalink": "Közvetlen hivatkozás megosztása",
-    "Sign in to your Matrix account on %(serverName)s": "Jelentkezz be a Matrix fiókodba itt: %(serverName)s",
-    "Create your Matrix account on %(serverName)s": "Készíts egy Matrix fiókot itt: %(serverName)s",
     "Could not load user profile": "A felhasználói profil nem tölthető be",
-    "Your Matrix account on %(serverName)s": "A Matrix fiókod itt: %(serverName)s",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "A sima szöveges üzenet elé teszi ezt: ¯\\_(ツ)_/¯",
     "User %(userId)s is already in the room": "%(userId)s felhasználó már a szobában van",
     "The user must be unbanned before they can be invited.": "A felhasználó kitiltását először vissza kell vonni mielőtt újra meghívható lesz.",
@@ -1224,7 +1014,6 @@
     "Change settings": "Beállítások megváltoztatása",
     "Kick users": "Felhasználók kirúgása",
     "Ban users": "Felhasználók kitiltása",
-    "Remove messages": "Üzenetek törlése",
     "Notify everyone": "Mindenki értesítése",
     "Send %(eventType)s events": "%(eventType)s esemény küldése",
     "Select the roles required to change various parts of the room": "A szoba bizonyos beállításainak megváltoztatásához szükséges szerep kiválasztása",
@@ -1232,7 +1021,6 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Ha egyszer engedélyezve lett, a szoba titkosítását nem lehet kikapcsolni. A titkosított szobákban küldött üzenetek a kiszolgáló számára nem, csak a szoba tagjai számára láthatók. A titkosítás bekapcsolása megakadályoz sok botot és hidat a megfelelő működésben. <a>Tudjon meg többet a titkosításról.</a>",
     "Power level": "Hozzáférési szint",
     "Want more than a community? <a>Get your own server</a>": "Többet szeretnél, mint egy közösség? <a>Szerezz saját szervert</a>",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény eléréséhez kérlek telepíts <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Figyelmeztetés</b>: A szoba frissítése <i>nem fogja automatikusan átvinni a szoba résztvevőit az új verziójú szobába.</i> A régi szobába bekerül egy link az új szobához - a tagoknak rá kell kattintani a linkre az új szobába való belépéshez.",
     "Adds a custom widget by URL to the room": "Egyéni kisalkalmazás hozzáadása a szobához URL alapján",
     "Please supply a https:// or http:// widget URL": "Add meg a kisalkalmazás https:// vagy http:// URL-jét",
@@ -1245,11 +1033,7 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "A meghívót nem lehet visszavonni. Vagy a szervernek átmenetileg problémái vannak vagy nincs megfelelő jogosultságod a meghívó visszavonásához.",
     "Revoke invite": "Meghívó visszavonása",
     "Invited by %(sender)s": "Meghívta: %(sender)s",
-    "Maximize apps": "Alkalmazások teljes méretűvé nyitása",
-    "A widget would like to verify your identity": "A kisalkalmazás ellenőrizné a személyazonosságodat",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A kisalkalmazás itt: %(widgetUrl)s ellenőrizni szeretné a személyazonosságodat. Ha ezt engedélyezed a kisalkalmazás ellenőrizheti a felhasználói azonosítódat de nem viselkedhet úgy mintha te lennél.",
     "Remember my selection for this widget": "Jegyezze meg a választásomat ehhez a kisalkalmazáshoz",
-    "Deny": "Megtilt",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)snak nem sikerült a protokoll listát beszereznie a Matrix szervertől. Lehet, hogy a Matrix szerver túl öreg ahhoz, hogy támogasson hálózatot harmadik féltől.",
     "%(brand)s failed to get the public room list.": "%(brand)snak nem sikerült beszereznie a nyilvános szoba listát.",
     "The homeserver may be unavailable or overloaded.": "A Matrix szerver elérhetetlen vagy túlterhelt.",
@@ -1259,8 +1043,6 @@
     "Replying With Files": "Válasz fájlokkal",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Egyelőre nem lehet fájllal válaszolni. Szeretné feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
     "The file '%(fileName)s' failed to upload.": "A(z) „%(fileName)s” fájl feltöltése sikertelen.",
-    "Rotate counter-clockwise": "Óramutató járásával ellentétesen fordít",
-    "Rotate clockwise": "Óramutató járásával megegyező irányba fordít",
     "GitHub issue": "GitHub hibajegy",
     "Notes": "Megjegyzések",
     "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.": "Ha a hiba felderítésében további adat is segítséget adhat, mint az, hogy mit csináltál éppen, mi a szoba-, felhasználó azonosítója, stb... itt add meg.",
@@ -1318,13 +1100,12 @@
     "Use an email address to recover your account": "A felhasználói fiók visszaszerzése e-mail címmel",
     "Enter email address (required on this homeserver)": "E-mail cím megadása (ezen a matrix szerveren kötelező)",
     "Doesn't look like a valid email address": "Az e-mail cím nem tűnik érvényesnek",
-    "Enter password": "Jelszó megadása",
+    "Enter password": "Adja meg a jelszót",
     "Password is allowed, but unsafe": "A jelszó engedélyezett, de nem biztonságos",
     "Nice, strong password!": "Szép, erős jelszó!",
     "Passwords don't match": "A jelszavak nem egyeznek meg",
     "Other users can invite you to rooms using your contact details": "Mások meghívhatnak a szobákba a kapcsolatoknál megadott adataiddal",
     "Enter phone number (required on this homeserver)": "Telefonszám megadása (ennél a matrix szervernél kötelező)",
-    "Doesn't look like a valid phone number": "Ez a telefonszám nem tűnik érvényesnek",
     "Enter username": "Felhasználói név megadása",
     "Some characters not allowed": "Néhány karakter nem engedélyezett",
     "Failed to get autodiscovery configuration from server": "A szerverről nem sikerült beszerezni az automatikus felderítés beállításait",
@@ -1338,15 +1119,9 @@
     "edited": "szerkesztve",
     "Show hidden events in timeline": "Rejtett események megmutatása az idővonalon",
     "Add room": "Szoba hozzáadása",
-    "Your profile": "Profilod",
     "No homeserver URL provided": "Hiányzó matrix szerver URL",
     "Unexpected error resolving homeserver configuration": "A matrix szerver konfiguráció betöltésekor ismeretlen hiba lépett fel",
     "Edit message": "Üzenet szerkesztése",
-    "Unable to validate homeserver/identity server": "A matrix vagy azonosító szerver hitelesítése sikertelen",
-    "Sign in to your Matrix account on <underlinedServerName />": "Bejelentkezés a Matrix fiókba itt: <underlinedServerName />",
-    "Create your Matrix account on <underlinedServerName />": "Matrix fiók létrehozása itt: <underlinedServerName />",
-    "Your Matrix account on <underlinedServerName />": "A Matrix fiókod itt: <underlinedServerName />",
-    "Low bandwidth mode": "Alacsony sávszélesség mód",
     "Cannot reach homeserver": "A matrix szerver elérhetetlen",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Legyen stabil az Internet elérésed vagy a szerver adminisztrátorával vedd fel a kapcsolatot",
     "Your %(brand)s is misconfigured": "A %(brand)sod hibásan van beállítva",
@@ -1373,8 +1148,7 @@
     "Message edits": "Üzenet szerkesztések",
     "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:": "A szoba frissítéséhez be kell zárnod ezt a szobát és egy újat kell nyitnod e helyett. A szoba tagjainak a legjobb felhasználói élmény nyújtásához az alábbit fogjuk tenni:",
     "Loading room preview": "Szoba előnézetének a betöltése",
-    "Show all": "Mindet mutat",
-    "%(senderName)s made no change.": "%(senderName)s nem változtatott semmit.",
+    "Show all": "Mind megjelenítése",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s alkalommal nem változtattak semmit",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s nem változtattak semmit",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s alkalommal nem változtatott semmit",
@@ -1383,9 +1157,7 @@
     "Removing…": "Eltávolítás…",
     "Clear all data": "Minden adat törlése",
     "Your homeserver doesn't seem to support this feature.": "A Matrix szervered úgy tűnik nem támogatja ezt a szolgáltatást.",
-    "Resend edit": "Szerkesztés újraküldése",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s reakció újraküldése",
-    "Resend removal": "Törlés újraküldése",
     "Failed to re-authenticate due to a homeserver problem": "Az újra bejelentkezés a matrix szerver hibájából meghiusúlt",
     "Failed to re-authenticate": "Újra bejelentkezés sikertelen",
     "Enter your password to sign in and regain access to your account.": "Add meg a jelszavadat a belépéshez, hogy visszaszerezd a hozzáférésed a fiókodhoz.",
@@ -1395,7 +1167,6 @@
     "You're signed out": "Kijelentkeztél",
     "Clear personal data": "Személyes adatok törlése",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Kérlek mond el nekünk mi az ami nem működött, vagy még jobb, ha egy GitHub jegyben leírod a problémát.",
-    "Identity Server": "Azonosítási szerver",
     "Find others by phone or email": "Keress meg másokat telefonszám vagy e-mail cím alapján",
     "Be found by phone or email": "Legyél megtalálható telefonszámmal vagy e-mail címmel",
     "Use bots, bridges, widgets and sticker packs": "Használj botokoat, hidakat, kisalkalmazásokat és matricákat",
@@ -1413,9 +1184,6 @@
     "Accept <policyLink /> to continue:": "<policyLink /> elfogadása a továbblépéshez:",
     "ID": "Azonosító",
     "Public Name": "Nyilvános név",
-    "Identity Server URL must be HTTPS": "Az Azonosítási Szerver URL-jének HTTPS-nek kell lennie",
-    "Not a valid Identity Server (status code %(code)s)": "Az Azonosítási Szerver nem érvényes (státusz kód: %(code)s)",
-    "Could not connect to Identity Server": "Az Azonosítási Szerverhez nem lehet csatlakozni",
     "Checking server": "Szerver ellenőrzése",
     "Terms of service not accepted or the identity server is invalid.": "A felhasználási feltételek nincsenek elfogadva vagy az azonosítási szerver nem érvényes.",
     "Identity server has no terms of service": "Az azonosítási kiszolgálónak nincsenek felhasználási feltételei",
@@ -1423,12 +1191,10 @@
     "Only continue if you trust the owner of the server.": "Csak akkor lépj tovább, ha megbízol a kiszolgáló tulajdonosában.",
     "Disconnect from the identity server <idserver />?": "Bontod a kapcsolatot ezzel az azonosítási szerverrel: <idserver />?",
     "Disconnect": "Kapcsolat bontása",
-    "Identity Server (%(server)s)": "Azonosítási kiszolgáló (%(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.": "A kapcsolatok kereséséhez és hogy megtalálják az ismerősei, ezt a kiszolgálót használja: <server></server>. A használt azonosítási kiszolgálót alább tudja megváltoztatni.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Jelenleg nem használsz azonosítási szervert. Ahhoz, hogy e-mail cím, vagy egyéb azonosító alapján megtalálhassanak az ismerőseid, vagy te megtalálhasd őket, be kell állítanod egy azonosítási szervert.",
     "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.": "Ha az azonosítási szerverrel bontod a kapcsolatot az azt fogja eredményezni, hogy más felhasználók nem találnak rád és nem tudsz másokat meghívni e-mail cím vagy telefonszám alapján.",
     "Enter a new identity server": "Új azonosítási szerver hozzáadása",
-    "Integration Manager": "Integrációs Menedzser",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Azonosítási szerver (%(serverName)s) felhasználási feltételeinek elfogadása, ezáltal megtalálhatóvá válsz e-mail cím vagy telefonszám megadásával.",
     "Discovery": "Felkutatás",
     "Deactivate account": "Fiók zárolása",
@@ -1446,18 +1212,12 @@
     "Remove %(phone)s?": "%(phone)s törlése?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A szöveges üzenetet elküldtük a +%(msisdn)s számra. Kérlek add meg az ellenőrző kódot amit tartalmazott.",
     "Command Help": "Parancsok súgója",
-    "No identity server is configured: add one in server settings to reset your password.": "Nincs azonosítási szerver beállítva: adj meg egyet a szerver beállításoknál, hogy a jelszavadat vissza tudd állítani.",
     "This account has been deactivated.": "Ez a fiók zárolva van.",
     "You do not have the required permissions to use this command.": "A parancs használatához nincs meg a megfelelő jogosultságod.",
-    "Multiple integration managers": "Több integrációs menedzser",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ha felkutatásra és, hogy más ismerősök megtalálhassanak, nem akarod használni ezt a szervert: <server />, akkor adjál meg másik azonosítási szervert alább.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Azonosítási szerver használata nem kötelező. Ha úgy döntesz, hogy az azonosítási szervert nem használod más felhasználók nem találnak rád és másokat sem tudsz e-mail cím vagy telefonszám alapján meghívni.",
     "Do not use an identity server": "Az azonosítási szerver mellőzése",
     "Upgrade the room": "Szoba fejlesztése",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "E-mail cím beállítása a fiók visszaállításához. E-mail cím vagy telefonszám, hogy ismerősök megtalálhassanak.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "E-mail-cím beállítása a fiók helyreállításához. Az e-mail-címet arra is használhatja, hogy megtalálhassák az ismerősei.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Add meg a matrix szervered URL-jét <a>Mit jelent ez?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Add meg az azonosítási szervered URL-jét <a>Mit jelent ez?</a>",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Használj azonosítási szervert az e-mail címmel való meghíváshoz. <default> Használd az alapértelmezett szervert (%(defaultIdentityServerName)s)</default> vagy adj meg mást a <settings>Beállításokban</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Használjon egy azonosítási kiszolgálót az e-maillel történő meghíváshoz. Kezelés a <settings>Beállításokban</settings>.",
     "Enable room encryption": "Szoba titkosításának bekapcsolása",
@@ -1495,15 +1255,12 @@
     "Remove recent messages": "Friss üzenetek törlése",
     "Error changing power level requirement": "A szükséges hozzáférési szint változtatás nem sikerült",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "A szoba szükséges hozzáférési szint változtatásakor hiba történt. Ellenőrizd, hogy megvan hozzá a megfelelő jogosultságod és próbáld újra.",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Olvasás visszajelzés küldése üzenetekhez (a tiltáshoz kompatibilis matrix szerverre van szükség)",
-    "Explore": "Felderít",
     "Filter": "Szűrés",
-    "Filter rooms…": "Szobák szűrése…",
     "Preview": "Előnézet",
     "View": "Nézet",
     "Find a room…": "Szoba keresése…",
     "Find a room… (e.g. %(exampleRoom)s)": "Szoba keresése… (pl.: %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ha nem találod a szobát amit keresel kérj egy meghívót vagy <a>Készíts egy új szobát</a>.",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ha nem találod a szobát amit keresel, kérj egy meghívót vagy <a>készíts egy új szobát</a>.",
     "Explore rooms": "Szobák felderítése",
     "Verify the link in your inbox": "Ellenőrizd a hivatkozást a bejövő leveleid között",
     "Complete": "Kiegészít",
@@ -1517,21 +1274,17 @@
     "Changes the avatar of the current room": "Megváltoztatja a profilképed a jelenlegi szobában",
     "e.g. my-room": "pl.: szobam",
     "Please enter a name for the room": "Kérlek adj meg egy nevet a szobához",
-    "This room is private, and can only be joined by invitation.": "A szoba zárt, csak meghívóval lehet belépni.",
-    "Create a public room": "Nyilvános szoba készítése",
-    "Create a private room": "Zárt szoba készítése",
+    "Create a public room": "Nyilvános szoba létrehozása",
+    "Create a private room": "Privát szoba létrehozása",
     "Topic (optional)": "Téma (nem kötelező)",
-    "Make this room public": "A szoba legyen nyilvános",
-    "Hide advanced": "Haladó elrejtése",
-    "Show advanced": "Speciális megjelenítése",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Más szervereken lévő felhasználók belépésének letiltása-csak helyi szoba (Ezt a beállítást később nem lehet megváltoztatni!)",
+    "Hide advanced": "Speciális beállítások elrejtése",
+    "Show advanced": "Speciális beállítások megjelenítése",
     "Close dialog": "Ablak bezárása",
     "Show previews/thumbnails for images": "Előnézet/bélyegkép mutatása a képekhez",
     "Clear cache and reload": "Gyorsítótár ürítése és újratöltés",
     "%(count)s unread messages including mentions.|other": "%(count)s olvasatlan üzenet megemlítéssel.",
     "%(count)s unread messages.|other": "%(count)s olvasatlan üzenet.",
-    "Unread mentions.": "Olvasatlan megemlítés.",
-    "Show image": "Képek megmutatása",
+    "Show image": "Kép megjelenítése",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Ahhoz hogy a hibát megvizsgálhassuk kérlek <newIssueLink>készíts egy új hibajegyet</newIssueLink> a GitHubon.",
     "To continue you need to accept the terms of this service.": "A folytatáshoz el kell fogadnod a felhasználási feltételeket.",
     "Document": "Dokumentum",
@@ -1545,7 +1298,7 @@
     "Remove %(count)s messages|one": "1 üzenet törlése",
     "Your email address hasn't been verified yet": "Az e-mail-címe még nincs ellenőrizve",
     "Click the link in the email you received to verify and then click continue again.": "Ellenőrzéshez kattints a linkre az e-mailben amit kaptál és itt kattints a folytatásra újra.",
-    "Add Email Address": "E-mail cím hozzáadása",
+    "Add Email Address": "E-mail-cím hozzáadása",
     "Add Phone Number": "Telefonszám hozzáadása",
     "%(creator)s created and configured the room.": "%(creator)s elkészítette és beállította a szobát.",
     "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.": "Először <b>töröld a személyes adatokat</b> az azonosítási szerverről (<idserver />) mielőtt lecsatlakozol. Sajnos az azonosítási szerver (<idserver />) jelenleg elérhetetlen.",
@@ -1557,7 +1310,6 @@
     "This client does not support end-to-end encryption.": "A kliens nem támogatja a végponttól végpontig való titkosítást.",
     "Messages in this room are not end-to-end encrypted.": "Az üzenetek a szobában nincsenek végponttól végpontig titkosítva.",
     "Command Autocomplete": "Parancs Automatikus kiegészítés",
-    "DuckDuckGo Results": "DuckDuckGo találatok",
     "Quick Reactions": "Gyors Reakció",
     "Frequently Used": "Gyakran Használt",
     "Smileys & People": "Mosolyok és emberek",
@@ -1573,8 +1325,6 @@
     "Jump to first unread room.": "Az első olvasatlan szobába ugrás.",
     "Jump to first invite.": "Az első meghívóra ugrás.",
     "Room %(name)s": "Szoba: %(name)s",
-    "Recent rooms": "Legutóbbi szobák",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Azonosítási szerver nincs beállítva, így nem tudsz hozzáadni e-mail címet amivel vissza lehetne állítani a jelszót a későbbiekben.",
     "%(count)s unread messages including mentions.|one": "1 olvasatlan megemlítés.",
     "%(count)s unread messages.|one": "1 olvasatlan üzenet.",
     "Unread messages.": "Olvasatlan üzenetek.",
@@ -1622,12 +1372,10 @@
     "Subscribing to a ban list will cause you to join it!": "A feliratkozás egy tiltó listára azzal jár, hogy csatlakozol hozzá!",
     "If this isn't what you want, please use a different tool to ignore users.": "Ha nem ez az amit szeretnél, kérlek használj más eszközt a felhasználók figyelmen kívül hagyásához.",
     "Subscribe": "Feliratkozás",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ezt a felhasználót figyelmen kívül hagyod, így az üzenetei el lesznek rejtve. <a>Mindenképpen megmutat.</a>",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ezt a felhasználót figyelmen kívül hagyod, így az üzenetei el lesznek rejtve. <a>Megjelenítés mindenképpen.</a>",
     "Custom (%(level)s)": "Egyéni (%(level)s)",
     "Trusted": "Megbízható",
     "Not trusted": "Megbízhatatlan",
-    "Direct message": "Közvetlen beszélgetés",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> a szobában: %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Az üzenetek a szobában végponttól végpontig titkosítottak.",
     "Security": "Biztonság",
     "Verify": "Ellenőrzés",
@@ -1639,27 +1387,19 @@
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "Szoba azonosító",
     "Widget ID": "Kisalkalmazás azonosító",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> a(z) %(widgetDomain)s oldallal és az Integrációkezelővel.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel.",
     "Widget added by": "A kisalkalmazást hozzáadta",
     "This widget may use cookies.": "Ez a kisalkalmazás sütiket használhat.",
     "More options": "További beállítások",
-    "Reload": "Újratölt",
-    "Take picture": "Fénykép készítés",
     "Remove for everyone": "Visszavonás mindenkitől",
-    "Remove for me": "Visszavonás magamtól",
     "Connecting to integration manager...": "Kapcsolódás az integrációs menedzserhez...",
     "Cannot connect to integration manager": "A kapcsolódás az integrációs menedzserhez sikertelen",
     "The integration manager is offline or it cannot reach your homeserver.": "Az integrációkezelő nem működik, vagy nem éri el a Matrix-kiszolgálóját.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Használj Integrációs Menedzsert <b>(%(serverName)s)</b> a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Használj Integrációs Menedzsert a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrációs Menedzser megkapja a konfigurációt, módosíthat kisalkalmazásokat, szobához meghívót küldhet és a hozzáférési szintet beállíthatja helyetted.",
     "Failed to connect to integration manager": "Az integrációs menedzserhez nem sikerült csatlakozni",
     "Widgets do not use message encryption.": "A kisalkalmazások nem használnak üzenet titkosítást.",
     "Integrations are disabled": "Az integrációk le vannak tiltva",
     "Enable 'Manage Integrations' in Settings to do this.": "Ehhez engedélyezd az „Integrációk Kezelésé”-t a Beállításokban.",
     "Integrations not allowed": "Az integrációk nem engedélyezettek",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "A %(brand)sod nem használhat ehhez Integrációs Menedzsert. Kérlek vedd fel a kapcsolatot az adminisztrátorral.",
     "Decline (%(counter)s)": "Elutasítás (%(counter)s)",
     "Manage integrations": "Integrációk kezelése",
     "Verification Request": "Ellenőrzési kérés",
@@ -1669,12 +1409,10 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s videóhívást kezdeményezett. (ebben a böngészőben nem támogatott)",
     "Match system theme": "A rendszer témájához megfelelő",
     "Clear notifications": "Értesítések törlése",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Kísérleti labor tulajdonságokkal egyénre szabhatod az élményt. <a>Tudj meg többet</a>.",
     "Error upgrading room": "Hiba a szoba verziófrissítésekor",
     "Double check that your server supports the room version chosen and try again.": "Ellenőrizd még egyszer, hogy a kiszolgálód támogatja-e kiválasztott szobaverziót, és próbáld újra.",
     "This message cannot be decrypted": "Ezt az üzenetet nem lehet visszafejteni",
     "Unencrypted": "Titkosítatlan",
-    "Automatically invite users": "Felhasználók automatikus meghívása",
     "Upgrade private room": "Privát szoba fejlesztése",
     "Upgrade public room": "Nyilvános szoba fejlesztése",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "A szoba frissítése nem egyszerű művelet, általában a szoba hibás működése, hiányzó funkció vagy biztonsági sérülékenység esetén javasolt.",
@@ -1684,7 +1422,6 @@
     "Notification settings": "Értesítések beállítása",
     "User Status": "Felhasználó állapota",
     "Reactions": "Reakciók",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> ezzel reagáltak: %(content)s</reactedWith>",
     "<userName/> wants to chat": "<userName/> csevegni szeretne",
     "Start chatting": "Beszélgetés elkezdése",
     "Cross-signing public keys:": "Eszközök közti hitelesítés nyilvános kulcsai:",
@@ -1695,10 +1432,6 @@
     "in account data": "fiók adatokban",
     "Cross-signing": "Eszközök közti hitelesítés",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Figyelmeztetés</b>: Csak biztonságos számítógépről állíts be kulcs mentést.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ha elfelejtetted a visszaállítási kulcsot <button>állíts be új visszaállítási lehetőséget</button>",
-    "Set up with a recovery key": "Beállítás visszaállítási kulccsal",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "A visszaállítási kulcsod <b>a vágólapra lett másolva</b>, illeszd be ide:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "A visszaállítási kulcsod a <b>Letöltések</b> mappában van.",
     "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szobák voltak kitiltva: %(glob)s",
@@ -1717,26 +1450,20 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szobák voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szerverek voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a kitiltó szabályt erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
-    "Cross-signing and secret storage are enabled.": "Eszközök közti hitelesítés és a biztonsági tároló engedélyezve van.",
-    "Cross-signing and secret storage are not yet set up.": "Az eszközök közti hitelesítés és a biztonsági tároló egyenlőre nincs beállítva.",
-    "Bootstrap cross-signing and secret storage": "Az eszközök közti hitelesítés és biztonsági tároló beállítása",
     "not stored": "nincs mentve",
     "Backup has a <validity>valid</validity> signature from this user": "A mentés <validity>érvényes</validity> aláírást tartalmaz a felhasználótól",
     "Backup has a <validity>invalid</validity> signature from this user": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz a felhasználótól",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "A mentésnek <verify>ismeretlen</verify> felhasználótól származó aláírása van ezzel az azonosítóval: %(deviceId)s",
-    "Backup key stored: ": "Visszaállítási kulcs tárolva: ",
     "Hide verified sessions": "Ellenőrzött munkamenetek eltakarása",
     "%(count)s verified sessions|other": "%(count)s ellenőrzött munkamenet",
     "%(count)s verified sessions|one": "1 ellenőrzött munkamenet",
     "Close preview": "Előnézet bezárása",
     "Language Dropdown": "Nyelvválasztó lenyíló menü",
     "Country Dropdown": "Ország lenyíló menü",
-    "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.",
-    "Help": "Súgó",
-    "Show more": "Mutass többet",
+    "Show more": "Több megjelenítése",
     "Recent Conversations": "Legújabb Beszélgetések",
     "Direct Messages": "Közvetlen Beszélgetések",
-    "Go": "Menj",
+    "Go": "Meghívás",
     "Show info about bridges in room settings": "Híd információk megmutatása a szoba beállításoknál",
     "This bridge is managed by <user />.": "Ezt a hidat ez a felhasználó kezeli: <user />.",
     "Suggestions": "Javaslatok",
@@ -1765,8 +1492,6 @@
     "Go Back": "Vissza",
     "Other users may not trust it": "Más felhasználók lehet, hogy nem bíznak benne",
     "Later": "Később",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Az alábbi felhasználókat nem sikerült meghívni a beszélgetésbe: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "A közvetlen üzenetedet nem sikerült elkészíteni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
     "Something went wrong trying to invite the users.": "Valami nem sikerült a felhasználók meghívásával.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezeket a felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
     "Recently Direct Messaged": "Nemrég küldött Közvetlen Üzenetek",
@@ -1780,25 +1505,18 @@
     "Send as message": "Üzenet küldése",
     "This room is end-to-end encrypted": "Ez a szoba végpontok közötti titkosítást használ",
     "Everyone in this room is verified": "A szobában mindenki ellenőrizve van",
-    "Invite only": "Csak meghívóval",
     "Send a reply…": "Válasz küldése…",
     "Send a message…": "Üzenet küldése…",
     "Reject & Ignore user": "Felhasználó elutasítása és figyelmen kívül hagyása",
     "Enter your account password to confirm the upgrade:": "A fejlesztés megerősítéséhez add meg a fiók jelszavadat:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Azonosítanod kell magad a szerveren a fejlesztés megerősítéséhez.",
     "Upgrade your encryption": "Titkosításod fejlesztése",
-    "Set up encryption": "Titkosítás beállítása",
     "Verify this session": "Munkamenet ellenőrzése",
     "Encryption upgrade available": "A titkosítási fejlesztés elérhető",
     "Enable message search in encrypted rooms": "Üzenetek keresésének bekapcsolása a titkosított szobákban",
     "Review": "Átnéz",
     "This bridge was provisioned by <user />.": "Ezt a hidat az alábbi felhasználó készítette: <user />.",
-    "Workspace: %(networkName)s": "Munkahely: %(networkName)s",
-    "Channel: %(channelName)s": "Csatorna: %(channelName)s",
-    "Show less": "Kevesebbet mutat",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "A titkosított üzenetek kereséséhez azokat biztonságos módon helyileg kell tárolnod, felhasználva: ",
-    " to store messages from ": " üzenetek tárolásához ",
-    "rooms.": "szobából.",
+    "Show less": "Kevesebb megjelenítése",
     "Manage": "Kezelés",
     "Securely cache encrypted messages locally for them to appear in search results.": "A titkosított üzenetek kereséséhez azokat biztonságos módon, helyileg kell tárolnia.",
     "Enable": "Engedélyez",
@@ -1807,10 +1525,6 @@
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ez a szoba összeköti az üzeneteket a felsorolt platformokkal, <a>tudj meg többet.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ez a szoba egy platformmal sem köt össze üzeneteket. <a>Tudj meg többet.</a>",
     "Bridges": "Hidak",
-    "New session": "Új munkamenet",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Az új munkamenet ellenőrzéséhez használd ezt, amivel hozzáférést adsz a titkosított üzenetekhez:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Ha nem te jelentkeztél be ebbe a munkamenetbe akkor a fiókodat feltörték.",
-    "This wasn't me": "Nem én voltam",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Ha nincs engedélyezve akkor a titkosított szobák üzenetei nem jelennek meg a keresések között.",
     "Disable": "Tiltás",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s a kereshetőség érdekében a titkosított üzeneteket biztonságos módon helyileg tárolja:",
@@ -1829,7 +1543,6 @@
     "They match": "Egyeznek",
     "They don't match": "Nem egyeznek",
     "To be secure, do this in person or use a trusted way to communicate.": "A biztonság érdekében ezt végezd el személyesen vagy egy megbízható kommunikációs csatornán.",
-    "Verify yourself & others to keep your chats safe": "Ellenőrizd magad és másokat, hogy a csevegéseid biztonságban legyenek",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A fiókodhoz tartozik egy eszköz-közti hitelesítési identitás, de ez a munkamenet még nem jelölte megbízhatónak.",
     "in memory": "memóriában",
     "Your homeserver does not support session management.": "A matrix szervered nem támogatja a munkamenetek kezelését.",
@@ -1888,7 +1601,6 @@
     "You've successfully verified %(displayName)s!": "Sikeresen ellenőrizted a felhasználót: %(displayName)s!",
     "Got it": "Értem",
     "Encryption enabled": "Titkosítás bekapcsolva",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Ebben a szobában az üzenetek végpontok között titkosítottak. További információkért és az ellenőrzéshez nyisd meg a felhasználók profiljait!",
     "Encryption not enabled": "Titkosítás nincs engedélyezve",
     "The encryption used by this room isn't supported.": "A szobában használt titkosítás nem támogatott.",
     "Clear all data in this session?": "Minden adat törlése ebben a munkamenetben?",
@@ -1899,33 +1611,22 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "A felhasználó ellenőrzése által az ő munkamenete megbízhatónak lesz jelölve, és a te munkameneted is megbízhatónak lesz jelölve nála.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Eszköz ellenőrzése és beállítás megbízhatóként. Az eszközben való megbízás megnyugtató lehet, ha végpontok közötti titkosítást használsz.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Az eszköz ellenőrzése megbízhatónak fogja jelezni az eszközt és azok a felhasználók, akik téged ellenőriztek, megbíznak majd ebben az eszközödben.",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ezzel visszatérhetsz a fiókodba miután kijelentkeztél majd vissza egy másik munkamenetbe.",
     "Cancel entering passphrase?": "Megszakítod a jelmondat bevitelét?",
-    "Recovery key mismatch": "A visszaállítási kulcs nem megfelelő",
-    "Incorrect recovery passphrase": "A visszaállítási jelmondat helytelen",
-    "Enter recovery passphrase": "Visszaállítási jelmondat megadása",
-    "Enter recovery key": "Visszaállítási kulcs megadása",
     "Confirm your identity by entering your account password below.": "A fiók jelszó megadásával erősítsd meg a személyazonosságodat.",
     "Your new session is now verified. Other users will see it as trusted.": "Az új munkameneted ellenőrizve. Mások megbízhatónak fogják látni.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Amíg a biztonság nincs beállítva a munkameneten nem fér hozzá a titkosított üzenetekhez.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "A jelszó változtatás minden munkamenet végpontok közötti titkosító kulcsait alaphelyzetbe állítja, ezáltal a titkosított üzenetek olvashatatlanok lesznek, hacsak először nem mented ki a szobák kulcsait és töltöd vissza jelszóváltoztatás után. A jövőben ezt egyszerűsítjük majd.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Kijelentkeztettünk minden eszközödből és nem kapsz értesítéseket sem. Az értesítések újra engedélyezéséhez jelentkezz be újra az eszközökön.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Szerezd vissza a hozzáférést a fiókodhoz és állítsd vissza az elmentett titkosítási kulcsokat ebben a munkamenetben. Ezek nélkül egyetlen munkamenetben sem tudod elolvasni a titkosított üzeneteidet.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Figyelmeztetés: A személyes adataid (beleértve a titkosító kulcsokat is) továbbra is az eszközön vannak tárolva. Ha az eszközt nem használod tovább vagy másik fiókba szeretnél bejelentkezni, töröld őket.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Fejleszd ezt a munkamenetet, hogy más munkameneteket is tudj vele hitelesíteni, azért, hogy azok hozzáférhessenek a titkosított üzenetekhez és megbízhatónak legyenek jelölve más felhasználók számára.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "A másolatot tartsd biztonságos helyen, mint pl. egy jelszókezelő (vagy széf).",
-    "Your recovery key": "Visszaállítási kulcsod",
     "Copy": "Másol",
-    "Make a copy of your recovery key": "Készíts másolatot a visszaállítási kulcsodról",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül kijelentkezés után vagy másik munkamenetet használva nem tudod visszaállítani a titkosított üzeneteidet.",
     "Create key backup": "Kulcs mentés készítése",
     "This session is encrypting history using the new recovery method.": "Ez a munkamenet az új visszaállítási módszerrel titkosítja a régi üzeneteket.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a Biztonságos üzenetek visszaállítási jelmondata és kulcsa törölve lett.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ha véletlenül tetted, beállíthatod a Biztonságos Üzeneteket ezen a munkameneten ami újra titkosítja a régi üzeneteket az visszaállítási eljárással.",
     "Indexed rooms:": "Indexált szobák:",
     "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)",
-    "If you cancel now, you won't complete verifying the other user.": "A másik felhasználó ellenőrzését nem fejezed be, ha ezt most megszakítod.",
-    "If you cancel now, you won't complete verifying your other session.": "A másik munkameneted ellenőrzését nem fejezed be, ha ezt most megszakítod.",
     "Show typing notifications": "Gépelés visszajelzés megjelenítése",
     "Verify this session by completing one of the following:": "Ellenőrizd ezt a munkamenetet az alábbiak egyikével:",
     "Scan this unique code": "Ennek az egyedi kódnak a beolvasása",
@@ -1939,7 +1640,6 @@
     "Destroy cross-signing keys?": "Megsemmisíted az eszközök közti hitelesítés kulcsait?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Eszközök közti hitelesítési kulcsok törlése végleges. Mindenki akit ezzel hitelesítettél biztonsági figyelmeztetéseket fog látni. Hacsak nem vesztetted el az összes eszközödet amivel eszközök közti hitelesítést tudsz végezni, nem valószínű, hogy ezt szeretnéd tenni.",
     "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése",
-    "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló alaphelyzetbe állítása",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Olyan eszközön használja-e a %(brand)sot, ahol az érintés az elsődleges beviteli mód",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Progresszív webalkalmazásként használja-e a %(brand)sot",
     "Your user agent": "Felhasználói ügynök",
@@ -1954,11 +1654,6 @@
     "Accepting …": "Elfogadás …",
     "Declining …": "Elutasítás …",
     "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",
-    "The internet connection either session is using": "Az egyik munkamenet internet kapcsolata",
-    "We recommend you change your password and recovery key in Settings immediately": "Javasoljuk, hogy a jelszavadat és a visszaállítási kulcsodat mihamarabb változtasd meg a Beállításokban",
     "Order rooms by name": "Szobák rendezése név szerint",
     "Show rooms with unread notifications first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
     "Show shortcuts to recently viewed rooms above the room list": "Gyorselérési gombok megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett",
@@ -2002,7 +1697,7 @@
     "Enter a server name": "Add meg a szerver nevét",
     "Looks good": "Jól néz ki",
     "Can't find this server or its room list": "A szerver vagy a szoba listája nem található",
-    "All rooms": "Minden szoba",
+    "All rooms": "Kezdő tér",
     "Your server": "Matrix szervered",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Biztos, hogy eltávolítja: <b>%(serverName)s</b>",
     "Remove server": "Szerver törlése",
@@ -2010,7 +1705,6 @@
     "Add a new server": "Új szerver hozzáadása",
     "Manually verify all remote sessions": "Az összes távoli munkamenet manuális ellenőrzése",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "A felhasználó által használt munkamenetek ellenőrzése egyenként, a eszközök közti aláírással hitelesített eszközökben nem bízol meg.",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "A nyilvánosságra hozott címeket bárki bármelyik szerveren használhatja a szobádba való belépéshez. A cím közzétételéhez először helyi címnek kell beállítani.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Állíts be címet ehhez a szobához, hogy a felhasználók a matrix szervereden megtalálhassák (%(localDomain)s)",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "A titkosított szobákban az üzenete biztonságban van, és csak Ön és a címzettek rendelkeznek a visszafejtéshez szükséges egyedi kulcsokkal.",
     "Verify all users in a room to ensure it's secure.": "Ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról!",
@@ -2023,7 +1717,6 @@
     "Add a new server...": "Új szerver hozzáadása…",
     "%(networkName)s rooms": "%(networkName)s szobák",
     "Matrix rooms": "Matrix szobák",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Indíts beszélgetést valakinek a nevével, felhasználói nevével (mint <userId/>) vagy e-mail címével.",
     "a new master key signature": "az új mester kulcs aláírás",
     "a new cross-signing key signature": "az új eszközök közötti kulcs aláírása",
     "a device cross-signing signature": "az eszköz eszközök közötti aláírása",
@@ -2076,7 +1769,6 @@
     "Enter": "Enter",
     "Space": "Szóköz",
     "End": "End",
-    "Session backup key:": "Munkamenet másolat kulcs:",
     "Use Single Sign On to continue": "A folytatáshoz használja az egyszeri bejelentkezést (SSO)",
     "Single Sign On": "Egyszeri bejelentkezés",
     "%(name)s is requesting verification": "%(name)s ellenőrzést kér",
@@ -2084,7 +1776,6 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Erősítse meg, hogy az alábbi emodzsik mindkét munkamenetben azonos sorrendben jelentek meg:",
     "Verify this session by confirming the following number appears on its screen.": "Ellenőrizd ezt a munkamenetet azzal, hogy megerősíted, hogy az alábbi szám jelent meg a kijelzőjén.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Az ellenőrzéshez a másik munkamenetére – %(deviceName)s (%(deviceId)s) – várunk…",
-    "From %(deviceName)s (%(deviceId)s)": "Innen: %(deviceName)s (%(deviceId)s)",
     "well formed": "helyes formátum",
     "unexpected type": "váratlan típus",
     "Confirm deleting these sessions": "Megerősíted ennek a munkamenetnek a törlését",
@@ -2092,7 +1783,6 @@
     "Click the button below to confirm deleting these sessions.|one": "A munkamenet törlésének megerősítéséhez kattintson a lenti gombra.",
     "Delete sessions|other": "Munkamenetek törlése",
     "Delete sessions|one": "Munkamenet törlése",
-    "Waiting for you to accept on your other session…": "Az elfogadást várjuk a másik munkamenetedből…",
     "Almost there! Is your other session showing the same shield?": "Majdnem kész! A másik munkameneted is ugyanazt a pajzsot mutatja?",
     "Almost there! Is %(displayName)s showing the same shield?": "Majdnem kész! %(displayName)s is ugyanazt a pajzsot mutatja?",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Sikeresen ellenőrizted: %(deviceName)s (%(deviceId)s)!",
@@ -2109,12 +1799,11 @@
     "Server did not return valid authentication information.": "A szerver semmilyen érvényes azonosítási információt sem küldött vissza.",
     "There was a problem communicating with the server. Please try again.": "A szerverrel való kommunikációval probléma történt. Kérlek próbáld újra.",
     "Sign in with SSO": "Belépés SSO-val",
-    "Welcome to %(appName)s": "Üdvözöl az %(appName)s",
+    "Welcome to %(appName)s": "Üdvözöl a(z) %(appName)s",
     "Liberate your communication": "Kommunikálj szabadon",
     "Send a Direct Message": "Közvetlen üzenet küldése",
     "Explore Public Rooms": "Nyilvános szobák felfedezése",
-    "Create a Group Chat": "Készíts Csoportos Beszélgetést",
-    "Self-verification request": "Ön ellenőrzés kérése",
+    "Create a Group Chat": "Készíts csoportos beszélgetést",
     "Cancel replying to a message": "Üzenet válasz megszakítása",
     "Confirm adding email": "E-mail hozzáadásának megerősítése",
     "Click the button below to confirm adding this email address.": "Az e-mail cím hozzáadásának megerősítéséhez kattintson a gombra lent.",
@@ -2122,7 +1811,6 @@
     "Click the button below to confirm adding this phone number.": "Az telefonszám hozzáadásának megerősítéséhez kattintson a gombra lent.",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Erősítse meg, hogy az egyszeri bejelentkezésnél a személyazonossága bizonyításaként használt e-mail címet hozzáadja.",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Erősítse meg, hogy az egyszeri bejelentkezésnél a személyazonossága bizonyításaként használt telefonszámot hozzáadja.",
-    "If you cancel now, you won't complete your operation.": "A műveletet nem fejezed be, ha ezt most megszakítod.",
     "Failed to set topic": "A téma beállítása sikertelen",
     "Command failed": "A parancs sikertelen",
     "Could not find user in room": "A felhasználó nem található a szobában",
@@ -2134,34 +1822,15 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Erősítsd meg egyszeri bejelentkezéssel, hogy felfüggeszted ezt a fiókot.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Biztos, hogy felfüggeszted a fiókodat? Ezt nem lehet visszavonni.",
     "Unable to upload": "Nem lehet feltölteni",
-    "Verify other session": "Más munkamenetek ellenőrzése",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó visszaállítási jelmondatot adtál-e meg.",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Ezzel a visszaállítási kulccsal a mentést nem lehet visszafejteni: kérlek ellenőrizd, hogy a visszaállítási kulcsot jól adtad-e meg.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "A mentést nem lehet visszafejteni ezzel a visszaállítási jelmondattal: kérlek ellenőrizd, hogy a megfelelő visszaállítási jelmondatot adtad-e meg.",
     "Syncing...": "Szinkronizálás…",
     "Signing In...": "Bejelentkezés…",
     "If you've joined lots of rooms, this might take a while": "Ha sok szobához csatlakozott, ez eltarthat egy darabig",
-    "Great! This recovery passphrase looks strong enough.": "Nagyszerű! Ez a visszaállítási jelmondat elég erősnek tűnik.",
-    "Enter a recovery passphrase": "Visszaállítási jelmondat megadása",
-    "Enter your recovery passphrase a second time to confirm it.": "A megerősítéshez add meg a visszaállítási jelmondatot még egyszer.",
-    "Confirm your recovery passphrase": "Visszaállítási jelmondat megerősítése",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "A visszaállítási kulcs egy biztonsági háló - arra az esetre ha elfelejted a visszaállítási jelmondatot a titkosított üzenetekhez való hozzáférést vissza tudd állítani.",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "A kulcsaidat titkosított formában tároljuk a szerverünkön. Helyezd biztonságba a mentéseded a visszaállítási jelmondattal.",
-    "Please enter your recovery passphrase a second time to confirm.": "A megerősítéshez kérlek add meg a visszaállítási jelmondatot még egyszer.",
-    "Repeat your recovery passphrase...": "Ismételd meg a visszaállítási jelmondatot…",
-    "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal",
     "Currently indexing: %(currentRoom)s": "Indexelés alatt: %(currentRoom)s",
     "Send a bug report with logs": "Hibajelentés beküldése naplóval",
     "Please supply a widget URL or embed code": "Add meg a kisalkalmazás URL-jét vagy a beágyazott kódot",
     "Verify this login": "Belépés ellenőrzése",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Erősítsd meg ebben a bejelentkezésben a személyazonosságodat egy másik munkamenetből, hogy hozzáférhess a titkosított üzenetekhez.",
-    "This requires the latest %(brand)s on your other devices:": "A %(brand)s legújabb kliensére van ehhez szükséged a többi eszközödön:",
-    "or another cross-signing capable Matrix client": "vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre",
     "Unable to query secret storage status": "A biztonsági tároló állapotát nem lehet lekérdezni",
-    "Review where you’re logged in": "Tekintsd át hol vagy bejelentkezve",
     "New login. Was this you?": "Új bejelentkezés. Te voltál?",
-    "Verify all your sessions to ensure your account & messages are safe": "Ellenőrizd minden munkamenetedet, hogy a fiókod és az üzeneteid biztonságban legyenek",
-    "Verify the new login accessing your account: %(name)s": "Ellenőrizd ezt az új bejelentkezést ami hozzáfér a fiókodhoz: %(name)s",
     "Where you’re logged in": "Ahol be vagy jelentkezve",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Állítsd be a munkameneteid neveit, jelentkezz ki belőlük, vagy <a>ellenőrizd őket a Felhasználói Beállításokban</a>.",
     "Restoring keys from backup": "Kulcsok visszaállítása mentésből",
@@ -2171,7 +1840,6 @@
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s kulcs sikeresen visszaállítva",
     "You signed in to a new session without verifying it:": "Ellenőrzés nélkül jelentkeztél be egy új munkamenetbe:",
     "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználónevével (mint <userId/>), e-mail címével vagy <a>oszd meg ezt a szobát</a>.",
     "Opens chat with the given user": "Beszélgetés megnyitása a megadott felhasználóval",
     "Sends a message to the given user": "Üzenet küldése a megadott felhasználónak",
     "Waiting for your other session to verify…": "A másik munkameneted ellenőrzésére várunk…",
@@ -2190,7 +1858,6 @@
     "Room name or address": "A szoba neve vagy címe",
     "Joins room with given address": "Megadott címmel csatlakozik a szobához",
     "Unrecognised room address:": "Ismeretlen szobacím:",
-    "Font scaling": "Betű nagyítás",
     "Font size": "Betűméret",
     "IRC display name width": "IRC megjelenítési név szélessége",
     "Size must be a number": "A méretnek számnak kell lennie",
@@ -2199,21 +1866,14 @@
     "Appearance": "Megjelenítés",
     "Help us improve %(brand)s": "Segíts nekünk jobbá tenni a %(brand)sot",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "<UsageDataLink>Anonim használati adatok</UsageDataLink> küldésével segíthetsz nekünk a %(brand)s fejlesztésében. Ehhez <PolicyLink>sütiket</PolicyLink> használ.",
-    "I want to help": "Segíteni akarok",
     "Your homeserver has exceeded its user limit.": "A Matrix szervered túllépte a felhasználói szám korlátot.",
     "Your homeserver has exceeded one of its resource limits.": "A Matrix szervered túllépte valamelyik erőforrás korlátját.",
     "Contact your <a>server admin</a>.": "Vedd fel a kapcsolatot a <a>szerver gazdájával</a>.",
     "Ok": "Rendben",
-    "Set password": "Jelszó beállítása",
-    "To return to your account in future you need to set a password": "Ahhoz, hogy a jövőben vissza tudj térni a fiókodba, jelszót kell beállítanod",
-    "Restart": "Újraindít",
-    "Upgrade your %(brand)s": "%(brand)s frissítése",
-    "A new version of %(brand)s is available!": "Új verzió érhető el a %(brand)sból!",
     "New version available. <a>Update now.</a>": "Új verzió érhető el.<a>Frissíts most.</a>",
     "Please verify the room ID or address and try again.": "Kérlek ellenőrizd a szoba azonosítót vagy címet és próbáld újra.",
     "Room ID or address of ban list": "Tiltó lista szoba azonosító vagy cím",
     "To link to this room, please add an address.": "Hogy linkelhess egy szobához, adj hozzá egy címet.",
-    "Create room": "Szoba létrehozása",
     "Error creating address": "Cím beállítási hiba",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "A cím beállításánál hiba történt. Vagy nincs engedélyezve a szerveren vagy átmeneti hiba történt.",
     "You don't have permission to delete the address.": "A cím törléséhez nincs jogosultságod.",
@@ -2221,12 +1881,9 @@
     "Error removing address": "Cím törlésénél hiba történt",
     "Categories": "Kategóriák",
     "Room address": "Szoba címe",
-    "Please provide a room address": "Kérlek add meg a szoba címét",
     "This address is available to use": "Ez a cím használható",
     "This address is already in use": "Ez a cím már használatban van",
-    "Set a room address to easily share your room with other people.": "A szoba egyszerű megosztásához másokkal állíts be egy címet.",
     "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.": "Ezt a munkamenetet előzőleg egy újabb %(brand)s verzióval használtad. Ahhoz, hogy újra ezt a verziót tudd használni végpontok közötti titkosítással, ki kell lépned majd újra vissza.",
-    "Address (optional)": "Cím (nem kötelező)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Törlöd a szoba címét: %(alias)s és eltávolítod a könyvtárból ezt: %(name)s?",
     "delete the address.": "cím törlése.",
     "Use a different passphrase?": "Másik jelmondat használata?",
@@ -2235,9 +1892,7 @@
     "No recently visited rooms": "Nincsenek nemrégiben meglátogatott szobák",
     "People": "Emberek",
     "Sort by": "Rendezés",
-    "Unread rooms": "Olvasatlan szobák",
-    "Always show first": "Mindig az elsőt mutatja",
-    "Show": "Mutat",
+    "Show": "Megjelenítés",
     "Message preview": "Üzenet előnézet",
     "List options": "Lista beállításai",
     "Show %(count)s more|other": "Még %(count)s megjelenítése",
@@ -2256,77 +1911,28 @@
     "Activity": "Aktivitás",
     "A-Z": "A-Z",
     "Looks good!": "Jól néz ki!",
-    "Use Recovery Key or Passphrase": "Használd a visszaállítási kulcsot vagy jelmondatot",
-    "Use Recovery Key": "Használd a Visszaállítási Kulcsot",
-    "Use the improved room list (will refresh to apply changes)": "Használd a fejlesztett szoba listát (a változások életbe lépéséhez újra fog tölteni)",
     "Use custom size": "Egyéni méret használata",
     "Use a system font": "Rendszer betűtípus használata",
     "System font name": "Rendszer betűtípus neve",
     "Hey you. You're the best!": "Hé te! Te vagy a legjobb!",
     "Message layout": "Üzenet kinézete",
-    "Compact": "Egyszerű",
     "Modern": "Modern",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.",
     "You joined the call": "Csatlakoztál a hívásba",
     "%(senderName)s joined the call": "%(senderName)s csatlakozott a híváshoz",
     "Call in progress": "Hívás folyamatban van",
-    "You left the call": "Kiléptél a hívásból",
-    "%(senderName)s left the call": "%(senderName)s kilépett a hívásból",
     "Call ended": "Hívás befejeződött",
     "You started a call": "Hívást kezdeményeztél",
     "%(senderName)s started a call": "%(senderName)s hívást kezdeményezett",
     "Waiting for answer": "Válaszra várakozás",
     "%(senderName)s is calling": "%(senderName)s hív",
-    "You created the room": "Létrehoztál egy szobát",
-    "%(senderName)s created the room": "%(senderName)s létrehozott egy szobát",
-    "You made the chat encrypted": "A beszélgetést titkosítottá tetted",
-    "%(senderName)s made the chat encrypted": "%(senderName)s titkosítottá tette a beszélgetést",
-    "You made history visible to new members": "A régi beszélgetéseket láthatóvá tetted az új tagok számára",
-    "%(senderName)s made history visible to new members": "%(senderName)s a régi beszélgetéseket láthatóvá tette az új tagok számára",
-    "You made history visible to anyone": "A régi beszélgetéseket láthatóvá tette mindenki számára",
-    "%(senderName)s made history visible to anyone": "%(senderName)s a régi beszélgetéseket láthatóvá tette mindenki számára",
-    "You made history visible to future members": "A régi beszélgetéseket láthatóvá tetted a leendő tagok számára",
-    "%(senderName)s made history visible to future members": "%(senderName)s a régi beszélgetéseket láthatóvá tette a leendő tagok számára",
-    "You were invited": "Meghívtak",
-    "%(targetName)s was invited": "Meghívták őt: %(targetName)s",
-    "You left": "Távoztál",
-    "%(targetName)s left": "%(targetName)s távozott",
-    "You were kicked (%(reason)s)": "Kirúgtak (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "Kirúgták őt: %(targetName)s (%(reason)s)",
-    "You were kicked": "Kirúgtak",
-    "%(targetName)s was kicked": "Kirúgták őt: %(targetName)s",
-    "You rejected the invite": "A meghívót elutasítottad",
-    "%(targetName)s rejected the invite": "%(targetName)s elutasította a meghívót",
-    "You were uninvited": "A meghívódat visszavonták",
-    "%(targetName)s was uninvited": "A meghívóját visszavonták neki: %(targetName)s",
-    "You were banned (%(reason)s)": "Kitiltottak (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "Kitiltották őt: %(targetName)s (%(reason)s)",
-    "You were banned": "Kitiltottak",
-    "%(targetName)s was banned": "Kitiltották őt: %(targetName)s",
-    "You joined": "Beléptél",
-    "%(targetName)s joined": "%(targetName)s belépett",
-    "You changed your name": "A neved megváltoztattad",
-    "%(targetName)s changed their name": "%(targetName)s megváltoztatta a nevét",
-    "You changed your avatar": "A profilképedet megváltoztattad",
-    "%(targetName)s changed their avatar": "%(targetName)s megváltoztatta a profilképét",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "A szoba nevét megváltoztattad",
-    "%(senderName)s changed the room name": "%(senderName)s megváltoztatta a szoba nevét",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "A meghívóját visszavontad neki: %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s visszavonta a meghívóját neki: %(targetName)s",
-    "You invited %(targetName)s": "Meghívtad őt: %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s meghívta őt: %(targetName)s",
-    "You changed the room topic": "A szoba témáját megváltoztattad",
-    "%(senderName)s changed the room topic": "%(senderName)s megváltoztatta a szoba témáját",
-    "New spinner design": "Új várakozási animáció",
     "Use a more compact ‘Modern’ layout": "Egyszerűbb 'Modern' kinézet használata",
     "Message deleted on %(date)s": "Az üzenetet ekkor törölték: %(date)s",
     "Wrong file type": "A fájl típus hibás",
-    "Wrong Recovery Key": "A Visszaállítási Kulcs hibás",
-    "Invalid Recovery Key": "A Visszaállítási Kulcs hibás",
     "Security Phrase": "Biztonsági jelmondat",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Add meg a Biztonsági jelmondatot vagy <button>Használd a Biztonsági Kulcsot</button> a folytatáshoz.",
     "Security Key": "Biztonsági Kulcs",
@@ -2340,54 +1946,29 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "A Biztonsági Kulcsot tárold biztonságos helyen, mint pl. a jelszókezelő vagy széf, mivel ez tartja biztonságban a titkosított adataidat.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Ha most megszakítod, akkor a munkameneteidhez való hozzáférés elvesztésével elveszítheted a titkosított üzeneteidet és adataidat.",
     "You can also set up Secure Backup & manage your keys in Settings.": "A Biztonsági mentést és a kulcsok kezelését beállíthatod a Beállításokban.",
-    "Set up Secure backup": "Biztonsági mentés beállítása",
     "Set a Security Phrase": "Biztonsági Jelmondat beállítása",
     "Confirm Security Phrase": "Biztonsági jelmondat megerősítése",
     "Save your Security Key": "Ments el a Biztonsági Kulcsodat",
-    "Use your account to sign in to the latest version": "A legutolsó verzióba való bejelentkezéshez használd a fiókodat",
-    "We’re excited to announce Riot is now Element": "Izgatottan jelentjük, hogy a Riot mostantól Element",
-    "Riot is now Element!": "Riot mostantól Element!",
-    "Learn More": "Tudj meg többet",
     "Enable experimental, compact IRC style layout": "Egyszerű (kísérleti) IRC stílusú kinézet engedélyezése",
     "Unknown caller": "Ismeretlen hívó",
-    "Incoming voice call": "Bejövő hanghívás",
-    "Incoming video call": "Bejövő videóhívás",
-    "Incoming call": "Bejövő hívás",
-    "There are advanced notifications which are not shown here.": "Vannak haladó értesítési beállítások amik itt nem jelennek meg.",
     "Appearance Settings only affect this %(brand)s session.": "A megjelenítési beállítások csak erre az %(brand)s munkamenetre lesznek érvényesek.",
-    "Make this room low priority": "Ez a szoba legyen alacsony prioritású",
     "Use default": "Alapértelmezett használata",
     "Mentions & Keywords": "Megemlítések és kulcsszavak",
     "Notification options": "Értesítési beállítások",
     "Favourited": "Kedvencek",
     "Forget Room": "Szoba elfelejtése",
-    "Use your account to sign in to the latest version of the app at <a />": "Az alkalmazás legutolsó verzióba való bejelentkezéshez itt <a /> használd a fiókodat",
-    "Go to Element": "Irány az Element",
-    "We’re excited to announce Riot is now Element!": "Izgatottan jelentjük, hogy a Riot mostantól Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Tudj meg többet: <a>element.io/previously-riot</a>",
-    "Search rooms": "Szobák keresése",
     "User menu": "Felhasználói menü",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "Asztali %(brand)s",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X Android",
     "This room is public": "Ez egy nyilvános szoba",
     "Away": "Távol",
     "Are you sure you want to cancel entering passphrase?": "Biztos vagy benne, hogy megszakítod a jelmondat bevitelét?",
-    "Enable advanced debugging for the room list": "Speciális hibakeresés bekapcsolása a szobalistához",
     "%(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.": "A(z) %(brand)s nem képes a web böngészőben futva biztonságosan elmenteni a titkosított üzeneteket helyben. Használd az <desktopLink>Asztali %(brand)s</desktopLink> alkalmazást ahhoz, hogy az üzenetekben való keresésekkor a titkosított üzenetek is megjelenhessenek.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Valószínűleg egy %(brand)s klienstől eltérő programmal konfiguráltad. %(brand)s kliensben nem tudod módosítani de attól még érvényesek.",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Adja meg a rendszer által használt betűkészlet nevét és az %(brand)s megpróbálja azt használni.",
     "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.": "A figyelmen kívül hagyandó felhasználókat és szervereket itt add meg. %(brand)s kliensben használj csillagot hogy a helyén minden karakterre illeszkedjen a kifejezés. Például: <code>@bot:*</code> figyelmen kívül fog hagyni minden „bot” nevű felhasználót bármely szerverről.",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Az alacsony prioritású szobák egy külön helyen a szobalista alján fognak megjelenni",
     "Custom Tag": "Egyedi címke",
     "Show rooms with unread messages first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
     "Show previews of messages": "Üzenet előnézet megjelenítése",
     "Edited at %(date)s": "Szerkesztve ekkor: %(date)s",
     "Click to view edits": "A szerkesztések megtekintéséhez kattints",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Már be vagy jelentkezve és ez rendben van, de minden platformon az alkalmazás legfrissebb verziójának beszerzéséhez látogass el ide: <a>element.io/get-started</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.": "Használhatod a más szerver opciót, hogy egy másik matrix szerverre jelentkezz be amihez megadod a szerver url címét. Ezzel használhatod %(brand)s klienst egy már létező Matrix fiókkal egy másik matrix szerveren.",
-    "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>.": "Add meg az Element Matrix Services matrix szerveredet. Használhatod a saját domain-edet vagy az <a>element.io</a> al-domain-jét.",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "The person who invited you already left the room.": "Aki meghívott a szobába már távozott.",
     "The person who invited you already left the room, or their server is offline.": "Aki meghívott a szobába már távozott, vagy a szervere elérhetetlen.",
@@ -2411,8 +1992,6 @@
     "No files visible in this room": "Ebben a szobában nincsenek fájlok",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Csatolj fájlt a csevegésből vagy húzd és ejtsd bárhova a szobában.",
     "You’re all caught up": "Mindent elolvastál",
-    "You have no visible notifications in this room.": "Nincsenek látható értesítéseid ebben a szobában.",
-    "%(brand)s Android": "%(brand)s Android",
     "Explore public rooms": "Nyilvános szobák felfedezése",
     "Unexpected server error trying to leave the room": "Váratlan szerver hiba lépett fel a szobából való kilépés közben",
     "Error leaving room": "A szoba elhagyásakor hiba történt",
@@ -2443,17 +2022,13 @@
     "Set up Secure Backup": "Biztonsági mentés beállítása",
     "Explore community rooms": "Fedezd fel a közösségi szobákat",
     "Create a room in %(communityName)s": "Szoba létrehozása itt: %(communityName)s",
-    "Cross-signing and secret storage are ready for use.": "Az eszközök közti hitelesítés és a biztonsági tároló kész a használatra.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Az eszközök közti hitelesítés kész a használatra, de a biztonsági tároló nincs használva a kulcsok mentéséhez.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privát szobák csak meghívóval találhatók meg és meghívóval lehet belépni. A nyilvános szobákat bárki megtalálhatja és be is léphet.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privát szobák csak meghívóval találhatók meg és meghívóval lehet belépni. A nyilvános szobákat a közösség bármely tagja megtalálhatja és be is léphet.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "A privát szobák csak meghívóval találhatók meg és csak meghívóval lehet belépni. A nyilvános szobákat a közösség bármely tagja megtalálhatja és be is léphet.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Beállíthatod, ha a szobát csak egy belső csoport használja majd a matrix szervereden. Ezt később nem lehet megváltoztatni.",
     "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.": "Ne engedélyezd ezt, ha a szobát külső csapat is használja másik matrix szerverről. Később nem lehet megváltoztatni.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "A szobába ne léphessenek be azok, akik nem ezen a szerveren vannak: %(serverName)s.",
     "There was an error updating your community. The server is unable to process your request.": "A közösség módosításakor hiba történt. A szerver nem tudja feldolgozni a kérést.",
     "Update community": "Közösség módosítása",
     "May include members not in %(communityName)s": "Olyan tagok is lehetnek akik nincsenek ebben a közösségben: %(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>.": "Kezdj beszélgetést valakivel akár a neve, felhasználói neve (mint <userId/>) vagy az e-mail címe segítségével. %(communityName)s közösségbe nem lesznek meghívva. Ha valakit meg szeretnél hívni ide: %(communityName)s, kattints <a>ide</a>.",
     "Failed to find the general chat for this community": "Ehhez a közösséghez nem található általános csevegés",
     "Community settings": "Közösségi beállítások",
     "User settings": "Felhasználói beállítások",
@@ -2463,10 +2038,6 @@
     "Privacy": "Adatvédelem",
     "%(count)s results|one": "%(count)s találat",
     "Room Info": "Szoba információ",
-    "Apps": "Alkalmazások",
-    "Unpin app": "Alkalmazás kitűzésének megszüntetése",
-    "Edit apps, bridges & bots": "Alkalmazások, hidak és botok szerkesztése",
-    "Add apps, bridges & bots": "Alkalmazások, hidak és botok hozzáadása",
     "Not encrypted": "Nem titkosított",
     "About": "Névjegy",
     "%(count)s people|other": "%(count)s személy",
@@ -2474,33 +2045,21 @@
     "Show files": "Fájlok megjelenítése",
     "Room settings": "Szoba beállítások",
     "Take a picture": "Fénykép készítése",
-    "Pin to room": "A szobába kitűz",
-    "You can only pin 2 apps at a time": "Csak 2 alkalmazást tűzhetsz ki egyszerre",
     "Unpin": "Leszed",
-    "Group call modified by %(senderName)s": "A konferenciahívást módosította: %(senderName)s",
-    "Group call started by %(senderName)s": "A konferenciahívást elindította: %(senderName)s",
-    "Group call ended by %(senderName)s": "A konferenciahívást befejezte: %(senderName)s",
     "Cross-signing is ready for use.": "Eszközök közötti hitelesítés kész a használatra.",
     "Cross-signing is not set up.": "Az eszközök közötti hitelesítés nincs beállítva.",
     "Backup version:": "Mentés verzió:",
     "Algorithm:": "Algoritmus:",
-    "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.": "Ments el a titkosítási kulcsaidat a fiókadatokkal arra az esetre ha elvesztenéd a hozzáférést a munkameneteidhez. A kulcsok egy egyedi visszaállítási kulccsal lesznek védve.",
     "Backup key stored:": "Mentési kulcs tár:",
     "Backup key cached:": "Mentési kulcs gyorsítótár:",
     "Secret storage:": "Biztonsági tároló:",
     "ready": "kész",
     "not ready": "nem kész",
     "Secure Backup": "Biztonsági Mentés",
-    "End Call": "Hívás befejezése",
-    "Remove the group call from the room?": "Törlöd a konferenciahívást a szobából?",
-    "You don't have permission to remove the call from the room": "A konferencia hívás törléséhez nincs jogosultságod",
     "Start a conversation with someone using their name or username (like <userId/>).": "Indíts beszélgetést valakivel és használd hozzá a nevét vagy a felhasználói nevét (mint <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Ez nem hívja meg őket ebbe a közösségbe: %(communityName)s. Hogy meghívj valakit ebbe a közösségbe: %(communityName)s kattints <a>ide</a>",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Hívj meg valakit a nevét, vagy felhasználónevét (például <userId/>) megadva, vagy <a>oszd meg ezt a szobát</a>.",
     "Add widgets, bridges & bots": "Widget-ek, hidak, és botok hozzáadása",
-    "You can only pin 2 widgets at a time": "Egyszerre csak 2 widget-et lehet kitűzni",
-    "Minimize widget": "Widget minimalizálása",
-    "Maximize widget": "Widget maximalizálása",
     "Your server requires encryption to be enabled in private rooms.": "A szervered megköveteli, hogy a titkosítás be legyen kapcsolva a privát szobákban.",
     "Unable to set up keys": "Nem sikerült a kulcsok beállítása",
     "Safeguard against losing access to encrypted messages & data": "Biztosítás a titkosított üzenetek és adatokhoz való hozzáférés elvesztése ellen",
@@ -2525,20 +2084,10 @@
     "Failed to save your profile": "A profilját nem sikerült menteni",
     "The operation could not be completed": "A műveletet nem lehetett befejezni",
     "Remove messages sent by others": "Mások által küldött üzenetek törlése",
-    "Starting microphone...": "Mikrofon bekapcsolása…",
-    "Starting camera...": "Kamera bekapcsolása…",
-    "Call connecting...": "Híváshoz csatlakozás…",
-    "Calling...": "Hívás…",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Minden szerver ki van tiltva! Ezt a szobát nem lehet többet használni.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s megváltoztatta a kiszolgálójogosultságokat a szobában.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s beállította a jogosultságokat a szobában.",
-    "%(senderName)s declined the call.": "%(senderName)s visszautasította a hívást.",
-    "(an error occurred)": "(hiba történt)",
-    "(their device couldn't start the camera / microphone)": "(az ő eszköze nem tudja a kamerát / mikrofont használni)",
-    "(connection failed)": "(kapcsolódás sikertelen)",
     "The call could not be established": "A hívás kapcsolatot nem lehet felépíteni",
-    "The other party declined the call.": "A másik fél elutasította a hívást.",
-    "Call Declined": "Hívás elutasítva",
     "Move right": "Mozgatás jobbra",
     "Move left": "Balra mozgat",
     "Revoke permissions": "Jogosultságok visszavonása",
@@ -2665,7 +2214,6 @@
     "Topic: %(topic)s (<a>edit</a>)": "Téma: %(topic)s (<a>szerkesztés</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Ez a közvetlen beszélgetés kezdete <displayName/> felhasználóval.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Csak önök ketten vannak ebben a beszélgetésben, hacsak valamelyikőjük nem hív meg valakit, hogy csatlakozzon.",
-    "Call Paused": "Hívás szüneteltetve",
     "Takes the call in the current room off hold": "Visszaveszi tartásból a jelenlegi szoba hívását",
     "Places the call in the current room on hold": "Tartásba teszi a jelenlegi szoba hívását",
     "Zimbabwe": "Zimbabwe",
@@ -2876,9 +2424,7 @@
     "Reason (optional)": "Ok (opcionális)",
     "Continue with %(provider)s": "Folytatás ezzel a szolgáltatóval: %(provider)s",
     "Homeserver": "Matrix kiszolgáló",
-    "Role": "Szerepkör",
     "Start a new chat": "Új beszélgetés indítása",
-    "%(name)s paused": "%(name)s megállítva",
     "Return to call": "Visszatérés a híváshoz",
     "Fill Screen": "Képernyő kitöltése",
     "Voice Call": "Hanghívás",
@@ -2889,7 +2435,6 @@
     "Sends the given message with fireworks": "Az üzenet elküldése tűzijátékkal",
     "sends confetti": "konfetti küldése",
     "Sends the given message with confetti": "Az üzenet elküldése konfettivel",
-    "Show chat effects": "Beszélgetés effektek megjelenítése",
     "Use Ctrl + Enter to send a message": "Ctrl + Enter használata az üzenet elküldéséhez",
     "Use Command + Enter to send a message": "Operációs rendszer billentyű + Enter használata az üzenet küldéséhez",
     "Render LaTeX maths in messages": "LaTeX matematikai kifejezések megjelenítése az üzenetekben",
@@ -2945,7 +2490,7 @@
     "Learn more": "Tudj meg többet",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "A matrix.org a legnagyobb nyilvános Matrix szerver a világon, és sok felhasználónak megfelelő választás.",
     "About homeservers": "A Matrix szerverekről",
-    "Use your preferred Matrix homeserver if you have one, or host your own.": "Add meg az általad választott Matrix szerver címét, ha van ilyen, vagy üzemeltess egy sajátot!",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Add meg az általad választott Matrix szerver címét, ha van ilyen, vagy üzemeltess egy sajátot.",
     "Other homeserver": "Másik Matrix szerver",
     "Host account on": "Fiók létrehozása itt:",
     "We call the places where you can host your account ‘homeservers’.": "Matrix szervereknek nevezzük azokat a helyeket, ahol fiókot lehet létrehozni.",
@@ -2982,7 +2527,6 @@
     "There was an error finding this widget.": "A kisalkalmazás keresésekor hiba történt.",
     "Active Widgets": "Aktív kisalkalmazások",
     "Open dial pad": "Számlap megnyitása",
-    "Start a Conversation": "Beszélgetés megkezdése",
     "Dial pad": "Tárcsázó számlap",
     "There was an error looking up the phone number": "A telefonszám megkeresésekor hiba történt",
     "Unable to look up phone number": "A telefonszámot nem sikerült megtalálni",
@@ -2999,7 +2543,6 @@
     "Your Security Key": "Biztonsági Kulcsa",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "A Biztonsági Kulcs egy biztonsági háló - arra az esetre ha elfelejti a Biztonsági Jelmondatot - a titkosított üzenetekhez való hozzáférés visszaállításához.",
     "Repeat your Security Phrase...": "Ismételje meg a Biztonsági Jelmondatát…",
-    "Please enter your Security Phrase a second time to confirm.": "A megerősítéshez kérjük adja meg a Biztonsági Jelmondatot még egyszer.",
     "Set up with a Security Key": "Beállítás Biztonsági Kulccsal",
     "Great! This Security Phrase looks strong enough.": "Nagyszerű! Ez a Biztonsági Jelmondat elég erősnek tűnik.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "A kulcsait titkosított formában tároljuk a szerverünkön. Helyezze biztonságba a mentését a Biztonsági Jelmondattal.",
@@ -3020,12 +2563,9 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérjük ellenőrizze, hogy jó Biztonsági jelmondatot adott-e meg.",
     "Invalid Security Key": "Érvénytelen Biztonsági Kulcs",
     "Wrong Security Key": "Hibás Biztonsági Kulcs",
-    "We recommend you change your password and Security Key in Settings immediately": "Javasoljuk, hogy a jelszavát és a Biztonsági kulcsát mihamarabb változtassa meg a Beállításokban",
     "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.": "Mentse el a titkosítási kulcsokat a fiókadatokkal arra az esetre ha elvesztené a hozzáférést a munkameneteihez. A kulcsok egy egyedi Biztonsági Kulccsal lesznek védve.",
     "Set my room layout for everyone": "A szoba megjelenésének beállítása mindenki számára",
     "%(senderName)s has updated the widget layout": "%(senderName)s megváltoztatta a kisalkalmazás megjelenését",
-    "Use Ctrl + F to search": "Kereséshez használja a CTRL + F kombinációt",
-    "Use Command + F to search": "Kereséshez használja a Parancs + F kombinációt",
     "Use app": "Használja az alkalmazást",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web kísérleti állapotban van mobiltelefonon. A jobb élmény és a legújabb funkciók használatához használja az alkalmazást.",
     "Use app for a better experience": "A jobb élmény érdekében használjon alkalmazást",
@@ -3042,13 +2582,9 @@
     "The widget will verify your user ID, but won't be able to perform actions for you:": "A kisalkalmazás ellenőrizni fogja a felhasználói azonosítóját, de az alábbi tevékenységeket nem tudja végrehajtani:",
     "Allow this widget to verify your identity": "A kisalkalmazás ellenőrizheti a személyazonosságot",
     "Show stickers button": "Matrica gomb megjelenítése",
-    "Windows": "Ablakok",
-    "Screens": "Képernyők",
-    "Share your screen": "Képernyő megosztása",
     "Show line numbers in code blocks": "Sorszámok megmutatása a kód blokkban",
     "Expand code blocks by default": "Kód blokk kibontása alapesetben",
     "Recently visited rooms": "Nemrég meglátogatott szobák",
-    "Upgrade to pro": "Pro verzióra való áttérés",
     "Minimize dialog": "Dialógus ablak kicsinyítés",
     "Maximize dialog": "Dialógus ablak nagyítás",
     "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Beállítás",
@@ -3085,48 +2621,24 @@
     "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/>",
+    "Welcome to <name/>": "Üdvözöl a(z) <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.",
@@ -3135,9 +2647,7 @@
     "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.",
@@ -3145,19 +2655,12 @@
     "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",
@@ -3168,40 +2671,28 @@
     "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",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Ellenőrizze ezt a bejelentkezést, hogy hozzáférjen a titkosított üzeneteihez, valamint be tudja bizonyítani másoknak, hogy ez bejelentkezés önhöz tartozik.",
-    "Verify with another session": "Ellenőrizze egy másik munkamenettel",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Készítünk mindegyik szobához egyet. Később is hozzáadhat újakat vagy akár meglévőket.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Készítsünk mindegyik szobához egyet. Később is hozzáadhat újakat vagy akár meglévőket.",
     "Make sure the right people have access. You can invite more later.": "Ellenőrizze, hogy a megfelelő személyeknek van hozzáférése. Később meghívhat másokat is.",
     "A private space to organise your rooms": "Privát tér a szobái csoportosításához",
     "Just me": "Csak én",
@@ -3212,24 +2703,17 @@
     "Private space": "Privát tér",
     "Public space": "Nyilvános tér",
     "<inviter/> invites you": "<inviter/> meghívta",
-    "Search names and description": "Nevek és leírás keresése",
     "You may want to try a different search or check for typos.": "Esetleg próbáljon ki egy másik keresést vagy nézze át elgépelések után.",
     "No results found": "Nincs találat",
     "Mark as suggested": "Javasoltnak jelölés",
     "Mark as not suggested": "Nem javasoltnak jelölés",
     "Removing...": "Törlés...",
     "Failed to remove some rooms. Try again later": "Néhány szoba törlése sikertelen. Próbálja később",
-    "%(count)s rooms and 1 space|one": "%(count)s szoba és 1 tér",
-    "%(count)s rooms and 1 space|other": "%(count)s szoba és 1 tér",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s szoba és %(numSpaces)s tér",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s szoba és %(numSpaces)s tér",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Ha nem található a szoba amit keresett kérjen egy meghívót vagy <a>Készítsen egy új szobát</a>.",
     "Suggested": "Javaslat",
     "This room is suggested as a good one to join": "Ez egy javasolt szoba csatlakozáshoz",
     "%(count)s rooms|one": "%(count)s szoba",
     "%(count)s rooms|other": "%(count)s szoba",
     "You don't have permission": "Nincs jogosultsága",
-    "Open": "Megnyitás",
     "%(count)s messages deleted.|one": "%(count)s üzenet törölve.",
     "%(count)s messages deleted.|other": "%(count)s üzenet törölve.",
     "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.": "Ez általában a szoba szerver oldali kezelésében jelent változást. Ha probléma van itt: %(brand)s, kérjük küldjön hibajelentést.",
@@ -3239,10 +2723,7 @@
     "Invite with email or username": "Meghívás e-mail címmel vagy felhasználói névvel",
     "You can change these anytime.": "Bármikor megváltoztatható.",
     "Add some details to help people recognise it.": "Információ hozzáadása, hogy könnyebben felismerhető legyen.",
-    "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.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Innen: %(deviceName)s (%(deviceId)s), %(ip)s",
     "Check your devices": "Ellenőrizze az eszközeit",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Új bejelentkezéssel hozzáférés történik a fiókjához: %(name)s (%(deviceID)s), %(ip)s",
     "You have unverified logins": "Ellenőrizetlen bejelentkezései vannak",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Az ellenőrzés nélkül nem fér hozzá az összes üzenetéhez és mások számára megbízhatatlannak fog látszani.",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Ellenőrizze a személyazonosságát, hogy hozzáférjen a titkosított üzeneteihez és másoknak is bizonyítani tudja személyazonosságát.",
@@ -3255,7 +2736,6 @@
     "Avatar": "Profilkép",
     "Verify other login": "Másik munkamenet ellenőrzése",
     "Reset event store": "Az esemény tárolót alaphelyzetbe állítása",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Ha ezt teszi, tudnia kell, hogy az üzenetek nem kerülnek törlésre de keresés nem lesz tökéletes amíg az indexek nem készülnek el újra",
     "You most likely do not want to reset your event index store": "Az esemény index tárolót nagy valószínűséggel nem szeretné alaphelyzetbe állítani",
     "Reset event store?": "Az esemény tárolót alaphelyzetbe állítja?",
     "Consult first": "Kérjen először véleményt",
@@ -3266,18 +2746,12 @@
     "%(count)s people you know have already joined|one": "%(count)s ismerős már csatlakozott",
     "%(count)s people you know have already joined|other": "%(count)s ismerős már csatlakozott",
     "Accept on your other login…": "Egy másik bejelentkezésében fogadta el…",
-    "Stop & send recording": "Megállít és a felvétel elküldése",
-    "Record a voice message": "Hang üzenet felvétele",
-    "Invite messages are hidden by default. Click to show the message.": "A meghívók alapesetben rejtve vannak. A megjelenítéshez kattintson.",
     "Quick actions": "Gyors műveletek",
     "Invite to just this room": "Meghívás csak ebbe a szobába",
     "Warn before quitting": "Kilépés előtt figyelmeztet",
-    "Message search initilisation failed": "Üzenet keresés beállítása sikertelen",
     "Manage & explore rooms": "Szobák kezelése és felderítése",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Egyeztetés vele: %(transferTarget)s. <a>Átadás ide: %(transferee)s</a>",
     "unknown person": "ismeretlen személy",
-    "Share decryption keys for room history when inviting users": "Visszafejtéshez szükséges kulcsok megosztása a szoba előzményekhez felhasználók meghívásakor",
-    "Send and receive voice messages (in development)": "Hang üzenetek küldése és fogadása (fejlesztés alatt)",
     "%(deviceId)s from %(ip)s": "%(deviceId)s innen: %(ip)s",
     "Review to ensure your account is safe": "Tekintse át, hogy meggyőződjön arról, hogy a fiókja biztonságban van",
     "Sends the given message as a spoiler": "A megadott üzenet szpojlerként küldése",
@@ -3308,18 +2782,13 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Válassz szobákat vagy beszélgetéseket amit hozzáadhat. Ez csak az ön tere, senki nem lesz értesítve. Továbbiakat később is hozzáadhat.",
     "What do you want to organise?": "Mit szeretne megszervezni?",
     "Filter all spaces": "Minden tér szűrése",
-    "Delete recording": "Felvétel törlése",
-    "Stop the recording": "Felvétel megállítása",
     "%(count)s results in all spaces|one": "%(count)s találat van az összes térben",
     "%(count)s results in all spaces|other": "%(count)s találat a terekben",
     "You have no ignored users.": "Nincs figyelmen kívül hagyott felhasználó.",
     "Play": "Lejátszás",
     "Pause": "Szünet",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Ez egy kísérleti funkció</b> Egyenlőre az a felhasználó aki meghívót kap a meghívóban lévő <link/> linkre kattintva tud csatlakozni.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "A csatlakozáshoz ide: %(spaceName)s először kapcsolja be a <a>béta Tereket</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "A %(spaceName)s megjelenítéséhez először kapcsolja be a <a>béta Tereket</a>",
     "Select a room below first": "Először válasszon ki szobát alulról",
-    "Communities are changing to Spaces": "A közösségek Terek lesznek",
     "Join the beta": "Csatlakozás béta lehetőségekhez",
     "Leave the beta": "Béta kikapcsolása",
     "Beta": "Béta",
@@ -3329,8 +2798,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Szobák hozzáadása…",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Szobák hozzáadása… (%(progress)s ennyiből: %(count)s)",
     "Not all selected were added": "Nem az összes kijelölt lett hozzáadva",
-    "You can add existing spaces to a space.": "Létező tereket adhat a térhez.",
-    "Feeling experimental?": "Kísérletezni szeretne?",
     "You are not allowed to view this server's rooms list": "Nincs joga ennek a szervernek a szobalistáját megnézni",
     "Error processing voice message": "Hiba a hangüzenet feldolgozásánál",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Nem található mikrofon. Ellenőrizze a beállításokat és próbálja újra.",
@@ -3340,29 +2807,18 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Kedve van kísérletezni? Labs az a hely ahol először hozzá lehet jutni az új dolgokhoz, kipróbálni új lehetőségeket és segíteni a fejlődésüket mielőtt mindenkihez eljut. <a>Tudj meg többet</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "A hozzáférési kulcs teljes elérést biztosít a fiókhoz. Soha ne ossza meg mással.",
     "Access Token": "Elérési kulcs",
-    "Spaces are a new way 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.",
     "Please enter a name for the space": "Kérem adjon meg egy nevet a térhez",
     "Connecting": "Kapcsolás",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Közvetlen hívás engedélyezése két fél között (ha ezt engedélyezi a másik fél láthatja az ön IP címét)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Béta verzió elérhető webre, asztali kliensre és Androidra. Bizonyos funkciók lehet, hogy nem elérhetők a matrix szerverén.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Bármikor elhagyhatja a béta változatot a beállításokban vagy a béta kitűzőre koppintva, mint alább.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s a Terekkel lesz újra betöltve. A közösségek és egyedi címkék rejtve maradnak.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Béta verzió elérhető webre, asztali kliensre és Androidra. Köszönjük, hogy kipróbálja.",
     "Spaces are a new way to group rooms and people.": "Szobák és emberek csoportosításának új lehetősége a Terek használata.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s a Terek nélkül lesz újra betöltve. A közösségek és egyedi címkék újra megjelennek.",
     "To leave the beta, visit your settings.": "A beállításokban tudja elhagyni a bétát.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "A platform és a felhasználói neve felhasználásra kerül ami segít nekünk a visszajelzést minél jobban felhasználni.",
     "%(featureName)s beta feedback": "%(featureName)s béta visszajelzés",
     "Thank you for your feedback, we really appreciate it.": "Köszönjük a visszajelzését, ezt nagyra értékeljük.",
-    "Beta feedback": "Béta visszajelzés",
     "Add reaction": "Reakció hozzáadása",
-    "Send and receive voice messages": "Hangüzenet küldése, fogadása",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "A visszajelzése segítség a terek javításához. Minél részletesebb annál jobb.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Távozás után %(brand)s Terek nélkül lesz újra betöltve. A közösségek és egyedi címkék újra megjelennek.",
     "Message search initialisation failed": "Üzenet keresés beállítása sikertelen",
     "Space Autocomplete": "Tér automatikus kiegészítése",
     "Go to my space": "Irány a teréhez",
-    "Spaces are a beta feature.": "A terek béta állapotban van.",
     "Search names and descriptions": "Nevek és leírások keresése",
     "You may contact me if you have any follow up questions": "Ha további kérdés merülne fel, kapcsolatba léphetnek velem",
     "sends space invaders": "space invaders küldése",
@@ -3370,5 +2826,343 @@
     "See when people join, leave, or are invited to your active room": "Emberek belépésének, távozásának vagy meghívásának a megjelenítése az aktív szobájában",
     "Kick, ban, or invite people to your active room, and make you leave": "Kirúgni, kitiltani vagy meghívni embereket az aktív szobába és, hogy ön elhagyja a szobát",
     "See when people join, leave, or are invited to this room": "Emberek belépésének, távozásának vagy meghívásának a megjelenítése ebben a szobában",
-    "Kick, ban, or invite people to this room, and make you leave": "Kirúgni, kitiltani vagy meghívni embereket ebbe a szobába és, hogy ön elhagyja a szobát"
+    "Kick, ban, or invite people to this room, and make you leave": "Kirúgni, kitiltani vagy meghívni embereket ebbe a szobába és, hogy ön elhagyja a szobát",
+    "Currently joining %(count)s rooms|one": "%(count)s szobába lép be",
+    "Currently joining %(count)s rooms|other": "%(count)s szobába lép be",
+    "No results for \"%(query)s\"": "Nincs találat erre: %(query)s",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Próbáljon ki más szavakat vagy keressen elgépelést. Néhány találat azért nem látszik, mert privát és meghívóra van szüksége, hogy csatlakozhasson.",
+    "The user you called is busy.": "A hívott felhasználó foglalt.",
+    "User Busy": "Felhasználó foglalt",
+    "If you can't see who you’re looking for, send them your invite link below.": "Ha nem található a keresett személy, küldje el az alábbi hivatkozást neki.",
+    "Some suggestions may be hidden for privacy.": "Adatvédelem miatt néhány javaslat esetleg rejtve van.",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Ha van hozzá jogosultsága, nyissa meg a menüt bármelyik üzenetben és válassza a <b>Kitűz</b> menüpontot a kitűzéshez.",
+    "Teammates might not be able to view or join any private rooms you make.": "Csapattagok lehet, hogy nem láthatják vagy léphetnek be az ön által készített privát szobákba.",
+    "Or send invite link": "Vagy meghívó link küldése",
+    "Search for rooms or people": "Szobák vagy emberek keresése",
+    "Forward message": "Üzenet továbbítása",
+    "Open link": "Hivatkozás megnyitása",
+    "Sent": "Elküldve",
+    "You don't have permission to do this": "Nincs jogosultsága ehhez",
+    "Error - Mixed content": "Hiba - Vegyes tartalom",
+    "Error loading Widget": "Kisalkalmazás betöltési hiba",
+    "Pinned messages": "Kitűzött üzenetek",
+    "Nothing pinned, yet": "Semmi sincs kitűzve egyenlőre",
+    "End-to-end encryption isn't enabled": "Végpontok közötti titkosítás nincs engedélyezve",
+    "Show all rooms in Home": "Minden szoba megjelenítése a Kezdő téren",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s megváltoztatta a szoba <a>kitűzött szövegeit</a>.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s kirúgta: %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s kirúgta őt: %(targetName)s, ok: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s visszavonta %(targetName)s meghívóját",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s visszavonta %(targetName)s meghívóját, ok: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s visszaengedte %(targetName)s felhasználót",
+    "%(targetName)s left the room": "%(targetName)s elhagyta a szobát",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s elhagyta a szobát, ok: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s elutasította a meghívót",
+    "%(targetName)s joined the room": "%(targetName)s belépett a szobába",
+    "%(senderName)s made no change": "%(senderName)s nem változtatott semmit",
+    "%(senderName)s set a profile picture": "%(senderName)s profil képet állított be",
+    "%(senderName)s changed their profile picture": "%(senderName)s megváltoztatta a profil képét",
+    "%(senderName)s removed their profile picture": "%(senderName)s törölte a profil képét",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s törölte a megjelenítési nevet (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s a megjelenítési nevét megváltoztatta erre: %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s kitiltotta őt: %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s kitiltotta őt: %(targetName)s, ok: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s elfogadta a meghívást",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s elfogadta a meghívást ide: %(displayName)s",
+    "Some invites couldn't be sent": "Néhány meghívót nem sikerült elküldeni",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Bármikor a szűrő panelen a profilképre kattintva megtekinthető, hogy melyik szobák és emberek tartoznak ehhez a közösséghez.",
+    "Please pick a nature and describe what makes this message abusive.": "Az üzenet természetének kiválasztása vagy annak megadása, hogy miért elítélendő.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Ez a szoba illegális vagy mérgező tartalmat közvetít vagy a moderátorok képtelenek ezeket megfelelően kezelni.\nEzek a szerver (%(homeserver)s) üzemeltetője felé jelzésre kerülnek.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Ez a szoba illegális vagy mérgező tartalmat közvetít vagy a moderátorok képtelenek ezeket megfelelően kezelni.\nEzek a szerver (%(homeserver)s) üzemeltetője felé jelzésre kerülnek. Az adminisztrátorok nem tudják olvasni a titkosított szobák tartalmát.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "A felhasználó kéretlen reklámokkal, reklám hivatkozásokkal vagy propagandával bombázza a szobát.\nEz moderátorok felé jelzésre kerül.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "A felhasználó illegális viselkedést valósít meg, például kipécézett valakit vagy tettlegességgel fenyeget.\nEz moderátorok felé jelzésre kerül akik akár hivatalos személyek felé továbbíthatják ezt.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "A felhasználó mérgező viselkedést jelenít meg, például más felhasználókat inzultál vagy felnőtt tartalmat oszt meg egy családbarát szobában vagy más módon sérti meg a szoba szabályait.\nEz moderátorok felé jelzésre kerül.",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)smegváltoztatta a szerver ACL-eket",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s %(count)s alkalommal megváltoztatta a kiszolgáló ACL-t",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a kiszolgáló ACL-t",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Üzenek keresés kezdő beállítása sikertelen, ellenőrizze a <a>beállításait</a> további információkért",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Cím beállítása ehhez a térhez, hogy a felhasználók a matrix szerveren megtalálhassák (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "A cím publikálásához először helyi címet kell beállítani.",
+    "Published addresses can be used by anyone on any server to join your space.": "A nyilvánosságra hozott címet bárki bármelyik szerverről használhatja a térbe való belépéshez.",
+    "Published addresses can be used by anyone on any server to join your room.": "A nyilvánosságra hozott címet bárki bármelyik szerverről használhatja a szobához való belépéshez.",
+    "Failed to update the history visibility of this space": "A tér régi üzeneteinek láthatóság állítása nem sikerült",
+    "Failed to update the guest access of this space": "A tér vendég hozzáférésének állítása sikertelen",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Jelzés a moderátornak prototípus. A moderálást támogató szobákban a „jelzés” gombbal jelenthető a kifogásolt tartalom a szoba moderátorainak",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Az alábbi embereket nem sikerül meghívni ide: <RoomName/>, de a többi meghívó elküldve",
+    "[number]": "[szám]",
+    "To view %(spaceName)s, you need an invite": "A %(spaceName)s megjelenítéséhez meghívó szükséges",
+    "Move down": "Mozgatás le",
+    "Move up": "Mozgatás fel",
+    "Report": "Jelentés",
+    "Collapse reply thread": "Üzenetszál becsukása",
+    "Show preview": "Előnézet megjelenítése",
+    "View source": "Forrás megtekintése",
+    "Forward": "Továbbítás",
+    "Settings - %(spaceName)s": "Beállítások - %(spaceName)s",
+    "Report the entire room": "Az egész szoba jelentése",
+    "Spam or propaganda": "Kéretlen reklám vagy propaganda",
+    "Illegal Content": "Jogosulatlan tartalom",
+    "Toxic Behaviour": "Mérgező viselkedés",
+    "Disagree": "Nem értek egyet",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Bármi más ok. Írja le a problémát.\nEz lesz elküldve a szoba moderátorának.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Amit ez a felhasználó ír az rossz.\nErről a szoba moderátorának jelentés készül.",
+    "Please provide an address": "Kérem adja meg a címet",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)smegváltoztatta a szerver ACL-eket",
+    "This space has no local addresses": "Ennek a térnek nincs helyi címe",
+    "Space information": "Tér információk",
+    "Collapse": "Bezár",
+    "Expand": "Kinyit",
+    "Recommended for public spaces.": "Nyilvános terekhez ajánlott.",
+    "Allow people to preview your space before they join.": "Tér előnézetének engedélyezése mielőtt belépnének.",
+    "Preview Space": "Tér előnézete",
+    "Decide who can view and join %(spaceName)s.": "Döntse el ki láthatja és léphet be ide: %(spaceName)s.",
+    "Visibility": "Láthatóság",
+    "This may be useful for public spaces.": "Nyilvános tereknél ez hasznos lehet.",
+    "Guests can join a space without having an account.": "Vendégek fiók nélkül is beléphetnek a térbe.",
+    "Enable guest access": "Vendég hozzáférés engedélyezése",
+    "Failed to update the visibility of this space": "A tér láthatóságának állítása sikertelen",
+    "Address": "Cím",
+    "e.g. my-space": "pl. én-terem",
+    "Silence call": "Némít",
+    "Sound on": "Hang be",
+    "Use Command + F to search timeline": "Command + F az idővonalon való kereséshez",
+    "Unnamed audio": "Névtelen hang",
+    "Error processing audio message": "Hiba a hangüzenet feldolgozásánál",
+    "Show %(count)s other previews|one": "%(count)s további előnézet megjelenítése",
+    "Show %(count)s other previews|other": "%(count)s további előnézet megjelenítése",
+    "Images, GIFs and videos": "Képek, GIFek és videók",
+    "Code blocks": "Kód blokkok",
+    "Displaying time": "Idő megjelenítése",
+    "To view all keyboard shortcuts, click here.": "A billentyűzet kombinációk megjelenítéséhez kattintson ide.",
+    "Keyboard shortcuts": "Billentyűzet kombinációk",
+    "Use Ctrl + F to search timeline": "Ctrl + F az idővonalon való kereséshez",
+    "User %(userId)s is already invited to the room": "%(userId)s felhasználó már kapott meghívót a szobába",
+    "Integration manager": "Integrációs Menedzser",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "A %(brand)s nem használhat Integrációs Menedzsert. Kérem vegye fel a kapcsolatot az adminisztrátorral.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> a(z) %(widgetDomain)s oldallal és az Integrációkezelővel.",
+    "Identity server is": "Azonosítási szerver",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrációs Menedzser megkapja a konfigurációt, módosíthat kisalkalmazásokat, szobához meghívót küldhet és a hozzáférési szintet állíthat be az ön nevében.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Használjon Integrációs Menedzsert a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Használjon Integrációs Menedzsert <b>(%(serverName)s)</b> a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
+    "Identity server": "Azonosító szerver",
+    "Identity server (%(server)s)": "Azonosítási kiszolgáló (%(server)s)",
+    "Could not connect to identity server": "Az Azonosítási Szerverhez nem lehet csatlakozni",
+    "Not a valid identity server (status code %(code)s)": "Az Azonosítási Szerver nem érvényes (státusz kód: %(code)s)",
+    "Identity server URL must be HTTPS": "Az Azonosítási Szerver URL-jének HTTPS-nek kell lennie",
+    "Unable to copy a link to the room to the clipboard.": "Ennek a szobának a hivatkozását nem sikerül a vágólapra másolni.",
+    "Unable to copy room link": "A szoba hivatkozása nem másolható",
+    "Error downloading audio": "Hiba a hang letöltésekor",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Vegye figyelembe, hogy a fejlesztés a szoba új verzióját hozza létre</b> Minden jelenlegi üzenet itt marad az archivált szobában.",
+    "Automatically invite members from this room to the new one": "Tagok automatikus meghívása ebből a szobából az újba",
+    "Other spaces or rooms you might not know": "Más terek vagy szobák melyről lehet, hogy nem tud",
+    "Spaces you know that contain this room": "Terek melyről tudja, hogy ezt a szobát tartalmazzák",
+    "Search spaces": "Terek keresése",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Döntse el melyik terek férhetnek hozzá ehhez a szobához. Ha a tér ki van választva a tagsága megtalálhatja és beléphet ebbe a szobába: <RoomName/>.",
+    "Select spaces": "Terek kiválasztása",
+    "You're removing all spaces. Access will default to invite only": "Minden teret töröl. A hozzáférés alapállapota „csak meghívóval” lesz",
+    "User Directory": "Felhasználójegyzék",
+    "Room visibility": "Szoba láthatóság",
+    "Visible to space members": "Tér tagság számára látható",
+    "Public room": "Nyilvános szoba",
+    "Private room (invite only)": "Privát szoba (csak meghívóval)",
+    "Create a room": "Szoba létrehozása",
+    "Only people invited will be able to find and join this room.": "Csak a meghívott emberek fogják megtalálni és tudnak belépni a szobába.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Bárki megtalálhatja és beléphet a szobába, nem csak <SpaceName/> tér tagsága.",
+    "You can change this at any time from room settings.": "A szoba beállításokban ezt bármikor megváltoztathatja.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "<SpaceName/> téren bárki megtalálhatja és beléphet a szobába.",
+    "Share content": "Tartalom megosztása",
+    "Application window": "Alkalmazás ablak",
+    "Share entire screen": "A teljes képernyő megosztása",
+    "Image": "Kép",
+    "Sticker": "Matrica",
+    "The call is in an unknown state!": "A hívás ismeretlen állapotban van!",
+    "An unknown error occurred": "Ismeretlen hiba történt",
+    "Their device couldn't start the camera or microphone": "A másik fél eszköze nem képes használni a kamerát vagy a mikrofont",
+    "Connection failed": "Kapcsolódás sikertelen",
+    "Could not connect media": "Média kapcsolat nem hozható létre",
+    "Call back": "Visszahívás",
+    "Copy Room Link": "Szoba hivatkozás másolása",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Már megoszthatja a képernyőjét hívás közben a \"képernyő megosztás\" gombra kattintva. Még hanghívás közben is működik ha mind a két fél támogatja.",
+    "Screen sharing is here!": "Képernyőmegosztás itt van!",
+    "Access": "Hozzáférés",
+    "People with supported clients will be able to join the room without having a registered account.": "Emberek támogatott kliensekkel, még regisztrált fiók nélkül is, beléphetnek a szobába.",
+    "Decide who can join %(roomName)s.": "Döntse el ki léphet be ide: %(roomName)s.",
+    "Space members": "Tér tagság",
+    "Anyone in a space can find and join. You can select multiple spaces.": "A téren bárki megtalálhatja és beléphet. Több teret is kiválaszthat egyidejűleg.",
+    "Spaces with access": "Terek hozzáféréssel",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "A téren bárki megtalálhatja és beléphet. <a>Szerkessze meg melyik tér férhet hozzá ehhez.</a>",
+    "Currently, %(count)s spaces have access|other": "Jelenleg %(count)s tér rendelkezik hozzáféréssel",
+    "& %(count)s more|other": "és még %(count)s",
+    "Upgrade required": "Fejlesztés szükséges",
+    "Anyone can find and join.": "Bárki megtalálhatja és beléphet.",
+    "Only invited people can join.": "Csak a meghívott emberek léphetnek be.",
+    "Private (invite only)": "Privát (csak meghívóval)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Ehhez a szobához ez a fejlesztés hozzáférést ad a kijelölt térhez tartozó tagoknak meghívó nélkül is.",
+    "Message bubbles": "Üzenet buborékok",
+    "IRC": "IRC",
+    "There was an error loading your notification settings.": "Az értesítés beállítások betöltésénél hiba történt.",
+    "Mentions & keywords": "Megemlítések és kulcsszavak",
+    "Global": "Globális",
+    "New keyword": "Új kulcsszó",
+    "Keyword": "Kulcsszó",
+    "Enable email notifications for %(email)s": "E-mail értesítés engedélyezése ehhez az e-mail címhez: %(email)s",
+    "Enable for this account": "Engedélyezés ennél a fióknál",
+    "An error occurred whilst saving your notification preferences.": "Hiba történt az értesítési beállításai mentése közben.",
+    "Error saving notification preferences": "Hiba az értesítési beállítások mentésekor",
+    "Messages containing keywords": "Az üzenetek kulcsszavakat tartalmaznak",
+    "Your camera is still enabled": "Az ön kamerája még be van kapcsolva",
+    "Your camera is turned off": "Az ön kamerája ki van kapcsolva",
+    "%(sharerName)s is presenting": "%(sharerName)s tartja a bemutatót",
+    "You are presenting": "Ön tartja a bemutatót",
+    "New layout switcher (with message bubbles)": "Új kinézet váltó (üzenet buborékokkal)",
+    "New in the Spaces beta": "Újdonság a béta Terekben",
+    "Transfer Failed": "Átadás sikertelen",
+    "Unable to transfer call": "A hívás átadása nem lehetséges",
+    "Anyone will be able to find and join this room.": "Bárki megtalálhatja és beléphet ebbe a szobába.",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "A szobák egyszerűbben maradhatnak privátok a téren kívül, amíg a tér tagsága megtalálhatja és beléphet oda. Minden új szoba a téren rendelkezik ezzel a beállítási lehetőséggel.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Ahhoz hogy segíthessen a tér tagságának privát szobák megtalálásában és a belépésben, lépjen be a szoba Biztonság és adatvédelem beállításaiba.",
+    "Help space members find private rooms": "Segítsen a tér tagságának privát szobák megtalálásában",
+    "Help people in spaces to find and join private rooms": "Segítsen a téren az embereknek privát szobák megtalálásába és a belépésben",
+    "We're working on this, but just want to let you know.": "Dolgozunk rajta, csak szerettük volna tudatni.",
+    "Search for rooms or spaces": "Szobák vagy terek keresése",
+    "Want to add an existing space instead?": "Inkább meglévő teret adna hozzá?",
+    "Private space (invite only)": "Privát tér (csak meghívóval)",
+    "Space visibility": "Tér láthatósága",
+    "Add a space to a space you manage.": "Adjon hozzá az ön által kezelt térhez.",
+    "Only people invited will be able to find and join this space.": "Csak a meghívott emberek fogják megtalálni és tudnak belépni erre a térre.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Bárki megtalálhatja és beléphet a térbe, nem csak <SpaceName/> tér tagsága.",
+    "Anyone in <SpaceName/> will be able to find and join.": "<SpaceName/> téren bárki megtalálhatja és beléphet.",
+    "Adding spaces has moved.": "Terek hozzáadása elköltözött.",
+    "Search for rooms": "Szobák keresése",
+    "Search for spaces": "Terek keresése",
+    "Create a new space": "Új tér készítése",
+    "Want to add a new space instead?": "Inkább új teret adna hozzá?",
+    "Add existing space": "Meglévő tér hozzáadása",
+    "Add space": "Tér hozzáadása",
+    "Give feedback.": "Adjon visszajelzést.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Köszönet a Terek használatáért. A visszajelzése segít a következő verzió kialakításában.",
+    "Spaces feedback": "Visszajelzés a Terekről",
+    "Spaces are a new feature.": "Terek az új lehetőség.",
+    "These are likely ones other room admins are a part of.": "Ezek valószínűleg olyanok, amelyeknek más szoba adminok is tagjai.",
+    "Show all rooms": "Minden szoba megjelenítése",
+    "All rooms you're in will appear in Home.": "Minden szoba amibe belépett megjelenik a Kezdő téren.",
+    "Leave %(spaceName)s": "Kilép innen: %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Ön az adminisztrátora néhány szobának vagy térnek amiből ki szeretne lépni. Ha kilép belőlük akkor azok adminisztrátor nélkül maradnak.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Ön az egyetlen adminisztrátora a térnek. Ha kilép, senki nem tudja irányítani.",
+    "You won't be able to rejoin unless you are re-invited.": "Nem fog tudni újra belépni amíg nem hívják meg újra.",
+    "Search %(spaceName)s": "Keresés: %(spaceName)s",
+    "Decrypting": "Visszafejtés",
+    "Send pseudonymous analytics data": "Pseudo-anonim felhasználási adatok küldése",
+    "Missed call": "Nem fogadott hívás",
+    "Call declined": "Hívás elutasítva",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s %(count)s alkalommal megváltoztatta a szoba <a>kitűzött üzeneteit</a>.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a szoba <a>kitűzött üzeneteit</a>.",
+    "Olm version:": "Olm verzió:",
+    "Stop recording": "Felvétel megállítása",
+    "Send voice message": "Hang üzenet küldése",
+    "Mute the microphone": "Mikrofon némítása",
+    "Unmute the microphone": "Mikrofon némításának megszüntetése",
+    "Dialpad": "Tárcsázó",
+    "More": "Több",
+    "Show sidebar": "Oldalsáv megjelenítése",
+    "Hide sidebar": "Oldalsáv elrejtése",
+    "Start sharing your screen": "Képernyőmegosztás indítása",
+    "Stop sharing your screen": "Képernyőmegosztás kikapcsolása",
+    "Stop the camera": "Kamera kikapcsolása",
+    "Start the camera": "Kamera bekapcsolása",
+    "Surround selected text when typing special characters": "Kijelölt szöveg körülvétele speciális karakterek beírásakor",
+    "Don't send read receipts": "Ne küldjön olvasási visszajelzést",
+    "Created from <Community />": "<Community /> közösségből készült",
+    "Communities won't receive further updates.": "A közösségek nem kapnak több fejlesztést.",
+    "Spaces are a new way to make a community, with new features coming.": "Terek az út a közösségek számára, további új lehetőségekkel hamarosan.",
+    "Communities can now be made into Spaces": "Közösségeket Terekké lehet alakítani",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Kérje meg a közösség <a>adminisztrátorát</a>, hogy változtassa Térré és figyelje a meghívót.",
+    "You can create a Space from this community <a>here</a>.": "A közösségből Teret <a>itt</a> csinálhat.",
+    "This description will be shown to people when they view your space": "Ezt a leírást látják majd azok az emberek akik benéznek a Térre",
+    "Flair won't be available in Spaces for the foreseeable future.": "A kitűzők egy jó ideig nem lesznek elérhetők még a Terekben.",
+    "All rooms will be added and all community members will be invited.": "Minden szoba hozzá lesz adva és minden közösségi tag meg lesz hívva.",
+    "A link to the Space will be put in your community description.": "A hivatkozás a Térre bekerül a közössége leírásába.",
+    "Create Space from community": "Tér létrehozása közösségből",
+    "Failed to migrate community": "Közösség migrálása sikertelen",
+    "To create a Space from another community, just pick the community in Preferences.": "Közösségből új Tér készítéséhez csak válasszon egy közösséget a Beállításokból.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> létrehozva mindenki aki a közösség tagja volt meg lett hívva ide.",
+    "Space created": "Tér létrehozva",
+    "To view Spaces, hide communities in <a>Preferences</a>": "A Terek megjelenítéséhez rejtse el a közösségeket a <a>Beállításokban</a>",
+    "This community has been upgraded into a Space": "Ez a közösség Térré lett formálva",
+    "Unknown failure: %(reason)s": "Ismeretlen hiba: %(reason)s",
+    "No answer": "Nincs válasz",
+    "If a community isn't shown you may not have permission to convert it.": "Ha egy közösség nem jelenik meg valószínűleg nincs joga átformálni azt.",
+    "Show my Communities": "Közösségeim megjelenítése",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "A közösségek archiválásra kerültek, hogy helyet adjanak a Tereknek de a közösségeket Terekké lehet formálni alább. Az átformálással a beszélgetések megkapják a legújabb lehetőségeket.",
+    "Create Space": "Tér készítése",
+    "Open Space": "Nyilvános tér",
+    "You can change this later.": "Ezt később meg lehet változtatni.",
+    "What kind of Space do you want to create?": "Milyen típusú teret szeretne készíteni?",
+    "Delete avatar": "Profilkép törlése",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "A hibakereső napló alkalmazás használati adatokat tartalmaz beleértve a felhasználói nevedet, az általad meglátogatott szobák és csoportok azonosítóit alternatív neveit, az utolsó felhasználói felület elemét amit használt és más felhasználói neveket. Csevegés üzenetek szövegét nem tartalmazza.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét, az utolsó felhasználói felület elemét amit használt és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
+    "Are you sure you want to add encryption to this public room?": "Biztos, hogy titkosítást állít be ehhez a nyilvános szobához?",
+    "Cross-signing is ready but keys are not backed up.": "Eszközök közötti hitelesítés megvan de a kulcsokhoz nincs biztonsági mentés.",
+    "Rooms and spaces": "Szobák és terek",
+    "Results": "Eredmények",
+    "Enable encryption in settings.": "Titkosítás bekapcsolása a beállításokban.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "A privát üzenetek általában titkosítottak de ez a szoba nem az. Általában ez a titkosítást nem támogató eszköz vagy metódus használata miatt lehet, mint az e-mail meghívók.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Az ehhez hasonló problémák elkerüléséhez készítsen <a>új nyilvános szobát</a> a tervezett beszélgetésekhez.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Titkosított szobát nem célszerű nyilvánossá tenni.</b> Bárki megtalálhatja és csatlakozhat nyilvános szobákhoz, így bárki elolvashatja az üzeneteket bennük. A titkosítás előnyeit így nem jelentkeznek és később ezt nem lehet kikapcsolni. Nyilvános szobákban a titkosított üzenetek az üzenetküldést és fogadást csak lassítják.",
+    "Are you sure you want to make this encrypted room public?": "Biztos, hogy nyilvánossá teszi ezt a titkosított szobát?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Az ehhez hasonló problémák elkerüléséhez készítsen <a>új titkosított szobát</a> a tervezett beszélgetésekhez.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nyilvános szobához nem javasolt a titkosítás beállítása.</b>Bárki megtalálhatja és csatlakozhat nyilvános szobákhoz, így bárki elolvashatja az üzeneteket bennük. A titkosítás előnyeit így nem jelentkeznek és később ezt nem lehet kikapcsolni. Nyilvános szobákban a titkosított üzenetek az üzenetküldést és fogadást csak lassítják.",
+    "Low bandwidth mode (requires compatible homeserver)": "Alacsony sávszélesség mód (kompatibilis matrix szervert igényel)",
+    "Multiple integration managers (requires manual setup)": "Több integrációs menedzser (kézi beállítást igényel)",
+    "Autoplay videos": "Videók automatikus lejátszása",
+    "Autoplay GIFs": "GIF-ek automatikus lejátszása",
+    "The above, but in <Room /> as well": "A felül lévő, de ebben a szobában is: <Room />",
+    "Show threads": "Üzenetszálak megjelenítése",
+    "Threaded messaging": "Üzenetszálas beszélgetés",
+    "The above, but in any room you are joined or invited to as well": "Ami felette van, de minden szobában amibe belépett vagy meghívták",
+    "Thread": "Üzenetszál",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s levett egy kitűzött üzenetet ebből a szobában. Minden kitűzött üzenet megjelenítése.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s levett egy kitűzött <a>üzenetet</a> ebből a szobában. Minden <b>kitűzött üzenet</b> megjelenítése.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s kitűzött egy üzenetet ebben a szobában. Minden kitűzött üzenet megjelenítése.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s kitűzött <a>egy üzenetet</a> ebben a szobában. Minden <b>kitűzött üzenet</b> megjelenítése.",
+    "Currently, %(count)s spaces have access|one": "Jelenleg a Térnek hozzáférése van",
+    "& %(count)s more|one": "és még %(count)s",
+    "Some encryption parameters have been changed.": "Néhány titkosítási paraméter megváltozott.",
+    "Role in <RoomName/>": "Szerep itt: <RoomName/>",
+    "Explore %(spaceName)s": "%(spaceName)s feltérképezése",
+    "Send a sticker": "Matrica küldése",
+    "Reply to thread…": "Válasz az üzenetszálra…",
+    "Reply to encrypted thread…": "Válasz a titkosított üzenetszálra…",
+    "Add emoji": "Emodzsi hozzáadás",
+    "Unknown failure": "Ismeretlen hiba",
+    "Failed to update the join rules": "A csatlakozási szabályokat nem sikerült frissíteni",
+    "Select the roles required to change various parts of the space": "A tér bizonyos beállításainak megváltoztatásához szükséges szerep kiválasztása",
+    "Change description": "Leírás megváltoztatása",
+    "Change main address for the space": "Tér elsődleges címének megváltoztatása",
+    "Change space name": "Tér nevének megváltoztatása",
+    "Change space avatar": "Tér profilkép megváltoztatása",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "<spaceName/> téren bárki megtalálhatja és beléphet. Kiválaszthat más tereket is.",
+    "Message didn't send. Click for info.": "Az üzenet nincs elküldve. Kattintson az információkért.",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "%(communityName)s csatlakozáshoz álljon át közösségekre a <a>beállításokban</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "%(communityName)s megjelenítéséhez álljon át közösségekre a <a>beállításokban</a>",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Ez a szoba olyan terekben is benne van amiben ön nem adminisztrátor. Ezekben a terekben a régi szoba jelenik meg és az emberek kapnak egy jelzést, hogy lépjenek be az újba.",
+    "To join this Space, hide communities in your <a>preferences</a>": "A Térbe való belépéshez rejtse el a közösségeket a <a>Beállításokban</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "A Tér megjelenítéséhez rejtse el a közösségeket a <a>Beállításokban</a>",
+    "Private community": "Zárt közösség",
+    "Public community": "Nyilvános közösség",
+    "Message": "Üzenet",
+    "Upgrade anyway": "Mindenképpen frissít",
+    "Before you upgrade": "Mielőtt frissítene",
+    "To join a space you'll need an invite.": "A térre való belépéshez meghívóra van szükség.",
+    "You can also make Spaces from <a>communities</a>.": "<a>Közösségből</a> is lehet Tereket készíteni.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Közösségek megjelenítése átmenetileg a terek helyett ebben a munkamenetben. Ez a lehetőség később kivezetésre kerül. Az Element újratöltődik.",
+    "Display Communities instead of Spaces": "Terek helyett inkább a közösségek megjelenítése",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reagált: %(content)s",
+    "Joining space …": "Belépés a térbe…",
+    "Would you like to leave the rooms in this space?": "Ki szeretne lépni ennek a térnek minden szobájából?",
+    "You are about to leave <spaceName/>.": "Éppen el akarja hagyni <spaceName/> teret.",
+    "Leave some rooms": "Kilépés néhány szobából",
+    "Leave all rooms": "Kilépés minden szobából",
+    "Don't leave any rooms": "Ne lépjen ki egy szobából sem"
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 2de350bae3..c0dc0b926a 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -2,7 +2,6 @@
     "Accept": "Terima",
     "Account": "Akun",
     "Add": "Tambah",
-    "Add a topic": "Tambah topik",
     "No Microphones detected": "Tidak ada mikrofon terdeteksi",
     "No media permissions": "Tidak ada izin media",
     "Microphone": "Mikrofon",
@@ -11,7 +10,6 @@
     "An error has occurred.": "Telah terjadi kesalahan.",
     "Are you sure you want to reject the invitation?": "Anda yakin menolak undangannya?",
     "Change Password": "Ubah Password",
-    "Click here to fix": "Klik di sini untuk perbaiki",
     "Close": "Tutup",
     "Commands": "Perintah",
     "Confirm password": "Konfirmasi password",
@@ -28,7 +26,6 @@
     "Download %(text)s": "Unduh %(text)s",
     "Export": "Ekspor",
     "Failed to join room": "Gagal gabung ruang",
-    "Failed to leave room": "Gagal meninggalkan ruang",
     "Failed to reject invitation": "Gagal menolak undangan",
     "Failed to send email": "Gagal mengirim email",
     "Favourite": "Favorit",
@@ -50,14 +47,11 @@
     "Operation failed": "Operasi gagal",
     "Passwords can't be empty": "Password tidak boleh kosong",
     "Permissions": "Izin",
-    "Private Chat": "Obrolan Privat",
     "Profile": "Profil",
-    "Public Chat": "Obrolan Publik",
     "Reason": "Alasan",
     "Register": "Registrasi",
     "%(brand)s version:": "%(brand)s versi:",
     "Return to login screen": "Kembali ke halaman masuk",
-    "Room Colour": "Warna Ruang",
     "Rooms": "Ruang",
     "Save": "Simpan",
     "Search": "Cari",
@@ -79,9 +73,7 @@
     "Verification Pending": "Verifikasi Tertunda",
     "Video call": "Panggilan Video",
     "Voice call": "Panggilan Suara",
-    "(no answer)": "(tidak ada jawaban)",
     "Warning!": "Peringatan!",
-    "You are already in a call.": "Anda telah berada di panggilan.",
     "You cannot place a call with yourself.": "Anda tidak dapat melakukan panggilan dengan diri sendiri.",
     "Sun": "Min",
     "Mon": "Sen",
@@ -102,10 +94,6 @@
     "Oct": "Okt",
     "Nov": "Nov",
     "Dec": "Des",
-    "%(targetName)s accepted an invitation.": "%(targetName)s telah menerima undangan.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s menerima undangan untuk %(displayName)s.",
-    "Access Token:": "Token Akses:",
-    "Active call (%(roomName)s)": "Panggilan aktif (%(roomName)s)",
     "Admin": "Admin",
     "Admin Tools": "Peralatan Admin",
     "No Webcams detected": "Tidak ada Webcam terdeteksi",
@@ -117,34 +105,25 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Anda yakin ingin meninggalkan ruang '%(roomName)s'?",
     "A new password must be entered.": "Password baru harus diisi.",
     "%(items)s and %(lastItem)s": "%(items)s dan %(lastItem)s",
-    "%(senderName)s answered the call.": "%(senderName)s telah menjawab panggilan.",
-    "Anyone who knows the room's link, including guests": "Siapa pun yang tahu tautan ruang, termasuk tamu",
-    "Anyone who knows the room's link, apart from guests": "Siapa pun yang tahu tautan ruang, selain tamu",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s telah memblokir %(targetName)s.",
     "Banned users": "Pengguna yang diblokir",
     "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.": "Tidak dapat terhubung ke server Home - harap cek koneksi anda, pastikan <a>sertifikat SSL server Home</a> Anda terpercaya, dan ekstensi dari browser tidak memblokir permintaan.",
     "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>.": "Tidak dapat terhubung ke server Home melalui HTTP ketika URL di browser berupa HTTPS. Pilih gunakan HTTPS atau <a>aktifkan skrip yang tidak aman</a>.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s telah mengubah foto profilnya.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s telah mengubah tingkat kekuatan dari %(powerLevelDiffText)s.",
     "Changes your display nickname": "Ubah tampilan nama panggilan Anda",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s telah menghapus nama ruang.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s telah mengubah nama ruang menjadi %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\".",
-    "click to reveal": "Klik untuk menampilkan",
     "Cryptography": "Kriptografi",
     "Decrypt %(text)s": "Dekrip %(text)s",
     "Ban": "Blokir",
     "Bans user with given id": "Blokir pengguna dengan id",
     "Fetching third party location failed": "Gagal mengambil lokasi pihak ketiga",
-    "All notifications are currently disabled for all targets.": "Semua notifikasi saat ini dinonaktifkan untuk semua target.",
-    "Uploading report": "Unggah laporan",
     "Sunday": "Minggu",
     "Guests can join": "Tamu dapat gabung",
     "Messages sent by bot": "Pesan dikirim oleh bot",
     "Notification targets": "Target notifikasi",
     "Failed to set direct chat tag": "Gagal mengatur tag obrolan langsung",
     "Today": "Hari Ini",
-    "You are not receiving desktop notifications": "Anda tidak menerima notifikasi desktop",
     "Dismiss": "Abaikan",
     "Update": "Perbarui",
     "Notifications": "Notifikasi",
@@ -153,57 +132,34 @@
     "Changelog": "Daftar perubahan",
     "Waiting for response from server": "Menunggu respon dari server",
     "Leave": "Tinggalkan",
-    "Advanced notification settings": "Pengaturan notifikasi lanjutan",
-    "Forget": "Lupakan",
     "World readable": "Terpublikasi Umum",
-    "You cannot delete this image. (%(code)s)": "Anda tidak dapat menghapus gambar ini. (%(code)s)",
-    "Cancel Sending": "Batalkan pengiriman",
     "Warning": "Peringatan",
     "This Room": "Ruang ini",
     "Noisy": "Berisik",
-    "Error saving email notification preferences": "Terjadi kesalahan saat menyimpan pilihan notifikasi email",
     "Messages containing my display name": "Pesan mengandung nama tampilan saya",
     "Messages in one-to-one chats": "Pesan di obrolan satu-ke-satu",
     "Unavailable": "Tidak Tersedia",
-    "View Decrypted Source": "Tampilkan Sumber Terdekripsi",
-    "Failed to update keywords": "Gagal memperbarui kata kunci",
     "remove %(name)s from the directory.": "hapus %(name)s dari direktori.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifikasi pada kata kunci berikut mengikuti aturan dimana tidak dapat ditampilkan di sini:",
-    "Please set a password!": "Mohon isi password!",
     "powered by Matrix": "didukung oleh Matrix",
-    "You have successfully set a password!": "Anda berhasil mengubah password!",
-    "An error occurred whilst saving your email notification preferences.": "Terjadi kesalahan saat menyimpan preferensi notifikasi email Anda.",
     "All Rooms": "Semua Ruang",
     "Source URL": "URL sumber",
     "Failed to add tag %(tagName)s to room": "Gagal menambahkan tag %(tagName)s ke ruang",
     "Members": "Anggota",
     "No update available.": "Tidak ada pembaruan.",
     "Resend": "Kirim Ulang",
-    "Files": "Files",
     "Collecting app version information": "Mengumpukan informasi versi aplikasi",
-    "Enable notifications for this account": "Aktifkan notifikasi untuk akun ini",
-    "Messages containing <span>keywords</span>": "Pesan mengandung <span>kata kunci</span>",
     "Room not found": "Ruang tidak ditemukan",
     "Tuesday": "Selasa",
-    "Enter keywords separated by a comma:": "Masukkan kata kunci dipisahkan oleh koma:",
     "Search…": "Cari…",
     "Remove %(name)s from the directory?": "Hapus %(name)s dari direktori?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s menggunakan banyak fitur terdepan dari browser, dimana tidak tersedia atau dalam fase eksperimen di browser Anda.",
     "Unnamed room": "Ruang tanpa nama",
     "Friday": "Jumat",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Ingat, Anda selalu dapat mengubah alamat email di pengaturan pengguna jika anda berubah pikiran.",
-    "All messages (noisy)": "Semua pesan (keras)",
     "Saturday": "Sabtu",
-    "I understand the risks and wish to continue": "Saya mengerti resikonya dan berharap untuk melanjutkan",
-    "Direct Chat": "Obrolan Langsung",
     "The server may be unavailable or overloaded": "Server mungkin tidak tersedia atau kelebihan muatan",
     "Reject": "Tolak",
-    "Failed to set Direct Message status of room": "Gagal mengatur status Pesan Langsung dari ruang",
     "Monday": "Senin",
     "Remove from Directory": "Hapus dari DIrektori",
-    "Enable them now": "Aktifkan sekarang",
     "Collecting logs": "Mengumpulkan catatan",
-    "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
     "Failed to forget room %(errCode)s": "Gagal melupakan ruang %(errCode)s",
     "Wednesday": "Rabu",
     "You cannot delete this message. (%(code)s)": "Anda tidak dapat menghapus pesan ini. (%(code)s)",
@@ -214,46 +170,28 @@
     "All messages": "Semua pesan",
     "Call invitation": "Undangan panggilan",
     "Downloading update...": "Unduh pembaruan...",
-    "You have successfully set a password and an email address!": "Anda telah berhasil mengubah password dan alamat email!",
     "What's new?": "Apa yang baru?",
-    "Notify me for anything else": "Beritau saya untuk lainnya",
     "When I'm invited to a room": "Ketika Saya diundang ke ruang",
     "Cancel": "Batal",
-    "Can't update user notification settings": "Tidak dapat memperbarui pengaturan notifikasi pengguna",
-    "Notify for all other messages/rooms": "Beritau semua pesan/ruang",
     "Unable to look up room ID from server": "Tidak dapat mencari ID ruang dari server",
     "Couldn't find a matching Matrix room": "Tidak dapat menemukan ruang Matrix yang sesuai",
     "Invite to this room": "Undang ke ruang ini",
     "Thursday": "Kamis",
-    "Forward Message": "Teruskan Pesan",
     "Back": "Kembali",
     "Show message in desktop notification": "Tampilkan pesan pada desktop",
-    "Unhide Preview": "Tampilkan Pratinjau",
     "Unable to join network": "Tidak dapat bergabung di jaringan",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Maaf, browser Anda <b>tidak</b> dapat menjalankan %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Diunggah pada %(date)s oleh %(user)s",
     "Messages in group chats": "Pesan di obrolan grup",
     "Yesterday": "Kemarin",
     "Error encountered (%(errorDetail)s).": "Terjadi kesalahan (%(errorDetail)s).",
-    "Keywords": "Kata Kunci",
     "Low Priority": "Prioritas Rendah",
-    "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target",
-    "Set Password": "Ubah Password",
     "Off": "Mati",
     "%(brand)s does not know how to join a room on this network": "%(brand)s tidak tau bagaimana gabung ruang di jaringan ini",
-    "Mentions only": "Hanya jika disinggung",
     "Failed to remove tag %(tagName)s from room": "Gagal menghapus tag %(tagName)s dari ruang",
     "Remove": "Hapus",
-    "You can now return to your account after signing out, and sign in on other devices.": "Anda dapat kembali ke akun setelah keluar dan masuk kembali di perangkat lain.",
-    "Enable email notifications": "Aktifkan notifikasi email",
     "No rooms to show": "Tidak ada ruang ditunjukkan",
-    "Download this file": "Unduh file ini",
-    "Failed to change settings": "Gagal mengubah pengaturan",
     "Failed to change password. Is your password correct?": "Gagal untuk mengubah password. Apakah password Anda benar?",
     "View Source": "Tampilkan Sumber",
-    "Custom Server Options": "Pilihan Server Khusus",
     "Thank you!": "Terima kasih!",
-    "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!": "Dengan browser ini, tampilan dari aplikasi mungkin tidak sesuai, dan beberapa atau bahkan semua fitur mungkin tidak berjalan. Jika Anda ingin tetap mencobanya, Anda bisa melanjutkan, tapi Anda tanggung sendiri jika muncul masalah yang terjadi!",
     "Checking for an update...": "Cek pembaruan...",
     "This email address is already in use": "Alamat email ini telah terpakai",
     "This phone number is already in use": "Nomor telepon ini telah terpakai",
@@ -269,15 +207,12 @@
     "The information being sent to us to help make %(brand)s better includes:": "Informasi yang dikirim membantu kami memperbaiki %(brand)s, termasuk:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Apabila terdapat informasi yang dapat digunakan untuk pengenalan pada halaman ini, seperti ruang, pengguna, atau ID grup, kami akan menghapusnya sebelum dikirim ke server.",
     "Call Failed": "Panggilan Gagal",
-    "Call Timeout": "Masa Berakhir Panggilan",
-    "The remote side failed to pick up": "Gagal jawab oleh pihak lain",
-    "Unable to capture screen": "Tidak dapat menangkap tampilan",
-    "Existing Call": "Panggilan Berlangsung",
     "VoIP is unsupported": "VoIP tidak didukung",
     "You cannot place VoIP calls in this browser.": "Anda tidak dapat melakukan panggilan VoIP di browser ini.",
-    "Call in Progress": "Panggilan Berlangsung",
-    "A call is currently being placed!": "Sedang melakukan panggilan sekarang!",
-    "A call is already in progress!": "Masih ada panggilan berlangsung!",
     "Permission Required": "Permisi Dibutuhkan",
-    "You do not have permission to start a conference call in this room": "Anda tidak memiliki permisi untuk memulai panggilan massal di ruang ini"
+    "You do not have permission to start a conference call in this room": "Anda tidak memiliki permisi untuk memulai panggilan massal di ruang ini",
+    "Explore rooms": "Jelajahi ruang",
+    "Sign In": "Masuk",
+    "Create Account": "Buat Akun",
+    "Identity server": "Server Identitas"
 }
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 35f5342b30..731fe2f281 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -6,7 +6,6 @@
     "e.g. <CurrentPageURL>": "t.d. <CurrentPageURL>",
     "Your device resolution": "Skjáupplausn tækisins þíns",
     "Analytics": "Greiningar",
-    "The remote side failed to pick up": "Ekki var svarað á fjartengda endanum",
     "VoIP is unsupported": "Enginn stuðningur við VoIP",
     "Warning!": "Aðvörun!",
     "Upload Failed": "Upphleðsla mistókst",
@@ -51,21 +50,15 @@
     "Missing user_id in request": "Vantar notandaauðkenni í beiðni",
     "Usage": "Notkun",
     "Reason": "Ástæða",
-    "VoIP conference started.": "VoIP-símafundur hafinn.",
-    "VoIP conference finished.": "VoIP-símafundi lokið.",
     "Someone": "Einhver",
-    "(not supported by this browser)": "(Ekki stutt af þessum vafra)",
-    "(no answer)": "(ekkert svar)",
     "Send": "Senda",
     "Unnamed Room": "Nafnlaus spjallrás",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Birta tímamerki á 12 stunda sniði (t.d. 2:30 fh)",
     "Always show message timestamps": "Alltaf birta tímamerki skilaboða",
     "Send analytics data": "Senda greiningargögn",
     "Enable inline URL previews by default": "Sjálfgefið virkja forskoðun innfelldra vefslóða",
-    "Room Colour": "Litur spjallrásar",
     "Collecting app version information": "Safna upplýsingum um útgáfu forrits",
     "Collecting logs": "Safna atvikaskrám",
-    "Uploading report": "Sendi inn skýrslu",
     "Waiting for response from server": "Bíð eftir svari frá vefþjóni",
     "Messages containing my display name": "Skilaboð sem innihalda birtingarnafn mitt",
     "Messages in one-to-one chats": "Skilaboð í maður-á-mann spjalli",
@@ -73,9 +66,6 @@
     "When I'm invited to a room": "Þegar mér er boðið á spjallrás",
     "Call invitation": "Boð um þátttöku",
     "Messages sent by bot": "Skilaboð send af vélmennum",
-    "unknown caller": "Óþekktur símnotandi",
-    "Incoming voice call from %(name)s": "Innhringing raddsamtals frá %(name)s",
-    "Incoming video call from %(name)s": "Innhringing myndsamtals frá %(name)s",
     "Decline": "Hafna",
     "Accept": "Samþykkja",
     "Error": "Villa",
@@ -91,32 +81,13 @@
     "Change Password": "Breyta lykilorði",
     "Authentication": "Auðkenning",
     "Last seen": "Sást síðast",
-    "Error saving email notification preferences": "Villa við að vista valkosti pósttilkynninga",
-    "An error occurred whilst saving your email notification preferences.": "Villa kom upp við að vista valkosti tilkynninga í tölvupósti.",
-    "Keywords": "Stikkorð",
-    "Enter keywords separated by a comma:": "Settu inn stikkorð aðskilin með kommu:",
     "OK": "Í lagi",
-    "Failed to change settings": "Mistókst að breyta stillingum",
-    "Can't update user notification settings": "Gat ekki uppfært stillingar á tilkynningum notandans",
-    "Failed to update keywords": "Mistókst að uppfæra stikkorð",
-    "Messages containing <span>keywords</span>": "Skilaboð sem innihalda <span>kstikkorð</span>",
-    "Notify for all other messages/rooms": "Senda tilkynningar fyrir öll önnur skilaboð/spjallrásir",
-    "Notify me for anything else": "Senda mér tilkynningar fyrir allt annað",
-    "Enable notifications for this account": "Virkja tilkynningar fyrir þennan notandaaðgang",
-    "Enable email notifications": "Virkja tilkynningar í tölvupósti",
     "Notification targets": "Markmið tilkynninga",
-    "Advanced notification settings": "Ítarlegar stillingar á tilkynningum",
     "Show message in desktop notification": "Birta tilkynningu í innbyggðu kerfistilkynningakerfi",
     "Off": "Slökkt",
     "On": "Kveikt",
     "Noisy": "Hávært",
-    "Add a widget": "Bæta við viðmótshluta",
-    "Drop File Here": "Slepptu skrá hérna",
     "Drop file here to upload": "Slepptu hér skrá til að senda inn",
-    " (unsupported)": " (óstutt)",
-    "%(senderName)s sent an image": "%(senderName)s sendi mynd",
-    "%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
-    "%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
     "Options": "Valkostir",
     "Kick": "Sparka",
     "Unban": "Afbanna",
@@ -167,10 +138,7 @@
     "Banned users": "Bannaðir notendur",
     "Leave room": "Fara af spjallrás",
     "Favourite": "Eftirlæti",
-    "Who can access this room?": "Hver hefur aðgang að þessari spjallrás?",
     "Only people who have been invited": "Aðeins fólk sem hefur verið boðið",
-    "Anyone who knows the room's link, apart from guests": "Hver sá sem þekkir slóðina á spjallrásina, fyrir utan gesti",
-    "Anyone who knows the room's link, including guests": "Hver sá sem þekkir slóðina á spjallrásina, að gestum meðtöldum",
     "Who can read history?": "Hver getur lesið ferilskráningu?",
     "Anyone": "Hver sem er",
     "Members only (since the point in time of selecting this option)": "Einungis meðlimir (síðan þessi kostur var valinn)",
@@ -199,9 +167,7 @@
     "Yesterday": "Í gær",
     "Error decrypting attachment": "Villa við afkóðun viðhengis",
     "Copied!": "Afritað!",
-    "Custom Server Options": "Sérsniðnir valkostir vefþjóns",
     "Dismiss": "Hunsa",
-    "Please check your email to continue registration.": "Skoðaðu tölvupóstinn þinn til að geta haldið áfram með skráningu.",
     "Code": "Kóði",
     "powered by Matrix": "keyrt með Matrix",
     "Email address": "Tölvupóstfang",
@@ -211,31 +177,22 @@
     "Remove": "Fjarlægja",
     "Something went wrong!": "Eitthvað fór úrskeiðis!",
     "Filter community rooms": "Sía spjallrásir samfélags",
-    "You are not receiving desktop notifications": "Þú færð ekki tilkynningar á skjáborði",
-    "Enable them now": "Virkja þetta núna",
     "What's New": "Nýtt á döfinni",
     "Update": "Uppfæra",
     "What's new?": "Hvað er nýtt á döfinni?",
-    "Set Password": "Setja lykilorð",
     "Error encountered (%(errorDetail)s).": "Villa fannst (%(errorDetail)s).",
     "Checking for an update...": "Athuga með uppfærslu...",
     "No update available.": "Engin uppfærsla tiltæk.",
     "Downloading update...": "Sæki uppfærslu...",
     "Warning": "Aðvörun",
-    "Allow": "Leyfa",
     "Edit": "Breyta",
     "No results": "Engar niðurstöður",
     "Communities": "Samfélög",
     "Home": "Heim",
-    "You cannot delete this image. (%(code)s)": "Þú getur ekki eytt þessari mynd. (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Sent inn %(date)s af %(user)s",
-    "Download this file": "Sækja þessa skrá",
     "collapse": "fella saman",
     "expand": "fletta út",
     "<a>In reply to</a> <pill>": "<a>Sem svar til</a> <pill>",
-    "Room directory": "Skrá yfir spjallrásir",
     "Start chat": "Hefja spjall",
-    "Add User": "Bæta við notanda",
     "email address": "tölvupóstfang",
     "Preparing to send logs": "Undirbý sendingu atvikaskráa",
     "Logs sent": "Sendi atvikaskrár",
@@ -270,35 +227,18 @@
     "Verification Pending": "Sannvottun í bið",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.",
     "Skip": "Sleppa",
-    "Username not available": "Notandanafnið er ekki tiltækt",
-    "Username available": "Notandanafnið er tiltækt",
-    "You have successfully set a password!": "Þér tókst að setja lykilorð!",
-    "You have successfully set a password and an email address!": "Þér tókst að setja lykilorð og tölvupóstfang!",
     "Failed to change password. Is your password correct?": "Mistókst að breyta lykilorðinu. Er lykilorðið rétt?",
-    "(HTTP status %(httpStatus)s)": "(HTTP staða %(httpStatus)s)",
-    "Please set a password!": "Stilltu lykilorð!",
-    "Custom": "Sérsniðið",
     "You cannot delete this message. (%(code)s)": "Þú getur ekki eytt þessum skilaboðum. (%(code)s)",
     "Resend": "Endursenda",
-    "Cancel Sending": "Hætta við sendingu",
-    "Forward Message": "Áframsenda skeyti",
     "Reply": "Svara",
-    "Pin Message": "Festa skeyti",
     "View Source": "Skoða frumkóða",
-    "View Decrypted Source": "Skoða afkóðaða upprunaskrá",
-    "Unhide Preview": "Birta forskoðun",
     "Quote": "Tilvitnun",
     "Source URL": "Upprunaslóð",
-    "All messages (noisy)": "Öll skilaboð (hávært)",
     "All messages": "Öll skilaboð",
-    "Mentions only": "Aðeins minnst á",
     "Leave": "Fara út",
-    "Forget": "Gleyma",
     "Reject": "Hafna",
     "Low Priority": "Lítill forgangur",
-    "Direct Chat": "Beint spjall",
     "View Community": "Skoða samfélag",
-    "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram",
     "Name": "Nafn",
     "Failed to upload image": "Gat ekki sent inn mynd",
     "Add rooms to this community": "Bæta spjallrásum í þetta samfélag",
@@ -310,16 +250,13 @@
     "Logout": "Útskráning",
     "Members": "Meðlimir",
     "Invite to this room": "Bjóða inn á þessa spjallrás",
-    "Files": "Skrár",
     "Notifications": "Tilkynningar",
     "Invite to this community": "Bjóða í þetta samfélag",
     "The server may be unavailable or overloaded": "Netþjónninn gæti verið undir miklu álagi eða ekki til taks",
     "Room not found": "Spjallrás fannst ekki",
     "Connectivity to the server has been lost.": "Tenging við vefþjón hefur rofnað.",
-    "Active call": "Virkt samtal",
     "Search failed": "Leit mistókst",
     "Room": "Spjallrás",
-    "Fill screen": "Fylla skjáinn",
     "Clear filter": "Hreinsa síu",
     "Success": "Tókst",
     "Import E2E room keys": "Flytja inn E2E dulritunarlykla spjallrásar",
@@ -333,11 +270,7 @@
     "Email": "Tölvupóstfang",
     "Profile": "Notandasnið",
     "Account": "Notandaaðgangur",
-    "Access Token:": "Aðgangsteikn:",
-    "click to reveal": "smelltu til að birta",
-    "Identity Server is": "Auðkennisþjónn er",
     "%(brand)s version:": "Útgáfa %(brand)s:",
-    "olm version:": "Útgáfa olm:",
     "Failed to send email": "Mistókst að senda tölvupóst",
     "The email address linked to your account must be entered.": "Það þarf að setja inn tölvupóstfangið sem tengt er notandaaðgangnum þínum.",
     "A new password must be entered.": "Það verður að setja inn nýtt lykilorð.",
@@ -346,7 +279,6 @@
     "Return to login screen": "Fara aftur í innskráningargluggann",
     "Send Reset Email": "Senda endurstillingarpóst",
     "Incorrect username and/or password.": "Rangt notandanafn og/eða lykilorð.",
-    "Upload an avatar:": "Hlaða inn auðkennismynd:",
     "Commands": "Skipanir",
     "Users": "Notendur",
     "Session ID": "Auðkenni setu",
@@ -361,27 +293,21 @@
     "The version of %(brand)s": "Útgáfan af %(brand)s",
     "Your language of choice": "Tungumálið þitt",
     "Your homeserver's URL": "Vefslóð á heimaþjóninn þinn",
-    "Call Timeout": "Tímamörk hringingar",
-    "Unable to capture screen": "Get ekki tekið skjámynd",
     "Invite to Community": "Bjóða í samfélag",
     "Add rooms to the community": "Bæta spjallrásum í þetta samfélag",
     "Add to community": "Bæta í samfélag",
     "Unable to enable Notifications": "Tekst ekki að virkja tilkynningar",
     "This email address was not found": "Tölvupóstfangið fannst ekki",
-    "Existing Call": "Fyrirliggjandi samtal",
-    "You are already in a call.": "Þú ert nú þegar í samtali.",
     "Invite new community members": "Bjóða nýjum meðlimum í samfélag",
     "Which rooms would you like to add to this community?": "Hvaða spjallrásum myndir þú vilja bæta í þetta samfélag?",
     "Failed to invite": "Mistókst að bjóða",
     "Missing roomId.": "Vantar spjallrásarauðkenni.",
-    "/ddg is not a command": "/ddg er ekki skipun",
     "Ignored user": "Hunsaður notandi",
     "Verified key": "Staðfestur dulritunarlykill",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s breytti umræðuefninu í \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjarlægði heiti spjallrásarinnar.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s breytti heiti spjallrásarinnar í %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendi mynd.",
-    "%(senderName)s answered the call.": "%(senderName)s svaraði símtalinu.",
     "Disinvite": "Taka boð til baka",
     "Unknown Address": "Óþekkt vistfang",
     "Delete Widget": "Eyða viðmótshluta",
@@ -390,7 +316,6 @@
     "were invited %(count)s times|one": "var boðið",
     "was invited %(count)s times|one": "var boðið",
     "And %(count)s more...|other": "Og %(count)s til viðbótar...",
-    "ex. @bob:example.com": "t.d. @jon:netfang.is",
     "Matrix ID": "Matrix-auðkenni",
     "Matrix Room ID": "Matrix-auðkenni spjallrásar",
     "Send Custom Event": "Senda sérsniðið atvik",
@@ -403,13 +328,6 @@
     "This doesn't appear to be a valid email address": "Þetta lítur ekki út eins og gilt tölvupóstfang",
     "Unable to add email address": "Get ekki bætt við tölvupóstfangi",
     "Unable to verify email address.": "Get ekki sannreynt tölvupóstfang.",
-    "Username invalid: %(errMessage)s": "Notandanafn er ógilt: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Villa kom upp: %(error_string)s",
-    "To get started, please pick a username!": "Til að komast í gang, veldu fyrst notandanafn!",
-    "Private Chat": "Einkaspjall",
-    "Public Chat": "Opinbert spjall",
-    "Collapse Reply Thread": "Fella saman svarþráð",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Því miður, vafrinn þinn getur <b>ekki</b> keyrt %(brand)s.",
     "Add a Room": "Bæta við spjallrás",
     "Add a User": "Bæta við notanda",
     "Unable to accept invite": "Mistókst að þiggja boð",
@@ -433,10 +351,6 @@
     "Failed to reject invitation": "Mistókst að hafna boði",
     "No more results": "Ekki fleiri niðurstöður",
     "Failed to reject invite": "Mistókst að hafna boði",
-    "Click to unmute video": "Smelltu til að virkja hljóð í myndskeiði",
-    "Click to mute video": "Smelltu til að þagga niður í myndskeiði",
-    "Click to unmute audio": "Smelltu til að virkja hljóð",
-    "Click to mute audio": "Smelltu til að þagga niður hljóð",
     "Failed to load timeline position": "Mistókst að hlaða inn staðsetningu á tímalínu",
     "Uploading %(filename)s and %(count)s others|other": "Sendi inn %(filename)s og %(count)s til viðbótar",
     "Uploading %(filename)s and %(count)s others|zero": "Sendi inn %(filename)s",
@@ -446,19 +360,14 @@
     "No Microphones detected": "Engir hljóðnemar fundust",
     "No Webcams detected": "Engar vefmyndavélar fundust",
     "Homeserver is": "Heimanetþjónn er",
-    "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
-    "Set a display name:": "Stilltu birtingarnafn:",
     "Displays action": "Birtir aðgerð",
     "Changes your display nickname": "Breytir birtu gælunafni þínu",
-    "Searches DuckDuckGo for results": "Leitar í DuckDuckGo að niðurstöðum",
-    "Results from DuckDuckGo": "Leitarniðurstöður frá DuckDuckGo",
     "Emoji": "Tjáningartáknmynd",
     "Notify the whole room": "Tilkynna öllum á spjallrásinni",
     "Room Notification": "Tilkynning á spjallrás",
     "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.",
     "Explore rooms": "Kanna herbergi",
     "Sign In": "Skrá inn",
     "The user's homeserver does not support the version of the room.": "Heimaþjónn notandans styður ekki útgáfu herbergis.",
@@ -504,7 +413,6 @@
     "Feedback": "Endurgjöf",
     "%(featureName)s beta feedback": "%(featureName)s beta endurgjöf",
     "Thank you for your feedback, we really appreciate it.": "Þakka þér fyrir athugasemdir þínar.",
-    "Beta feedback": "Beta endurgjöf",
     "All settings": "Allar stillingar",
     "Notification settings": "Tilkynningarstillingar",
     "Change notification settings": "Breytta tilkynningastillingum",
@@ -525,7 +433,6 @@
     "Use Ctrl + Enter to send a message": "Notaðu Ctrl + Enter til að senda skilaboð",
     "Use Command + Enter to send a message": "Notaðu Command + Enter til að senda skilaboð",
     "Jump to the bottom of the timeline when you send a message": "Hoppaðu neðst á tímalínunni þegar þú sendir skilaboð",
-    "Send and receive voice messages": "Senda og taka á móti talskilaboðum",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
     "Send <b>%(msgtype)s</b> messages as you in your active room": "Senda <b>%(msgtype)s</b> skilaboð sem þú í virka herbergi þínu",
     "Send <b>%(msgtype)s</b> messages as you in this room": "Senda <b>%(msgtype)s</b> skilaboð sem þú í þessu herbergi",
@@ -583,15 +490,11 @@
     "Enable URL previews for this room (only affects you)": "Virkja forskoðun vefslóða fyrir þetta herbergi (einungis fyrir þig)",
     "Room settings": "Herbergisstillingar",
     "Room Settings - %(roomName)s": "Herbergisstillingar - %(roomName)s",
-    "Pinned Messages": "Föst Skilaboð",
-    "No pinned messages.": "Engin föst skilaboð.",
     "This is the beginning of your direct message history with <displayName/>.": "Þetta er upphaf beinna skilaboðasögu með <displayName/>.",
     "Recently Direct Messaged": "Nýlega Fékk Bein Skilaboð",
     "Direct Messages": "Bein skilaboð",
-    "Direct message": "Beint skilaboð",
     "Frequently Used": "Oft notað",
     "Filter all spaces": "Sía öll rými",
-    "Filter your rooms and spaces": "Sía rými og herbergin þín",
     "Filter rooms and people": "Sía fólk og herbergi",
     "Filter": "Sía",
     "Your Security Key is in your <b>Downloads</b> folder.": "Öryggislykillinn þinn er <b>Niðurhals</b> möppu þinni.",
@@ -720,5 +623,15 @@
     "%(count)s messages deleted.|one": "%(count)s skilaboð eytt.",
     "%(count)s messages deleted.|other": "%(count)s skilaboðum eytt.",
     "Message deleted on %(date)s": "Skilaboð eytt á %(date)s",
-    "Message edits": "Skilaboðs breytingar"
+    "Message edits": "Skilaboðs breytingar",
+    "List options": "Lista valkosti",
+    "Create a Group Chat": "Búa Til Hópspjall",
+    "Explore Public Rooms": "Kanna Almenningsherbergi",
+    "Explore public rooms": "Kanna almenningsherbergi",
+    "Explore all public rooms": "Kanna öll almenningsherbergi",
+    "Liberate your communication": "Frelsaðu samskipti þín",
+    "Welcome to <name/>": "Velkomin til <name/>",
+    "Welcome to %(appName)s": "Velkomin til %(appName)s",
+    "Identity server is": "Auðkennisþjónn er",
+    "Identity server": "Auðkennisþjónn"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 585ee8ba3a..6cf5ff1e07 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -8,24 +8,18 @@
     "Search": "Cerca",
     "Settings": "Impostazioni",
     "Start chat": "Inizia una chat",
-    "Room directory": "Elenco delle stanze",
     "unknown error code": "codice errore sconosciuto",
     "Cancel": "Annulla",
     "Close": "Chiudi",
     "Create new room": "Crea una nuova stanza",
-    "Custom Server Options": "Opzioni server personalizzate",
     "Dismiss": "Chiudi",
     "Error": "Errore",
     "Favourite": "Preferito",
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Modifica password fallita. La tua password è corretta?",
     "Continue": "Continua",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ha accettato un invito.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha accettato l'invito per %(displayName)s.",
     "Account": "Account",
-    "Access Token:": "Token di Accesso:",
     "Add": "Aggiungi",
-    "Add a topic": "Aggiungi un argomento",
     "Admin": "Amministratore",
     "Admin Tools": "Strumenti di amministrazione",
     "No Microphones detected": "Nessun Microfono rilevato",
@@ -37,7 +31,6 @@
     "Advanced": "Avanzato",
     "Always show message timestamps": "Mostra sempre il timestamps dei messaggi",
     "Authentication": "Autenticazione",
-    "Add a widget": "Aggiungi un widget",
     "Edit": "Modifica",
     "This email address is already in use": "Questo indirizzo e-mail è già in uso",
     "This phone number is already in use": "Questo numero di telefono è già in uso",
@@ -72,10 +65,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Register": "Registrati",
     "Rooms": "Stanze",
-    "The remote side failed to pick up": "Dall'altro lato non è giunta risposta",
-    "Unable to capture screen": "Impossibile catturare la schermata",
     "Invite to Community": "Invita alla community",
-    "Unpin Message": "Sblocca messaggio",
     "Add rooms to this community": "Aggiungi stanze a questa community",
     "Warning": "Attenzione",
     "Unnamed room": "Stanza senza nome",
@@ -90,13 +80,6 @@
     "The information being sent to us to help make %(brand)s better includes:": "Le informazioni che ci vengono inviate per aiutarci a migliorare %(brand)s includono:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se questa pagina include informazioni identificabili, come una stanza, un utente o un ID di un gruppo, tali dati saranno rimossi prima di essere inviati al server.",
     "Call Failed": "Chiamata fallita",
-    "Call Timeout": "Tempo di attesa della chiamata",
-    "Existing Call": "Chiamata esistente",
-    "You are already in a call.": "Partecipi già ad una chiamata.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha richiesto una conferenza VoIP.",
-    "VoIP conference started.": "Conferenza VoIP iniziata.",
-    "VoIP conference finished.": "Conferenza VoIP terminata.",
-    "Ongoing conference call%(supportedText)s.": "Chiamata di gruppo in corso%(supportedText)s.",
     "Upload Failed": "Invio fallito",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "Who would you like to add to this community?": "Chi vuoi aggiungere a questa comunità?",
@@ -119,7 +102,6 @@
     "Restricted": "Limitato",
     "Moderator": "Moderatore",
     "Failed to invite": "Invito fallito",
-    "Failed to invite the following users to the %(roomName)s room:": "Invito nella stanza %(roomName)s fallito per i seguenti utenti:",
     "You need to be logged in.": "Devi aver eseguito l'accesso.",
     "You need to be able to invite users to do that.": "Devi poter invitare utenti per completare l'azione.",
     "Unable to create widget.": "Impossibile creare il widget.",
@@ -131,39 +113,17 @@
     "Room %(roomId)s not visible": "Stanza %(roomId)s non visibile",
     "Missing user_id in request": "Manca l'id_utente nella richiesta",
     "Usage": "Utilizzo",
-    "/ddg is not a command": "/ddg non è un comando",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Per usarlo, attendi l'autocompletamento dei risultati e selezionali con tab.",
     "Ignored user": "Utente ignorato",
     "You are now ignoring %(userId)s": "Ora stai ignorando %(userId)s",
     "Unignored user": "Utente non più ignorato",
     "You are no longer ignoring %(userId)s": "Non stai più ignorando %(userId)s",
     "Verified key": "Chiave verificata",
     "Reason": "Motivo",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitato %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bandito %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha modificato il proprio nome in %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha impostato il proprio nome a %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha rimosso il proprio nome visibile (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ha rimosso la propria immagine del profilo.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiato la propria immagine del profilo.",
-    "%(senderName)s set a profile picture.": "%(senderName)s ha impostato un'immagine del profilo.",
-    "%(targetName)s joined the room.": "%(targetName)s è entrato nella stanza.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ha rifiutato l'invito.",
-    "%(targetName)s left the room.": "%(targetName)s è uscito dalla stanza.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha rimosso il ban a %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha cacciato %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha revocato l'invito per %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha modificato l'argomento in \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha rimosso il nome della stanza.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha modificato il nome della stanza in %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha inviato un'immagine.",
     "Someone": "Qualcuno",
-    "(not supported by this browser)": "(non supportato da questo browser)",
-    "%(senderName)s answered the call.": "%(senderName)s ha risposto alla chiamata.",
-    "(could not connect media)": "(connessione del media non riuscita)",
-    "(no answer)": "(nessuna risposta)",
-    "(unknown failure: %(reason)s)": "(errore sconosciuto: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ha terminato la chiamata.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha mandato un invito a %(targetDisplayName)s per unirsi alla stanza.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento del loro invito.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento in cui sono entrati.",
@@ -184,18 +144,11 @@
     "Authentication check failed: incorrect password?": "Controllo di autenticazione fallito: password sbagliata?",
     "Failed to join room": "Accesso alla stanza fallito",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra gli orari nel formato 12 ore (es. 2:30pm)",
-    "Autoplay GIFs and videos": "Riproduzione automatica di GIF e video",
     "Enable automatic language detection for syntax highlighting": "Attiva la rilevazione automatica della lingua per l'evidenziazione della sintassi",
     "Automatically replace plain text Emoji": "Sostituisci automaticamente le emoji testuali",
     "Enable inline URL previews by default": "Attiva le anteprime URL in modo predefinito",
     "Enable URL previews for this room (only affects you)": "Attiva le anteprime URL in questa stanza (riguarda solo te)",
     "Enable URL previews by default for participants in this room": "Attiva le anteprime URL in modo predefinito per i partecipanti in questa stanza",
-    "Room Colour": "Colore della stanza",
-    "Active call (%(roomName)s)": "Chiamata attiva (%(roomName)s)",
-    "unknown caller": "Chiamante sconosciuto",
-    "Incoming voice call from %(name)s": "Telefonata in arrivo da %(name)s",
-    "Incoming video call from %(name)s": "Videochiamata in arrivo da %(name)s",
-    "Incoming call from %(name)s": "Chiamata in arrivo da %(name)s",
     "Decline": "Rifiuta",
     "Accept": "Accetta",
     "Incorrect verification code": "Codice di verifica sbagliato",
@@ -215,18 +168,9 @@
     "Change Password": "Modifica password",
     "Last seen": "Visto l'ultima volta",
     "Failed to set display name": "Impostazione nome visibile fallita",
-    "Cannot add any more widgets": "Impossibile aggiungere altri widget",
-    "The maximum permitted number of widgets have already been added to this room.": "Il numero massimo consentito di widget è già stato raggiunto in questa stanza.",
-    "Drop File Here": "Trascina file qui",
     "Drop file here to upload": "Trascina un file qui per l'invio",
-    " (unsupported)": " (non supportato)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Unisciti come <voiceText>voce</voiceText> o <videoText>video</videoText>.",
-    "%(senderName)s sent an image": "%(senderName)s ha inviato un'immagine",
-    "%(senderName)s sent a video": "%(senderName)s ha inviato un video",
-    "%(senderName)s uploaded a file": "%(senderName)s ha inviato un file",
     "Options": "Opzioni",
     "Key request sent.": "Richiesta chiave inviata.",
-    "Please select the destination room for this message": "Seleziona la stanza di destinazione per questo messaggio",
     "Disinvite": "Revoca invito",
     "Kick": "Butta fuori",
     "Disinvite this user?": "Revocare l'invito a questo utente?",
@@ -244,7 +188,7 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non potrai annullare questa modifica dato che stai promuovendo l'utente al tuo stesso grado.",
     "Unignore": "Non ignorare più",
     "Ignore": "Ignora",
-    "Mention": "Cita",
+    "Mention": "Menziona",
     "Invite": "Invita",
     "Unmute": "Togli silenzio",
     "and %(count)s others...|other": "e altri %(count)s ...",
@@ -263,10 +207,7 @@
     "Server error": "Errore del server",
     "Server unavailable, overloaded, or something else went wrong.": "Server non disponibile, sovraccarico o qualcos'altro è andato storto.",
     "Command error": "Errore nel comando",
-    "Jump to message": "Salta al messaggio",
-    "No pinned messages.": "Nessun messaggio ancorato.",
     "Loading...": "Caricamento...",
-    "Pinned Messages": "Messaggi ancorati",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)so",
@@ -288,7 +229,6 @@
     "Join Room": "Entra nella stanza",
     "Upload avatar": "Invia avatar",
     "Forget room": "Dimentica la stanza",
-    "Community Invites": "Inviti della comunità",
     "Invites": "Inviti",
     "Favourites": "Preferiti",
     "Low priority": "Bassa priorità",
@@ -306,12 +246,7 @@
     "Banned users": "Utenti banditi",
     "This room is not accessible by remote Matrix servers": "Questa stanza non è accessibile da server di Matrix remoti",
     "Leave room": "Esci dalla stanza",
-    "Guests cannot join this room even if explicitly invited.": "Gli ospiti non possono entrare in questa stanza anche se esplicitamente invitati.",
-    "Click here to fix": "Clicca qui per correggere",
-    "Who can access this room?": "Chi può accedere a questa stanza?",
     "Only people who have been invited": "Solo chi è stato invitato",
-    "Anyone who knows the room's link, apart from guests": "Chiunque conosca il link della stanza, eccetto gli ospiti",
-    "Anyone who knows the room's link, including guests": "Chiunque conosca il link della stanza, inclusi gli ospiti",
     "Publish this room to the public in %(domain)s's room directory?": "Pubblicare questa stanza nell'elenco pubblico delle stanze in %(domain)s ?",
     "Who can read history?": "Chi può leggere la cronologia?",
     "Anyone": "Chiunque",
@@ -333,7 +268,6 @@
     "URL previews are enabled by default for participants in this room.": "Le anteprime degli URL sono attive in modo predefinito per i partecipanti di questa stanza.",
     "URL previews are disabled by default for participants in this room.": "Le anteprime degli URL sono inattive in modo predefinito per i partecipanti di questa stanza.",
     "URL Previews": "Anteprime URL",
-    "Error decrypting audio": "Errore decifratura audio",
     "Error decrypting attachment": "Errore decifratura allegato",
     "Decrypt %(text)s": "Decifra %(text)s",
     "Download %(text)s": "Scarica %(text)s",
@@ -347,8 +281,6 @@
     "Failed to copy": "Copia fallita",
     "Add an Integration": "Aggiungi un'integrazione",
     "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?": "Stai per essere portato in un sito di terze parti per autenticare il tuo account da usare con %(integrationsUrl)s. Vuoi continuare?",
-    "An email has been sent to %(emailAddress)s": "È stata inviata un'email a %(emailAddress)s",
-    "Please check your email to continue registration.": "Controlla la tua email per continuare la registrazione.",
     "Token incorrect": "Token errato",
     "A text message has been sent to %(msisdn)s": "È stato inviato un messaggio di testo a %(msisdn)s",
     "Please enter the code it contains:": "Inserisci il codice contenuto:",
@@ -356,7 +288,6 @@
     "Sign in with": "Accedi con",
     "Email address": "Indirizzo email",
     "Sign in": "Accedi",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se non specifichi un indirizzo email, non potrai reimpostare la password. Sei sicuro?",
     "Remove from community": "Rimuovi dalla comunità",
     "Disinvite this user from community?": "Revocare l'invito di questo utente alla comunità?",
     "Remove this user from community?": "Rimuovere questo utente dalla comunità?",
@@ -378,15 +309,12 @@
     "Display your community flair in rooms configured to show it.": "Mostra la tua predisposizione di comunità nelle stanze configurate per mostrarla.",
     "You're not currently a member of any communities.": "Attualmente non sei membro di alcuna comunità.",
     "Unknown Address": "Indirizzo sconosciuto",
-    "Allow": "Permetti",
     "Delete Widget": "Elimina widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "L'eliminazione di un widget lo rimuove per tutti gli utenti della stanza. Sei sicuro di eliminare il widget?",
     "Delete widget": "Elimina widget",
-    "Minimize apps": "Riduci le app",
     "No results": "Nessun risultato",
     "Communities": "Comunità",
     "Home": "Inizio",
-    "Manage Integrations": "Gestisci integrazioni",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)ssono entrati %(count)s volte",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)ssono entrati",
@@ -444,8 +372,6 @@
     "Custom level": "Livello personalizzato",
     "<a>In reply to</a> <pill>": "<a>In risposta a</a> <pill>",
     "And %(count)s more...|other": "E altri %(count)s ...",
-    "ex. @bob:example.com": "es. @mario:esempio.it",
-    "Add User": "Aggiungi utente",
     "Matrix ID": "ID Matrix",
     "Matrix Room ID": "ID stanza Matrix",
     "email address": "indirizzo email",
@@ -477,21 +403,9 @@
     "Unable to verify email address.": "Impossibile verificare l'indirizzo email.",
     "This will allow you to reset your password and receive notifications.": "Ciò ti permetterà di reimpostare la tua password e ricevere notifiche.",
     "Skip": "Salta",
-    "Username not available": "Nome utente non disponibile",
-    "Username invalid: %(errMessage)s": "Nome utente non valido: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Si è verificato un errore: %(error_string)s",
-    "Username available": "Nome utente disponibile",
-    "To get started, please pick a username!": "Per iniziare, scegli un nome utente!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Questo sarà il tuo account nell'homeserver <span></span>, o puoi scegliere un <a>server diverso</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Se invece hai già un account Matrix puoi <a>accedere</a>.",
-    "Private Chat": "Conversazione privata",
-    "Public Chat": "Chat pubblica",
-    "Custom": "Personalizzato",
     "Name": "Nome",
     "You must <a>register</a> to use this functionality": "Devi <a>registrarti</a> per usare questa funzionalità",
     "You must join the room to see its files": "Devi entrare nella stanza per vederne i file",
-    "There are no visible files in this room": "Non ci sono file visibili in questa stanza",
-    "<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 per la pagina della tua comunità</h1>\n<p>\n    Usa la descrizione estesa per introdurre i nuovi membri alla comunità, o distribuisci\n    alcuni <a href=\"foo\">link</a> importanti\n</p>\n<p>\n    Puoi anche usare i tag 'img'\n</p>\n",
     "Add rooms to the community summary": "Aggiungi stanze nel sommario della comunità",
     "Which rooms would you like to add to this summary?": "Quali stanze vorresti aggiungere a questo sommario?",
     "Add to summary": "Aggiungi al sommario",
@@ -529,7 +443,6 @@
     "Failed to reject invitation": "Rifiuto dell'invito fallito",
     "This room is not public. You will not be able to rejoin without an invite.": "Questa stanza non è pubblica. Non potrai rientrare senza un invito.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Sei sicuro di volere uscire dalla stanza '%(roomName)s'?",
-    "Failed to leave room": "Uscita dalla stanza fallita",
     "Signed Out": "Disconnesso",
     "For security, this session has been signed out. Please sign in again.": "Per sicurezza questa sessione è stata disconnessa. Accedi di nuovo.",
     "Old cryptography data detected": "Rilevati dati di crittografia obsoleti",
@@ -537,19 +450,11 @@
     "Logout": "Disconnetti",
     "Your Communities": "Le tue comunità",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sapevi che: puoi usare le comunità per filtrare la tua esperienza su %(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.": "Per impostare un filtro, trascina l'avatar di una comunità sul pannello dei filtri a sinistra dello schermo. Puoi cliccare un avatar nel pannello dei filtri quando vuoi per vedere solo le stanze e le persone associate a quella comunità.",
     "Error whilst fetching joined communities": "Errore nella rilevazione delle comunità a cui ti sei unito",
     "Create a new community": "Crea una nuova comunità",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunità per raggruppare utenti e stanze! Crea una pagina iniziale personalizzata per stabilire il tuo spazio nell'universo di Matrix.",
-    "You have no visible notifications": "Non hai alcuna notifica visibile",
-    "%(count)s of your messages have not been sent.|other": "Alcuni dei tuoi messaggi non sono stati inviati.",
-    "%(count)s of your messages have not been sent.|one": "Il tuo messaggio non è stato inviato.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reinvia tutti</resendText> o <cancelText>annulla tutti</cancelText> adesso. Puoi anche selezionare i singoli messaggi da reinviare o annullare.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reinvia messaggio</resendText> o <cancelText>annulla messaggio</cancelText> adesso.",
     "Connectivity to the server has been lost.": "Connessione al server persa.",
     "Sent messages will be stored until your connection has returned.": "I messaggi inviati saranno salvati fino al ritorno della connessione.",
-    "Active call": "Chiamata attiva",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Non c'è nessun altro qui! Vorresti <inviteText>invitare altri</inviteText> o <nowarnText>fermare l'avviso sulla stanza vuota</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Sembra che tu stia inviando file, sei sicuro di volere uscire?",
     "You seem to be in a call, are you sure you want to quit?": "Sembra che tu sia in una chiamata, sei sicuro di volere uscire?",
     "Search failed": "Ricerca fallita",
@@ -557,14 +462,9 @@
     "No more results": "Nessun altro risultato",
     "Room": "Stanza",
     "Failed to reject invite": "Rifiuto dell'invito fallito",
-    "Fill screen": "Riempi schermo",
-    "Click to unmute video": "Clicca per attivare l'audio del video",
-    "Click to mute video": "Clicca per silenziare il video",
-    "Click to unmute audio": "Clicca per attivare l'audio",
-    "Click to mute audio": "Clicca per silenziare l'audio",
     "Clear filter": "Annulla filtro",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non hai l'autorizzazione per vedere il messaggio in questione.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non si è trovato.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non è stato trovato.",
     "Failed to load timeline position": "Caricamento posizione cronologica fallito",
     "Uploading %(filename)s and %(count)s others|other": "Invio di %(filename)s e altri %(count)s",
     "Uploading %(filename)s and %(count)s others|zero": "Invio di %(filename)s",
@@ -575,7 +475,6 @@
     "<not supported>": "<non supportato>",
     "Import E2E room keys": "Importa chiavi E2E stanza",
     "Cryptography": "Crittografia",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Se hai segnalato un errore via Github, i log di debug possono aiutarci a identificare il problema. I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati e i nomi degli altri utenti. Non contengono messaggi.",
     "Submit debug logs": "Invia log di debug",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s raccoglie statistiche anonime per permetterci di migliorare l'applicazione.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Diamo importanza alla privacy, perciò non raccogliamo dati personali o identificabili per le nostre statistiche.",
@@ -587,11 +486,8 @@
     "No media permissions": "Nessuna autorizzazione per i media",
     "Email": "Email",
     "Profile": "Profilo",
-    "click to reveal": "clicca per mostrare",
     "Homeserver is": "L'homeserver è",
-    "Identity Server is": "Il server di identità è",
     "%(brand)s version:": "versione %(brand)s:",
-    "olm version:": "versione olm:",
     "Failed to send email": "Invio dell'email fallito",
     "The email address linked to your account must be entered.": "Deve essere inserito l'indirizzo email collegato al tuo account.",
     "A new password must be entered.": "Deve essere inserita una nuova password.",
@@ -602,14 +498,9 @@
     "Send Reset Email": "Invia email di ripristino",
     "Incorrect username and/or password.": "Nome utente e/o password sbagliati.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Nota che stai accedendo nel server %(hs)s , non matrix.org.",
-    "The phone number entered looks invalid": "Il numero di telefono inserito sembra non valido",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Questo home server non offre alcuna procedura di accesso supportata da questo client.",
-    "Error: Problem communicating with the given homeserver.": "Errore: problema di comunicazione con l'homeserver dato.",
     "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>.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o <a>attiva gli script non sicuri</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il <a>certificato SSL dell'homeserver</a> sia fidato e che un'estensione del browser non stia bloccando le richieste.",
-    "Failed to fetch avatar URL": "Ricezione URL dell'avatar fallita",
-    "Set a display name:": "Imposta un nome visualizzato:",
-    "Upload an avatar:": "Invia un avatar:",
     "This server does not support authentication with a phone number.": "Questo server non supporta l'autenticazione tramite numero di telefono.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto da %(displayName)s (%(userName)s) alle %(dateTime)s",
     "Displays action": "Mostra l'azione",
@@ -619,12 +510,10 @@
     "Invites user with given id to current room": "Invita l'utente per ID alla stanza attuale",
     "Kicks user with given id": "Caccia un utente per ID",
     "Changes your display nickname": "Modifica il tuo nick visualizzato",
-    "Searches DuckDuckGo for results": "Cerca risultati su DuckDuckGo",
     "Ignores a user, hiding their messages from you": "Ignora un utente, non mostrandoti i suoi messaggi",
     "Stops ignoring a user, showing their messages going forward": "Smetti di ignorare un utente, mostrando i suoi messaggi successivi",
     "Opens the Developer Tools dialog": "Apre la finestra di strumenti per sviluppatori",
     "Commands": "Comandi",
-    "Results from DuckDuckGo": "Risultati da DuckDuckGo",
     "Emoji": "Emoji",
     "Notify the whole room": "Notifica l'intera stanza",
     "Room Notification": "Notifica della stanza",
@@ -659,13 +548,9 @@
     "Everyone": "Tutti",
     "Fetching third party location failed": "Rilevazione posizione di terze parti fallita",
     "Send Account Data": "Invia dati account",
-    "Advanced notification settings": "Impostazioni di notifica avanzate",
-    "Uploading report": "Sto caricando il report",
     "Sunday": "Domenica",
     "Notification targets": "Obiettivi di notifica",
     "Today": "Oggi",
-    "Files": "File",
-    "You are not receiving desktop notifications": "Non stai ricevendo le notifiche sul desktop",
     "Friday": "Venerdì",
     "Update": "Aggiornamento",
     "%(brand)s does not know how to join a room on this network": "%(brand)s non sa come entrare nella stanza su questa rete",
@@ -673,24 +558,13 @@
     "Changelog": "Cambiamenti",
     "Waiting for response from server": "In attesa di una risposta dal server",
     "Send Custom Event": "Invia evento personalizzato",
-    "All notifications are currently disabled for all targets.": "Tutte le notifiche sono disabilitate per tutti gli obbiettivi.",
     "Failed to send logs: ": "Invio dei log fallito: ",
-    "Forget": "Dimentica",
-    "You cannot delete this image. (%(code)s)": "Non puoi eliminare quest'immagine. (%(code)s)",
-    "Cancel Sending": "Annulla invio",
     "This Room": "Questa stanza",
     "Noisy": "Rumoroso",
-    "Error saving email notification preferences": "Errore nel salvataggio delle preferenze di notifica email",
     "Messages containing my display name": "Messaggi contenenti il mio nome visualizzato",
     "Messages in one-to-one chats": "Messaggi in chat uno-a-uno",
     "Unavailable": "Non disponibile",
-    "View Decrypted Source": "Visualizza sorgente decifrato",
-    "Failed to update keywords": "Impossibile aggiornare le parole chiave",
     "remove %(name)s from the directory.": "rimuovi %(name)s dalla lista.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Le notifiche alle seguenti parole chiave seguono regole che non possono essere mostrate qui:",
-    "Please set a password!": "Imposta una password!",
-    "You have successfully set a password!": "Hai impostato una password con successo!",
-    "An error occurred whilst saving your email notification preferences.": "Si è verificato un errore durante il salvataggio delle tue preferenze sulle notifiche email.",
     "Explore Room State": "Esplora stato stanza",
     "Source URL": "URL d'origine",
     "Messages sent by bot": "Messaggi inviati dai bot",
@@ -699,35 +573,22 @@
     "No update available.": "Nessun aggiornamento disponibile.",
     "Resend": "Reinvia",
     "Collecting app version information": "Raccolta di informazioni sulla versione dell'applicazione",
-    "Keywords": "Parole chiave",
-    "Enable notifications for this account": "Abilita le notifiche per questo account",
     "Invite to this community": "Invita a questa comunità",
-    "Messages containing <span>keywords</span>": "Messaggi contenenti <span>parole chiave</span>",
     "Room not found": "Stanza non trovata",
     "Tuesday": "Martedì",
-    "Enter keywords separated by a comma:": "Inserisci le parole chiave separate da virgole:",
     "Search…": "Cerca…",
-    "You have successfully set a password and an email address!": "Hai impostato con successo una password e un indirizzo email!",
     "Remove %(name)s from the directory?": "Rimuovere %(name)s dalla lista?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilizza molte funzioni avanzate del browser, alcune delle quali non sono disponibili o sono sperimentali nel tuo browser attuale.",
     "Developer Tools": "Strumenti per sviluppatori",
     "Preparing to send logs": "Preparazione invio dei log",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Ricorda, puoi sempre specificare un indirizzo email nelle impostazioni utente se cambi idea.",
     "Explore Account Data": "Esplora dati account",
-    "All messages (noisy)": "Tutti i messaggi (rumoroso)",
     "Saturday": "Sabato",
-    "I understand the risks and wish to continue": "Capisco i rischi e desidero continuare",
-    "Direct Chat": "Chat Diretta",
     "The server may be unavailable or overloaded": "Il server potrebbe essere non disponibile o sovraccarico",
     "Reject": "Rifiuta",
-    "Failed to set Direct Message status of room": "Impossibile impostare lo stato di Messaggio Diretto alla stanza",
     "Monday": "Lunedì",
     "Remove from Directory": "Rimuovi dalla lista",
-    "Enable them now": "Abilitale adesso",
     "Toolbox": "Strumenti",
     "Collecting logs": "Sto recuperando i log",
     "You must specify an event type!": "Devi specificare un tipo di evento!",
-    "(HTTP status %(httpStatus)s)": "(stato HTTP %(httpStatus)s)",
     "All Rooms": "Tutte le stanze",
     "Wednesday": "Mercoledì",
     "You cannot delete this message. (%(code)s)": "Non puoi eliminare questo messaggio. (%(code)s)",
@@ -739,51 +600,33 @@
     "State Key": "Chiave dello stato",
     "Failed to send custom event.": "Impossibile inviare evento personalizzato.",
     "What's new?": "Cosa c'è di nuovo?",
-    "Notify me for anything else": "Notificami per qualsiasi altra cosa",
     "When I'm invited to a room": "Quando vengo invitato/a in una stanza",
-    "Can't update user notification settings": "Impossibile aggiornare le impostazioni di notifica dell'utente",
-    "Notify for all other messages/rooms": "Notifica per tutti gli altri messaggi/stanze",
     "Unable to look up room ID from server": "Impossibile consultare l'ID stanza dal server",
     "Couldn't find a matching Matrix room": "Impossibile trovare una stanza Matrix corrispondente",
     "Invite to this room": "Invita in questa stanza",
     "Thursday": "Giovedì",
-    "Forward Message": "Inoltra messaggio",
     "Logs sent": "Log inviati",
     "Back": "Indietro",
-    "Failed to change settings": "Impossibile modificare le impostazioni",
     "Reply": "Rispondi",
     "Show message in desktop notification": "Mostra i messaggi nelle notifiche desktop",
-    "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.": "I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati e i nomi degli altri utenti. Non contengono messaggi.",
-    "Unhide Preview": "Mostra anteprima",
     "Unable to join network": "Impossibile collegarsi alla rete",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Spiacenti, ma il tuo browser <b>non</b>  è in grado di utilizzare %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Caricato il %(date)s da %(user)s",
     "Messages in group chats": "Messaggi nelle chat di gruppo",
     "Yesterday": "Ieri",
     "Error encountered (%(errorDetail)s).": "Errore riscontrato (%(errorDetail)s).",
     "Low Priority": "Priorità bassa",
     "What's New": "Novità",
-    "Set Password": "Imposta Password",
     "Off": "Spento",
-    "Mentions only": "Solo le citazioni",
-    "You can now return to your account after signing out, and sign in on other devices.": "Ora puoi tornare al tuo account dopo esserti disconnesso e accedere su altri dispositivi.",
-    "Enable email notifications": "Abilita le notifiche email",
     "Event Type": "Tipo di Evento",
-    "Download this file": "Scarica questo file",
-    "Pin Message": "Blocca messaggio",
     "Thank you!": "Grazie!",
     "View Community": "Vedi la comunità",
     "Event sent!": "Evento inviato!",
     "View Source": "Visualizza sorgente",
     "Event Content": "Contenuto dell'Evento",
-    "Unable to fetch notification target list": "Impossibile ottenere la lista di obiettivi notifiche",
-    "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!": "Con il tuo attuale browser, l'aspetto e la sensazione generale dell'applicazione potrebbero essere completamente sbagliati e alcune delle funzionalità potrebbero non funzionare. Se vuoi provare comunque puoi continuare, ma non riceverai aiuto per qualsiasi problema tu possa riscontrare!",
     "Checking for an update...": "Controllo aggiornamenti...",
     "Every page you use in the app": "Ogni pagina che usi nell'app",
     "e.g. <CurrentPageURL>": "es. <CurrentPageURL>",
     "Your device resolution": "La risoluzione del dispositivo",
     "Missing roomId.": "ID stanza mancante.",
-    "Always show encryption icons": "Mostra sempre icone di crittografia",
     "Enable widget screenshots on supported widgets": "Attiva le schermate dei widget sui widget supportati",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossibile caricare l'evento a cui si è risposto, o non esiste o non hai il permesso di visualizzarlo.",
     "Refresh": "Aggiorna",
@@ -792,7 +635,6 @@
     "Clear Storage and Sign Out": "Elimina l'archiviazione e disconnetti",
     "Send Logs": "Invia i log",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare l'archiviazione del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
-    "Collapse Reply Thread": "Riduci finestra di risposta",
     "e.g. %(exampleValue)s": "es. %(exampleValue)s",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Il tuo account sarà permanentemente inutilizzabile. Non potrai accedere e nessuno potrà ri-registrare lo stesso ID utente. Il tuo account abbandonerà tutte le stanze a cui partecipa e i dettagli del tuo account saranno rimossi dal server di identità. <b>Questa azione è irreversibile.</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.": "Disattivare il tuo account <b>non eliminerà in modo predefinito i messaggi che hai inviato</b>. Se vuoi che noi dimentichiamo i tuoi messaggi, seleziona la casella sotto.",
@@ -817,12 +659,8 @@
     "Share Community": "Condividi comunità",
     "Share Room Message": "Condividi messaggio stanza",
     "Link to selected message": "Link al messaggio selezionato",
-    "COPY": "COPIA",
-    "Share Message": "Condividi messaggio",
     "No Audio Outputs detected": "Nessuna uscita audio rilevata",
     "Audio Output": "Uscita audio",
-    "Call in Progress": "Chiamata in corso",
-    "A call is already in progress!": "Una chiamata è già in corso!",
     "Permission Required": "Permesso richiesto",
     "You do not have permission to start a conference call in this room": "Non hai il permesso di avviare una chiamata di gruppo in questa stanza",
     "This event could not be displayed": "Questo evento non può essere mostrato",
@@ -830,14 +668,8 @@
     "Demote": "Declassa",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Nelle stanze criptate, come questa, le anteprime degli URL sono disabilitate di default per garantire che il tuo server di casa (dove vengono generate le anteprime) non possa raccogliere informazioni sui collegamenti che vedi in questa stanza.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quando qualcuno inserisce un URL nel proprio messaggio, è possibile mostrare un'anteprima dell'URL per fornire maggiori informazioni su quel collegamento, come il titolo, la descrizione e un'immagine dal sito web.",
-    "The email field must not be blank.": "Il campo email non deve essere vuoto.",
-    "The phone number field must not be blank.": "Il campo telefono non deve essere vuoto.",
-    "The password field must not be blank.": "Il campo passwordl non deve essere vuoto.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non puoi inviare alcun messaggio fino a quando non leggi ed accetti <consentLink>i nostri termini e condizioni</consentLink>.",
-    "A call is currently being placed!": "Attualmente c'è una chiamata in corso!",
     "System Alerts": "Avvisi di sistema",
-    "Failed to remove widget": "Rimozione del widget fallita",
-    "An error ocurred whilst trying to remove the widget from the room": "Si è verificato un errore tentando di rimuovere il widget dalla stanza",
     "Only room administrators will see this warning": "Solo gli amministratori della stanza vedranno questo avviso",
     "Please <a>contact your service administrator</a> to continue using the service.": "<a>Contatta l'amministratore del servizio</a> per continuare ad usarlo.",
     "This homeserver has hit its Monthly Active User limit.": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili.",
@@ -909,8 +741,6 @@
     "Unknown server error": "Errore sconosciuto del server",
     "Delete Backup": "Elimina backup",
     "Unable to load key backup status": "Impossibile caricare lo stato del backup delle chiavi",
-    "Backup version: ": "Versione backup: ",
-    "Algorithm: ": "Algoritmo: ",
     "Please review and accept all of the homeserver's policies": "Si prega di rivedere e accettare tutte le politiche dell'homeserver",
     "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": "Per evitare di perdere la cronologia della chat, devi esportare le tue chiavi della stanza prima di uscire. Dovrai tornare alla versione più recente di %(brand)s per farlo",
     "Incompatible Database": "Database non compatibile",
@@ -919,12 +749,7 @@
     "Unable to restore backup": "Impossibile ripristinare il backup",
     "No backup found!": "Nessun backup trovato!",
     "Failed to decrypt %(failedCount)s sessions!": "Decifrazione di %(failedCount)s sessioni fallita!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua password di recupero.",
     "Next": "Avanti",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se hai dimenticato la password di recupero puoi <button1>usare la tua chiave di recupero</button1> o <button2>impostare nuove opzioni di recupero</button2>",
-    "This looks like a valid recovery key!": "Sembra essere una chiave di recupero valida!",
-    "Not a valid recovery key": "Non è una chiave di recupero valida",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua chiave di recupero.",
     "Failed to load group members": "Caricamento membri del gruppo fallito",
     "Failed to perform homeserver discovery": "Ricerca dell'homeserver fallita",
     "Invalid homeserver discovery response": "Risposta della ricerca homeserver non valida",
@@ -939,16 +764,11 @@
     "Set up Secure Message Recovery": "Imposta ripristino sicuro dei messaggi",
     "Unable to create key backup": "Impossibile creare backup della chiave",
     "Retry": "Riprova",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostra un promemoria per attivare il ripristino sicuro dei messaggi nelle stanze cifrate",
-    "Don't ask again": "Non chiedere più",
     "Set up": "Imposta",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Se non imposti il ripristino sicuro dei messaggi, perderai la cronologia sicura dei messaggi quando ti disconnetti.",
-    "If you don't want to set this up now, you can later in Settings.": "Se non vuoi impostarlo ora, è possibile farlo in seguito nelle impostazioni.",
     "Messages containing @room": "Messaggi contenenti @room",
     "Encrypted messages in one-to-one chats": "Messaggi cifrati in chat uno-ad-uno",
     "Encrypted messages in group chats": "Messaggi cifrati in chat di gruppo",
     "That doesn't look like a valid email address": "Non sembra essere un indirizzo email valido",
-    "Checking...": "Controllo...",
     "Invalid identity server discovery response": "Risposta non valida cercando server di identità",
     "General failure": "Guasto generale",
     "Straight rows of keys are easy to guess": "Sequenze di tasti in riga sono facili da indovinare",
@@ -1000,11 +820,10 @@
     "Show avatar changes": "Mostra i cambi di avatar",
     "Show display name changes": "Mostra i cambi di nomi visualizzati",
     "Show read receipts sent by other users": "Mostra ricevute di lettura inviate da altri utenti",
-    "Show avatars in user and room mentions": "Mostra gli avatar nelle citazioni di utenti e stanze",
+    "Show avatars in user and room mentions": "Mostra gli avatar nelle menzioni di utenti e stanze",
     "Enable big emoji in chat": "Attiva gli emoji grandi in chat",
     "Send typing notifications": "Invia notifiche di scrittura",
     "Enable Community Filter Panel": "Attiva il pannello dei filtri di comunità",
-    "Allow Peer-to-Peer for 1:1 calls": "Permetti il peer-to-peer per chiamate 1:1",
     "Messages containing my username": "Messaggi contenenti il mio nome utente",
     "The other party cancelled the verification.": "L'altra parte ha annullato la verifica.",
     "Verified!": "Verificato!",
@@ -1088,7 +907,6 @@
     "Backing up %(sessionsRemaining)s keys...": "Copia di %(sessionsRemaining)s chiavi...",
     "All keys backed up": "Tutte le chiavi sono state copiate",
     "Start using Key Backup": "Inizia ad usare il backup chiavi",
-    "Add an email address to configure email notifications": "Aggiungi un indirizzo email per configurare le notifiche via email",
     "Unable to verify phone number.": "Impossibile verificare il numero di telefono.",
     "Verification code": "Codice di verifica",
     "Phone Number": "Numero di telefono",
@@ -1119,7 +937,6 @@
     "Ignored users": "Utenti ignorati",
     "Bulk options": "Opzioni generali",
     "Accept all %(invitedRooms)s invites": "Accetta tutti i %(invitedRooms)s inviti",
-    "Key backup": "Backup chiavi",
     "Security & Privacy": "Sicurezza e privacy",
     "Missing media permissions, click the button below to request.": "Autorizzazione multimediale mancante, clicca il pulsante sotto per richiederla.",
     "Request media permissions": "Richiedi autorizzazioni multimediali",
@@ -1143,7 +960,6 @@
     "Change settings": "Modifica impostazioni",
     "Kick users": "Butta fuori utenti",
     "Ban users": "Bandisci utenti",
-    "Remove messages": "Rimuovi messaggi",
     "Notify everyone": "Notifica tutti",
     "Send %(eventType)s events": "Invia eventi %(eventType)s",
     "Roles & Permissions": "Ruoli e permessi",
@@ -1154,11 +970,6 @@
     "Encryption": "Crittografia",
     "Once enabled, encryption cannot be disabled.": "Una volta attivata, la crittografia non può essere disattivata.",
     "Encrypted": "Cifrato",
-    "Never lose encrypted messages": "Non perdere mai i messaggi cifrati",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "I messaggi in questa stanza sono protetti con crittografia end-to-end. Solo tu e i destinatari avete le chiavi per leggere questi messaggi.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Fai una copia sicura delle chiavi per evitare di perderle. <a>Maggiori informazioni.</a>",
-    "Not now": "Non ora",
-    "Don't ask me again": "Non chiedermelo più",
     "Error updating main address": "Errore di aggiornamento indirizzo principale",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Si è verificato un errore aggiornando l'indirizzo principale della stanza. Potrebbe non essere permesso dal server o un problema temporaneo.",
     "Main address": "Indirizzo principale",
@@ -1176,46 +987,25 @@
     "Manually export keys": "Esporta le chiavi manualmente",
     "You'll lose access to your encrypted messages": "Perderai l'accesso ai tuoi messaggi cifrati",
     "Are you sure you want to sign out?": "Sei sicuro di volerti disconnettere?",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Se ti imbatti in qualche errore o hai opinioni che vorresti condividere, faccelo sapere su GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Per evitare segnalazioni doppie, prima <existingIssuesLink>vedi i problemi esistenti</existingIssuesLink> (e aggiungi un +1) o <newIssueLink>segnala un nuovo problema</newIssueLink> se non riesci a trovarlo.",
-    "Report bugs & give feedback": "Segnala errori e dai opinioni",
     "Go back": "Torna",
     "Room Settings - %(roomName)s": "Impostazioni stanza - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Un nome utente può contenere solo minuscole, numeri e '=_-./'",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Attenzione</b>: dovresti impostare il backup chiavi solo da un computer fidato.",
-    "Share Permalink": "Condividi permalink",
     "Update status": "Stato aggiornamento",
     "Set status": "Imposta stato",
     "Hide": "Nascondi",
     "This homeserver would like to make sure you are not a robot.": "Questo homeserver vorrebbe assicurarsi che non sei un robot.",
-    "Your Modular server": "Il tuo server Modular",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Inserisci l'indirizzo del tuo homeserver Modular. Potrebbe usare il tuo nome di dominio o essere un sottodominio di <a>modular.im</a>.",
-    "Server Name": "Nome server",
-    "The username field must not be blank.": "Il campo nome utente non deve essere vuoto.",
     "Username": "Nome utente",
-    "Not sure of your password? <a>Set a new one</a>": "Non sei sicuro della tua password? <a>Impostane una nuova</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Accedi al tuo account Matrix su %(serverName)s",
     "Change": "Cambia",
-    "Create your Matrix account on %(serverName)s": "Crea il tuo account Matrix su %(serverName)s",
     "Email (optional)": "Email (facoltativa)",
     "Phone (optional)": "Telefono (facoltativo)",
     "Confirm": "Conferma",
-    "Other servers": "Altri server",
-    "Homeserver URL": "URL homeserver",
-    "Identity Server URL": "URL server identità",
-    "Free": "Gratuito",
     "Join millions for free on the largest public server": "Unisciti gratis a milioni nel più grande server pubblico",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Hosting premium per organizzazioni <a>Maggior informazioni</a>",
     "Other": "Altro",
-    "Find other public servers or use a custom server": "Trova altri server pubblici o usane uno personale",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installa <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una migliore esperienza.",
     "Couldn't load page": "Caricamento pagina fallito",
     "Want more than a community? <a>Get your own server</a>": "Vuoi più di una comunità? <a>Ottieni il tuo server personale</a>",
     "This homeserver does not support communities": "Questo homeserver non supporta le comunità",
     "Guest": "Ospite",
     "Could not load user profile": "Impossibile caricare il profilo utente",
-    "Your Matrix account on %(serverName)s": "Il tuo account Matrix su %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Ti verrà inviata un'email di verifica per confermare la tua nuova password.",
     "Sign in instead": "Oppure accedi",
     "Your password has been reset.": "La tua password è stata reimpostata.",
@@ -1224,13 +1014,11 @@
     "Create account": "Crea account",
     "Registration has been disabled on this homeserver.": "La registrazione è stata disattivata su questo homeserver.",
     "Unable to query for supported registration methods.": "Impossibile richiedere i metodi di registrazione supportati.",
-    "Create your account": "Crea il tuo account",
     "Keep going...": "Continua...",
     "For maximum security, this should be different from your account password.": "Per la massima sicurezza, questa dovrebbe essere diversa dalla password del tuo account.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Il backup delle chiavi è in corso (il primo backup potrebbe richiedere qualche minuto).",
     "Starting backup...": "Avvio del backup...",
     "Success!": "Completato!",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Sono state rilevate una nuova password di ripristino e una chiave per i messaggi sicuri.",
     "Recovery Method Removed": "Metodo di ripristino rimosso",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se non hai rimosso il metodo di ripristino, è possibile che un aggressore stia cercando di accedere al tuo account. Cambia la password del tuo account e imposta immediatamente un nuovo metodo di recupero nelle impostazioni.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Attenzione</b>: aggiornare una stanza <i>non migrerà automaticamente i membri della stanza alla nuova versione.</i> Inseriremo un link alla nuova stanza nella vecchia versione - i membri dovranno cliccare questo link per unirsi alla nuova stanza.",
@@ -1245,11 +1033,7 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Impossibile revocare l'invito. Il server potrebbe avere un problema temporaneo o non si dispone di autorizzazioni sufficienti per revocare l'invito.",
     "Revoke invite": "Revoca invito",
     "Invited by %(sender)s": "Invitato da %(sender)s",
-    "Maximize apps": "Espandi le app",
-    "A widget would like to verify your identity": "Un widget vorrebbe verificare la tua identità",
-    "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 su %(widgetUrl)s vorrebbe verificare la tua identità. Se lo permetti, il widget sarà in grado di verificare il tuo ID utente, ma non di compiere azioni come te.",
     "Remember my selection for this widget": "Ricorda la mia scelta per questo widget",
-    "Deny": "Nega",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s non è riuscito ad ottenere l'elenco di protocolli dall'homeserver. L'homeserver potrebbe essere troppo vecchio per supportare reti di terze parti.",
     "%(brand)s failed to get the public room list.": "%(brand)s non è riuscito ad ottenere l'elenco di stanze pubbliche.",
     "The homeserver may be unavailable or overloaded.": "L'homeserver potrebbe non essere disponibile o sovraccarico.",
@@ -1266,7 +1050,7 @@
     "Sends the given message coloured as a rainbow": "Invia il messaggio dato colorato come un arcobaleno",
     "Sends the given emote coloured as a rainbow": "Invia l'emoticon dato colorato come un arcobaleno",
     "The user's homeserver does not support the version of the room.": "L'homeserver dell'utente non supporta la versione della stanza.",
-    "Show hidden events in timeline": "Mostra eventi nascosti nella timeline",
+    "Show hidden events in timeline": "Mostra eventi nascosti nella linea temporale",
     "When rooms are upgraded": "Quando le stanze vengono aggiornate",
     "this room": "questa stanza",
     "View older messages in %(roomName)s.": "Vedi messaggi più vecchi in %(roomName)s.",
@@ -1298,9 +1082,7 @@
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>ha reagito con %(shortName)s</reactedWith>",
     "edited": "modificato",
     "Rotate Left": "Ruota a sinistra",
-    "Rotate counter-clockwise": "Ruota in senso antiorario",
     "Rotate Right": "Ruota a destra",
-    "Rotate clockwise": "Ruota in senso orario",
     "Edit message": "Modifica messaggio",
     "GitHub issue": "Segnalazione GitHub",
     "Notes": "Note",
@@ -1330,11 +1112,9 @@
     "Passwords don't match": "Le password non corrispondono",
     "Other users can invite you to rooms using your contact details": "Altri utenti ti possono invitare nelle stanze usando i tuoi dettagli di contatto",
     "Enter phone number (required on this homeserver)": "Inserisci numero di telefono (necessario in questo homeserver)",
-    "Doesn't look like a valid phone number": "Non sembra essere un numero di telefono valido",
     "Enter username": "Inserisci nome utente",
     "Some characters not allowed": "Alcuni caratteri non sono permessi",
     "Add room": "Aggiungi stanza",
-    "Your profile": "Il tuo profilo",
     "Failed to get autodiscovery configuration from server": "Ottenimento automatico configurazione dal server fallito",
     "Invalid base_url for m.homeserver": "Base_url per m.homeserver non valido",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "L'URL dell'homeserver non sembra essere un homeserver Matrix valido",
@@ -1342,11 +1122,6 @@
     "Identity server URL does not appear to be a valid identity server": "L'URL del server di identità non sembra essere un server di identità valido",
     "No homeserver URL provided": "Nessun URL homeserver fornito",
     "Unexpected error resolving homeserver configuration": "Errore inaspettato nella risoluzione della configurazione homeserver",
-    "Unable to validate homeserver/identity server": "Impossibile validare l'homeserver/il server di identità",
-    "Sign in to your Matrix account on <underlinedServerName />": "Accedi al tuo account Matrix su <underlinedServerName />",
-    "Create your Matrix account on <underlinedServerName />": "Crea il tuo account Matrix su <underlinedServerName />",
-    "Your Matrix account on <underlinedServerName />": "Il tuo account Matrix su <underlinedServerName />",
-    "Low bandwidth mode": "Modalità larghezza di banda bassa",
     "Uploaded sound": "Suono inviato",
     "Sounds": "Suoni",
     "Notification sound": "Suoni di notifica",
@@ -1372,16 +1147,13 @@
     "Edited at %(date)s. Click to view edits.": "Modificato alle %(date)s. Clicca per vedere le modifiche.",
     "Message edits": "Modifiche del messaggio",
     "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:": "Per aggiornare questa stanza devi chiudere l'istanza attuale e creare una nuova stanza al suo posto. Per offrire la migliore esperienza possibile ai membri della stanza:",
-    "%(senderName)s made no change.": "%(senderName)s non ha fatto modifiche.",
     "Loading room preview": "Caricamento anteprima stanza",
     "Show all": "Mostra tutto",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)snon hanno fatto modifiche %(count)s volte",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)snon hanno fatto modifiche",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snon ha fatto modifiche %(count)s volte",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snon ha fatto modifiche",
-    "Resend edit": "Reinvia la modifica",
     "Resend %(unsentCount)s reaction(s)": "Reinvia %(unsentCount)s reazione/i",
-    "Resend removal": "Reinvia la rimozione",
     "Changes your avatar in all rooms": "Cambia il tuo avatar in tutte le stanze",
     "Your homeserver doesn't seem to support this feature.": "Il tuo homeserver non sembra supportare questa funzione.",
     "You're signed out": "Sei disconnesso",
@@ -1395,7 +1167,6 @@
     "Sign in and regain access to your account.": "Accedi ed ottieni l'accesso al tuo account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Non puoi accedere al tuo account. Contatta l'admin del tuo homeserver per maggiori informazioni.",
     "Clear personal data": "Elimina dati personali",
-    "Identity Server": "Server identità",
     "Find others by phone or email": "Trova altri per telefono o email",
     "Be found by phone or email": "Trovato per telefono o email",
     "Use bots, bridges, widgets and sticker packs": "Usa bot, bridge, widget e pacchetti di adesivi",
@@ -1410,18 +1181,13 @@
     "Actions": "Azioni",
     "Displays list of commands with usages and descriptions": "Visualizza l'elenco dei comandi con usi e descrizioni",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Consenti al server di assistenza alle chiamate di fallback turn.matrix.org quando il tuo homeserver non ne offre uno (il tuo indirizzo IP verrà condiviso durante una chiamata)",
-    "Identity Server URL must be HTTPS": "L'URL di Identita' Server deve essere HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Non è un server di identità valido (codice di stato %(code)s)",
-    "Could not connect to Identity Server": "Impossibile connettersi al server di identità",
     "Checking server": "Controllo del server",
     "Disconnect from the identity server <idserver />?": "Disconnettere dal server di identità <idserver />?",
     "Disconnect": "Disconnetti",
-    "Identity Server (%(server)s)": "Server di 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.": "Stai attualmente usando <server></server> per trovare ed essere trovabile dai contatti esistenti che conosci. Puoi cambiare il tuo server di identità sotto.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Attualmente non stai usando un server di identità. Per trovare ed essere trovabile dai contatti esistenti che conosci, aggiungine uno sotto.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "La disconnessione dal tuo server di identità significa che non sarai trovabile da altri utenti e non potrai invitare nessuno per email o telefono.",
     "Only continue if you trust the owner of the server.": "Continua solo se ti fidi del proprietario del server.",
-    "Integration Manager": "Gestore dell'integrazione",
     "Discovery": "Scopri",
     "Deactivate account": "Disattiva account",
     "Always show the window menu bar": "Mostra sempre la barra dei menu della finestra",
@@ -1436,7 +1202,6 @@
     "Discovery options will appear once you have added a phone number above.": "Le opzioni di scoperta appariranno dopo aver aggiunto un numero di telefono sopra.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "È stato inviato un SMS a +%(msisdn)s. Inserisci il codice di verifica contenuto.",
     "Command Help": "Aiuto comando",
-    "No identity server is configured: add one in server settings to reset your password.": "Nessun server di identità configurato: aggiungine uno nelle impostazioni server per ripristinare la password.",
     "This account has been deactivated.": "Questo account è stato disattivato.",
     "Accept <policyLink /> to continue:": "Accetta la <policyLink /> per continuare:",
     "ID": "ID",
@@ -1448,7 +1213,6 @@
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Accetta le condizioni di servizio del server di identità (%(serverName)s) per poter essere trovabile tramite indirizzo email o numero di telefono.",
     "Remove %(email)s?": "Rimuovere %(email)s?",
     "Remove %(phone)s?": "Rimuovere %(phone)s?",
-    "Multiple integration managers": "Gestori di integrazione multipli",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se non vuoi usare <server /> per trovare ed essere trovato dai contatti esistenti che conosci, inserisci un altro server di identità qua sotto.",
     "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.": "Usare un server di identità è facoltativo. Se scegli di non usarne uno, non potrai essere trovato dagli altri utenti e non potrai invitarne altri per email o telefono.",
     "Do not use an identity server": "Non usare un server di identità",
@@ -1463,10 +1227,6 @@
     "Deactivate user": "Disattiva utente",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usa un server di identità per invitare via email. <default>Usa quello predefinito (%(defaultIdentityServerName)s)</default> o gestiscilo nelle <settings>impostazioni</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Usa un server di identità per invitare via email. Gestisci nelle <settings>impostazioni</settings>.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Imposta un'email per il recupero dell'account. Usa l'email o il telefono per essere facoltativamente trovabile dai contatti esistenti.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Imposta un'email per il recupero dell'account. Usa l'email per essere facoltativamente trovabile dai contatti esistenti.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Inserisci l'URL dell'homeserver personalizzato <a>Cosa significa?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Inserisci l'URL del server di identità personalizzato <a>Cosa significa?</a>",
     "Sends a message as plain text, without interpreting it as markdown": "Invia un messaggio in testo semplice, senza interpretarlo come markdown",
     "Error changing power level": "Errore cambiando il livello di poteri",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Si è verificato un errore cambiando il livello di poteri dell'utente. Assicurati di averne l'autorizzazione e riprova.",
@@ -1485,7 +1245,7 @@
     "Error changing power level requirement": "Errore nella modifica del livello dei permessi",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "C'é stato un errore nel cambio di libelli dei permessi. Assicurati di avere i permessi necessari e riprova.",
     "No recent messages by %(user)s found": "Non sono stati trovati messaggi recenti dell'utente %(user)s",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Prova a scorrere la timeline per vedere se ce ne sono di precedenti.",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Prova a scorrere la linea temporale per vedere se ce ne sono di precedenti.",
     "Remove recent messages by %(user)s": "Rimuovi gli ultimi messaggi di %(user)s",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Stai per rimuovere %(count)s messaggi di %(user)s. L'azione é irreversibile. Vuoi continuare?",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Se i messaggi sono tanti può volerci un po' di tempo. Nel frattempo, per favore, non fare alcun refresh.",
@@ -1496,28 +1256,22 @@
     "Strikethrough": "Barrato",
     "Code block": "Code block",
     "Changes the avatar of the current room": "Cambia l'avatar della stanza attuale",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Invia notifiche di lettura per i messaggi (richiede homeserver compatibile per disattivare)",
     "Verify the link in your inbox": "Verifica il link nella tua posta in arrivo",
     "Complete": "Completa",
     "e.g. my-room": "es. mia-stanza",
     "Close dialog": "Chiudi finestra",
     "Please enter a name for the room": "Inserisci un nome per la stanza",
-    "This room is private, and can only be joined by invitation.": "Questa stanza è privata ed è accessibile solo tramite invito.",
     "Create a public room": "Crea una stanza pubblica",
     "Create a private room": "Crea una stanza privata",
     "Topic (optional)": "Argomento (facoltativo)",
-    "Make this room public": "Rendi questa stanza pubblica",
     "Hide advanced": "Nascondi avanzate",
     "Show advanced": "Mostra avanzate",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Impedisci agli utenti di altri homeserver Matrix di unirsi alla stanza (non può essere cambiato successivamente!)",
     "Please fill why you're reporting.": "Inserisci il motivo della segnalazione.",
     "Report Content to Your Homeserver Administrator": "Segnala il contenuto all'amministratore dell'homeserver",
     "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.": "La segnalazione di questo messaggio invierà il suo 'ID evento' univoco all'amministratore del tuo homeserver. Se i messaggi della stanza sono cifrati, l'amministratore non potrà leggere il messaggio o vedere file e immagini.",
     "Send report": "Invia segnalazione",
     "Report Content": "Segnala contenuto",
-    "Explore": "Esplora",
     "Filter": "Filtra",
-    "Filter rooms…": "Filtra stanze…",
     "Preview": "Anteprima",
     "View": "Vedi",
     "Find a room…": "Trova una stanza…",
@@ -1528,7 +1282,6 @@
     "Clear cache and reload": "Svuota la cache e ricarica",
     "%(count)s unread messages including mentions.|other": "%(count)s messaggi non letti incluse le menzioni.",
     "%(count)s unread messages.|other": "%(count)s messaggi non letti.",
-    "Unread mentions.": "Menzioni non lette.",
     "Show image": "Mostra immagine",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Segnala un nuovo problema</newIssueLink> su GitHub in modo che possiamo indagare su questo errore.",
     "To continue you need to accept the terms of this service.": "Per continuare devi accettare le condizioni di servizio.",
@@ -1571,11 +1324,8 @@
     "Jump to first unread room.": "Salta alla prima stanza non letta.",
     "Jump to first invite.": "Salta al primo invito.",
     "Command Autocomplete": "Autocompletamento comando",
-    "DuckDuckGo Results": "Risultati DuckDuckGo",
     "Room %(name)s": "Stanza %(name)s",
-    "Recent rooms": "Stanze recenti",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nessun server di identità configurato, perciò non puoi aggiungere un indirizzo email per ripristinare la tua password in futuro.",
-    "%(count)s unread messages including mentions.|one": "1 citazione non letta.",
+    "%(count)s unread messages including mentions.|one": "1 menzione non letta.",
     "%(count)s unread messages.|one": "1 messaggio non letto.",
     "Unread messages.": "Messaggi non letti.",
     "Show tray icon and minimize window to it on close": "Mostra icona in tray e usala alla chiusura della finestra",
@@ -1625,8 +1375,6 @@
     "Custom (%(level)s)": "Personalizzato (%(level)s)",
     "Trusted": "Fidato",
     "Not trusted": "Non fidato",
-    "Direct message": "Messaggio diretto",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "I messaggi in questa stanza sono cifrati end-to-end.",
     "Security": "Sicurezza",
     "Verify": "Verifica",
@@ -1638,27 +1386,19 @@
     "%(brand)s URL": "URL di %(brand)s",
     "Room ID": "ID stanza",
     "Widget ID": "ID widget",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s e il tuo Gestore di Integrazione.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s.",
     "Widget added by": "Widget aggiunto da",
     "This widget may use cookies.": "Questo widget può usare cookie.",
     "Connecting to integration manager...": "Connessione al gestore di integrazioni...",
     "Cannot connect to integration manager": "Impossibile connettere al gestore di integrazioni",
     "The integration manager is offline or it cannot reach your homeserver.": "Il gestore di integrazioni è offline o non riesce a raggiungere il tuo homeserver.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni <b>(%(serverName)s)</b> per gestire bot, widget e pacchetti di adesivi.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni per gestire bot, widget e pacchetti di adesivi.",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "I gestori di integrazione ricevono dati di configurazione e possono modificare widget, inviare inviti alla stanza, assegnare permessi a tuo nome.",
     "Failed to connect to integration manager": "Connessione al gestore di integrazioni fallita",
     "Widgets do not use message encryption.": "I widget non usano la crittografia dei messaggi.",
     "More options": "Altre opzioni",
     "Integrations are disabled": "Le integrazioni sono disattivate",
     "Enable 'Manage Integrations' in Settings to do this.": "Attiva 'Gestisci integrazioni' nelle impostazioni per continuare.",
     "Integrations not allowed": "Integrazioni non permesse",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Il tuo %(brand)s non ti permette di usare il gestore di integrazioni per questa azione. Contatta un amministratore.",
-    "Reload": "Ricarica",
-    "Take picture": "Scatta foto",
     "Remove for everyone": "Rimuovi per tutti",
-    "Remove for me": "Rimuovi per me",
     "Trust": "Fidati",
     "Decline (%(counter)s)": "Rifiuta (%(counter)s)",
     "Manage integrations": "Gestisci integrazioni",
@@ -1670,14 +1410,11 @@
     "%(senderName)s placed a video call.": "%(senderName)s ha iniziato una videochiamata.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ha iniziato una videochiamata. (non supportata da questo browser)",
     "Clear notifications": "Cancella le notifiche",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personalizza la tua esperienza con funzionalità sperimentali. <a>Maggiori informazioni</a>.",
     "Error upgrading room": "Errore di aggiornamento stanza",
     "Double check that your server supports the room version chosen and try again.": "Controlla che il tuo server supporti la versione di stanza scelta e riprova.",
     "This message cannot be decrypted": "Questo messaggio non può essere decifrato",
     "Unencrypted": "Non criptato",
     "Reactions": "Reazioni",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> ha reagito con %(content)s</reactedWith>",
-    "Automatically invite users": "Invita utenti automaticamente",
     "Upgrade private room": "Aggiorna stanza privata",
     "Upgrade public room": "Aggiorna stanza pubblica",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Aggiornare una stanza è un'azione avanzata ed è consigliabile quando una stanza non è stabile a causa di errori, funzioni mancanti o vulnerabilità di sicurezza.",
@@ -1712,27 +1449,18 @@
     "Cross-signing": "Firma incrociata",
     "<userName/> wants to chat": "<userName/> vuole chattare",
     "Start chatting": "Inizia a chattare",
-    "Cross-signing and secret storage are enabled.": "La firma incrociata e l'archivio segreto sono attivi.",
-    "Cross-signing and secret storage are not yet set up.": "La firma incrociata e l'archivio segreto non sono ancora impostati.",
     "not stored": "non salvato",
     "Backup has a <validity>valid</validity> signature from this user": "Il backup ha una firma <validity>valida</validity> da questo utente",
     "Backup has a <validity>invalid</validity> signature from this user": "Il backup ha una firma <validity>non valida</validity> da questo utente",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Il backup ha una firma dall'utente <verify>sconosciuto</verify> con ID %(deviceId)s",
-    "Backup key stored: ": "Backup chiavi salvato: ",
     "Hide verified sessions": "Nascondi sessioni verificate",
     "%(count)s verified sessions|other": "%(count)s sessioni verificate",
     "%(count)s verified sessions|one": "1 sessione verificata",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attenzione</b>: dovresti impostare il backup chiavi solo da un computer fidato.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se hai dimenticato la tua chiave di recupero puoi <button>impostare nuove opzioni di recupero</button>",
-    "Set up with a recovery key": "Imposta con una chiave di recupero",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "La tua chiave di recupero è stata <b>copiata negli appunti</b>, incollala in:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "La chiave di recupero è nella tua cartella <b>Scaricati</b>.",
     "Unable to set up secret storage": "Impossibile impostare un archivio segreto",
     "Close preview": "Chiudi anteprima",
     "Language Dropdown": "Lingua a tendina",
     "Country Dropdown": "Nazione a tendina",
-    "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.",
-    "Help": "Aiuto",
     "Show info about bridges in room settings": "Mostra info sui bridge nelle impostazioni stanza",
     "This bridge is managed by <user />.": "Questo bridge è gestito da <user />.",
     "Recent Conversations": "Conversazioni recenti",
@@ -1755,14 +1483,11 @@
     "about a day from now": "circa un giorno da adesso",
     "%(num)s days from now": "%(num)s giorni da adesso",
     "Lock": "Lucchetto",
-    "Bootstrap cross-signing and secret storage": "Inizializza firma incrociata e archivio segreto",
     "Failed to find the following users": "Impossibile trovare i seguenti utenti",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "I seguenti utenti potrebbero non esistere o non sono validi, perciò non possono essere invitati: %(csvNames)s",
     "Restore": "Ripristina",
     "Other users may not trust it": "Altri utenti potrebbero non fidarsi",
     "Later": "Più tardi",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Impossibile invitare i seguenti utenti alla chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossibile creare il messaggio diretto. Ricontrolla gli utenti che vuoi invitare e riprova.",
     "Something went wrong trying to invite the users.": "Qualcosa è andato storto provando ad invitare gli utenti.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossibile invitare quegli utenti. Ricontrolla gli utenti che vuoi invitare e riprova.",
     "Recently Direct Messaged": "Contattati direttamente di recente",
@@ -1776,7 +1501,6 @@
     "Start Verification": "Inizia la verifica",
     "This room is end-to-end encrypted": "Questa stanza è cifrata end-to-end",
     "Everyone in this room is verified": "Tutti in questa stanza sono verificati",
-    "Invite only": "Solo a invito",
     "Send a reply…": "Invia risposta…",
     "Send a message…": "Invia un messaggio…",
     "Reject & Ignore user": "Rifiuta e ignora l'utente",
@@ -1788,7 +1512,6 @@
     "Enter your account password to confirm the upgrade:": "Inserisci la password del tuo account per confermare l'aggiornamento:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Dovrai autenticarti con il server per confermare l'aggiornamento.",
     "Upgrade your encryption": "Aggiorna la tua crittografia",
-    "Set up encryption": "Imposta la crittografia",
     "Verify this session": "Verifica questa sessione",
     "Encryption upgrade available": "Aggiornamento crittografia disponibile",
     "Enable message search in encrypted rooms": "Attiva la ricerca messaggi nelle stanze cifrate",
@@ -1797,12 +1520,7 @@
     "They don't match": "Non corrispondono",
     "Review": "Controlla",
     "This bridge was provisioned by <user />.": "Questo bridge è stato fornito da <user />.",
-    "Workspace: %(networkName)s": "Spazio di lavoro: %(networkName)s",
-    "Channel: %(channelName)s": "Canale: %(channelName)s",
     "Show less": "Mostra meno",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca, usando ",
-    " to store messages from ": " per conservare i messaggi da ",
-    "rooms.": "stanze.",
     "Manage": "Gestisci",
     "Securely cache encrypted messages locally for them to appear in search results.": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca.",
     "Enable": "Attiva",
@@ -1840,7 +1558,6 @@
     "Indexed messages:": "Messaggi indicizzati:",
     "Setting up keys": "Configurazione chiavi",
     "How fast should messages be downloaded.": "Quanto veloce devono essere scaricati i messaggi.",
-    "Verify yourself & others to keep your chats safe": "Verifica te stesso e gli altri per mantenere sicure le chat",
     "Your keys are <b>not being backed up from this session</b>.": "Il backup chiavi <b>non viene fatto per questa sessione</b>.",
     "Enable desktop notifications for this session": "Attiva le notifiche desktop per questa sessione",
     "Enable audible notifications for this session": "Attiva le notifiche audio per questa sessione",
@@ -1880,7 +1597,6 @@
     "You've successfully verified %(displayName)s!": "Hai verificato correttamente %(displayName)s!",
     "Got it": "Capito",
     "Encryption enabled": "Crittografia attivata",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "I messaggi in questa stanza sono cifrati end-to-end. Maggiori info e verifica di questo utente nel suo profilo.",
     "Encryption not enabled": "Crittografia non attivata",
     "The encryption used by this room isn't supported.": "La crittografia usata da questa stanza non è supportata.",
     "Clear all data in this session?": "Svuotare tutti i dati in questa sessione?",
@@ -1891,18 +1607,8 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "La verifica di questo utente contrassegnerà come fidata la sua sessione a te e viceversa.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifica questo dispositivo per segnarlo come fidato. Fidarsi di questo dispositivo offre a te e agli altri utenti una maggiore tranquillità nell'uso di messaggi cifrati end-to-end.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "La verifica di questo dispositivo lo segnerà come fidato e gli utenti che si sono verificati con te si fideranno di questo dispositivo.",
-    "New session": "Nuova sessione",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa questa sessione per verificare quella nuova, dandole accesso ai messaggi cifrati:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Se non hai fatto l'accesso a questa sessione, il tuo account potrebbe essere compromesso.",
-    "This wasn't me": "Non ero io",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ciò ti permetterà di tornare al tuo account dopo la disconnessione e di accedere in altre sessioni.",
-    "Recovery key mismatch": "La chiave di recupero non corrisponde",
-    "Incorrect recovery passphrase": "Password di recupero errata",
-    "Enter recovery passphrase": "Inserisci password di recupero",
-    "Enter recovery key": "Inserisci chiave di recupero",
     "Confirm your identity by entering your account password below.": "Conferma la tua identità inserendo la password dell'account sotto.",
     "Your new session is now verified. Other users will see it as trusted.": "La tua nuova sessione è ora verificata. Gli altri utenti la vedranno come fidata.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Senza completare la sicurezza di questa sessione, essa non avrà accesso ai messaggi cifrati.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "La modifica della password reimposterà qualsiasi chiave di crittografia end-to-end su tutte le sessioni, rendendo illeggibile la cronologia delle chat cifrate. Configura il Backup Chiavi o esporta le tue chiavi della stanza da un'altra sessione prima di reimpostare la password.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Sei stato disconnesso da tutte le sessioni e non riceverai più notifiche push. Per riattivare le notifiche, riaccedi su ogni dispositivo.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Riprendi l'accesso al tuo account e recupera le chiavi di crittografia memorizzate in questa sessione. Senza di esse, non sarai in grado di leggere tutti i tuoi messaggi sicuri in qualsiasi sessione.",
@@ -1910,20 +1616,15 @@
     "Restore your key backup to upgrade your encryption": "Ripristina il tuo backup chiavi per aggiornare la crittografia",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aggiorna questa sessione per consentirle di verificare altre sessioni, garantendo loro l'accesso ai messaggi cifrati e contrassegnandole come fidate per gli altri utenti.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Conservane una copia in un luogo sicuro, come un gestore di password o una cassaforte.",
-    "Your recovery key": "La tua chiave di recupero",
     "Copy": "Copia",
-    "Make a copy of your recovery key": "Fai una copia della chiave di recupero",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Senza configurare il Recupero Messaggi Sicuri, non potrai ripristinare la cronologia di messaggi cifrati se ti disconnetti o se usi un'altra sessione.",
     "Create key backup": "Crea backup chiavi",
     "This session is encrypting history using the new recovery method.": "Questa sessione sta cifrando la cronologia usando il nuovo metodo di recupero.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Questa sessione ha rilevato che la tua password di recupero e la chiave per i Messaggi Sicuri sono state rimosse.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Se l'hai fatto accidentalmente, puoi configurare Messaggi Sicuri su questa sessione che cripterà nuovamente la cronologia dei messaggi con un nuovo metodo di recupero.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Se disattivato, i messaggi delle stanze cifrate non appariranno nei risultati di ricerca.",
     "Disable": "Disattiva",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s sta tenendo in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca:",
     "Message downloading sleep time(ms)": "Tempo di attesa scaricamento messaggi (ms)",
-    "If you cancel now, you won't complete verifying the other user.": "Se adesso annulli, non completerai la verifica dell'altro utente.",
-    "If you cancel now, you won't complete verifying your other session.": "Se adesso annulli, non completerai la verifica dell'altra tua sessione.",
     "Cancel entering passphrase?": "Annullare l'inserimento della password?",
     "Mod": "Moderatore",
     "Indexed rooms:": "Stanze indicizzate:",
@@ -1936,7 +1637,6 @@
     "or": "o",
     "Compare unique emoji": "Confronta emoji univoci",
     "Compare a unique set of emoji if you don't have a camera on either device": "Confrontate un set di emoji univoci se non avete una fotocamera sui dispositivi",
-    "Reset cross-signing and secret storage": "Reimposta la firma incrociata e l'archivio segreto",
     "Not Trusted": "Non fidato",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) ha fatto l'accesso con una nuova sessione senza verificarla:",
     "Ask this user to verify their session, or manually verify it below.": "Chiedi a questo utente di verificare la sua sessione o verificala manualmente sotto.",
@@ -1964,11 +1664,6 @@
     "Accepting…": "Accettazione…",
     "Accepting …": "Accettazione …",
     "Declining …": "Rifiuto …",
-    "Your account is not secure": "Il tuo account non è sicuro",
-    "Your password": "La tua password",
-    "This session, or the other session": "Questa o l'altra sessione",
-    "The internet connection either session is using": "La connessione internet di una sessione",
-    "We recommend you change your password and recovery key in Settings immediately": "Ti consigliamo di cambiare immediatamente la password e la chiave di recupero nelle impostazioni",
     "Not currently indexing messages for any room.": "Attualmente non si stanno indicizzando i messaggi di alcuna stanza.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s di %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ha cambiato il nome della stanza da %(oldRoomName)s a %(newRoomName)s.",
@@ -1989,7 +1684,6 @@
     "Scroll to most recent messages": "Scorri ai messaggi più recenti",
     "Local address": "Indirizzo locale",
     "Published Addresses": "Indirizzi pubblicati",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Gli indirizzi pubblicati possono essere usati da chiunque su qualsiasi server per entrare nella stanza. Per pubblicare un indirizzo, deve essere prima impostato come indirizzo locale.",
     "Other published addresses:": "Altri indirizzi pubblicati:",
     "No other published addresses yet, add one below": "Nessun altro indirizzo ancora pubblicato, aggiungine uno sotto",
     "New published address (e.g. #alias:server)": "Nuovo indirizzo pubblicato (es. #alias:server)",
@@ -2010,7 +1704,6 @@
     "%(networkName)s rooms": "Stanze di %(networkName)s",
     "Matrix rooms": "Stanze di Matrix",
     "Keyboard Shortcuts": "Scorciatoie da tastiera",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Inizia una conversazione con qualcuno usando il suo nome, nome utente (come <userId/>) o indirizzo email.",
     "a new master key signature": "una nuova firma della chiave principale",
     "a new cross-signing key signature": "una nuova firma della chiave a firma incrociata",
     "a device cross-signing signature": "una firma incrociata di dispositivo",
@@ -2043,7 +1736,7 @@
     "Collapse room list section": "Riduci sezione elenco stanze",
     "Expand room list section": "Espandi sezione elenco stanze",
     "Clear room list filter field": "Svuota campo filtri elenco stanze",
-    "Scroll up/down in the timeline": "Scorri su/giù nella cronologia",
+    "Scroll up/down in the timeline": "Scorri su/giù nella linea temporale",
     "Toggle the top left menu": "Attiva/disattiva menu in alto a sinistra",
     "Close dialog or context menu": "Chiudi finestra o menu contestuale",
     "Activate selected button": "Attiva pulsante selezionato",
@@ -2070,7 +1763,6 @@
     "cached locally": "in cache locale",
     "not found locally": "non trovato in locale",
     "User signing private key:": "Chiave privata di firma utente:",
-    "Session backup key:": "Chiave di backup sessione:",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifica individualmente ogni sessione usata da un utente per segnarla come fidata, senza fidarsi dei dispositivi a firma incrociata.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Nelle stanze cifrate, i tuoi messaggi sono protetti e solo tu ed il destinatario avete le chiavi univoche per sbloccarli.",
     "Verify all users in a room to ensure it's secure.": "Verifica tutti gli utenti in una stanza per confermare che sia sicura.",
@@ -2098,8 +1790,6 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Conferma che gli emoji sottostanti sono mostrati in entrambe le sessioni, nello stesso ordine:",
     "Verify this session by confirming the following number appears on its screen.": "Verifica questa sessione confermando che il seguente numero compare nel suo schermo.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "In attesa che la tua altra sessione, %(deviceName)s (%(deviceId)s), verifichi…",
-    "From %(deviceName)s (%(deviceId)s)": "Da %(deviceName)s (%(deviceId)s)",
-    "Waiting for you to accept on your other session…": "In attesa che tu accetti nella tua altra sessione…",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Hai verificato %(deviceName)s (%(deviceId)s) correttamente!",
     "Start verification again from the notification.": "Inizia di nuovo la verifica dalla notifica.",
     "Start verification again from their profile.": "Inizia di nuovo la verifica dal suo profilo.",
@@ -2107,7 +1797,6 @@
     "You cancelled verification on your other session.": "Hai annullato la verifica nell'altra sessione.",
     "%(displayName)s cancelled verification.": "%(displayName)s ha annullato la verifica.",
     "You cancelled verification.": "Hai annullato la verifica.",
-    "Self-verification request": "Richiesta di auto-verifica",
     "%(name)s is requesting verification": "%(name)s sta richiedendo la verifica",
     "well formed": "formattato bene",
     "unexpected type": "tipo inatteso",
@@ -2136,38 +1825,18 @@
     "Syncing...": "Sincronizzazione...",
     "Signing In...": "Accesso...",
     "If you've joined lots of rooms, this might take a while": "Se sei dentro a molte stanze, potrebbe impiegarci un po'",
-    "If you cancel now, you won't complete your operation.": "Se annulli adesso, non completerai l'operazione.",
     "Please supply a widget URL or embed code": "Inserisci un URL del widget o un codice di incorporamento",
     "Send a bug report with logs": "Invia una segnalazione di errore con i registri",
     "Can't load this message": "Impossibile caricare questo messaggio",
     "Submit logs": "Invia registri",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Promemoria: il tuo browser non è supportato, perciò la tua esperienza può essere imprevedibile.",
     "Unable to upload": "Impossibile inviare",
-    "Verify other session": "Verifica l'altra sessione",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Impossibile accedere all'archivio segreto. Verifica di avere inserito la password di ripristino giusta.",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Impossibile decifrare il backup con questa chiave di ripristino: verifica di avere inserito la chiave di ripristino giusta.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Impossibile decifrare il backup con questa password di ripristino: verifica di avere inserito la password di ripristino giusta.",
-    "Great! This recovery passphrase looks strong enough.": "Ottimo! Questa password di ripristino sembra abbastanza robusta.",
-    "Enter a recovery passphrase": "Inserisci una password di ripristino",
-    "Enter your recovery passphrase a second time to confirm it.": "Inserisci di nuovo la password di ripristino per confermarla.",
-    "Confirm your recovery passphrase": "Conferma la password di ripristino",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "La chiave di ripristino è come una rete di sicurezza - puoi usarla per recuperare l'accesso ai messaggi cifrati se dimentichi la password di ripristino.",
     "Unable to query secret storage status": "Impossibile rilevare lo stato dell'archivio segreto",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Salveremo una copia cifrata delle tue chiavi sul nostro server. Proteggi il tuo backup con una password di ripristino.",
-    "Please enter your recovery passphrase a second time to confirm.": "Inserisci di nuovo la password di ripristino per confermarla.",
-    "Repeat your recovery passphrase...": "Ripeti la password di ripristino...",
-    "Secure your backup with a recovery passphrase": "Proteggi il backup con una password di ripristino",
     "Currently indexing: %(currentRoom)s": "Attualmente si indicizzano: %(currentRoom)s",
     "Verify this login": "Verifica questo accesso",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Conferma la tua identità verificando questo accesso da una delle tue altre sessioni, dandogli l'accesso ai messaggi cifrati.",
-    "This requires the latest %(brand)s on your other devices:": "È richiesta l'ultima versione di %(brand)s sui tuoi altri dispositivi:",
-    "or another cross-signing capable Matrix client": "o un altro client Matrix che supporti la firma incrociata",
-    "Review where you’re logged in": "Controlla dove hai fatto l'accesso",
     "Where you’re logged in": "Dove hai fatto l'accesso",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gestisci i nomi e disconnettiti dalle tue sessioni sotto o <a>verificale nel tuo profilo utente</a>.",
     "New login. Was this you?": "Nuovo accesso. Eri tu?",
-    "Verify all your sessions to ensure your account & messages are safe": "Verifica tutte le tue sessioni per assicurarti che il tuo account e i messaggi siano protetti",
-    "Verify the new login accessing your account: %(name)s": "Verifica il nuovo accesso entrando nel tuo account: %(name)s",
     "Restoring keys from backup": "Ripristino delle chiavi dal backup",
     "Fetching keys from server...": "Ricezione delle chiavi dal server...",
     "%(completed)s of %(total)s keys restored": "%(completed)s di %(total)s chiavi ripristinate",
@@ -2175,7 +1844,6 @@
     "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente",
     "You signed in to a new session without verifying it:": "Hai fatto l'accesso ad una nuova sessione senza verificarla:",
     "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>), indirizzo email o <a>condividi questa stanza</a>.",
     "Message deleted": "Messaggio eliminato",
     "Message deleted by %(name)s": "Messaggio eliminato da %(name)s",
     "Opens chat with the given user": "Apre una chat con l'utente specificato",
@@ -2192,8 +1860,6 @@
     "Jump to oldest unread message": "Salta al messaggio non letto più vecchio",
     "Upload a file": "Invia un file",
     "IRC display name width": "Larghezza nome di IRC",
-    "Create room": "Crea stanza",
-    "Font scaling": "Ridimensionamento carattere",
     "Font size": "Dimensione carattere",
     "Size must be a number": "La dimensione deve essere un numero",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "La dimensione del carattere personalizzata può solo essere tra %(min)s pt e %(max)s pt",
@@ -2212,27 +1878,18 @@
     "Error removing address": "Errore rimozione indirizzo",
     "Categories": "Categorie",
     "Room address": "Indirizzo stanza",
-    "Please provide a room address": "Inserisci un indirizzo della stanza",
     "This address is available to use": "Questo indirizzo è disponibile per l'uso",
     "This address is already in use": "Questo indirizzo è già in uso",
-    "Set a room address to easily share your room with other people.": "Imposta un indirizzo della stanza per condividerla facilmente con le altre persone.",
     "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.": "Hai precedentemente usato una versione più recente di %(brand)s con questa sessione. Per usare ancora questa versione con la crittografia end to end, dovrai disconnetterti e riaccedere.",
-    "Address (optional)": "Indirizzo (facoltativo)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Eliminare l'indirizzo della stanza %(alias)s e rimuovere %(name)s dalla cartella?",
     "delete the address.": "elimina l'indirizzo.",
     "Use a different passphrase?": "Usare una password diversa?",
     "Help us improve %(brand)s": "Aiutaci a migliorare %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Invia <UsageDataLink>dati di utilizzo anonimi</UsageDataLink> che ci aiutano a migliorare %(brand)s. Verrà usato un <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "Voglio aiutare",
     "Your homeserver has exceeded its user limit.": "Il tuo homeserver ha superato il limite di utenti.",
     "Your homeserver has exceeded one of its resource limits.": "Il tuo homeserver ha superato uno dei suoi limiti di risorse.",
     "Contact your <a>server admin</a>.": "Contatta il tuo <a>amministratore del server</a>.",
     "Ok": "Ok",
-    "Set password": "Imposta password",
-    "To return to your account in future you need to set a password": "Per tornare nel tuo account in futuro, devi impostare una password",
-    "Restart": "Riavvia",
-    "Upgrade your %(brand)s": "Aggiorna %(brand)s",
-    "A new version of %(brand)s is available!": "È disponibile una nuova versione di %(brand)s!",
     "New version available. <a>Update now.</a>": "Nuova versione disponibile. <a>Aggiorna ora.</a>",
     "Emoji picker": "Selettore emoji",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti.",
@@ -2245,7 +1902,6 @@
     "Feedback": "Feedback",
     "No recently visited rooms": "Nessuna stanza visitata di recente",
     "Sort by": "Ordina per",
-    "Unread rooms": "Stanze non lette",
     "Show": "Mostra",
     "Message preview": "Anteprima messaggio",
     "List options": "Opzioni lista",
@@ -2260,13 +1916,9 @@
     "Customise your appearance": "Personalizza l'aspetto",
     "Appearance Settings only affect this %(brand)s session.": "Le impostazioni dell'aspetto hanno effetto solo in questa sessione di %(brand)s.",
     "Looks good!": "Sembra giusta!",
-    "Use Recovery Key or Passphrase": "Usa la chiave o password di recupero",
-    "Use Recovery Key": "Usa chiave di recupero",
-    "Use the improved room list (will refresh to apply changes)": "Usa l'elenco stanze migliorato (verrà ricaricato per applicare le modifiche)",
     "Use custom size": "Usa dimensione personalizzata",
     "Hey you. You're the best!": "Ehi tu. Sei il migliore!",
     "Message layout": "Layout messaggio",
-    "Compact": "Compatto",
     "Modern": "Moderno",
     "Use a system font": "Usa un carattere di sistema",
     "System font name": "Nome carattere di sistema",
@@ -2274,101 +1926,32 @@
     "You joined the call": "Ti sei unito alla chiamata",
     "%(senderName)s joined the call": "%(senderName)s si è unito alla chiamata",
     "Call in progress": "Chiamata in corso",
-    "You left the call": "Hai abbandonato la chiamata",
-    "%(senderName)s left the call": "%(senderName)s ha abbandonato la chiamata",
     "Call ended": "Chiamata terminata",
     "You started a call": "Hai iniziato una chiamata",
     "%(senderName)s started a call": "%(senderName)s ha iniziato una chiamata",
     "Waiting for answer": "In attesa di risposta",
     "%(senderName)s is calling": "%(senderName)s sta chiamando",
-    "You created the room": "Hai creato la stanza",
-    "%(senderName)s created the room": "%(senderName)s ha creato la stanza",
-    "You made the chat encrypted": "Hai reso la chat crittografata",
-    "%(senderName)s made the chat encrypted": "%(senderName)s ha reso la chat crittografata",
-    "You made history visible to new members": "Hai reso visibile la cronologia ai nuovi membri",
-    "%(senderName)s made history visible to new members": "%(senderName)s ha reso visibile la cronologia ai nuovi membri",
-    "You made history visible to anyone": "Hai reso visibile la cronologia a chiunque",
-    "%(senderName)s made history visible to anyone": "%(senderName)s ha reso visibile la cronologia a chiunque",
-    "You made history visible to future members": "Hai reso visibile la cronologia ai membri futuri",
-    "%(senderName)s made history visible to future members": "%(senderName)s ha reso visibile la cronologia ai membri futuri",
-    "You were invited": "Sei stato invitato",
-    "%(targetName)s was invited": "%(targetName)s è stato invitato",
-    "You left": "Sei uscito",
-    "%(targetName)s left": "%(targetName)s è uscito",
-    "You were kicked (%(reason)s)": "Sei stato buttato fuori (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s è stato buttato fuori (%(reason)s)",
-    "You were kicked": "Sei stato buttato fuori",
-    "%(targetName)s was kicked": "%(targetName)s è stato buttato fuori",
-    "You rejected the invite": "Hai rifiutato l'invito",
-    "%(targetName)s rejected the invite": "%(targetName)s ha rifiutato l'invito",
-    "You were uninvited": "Ti è stato revocato l'invito",
-    "%(targetName)s was uninvited": "È stato revocato l'invito a %(targetName)s",
-    "You were banned (%(reason)s)": "Sei stato bandito (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s è stato bandito (%(reason)s)",
-    "You were banned": "Sei stato bandito",
-    "%(targetName)s was banned": "%(targetName)s è stato bandito",
-    "You joined": "Ti sei unito",
-    "%(targetName)s joined": "%(targetName)s si è unito",
-    "You changed your name": "Hai cambiato il tuo nome",
-    "%(targetName)s changed their name": "%(targetName)s ha cambiato il suo nome",
-    "You changed your avatar": "Hai cambiato il tuo avatar",
-    "%(targetName)s changed their avatar": "%(targetName)s ha cambiato il suo avatar",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Hai cambiato il nome della stanza",
-    "%(senderName)s changed the room name": "%(senderName)s ha cambiato il nome della stanza",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Hai revocato l'invito a %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s ha revocato l'invito a %(targetName)s",
-    "You invited %(targetName)s": "Hai invitato %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s ha invitato %(targetName)s",
-    "You changed the room topic": "Hai cambiato l'argomento della stanza",
-    "%(senderName)s changed the room topic": "%(senderName)s ha cambiato l'argomento della stanza",
-    "New spinner design": "Nuovo design dello spinner",
     "Use a more compact ‘Modern’ layout": "Usa un layout più compatto e moderno",
-    "Always show first": "Mostra sempre per prime",
     "Message deleted on %(date)s": "Messaggio eliminato il %(date)s",
-    "Use your account to sign in to the latest version": "Usa il tuo account per accedere alla versione più recente",
-    "We’re excited to announce Riot is now Element": "Siamo entusiasti di annunciare che Riot ora si chiama Element",
-    "Riot is now Element!": "Riot ora si chiama Element!",
-    "Learn More": "Maggiori info",
     "Enable experimental, compact IRC style layout": "Attiva il layout in stile IRC, sperimentale e compatto",
     "Unknown caller": "Chiamante sconosciuto",
-    "Incoming voice call": "Telefonata in arrivo",
-    "Incoming video call": "Videochiamata in arrivo",
-    "Incoming call": "Chiamata in arrivo",
     "%(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 non può tenere in cache i messaggi cifrati quando usato in un browser web. Usa <desktopLink>%(brand)s Desktop</desktopLink> affinché i messaggi cifrati appaiano nei risultati di ricerca.",
-    "There are advanced notifications which are not shown here.": "Ci sono notifiche avanzate che non vengono mostrate qui.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Potresti averle configurate in un client diverso da %(brand)s. Non puoi regolarle in %(brand)s ma sono comunque applicate.",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Imposta il nome di un font installato nel tuo sistema e %(brand)s proverà ad usarlo.",
-    "Make this room low priority": "Rendi questa stanza a bassa priorità",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Le stanze a bassa priorità vengono mostrate in fondo all'elenco stanze in una sezione dedicata",
     "Use default": "Usa predefinito",
-    "Mentions & Keywords": "Citazioni e parole chiave",
+    "Mentions & Keywords": "Menzioni e parole chiave",
     "Notification options": "Opzioni di notifica",
     "Favourited": "Preferito",
     "Forget Room": "Dimentica stanza",
-    "Use your account to sign in to the latest version of the app at <a />": "Usa il tuo account per accedere alla versione più recente dell'app in <a />",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Hai già fatto l'accesso e sei pronto ad iniziare, ma puoi anche ottenere le versioni più recenti dell'app su tutte le piattaforme in <a>element.io/get-started</a>.",
-    "Go to Element": "Vai su Element",
-    "We’re excited to announce Riot is now Element!": "Siamo entusiasti di annunciare che Riot ora si chiama Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Maggiori informazioni su <a>element.io/previously-riot</a>",
     "Wrong file type": "Tipo di file errato",
-    "Wrong Recovery Key": "Chiave di ripristino errata",
-    "Invalid Recovery Key": "Chiave di ripristino non valida",
     "Security Phrase": "Frase di sicurezza",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Inserisci una frase di sicurezza o <button>Usa la tua chiave di sicurezza</button> per continuare.",
     "Security Key": "Chiave di sicurezza",
     "Use your Security Key to continue.": "Usa la tua chiave di sicurezza per continuare.",
-    "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.": "Puoi usare le opzioni di server personalizzato per accedere ad altri server Matrix, specificando un URL diverso di homeserver. Ciò ti consente di usare %(brand)s con un account Matrix esistente su un homeserver diverso.",
-    "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>.": "Inserisci la posizione del tuo homeserver di Element Matrix Services. Potrebbe usare il tuo nome di dominio o essere un sottodominio di <a>element.io</a>.",
-    "Search rooms": "Cerca stanze",
     "User menu": "Menu utente",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X per Android",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Proteggiti contro la perdita dell'accesso ai messaggi e dati cifrati facendo un backup delle chiavi crittografiche sul tuo server.",
     "Generate a Security Key": "Genera una chiave di sicurezza",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Genereremo per te una chiave di sicurezza da conservare in un posto sicuro, come un gestore di password o una cassaforte.",
@@ -2378,13 +1961,11 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Conserva la chiave di sicurezza in un posto sicuro, come un gestore di password o una cassaforte, dato che è usata per proteggere i tuoi dati cifrati.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se annulli ora, potresti perdere i messaggi e dati cifrati in caso tu perda l'accesso ai tuoi login.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Puoi anche impostare il Backup Sicuro e gestire le tue chiavi nelle impostazioni.",
-    "Set up Secure backup": "Imposta il Backup Sicuro",
     "Set a Security Phrase": "Imposta una frase di sicurezza",
     "Confirm Security Phrase": "Conferma frase di sicurezza",
     "Save your Security Key": "Salva la tua chiave di sicurezza",
     "This room is public": "Questa stanza è pubblica",
     "Away": "Assente",
-    "Enable advanced debugging for the room list": "Attiva il debug avanzato per l'elenco di stanze",
     "Show rooms with unread messages first": "Mostra prima le stanze con messaggi non letti",
     "Show previews of messages": "Mostra anteprime dei messaggi",
     "Edited at %(date)s": "Modificato il %(date)s",
@@ -2412,8 +1993,6 @@
     "No files visible in this room": "Nessun file visibile in questa stanza",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Allega file dalla chat o trascinali in qualsiasi punto in una stanza.",
     "You’re all caught up": "Non hai nulla di nuovo da vedere",
-    "You have no visible notifications in this room.": "Non hai alcuna notifica visibile in questa stanza.",
-    "%(brand)s Android": "%(brand)s Android",
     "Show message previews for reactions in DMs": "Mostra anteprime messaggi per le reazioni nei messaggi diretti",
     "Show message previews for reactions in all rooms": "Mostra anteprime messaggi per le reazioni in tutte le stanze",
     "Explore public rooms": "Esplora stanze pubbliche",
@@ -2427,8 +2006,6 @@
     "Unexpected server error trying to leave the room": "Errore inaspettato del server tentando di abbandonare la stanza",
     "Error leaving room": "Errore uscendo dalla stanza",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototipi di comunità v2. Richiede un homeserver compatibile. Altamente sperimentale - usa con attenzione.",
-    "Cross-signing and secret storage are ready for use.": "La firma incrociata e l'archivio segreto sono pronti all'uso.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "La firma incrociata è pronta all'uso, ma l'archivio segreto attualmente non è usato per fare il backup delle tue chiavi.",
     "Explore community rooms": "Esplora stanze della comunità",
     "Information": "Informazione",
     "Add another email": "Aggiungi un'altra email",
@@ -2448,21 +2025,16 @@
     "Explore rooms in %(communityName)s": "Esplora le stanze in %(communityName)s",
     "Create community": "Crea comunità",
     "Set up Secure Backup": "Imposta il Backup Sicuro",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Le stanze private possono essere trovate e visitate solo con invito. Le stanze pubbliche invece sono aperte a tutti.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Le stanze private possono essere trovate e visitate solo con invito. Le stanze pubbliche invece sono aperte a tutti i membri di questa comunità.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Dovresti attivarlo se questa stanza verrà usata solo per collaborazioni tra squadre interne nel tuo homeserver. Non può essere cambiato in seguito.",
     "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.": "Dovresti disattivarlo se questa stanza verrà usata per collaborazioni con squadre esterne che hanno il loro homeserver. Non può essere cambiato in seguito.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Blocca l'accesso alla stanza per chiunque non faccia parte di %(serverName)s.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Antepone ( ͡° ͜ʖ ͡°) ad un messaggio di testo",
-    "Group call modified by %(senderName)s": "Chiamata di gruppo modificata da %(senderName)s",
-    "Group call started by %(senderName)s": "Chiamata di gruppo iniziata da %(senderName)s",
-    "Group call ended by %(senderName)s": "Chiamata di gruppo terminata da %(senderName)s",
     "Unknown App": "App sconosciuta",
     "Cross-signing is ready for use.": "La firma incrociata è pronta all'uso.",
     "Cross-signing is not set up.": "La firma incrociata non è impostata.",
     "Backup version:": "Versione backup:",
     "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.": "Fai il backup delle tue chiavi di crittografia con i dati del tuo account in caso perdessi l'accesso alle sessioni. Le tue chiavi saranno protette con una chiave di recupero univoca.",
     "Backup key stored:": "Chiave di backup salvata:",
     "Backup key cached:": "Chiave di backup in cache:",
     "Secret storage:": "Archivio segreto:",
@@ -2472,10 +2044,6 @@
     "Privacy": "Privacy",
     "%(count)s results|one": "%(count)s risultato",
     "Room Info": "Info stanza",
-    "Apps": "App",
-    "Unpin app": "Sblocca app",
-    "Edit apps, bridges & bots": "Modifica app, bridge e bot",
-    "Add apps, bridges & bots": "Aggiungi app, bridge e bot",
     "Not encrypted": "Non cifrato",
     "About": "Al riguardo",
     "%(count)s people|other": "%(count)s persone",
@@ -2483,28 +2051,19 @@
     "Show files": "Mostra file",
     "Room settings": "Impostazioni stanza",
     "Take a picture": "Scatta una foto",
-    "Pin to room": "Fissa nella stanza",
-    "You can only pin 2 apps at a time": "Puoi fissare solo 2 app alla volta",
     "There was an error updating your community. The server is unable to process your request.": "Si è verificato un errore nell'aggiornamento della comunità. Il server non riesce ad elaborare la richiesta.",
     "Update community": "Aggiorna comunità",
     "May include members not in %(communityName)s": "Può includere membri non in %(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>.": "Inizia una conversazione con qualcuno usando il suo nome, nome utente (come <userId/>) o indirizzo email. Ciò non lo inviterà in %(communityName)s. Per invitare qualcuno in %(communityName)s, clicca <a>qui</a>.",
     "Unpin": "Sblocca",
     "Failed to find the general chat for this community": "Impossibile trovare la chat generale di questa comunità",
     "Community settings": "Impostazioni comunità",
     "User settings": "Impostazioni utente",
     "Community and user menu": "Menu comunità e utente",
-    "End Call": "Chiudi chiamata",
-    "Remove the group call from the room?": "Rimuovere la chiamata di gruppo dalla stanza?",
-    "You don't have permission to remove the call from the room": "Non hai l'autorizzazione per rimuovere la chiamata dalla stanza",
     "Safeguard against losing access to encrypted messages & data": "Proteggiti dalla perdita dei messaggi e dati crittografati",
     "not found in storage": "non trovato nell'archivio",
     "Widgets": "Widget",
     "Edit widgets, bridges & bots": "Modifica widget, bridge e bot",
     "Add widgets, bridges & bots": "Aggiungi widget, bridge e bot",
-    "You can only pin 2 widgets at a time": "Puoi fissare solo 2 widget alla volta",
-    "Minimize widget": "Riduci widget",
-    "Maximize widget": "Espandi widget",
     "Your server requires encryption to be enabled in private rooms.": "Il tuo server richiede la crittografia attiva nelle stanze private.",
     "Start a conversation with someone using their name or username (like <userId/>).": "Inizia una conversazione con qualcuno usando il suo nome o il nome utente (come <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Ciò non lo inviterà in %(communityName)s. Per invitare qualcuno in %(communityName)s, clicca <a>qui</a>",
@@ -2527,20 +2086,10 @@
     "Failed to save your profile": "Salvataggio del profilo fallito",
     "The operation could not be completed": "Impossibile completare l'operazione",
     "Remove messages sent by others": "Rimuovi i messaggi inviati dagli altri",
-    "Calling...": "Chiamata in corso...",
-    "Call connecting...": "In connessione...",
-    "Starting camera...": "Avvio fotocamera...",
-    "Starting microphone...": "Avvio microfono...",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tutti i server sono banditi dalla partecipazione! Questa stanza non può più essere usata.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ha cambiato le ACL del server per questa stanza.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s ha impostato le ACL del server per questa stanza.",
-    "%(senderName)s declined the call.": "%(senderName)s ha rifiutato la chiamata.",
-    "(an error occurred)": "(si è verificato un errore)",
-    "(their device couldn't start the camera / microphone)": "(il suo dispositivo non ha potuto avviare la fotocamera / il microfono)",
-    "(connection failed)": "(connessione fallita)",
     "The call could not be established": "Impossibile stabilire la chiamata",
-    "The other party declined the call.": "Il destinatario ha rifiutato la chiamata.",
-    "Call Declined": "Chiamata rifiutata",
     "Offline encrypted messaging using dehydrated devices": "Messaggistica offline criptata usando dispositivi \"disidratati\"",
     "Move right": "Sposta a destra",
     "Move left": "Sposta a sinistra",
@@ -2590,7 +2139,6 @@
     "Topic: %(topic)s (<a>edit</a>)": "Argomento: %(topic)s (<a>modifica</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Questo è l'inizio della tua cronologia di messaggi diretti con <displayName/>.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Solo voi due siete in questa conversazione, a meno che uno di voi non inviti qualcuno.",
-    "Call Paused": "Chiamata in pausa",
     "Takes the call in the current room off hold": "Riprende la chiamata nella stanza attuale",
     "Places the call in the current room on hold": "Mette in pausa la chiamata nella stanza attuale",
     "Zimbabwe": "Zimbabwe",
@@ -2842,9 +2390,6 @@
     "Afghanistan": "Afghanistan",
     "United States": "Stati Uniti",
     "United Kingdom": "Regno Unito",
-    "Role": "Ruolo",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanza.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanze.",
     "Filter rooms and people": "Filtra stanze e persone",
     "Open the link in the email to continue registration.": "Apri il link nell'email per continuare la registrazione.",
     "A confirmation email has been sent to %(emailAddress)s": "È stata inviata un'email di conferma a %(emailAddress)s",
@@ -2940,7 +2485,6 @@
     "Video Call": "Videochiamata",
     "sends confetti": "invia coriandoli",
     "Sends the given message with confetti": "Invia il messaggio in questione con coriandoli",
-    "Show chat effects": "Mostra effetti chat",
     "Use Ctrl + Enter to send a message": "Usa Ctrl + Invio per inviare un messaggio",
     "Use Command + Enter to send a message": "Usa Comando + Invio per inviare un messaggio",
     "Render LaTeX maths in messages": "Renderizza matematica LaTeX nei messaggi",
@@ -2967,7 +2511,6 @@
     "Effects": "Effetti",
     "Hold": "Sospendi",
     "Resume": "Riprendi",
-    "%(name)s paused": "%(name)s ha messo in pausa",
     "%(peerName)s held the call": "%(peerName)s ha sospeso la chiamata",
     "You held the call <a>Resume</a>": "Hai sospeso la chiamata <a>Riprendi</a>",
     "You've reached the maximum number of simultaneous calls.": "Hai raggiungo il numero massimo di chiamate simultanee.",
@@ -2987,7 +2530,6 @@
     "There was an error finding this widget.": "Si è verificato un errore trovando i widget.",
     "Active Widgets": "Widget attivi",
     "Open dial pad": "Apri tastierino",
-    "Start a Conversation": "Inizia una conversazione",
     "Dial pad": "Tastierino",
     "There was an error looking up the phone number": "Si è verificato un errore nella ricerca del numero di telefono",
     "Unable to look up phone number": "Impossibile cercare il numero di telefono",
@@ -3001,7 +2543,6 @@
     "Your Security Key": "La tua chiave di sicurezza",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "La chiave di sicurezza è come una rete di salvataggio - puoi usarla per recuperare l'accesso ai messaggi cifrati se dimentichi la password di sicurezza.",
     "Repeat your Security Phrase...": "Ripeti la password di sicurezza...",
-    "Please enter your Security Phrase a second time to confirm.": "Inserisci di nuovo la password di sicurezza per confermarla.",
     "Set up with a Security Key": "Imposta con una chiave di sicurezza",
     "Great! This Security Phrase looks strong enough.": "Ottimo! Questa password di sicurezza sembra abbastanza robusta.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Salveremo una copia cifrata delle tue chiavi sul nostro server. Proteggi il tuo backup con una password di sicurezza.",
@@ -3022,7 +2563,6 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Impossibile accedere all'archivio segreto. Verifica di avere inserito la password di sicurezza giusta.",
     "Invalid Security Key": "Chiave di sicurezza non valida",
     "Wrong Security Key": "Chiave di sicurezza sbagliata",
-    "We recommend you change your password and Security Key in Settings immediately": "Ti consigliamo di cambiare immediatamente la password e la chiave di sicurezza nelle impostazioni",
     "Set my room layout for everyone": "Imposta la disposizione della stanza per tutti",
     "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.": "Fai il backup delle tue chiavi di crittografia con i dati del tuo account in caso perdessi l'accesso alle sessioni. Le tue chiavi saranno protette con una chiave di recupero univoca.",
     "Channel: <channelLink/>": "Canale: <channelLink/>",
@@ -3031,8 +2571,6 @@
     "%(senderName)s has updated the widget layout": "%(senderName)s ha aggiornato la disposizione del widget",
     "Converts the room to a DM": "Converte la stanza in un MD",
     "Converts the DM to a room": "Converte il MD in una stanza",
-    "Use Command + F to search": "Usa Command + F per cercare",
-    "Use Ctrl + F to search": "Usa Ctrl + F per cercare",
     "Use app for a better experience": "Usa l'app per un'esperienza migliore",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web è sperimentale su mobile. Per un'esperienza migliore e le ultime funzionalità, usa la nostra app nativa gratuita.",
     "Use app": "Usa l'app",
@@ -3046,7 +2584,6 @@
     "Try again": "Riprova",
     "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.": "Abbiamo chiesto al browser di ricordare quale homeserver usi per farti accedere, ma sfortunatamente l'ha dimenticato. Vai alla pagina di accesso e riprova.",
     "We couldn't log you in": "Non abbiamo potuto farti accedere",
-    "Upgrade to pro": "Aggiorna a Pro",
     "Minimize dialog": "Riduci finestra",
     "Maximize dialog": "Espandi finestra",
     "%(hostSignupBrand)s Setup": "Configurazione di %(hostSignupBrand)s",
@@ -3059,9 +2596,6 @@
     "Abort": "Annulla",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Vuoi veramente annullare la creazione dell'host? Il processo non può essere continuato.",
     "Confirm abort of host creation": "Conferma annullamento creazione host",
-    "Windows": "Finestre",
-    "Screens": "Schermi",
-    "Share your screen": "Condividi lo schermo",
     "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",
@@ -3090,22 +2624,14 @@
     "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",
@@ -3113,25 +2639,9 @@
     "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.",
@@ -3140,9 +2650,7 @@
     "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.",
@@ -3150,19 +2658,12 @@
     "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",
@@ -3173,29 +2674,20 @@
     "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",
@@ -3203,10 +2695,7 @@
     "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",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifica questa sessione per accedere ai tuoi messaggi cifrati e provare agli altri che questo sei veramente tu.",
-    "Verify with another session": "Verifica con un'altra sessione",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Creeremo stanze per ognuno di essi. Puoi aggiungerne altri dopo, inclusi quelli già esistenti.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Inizia a creare una stanza per ognuno di essi. Puoi aggiungerne altri dopo, inclusi quelli già esistenti.",
     "Make sure the right people have access. You can invite more later.": "Assicurati che le persone giuste abbiano accesso. Puoi invitarne altre dopo.",
     "A private space to organise your rooms": "Uno spazio privato per organizzare le tue stanze",
     "Just me": "Solo io",
@@ -3217,18 +2706,12 @@
     "Private space": "Spazio privato",
     "Public space": "Spazio pubblico",
     "<inviter/> invites you": "<inviter/> ti ha invitato",
-    "Search names and description": "Cerca nomi e descrizioni",
     "You may want to try a different search or check for typos.": "Prova a fare una ricerca diversa o controllare errori di battitura.",
     "No results found": "Nessun risultato trovato",
     "Mark as suggested": "Segna come consigliato",
     "Mark as not suggested": "Segna come non consigliato",
     "Removing...": "Rimozione...",
     "Failed to remove some rooms. Try again later": "Rimozione di alcune stanze fallita. Riprova più tardi",
-    "%(count)s rooms and 1 space|one": "%(count)s stanza e 1 spazio",
-    "%(count)s rooms and 1 space|other": "%(count)s stanze e 1 spazio",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s stanza e %(numSpaces)s spazi",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s stanze e %(numSpaces)s spazi",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Se non trovi la stanza che stai cercando, chiedi un invito o <a>crea una stanza nuova</a>.",
     "Suggested": "Consigliato",
     "This room is suggested as a good one to join": "Questa è una buona stanza in cui entrare",
     "%(count)s rooms|one": "%(count)s stanza",
@@ -3243,37 +2726,26 @@
     "Invite with email or username": "Invita con email o nome utente",
     "You can change these anytime.": "Puoi cambiarli in qualsiasi momento.",
     "Add some details to help people recognise it.": "Aggiungi qualche dettaglio per aiutare le persone a riconoscerlo.",
-    "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.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Da %(deviceName)s (%(deviceId)s) al %(ip)s",
     "Check your devices": "Controlla i tuoi dispositivi",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Una nuova sessione sta accedendo al tuo account: %(name)s (%(deviceID)s) al %(ip)s",
     "You have unverified logins": "Hai accessi non verificati",
-    "Open": "Apri",
-    "Send and receive voice messages (in development)": "Invia e ricevi messaggi vocali (in sviluppo)",
     "unknown person": "persona sconosciuta",
     "Sends the given message as a spoiler": "Invia il messaggio come spoiler",
     "Review to ensure your account is safe": "Controlla per assicurarti che l'account sia sicuro",
     "%(deviceId)s from %(ip)s": "%(deviceId)s da %(ip)s",
-    "Share decryption keys for room history when inviting users": "Condividi le chiavi di decifrazione della cronologia della stanza quando inviti utenti",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultazione con %(transferTarget)s. <a>Trasferisci a %(transferee)s</a>",
     "Manage & explore rooms": "Gestisci ed esplora le stanze",
     "Invite to just this room": "Invita solo in questa stanza",
     "%(count)s people you know have already joined|other": "%(count)s persone che conosci sono già entrate",
     "%(count)s people you know have already joined|one": "%(count)s persona che conosci è già entrata",
-    "Message search initilisation failed": "Inizializzazione ricerca messaggi fallita",
     "Add existing rooms": "Aggiungi stanze esistenti",
     "Warn before quitting": "Avvisa prima di uscire",
     "Invited people will be able to read old messages.": "Le persone invitate potranno leggere i vecchi messaggi.",
     "You most likely do not want to reset your event index store": "Probabilmente non hai bisogno di reinizializzare il tuo archivio indice degli eventi",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Se lo fai, ricorda che nessuno dei tuoi messaggi verrà eliminato, ma l'esperienza di ricerca potrà peggiorare per qualche momento mentre l'indice viene ricreato",
     "Avatar": "Avatar",
     "Verification requested": "Verifica richiesta",
     "What are some things you want to discuss in %(spaceName)s?": "Quali sono le cose di cui vuoi discutere in %(spaceName)s?",
     "Please choose a strong password": "Scegli una password robusta",
     "Quick actions": "Azioni rapide",
-    "Invite messages are hidden by default. Click to show the message.": "I messaggi di invito sono nascosti in modo predefinito. Clicca per mostrare il messaggio.",
-    "Record a voice message": "Registra un messaggio vocale",
-    "Stop & send recording": "Ferma e invia la registrazione",
     "Accept on your other login…": "Accetta nella tua altra sessione…",
     "Adding...": "Aggiunta...",
     "We couldn't create your DM.": "Non abbiamo potuto creare il tuo messaggio diretto.",
@@ -3313,18 +2785,13 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Scegli le stanze o le conversazioni da aggiungere. Questo è uno spazio solo per te, nessuno ne saprà nulla. Puoi aggiungerne altre in seguito.",
     "What do you want to organise?": "Cosa vuoi organizzare?",
     "Filter all spaces": "Filtra tutti gli spazi",
-    "Delete recording": "Elimina registrazione",
-    "Stop the recording": "Ferma la registrazione",
     "%(count)s results in all spaces|one": "%(count)s risultato in tutti gli spazi",
     "%(count)s results in all spaces|other": "%(count)s risultati in tutti gli spazi",
     "You have no ignored users.": "Non hai utenti ignorati.",
     "Play": "Riproduci",
     "Pause": "Pausa",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Questa è una funzione sperimentale.</b> Per ora, i nuovi utenti che ricevono un invito dovranno aprirlo su <link/> per entrare.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Per entrare in %(spaceName)s, attiva la <a>beta degli spazi</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Per vedere %(spaceName)s, attiva la <a>beta degli spazi</a>",
     "Select a room below first": "Prima seleziona una stanza sotto",
-    "Communities are changing to Spaces": "Le comunità stanno diventando spazi",
     "Join the beta": "Unisciti alla beta",
     "Leave the beta": "Abbandona la beta",
     "Beta": "Beta",
@@ -3334,8 +2801,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Aggiunta stanza...",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Aggiunta stanze... (%(progress)s di %(count)s)",
     "Not all selected were added": "Non tutti i selezionati sono stati aggiunti",
-    "You can add existing spaces to a space.": "Puoi aggiungere spazi esistenti ad uno spazio.",
-    "Feeling experimental?": "Ti va di sperimentare?",
     "You are not allowed to view this server's rooms list": "Non hai i permessi per vedere l'elenco di stanze del server",
     "Error processing voice message": "Errore di elaborazione del vocale",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Non abbiamo trovato un microfono nel tuo dispositivo. Controlla le impostazioni e riprova.",
@@ -3345,28 +2810,17 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Ti va di sperimentare? I laboratori sono il miglior modo di ottenere anteprime, testare nuove funzioni ed aiutare a modellarle prima che vengano pubblicate. <a>Maggiori informazioni</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "Il tuo token di accesso ti dà l'accesso al tuo account. Non condividerlo con nessuno.",
     "Access Token": "Token di accesso",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Gli spazi sono un nuovo modo di raggruppare stanze e persone. Per entrare in uno spazio esistente ti serve un invito.",
     "Please enter a name for the space": "Inserisci un nome per lo spazio",
     "Connecting": "In connessione",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Permetti Peer-to-Peer per chiamate 1:1 (se lo attivi, l'altra parte potrebbe essere in grado di vedere il tuo indirizzo IP)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta disponibile per web, desktop e Android. Alcune funzioni potrebbero non essere disponibili nel tuo homeserver.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Puoi abbandonare la beta quando vuoi dalle impostazioni o toccando un'etichetta beta, come quella sopra.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s si ricaricherà con gli spazi attivati. Le comunità e le etichette personalizzate saranno nascoste.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta disponibile per web, desktop e Android. Grazie per la partecipazione alla beta.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s si ricaricherà con gli spazi disattivati. Le comunità e le etichette personalizzate saranno di nuovo visibili.",
     "Spaces are a new way to group rooms and people.": "Gli spazi sono un nuovo modo di raggruppare stanze e persone.",
-    "Spaces are a beta feature.": "Gli spazi sono una funzionalità beta.",
     "Search names and descriptions": "Cerca nomi e descrizioni",
     "You may contact me if you have any follow up questions": "Potete contattarmi se avete altre domande",
     "To leave the beta, visit your settings.": "Per abbandonare la beta, vai nelle impostazioni.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Verranno annotate la tua piattaforma e il nome utente per aiutarci ad usare la tua opinione al meglio.",
     "%(featureName)s beta feedback": "Feedback %(featureName)s beta",
     "Thank you for your feedback, we really appreciate it.": "Grazie per la tua opinione, lo appreziamo molto.",
-    "Beta feedback": "Feedback beta",
     "Add reaction": "Aggiungi reazione",
-    "Send and receive voice messages": "Invia e ricevi messaggi vocali",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "La tua opinione aiuterà a migliorare gli spazi. Più dettagli dai, meglio è.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Se esci, %(brand)s si ricaricherà con gli spazi disattivati. Le comunità e le etichette personalizzate saranno di nuovo visibili.",
     "Message search initialisation failed": "Inizializzazione ricerca messaggi fallita",
     "Space Autocomplete": "Autocompletamento spazio",
     "Go to my space": "Vai nel mio spazio",
@@ -3375,5 +2829,337 @@
     "Kick, ban, or invite people to your active room, and make you leave": "Buttare fuori, bandire o invitare persone nella tua stanza attiva e farti uscire",
     "See when people join, leave, or are invited to this room": "Vedere quando le persone entrano, escono o sono invitate in questa stanza",
     "Kick, ban, or invite people to this room, and make you leave": "Buttare fuori, bandire o invitare persone in questa stanza e farti uscire",
-    "See when people join, leave, or are invited to your active room": "Vedere quando le persone entrano, escono o sono invitate nella tua stanza attiva"
+    "See when people join, leave, or are invited to your active room": "Vedere quando le persone entrano, escono o sono invitate nella tua stanza attiva",
+    "Currently joining %(count)s rooms|one": "Stai entrando in %(count)s stanza",
+    "Currently joining %(count)s rooms|other": "Stai entrando in %(count)s stanze",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Prova parole diverse o controlla errori di battitura. Alcuni risultati potrebbero non essere visibili dato che sono privati e ti servirebbe un invito per unirti.",
+    "No results for \"%(query)s\"": "Nessun risultato per \"%(query)s\"",
+    "The user you called is busy.": "L'utente che hai chiamato è occupato.",
+    "User Busy": "Utente occupato",
+    "Teammates might not be able to view or join any private rooms you make.": "I tuoi compagni potrebbero non riuscire a vedere o unirsi a qualsiasi stanza privata che crei.",
+    "Or send invite link": "O manda un collegamento di invito",
+    "If you can't see who you’re looking for, send them your invite link below.": "Se non vedi chi stai cercando, mandagli il collegamento di invito sottostante.",
+    "Some suggestions may be hidden for privacy.": "Alcuni suggerimenti potrebbero essere nascosti per privacy.",
+    "Search for rooms or people": "Cerca stanze o persone",
+    "Forward message": "Inoltra messaggio",
+    "Open link": "Apri collegamento",
+    "Sent": "Inviato",
+    "You don't have permission to do this": "Non hai il permesso per farlo",
+    "Error - Mixed content": "Errore - Contenuto misto",
+    "Error loading Widget": "Errore di caricamento del widget",
+    "Nothing pinned, yet": "Non c'è ancora nulla di ancorato",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Se ne hai il permesso, apri il menu di qualsiasi messaggio e seleziona <b>Fissa</b> per ancorarlo qui.",
+    "Pinned messages": "Messaggi ancorati",
+    "End-to-end encryption isn't enabled": "La crittografia end-to-end non è attiva",
+    "Report": "Segnala",
+    "Show preview": "Mostra anteprima",
+    "View source": "Visualizza sorgente",
+    "Settings - %(spaceName)s": "Impostazioni - %(spaceName)s",
+    "Report the entire room": "Segnala l'intera stanza",
+    "Spam or propaganda": "Spam o propaganda",
+    "Illegal Content": "Contenuto illegale",
+    "Toxic Behaviour": "Cattivo comportamento",
+    "Please pick a nature and describe what makes this message abusive.": "Scegli la natura del problema e descrivi cosa rende questo messaggio un abuso.",
+    "Please provide an address": "Inserisci un indirizzo",
+    "This space has no local addresses": "Questo spazio non ha indirizzi locali",
+    "Space information": "Informazioni spazio",
+    "Collapse": "Riduci",
+    "Expand": "Espandi",
+    "Preview Space": "Anteprima spazio",
+    "Decide who can view and join %(spaceName)s.": "Decidi chi può vedere ed entrare in %(spaceName)s.",
+    "Visibility": "Visibilità",
+    "This may be useful for public spaces.": "Può tornare utile per gli spazi pubblici.",
+    "Guests can join a space without having an account.": "Gli ospiti possono entrare in uno spazio senza avere un account.",
+    "Enable guest access": "Attiva accesso ospiti",
+    "Address": "Indirizzo",
+    "e.g. my-space": "es. mio-spazio",
+    "Silence call": "Silenzia la chiamata",
+    "Sound on": "Audio attivo",
+    "Show all rooms in Home": "Mostra tutte le stanze nella pagina principale",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototipo di segnalazione ai moderatori. Nelle stanze che supportano la moderazione, il pulsante `segnala` ti permetterà di notificare un abuso ai moderatori della stanza",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s ha cambiato i <a>messaggi ancorati</a> della stanza.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s ha buttato fuori %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s ha buttato fuori %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s ha revocato l'invito per %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s ha revocato l'invito per %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s ha riammesso %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s ha lasciato la stanza",
+    "[number]": "[numero]",
+    "To view %(spaceName)s, you need an invite": "Per vedere %(spaceName)s ti serve un invito",
+    "Move down": "Sposta giù",
+    "Move up": "Sposta su",
+    "Collapse reply thread": "Riduci finestra di risposta",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s ha modificato il proprio nome in %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s ha bandito %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s ha bandito %(targetName)s: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s ha accettato un invito",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s ha accettato l'invito per %(displayName)s",
+    "Some invites couldn't be sent": "Alcuni inviti non sono stati spediti",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Abbiamo inviato gli altri, ma non è stato possibile invitare le seguenti persone in <RoomName/>",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Puoi cliccare un avatar nella pannello dei filtri quando vuoi per vedere solo le stanze e le persone associate a quella comunità.",
+    "Forward": "Inoltra",
+    "Disagree": "Rifiuta",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Altri motivi. Si prega di descrivere il problema.\nVerrà segnalato ai moderatori della stanza.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Questa stanza è dedicata a contenuti illegali o dannosi, oppure i moderatori non riescono a censurare questo tipo di contenuti.\nVerrà segnalata agli amministratori di %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Questa stanza è dedicata a contenuti illegali o dannosi, oppure i moderatori non riescono a censurare questo tipo di contenuti.\nVerrà segnalata agli amministratori di %(homeserver)s. Gli amministratori NON potranno leggere i contenuti cifrati di questa stanza.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Questo utente sta facendo spam nella stanza con pubblicità, collegamenti ad annunci o a propagande.\nVerrà segnalato ai moderatori della stanza.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Questo utente sta mostrando un comportamento illegale, ad esempio facendo doxing o minacciando violenza.\nVerrà segnalato ai moderatori della stanza che potrebbero portarlo in ambito legale.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Questo utente sta mostrando un cattivo comportamento, ad esempio insultando altri utenti o condividendo  contenuti per adulti in una stanza per tutti  , oppure violando le regole della stessa.\nVerrà segnalato ai moderatori della stanza.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Questo utente sta scrivendo cose sbagliate.\nVerrà segnalato ai moderatori della stanza.",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sha cambiato le ACL del server",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sha cambiato le ACL del server %(count)s volte",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)shanno cambiato le ACL del server",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)shanno cambiato le ACL del server %(count)s volte",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Inizializzazione ricerca messaggi fallita, controlla <a>le impostazioni</a> per maggiori informazioni",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Imposta gli indirizzi per questo spazio affinché gli utenti lo trovino attraverso il tuo homeserver (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Per pubblicare un indirizzo, deve prima essere impostato come indirizzo locale.",
+    "Published addresses can be used by anyone on any server to join your room.": "Gli indirizzi pubblicati possono essere usati da chiunque su tutti i server per entrare nella tua stanza.",
+    "Published addresses can be used by anyone on any server to join your space.": "Gli indirizzi pubblicati possono essere usati da chiunque su tutti i server per entrare nel tuo spazio.",
+    "Recommended for public spaces.": "Consigliato per gli spazi pubblici.",
+    "Allow people to preview your space before they join.": "Permetti a chiunque di vedere l'anteprima dello spazio prima di unirsi.",
+    "Failed to update the history visibility of this space": "Aggiornamento visibilità cronologia dello spazio fallito",
+    "Failed to update the guest access of this space": "Aggiornamento accesso ospiti dello spazio fallito",
+    "Failed to update the visibility of this space": "Aggiornamento visibilità dello spazio fallito",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s ha abbandonato la stanza: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s ha rifiutato l'invito",
+    "%(targetName)s joined the room": "%(targetName)s è entrato/a nella stanza",
+    "%(senderName)s made no change": "%(senderName)s non ha fatto modifiche",
+    "%(senderName)s set a profile picture": "%(senderName)s ha impostato un'immagine del profilo",
+    "%(senderName)s changed their profile picture": "%(senderName)s ha cambiato la propria immagine del profilo",
+    "%(senderName)s removed their profile picture": "%(senderName)s ha rimosso la propria immagine del profilo",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s ha rimosso il proprio nome (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s ha impostato il proprio nome a %(displayName)s",
+    "Integration manager": "Gestore di integrazioni",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Il tuo %(brand)s non ti permette di usare il gestore di integrazioni per questa azione. Contatta un amministratore.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s e il tuo gestore di integrazioni.",
+    "Identity server is": "Il server di identità è",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "I gestori di integrazione ricevono dati di configurazione e possono modificare widget, inviare inviti alla stanza, assegnare permessi a tuo nome.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni per gestire bot, widget e pacchetti di adesivi.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni <b>(%(serverName)s)</b> per gestire bot, widget e pacchetti di adesivi.",
+    "Identity server": "Server di identità",
+    "Identity server (%(server)s)": "Server di identità (%(server)s)",
+    "Could not connect to identity server": "Impossibile connettersi al server di identità",
+    "Not a valid identity server (status code %(code)s)": "Non è un server di identità valido (codice di stato %(code)s)",
+    "Identity server URL must be HTTPS": "L'URL del server di identità deve essere HTTPS",
+    "Unable to copy a link to the room to the clipboard.": "Impossibile copiare un collegamento alla stanza negli appunti.",
+    "Unable to copy room link": "Impossibile copiare il link della stanza",
+    "Unnamed audio": "Audio senza nome",
+    "Error processing audio message": "Errore elaborazione messaggio audio",
+    "Show %(count)s other previews|one": "Mostra %(count)s altra anteprima",
+    "Show %(count)s other previews|other": "Mostra altre %(count)s anteprime",
+    "Images, GIFs and videos": "Immagini, GIF e video",
+    "Code blocks": "Blocchi di codice",
+    "To view all keyboard shortcuts, click here.": "Per vedere tutte le scorciatoie, clicca qui.",
+    "Keyboard shortcuts": "Scorciatoie da tastiera",
+    "There was an error loading your notification settings.": "Si è verificato un errore caricando le tue impostazioni di notifica.",
+    "Mentions & keywords": "Menzioni e parole chiave",
+    "Global": "Globale",
+    "New keyword": "Nuova parola chiave",
+    "Keyword": "Parola chiave",
+    "Enable email notifications for %(email)s": "Attive le notifiche email per %(email)s",
+    "Enable for this account": "Attiva per questo account",
+    "An error occurred whilst saving your notification preferences.": "Si è verificato un errore durante il salvataggio delle tue preferenze di notifica.",
+    "Error saving notification preferences": "Errore nel salvataggio delle preferenze di notifica",
+    "Messages containing keywords": "Messaggi contenenti parole chiave",
+    "Use Ctrl + F to search timeline": "Usa Ctrl + F per cercare nella linea temporale",
+    "Use Command + F to search timeline": "Usa Command + F per cercare nella linea temporale",
+    "User %(userId)s is already invited to the room": "L'utente %(userId)s è già stato invitato nella stanza",
+    "Transfer Failed": "Trasferimento fallito",
+    "Unable to transfer call": "Impossibile trasferire la chiamata",
+    "New layout switcher (with message bubbles)": "Nuovo commutatore disposizione (con nuvolette dei messaggi)",
+    "Error downloading audio": "Errore di scaricamento dell'audio",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Nota che aggiornare creerà una nuova versione della stanza</b>. Tutti i messaggi attuali resteranno in questa stanza archiviata.",
+    "Automatically invite members from this room to the new one": "Invita automaticamente i membri da questa stanza a quella nuova",
+    "These are likely ones other room admins are a part of.": "Questi sono probabilmente quelli di cui fanno parte gli altri amministratori delle stanze.",
+    "Other spaces or rooms you might not know": "Altri spazi o stanze che potresti non conoscere",
+    "Spaces you know that contain this room": "Spazi di cui sai che contengono questa stanza",
+    "Search spaces": "Cerca spazi",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decidi quali spazi possono accedere a questa stanza. Se uno spazio è selezionato, i suoi membri possono trovare ed entrare in <RoomName/>.",
+    "Select spaces": "Seleziona spazi",
+    "You're removing all spaces. Access will default to invite only": "Stai rimuovendo tutti gli spazi. L'accesso tornerà solo su invito",
+    "User Directory": "Elenco utenti",
+    "Room visibility": "Visibilità stanza",
+    "Visible to space members": "Visibile ai membri dello spazio",
+    "Public room": "Stanza pubblica",
+    "Private room (invite only)": "Stanza privata (solo a invito)",
+    "Create a room": "Crea una stanza",
+    "Only people invited will be able to find and join this room.": "Solo le persone invitate potranno trovare ed entrare in questa stanza.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Chiunque potrà trovare ed entrare in questa stanza, non solo i membri di <SpaceName/>.",
+    "You can change this at any time from room settings.": "Puoi cambiarlo in qualsiasi momento dalle impostazioni della stanza.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Chiunque in <SpaceName/> potrà trovare ed entrare in questa stanza.",
+    "Image": "Immagine",
+    "Sticker": "Sticker",
+    "The call is in an unknown state!": "La chiamata è in uno stato sconosciuto!",
+    "Call back": "Richiama",
+    "No answer": "Nessuna risposta",
+    "An unknown error occurred": "Si è verificato un errore sconosciuto",
+    "Their device couldn't start the camera or microphone": "Il suo dispositivo non ha potuto avviare la fotocamera o il microfono",
+    "Connection failed": "Connessione fallita",
+    "Could not connect media": "Connessione del media fallita",
+    "Copy Room Link": "Copia collegamento stanza",
+    "Access": "Accesso",
+    "People with supported clients will be able to join the room without having a registered account.": "Le persone con client supportati potranno entrare nella stanza senza avere un account registrato.",
+    "Decide who can join %(roomName)s.": "Decidi chi può entrare in %(roomName)s.",
+    "Space members": "Membri dello spazio",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Chiunque in uno spazio può trovare ed entrare. Puoi selezionare più spazi.",
+    "Spaces with access": "Spazi con accesso",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Chiunque in uno spazio può trovare ed entrare. <a>Modifica quali spazi possono accedere qui.</a>",
+    "Currently, %(count)s spaces have access|other": "Attualmente, %(count)s spazi hanno accesso",
+    "& %(count)s more|other": "e altri %(count)s",
+    "Upgrade required": "Aggiornamento necessario",
+    "Anyone can find and join.": "Chiunque può trovare ed entrare.",
+    "Only invited people can join.": "Solo le persone invitate possono entrare.",
+    "Private (invite only)": "Privato (solo a invito)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Questo aggiornamento permetterà ai membri di spazi selezionati di accedere alla stanza senza invito.",
+    "Message bubbles": "Messaggi",
+    "IRC": "IRC",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Ciò rende facile mantenere private le stanze in uno spazio, mentre le persone potranno trovarle ed unirsi. Tutte le stanze nuove in uno spazio avranno questa opzione disponibile.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Per aiutare i membri dello spazio a trovare ed entrare in una stanza privata, vai nelle impostazioni \"Sicurezza e privacy\" di quella stanza.",
+    "Help space members find private rooms": "Aiuta i membri dello spazio a trovare stanze private",
+    "Help people in spaces to find and join private rooms": "Aiuta le persone negli spazi a trovare ed entrare nelle stanze private",
+    "New in the Spaces beta": "Novità nella beta degli spazi",
+    "We're working on this, but just want to let you know.": "Ci stiamo lavorando, ma volevamo almeno fartelo sapere.",
+    "Search for rooms or spaces": "Cerca stanze o spazi",
+    "Add space": "Aggiungi spazio",
+    "Leave %(spaceName)s": "Esci da %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Sei l'unico amministratore di alcune delle stanze o spazi che vuoi abbandonare. Se esci li lascerai senza amministratori.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Sei l'unico amministratore di questo spazio. Se esci nessuno ne avrà il controllo.",
+    "You won't be able to rejoin unless you are re-invited.": "Non potrai rientrare a meno che non ti invitino di nuovo.",
+    "Search %(spaceName)s": "Cerca %(spaceName)s",
+    "Want to add an existing space instead?": "Vuoi piuttosto aggiungere uno spazio esistente?",
+    "Private space (invite only)": "Spazio privato (solo a invito)",
+    "Space visibility": "Visibilità spazio",
+    "Add a space to a space you manage.": "Aggiungi uno spazio ad un altro che gestisci.",
+    "Only people invited will be able to find and join this space.": "Solo le persone invitate potranno trovare ed entrare in questo spazio.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Chiunque in <SpaceName/> potrà trovare ed entrare.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Chiunque potrà trovare ed entrare in questo spazio, non solo i membri di <SpaceName/>.",
+    "Anyone will be able to find and join this room.": "Chiunque potrà trovare ed entrare in questa stanza.",
+    "Adding spaces has moved.": "L'aggiunta di spazi è stata spostata.",
+    "Search for rooms": "Cerca stanze",
+    "Search for spaces": "Cerca spazi",
+    "Create a new space": "Crea un nuovo spazio",
+    "Want to add a new space instead?": "Vuoi piuttosto aggiungere un nuovo spazio?",
+    "Add existing space": "Aggiungi spazio esistente",
+    "Share content": "Condividi contenuto",
+    "Application window": "Finestra applicazione",
+    "Share entire screen": "Condividi schermo intero",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Ora puoi condividere lo schermo premendo il pulsante \"condivisione schermo\" durante una chiamata. Puoi anche farlo nelle telefonate se entrambe le parti lo supportano!",
+    "Screen sharing is here!": "È arrivata la condivisione dello schermo!",
+    "Show all rooms": "Mostra tutte le stanze",
+    "Give feedback.": "Manda feedback.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Grazie per aver provato gli spazi. Il tuo feedback aiuterà a migliorare le prossime versioni.",
+    "Spaces feedback": "Feedback sugli spazi",
+    "Spaces are a new feature.": "Gli spazi sono una nuova funzionalità.",
+    "Your camera is still enabled": "La tua fotocamera è ancora attiva",
+    "Your camera is turned off": "La tua fotocamera è spenta",
+    "%(sharerName)s is presenting": "%(sharerName)s sta presentando",
+    "You are presenting": "Stai presentando",
+    "All rooms you're in will appear in Home.": "Tutte le stanze in cui sei appariranno nella pagina principale.",
+    "Decrypting": "Decifrazione",
+    "Send pseudonymous analytics data": "Invia dati analitici pseudo-anonimi",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)sha cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte.",
+    "Missed call": "Chiamata persa",
+    "Call declined": "Chiamata rifiutata",
+    "Stop recording": "Ferma la registrazione",
+    "Send voice message": "Invia messaggio vocale",
+    "Olm version:": "Versione Olm:",
+    "Mute the microphone": "Spegni il microfono",
+    "Unmute the microphone": "Accendi il microfono",
+    "Dialpad": "Tastierino",
+    "More": "Altro",
+    "Show sidebar": "Mostra barra laterale",
+    "Hide sidebar": "Nascondi barra laterale",
+    "Start sharing your screen": "Avvia la condivisione dello schermo",
+    "Stop sharing your screen": "Ferma la condivisione dello schermo",
+    "Stop the camera": "Ferma la fotocamera",
+    "Start the camera": "Avvia la fotocamera",
+    "Surround selected text when typing special characters": "Circonda il testo selezionato quando si digitano caratteri speciali",
+    "Created from <Community />": "Creato da <Community />",
+    "Communities won't receive further updates.": "Le comunità non riceveranno altri aggiornamenti.",
+    "Spaces are a new way to make a community, with new features coming.": "Gli spazi sono un nuovo modo di creare una comunità, con nuove funzioni in arrivo.",
+    "Communities can now be made into Spaces": "Le comunità ora possono diventare spazi",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Chiedi agli <a>amministratori</a> di questa comunità di renderla uno spazio e di tenere d'occhio l'invito.",
+    "You can create a Space from this community <a>here</a>.": "Puoi creare uno spazio da questa comunità <a>qui</a>.",
+    "This description will be shown to people when they view your space": "Questa descrizione verrà mostrata alle persone quando vedono il tuo spazio",
+    "Flair won't be available in Spaces for the foreseeable future.": "Le predisposizioni non saranno disponibili negli spazi per l'immediato futuro.",
+    "All rooms will be added and all community members will be invited.": "Tutte le stanze verranno aggiunte e tutti i membri della comunità saranno invitati.",
+    "A link to the Space will be put in your community description.": "Un collegamento allo spazio verrà inserito nella descrizione della tua comunità.",
+    "Create Space from community": "Crea spazio da comunità",
+    "Failed to migrate community": "Migrazione delle comunità fallita",
+    "To create a Space from another community, just pick the community in Preferences.": "Per creare uno spazio da un'altra comunità, scegli la comunità nelle preferenze.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> è stato creato e chiunque facesse parte della comunità è stato invitato.",
+    "Space created": "Spazio creato",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Per vedere gli spazi, nascondi le comunità nelle <a>preferenze</a>",
+    "This community has been upgraded into a Space": "La comunità è stata aggiornata in uno spazio",
+    "Unknown failure: %(reason)s": "Malfunzionamento sconosciuto: %(reason)s",
+    "If a community isn't shown you may not have permission to convert it.": "Se una comunità non è mostrata, potresti non avere il permesso di convertirla.",
+    "Show my Communities": "Mostra le mie comunità",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Le comunità sono state archiviate per introdurre gli spazi, ma puoi convertirle in spazi qua sotto. La conversione assicurerà che le tue conversazioni otterranno le funzionalità più recenti.",
+    "Create Space": "Crea spazio",
+    "Open Space": "Apri spazio",
+    "You can change this later.": "Puoi cambiarlo in seguito.",
+    "What kind of Space do you want to create?": "Che tipo di spazio vuoi creare?",
+    "Delete avatar": "Elimina avatar",
+    "Don't send read receipts": "Non inviare ricevute di lettura",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati, gli ultimi elementi dell'interfaccia con cui hai interagito e i nomi degli altri utenti. Non contengono messaggi.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se hai segnalato un errore via Github, i log di debug possono aiutarci a identificare il problema. I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati, gli ultimi elementi dell'interfaccia con cui hai interagito e i nomi degli altri utenti. Non contengono messaggi.",
+    "Enable encryption in settings.": "Attiva la crittografia nelle impostazioni.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "I tuoi messaggi privati normalmente sono cifrati, ma questa stanza non lo è. Di solito ciò è dovuto ad un dispositivo non supportato o dal metodo usato, come gli inviti per email.",
+    "Cross-signing is ready but keys are not backed up.": "La firma incrociata è pronta ma c'è un backup delle chiavi.",
+    "Rooms and spaces": "Stanze e spazi",
+    "Results": "Risultati",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Per evitare questi problemi, crea una <a>nuova stanza pubblica</a> per la conversazione che vuoi avere.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non è consigliabile rendere pubbliche le stanze cifrate.</b> Se lo fai, chiunque potrà trovare ed entrare nella stanza, quindi chiunque potrà leggere i messaggi. Non avrai alcun beneficio dalla crittografia. Cifrare i messaggi in una stanza pubblica renderà più lenti l'invio e la ricezione dei messaggi.",
+    "Are you sure you want to make this encrypted room public?": "Vuoi veramente rendere pubblica questa stanza cifrata?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Per evitare questi problemi, crea una <a>nuova stanza cifrata</a> per la conversazione che vuoi avere.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non è consigliabile aggiungere la crittografia alle stanze pubbliche.</b>Chiunque può trovare ed entrare in stanze pubbliche, quindi chiunque può leggere i messaggi. Non avrai alcun beneficio dalla crittografia e non potrai disattivarla in seguito. Cifrare i messaggi in una stanza pubblica renderà più lenti l'invio e la ricezione dei messaggi.",
+    "Are you sure you want to add encryption to this public room?": "Vuoi veramente aggiungere la crittografia a questa stanza pubblica?",
+    "Low bandwidth mode (requires compatible homeserver)": "Modalità a connessione lenta (richiede un homeserver compatibile)",
+    "Multiple integration managers (requires manual setup)": "Gestori di integrazione multipli (richiede configurazione manuale)",
+    "Thread": "Conversazione",
+    "Show threads": "Mostra conversazioni",
+    "Threaded messaging": "Messaggi raggruppati",
+    "The above, but in any room you are joined or invited to as well": "Quanto sopra, ma anche in qualsiasi stanza tu sia entrato o invitato",
+    "The above, but in <Room /> as well": "Quanto sopra, ma anche in <Room />",
+    "Currently, %(count)s spaces have access|one": "Attualmente, uno spazio ha accesso",
+    "& %(count)s more|one": "e altri %(count)s",
+    "Autoplay videos": "Auto-riproduci i video",
+    "Autoplay GIFs": "Auto-riproduci le GIF",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s ha tolto un messaggio ancorato da questa stanza. Vedi tutti i messaggi ancorati.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s ha tolto un <a>messaggio ancorato</a> da questa stanza. Vedi tutti i <b>messaggi ancorati</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s ha ancorato un messaggio a questa stanza. Vedi tutti i messaggi ancorati.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s ha ancorato <a>un messaggio</a> a questa stanza. Vedi tutti i <b>messaggi ancorati</b>.",
+    "Some encryption parameters have been changed.": "Alcuni parametri di crittografia sono stati modificati.",
+    "Role in <RoomName/>": "Ruolo in <RoomName/>",
+    "Explore %(spaceName)s": "Esplora %(spaceName)s",
+    "Send a sticker": "Invia uno sticker",
+    "Reply to thread…": "Rispondi alla conversazione…",
+    "Reply to encrypted thread…": "Rispondi alla conversazione cifrata…",
+    "Add emoji": "Aggiungi emoji",
+    "Unknown failure": "Errore sconosciuto",
+    "Failed to update the join rules": "Modifica delle regole di accesso fallita",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Chiunque in <spaceName/> può trovare ed entrare. Puoi selezionare anche altri spazi.",
+    "Select the roles required to change various parts of the space": "Seleziona i ruoli necessari per cambiare varie parti dello spazio",
+    "Change description": "Cambia descrizione",
+    "Change main address for the space": "Cambia indirizzo principale dello spazio",
+    "Change space name": "Cambia nome dello spazio",
+    "Change space avatar": "Cambia avatar dello spazio",
+    "Message didn't send. Click for info.": "Il messaggio non è stato inviato. Clicca per informazioni.",
+    "To join this Space, hide communities in your <a>preferences</a>": "Per entrare in questo spazio, nascondi le comunità nelle <a>preferenze</a>",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Per entrare in %(communityName)s, passa alle comunità nelle <a>preferenze</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Per vedere %(communityName)s, passa alle comunità nelle <a>preferenze</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "Per vedere questo spazio, nascondi le comunità nelle <a>preferenze</a>",
+    "Private community": "Comunità privata",
+    "Public community": "Comunità pubblica",
+    "Message": "Messaggio",
+    "Upgrade anyway": "Aggiorna comunque",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Questa stanza è in alcuni spazi di cui non sei amministratore. In quegli spazi, la vecchia stanza verrà ancora mostrata, ma alla gente verrà chiesto di entrare in quella nuova.",
+    "Before you upgrade": "Prima di aggiornare",
+    "To join a space you'll need an invite.": "Per entrare in uno spazio ti serve un invito.",
+    "You can also make Spaces from <a>communities</a>.": "Puoi anche creare spazi dalle <a>comunità</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Mostra temporaneamente le comunità invece degli spazi per questa sessione. Il supporto per questa azione verrà rimosso nel breve termine. Element verrà ricaricato.",
+    "Display Communities instead of Spaces": "Mostra le comunità invece degli spazi",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s ha reagito con %(content)s",
+    "Joining space …": "Ingresso nello spazio …"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 495e240051..cd51de0826 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1,8 +1,5 @@
 {
     "Anyone": "誰でも",
-    "Anyone who knows the room's link, apart from guests": "誰でも部屋に参加できる (ゲストユーザは不可)",
-    "Anyone who knows the room's link, including guests": "誰でも部屋に参加できる (ゲストユーザも可能)",
-    "Autoplay GIFs and videos": "GIFアニメーションや動画を自動再生する",
     "Change Password": "パスワード変更",
     "Close": "閉じる",
     "Create Room": "部屋を作成",
@@ -10,22 +7,20 @@
     "Favourite": "お気に入り",
     "Favourites": "お気に入り",
     "Invited": "招待中",
-    "%(targetName)s joined the room.": "%(targetName)s が部屋に参加しました。",
     "Low priority": "低優先度",
     "Mute": "通知しない",
     "Notifications": "通知",
     "Cancel": "キャンセル",
     "Create new room": "新しい部屋を作成",
-    "Room directory": "公開部屋一覧",
     "Search": "検索",
     "Settings": "設定",
     "Start chat": "対話開始",
     "New Password": "新しいパスワード",
     "Failed to change password. Is your password correct?": "パスワード変更に失敗しました。パスワードは正しいですか?",
     "Only people who have been invited": "この部屋に招待された人のみ参加可能",
-    "Always show message timestamps": "発言時刻を常に表示",
+    "Always show message timestamps": "発言時刻を常に表示する",
     "Filter room members": "部屋メンバーを検索",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を 12 時間形式で表示する (例: 2:30午後)",
     "Upload avatar": "アイコン画像を変更",
     "Upload file": "ファイルのアップロード",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)sはアプリケーションを改善するために匿名の分析情報を収集しています。",
@@ -37,7 +32,6 @@
     "Are you sure?": "本当によろしいですか？",
     "OK": "OK",
     "Operation failed": "操作に失敗しました",
-    "Custom Server Options": "カスタムサーバのオプション",
     "Dismiss": "やめる",
     "powered by Matrix": "powered by Matrix",
     "Error": "エラー",
@@ -45,7 +39,6 @@
     "Submit debug logs": "デバッグログを送信する",
     "Edit": "編集",
     "Continue": "続ける",
-    "Unpin Message": "メッセージの固定を外す",
     "Online": "オンライン",
     "unknown error code": "不明なエラーコード",
     "Failed to forget room %(errCode)s": "部屋の履歴を消すのに失敗しました %(errCode)s",
@@ -73,71 +66,40 @@
     "You cannot delete this message. (%(code)s)": "あなたはこの発言を削除できません (%(code)s)",
     "Send": "送信",
     "All messages": "全ての発言",
-    "Uploading report": "レポートのアップロード",
     "Sunday": "日曜日",
-    "Direct Chat": "対話",
     "Today": "今日",
-    "Files": "添付ファイル",
     "Room not found": "部屋が見つかりません",
-    "Set Password": "パスワードを設定",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "申し訳ありません。あなたのブラウザでは%(brand)sは<b>動作できません</b>。",
     "Monday": "月曜日",
     "Messages in group chats": "グループチャットでのメッセージ",
     "Friday": "金曜日",
-    "All messages (noisy)": "全ての発言(通知音あり)",
     "Yesterday": "昨日",
     "Messages sent by bot": "ボットから送信されたメッセージ",
     "Low Priority": "低優先度",
     "Members": "参加者",
     "Collecting logs": "ログの収集",
     "No update available.": "更新はありません。",
-    "An error occurred whilst saving your email notification preferences.": "電子メール通知設定を保存中にエラーが発生しました。",
-    "Failed to change settings": "設定の変更に失敗しました",
-    "Mentions only": "呼び掛けられた時のみ",
     "Collecting app version information": "アプリのバージョン情報を収集",
     "Changelog": "変更履歴",
     "Invite to this room": "この部屋へ招待",
     "Waiting for response from server": "サーバからの応答を待っています",
     "Wednesday": "水曜日",
     "Leave": "退室",
-    "Enable notifications for this account": "このアカウントで通知を行う",
-    "Failed to update keywords": "キーワードの更新に失敗しました",
-    "Enable email notifications": "電子メール通知を有効にする",
-    "Download this file": "この添付ファイルをダウンロード",
     "Call invitation": "通話への招待",
-    "Forget": "忘れる",
-    "Messages containing <span>keywords</span>": "<span>キーワード</span> を含むメッセージ",
-    "Error saving email notification preferences": "電子メール通知設定の保存エラー",
     "Tuesday": "火曜日",
-    "Enter keywords separated by a comma:": "キーワードをコンマで区切って入力:",
     "Search…": "検索…",
     "Saturday": "土曜日",
     "Warning": "警告",
     "This Room": "この部屋",
     "When I'm invited to a room": "部屋に招待された時",
-    "Keywords": "キーワード",
     "Resend": "再送信",
-    "Can't update user notification settings": "ユーザー通知の設定を更新できません",
     "Messages containing my display name": "自身の表示名を含むメッセージ",
     "Fetching third party location failed": "サードパーティの記憶場所の取得に失敗しました",
     "Send Account Data": "アカウントのデータを送信する",
-    "Advanced notification settings": "通知の詳細設定",
     "Notification targets": "通知先",
-    "You are not receiving desktop notifications": "デスクトップ通知を受け取っていません",
     "Update": "更新",
-    "Unable to fetch notification target list": "通知先リストを取得できませんでした",
-    "Uploaded on %(date)s by %(user)s": "このファイルは %(date)s に %(user)s によりアップロードされました",
     "Send Custom Event": "カスタムイベントを送信する",
-    "All notifications are currently disabled for all targets.": "現在すべての対象についての全通知が無効です。",
     "Failed to send logs: ": "ログの送信に失敗しました: ",
-    "You cannot delete this image. (%(code)s)": "この画像を消すことはできません。 (%(code)s)",
-    "Cancel Sending": "送信を取り消す",
-    "Remember, you can always set an email address in user settings if you change your mind.": "利用者設定でいつでもメールアドレスを設定できます。",
     "Unavailable": "使用できません",
-    "View Decrypted Source": "復号されたソースを表示する",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "ルールにより、次のキーワードについての通知はここに表示されません:",
-    "Please set a password!": "パスワードを設定してください！",
-    "You have successfully set a password!": "パスワードの設定に成功しました！",
     "Explore Room State": "部屋の状態を調べる",
     "Source URL": "ソースのURL",
     "Filter results": "絞り込み結果",
@@ -146,64 +108,42 @@
     "View Source": "ソースコードを表示する",
     "Back": "戻る",
     "Remove %(name)s from the directory?": "ディレクトリから %(name)s を消去しますか？",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)sは多くの高度なブラウザの機能を使用しています。そのうちのいくつかはご使用のブラウザでは使えないか、実験的な機能です。",
     "Event sent!": "イベントが送信されました！",
     "Preparing to send logs": "ログを送信する準備をしています",
     "Explore Account Data": "アカウントのデータを調べる",
     "The server may be unavailable or overloaded": "サーバは使用できないか、オーバーロードされています",
     "Reject": "拒否する",
-    "Failed to set Direct Message status of room": "部屋のダイレクトメッセージステータスの設定に失敗しました",
     "Remove from Directory": "ディレクトリから消去する",
-    "Enable them now": "今有効化する",
-    "Forward Message": "メッセージを転送する",
     "Toolbox": "ツールボックス",
     "You must specify an event type!": "イベントの形式を特定してください！",
-    "(HTTP status %(httpStatus)s)": "(HTTPステータス %(httpStatus)s)",
     "State Key": "ステータスキー",
     "Quote": "引用",
     "Send logs": "ログを送信する",
     "Downloading update...": "更新をダウンロードしています...",
-    "You have successfully set a password and an email address!": "パスワードとメールアドレスの設定に成功しました！",
     "Failed to send custom event.": "カスタムイベントの送信に失敗しました。",
     "What's new?": "新着",
-    "Notify me for anything else": "他の場合についても通知する",
-    "Notify for all other messages/rooms": "他のすべてのメッセージ又は部屋について通知する",
     "Unable to look up room ID from server": "サーバから部屋IDを検索できません",
     "Couldn't find a matching Matrix room": "一致するMatrixの部屋を見つけることができませんでした",
-    "I understand the risks and wish to continue": "リスクを理解し続ける",
     "Logs sent": "ログが送信されました",
     "Reply": "返信",
     "Show message in desktop notification": "デスクトップ通知にメッセージ内容を表示する",
-    "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.": "デバッグログはあなたのユーザ名、訪問した部屋やグループのIDやエイリアス、他のユーザのユーザ名を含むアプリの使用データを含みます。メッセージは含みません。",
     "Unable to join network": "ネットワークに接続できません",
     "Error encountered (%(errorDetail)s).": "エラーが発生しました (%(errorDetail)s)。",
     "Event Type": "イベントの形式",
     "What's New": "新着",
     "remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。",
     "%(brand)s does not know how to join a room on this network": "%(brand)sはこのネットワークで部屋に参加する方法を知りません",
-    "You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。",
-    "Pin Message": "メッセージを固定する",
     "Thank you!": "ありがとうございます！",
     "View Community": "コミュニティを表示する",
     "Developer Tools": "開発者ツール",
-    "Unhide Preview": "プレビューを表示する",
     "Event Content": "イベントの内容",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "現在ご使用のブラウザでは、アプリの外見や使い心地が正常でない可能性があります。また、一部または全部の機能がご使用いただけない可能性があります。このままご使用いただけますが、問題が発生した場合は対応しかねます！",
     "Checking for an update...": "更新を確認しています...",
     "e.g. <CurrentPageURL>": "凡例: <CurrentPageURL>",
     "Your device resolution": "端末の解像度",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "このページに部屋、ユーザー、グループIDなどの識別可能な情報が含まれている場合、そのデータはサーバーに送信される前に削除されます。",
-    "Call Timeout": "通話タイムアウト",
-    "The remote side failed to pick up": "相手が応答しませんでした",
-    "Unable to capture screen": "画面をキャプチャできません",
-    "Existing Call": "既存の通話",
-    "You are already in a call.": "すでに通話中です。",
     "VoIP is unsupported": "VoIPは対応していません",
     "You cannot place VoIP calls in this browser.": "このブラウザにはVoIP通話はできません。",
     "You cannot place a call with yourself.": "自分自身に電話をかけることはできません。",
-    "Call in Progress": "発信中",
-    "A call is currently being placed!": "現在発信中です！",
-    "A call is already in progress!": "既に発信しています!",
     "Permission Required": "権限必要",
     "You do not have permission to start a conference call in this room": "この部屋で電話会議を開始する権限がありません",
     "Upload Failed": "アップロードに失敗しました",
@@ -254,7 +194,6 @@
     "Moderator": "仲裁者",
     "Admin": "管理者",
     "Failed to invite": "招待できませんでした",
-    "Failed to invite the following users to the %(roomName)s room:": "次のユーザーを %(roomName)s の部屋に招待できませんでした:",
     "You need to be logged in.": "ログインする必要があります。",
     "You need to be able to invite users to do that.": "それをするためにユーザーを招待できる必要があります。",
     "Unable to create widget.": "ウィジェットを作成できません。",
@@ -268,9 +207,6 @@
     "Room %(roomId)s not visible": "部屋 %(roomId)s は見えません",
     "Missing user_id in request": "リクエストにuser_idがありません",
     "Usage": "用法",
-    "Searches DuckDuckGo for results": "DuckDuckGoを検索します",
-    "/ddg is not a command": "/ddg はコマンドではありません",
-    "To use it, just wait for autocomplete results to load and tab through them.": "それを使用するには、結果が完全にロードされるのを待ってから、Tabキーを押してください。",
     "Changes your display nickname": "表示されるニックネームを変更",
     "Invites user with given id to current room": "指定されたIDを持つユーザーを現在のルームに招待する",
     "Leave room": "部屋を退出",
@@ -289,24 +225,6 @@
     "Displays action": "アクションを表示",
     "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄します",
     "Reason": "理由",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s が %(displayName)s の招待を受け入れました。",
-    "%(targetName)s accepted an invitation.": "%(targetName)s が招待を受け入れました。",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s がVoIP会議を要求しました。",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s が %(targetName)s を招待しました。",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s が %(targetName)s をブロックしました。",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s が、表示名を %(displayName)s に変更しました。",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s が、表示名を %(displayName)s に設定しました。",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s が表示名 (%(oldDisplayName)s) を削除しました。",
-    "%(senderName)s removed their profile picture.": "%(senderName)s がプロフィール画像を削除しました。",
-    "%(senderName)s changed their profile picture.": "%(senderName)s がプロフィール画像を変更しました。",
-    "%(senderName)s set a profile picture.": "%(senderName)s がプロフィール画像を設定しました。",
-    "VoIP conference started.": "VoIP会議が開始されました。",
-    "VoIP conference finished.": "VoIP会議が終了しました。",
-    "%(targetName)s rejected the invitation.": "%(targetName)s が招待を拒否しました。",
-    "%(targetName)s left the room.": "%(targetName)s が部屋を退出しました。",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s が %(targetName)s のブロックを解除しました。",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s が %(targetName)s を追放しました。",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s が %(targetName)s の招待を撤回しました。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s がトピックを \"%(topic)s\" に変更しました。",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s が部屋名を削除しました。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s が部屋名を %(roomName)s に変更しました。",
@@ -314,17 +232,11 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s が、この部屋のメインアドレスを %(address)s に設定しました。",
     "%(senderName)s removed the main address for this room.": "%(senderName)s がこの部屋のメインアドレスを削除しました。",
     "Someone": "誰か",
-    "(not supported by this browser)": "(このブラウザではサポートされていません)",
-    "%(senderName)s answered the call.": "%(senderName)s が応答しました。",
-    "(could not connect media)": "(メディアを接続できませんでした)",
-    "(no answer)": "(応答なし)",
-    "(unknown failure: %(reason)s)": "(不明なエラー: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s が通話を終了しました。",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s は部屋に加わるよう %(targetDisplayName)s に招待状を送りました。",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s が、部屋のメンバー全員に招待された時点からの部屋履歴を参照できるようにしました。",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s が、部屋のメンバー全員に参加した時点からの部屋履歴を参照できるようにしました。",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s が、部屋のメンバー全員に部屋履歴を参照できるようにしました。",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s が、部屋履歴を誰でも参照できるようにしました。",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s が %(targetDisplayName)s をこの部屋に招待しました。",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「メンバーのみ (招待された時点以降)」閲覧できるようにしました。",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「メンバーのみ (参加した時点以降)」閲覧できるようにしました。",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「メンバーのみ」閲覧できるようにしました。",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s がこの部屋で今後送信されるメッセージの履歴を「誰でも」閲覧できるようにしました。",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s が、見知らぬ (%(visibility)s) に部屋履歴を参照できるようにしました。",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s は %(fromPowerLevel)s から %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s が %(powerLevelDiffText)s の権限レベルを変更しました。",
@@ -346,20 +258,13 @@
     "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
     "Failed to join room": "部屋に参加できませんでした",
     "Message Pinning": "メッセージ留め",
-    "Always show encryption icons": "常に暗号化アイコンを表示する",
     "Enable automatic language detection for syntax highlighting": "構文強調表示の自動言語検出を有効にする",
     "Mirror local video feed": "ローカルビデオ映像送信",
     "Send analytics data": "分析データを送信する",
     "Enable inline URL previews by default": "デフォルトでインライン URL プレビューを有効にする",
     "Enable URL previews for this room (only affects you)": "この部屋の URL プレビューを有効にする (あなたにのみ適用)",
     "Enable URL previews by default for participants in this room": "この部屋の参加者のためにデフォルトで URL プレビューを有効にする",
-    "Room Colour": "部屋の色",
     "Enable widget screenshots on supported widgets": "サポートされているウィジェットでウィジェットのスクリーンショットを有効にする",
-    "Active call (%(roomName)s)": "アクティブな通話 (%(roomName)s)",
-    "unknown caller": "不明な発信者",
-    "Incoming voice call from %(name)s": "%(name)s からの音声通話の着信",
-    "Incoming video call from %(name)s": "%(name)s からのビデオ通話の着信",
-    "Incoming call from %(name)s": "%(name)s からの通話の着信",
     "Decline": "辞退",
     "Accept": "受諾",
     "Incorrect verification code": "認証コードの誤りです",
@@ -380,21 +285,10 @@
     "Failed to set display name": "表示名の設定に失敗しました",
     "Off": "オフ",
     "On": "オン",
-    "Cannot add any more widgets": "ウィジェットを追加できません",
-    "The maximum permitted number of widgets have already been added to this room.": "この部屋にウィジェットの最大許容数が既に追加されています。",
-    "Add a widget": "ウィジェットを追加する",
-    "Drop File Here": "ここにファイルをドロップする",
     "Drop file here to upload": "アップロードするファイルをここにドロップする",
-    " (unsupported)": " (サポートされていない)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>音声</voiceText>または<videoText>ビデオ</videoText>として参加してください。",
-    "Ongoing conference call%(supportedText)s.": "進行中の会議通話 %(supportedText)s",
     "This event could not be displayed": "このイベントは表示できませんでした",
-    "%(senderName)s sent an image": "%(senderName)s が画像を送信しました",
-    "%(senderName)s sent a video": "%(senderName)s が動画を送信しました",
-    "%(senderName)s uploaded a file": "%(senderName)s がファイルをアップロードしました",
     "Options": "オプション",
     "Key request sent.": "鍵リクエストが送信されました。",
-    "Please select the destination room for this message": "このメッセージを送り先部屋を選択してください",
     "Disinvite": "招待拒否",
     "Kick": "追放する",
     "Disinvite this user?": "このユーザーを招待拒否しますか?",
@@ -431,10 +325,7 @@
     "Server error": "サーバーエラー",
     "Server unavailable, overloaded, or something else went wrong.": "サーバーが使用できない、オーバーロードされている、または何かが間違っていました。",
     "Command error": "コマンドエラー",
-    "Jump to message": "メッセージにジャンプ",
-    "No pinned messages.": "固定メッセージはありません。",
     "Loading...": "読み込み中...",
-    "Pinned Messages": "固定メッセージ",
     "%(duration)ss": "%(duration)s 秒",
     "%(duration)sm": "%(duration)s 分",
     "%(duration)sh": "%(duration)s 時",
@@ -455,7 +346,6 @@
     "Join Room": "部屋に入る",
     "Forget room": "部屋を忘れる",
     "Share room": "部屋を共有",
-    "Community Invites": "コミュニティへの招待",
     "Invites": "招待",
     "Unban": "ブロック解除",
     "Ban": "ブロックする",
@@ -473,17 +363,13 @@
     "Muted Users": "ミュートされたユーザー",
     "Banned users": "ブロックされたユーザー",
     "This room is not accessible by remote Matrix servers": "この部屋はリモートのMatrixサーバーからアクセスできない",
-    "Guests cannot join this room even if explicitly invited.": "ゲストは、明示的に招待された場合でもこの部屋に参加することはできません。",
-    "Click here to fix": "修正するにはここをクリック",
-    "Who can access this room?": "誰がこの部屋にアクセスできますか？",
     "Publish this room to the public in %(domain)s's room directory?": "%(domain)s のルームディレクトリにこの部屋を公開しますか？",
     "Who can read history?": "誰が履歴を読むことができますか？",
     "Members only (since the point in time of selecting this option)": "メンバーのみ (このオプションを選択した時点以降)",
-    "Members only (since they were invited)": "メンバーのみ (招待されて以来)",
-    "Members only (since they joined)": "メンバーのみ (参加して以来)",
+    "Members only (since they were invited)": "メンバーのみ (招待された時点以降)",
+    "Members only (since they joined)": "メンバーのみ (参加した時点以降)",
     "Permissions": "アクセス許可",
     "Advanced": "詳細",
-    "Add a topic": "トピックを追加",
     "Only room administrators will see this warning": "この警告はルーム管理者のみに表示されます",
     "You don't currently have any stickerpacks enabled": "現在、使用可能なステッカーパックはありません",
     "Add some now": "今すぐ追加",
@@ -506,7 +392,6 @@
     "URL Previews": "URL プレビュー",
     "Historical": "履歴のある",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "メッセージに URL が含まれる場合、タイトル、説明、ウェブサイトの画像などが URL プレビューとして表示されます。",
-    "Error decrypting audio": "オーディオの復号化エラー",
     "Error decrypting attachment": "添付ファイルの復号化エラー",
     "Decrypt %(text)s": "%(text)s を復号",
     "Download %(text)s": "%(text)s をダウンロード",
@@ -523,20 +408,14 @@
     "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?": "サードパーティのサイトに移動して、%(integrationsUrl)s で使用するためにアカウントを認証できるようになります。続行しますか？",
     "Please review and accept the policies of this homeserver:": "このホームサーバーのポリシーを確認し、同意してください:",
-    "An email has been sent to %(emailAddress)s": "電子メールが %(emailAddress)s に送信されました",
-    "Please check your email to continue registration.": "登録を続行するにはメールをご確認ください。",
     "Token incorrect": "間違ったトークン",
     "A text message has been sent to %(msisdn)s": "テキストメッセージが %(msisdn)s に送信されました",
     "Please enter the code it contains:": "それに含まれるコードを入力してください:",
     "Code": "コード",
     "Start authentication": "認証を開始する",
-    "The email field must not be blank.": "電子メールフィールドは空白であってはいけません。",
-    "The phone number field must not be blank.": "電話番号フィールドは空白であってはいけません。",
-    "The password field must not be blank.": "パスワードフィールドは空白であってはいけません。",
     "Sign in with": "ログインに使用するユーザー情報",
     "Email address": "メールアドレス",
     "Sign in": "サインイン",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "メールアドレスを指定しないと、パスワードをリセットできません。間違いありませんか？",
     "Remove from community": "コミュニティから削除",
     "Disinvite this user from community?": "このユーザーをコミュニティから拒否しますか?",
     "Remove this user from community?": "コミュニティからこのユーザーを削除しますか?",
@@ -558,18 +437,13 @@
     "Show developer tools": "開発者ツールを表示",
     "You're not currently a member of any communities.": "あなたは現在、どのコミュニティのメンバーでもありません。",
     "Unknown Address": "不明な住所",
-    "Allow": "許可",
     "Delete Widget": "ウィジェットを削除",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "ウィジェットを削除すると、この部屋のすべてのユーザーのウィジェットが削除されます。 このウィジェットを削除してもいいですか？",
     "Delete widget": "ウィジェットを削除",
-    "Failed to remove widget": "ウィジェットを削除できませんでした",
-    "An error ocurred whilst trying to remove the widget from the room": "ウィジェットをその部屋から削除しようとしているときにエラーが発生しました",
-    "Minimize apps": "アプリを最小化する",
     "Popout widget": "ウィジェットをポップアウト",
     "No results": "結果がありません",
     "Communities": "コミュニティ",
     "Home": "ホーム",
-    "Manage Integrations": "統合管理",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s が %(count)s 回参加しました",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s が参加しました",
@@ -626,8 +500,6 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "返信されたイベントを読み込めません。存在しないか、表示する権限がありません。",
     "<a>In reply to</a> <pill>": "<a>返信</a> <pill>",
     "And %(count)s more...|other": "他 %(count)s 人以上...",
-    "ex. @bob:example.com": "例 @bob:example.com",
-    "Add User": "ユーザーを追加",
     "Matrix ID": "Matirx ID",
     "Matrix Room ID": "Matrix 部屋 ID",
     "email address": "メールアドレス",
@@ -687,33 +559,18 @@
     "Unable to verify email address.": "メールアドレスを確認できません。",
     "This will allow you to reset your password and receive notifications.": "これにより、パスワードをリセットして通知を受け取ることができます。",
     "Skip": "スキップ",
-    "Username not available": "ユーザー名は利用できません",
-    "Username invalid: %(errMessage)s": "ユーザー名が無効です: %(errMessage)s",
-    "An error occurred: %(error_string)s": "エラーが発生しました: %(error_string)s",
-    "Username available": "利用可能なユーザー名",
-    "To get started, please pick a username!": "開始するには、ユーザー名を選んでください!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "これは<span>ホームサーバー</span>上のアカウント名ですが、<a>別のサーバー</a>を選択することもできます。",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "すでにMatrixアカウントをお持ちの場合は、代わりに<a>ログイン</a>することができます。",
     "Share Room": "部屋を共有",
     "Link to most recent message": "最新のメッセージへのリンク",
     "Share User": "ユーザーを共有",
     "Share Community": "コミュニティを共有",
     "Share Room Message": "部屋のメッセージを共有",
     "Link to selected message": "選択したメッセージにリンクする",
-    "COPY": "コピー",
-    "Private Chat": "プライベートチャット",
-    "Public Chat": "パブリックチャット",
-    "Custom": "カスタム",
     "Reject invitation": "招待を拒否する",
     "Are you sure you want to reject the invitation?": "招待を拒否しますか?",
     "Unable to reject invite": "招待を拒否できません",
-    "Share Message": "メッセージを共有",
-    "Collapse Reply Thread": "返信スレッドを折りたたむ",
     "Name": "名前",
     "You must <a>register</a> to use this functionality": "この機能を使用するには<a>登録</a>する必要があります",
     "You must join the room to see its files": "そのファイルを見るために部屋に参加する必要があります",
-    "There are no visible files in this room": "この部屋に表示可能なファイルは存在しません",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>コミュニティのページのHTML</h1>\n<p>\n     詳細な説明を使用して、新しいメンバーをコミュニティに紹介する、または配布する\n     重要な<a href=\"foo\">リンク</a>\n</p>\n<p>\n     あなたは 'img'タグを使うことさえできます\n</p>\n",
     "Add rooms to the community summary": "コミュニティサマリーに部屋を追加する",
     "Which rooms would you like to add to this summary?": "このサマリーにどの部屋を追加したいですか?",
     "Add to summary": "サマリーに追加",
@@ -755,7 +612,6 @@
     "Failed to reject invitation": "招待を拒否できませんでした",
     "This room is not public. You will not be able to rejoin without an invite.": "この部屋は公開されていません。再度参加するには、招待が必要です。",
     "Are you sure you want to leave the room '%(roomName)s'?": "この部屋「%(roomName)s」から退出してよろしいですか？",
-    "Failed to leave room": "部屋からの退出に失敗しました",
     "Can't leave Server Notices room": "サーバー通知部屋を離れることはできません",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "この部屋はホームサーバーからの重要なメッセージに使用されるため、そこを離れることはできません。",
     "Signed Out": "サインアウト",
@@ -768,22 +624,14 @@
     "Logout": "ログアウト",
     "Your Communities": "あなたのコミュニティ",
     "Did you know: you can use communities to filter your %(brand)s experience!": "知っていましたか: コミュニティを使って%(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.": "フィルターを設定するには、画面左側のフィルターパネルへコミュニティアバターをドラッグします。フィルタパネルのアバターをクリックすると、そのコミュニティに関連付けられた部屋や人だけが表示されます。",
     "Error whilst fetching joined communities": "参加したコミュニティを取得中にエラーが発生しました",
     "Create a new community": "新しいコミュニティを作成する",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "ユーザーと部屋をグループ化するコミュニティを作成してください! Matrixユニバースにあなたの空間を目立たせるためにカスタムホームページを作成してください。",
-    "You have no visible notifications": "通知はありません",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "<consentLink>利用規約</consentLink> を確認して同意するまでは、いかなるメッセージも送信できません。",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーが月間アクティブユーザー制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーがリソース制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
-    "%(count)s of your messages have not been sent.|other": "メッセージの一部が送信されていません。",
-    "%(count)s of your messages have not been sent.|one": "あなたのメッセージは送信されませんでした。",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>すべて再送信</resendText>または<cancelText>すべてキャンセル</cancelText>。個々のメッセージを選択して、再送信またはキャンセルすることもできます。",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>メッセージ再送信</resendText>または<cancelText>メッセージキャンセル</cancelText>。",
     "Connectivity to the server has been lost.": "サーバーへの接続が失われました。",
     "Sent messages will be stored until your connection has returned.": "送信されたメッセージは、接続が復旧するまで保存されます。",
-    "Active call": "アクティブコール",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "この部屋には他に誰もいません！：<inviteText>他のユーザーを招待</inviteText>・<nowarnText>この警告を停止</nowarnText>",
     "You seem to be uploading files, are you sure you want to quit?": "ファイルをアップロードしているようですが、中止しますか?",
     "You seem to be in a call, are you sure you want to quit?": "通話中のようですが、本当にやめたいですか？",
     "Search failed": "検索に失敗しました",
@@ -791,10 +639,6 @@
     "No more results": "もう結果はありません",
     "Room": "部屋",
     "Failed to reject invite": "招待を拒否できませんでした",
-    "Click to unmute video": "ビデオの音消解除するにはクリックしてください",
-    "Click to mute video": "ビデオの音を消すにはクリックしてください",
-    "Click to unmute audio": "オーディオの音消解除するにはクリックしてください",
-    "Click to mute audio": "オーディオの音を消すにはクリックしてください",
     "Clear filter": "フィルタークリア",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "この部屋のタイムラインに特定のポイントをロードしようとしましたが、問題のメッセージを見る権限がありません。",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "この部屋のタイムラインに特定のポイントをロードしようとしましたが、それを見つけることができませんでした。",
@@ -807,7 +651,6 @@
     "<not supported>": "<サポート対象外>",
     "Import E2E room keys": "E2Eルームキーのインポート",
     "Cryptography": "暗号",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "GitHub経由でバグを提出した場合、デバッグログは問題の追跡に役立ちます。 デバッグログには、ユーザー名、訪問した部屋またはグループIDまたはエイリアス、および他のユーザーのユーザー名を含むアプリケーション使用データが含まれます。 それらはメッセージを含んでいません。",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "プライバシーは私たちにとって重要なので、私たちは分析のための個人情報や識別可能なデータを収集しません。",
     "Learn more about how we use analytics.": "アナリティクスの使用方法の詳細については、こちらをご覧ください。",
     "Labs": "ラボ",
@@ -823,12 +666,8 @@
     "Email": "Eメール",
     "Profile": "プロフィール",
     "Account": "アカウント",
-    "Access Token:": "アクセストークン:",
-    "click to reveal": "クリックすると表示されます",
     "Homeserver is": "ホームサーバー:",
-    "Identity Server is": "ID サーバー:",
     "%(brand)s version:": "%(brand)s のバージョン:",
-    "olm version:": "olm のバージョン:",
     "Failed to send email": "メールを送信できませんでした",
     "The email address linked to your account must be entered.": "あなたのアカウントにリンクされているメールアドレスを入力する必要があります。",
     "A new password must be entered.": "新しいパスワードを入力する必要があります。",
@@ -840,17 +679,11 @@
     "Please <a>contact your service administrator</a> to continue using this service.": "このサービスを続行するには、<a>サービス管理者にお問い合わせ</a>ください。",
     "Incorrect username and/or password.": "不正なユーザー名またはパスワード。",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "matrix.orgではなく、%(hs)s サーバーにログインしていることに注意してください。",
-    "The phone number entered looks invalid": "入力された電話番号が無効です",
     "This homeserver doesn't offer any login flows which are supported by this client.": "このホームサーバーは、このクライアントでサポートされているログインフローを提供していません。",
-    "Error: Problem communicating with the given homeserver.": "エラー: 指定されたホームサーバーとの通信に問題があります。",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "HTTPS URLがブラウザバーにある場合、HTTP経由でホームサーバーに接続できません。 HTTPSを使用するか<a>安全でないスクリプトを有効にする</a>。",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "ホームサーバーに接続できません - 接続を確認し、<a>ホームサーバーのSSL証明書</a>が信頼できるものであり、ブラウザの拡張機能が要求をブロックしていないことを確認してください。",
-    "Failed to fetch avatar URL": "アバターURLを取得できませんでした",
-    "Set a display name:": "表示名を設定する:",
-    "Upload an avatar:": "アバターをアップロードする:",
     "This server does not support authentication with a phone number.": "このサーバーは、電話番号による認証をサポートしていません。",
     "Commands": "コマンド",
-    "Results from DuckDuckGo": "DuckDuckGoの結果",
     "Emoji": "絵文字",
     "Notify the whole room": "部屋全体に通知する",
     "Room Notification": "ルーム通知",
@@ -874,7 +707,6 @@
     "Failed to add tag %(tagName)s to room": "部屋にタグ %(tagName)s を追加できませんでした",
     "Open Devtools": "開発ツールを開く",
     "Flair": "バッジ",
-    "Fill screen": "フィルスクリーン",
     "Unignore": "無視をやめる",
     "Unable to load! Check your network connectivity and try again.": "ロードできません！ ネットワーク通信を確認の上もう一度お試しください。",
     "Failed to invite users to the room:": "部屋にユーザーを招待できませんでした:",
@@ -932,7 +764,6 @@
     "Sends the given message coloured as a rainbow": "与えられたメッセージを虹色にして送信する",
     "Sends the given emote coloured as a rainbow": "与えられたエモートを虹色で送信する",
     "Displays list of commands with usages and descriptions": "使い方と説明付きのコマンド一覧を表示する",
-    "%(senderName)s made no change.": "%(senderName)s は変更されませんでした。",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s がこの部屋をアップグレードしました。",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s がこの部屋を「リンクを知っている人全員」に公開しました。",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s がこの部屋を「招待者のみ参加可能」に変更しました。",
@@ -970,7 +801,6 @@
     "Enable big emoji in chat": "チャットで大きな絵文字を有効にする",
     "Send typing notifications": "入力中通知を送信する",
     "Enable Community Filter Panel": "コミュニティーフィルターパネルを有効にする",
-    "Low bandwidth mode": "低帯域通信モード",
     "Public Name": "公開名",
     "<a>Upgrade</a> to your own domain": "あなた自身のドメインに<a>アップグレード</a>",
     "Phone numbers": "電話番号",
@@ -999,14 +829,11 @@
     "Email Address": "メールアドレス",
     "Main address": "メインアドレス",
     "Join": "参加",
-    "This room is private, and can only be joined by invitation.": "この部屋はプライベートです。招待によってのみ参加できます。",
     "Create a private room": "プライベートな部屋を作成",
     "Topic (optional)": "トピック (オプション)",
     "Hide advanced": "高度な設定を非表示",
     "Show advanced": "高度な設定を表示",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "他の Matrix ホームサーバーからの参加を禁止する (この設定はあとから変更できません!)",
     "Room Settings - %(roomName)s": "部屋の設定 - %(roomName)s",
-    "Explore": "探索",
     "Filter": "検索",
     "Find a room… (e.g. %(exampleRoom)s)": "部屋を探す… (例: %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "もしお探しの部屋が見つからない場合、招待してもらうか<a>部屋を作成</a>しましょう。",
@@ -1027,18 +854,12 @@
     "Change settings": "設定の変更",
     "Kick users": "ユーザーの追放",
     "Ban users": "ユーザーのブロック",
-    "Remove messages": "メッセージの削除",
     "Notify everyone": "全員に通知",
     "Select the roles required to change various parts of the room": "部屋の様々な部分の変更に必要な役割を選択",
     "Room Topic": "部屋のトピック",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>%(shortName)s とリアクションしました</reactedWith>",
     "Next": "次へ",
-    "The username field must not be blank.": "ユーザー名フィールドは空白であってはいけません。",
     "Username": "ユーザー名",
-    "Not sure of your password? <a>Set a new one</a>": "パスワードに覚えがありませんか？ <a>新しいものを設定しましょう</a>",
-    "Other servers": "他のサーバー",
-    "Sign in to your Matrix account on %(serverName)s": "%(serverName)s上のMatrixアカウントにサインインします",
-    "Sign in to your Matrix account on <underlinedServerName />": "<underlinedServerName />上のMatrixアカウントにサインインします",
     "Create account": "アカウントを作成",
     "Error upgrading room": "部屋のアップグレード中にエラーが発生しました",
     "%(senderName)s placed a voice call.": "%(senderName)s が音声通話を行いました。",
@@ -1046,7 +867,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s がビデオ通話を行いました。",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s がビデオ通話を行いました。 (このブラウザではサポートされていません)",
     "Match system theme": "システムテーマに合わせる",
-    "Allow Peer-to-Peer for 1:1 calls": "1対1通話でP2P(ピアツーピア)を許可する",
     "Delete Backup": "バックアップを削除",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "暗号化されたメッセージは、エンドツーエンドの暗号化によって保護されています。これらの暗号化されたメッセージを読むための鍵を持っているのは、あなたと参加者だけです。",
     "Restore from Backup": "バックアップから復元",
@@ -1056,7 +876,6 @@
     "Bug reporting": "バグの報告",
     "FAQ": "よくある質問",
     "Versions": "バージョン",
-    "Key backup": "鍵のバックアップ",
     "Voice & Video": "音声とビデオ",
     "Remove recent messages": "最近のメッセージを削除する",
     "%(creator)s created and configured the room.": "%(creator)s が部屋を作成して構成しました。",
@@ -1067,9 +886,6 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "本当によろしいですか？ もしキーが正常にバックアップされていない場合、暗号化されたメッセージにアクセスできなくなります。",
     "not stored": "保存されていません",
     "All keys backed up": "すべてのキーがバックアップされました",
-    "Backup version: ": "バックアップのバージョン: ",
-    "Algorithm: ": "アルゴリズム: ",
-    "Backup key stored: ": "バックアップキーの保存: ",
     "Back up your keys before signing out to avoid losing them.": "暗号化キーを失くさないために、サインアウトする前にキーをバックアップしてください。",
     "Start using Key Backup": "キーのバックアップをはじめる",
     "Error updating flair": "バッジの更新でエラーが発生しました",
@@ -1084,14 +900,12 @@
     "For maximum security, this should be different from your account password.": "セキュリティの効果を高めるために、アカウントのパスワードと別のものを設定するべきです。",
     "That matches!": "同じです!",
     "Download": "ダウンロード",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "リカバリキーが<b>クリップボードにコピーされました</b>。ペーストして:",
     "<b>Print it</b> and store it somewhere safe": "<b>印刷して</b>安全な場所に保管しましょう",
     "<b>Save it</b> on a USB key or backup drive": "USB メモリーやバックアップ用のドライブに<b>保存</b>しましょう",
     "<b>Copy it</b> to your personal cloud storage": "個人のクラウドストレージに<b>コピー</b>しましょう",
     "Display Name": "表示名",
     "Profile picture": "プロフィール画像",
     "Encryption enabled": "暗号化が有効です",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。詳細およびユーザーの検証に関しては各ユーザーのプロフィールをご確認ください。",
     "Encryption not enabled": "暗号化が無効です",
     "The encryption used by this room isn't supported.": "この部屋では暗号化の使用がサポートされていません。",
     "Cross-signing public keys:": "クロス署名公開鍵:",
@@ -1118,7 +932,6 @@
     "Close preview": "プレビューを閉じる",
     "Direct Messages": "対話",
     "Loading …": "読み込み中 …",
-    "Direct message": "ダイレクトメッセージ",
     "Your display name": "あなたの表示名",
     "Power level": "権限レベル",
     "Removing…": "削除中…",
@@ -1127,7 +940,6 @@
     "Clear all data in this session?": "このセッションの全てのデータを削除してよろしいですか？",
     "Clear all data": "全てのデータを削除",
     "Create a public room": "公開された部屋を作成",
-    "Make this room public": "この部屋を公開する",
     "Message edits": "メッセージの編集履歴",
     "Report Content to Your Homeserver Administrator": "あなたのホームサーバーの管理者にコンテンツを報告",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "このメッセージを報告すると、このメッセージの一意の「イベントID」があなたのホームサーバーの管理者に送信されます。この部屋内のメッセージが暗号化されている場合、ホームサーバーの管理者はメッセージのテキストを読んだり、ファイルや画像を表示することはできません。",
@@ -1137,15 +949,12 @@
     "To continue you need to accept the terms of this service.": "続行するには、このサービスの利用規約に同意する必要があります。",
     "Report Content": "コンテンツを報告",
     "Hide": "隠す",
-    "Help": "ヘルプ",
-    "Filter rooms…": "部屋を検索…",
     "Preview": "プレビュー",
     "Your user agent": "あなたの User Agent",
     "Bold": "太字",
     "Italics": "イタリック体",
     "React": "リアクション",
     "Quick Reactions": "一般的なリアクション",
-    "Share Permalink": "パーマリンクを共有",
     "Keyboard Shortcuts": "キーボードショートカット",
     "Local address": "ローカルアドレス",
     "Calls": "通話",
@@ -1165,14 +974,7 @@
     "Enter username": "ユーザー名を入力",
     "Email (optional)": "メールアドレス (任意)",
     "Phone (optional)": "電話番号 (任意)",
-    "Create your Matrix account on %(serverName)s": "あなたの Matrix アカウントを %(serverName)s に作成",
-    "Create your Matrix account on <underlinedServerName />": "あなたの Matrix アカウントを <underlinedServerName /> に作成",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "アカウント回復のためのメールアドレスを設定できます。また、メールアドレスや電話番号を既存の知り合いにこのアカウントを発見してもらうために使うこともできます。",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "アカウント回復のためのメールアドレスを設定できます。また、メールアドレスを既存の知り合いにこのアカウントを発見してもらうために使うこともできます。",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "独自のホームサーバー URL を入力 <a>詳細情報</a>",
-    "Homeserver URL": "ホームサーバー URL",
     "Sign in instead": "サインインする",
-    "Create your account": "アカウントの作成",
     "Verify this session": "このセッションの検証",
     "Encryption upgrade available": "暗号化のアップグレードが利用できます",
     "Not Trusted": "まだ信頼されていません",
@@ -1181,10 +983,8 @@
     "Done": "戻る",
     "Later": "後で",
     "Review": "検証",
-    "Verify yourself & others to keep your chats safe": "あなたと他の人々とのチャットの安全性を検証",
     "Upgrade": "アップグレード",
     "Verify": "検証",
-    "Invite only": "招待者のみ参加可能",
     "Trusted": "信頼済み",
     "Not trusted": "未信頼",
     "%(count)s verified sessions|other": "%(count)s 件の検証済みのセッション",
@@ -1206,7 +1006,6 @@
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) のこのセッションはまだ検証されていません：",
     "Recent Conversations": "最近会話したユーザー",
     "Suggestions": "提案",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "相手の名前、( <userId/> のような)ユーザー名、メールアドレスを使って会話を開始できます。",
     "Go": "続行",
     "Session already verified!": "このセッションは検証済みです!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "警告: このセッションは検証済みです、しかし鍵が一致していません！",
@@ -1214,8 +1013,6 @@
     "Show typing notifications": "入力中通知を表示する",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "あなたのホームサーバーが対応していない場合は代替通話支援サーバー turn.matrix.org の使用を許可 (あなたの IP アドレスが通話相手に漏洩するのを防ぎます)",
     "Your homeserver does not support cross-signing.": "あなたのホームサーバーはクロス署名に対応していません。",
-    "Cross-signing and secret storage are enabled.": "クロス署名および機密ストレージは有効です。",
-    "Reset cross-signing and secret storage": "クロス署名および機密ストレージをリセット",
     "in memory": "メモリー内",
     "not found": "存在しない",
     "in secret storage": "機密ストレージ内",
@@ -1223,18 +1020,13 @@
     "cached locally": "ローカルキャッシュ",
     "not found locally": "ローカルに存在しない",
     "User signing private key:": "ユーザー署名秘密鍵:",
-    "Session backup key:": "セッションバックアップ鍵:",
     "Secret storage public key:": "機密ストレージ公開鍵:",
     "in account data": "アカウントデータ内",
     "Homeserver feature support:": "ホームサーバーの対応状況:",
     "exists": "対応している",
     "Your homeserver does not support session management.": "あなたのホームサーバーはセッション管理に対応していません。",
     "Unable to load session list": "セッション一覧を読み込めません",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています。 キャッシュの保存に ",
-    " to store messages from ": " を使用中であり ",
-    "rooms.": "件の部屋のメッセージが含まれています。",
     "Manage": "管理",
-    "Add an email address to configure email notifications": "メールアドレスを追加すると電子メール通知の設定も行えます",
     "Custom theme URL": "カスタムテーマ URL",
     "Add theme": "テーマの追加",
     "Account management": "アカウントの管理",
@@ -1244,7 +1036,6 @@
     "Timeline": "タイムライン",
     "Message search": "メッセージの検索",
     "Published Addresses": "公開アドレス",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "公開アドレスを使うと、どのサーバーのどのユーザーでもあなたの部屋に参加することができます。アドレスを公開するには、まずローカルアドレスとして設定する必要があります。",
     "Local Addresses": "ローカルアドレス",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s は検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています:",
     "Space used:": "使用中のストレージ容量:",
@@ -1267,7 +1058,6 @@
     "Your theme": "あなたのテーマ",
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "部屋 ID",
-    "Maximize apps": "アプリを最大化する",
     "More options": "更なるオプション",
     "Manually verify all remote sessions": "すべてのリモートセッションを手動で検証する",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "クロス署名されたデバイスを信頼せず、信頼済みとしてマークするためにユーザーが使用する各セッションを個別に検証します。",
@@ -1304,8 +1094,8 @@
     "Prompt before sending invites to potentially invalid matrix IDs": "不正な可能性のある Matrix ID に招待を送るまえに確認を表示",
     "Order rooms by name": "名前順で部屋を整列",
     "Show rooms with unread notifications first": "未読通知のある部屋をトップに表示",
-    "Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示",
-    "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示",
+    "Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示する",
+    "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示する",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "あなたのアカウントではクロス署名の認証情報がシークレットストレージに保存されていますが、このセッションでは信頼されていません。",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "このセッションでは<b>キーをバックアップしていません</b>。ですが、あなたは復元に使用したり今後キーを追加したりできるバックアップを持っています。",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "このセッションのみにあるキーを失なわないために、セッションをキーバックアップに接続しましょう。",
@@ -1317,14 +1107,9 @@
     "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) を通じてこの部屋を見つけられるよう、アドレスを設定しましょう",
-    "Enter recovery key": "リカバリーキーを入力",
     "Verify this login": "このログインを承認",
     "Signing In...": "サインイン中...",
     "If you've joined lots of rooms, this might take a while": "たくさんの部屋に参加している場合は、時間がかかる可能性があります",
-    "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:": "最新版の %(brand)s が他のあなたのデバイスで実行されている必要があります:",
-    "or another cross-signing capable Matrix client": "もしくはクロス署名に対応した他の Matrix クライアント",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "このセッションでのセキュリティを完了させない限り、暗号化されたメッセージにはアクセスできません。",
     "Single Sign On": "シングルサインオン",
     "Light": "ライト",
     "Dark": "ダーク",
@@ -1360,7 +1145,6 @@
     "Leave Room": "部屋を退出",
     "Failed to connect to integration manager": "インテグレーションマネージャへの接続に失敗しました",
     "Start verification again from their profile.": "プロフィールから再度検証を開始してください。",
-    "Integration Manager": "インテグレーションマネージャ",
     "Do not use an identity server": "ID サーバーを使用しない",
     "Composer": "入力欄",
     "Sort by": "並び替え",
@@ -1368,7 +1152,6 @@
     "Use Single Sign On to continue": "シングルサインオンを使用して続行",
     "Accept <policyLink /> to continue:": "<policyLink /> に同意して続行：",
     "Always show the window menu bar": "常にウィンドウメニューバーを表示する",
-    "Create room": "部屋を作成",
     "Show %(count)s more|other": "さらに %(count)s 件を表示",
     "Show %(count)s more|one": "さらに %(count)s 件を表示",
     "%(num)s minutes ago": "%(num)s 分前",
@@ -1391,13 +1174,6 @@
     "Privacy": "プライバシー",
     "Syncing...": "同期中...",
     "<a>Log in</a> to your new account.": "新しいアカウントで<a>ログイン</a>する。",
-    "Use Recovery Key or Passphrase": "リカバリーキーまたはパスフレーズを使う",
-    "Use Recovery Key": "リカバリーキーを使う",
-    "%(brand)s Web": "%(brand)s ウェブ",
-    "%(brand)s Desktop": "%(brand)s デスクトップ",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Android": "%(brand)s Android",
-    "Your recovery key": "あなたのリカバリーキー",
     "a few seconds ago": "数秒前",
     "about a minute ago": "約1分前",
     "about an hour ago": "約1時間前",
@@ -1429,11 +1205,7 @@
     "Cross-signing is ready for use.": "クロス署名の使用準備が完了しています。",
     "Secure Backup": "セキュアバックアップ",
     "Set up Secure Backup": "セキュアバックアップのセットアップ",
-    "Restart": "再起動",
     "Go back": "戻る",
-    "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.": "重複した issue の報告が発生しないようにするため、まず<existingIssuesLink>既存の issue を確認</existingIssuesLink>してあなたが行おうとしているのと同様の報告が見つかった場合はその issue を +1 してください。見つからなかった場合は、<newIssueLink>新しい issue を作成</newIssueLink>して報告を行ってください。",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "バグが発生したり、共有したいフィードバックがある場合は、GitHub でお知らせください。",
-    "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 は正常に検証されました!",
@@ -1447,7 +1219,6 @@
     "<userName/> wants to chat": "<userName/> がチャット開始を求めています",
     "Do you want to chat with %(user)s?": "%(user)s とのチャットを開始しますか？",
     "Use the <a>Desktop app</a> to search encrypted messages": "<a>デスクトップアプリ</a>を使用すると暗号化されたメッセージを検索できます",
-    "You have no visible notifications in this room.": "この部屋に確認すべき通知はありません。",
     "You’re all caught up": "確認するものはありません",
     "Got it": "了解",
     "Got It": "了解",
@@ -1467,7 +1238,6 @@
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "この部屋に誰かを招待したい場合は、招待したいユーザーの名前、（ <userId/> の様な）ユーザー名、またはメールアドレスを指定するか、<a>この部屋を共有</a>してください。",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "この部屋に誰かを招待したい場合は、招待したいユーザーの名前、メールアドレス、または（ <userId/> の様な）ユーザー名を指定するか、<a>この部屋を共有</a>してください。",
     "Upgrade your encryption": "暗号化をアップグレード",
-    "Role": "役割",
     "Send a reply…": "返信を送信する…",
     "Send a message…": "メッセージを送信する…",
     "This is the beginning of your direct message history with <displayName/>.": "ここがあなたと <displayName/> のダイレクトメッセージの履歴の先頭です。",
@@ -1490,22 +1260,17 @@
     "Mentions & Keywords": "メンションとキーワード",
     "Security Key": "セキュリティキー",
     "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.": "ID サーバーの使用は任意です。ID サーバーを使用しない場合、あなたは他のユーザーから発見されなくなり、メールアドレスや電話番号で他のユーザーを招待することもできません。",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "インテグレーションマネージャは設定データを受け取り、ユーザーの代わりにウィジェットの変更、部屋への招待の送信、権限レベルの設定を行うことができます。",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "インテグレーションマネージャを使用して、ボット、ウィジェット、ステッカーパックを管理します。",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "インテグレーションマネージャ <b>(%(serverName)s)</b> を使用して、ボット、ウィジェット、ステッカーパックを管理します。",
     "Integrations not allowed": "インテグレーションは許可されていません",
     "Integrations are disabled": "インテグレーションが無効になっています",
     "Manage integrations": "インテグレーションの管理",
     "Enter a new identity server": "新しい ID サーバーを入力",
     "Use Ctrl + Enter to send a message": "Ctrl + Enter でメッセージを送信する",
-    "Show chat effects": "チャットエフェクトを表示",
     "Backup key cached:": "バックアップキーのキャッシュ:",
     "Backup key stored:": "バックアップキー保存場所:",
     "Algorithm:": "アルゴリズム:",
     "Backup version:": "バックアップバージョン:",
     "Secret storage:": "機密ストレージ:",
     "Master private key:": "マスター秘密鍵:",
-    "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.": "セッションにアクセスできなくなる場合に備えて、アカウントデータとともに暗号鍵をバックアップします。あなたの鍵は一意のリカバリーキーで保護されます。",
     "Add a photo, so people can easily spot your room.": "写真を追加して、あなたの部屋を目立たせましょう。",
     "Add a photo so people know it's you.": "写真を追加して、あなただとわかるようにしましょう。",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "あなたか宛先が誰かを招待しない限りは、この会話は2人だけのものです。",
@@ -1517,7 +1282,6 @@
     "Enter phone number (required on this homeserver)": "電話番号を入力 (このホームサーバーでは必須)",
     "Enter phone number": "電話番号を入力",
     "Show avatars in user and room mentions": "ユーザーと部屋でのメンションにアバターを表示する",
-    "Use Ctrl + F to search": "Ctrl + F で検索する",
     "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.": "セッションにアクセスできなくなる場合に備えて、アカウントデータと暗号鍵をバックアップします。鍵は一意のセキュリティキーで保護されます。",
     "New version available. <a>Update now.</a>": "新しいバージョンが利用可能です。<a>今すぐ更新</a>",
     "Sign In": "サインイン",
@@ -1532,7 +1296,6 @@
     "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 以外からの参加をブロックします。",
-    "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.": "シングルサインオンを使用して本人確認を行い、メールアドレスの追加を承認してください。",
@@ -1653,7 +1416,6 @@
     "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": "見つける",
@@ -1668,10 +1430,8 @@
     "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": "とにかく切断します",
@@ -1688,9 +1448,6 @@
     "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",
@@ -1700,8 +1457,6 @@
     "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> アプリを使うと暗号化メッセージを検索結果に表示することができます。",
@@ -1724,7 +1479,6 @@
     "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": "フォルダー",
@@ -1791,8 +1545,8 @@
     "Cat": "猫",
     "Dog": "犬",
     "To be secure, do this in person or use a trusted way to communicate.": "安全を確保するため、1人でこれを行うか、または信頼できる方法で連携してください。",
-    "They don't match": "それらは一致しません",
-    "They match": "それらは一致します",
+    "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) による検証を待っています…",
@@ -1802,7 +1556,6 @@
     "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 サーバーがオンラインに戻るまで一部の機能を使用できません。 この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
@@ -1820,7 +1573,7 @@
     "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 your active room": "あなたとしてアクティブな部屋に動画を送る",
     "Send videos as you in this room": "あなたとして部屋に動画を送る",
     "See images posted to your active room": "アクティブな部屋に送られた画像を見る",
     "See images posted to this room": "部屋に送られた画像を見る",
@@ -1887,11 +1640,7 @@
     "%(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 revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s が %(targetDisplayName)s への招待を取り消しました。",
     "%(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 がこの部屋の代替アドレスを変更しました。",
@@ -1983,7 +1732,6 @@
     "South Georgia & South Sandwich Islands": "南ジョージア&南サンドイッチ諸島",
     "Explore community rooms": "コミュニティルームを探索する",
     "Open dial pad": "ダイヤルパッドを開く",
-    "Start a Conversation": "会話を始める",
     "Show Widgets": "ウィジェットを表示する",
     "Hide Widgets": "ウィジェットを隠す",
     "No recently visited rooms": "最近訪れた部屋はありません",
@@ -2231,9 +1979,6 @@
     "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": "電話番号を見つける際にエラーがありました",
@@ -2262,20 +2007,16 @@
     "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": "通知設定を変更する",
@@ -2297,7 +2038,6 @@
     "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",
@@ -2310,8 +2050,6 @@
     "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> を使用します。",
@@ -2329,8 +2067,6 @@
     "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.": "下のボタンをクリックして電話番号の追加を確認します。",
@@ -2342,7 +2078,6 @@
     "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": "あなたは中止しました",
@@ -2404,7 +2139,6 @@
     "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": "このスペースに新しい部屋を作成する権限がありません",
@@ -2415,32 +2149,23 @@
     "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.": "あなたは既にこの人と通話中です。",
@@ -2449,19 +2174,16 @@
     "Edit devices": "デバイスを編集",
     "%(count)s messages deleted.|one": "%(count)s 件のメッセージが削除されました。",
     "%(count)s messages deleted.|other": "%(count)s 件のメッセージが削除されました。",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "<a>スペース Beta</a> を有効にすると %(spaceName)s を表示できます",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "1 対 1 の通話で P2P の使用を許可 (有効にするとあなたの IP アドレスが通話相手に漏洩する可能性があります)",
     "You have no ignored users.": "無視しているユーザーはいません。",
     "Join the beta": "Beta に参加",
     "Leave the beta": "Beta を終了",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta は、ウェブ、デスクトップ、Android で利用可能です。Beta をお試しいただきありがとうございます。",
     "Your access token gives full access to your account. Do not share it with anyone.": "アクセストークンを用いるとあなたのアカウントの全てにアクセスできます。外部に公開しないでください。",
     "Access Token": "アクセストークン",
     "Filter all spaces": "全スペースを検索",
     "Save Changes": "変更を保存",
     "Edit settings relating to your space.": "スペースの設定を変更します。",
     "Space settings": "スペースの設定",
-    "Spaces are a beta feature.": "スペースは Beta 機能です。",
     "Spaces is a beta feature": "スペースは Beta 機能です",
     "Spaces are a new way to group rooms and people.": "スペースは、部屋や人をグループ化する新しい方法です。",
     "Spaces": "スペース",
@@ -2476,13 +2198,8 @@
     "Who are you working with?": "誰が使いますか？",
     "Beta": "Beta",
     "Tap for more info": "タップして詳細を表示",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "スペースは、部屋や人をグループ化する新しい方法です。既存のスペースに参加するには、招待が必要です。",
     "Check your devices": "デバイスを確認",
     "Invite to %(roomName)s": "%(roomName)s へ招待",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta は、ウェブ、デスクトップ、Android で利用可能です。お使いのホームサーバーによっては一部機能が利用できない場合があります。",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s はスペースが有効な状態で再読み込みされます。コミュニティとカスタムタグは非表示になります。",
-    "Communities are changing to Spaces": "コミュニティはスペースに生まれ変わります",
-    "Beta feedback": "Beta フィードバック",
     "%(featureName)s beta feedback": "%(featureName)s Beta フィードバック",
     "Send feedback": "フィードバックを送信",
     "Manage & explore rooms": "部屋の管理および検索",
@@ -2490,7 +2207,6 @@
     "A private space to organise your rooms": "部屋を整理するためのプライベートスペース",
     "Private space": "プライベートスペース",
     "Leave Space": "スペースを退出",
-    "Make this space private": "このスペースを非公開にする",
     "Welcome %(name)s": "ようこそ、%(name)s",
     "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.": "このスペースは公開されていません。再度参加するには、招待が必要です。",
@@ -2502,5 +2218,51 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "部屋や会話を追加できます。これはあなた専用のスペースで、他の人からは見えません。後から部屋や会話を追加することもできます。",
     "Support": "サポート",
     "You can change these anytime.": "ここで入力した情報はいつでも編集できます。",
-    "Add some details to help people recognise it.": "情報を入力してください。"
+    "Add some details to help people recognise it.": "情報を入力してください。",
+    "To view %(spaceName)s, you need an invite": "%(spaceName)s を閲覧するには招待が必要です",
+    "Integration manager": "インテグレーションマネージャ",
+    "Identity server is": "アイデンティティ・サーバー",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "インテグレーションマネージャは設定データを受け取り、ユーザーの代わりにウィジェットの変更、部屋への招待の送信、権限レベルの設定を行うことができます。",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "インテグレーションマネージャを使用して、ボット、ウィジェット、ステッカーパックを管理します。",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "インテグレーションマネージャ <b>(%(serverName)s)</b> を使用して、ボット、ウィジェット、ステッカーパックを管理します。",
+    "Identity server": "認証サーバ",
+    "Identity server (%(server)s)": "identity サーバー (%(server)s)",
+    "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 スキーマである必要があります",
+    "Saving...": "保存しています…",
+    "Failed to save space settings.": "スペースの設定を保存できませんでした。",
+    "Transfer Failed": "転送に失敗しました",
+    "Unable to transfer call": "通話が転送できませんでした",
+    "All rooms you're in will appear in Home.": "ホームに、あなたが参加しているすべての部屋が表示されます。",
+    "Show all rooms in Home": "ホームにすべての部屋を表示する",
+    "Images, GIFs and videos": "画像・GIF・動画",
+    "Displaying time": "表示時刻",
+    "Use Command + F to search timeline": "Command + F でタイムラインを検索する",
+    "Use Ctrl + F to search timeline": "Ctrl + F でタイムラインを検索する",
+    "To view all keyboard shortcuts, click here.": "ここをクリックすると、すべてのキーボードショートカットを確認できます。",
+    "Keyboard shortcuts": "キーボードショートカット",
+    "Messages containing keywords": "指定のキーワードを含むメッセージ",
+    "Mentions & keywords": "メンションとキーワード",
+    "Global": "グローバル",
+    "New keyword": "新しいキーワード",
+    "Keyword": "キーワード",
+    "Enable for this account": "このアカウントで有効にする",
+    "%(targetName)s joined the room": "%(targetName)s がこの部屋に参加しました",
+    "Anyone can find and join.": "誰でも検索・参加できます。",
+    "Anyone in a space can find and join. You can select multiple spaces.": "スペースのメンバーが検索・参加できます。複数のスペースも選択可能です。",
+    "Space members": "スペースのメンバー",
+    "Upgrade required": "アップグレードが必要",
+    "Only invited people can join.": "招待された人のみ参加できます。",
+    "Private (invite only)": "プライベート (招待者のみ)",
+    "Decide who can join %(roomName)s.": "%(roomName)s に参加できる人を設定します。",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s が %(targetName)s を招待しました",
+    "Verify other login": "他のログインを使用した検証",
+    "Accept on your other login…": "他のログインで了承してください…",
+    "Use Security Key": "セキュリティキーで検証",
+    "Use another login": "他の端末から検証",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "あなたが本人であることを検証し、暗号化されたメッセージにアクセスします。",
+    "New? <a>Create account</a>": "<a>アカウント作成</a>",
+    "Are you sure you want to sign out?": "サインアウトしてよろしいですか？",
+    "Upgrade to %(hostSignupBrand)s": "%(hostSignupBrand)s にアップグレード"
 }
diff --git a/src/i18n/strings/jbo.json b/src/i18n/strings/jbo.json
index b19d4bb95d..eb0a3d07f2 100644
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -14,21 +14,13 @@
     "Analytics": "lanli datni",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": ".i zilbe'i le samtcise'u fa le te zilvi'u be le datni bei lu'o ro datni be le du'u mu'a pa ve zilbe'i ja pa pilno ja pa girzu ja pa drata cu jai steci do",
     "Call Failed": ".i da nabmi fi lo nu co'a fonjo'e",
-    "You are already in a call.": ".i do xa'o ca'o fonjo'e da",
     "VoIP is unsupported": ".i na ka'e pilno la .voip.",
     "You cannot place VoIP calls in this browser.": ".i le kibrbrauzero na ka'e pilno la .voip. lo nu fonjo'e",
     "You cannot place a call with yourself.": ".i do na ka'e fonjo'e do",
-    "Call in Progress": ".i ca'o fonjo'e",
-    "A call is currently being placed!": ".i ca'o co'a fonjo'e",
-    "A call is already in progress!": ".i xa'o ca'o fonjo'e da",
     "Permission Required": ".i lo nu curmi cu sarcu",
     "You do not have permission to start a conference call in this room": ".i na curmi lo nu le du'u co'a girzu fonjo'e cu zilbe'i do fo le ca se cuxna",
     "Upload Failed": ".i da nabmi fi lo nu kibdu'a",
     "Failure to create room": ".i da nabmi fi lo nu cupra le ve zilbe'i",
-    "Call Timeout": ".i dukse le ka ca'o ce'u co'a fonjo'e",
-    "The remote side failed to pick up": ".i da poi do co'a fonjo'e ke'a na spuda",
-    "Unable to capture screen": ".i na ka'e facki le du'u vidvi fi le vidni",
-    "Existing Call": ".i xa'o ca'o fonjo'e",
     "Server may be unavailable, overloaded, or you hit a bug.": ".i la'a cu'i gi ja le samtcise'u cu spofu vau ja mutce le ka gunka gi da samcfi",
     "Send": "nu zilbe'i",
     "Sun": "jy. dy. ze",
@@ -83,7 +75,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "lo ni la'o ny. %(userId)s .ny. vlipa noi pu du %(fromPowerLevel)s ku %(toPowerLevel)s",
     "Operation failed": ".i da nabmi",
     "Failed to invite": ".i da nabmi fi lo nu friti le ka ziljmina",
-    "Failed to invite the following users to the %(roomName)s room:": ".i da nabmi fi lo nu friti le ka ziljmina le se zilbe'i be fo la'o zoi. %(roomName)s .zoi kei le di'e pilno",
     "You need to be logged in.": ".i lo nu da jaspu do sarcu",
     "You need to be able to invite users to do that.": ".i lo nu do vlipa le ka friti le ka ziljmina cu sarcu",
     "Unable to create widget.": ".i na kakne lo nu zbasu lo uidje",
@@ -96,8 +87,6 @@
     "Room %(roomId)s not visible": ".i na kakne lo nu viska la'o ly. %(roomId)s .ly. noi kumfa pe'a",
     "Missing user_id in request": ".i na pa judri be pa pilno cu pagbu le ve cpedu",
     "Usage": "tadji lo nu pilno",
-    "Searches DuckDuckGo for results": ".i sisku se pi'o la datkysisku",
-    "/ddg is not a command": "zoi ny. /ddg .ny. na nu minde",
     "Changes your display nickname": "",
     "Invites user with given id to current room": ".i vi'ecpe lo pilno poi se judri ti ku le kumfa pe'a",
     "Leave room": "nu do zilvi'u le se zilbe'i",
@@ -116,25 +105,6 @@
     "Displays action": ".i mrilu lo nu do gasnu",
     "Forces the current outbound group session in an encrypted room to be discarded": ".i macnu vimcu lo ca barkla termifckiku gunma lo kumfa pe'a poi mifra",
     "Reason": "krinu",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "",
-    "%(targetName)s accepted an invitation.": ".i la'o zoi. %(targetName)s .zoi zukte pa se friti",
-    "%(senderName)s requested a VoIP conference.": "",
-    "%(senderName)s invited %(targetName)s.": ".i la'o zoi. %(senderName)s .zoi friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
-    "%(senderName)s banned %(targetName)s.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu la'o ly. %(targetName)s .ly. vitno cliva",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": ".i zoi zoi. %(displayName)s .zoi basti zoi zoi. %(oldDisplayName)s .zoi le ka cmene",
-    "%(senderName)s set their display name to %(displayName)s.": ".i zoi zoi. %(displayName)s .zoi co'a cmene la'o zoi. %(senderName)s .zoi",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": ".i zoi zoi. %(oldDisplayName)s .zoi co'u cmene la'o zoi. %(senderName)s .zoi",
-    "%(senderName)s removed their profile picture.": ".i da co'u pixra sinxa la'o zoi. %(senderName)s .zoi",
-    "%(senderName)s changed their profile picture.": ".i da basti de le ka pixra sinxa la'o zoi. %(senderName)s .zoi",
-    "%(senderName)s set a profile picture.": ".i da co'a pixra sinxa la'o zoi. %(senderName)s .zoi",
-    "VoIP conference started.": ".i co'a .voip. zei nunjmaji",
-    "%(targetName)s joined the room.": ".i la'o zoi. %(targetName)s .zoi ziljmina le se zilbe'i",
-    "VoIP conference finished.": ".i mo'u .voip. zei nunjmaji",
-    "%(targetName)s rejected the invitation.": ".i la'o zoi. %(targetName)s .zoi zukte le ka na ckaji le se friti",
-    "%(targetName)s left the room.": ".i la'o zoi. %(targetName)s .zoi zilvi'u le se zilbe'i",
-    "%(senderName)s unbanned %(targetName)s.": ".i la'o ly. %(senderName)s .ly. xruti fo lo nu la'o ly. %(targetName)s .ly. vitno cliva",
-    "%(senderName)s kicked %(targetName)s.": ".i gau la'o zoi. %(senderName)s .zoi la'o zoi. %(targetName)s .zoi zilvi'u le se zilbe'i",
-    "%(senderName)s withdrew %(targetName)s's invitation.": ".i la'o zoi. %(senderName)s .zoi co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": ".i gau la'o zoi. %(senderDisplayName)s .zoi zoi zoi. %(topic)s .zoi basti da le ka skicu lerpoi",
     "%(senderDisplayName)s removed the room name.": ".i gau la'o zoi. %(senderDisplayName)s .zoi da co'u cmene le se zilbe'i",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": ".i gau la'o zoi. %(senderDisplayName)s .zoi zoi zoi. %(roomName)s .zoi basti da le ka cmene le se zilbe'i",
@@ -142,12 +112,6 @@
     "%(senderName)s set the main address for this room to %(address)s.": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(address)s .zoi co'a ralju le'i judri be le ve zilbe'i",
     "%(senderName)s removed the main address for this room.": ".i gau la'o zoi. %(senderName)s .zoi da co'u ralju le'i judri be le ve zilbe'i",
     "Someone": "da",
-    "(not supported by this browser)": ".i le kibrbrauzero na kakne",
-    "%(senderName)s answered the call.": ".i mo'u co'a fonjo'e la'o zoi. %(senderName)s .zoi",
-    "(could not connect media)": "to na kakne lo nu ganvi samjongau toi",
-    "(no answer)": ".i na spuda",
-    "(unknown failure: %(reason)s)": "to na'e te djuno nu fliba fi'o ve skicu zoi gy. %(reason)s .gy. toi",
-    "%(senderName)s ended the call.": ".i gau la'o zoi. %(senderName)s .zoi co'u fonjo'e ri",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": ".i la'o zoi. %(senderName)s .zoi friti le ka ziljmina le se zilbe'i kei la'o zoi. %(targetDisplayName)s .zoi",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": ".i ro da poi pagbu le se zilbe'i zo'u gau la'o zoi. %(senderName)s .zoi da ka'e tcidu ro notci poi ba lo nu da te friti ba zilbe'i",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": ".i ro da poi pagbu le se zilbe'i zo'u gau la'o zoi. %(senderName)s .zoi da ka'e tcidu ro notci poi ba lo nu da ziljmina ba zilbe'i",
@@ -170,8 +134,6 @@
     "Message Pinning": "lo du'u xu kau kakne lo nu mrilu lo vitno notci",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "lo du'u xu kau lo tcika cu se tarmi mu'a lu ti'u li re pi'e ci no su'i pa re li'u",
     "Always show message timestamps": "lo du'u xu kau do ro roi viska ka'e lo tcika be tu'a lo notci",
-    "Autoplay GIFs and videos": "lo du'u xu kau lo vidvi cu zmiku cfari",
-    "Always show encryption icons": "lo du'u xu kau jarco ro lo ka mifra",
     "Enable automatic language detection for syntax highlighting": "lo du'u xu kau zmiku facki lo du'u ma kau bangu ku te zu'e lo nu skari ba'argau lo gensu'a",
     "Automatically replace plain text Emoji": "lo du'u xu kau zmiku basti lo cinmo lerpoi",
     "Mirror local video feed": "lo du'u xu kau minra lo diklo vidvi",
@@ -179,11 +141,9 @@
     "Enable inline URL previews by default": "lo zmiselcu'a pe lo du'u xu kau zmiku purzga lo se urli",
     "Enable URL previews for this room (only affects you)": "lo du'u xu kau do zmiku purzga lo se urli ne'i le kumfa pe'a",
     "Enable URL previews by default for participants in this room": "lo zmiselcu'a pe lo du'u xu kau lo cmima be le kumfa pe'a cu zmiku purzga lo se urli",
-    "Room Colour": "se skari le ve zilbe'i",
     "Enable widget screenshots on supported widgets": "lo du'u xu kau kakne lo nu co'a pixra lo uidje kei lo nu kakne tu'a .ubu",
     "Collecting app version information": ".i ca'o facki le du'u favytcinymupli",
     "Collecting logs": ".i ca'o facki le du'u citri",
-    "Uploading report": ".i ca'o kibdu'a le vreji",
     "Waiting for response from server": ".i ca'o denpa lo nu le samtcise'u cu spuda",
     "Messages containing my display name": "nu pa se pagbu be le cmene be mi cu zilbe'i",
     "Messages in one-to-one chats": "nu da zilbe'i pa prenu",
@@ -191,11 +151,6 @@
     "When I'm invited to a room": "nu da friti le ka ziljmina lo se zilbe'i kei do",
     "Call invitation": "nu da co'a fonjo'e do",
     "Messages sent by bot": "nu da zilbe'i fi pa sampre",
-    "Active call (%(roomName)s)": "le ca fonjo'e ne la'o ly. %(roomName)s .ly.",
-    "unknown caller": "lo fonjo'e noi na'e te djuno",
-    "Incoming voice call from %(name)s": ".i la'o ly. %(name)s .ly. ca'o snavi fonjo'e",
-    "Incoming video call from %(name)s": ".i la'o ly. %(name)s .ly. ca'o vidvi fonjo'e",
-    "Incoming call from %(name)s": ".i la'o ly. %(name)s .ly. ca'o fonjo'e",
     "Decline": "nu na fonjo'e",
     "Accept": "nu fonjo'e",
     "Error": "nabmi",
@@ -219,15 +174,7 @@
     "Authentication": "lo nu facki lo du'u do du ma kau",
     "Last seen": "lo ro re'u nu viska",
     "Failed to set display name": ".i pu fliba lo nu galfi lo cmene",
-    "Error saving email notification preferences": ".i pu fliba lo nu co'a vreji lo se cuxna pe lo nu samymri",
-    "An error occurred whilst saving your email notification preferences.": ".i pu fliba lo nu co'a vreji lo se cuxna pe lo nu samymri sajgau",
-    "Keywords": "lo midvla",
-    "Enter keywords separated by a comma:": ".i ko ciska lo midvla ta'i lo nu sepli fi lo lerkoma",
     "OK": "je'e",
-    "Failed to change settings": ".i pu fliba lo nu galfi lo se cuxna",
-    "Can't update user notification settings": ".i pu fliba lo nu galfi lo se cuxna pe lo nu sajgau",
-    "Failed to update keywords": ".i pu fliba lo nu galfi lo midvla",
-    "Messages containing <span>keywords</span>": "lo notci poi vasru <span>lo midvla</span>",
     "Try using turn.matrix.org": ".i ko troci le ka pilno le se judri be zoi zoi. turn.matrix.org .zoi",
     "Room name or address": "fe pa ve zilbe'i cu cmene vau ja judri",
     "Custom (%(level)s)": "drata (%(level)s)",
@@ -243,7 +190,6 @@
     "Could not find user in room": ".i le pilno na pagbu le se zilbe'i",
     "Session already verified!": ".i xa'o lacri le se samtcise'u",
     "WARNING: Session already verified, but keys do NOT MATCH!": ".i ju'i zo'e xa'o lacri le se samtcise'u .i ku'i le'i ckiku ba'e na simxu le ka mapti",
-    "%(senderName)s made no change.": ".i la'o zoi. %(senderName)s .zoi na binxo da de",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": ".i gau la'o zoi. %(senderDisplayName)s .zoi zoi zoi. %(newRoomName)s .zoi basti zoi zoi. %(oldRoomName)s .zoi le ka cmene le se zilbe'i",
     "%(senderDisplayName)s made the room public to whoever knows the link.": ".i gau la'o zoi. %(senderDisplayName)s .zoi ro djuno be le du'u judri cu ka'e ziljmina le se zilbe'i",
     "%(senderDisplayName)s made the room invite only.": ".i ro da zo'u gau la'o zoi. %(senderDisplayName)s .zoi lo nu de friti le ka ziljmina le se zilbe'i kei da sarcu",
@@ -344,7 +290,6 @@
     "Today": "cabdei",
     "Yesterday": "prulamdei",
     "Cancel search": "nu co'u sisku",
-    "Search rooms": "sisku fi le'i ve zilbe'i",
     "Search failed": ".i da nabmi lo nu sisku",
     "Switch to light mode": "nu le jvinu cu binxo le ka carmi",
     "Switch to dark mode": "nu le jvinu cu binxo le ka manku",
@@ -352,8 +297,6 @@
     "Syncing...": ".i ca'o samymo'i",
     "Signing In...": ".i ca'o co'a jaspu",
     "If you've joined lots of rooms, this might take a while": ".i gi na ja do pagbu so'i se zilbe'i gi la'a ze'u gunka",
-    "Set a display name:": ".i ko cuxna fo le ka cmene",
-    "Upload an avatar:": ".i ko cuxna fo le ka pixra sinxa",
     "Incorrect password": ".i le lerpoijaspu na drani",
     "Emoji": "cinmo sinxa",
     "Users": "pilno",
@@ -381,10 +324,6 @@
     "Messages containing @room": "nu pa se pagbu be zoi zoi. @room .zoi cu zilbe'i",
     "Encrypted messages in one-to-one chats": "nu pa mifra cu zilbe'i pa prenu",
     "Encrypted messages in group chats": "nu pa mifra cu zilbe'i lu'o pa prenu",
-    "Active call": ".i ca'o fonjo'e",
-    "Incoming voice call": ".i da co'a snavi fonjo'e do",
-    "Incoming video call": ".i da co'a vidvi fonjo'e do",
-    "Incoming call": ".i da co'a fonjo'e do",
     "The other party cancelled the verification.": ".i le na du be do co'u troci le ka co'a lacri",
     "Verified!": ".i mo'u co'a lacri",
     "You've successfully verified this user.": ".i mo'u co'a lacri le pilno",
@@ -402,56 +341,24 @@
     "User %(user_id)s does not exist": ".i zoi zoi. %(user_id)s .zoi na judri pa pilno",
     "User %(user_id)s may or may not exist": ".i la'a cu'i zoi zoi. %(user_id)s .zoi na judri pa pilno",
     "Help us improve %(brand)s": ".i ko sidju fi le ka xagzengau la'o zoi. %(brand)s .zoi",
-    "I want to help": ".i mi kaidji le ka sidju",
     "No": ".i na co'e",
     "Close": "nu zilmipri",
     "Ok": "je'e",
     "Verify this session": "nu co'a lacri le se samtcise'u",
     "Verify": "nu co'a lacri",
     "What's New": "notci le du'u cnino",
-    "A new version of %(brand)s is available!": ".i da favytcinymupli pa cnino la'o zoi. %(brand)s .zoi",
     "You joined the call": ".i do mo'u co'a fonjo'e",
     "%(senderName)s joined the call": ".i la'o zoi. %(senderName)s .zoi mo'u co'a fonjo'e",
     "Call in progress": ".i ca'o fonjo'e",
-    "You left the call": ".i do co'u fonjo'e",
-    "%(senderName)s left the call": ".i la'o zoi. %(senderName)s .zoi co'u fonjo'e",
     "Call ended": ".i co'u fonjo'e",
     "You started a call": ".i do co'a fonjo'e",
     "%(senderName)s started a call": ".i la'o zoi. %(senderName)s .zoi co'a fonjo'e",
     "Waiting for answer": ".i ca'o denpa lo nu spuda",
     "%(senderName)s is calling": ".i la'o zoi. %(senderName)s .zoi co'a fonjo'e",
-    "You created the room": ".i do cupra le ve zilbe'i",
-    "%(senderName)s created the room": ".i la'o zoi. %(senderName)s .zoi cupra le ve zilbe'i",
-    "You made the chat encrypted": ".i gau do ro ba zilbe'i be fo le gai'o cu mifra",
-    "%(senderName)s made the chat encrypted": ".i gau la'o zoi. %(senderName)s .zoi ro ba zilbe'i be fo le gai'o cu mifra",
-    "You were invited": ".i da friti le ka ziljmina kei do",
-    "%(targetName)s was invited": ".i da friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
-    "You left": ".i do zilvi'u",
-    "%(targetName)s left": ".i la'o zoi. %(targetName)s .zoi zilvi'u",
-    "You were kicked (%(reason)s)": ".i gau da do zilvi'u fi'o krinu lerpoi zoi zoi. %(reason)s .zoi",
-    "%(targetName)s was kicked (%(reason)s)": ".i gau da la'o zoi. %(targetName)s .zoi zilvi'u fi'o krinu lerpoi zoi zoi. %(reason)s .zoi",
-    "You were kicked": ".i gau da do zilvi'u",
-    "%(targetName)s was kicked": ".i gau da la'o zoi. %(targetName)s .zoi zilvi'u",
-    "You rejected the invite": ".i do zukte le ka na ckaji le se friti",
-    "%(targetName)s rejected the invite": ".i la'o zoi. %(targetName)s .zoi zukte le ka na ckaji le se friti",
-    "You were uninvited": ".i da co'u friti le ka ziljmina kei do",
-    "%(targetName)s was uninvited": ".i da co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
-    "You changed your name": ".i gau do da basti de le ka cmene do",
-    "%(targetName)s changed their name": ".i gau da zoi zoi. %(targetName)s .zoi basti de le ka cmene da",
-    "You changed your avatar": ".i gau do da basti de le ka pixra sinxa do",
-    "%(targetName)s changed their avatar": ".i gau la'o zoi. %(targetName)s .zoi da basti de le ka pixra sinxa ri",
-    "%(senderName)s %(emote)s": ".i la'o zoi. %(senderName)s .zoi ckaji le smuni be zoi zoi. %(emote)s .zoi",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": ".i gau do da basti de le ka cmene le ve zilbe'i",
-    "%(senderName)s changed the room name": ".i gau la'o zoi. %(senderName)s .zoi da basti de le ka cmene le ve zilbe'i",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": ".i do co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
-    "%(senderName)s uninvited %(targetName)s": ".i la'o zoi. %(senderName)s .zoi co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
-    "You invited %(targetName)s": ".i do friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
     "%(senderName)s invited %(targetName)s": ".i la'o zoi. %(senderName)s .zoi friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
-    "You changed the room topic": ".i gau do da basti de le ka skicu be le ve zilbe'i be'o lerpoi",
-    "%(senderName)s changed the room topic": ".i gau la'o zoi. %(senderName)s .zoi da basti de le ka skicu be le ve zilbe'i be'o lerpoi",
     "Use a system font": "nu da pe le vanbi cu ci'artai",
     "System font name": "cmene le ci'artai pe le vanbi",
     "Never send encrypted messages to unverified sessions from this session": "nu na pa mifra be pa notci cu zilbe'i pa se samtcise'u poi na se lanli ku'o le se samtcise'u",
@@ -468,15 +375,9 @@
     "<userName/> invited you": ".i la'o zoi. <userName/> .zoi friti le ka ziljmina kei do",
     "Username": "judri cmene",
     "Enter username": ".i ko cuxna fo le ka judri cmene",
-    "We’re excited to announce Riot is now Element": ".i fizbu lo nu zo .elyment. basti zo .raiyt. le ka cmene",
-    "Riot is now Element!": ".i zo .elyment. basti zo .raiyt. le ka cmene",
-    "Learn More": "nu facki",
-    "We’re excited to announce Riot is now Element!": ".i fizbu lo nu gubni xusra le du'u zo .elyment. basti zo .raiyt. le ka cmene",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": ".i ro zilbe'i be fo le cei'i cu mifra .i le ka ka'e tcidu lo notci cu steci fi lu'i do je ro pagbu be le se zilbe'i",
     "Messages in this room are end-to-end encrypted.": ".i ro zilbe'i be fo le cei'i cu mifra",
     "Messages in this room are not end-to-end encrypted.": ".i na pa zilbe'i be fo le cei'i cu mifra",
     "Members": "pagbu le se zilbe'i",
-    "Files": "vreji",
     "Trusted": "se lacri",
     "Not trusted": "na se lacri",
     "%(count)s verified sessions|other": ".i lacri %(count)s se samtcise'u",
@@ -491,7 +392,6 @@
     "This room is end-to-end encrypted": ".i ro zilbe'i be fo le cei'i cu mifra",
     "Everyone in this room is verified": ".i do lacri ro pagbu be le se zilbe'i",
     "Start chat": "nu co'a tavla",
-    "Create room": "nu cupra pa ve zilbe'i",
     "The file '%(fileName)s' failed to upload.": ".i da nabmi fi lo nu kibdu'a la'o zoi. %(fileName)s .zoi",
     "Invite users": "nu friti le ka ziljmina kei pa pilno",
     "Invite to this room": "nu friti le ka ziljmina le se zilbe'i",
@@ -539,7 +439,6 @@
     "Community %(groupId)s not found": ".i na da poi girzu zo'u facki le du'u zoi zoi. %(groupId)s .zoi judri da",
     "This homeserver does not support communities": ".i le samtcise'u na kakne tu'a lo girzu",
     "Are you sure you want to leave the room '%(roomName)s'?": ".i xu do birti le du'u do kaidji le ka co'u pagbu le se zilbe'i be fo la'o zoi. %(roomName)s .zoi",
-    "Failed to leave room": ".i da nabmi fi lo nu do co'u pagbu le se zilbe'i",
     "For security, this session has been signed out. Please sign in again.": ".i ki'u lo nu snura co'u jaspu le se samtcise'u .i ko za'u re'u co'a se jaspu",
     "Your Communities": "girzu vau je se pagbu do",
     "Error whilst fetching joined communities": ".i da nabmi fi lo nu kibycpa ro girzu poi se pagbu do",
@@ -548,9 +447,6 @@
     "React": "nu cinmo spuda",
     "Reply": "nu spuda",
     "<a>In reply to</a> <pill>": ".i nu <a>spuda</a> tu'a la'o zoi. <pill> .zoi",
-    "%(senderName)s made history visible to anyone": ".i gau la'o zoi. %(senderName)s .zoi ro da ka'e tcidu ro pu zilbe'i",
-    "You joined": ".i do ziljmina",
-    "%(targetName)s joined": ".i la'o zoi. %(targetName)s .zoi ziljmina",
     "Show less": "nu viska so'u da",
     "Save": "nu co'a vreji",
     "Unable to share email address": ".i da nabmi fi lo nu jungau le du'u samymri judri",
@@ -564,14 +460,6 @@
     "Share User": "nu jungau fi le du'u pilno",
     "Share Community": "nu jungau fi le du'u girzu",
     "Share Room Message": "nu jungau fi le du'u notci",
-    "Resend edit": "nu le basti cu za'u re'u zilbe'i",
-    "Share Permalink": "nu jungau fi le du'u vitno judri",
-    "Share Message": "nu jungau fi le du'u notci",
-    "%(senderName)s made history visible to new members": ".i gau la'o zoi. %(senderName)s .zoi ro cnino be fi le ka pagbu le se zilbe'i cu ka'e tcidu ro pu zilbe'i",
-    "%(senderName)s made history visible to future members": ".i gau la'o zoi. %(senderName)s .zoi ro ba pagbu be le se zilbe'i cu ka'e tcidu ro pu zilbe'i",
-    "%(senderName)s sent an image": ".i pa pixra cu zilbe'i fi la'o zoi. %(senderName)s .zoi",
-    "%(senderName)s sent a video": ".i pa se vidvi cu zilbe'i fi la'o zoi. %(senderName)s .zoi",
-    "%(senderName)s uploaded a file": ".i pa vreji cu zilbe'i fi la'o zoi. %(senderName)s .zoi",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": ".i la'o zoi. %(displayName)s .zoi poi se judri zoi zoi. %(userName)s .zoi zgana de'i li %(dateTime)s",
     "Waiting for %(displayName)s to accept…": ".i ca'o denpa lo nu la'o zoi. %(displayName)s .zoi zanru",
     "Ask %(displayName)s to scan your code:": ".i ko cpedu le ka gau ce'u kacma samymo'i le sinxa kei la'o zoi. %(displayName)s .zoi",
@@ -580,7 +468,6 @@
     "%(displayName)s cancelled verification.": ".i la'o zoi. %(displayName)s .zoi co'u co'a lacri",
     "Decrypt %(text)s": "nu facki le du'u mifra la'o zoi. %(text)s .zoi",
     "Download %(text)s": "nu kibycpa la'o zoi. %(text)s .zoi",
-    "Download this file": "nu kibycpa le vreji",
     "Explore rooms": "nu facki le du'u ve zilbe'i",
     "Create Account": "nu pa re'u co'a jaspu",
     "Dismiss": "nu mipri"
diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
index b6e1b3020f..7c60703c19 100644
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -54,12 +54,10 @@
     "Close": "Mdel",
     "Warning": "Asmigel",
     "Ok": "Ih",
-    "Set password": "Sbadu awal uffir",
     "Upgrade": "Leqqem",
     "Verify": "Senqed",
     "What's New": "D acu-t umaynut",
     "Update": "Leqqem",
-    "Restart": "Ales tanekra",
     "Font size": "Tuɣzi n tsefsit",
     "Decline": "Agwi",
     "Accept": "Qbel",
@@ -96,7 +94,6 @@
     "ID": "ID",
     "Manage": "Sefrek",
     "Enable": "Rmed",
-    "Keywords": "Awalen tisura",
     "Clear notifications": "Sfeḍ ilɣuyen",
     "Off": "Insa",
     "Display Name": "Sken isem",
@@ -150,7 +147,6 @@
     "People": "Imdanen",
     "Sign Up": "Jerred",
     "Reject": "Agi",
-    "Not now": "Mačči tura",
     "Sort by": "Semyizwer s",
     "Activity": "Armud",
     "A-Z": "A-Z",
@@ -158,7 +154,6 @@
     "Options": "Tixtiṛiyin",
     "Server error": "Tuccḍa n uqeddac",
     "Members": "Imettekkiyen",
-    "Files": "Ifuyla",
     "Trusted": "Yettwattkal",
     "Invite": "Nced",
     "Unmute": "Rmed imesli",
@@ -195,9 +190,6 @@
     "Join": "Rnu",
     "No results": "Ulac igmad",
     "collapse": "fneẓ",
-    "Rotate counter-clockwise": "Zzi mgal tanila n tessegnatin n temrilt",
-    "Rotate clockwise": "Zzi almend n tnila n tsegnatin n temrilt",
-    "Add User": "Rnu aseqdac",
     "Server name": "Isem n uqeddac",
     "email address": "tansa n yimayl",
     "Close dialog": "Mdel adiwenni",
@@ -220,9 +212,6 @@
     "Refresh": "Smiren",
     "Email address": "Tansa n yimayl",
     "Skip": "Zgel",
-    "Username not available": "Ulac isem n useqdac",
-    "Checking...": "Asenqed...",
-    "Username available": "Yella yisem n useqdac",
     "Terms of Service": "Tiwtilin n useqdec",
     "Service": "Ameẓlu",
     "Summary": "Agzul",
@@ -230,9 +219,6 @@
     "Next": "Γer sdat",
     "Upload files": "Sali-d ifuyla",
     "Appearance": "Arwes",
-    "Allow": "Sireg",
-    "Deny": "Agi",
-    "Custom": "Sagen",
     "Source URL": "URL aɣbalu",
     "Notification settings": "Iɣewwaren n yilɣa",
     "Leave": "Ffeɣ",
@@ -240,10 +226,7 @@
     "Hide": "Ffer",
     "Home": "Agejdan",
     "Sign in": "Qqen",
-    "Help": "Tallalt",
-    "Reload": "Smiren",
     "powered by Matrix": "s lmendad n Matrix",
-    "Custom Server Options": "Iɣewwaren n uqeddac udmawan",
     "Code": "Tangalt",
     "Submit": "Azen",
     "Email": "Imayl",
@@ -252,10 +235,8 @@
     "Passwords don't match": "Awalen uffiren ur mṣadan ara",
     "Email (optional)": "Imayl (Afrayan)",
     "Register": "Jerred",
-    "Free": "Ilelli",
     "Failed to upload image": "Tegguma ad d-tali tugna",
     "Description": "Aglam",
-    "Explore": "Snirem",
     "Filter": "Imsizdeg",
     "Explore rooms": "Snirem tixxamin",
     "Unknown error": "Tuccḍa tarussint",
@@ -263,12 +244,10 @@
     "Preview": "Taskant",
     "View": "Sken",
     "Guest": "Anerzaf",
-    "Your profile": "Amaɣnu-ik/im",
     "Feedback": "Takti",
     "Your password has been reset.": "Awal uffir-inek/inem yettuwennez.",
     "Syncing...": "Amtawi...",
     "Create account": "Rnu amiḍan",
-    "Create your account": "Rnu amiḍan-ik/im",
     "Go Back": "Uɣal ɣer deffir",
     "Commands": "Tiludna",
     "Users": "Iseqdacen",
@@ -296,8 +275,6 @@
     "This email address is already in use": "Tansa-agi n yimayl tettuseqdac yakan",
     "This phone number is already in use": "Uṭṭun-agi n tilifun yettuseqddac yakan",
     "Your %(brand)s is misconfigured": "%(brand)s inek(inem) ur ittusbadu ara",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ma ulac aɣilif, sebded <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, neɣ<safariLink>Safari</safariLink> i tirmit igerrzen.",
-    "I understand the risks and wish to continue": "Gziɣ ayen ara d-yeḍrun maca bɣiɣ ad kemmleɣ",
     "Use Single Sign On to continue": "Seqdec anekcum asuf akken ad tkemmleḍ",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Sentem timerna n tansa-a n yimayl s useqdec n unekcum asuf i ubeggen n timagit-in(im).",
     "Single Sign On": "Anekcum asuf",
@@ -353,24 +330,11 @@
     "Session key": "Tasarut n tɣimit",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ma ulac aɣilif, senqed imayl-ik/im syen sit ɣef useɣwen i yellan. Akken ara yemmed waya, sit ad tkemmleḍ.",
     "This will allow you to reset your password and receive notifications.": "Ayagi ad ak(akem)-yeǧǧ ad twennzeḍ awal-ik/im uffir yerna ad d-tremseḍ ilɣa.",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Isem n useqdac yezmer kan ad yegber isekkilen imeẓyanen, izwilen neɣ '=_-./'",
-    "Username invalid: %(errMessage)s": "Isem n useqdac d arameɣtu: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Tella-d tuccḍa: %(error_string)s",
-    "To get started, please pick a username!": "I wakken ad tebduḍ, ttxil-k/m fren isem n useqdac!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Wagi ad yili d isem-ik/im deg <span></span> usebter agejdan, neɣ tzemreḍ ad tferneḍ <a>aqeddac-nniḍen</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Ma yella tesεiḍ yakan amiḍan di Matrix, tzemreḍ <a>ad tkecmeḍ</a> deg umḍq-nni.",
     "Call Failed": "Ur iddi ara usiwel",
-    "Call Timeout": "Akud n uṛaǧu n usiwel",
     "Try using turn.matrix.org": "Ɛreḍ aseqdec n turn.matrix.org",
-    "Unable to capture screen": "Tuṭṭfa n ugdil ulamek",
-    "Existing Call": "Asiwel amiran",
-    "You are already in a call.": "Aql-ak(qkem)-id yakan tessawaleḍ.",
     "VoIP is unsupported": "VoIP ur tettusefrak ara",
     "You cannot place VoIP calls in this browser.": "Ur tezmireḍ ara ad tesεeddiḍ asiwel VoIP deg yiminig-a.",
     "You cannot place a call with yourself.": "Ur tezmireḍ ara a temsawaleḍ d yiman-ik.",
-    "Call in Progress": "Asiwel iteddu",
-    "A call is currently being placed!": "Yella usiwel ila iteddu!",
-    "A call is already in progress!": "Yella usiwel ila iteddun akka tura!",
     "Replying With Files": "Tiririt s yifuyla",
     "The file '%(fileName)s' failed to upload.": "Yegguma ad d-yali '%(fileName)s' ufaylu.",
     "Upload Failed": "Asali ur yeddi ara",
@@ -387,7 +351,6 @@
     "Add to community": "Rnu ɣer temɣiwent",
     "Unnamed Room": "Taxxamt war isem",
     "The server does not support the room version specified.": "Aqeddac ur issefrek ara lqem n texxamt yettwafernen.",
-    "If you cancel now, you won't complete verifying the other user.": "Ma yella teffɣeḍ tura, asenqed n yiseqdacen-nniḍen ur ittemmed ara.",
     "Cancel entering passphrase?": "Sefsex tafyirt tuffirt n uεeddi?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Γur-k: yal amdan ara ternuḍ ɣer temɣiwent ad d-iban s wudem azayaz i yal yiwen yessnen asulay n temɣiwent",
     "Invite new community members": "Nced-d imttekkiyen imaynuten ɣer temɣiwent",
@@ -417,7 +380,6 @@
     "Room %(roomId)s not visible": "Taxxamt %(roomId)s ur d-tban ara",
     "Missing user_id in request": "Ixuṣṣ useqdac_asulay deg usuter",
     "Command error": "Tuccḍa n tladna",
-    "/ddg is not a command": "/ddg mačči d taladna",
     "Upgrades a room to a new version": "Leqqem taxxamt ɣer lqem amaynut",
     "Error upgrading room": "Tuccḍa deg uleqqem n texxamt",
     "Changes your avatar in this current room only": "Snifel avatar-ik/im deg texxamat-agi kan tamirant",
@@ -430,12 +392,8 @@
     "You are now ignoring %(userId)s": "Aql-ak tura tunfeḍ i %(userId)s",
     "Command failed": "Taladna ur teddi ara",
     "Could not find user in room": "Ur yettwaf ara useqdac deg texxamt",
-    "(no answer)": "(ulac tiririt)",
     "New login. Was this you?": "Anekcam amaynut. D kečč/kemm?",
-    "Verify the new login accessing your account: %(name)s": "Senqed anekcam amaynut i ikecmen ɣer umiḍan-ik/im: %(name)s",
     "What's new?": "D acu-t umaynut?",
-    "Upgrade your %(brand)s": "Leqqem %(brand)s inek/inem",
-    "A new version of %(brand)s is available!": "Lqem amaynut n %(brand)s yella!",
     "There was an error joining the room": "Tella-d tuccḍa deg unekcum ɣer texxamt",
     "Sorry, your homeserver is too old to participate in this room.": "Suref-aɣ, asebter-ik/im agejdan d aqbur aṭas akken ad yettekki deg texxamt-a.",
     "Please contact your homeserver administrator.": "Ttxil-k/m nermes anedbal-ik/im n usebter agejdan.",
@@ -444,10 +402,8 @@
     "Support adding custom themes": "Tallalt n tmerna n yisental udmawanen",
     "Use custom size": "Seqdec teɣzi tudmawant",
     "Show avatar changes": "Sken isnifal n avatar",
-    "Always show encryption icons": "Sken yal tikkelt tignitin tiwgelhanen",
     "Send typing notifications": "Azen ilɣa yettuszemlen",
     "Show typing notifications": "Azen ilɣa yettuszemlen",
-    "Room Colour": "Initen n texxamt",
     "Show developer tools": "Sken ifecka n uneflay",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ama tseqdaceḍ askar-inek.inem n umaẓrag n uḍris anesbaɣur neɣ xaṭi",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Γas ma tseqdaceḍ %(brand)s inek.inem deg yibenk anida asami d ametwi agejdan n unekcum",
@@ -457,10 +413,7 @@
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ma yili asebter-a degs talɣut tummilt, am texxamt neɣ aseqdac neɣ asulay n ugraw, isefka-a ad ttwakksen send ad ttwaznen i uqeddac.",
     "Unable to load! Check your network connectivity and try again.": "Yegguma ad d-yali! Senqed tuqqna-inek.inem ɣer uzeṭṭa syen tεerḍeḍ tikkelt-nniḍen.",
     "Failure to create room": "Timerna n texxamt ur teddi ara",
-    "If you cancel now, you won't complete verifying your other session.": "Ma yella teffɣeḍ tura, ur tessawaḍeḍ ara ad tesneqdeḍ akk tiɣimiyin-inek.inem.",
-    "If you cancel now, you won't complete your operation.": "Ma yella teffɣeḍ tura, tamhelt-ik.im ur tettemmed ara.",
     "Show these rooms to non-members on the community page and room list?": "Sken tixxamin-a i wid ur nettekka ara deg usebter n temɣiwent d tebdert n texxamt?",
-    "The remote side failed to pick up": "Amazan ur yessaweḍ ara ad d-yerr",
     "Call failed due to misconfigured server": "Ur yeddi ara usiwel ssebba n uqeddac ur nettuswel ara akken iwata",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Ttxil-k·m suter deg anedbal n uqeddac-ik·im agejdan (<code>%(homeserverDomain)s</code>) ad yeswel aqeddac TURN akken isawalen ad ddun akken ilaq.",
     "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.": "Neɣ, tzemreḍ ad tεerḍed aseqdec n uqeddac azayez deg <code>turn.matrix.org</code>, maca ayagi ur yelhi ara, yezmer ad yebḍu tansa-inek·inem IP d uqeddac-a. Tzemreḍ ad tesferkeḍ daɣen ayagi deg yiɣewwaren.",
@@ -471,25 +424,16 @@
     "Are you sure you want to cancel entering passphrase?": "S tidet tebɣiḍ ad tesfesxeḍ asekcem n tefyirt tuffirt?",
     "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.": "Tigawt-a tesra anekcum ɣer uqeddac n tmagit tamezwert <server /> i usentem n tansa n yimayl neɣ uṭṭun n tiliɣri, maca aqeddac ur yesεi ula d yiwet n twali n umeẓlu.",
     "Only continue if you trust the owner of the server.": "Ala ma tettekleḍ ɣef bab n uqeddac ara tkemmleḍ.",
-    "Use your account to sign in to the latest version": "Seqdec amiḍan-ik·im akken ad tkecmeḍ ɣer lqem aneggaru",
-    "Riot is now Element!": "Tura, Riot d aferdis!",
-    "Learn More": "Issin ugar",
     "Restricted": "Yesεa tilas",
     "Set up": "Sbadu",
     "Pencil": "Akeryun",
-    "Compact": "Akussem",
     "Modern": "Atrar",
     "Online": "Srid",
     "Mention": "Abdar",
     "Verify session": "Asenqed n tɣimit",
     "Message edits": "Tiẓrigin n yizen",
-    "Your account is not secure": "Amiḍan-ik·im d araɣelsan",
-    "Your password": "Awal-ik·im uffir",
-    "New session": "Tiɣimit tamaynut",
-    "This wasn't me": "Wagi/tagi mačči d nekk",
     "Security Key": "Tasarut n tɣellist",
     "Resend": "Ɛawed azen",
-    "Premium": "Premium",
     "Everyone": "Yal yiwen",
     "New Recovery Method": "Tarrayt tamaynut n ujebber",
     "Go to Settings": "Ddu ɣer yiɣewwaren",
@@ -505,15 +449,11 @@
     "Alt Gr": "Alt Gr",
     "Super": "Ayuz",
     "Ctrl": "Ctrl",
-    "We’re excited to announce Riot is now Element": "S tumert meqqren ara d-nselɣu belli Riot tura d aferdis",
     "Operation failed": "Tamhelt ur teddi ara",
     "Failed to invite users to the room:": "Yegguma ad yeddu usnubget n yiseqdacen ɣer texxamt:",
-    "Failed to invite the following users to the %(roomName)s room:": "Asnubget n yiseqdacen i d-iteddun ɣer taxxamt %(roomName)s ur yeddi ara:",
     "Unable to create widget.": "Timerna n uwiǧit ulamek.",
     "Missing roomId.": "Ixuṣ usulay n texxamt.",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Yerna ¯\\_(ツ)_/¯ ɣer yizen n uḍris arewway",
-    "Searches DuckDuckGo for results": "Yettnadi DuckDuckGo ɣef yigmaḍ",
-    "To use it, just wait for autocomplete results to load and tab through them.": "I useqdec-ines, ṛǧu kan i yigmaḍ iwurmanen iččuranen i usali syen nadi deg-sen.",
     "Changes the avatar of the current room": "Ibeddel avatar n texxamt tamirant",
     "Gets or sets the room topic": "Yufa-d neɣ yesbadu asentel n texxamt",
     "Failed to set topic": "Asbadu n usentel ur yeddi ara",
@@ -537,21 +477,6 @@
     "Opens chat with the given user": "Yeldi adiwenni d useqdac i d-yettunefken",
     "Sends a message to the given user": "Yuzen iznan i useqdac i d-yettunefken",
     "Displays action": "Yeskan tigawt",
-    "%(targetName)s accepted an invitation.": "%(targetName)s yeqbel tinnubga.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s inced-d %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s yugi %(targetName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s kksen isem ara d-ibanen (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s yekkes tawlaft n umaqnu-ines.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ibeddel tawlaft n umaɣnu-ines.",
-    "%(senderName)s set a profile picture.": "%(senderName)s yesbadu tawlaft n umaɣnu.",
-    "%(senderName)s made no change.": "%(senderName)s ur yegi ara ula d yiwen n ubeddel.",
-    "VoIP conference started.": "Asarag VoIP yebda.",
-    "%(targetName)s joined the room.": "%(targetName)s yerna-d ɣer texxamt.",
-    "VoIP conference finished.": "Asarag VoIP yekfa.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s yeugi tinnubga.",
-    "%(targetName)s left the room.": "%(targetName)s yeǧǧa texxamt.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s yeqbel %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s yekkes-d tinnubga n %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ibeddel asentel ɣer \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s yekkes isem n texxamt.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s ileqqem taxxamt-a.",
@@ -560,8 +485,6 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s yuzen-d tugna.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s yekkes tansa tagejdant n texxamt-a.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s yerna tansiwin-nniḍen %(addresses)s ɣer texxamt-a.",
-    "(unknown failure: %(reason)s)": "(abrir tarussint: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s yekfa asiwel.",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s awiǧit yettwarna sɣur %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s awiǧit yettwakkes sɣur %(senderName)s",
     "Not Trusted": "Ur yettwattkal ara",
@@ -576,63 +499,26 @@
     "about a minute ago": "tasdidt seg yimir-nni",
     "%(num)s minutes ago": "%(num)s tesdat seg yimir-nni",
     "about an hour ago": "azal n usrag seg yimir-nni",
-    "Set Password": "Sbadu awal uffir",
-    "Set up encryption": "Swel awgelhen",
     "Encryption upgrade available": "Yella uleqqem n uwgelhen",
     "Verify this session": "Asenqed n tɣimit",
     "Other users may not trust it": "Iseqdacen-nniḍen yezmer ur tettamnen ara",
     "You joined the call": "Terniḍ ɣer usiwel",
     "%(senderName)s joined the call": "%(senderName)s yerna ɣer usiwel",
     "Call in progress": "Asiwel la iteddu",
-    "You left the call": "Teǧǧiḍ asiwel",
-    "%(senderName)s left the call": "%(senderName)s yeǧǧa asiwel",
     "Call ended": "Asiwel yekfa",
     "You started a call": "Tebdiḍ asiwel",
     "%(senderName)s started a call": "%(senderName)s yebda asiwel",
     "Waiting for answer": "Yettṛaǧu tiririt",
     "%(senderName)s is calling": "%(senderName)s yessawal",
-    "You created the room": "Terniḍ taxxamt",
-    "%(senderName)s created the room": "%(senderName)s yerna taxxamt",
-    "You made the chat encrypted": "Terriḍ adiwenni yettuwgelhen",
-    "%(senderName)s made the chat encrypted": "%(senderName)s yerra adiwenni yettuwgelhen",
-    "You made history visible to new members": "Terriḍ amazray yettban i yimttekkiyen imaynuten",
-    "%(senderName)s made history visible to new members": "%(senderName)s yerra amazray yettban i yimttekkiyen imaynuten",
-    "You made history visible to anyone": "Terriḍ amazray yettban i yal amdan",
-    "%(senderName)s made history visible to anyone": "%(senderName)s yerra amazray yettban i yal amdan",
-    "You made history visible to future members": "Terriḍ amazray yettban i yimttekkiyen ara d-yernun",
-    "%(senderName)s made history visible to future members": "%(senderName)s yerra amazray yettban i yimttekkiyen ara d-yernun",
-    "You were invited": "Tettusnubegteḍ",
-    "%(targetName)s was invited": "%(senderName)s yettusnubget",
-    "You left": "Truḥeḍ",
-    "%(targetName)s left": "%(targetName)s iṛuḥ",
-    "You rejected the invite": "Tugiḍ tinnubga",
-    "%(targetName)s rejected the invite": "%(targetName)s yugi tinnubga",
-    "You were uninvited": "Ur tettusnubegteḍ ara",
-    "%(targetName)s was uninvited": "%(senderName)s ur yettusnubget ara",
-    "You joined": "Terniḍ",
-    "%(targetName)s joined": "%(targetName)s yerna",
-    "You changed your name": "Tbeddleḍ isem-ik·im",
-    "%(targetName)s changed their name": "%(targetName)s ibeddel isem-is",
-    "You changed your avatar": "Tbeddleḍ avatar-inek·inem",
-    "%(targetName)s changed their avatar": "%(targetName)s ibeddel avatar-ines",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Tbeddleḍ isem n texxamt",
-    "%(senderName)s changed the room name": "%(senderName)s kksen isem n texxamt",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Ur tettusnubegteḍ ara sɣur %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s ur yettusnubget ara sɣur %(targetName)s",
-    "You invited %(targetName)s": "Tettusnubegteḍ sɣur %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s yettusnubget %(targetName)s",
-    "You changed the room topic": "Tbeddleḍ asentel n texxamt",
-    "%(senderName)s changed the room topic": "%(senderName)s ibeddel asentel n texxamt",
     "Message Pinning": "Arezzi n yizen",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Sdukkel tixxamin, tsizedgeḍ-tent s tebzimin tudmawanin (smiren akken ad alin yisnifal)",
     "Order rooms by name": "Semyizwer tixxamin s yisem",
     "Show rooms with unread notifications first": "Sken tixxamin yesεan ilɣa ur nettwaɣra ara d timezwura",
     "Collecting logs": "Alqaḍ n yiɣmisen",
-    "Uploading report": "Asali n uneqqis",
     "Waiting for response from server": "Aṛaǧu n tririt sɣur aqeddac",
     "Messages containing my display name": "Iznan ideg yella yisem-iw yettwaskanen",
     "Messages containing my username": "Iznan ideg yella yisem-iw n useqdac",
@@ -644,46 +530,30 @@
     "Public Name": "Isem azayez",
     "Last seen": "Timeẓri taneggarut",
     "Failed to set display name": "Asbadu n yisem yettwaskanen ur yeddi ara",
-    " to store messages from ": " i usekles n yiznan sɣur ",
-    "rooms.": "tixxamin.",
     "Connecting to integration manager...": "Tuqqna ɣer umsefrak n useddu...",
     "Cannot connect to integration manager": "Ur nessaweḍ ara ad neqqen ɣer umsefrak n useddu",
     "Delete Backup": "Kkes aḥraz",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Iznan yettwawgelhen ttuḥerzen s uwgelhen n yixef ɣer yixef. Ala kečč d uɣerwaḍ (yiɣerwaḍen) i yesεan tisura akken ad ɣren iznan-a.",
     "This session is backing up your keys. ": "Tiɣimit tḥerrez tisura-inek·inem. ",
     "Connect this session to Key Backup": "Qqen tiɣimit-a ɣer uḥraz n tsarut",
-    "Server Name": "Isem n uqeddac",
     "Enter password": "Sekcem awal n uffir",
     "Nice, strong password!": "Igerrez, d awal uffir iǧhed aṭas!",
     "Password is allowed, but unsafe": "Awal uffir yettusireg, maca d araɣelsan",
     "Keep going...": "Kemmel ddu...",
-    "The email field must not be blank.": "Urti n yimayl ur ilaq ara ad yili d ilem.",
-    "The username field must not be blank.": "Urti n yisem n useqdac ur ilaq ara ad yili d ilem.",
-    "The phone number field must not be blank.": "Urti n wuṭṭun n tiliɣri ur ilaq ara ad yili d ilem.",
-    "The password field must not be blank.": "Urti n wawal uffir ilaq ara ad yili d ilem.",
-    "Not sure of your password? <a>Set a new one</a>": "Tcukkteḍ deg wawal-ik·im uffir? <a>Sbadu yiwen-nniḍen d amaynut</a>",
     "Sign in with": "Kcem s",
     "Use an email address to recover your account": "Seqdec tansa n yimayl akken ad t-terreḍ amiḍan-ik:im",
     "Enter email address (required on this homeserver)": "Sekcem tansa n yimayl (yettusra deg uqeddac-a agejdan)",
     "Doesn't look like a valid email address": "Ur tettban ara d tansa n yimayl tameɣtut",
     "Other users can invite you to rooms using your contact details": "Iseqdacen wiyaḍ zemren ad ak·akem-snubegten ɣer texxamin s useqdec n tlqayt n unermas",
     "Enter phone number (required on this homeserver)": "Sekcem uṭṭun n tiliɣri (yettusra deg uqeddac-a agejdan)",
-    "Doesn't look like a valid phone number": "Ur tettban ara d uṭṭun n tiliɣri ameɣtu",
     "Enter username": "Sekcem isem n useqdac",
     "Phone (optional)": "Tiliɣri (d afrayan)",
-    "Create your Matrix account on %(serverName)s": "Rnu amiḍan-ik·im Matrix deg %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Rnu amiḍan-ik·im Matrix deg <underlinedServerName />",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Sekcem URL n uqeddac agejdan udmawan <a>D acu-t unamek n waya?</a>",
-    "Homeserver URL": "URL n uqeddac agejdan",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Sekcem URL n uqeddac n timagit udmawan <a>D acu-t unamek n waya?</a>",
     "Forgotten your password?": "Tettuḍ awal-ik·im uffir?",
     "Sign in and regain access to your account.": "Qqen syen εreḍ anekcum ɣer umiḍan-inek·inem tikkelt-nniḍen.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Ur tessawḍeḍ ara ad teqqneḍ ɣer umiḍan-inek:inem. Ttxil-k·m nermes anedbal n uqeddac-ik·im agejdan i wugar n talɣut.",
     "You're signed out": "Teffɣeḍ-d seg tuqqna",
     "Clear personal data": "Sfeḍ isefka udmawanen",
     "Community Autocomplete": "Asmad awurman n temɣiwent",
-    "Results from DuckDuckGo": "Igmaḍ seg DuckDuchGo",
-    "DuckDuckGo Results": "Igmaḍ n DuckDuckGo",
     "Notify the whole room": "Selɣu akk taxxamt",
     "Room Notification": "Ilɣa n texxamt",
     "Notification Autocomplete": "Asmad awurman n yilɣa",
@@ -700,18 +570,13 @@
     "Generate a Security Key": "Sirew tasarut n tɣellist",
     "Enter a Security Phrase": "Sekcem tafyirt tuffirt",
     "Enter your account password to confirm the upgrade:": "Sekcem awal uffir n umiḍan-ik·im akken ad tesnetmeḍ aleqqem:",
-    "Great! This recovery passphrase looks strong enough.": "Ayuz! Tafyirt-agi tuffirt n ujebber tettban teǧhed nezzeh.",
     "That matches!": "Yemṣada!",
     "Use a different passphrase?": "Seqdec tafyirt tuffirt yemgaraden?",
     "That doesn't match.": "Ur yemṣada ara.",
     "Go back to set it again.": "Uɣal ɣer deffir akken ad t-tesbaduḍ i tikkelt-nniḍen.",
-    "Enter your recovery passphrase a second time to confirm it.": "Sekcem tafyirt-ik·im tuffirt n ujebber i tikkelt-nniḍen akken ad tt-tesnetmeḍ.",
-    "Confirm your recovery passphrase": "Sentem tafyirt-ik·im tuffirt n ujebber",
-    "Set up Secure backup": "Sebded aḥraz aɣelsan",
     "Upgrade your encryption": "Leqqem awgelhen-inek·inem",
     "Set a Security Phrase": "Sbadu tafyirt taɣelsant",
     "Confirm Security Phrase": "Sentem tafyirt tuffirt",
-    "Don't ask again": "Ur d-sutur ara tikelt-nniḍen",
     "Recovery Method Removed": "Tarrayt n ujebber tettwakkes",
     "Failed to set direct chat tag": "Asbadu n tebzimt n udiwenni usrid ur yeddi ara",
     "Failed to remove tag %(tagName)s from room": "Tukksa n tebzimt %(tagName)s seg texxamt ur yeddi ara",
@@ -774,10 +639,6 @@
     "Please supply a widget URL or embed code": "Ttxil-k·m mudd URL n uwiǧit neɣ tangalt tusliɣt",
     "Verifies a user, session, and pubkey tuple": "Yessenqad tagrumma-a: aseqdac, tiɣimit d tsarut tazayezt",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ΓUR-K·M: Tettwasenqed tɣimit yakan maca tisura ur mṣadant ara!",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s isuter-d asarag VoIP.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ibeddel isem-ines yettwaskanen s %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s yesbadu isem yettwaskanen s %(displayName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s yessuffeɣ %(targetName)s.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ibeddel isem n texxamt seg %(oldRoomName)s ɣer %(newRoomName)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ibeddel isem n texxamt s %(roomName)s.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s yerra taxxamt d tazayazt i kra n win yessnen aseɣwen.",
@@ -794,11 +655,7 @@
     "Deops user with given id": "Aseqdac Deops s usulay i d-yettunefken",
     "Sends the given message coloured as a rainbow": "Yuzen iznan i d-yettunefken yeɣman s yiniten am teslit n Unẓar",
     "Sends the given emote coloured as a rainbow": "Yuzen tanfalit i d-yettunefken yeɣman s yiniten am teslit n Unẓar",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s yeqbel tinnubga i %(displayName)s.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ibeddel tansiwin n texxamt-a.",
-    "(not supported by this browser)": "(ur yettusefrak ara sɣur iminig-a)",
-    "%(senderName)s answered the call.": "%(senderName)s yerra ɣef usiwel.",
-    "(could not connect media)": "(tuqqna n umidya tegguma)",
     "%(senderName)s placed a voice call.": "%(senderName)s isɛedda asiwel s taɣect.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s isɛedda asiwel s taɣect. (ur yettusefrak ara s yiming-a)",
     "%(senderName)s placed a video call.": "%(senderName)s isɛedda asiwel s tvidyut.",
@@ -828,8 +685,6 @@
     "This is a top-10 common password": "Wagi d awal uffir gar 10 yimezwura yettwassnen",
     "This is a top-100 common password": "Wagi d awal uffir gar 100 yimezwura yettwassnen",
     "This is a very common password": "Wagi d awal uffir yettwassnen",
-    "I want to help": "Bɣiɣ ad d-muddeɣ tallalt",
-    "Enable them now": "Sermed-iten tura",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Change notification settings": "Snifel iɣewwaren n yilɣa",
     "Match system theme": "Asentel n unagraw yemṣadan",
@@ -839,16 +694,10 @@
     "Messages sent by bot": "Iznan yettwaznen s Bot",
     "When rooms are upgraded": "Mi ara ttwaleqqment texxamin",
     "My Ban List": "Tabdart-inu n tigtin",
-    "Incoming voice call": "Asiwel s taɣect ikcem-d",
-    "Incoming video call": "Asiwel s tvidyut ikcem-d",
-    "Incoming call": "Asiwel i d-ikecmen",
     "Got It": "Awi-t",
-    "From %(deviceName)s (%(deviceId)s)": "Seg %(deviceName)s (%(deviceId)s)",
     "Accept <policyLink /> to continue:": "Qbel <policyLink /> i wakken ad tkemmleḍ:",
     "This bridge was provisioned by <user />.": "Tileggit-a tella-d sɣur <user />.",
     "This bridge is managed by <user />.": "Tileggit-a tettusefrak sɣur <user />.",
-    "Workspace: %(networkName)s": "Tallunt n uxeddim: %(networkName)s",
-    "Channel: %(channelName)s": "Abadu: %(channelName)s",
     "Upload new:": "Asali amaynut:",
     "New passwords don't match": "Awalen uffiren imaynuten ur mṣadan ara",
     "Passwords can't be empty": "Awalen uffiren ur ilaq ara ad ilin d ilmawen",
@@ -858,13 +707,7 @@
     "Confirm deleting these sessions": "Sentem tukksa n tɣimiyin-a",
     "Restore from Backup": "Tiririt seg uḥraz",
     "All keys backed up": "Akk tisura ttwaḥerzent",
-    "Backup version: ": "Lqem n uḥraz: ",
-    "Failed to change settings": "Asnifel n yiɣewwaren ur yeddi ara",
-    "Failed to update keywords": "Aleqqem n wawalen ufrinen ur yeddi ara",
-    "Enable notifications for this account": "Sens ilɣa i umiḍan-a",
-    "Enable email notifications": "Sens ilɣa n yimayla",
     "Notification targets": "Isaḍasen n yilɣa",
-    "Advanced notification settings": "Iɣewwaren n yilɣa leqqayen",
     "Enable desktop notifications for this session": "Sens ilɣa n tnirawt i tɣimit-a",
     "Enable audible notifications for this session": "Sens ilɣa imsiwal i texxamt",
     "<a>Upgrade</a> to your own domain": "<a>Leqqem</a> ɣer taɣult-inek kečč",
@@ -892,7 +735,6 @@
     "Submit debug logs": "Azen iɣmisen n wabug",
     "Clear cache and reload": "Sfeḍ takatut tuffirt syen sali-d",
     "%(brand)s version:": "Lqem %(brand)s:",
-    "olm version:": "lqem n olm:",
     "Ignored/Blocked": "Yettunfen/Yettusweḥlen",
     "Error unsubscribing from list": "Tuccḍa deg usefsex n ujerred seg texxamt",
     "Server rules": "Ilugan n uqeddac",
@@ -928,7 +770,6 @@
     "Change settings": "Snifel iɣewwaren",
     "Kick users": "Suffeɣ iseqdacen",
     "Ban users": "Agi yiseqdacen",
-    "Remove messages": "Kkes iznan",
     "Privileged Users": "Iseqdacen i yettwafernen",
     "Muted Users": "Iseqdacen i isusmen",
     "Banned users": "Iseqdacen i yettwagin",
@@ -955,8 +796,6 @@
     "Send an encrypted message…": "Azen izen yettuwgelhen…",
     "Send a message…": "Azen izen…",
     "Italics": "Uknan",
-    "No pinned messages.": "Ulac iznan yerzin.",
-    "Pinned Messages": "Iznan yerzin",
     "Online for %(duration)s": "Srid azal n %(duration)s",
     "Idle for %(duration)s": "D arurmid azal n %(duration)s",
     "Offline for %(duration)s": "Beṛṛa n tuqqna  azal n %(duration)s",
@@ -986,7 +825,6 @@
     "Mentions & Keywords": "Ibdaren & Awalen ufrinen",
     "Forget Room": "Tettuḍ taxxamt",
     "Leave Room": "Ffeɣ seg texxamt",
-    "Add a topic": "Rnu asentel",
     "This Room": "Taxxamt-a",
     "Search…": "Nadi…",
     "Send as message": "Azen-it d izen",
@@ -1058,14 +896,11 @@
     "Your theme": "Asentel-inek·inem",
     "Room ID": "Asulay n texxamt",
     "Widget ID": "Asulay n yiwiǧit",
-    "Download this file": "Sali-d afaylu-a",
-    "Manage Integrations": "Sefrek imsidaf",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Power level": "Sagen aswir",
     "Custom level": "Sagen aswir",
     "<a>In reply to</a> <pill>": "<a>Deg tririt i</a> <pill>",
     "e.g. my-room": "e.g. taxxamt-inu",
-    "Please provide a room address": "Ttxil-k·m mudd-d tansa n texxamt",
     "Sign in with single sign-on": "Qqen s unekcum asuf",
     "And %(count)s more...|other": "D %(count)s ugar...",
     "Enter a server name": "Sekcem isem n uqeddac",
@@ -1083,7 +918,6 @@
     "Please enter a name for the room": "Ttxil-k·m sekcem isem i texxamt",
     "Enable end-to-end encryption": "Awgelhen seg yixef ɣer yixef ur yeddi ara",
     "Topic (optional)": "Asentel (afrayan)",
-    "Make this room public": "Err taxxamt-a d tazayezt",
     "Continue With Encryption Disabled": "Kemmel s uwgelhen yensan",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Sentem asensi n umiḍan s useqdec n unekcum asuf i ubeggen n timagit-ik·im.",
     "Confirm account deactivation": "Sentem asensi n umiḍan",
@@ -1095,7 +929,6 @@
     "Waiting for partner to confirm...": "Aṛaǧu n umendad ad isentem...",
     "Incoming Verification Request": "Tuttra n usenqed i d-ikecmen",
     "Confirm to continue": "Sentem i wakken ad tkemmleḍ",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Ancad n yiseqdacen i d-iteddun ɣer udiwenni ur yeddi ara: %(csvUsers)s",
     "Failed to find the following users": "Ur nessaweḍ ara ad naf iseqdacen",
     "Recent Conversations": "Idiwenniyen n melmi kan",
     "Direct Messages": "Iznan usligen",
@@ -1105,7 +938,6 @@
     "Failed to upgrade room": "Aleqqem n texxamt ur yeddi ara",
     "Upgrade this room to version %(version)s": "Leqqem taxxamt-a ɣer lqem amaynut %(version)s",
     "Upgrade Room Version": "Lqem n uleqqem n texxamt",
-    "Automatically invite users": "Nced-d iseqdacen s wudem awurman",
     "Upgrade private room": "Leqqem taxxamt tusligt",
     "Upgrade public room": "Leqqem taxxamt tazayezt",
     "Server isn't responding": "Ulac tiririt sɣur aqeddac",
@@ -1120,34 +952,18 @@
     "Missing session data": "Isefka n tɣimit xuṣṣen",
     "Upload all": "Sali-d kullec",
     "Cancel All": "Sefsex kullec",
-    "Verify other session": "Senqed tiɣimit tayeḍ",
     "Verification Request": "Asuter n usenqed",
     "Use your Security Key to continue.": "Seqdec tasarut-ik·im n tɣellist akken ad tkemmleḍ.",
-    "Incorrect recovery passphrase": "Tafyirt tuffirt n uεeddi d tarameɣtut",
     "Unable to restore backup": "Tiririt n uḥraz tugi ad teddu",
     "Keys restored": "Tisura ttwaskelsent",
-    "Enter recovery passphrase": "Sekcem tafyirt tuffirt n tririt",
-    "Enter recovery key": "Sekcem tasarut tririt",
-    "Private Chat": "Adiwenni uslig",
-    "Public Chat": "Adiwenni azayez",
-    "Address (optional)": "Tansa (tafrayan)",
     "Reject invitation": "Agi tinnubga",
     "Unable to reject invite": "Tegtin n tinnubga tegguma ad teddu",
-    "Resend edit": "Ales tuzna n useẓreg",
-    "Resend removal": "Azen tikkelt-nniḍen tukksa",
-    "Cancel Sending": "Sefsex tuzna",
-    "Share Permalink": "Bḍu aseɣwen ameɣlal",
-    "Share Message": "Bḍu izen",
-    "Collapse Reply Thread": "Fneẓ asqerdec n tririt",
     "Report Content": "Agbur n uneqqis",
-    "All messages (noisy)": "Iznan i meṛṛa (sɛan ṣṣut)",
-    "Direct Chat": "Adiwenni uslig",
     "Clear status": "Sfeḍ addaden",
     "Update status": "Leqqem addaden",
     "Set a new status...": "Sbadu addad amaynut...",
     "View Community": "Wali tamɣiwent",
     "Remove for everyone": "Kkes i meṛṛa",
-    "Remove for me": "Kkes i nekk",
     "User Status": "Addaden n useqdac",
     "Start authentication": "Bdu alɣu",
     "Sign in with SSO": "Anekcum s SSO",
@@ -1179,42 +995,29 @@
     "Welcome to %(appName)s": "Ansuf ɣer %(appName)s",
     "Send a Direct Message": "Azen izen uslig",
     "Failed to reject invitation": "Tigtin n tinnubga ur yeddi ara",
-    "Failed to leave room": "Tuffɣa seg texxamt ur yeddi ara",
     "Signed Out": "Yeffeɣ seg tuqqna",
-    "Self-verification request": "Asuter n usenqed awurman",
     "Create a new community": "Rnu tamɣiwent tamaynut",
     "Remove from Directory": "Kkes seg ukaram",
     "Unable to join network": "Timerna ɣer uzeṭṭa d tawezɣit",
     "Clear filter": "Sfeḍ asizdeg",
-    "%(count)s of your messages have not been sent.|one": "Izen-inek·inem ur yettwazen ara.",
     "Room": "Taxxamt",
     "Failed to reject invite": "Tigtin n tinnubga ur yeddi ara",
-    "Click to unmute video": "Sit i wakken ad tesremdeḍ tavidyut",
-    "Click to mute video": "Sit i wakken ad tsenseḍ tavidyut",
-    "Click to unmute audio": "Sit i wakken ad tesremdeḍ ameslaw",
-    "Click to mute audio": "Sit i wakken ad tsenseḍ ameslaw",
     "Switch to light mode": "Uɣal ɣer uskar aceɛlal",
     "Switch to dark mode": "Uɣal ɣer uskar aberkan",
     "Switch theme": "Abeddel n usentel",
     "All settings": "Akk iɣewwaren",
     "Verify this login": "Senqed anekcam-a",
     "A new password must be entered.": "Awal uffir amaynut ilaq ad yettusekcem.",
-    "Your Matrix account on <underlinedServerName />": "Amiḍan-ik·im Matrix deg <underlinedServerName />",
     "Send Reset Email": "Azen imayl n uwennez",
     "Set a new password": "Sbadu awal uffir amaynut",
     "General failure": "Tuccḍa tamatut",
     "This account has been deactivated.": "Amiḍan-a yettuḥbes.",
     "Continue with previous account": "Kemmel s umiḍan yezrin",
     "<a>Log in</a> to your new account.": "<a>Kcem ɣer</a> umiḍan-ik·im amaynut.",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s n tnarit",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Android": "%(brand)s Andriod",
     "Incorrect password": "Awal uffir d arameɣtu",
     "Failed to re-authenticate": "Aɛiwed n usesteb ur yeddi ara",
     "Command Autocomplete": "Asmad awurman n tiludna",
     "Emoji Autocomplete": "Asmad awurman n yimujit",
-    "Enter a recovery passphrase": "Sekcem tafyirt tuffirt n tririt",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Seqdec aqeddac n timagit i uncad s yimayl. Sit, tkemmleḍ aseqdec n uqeddac n timagit amezwer (%(defaultIdentityServerName)s) neɣ sefrek deg yiɣewwaren.",
     "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!": "ƔUR-K·M: tASARUT N USENQED UR TEDDI ARA! Tasarut n uzmul n %(userId)s akked tɣimit %(deviceId)s d \"%(fprint)s\" ur imṣada ara d tsarut i d-yettunefken \"%(fingerprint)s\". Ayagi yezmer ad d-yini tiywalin-ik·im ttusweḥlent!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Tasarut n uzmul i d-tefkiḍ temṣada d tsarut n uzmul i d-tremseḍ seg tɣimit %(userId)s's %(deviceId)s. Tiɣimit tettucreḍ tettwasenqed.",
@@ -1247,22 +1050,16 @@
     "Export E2E room keys": "Sifeḍ tisura n texxamt E2E",
     "Do you want to set an email address?": "Tebɣiḍ ad tazneḍ tansa n yimayl?",
     "Your homeserver does not support cross-signing.": "Aqeddac-ik·im agejdan ur yessefrak ara azmul anmidag.",
-    "Cross-signing and secret storage are enabled.": "Azmul anmidag d uklas uffir ur ttwaremden ara.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Amiḍan-inek·inem ɣer-s timagit n uzmul anmidag deg uklas uffir, maca mazal ur yettwaman ara sɣur taxxamt-a.",
-    "Cross-signing and secret storage are not yet set up.": "Azmul anmidag d uklas uffir mazal ar tura ur ttusbadeun ara.",
-    "Reset cross-signing and secret storage": "Wennez azmul anmidag d uklas uffir",
-    "Bootstrap cross-signing and secret storage": "Azmul anmidag s tazwara d uklas uffir",
     "well formed": "imsel akken iwata",
     "unexpected type": "anaw ur nettwaṛǧa ara",
     "Cross-signing public keys:": "Tisura n uzmul anmidag tizuyaz:",
     "in memory": "deg tkatut",
     "Cross-signing private keys:": "Tisura tusligin n uzmul anmidag:",
-    "Create room": "Rnu taxxamt",
     "System Alerts": "Ilɣa n unagraw",
     "Forget this room": "Ttu taxxamt-a",
     "Reject & Ignore user": "Agi & Zgel aseqdac",
     "%(roomName)s does not exist.": "%(roomName)s ulac-it.",
-    "Don't ask me again": "Ur d-sutur ara tikelt-nniḍen",
     "Show rooms with unread messages first": "Sken tixxamin yesεan iznan ur nettwaɣra ara d timezwura",
     "List options": "Tixtiṛiyin n tebdart",
     "Show %(count)s more|other": "Sken %(count)s ugar",
@@ -1293,7 +1090,6 @@
     "Your display name": "Isem-ik·im yettwaskanen",
     "Your avatar URL": "URL n avatar-inek·inem",
     "%(brand)s URL": "%(brand)s URL",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Aseqdec n uwiǧit-a yezmer ad yebḍu isefka <helpIcon/> d %(widgetDomain)s & amsefrak-inek·inem n umsidef.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Aseqdec n uwiǧit-a yezmer ad bḍun yisefka <helpIcon /> d %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Iwiǧiten ur seqdacen ara awgelhen n yiznan.",
     "Widget added by": "Awiǧit yettwarna sɣur",
@@ -1301,15 +1097,9 @@
     "Delete Widget": "Kkes awiǧit",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Tukksan n uwiǧit, ad t-tekkes akk i yiseqdacen n texxamt-nni. D tidet tebɣiḍ ad tekkseḍ awiǧit-a?",
     "Delete widget": "Kkes awiǧit",
-    "Failed to remove widget": "Tukksa n uwiǧit ur teddi ara",
-    "An error ocurred whilst trying to remove the widget from the room": "Tella-d tuccḍa lawan n tukksa n uwiǧit seg texxamt",
-    "Minimize apps": "Semi isnasen",
-    "Maximize apps": "Semer isnasen",
     "Popout widget": "Awiǧit attalan",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Ttxil-k·m <newIssueLink>rnu ugur amaynut</newIssueLink> deg GitHub akken ad nessiweḍ ad nezrew abug-a.",
     "expand": "snefli",
-    "You cannot delete this image. (%(code)s)": "Ur tezmireḍ ara ad tekkseḍ tugna-a. (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Yuli-d deg %(date)s sɣur %(user)s",
     "Rotate Left": "Zzi ɣer uzelmaḍ",
     "Rotate Right": "Zzi ɣer uyeffus",
     "Language Dropdown": "Tabdart n udrurem n tutlayin",
@@ -1371,8 +1161,6 @@
     "Some characters not allowed": "Kra n yisekkilen ur ttusirgen ara",
     "This address is available to use": "Tansa-a tella i useqdec",
     "This address is already in use": "Tansa-a ha-tt-an yakan deg useqdec",
-    "Room directory": "Akaram n texxamt",
-    "ex. @bob:example.com": "am. @bob:amedya.com",
     "Looks good": "Ayagi yettban yelha",
     "Can't find this server or its room list": "D awezɣi ad d-naf aqeddac-a neɣ tabdart-is n texxamt",
     "All rooms": "Akk tixxamin",
@@ -1398,7 +1186,6 @@
     "delete the address.": "kkes tansa.",
     "Room not found": "Ur tettwaf ara texxamt",
     "Find a room…": "Af-d taxxamt…",
-    "Search rooms": "Nadi tixxamin",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s yuzen tinubga i %(targetDisplayName)s i wakken ad d-yernu ɣer texxamt.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s yerra amazray n texxamt tamaynut yettban i meṛṛa iɛeggalen n texxamt, segmi ara d-ttwanecden.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s yerra amazray n texxamt tamaynut yettban i meṛṛa iɛeggalen n texxamt, segmi ara d-rnun.",
@@ -1429,17 +1216,13 @@
     "Ask this user to verify their session, or manually verify it below.": "Suter deg useqdac-a ad isenqed tiɣimit-is, neɣ senqed-itt ddaw s ufus.",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Ḍmen qbel tesɛiḍ tuqqna i igerrzen, neɣ nermes anedbal n uqeddac",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Suter deg %(brand)s unedbal ad isenqed <a>tawila-ik·im</a> n unekcam arameɣtu neɣ i d-yuɣalen.",
-    "The message you are trying to send is too large.": "Izen i tettaɛraḍeḍ ad t-tazneḍ ɣezzif aṭas.",
     "This homeserver has hit its Monthly Active User limit.": "Aqeddac-a agejdan yewweḍ ɣer talast n useqdac urmid n wayyur.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Ttxil-k·m <a>nermes anedbal-ik·im n uqeddac</a> i wakken ad tkemmleḍ aseqdec n uqeddac.",
     "Unable to connect to Homeserver. Retrying...": "Yegguma ad yeqqen ɣer uqeddac agejdan. Ales aneɛruḍ...",
     "Use a few words, avoid common phrases": "Seqdec kra n wawalen, sinef i tefyar i d-yettuɣalen",
     "No need for symbols, digits, or uppercase letters": "Ulayɣer izamulen, izwilen d yisekkilen imeqqranen",
-    "Make a copy of your recovery key": "Eg anɣal i tsarut-ik·im n uɛeddi",
     "Create key backup": "Rnu aḥraz n tsarut",
     "Unable to create key backup": "Yegguma ad yernu uḥraz n tsarut",
-    "If you don't want to set this up now, you can later in Settings.": "Ma yella ur tebɣiḍ ara ad t-tesbaduḍ tura, tzemreḍ ad t-tgeḍ mbeɛd deg yiɣewwaren.",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Tasarut tuffirt n uɛeddi tamaynut d tsarut i tɣellist n yiznan ttwafent.",
     "This session is encrypting history using the new recovery method.": "Tiɣimit-a, amazray-ines awgelhen yesseqdac tarrayt n uɛeddi tamaynut.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Ma yella tensa, iznan n texxamin tiwgelhanin ur d-ttbanen ara deg yigmaḍ n unadi.",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s iteffer iznan iwgelhanen idiganen s wudem aɣelsan i wakken ad d-banen deg yigmaḍ n unadi:",
@@ -1449,10 +1232,8 @@
     "Show read receipts sent by other users": "Sken awwaḍen n tɣuri yettwaznen sɣur yiseqdacen-nniḍen",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Sken azemzakud s umasal 12 yisragen (am. 14:30)",
     "Always show message timestamps": "Sken yal tikkelt azemzakud n yiznan",
-    "Autoplay GIFs and videos": "Taɣuri tawurmant n GIFs d tvidyutin",
     "When I'm invited to a room": "Mi ara d-ttunecdeɣ ɣer texxamt",
     "This is your list of users/servers you have blocked - don't leave the room!": "Tagi d tabdart-ik·im n yiseqdacen/yiqeddacen i tesweḥleḍ - ur teffeɣ ara seg texxamt!",
-    "Active call": "Asiwel urmid",
     "Verified!": "Yettwasenqed!",
     "Scan this unique code": "Ḍumm tangalt-a tasuft",
     "Compare unique emoji": "Serwes gar yimujiten asufen",
@@ -1462,7 +1243,6 @@
     "not found locally": "ulac s wudem adigan",
     "Self signing private key:": "Tasarut tusligt n uzmul awurman:",
     "User signing private key:": "Tasarut tusligt n uzmul n useqdac:",
-    "Session backup key:": "Tasarut n uḥraz n tɣimit:",
     "Secret storage public key:": "Tasarut tazayezt n uḥraz uffir:",
     "Homeserver feature support:": "Asefrek n tmahilt n Homeserver:",
     "exists": "yella",
@@ -1484,8 +1264,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Aḥraz ɣer-s <validity>azmul</validity> arameɣtu seg <verify>tɣimit</verify> yettwasneqden <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Aḥraz ɣer-s <validity>azmul</validity> arameɣtu seg <verify>tɣimit</verify> ur yettwasneqden ara <device></device>",
     "Backup is not signed by any of your sessions": "Aḥraz ur yettuzmel ara ula seg yiwet n tɣimit-ik·im",
-    "Algorithm: ": "Alguritm: ",
-    "Backup key stored: ": "Tasarut n uḥraz tettwasekles: ",
     "Your keys are <b>not being backed up from this session</b>.": "Tisura-inek·inem <b>ur ttwaḥrazent ara seg tɣimit-a</b>.",
     "Start using Key Backup": "Bdu aseqdec n uḥraz n tsarut",
     "Flair": "Lbenna",
@@ -1498,7 +1276,6 @@
     "%(count)s verified sessions|other": "%(count)s isenqed tiɣimiyin",
     "%(count)s verified sessions|one": "1 n tɣimit i yettwasneqden",
     "%(count)s sessions|one": "Tiɣimit n %(count)s",
-    "Direct message": "Izen uslig",
     "Demote yourself?": "Ṣubb deg usellun-ik·im?",
     "Demote": "Ṣubb deg usellun",
     "Disinvite": "Kkes-d tinnubga",
@@ -1514,7 +1291,6 @@
     "Ban": "Agi",
     "Failed to ban user": "Tigtin n useqdac ur yeddi ara",
     "Failed to remove user from community": "Tukksa n useqdac seg temɣiwent ur yeddi ara",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> deg %(roomName)s",
     "Failed to change power level": "Asnifel n uswir afellay ur yeddi ara",
     "Failed to deactivate user": "Asensi n useqdac ur yeddi ara",
     "This client does not support end-to-end encryption.": "Amsaɣ-a ur yessefrak ara awgelhen seg yixef ɣer yixef.",
@@ -1534,7 +1310,6 @@
     "Compare emoji": "Serwes imujiten",
     "Encryption not enabled": "Awgelhen ur yermid ara",
     "The encryption used by this room isn't supported.": "Awgelhen yettusqedcen ur yettusefrak ara s texxamt-a.",
-    "Error decrypting audio": "Tuccḍa deg uwgelhen n umeslaw",
     "React": "Sedmer",
     "Message Actions": "Tigawin n yizen",
     "Invalid file%(extra)s": "D afaylu %(extra)s arameɣtu",
@@ -1543,24 +1318,14 @@
     "Invalid base_url for m.identity_server": "D arameɣtu base_url i m.identity_server",
     "Signing In...": "Anekcum ɣer...",
     "If you've joined lots of rooms, this might take a while": "Ma yella tettekkaḍ deg waṭas n texxamin, ayagi yezmer ad yeṭṭef kra n wakud",
-    "Set a display name:": "Sbadu isem n uskan:",
-    "Upload an avatar:": "Sali-d avaṭar:",
-    "Use Recovery Key": "Seqdec tasarut n uɛeddi",
     "Emoji": "Imujit",
     "For maximum security, this should be different from your account password.": "I wugar n tɣellist, wagi ilaq ad yemgarad ɣef wawal uffir n umiḍan-ik·im.",
-    "Set up with a recovery key": "Sbadu s tsarut n uɛeddi",
-    "Please enter your recovery passphrase a second time to confirm.": "Ttxil-ik·im sekcem tafyirt-ik·im tuffirt n uɛeddi tikkelt tis sant i usentem.",
-    "Repeat your recovery passphrase...": "Ales-as i tefyirt-ik·im tuffirt n uɛeddi...",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Ḥrez anɣal-ines deg wadeg aɣelsan, am umsefrak n wawalen uffiren neɣ am usenduq iǧehden.",
-    "Your recovery key": "Tasarut-ik·im n uɛeddi",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Tasarut-ik·im n uɛeddi tettwanɣel <b>ɣer ɣef wafus</b>, senteḍ-itt deg:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Tasarut-ik·im n tririt ha-tt-an deg ufaylu n <b>yisidar</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Siggez-itt</b> syen kles-itt deg wadeg aɣelsan",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sekles-itt</b> ɣef tsarut USB neɣ deg yibenk n uḥraz",
     "<b>Copy it</b> to your personal cloud storage": "<b>Nɣel-itt</b> ɣer uklas-ik·im n usigna udmawan",
     "Your keys are being backed up (the first backup could take a few minutes).": "Tisura-ik·im la ttwaḥrazent (aḥraz amezwaru yezmer ad yeṭṭef kra n tesdidin).",
     "Set up Secure Message Recovery": "Sbadu iznan iɣelsanen n tririt",
-    "Secure your backup with a recovery passphrase": "Ḍmen aḥrazen-inek·inem s tefyirt tuffirt n uɛeddi",
     "Unexpected error resolving homeserver configuration": "Tuccḍa ur nettwaṛǧa ara lawan n uṣeggem n twila n uqeddac agejdan",
     "Unexpected error resolving identity server configuration": "Tuccḍa ur nettwaṛǧa ara lawan n uṣeggem n uqeddac n timagit",
     "This homeserver has exceeded one of its resource limits.": "Aqeddac-a agejdan iɛedda yiwet seg tlisa-ines tiɣbula.",
@@ -1585,20 +1350,13 @@
     "Short keyboard patterns are easy to guess": "Tinerufin n unasiw amecṭuḥ fessusit i ussumer",
     "Help us improve %(brand)s": "Mudd-aɣ-d tallalt ad nesnerni %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Azen <UsageDataLink>inesfka n useqdec udrig</UsageDataLink> ayen ara aɣ-iɛawnen ad nesnerni %(brand)s. Ayagi ad isseqdec <PolicyLink>inagan n tuqqna</PolicyLink>.",
-    "Review where you’re logged in": "Senqed ansi i d-tkecmeḍ",
-    "Verify all your sessions to ensure your account & messages are safe": "Senqed akk tiqimiyin-ik·im i wakken ad tḍemneḍ amiḍan-ik·m & yiznan d iɣelsanen",
-    "You are not receiving desktop notifications": "Ur d-termiseḍ ara ilɣa n tnarit",
     "Your homeserver has exceeded its user limit.": "Aqeddac-inek·inem agejdan yewweḍ ɣer talast n useqdac.",
     "Your homeserver has exceeded one of its resource limits.": "Aqeddac-inek·inem agejdan iɛedda yiwet seg tlisa-ines tiɣbula.",
     "Contact your <a>server admin</a>.": "Nermes anedbal-inek·inem <a>n uqeddac</a>.",
-    "To return to your account in future you need to set a password": "Akken ad tuɣaleḍ ɣer umiḍan-ik·im ɣer sdat tesriḍ ad tesbaduḍ awal uffir",
-    "New spinner design": "Afeṣṣel amaynut n tuzzya",
     "Render simple counters in room header": "Err amsiḍen afessa ɣef uqerru n texxamt",
-    "Multiple integration managers": "Imsefrak n waṭas n yimsidaf",
     "Try out new ways to ignore people (experimental)": "Ɛreḍ iberdan-nniḍen i tigtin n yimdanen (armitan)",
     "Show message previews for reactions in DMs": "Sken timeẓriwin n yiznan i tsedmirin deg DMs",
     "Show message previews for reactions in all rooms": "Sken timeẓriwin n yiznan i tsedmirin deg meṛṛa tixxamin",
-    "Enable advanced debugging for the room list": "Rmed tamseɣtayt leqqayen i tebdart n texxamt",
     "Enable big emoji in chat": "Rmed imujit ameqqran deg udiwenni",
     "Automatically replace plain text Emoji": "Semselsi iujit n uḍris aččuran s wudem awurman",
     "Enable Community Filter Panel": "Rmed agalis n umsizdeg n temɣiwent",
@@ -1608,11 +1366,7 @@
     "Discovery": "Tagrut",
     "Help & About": "Tallalt & Ɣef",
     "Homeserver is": "Aqeddac agejdan d",
-    "Identity Server is": "Aqeddac n timagit d",
-    "Access Token:": "Ajuṭu n unekcum:",
-    "click to reveal": "sit i ubeggen",
     "Labs": "Tinarimin",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Sagen tarmit-ik·im s tmahilin n tinarimin tirmitanin. <a>Issin ugar</a>.",
     "Error adding ignored user/server": "Tuccḍa deg tmerna n useqdac/uqeddac yettwanfen",
     "Something went wrong. Please try again or view your console for hints.": "Yella wayen ur nteddu ara akken iwata, ma ulac aɣilif ales tikkelt-nniḍen neɣ senqed tadiwent-ik·im i yiwellihen.",
     "Error subscribing to list": "Tuccḍa deg ujerred ɣef tebdart",
@@ -1632,7 +1386,6 @@
     "Bulk options": "Tixtiṛiyin s ubleɣ",
     "Accept all %(invitedRooms)s invites": "Qbel akk tinubgiwin %(invitedRooms)s",
     "Reject all %(invitedRooms)s invites": "Agi akk tinubgiwin %(invitedRooms)s",
-    "Key backup": "Araz n tsarut",
     "Cross-signing": "Azmul anmidag",
     "Security & Privacy": "Taɣellist & tbaḍnit",
     "Where you’re logged in": "Ansi i d-tkecmeḍ",
@@ -1664,16 +1417,12 @@
     "Notify everyone": "Selɣu yal yiwen",
     "Send %(eventType)s events": "Azen tidyanin n %(eventType)s",
     "Roles & Permissions": "Timlellay & Tisirag",
-    "Click here to fix": "Sit dagi i uṣeggem",
     "To link to this room, please add an address.": "I ucuddu ɣer texxamt-a, ttxil-k·m rnu tansa.",
     "Only people who have been invited": "Ala imdanen i d-yettusnubegten",
-    "Anyone who knows the room's link, apart from guests": "Yal win·tin yessnen aseɣwen n texxamt slid inebgawen",
-    "Anyone who knows the room's link, including guests": "Yal win·tin yessnen aseɣwen n texxamt rnu-d ɣer-sen inebgawen",
     "Members only (since the point in time of selecting this option)": "Iɛeggalen kan (segmi yebda ufran n textiṛit-a)",
     "Members only (since they were invited)": "Iɛeggalen kan (segmi ara d-ttwanecden)",
     "Members only (since they joined)": "Iɛeggalen kan (segmi ara d-ttwarnun)",
     "Encrypted": "Yettwawgelhen",
-    "Who can access this room?": "Anwa i izemren ad d-yernu ɣer texxamt-a?",
     "Who can read history?": "Anwa i izemren ad d-iɣer amazray?",
     "Unable to revoke sharing for email address": "Asefsex n beṭṭu n tansa n yimayl ur yeddi ara",
     "Unable to share email address": "Beṭṭu n tansa n yimayl ur yeddi ara",
@@ -1690,13 +1439,7 @@
     "Invalid Email Address": "Tansa n yimayl d tarameɣtut",
     "This doesn't appear to be a valid email address": "Tagi ur tettban ara d tansa n yimayl tameɣtut",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Izen n uḍris yettwazen ɣer +%(msisdn)s. Ttxil-k·m sekcem tangalt n usenqed yellan deg-s.",
-    "Cannot add any more widgets": "Ur yezmir ara ad yernu ugar n yiwiǧiten",
-    "Add a widget": "Rnu awiǧit",
-    "Drop File Here": "Sers afaylu dagi",
     "Drop file here to upload": "Eǧǧ afaylu dagi i usali",
-    " (unsupported)": " ·(ur yettwasefrak ara)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Ttekki d <voiceText>taɣuct</voiceText> neɣ <videoText>tavidyut</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Asarag s usiwel iteddu%(supportedText)s.",
     "This user has not verified all of their sessions.": "Aseqdac-a ur issenqed ara akk tiɣimiyin-ines.",
     "You have not verified this user.": "Ur tesneqdeḍ aea aseqdac-a.",
     "You have verified this user. This user has verified all of their sessions.": "Tesneqdeḍ aseqdac-a. Aseqdac-a issenqed akk tiɣimiyin-ines.",
@@ -1704,15 +1447,11 @@
     "Everyone in this room is verified": "Yal yiwen deg taxxamt-a yettwasenqed",
     "Mod": "Atrar",
     "This event could not be displayed": "Tadyant-a ur tezmir ad d-tettwaskan",
-    "%(senderName)s sent an image": "%(senderName)s yuzen-d tugna",
-    "%(senderName)s sent a video": "%(senderName)s yuzen-d tavidyut",
-    "%(senderName)s uploaded a file": "%(senderName)s yessuli-d afaylu",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Asuter-ik·im n beṭṭ n tsarut yettwazen - ttxil-k·m senqed tiɣimiyin-ik·im-nniḍen i yisutar n beṭṭu n tsarut.",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Suter i tikkelt-nniḍen tisura n uwgelhen</requestLink> seg tɣimiyin-ik·im tiyaḍ.",
     "Encrypted by an unverified session": "Yettuwgelhen s tɣimit ur nettwasenqed ara",
     "Unencrypted": "Ur yettwawgelhen ara",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Asesteb n yizen-a awgelhen ur yettwaḍman ara deg yibenk-a.",
-    "Please select the destination room for this message": "Ttxil-k·m fren taxxamt n userken n yizen-a",
     "Invited": "Yettwancad",
     "Hangup": "Ɛelleq",
     "Emoji picker": "Amefran n yimujit",
@@ -1720,8 +1459,6 @@
     "This room has been replaced and is no longer active.": "Taxxamt-a ad tettusmelsi, dayen d tarurmidt.",
     "You do not have permission to post to this room": "Ur tesεiḍ ara tasiregt ad d-tsuffɣeḍ deg texxamt-a",
     "Code block": "Iḥder n tengalt",
-    "Unpin Message": "Senser-d izen",
-    "Jump to message": "Ɛeddi ɣer yizen",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -1779,18 +1516,10 @@
     "The server is not configured to indicate what the problem is (CORS).": "Aqeddac ur yettusesteb ara i wakken ad d-imel anida-t wugur (CORPS).",
     "Recent changes that have not yet been received": "Isnifal imaynuten ur d-newwiḍ ara akka ar tura",
     "Sign out and remove encryption keys?": "Ffeɣ syen kkes tisura tiwgelhanin?",
-    "You have successfully set a password!": "Tesbaduḍ akken iwata awal uffir!",
-    "You have successfully set a password and an email address!": "Tesbaduḍ akken iwata awal uffird tansa n yimayl!",
-    "You can now return to your account after signing out, and sign in on other devices.": "Tzemreḍ tura ad tuɣaleḍ ɣer umiḍan-ik·im mbeɛd mi d-teffɣeḍ, syen kcem ɣer yibenkan-nniḍen.",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Cfu, tzemreḍ melmi i ak-yehwa ad tesbaduḍ tansa n yimayl deg yiɣewwaren n useqdac ma yella tbeddleḍ ṛṛay-ik·im.",
-    "(HTTP status %(httpStatus)s)": "(HTTP addad %(httpStatus)s)",
-    "Please set a password!": "Ttxil-ik·im sbadu awal uffir!",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ayagi ad ak·akem-yeǧǧ ad tuɣaleḍ ɣer umiḍan-ik·im mbeɛd mi d-teffɣeḍ, syen kcem ɣer yibenkan-nniḍen.",
     "Share Room": "Bḍu taxxamt",
     "Link to most recent message": "Aseɣwen n yizen akk aneggaru",
     "Share Room Message": "Bḍu izen n texxamt",
     "Command Help": "Tallalt n tiludna",
-    "Integration Manager": "Amsefrak n umsidef",
     "Find others by phone or email": "Af-d wiyaḍ s tiliɣri neɣ s yimayl",
     "Be found by phone or email": "Ad d-yettwaf s tiliɣri neɣ s yimayl",
     "Upload files (%(current)s of %(total)s)": "Sali-d ifuyla (%(current)s ɣef %(total)s)",
@@ -1805,7 +1534,6 @@
     "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.": "Tzemreḍ ad tjerrdeḍ, maca kra n tmahilin ur ttilint ara almi yuɣal-d uqeddac n tmagit. Ma mazal tettwaliḍ alɣu-a, senqed tawila-inek•inem neɣ nermes anedbal n uqeddac.",
     "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.": "Tzemreḍ ad talseḍ awennez i wawal-ik•im uffir, maca kra n tmahilin ur ttilint ara almi yuɣal-d uqeddac n tmagit. Ma mazal tettwaliḍ alɣu-a, senqed tawila-inek•inem neɣ nermes anedbal n uqeddac.",
     "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.": "Tzemreḍ ad teqqneḍ, maca kra n tmahilin ur ttilint ara almi yuɣal-d uqeddac n tmagit. Ma mazal tettwaliḍ alɣu-a senqed tawila-inek•inem neɣ nermes anedbal n uqeddac.",
-    "Verify yourself & others to keep your chats safe": "Senqed iman-ik•im d wiyaḍ akken ad qqimen yidiwenniyen-ik•im d iɣellsanen",
     "The person who invited you already left the room.": "Amdan i k•kem-iɛerḍen dayen yeǧǧa taxxamt.",
     "The person who invited you already left the room, or their server is offline.": "Amdan i k•kem-iɛerḍen dayen yeǧǧa taxxamt, neɣ d aqeddac-is i d aruqqin.",
     "Show info about bridges in room settings": "Sken-d tilɣa ɣef teqneṭrin deg yiɣewwaṛen n texxamt",
@@ -1817,12 +1545,9 @@
     "Show avatars in user and room mentions": "Sken ivaṭaren deg yibdaren n useqdac neɣ n texxamt",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ur ttazen ara akk iznan yettwawgelhen ɣer tɣimiyin ur nettusenqad ara seg tɣimit-a",
     "Enable URL previews by default for participants in this room": "Rmed tiskanin n URL s wudem amezwer i yimttekkiyen deg texxamt-a",
-    "Allow Peer-to-Peer for 1:1 calls": "Sireg isawalen udem e wudem i 1:1",
     "Enable inline URL previews by default": "Rmed tiskanin n URL srid s wudem amezwer",
     "Enable URL previews for this room (only affects you)": "Rmed tiskanin n URL i texxamt-a (i ak·akem-yeɛnan kan)",
     "Enable widget screenshots on supported widgets": "Rmed tuṭṭfiwin n ugdil n uwiǧit deg yiwiǧiten yettwasferken",
-    "Identity Server (%(server)s)": "Aqeddac n timagit (%(server)s)",
-    "Identity Server": "Aqeddac n timagit",
     "Enter a new identity server": "Sekcem aqeddac n timagit amaynut",
     "No update available.": "Ulac lqem i yellan.",
     "Hey you. You're the best!": "Kečč·kemm. Ulac win i ak·akem-yifen!",
@@ -1846,7 +1571,6 @@
     "Incompatible local cache": "Tuffra tadigant ur temṣada ara",
     "Room Settings - %(roomName)s": "Iɣewwaren n texxamt - %(roomName)s",
     "The room upgrade could not be completed": "Aleqqem n texxamt yegguma ad yemmed",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Sken asmekti i urmed n tririt n yiznan iɣellsanen deg texxamin yettwawgelhen",
     "Show hidden events in timeline": "Sken-d ineḍruyen yeffren deg uzray",
     "Enable message search in encrypted rooms": "Rmed anadi n yiznan deg texxamin yettwawgelhen",
     "Manually verify all remote sessions": "Senqed s ufus akk tiɣimiyin tinmeggagin",
@@ -1873,23 +1597,14 @@
     "Unexpected server error trying to leave the room": "Tuccḍa n uqeddac ur nettwaṛǧa ara lawan n tuffɣa seg texxamt",
     "Prompt before sending invites to potentially invalid matrix IDs": "Suter send tuzna n tnubgiwin i yisulayen i izmren ad ilin d arimeɣta",
     "Show shortcuts to recently viewed rooms above the room list": "Sken inegzumen i texxamin i d-ibanen melmi kan nnig tebdart n texxamt",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Azen inagan n tɣuri i yiznan (yesra aqeddac agejdan yemṣadan i wakken ad yens)",
     "Show previews/thumbnails for images": "Sken tiskanin/tinfulin i tugniwin",
     "How fast should messages be downloaded.": "Acḥal i ilaq ad yili urured i wakken ad d-adren yiznan.",
     "Enable experimental, compact IRC style layout": "Rmed aseflu n uɣanib n IRC armitan, ussid",
     "Waiting for %(displayName)s to verify…": "Aṛaǧu n %(displayName)s i usenqed…",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Ḥrez iznan iwgelhanen idiganen s wudem awurman i wakken ad d-banen deg yigmaḍ n unadi, s useqdec ",
     "Securely cache encrypted messages locally for them to appear in search results.": "Ḥrez iznan iwgelhanen idiganen s wudem awurman i wakken ad d-banen deg yigmaḍ n unadi.",
     "The integration manager is offline or it cannot reach your homeserver.": "Amsefrak n umsidef ha-t-an beṛṛa n tuqqna neɣ ur yezmir ara ad yaweḍ ɣer uqeddac-ik·im agejdan.",
     "This backup is trusted because it has been restored on this session": "Aḥraz yettwaḍman acku yuɣal-d seg tɣimit-a",
     "Back up your keys before signing out to avoid losing them.": "Ḥrez tisura-ik·im send tuffɣa i wakken ur ttruḥunt ara.",
-    "Error saving email notification preferences": "Tuccḍa deg usekles n yismenyaf n ulɣu n yimayl",
-    "An error occurred whilst saving your email notification preferences.": "Tella-d tuccḍa lawan n usekles n yismenyaf n ulɣu n yimayl.",
-    "Can't update user notification settings": "D awezɣi ad ttwaleqqmen iɣewwaren n yilɣa n useqdac",
-    "Messages containing <span>keywords</span>": "Iznan ideg llan <span>awalen ufrinen</span>",
-    "Notify for all other messages/rooms": "Ṭṭef-d ilɣa i meṛṛa iznan/tixxamin",
-    "Notify me for anything else": "Azen-iyi-d ilɣa i wayen akk ara yellan",
-    "All notifications are currently disabled for all targets.": "Meṛṛa ilɣa nsan akka tura i meṛṛa isaḍasen.",
     "On": "Yermed",
     "Noisy": "Sɛan ṣṣut",
     "wait and try again later": "ṛǧu syen ɛreḍ tikkelt-nniḍen",
@@ -1898,43 +1613,25 @@
     "Event Type": "Anaw n tedyant",
     "State Key": "Tasarut n waddad",
     "Event Content": "Agbur n tedyant",
-    "This session, or the other session": "Tiɣimita, neɣ tiɣimit tayeḍ",
-    "If you didn’t sign in to this session, your account may be compromised.": "Ma yella ur teqqineḍ ara ɣer tɣimit-a, amiḍan-ik·im yezmer ad yettwaker.",
     "Please fill why you're reporting.": "Ttxil-k·m ini-aɣ-d ayɣer i d-tettazneḍ alɣu.",
     "Report Content to Your Homeserver Administrator": "Ttxil-k·m azen aneqqis i unedbal-ik·im n usebter agejdan",
-    "Wrong Recovery Key": "Mačči d tasarut-ik·im n uɛeddi tagi",
-    "Invalid Recovery Key": "Tasarut-ik·im n uɛeddi d tarameɣtut",
     "Security Phrase": "Tafyirt n tɣellist",
     "Restoring keys from backup": "Tiririt n tsura seg uḥraz",
     "Fetching keys from server...": "Tiririt n tsura seg uḥraz...",
     "%(completed)s of %(total)s keys restored": "%(completed)s n %(total)s tsura i yettwarran",
     "Unable to load backup status": "Yegguma ad d-yali waddad n uḥraz",
-    "Recovery key mismatch": "Tasarut n tririt ur temṣada ara",
     "No backup found!": "Ulac aḥraz yettwafen!",
     "Failed to decrypt %(failedCount)s sessions!": "Tukksa n uwgelhen n tɣimiyin %(failedCount)s ur yeddi ara!",
     "Successfully restored %(sessionCount)s keys": "Tiririt n tsura n %(sessionCount)s yedda akken iwata",
-    "This looks like a valid recovery key!": "Ayagi yettban am wakken tasarut n tririt d tameɣtut!",
-    "Not a valid recovery key": "Tasarut n tririt mačči d tameɣtut",
     "Are you sure you want to reject the invitation?": "S tidet tebɣiḍ ad tesfesxeḍ tinubga?",
     "Resend %(unsentCount)s reaction(s)": "Ales tuzna n tsedmirt (tsedmirin) %(unsentCount)s",
-    "Forward Message": "Welleh izen",
-    "Pin Message": "Rzi izen",
-    "View Decrypted Source": "Senqed taɣbalut tawgelhent",
-    "Unhide Preview": "Sban-d taskant",
-    "Take picture": "Ṭṭef-d tawleft",
     "Away": "Akin",
     "This homeserver would like to make sure you are not a robot.": "Aqeddac-a aqejdan yesra ad iẓer ma mačči d aṛubut i telliḍ.",
     "Country Dropdown": "Tabdart n udrurem n tmura",
-    "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.": "Tzemreḍ ad tesqedceḍ tixtiṛiyin n uqeddac udmawan i wakken ad teqqneḍ ɣer iqeddacen-nniḍen n Matrix s ufran n URL n uqeddac agejdan yemgaraden. Ayagi ad ak-yeǧǧ ad tesqedceḍ %(brand)s s umiḍan n Matrix yellan ɣef uqeddac agejdan yemgaraden.",
     "Confirm your identity by entering your account password below.": "Sentem timagit-ik·im s usekcem n wawal uffir n umiḍan-ik·im ddaw.",
     "Please review and accept all of the homeserver's policies": "Ttxil-k·m senqed syen qbel tisertiyin akk n uqeddac agejdan",
     "Please review and accept the policies of this homeserver:": "Ttxil-k·m senqed syen qbel tisertiyin n uqeddac-a agejdan:",
-    "An email has been sent to %(emailAddress)s": "Yettwazen yimayl ɣer %(emailAddress)s",
     "Token incorrect": "Ajuṭu d arameɣtu",
-    "Identity Server URL": "URL n uqeddac n timagit",
-    "Other servers": "Iqeddacen wiya",
-    "Sign in to your Matrix account on %(serverName)s": "Qqen ɣer umiḍan-ik·im n Matrix deg %(serverName)s",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Suref-aɣ, iminig-ik·im <b>ur yezmir ara</b> ad iseddu %(brand)s.",
     "You must <a>register</a> to use this functionality": "Ilaq-ak·am <a>ad teskelseḍ</a> i wakken ad tesxedmeḍ tamahilt-a",
     "No files visible in this room": "Ulac ifuyla i d-ibanen deg texxamt-a",
     "Featured Rooms:": "Tixxamin i ifazen:",
@@ -1943,7 +1640,6 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Af-d taxxamt… (am. %(exampleRoom)s)",
     "Search failed": "Ur iddi ara unadi",
     "No more results": "Ulac ugar n yigmaḍ",
-    "Fill screen": "Agdil aččuran",
     "Uploading %(filename)s and %(count)s others|other": "Asali n %(filename)s d %(count)s wiyaḍ-nniḍen",
     "Uploading %(filename)s and %(count)s others|zero": "Asali n %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Asali n %(filename)s d %(count)s wayeḍ-nniḍen",
@@ -1953,7 +1649,6 @@
     "Session verified": "Tiɣimit tettwasenqed",
     "Failed to send email": "Tuzna n yimayl ur teddi ara",
     "New passwords must match each other.": "Awalen uffiren imaynuten ilaq ad mṣadan.",
-    "Your Matrix account on %(serverName)s": "Amiḍan-ik·im Matrix deg %(serverName)s",
     "I have verified my email address": "Sneqdeɣ tansa-inu n yimayl",
     "Return to login screen": "Uɣal ɣer ugdil n tuqqna",
     "Incorrect username and/or password.": "Isem n uqeddac d/neɣ awal uffir d arameɣtu.",
@@ -1963,16 +1658,7 @@
     "Paperclip": "Tamessakt n lkaɣeḍ",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Tettḥeqqeḍ? Ad tesruḥeḍ iznan-ik•im yettwawgelhen ma tisura-k•m ur klisent ara akken ilaq.",
     "Cactus": "Akermus",
-    "Enter keywords separated by a comma:": "Sekcem awalen uffiren gar-asen tafrayt:",
-    "Add an email address to configure email notifications": "Rnu tansa n yimayl i uswel n yilɣa s yimayl",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Ilɣa deg wawalen-a ufranen i d-iteddun ṭṭafaren ilugan ur yezmiren ara ad d-ttwaskanen ara da:",
-    "Unable to fetch notification target list": "D awazɣi ad d-nerr tabdart n yisaḍasen n yilɣa",
-    "There are advanced notifications which are not shown here.": "Llan yilɣa leqqayen ur d-nettwaskan ara da.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Ahat tsewleḍ-ten deg yimsaɣ-nniḍen mačči deg %(brand)s. Ur tezmireḍ ara ad ten-tṣeggmeḍ deg %(brand)s maca mazal-iten teddun.",
     "Show message in desktop notification": "Sken-d iznan deg yilɣa n tnarit",
-    "Identity Server URL must be HTTPS": "URL n uqeddac n timagit ilaq ad yili d HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Aqeddac n timagit mačči d ameɣtu (status code %(code)s)",
-    "Could not connect to Identity Server": "Ur izmir ara ad yeqqen ɣer uqeddac n timagit",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Ffeɣ seg tuqqna n uqeddac n timagit <current /> syen qqen ɣer <new /> deg wadeg-is?",
     "Terms of service not accepted or the identity server is invalid.": "Tiwtilin n uqeddac ur ttwaqbalent ara neɣ aqeddac n timagit d arameɣtu.",
     "The identity server you have chosen does not have any terms of service.": "Aqeddac n timagit i tferneḍ ulac akk ɣer-s tiwtilin n uqeddac.",
@@ -1990,7 +1676,6 @@
     "Deactivating your account is a permanent action - be careful!": "Asensi n umiḍan-inek·inem d ayen ara yilin i lebda - Ɣur-k·m!",
     "For help with using %(brand)s, click <a>here</a>.": "I tallalt n useqdec n %(brand)s, sit <a>dagi</a>.",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "I tallalt ɣef useqdec n %(brand)s, sit <a>dagi</a> neɣ bdu adiwenni d wabuṭ-nneɣ s useqdec n tqeffalt ddaw.",
-    "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.": "Ma yella tuzneḍ ugur deg Github, iɣmisen n temseɣtit zemren ad aɣ-ɛiwnen ad negzu ugur. Iɣmisen n temseɣtit deg-sen isefka n useqdec n usnas am yisem n useqdec, am yisulayen neɣ am yismawen i yettunefken i texxamin neɣ i yigrawen ɣer wuɣur terziḍ d yismawen n useqdac n yiseqdacen-nniḍen. Ulac deg-sen iznan.",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "I wakken ad d-tazneḍ ugur n tɣellist i icudden ɣer Matrix, ttxil-k·m ɣer <a>tasertit n ukcaf n tɣellist</a> deg Matrix.org.",
     "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.": "Rnu dagi iseqdacen d yiqeddacen i tebɣiḍ ad tzegleḍ. Seqdec izamelen n yitran i wakken %(brand)s ad yemṣada d yal asekkil. D amedya, <code>@bot:*</code> izeggel akk iseqdacen i yesɛan isem \"abuṭ\" ɣef yal aqeddac.",
     "Subscribing to a ban list will cause you to join it!": "Amulteɣ ɣer tebdart n tegtin ad ak·akem-yawi ad tettekkiḍ deg-s!",
@@ -2012,7 +1697,6 @@
     "You sent a verification request": "Tuzneḍ asuter n usenqed",
     "Error decrypting video": "Tuccḍa deg uwgelhen n tvidyut",
     "Reactions": "Tisedmirin",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> isedmer s %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>issedmer s %(shortName)s</reactedWith>",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ibeddel avaṭar i %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s yekkes avaṭar n texxamt.",
@@ -2041,7 +1725,6 @@
     "Invite anyway and never warn me again": "Ɣas akken nced-d yerna ur iyi-id-ttɛeggin ara akk",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Ttxil-k·m ini-aɣ-d acu ur nteddu ara akken ilaq neɣ, akken i igerrez, rnu ugur deg Github ara ad d-igelmen ugur.",
     "Preparing to download logs": "Aheyyi i usali n yiɣmisen",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ulac ula d yiwen da! Tebɣiḍ <inviteText>ad d-necdeḍ wiyaḍ</inviteText> neɣ <nowarnText>aḥbas n uɛeggen ɣef texxamt tilemt</nowarnText>?",
     "You seem to be in a call, are you sure you want to quit?": "Tettbaneḍ aql-ak·akem deg useiwel, tebɣiḍ s tidet ad teffɣeḍ?",
     "Failed to load timeline position": "Asali n yideg n tesnakudt ur yeddi ara",
     "Sign in instead": "Kcem axiṛ",
@@ -2053,14 +1736,10 @@
     "Identity server URL does not appear to be a valid identity server": "URL n uqeddac n timagit ur yettban ara d aqeddac n timagit ameɣtu",
     "This homeserver does not support login using email address.": "Aqeddac-a agejdan ur yessefrak ara inekcum s useqdec n tansa n yimayl.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Ttxil-k·m <a>nermes anedbal-ik·im n uqeddac</a> i wakken ad tkemmleḍ aseqdec n yibenk-a.",
-    "Failed to fetch avatar URL": "Tiririt n URL ur teddi ara",
     "Unable to query for supported registration methods.": "Anadi n tarrayin n usekles yettusefraken d awezi.",
     "Registration has been disabled on this homeserver.": "Aklas yensa deg uqeddac-a agejdan.",
     "This server does not support authentication with a phone number.": "Aqeddac-a ur yessefrak ara asesteb s wuṭṭun n tilifun.",
     "You can now close this window or <a>log in</a> to your new account.": "Tzemreḍ tura ad tmedleḍ asfaylu-a neɣ <a>kcem</a> ɣer umiḍan-ik·im amaynut.",
-    "Use Recovery Key or Passphrase": "Seqdec tasarut tuffirt neɣ tafyirt tuffirt n uεeddi",
-    "This requires the latest %(brand)s on your other devices:": "Ayagi yesra %(brand)s tineggura ɣef yibenkan-ik·im wiyaḍ:",
-    "or another cross-signing capable Matrix client": "neɣ amsaɣ-nniḍen n Matrix yemṣadan d uzmul amdigan",
     "Your new session is now verified. Other users will see it as trusted.": "Tiɣimit-ik·im tamaynut tettwasenqed tura. Ad tt-walin wiyaḍ tettwaḍman.",
     "Failed to re-authenticate due to a homeserver problem": "Allus n usesteb ur yeddi ara ssebbba n wugur deg uqeddac agejdan",
     "Enter your password to sign in and regain access to your account.": "Sekcem awal-ik·im uffir i wakken ad teqqneḍ syen ad tkecmeḍ i tikkelt tayeḍ ɣer umiḍan-ik·im.",
@@ -2069,14 +1748,10 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Ad teḥqiǧeḍ asesteb s uqeddac i wakken ad tesnetmeḍ lqem.",
     "Unable to query secret storage status": "Tuttra n waddad n uklas uffir ur teddi ara",
     "You can also set up Secure Backup & manage your keys in Settings.": "Tzemreḍ daɣen aḥraz uffir & tesferkeḍ tisura-ik·im deg yiɣewwaren.",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ad d-terreḍ anɣal awgelhan n tsura-ik·im ɣef uqeddac-nneɣ. Ḥrez aḥrazen s tefyirt tuffirt n uɛeddi.",
     "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.": "War aswel n Secure Message Recovery, ur tettizmireḍ ara ad d-terreḍ amazray-ik·im n yiznan iwgelhanen ma yella teffɣeḍ neɣ tesqedceḍ tiɣimit-nniḍen.",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "War aswel n Secure Message Recovery, ad tmedleḍ amazray-ik·im n yiznan uffiren ma yella teffɣeḍ.",
     "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.": "Ma yella ur tesbaduḍ ara tarrayt n tririt tamaynut, yezmer ad yili umaker ara iɛerḍen ad yekcem ɣer umiḍan-ik·im. Beddel awal uffir n umiḍan-ik·im syen sbadu tarrayt n tririt tamaynut din din deg yiɣewwaren.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tiɣimit-a tufa-d tafyirt-ik·im tuffirt n tririt d tsarut-ik·im n yiznan uffiren ttwakksent.",
     "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.": "Ma yella ur tekkiseḍ ara tarrayt n tririt tamaynut, yezmer ad yili umaker ara iɛerḍen ad yekcem ɣer umiḍan-ik·im. Beddel awal uffir n umiḍan-ik·im syen sbadu tarrayt n tririt tamaynut din din deg yiɣewwaren.",
     "Mirror local video feed": "Asbani n usuddem n tvidyut tadigant",
-    "Low bandwidth mode": "Askar n tehri n tesfift adday",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Sireg aqeddac n tallalt i yisawalen n ufran aneggaru turn.matrix.org ma yili aqeddac-ik·im agejdan ur d-yettmudd ara yiwen (tansa-ik·im n IP ad tettwabḍu lawan n usiwel)",
     "Compare a unique set of emoji if you don't have a camera on either device": "Serwes tagrumma n yimujiten asufen ma yella ur tesɛiḍ ara takamiṛat ɣef yiwen seg sin yibenkan",
     "Unable to find a supported verification method.": "D awezɣi ad d-naf tarrayt n usenqed yettusefraken.",
@@ -2086,18 +1761,13 @@
     "This room is not accessible by remote Matrix servers": "Anekcum er texxamt-a ulamek s yiqeddacen n Matrix inmeggagen",
     "No users have specific privileges in this room": "Ulac aqeddac yesan taseglut tuzzigtt deg texxamt-a",
     "Select the roles required to change various parts of the room": "Fren timlilin yettusran i usnifel n yiḥricen yemgaraden n texxamt",
-    "Guests cannot join this room even if explicitly invited.": "Ur zmiren ara inebgawen ad d-rnun ɣer texxamt-a alamma ttusnubegten-d s tidet.",
     "Once enabled, encryption cannot be disabled.": "Akken ara yettwarmad, awgelhen ur yettizmir ara ad yens.",
     "Click the link in the email you received to verify and then click continue again.": "Sit ɣef useɣwen yella deg yimayl i teṭṭfeḍ i usenqed syen sit tikkelt tayeḍ ad tkemmleḍ.",
     "Discovery options will appear once you have added an email above.": "Tixtiṛiyin n usnirem ad d-banent akken ara ternuḍ imayl s ufella.",
     "Discovery options will appear once you have added a phone number above.": "Tixtiṛiyin n usnirem ad d-banent akken ara ternuḍ uṭṭun n tilifun s ufella.",
-    "The maximum permitted number of widgets have already been added to this room.": "Amḍan afellay yettusirgen n yiwiǧiten yettwarna yakan ɣer texxamt-a.",
     "This room doesn't exist. Are you sure you're at the right place?": "Taxxamt-a ulac-itt. Tetteḥqeḍ aql-ak·akem deg wadeg i iṣeḥḥan?",
     "Try again later, or ask a room admin to check if you have access.": "Ɛreḍ tikkelt-nniḍen ticki, neɣ suter deg unedbal n texxamt ad iwali ma tzemreḍ ad tkecmeḍ.",
     "%(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 yuɣal-d lawan n uneɛruḍ n unekcum ɣer texxamt. Ma yella izen-a twalaḍ-t ur tebniḍ fell-as, ttxil-k·m <issueLink>azen aneqqis n wabug</issueLink>.",
-    "Never lose encrypted messages": "Ur ttamdal ara akk iznan iwgelhanen",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Iznan deg texxamt-a ttwaḥerzen s uwgelhen n yixef ɣer yixef. Ala kečč·kemm d uɣerwaḍ (yiɣerwaḍen) i yesεan tisura akken ad ɣren iznan-a.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Ḥrez tisura-k·m s wudem aɣelsan i wakken ur ak·am-ttṛuḥunt ara. <a>Issin ugar</a>",
     "Unrecognised command: %(commandText)s": "Taladna d tarussint: %(commandText)s",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Taxballut: Bdu izen-ik·im s <code>//</code> i wakken ad t-tebduḍ s uṣlac.",
     "Failed to connect to integration manager": "Tuqqna ɣer umsefrak n umsidef ur yeddi ara",
@@ -2115,27 +1785,20 @@
     "Upload %(count)s other files|other": "Sali-d %(count)s ifuyla-nniḍen",
     "Upload %(count)s other files|one": "Sali-d %(count)s afaylu-nniḍen",
     "Upload Error": "Tuccḍa deg usali",
-    "A widget would like to verify your identity": "Awiǧit yebɣa ad issenqed timagit-inek·inem",
     "Remember my selection for this widget": "Cfu ɣef tefrant-inu i uwiǧit-a",
     "Wrong file type": "Anaw n yifuyla d arameɣtu",
     "Looks good!": "Yettban igerrez!",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Sekcem tafyirt-ik·im n tɣellist neɣ <button>seqdec tasarut n tɣellist</buttout> i wakken ad tkemmleḍ.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Ɣur-k·m</b>: ilaq ad tesbaduḍ aḥraz n tsarut seg uselkim kan iɣef tettekleḍ.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Ɣur-k·m</b>: Ilaq ad tesbaduḍ aḥraz n tsarut seg uselkim kan iɣef tettekleḍ.",
-    "Please check your email to continue registration.": "Ttxil-k·m senqed imayl-ik·im i wakken ad tkemmleḍ asekles.",
     "A text message has been sent to %(msisdn)s": "Izen aḍris yettwazen ɣer %(msisdn)s",
     "Please enter the code it contains:": "Ttxil-k·m sekcem tangalt yellan deg-s:",
-    "Unable to validate homeserver/identity server": "Asentem n uqeddac agejdan/uqeddac n timagit d awezɣi",
     "Use lowercase letters, numbers, dashes and underscores only": "Seqdec kan isekkilen imeẓẓyanen, izwilen, ijerriden d yidurren kan",
     "Join millions for free on the largest public server": "Rnu ɣer yimelyan n yimdanen baṭel ɣef uqeddac azayez ameqqran akk",
-    "Premium hosting for organisations <a>Learn more</a>": "Tanezduɣt n Premium i tkebbaniyin <a>Issin ugar</a>",
-    "Find other public servers or use a custom server": "Af-d iqeddacen-nniḍen izuyaz neɣ seqdec aqeddac udmawan",
-    "Sign in to your Matrix account on <underlinedServerName />": "Qqen ɣer umiḍan-ik·im Matrix ɣef <underlinedServerName />",
     "Want more than a community? <a>Get your own server</a>": "Tebɣiḍ ugar n temɣiwent? <a>Awi aqeddac-inek·inem kečč·kemm</a>",
     "%(inviter)s has invited you to join this community": "%(inviter)s inced-ik·ikem ad ternuḍ ɣer temɣiwent-a",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Teẓriḍ: tzemreḍ ad tesqedceḍ timɣiwnin i usizdeg n tarmit-ik·im %(brand)s!",
     "Error whilst fetching joined communities": "Tuccḍa deg tririt n temɣiwanin i d-yernan",
-    "You have no visible notifications in this room.": "Ulac ɣur-k·m ilɣa i d-yettbanen deg texxamt-a.",
     "%(brand)s failed to get the public room list.": "%(brand)s ur yeddi ara wawway n tebdart n texxamt tazayezt.",
     "The homeserver may be unavailable or overloaded.": "Aqeddac agejdan yezmer ad yili ulac-it neɣ iɛedda nnig uɛebbi.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Kkes tansa n texxamt %(alias)s rnu kkes %(name)s seg ukaram?",
@@ -2144,7 +1807,6 @@
     "%(brand)s does not know how to join a room on this network": "%(brand)s ur yeẓri ara amek ara yernu ɣer texxamt deg uzeṭṭa-a",
     "Couldn't find a matching Matrix room": "D awezɣi tiftin n texxamt n Matrix yemṣadan",
     "Unable to look up room ID from server": "Anadi n usulay n texxamt ɣef uqeddac d awezɣi",
-    "%(count)s of your messages have not been sent.|other": "Kra seg yiznan-inek·inem ur ttwaznen ara.",
     "Connectivity to the server has been lost.": "Tṛuḥ tuqqna ɣer uqeddac.",
     "Sent messages will be stored until your connection has returned.": "Iznan yettwaznen ad ttwakelsen alamma tuɣal-d tuqqna.",
     "You seem to be uploading files, are you sure you want to quit?": "Aql-ak·akem tessalayeḍ-d ifuyla, tebɣiḍ stidet ad teffɣeḍ?",
@@ -2152,12 +1814,9 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Ɣur-k·m %(count)s ilɣa ur nettwaɣra ara deg lqem yezrin n texxamt-a.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Ɣur-k·m %(count)s ilɣa ur nettwaɣra ara deg lqem yezrin n texxamt-a.",
     "The email address linked to your account must be entered.": "Tansa n yimayl i icudden ɣer umiḍan-ik·im ilaq ad tettwasekcem.",
-    "No identity server is configured: add one in server settings to reset your password.": "Ulac aqeddac n timagit yettusiwlen: rnu yiwen deg yiɣewwaren n uqeddac i wakken ad twennzeḍ awal-ik·im uffir.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Ttxil-k·m gar tamawt aql-ak·akem tkecmeḍ ɣer uqeddac %(hs)s, neɣ matrix.org.",
     "Failed to perform homeserver discovery": "Tifin n uqeddac agejdan tegguma ad teddu",
-    "The phone number entered looks invalid": "Uṭṭun n tilifun yettwaskecmen yettban d arameɣtu",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Aqeddac-a agejdan ur d-yettmuddu ara akk aseddem n tuqqna i yettwasefraken sɣur umsaɣ-a.",
-    "Error: Problem communicating with the given homeserver.": "Tuccḍa: Ugur n teywalt d uqeddac agejdan i d-yettunefken.",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Aznuzwir n temɣiwnin v2. Yesra aqeddac agejdan yemṣadan. D armitan aṭas - aseqdec-ines s leḥder.",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Senqed yal tiɣimit yettwasqedcen sɣur aseqdac weḥd-s i ucraḍ fell-as d tuttkilt, war attkal ɣef yibenkan yettuzemlen s uzmel anmidag.",
     "%(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 xuṣṣent kra n yisegran yettusran i tuffra s wudem aɣelsan n yiznan iwgelhanen idiganen. Ma yella tebɣiḍ ad tgeḍ tarmit s tmahilt-a, snulfu-d tanarit %(brand)s tudmawant s <nativeLink>unadi n yisegran yettwarnan</nativeLink>.",
@@ -2170,9 +1829,6 @@
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Akka tura ur tesseqdaceḍ ula d yiwen n uqeddac n timagit. I wakken ad d-tafeḍ daɣen ad d-tettwafeḍ sɣur yinermisen yellan i tessneḍ, rnu yiwen ddaw.",
     "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.": "Tuffɣa seg tuqqna n uqeddac-ik·im n timaqit anamek-is dayen ur yettuɣal yiwen ad ak·akem-id-yaf, daɣen ur tettizmireḍ ara ad d-necdeḍ wiyaḍ s yimayl neɣ s tiliɣri.",
     "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.": "Aseqdec n uqeddac n timagit d afrayan. Ma yella tferneḍ ur tesseqdaceḍ ara aqeddac n timagit, dayen ur tettuɣaleḍ ara ad tettwafeḍ sɣur iseqdac wiyaḍ rnu ur tettizmireḍ ara ad d-necdeḍ s yimayl neɣ s tiliɣri.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Seqdec amsefrak n umsidef <b>(%(serverName)s)</b> i usefrek n yibuten, n yiwiǧiten d tɣawsiwin n usenteḍ.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Seqdec amsefrak n umsidef i usefrek n yibuten, n yiwiǧiten d tɣawsiwin n usenteḍ.",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Imsefrak n yimsidaf remmsen-d isefka n uswel, syen ad uɣalen zemren ad beddlen iwiǧiten, ad aznen tinubgiwin ɣer texxamin, ad yesbadu daɣen tazmert n yiswiren s yiswiren deg ubdil-ik·im.",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Awal-ik·im uffir yettusnifel akken iwata. Ur d-tremmseḍ ara d umatu ilɣa ɣef tɣimiyin-nniḍen alamma tɛaqdeḍ teqqneḍ ɣer-sent",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Qbel tiwtilin n umeẓlu n uqeddac n timagit (%(serverName)s) i wakken ad tsirgeḍ iman-ik·im ad d-tettwafeḍ s yimayl neɣ s wuṭṭun n tiliɣri.",
     "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.": "Tiririt n yimdanen deg rrif yettwaxdam deg tebdarin n uzgal ideg llan ilugan ɣef yimdanen ara yettwazeglen. Amulteɣ ɣer tebdart n uzgal anamek-is iseqdacen/iqeddacen yettusweḥlen s tebdart-a ad akȧm-ttwaffren.",
@@ -2196,7 +1852,6 @@
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Tella-d tuccḍa deg uleqqem n tansiwin-nniḍen n texxamt. Ur yettusireg ara waya sɣur aqeddac neɣ d tuccḍa kan meẓẓiyen i d-yeḍran.",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Tella-d tuccḍa deg tmerna n tansa-a. Ur yettusireg ara waya sɣur aqeddac neɣ d tuccḍa kan meẓẓiyen i d-yeḍran.",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Tella-d tuccḍa deg tukksa n tansa-a. Ahat dayen ur telli ara neɣ d tuccḍa meẓẓiyen i d-yeḍran.",
-    "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.": "Tansiwin i d-yettusuffɣen ur yezmir ula d yiwen ad tent-isseqdec ɣef yiqeddacen akk i wakken ad yekcem ɣer texxamt-ik·im. I wakken ad tsuffɣeḍ tansa, ilaq ad tettusbadu deg tazwara d tansa tadigant.",
     "No other published addresses yet, add one below": "Ulac tansiwin i d-yeffɣen akka tura, rnu yiwet ddaw",
     "New published address (e.g. #alias:server)": "Tansa tamynut i d-yettusuffɣen (am. #alias:server)",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sbadu tansiwin i texxamt-a i wakken iseqdacen ad ttafen s uqeddac-ik·im agejdan (%(localDomain)s)",
@@ -2211,7 +1866,6 @@
     "URL previews are disabled by default for participants in this room.": "Tiskanin n URL ttwasensnt s wudem amezwer i yimttekkiyen n texxamt-a.",
     "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.": "Deg texxamin yettwawgelhen, am texxamt-a, tiskanin n URL ttwasensnt s wudem amezwer i wakken ad neḍmen belli aqeddac agejdan (anida tiskanin ttwasirwent) ur yettizmir ara ad yelqeḍ talɣut ɣef yiseɣwan i d-ibanen deg texxamt-a.",
     "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.": "Ma yili yiwet iger-d aseɣwen deg yizen-ines, taskant n URL tezmer ad tettwaskan i wakken ad d-imudd ugar n talɣut ɣef useɣwen-a am uzwel, aglam d tugna n usmel.",
-    "Waiting for you to accept on your other session…": "Deg uṛaǧu ad tqebleḍ deg tɣimit-inek·inem tayeḍ…",
     "Waiting for %(displayName)s to accept…": "Aṛaǧu n %(displayName)s i uqbal…",
     "Messages in this room are end-to-end encrypted.": "Iznan deg texxamt-a ttwawgelhen seg yixef ɣer yixef.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Iznan-inek·inem d iɣelsanen, ala kečč d uɣerwaḍ i yesɛan tisura tasufin i wakken ad asen-kksen awgelhen.",
@@ -2264,7 +1918,6 @@
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ma yella tgiḍ aya war ma tebniḍ, tzemreḍ ad tsewleḍ iznan uffiren deg tɣimit-a ayen ara yalsen awgelhen n umazray n yiznan n texxamt-a s tarrayt n tririt tamaynut.",
     "Explore community rooms": "Snirem tixxamin n temɣiwent",
     "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.": "Ur tettizmireḍ ara ad tesfesxeḍ asnifel-a acku tettṣubbuḍ deg usellun-unek·inem, ma yella d kečč·kemm i d aseqdac aneglam n texxamt-a, d awezɣi ad d-terreḍ ula d yiwet n tseglut.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Iznan deg texxamt-a ttwawgelhen seg yixef ɣer yixef. Issin ugar & senqed aseqdac-a deg umaɣnu-ines n useqdac.",
     "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?": "Aql-ak·akem ad tettuwellheḍ ɣer usmel n wis tlata i wakken ad tizmireḍ ad tsestbeḍ amiḍan-ik·im i useqdec d %(integrationsUrl)s. Tebɣiḍ ad tkemmleḍ?",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "D awezɣi ad d-naf imuɣna n yisulay Matrix i d-yettwabdaren ddaw - tebɣiḍ ad ten-id-tnecdeḍ ɣas akken?",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Asmekti: Iming-ik·im ur yettusefrak ara, ihi tarmit-ik·im yezmer ur d-tettili ara.",
@@ -2273,11 +1926,8 @@
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Asfaḍ akk n yisefka seg tɣimit-a ad yili i lebda. Ad ak-ruḥen yiznan yettwawgelhen ala ma yella tisura ttwaḥerzent.",
     "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Tella-d tuccḍa deg tmerna n temɣiwent-ik·im. Yezmer isem yettwaddem neɣ aqeddac ur yezmir ara ad isleḍ asuter-ik·im.",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Seqdec aya mi ara tselɣuḍ tamɣiwent-ik·im i wiyaḍ. Asulay n temɣiwent ur yezmir ara ad yettusnifel.",
-    "Set a room address to easily share your room with other people.": "Sbadu tansa n texxamt i wakken ad ak·am-yishil beṭṭu-ines d yimdanen-nniḍen.",
-    "This room is private, and can only be joined by invitation.": "Taxxamt-a d tusligt, anekcum ɣur-s ala s tinubga.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Ur tezmireḍ ara ad tsenseḍ aya ticki. Tileggiyin d tuget n wabuten ur teddun ara akka tura.",
     "Create a room in %(communityName)s": "Rnu taxxamt deg %(communityName)s",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Sewḥel iseqdacen n yiqeddacen-nniḍen igejdanen ad d-rnun ɣer texxamt-a (Iɣewwaren-a ur tettizmireḍ ara ad ten-tesnifleḍ mbeɛd!)",
     "Are you sure you want to deactivate your account? This is irreversible.": "S tidet tebɣiḍ ad tsenseḍ amiḍăn-ik·im? Ulac tuɣalin ɣer deffir.",
     "There was a problem communicating with the server. Please try again.": "Tella-d tuccḍa mi ara nettaɛraḍ ad nemmeslay d uqeddac. Ɛreḍ tikkelt-nniḍen.",
     "Server did not require any authentication": "Aqeddac ur isuter ara akk asesteb",
@@ -2286,10 +1936,8 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Senqed aseqdac-a i wakken ad tcerḍeḍ fell-as d uttkil. Iseqdac uttkilen ad ak·am-d-awin lehna meqqren meqqren i uqerru mi ara tesseqdaceḍ iznan yettwawgelhen seg yixef ɣer yixef.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Asenqed n useqdac-a ad yecreḍ ɣef tɣimit-is tettwattkal, yerna ad yecreḍ ula ɣef tɣimit-ik·im tettwattkal i netta·nettat.",
     "Enable 'Manage Integrations' in Settings to do this.": "Rmed 'imsidaf n usefrek' deg yiɣewwaren i tigin n waya.",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s-ik·im ur ak·am yefki ara tisirag i useqdec n umsefrak n umsidef i wakken ad tgeḍ aya. Ttxil-k·m nermes anedbal.",
     "To continue, use Single Sign On to prove your identity.": "I ukemmel, seqdec n unekcum asuf i ubeggen n timagit-ik·im.",
     "Click the button below to confirm your identity.": "Sit ɣef tqeffalt ddaw i wakken ad tesnetmeḍ timagit-ik·im.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "D awezɣi ad ternuḍ izen-inek·inem uslig. Ttxil-k·m senqed iseqdacen i tebɣiḍ ad d-tnecdeḍ syen ɛreḍ tikkelt-nniḍen.",
     "Something went wrong trying to invite the users.": "Yella wayen ur nteddu ara akken ilaq i wakken ad d-tesnubegteḍ iseqdacen.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ur nezmir ara ad d-nesnubget iseqdacen-a. Ttxil-k·m wali iseqdac i tebɣiḍ ad d-tesnubegteḍ syen ɛreḍ tikkelt-nniḍen.",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Iseqdac i d-iteddun ahat ulac-iten neɣ d arimeɣta, ur zmiren ad d-ttusnubegten: %(csvNames)s",
@@ -2299,23 +1947,14 @@
     "Confirm this user's session by comparing the following with their User Settings:": "Sentem tiɣimit n useqdac-a s userwes gar wayen i d-iteddun d yiɣewwaren-is n useqdac:",
     "If they don't match, the security of your communication may be compromised.": "Ma yella ur mṣadan ara, taɣellist n teywalt-ik·im tezmer ad tettwaker.",
     "Your homeserver doesn't seem to support this feature.": "Aqeddac-ik·im agejdan ur yettban ara yessefrak tamahilt-a.",
-    "The internet connection either session is using": "Tuqqna n internet yettusqedcen deg yal tiɣimit",
-    "We recommend you change your password and recovery key in Settings immediately": "Ad ak·akem-nwellah ad tesnifleḍ awal-ik·im uffir d tsarut n tririt deg yiɣewwaren tura tura",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Seqdec tiɣimit-a i usenqed tiɣimit-ik·im tamaynut, s tikci n uzref i wakken ad tekcem ɣer yiznan yettwawgelhen:",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ma yella tettemliliḍ-d abugen neɣ tesɛiḍ tamawin i beṭṭu, ttxil-k·m selɣu-aɣ-d deg Github.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "I tallalt n ussinef n wuguren i d-yettuɣalen, ttxil-k·m <existingIssuesLink>wali uguren yellan</existingIssuesLink> deg tazwara (syen rnu yiwen +1) neɣ <newIssueLink>rnu ugur amaynut</newIssueLink> ma yella ur t-tufiḍ ara.",
-    "Report bugs & give feedback": "Azen abugen & efk-d tamawt",
     "Create a new room with the same name, description and avatar": "Rnu taxxamt tamaynut s yisem-nni, aglam-nni d uvaṭar-nni",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Seddu ifuyla seg udiwenni neɣ ger-iten, tserseḍ-ten deg kra n wadeg deg texxamt.",
-    "<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 i usebter n temɣiwent-ik·im</h1>\n<p>\n    Seqdec aglam ɣezzifen i wakken ad teskecmeḍ iɛeggalen imaynuten ɣer temɣiwent, neɣ bḍu\n    kra n yiseɣwan <a href=\"foo\">yesɛan azal</a>\n</p>\n<p>\n    Tzemreḍ daɣen ad tesqedceḍ tibzimin 'img'\n</p>\n",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Ur teddi ara tmerna n texxamin i d-iteddun ɣer ugzul n %(groupId)s:",
     "Failed to remove the room from the summary of %(groupId)s": "Ur teddi ara tukksa n texxamt seg ugzul n %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "Taxxamt '%(roomName)s' ur tezmir ara ad tettwakkes seg ugzul.",
     "Failed to add the following users to the summary of %(groupId)s:": "Timerna n yiseqdac i d-iteddun ɣer ugzul n %(groupId)s ur yedi ara:",
     "Failed to remove a user from the summary of %(groupId)s": "Ur teddi ara tukksa n useqdac seg ugzul n %(groupId)s",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Sentem timagit-ik·im s usenqed n yinekcam-a seg yiwet gar tɣimiyin-inek·inem-nniḍen, serreḥ-as ad tekcem ɣer yiznan yettwawgelhen.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Tiɣimit-ik·im tamaynut dayen tettwasenqed tura. Ɣur-s anekcum ɣer yiznan yettwawgelhen, iseqdac-nniḍen daɣen ad asen-d-tban tettwattkal.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Ma yella ur temmid ara tɣellist n tɣimit-a, ur yettili ara unekcum ɣer yiznan yettwawgelhen.",
     "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.": "Err-d anekcum ɣer umiḍan-ik·im, rnu err-d tisura n uwgelhen yettwakelsen deg tɣimit-a. Mebla yis-sent, ur tettizmireḍ ara ad teɣreḍ akk iznan-inek·inem deg yal tiɣimit.",
     "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.": "Ɣur-k·m: Isefka-inek·inem udmawanen (ula d tisura tiwgelhanin) ad qqimen ttwakelsent deg tɣimit-a. Sfeḍ-itent ma yella dayen ur tseqdaceḍ ara tiɣimit-a, neɣ tebɣiḍ ad tkecmeḍ ɣer umiḍan-nniḍen.",
     "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.": "Akala-a ad ak·am-imudd tisirag ad d-tsifḍeḍ tisura i d-tremseḍ deg texxamin yettwawgelhen i ufaylu adigan. Syen tzemreḍ ad tketreḍ afaylu deg umsaɣ-nniḍen n Matrix ɣer sdat, ihi amsaɣ-a mazal-it yezmer ad yekkes awgelhen i yiznan-a.",
@@ -2331,13 +1970,10 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Ur tettizmireḍ ara ad tesfesxeḍ asnifel-a acku tessebɣaseḍ aseqdac ad yesɛu aswir n tezmert am kečč·kemm.",
     "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?": "Asemmet n useqdac-a ad t-isuffeɣ yerna ur as-yettaǧǧa ara ad yales ad yeqqen. Daɣen, ad ffɣen akk seg texxamin ideg llan. Tigawt-a dayen ur tettwasefsax ara. S tidet tebɣiḍ ad tsemmteḍ aseqdac-a?",
     "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.": "Tiɣimit ara tettaɛraḍeḍ ad tt-tesneqdeḍ ur tessefrak ara tangalt n uḍummu QR neɣ asenqed n yimujit, d ayen i yessefrak %(brand)s. Ɛreḍ amsaɣ-nniḍen.",
-    "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.": "Iɣmisen n temseɣtit deg-sen isefka n useqdec n usnas am yisem n useqdec, am yisulayen neɣ am yismawen i yettunefken i texxamin neɣ i yigrawen ɣer wuɣur terziḍ d yismawen n useqdac n yiseqdacen-nniḍen. Ulac deg-sen iznan.",
     "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.": "Ma yella umnaḍ-nniḍen ara iɛawnen deg tesleḍt n wugur, am wamek akken i txeddmeḍ zik, isulay n texxamt, isulay n useqdac, atg., ttxil-k·m rnu iferdisen-a da.",
     "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.": "Tukksa n tsura n uzmul anmidag ad yili i lebda. Yal amdan i tesneqdeḍ ad iwali ilɣa n tɣellist. Maca ur tebɣiḍ ara ad txedmeḍ aya, ala ma yella tesruḥeḍ ibenkan akk ara ak·akem-yeǧǧen ad tkecmeḍ seg-s.",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "I wakken ur tesruḥuyeḍ ara amazray n udiwenni, ilaq ad tsifḍeḍ tisura seg texxam-ik·im send ad teffɣeḍ seg tuqqna. Tesriḍ ad tuɣaleḍ ɣer lqem amaynut n %(brand)s i wakken ad tgeḍ aya",
     "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.": "Tesxedmeḍ yakan lqem akk aneggaru n %(brand)s s tɣimit-a. I useqdec n lqem-a i tikkelt-nniḍen s uwgelhen seg yixef ɣer yixef, tesriḍ ad teffɣeḍ syen ad talseḍ anekcum i tikkelt-nniḍen.",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Bdu adiwenni d walbeɛḍ s useqdec n yisem-is, n yisem-is n useqdac (am <userId/>) neɣ tansa-ines n yimayl.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Nced-d albeɛḍ s useqdec n yisem-is, s yisem-is n useqdac (am <userId/>), s tansa-ines n yimayl neɣ <a>bḍu taxxamt-a</a>.",
     "Update any local room aliases to point to the new room": "Leqqem ismawen yettunefken i yal taxxamt tadigant akken ad tsekneḍ ɣer texxamt tamaynut",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Seḥbes iseqdacen ɣef umeslay deg lqem aqbur n texxamt, syen aru izen anida ara twellheḍ iseqdacen ad d-uɣalen ɣer texxamt tamaynut",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Sers aseɣwen deg texxamt taqburt mi ara tebdu kan texxamt tamaynut i wakken imdanen ad izmiren ad walin iznan iqburen",
@@ -2350,8 +1986,6 @@
     "A browser extension is preventing the request.": "Asiɣzef n yiminig tessewḥel asuter.",
     "We encountered an error trying to restore your previous session.": "Nemlal-d tuccḍa mi ara d-nettarra tiɣimit-ik·im yezrin.",
     "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.": "Ma yella tesqedceḍ yakan lqem n melmi kan n %(brand)s, tiɣimit-ik·im tezmer ur tettemṣada ara d lqem-a. Mdel afaylu-a syen uɣal ɣer lqem n melmi kan.",
-    "Cross-signing and secret storage are ready for use.": "Azmul anmidag d uklas uffir wejden i useqdec.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Azmul anmidag yewjed i useqdec, maca aklas uffir akka tura ur yettuseqdac ara i uḥraz n tsura.",
     "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>": "Amiḍan-ik·im ad  yuɣal ur yettwaseqdac ara i lebda. Ur tettizmireḍ ara ad tkecmeḍ, daɣen ulac win ara yizmiren ad issekle asulay-a n useqdac. Ad yerr amiḍăn-ik·im ad yettwakkes seg meṛṛa tixxamin ideg tettekkaḍ, rnu ad yekkes akk talqayt seg uqeddac-ik·im n timagit. <b>Ulac tuɣalin ɣer deffir deg tigawt-a.</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.": "Asemmet n umiḍan-ik·im <b>ur aɣ-isettu ara iznan i tuzneḍ s wudem amezwer. </b> Ma yella teɣiḍ ad nettu iznan-ik·im, ttxil-k·m mwati tabewwaḍt ddaaw.",
     "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.": "Abani n yiznan deg Matrix kifkif d wid n yimayl. Mi ara nettu iznan-ik·im, aya yebɣa ad d-yini iznan i tuzneḍ ur ttwabḍan ara ula d yiwen useqdac amaynut neɣ wid ur njerred ara, maca iseqdacen yettujerrden i yesɛan yakan anekcum ɣer yiznan-a mazal ad sɛun anekcum ɣer unɣal-nsen.",
@@ -2365,30 +1999,13 @@
     "To help us prevent this in future, please <a>send us logs</a>.": "I wakken ad aɣ-tɛiwneḍ ur d-iḍerru ara waya ɣer sdat, ttxil-k·m <a>azen-aɣ-d iɣmisen</a>.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Kra n yisefka n tɣimit, daɣen tisura n yiznan yettwawgelhen, ttwakksen. Ffeɣ syen ales anekcum i wakken ad tṣeggmeḍ aya, err-d tisura seg uḥraz.",
     "Your browser likely removed this data when running low on disk space.": "Yezmer iminig-ik·im yekkes isefka-a mi t-txuṣṣ tallunt ɣef uḍebsi.",
-    "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.": "Awiǧit ha-t-an deg %(widgetUrl)s yesra ad isenqed timagit-ik·im. Ma yella tqebleḍ aya, awiǧit yezmer ad isenqed asulay-inek·inem n useqdac, maca ur iteg ara tigawin am kečč·kemm.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "D awezɣi ad yili unekcum ɣer uklas uffir. Ttxil-k·m sefqed ma teskecmeḍ tafyirt tuffirt n uɛeddi tameɣtut.",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Aḥraz ue yezmir ara ad yekkes awgelhen s tsarut-a n uɛeddi: ttxil-k·m sefqed ma d tasarut n uɛeddi tameɣtut i teskecmeḍ.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Aḥraz ur yezmir ara ad yekkes awgelhen s tefyirt-a tuffirt n uɛeddi: sefqed ma yella d tafyirt tuffirt n uɛeddi tameɣtut i teskecmeḍ.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Ma yella tettuḍ tafyirt-ik tuffirt n uɛeddi, tzemreḍ <button1>ad tesqedceḍ tasarut-ik·im n uɛeddi</button1> neɣ <button2>sbadu tixtiṛiyin timaynutin n uɛeddi</button2>",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ma yella tettuḍ tasarut-ik·im n uɛeddi, tzemreḍ <button>ad tesbaduḍ tixtiṛiyin timaynutin n uɛeddi</button>",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Wennez kullec</resendText> neɣ <cancelText>sefsex kullec</cancelText> tura. Tzemreḍ daɣen ad tferneḍ iznan udmawanen i uwennez neɣ i usefsex.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Ɛerḍeɣ ad d-saliɣ tazmilt tufrint tesnakudt n texxamt-a, maca ur ssawḍeɣ ara ad t-naf.",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Imayl n usenqed ad yettwazen ɣer tbewwaḍt-ik·im n yimayl i usentem n yiɣewwaren n wawal-ik·im uffir.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Kcem ɣer umazray aɣelsan n yiznan-inek·inem syen sbadu tirawt taɣelsant s usekcem n tefyirt tuffirt n uɛeddi.",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Kcem ɣer umazray aɣelsan n yiznan-ik·im syen sbadu tirawt taɣelsant s usekcem n tsarut n uɛeddi.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Txuṣṣ tsarut tazayezt n captcha deg umtawi n uqeddac agejdan. Ttxil-k·m azen aneqqis ɣef waya i unedbal n uqeddac-ik·im agejdan.",
-    "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>.": "Sekcem adeg n uqeddac-ik·im agejdan n umeẓlu n Element Matrix. Yezmer ad iseqdec isem n taɣult-ik·im uzzig neɣ ad yili d taɣult tarnawt n <a>element.io</a>.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ulac aqeddac n timagit yettusiwlen, ɣef waya ur tettizmireḍ ara ad ternuḍ tansa n yimayl i wakken ad twennzeḍ awal-ik·im uffir ɣer sdat.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ma yella ur d-tefrineḍ ara tansa n yimayl, ur tettizmireḍ ara ad twennzeḍ awal-ik·im uffir. Tebɣiḍ?",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Sbadu imayl i tririt n umiḍan. Seqdec imayl neɣ tiliɣri i wakken ad tettwaf s uxtiṛi sɣur inermisen i yellan.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Sbadu imayl i tririt n umiḍan. Seqdec imayl s ufran i wakken ad d-iban i yinermisen i yellan.",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s isseqdac aṭas n tmahilin leqqayen n yiminig, kra seg-sent ulac-itent neɣ d tirmitanin deg yiminig-ik·im amiran.",
-    "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!": "S yiminig-ik·im amiran, ameẓraw d umḥulfan n usnas zemren ad ilin mačči akk d imeɣta, rnu kra neɣ akk timahilin zemrent ur teddunt ara. Ma yella tebɣiḍ ɣas akken ad t-tɛerḍeḍ tzemreḍ ad tkemmleḍ, maca ur tseɛɛuḍ ara akk tallalt ma yella temlaleḍ-d d wuguren!",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Aql-ak·akem d (t)anedbal(t) n temɣiwent-a. Ur tettizmireḍ ara ad tɛawdeḍ anekcum alamma s tinubga n unedbal-nniḍen.",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Isnifal i d-yellan ɣef <bold1>isem</bold1> d <bold2>avaṭar</bold2> i temɣiwent-ik·im ur ttmeẓran ara sɣur yiseqdacen-nniḍen alamma d 30 tesdidin .",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tixxamin-a ttwaskanent i yiɛeggalen n temɣiwent ɣef usebter n temɣiwent. Iɛeggalen n temɣiwent zemren ad ttekkin deg texxamin s usiti fell-asent.",
     "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!": "Tamɣiwent-ik·im ur tesɛi ara aglam ɣezzifen, asebter HTML i uskan n yiɛeggalen n temɣiwent.<br />Sit da i wakken ad teldiḍ iɣewwaren syen rnu yiwet!",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Tixxamin tusligin zemrent ad ttwafent, timerna ɣer-sent s tinubga kan. Tixxamin tizuyaz zemrent ad ttwafent, yal wa yezmer ad yernu ɣer-sent.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Tixxamin tusligin zemrent ad ttwafent, timerna ɣer-sent s tinubga kan. Tixxamin tizuyaz zemrent ad ttwafent, yal wa yezmer ad yernu ɣer-sent deg temɣiwent-a.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Ilaq ad tesremdeḍ aya ma yella taxxamt ad tettwaseqdec kan i uttekki d trebbaɛ tigensanin ɣef uqeddac-ik·im agejdan. Ayagi ur yettubeddal ara ɣer sdat.",
     "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.": "Ilaq ad tsenseḍ aya ma yella taxxamt ad tettuseqdac i uttekki d trebbaɛ tuffiɣin i yesɛan aqeddac-nsent agejdan. Aya ur yettwabeddal ara ɣer sdat.",
@@ -2396,12 +2013,10 @@
     "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.": "Timenna ɣef yizen-a ad yazen \"asulay n uneḍru\" asuf i unedbal n uqeddac agejdan. Ma yella iznan n texxamt-a ttwawgelhen, anedbal-ik·im n uqeddac agejdan ur yettizmir ara ad d-iɣer aḍris n yizen neɣ senqed ifuyla neɣ tugniwin.",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "I wakken ad tkemmleḍ aseqdec n uqeddac agejdan n %(homeserverDomain)s ilaq ad talseḍ asenqed syen ad tqebleḍ tiwtilin-nneɣ s umata.",
     "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.": "Isefka n lqem aqbur n %(brand)s ttwafen. Ayagi ad d-yeglu s yir tamahalt n uwgelhen seg yixef ɣer yixef deg lqem aqbur. Iznan yettwawgelhen seg yixef ɣer yixef yettumbeddalen yakan mi akken yettuseqdac lqem aqbur yezmer ur asen-ittekkes ara uwgelhen deg lqem-a. Aya yezmer daɣen ad d-yeglu asefsex n yiznan yettumbeddalen s lqem-a. Ma yella temlaleḍ-d uguren, ffeɣ syen tuɣaleḍ-d tikkelt-nniḍen. I wakken ad tḥerzeḍ amazray n yiznan, sifeḍ rnu ales kter tisura-ik·im.",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "I usbadu n umsizdeg, jbed-d avaṭar n temɣiwent ɣer ugalis n umsizdeg deg tama tazelmaḍt akk n ugdil. Tzemreḍ ad tsiteḍ ɣef avaṭar deg ugalis n yimsizdeg deg yal akud i wakken ad twaliḍ tixxamin kan d yimdanen yettwaqqnen d temɣiwent-a.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Rnu tamɣiwent i wakken ad d-tesdukkleḍ akk iseqdac d texxamin! Snulfu-d asebter agejdan i ucraḍ n tallunt-ik·im deg umaḍal n Matrix.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Ur tezmireḍ ara ad tazneḍ iznan alamma tesneqdeḍ syen ad tqebleḍ <consentLink>tiwtilin-nneɣ</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.": "Izen-ik·im ur yettwazen ara acku aqeddac-a agejdan iɛedda talast n useqdac urmid n wayyur. Ttxil-k·m <a>nermes anedbal-ik·im n umeẓlu</a> i wakken ad tkemmleḍ aseqdec ameẓlu.",
     "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.": "Izen-ik·im ur yettwazen ara acku aqeddac-a agejdan iɛedda talast n yiɣbula. Ttxil-k·m <a>nermes anedbal-ik·im n umeẓlu</a> i wakken ad tkemmleḍ aseqdec ameẓlu.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Ales tuzna n yizen</resendText> neɣ <cancelText>sefsex izen</cancelText> tura.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tɛerḍeḍ ad d-tsaliḍ tazmilt tufrint deg tesnakudt n teamt, maca ur tesɛiḍ ara tisirag ad d-tsekneḍ izen i d-teɛniḍ.",
     "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.": "Asnifel n wawal-ik·im uffir ad iwennez akk tisura n uwgelhen seg yixef ɣer yixef deg meṛṛa n tɣimiyin-ik·im, s tririt n umazray n udiwenni awgelhan ur yettwaɣra ara. Sbadu aḥraz n tsarut neɣ sifeḍ tisura n texxamt-ik·im seg texxamt-nniḍen send awennez n wawal-ik·im uffir.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Imayl yettwazen ɣer %(emailAddress)s. Akken ara tḍefreḍ aseɣwen i yellan deg-s, sit ddaw.",
@@ -2409,25 +2024,19 @@
     "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>.": "Ur tessawḍeḍ ara ad teqqneḍ ɣer uqeddac agejdan s HTTP mi ara yili URL n HTTPS deg ufeggag n yiminig-ik·im. Seqdec HTTPS neɣ <a>sermed isekripten ariɣelsanen</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Yegguma ad yeqqen ɣer uqeddac agejdan - ttxil-k·m senqed tuqqna-inek·inem, tḍemneḍ belli <a>aselken n SSL n uqeddac agejdan</a> yettwattkal, rnu aseɣzan n yiminig-nni ur issewḥal ara isutar.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Amiḍan-ik·im amaynut (%(newAccountId)s) yettwaseklas, maca teqqneḍ yakan ɣer umiḍan wayeḍ (%(loggedInUserId)s).",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Tasarut-ik·im n tririt d azeṭṭa aɣelsan - tzemreḍ ad tt-tesqedceḍ i wakken ad d-terreḍ anekcum ɣer yiznan-ik·im yettwawgelhen ma yella tettuḍ tafyirt-ik·im tuffirt n tririt.",
     "Trophy": "Arraz",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Irennu ( ͡° ͜ʖ ͡°) ɣer yizen s uḍris arewway",
-    "Group call modified by %(senderName)s": "Asiwel n ugraw yettwabeddel sɣur %(senderName)s",
-    "Group call started by %(senderName)s": "Asiwel n ugraw yebda-t-id %(senderName)s",
-    "Group call ended by %(senderName)s": "Asiwel n ugraw yekfa-t %(senderName)s",
     "Unknown App": "Asnas arussin",
     "Cross-signing is ready for use.": "Azmul anmidag yewjed i useqdec.",
     "Cross-signing is not set up.": "Azmul anmidag ur yettwasebded ara.",
     "Backup version:": "Lqem n uklas:",
     "Algorithm:": "Alguritm:",
-    "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.": "Kkes tisura-k•m n uwgelhen s yisefka n umiḍan-ik•im ma ur tezmireḍ ara ad tkecmeḍ ɣer tɣimiyin-ik•im. Tisura-k•m ad ttwaɣellsent s yiwet n tsarut n tiririt.",
     "Backup key stored:": "Tasarut n uklas tettwaḥrez:",
     "ready": "yewjed",
     "not ready": "ur yewjid ara",
     "Secure Backup": "Aklas aɣellsan",
     "Privacy": "Tabaḍnit",
     "Room Info": "Talɣut ɣef texxamt",
-    "Apps": "Isnasen",
     "Not encrypted": "Ur yettwawgelhen ara",
     "About": "Ɣef",
     "%(count)s people|other": "%(count)s n yimdanen",
@@ -2438,7 +2047,6 @@
     "There was an error updating your community. The server is unable to process your request.": "Tella-d tuccḍa deg uleqqem n temɣiwent-ik•im. Aqeddac ur izmir ara ad isesfer asuter.",
     "Update community": "Leqqem tamɣiwent",
     "May include members not in %(communityName)s": "Yezmer ad d-isseddu iɛeggalen ur nelli deg %(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>.": "Bdu adiwenni akked ḥedd s useqdec n yisem-is, isem uffir (am <userId/>) neɣ tansa imayl. Aya ur ten-iecced ara ɣer %(communityName)s. Akked ad d-tnecdeḍ yiwen ɣer %(communityName)s sit ɣef <a>da</a>.",
     "not found in storage": "Ulac-it deg uklas",
     "Failed to save your profile": "Yecceḍ usekles n umaɣnu-ik•im",
     "The operation could not be completed": "Tamahilt ur tezmir ara ad tettwasmed",
@@ -2447,10 +2055,6 @@
     "Remove messages sent by others": "Kkes iznan i uznen wiyaḍ",
     "%(count)s results|one": "%(count)s n ugmuḍ",
     "Widgets": "Iwiǧiten",
-    "Unpin app": "Serreḥ i usnas",
-    "Pin to room": "Sentu deg texxamt",
-    "You can only pin 2 widgets at a time": "Tzemreḍ ad tsentuḍ 2 kan n yiwiǧiten ɣef tikkelt",
-    "Call Declined": "Yettwagi usiwel",
     "Video Call": "Asiwel s tvidyut",
     "Iraq": "ɛiṛaq",
     "Bosnia": "Busniya",
@@ -2657,7 +2261,6 @@
     "Brunei": "Brunei",
     "Finland": "Finland",
     "Algeria": "Zzayer",
-    "Role": "Tamlit",
     "Tunisia": "Tunes",
     "Equatorial Guinea": "Ginya Tasebgast",
     "Swaziland": "Swis",
@@ -2731,7 +2334,6 @@
     "The call was answered on another device.": "Tiririt ɣef usiwel tella-d ɣef yibenk-nniḍen.",
     "Answered Elsewhere": "Yerra-d seg wadeg-nniḍen",
     "The call could not be established": "Asiwel ur yeqεid ara",
-    "The other party declined the call.": "Amdan-nniḍen yugi asiwel.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s isenfel iɣewwaren n unekcum ɣer texxamt-a.",
     "Decide where your account is hosted": "Wali anida ara yezdeɣ umiḍan-ik·im",
     "Host account on": "Sezdeɣ amiḍan deg",
@@ -2750,9 +2352,18 @@
     "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.",
-    "%(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"
+    "Try again": "Ɛreḍ tikkelt-nniḍen",
+    "Integration manager": "Amsefrak n umsidef",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s-ik·im ur ak·am yefki ara tisirag i useqdec n umsefrak n umsidef i wakken ad tgeḍ aya. Ttxil-k·m nermes anedbal.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Aseqdec n uwiǧit-a yezmer ad yebḍu isefka <helpIcon/> d %(widgetDomain)s & amsefrak-inek·inem n umsidef.",
+    "Identity server is": "Aqeddac n timagit d",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Imsefrak n yimsidaf remmsen-d isefka n uswel, syen ad uɣalen zemren ad beddlen iwiǧiten, ad aznen tinubgiwin ɣer texxamin, ad yesbadu daɣen tazmert n yiswiren s yiswiren deg ubdil-ik·im.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Seqdec amsefrak n umsidef i usefrek n yibuten, n yiwiǧiten d tɣawsiwin n usenteḍ.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Seqdec amsefrak n umsidef <b>(%(serverName)s)</b> i usefrek n yibuten, n yiwiǧiten d tɣawsiwin n usenteḍ.",
+    "Identity server": "Aqeddac n timagit",
+    "Identity server (%(server)s)": "Aqeddac n timagit (%(server)s)",
+    "Could not connect to identity server": "Ur izmir ara ad yeqqen ɣer uqeddac n timagit",
+    "Not a valid identity server (status code %(code)s)": "Aqeddac n timagit mačči d ameɣtu (status code %(code)s)",
+    "Identity server URL must be HTTPS": "URL n uqeddac n timagit ilaq ad yili d HTTPS"
 }
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index f817dbc26b..a675a151b0 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -2,14 +2,12 @@
     "Cancel": "취소",
     "Close": "닫기",
     "Create new room": "새 방 만들기",
-    "Custom Server Options": "맞춤 서버 설정",
     "Dismiss": "버리기",
     "Error": "오류",
     "Mute": "음소거",
     "Notifications": "알림",
     "powered by Matrix": "Matrix의 지원을 받음",
     "Remove": "제거",
-    "Room directory": "방 목록",
     "Search": "찾기",
     "Settings": "설정",
     "Start chat": "대화 시작",
@@ -36,14 +34,12 @@
     "Are you sure?": "확신합니까?",
     "Are you sure you want to leave the room '%(roomName)s'?": "%(roomName)s 방을 떠나겠습니까?",
     "Attachment": "첨부 파일",
-    "Autoplay GIFs and videos": "GIF와 동영상을 자동으로 재생하기",
     "Ban": "출입 금지",
     "Banned users": "출입 금지된 사용자",
     "Change Password": "비밀번호 바꾸기",
     "Changes your display nickname": "표시 별명 변경하기",
     "Confirm password": "비밀번호 확인",
     "Create Room": "방 만들기",
-    "Custom": "사용자 지정",
     "Default": "기본",
     "Email": "이메일",
     "Email address": "이메일 주소",
@@ -51,41 +47,23 @@
     "Favourite": "즐겨찾기",
     "Operation failed": "작업 실패",
     "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했습니다. 이 비밀번호가 맞나요?",
-    "%(targetName)s accepted an invitation.": "%(targetName)s님이 초대를 수락했습니다.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s 초대를 수락했습니다.",
-    "Access Token:": "접근 토큰:",
-    "Active call (%(roomName)s)": "현재 전화 (%(roomName)s 방)",
-    "Add a topic": "주제 추가",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "수동으로 %(brand)s에 마이크와 카메라를 허용해야 함",
     "%(items)s and %(lastItem)s": "%(items)s님과 %(lastItem)s님",
     "and %(count)s others...|one": "외 한 명...",
     "and %(count)s others...|other": "외 %(count)s명...",
-    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았습니다.",
-    "Anyone who knows the room's link, apart from guests": "손님을 제외하고, 방의 주소를 아는 누구나",
-    "Anyone who knows the room's link, including guests": "손님을 포함하여, 방의 주소를 아는 누구나",
     "Are you sure you want to reject the invitation?": "초대를 거절하시겠어요?",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 출입 금지했습니다.",
     "Bans user with given id": "받은 ID로 사용자 출입 금지하기",
-    "Call Timeout": "전화 대기 시간 초과",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "홈서버에 연결할 수 없음 - 연결 상태를 확인하거나, <a>홈서버의 SSL 인증서</a>가 믿을 수 있는지 확인하고, 브라우저 확장 기능이 요청을 막고 있는지 확인해주세요.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "주소 창에 HTTPS URL이 있을 때는 HTTP로 홈서버를 연결할 수 없습니다. HTTPS를 쓰거나 <a>안전하지 않은 스크립트를 허용</a>해주세요.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s님이 프로필 사진을 바꿨습니다.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꿨습니다.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s(으)로 바꿨습니다.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 제거했습니다.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"(으)로 바꿨습니다.",
-    "Click here to fix": "해결하려면 여기를 누르세요",
-    "Click to mute audio": "소리를 끄려면 클릭",
-    "Click to mute video": "영상 소리를 끄려면 클릭",
-    "click to reveal": "클릭해서 보기",
-    "Click to unmute video": "영상 소리를 켜려면 클릭",
-    "Click to unmute audio": "소리를 켜려면 클릭",
     "Command error": "명령어 오류",
     "Commands": "명령어",
     "Cryptography": "암호화",
     "Current password": "현재 비밀번호",
     "Custom level": "맞춤 등급",
-    "/ddg is not a command": "/ddg는 명령어가 아닙니다",
     "Deactivate Account": "계정 비활성화",
     "Decline": "거절",
     "Decrypt %(text)s": "%(text)s 복호화",
@@ -93,21 +71,15 @@
     "Disinvite": "초대 취소",
     "Displays action": "활동 표시하기",
     "Download %(text)s": "%(text)s 다운로드",
-    "Drop File Here": "여기에 파일을 놓아주세요",
     "Emoji": "이모지",
-    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었습니다.",
     "Enter passphrase": "암호 입력",
     "Error decrypting attachment": "첨부 파일 복호화 중 오류",
-    "Error: Problem communicating with the given homeserver.": "오류: 지정한 홈서버와 통신에 문제가 있습니다.",
-    "Existing Call": "기존 전화",
     "Export": "내보내기",
     "Export E2E room keys": "종단간 암호화 방 열쇠 내보내기",
     "Failed to ban user": "사용자 출입 금지에 실패함",
     "Failed to change power level": "권한 등급 변경에 실패함",
-    "Failed to fetch avatar URL": "아바타 URL 가져오기에 실패함",
     "Failed to join room": "방에 들어가지 못했습니다",
     "Failed to kick": "추방에 실패함",
-    "Failed to leave room": "방 떠나기에 실패함",
     "Failed to load timeline position": "타임라인 위치 불러오기에 실패함",
     "Failed to mute user": "사용자 음소거에 실패함",
     "Failed to reject invite": "초대 거부에 실패함",
@@ -120,44 +92,33 @@
     "Failed to verify email address: make sure you clicked the link in the email": "이메일 주소를 인증하지 못했습니다. 메일에 나온 주소를 눌렀는지 확인해 보세요",
     "Failure to create room": "방 만들기 실패",
     "Favourites": "즐겨찾기",
-    "Fill screen": "화면 채우기",
     "Filter room members": "방 구성원 필터",
     "Forget room": "방 지우기",
     "For security, this session has been signed out. Please sign in again.": "안전을 위해서 이 세션에서 로그아웃했습니다. 다시 로그인해주세요.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
-    "Guests cannot join this room even if explicitly invited.": "명시적으로 초대 받은 손님이라도 이 방에는 들어가실 수 없습니다.",
     "Hangup": "전화 끊기",
     "Historical": "기록",
     "Home": "홈",
     "Homeserver is": "홈서버:",
-    "Identity Server is": "ID 서버:",
     "I have verified my email address": "이메일 주소를 인증했습니다",
     "Import": "가져오기",
     "Import E2E room keys": "종단간 암호화 방 키 불러오기",
     "Import room keys": "방 키 가져오기",
-    "Incoming call from %(name)s": "%(name)s님으로부터 전화가 왔습니다",
-    "Incoming video call from %(name)s": "%(name)s님으로부터 영상 통화가 왔습니다",
-    "Incoming voice call from %(name)s": "%(name)s님으로부터 음성 통화가 왔습니다",
     "Incorrect username and/or password.": "사용자 이름 혹은 비밀번호가 맞지 않습니다.",
     "Incorrect verification code": "맞지 않은 인증 코드",
     "Invalid Email Address": "잘못된 이메일 주소",
     "Invalid file%(extra)s": "잘못된 파일%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대했습니다.",
     "Invited": "초대받음",
     "Invites": "초대",
     "Invites user with given id to current room": "받은 ID로 사용자를 현재 방에 초대하기",
     "Sign in with": "이것으로 로그인",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>음성</voiceText> 또는 <videoText>영상</videoText>으로 참가하세요.",
     "Join Room": "방에 참가",
-    "%(targetName)s joined the room.": "%(targetName)s님이 방에 참가했습니다.",
     "Jump to first unread message.": "읽지 않은 첫 메시지로 건너뜁니다.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 추방했습니다.",
     "Kick": "추방",
     "Kicks user with given id": "받은 ID로 사용자 추방하기",
     "Labs": "실험실",
     "Last seen": "마지막으로 본 순간",
     "Leave room": "방 떠나기",
-    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠났습니다.",
     "Logout": "로그아웃",
     "Low priority": "중요하지 않음",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방 구성원 모두, 초대받은 시점부터 방의 기록을 볼 수 있게 했습니다.",
@@ -165,7 +126,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방 구성원 모두 방의 기록을 볼 수 있게 했습니다.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 누구나 방의 기록을 볼 수 있게 했습니다.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 알 수 없음 (%(visibility)s)이 방의 기록을 볼 수 있게 했습니다.",
-    "Manage Integrations": "통합 관리",
     "Missing room_id in request": "요청에서 room_id가 빠짐",
     "Missing user_id in request": "요청에서 user_id이(가) 빠짐",
     "Moderator": "조정자",
@@ -173,13 +133,11 @@
     "New passwords don't match": "새 비밀번호가 맞지 않음",
     "New passwords must match each other.": "새 비밀번호는 서로 같아야 합니다.",
     "not specified": "지정되지 않음",
-    "(not supported by this browser)": "(이 브라우저에서 지원하지 않습니다)",
     "<not supported>": "<지원하지 않음>",
     "No display name": "표시 이름 없음",
     "No more results": "더 이상 결과 없음",
     "No results": "결과 없음",
     "No users have specific privileges in this room": "모든 사용자가 이 방에 대한 특정 권한이 없음",
-    "olm version:": "olm 버전:",
     "Password": "비밀번호",
     "Passwords can't be empty": "비밀번호를 입력해주세요",
     "Permissions": "권한",
@@ -189,31 +147,21 @@
     "Power level must be positive integer.": "권한 등급은 양의 정수이어야 합니다.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s님 (권한 %(powerLevelNumber)s)",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "사용자를 자신과 같은 권한 등급으로 올리는 것은 취소할 수 없습니다.",
-    "Private Chat": "비공개 대화",
     "Privileged Users": "권한 있는 사용자",
     "Profile": "프로필",
-    "%(senderName)s removed their profile picture.": "%(senderName)s님이 프로필 사진을 제거했습니다.",
-    "%(senderName)s set a profile picture.": "%(senderName)s님이 프로필 사진을 설정했습니다.",
-    "Public Chat": "공개 대화",
     "Reason": "이유",
     "Register": "등록",
-    "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절했습니다.",
     "Reject invitation": "초대 거절",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 표시 이름 (%(oldDisplayName)s)을(를) 제거했습니다.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 VoIP 회의를 요청했습니다.",
-    "Results from DuckDuckGo": "DuckDuckGo에서 검색한 결과",
     "Return to login screen": "로그인 화면으로 돌아가기",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s은 알림을 보낼 권한을 가지고 있지 않습니다. 브라우저 설정을 확인해주세요",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s이 알림을 보낼 권한을 받지 못했습니다. 다시 해주세요",
     "%(brand)s version:": "%(brand)s 웹 버전:",
     "Room %(roomId)s not visible": "방 %(roomId)s이(가) 보이지 않음",
-    "Room Colour": "방 색",
     "%(roomName)s does not exist.": "%(roomName)s은 없는 방이에요.",
     "%(roomName)s is not accessible at this time.": "현재는 %(roomName)s에 들어갈 수 없습니다.",
     "Rooms": "방",
     "Save": "저장",
     "Search failed": "검색 실패함",
-    "Searches DuckDuckGo for results": "DuckDuckGo에서 검색하기",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s님이 %(dateTime)s에 확인함",
     "Send Reset Email": "초기화 이메일 보내기",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈습니다.",
@@ -223,38 +171,30 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류입니다.",
     "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있습니다.",
     "Session ID": "세션 ID",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s님이 표시 이름을 %(displayName)s(으)로 설정했습니다.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보이기(예: 오후 2:30)",
     "Signed Out": "로그아웃함",
     "Sign in": "로그인",
     "Sign out": "로그아웃",
-    "%(count)s of your messages have not been sent.|other": "일부 메시지를 보내지 못했습니다.",
     "Someone": "다른 사람",
     "Start authentication": "인증 시작",
     "Submit": "제출",
     "Success": "성공",
-    "The phone number entered looks invalid": "입력한 전화번호가 잘못됨",
     "This email address is already in use": "이 이메일 주소는 이미 사용 중입니다",
     "This email address was not found": "이 이메일 주소를 찾을 수 없음",
     "The email address linked to your account must be entered.": "계정에 연결한 이메일 주소를 입력해야 합니다.",
-    "The remote side failed to pick up": "상대방이 받지 못함",
     "This room has no local addresses": "이 방은 로컬 주소가 없음",
     "This room is not recognised.": "이 방은 드러나지 않습니다.",
     "This doesn't appear to be a valid email address": "올바르지 않은 이메일 주소로 보입니다",
     "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.": "이 기능을 사용하려면, 자동 완성 결과가 나오길 기다린 뒤에 탭으로 움직여주세요.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 문제의 메시지를 볼 수 있는 권한이 없습니다.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었습니다.",
     "Unable to add email address": "이메일 주소를 추가할 수 없음",
     "Unable to remove contact information": "연락처 정보를 제거할 수 없음",
     "Unable to verify email address.": "이메일 주소를 인증할 수 없습니다.",
     "Unban": "출입 금지 풀기",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님에 대한 출입 금지를 풀었습니다.",
-    "Unable to capture screen": "화면을 찍을 수 없음",
     "Unable to enable Notifications": "알림을 사용할 수 없음",
-    "unknown caller": "알 수 없는 발신자",
     "Unmute": "음소거 끄기",
     "Unnamed Room": "이름 없는 방",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s을(를) 올리는 중",
@@ -265,29 +205,19 @@
     "Upload file": "파일 업로드",
     "Upload new:": "새로 업로드:",
     "Usage": "사용",
-    "Username invalid: %(errMessage)s": "잘못된 사용자 이름: %(errMessage)s",
     "Users": "사용자",
     "Verification Pending": "인증을 기다리는 중",
     "Verified key": "인증한 열쇠",
     "Video call": "영상 통화",
     "Voice call": "음성 통화",
-    "VoIP conference finished.": "VoIP 회의를 마쳤습니다.",
-    "VoIP conference started.": "VoIP 회의를 시작했습니다.",
     "VoIP is unsupported": "VoIP를 지원하지 않음",
-    "(could not connect media)": "(미디어에 연결할 수 없었습니다)",
-    "(no answer)": "(응답 없음)",
-    "(unknown failure: %(reason)s)": "(알 수 없는 오류: %(reason)s)",
     "Warning!": "주의!",
-    "Who can access this room?": "누가 이 방에 들어올 수 있나요?",
     "Who can read history?": "누가 기록을 읽을 수 있나요?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s님의 초대를 거절했습니다.",
-    "You are already in a call.": "이미 통화 중입니다.",
     "You cannot place a call with yourself.": "자기 자신에게는 전화를 걸 수 없습니다.",
     "You cannot place VoIP calls in this browser.": "이 브라우저에서는 VoIP 전화를 걸 수 없습니다.",
     "You do not have permission to post to this room": "이 방에 글을 올릴 권한이 없습니다",
     "You have <a>disabled</a> URL previews by default.": "기본으로 URL 미리 보기를 <a>껐습니다</a>.",
     "You have <a>enabled</a> URL previews by default.": "기본으로 URL 미리 보기를 <a>켰습니다</a>.",
-    "You have no visible notifications": "보여줄 수 있는 알림이 없습니다",
     "You must <a>register</a> to use this functionality": "이 기능을 쓰려면 <a>등록</a>해야 합니다",
     "You need to be able to invite users to do that.": "그러려면 사용자를 초대할 수 있어야 합니다.",
     "You need to be logged in.": "로그인을 해야 합니다.",
@@ -316,18 +246,12 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s일 %(weekDayName)s요일 %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s년 %(monthName)s %(day)s일 %(weekDayName)s요일 %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s요일, %(time)s",
-    "Set a display name:": "표시 이름 설정:",
-    "Upload an avatar:": "아바타 업로드:",
     "This server does not support authentication with a phone number.": "이 서버는 전화번호 인증을 지원하지 않습니다.",
-    "An error occurred: %(error_string)s": "오류가 발생함: %(error_string)s",
-    "There are no visible files in this room": "이 방에는 보여줄 수 있는 파일이 없습니다",
     "Room": "방",
     "Connectivity to the server has been lost.": "서버 연결이 끊어졌습니다.",
     "Sent messages will be stored until your connection has returned.": "보낸 메시지는 연결이 돌아올 때까지 저장됩니다.",
     "(~%(count)s results)|one": "(~%(count)s개의 결과)",
     "(~%(count)s results)|other": "(~%(count)s개의 결과)",
-    "Active call": "전화 중",
-    "Please select the destination room for this message": "이 메시지를 보낼 방을 골라주세요",
     "New Password": "새 비밀번호",
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
     "Analytics": "정보 분석",
@@ -341,7 +265,6 @@
     "You must join the room to see its files": "파일을 보려면 방에 참가해야 합니다",
     "Reject all %(invitedRooms)s invites": "모든 %(invitedRooms)s개의 초대를 거절",
     "Failed to invite": "초대 실패",
-    "Failed to invite the following users to the %(roomName)s room:": "다음 사용자들을 %(roomName)s 방으로 초대하지 못했습니다:",
     "Confirm Removal": "삭제 확인",
     "Unknown error": "알 수 없는 오류",
     "Incorrect password": "맞지 않는 비밀번호",
@@ -353,21 +276,14 @@
     "Unable to restore session": "세션을 복구할 수 없음",
     "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.": "이전에 최근 버전의 %(brand)s을 썼다면, 세션이 이 버전과 맞지 않을 것입니다. 창을 닫고 최근 버전으로 돌아가세요.",
     "Unknown Address": "알 수 없는 주소",
-    "ex. @bob:example.com": "예: @bob:example.com",
-    "Add User": "사용자 추가",
-    "Please check your email to continue registration.": "등록하려면 이메일을 확인해주세요.",
     "Token incorrect": "토큰이 맞지 않음",
     "Please enter the code it contains:": "들어있던 코드를 입력해주세요:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "이메일 주소를 지정하지 않으면, 비밀번호를 다시 설정할 수 없습니다. 괜찮을까요?",
-    "Error decrypting audio": "음성 복호화 오류",
     "Error decrypting image": "사진 복호화 중 오류",
     "Error decrypting video": "영상 복호화 중 오류",
     "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?": "%(integrationsUrl)s에서 쓸 수 있도록 계정을 인증하려고 다른 사이트로 이동하고 있습니다. 계속하겠습니까?",
     "URL Previews": "URL 미리보기",
     "Drop file here to upload": "업로드할 파일을 여기에 놓으세요",
-    " (unsupported)": " (지원하지 않음)",
-    "Ongoing conference call%(supportedText)s.": "진행 중인 회의 전화 %(supportedText)s.",
     "Online": "접속 중",
     "Idle": "대기 중",
     "Offline": "접속 없음",
@@ -375,11 +291,7 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s님이 방 아바타를 <img/>(으)로 바꿈",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 제거했습니다.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s님이 %(roomName)s 방의 아바타를 바꿈",
-    "Username available": "쓸 수 있는 사용자 이름",
-    "Username not available": "쓸 수 없는 사용자 이름",
     "Something went wrong!": "문제가 생겼습니다!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "이건 <span></span> 홈서버에서 계정 이름이 됩니다, 혹은 <a>다른 서버</a>를 고를 수도 있습니다.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Matrix 계정을 이미 갖고 있다면, <a>로그인</a>할 수 있습니다.",
     "Your browser does not support the required cryptography extensions": "필요한 암호화 확장 기능을 브라우저가 지원하지 않습니다",
     "Not a valid %(brand)s keyfile": "올바른 %(brand)s 열쇠 파일이 아닙니다",
     "Authentication check failed: incorrect password?": "인증 확인 실패: 비밀번호를 틀리셨나요?",
@@ -388,15 +300,12 @@
     "Skip": "건너뛰기",
     "Edit": "편집",
     "Fetching third party location failed": "제 3자 위치를 가져오지 못함",
-    "All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 대상에 대해 꺼져있습니다.",
-    "Uploading report": "신고 업로드 중",
     "Sunday": "일요일",
     "Guests can join": "손님이 참가할 수 있음",
     "Messages sent by bot": "봇에게 받은 메시지",
     "Notification targets": "알림 대상",
     "Failed to set direct chat tag": "다이렉트 대화 태그 설정에 실패함",
     "Today": "오늘",
-    "You are not receiving desktop notifications": "컴퓨터 알림을 받지 않고 있습니다",
     "Friday": "금요일",
     "Update": "업데이트",
     "What's New": "새로운 점",
@@ -404,103 +313,62 @@
     "Changelog": "바뀐 점",
     "Waiting for response from server": "서버에서 응답을 기다리는 중",
     "Leave": "떠나기",
-    "Advanced notification settings": "고급 알림 설정",
-    "Forget": "지우기",
     "World readable": "모두가 읽을 수 있음",
-    "You cannot delete this image. (%(code)s)": "이 사진을 삭제할 수 없습니다. (%(code)s)",
-    "Cancel Sending": "보내기 취소",
     "Warning": "경고",
     "This Room": "방",
     "Resend": "다시 보내기",
-    "Error saving email notification preferences": "이메일 알림 설정을 저장 중 오류",
     "Messages containing my display name": "내 표시 이름이 포함된 메시지",
     "Messages in one-to-one chats": "1:1 대화 메시지",
     "Unavailable": "이용할 수 없음",
-    "View Decrypted Source": "복호화된 소스 보기",
     "Send": "보내기",
     "remove %(name)s from the directory.": "목록에서 %(name)s 방을 제거했습니다.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "여기에 표시할 수 없는 규칙에 따르는 다음 키워드에 대한 알림:",
-    "Please set a password!": "비밀번호를 설정해주세요!",
-    "You have successfully set a password!": "성공적으로 비밀번호를 설정했습니다!",
-    "An error occurred whilst saving your email notification preferences.": "이메일 알림 설정을 저장하는 중 오류가 발생했습니다.",
     "Source URL": "출처 URL",
     "Failed to add tag %(tagName)s to room": "방에 %(tagName)s 태그 추가에 실패함",
     "Members": "구성원",
     "No update available.": "업데이트가 없습니다.",
     "Noisy": "소리",
-    "Files": "파일",
     "Collecting app version information": "앱 버전 정보를 수집하는 중",
-    "Enable notifications for this account": "이 계정의 알림 사용하기",
-    "Messages containing <span>keywords</span>": "<span>키워드</span>가 적힌 메시지",
     "Room not found": "방을 찾을 수 없음",
     "Tuesday": "화요일",
-    "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
     "Search…": "찾기…",
     "Remove %(name)s from the directory?": "목록에서 %(name)s 방을 제거하겠습니까?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s은 많은 고급 브라우저 기능을 사용합니다. 일부는 현재 브라우저에서 쓸 수 없거나 실험 상태입니다.",
     "Developer Tools": "개발자 도구",
     "Unnamed room": "이름 없는 방",
     "Remove from Directory": "목록에서 제거",
     "Saturday": "토요일",
-    "Remember, you can always set an email address in user settings if you change your mind.": "기억하세요, 마음이 바뀌면 언제든지 사용자 설정에서 이메일 주소를 바꿀 수 있습니다.",
-    "Direct Chat": "다이렉트 대화",
     "The server may be unavailable or overloaded": "서버를 이용할 수 없거나 과부하된 상태임",
     "Reject": "거절하기",
-    "Failed to set Direct Message status of room": "방의 다이렉트 메시지 상태 설정에 실패함",
     "Monday": "월요일",
-    "All messages (noisy)": "모든 메시지 (소리)",
-    "Enable them now": "지금 켜기",
-    "Forward Message": "메시지 답장",
     "Toolbox": "도구 상자",
     "Collecting logs": "로그 수집 중",
-    "(HTTP status %(httpStatus)s)": "(HTTP 상태 %(httpStatus)s)",
     "All Rooms": "모든 방",
     "Quote": "인용",
-    "Failed to update keywords": "키워드 갱신 실패",
     "Send logs": "로그 보내기",
     "All messages": "모든 메시지",
     "Call invitation": "전화 초대",
     "Downloading update...": "업데이트 다운로드 중...",
-    "You have successfully set a password and an email address!": "성공적으로 비밀번호와 이메일 주소를 설정했습니다!",
     "What's new?": "새로운 점은?",
-    "Notify me for anything else": "모든 것에 대해 나에게 알림",
     "When I'm invited to a room": "방에 초대받았을 때",
-    "Keywords": "키워드",
-    "Can't update user notification settings": "사용자 알림 설정을 갱신할 수 없음",
-    "Notify for all other messages/rooms": "다른 모든 메시지/방에 대한 알림",
     "Unable to look up room ID from server": "서버에서 방 ID를 찾을 수 없음",
     "Couldn't find a matching Matrix room": "일치하는 Matrix 방을 찾을 수 없음",
     "Invite to this room": "이 방에 초대",
     "You cannot delete this message. (%(code)s)": "이 메시지를 삭제할 수 없습니다. (%(code)s)",
     "Thursday": "목요일",
-    "I understand the risks and wish to continue": "위험하다는 것을 이해했으며 계속하고 싶습니다",
     "Back": "돌아가기",
-    "Failed to change settings": "설정 변경 실패",
     "Show message in desktop notification": "컴퓨터 알림에서 내용 보이기",
-    "Unhide Preview": "미리 보기를 숨기지 않기",
     "Unable to join network": "네트워크에 들어갈 수 없음",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "죄송합니다. 쓰고 계신 브라우저에서는 %(brand)s를 사용할 수 <b>없습니다</b>.",
-    "Uploaded on %(date)s by %(user)s": "%(user)s님이 %(date)s에 업로드함",
     "Messages in group chats": "그룹 대화 메시지",
     "Yesterday": "어제",
     "Error encountered (%(errorDetail)s).": "오류가 일어났습니다 (%(errorDetail)s).",
     "Low Priority": "중요하지 않음",
     "%(brand)s does not know how to join a room on this network": "%(brand)s이 이 네트워크에서 방에 참가하는 방법을 모름",
-    "Set Password": "비밀번호 설정",
     "Off": "끄기",
-    "Mentions only": "언급한 것만",
     "Failed to remove tag %(tagName)s from room": "방에 %(tagName)s 태그 제거에 실패함",
     "Wednesday": "수요일",
-    "You can now return to your account after signing out, and sign in on other devices.": "이제 로그아웃한 후 계정으로 돌아가, 다른 기기에 로그인할 수 있습니다.",
-    "Enable email notifications": "이메일로 알림 사용하기",
     "No rooms to show": "보여줄 방 없음",
-    "Download this file": "이 파일 다운로드",
     "Thank you!": "감사합니다!",
     "View Source": "소스 보기",
-    "Unable to fetch notification target list": "알림 대상 목록을 가져올 수 없음",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 쓰는 브라우저로는, 응용 프로그램의 보고 느끼는 경험이 완전히 안 맞을수도 있고, 일부 혹은 전체 기능이 제대로 작동하지 않을 수 있습니다. 이 브라우저를 계속 사용하고 싶다면 사용해도 되지만 발생하는 문제는 스스로 해결해야 합니다!",
     "Checking for an update...": "업데이트를 확인하는 중...",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s님이 표시 이름을 %(displayName)s(으)로 바꿨습니다.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s가 방의 고정된 메시지를 바꿨습니다.",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s이 이름을 %(count)s번 바꿨습니다",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s이 이름을 바꿨습니다",
@@ -517,7 +385,6 @@
     "Display your community flair in rooms configured to show it.": "커뮤니티 재능이 보이도록 설정된 방에서 커뮤니티 재능을 표시할 수 있습니다.",
     "The user '%(displayName)s' could not be removed from the summary.": "사용자 %(displayName)s님을 요약에서 제거하지 못했습니다.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "이 방들은 커뮤니티 페이지에서 커뮤니티 구성원에게 보여집니다. 커뮤니티 구성원은 방을 클릭해 참가할 수 있습니다.",
-    "Pinned Messages": "고정된 메시지",
     "You're not currently a member of any communities.": "지금은 어떤 커뮤니티에도 속해 있지 않습니다.",
     "Flair": "재능",
     "Showing flair for these communities:": "이 커뮤니티에 재능을 공개 중:",
@@ -535,8 +402,6 @@
     "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와 같은 식별 가능한 정보를 포함하는 부분이 있는 데이터는 서버에 보내지기 전에 제거됩니다.",
     "Call Failed": "전화 실패",
-    "Call in Progress": "전화 거는 중",
-    "A call is already in progress!": "이미 전화가 진행 중입니다!",
     "PM": "오후",
     "AM": "오전",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s년 %(monthName)s %(day)s일 (%(weekDayName)s)",
@@ -579,10 +444,8 @@
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "저희는 프라이버시를 중요하게 여기기 때문에, 그 어떤 개인적이거나 특정할 수 있는 정보도 정보 분석을 위해 수집하지 않습니다.",
     "Send analytics data": "정보 분석 데이터 보내기",
     "Learn more about how we use analytics.": "저희가 어떻게 정보 분석을 이용하는지 알아보세요.",
-    "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.": "디버그 로그는 사용자 이름, 방문한 방이나 그룹의 ID나 별칭, 그리고 다른 사용자의 사용자 이름을 포함한 앱 이용 데이터를 포함합니다. 메시지는 포함하지 않습니다.",
     "Submit debug logs": "디버그 로그 전송하기",
     "Enable inline URL previews by default": "기본으로 인라인 URL 미리 보기 사용하기",
-    "Always show encryption icons": "암호화 아이콘을 언제나 보이기",
     "Enable automatic language detection for syntax highlighting": "구문 강조를 위해 자동 언어 감지 사용하기",
     "Automatically replace plain text Emoji": "일반 문자로 된 이모지 자동으로 변환하기",
     "Mirror local video feed": "보고 있는 비디오 전송 상태 비추기",
@@ -592,12 +455,6 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "새 커뮤니티 ID (예시: +foo:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "기본으로 URL 미리 보기가 이 방에 참여한 사람들 모두에게 켜졌습니다.",
     "URL previews are disabled by default for participants in this room.": "기본으로 URL 미리 보기가 이 방에 참여한 사람들 모두에게 꺼졌습니다.",
-    "Cannot add any more widgets": "더 이상 위젯을 추가할 수 없음",
-    "The maximum permitted number of widgets have already been added to this room.": "이미 이 방에는 허용된 최대 수의 위젯이 추가됐습니다.",
-    "Add a widget": "위젯 추가",
-    "%(senderName)s sent an image": "%(senderName)s님이 사진을 보냄",
-    "%(senderName)s sent a video": "%(senderName)s님이 영상을 보냄",
-    "%(senderName)s uploaded a file": "%(senderName)s님이 파일을 업로드함",
     "Key request sent.": "키 요청을 보냈습니다.",
     "Disinvite this user?": "이 사용자에 대한 초대를 취소할까요?",
     "Kick this user?": "이 사용자를 추방할까요?",
@@ -613,8 +470,6 @@
     "Unknown": "알 수 없음",
     "Replying": "답장 중",
     "Loading...": "로딩 중...",
-    "Unpin Message": "메시지 고정 풀기",
-    "No pinned messages.": "고정된 메시지가 없습니다.",
     "Send an encrypted message…": "암호화된 메시지를 보내세요…",
     "Send an encrypted reply…": "암호화된 메시지를 보내세요…",
     "Share Link to User": "사용자에게 링크 공유",
@@ -642,9 +497,7 @@
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "지금 이 방처럼, 암호화된 방에서는 홈서버 (미리 보기가 만들어지는 곳)에서 이 방에서 보여지는 링크에 대해 알 수 없도록 기본으로 URL 미리 보기가 꺼집니다.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "자기 자신을 강등하는 것은 되돌릴 수 없고, 자신이 마지막으로 이 방에서 특권을 가진 사용자라면 다시 특권을 얻는 건 불가능합니다.",
     "Jump to read receipt": "읽은 기록으로 건너뛰기",
-    "Jump to message": "메세지로 건너뛰기",
     "Share room": "방 공유하기",
-    "Community Invites": "커뮤니티 초대",
     "Members only (since they joined)": "구성원만(구성원들이 참여한 시점부터)",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s이 참가했습니다",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s이 %(count)s번 참가했습니다",
@@ -662,21 +515,15 @@
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s님이 %(count)s번 떠났습니다",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s님이 떠났습니다",
     "%(items)s and %(count)s others|one": "%(items)s님 외 한 명",
-    "A call is currently being placed!": "현재 전화를 걸고 있습니다!",
     "Permission Required": "권한 필요",
     "You do not have permission to start a conference call in this room": "이 방에서는 회의 전화를 시작할 권한이 없습니다",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>커뮤니티 페이지를 위한 HTML</h1>\n<p>\n    새 구성원에게 커뮤니티에 대해 소개하거나\n    일부 중요한 <a href=\"foo\">링크</a>를 나눠주기 위해 긴 설명을 사용\n</p>\n<p>\n    'img' 태그를 사용할 수도 있습니다\n</p>\n",
     "Copied!": "복사했습니다!",
     "Failed to copy": "복사 실패함",
     "Show Stickers": "스티커 보내기",
     "Hide Stickers": "스티커 숨기기",
     "Stickerpack": "스티커 팩",
     "You don't currently have any stickerpacks enabled": "현재 사용하고 있는 스티커 팩이 없음",
-    "An email has been sent to %(emailAddress)s": "%(emailAddress)s님에게 이메일을 보냈습니다",
     "Code": "코드",
-    "The email field must not be blank.": "이메일을 반드시 입력해야 합니다.",
-    "The phone number field must not be blank.": "전화번호를 반드시 입력해야 합니다.",
-    "The password field must not be blank.": "비밀번호를 반드시 입력해야 합니다.",
     "Disinvite this user from community?": "이 사용자에게 보낸 커뮤니티 초대를 취소합니까?",
     "Failed to withdraw invitation": "초대 취소에 실패함",
     "Filter community members": "커뮤니티 구성원 필터",
@@ -684,19 +531,14 @@
     "Filter community rooms": "커뮤니티 방 찾기",
     "Clear filter": "필터 지우기",
     "Did you know: you can use communities to filter your %(brand)s experience!": "그거 아세요: 커뮤니티로 %(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.": "필터를 사용하려면, 커뮤니티 아바타를 화면 왼쪽의 필터 패널로 드래그하세요. 언제든지 필터 패널에 있는 아바타를 클릭해 커뮤니티와 관련된 방과 사람들만 볼 수 있습니다.",
     "Muted Users": "음소거된 사용자",
     "Delete Widget": "위젯 삭제",
-    "An error ocurred whilst trying to remove the widget from the room": "방에서 위젯을 제거하는 동안 오류가 발생함",
-    "Failed to remove widget": "위젯 삭제에 실패함",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "위젯을 삭제하면 이 방의 모든 사용자에게도 제거됩니다. 위젯을 삭제하겠습니까?",
     "The room '%(roomName)s' could not be removed from the summary.": "'%(roomName)s' 방을 요약에서 제거하지 못했습니다.",
     "Failed to remove the room from the summary of %(groupId)s": "%(groupId)s의 요약에서 방을 제거하는데 실패함",
     "Failed to remove a user from the summary of %(groupId)s": "%(groupId)s의 요약에 사용자를 제거하는데 실패함",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "계정을 일시적으로 사용할 수 없게 됩니다. 로그인할 수 없고, 누구도 같은 사용자 ID를 다시 등록할 수 없습니다. 계정이 들어가 있던 모든 방에서 나오게 되고, ID 서버에서 계정 세부 정보도 제거됩니다. <b>이 결정은 돌이킬 수 없습니다.</b>",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Github를 통해 버그를 신고한다면, 디버그 로그가 문제를 해결하는데 도움을 줍니다. 디버그 로그에는 사용자 이름과 방문했던 방이나 그룹의 ID와 별칭, 그리고 다른 사용자의 사용자 이름이 포함됩니다. 대화 내용은 포함되지 않습니다.",
     "Delete widget": "위젯 삭제",
-    "Minimize apps": "앱 최소화",
     "Popout widget": "위젯 팝업",
     "Communities": "커뮤니티",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s이 초대를 거절했습니다",
@@ -713,7 +555,6 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "응답한 이벤트를 불러오지 못했습니다, 존재하지 않거나 볼 수 있는 권한이 없습니다.",
     "A text message has been sent to %(msisdn)s": "%(msisdn)s님에게 문자 메시지를 보냈습니다",
     "Something went wrong when trying to get your communities.": "커뮤니티를 받는 중 잘못되었습니다.",
-    "Allow": "허용",
     "Visible to everyone": "모두에게 보여짐",
     "Only visible to community members": "커뮤니티 구성원에게만 보여짐",
     "Visibility in Room List": "방 목록에서의 가시성",
@@ -738,21 +579,15 @@
     "example": "예시",
     "Create": "만들기",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "계정을 비활성화한다고 해서 <b>보냈던 메시지가 기본으로 지워지는 건 아닙니다.</b> 저희가 갖고 있는 메시지를 지우시려면 밑의 박스를 눌러주세요.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "다른 사람이 아무도 없군요! <inviteText>다른 사람을 초대하거나</inviteText> <nowarnText>방이 비었다는 것을 그만 알릴까요</nowarnText>?",
     "To continue, please enter your password:": "계속하려면 비밀번호를 입력해 주세요:",
     "Refresh": "새로고침",
-    "To get started, please pick a username!": "시작하려면, 사용자 이름을 골라주세요!",
     "Share Room": "방 공유",
     "Share User": "사용자 공유",
     "Share Community": "커뮤니티 공유",
     "Share Room Message": "방 메시지 공유",
     "Link to selected message": "선택한 메시지로 연결",
-    "COPY": "복사",
     "Unable to reject invite": "초대를 거절하지 못함",
     "Reply": "답장",
-    "Pin Message": "메시지 고정하기",
-    "Share Message": "메시지 공유",
-    "Collapse Reply Thread": "이어지는 답장 접기",
     "View Community": "커뮤니티 보기",
     "Add rooms to the community summary": "커뮤니티 요약에 방 추가",
     "Everyone": "모두",
@@ -835,9 +670,6 @@
     "Invite to this community": "이 커뮤니티에 초대",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "<consentLink>이용 약관</consentLink>을 검토하고 동의하기 전까진 메시지를 보낼 수 없습니다.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "이 홈서버가 월 간 활성 사용자 한도를 초과했기 때문에 메시지를 보낼 수 없었습니다. 서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>해주세요.",
-    "%(count)s of your messages have not been sent.|one": "메시지가 보내지지 않았습니다.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "지금 <resendText>전부 다시 보내기</resendText> 혹은 <cancelText>전부 취소</cancelText>합니다. 메시지 하나하나 다시 보내거나 취소할 수도 있습니다.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "지금 <resendText>메시지 다시 보내기</resendText> 혹은 <cancelText>메시지 취소</cancelText>합니다.",
     "No Audio Outputs detected": "오디오 출력 감지 없음",
     "Audio Output": "오디오 출력",
     "Please <a>contact your service administrator</a> to continue using this service.": "이 서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>하세요.",
@@ -875,7 +707,6 @@
     "Sends the given message coloured as a rainbow": "주어진 메시지를 무지개 색으로 보냅니다",
     "Sends the given emote coloured as a rainbow": "주어진 감정 표현을 무지개 색으로 보냅니다",
     "Displays list of commands with usages and descriptions": "사용법과 설명이 포함된 명령어 목록을 표시합니다",
-    "%(senderName)s made no change.": "%(senderName)s님은 변경 사항이 없습니다.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s님이 이 방을 업그레이드했습니다.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s님이 링크를 아는 사람들에게 방을 공개했습니다.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s님이 초대받은 사람만 방에 들어오도록 설정했습니다.",
@@ -1012,23 +843,19 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "맞춤 태그로 방을 그룹 & 필터\n(변경 사항을 적용하려면 새로고침)",
     "You do not have the required permissions to use this command.": "이 명령어를 사용하기 위해 필요한 권한이 없습니다.",
     "Render simple counters in room header": "방 헤더에 간단한 카운터 표현",
-    "Multiple integration managers": "여러 통합 관리자",
     "Enable Emoji suggestions while typing": "입력 중 이모지 제안 켜기",
     "Show a placeholder for removed messages": "감춘 메시지의 자리 표시하기",
     "Show join/leave messages (invites/kicks/bans unaffected)": "참가/떠남 메시지 보이기 (초대/추방/출입 금지는 영향 없음)",
     "Show avatar changes": "아바타 변경 사항 보이기",
     "Show display name changes": "표시 이름 변경 사항 보이기",
     "Show read receipts sent by other users": "다른 사용자가 읽은 기록 보이기",
-    "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": "입력 알림 보내기",
     "Enable Community Filter Panel": "커뮤니티 필터 패널 켜기",
-    "Allow Peer-to-Peer for 1:1 calls": "1:1 전화를 위해 P2P 허용",
     "Prompt before sending invites to potentially invalid matrix IDs": "잠재적으로 올바르지 않은 Matrix ID로 초대를 보내기 전에 확인",
     "Show developer tools": "개발 도구 보이기",
     "Show hidden events in timeline": "타임라인에서 숨겨진 이벤트 보이기",
-    "Low bandwidth mode": "낮은 대역폭 모드",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "홈서버가 전화를 제공하지 않을 경우 대체 전화 지원 서버 turn.matrix.org 허용 (전화하는 동안 IP 주소가 공유됨)",
     "Messages containing my username": "내 사용자 이름이 있는 메시지",
     "Messages containing @room": "@room이(가) 있는 메시지",
@@ -1052,17 +879,11 @@
     "Restore from Backup": "백업에서 복구",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s 키를 백업 중...",
     "All keys backed up": "모든 키 백업됨",
-    "Backup version: ": "백업 버전: ",
-    "Algorithm: ": "알고리즘: ",
     "Back up your keys before signing out to avoid losing them.": "잃어버리지 않도록 로그아웃하기 전에 키를 백업하세요.",
     "Start using Key Backup": "키 백업 시작",
-    "Add an email address to configure email notifications": "이메일 알림을 설정하려면 이메일 주소를 추가하세요",
     "Profile picture": "프로필 사진",
     "<a>Upgrade</a> to your own domain": "자체 도메인을 <a>업그레이드</a>하기",
     "Display Name": "표시 이름",
-    "Identity Server URL must be HTTPS": "ID 서버 URL은 HTTPS이어야 함",
-    "Not a valid Identity Server (status code %(code)s)": "올바르지 않은 ID 서버 (상태 코드 %(code)s)",
-    "Could not connect to Identity Server": "ID 서버에 연결할 수 없음",
     "Checking server": "서버 확인 중",
     "Terms of service not accepted or the identity server is invalid.": "서비스 약관에 동의하지 않거나 ID 서버가 올바르지 않습니다.",
     "Identity server has no terms of service": "ID 서버에 서비스 약관이 없음",
@@ -1070,17 +891,14 @@
     "Only continue if you trust the owner of the server.": "서버의 관리자를 신뢰하는 경우에만 계속하세요.",
     "Disconnect from the identity server <idserver />?": "ID 서버 <idserver />(으)로부터 연결을 끊겠습니까?",
     "Disconnect": "연결 끊기",
-    "Identity Server (%(server)s)": "ID 서버 (%(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.": "현재 <server></server>을(를) 사용하여 알고 있는 기존 연락처 사람들을 검색하거나 사람들이 당신을 검색할 수 있습니다. 아래에서 ID 서버를 변경할 수 있습니다.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "알고 있는 기존 연락처 사람들을 검색하거나 사람들이 당신을 검색할 수 있는 <server />을(를) 쓰고 싶지 않다면, 아래에 다른 ID 서버를 입력하세요.",
-    "Identity Server": "ID 서버",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "현재 ID 서버를 사용하고 있지 않습니다. 알고 있는 기존 연락처 사람들을 검색하거나 사람들이 당신을 검색하려면, 아래에 하나를 추가하세요.",
     "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.": "ID 서버로부터 연결을 끊으면 다른 사용자에게 검색될 수 없고, 이메일과 전화번호로 다른 사람을 초대할 수 없게 됩니다.",
     "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.": "ID 서버를 사용하는 것은 선택입니다. ID 서버를 사용하지 않는다면, 다른 사용자에게 검색될 수 없고, 이메일과 전화번호로 다른 사람을 초대할 수 없게 됩니다.",
     "Do not use an identity server": "ID 서버를 사용하지 않기",
     "Enter a new identity server": "새 ID 서버 입력",
     "Change": "변경",
-    "Integration Manager": "통합 관리자",
     "Email addresses": "이메일 주소",
     "Phone numbers": "전화번호",
     "Set a new account password...": "새 계정 비밀번호를 설정하세요...",
@@ -1110,7 +928,6 @@
     "Ignored users": "무시한 사용자",
     "Bulk options": "대량 설정",
     "Accept all %(invitedRooms)s invites": "모든 %(invitedRooms)s개의 초대를 수락",
-    "Key backup": "키 백업",
     "Security & Privacy": "보안 & 개인",
     "Missing media permissions, click the button below to request.": "미디어 권한이 없습니다, 권한 요청을 보내려면 아래 버튼을 클릭하세요.",
     "Request media permissions": "미디어 권한 요청",
@@ -1146,7 +963,6 @@
     "Change settings": "설정 변경",
     "Kick users": "사용자 추방",
     "Ban users": "사용자 출입 금지",
-    "Remove messages": "메시지 감추기",
     "Notify everyone": "모두에게 알림",
     "Send %(eventType)s events": "%(eventType)s 이벤트 보내기",
     "Roles & Permissions": "규칙 & 권한",
@@ -1200,11 +1016,6 @@
     "This room doesn't exist. Are you sure you're at the right place?": "이 방은 존재하지 않습니다. 여기가 확실합니까?",
     "Try again later, or ask a room admin to check if you have access.": "나중에 다시 시도하거나, 방 관리자에게 내가 접근을 했는지 확인을 요청하세요.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "방에 접근하려 할 때 %(errcode)s가 반환되었습니다. 이 메시지를 오류로 본다면, <issueLink>버그를 신고해주세요</issueLink>.",
-    "Never lose encrypted messages": "암호화된 메시지를 잃지 않기",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "이 방에서 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 상대방만 이 메시지를 읽을 키를 갖습니다.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "잃는 것을 막기 위해 키를 안전하게 백업합니다. <a>더 알아보기.</a>",
-    "Not now": "지금은 아님",
-    "Don't ask me again": "다시 묻지 않기",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "이 방을 업그레이드하면 현재 방의 인스턴스는 문을 닫고 같은 이름의 업그레이드된 방을 만듭니다.",
     "This room has already been upgraded.": "이 방은 이미 업그레이드됬습니다.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "이 방은 방 버전 <roomVersion />에서 실행 중이고, 이 홈서버가 <i>불안정</i>으로 표시됩니다.",
@@ -1226,14 +1037,11 @@
     "Edited at %(date)s. Click to view edits.": "%(date)s에 편집함. 클릭해서 편집 보기.",
     "edited": "편집됨",
     "Failed to load group members": "그룹 구성원을 불러오는 데 실패함",
-    "Maximize apps": "앱 최대화",
     "Join": "참가",
     "Yes": "네",
     "No": "아니오",
     "Rotate Left": "왼쪽으로 회전",
-    "Rotate counter-clockwise": "반시계 방향으로 회전",
     "Rotate Right": "오른쪽으로 회전",
-    "Rotate clockwise": "시계 방향으로 회전",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s이 초대를 %(count)s번 거절했습니다",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s이 초대를 %(count)s번 취소했습니다",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s이 초대를 취소했습니다",
@@ -1278,9 +1086,6 @@
     "Are you sure you want to sign out?": "로그아웃하겠습니까?",
     "Your homeserver doesn't seem to support this feature.": "홈서버가 이 기능을 지원하지 않는 모양입니다.",
     "Message edits": "메시지 편집",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "버그에 시달리거나 공유하고 싶은 피드백이 있다면, GitHub에 알려주세요.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "중복된 이슈를 피하기 위해, 먼저 <existingIssuesLink>존재하는 이슈를 확인</existingIssuesLink>해주세요 (그리고 +1을 추가하고요), 찾을 수 없다면 <newIssueLink>새 이슈를 만드세요</newIssueLink>.",
-    "Report bugs & give feedback": "버그 신고 & 피드백 제공",
     "Go back": "돌아가기",
     "Room Settings - %(roomName)s": "방 설정 - %(roomName)s",
     "Failed to upgrade room": "방 업그레이드에 실패함",
@@ -1289,8 +1094,6 @@
     "Update any local room aliases to point to the new room": "모든 로컬 방 별칭을 새 방을 향하도록 업데이트",
     "Sign out and remove encryption keys?": "로그아웃하고 암호화 키를 제거합니까?",
     "Enable room encryption": "방 암호화 켜기",
-    "A username can only contain lower case letters, numbers and '=_-./'": "사용자 이름은 소문자, 숫자 그리고 '=_-./'만 들어갈 수 있습니다",
-    "Checking...": "확인 중...",
     "Command Help": "명령어 도움",
     "To help us prevent this in future, please <a>send us logs</a>.": "앞으로 이를 방지할 수 있도록, <a>로그를 보내주세요</a>.",
     "Missing session data": "누락된 세션 데이터",
@@ -1314,24 +1117,13 @@
     "Upload %(count)s other files|one": "%(count)s개의 다른 파일 업로드",
     "Cancel All": "전부 취소",
     "Upload Error": "업로드 오류",
-    "A widget would like to verify your identity": "위젯이 ID를 확인하고 싶음",
-    "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.": "%(widgetUrl)s에 있는 위젯이 ID를 확인하고 싶어합니다. 이를 허용하면 위젯이 사용자 ID를 확인할 수 있지만, 사용자처럼 작업을 수행할 수는 없습니다.",
     "Remember my selection for this widget": "이 위젯에 대해 내 선택 기억하기",
-    "Deny": "거부",
     "Unable to load backup status": "백업 상태 불러올 수 없음",
     "Unable to restore backup": "백업을 복구할 수 없음",
     "No backup found!": "백업을 찾을 수 없습니다!",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s개의 세션 복호화에 실패했습니다!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>경고</b>: 신뢰할 수 있는 컴퓨터에서만 키 백업을 설정해야 합니다.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "복구 암호를 입력해서 보안 메시지 기록에 접근하고 보안 메시지 설정하기.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "복구 암호를 잊어버렸다면 <button1>복구 키를 사용</button1>하거나 <button2>새 복구 옵션을 설정</button2>할 수 있음",
-    "This looks like a valid recovery key!": "올바른 복구 키입니다!",
-    "Not a valid recovery key": "올바르지 않은 복구 키",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "복구 키를 입력해서 보안 메시지 기록에 접근하고 보안 메시지 설정하기.",
-    "Resend edit": "편집 다시 보내기",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s개의 리액션 다시 보내기",
-    "Resend removal": "삭제 다시 보내기",
-    "Share Permalink": "고유 링크 공유",
     "Clear status": "상태 지우기",
     "Update status": "상태 업데이트",
     "Set status": "상태 설정",
@@ -1340,15 +1132,7 @@
     "This homeserver would like to make sure you are not a robot.": "이 홈서버는 당신이 로봇이 아닌지 확인하고 싶어합니다.",
     "Please review and accept all of the homeserver's policies": "모든 홈서버의 정책을 검토하고 수락해주세요",
     "Please review and accept the policies of this homeserver:": "이 홈서버의 정책을 검토하고 수락해주세요:",
-    "Unable to validate homeserver/identity server": "홈서버/ID서버를 확인할 수 없음",
-    "Your Modular server": "당신의 Modular 서버",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Modular 홈서버의 위치를 입력하세요. 고유 도메인 이름 혹은 <a>modular.im</a>의 하위 도메인으로 사용할 수 있습니다.",
-    "Server Name": "서버 이름",
-    "The username field must not be blank.": "사용자 이름을 반드시 입력해야 합니다.",
     "Username": "사용자 이름",
-    "Not sure of your password? <a>Set a new one</a>": "비밀번호가 불확실한가요? <a>새 것으로 설정</a>",
-    "Sign in to your Matrix account on %(serverName)s": "%(serverName)s에서 Matrix 계정으로 로그인함",
-    "Sign in to your Matrix account on <underlinedServerName />": "<underlinedServerName />에서 Matrix 계정으로 로그인함",
     "Use an email address to recover your account": "이메일 주소를 사용하여 계정을 복구",
     "Enter email address (required on this homeserver)": "이메일 주소를 입력 (이 홈서버에 필요함)",
     "Doesn't look like a valid email address": "올바른 이메일 주소가 아닙니다",
@@ -1359,28 +1143,13 @@
     "Passwords don't match": "비밀번호가 맞지 않음",
     "Other users can invite you to rooms using your contact details": "다른 사용자가 연락처 세부 정보를 사용해서 당신을 방에 초대할 수 있음",
     "Enter phone number (required on this homeserver)": "전화번호 입력 (이 홈서버에 필요함)",
-    "Doesn't look like a valid phone number": "올바른 전화번호가 아닙니다",
     "Use lowercase letters, numbers, dashes and underscores only": "소문자, 숫자, 가로선, 밑줄선만 사용할 수 있음",
     "Enter username": "사용자 이름 입력",
     "Some characters not allowed": "일부 문자는 허용할 수 없습니다",
     "Email (optional)": "이메일 (선택)",
     "Confirm": "확인",
     "Phone (optional)": "전화 (선택)",
-    "Create your Matrix account on %(serverName)s": "%(serverName)s에서 Matrix 계정 만들기",
-    "Create your Matrix account on <underlinedServerName />": "<underlinedServerName />에서 Matrix 계정 만들기",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "계정 복구를 위해 이메일을 설정하세요. 이메일 또는 전화를 사용해 존재하는 연락처 사람들이 검색할 수 있습니다.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "계정 복구를 위해 이메일을 설정하세요. 이메일을 사용해 존재하는 연락처 사람들이 검색할 수 있습니다.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "맞춤 홈서버 URL을 입력 <a>무엇을 의미하나요?</a>",
-    "Homeserver URL": "홈서버 URL",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "맞춤 ID 서버 URL을 입력 <a>무엇을 의미하나요?</a>",
-    "Identity Server URL": "ID 서버 URL",
-    "Other servers": "다른 서버",
-    "Free": "무료",
     "Join millions for free on the largest public server": "가장 넓은 공개 서버에 수 백 만명이 무료로 등록함",
-    "Premium": "프리미엄",
-    "Premium hosting for organisations <a>Learn more</a>": "조직을 위한 프리미엄 호스팅 <a>더 알아보기</a>",
-    "Find other public servers or use a custom server": "다릉 공개 서버를 찾거나 맞춤 서버 사용",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "최상의 경험을 위해 <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, 또는 <safariLink>Safari</safariLink>를 설치해주세요.",
     "Couldn't load page": "페이지를 불러올 수 없음",
     "Failed to add the following rooms to the summary of %(groupId)s:": "%(groupId)s의 요약에 다음 방을 추가하는데 실패함:",
     "Failed to add the following users to the summary of %(groupId)s:": "%(groupId)s의 요약에 다음 사용자를 추가하는데 실패함:",
@@ -1395,11 +1164,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.",
     "Guest": "손님",
-    "Your profile": "당신의 프로필",
     "Could not load user profile": "사용자 프로필을 불러올 수 없음",
-    "Your Matrix account on %(serverName)s": "%(serverName)s에서 당신의 Matrix 계정",
-    "Your Matrix account on <underlinedServerName />": "<underlinedServerName />에서 당신의 Matrix 계정",
-    "No identity server is configured: add one in server settings to reset your password.": "ID 서버가 설정되지 않음: 비밀번호를 초기화하기 위해 서버 설정에서 하나를 추가하세요.",
     "Sign in instead": "대신 로그인",
     "A verification email will be sent to your inbox to confirm setting your new password.": "새 비밀번호 설정을 확인할 인증 이메일을 메일함으로 보냈습니다.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s(으)로 이메일을 보냈습니다. 메일에 있는 링크를 따라갔다면, 아래를 클릭하세요.",
@@ -1426,7 +1191,6 @@
     "<a>Log in</a> to your new account.": "새 계정으로 <a>로그인</a>하기.",
     "You can now close this window or <a>log in</a> to your new account.": "이제 이 창을 닫거나 새 계정으로 <a>로그인</a>할 수 있습니다.",
     "Registration Successful": "등록 성공",
-    "Create your account": "당신의 계정 만들기",
     "Failed to re-authenticate due to a homeserver problem": "홈서버 문제로 다시 인증에 실패함",
     "Failed to re-authenticate": "다시 인증에 실패함",
     "Enter your password to sign in and regain access to your account.": "로그인하고 계정에 다시 접근하려면 비밀번호를 입력하세요.",
@@ -1449,12 +1213,8 @@
     "Success!": "성공!",
     "Unable to create key backup": "키 백업을 만들 수 없음",
     "Retry": "다시 시도",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "보안 메시지 복구를 설정하지 않으면, 로그아웃할 때 보안 메시지 기록을 잃게 됩니다.",
-    "If you don't want to set this up now, you can later in Settings.": "지금 설정하고 싶지 않다면, 나중에 설정에서 할 수 있습니다.",
     "Set up": "설정",
-    "Don't ask again": "다시 묻지 않기",
     "New Recovery Method": "새 복구 방식",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "보안 메시지 용 새로운 복구 암호와 키가 감지되었습니다.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "새 복구 방식을 설정하지 않으면, 공격자가 계정에 접근을 시도할 지도 모릅니다. 설정에서 계정 비밀번호를 바꾸고 즉시 새 복구 방식을 설정하세요.",
     "Go to Settings": "설정으로 가기",
     "Set up Secure Messages": "보안 메시지 설정",
@@ -1494,10 +1254,7 @@
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "메시지의 양이 많아서 시간이 걸릴 수 있습니다. 처리하는 동안 클라이언트를 새로고침하지 말아주세요.",
     "Remove %(count)s messages|other": "%(count)s개의 메시지 삭제",
     "Remove recent messages": "최근 메시지 삭제",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "메시지 읽은 기록 보내기 (이 기능을 끄려면 그것을 호환하는 홈서버이어야 함)",
-    "Explore": "검색",
     "Filter": "필터",
-    "Filter rooms…": "방 필터…",
     "Preview": "미리 보기",
     "View": "보기",
     "Find a room…": "방 찾기…",
@@ -1516,14 +1273,11 @@
     "Changes the avatar of the current room": "현재 방의 아바타 변경하기",
     "e.g. my-room": "예: my-room",
     "Please enter a name for the room": "방 이름을 입력해주세요",
-    "This room is private, and can only be joined by invitation.": "이 방은 개인입니다, 오직 초대로만 참가할 수 있습니다.",
     "Create a public room": "공개 방 만들기",
     "Create a private room": "개인 방 만들기",
     "Topic (optional)": "주제 (선택)",
-    "Make this room public": "이 방 주제를 정하기",
     "Hide advanced": "고급 숨기기",
     "Show advanced": "고급 보이기",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "다른 매트릭스 홈서버에서 이 방에 참가하려는 사용자를 막기 (이 설정은 이후 변경할 수 없습니다!)",
     "Close dialog": "대화 상자 닫기",
     "To continue you need to accept the terms of this service.": "계속하려면 이 서비스 약관에 동의해야 합니다.",
     "Document": "문서",
@@ -1537,7 +1291,6 @@
     "Clear cache and reload": "캐시 지우기 및 새로고침",
     "%(count)s unread messages including mentions.|other": "언급을 포함한 %(count)s개의 읽지 않은 메시지.",
     "%(count)s unread messages.|other": "%(count)s개의 읽지 않은 메시지.",
-    "Unread mentions.": "읽지 않은 언급.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "이 버그를 조사할 수 있도록 GitHub에 <newIssueLink>새 이슈를 추가</newIssueLink>해주세요.",
     "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개의 메시지 삭제",
@@ -1553,7 +1306,6 @@
     "contact the administrators of identity server <idserver />": "ID 서버 <idserver />의 관리자와 연락하세요",
     "wait and try again later": "기다리고 나중에 다시 시도하세요",
     "Command Autocomplete": "명령어 자동 완성",
-    "DuckDuckGo Results": "DuckDuckGo 결과",
     "Quick Reactions": "빠른 리액션",
     "Frequently Used": "자주 사용함",
     "Smileys & People": "표정 & 사람",
@@ -1572,8 +1324,6 @@
     "Jump to first unread room.": "읽지 않은 첫 방으로 건너뜁니다.",
     "Jump to first invite.": "첫 초대로 건너뜁니다.",
     "Room %(name)s": "%(name)s 방",
-    "Recent rooms": "최근 방",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "설정된 ID 서버가 없어서 이후 비밀번호를 초기화하기 위한 이메일 주소를 추가할 수 없습니다.",
     "%(count)s unread messages including mentions.|one": "1개의 읽지 않은 언급.",
     "%(count)s unread messages.|one": "1개의 읽지 않은 메시지.",
     "Unread messages.": "읽지 않은 메시지.",
@@ -1625,8 +1375,6 @@
     "Subscribe": "구독",
     "Trusted": "신뢰함",
     "Not trusted": "신뢰하지 않음",
-    "Direct message": "다이렉트 메시지",
-    "<strong>%(role)s</strong> in %(roomName)s": "%(roomName)s 방의 <strong>%(role)s</strong>",
     "Messages in this room are end-to-end encrypted.": "이 방의 메시지는 종단간 암호화되었습니다.",
     "Security": "보안",
     "Verify": "확인",
@@ -1639,7 +1387,6 @@
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "방 ID",
     "Widget ID": "위젯 ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "이 위젯을 사용하면 <helpcon /> %(widgetDomain)s & 통합 관리자와 데이터를 공유합니다.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "이 위젯을 사용하면 <helpIcon /> %(widgetDomain)s와(과) 데이터를 공유합니다.",
     "Widget added by": "위젯을 추가했습니다",
     "This widget may use cookies.": "이 위젯은 쿠키를 사용합니다.",
@@ -1650,13 +1397,10 @@
     "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을 설치형 프로그레시브 웹 앱으로 사용하는지 여부",
     "Your user agent": "사용자 에이전트",
-    "If you cancel now, you won't complete verifying the other user.": "지금 취소하면 다른 사용자 확인이 완료될 수 없습니다.",
-    "If you cancel now, you won't complete verifying your other session.": "지금 취소하면 당신의 다른 세션을 검증할 수 없습니다.",
     "Cancel entering passphrase?": "암호 입력을 취소하시겠습니까?",
     "Setting up keys": "키 설정",
     "Verify this session": "이 세션 검증",
     "Encryption upgrade available": "암호화 업그레이드 가능",
-    "Set up encryption": "암호화 설정",
     "Error upgrading room": "방 업그레이드 오류",
     "Double check that your server supports the room version chosen and try again.": "서버가 선택한 방 버전을 지원하는지 확인한 뒤에 다시 시도해주세요.",
     "Verifies a user, session, and pubkey tuple": "사용자, 세션, 공개키 튜플을 검증합니다",
@@ -1667,5 +1411,13 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다.",
     "Show more": "더 보기",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 변경한다면 방의 암호화 키를 내보낸 후 다시 가져오지 않는 이상 모든 종단간 암호화 키는 초기화 될 것이고, 암호화된 대화 내역은 읽을 수 없게 될 것입니다. 이 문제는 추후에 개선될 것입니다.",
-    "Create Account": "계정 만들기"
+    "Create Account": "계정 만들기",
+    "Integration manager": "통합 관리자",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "이 위젯을 사용하면 <helpcon /> %(widgetDomain)s & 통합 관리자와 데이터를 공유합니다.",
+    "Identity server is": "ID 서버:",
+    "Identity server": "ID 서버",
+    "Identity server (%(server)s)": "ID 서버 (%(server)s)",
+    "Could not connect to identity server": "ID 서버에 연결할 수 없음",
+    "Not a valid identity server (status code %(code)s)": "올바르지 않은 ID 서버 (상태 코드 %(code)s)",
+    "Identity server URL must be HTTPS": "ID 서버 URL은 HTTPS이어야 함"
 }
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 83b59681e7..7c1367ba78 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -11,34 +11,23 @@
     "Analytics": "Analitika",
     "The information being sent to us to help make %(brand)s better includes:": "Informacija, siunčiama mums siekiant pagerinti %(brand)s, yra:",
     "Fetching third party location failed": "Nepavyko gauti trečios šalies vietos",
-    "I understand the risks and wish to continue": "Suprantu šią riziką ir noriu tęsti",
     "Send Account Data": "Siųsti paskyros duomenis",
-    "Advanced notification settings": "Išplėstiniai pranešimų nustatymai",
-    "Uploading report": "Išsiunčiama ataskaita",
     "Sunday": "Sekmadienis",
     "Guests can join": "Svečiai gali prisijungti",
     "Notification targets": "Pranešimo objektai",
     "Today": "Šiandien",
-    "Files": "Failai",
-    "You are not receiving desktop notifications": "Jūs negaunate darbalaukio pranešimų",
     "Friday": "Penktadienis",
     "Update": "Atnaujinti",
     "Notifications": "Pranešimai",
-    "Unable to fetch notification target list": "Nėra galimybės rasti pranešimo objektų sąrašui",
     "On": "Įjungta",
     "Changelog": "Keitinių žurnalas",
     "Waiting for response from server": "Laukiama atsakymo iš serverio",
     "Failed to change password. Is your password correct?": "Nepavyko pakeisti slaptažodžio. Ar jūsų slaptažodis teisingas?",
-    "Uploaded on %(date)s by %(user)s": "Atnaujinta %(date)s vartotojo %(user)s",
     "OK": "Gerai",
     "Send Custom Event": "Siųsti pasirinktinį įvykį",
-    "All notifications are currently disabled for all targets.": "Šiuo metu visi pranešimai visiems objektams yra išjungti.",
     "Operation failed": "Operacija nepavyko",
-    "Forget": "Pamiršti",
     "World readable": "Visiems skaitomas",
     "Mute": "Nutildyti",
-    "You cannot delete this image. (%(code)s)": "Jūs negalite ištrinti šio vaizdo. (%(code)s)",
-    "Cancel Sending": "Atšaukti siuntimą",
     "Warning": "Įspėjimas",
     "This Room": "Šis pokalbių kambarys",
     "Resend": "Siųsti iš naujo",
@@ -46,13 +35,7 @@
     "Downloading update...": "Atsiunčiamas atnaujinimas...",
     "Messages in one-to-one chats": "Žinutės privačiuose pokalbiuose",
     "Unavailable": "Neprieinamas",
-    "Error saving email notification preferences": "Klaida saugojant el. pašto pranešimų nuostatas",
-    "View Decrypted Source": "Peržiūrėti iššifruotą šaltinį",
-    "Failed to update keywords": "Nepavyko atnaujinti raktažodžių",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Pranešimai šiems raktažodžiams yra uždrausti taisyklėmis:",
-    "Please set a password!": "Prašau įrašykite slaptažodį!",
     "powered by Matrix": "veikia su Matrix",
-    "You have successfully set a password!": "Jūs sėkmingai įrašėte slaptažodį!",
     "Favourite": "Mėgstamas",
     "All Rooms": "Visi pokalbių kambariai",
     "Explore Room State": "Peržiūrėti kambario būseną",
@@ -64,40 +47,26 @@
     "No update available.": "Nėra galimų atnaujinimų.",
     "Noisy": "Triukšmingas",
     "Collecting app version information": "Renkama programos versijos informacija",
-    "Keywords": "Raktažodžiai",
-    "Unpin Message": "Atsegti Žinutę",
-    "Enable notifications for this account": "Įjungti pranešimus šiai paskyrai",
     "Remove": "Pašalinti",
     "Invite to this community": "Pakviesti į šią bendruomenę",
-    "Messages containing <span>keywords</span>": "Žinutės, kuriose yra <span>raktažodžiai</span>",
     "When I'm invited to a room": "Kai mane pakviečia į kambarį",
     "Tuesday": "Antradienis",
-    "Enter keywords separated by a comma:": "Įveskite kableliais atskirtus raktažodžius:",
     "Search…": "Paieška…",
-    "You have successfully set a password and an email address!": "Jūs sėkmingai įrašėte slaptažodį ir el. pašto adresą!",
     "Remove %(name)s from the directory?": "Ar ištrinti %(name)s iš katalogo?",
-    "%(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": "Atmesti",
     "Explore Account Data": "Peržiūrėti paskyros duomenis",
     "Remove from Directory": "Pašalinti iš Katalogo",
-    "Download this file": "Atsisiųsti šį failą",
     "Saturday": "Šeštadienis",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Nepamirškite, kad jei persigalvosite, tai bet kada galite nustatyti el. pašto adresą vartotojo nustatymuose.",
-    "Direct Chat": "Privatus pokalbis",
     "The server may be unavailable or overloaded": "Gali būti, kad serveris yra neprieinamas arba perkrautas",
     "Online": "Prisijungęs",
-    "Failed to set Direct Message status of room": "Nepavyko nustatyti privačios žinutės kambario statuso",
     "Monday": "Pirmadienis",
-    "All messages (noisy)": "Visos žinutės (triukšmingas)",
-    "Enable them now": "Įjungti juos dabar",
     "Toolbox": "Įrankinė",
     "Collecting logs": "Renkami žurnalai",
     "Rooms": "Kambariai",
     "Search": "Ieškoti",
     "You must specify an event type!": "Privalote nurodyti įvykio tipą!",
-    "(HTTP status %(httpStatus)s)": "(HTTP būsena %(httpStatus)s)",
     "Failed to forget room %(errCode)s": "Nepavyko pamiršti kambario %(errCode)s",
     "What's New": "Kas Naujo",
     "Wednesday": "Trečiadienis",
@@ -111,59 +80,42 @@
     "State Key": "Būklės raktas",
     "Failed to send custom event.": "Nepavyko išsiųsti pasirinktinio įvykio.",
     "What's new?": "Kas naujo?",
-    "Notify me for anything else": "Pranešti man apie visa kita",
     "View Source": "Peržiūrėti šaltinį",
     "Close": "Uždaryti",
-    "Can't update user notification settings": "Nepavyksta atnaujinti naudotojo pranešimų nustatymų",
-    "Notify for all other messages/rooms": "Pranešti apie visas kitas žinutes/pokalbių kambarius",
     "Unable to look up room ID from server": "Nepavyko gauti kambario ID iš serverio",
     "Couldn't find a matching Matrix room": "Nepavyko rasti atitinkamo Matrix kambario",
     "Invite to this room": "Pakviesti į šį kambarį",
     "You cannot delete this message. (%(code)s)": "Jūs negalite trinti šios žinutės. (%(code)s)",
     "Thursday": "Ketvirtadienis",
-    "Forward Message": "Persiųsti žinutę",
     "Back": "Atgal",
     "Reply": "Atsakyti",
     "Show message in desktop notification": "Rodyti žinutę darbalaukio pranešime",
     "Reject": "Atmesti",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Atleiskite, jūsų naršyklė <b>negali</b> paleisti %(brand)s.",
     "Quote": "Cituoti",
     "Messages in group chats": "Žinutės grupiniuose pokalbiuose",
     "Yesterday": "Vakar",
     "Error encountered (%(errorDetail)s).": "Susidurta su klaida (%(errorDetail)s).",
     "Low Priority": "Žemo prioriteto",
     "%(brand)s does not know how to join a room on this network": "%(brand)s nežino kaip prisijungti prie kambario šiame tinkle",
-    "Set Password": "Nustatyti slaptažodį",
-    "An error occurred whilst saving your email notification preferences.": "Saugojant jūsų el. pašto pranešimų nuostatas, įvyko klaida.",
     "Unable to join network": "Nepavyko prisijungti prie tinklo",
     "Register": "Registruotis",
     "Off": "Išjungta",
     "Edit": "Koreguoti",
-    "Mentions only": "Tik paminėjimai",
     "remove %(name)s from the directory.": "pašalinti %(name)s iš katalogo.",
-    "You can now return to your account after signing out, and sign in on other devices.": "Po atsijungimo galite grįžti prie savo paskyros ir prisijungti kituose įrenginiuose.",
     "Continue": "Tęsti",
-    "Enable email notifications": "Įjungti pranešimus el. paštu",
     "Event Type": "Įvykio tipas",
     "No rooms to show": "Nėra kambarių rodymui",
     "Add rooms to this community": "Įtraukti kambarius į šią bendruomenę",
-    "Pin Message": "Prisegti žinutę",
-    "Failed to change settings": "Nepavyko pakeisti nustatymų",
     "Leave": "Išeiti",
     "View Community": "Peržiūrėti bendruomenes",
     "Developer Tools": "Programuotojo Įrankiai",
-    "Unhide Preview": "Rodyti paržiūrą",
-    "Custom Server Options": "Pasirinktiniai Serverio Nustatymai",
     "Event Content": "Įvykio turinys",
     "Thank you!": "Ačiū!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Naudojant šią naršyklę aplikacija gali atrodyti ir reaguoti neteisingai. Kai kurios arba visos funkcijos gali neveikti. Jei vis tiek norite pabandyti gali tęsti, tačiau iškilusios problemos yra jūsų pačių reikalas!",
     "Checking for an update...": "Tikrinama ar yra atnaujinimų...",
     "e.g. %(exampleValue)s": "pvz., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "pvz., <CurrentPageURL>",
     "Your device resolution": "Jūsų įrenginio skyra",
     "Call Failed": "Skambutis Nepavyko",
-    "Unable to capture screen": "Nepavyko nufotografuoti ekrano",
-    "You are already in a call.": "Jūs jau esate skambutyje.",
     "VoIP is unsupported": "VoIP yra nepalaikoma",
     "Permission Required": "Reikalingas Leidimas",
     "Upload Failed": "Įkėlimas Nepavyko",
@@ -208,7 +160,6 @@
     "This email address was not found": "Šis el. pašto adresas buvo nerastas",
     "Admin": "Administratorius",
     "Failed to invite": "Nepavyko pakviesti",
-    "Failed to invite the following users to the %(roomName)s room:": "Nepavyko pakviesti šių vartotojų į kambarį %(roomName)s:",
     "You need to be logged in.": "Jūs turite būti prisijungę.",
     "Unable to create widget.": "Nepavyko sukurti valdiklio.",
     "Failed to send request.": "Nepavyko išsiųsti užklausos.",
@@ -216,7 +167,6 @@
     "You are not in this room.": "Jūs nesate šiame kambaryje.",
     "You do not have permission to do that in this room.": "Jūs neturite leidimo tai atlikti šiame kambaryje.",
     "Room %(roomId)s not visible": "Kambarys %(roomId)s nematomas",
-    "/ddg is not a command": "/ddg nėra komanda",
     "Changes your display nickname": "Pakeičia jūsų rodomą slapyvardį",
     "Invites user with given id to current room": "Pakviečia vartotoją su nurodytu id į dabartinį kambarį",
     "You are now ignoring %(userId)s": "Dabar ignoruojate %(userId)s",
@@ -224,27 +174,13 @@
     "Verified key": "Patvirtintas raktas",
     "Displays action": "Rodo veiksmą",
     "Reason": "Priežastis",
-    "%(targetName)s accepted an invitation.": "%(targetName)s priėmė pakvietimą.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s pakvietė %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s pakeitė savo rodomą vardą į %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nustatė savo rodomą vardą į %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s pašalino savo rodomą vardą (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s pašalino savo profilio paveikslėlį.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s pakeitė savo profilio paveikslėlį.",
-    "%(senderName)s set a profile picture.": "%(senderName)s nustatė profilio paveikslėlį.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s atmetė pakvietimą.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s pakeitė temą į \"%(topic)s\".",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą į %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s išsiuntė vaizdą.",
     "Someone": "Kažkas",
-    "%(senderName)s answered the call.": "%(senderName)s atsiliepė į skambutį.",
-    "(unknown failure: %(reason)s)": "(nežinoma klaida: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s užbaigė skambutį.",
     "Unnamed Room": "Bevardis Kambarys",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rodyti laiko žymes 12 valandų formatu (pvz. 2:30pm)",
     "Always show message timestamps": "Visada rodyti žinučių laiko žymes",
-    "Always show encryption icons": "Visada rodyti šifravimo piktogramas",
-    "Room Colour": "Kambario Spalva",
     "Decline": "Atmesti",
     "Accept": "Priimti",
     "Incorrect verification code": "Neteisingas patvirtinimo kodas",
@@ -260,16 +196,9 @@
     "Do you want to set an email address?": "Ar norite nustatyti el. pašto adresą?",
     "Current password": "Dabartinis slaptažodis",
     "Password": "Slaptažodis",
-    "New Password": "Naujas Slaptažodis",
+    "New Password": "Naujas slaptažodis",
     "Failed to set display name": "Nepavyko nustatyti rodomo vardo",
-    "Cannot add any more widgets": "Nepavyksta pridėti daugiau valdiklių",
-    "Add a widget": "Pridėti valdiklį",
-    "Drop File Here": "Vilkite failą čia",
     "Drop file here to upload": "Norėdami įkelti, vilkite failą čia",
-    " (unsupported)": " (nepalaikoma)",
-    "%(senderName)s sent an image": "%(senderName)s išsiuntė vaizdą",
-    "%(senderName)s sent a video": "%(senderName)s išsiuntė vaizdo įrašą",
-    "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
     "Options": "Parinktys",
     "Key request sent.": "Rakto užklausa išsiųsta.",
     "Failed to mute user": "Nepavyko nutildyti vartotojo",
@@ -286,31 +215,24 @@
     "Server error": "Serverio klaida",
     "Command error": "Komandos klaida",
     "Loading...": "Įkeliama...",
-    "Pinned Messages": "Prisegtos žinutės",
     "Unknown": "Nežinoma",
     "Save": "Išsaugoti",
     "(~%(count)s results)|other": "(~%(count)s rezultatų(-ai))",
     "(~%(count)s results)|one": "(~%(count)s rezultatas)",
     "Upload avatar": "Įkelti pseudoportretą",
     "Settings": "Nustatymai",
-    "Community Invites": "Bendruomenės pakvietimai",
     "%(roomName)s does not exist.": "%(roomName)s neegzistuoja.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s šiuo metu nėra pasiekiamas.",
     "Muted Users": "Nutildyti naudotojai",
-    "Click here to fix": "Spustelėkite čia, norėdami pataisyti",
     "Only people who have been invited": "Tik žmonės, kurie buvo pakviesti",
-    "Anyone who knows the room's link, apart from guests": "Bet kas, žinantis kambario nuorodą, išskyrus svečius",
-    "Anyone who knows the room's link, including guests": "Bet kas, žinantis kambario nuorodą, įskaitant svečius",
     "Anyone": "Bet kas",
     "Permissions": "Leidimai",
     "Advanced": "Išplėstiniai",
-    "Add a topic": "Pridėti temą",
     "This room has no local addresses": "Šis kambarys neturi jokių vietinių adresų",
     "Invalid community ID": "Neteisingas bendruomenės ID",
     "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" nėra teisingas bendruomenės ID",
     "New community ID (e.g. +foo:%(localDomain)s)": "Naujas bendruomenės ID (pvz., +betkoks:%(localDomain)s)",
     "URL Previews": "URL nuorodų peržiūros",
-    "Error decrypting audio": "Klaida iššifruojant garsą",
     "Error decrypting attachment": "Klaida iššifruojant priedą",
     "Decrypt %(text)s": "Iššifruoti %(text)s",
     "Download %(text)s": "Atsisiųsti %(text)s",
@@ -318,14 +240,9 @@
     "Error decrypting video": "Klaida iššifruojant vaizdo įrašą",
     "Copied!": "Nukopijuota!",
     "Failed to copy": "Nepavyko nukopijuoti",
-    "An email has been sent to %(emailAddress)s": "El. laiškas buvo išsiųstas į %(emailAddress)s",
-    "Please check your email to continue registration.": "Norėdami tęsti registraciją, patikrinkite savo el. paštą.",
     "A text message has been sent to %(msisdn)s": "Tekstinė žinutė buvo išsiųsta į %(msisdn)s",
     "Please enter the code it contains:": "Įveskite joje esantį kodą:",
     "Code": "Kodas",
-    "The email field must not be blank.": "El. pašto laukas negali būti tuščias.",
-    "The phone number field must not be blank.": "Telefono numerio laukas negali būti tuščias.",
-    "The password field must not be blank.": "Slaptažodžio laukas negali būti tuščias.",
     "Email address": "El. pašto adresas",
     "Remove from community": "Pašalinti iš bendruomenės",
     "Remove this user from community?": "Pašalinti šį vartotoją iš bendruomenės?",
@@ -337,16 +254,10 @@
     "Visibility in Room List": "Matomumas kambarių sąraše",
     "Visible to everyone": "Matomas visiems",
     "Unknown Address": "Nežinomas adresas",
-    "Allow": "Leisti",
     "Delete Widget": "Ištrinti valdiklį",
     "Delete widget": "Ištrinti valdiklį",
-    "Failed to remove widget": "Nepavyko pašalinti valdiklio",
-    "%(count)s of your messages have not been sent.|other": "Kai kurios iš jūsų žinučių nebuvo išsiųstos.",
-    "%(count)s of your messages have not been sent.|one": "Jūsų žinutė nebuvo išsiųsta.",
     "Connectivity to the server has been lost.": "Jungiamumas su šiuo serveriu buvo prarastas.",
     "Sent messages will be stored until your connection has returned.": "Išsiųstos žinutės bus saugomos tol, kol atsiras ryšys.",
-    "Active call": "Aktyvus skambutis",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Čia daugiau nieko nėra! Ar norėtumėte <inviteText>pakviesti kitus</inviteText> ar <nowarnText>išjungti įspėjimą apie tuščią kambarį</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Panašu, kad jūs įkeliate failus, ar tikrai norite išeiti?",
     "You seem to be in a call, are you sure you want to quit?": "Panašu, kad jūs dalyvaujate skambutyje, ar tikrai norite išeiti?",
     "Search failed": "Paieška nepavyko",
@@ -354,11 +265,6 @@
     "No more results": "Daugiau nėra jokių rezultatų",
     "Room": "Kambarys",
     "Failed to reject invite": "Nepavyko atmesti pakvietimo",
-    "Fill screen": "Užpildyti ekraną",
-    "Click to unmute video": "Spustelėkite, norėdami įjungti vaizdą",
-    "Click to mute video": "Spustelėkite, norėdami išjungti vaizdą",
-    "Click to unmute audio": "Spustelėkite, norėdami įjungti garsą",
-    "Click to mute audio": "Spustelėkite, norėdami nutildyti garsą",
     "Clear filter": "Išvalyti filtrą",
     "Uploading %(filename)s and %(count)s others|other": "Įkeliamas %(filename)s ir dar %(count)s failai",
     "Uploading %(filename)s and %(count)s others|zero": "Įkeliamas %(filename)s",
@@ -379,9 +285,7 @@
     "Email": "El. paštas",
     "Profile": "Profilis",
     "Account": "Paskyra",
-    "click to reveal": "spustelėkite, norėdami atskleisti",
     "%(brand)s version:": "%(brand)s versija:",
-    "olm version:": "olm versija:",
     "Failed to send email": "Nepavyko išsiųsti el. laiško",
     "The email address linked to your account must be entered.": "Privalo būti įvestas su jūsų paskyra susietas el. pašto adresas.",
     "A new password must be entered.": "Privalo būti įvestas naujas slaptažodis.",
@@ -391,9 +295,7 @@
     "Send Reset Email": "Siųsti naujo slaptažodžio nustatymo el. laišką",
     "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Atkreipkite dėmesį, kad jūs jungiatės prie %(hs)s serverio, o ne matrix.org.",
-    "Failed to fetch avatar URL": "Nepavyko gauti pseudoportreto URL",
     "Commands": "Komandos",
-    "Results from DuckDuckGo": "Rezultatai iš DuckDuckGo",
     "Notify the whole room": "Pranešti visam kambariui",
     "Users": "Naudotojai",
     "Session ID": "Seanso ID",
@@ -411,15 +313,12 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Neatrodo, kad jūsų el. pašto adresas šiame serveryje būtų susietas su Matrix ID.",
     "Missing room_id in request": "Užklausoje trūksta room_id",
     "Missing user_id in request": "Užklausoje trūksta user_id",
-    "VoIP conference started.": "VoIP konferencija pradėta.",
-    "VoIP conference finished.": "VoIP konferencija užbaigta.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s pašalino kambario pavadinimą.",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s modifikavo %(widgetName)s valdiklį",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pridėjo %(widgetName)s valdiklį",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s pašalino %(widgetName)s valdiklį",
     "Failure to create room": "Nepavyko sukurti kambario",
     "Server may be unavailable, overloaded, or you hit a bug.": "Serveris gali būti neprieinamas, per daug apkrautas, arba susidūrėte su klaida.",
-    "Autoplay GIFs and videos": "Automatiškai paleisti GIF ir vaizdo įrašus",
     "This event could not be displayed": "Nepavyko parodyti šio įvykio",
     "Kick": "Išmesti",
     "Kick this user?": "Išmesti šį vartotoją?",
@@ -441,11 +340,6 @@
     "Show these rooms to non-members on the community page and room list?": "Rodyti šiuos kambarius ne nariams bendruomenės puslapyje ir kambarių sąraše?",
     "Kicks user with given id": "Išmeta vartotoją su nurodytu id",
     "Bans user with given id": "Užblokuoja vartotoją su nurodytu id",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s užblokavo %(targetName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atblokavo %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s išmetė %(targetName)s.",
-    "(not supported by this browser)": "(nėra palaikoma šios naršyklės)",
-    "(no answer)": "(nėra atsakymo)",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams, nuo jų pakvietimo momento.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarė būsimą kambario istoriją matomą bet kam.",
@@ -453,15 +347,9 @@
     "Not a valid %(brand)s keyfile": "Negaliojantis %(brand)s rakto failas",
     "Authentication check failed: incorrect password?": "Autentifikavimo patikra nepavyko: neteisingas slaptažodis?",
     "Send analytics data": "Siųsti analitinius duomenis",
-    "Incoming voice call from %(name)s": "Įeinantis balso skambutis nuo %(name)s",
-    "Incoming video call from %(name)s": "Įeinantis vaizdo skambutis nuo %(name)s",
-    "Incoming call from %(name)s": "Įeinantis skambutis nuo %(name)s",
     "Change Password": "Keisti Slaptažodį",
     "Authentication": "Autentifikavimas",
-    "The maximum permitted number of widgets have already been added to this room.": "Į šį kambarį jau yra pridėtas didžiausias leidžiamas valdiklių skaičius.",
-    "Please select the destination room for this message": "Pasirinkite šiai žinutei paskirties kambarį",
     "Hangup": "Padėti ragelį",
-    "No pinned messages.": "Nėra jokių prisegtų žinučių.",
     "Online for %(duration)s": "Prisijungęs %(duration)s",
     "Idle for %(duration)s": "Neveiklus %(duration)s",
     "Offline for %(duration)s": "Atsijungęs %(duration)s",
@@ -470,9 +358,6 @@
     "Forget room": "Pamiršti kambarį",
     "Share room": "Bendrinti kambarį",
     "Usage": "Naudojimas",
-    "Searches DuckDuckGo for results": "Atlieka rezultatų paiešką sistemoje DuckDuckGo",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Norėdami tai naudoti, tiesiog palaukite, kol bus įkelti automatiškai užbaigti rezultatai, tuomet pereikite per juos naudodami tab klavišą.",
-    "%(targetName)s left the room.": "%(targetName)s išėjo iš kambario.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s pakeitė prisegtas kambario žinutes.",
     "Sorry, your homeserver is too old to participate in this room.": "Atleiskite, jūsų serverio versija yra per sena dalyvauti šiame kambaryje.",
     "Please contact your homeserver administrator.": "Susisiekite su savo serverio administratoriumi.",
@@ -484,7 +369,6 @@
     "Demote": "Pažeminti",
     "Share Link to User": "Dalintis nuoroda į vartotoją",
     "The conversation continues here.": "Pokalbis tęsiasi čia.",
-    "Jump to message": "Pereiti prie žinutės",
     "Favourites": "Mėgstami",
     "Banned users": "Užblokuoti vartotojai",
     "This room is not accessible by remote Matrix servers": "Šis kambarys nėra pasiekiamas nuotoliniams Matrix serveriams",
@@ -500,7 +384,6 @@
     "Token incorrect": "Neteisingas prieigos raktas",
     "Sign in with": "Prisijungti naudojant",
     "Sign in": "Prisijungti",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeigu nenurodysite savo el. pašto adreso, negalėsite iš naujo nustatyti savo slaptažodžio. Ar esate tikri?",
     "Please <a>contact your service administrator</a> to continue using the service.": "Norėdami toliau naudotis šia paslauga, <a>susisiekite su savo paslaugos administratoriumi</a>.",
     "Create new room": "Sukurti naują kambarį",
     "No results": "Jokių rezultatų",
@@ -510,10 +393,7 @@
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s pasikeitė pseudoportretą",
     "collapse": "suskleisti",
     "expand": "išskleisti",
-    "Room directory": "Kambarių katalogas",
     "Start chat": "Pradėti pokalbį",
-    "ex. @bob:example.com": "pvz., @jonas:example.com",
-    "Add User": "Pridėti naudotoją",
     "Matrix ID": "Matrix ID",
     "email address": "el. pašto adresas",
     "You have entered an invalid address.": "Įvedėte neteisingą adresą.",
@@ -543,7 +423,6 @@
     "You cannot place a call with yourself.": "Negalite skambinti patys sau.",
     "Missing roomId.": "Trūksta kambario ID.",
     "Leave room": "Išeiti iš kambario",
-    "(could not connect media)": "(nepavyko prijungti medijos)",
     "This homeserver has hit its Monthly Active User limit.": "Šis serveris pasiekė savo Mėnesinį Aktyvių Vartotojų limitą.",
     "This homeserver has exceeded one of its resource limits.": "Šis serveris viršijo vieno iš savo išteklių limitą.",
     "Unable to connect to Homeserver. Retrying...": "Nepavyksta prisijungti prie serverio. Bandoma iš naujo...",
@@ -566,7 +445,6 @@
     "Filter community members": "Filtruoti bendruomenės dalyvius",
     "Removing a room from the community will also remove it from the community page.": "Pašalinus kambarį iš bendruomenės, taip pat pašalins jį iš bendruomenės puslapio.",
     "Filter community rooms": "Filtruoti bendruomenės kambarius",
-    "An error ocurred whilst trying to remove the widget from the room": "Bandant pašalinti valdiklį iš kambario įvyko klaida",
     "Communities": "Bendruomenės",
     "Home": "Pradžia",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s išėjo %(count)s kartų(-us)",
@@ -578,8 +456,6 @@
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s pasikeitė pseudoportretus %(count)s kartų(-us)",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s pasikeitė pseudoportretą %(count)s kartų(-us)",
     "And %(count)s more...|other": "Ir dar %(count)s...",
-    "Existing Call": "Esamas Skambutis",
-    "A call is already in progress!": "Skambutis jau vyksta!",
     "Default": "Numatytas",
     "Restricted": "Apribotas",
     "Moderator": "Moderatorius",
@@ -588,14 +464,12 @@
     "Invites": "Pakvietimai",
     "Historical": "Istoriniai",
     "Every page you use in the app": "Kiekvienas puslapis, kurį jūs naudojate programoje",
-    "Call Timeout": "Skambučio laikas baigėsi",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nustatė pagrindinį šio kambario adresą į %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s pašalino pagrindinį šio kambario adresą.",
     "Disinvite": "Atšaukti pakvietimą",
     "Disinvite this user?": "Atšaukti pakvietimą šiam vartotojui?",
     "Unknown for %(duration)s": "Nežinoma jau %(duration)s",
     "Unable to load! Check your network connectivity and try again.": "Nepavyko įkelti! Patikrinkite savo tinklo ryšį ir bandykite dar kartą.",
-    "%(targetName)s joined the room.": "%(targetName)s prisijungė prie kambario.",
     "User %(user_id)s does not exist": "Vartotojas %(user_id)s neegzistuoja",
     "Unknown server error": "Nežinoma serverio klaida",
     "Avoid sequences": "Venkite sekų",
@@ -626,14 +500,10 @@
     "No need for symbols, digits, or uppercase letters": "Nereikia simbolių, skaitmenų ar didžiųjų raidžių",
     "Encrypted messages in group chats": "Šifruotos žinutės grupiniuose pokalbiuose",
     "Delete Backup": "Ištrinti Atsarginę Kopiją",
-    "Backup version: ": "Atsarginės kopijos versija: ",
-    "Algorithm: ": "Algoritmas: ",
-    "Don't ask again": "Daugiau nebeklausti",
     "Set up": "Nustatyti",
     "Publish this room to the public in %(domain)s's room directory?": "Paskelbti šį kambarį viešai %(domain)s kambarių kataloge?",
     "Start authentication": "Pradėti tapatybės nustatymą",
     "Failed to load group members": "Nepavyko įkelti grupės dalyvių",
-    "Manage Integrations": "Valdyti integracijas",
     "Matrix Room ID": "Matrix kambario ID",
     "That doesn't look like a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
     "Preparing to send logs": "Ruošiamasi išsiųsti žurnalus",
@@ -646,20 +516,10 @@
     "Unable to verify email address.": "Nepavyko patvirtinti el. pašto adreso.",
     "This will allow you to reset your password and receive notifications.": "Tai jums leis iš naujo nustatyti slaptažodį ir gauti pranešimus.",
     "Skip": "Praleisti",
-    "Username not available": "Vartotojo vardas negalimas",
-    "Username invalid: %(errMessage)s": "Neteisingas vartotojo vardas: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Įvyko klaida: %(error_string)s",
-    "Checking...": "Tikrinama...",
-    "Username available": "Vartotojo vardas galimas",
-    "To get started, please pick a username!": "Norėdami pradėti, pasirinkite vartotojo vardą!",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Jeigu jau turite Matrix paskyrą, tuomet vietoj to, galite <a>prisijungti</a>.",
     "Unable to restore backup": "Nepavyko atkurti atsarginės kopijos",
     "No backup found!": "Nerasta jokios atsarginės kopijos!",
     "Failed to decrypt %(failedCount)s sessions!": "Nepavyko iššifruoti %(failedCount)s seansų!",
     "Next": "Toliau",
-    "Private Chat": "Privatus pokalbis",
-    "Public Chat": "Viešas pokalbis",
-    "There are no visible files in this room": "Šiame kambaryje nėra matomų failų",
     "Add a Room": "Pridėti kambarį",
     "Add a User": "Pridėti Vartotoją",
     "Long Description (HTML)": "Ilgasis aprašas (HTML)",
@@ -670,9 +530,7 @@
     "For security, this session has been signed out. Please sign in again.": "Saugumo sumetimais, šis seansas buvo atjungtas. Prisijunkite dar kartą.",
     "Your Communities": "Jūsų bendruomenės",
     "Create a new community": "Sukurti naują bendruomenę",
-    "You have no visible notifications": "Jūs neturite matomų pranešimų",
     "Failed to perform homeserver discovery": "Nepavyko atlikti serverio radimo",
-    "Error: Problem communicating with the given homeserver.": "Klaida: Problemos susisiekiant su nurodytu namų serveriu.",
     "This server does not support authentication with a phone number.": "Šis serveris nepalaiko tapatybės nustatymo telefono numeriu.",
     "Download": "Atsisiųsti",
     "Retry": "Bandyti dar kartą",
@@ -683,17 +541,12 @@
     "Sign In": "Prisijungti",
     "Explore rooms": "Žvalgyti kambarius",
     "Your %(brand)s is misconfigured": "Jūsų %(brand)s yra neteisingai sukonfigūruotas",
-    "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo Matrix paskyros %(serverName)s serveryje",
-    "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ar jūs naudojate 'duonos trupinių' funkciją ar ne (pseudoportretai virš kambarių sąrašo)",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ten, kur šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
-    "The remote side failed to pick up": "Nuotolinei pusei nepavyko atsiliepti",
     "Call failed due to misconfigured server": "Skambutis nepavyko dėl neteisingai sukonfigūruoto serverio",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Paprašykite savo serverio administratoriaus (<code>%(homeserverDomain)s</code>) sukonfiguruoti TURN serverį, kad skambučiai veiktų patikimai.",
     "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.": "Alternatyviai, jūs galite bandyti naudoti viešą serverį <code>turn.matrix.org</code>, bet tai nebus taip patikima, ir tai atskleis jūsų IP adresą šiam serveriui. Jūs taip pat galite tvarkyti tai Nustatymuose.",
     "Try using turn.matrix.org": "Bandyti naudojant turn.matrix.org",
-    "Call in Progress": "Vykstantis Skambutis",
-    "A call is currently being placed!": "Šiuo metu skambinama!",
     "Replying With Files": "Atsakyti Su Failais",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Šiuo metu neįmanoma atsakyti su failu. Ar norėtumėte įkelti šį failą neatsakydami?",
     "The file '%(fileName)s' failed to upload.": "Failo '%(fileName)s' nepavyko įkelti.",
@@ -739,10 +592,6 @@
     "Sends the given message coloured as a rainbow": "Išsiunčia nurodytą žinutę nuspalvintą kaip vaivorykštė",
     "Sends the given emote coloured as a rainbow": "Išsiunčia nurodytą emociją nuspalvintą kaip vaivorykštė",
     "Displays list of commands with usages and descriptions": "Parodo komandų sąrašą su naudojimo būdais ir aprašymais",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s priėmė pakvietimą %(displayName)s.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s pageidauja VoIP konferencijos.",
-    "%(senderName)s made no change.": "%(senderName)s neatliko pakeitimo.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atšaukė %(targetName)s pakvietimą.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s atnaujino šį kambarį.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s padarė kambarį viešą visiems žinantiems nuorodą.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s padarė kambarį tik pakviestiems.",
@@ -789,7 +638,6 @@
     "Custom user status messages": "Pasirinktinės vartotojo būsenos žinutės",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupuoti ir filtruoti kambarius pagal pasirinktines žymas (atnaujinkite, kad pritaikytumėte pakeitimus)",
     "Render simple counters in room header": "Užkrauti paprastus skaitiklius kambario antraštėje",
-    "Multiple integration managers": "Daugialypiai integracijų valdikliai",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Show info about bridges in room settings": "Rodyti informaciją apie tiltus kambario nustatymuose",
     "General": "Bendrieji",
@@ -806,7 +654,6 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s negali būti peržiūrėtas. Ar jūs norite prie jo prisijungti?",
     "This room doesn't exist. Are you sure you're at the right place?": "Šis kambarys neegzistuoja. Ar jūs tikri, kad esate tinkamoje vietoje?",
     "Create a public room": "Sukurti viešą kambarį",
-    "Make this room public": "Padaryti šį kambarį viešu",
     "Room Settings - %(roomName)s": "Kambario nustatymai - %(roomName)s",
     "Upgrade public room": "Atnaujinti viešą kambarį",
     "Upload files (%(current)s of %(total)s)": "Įkelti failus (%(current)s iš %(total)s)",
@@ -819,9 +666,7 @@
     "Upload %(count)s other files|one": "Įkelti %(count)s kitą failą",
     "Cancel All": "Atšaukti visus",
     "Upload Error": "Įkėlimo klaida",
-    "Explore": "Žvalgyti",
     "Filter": "Filtruoti",
-    "Filter rooms…": "Filtruoti kambarius…",
     "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite prisijungti iš naujo be pakvietimo.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite išeiti iš kambario %(roomName)s?",
     "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
@@ -829,24 +674,14 @@
     "General failure": "Bendras triktis",
     "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas",
     "Set a new account password...": "Nustatyti naują paskyros slaptažodį...",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jei jūs pateikėte pranešimą apie klaidą per GitHub, derinimo žurnalai (debug logs) gali padėti mums surasti problemą. Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (galia %(powerLevelNumber)s)",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Vartotojo vardą gali sudaryti tik mažosios raidės, skaičiai ir '=_-./'",
-    "The username field must not be blank.": "Vartotojo vardo laukelis negali būti tuščias.",
     "Username": "Vartotojo vardas",
-    "Not sure of your password? <a>Set a new one</a>": "Pamiršote slaptažodį? <a>Nustatykite naują</a>",
     "Enter username": "Įveskite vartotojo vardą",
     "Confirm": "Patvirtinti",
-    "Create your Matrix account on %(serverName)s": "Sukurkite savo Matrix paskyrą %(serverName)s serveryje",
-    "Create your Matrix account on <underlinedServerName />": "Sukurkite savo Matrix paskyrą <underlinedServerName /> serveryje",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą ar telefoną, jei norite, kad esami kontaktai galėtų jus rasti.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą, jei norite, kad esami kontaktai galėtų jus rasti.",
     "Sign in instead": "Prisijungti",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Tam, kad patvirtinti jūsų naujo slaptažodžio nustatymą, į jūsų pašto dėžutę bus išsiųstas patvirtinimo laiškas.",
     "Set a new password": "Nustatykite naują slaptažodį",
     "Create account": "Sukurti paskyrą",
-    "Create your account": "Sukurkite savo paskyrą",
     "Change identity server": "Pakeisti tapatybės serverį",
     "Change": "Keisti",
     "Change room avatar": "Keisti kambario pseudoportretą",
@@ -861,14 +696,12 @@
     "Failed to change power level": "Nepavyko pakeisti galios lygio",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Jūs neturėsite galimybės atšaukti šio keitimo, kadangi jūs paaukštinate vartotoją, suteikdami tokį patį galios lygį, kokį turite jūs.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Ar tikrai norite pašalinti (ištrinti) šį įvykį? Atkreipkite dėmesį į tai, kad jei jūs ištrinsite kambario pavadinimo arba temos keitimo įvykį, tai gali atšaukti patį pakeitimą.",
-    "We recommend you change your password and recovery key in Settings immediately": "Mes rekomenduojame nedelsiant Nustatymuose pasikeisti jūsų slaptažodį ir atgavimo raktą",
     "Email (optional)": "El. paštas (neprivaloma)",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nepašalinote paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą.",
     "Help & About": "Pagalba ir Apie",
     "Direct Messages": "Privačios žinutės",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Nustatykite adresus šiam kambariui, kad vartotojai galėtų surasti šį kambarį per jūsų serverį (%(localDomain)s)",
-    "Direct message": "Siųsti tiesioginę žinutę",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s prisijungė %(count)s kartų(-us)",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s prisijungė",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s prisijungė %(count)s kartų(-us)",
@@ -916,7 +749,6 @@
     "Matrix rooms": "Matrix kambariai",
     "Recently Direct Messaged": "Neseniai tiesiogiai susirašyta",
     "Command Help": "Komandų pagalba",
-    "Help": "Pagalba",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sukurkite bendruomenę, kad kartu sugrupuotumėte vartotojus ir kambarius! Sukurkite pagrindinį puslapį, kad pažymėtumėte savo vietą Matrix visatoje.",
     "Find a room…": "Rasti kambarį…",
     "Find a room… (e.g. %(exampleRoom)s)": "Rasti kambarį... (pvz.: %(exampleRoom)s)",
@@ -933,8 +765,6 @@
     "Shift": "Shift",
     "Super": "Super",
     "Ctrl": "Ctrl",
-    "If you cancel now, you won't complete verifying the other user.": "Jei atšauksite dabar, neužbaigsite kito vartotojo patvirtinimo.",
-    "If you cancel now, you won't complete verifying your other session.": "Jei atšauksite dabar, neužbaigsite kito seanso patvirtinimo.",
     "Verify this session": "Patvirtinti šį seansą",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą iš %(oldRoomName)s į %(newRoomName)s.",
     "Show display name changes": "Rodyti rodomo vardo pakeitimus",
@@ -965,65 +795,39 @@
     "Enter the name of a new server you want to explore.": "Įveskite naujo, norimo žvalgyti serverio pavadinimą.",
     "Server name": "Serverio pavadinimas",
     "Please enter a name for the room": "Įveskite kambario pavadinimą",
-    "This room is private, and can only be joined by invitation.": "Šis kambarys yra privatus, prie jo prisijungti galima tik su pakvietimu.",
     "Create a private room": "Sukurti privatų kambarį",
     "Name": "Pavadinimas",
     "Topic (optional)": "Tema (nebūtina)",
     "Hide advanced": "Paslėpti išplėstinius",
     "Show advanced": "Rodyti išplėstinius",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Neleisti kitų matrix serverių vartotojams prisijungti prie šio kambario (Šis nustatymas negali būti vėliau pakeistas!)",
     "Session name": "Seanso pavadinimas",
     "Session key": "Seanso raktas",
     "I don't want my encrypted messages": "Man nereikalingos užšifruotos žinutės",
     "You'll lose access to your encrypted messages": "Jūs prarasite prieigą prie savo užšifruotų žinučių",
-    "New session": "Naujas seansas",
-    "Enter recovery passphrase": "Įveskite atgavimo slaptafrazę",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: Atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
-    "Server Name": "Serverio Pavadinimas",
-    "Other servers": "Kiti serveriai",
     "Add room": "Sukurti kambarį",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Slaptažodžio keitimas iš naujo nustatys visų jūsų seansų šifravimo raktus, todėl užšifruota pokalbių istorija taps neperskaitoma. Sukurkite atsarginę raktų kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš iš naujo nustatydami slaptažodį.",
-    "Set a display name:": "Nustatyti rodomą vardą:",
     "For maximum security, this should be different from your account password.": "Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio.",
-    "Set up encryption": "Nustatyti šifravimą",
-    "COPY": "Kopijuoti",
-    "Enter recovery key": "Įveskite atgavimo raktą",
     "Keep going...": "Tęskite...",
     "Syncing...": "Sinchronizuojama...",
     "Signing In...": "Prijungiama...",
     "If you've joined lots of rooms, this might take a while": "Jei esate prisijungę prie daug kambarių, tai gali užtrukti",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Neužbaigus saugumo šiame seanse, jis neturės prieigos prie šifruotų žinučių.",
-    "Enter a recovery passphrase": "Įveskite atgavimo slaptafrazę",
-    "Set up with a recovery key": "Nustatyti su atgavimo raktu",
-    "Enter your recovery passphrase a second time to confirm it.": "Įveskite atgavimo slaptafrazę antrą kartą, kad ją patvirtintumėte.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti prieigos prie jūsų šifruotų žinučių atkūrimui, jei pamiršite savo atgavimo slaptafrazę.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Laikykite šio rakto kopiją saugioje vietoje, pavyzdžiui slaptažodžių tvarkyklėje arba seife.",
-    "Your recovery key": "Jūsų atgavimo raktas",
     "Copy": "Kopijuoti",
-    "Make a copy of your recovery key": "Padaryti atgavimo rakto kopiją",
-    "Please enter your recovery passphrase a second time to confirm.": "Įveskite atgavimo slaptafrazę antrą kartą, kad patvirtintumėte.",
     "Later": "Vėliau",
-    "Verify yourself & others to keep your chats safe": "Patvirtinkite save ir kitus, kad jūsų pokalbiai būtų saugūs",
     "Go back": "Grįžti",
     "This room is end-to-end encrypted": "Šis kambarys visapusiškai užšifruotas",
     "Send a message…": "Siųsti žinutę…",
-    "Never lose encrypted messages": "Niekada nepraraskite šifruotų žinučių",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Žinutės šiame kambaryje yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turite raktus šioms žinutėms perskaityti.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Saugiai sukurkite jūsų raktų atsarginę kopiją, kad išvengtumėte jų praradimo. <a>Sužinoti daugiau.</a>",
-    "Not now": "Ne dabar",
-    "Don't ask me again": "Daugiau neklausti",
     "Send as message": "Siųsti kaip žinutę",
     "Messages in this room are end-to-end encrypted.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos.",
     "Messages in this room are not end-to-end encrypted.": "Žinutės šiame kambaryje nėra visapusiškai užšifruotos.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos. Sužinokite daugiau ir patvirtinkite šį vartotoją jo vartotojo profilyje.",
     "Confirm Removal": "Patvirtinkite pašalinimą",
     "Manually export keys": "Eksportuoti raktus rankiniu būdu",
     "Send a Direct Message": "Siųsti tiesioginę žinutę",
     "Go Back": "Grįžti",
     "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo.",
     "Click the button below to confirm adding this email address.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šio el. pašto pridėjimą.",
-    "Add an email address to configure email notifications": "Pridėkite el. pašto adresą, kad nustatytumėte el. pašto pranešimus",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Prieš atsijungiant rekomenduojame iš tapatybės serverio pašalinti savo el. pašto adresus ir telefono numerius.",
     "Email addresses": "El. pašto adresai",
     "Account management": "Paskyros tvarkymas",
@@ -1031,27 +835,18 @@
     "Your email address hasn't been verified yet": "Jūsų el. pašto adresas dar nebuvo patvirtintas",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Išsiuntėme jums el. laišką, kad patvirtintumėme savo adresą. Sekite ten pateiktas instrukcijas ir tada paspauskite žemiau esantį mygtuką.",
     "Email Address": "El. pašto adresas",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Įveskite pasirinktinio serverio URL <a>Ką tai reiškia?</a>",
-    "Homeserver URL": "Serverio URL",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Serverio adresas neatrodo esantis tinkamas Matrix serveris",
     "This homeserver does not support login using email address.": "Šis serveris nepalaiko prisijungimo naudojant el. pašto adresą.",
     "Setting up keys": "Raktų nustatymas",
-    "Review where you’re logged in": "Peržiūrėkite kur esate prisijungę",
-    "Verify all your sessions to ensure your account & messages are safe": "Patvirtinkite visus savo seansus, kad užtikrintumėte savo paskyros ir žinučių saugumą",
     "Review": "Peržiūrėti",
     "Message deleted": "Žinutė ištrinta",
     "Message deleted by %(name)s": "Žinutė, ištrinta %(name)s",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujas atgavimo parinktis</button2>",
     "Confirm your identity by entering your account password below.": "Patvirtinkite savo tapatybę žemiau įvesdami savo paskyros slaptažodį.",
     "Use an email address to recover your account": "Naudokite el. pašto adresą, kad prireikus galėtumėte atgauti paskyrą",
     "Passwords don't match": "Slaptažodžiai nesutampa",
     "Use lowercase letters, numbers, dashes and underscores only": "Naudokite tik mažąsias raides, brūkšnelius ir pabraukimus",
-    "Great! This recovery passphrase looks strong enough.": "Puiku! Ši atgavimo slaptafrazė atrodo pakankamai stipri.",
     "That matches!": "Tai sutampa!",
     "That doesn't match.": "Tai nesutampa.",
-    "Confirm your recovery passphrase": "Patvirtinti atgavimo slaptafrazę",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Jūsų atgavimo raktas buvo <b>nukopijuotas į jūsų iškarpinę</b>, jūs galite:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Jūsų atgavimo raktas yra <b>Parsisiuntimų</b> kataloge.",
     "<b>Print it</b> and store it somewhere safe": "<b>Atsispausdinti jį</b> ir laikyti saugioje vietoje",
     "<b>Save it</b> on a USB key or backup drive": "<b>Išsaugoti jį</b> USB rakte arba atsarginių kopijų diske",
     "<b>Copy it</b> to your personal cloud storage": "<b>Nukopijuoti jį</b> į savo asmeninę debesų saugyklą",
@@ -1078,7 +873,6 @@
     "Waiting for your other session to verify…": "Laukiama, kol jūsų kitas seansas patvirtins…",
     "To be secure, do this in person or use a trusted way to communicate.": "Norėdami užtikrinti saugumą, darykite tai asmeniškai arba naudokite patikimą komunikacijos būdą.",
     "Verify": "Patvirtinti",
-    "Verify the new login accessing your account: %(name)s": "Patvirtinkite naują prisijungimą prie jūsų paskyros: %(name)s",
     "Confirm deleting these sessions": "Patvirtinkite šių seansų ištrinimą",
     "Delete sessions|other": "Ištrinti seansus",
     "Delete sessions|one": "Ištrinti seansą",
@@ -1087,7 +881,6 @@
     "ID": "ID",
     "Restore from Backup": "Atkurti iš Atsarginės Kopijos",
     "Flair": "Ženkliukai",
-    "Access Token:": "Prieigos Talonas:",
     "Preferences": "Nuostatos",
     "Cryptography": "Kriptografija",
     "Security & Privacy": "Saugumas ir Privatumas",
@@ -1096,8 +889,6 @@
     "Enable encryption?": "Įjungti šifravimą?",
     "Encryption": "Šifravimas",
     "Once enabled, encryption cannot be disabled.": "Įjungus šifravimą jo nebus galima išjungti.",
-    "Who can access this room?": "Kas turi prieigą prie šio kambario?",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Prisijungti kaip <voiceText>balsas</voiceText> arba <videoText>vaizdas</videoText>.",
     "Deactivate user?": "Deaktyvuoti vartotoją?",
     "Deactivate user": "Deaktyvuoti vartotoją",
     "Failed to deactivate user": "Nepavyko deaktyvuoti vartotojo",
@@ -1107,7 +898,6 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Įvyko klaida atnaujinant ženkliukus šiam kambariui. Serveris gali jų neleisti arba įvyko laikina klaida.",
     "Showing flair for these communities:": "Ženkliukai rodomi šioms bendruomenėms:",
     "This room is not showing flair for any communities": "Šis kambarys nerodo ženkliukų jokioms bendruomenėms",
-    "Waiting for you to accept on your other session…": "Laukiama kol jūs priimsite kitame savo seanse…",
     "Start Verification": "Pradėti patvirtinimą",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifruotuose kambariuose jūsų žinutės yra apsaugotos ir tik jūs ir gavėjas turite unikalius raktus joms atrakinti.",
     "Verify User": "Patvirtinti Vartotoją",
@@ -1116,7 +906,6 @@
     "Hide verified sessions": "Slėpti patvirtintus seansus",
     "%(count)s sessions|other": "%(count)s seansai(-ų)",
     "Hide sessions": "Slėpti seansus",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> kambaryje %(roomName)s",
     "Security": "Saugumas",
     "Verify by scanning": "Patvirtinti nuskaitant",
     "Verify all users in a room to ensure it's secure.": "Patvirtinkite visus vartotojus kambaryje, kad užtikrintumėte jo saugumą.",
@@ -1135,27 +924,16 @@
     "Are you sure you want to deactivate your account? This is irreversible.": "Ar tikrai norite deaktyvuoti savo paskyrą? Tai yra negrįžtama.",
     "Verify session": "Patvirtinti seansą",
     "Are you sure you want to sign out?": "Ar tikrai norite atsijungti?",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Panaudoti šį seansą naujo patvirtinimui, suteikiant jam prieigą prie šifruotų žinučių:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Jei jūs nesijungėte prie šios sesijos, jūsų paskyra gali būti sukompromituota.",
-    "This wasn't me": "Tai ne aš",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jei jūs susidūrėte su klaidomis arba norėtumėte palikti atsiliepimą, praneškite mums GitHub'e.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Tam, kad būtų išvengta pasikartojančių problemų, pirmiausia <existingIssuesLink>peržiūrėkite esamas problemas</existingIssuesLink> (ir pridėkite +1) arba, jei nerandate, <newIssueLink>sukurkite naują svarstomą problemą</newIssueLink>.",
-    "Report bugs & give feedback": "Pranešti apie klaidas ir palikti atsiliepimą",
     "Report Content to Your Homeserver Administrator": "Pranešti apie turinį serverio administratoriui",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Pranešant apie šią netinkamą žinutę, serverio administratoriui bus nusiųstas unikalus 'įvykio ID'. Jei žinutės šiame kambaryje yra šifruotos, serverio administratorius negalės perskaityti žinutės teksto ar peržiūrėti failų arba paveikslėlių.",
     "Send report": "Siųsti pranešimą",
-    "Verify other session": "Patvirtinti kitą seansą",
     "Are you sure you want to reject the invitation?": "Ar tikrai norite atmesti pakvietimą?",
-    "Share Permalink": "Dalintis nuoroda",
     "Report Content": "Pranešti",
     "Nice, strong password!": "Puiku, stiprus slaptažodis!",
     "Old cryptography data detected": "Aptikti seni kriptografijos duomenys",
     "Verify this login": "Patvirtinkite šį prisijungimą",
     "Registration has been disabled on this homeserver.": "Registracija šiame serveryje išjungta.",
     "You can now close this window or <a>log in</a> to your new account.": "Jūs galite uždaryti šį langą arba <a>prisijungti</a> į savo naują paskyrą.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Identifikuokite save, patvirtindami šį prisijungimą viename iš kitų jūsų seansų, ir suteikdami jam prieigą prie šifruotų žinučių.",
-    "This requires the latest %(brand)s on your other devices:": "Tam reikia naujausios %(brand)s versijos kituose jūsų įrenginiuose:",
-    "or another cross-signing capable Matrix client": "arba kito kryžminį pasirašymą palaikančio Matrix kliento",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams.",
     "Use Single Sign On to continue": "Norėdami tęsti naudokite Vieną Prisijungimą",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Patvirtinkite šio el. pašto adreso pridėjimą naudodami Vieną Prisijungimą, kad įrodytumėte savo tapatybę.",
@@ -1165,9 +943,6 @@
     "Confirm adding phone number": "Patvirtinkite telefono numerio pridėjimą",
     "Click the button below to confirm adding this phone number.": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šio numerio pridėjimą.",
     "Match system theme": "Suderinti su sistemos tema",
-    "Identity Server URL must be HTTPS": "Tapatybės Serverio URL privalo būti HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Netinkamas Tapatybės Serveris (statuso kodas %(code)s)",
-    "Could not connect to Identity Server": "Nepavyko prisijungti prie Tapatybės Serverio",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Atsijungti nuo <current /> tapatybės serverio ir jo vietoje prisijungti prie <new />?",
     "Terms of service not accepted or the identity server is invalid.": "Nesutikta su paslaugų teikimo sąlygomis arba tapatybės serveris yra klaidingas.",
     "The identity server you have chosen does not have any terms of service.": "Jūsų pasirinktas tapatybės serveris neturi jokių paslaugų teikimo sąlygų.",
@@ -1177,12 +952,8 @@
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "patikrinti ar tarp jūsų naršyklės įskiepių nėra nieko kas galėtų blokuoti tapatybės serverį (pavyzdžiui \"Privacy Badger\")",
     "contact the administrators of identity server <idserver />": "susisiekti su tapatybės serverio <idserver /> administratoriais",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Jūs vis dar <b>dalijatės savo asmeniniais duomenimis</b> tapatybės serveryje <idserver />.",
-    "Identity Server (%(server)s)": "Tapatybės Serveris (%(server)s)",
     "Enter a new identity server": "Pridėkite naują tapatybės serverį",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite Integracijų Tvarkytuvą <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų pakuočių tvarkymui.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Naudokite Integracijų Tvarkytuvą botų, valdiklių ir lipdukų pakuočių tvarkymui.",
     "Manage integrations": "Valdyti integracijas",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų Tvarkytuvai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
     "Invalid theme schema.": "Klaidinga temos schema.",
     "Error downloading theme information.": "Klaida atsisiunčiant temos informaciją.",
     "Theme added!": "Tema pridėta!",
@@ -1203,18 +974,14 @@
     "Your theme": "Jūsų tema",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Valdiklio ištrinimas pašalina jį visiems kambaryje esantiems vartotojams. Ar tikrai norite ištrinti šį valdiklį?",
     "Enable 'Manage Integrations' in Settings to do this.": "Įjunkite 'Valdyti integracijas' Nustatymuose, kad tai atliktumėte.",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Jūsų %(brand)s neleidžia jums naudoti integracijų tvarkytuvo tam atlikti. Susisiekite su administratoriumi.",
     "Enter phone number (required on this homeserver)": "Įveskite telefono numerį (privaloma šiame serveryje)",
-    "Doesn't look like a valid phone number": "Tai nepanašu į veikiantį telefono numerį",
     "Invalid homeserver discovery response": "Klaidingas serverio radimo atsakas",
     "Invalid identity server discovery response": "Klaidingas tapatybės serverio radimo atsakas",
-    "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas",
     "Double check that your server supports the room version chosen and try again.": "Dar kartą įsitikinkite, kad jūsų serveris palaiko pasirinktą kambario versiją ir bandykite iš naujo.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ar jūs naudojate %(brand)s įrenginyje, kuriame pagrindinis įvesties mechanizmas yra lietimas",
     "Session already verified!": "Seansas jau patvirtintas!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Seansas jau patvirtintas, bet raktai NESUTAMPA!",
     "Enable Emoji suggestions while typing": "Įjungti Jaustukų pasiūlymus rašant",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Rodyti priminimą įjungti saugių žinučių atgavimą šifruotuose kambariuose",
     "Enable automatic language detection for syntax highlighting": "Įjungti automatinį kalbos aptikimą sintaksės paryškinimui",
     "Enable big emoji in chat": "Įjungti didelius jaustukus pokalbiuose",
     "Enable Community Filter Panel": "Įjungti Bendruomenės Filtrų Skydelį",
@@ -1297,16 +1064,11 @@
     "Pin": "Smeigtukas",
     "Other users may not trust it": "Kiti vartotojai gali nepasitikėti",
     "Upgrade": "Atnaujinti",
-    "From %(deviceName)s (%(deviceId)s)": "Iš %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Atsisakyti (%(counter)s)",
     "Accept <policyLink /> to continue:": "Sutikite su <policyLink />, kad tęstumėte:",
     "Upload": "Įkelti",
     "Your homeserver does not support cross-signing.": "Jūsų serveris nepalaiko kryžminio pasirašymo.",
-    "Cross-signing and secret storage are enabled.": "Kryžminis pasirašymas ir slapta saugykla yra įjungti.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Jūsų paskyra slaptoje saugykloje turi kryžminio pasirašymo tapatybę, bet šis seansas dar ja nepasitiki.",
-    "Cross-signing and secret storage are not yet set up.": "Kryžminis pasirašymas ir slapta saugykla dar nėra nustatyti.",
-    "Reset cross-signing and secret storage": "Iš naujo nustatyti kryžminį pasirašymą ir slaptą saugyklą",
-    "Bootstrap cross-signing and secret storage": "Prikabinti kryžminį pasirašymą ir slaptą saugyklą",
     "Cross-signing public keys:": "Kryžminio pasirašymo vieši raktai:",
     "Cross-signing private keys:": "Kryžminio pasirašymo privatūs raktai:",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individualiai patikrinkite kiekvieną vartotojo naudojamą seansą, kad pažymėtumėte jį kaip patikimą, nepasitikint kryžminiu pasirašymu patvirtintais įrenginiais.",
@@ -1354,7 +1116,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neįmanoma prisijungti prie serverio per HTTP, kai naršyklės juostoje yra HTTPS URL. Naudokite HTTPS arba <a>įjunkite nesaugias rašmenas</a>.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jūsų naujas seansas buvo patvirtintas. Jis turi prieigą prie jūsų šifruotų žinučių ir kiti vartotojai matys jį kaip patikimą.",
     "Your new session is now verified. Other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Kiti vartotojai matys jį kaip patikimą.",
-    "If you don't want to set this up now, you can later in Settings.": "Jei jūs dabar nenorite to nustatyti, galite padaryti tai vėliau Nustatymuose.",
     "Done": "Atlikta",
     "No media permissions": "Nėra medijos leidimų",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "Seansas, kurį jūs bandote patvirtinti, nepalaiko QR kodo nuskaitymo arba jaustukų patvirtinimo, kuriuos palaiko %(brand)s. Bandykite su kitu klientu.",
@@ -1363,7 +1124,6 @@
     "No": "Ne",
     "Yes": "Taip",
     "Interactively verify by Emoji": "Patvirtinti interaktyviai, naudojant Jaustukus",
-    "The message you are trying to send is too large.": "Žinutė, kurią jūs bandote siųsti, yra per didelė.",
     "Show a placeholder for removed messages": "Rodyti pašalintų žinučių žymeklį",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Rodyti prisijungimo/išėjimo žinutes (pakvietimai/išmetimai/draudimai nepaveikti)",
     "Show avatar changes": "Rodyti pseudoportretų pakeitimus",
@@ -1371,7 +1131,6 @@
     "Send typing notifications": "Siųsti spausdinimo pranešimus",
     "Automatically replace plain text Emoji": "Automatiškai pakeisti paprasto teksto Jaustukus",
     "Mirror local video feed": "Atkartoti lokalų video tiekimą",
-    "Allow Peer-to-Peer for 1:1 calls": "Leisti tiesioginį \"Peer-to-Peer\" sujungimą 1:1 skambučiams",
     "Prompt before sending invites to potentially invalid matrix IDs": "Klausti prieš siunčiant pakvietimus galimai netinkamiems matrix ID",
     "Show rooms with unread notifications first": "Pirmiausia rodyti kambarius su neperskaitytais pranešimais",
     "Show shortcuts to recently viewed rooms above the room list": "Rodyti neseniai peržiūrėtų kambarių nuorodas virš kambarių sąrašo",
@@ -1403,8 +1162,6 @@
     "To help us prevent this in future, please <a>send us logs</a>.": "Norėdami padėti mums išvengti to ateityje, <a>atsiųskite mums žurnalus</a>.",
     "Failed to upload image": "Nepavyko įkelti vaizdo",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Pakeitimai atlikti jūsų bendruomenės <bold1>pavadinimui</bold1> ir <bold2>pseudoportretui</bold2> iki 30 minučių gali būti nematomi kitų vartotojų.",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Norėdami nustatyti filtrą, vilkite bendruomenės pseudoportretą į filtrų skydelį, esantį kairėje ekrano pusėje. Jūs bet kada galite paspausti ant pseudoportreto filtrų skydelyje, kad pamatytumėte tik su ta bendruomene susijusius kambarius ir žmones.",
-    "Upload an avatar:": "Įkelti pseudoportretą:",
     "Emoji": "Jaustukai",
     "Emoji Autocomplete": "Jaustukų automatinis užbaigimas",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Eksportuotas failas leis visiems, kurie gali jį perskaityti, iššifruoti visas užšifruotas žinutes, kurias jūs galite matyti, todėl turėtumėte būti atsargūs, kad jis būtų saugus. Tam padėti, jūs turėtumėte žemiau įvesti slaptafrazę, kuri bus naudojama eksportuotų duomenų užšifravimui. Duomenis bus galima importuoti tik naudojant tą pačią slaptafrazę.",
@@ -1417,20 +1174,16 @@
     "Clear room list filter field": "Išvalyti kambarių sąrašo filtro lauką",
     "Community IDs cannot be empty.": "Bendruomenių ID negali būti tušti.",
     "Failed to reject invitation": "Nepavyko atmesti pakvietimo",
-    "Failed to leave room": "Nepavyko išeiti iš kambario",
     "Can't leave Server Notices room": "Negalima išeiti iš Serverio Pranešimų kambario",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Šis kambarys yra naudojamas svarbioms žinutėms iš serverio, tad jūs negalite iš jo išeiti.",
     "Terms and Conditions": "Taisyklės ir Sąlygos",
-    "Self-verification request": "Savarankiško patvirtinimo užklausa",
     "Logout": "Atsijungti",
     "Reject & Ignore user": "Atmesti ir ignoruoti vartotoją",
     "Reject invitation": "Atmesti pakvietimą",
     "Unable to reject invite": "Nepavyko atmesti pakvietimo",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Ar jūs naudojate %(brand)s kaip Įdiegtą Progresyviąją Žiniatinklio Programą",
     "Your user agent": "Jūsų vartotojo agentas",
-    "Invite only": "Tik pakviestiems",
     "You can only join it with a working invite.": "Jūs galite prisijungti tik su veikiančiu pakvietimu.",
-    "If you cancel now, you won't complete your operation.": "Jei atšauksite dabar, jūs neužbaigsite savo operacijos.",
     "Cancel entering passphrase?": "Atšaukti slaptafrazės įvedimą?",
     "Room name or address": "Kambario pavadinimas arba adresas",
     "%(name)s is requesting verification": "%(name)s prašo patvirtinimo",
@@ -1457,11 +1210,7 @@
     "Continue With Encryption Disabled": "Tęsti išjungus šifravimą",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Patvirtinkite šį vartotoją, kad pažymėtumėte jį kaip patikimą. Vartotojų pažymėjimas patikimais suteikia jums papildomos ramybės naudojant visapusiškai užšifruotas žinutes.",
     "Waiting for partner to confirm...": "Laukiama kol partneris patvirtins...",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Pradėkite pokalbį su kuo nors naudodami jų vardą, vartotojo vardą (kaip <userId/>) arba el. pašto adresą.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Pakvieskite ką nors naudodami jų vardą, vartotojo vardą (kaip <userId/>), el. pašto adresą arba <a>bendrinkite šį kambarį</a>.",
     "Sign out and remove encryption keys?": "Atsijungti ir pašalinti šifravimo raktus?",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tai bus jūsų paskyros pavadinimas <span></span> serveryje, arba jūs galite pasirinkti <a>kitą serverį</a>.",
-    "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.": "Valdiklis, esantis %(widgetUrl)s nori patvirtinti jūsų tapatybę. Jei tai leisite, valdiklis galės patvirtinti jūsų vartotojo ID, bet neatliks veiksmų kaip jūs.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ištrinti kambario adresą %(alias)s ir pašalinti %(name)s iš katalogo?",
     "delete the address.": "ištrinti adresą.",
     "Preview": "Peržiūrėti",
@@ -1473,38 +1222,24 @@
     "Failed to set topic": "Nepavyko nustatyti temos",
     "Show typing notifications": "Rodyti spausdinimo pranešimus",
     "Show hidden events in timeline": "Rodyti paslėptus įvykius laiko juostoje",
-    "Session backup key:": "Seanso atsarginės kopijos raktas:",
     "Unable to load key backup status": "Nepavyko įkelti atsarginės raktų kopijos būklės",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Prieš atsijungdami prijunkite šį seansą prie atsarginės raktų kopijos, kad neprarastumėte raktų, kurie gali būti tik šiame seanse.",
     "Connect this session to Key Backup": "Prijungti šį seansą prie Atsarginės Raktų Kopijos",
-    "Backup key stored: ": "Atsarginės kopijos raktas saugomas: ",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, jūs šiuo metu naudojate <server></server> tapatybės serverį. Jį pakeisti galite žemiau.",
-    "Identity Server": "Tapatybės Serveris",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Šiuo metu jūs nenaudojate tapatybės serverio. Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, pridėkite jį žemiau.",
     "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.": "Atsijungimas nuo tapatybės serverio reikš, kad jūs nebebūsite randamas kitų vartotojų ir jūs nebegalėsite pakviesti kitų, naudodami jų el. paštą arba telefoną.",
     "Appearance": "Išvaizda",
     "Deactivate account": "Deaktyvuoti paskyrą",
-    "Identity Server is": "Tapatybės Serveris yra",
     "Timeline": "Laiko juosta",
-    "Key backup": "Atsarginė raktų kopija",
     "Where you’re logged in": "Kur esate prisijungę",
     "A session's public name is visible to people you communicate with": "Seanso viešas pavadinimas yra matomas žmonėms su kuriais jūs bendraujate",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Pabandykite slinkti aukštyn laiko juostoje, kad sužinotumėte, ar yra ankstesnių.",
     "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>": "Tai visam laikui padarys jūsų paskyrą nebetinkama naudoti. Jūs nebegalėsite prisijungti ir niekas nebegalės iš naujo užregistruoti to pačio vartotojo ID. Jūsų paskyra išeis iš visų kambarių, kuriuose ji dalyvauja ir pašalins jūsų paskyros detales iš jūsų tapatybės serverio. <b>Šis veiksmas neatšaukiamas.</b>",
-    "Unable to validate homeserver/identity server": "Neįmanoma patvirtinti serverio/tapatybės serverio",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nėra sukonfigūruota jokio tapatybės serverio, tad jūs negalite pridėti el. pašto adreso, tam, kad galėtumėte iš naujo nustatyti savo slaptažodį ateityje.",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Įveskite savo pasirinktinio tapatybės serverio URL <a>Ką tai reiškia?</a>",
-    "Identity Server URL": "Tapatybės serverio URL",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Bandyta įkelti konkrečią vietą šio kambario laiko juostoje, bet jūs neturite leidimo peržiūrėti tos žinutės.",
     "Failed to load timeline position": "Nepavyko įkelti laiko juostos pozicijos",
-    "Your Matrix account on %(serverName)s": "Jūsų Matrix paskyra %(serverName)s serveryje",
-    "Your Matrix account on <underlinedServerName />": "Jūsų Matrix paskyra <underlinedServerName /> serveryje",
-    "No identity server is configured: add one in server settings to reset your password.": "Nesukonfigūruotas joks tapatybės serveris: pridėkite jį serverio nustatymuose, kad iš naujo nustatytumėte slaptažodį.",
     "Identity server URL does not appear to be a valid identity server": "Tapatybės serverio URL neatrodo kaip tinkamas tapatybės serveris",
     "Scroll up/down in the timeline": "Slinkti aukštyn/žemyn laiko juostoje",
     "Show developer tools": "Rodyti programuotojo įrankius",
-    "Low bandwidth mode": "Žemo duomenų pralaidumo režimas",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Siųsti žinučių perskaitymo kvitus (norint išjungti reikalingas suderinamas serveris)",
     "How fast should messages be downloaded.": "Kaip greitai žinutės turi būti parsiųstos.",
     "Manually verify all remote sessions": "Rankiniu būdu patvirtinti visus nuotolinius seansus",
     "well formed": "gerai suformuotas",
@@ -1532,12 +1267,9 @@
     "Message search": "Žinučių paieška",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Šio seanso duomenų išvalymas yra negrįžtamas. Šifruotos žinutės bus prarastos, nebent buvo sukurta jų raktų atsarginė kopija.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Trūksta kai kurių seanso duomenų, įskaitant šifruotų žinučių raktus. Atsijunkite ir prisijunkite, kad tai išspręstumėte, atkurdami raktus iš atsarginės kopijos.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atgavimo slaptafrazę.",
     "Restoring keys from backup": "Raktų atkūrimas iš atsarginės kopijos",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Atsarginės kopijos nepavyko iššifruoti naudojant šį atgavimo raktą: patikrinkite, ar įvedėte teisingą atgavimo raktą.",
     "Unable to query secret storage status": "Slaptos saugyklos būsenos užklausa neįmanoma",
     "Unable to set up secret storage": "Neįmanoma nustatyti slaptos saugyklos",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Užšifruotą jūsų raktų kopiją saugosime savo serveryje. Apsaugokite savo atsarginę kopiją naudodami atgavimo slaptafrazę.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Kuriama jūsų raktų atsarginė kopija (pirmas atsarginės kopijos sukūrimas gali užtrukti kelias minutes).",
     "Create key backup": "Sukurti atsarginę raktų kopiją",
     "Unable to create key backup": "Nepavyko sukurti atsarginės raktų kopijos",
@@ -1574,7 +1306,6 @@
     "Learn more about how we use analytics.": "Sužinokite daugiau apie tai, kaip mes naudojame analitiką.",
     "Reset": "Iš naujo nustatyti",
     "Failed to connect to integration manager": "Nepavyko prisijungti prie integracijų tvarkytuvo",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Naudojimasis šiuo valdikliu gali pasidalinti duomenimis <helpIcon /> su %(widgetDomain)s ir jūsų integracijų tvarkytuvu.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Prašome <newIssueLink>sukurti naują problemą</newIssueLink> GitHub'e, kad mes galėtume ištirti šią klaidą.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Pasakyite mums kas nutiko, arba, dar geriau, sukurkite GitHub problemą su jos apibūdinimu.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Prieš pateikiant žurnalus jūs turite <a>sukurti GitHub problemą</a>, kad apibūdintumėte savo problemą.",
@@ -1582,28 +1313,14 @@
     "Notes": "Pastabos",
     "Integrations are disabled": "Integracijos yra išjungtos",
     "Integrations not allowed": "Integracijos neleidžiamos",
-    "Integration Manager": "Integracijų tvarkytuvas",
-    "This looks like a valid recovery key!": "Tai panašu į galiojantį atgavimo raktą!",
-    "Not a valid recovery key": "Negaliojantis atgavimo raktas",
-    "Recovery key mismatch": "Atgavimo rakto neatitikimas",
-    "Incorrect recovery passphrase": "Neteisinga atgavimo slaptafrazė",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Nepavyko iššifruoti atsarginės kopijos naudojant šią atgavimo slaptafrazę: patikrinkite, ar įvedėte teisingą atgavimo slaptafrazę.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą, įvesdami atgavimo slaptafrazę.",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą, įvesdami atgavimo raktą.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jei pamiršote savo atgavimo raktą, galite <button>nustatyti naujas atgavimo parinktis</button>",
     "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.": "Susigrąžinkite prieigą prie savo paskyros ir atgaukite šifravimo raktus, saugomus šiame seanse. Be jų jūs negalėsite perskaityti visų savo saugių žinučių bet kuriame seanse.",
     "Restore": "Atkurti",
     "Use a different passphrase?": "Naudoti kitą slaptafrazę?",
-    "Repeat your recovery passphrase...": "Pakartokite savo atgavimo slaptafrazę...",
     "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.": "Nenustatę saugių žinučių atgavimo, negalėsite atkurti užšifruotų žinučių istorijos, jei atsijungsite ar naudosite kitą seansą.",
     "Set up Secure Message Recovery": "Nustatyti saugių žinučių atgavimą",
-    "Secure your backup with a recovery passphrase": "Apsaugokite savo atsarginę kopiją atgavimo slaptafraze",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Nenustatę saugių žinučių atgavimo, atsijungdami jūs prarasite savo saugių žinučių istoriją.",
     "New Recovery Method": "Naujas atgavimo metodas",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Buvo aptikta nauja atgavimo slaptafrazė ir saugių žinučių raktas.",
     "This session is encrypting history using the new recovery method.": "Šis seansas šifruoja istoriją naudodamas naują atgavimo metodą.",
     "Recovery Method Removed": "Atgavimo Metodas Pašalintas",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ši seansas aptiko, kad buvo pašalinta jūsų atgavimo slaptafrazė ir saugių žinučių raktas.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Jei tai padarėte netyčia, šiame seanse galite nustatyti saugias žinutes, kurios pakartotinai užšifruos šio seanso žinučių istoriją nauju atgavimo metodu.",
     "Toggle Bold": "Perjungti paryškinimą",
     "Toggle Italics": "Perjungti kursyvą",
@@ -1626,8 +1343,6 @@
     "Toggle this dialog": "Perjungti šį dialogą",
     "Move autocomplete selection up/down": "Perkelti automatinio užbaigimo pasirinkimą aukštyn/žemyn",
     "Cancel autocomplete": "Atšaukti automatinį užbaigimą",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>.",
-    "Use Recovery Key or Passphrase": "Naudoti atgavimo raktą arba slaptafrazę",
     "Error upgrading room": "Klaida atnaujinant kambarį",
     "Sends a message as html, without interpreting it as markdown": "SIunčia žinutę, kaip html, jo neinterpretuodamas kaip pažymėto",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Prideda ( ͡° ͜ʖ ͡°) prie paprasto teksto žinutės",
@@ -1668,7 +1383,6 @@
     "Encrypted by an unverified session": "Užšifruota nepatvirtinto seanso",
     "Encrypted": "Užšifruota",
     "Securely cache encrypted messages locally for them to appear in search results.": "Šifruotas žinutes saugiai talpinkite lokaliai, kad jos būtų rodomos paieškos rezultatuose.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Šifruotas žinutes saugiai talpinkite lokaliai, kad jos būtų rodomos paieškos rezultatuose, naudojant ",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Saugios žinutės su šiuo vartotoju yra visapusiškai užšifruotos ir negali būti perskaitytos trečiųjų šalių.",
     "Safeguard against losing access to encrypted messages & data": "Apsisaugokite nuo prieigos prie šifruotų žinučių ir duomenų praradimo",
     "Main address": "Pagrindinis adresas",
@@ -1720,18 +1434,15 @@
     "Join millions for free on the largest public server": "Prisijunkite prie milijonų didžiausiame viešame serveryje nemokamai",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Blokuoti bet ką, kas nėra iš %(serverName)s, niekada nebeleidžiant prisijungti prie šio kambario.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privačius kambarius rasti ir prie jų prisijungti galima tik su pakvietimu. Viešus kambarius rasti ir prie jų prisijungti gali visi šioje bendruomenėje.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privačius kambarius rasti ir prie jų prisijungti galima tik su pakvietimu. Viešus kambarius rasti ir prie jų prisijungti gali visi.",
     "Join": "Prisijungti",
     "Join the conference from the room information card on the right": "Prisijunkite prie konferencijos kambario informacijos kortelėje dešinėje",
     "Join the conference at the top of this room": "Prisijunkite prie konferencijos šio kambario viršuje",
-    "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.": "Paskelbtus adresus gali naudoti bet kas, bet kuriame serveryje, kad prisijungtų prie jūsų kambario. Tam, kad paskelbtumėte adresą, visų pirma jis turi būti nustatytas kaip lokalus adresas.",
     "Join the discussion": "Prisijungti prie diskusijos",
     "Joining room …": "Jungiamasi prie kambario …",
     "Try to join anyway": "Vis tiek bandyti prisijungti",
     "Re-join": "Prisijungti iš naujo",
     "Join the conversation with an account": "Prisijunkite prie pokalbio su paskyra",
     "Join Room": "Prisijungti prie kambario",
-    "Guests cannot join this room even if explicitly invited.": "Svečiai negali prisijungti prie šio kambario, net jei jie yra pakviesti.",
     "Subscribing to a ban list will cause you to join it!": "Užsiprenumeravus draudimų sąrašą, būsite prie jo prijungtas!",
     "%(senderName)s joined the call": "%(senderName)s prisijungė prie skambučio",
     "You joined the call": "Jūs prisijungėte prie skambučio",
@@ -1750,7 +1461,6 @@
     "Show Widgets": "Rodyti Valdiklius",
     "Show tray icon and minimize window to it on close": "Rodyti dėklo piktogramą ir sumažinti langą į jį, kai uždaroma",
     "Always show the window menu bar": "Visada rodyti lango meniu juostą",
-    "There are advanced notifications which are not shown here.": "Yra išplėstinių pranešimų, kurie čia nerodomi.",
     "Show less": "Rodyti mažiau",
     "Show message previews for reactions in all rooms": "Rodyti žinučių peržiūras reakcijoms visuose kambariuose",
     "Show message previews for reactions in DMs": "Rodyti žinučių peržiūras reakcijoms tiesioginėse žinutėse",
@@ -1775,18 +1485,12 @@
     "The call was answered on another device.": "Į skambutį buvo atsiliepta kitame įrenginyje.",
     "Answered Elsewhere": "Atsiliepta Kitur",
     "The call could not be established": "Nepavyko pradėti skambučio",
-    "The other party declined the call.": "Kita šalis atsisakė skambučio.",
-    "Call Declined": "Skambutis Atmestas",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Visiems serveriams uždrausta dalyvauti! Šis kambarys nebegali būti naudojamas.",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s pašalino draudimo taisyklę, sutampančią su %(glob)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s pašalino taisyklę, draudžiančią serverius, sutampančius su %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s pašalino taisyklę, draudžiančią kambarius, sutampančius su %(glob)s",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s pašalino taisyklę, draudžiančią vartotojus, sutampančius su %(glob)s",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s atnaujino klaidingą draudimo taisyklę",
-    "%(senderName)s declined the call.": "%(senderName)s atmetė skambutį.",
-    "(an error occurred)": "(įvyko klaida)",
-    "(their device couldn't start the camera / microphone)": "(jų įrenginys negalėjo pradėti kameros / mikrofono)",
-    "(connection failed)": "(prisijungimas nepavyko)",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s pakeitė serverio prieigos kontrolės sąrašus šiam kambariui.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s nustatė serverio prieigos kontrolės sąrašus šiam kambariui.",
     "Sends a message to the given user": "Siunčia žinutę nurodytam vartotojui",
@@ -1806,7 +1510,6 @@
     "Set up Secure Backup": "Nustatyti Saugią Atsarginę Kopiją",
     "Ok": "Gerai",
     "Contact your <a>server admin</a>.": "Susisiekite su savo <a>serverio administratoriumi</a>.",
-    "I want to help": "Aš noriu padėti",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Siųsti <UsageDataLink>anoniminius naudojimo duomenis</UsageDataLink>, kurie padeda mums tobulinti %(brand)s. Tam bus naudojamas <PolicyLink>slapukas</PolicyLink>.",
     "Help us improve %(brand)s": "Padėkite mums tobulinti %(brand)s",
     "Unknown App": "Nežinoma Programa",
@@ -1882,14 +1585,12 @@
     "Something went wrong. Please try again or view your console for hints.": "Kažkas ne taip. Bandykite dar kartą arba peržiūrėkite konsolę, kad rastumėte užuominų.",
     "Error adding ignored user/server": "Klaida pridedant ignoruojamą vartotoją/serverį",
     "Ignored/Blocked": "Ignoruojami/Blokuojami",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Tinkinkite savo patirtį su eksperimentinėmis laboratorijų funkcijomis. <a>Sužinoti daugiau</a>.",
     "Labs": "Laboratorijos",
     "Legal": "Teisiniai",
     "Appearance Settings only affect this %(brand)s session.": "Išvaizdos Nustatymai įtakoja tik šį %(brand)s seansą.",
     "Customise your appearance": "Tinkinti savo išvaizdą",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Nustatykite sistemoje įdiegto šrifto pavadinimą ir %(brand)s bandys jį naudoti.",
     "Modern": "Modernus",
-    "Compact": "Kompaktiškas",
     "Message layout": "Žinutės išdėstymas",
     "Use between %(min)s pt and %(max)s pt": "Naudokite dydį tarp %(min)s pt ir %(max)s pt",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Pasirinktinis šrifto dydis gali būti tik tarp %(min)s pt ir %(max)s pt",
@@ -1904,7 +1605,6 @@
     "Backup key cached:": "Atsarginis raktas išsaugotas talpykloje:",
     "not stored": "nesaugomas",
     "Backup key stored:": "Atsarginis raktas saugomas:",
-    "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.": "Sukurkite šifravimo raktų atsarginę kopiją su savo paskyros duomenimis, jei prarastumėte prieigą prie savo seansų. Jūsų raktai bus apsaugoti unikaliu Atkūrimo Raktu.",
     "Algorithm:": "Algoritmas:",
     "Backup version:": "Atsarginės kopijos versija:",
     "Backup is not signed by any of your sessions": "Atsarginė kopija nepasirašyta nė vieno jūsų seanso",
@@ -1912,7 +1612,6 @@
     "Profile picture": "Profilio paveikslėlis",
     "The operation could not be completed": "Nepavyko užbaigti operacijos",
     "Failed to save your profile": "Nepavyko išsaugoti jūsų profilio",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Galbūt juos sukonfigūravote ne %(brand)s kliente, o kitame. Jūs negalite derinti jų %(brand)s, bet jie vis tiek taikomi.",
     "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)": "Prašau pamiršti visas mano siųstas žinutes, kai mano paskyra bus deaktyvuota (<b>Įspėjimas:</b> tai neleis būsimiems vartotojams pamatyti pilnų pokalbių vaizdo)",
     "Forget Room": "Pamiršti Kambarį",
     "Forget this room": "Pamiršti šį kambarį",
@@ -1939,7 +1638,6 @@
     "Room Notification": "Kambario Pranešimas",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Jūs turite %(count)s neperskaitytą pranešimą ankstesnėje šio kambario versijoje.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Jūs turite %(count)s neperskaitytus(-ų) pranešimus(-ų) ankstesnėje šio kambario versijoje.",
-    "You have no visible notifications in this room.": "Šiame kambaryje neturite matomų pranešimų.",
     "Notification options": "Pranešimų parinktys",
     "Leave Room": "Išeiti Iš Kambario",
     "Favourited": "Mėgstamas",
@@ -1947,23 +1645,16 @@
     "%(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 negali saugiai talpinti šifruotų žinučių lokaliai, kai veikia interneto naršyklėje. Naudokite <desktopLink>%(brand)s Desktop (darbastalio versija)</desktopLink>, kad šifruotos žinutės būtų rodomos paieškos rezultatuose.",
     "%(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 trūksta kai kurių komponentų, reikalingų saugiai talpinti šifruotas žinutes lokaliai. Jei norite eksperimentuoti su šia funkcija, sukurkite pasirinktinį %(brand)s Desktop (darbastalio versiją), su <nativeLink>pridėtais paieškos komponentais</nativeLink>.",
     "Manage": "Tvarkyti",
-    "rooms.": "kambarių.",
-    " to store messages from ": " saugoti žinutes iš ",
     "Master private key:": "Pagrindinis privatus raktas:",
     "not found in storage": "saugykloje nerasta",
     "Cross-signing is not set up.": "Kryžminis pasirašymas nenustatytas.",
     "Cross-signing is ready for use.": "Kryžminis pasirašymas yra paruoštas naudoti.",
-    "Channel: %(channelName)s": "Kanalas: %(channelName)s",
-    "Workspace: %(networkName)s": "Darbo sritis: %(networkName)s",
     "This bridge is managed by <user />.": "Šis tiltas yra tvarkomas <user />.",
     "This bridge was provisioned by <user />.": "Šis tiltas buvo parūpintas <user />.",
     "Your server isn't responding to some <a>requests</a>.": "Jūsų serveris neatsako į kai kurias <a>užklausas</a>.",
     "Unable to find a supported verification method.": "Nepavyko rasti palaikomo patvirtinimo metodo.",
     "Start": "Pradėti",
     "or": "arba",
-    "Incoming call": "Įeinantis skambutis",
-    "Incoming video call": "Įeinantis video skambutis",
-    "Incoming voice call": "Įeinantis balso skambutis",
     "Unknown caller": "Nežinomas skambintojas",
     "Downloading logs": "Parsiunčiami žurnalai",
     "Uploading logs": "Įkeliami žurnalai",
@@ -1972,7 +1663,6 @@
     "Use a more compact ‘Modern’ layout": "Naudoti labiau kompaktišką 'Modernų' išdėstymą",
     "Use custom size": "Naudoti pasirinktinį dydį",
     "Font size": "Šrifto dydis",
-    "Enable advanced debugging for the room list": "Įjungti išplėstinį kambarių sąrašo derinimą",
     "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.": "Jei kita %(brand)s versija vis dar yra atidaryta kitame skirtuke, uždarykite jį, nes %(brand)s naudojimas tame pačiame serveryje, tuo pačiu metu įjungus ir išjungus tingų įkėlimą, sukelks problemų.",
     "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.": "Jūs anksčiau naudojote %(brand)s ant %(host)s įjungę tingų narių įkėlimą. Šioje versijoje tingus įkėlimas yra išjungtas. Kadangi vietinė talpykla nesuderinama tarp šių dviejų nustatymų, %(brand)s reikia iš naujo sinchronizuoti jūsų paskyrą.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Jūs galite tai įjungti, jei kambarys bus naudojamas tik bendradarbiavimui su vidinėmis komandomis jūsų serveryje. Tai negali būti vėliau pakeista.",
@@ -1980,7 +1670,6 @@
     "You don't currently have any stickerpacks enabled": "Jūs šiuo metu neturite jokių įjungtų lipdukų paketų",
     "Enable experimental, compact IRC style layout": "Įjungti eksperimentinį, kompaktišką IRC stiliaus išdėstymą",
     "Support adding custom themes": "Palaikykite pridėdami pasirinktines temas",
-    "New spinner design": "Naujas suktuko dizainas",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Bendruomenių v2 prototipai. Reikalingas suderinamas serveris. Itin eksperimentiniai - naudokite atsargiai.",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
@@ -1991,16 +1680,10 @@
     "%(senderName)s started a call": "%(senderName)s pradėjo skambutį",
     "You started a call": "Jūs pradėjote skambutį",
     "Call ended": "Skambutis baigtas",
-    "%(senderName)s left the call": "%(senderName)s paliko skambutį",
-    "You left the call": "Jūs palikote skambutį",
     "Call in progress": "Vykdomas skambutis",
     "The person who invited you already left the room, or their server is offline.": "Asmuo, kuris jus pakvietė, jau išėjo iš kambario, arba jo serveris yra neprisijungęs.",
     "The person who invited you already left the room.": "Asmuo, kuris jus pakvietė, jau išėjo iš kambario.",
     "Guest": "Svečias",
-    "A new version of %(brand)s is available!": "Galima nauja %(brand)s versija!",
-    "Upgrade your %(brand)s": "Atnaujinti jūsų %(brand)s",
-    "Restart": "Perkrauti",
-    "A widget would like to verify your identity": "Valdiklis nori patvirtinti jūsų tapatybę",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Patvirtinant šį vartotoją, jo seansas bus pažymėtas kaip patikimas, taip pat jūsų seansas bus pažymėtas kaip patikimas jam.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "Užšifruotuose kambariuose, patvirtinkite visus vartotojus, kad užtikrintumėte jo saugumą.",
     "The homeserver the user you’re verifying is connected to": "Serveris, prie kurio yra prisijungęs jūsų tvirtinamas vartotojas",
@@ -2031,7 +1714,6 @@
     "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.": "Nepavyksta prisijungti prie serverio - patikrinkite savo ryšį, įsitikinkite, kad jūsų <a>serverio SSL sertifikatas</a> yra patikimas ir, kad naršyklės plėtinys neužblokuoja užklausų.",
     "Not trusted": "Nepatikimas",
     "Trusted": "Patikimas",
-    "Role": "Rolė",
     "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.": "Anksčiau šiame seanse naudojote naujesnę %(brand)s versiją. Norėdami vėl naudoti šią versiją su visapusiu šifravimu, turėsite atsijungti ir prisijungti iš naujo.",
     "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": "Tam, kad neprarastumėte savo pokalbių istorijos, prieš atsijungdami turite eksportuoti kambario raktus. Norėdami tai padaryti, turėsite grįžti į naujesnę %(brand)s versiją",
     "New version of %(brand)s is available": "Yra nauja %(brand)s versija",
@@ -2078,8 +1760,6 @@
     "Local Addresses": "Vietiniai Adresai",
     "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.": "Jei anksčiau naudojote naujesnę %(brand)s versiją, jūsų seansas gali būti nesuderinamas su šia versija. Uždarykite šį langą ir grįžkite į naujesnę versiją.",
     "We encountered an error trying to restore your previous session.": "Bandant atkurti ankstesnį seansą įvyko klaida.",
-    "The internet connection either session is using": "Interneto ryšys, naudojamas bet kurio seanso",
-    "This session, or the other session": "Šis seansas, arba kitas seansas",
     "Confirm this user's session by comparing the following with their User Settings:": "Patvirtinkite šio vartotojo seansą, palygindami tai, kas nurodyta toliau, su jo Vartotojo Nustatymais:",
     "Confirm by comparing the following with the User Settings in your other session:": "Patvirtinkite, palygindami tai, kas nurodyta toliau, su Vartotojo Nustatymais kitame jūsų seanse:",
     "Clear all data in this session?": "Išvalyti visus duomenis šiame seanse?",
@@ -2102,5 +1782,330 @@
     "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.": "Jūs galite naudoti serverio parinktis, norėdami prisijungti prie kitų Matrix serverių, nurodydami kitą serverio URL. Tai leidžia jums naudoti Element su egzistuojančia paskyra kitame serveryje.",
     "Server Options": "Serverio Parinktys",
     "Your homeserver": "Jūsų serveris",
-    "Download logs": "Parsisiųsti žurnalus"
+    "Download logs": "Parsisiųsti žurnalus",
+    "edited": "pakeista",
+    "Edited at %(date)s. Click to view edits.": "Keista %(date)s. Spustelėkite kad peržiūrėti pakeitimus.",
+    "Edited at %(date)s": "Keista %(date)s",
+    "Click to view edits": "Spustelėkite kad peržiūrėti pakeitimus",
+    "Add an Integration": "Pridėti Integraciją",
+    "Message deleted on %(date)s": "Žinutė buvo ištrinta %(date)s",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagavo su %(shortName)s</reactedWith>",
+    "Reactions": "Reakcijos",
+    "Add reaction": "Pridėti reakciją",
+    "Error processing voice message": "Klaida apdorojant balso pranešimą",
+    "Declining …": "Atmetama …",
+    "Ignored attempt to disable encryption": "Bandymas išjungti šifravimą buvo ignoruotas",
+    "Verification timed out.": "Pasibaigė laikas patikrinimui.",
+    "Ask %(displayName)s to scan your code:": "Paprašykite %(displayName)s nuskaityti jūsų kodą:",
+    "Failed to withdraw invitation": "Nepavyko atšaukti pakvietimo",
+    "Disinvite this user from community?": "Atšaukti pakvietimą šiam vartotojui iš šios bendruomenės?",
+    "Unmute": "Atšaukti nutildymą",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Dideliam žinučių kiekiui tai gali užtrukti kurį laiką. Prašome neperkrauti savo kliento.",
+    "No recent messages by %(user)s found": "Nerasta jokių naujesnių %(user)s žinučių",
+    "Accepting …": "Priimame …",
+    "You cancelled": "Jūs atšaukėte",
+    "You declined": "Jūs atsisakėte",
+    "You accepted": "Jūs priėmėte",
+    "Message Actions": "Žinutės Veiksmai",
+    "React": "Reaguoti",
+    "Edit devices": "Redaguoti įrenginius",
+    "Not encrypted": "Neužšifruota",
+    "Pinned messages": "Prisegtos žinutės",
+    "Nothing pinned, yet": "Kol kas nieko neprisegta",
+    "Mexico": "Meksika",
+    "Malaysia": "Malaizija",
+    "Iraq": "Irakas",
+    "Iran": "Iranas",
+    "Indonesia": "Indonezija",
+    "India": "Indija",
+    "Iceland": "Islandija",
+    "Greenland": "Grenlandija",
+    "Greece": "Graikija",
+    "Germany": "Vokietija",
+    "France": "Prancūzija",
+    "Finland": "Suomija",
+    "Estonia": "Estija",
+    "Egypt": "Egiptas",
+    "Denmark": "Danija",
+    "Croatia": "Kroatija",
+    "Colombia": "Kolumbija",
+    "China": "Kinija",
+    "Chile": "Čilė",
+    "Canada": "Kanada",
+    "Bulgaria": "Bulgarija",
+    "Brazil": "Brazilija",
+    "Belgium": "Belgija",
+    "Bangladesh": "Bangladešas",
+    "Try again": "Bandykite vėl",
+    "We couldn't log you in": "Mes negalėjome jūsų prijungti",
+    "You're already in a call with this person.": "Jūs jau esate pokalbyje su šiuo asmeniu.",
+    "Already in call": "Jau pokalbyje",
+    "Your Security Key": "Jūsų Saugumo Raktas",
+    "Confirm your Security Phrase": "Patvirtinkite savo Saugumo Frazę",
+    "Make a copy of your Security Key": "Sukurkite savo Saugumo Rakto kopiją",
+    "Generate a Security Key": "Generuoti Saugumo Raktą",
+    "Save your Security Key": "Išsaugoti savo Saugumo Raktą",
+    "Go to Settings": "Eiti į Nustatymus",
+    "Disable": "Išjungti",
+    "Search (must be enabled)": "Paieška (turi būti įjungta)",
+    "The user you called is busy.": "Vartotojas kuriam skambinate yra užsiėmęs.",
+    "User Busy": "Vartotojas Užsiėmęs",
+    "Any of the following data may be shared:": "Gali būti dalijamasi bet kuriais toliau nurodytais duomenimis:",
+    "Cancel search": "Atšaukti paiešką",
+    "Quick Reactions": "Greitos Reakcijos",
+    "Categories": "Kategorijos",
+    "Flags": "Vėliavos",
+    "Symbols": "Simboliai",
+    "Objects": "Objektai",
+    "Travel & Places": "Kelionės & Vietovės",
+    "Activities": "Veikla",
+    "Food & Drink": "Maistas & Gėrimai",
+    "Animals & Nature": "Gyvūnai & Gamta",
+    "Frequently Used": "Dažnai Naudojama",
+    "Something went wrong when trying to get your communities.": "Kažkas nepavyko bandant gauti jūsų bendruomenes.",
+    "Can't load this message": "Nepavyko įkelti šios žinutės",
+    "Submit logs": "Pateikti žurnalus",
+    "Botswana": "Botsvana",
+    "Bosnia": "Bosnija",
+    "Bolivia": "Bolivija",
+    "Bhutan": "Butanas",
+    "Bermuda": "Bermudai",
+    "Benin": "Beninas",
+    "Belize": "Belizas",
+    "Belarus": "Baltarusija",
+    "Barbados": "Barbadosas",
+    "Bahrain": "Bahreinas",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Jūsų Saugumo Raktas buvo <b>nukopijuotas į iškarpinę</b>, įklijuokite jį į:",
+    "Great! This Security Phrase looks strong enough.": "Puiku! Ši Saugumo Frazė atrodo pakankamai stipri.",
+    "Revoke permissions": "Atšaukti leidimus",
+    "Take a picture": "Padarykite nuotrauką",
+    "Start audio stream": "Pradėti garso transliaciją",
+    "Failed to start livestream": "Nepavyko pradėti tiesioginės transliacijos",
+    "Unable to start audio streaming.": "Nepavyksta pradėti garso transliacijos.",
+    "Set a new status...": "Nustatykite naują būseną...",
+    "Set status": "Nustatyti būseną",
+    "Clear status": "Išvalyti būseną",
+    "Resend %(unsentCount)s reaction(s)": "Pakartotinai išsiųsti %(unsentCount)s reakciją (-as)",
+    "Hold": "Sulaikyti",
+    "Resume": "Tęsti",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Jei pamiršote Saugumo Raktą, galite <button>nustatyti naujas atkūrimo parinktis</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą įvesdami Saugumo Raktą.",
+    "This looks like a valid Security Key!": "Atrodo, kad tai tinkamas Saugumo Raktas!",
+    "Not a valid Security Key": "Netinkamas Saugumo Raktas",
+    "Enter Security Key": "Įveskite Saugumo Raktą",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo Saugumo Frazę, galite <button1>panaudoti savo Saugumo Raktą</button1> arba <button2>nustatyti naujas atkūrimo parinktis</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Pasiekite savo saugių žinučių istoriją ir nustatykite saugių žinučių siuntimą įvesdami Saugumo Frazę.",
+    "Enter Security Phrase": "Įveskite Saugumo Frazę",
+    "Keys restored": "Raktai atkurti",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Atsarginės kopijos nepavyko iššifruoti naudojant šią Saugumo Frazę: prašome patikrinti, ar įvedėte teisingą Saugumo Frazę.",
+    "Incorrect Security Phrase": "Neteisinga Saugumo Frazė",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Atsarginės kopijos nepavyko iššifruoti naudojant šį Saugumo Raktą: prašome patikrinti, ar įvedėte teisingą Saugumo Raktą.",
+    "Security Key mismatch": "Saugumo Rakto nesutapimas",
+    "Unable to load backup status": "Nepavyksta įkelti atsarginės kopijos būsenos",
+    "%(completed)s of %(total)s keys restored": "%(completed)s iš %(total)s raktų atkurta",
+    "Fetching keys from server...": "Gauname raktus iš serverio...",
+    "Unable to set up keys": "Nepavyksta nustatyti raktų",
+    "Use your Security Key to continue.": "Naudokite Saugumo Raktą kad tęsti.",
+    "Security Key": "Saugumo Raktas",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Nepavyksta pasiekti slaptosios saugyklos. Prašome patvirtinti kad teisingai įvedėte Saugumo Frazę.",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Jei viską nustatysite iš naujo, paleisite iš naujo be patikimų seansų, be patikimų vartotojų ir galbūt negalėsite matyti ankstesnių žinučių.",
+    "Only do this if you have no other device to complete verification with.": "Taip darykite tik tuo atveju, jei neturite kito prietaiso, kuriuo galėtumėte užbaigti patikrinimą.",
+    "Reset everything": "Iš naujo nustatyti viską",
+    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Pamiršote arba praradote visus atkūrimo metodus? <a>Iš naujo nustatyti viską</a>",
+    "Invalid Security Key": "Klaidingas Saugumo Raktas",
+    "Wrong Security Key": "Netinkamas Saugumo Raktas",
+    "Looks good!": "Atrodo gerai!",
+    "Wrong file type": "Netinkamas failo tipas",
+    "Remember this": "Prisiminkite tai",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Šis valdiklis patvirtins jūsų vartotojo ID, bet negalės už jus atlikti veiksmų:",
+    "Allow this widget to verify your identity": "Leiskite šiam valdikliui patvirtinti jūsų tapatybę",
+    "Remember my selection for this widget": "Prisiminti mano pasirinkimą šiam valdikliui",
+    "Decline All": "Atmesti Visus",
+    "Approve": "Patvirtinti",
+    "This widget would like to:": "Šis valdiklis norėtų:",
+    "Approve widget permissions": "Patvirtinti valdiklio leidimus",
+    "Verification Request": "Patikrinimo Užklausa",
+    "Verify other login": "Patikrinkite kitą prisijungimą",
+    "Document": "Dokumentas",
+    "Summary": "Santrauka",
+    "Service": "Paslauga",
+    "To continue you need to accept the terms of this service.": "Norėdami tęsti, turite sutikti su šios paslaugos sąlygomis.",
+    "Be found by phone or email": "Tapkite randami telefonu arba el. paštu",
+    "Find others by phone or email": "Ieškokite kitų telefonu arba el. paštu",
+    "Save Changes": "Išsaugoti Pakeitimus",
+    "Saving...": "Išsaugoma...",
+    "Link to selected message": "Nuoroda į pasirinktą pranešimą",
+    "Share Community": "Dalintis Bendruomene",
+    "Share User": "Dalintis Vartotoju",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Patikrinkite savo el. laišką ir spustelėkite jame esančią nuorodą. Kai tai padarysite, spauskite tęsti.",
+    "Verification Pending": "Laukiama Patikrinimo",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Išvalius naršyklės saugyklą, problema gali būti išspręsta, tačiau jus atjungs ir užšifruotų pokalbių istorija taps neperskaitoma.",
+    "Clear Storage and Sign Out": "Išvalyti Saugyklą ir Atsijungti",
+    "Reset event store": "Iš naujo nustatyti įvykių saugyklą",
+    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Jei to norite, atkreipkite dėmesį, kad nė viena iš jūsų žinučių nebus ištrinta, tačiau keletą akimirkų, kol bus atkurtas indeksas, gali sutrikti paieška",
+    "You most likely do not want to reset your event index store": "Tikriausiai nenorite iš naujo nustatyti įvykių indekso saugyklos",
+    "Reset event store?": "Iš naujo nustatyti įvykių saugyklą?",
+    "About homeservers": "Apie namų serverius",
+    "Learn more": "Sužinokite daugiau",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Naudokite pageidaujamą Matrix namų serverį, jei tokį turite, arba talpinkite savo.",
+    "Other homeserver": "Kitas namų serveris",
+    "We call the places where you can host your account ‘homeservers’.": "Vietas, kuriose galite talpinti savo paskyrą, vadiname 'namų serveriais'.",
+    "Sign into your homeserver": "Prisijunkite prie savo namų serverio",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org yra didžiausias viešasis namų serveris pasaulyje, todėl tai gera vieta daugeliui.",
+    "Specify a homeserver": "Nurodykite namų serverį",
+    "Invalid URL": "Netinkamas URL",
+    "Unable to validate homeserver": "Nepavyksta patvirtinti namų serverio",
+    "Recent changes that have not yet been received": "Naujausi pakeitimai, kurie dar nebuvo gauti",
+    "The server is not configured to indicate what the problem is (CORS).": "Serveris nėra sukonfigūruotas taip, kad būtų galima nurodyti, kokia yra problema (CORS).",
+    "A connection error occurred while trying to contact the server.": "Bandant susisiekti su serveriu įvyko ryšio klaida.",
+    "The server has denied your request.": "Serveris atmetė jūsų užklausą.",
+    "The server is offline.": "Serveris yra išjungtas.",
+    "A browser extension is preventing the request.": "Naršyklės plėtinys užkerta kelią užklausai.",
+    "Your firewall or anti-virus is blocking the request.": "Jūsų užkarda arba antivirusinė programa blokuoja užklausą.",
+    "The server (%(serverName)s) took too long to respond.": "Serveris (%(serverName)s) užtruko per ilgai atsakydamas.",
+    "Server isn't responding": "Serveris neatsako",
+    "You're all caught up.": "Jūs jau viską pasivijote.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Atnaujinsite šį kambarį iš <oldVersion /> į <newVersion />.",
+    "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.": "Paprastai tai turi įtakos tik tam, kaip kambarys apdorojamas serveryje. Jei turite problemų su %(brand)s, praneškite apie klaidą.",
+    "Upgrade private room": "Atnaujinti privatų kambarį",
+    "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>.": "Įspėjame, kad nepridėję el. pašto ir pamiršę slaptažodį galite <b>visam laikui prarasti prieigą prie savo paskyros</b>.",
+    "Continuing without email": "Tęsiama be el. pašto",
+    "Doesn't look like a valid email address": "Neatrodo kaip tinkamas el. pašto adresas",
+    "Data on this screen is shared with %(widgetDomain)s": "Duomenimis šiame ekrane yra dalinamasi su %(widgetDomain)s",
+    "Message edits": "Žinutės redagavimai",
+    "Your homeserver doesn't seem to support this feature.": "Panašu, kad jūsų namų serveris nepalaiko šios galimybės.",
+    "If they don't match, the security of your communication may be compromised.": "Jei jie nesutampa, gali būti pažeistas jūsų komunikacijos saugumas.",
+    "Clear cache and resync": "Išvalyti talpyklą ir sinchronizuoti iš naujo",
+    "Signature upload failed": "Parašo įkėlimas nepavyko",
+    "Signature upload success": "Parašo įkėlimas sėkmingas",
+    "Unable to upload": "Nepavyksta įkelti",
+    "Cancelled signature upload": "Atšauktas parašo įkėlimas",
+    "Upload completed": "Įkėlimas baigtas",
+    "%(brand)s encountered an error during upload of:": "%(brand)s aptiko klaidą įkeliant:",
+    "a key signature": "rakto parašas",
+    "a new master key signature": "naujas pagrindinio rakto parašas",
+    "Transfer": "Perkelti",
+    "Invited people will be able to read old messages.": "Pakviesti asmenys galės skaityti senus pranešimus.",
+    "Invite to %(roomName)s": "Pakvietimas į %(roomName)s",
+    "Or send invite link": "Arba atsiųskite kvietimo nuorodą",
+    "If you can't see who you’re looking for, send them your invite link below.": "Jei nematote ieškomo asmens, atsiųskite jam žemiau pateiktą kvietimo nuorodą.",
+    "Some suggestions may be hidden for privacy.": "Kai kurie pasiūlymai gali būti paslėpti dėl privatumo.",
+    "Go": "Eiti",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Tai nepakvies jų į %(communityName)s. Norėdami pakviesti ką nors į %(communityName)s, spustelėkite <a>čia</a>",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Pradėkite pokalbį su asmeniu naudodami jo vardą arba vartotojo vardą (pvz., <userId/>).",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Pradėkite pokalbį su kažkuo naudodami jų vardą, el. pašto adresą arba vartotojo vardą (pvz., <userId/>).",
+    "May include members not in %(communityName)s": "Gali apimti narius, neįtrauktus į %(communityName)s",
+    "Suggestions": "Pasiūlymai",
+    "Recent Conversations": "Pastarieji pokalbiai",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Toliau išvardyti vartotojai gali neegzistuoti arba būti negaliojantys, todėl jų negalima pakviesti: %(csvNames)s",
+    "Failed to find the following users": "Nepavyko rasti šių vartotojų",
+    "Failed to transfer call": "Nepavyko perduoti skambučio",
+    "A call can only be transferred to a single user.": "Skambutį galima perduoti tik vienam naudotojui.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Negalėjome pakviesti šių vartotojų. Patikrinkite vartotojus, kuriuos norite pakviesti, ir bandykite dar kartą.",
+    "Something went wrong trying to invite the users.": "Bandant pakviesti vartotojus kažkas nepavyko.",
+    "We couldn't create your DM.": "Negalėjome sukurti jūsų AŽ.",
+    "Invite by email": "Kviesti el. paštu",
+    "Click the button below to confirm your identity.": "Spustelėkite toliau esantį mygtuką, kad patvirtintumėte savo tapatybę.",
+    "Confirm to continue": "Patvirtinkite, kad tęstumėte",
+    "Incoming Verification Request": "Įeinantis Patikrinimo Prašymas",
+    "Minimize dialog": "Sumažinti dialogą",
+    "Maximize dialog": "Maksimaliai padidinti dialogą",
+    "You should know": "Turėtumėte žinoti",
+    "Terms of Service": "Paslaugų Teikimo Sąlygos",
+    "Privacy Policy": "Privatumo Politika",
+    "Cookie Policy": "Slapukų Politika",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Sužinokite daugiau mūsų <privacyPolicyLink />, <termsOfServiceLink /> ir <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Tęsiant laikinai leidžiama %(hostSignupBrand)s sąrankos procesui prisijungti prie jūsų paskyros ir gauti patikrintus el. pašto adresus. Šie duomenys nėra saugomi.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Nepavyko prisijungti prie namų serverio. Uždarykite šį dialogą ir bandykite dar kartą.",
+    "Abort": "Nutraukti",
+    "Search for rooms or people": "Ieškoti kambarių ar žmonių",
+    "Message preview": "Žinutės peržiūra",
+    "Forward message": "Persiųsti žinutę",
+    "Open link": "Atidaryti nuorodą",
+    "Sent": "Išsiųsta",
+    "Sending": "Siunčiama",
+    "You don't have permission to do this": "Jūs neturite leidimo tai daryti",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Yra du būdai, kaip galite pateikti atsiliepimus ir padėti mums patobulinti %(brand)s.",
+    "Comment": "Komentaras",
+    "Add comment": "Pridėti komentarą",
+    "Please go into as much detail as you like, so we can track down the problem.": "Pateikite kuo daugiau informacijos, kad galėtume nustatyti problemą.",
+    "Tell us below how you feel about %(brand)s so far.": "Toliau papasakokite mums, ką iki šiol manote apie %(brand)s.",
+    "Rate %(brand)s": "Vertinti %(brand)s",
+    "Feedback sent": "Atsiliepimas išsiųstas",
+    "Level": "Lygis",
+    "Setting:": "Nustatymas:",
+    "Value": "Reikšmė",
+    "Setting ID": "Nustatymo ID",
+    "Failed to save settings": "Nepavyko išsaugoti nustatymų",
+    "Settings Explorer": "Nustatymų Naršyklė",
+    "There was an error finding this widget.": "Įvyko klaida ieškant šio valdiklio.",
+    "Active Widgets": "Aktyvūs Valdikliai",
+    "Verification Requests": "Patikrinimo Prašymai",
+    "View Servers in Room": "Peržiūrėti serverius Kambaryje",
+    "Server did not return valid authentication information.": "Serveris negrąžino galiojančios autentifikavimo informacijos.",
+    "Server did not require any authentication": "Serveris nereikalavo jokio autentifikavimo",
+    "There was a problem communicating with the server. Please try again.": "Kilo problemų bendraujant su serveriu. Bandykite dar kartą.",
+    "Confirm account deactivation": "Patvirtinkite paskyros deaktyvavimą",
+    "Create a room in %(communityName)s": "Sukurti kambarį %(communityName)s bendruomenėje",
+    "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.": "Šią funkciją galite išjungti, jei kambarys bus naudojamas bendradarbiavimui su išorės komandomis, turinčiomis savo namų serverį. Vėliau to pakeisti negalima.",
+    "Something went wrong whilst creating your community": "Kuriant bendruomenę kažkas nepavyko",
+    "Add image (optional)": "Pridėti nuotrauką (nebūtina)",
+    "Enter name": "Įveskite pavadinimą",
+    "What's the name of your community or team?": "Koks jūsų bendruomenės ar komandos pavadinimas?",
+    "You can change this later if needed.": "Jei reikės, vėliau tai galite pakeisti.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Naudokite tai, kai apie savo bendruomenę sakote kitiems. Bendruomenės ID negalima keisti.",
+    "Community ID: +<localpart />:%(domain)s": "Bendruomenės ID: +<localpart />:%(domain)s",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Klaida kuriant jūsų bendruomenę. Pavadinimas gali būti užimtas arba serveris negali apdoroti jūsų užklausos.",
+    "Clear all data": "Išvalyti visus duomenis",
+    "Removing…": "Pašalinama…",
+    "Send %(count)s invites|one": "Siųsti %(count)s pakvietimą",
+    "Send %(count)s invites|other": "Siųsti %(count)s pakvietimus",
+    "Hide": "Slėpti",
+    "Add another email": "Pridėti dar vieną el. paštą",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Primename: Jūsų naršyklė yra nepalaikoma, todėl jūsų patirtis gali būti nenuspėjama.",
+    "Send feedback": "Siųsti atsiliepimą",
+    "You may contact me if you have any follow up questions": "Jei turite papildomų klausimų, galite susisiekti su manimi",
+    "To leave the beta, visit your settings.": "Norėdami išeiti iš beta versijos, apsilankykite savo nustatymuose.",
+    "%(featureName)s beta feedback": "%(featureName)s beta atsiliepimas",
+    "Thank you for your feedback, we really appreciate it.": "Dėkojame už jūsų atsiliepimą, mes tai labai vertiname.",
+    "Close dialog": "Uždaryti dialogą",
+    "This version of %(brand)s does not support viewing some encrypted files": "Ši %(brand)s versija nepalaiko kai kurių užšifruotų failų peržiūros",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Naudokite <a>Kompiuterio programą</a> kad ieškoti užšifruotų žinučių",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Naudokite <a>Kompiuterio programą</a> kad matytumėte visus užšifruotus failus",
+    "Error - Mixed content": "Klaida - Maišytas turinys",
+    "Error loading Widget": "Klaida kraunant Valdiklį",
+    "This widget may use cookies.": "Šiame valdiklyje gali būti naudojami slapukai.",
+    "Widget added by": "Valdiklį pridėjo",
+    "Widget ID": "Valdiklio ID",
+    "Room ID": "Kambario ID",
+    "Your user ID": "Jūsų vartotojo ID",
+    "Sri Lanka": "Šri Lanka",
+    "Spain": "Ispanija",
+    "South Korea": "Pietų Korėja",
+    "South Africa": "Pietų Afrika",
+    "Slovakia": "Slovakija",
+    "Singapore": "Singapūras",
+    "Philippines": "Filipinai",
+    "Pakistan": "Pakistanas",
+    "Norway": "Norvegija",
+    "North Korea": "Šiaurės Korėja",
+    "Nigeria": "Nigerija",
+    "Niger": "Nigeris",
+    "Nicaragua": "Nikaragva",
+    "New Zealand": "Naujoji Zelandija",
+    "New Caledonia": "Naujoji Kaledonija",
+    "Netherlands": "Nyderlandai",
+    "Cayman Islands": "Kaimanų Salos",
+    "Integration manager": "Integracijų tvarkytuvas",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Jūsų %(brand)s neleidžia jums naudoti integracijų tvarkytuvo tam atlikti. Susisiekite su administratoriumi.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Naudojimasis šiuo valdikliu gali pasidalinti duomenimis <helpIcon /> su %(widgetDomain)s ir jūsų integracijų tvarkytuvu.",
+    "Identity server is": "Tapatybės serveris yra",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų Tvarkytuvai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Naudokite Integracijų Tvarkytuvą botų, valdiklių ir lipdukų pakuočių tvarkymui.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite Integracijų Tvarkytuvą <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų pakuočių tvarkymui.",
+    "Identity server": "Tapatybės serveris",
+    "Identity server (%(server)s)": "Tapatybės serveris (%(server)s)",
+    "Could not connect to identity server": "Nepavyko prisijungti prie tapatybės serverio",
+    "Not a valid identity server (status code %(code)s)": "Netinkamas tapatybės serveris (statuso kodas %(code)s)",
+    "Identity server URL must be HTTPS": "Tapatybės Serverio URL privalo būti HTTPS"
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index b56599f26e..30a455ad50 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1,12 +1,7 @@
 {
     "Accept": "Akceptēt",
-    "%(targetName)s accepted an invitation.": "%(targetName)s pieņēma uzaicinājumu.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s pieņēma uzaicinājumu no %(displayName)s.",
     "Account": "Konts",
-    "Access Token:": "Pieejas tokens:",
-    "Active call (%(roomName)s)": "Aktīvs zvans (%(roomName)s)",
     "Add": "Pievienot",
-    "Add a topic": "Pievienot tematu",
     "Admin": "Administrators",
     "Admin Tools": "Administratora rīki",
     "No Microphones detected": "Nav mikrofonu",
@@ -21,36 +16,23 @@
     "Authentication": "Autentifikācija",
     "%(items)s and %(lastItem)s": "%(items)s un %(lastItem)s",
     "A new password must be entered.": "Nepieciešams ievadīt jauno paroli.",
-    "%(senderName)s answered the call.": "%(senderName)s atbildēja uz zvanu.",
     "An error has occurred.": "Notikusi kļūda.",
     "Anyone": "Ikviens",
-    "Anyone who knows the room's link, apart from guests": "Ikviens, kurš zina adreses saiti uz istabu, izņemot viesus",
-    "Anyone who knows the room's link, including guests": "Ikviens, kurš zina adreses saiti uz istabu, tai skaitā arī viesi",
     "Are you sure?": "Vai tiešām to vēlaties?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Vai tiešām vēlaties pamest istabu: '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Vai tiešām vēlaties noraidīt šo uzaicinājumu?",
     "Attachment": "Pielikums",
-    "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
     "Ban": "Liegt pieeju",
     "Banned users": "Lietotāji, kuriem liegta pieeju",
     "Bans user with given id": "Liedz pieeju lietotājam ar norādīto id",
-    "Call Timeout": "Savienojuma gaidīšanas noilgums",
     "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.": "Neizdodas savienoties ar bāzes serveri. Pārbaudi tīkla savienojumu un pārliecinies, ka <a> bāzes servera SSL sertifikāts</a> ir uzticams, kā arī pārlūkā instalētie paplašinājumi nebloķē pieprasījumus.",
     "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>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
     "Change Password": "Nomainīt paroli",
-    "%(senderName)s changed their profile picture.": "%(senderName)s nomainīja profila attēlu.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s nomainīja statusa līmeni %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s nomainīja istabas nosaukumu uz %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s dzēsa istabas nosaukumu.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja istabas tematu uz \"%(topic)s\".",
     "Changes your display nickname": "Nomaina jūsu parādāmo vārdu",
-    "Click here to fix": "Klikšķini šeit, lai salabotu",
-    "Click to mute audio": "Klikšķini, lai audio skaņu izslēgtu",
-    "Click to mute video": "Klikšķini, lai video skaņu izslēgtu",
-    "click to reveal": "nospiediet, lai atsegtu",
-    "Click to unmute video": "Klikšķini, lai video skaņu ieslēgtu",
-    "Click to unmute audio": "Klikšķini, lai audio skaņu ieslēgtu",
     "Close": "Aizvērt",
     "Command error": "Komandas kļūda",
     "Commands": "Komandas",
@@ -59,9 +41,7 @@
     "Create Room": "Izveidot istabu",
     "Cryptography": "Kriptogrāfija",
     "Current password": "Pašreizējā parole",
-    "Custom": "Pielāgots",
     "Custom level": "Pielāgots līmenis",
-    "/ddg is not a command": "/ddg nav komanda",
     "Deactivate Account": "Deaktivizēt kontu",
     "Decline": "Noraidīt",
     "Decrypt %(text)s": "Atšifrēt %(text)s",
@@ -70,16 +50,12 @@
     "Disinvite": "Atsaukt",
     "Displays action": "Parāda darbību",
     "Download %(text)s": "Lejupielādēt: %(text)s",
-    "Drop File Here": "Ievelc failu šeit",
     "Email": "Epasts",
     "Email address": "Epasta adrese",
     "Emoji": "Emocijzīmes",
-    "%(senderName)s ended the call.": "%(senderName)s pabeidza zvanu.",
     "Enter passphrase": "Ievadiet frāzveida paroli",
     "Error": "Kļūda",
     "Error decrypting attachment": "Kļūda atšifrējot pielikumu",
-    "Error: Problem communicating with the given homeserver.": "Kļūda: Saziņas problēma ar norādīto bāzes serveri.",
-    "Existing Call": "Pašreizējā saruna (zvans)",
     "Export": "Eksportēt",
     "Export E2E room keys": "Eksportēt istabas šifrēšanas atslēgas",
     "Failed to ban user": "Neizdevās nobanot/bloķēt (liegt pieeju) lietotāju",
@@ -87,11 +63,9 @@
     "Failed to change power level": "Neizdevās nomainīt statusa līmeni",
     "Power level must be positive integer.": "Statusa līmenim ir jābūt pozitīvam skaitlim.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tu nevarēsi atcelt šo darbību, jo šim lietotājam piešķir tādu pašu statusa līmeni, kāds ir Tev.",
-    "Failed to fetch avatar URL": "Neizdevās noteikt avatara URL adresi",
     "Failed to forget room %(errCode)s": "Neizdevās \"aizmirst\" istabu %(errCode)s",
     "Failed to join room": "Neizdevās pievienoties istabai",
     "Failed to kick": "Neizdevās padzīt",
-    "Failed to leave room": "Neizdevās pamest istabu",
     "Failed to load timeline position": "Neizdevās ielādēt laikpaziņojumu pozīciju",
     "Failed to mute user": "Neizdevās apklusināt lietotāju",
     "Failed to reject invite": "Neizdevās noraidīt uzaicinājumu",
@@ -105,43 +79,32 @@
     "Failure to create room": "Neizdevās izveidot istabu",
     "Favourite": "Izlase",
     "Favourites": "Izlase",
-    "Fill screen": "Aizpildīt ekrānu",
     "Filter room members": "Filtrēt istabas biedrus",
     "Forget room": "\"Aizmirst\" istabu",
     "For security, this session has been signed out. Please sign in again.": "Drošības nolūkos šī sesija ir pārtraukta. Lūdzu, pieraksties par jaunu.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai, pat ja ir uzaicināti.",
     "Hangup": "Beigt zvanu",
     "Historical": "Bijušie",
     "Home": "Mājup",
     "Homeserver is": "Bāzes serveris ir",
-    "Identity Server is": "Indentifikācijas serveris ir",
     "I have verified my email address": "Mana epasta adrese ir verificēta",
     "Import": "Importēt",
     "Import E2E room keys": "Importēt E2E istabas atslēgas",
-    "Incoming call from %(name)s": "Ienākošs zvans no %(name)s",
-    "Incoming video call from %(name)s": "Ienākošs VIDEO zvans no %(name)s",
-    "Incoming voice call from %(name)s": "Ienākošs AUDIO zvans no %(name)s",
     "Incorrect username and/or password.": "Nepareizs lietotājvārds un/vai parole.",
     "Incorrect verification code": "Nepareizs verifikācijas kods",
     "Invalid Email Address": "Nepareiza epasta adrese",
     "Invalid file%(extra)s": "Nederīgs fails %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s uzaicināja %(targetName)s.",
     "Invited": "Uzaicināts/a",
     "Invites": "Uzaicinājumi",
     "Invites user with given id to current room": "Uzaicina lietotāju ar norādīto id uz pašreizējo istabu",
     "Sign in with": "Pierakstīties ar",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
     "Join Room": "Pievienoties istabai",
-    "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s padzina %(targetName)s.",
     "Kick": "Padzīt",
     "Kicks user with given id": "Padzen lietotāju ar norādīto id",
     "Labs": "Izmēģinājumu lauciņš",
     "Last seen": "Pēdējo reizi redzēts/a",
     "Leave room": "Pamest istabu",
-    "%(targetName)s left the room.": "%(targetName)s pameta istabu.",
     "Logout": "Izrakstīties",
     "Low priority": "Zema prioritāte",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
@@ -149,7 +112,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
-    "Manage Integrations": "Pārvaldīt integrācijas",
     "Missing room_id in request": "Iztrūkstošs room_id pieprasījumā",
     "Missing user_id in request": "Iztrūkstošs user_id pieprasījumā",
     "Moderator": "Moderators",
@@ -159,14 +121,12 @@
     "New passwords must match each other.": "Jaunajām parolēm ir jāsakrīt vienai ar otru.",
     "not specified": "nav noteikts",
     "Notifications": "Paziņojumi",
-    "(not supported by this browser)": "(netiek atbalstīts šajā pārlūkā)",
     "<not supported>": "<netiek atbalstīts>",
     "No display name": "Nav parādāmā vārda",
     "No more results": "Vairāk nekādu rezultātu nav",
     "No results": "Nav rezultātu",
     "No users have specific privileges in this room": "Šajā istabā nav lietotāju ar īpašām privilēģijām",
     "OK": "Labi",
-    "olm version:": "olm versija:",
     "Only people who have been invited": "Vienīgi uzaicināti cilvēki",
     "Operation failed": "Darbība neizdevās",
     "Password": "Parole",
@@ -174,25 +134,17 @@
     "Permissions": "Atļaujas",
     "Phone": "Telefons",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu, pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
-    "Private Chat": "Privātais čats",
     "Privileged Users": "Priviliģētie lietotāji",
     "Profile": "Profils",
-    "Public Chat": "Publiskais čats",
     "Reason": "Iemesls",
     "Register": "Reģistrēties",
-    "%(targetName)s rejected the invitation.": "%(targetName)s noraidīja uzaicinājumu.",
     "Reject invitation": "Noraidīt uzaicinājumu",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s dzēsa parādāmo vārdu (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s dzēsa profila attēlu.",
     "Remove": "Dzēst",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s vēlas VoIP konferenci.",
-    "Results from DuckDuckGo": "Rezultāti no DuckDuckGo",
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nav atļauts nosūtīt jums paziņojumus. Lūdzu pārbaudi sava pārlūka iestatījumus",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nav piešķirta atļauja nosūtīt paziņojumus. Lūdzu mēģini vēlreiz",
     "%(brand)s version:": "%(brand)s versija:",
     "Unable to enable Notifications": "Neizdevās iespējot paziņojumus",
-    "You have no visible notifications": "Tev nav redzamo paziņojumu",
     "This will allow you to reset your password and receive notifications.": "Tas atļaus Tev atiestatīt paroli un saņemt paziņojumus.",
     "Room %(roomId)s not visible": "Istaba %(roomId)s nav redzama",
     "%(roomName)s does not exist.": "%(roomName)s neeksistē.",
@@ -200,34 +152,23 @@
     "Seen by %(userName)s at %(dateTime)s": "Lietotājs %(userName)s apskatīja %(dateTime)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
-    "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nomainīja parādāmo vārdu uz: %(displayName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas liegumu %(targetName)s.",
     "Uploading %(filename)s and %(count)s others|zero": "Tiek augšupielādēts %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Tiek augšupielādēts %(filename)s un %(count)s citi",
     "Uploading %(filename)s and %(count)s others|other": "Tiek augšupielādēts %(filename)s un %(count)s citi",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tiesību līmenis %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
-    "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atsauca %(targetName)s uzaicinājumu.",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "An error occurred: %(error_string)s": "Notikusi kļūda: %(error_string)s",
     "(~%(count)s results)|one": "(~%(count)s rezultāts)",
     "(~%(count)s results)|other": "(~%(count)s rezultāti)",
     "Reject all %(invitedRooms)s invites": "Noraidīt visus %(invitedRooms)s uzaicinājumus",
-    "Failed to invite the following users to the %(roomName)s room:": "Neizdevās uzaicināt sekojošos lietotājus uz %(roomName)s istabu:",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
-    "Ongoing conference call%(supportedText)s.": "Notiekošs konferences zvans %(supportedText)s.",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja %(roomName)s istabas avataru",
-    "Room Colour": "Istabas krāsa",
     "Rooms": "Istabas",
     "Save": "Saglabāt",
     "Search": "Meklēt",
     "Search failed": "Meklēšana neizdevās",
-    "Searches DuckDuckGo for results": "Meklēšana DuckDuckGo rezultātos",
     "Send Reset Email": "Nosūtīt atiestatīšanas epastu",
     "Server error": "Servera kļūda",
     "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nesasniedzams, ir pārslogots, vai arī meklēšana beigusies ar savienojuma noildzi :(",
@@ -239,38 +180,31 @@
     "Signed Out": "Izrakstījās",
     "Sign in": "Pierakstīties",
     "Sign out": "Izrakstīties",
-    "%(count)s of your messages have not been sent.|other": "Dažas no tavām ziņām netika nosūtītas.",
     "Someone": "Kāds",
     "Start authentication": "Sākt autentifikāciju",
     "Submit": "Iesniegt",
     "Success": "Izdevās",
-    "The phone number entered looks invalid": "Ievadītais telefona numurs izskatās nepareizs",
     "This email address is already in use": "Šī epasta adrese jau tiek izmantota",
     "This email address was not found": "Šāda epasta adrese nav atrasta",
     "The email address linked to your account must be entered.": "Ir jāievada jūsu kontam piesaistītā epasta adrese.",
-    "The remote side failed to pick up": "Zvana adresāts neatbild",
     "This room has no local addresses": "Šai istabai nav lokālo adrešu",
     "This room is not recognised.": "Šī istaba netika atpazīta.",
     "This doesn't appear to be a valid email address": "Šī neizskatās pēc derīgas epasta adreses",
     "This phone number is already in use": "Šis telefona numurs jau tiek izmantots",
     "This room": "Šajā istabā",
     "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no citiem Matrix serveriem",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Notika mēģinājums ielādēt šīs istabas specifisku laikpaziņojumu sadaļu, bet Tev nav atļaujas skatīt šo ziņu.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Mēģinājums ielādēt šīs istabas čata vēstures izvēlēto posmu neizdevās, jo tas netika atrasts.",
     "Unable to add email address": "Neizdevās pievienot epasta adresi",
     "Unable to remove contact information": "Neizdevās dzēst kontaktinformāciju",
     "Unable to verify email address.": "Neizdevās apstiprināt epasta adresi.",
     "Unban": "Atcelt pieejas liegumu",
-    "Unable to capture screen": "Neizdevās uzņemt ekrānattēlu",
-    "unknown caller": "nezināms zvanītājs",
     "unknown error code": "nezināms kļūdas kods",
     "Unmute": "Pārtraukt apklusināšanu",
     "Unnamed Room": "Istaba bez nosaukuma",
     "Cancel": "Atcelt",
     "Create new room": "Izveidot jaunu istabu",
-    "Custom Server Options": "Iestatāmās servera opcijas",
-    "Dismiss": "Aizvērt",
+    "Dismiss": "Aizvērt/atcelt",
     "You have <a>enabled</a> URL previews by default.": "URL priekšskatījumi pēc noklusējuma jums ir<a>iespējoti</a> .",
     "Upload avatar": "Augšupielādēt avataru (profila attēlu)",
     "Upload Failed": "Augšupielāde (nosūtīšana) neizdevās",
@@ -282,15 +216,9 @@
     "Verified key": "Verificēta atslēga",
     "Video call": "Video zvans",
     "Voice call": "Balss zvans",
-    "VoIP conference finished.": "VoIP konference beidzās.",
-    "VoIP conference started.": "VoIP konference sākās.",
     "VoIP is unsupported": "VoIP netiek atbalstīts",
-    "(could not connect media)": "(nav iespējams savienoties ar mediju)",
-    "(no answer)": "(nav atbildes)",
     "Warning!": "Brīdinājums!",
-    "Who can access this room?": "Kurš var piekļūt istabai?",
     "Who can read history?": "Kas var lasīt vēsturi?",
-    "You are already in a call.": "Tu jau šobrīd esi sarunā.",
     "You cannot place a call with yourself.": "Nav iespējams piezvanīt sev.",
     "You cannot place VoIP calls in this browser.": "VoIP zvani šajā pārlūkā netiek atbalstīti.",
     "You do not have permission to post to this room": "Tev nav vajadzīgo atļauju, lai rakstītu ziņas šajā istabā",
@@ -320,17 +248,11 @@
     "Oct": "Okt.",
     "Nov": "Nov.",
     "Dec": "Dec.",
-    "Set a display name:": "Iestatīt attēloto vārdu:",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas avataru uz <img/>",
-    "Upload an avatar:": "Augšuplādē avataru (profila attēlu):",
     "This server does not support authentication with a phone number.": "Šis serveris neatbalsta autentifikāciju pēc telefona numura.",
-    "There are no visible files in this room": "Nav redzamu failu šajā istabā",
     "Room": "Istaba",
     "Connectivity to the server has been lost.": "Savienojums ar serveri pārtrūka.",
     "Sent messages will be stored until your connection has returned.": "Sūtītās ziņas tiks saglabātas līdz brīdim, kad savienojums tiks atjaunots.",
-    "Active call": "Aktīvs zvans",
-    "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
-    "Room directory": "Istabu katalogs",
     "Start chat": "Uzsākt čalošanu",
     "New Password": "Jaunā parole",
     "Start automatically after system login": "Startēt pie ierīces ielādes",
@@ -356,39 +278,26 @@
     "Unable to restore session": "Neizdevās atjaunot sesiju",
     "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.": "Ja iepriekš izmantojāt jaunāku %(brand)s versiju, jūsu sesija var nebūt saderīga ar šo versiju. Aizveriet šo logu un atgriezieties jaunākajā versijā.",
     "Unknown Address": "Nezināma adrese",
-    "ex. @bob:example.com": "piemēram, @valters:smaidu.lv",
-    "Add User": "Pievienot lietotāju",
-    "Please check your email to continue registration.": "Lūdzu pārbaudi savu epastu lai turpinātu reģistrāciju.",
     "Token incorrect": "Nepareizs autentifikācijas tokens",
     "Please enter the code it contains:": "Lūdzu, ievadiet tajā ietverto kodu:",
     "powered by Matrix": "tiek darbināta ar Matrix",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ja Tu nenorādīsi epasta adresi, tev nebūs iespējams izmantot paroles atiestatīšanu. Vai to vēlies?",
-    "Error decrypting audio": "Kļūda atšifrējot audio",
     "Error decrypting image": "Kļūda atšifrējot attēlu",
     "Error decrypting video": "Kļūda atšifrējot video",
     "Add an Integration": "Pievienot integrāciju",
     "URL Previews": "URL priekšskatījumi",
     "Drop file here to upload": "Ievelc šeit failu augšupielādei",
-    " (unsupported)": " (netiek atbalstīts)",
     "Online": "Tiešsaistē",
     "Idle": "Dīkstāvē",
     "Offline": "Bezsaistē",
     "Check for update": "Pārbaudīt atjauninājumus",
-    "Username available": "Lietotājvārds ir pieejams",
-    "Username not available": "Lietotājvārds nav pieejams",
     "Something went wrong!": "Kaut kas nogāja greizi!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Šis būs Tavs konta vārds <span></span> Bāzes serverī, vai arī vari izvēlēties <a>citu serveri</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Vai arī, ja Tev jau ir Matrix konts, tu vari  <a>pierakstīties</a> tajā.",
     "Your browser does not support the required cryptography extensions": "Jūsu pārlūks neatbalsta vajadzīgos kriptogrāfijas paplašinājumus",
     "Not a valid %(brand)s keyfile": "Nederīgs %(brand)s atslēgfails",
     "Authentication check failed: incorrect password?": "Autentifikācijas pārbaude neizdevās. Nepareiza parole?",
     "Do you want to set an email address?": "Vai vēlies norādīt epasta adresi?",
     "Skip": "Izlaist",
-    "Add a widget": "Pievienot vidžetu",
-    "Allow": "Atļaut",
     "and %(count)s others...|other": "un vēl %(count)s citi...",
     "and %(count)s others...|one": "un vēl viens cits...",
-    "Cannot add any more widgets": "Nav iespējams pievienot vairāk vidžetus",
     "Delete widget": "Dzēst vidžetu",
     "Define the power level of a user": "Definē lietotāja statusu",
     "Edit": "Rediģēt",
@@ -396,8 +305,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publicēt šo istabu publiskajā %(domain)s katalogā?",
     "AM": "AM",
     "PM": "PM",
-    "The maximum permitted number of widgets have already been added to this room.": "Maksimāli atļautais vidžetu skaits šai istabai jau sasniegts.",
-    "To get started, please pick a username!": "Lai sāktu, lūdzu izvēlies lietotājvārdu!",
     "Unable to create widget.": "Neizdevās izveidot widžetu.",
     "You are not in this room.": "Tu neatrodies šajā istabā.",
     "You do not have permission to do that in this room.": "Tev nav atļaujas šai darbībai šajā istabā.",
@@ -409,7 +316,6 @@
     "Failed to upload image": "Neizdevās augšupielādēt attēlu",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
-    "Unpin Message": "Atspraust ziņu",
     "Add rooms to this community": "Pievienot istabas šai kopienai",
     "Failed to set direct chat tag": "Neizdevās tiešajam čatam uzstādīt birku",
     "Warning": "Brīdinājums",
@@ -444,7 +350,6 @@
     "You are now ignoring %(userId)s": "Tagad Tu ignorē %(userId)s",
     "Unignored user": "Atignorēts lietotājs",
     "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu parādāmo vārdu uz %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s nomainīja šajā istabā piespraustās ziņas.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "Message Pinning": "Ziņu piespraušana",
@@ -452,9 +357,6 @@
     "Enable inline URL previews by default": "Iespējot URL priekšskatījumus pēc noklusējuma",
     "Enable URL previews for this room (only affects you)": "Iespējot URL priekšskatījumus šajā istabā (ietekmē tikai jūs pašu)",
     "Enable URL previews by default for participants in this room": "Iespējot URL priekšskatījumus pēc noklusējuma visiem šīs istabas dalībniekiem",
-    "%(senderName)s sent an image": "%(senderName)s nosūtīja attēlu",
-    "%(senderName)s sent a video": "%(senderName)s nosūtīja video",
-    "%(senderName)s uploaded a file": "%(senderName)s augšupielādēja failu",
     "Disinvite this user?": "Atsaukt uzaicinājumu šim lietotājam?",
     "Kick this user?": "Padzīt šo lietotāju?",
     "Unban this user?": "Atcelt liegumu šim lietotājam?",
@@ -467,10 +369,7 @@
     "Invite": "Uzaicināt",
     "Send an encrypted reply…": "Sūtīt šifrētu atbildi…",
     "Send an encrypted message…": "Sūtīt šifrētu ziņu…",
-    "Jump to message": "Pāriet uz ziņu",
-    "No pinned messages.": "Nav piespraustu ziņu.",
     "Loading...": "Ielāde...",
-    "Pinned Messages": "Piespraustās ziņas",
     "%(duration)ss": "%(duration)s sek",
     "%(duration)sm": "%(duration)smin",
     "%(duration)sh": "%(duration)s stundas",
@@ -485,7 +384,6 @@
     "World readable": "Pieejama ikvienam un no visurienes",
     "Failed to remove tag %(tagName)s from room": "Neizdevās istabai noņemt birku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Neizdevās istabai pievienot birku %(tagName)s",
-    "Community Invites": "Uzaicinājums uz kopienu",
     "Banned by %(displayName)s": "%(displayName)s liedzis piekļuvi",
     "Members only (since the point in time of selecting this option)": "Tikai biedri (no šī parametra iestatīšanas brīža)",
     "Members only (since they were invited)": "Tikai biedri (no to uzaicināšanas brīža)",
@@ -500,7 +398,6 @@
     "URL previews are disabled by default for participants in this room.": "ULR priekšskatījumi šīs istabas dalībniekiem pēc noklusējuma ir atspējoti.",
     "Copied!": "Nokopēts!",
     "Failed to copy": "Nokopēt neizdevās",
-    "An email has been sent to %(emailAddress)s": "Vēstule tika nosūtīta uz %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Teksta ziņa tika nosūtīta uz %(msisdn)s",
     "Remove from community": "Dzēst no kopienas",
     "Disinvite this user from community?": "Atcelt šim lietotājam nosūtīto uzaicinājumu pievienoties kopienai?",
@@ -522,7 +419,6 @@
     "You're not currently a member of any communities.": "Pašlaik jūs neesat nevienā kopienā.",
     "Delete Widget": "Dzēst vidžetu",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidžeta dzēšana to dzēš visiem šīs istabas lietotājiem. Vai tiešām vēlies dzēst šo vidžetu?",
-    "Minimize apps": "Minimizēt programmas",
     "Communities": "Kopienas",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)spievienojās %(count)s reizes",
@@ -577,7 +473,6 @@
     "was kicked %(count)s times|one": "tika padzīts",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sizmainīja savu lietotājvārdu %(count)s reizes",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sizmainīja savu lietotājvārdu",
-    "<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>Tavas kopienas lapas HTML</h1>\n<p>\n    Izmanto garāku aprakstu, lai iepazīstinātu jaunos lietoājus ar kopienu, \n    vai padalies ar kādām attiecināmām <a href=\"foo\">web-saitēm</a>\n</p>\n<p>\n    Vari izmantot arī 'img' birkas\n</p>\n",
     "Add rooms to the community summary": "Pievienot istabas kopienas informatīvajā kopsavilkumā",
     "Which rooms would you like to add to this summary?": "Kuras istabas vēlaties pievienot šim kopsavilkumam?",
     "Add to summary": "Pievienot kopsavilkumam",
@@ -596,9 +491,6 @@
     "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.": "Uzieti dati no vecākas %(brand)s versijas. Tas novedīs pie \"end-to-end\" šifrēšanas problēmām vecākajā versijā. Šajā versijā nevar tikt atšifrēti ziņojumi, kuri radīti izmantojot vecākajā versijā \"end-to-end\" šifrētas ziņas. Tas var arī novest pie ziņapmaiņas, kas veikta ar šo versiju, neizdošanās. Ja rodas ķibeles, izraksties un par jaunu pieraksties sistēmā. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas šifrēšanas atslēgas.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Radi kopienu, lai apvienotu lietotājus un istabas. Izveido mājaslapu, lai iezīmētu Matrix visumā savu klātbūtni, vietu un telpu.",
     "Error whilst fetching joined communities": "Ielādējot kopienas, radās kļūda",
-    "%(count)s of your messages have not been sent.|one": "Jūsu ziņa netika nosūtīta.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Atkārtoti sūtīt ziņu</resendText> vai <cancelText>atcelt sūtīšanu</cancelText>.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Šeit neviena nav. Ja vēlies <inviteText>kādu uzaicināt</inviteText> vai <nowarnText>atslēgt paziņojumu par tukšu istabu</nowarnText>?",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privātumu augstu respektējam, tādēļ analītikas mērķiem nevācam nekādus personas un identificējamus datus.",
     "Learn more about how we use analytics.": "Sīkāk par to, kā tiek izmantota analītika.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Epasts ir nosūtīts uz %(emailAddress)s. Izmanto epastā nosūtīto tīmekļa saiti un tad noklikšķini zemāk.",
@@ -640,22 +532,16 @@
     "Community %(groupId)s not found": "Kopiena %(groupId)s nav atrasta",
     "Your Communities": "Jūsu kopienas",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Vai zināji: Tu vari izmantot kopienas, lai filtrētu (atlasītu) savu %(brand)s pieredzi!",
-    "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.": "Lai uzstādītu filtru, uzvelc kopienas avataru uz filtru paneļa ekrāna kreisajā malā. Lai redzētu tikai istabas un cilvēkus, kas saistīti ar šo kopienu, Tu vari klikšķināt uz avatara filtru panelī jebkurā brīdī.",
     "Create a new community": "Izveidot jaunu kopienu",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Tagad<resendText>visas atkārtoti sūtīt</resendText> vai <cancelText>visas atcelt</cancelText>. Tu vari atzīmēt arī individuālas ziņas, kuras atkārtoti sūtīt vai atcelt.",
     "Clear filter": "Attīrīt filtru",
-    "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.": "Ja esi paziņojis par kļūdu caur GitHub, atutošanas logfaili var mums palīdzēt identificēt problēmu. Atutošanas logfaili satur programmas lietošanas datus, tostarp Tavu lietotājvārdu, istabu/grupu Id vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
     "Submit debug logs": "Iesniegt atutošanas logfailus",
     "Opens the Developer Tools dialog": "Atver Izstrādātāja instrumentus",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Lietotājs %(displayName)s (%(userName)s) apskatīja %(dateTime)s",
     "Fetching third party location failed": "Neizdevās iegūt trešās puses atrašanās vietu",
     "Send Account Data": "Sūtīt konta datus",
-    "All notifications are currently disabled for all targets.": "Visiem saņēmējiem visi paziņojumi ir atspējoti.",
-    "Uploading report": "Augšuplādē atskaiti",
     "Sunday": "Svētdiena",
     "Notification targets": "Paziņojumu adresāti",
     "Today": "Šodien",
-    "You are not receiving desktop notifications": "Darbvirsmas paziņojumi netiek saņemti",
     "Friday": "Piektdiena",
     "Update": "Atjaunināt",
     "What's New": "Kas jauns",
@@ -663,24 +549,13 @@
     "Changelog": "Izmaiņu saraksts (vēsture)",
     "Waiting for response from server": "Tiek gaidīta atbilde no servera",
     "Send Custom Event": "Sūtīt individuālu notikumu",
-    "Advanced notification settings": "Paziņojumu papildu iestatījumi",
     "Failed to send logs: ": "Neizdevās nosūtīt logfailus: ",
-    "Forget": "Aizmirst",
-    "You cannot delete this image. (%(code)s)": "Jūs nevarat dzēst šo attēlu. (%(code)s)",
-    "Cancel Sending": "Atcelt sūtīšanu",
     "This Room": "Šajā istabā",
     "Noisy": "Ar skaņu",
-    "Error saving email notification preferences": "Kļūda saglabājot epasta notifikāciju paziņojumu uzstādījumus",
     "Messages containing my display name": "Ziņas, kuras satur manu parādāmo vārdu",
     "Messages in one-to-one chats": "Ziņas viens-pret-vienu čatos",
     "Unavailable": "Nesasniedzams",
-    "View Decrypted Source": "Skatīt atšifrētu pirmkodu",
-    "Failed to update keywords": "Neizdevās atjaunināt atslēgvārdus",
     "remove %(name)s from the directory.": "dzēst %(name)s no kataloga.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Paziņojumi par šādiem atslēgvārdiem atbilst noteikumiem, kurus šeit nevar parādīt:",
-    "Please set a password!": "Lūdzu iestati paroli!",
-    "You have successfully set a password!": "Esi veiksmīgi iestatījis(usi) paroli!",
-    "An error occurred whilst saving your email notification preferences.": "Saglabājot Tavus epasta paziņojumu uzstādījumus, radās kļūda.",
     "Explore Room State": "Noskaidrot istabas statusu",
     "Source URL": "Avota URL adrese",
     "Messages sent by bot": "Botu nosūtītās ziņas",
@@ -688,37 +563,23 @@
     "Members": "Biedri",
     "No update available.": "Nav atjauninājumu.",
     "Resend": "Nosūtīt atkārtoti",
-    "Files": "Faili",
     "Collecting app version information": "Tiek iegūta programmas versijas informācija",
-    "Keywords": "Atslēgvārdi",
-    "Enable notifications for this account": "Iespējot paziņojumus šim kontam",
     "Invite to this community": "Uzaicināt šajā kopienā",
-    "Messages containing <span>keywords</span>": "Ziņas, kuras satur <span>atslēgvārdus</span>",
     "Room not found": "Istaba netika atrasta",
     "Tuesday": "Otrdiena",
-    "Enter keywords separated by a comma:": "Ievadiet ar komatu atdalītus atslēgvārdus:",
     "Search…": "Meklēt…",
-    "You have successfully set a password and an email address!": "Esi veiksmīgi iestatījis(usi) paroli un epasta adresi!",
     "Remove %(name)s from the directory?": "Dzēst %(name)s no kataloga?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s izmanto daudzas advancētas tīmekļa pārlūka iespējas, no kurām dažas var nebūt pieejamas vai ir eksperimentālas Tavā pašreizējajā pārlūkā.",
     "Event sent!": "Notikums nosūtīts!",
     "Preparing to send logs": "Gatavojos nosūtīt atutošanas logfailus",
     "Explore Account Data": "Aplūkot konta datus",
-    "All messages (noisy)": "Visas ziņas (ar skaņu)",
     "Saturday": "Sestdiena",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Atceries, ka vienmēr vari iestatīt epasta adresi lietotāja uzstādījumos, ja pārdomā.",
-    "Direct Chat": "Tiešais čats",
     "The server may be unavailable or overloaded": "Serveris nav pieejams vai ir pārslogots",
     "Reject": "Noraidīt",
-    "Failed to set Direct Message status of room": "Neizdevās iestatīt istabas tiešās ziņas statusu",
     "Monday": "Pirmdiena",
     "Remove from Directory": "Dzēst no kataloga",
-    "Enable them now": "Iespējot tos tagad",
-    "Forward Message": "Pārsūtīt ziņu",
     "Toolbox": "Instrumentārijs",
     "Collecting logs": "Tiek iegūti logfaili",
     "You must specify an event type!": "Jānorāda notikuma tips!",
-    "(HTTP status %(httpStatus)s)": "(HTTP statuss %(httpStatus)s)",
     "All Rooms": "Visās istabās",
     "Wednesday": "Trešdiena",
     "You cannot delete this message. (%(code)s)": "Tu nevari dzēst šo ziņu. (%(code)s)",
@@ -730,56 +591,36 @@
     "State Key": "Stāvokļa atslēga",
     "Failed to send custom event.": "Individuālo notikumu nosūtīt neizdevās.",
     "What's new?": "Kas jauns?",
-    "Notify me for anything else": "Paziņot man par jebko citu",
     "When I'm invited to a room": "Kad esmu uzaicināts/a istabā",
-    "Can't update user notification settings": "Neizdodas atjaunināt lietotāja paziņojumu iestatījumus",
-    "Notify for all other messages/rooms": "Paziņot par visām citām ziņām/istabām",
     "Unable to look up room ID from server": "Neizdevās no servera iegūt istabas ID",
     "Couldn't find a matching Matrix room": "Atbilstoša Matrix istaba netika atrasta",
     "Invite to this room": "Uzaicināt uz šo istabu",
     "Thursday": "Ceturtdiena",
-    "I understand the risks and wish to continue": "Apzinos riskus un vēlos turpināt",
     "Logs sent": "Logfaili nosūtīti",
     "Back": "Atpakaļ",
     "Reply": "Atbildēt",
     "Show message in desktop notification": "Parādīt ziņu darbvirsmas paziņojumos",
-    "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.": "Atutošanas logfaili satur programmas datus, ieskaitot Tavu lietotājvārdu, istabu/grupu ID vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
-    "Unhide Preview": "Rādīt priekšskatījumu",
     "Unable to join network": "Neizdodas pievienoties tīklam",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Atvaino, diemžēl tavs tīmekļa pārlūks <b>nespēj</b> darbināt %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Augšupielādēja %(user)s %(date)s",
     "Messages in group chats": "Ziņas grupas čatos",
     "Yesterday": "Vakardien",
     "Error encountered (%(errorDetail)s).": "Gadījās kļūda (%(errorDetail)s).",
     "Low Priority": "Zema prioritāte",
-    "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu",
-    "Set Password": "Iestatīt paroli",
     "Off": "Izslēgt",
     "%(brand)s does not know how to join a room on this network": "%(brand)s nezin kā pievienoties šajā tīklā esošajai istabai",
-    "Mentions only": "Vienīgi atsauces",
-    "You can now return to your account after signing out, and sign in on other devices.": "Tagad vari atgriezties savā kontā arī pēc izrakstīšanās, un pierakstīties no citām ierīcēm.",
-    "Enable email notifications": "Iespējot paziņojumus pa epastu",
     "Event Type": "Notikuma tips",
-    "Download this file": "Lejupielādēt šo failu",
-    "Pin Message": "Piespraust ziņu",
-    "Failed to change settings": "Neizdevās nomainīt iestatījumus",
     "View Community": "Skatīt kopienu",
     "Developer Tools": "Izstrādātāja rīki",
     "View Source": "Skatīt pirmkodu",
     "Event Content": "Notikuma saturs",
     "Thank you!": "Tencinam!",
-    "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!": "Tavā pašreizējā pārlūkā aplikācijas izskats un uzvedība var būt pilnīgi neatbilstoša, kā arī dažas no visām funkcijām var nedarboties. Ja vēlies turpināt izmantot šo pārlūku, Tu vari arī turpināt, apzinoties, ka šajā gadījumā esi viens/a ar iespējamo problēmu!",
     "Checking for an update...": "Atjauninājumu pārbaude…",
     "e.g. %(exampleValue)s": "piemēram %(exampleValue)s",
     "e.g. <CurrentPageURL>": "piemēram <CurrentPageURL>",
     "Your device resolution": "Jūsu iekārtas izšķirtspēja",
-    "Sign In": "Pierakstīties",
+    "Sign In": "Ierakstīties",
     "Whether or not you're logged in (we don't record your username)": "Esat vai neesat pieteicies (mēs nesaglabājam jūsu lietotājvārdu)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Neatkarīgi no tā, vai izmantojat funkciju \"breadcrumbs\" (avatari virs istabu saraksta)",
     "Every page you use in the app": "Katra lapa, ko lietojat lietotnē",
-    "Call in Progress": "Notiek zvans",
-    "A call is currently being placed!": "Pašlaik notiek sazvans!",
-    "A call is already in progress!": "Zvans jau notiek!",
     "Permission Required": "Nepieciešama atļauja",
     "You do not have permission to start a conference call in this room": "Šajā istabā nav atļaujas sākt konferences zvanu",
     "Replying With Files": "Atbildot ar failiem",
@@ -792,7 +633,6 @@
     "You sent a verification request": "Jūs nosūtījāt verifikācijas pieprasījumu",
     "Start Verification": "Uzsākt verifikāciju",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jaunā sesija ir verificēta un ir dota piekļuve jūsu šifrētajām ziņām, kā arī citi lietotāji redzēs, ka šī sesija ir uzticama.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Apstipriniet savu identitāti, verificējot šo pierakstīšanos no kādas citas savas sesijas, tādējādi ļaujot piekļūt šifrētajām ziņām.",
     "Hide verified sessions": "Slēpt verificētas sesijas",
     "%(count)s verified sessions|one": "1 verificēta sesija",
     "%(count)s verified sessions|other": "%(count)s verificētas sesijas",
@@ -824,7 +664,6 @@
     "Verify User": "Verificēt lietotāju",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifrētās istabās jūsu ziņas ir drošībā - tikai jums un saņēmējam ir unikālas atslēgas, lai ziņas atšifrētu.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Jūsu ziņas ir drošībā - tikai jums un saņēmējam ir unikālas atslēgas, lai ziņas atšifrētu.",
-    "Direct message": "Uzsākt dialogu",
     "Direct Messages": "Dialogi",
     "Delete sessions|one": "Dzēst sesiju",
     "Delete sessions|other": "Dzēst sesijas",
@@ -889,7 +728,6 @@
     "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Ja ir aizmirsta slepenā frāze, jūs varat <button1>izmantot drošības atslēgu</button1> vai<button2>iestatīt jaunus atkopšanas veidus</button2>",
     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Ja ir aizmirsta drošības atslēga, jūs varat <button>iestatīt jaunus atkopšanas veidus</button>",
     "Messages in this room are end-to-end encrypted.": "Ziņas šajā istabā ir nodrošinātas ar pilnīgu šifrēšanu.",
-    "Share Permalink": "Dalīties ar pastāvīgo saiti",
     "Share Link to User": "Dalīties ar saiti uz lietotāju",
     "Remove recent messages by %(user)s": "Dzēst nesenās ziņas no %(user)s",
     "Remove recent messages": "Dzēst nesenās ziņas",
@@ -924,8 +762,6 @@
     "Confirm to continue": "Apstipriniet, lai turpinātu",
     "Confirm account deactivation": "Apstipriniet konta deaktivizēšanu",
     "Enter username": "Ievadiet lietotājvārdu",
-    "Confirm your recovery passphrase": "Apstipriniet atkopšanas frāzveida paroli",
-    "Enter your recovery passphrase a second time to confirm it.": "Ievadiet savu atkopšanas frāzveida paroli otreiz, lai to apstiprinātu.",
     "Use a different passphrase?": "Izmantot citu frāzveida paroli?",
     "Are you sure you want to cancel entering passphrase?": "Vai tiešām vēlaties atcelt frāzveida paroles ievadi?",
     "Cancel entering passphrase?": "Atcelt frāzveida paroles ievadi?",
@@ -955,7 +791,6 @@
     "Liberate your communication": "Padari savu saziņu brīvu",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s no %(totalRooms)s",
     "Done": "Gatavs",
-    "Please enter your Security Phrase a second time to confirm.": "Lūdzu, ievadiet savu slepeno frāzi otreiz, lai apstiprinātu.",
     "Secure your backup with a Security Phrase": "Nodrošiniet savu rezerves kopiju ar slepeno frāzi",
     "Great! This Security Phrase looks strong enough.": "Lieliski! Šī slepenā frāze šķiet pietiekami sarežgīta.",
     "Use Security Key or Phrase": "Izmantojiet drošības atslēgu vai slepeno frāzi",
@@ -966,8 +801,6 @@
     "Incorrect Security Phrase": "Nepareiza slepenā frāze",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Ievadiet savu slepeno frāzi vai <button>izmantojiet savu drošības atslēgu</button>, lai turpinātu.",
     "Security Phrase": "Slepenā frāze",
-    "or another cross-signing capable Matrix client": "vai kāda cita Matrix lietotne ar cross-signing atbalstu",
-    "This requires the latest %(brand)s on your other devices:": "Tam nepieciešama jaunākā %(brand)s versija citās jūsu ierīcēs:",
     "Confirm": "Apstiprināt",
     "Set a new password": "Iestati jaunu paroli",
     "Set a new account password...": "Iestatiet jaunu konta paroli...",
@@ -1009,12 +842,9 @@
     "Interactively verify by Emoji": "Abpusēji verificēt ar emocijzīmēm",
     "Manually Verify by Text": "Manuāli verificēt ar tekstu",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s atsauca uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
-    "%(senderName)s declined the call.": "%(senderName)s noraidīja zvanu.",
-    "(connection failed)": "(savienojums neizdevās)",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s izmainīja istabas adreses.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s dzēsa galveno adresi šai istabai.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s iestatīja istabas galveno adresi kā %(address)s.",
-    "%(senderName)s made no change.": "%(senderName)s neko neizmainīja.",
     "Afghanistan": "Afganistāna",
     "United States": "Amerikas Savienotās Valstis",
     "United Kingdom": "Lielbritānija",
@@ -1026,8 +856,6 @@
     "You've reached the maximum number of simultaneous calls.": "Ir sasniegts maksimālais vienaicīgu zvanu skaits.",
     "Too Many Calls": "Pārāk daudz zvanu",
     "Try using turn.matrix.org": "Mēģiniet izmantot turn.matrix.org",
-    "The other party declined the call.": "Otra puse noraidīja zvanu.",
-    "Call Declined": "Zvans noraidīts",
     "Session key:": "Sesijas atslēga:",
     "Session ID:": "Sesijas ID:",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Uzskatīt par uzticamām tikai individuāli verificētas lietotāja sesijas, nepaļaujoties uz ierīču cross-signing funkcionalitāti.",
@@ -1037,7 +865,6 @@
     "Delete %(count)s sessions|other": "Dzēst %(count)s sesijas",
     "Public Name": "Publiskais nosaukums",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Pārskatiet nosaukumus un izrakstieties no savām sesijām zemāk vai <a>verificējiet tās savā lietotāja profilā</a>.",
-    "Review where you’re logged in": "Pārskatiet savas pierakstīšanās",
     "Where you’re logged in": "Jūsu pierakstīšanās",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Notikusi kļūda, mēģinot atjaunināt istabas alternatīvās adreses. Iespējams, tas ir liegts servera iestatījumos vai arī notikusi kāda pagaidu kļūme.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s nomainīja šīs istabas alternatīvās adreses.",
@@ -1058,9 +885,7 @@
     "You verified %(name)s": "Jūs verificējāt %(name)s",
     "%(name)s accepted": "%(name)s akceptēja",
     "You accepted": "Jūs akceptējāt",
-    "Rotate clockwise": "Rotēt pulksteņrādītāja kustības virzienā",
     "Rotate Right": "Rotēt pa labi",
-    "Rotate counter-clockwise": "Rotēt pretēji pulksteņrādītāja kustības virzienam",
     "Rotate Left": "Rotēt pa kreisi",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s uzsāka video zvanu. (Netiek atbalstīts šajā pārlūkā)",
     "%(senderName)s placed a video call.": "%(senderName)s uzsāka video zvanu.",
@@ -1073,7 +898,6 @@
     "Show display name changes": "Rādīt parādāmā vārda izmaiņas",
     "%(displayName)s cancelled verification.": "%(displayName)s atcēla verificēšanu.",
     "Your display name": "Jūsu parādāmais vārds",
-    "Add an email address to configure email notifications": "Pievienojiet epasta adresi, lai konfigurētu epasta paziņojumus",
     "Enable audible notifications for this session": "Iespējot dzirdamus paziņojumus šai sesijai",
     "Enable desktop notifications for this session": "Iespējot darbvirsmas paziņojumus šai sesijai",
     "Enable 'Manage Integrations' in Settings to do this.": "Iespējojiet 'Pārvaldīt integrācijas' iestatījumos, lai to izdarītu.",
@@ -1132,7 +956,6 @@
     "Local Addresses": "Lokālās adreses",
     "New published address (e.g. #alias:server)": "Jauna publiska adrese (piemēram, #alias:server)",
     "No other published addresses yet, add one below": "Pagaidām nav nevienas publiskotas adreses, pievienojiet zemāk",
-    "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.": "Publiskotas adreses ikviens var izmantot jebkurā serverī, lai pievienotos jūsu istabai. Lai varētu publiskot adresi, tai vispirms jābūt iestatītai kā lokālajai adresei.",
     "Published Addresses": "Publiskotās adreses",
     "Other published addresses:": "Citas publiskotās adreses:",
     "This address is already in use": "Šī adrese jau tiek izmantota",
@@ -1161,17 +984,14 @@
     "This is the start of <roomName/>.": "Šis ir <roomName/> istabas pats sākums.",
     "You created this room.": "Jūs izveidojāt šo istabu.",
     "%(creator)s created and configured the room.": "%(creator)s izveidoja un nokonfigurēja istabu.",
-    "Please provide a room address": "Lūdzu, ievadiet istabas adresi",
     "e.g. my-room": "piem., mana-istaba",
     "Room address": "Istabas adrese",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Jūs varat iespējot šo situācijā, kad istaba paredzēta izmantošanai tikai saziņai starp jūsu bāzes serverī esošajām komandām. Tas nav maināms vēlāk.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Liegt pievienoties šai istabai ikvienam, kas nav reģistrēts %(serverName)s serverī.",
     "Show advanced": "Rādīt papildu iestatījumus",
     "Hide advanced": "Slēpt papildu iestatījumus",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privātas istabas nav atrodamas ikvienam un ļauj pievienoties tikai ar ielūgumiem. Publiskas istabas parādās meklējumu rezultātos ikvienam un ļauj pievienoties ikvienam.",
     "Your server requires encryption to be enabled in private rooms.": "Jūsu serveris pieprasa iespējotu šifrēšānu privātās istabās.",
     "Enable end-to-end encryption": "Iespējot pilnīgu šifrēšanu",
-    "Make this room public": "Padarīt istabu publiski pieejamu",
     "Create a private room": "Izveidot privātu istabu",
     "Create a public room": "Izveidot publisku istabu",
     "Add a new server...": "Pievienot jaunu serveri...",
@@ -1191,7 +1011,6 @@
     "About": "Par",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s uzsāka balss zvanu. (Netiek atbalstīts šajā pārlūkā)",
     "%(senderName)s placed a voice call.": "%(senderName)s uzsāka balss zvanu.",
-    "Incoming voice call": "Ienākošais balss zvans",
     "Voice Call": "Balss zvans",
     "Enable message search in encrypted rooms": "Iespējot ziņu meklēšanu šifrētās istabās",
     "Search (must be enabled)": "Meklēšana (jābūt iespējotai)",
@@ -1234,7 +1053,7 @@
     "Reject & Ignore user": "Noraidīt un ignorēt lietotāju",
     "Do you want to chat with %(user)s?": "Vai vēlaties sarakstīties ar %(user)s?",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Šis bāzes serveris neatbalsta nevienu pierakstīšanās metodi, kuru atbalstītu šis klients.",
-    "Explore rooms": "Pārlūkot istabas",
+    "Explore rooms": "Pārlūkot telpas",
     "Confirm Security Phrase": "Apstipriniet slepeno frāzi",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Nodrošinieties pret piekļuves zaudēšanu šifrētām ziņām un datiem, dublējot šifrēšanas atslēgas savā serverī.",
     "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Izmantojiet tikai jums zināmu slepeno frāzi un pēc izvēles saglabājiet drošības atslēgu, lai to izmantotu dublēšanai.",
@@ -1248,7 +1067,6 @@
     "Room Autocomplete": "Istabu automātiska pabeigšana",
     "Notification Autocomplete": "Paziņojumu automātiska pabeigšana",
     "Emoji Autocomplete": "Emocijzīmju automātiska pabeigšana",
-    "DuckDuckGo Results": "DuckDuckGo rezultāti",
     "Community Autocomplete": "Kopienu automātiska pabeigšana",
     "Command Autocomplete": "Komandu automātiska pabeigšana",
     "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.": "Brīdinājums: šajā sesijā joprojām tiek glabāti jūsu personas dati (ieskaitot šifrēšanas atslēgas). Notīriet to, ja esat beidzis izmantot šo sesiju vai vēlaties pierakstīties citā kontā.",
@@ -1261,12 +1079,7 @@
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Atgūstiet piekļuvi savam kontam un atjaunojiet šajā sesijā saglabātās šifrēšanas atslēgas. Bez tām nevienā sesijā nevarēsiet izlasīt visas šifrētās ziņas.",
     "Failed to re-authenticate": "Neizdevās atkārtoti autentificēties",
     "Failed to re-authenticate due to a homeserver problem": "Bāzes servera problēmas dēļ atkārtoti autentificēties neizdevās",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Nepabeidzot šīs sesijas drošību, tai nebūs piekļuves šifrētām ziņām.",
     "Your new session is now verified. Other users will see it as trusted.": "Jūsu jaunā sesija tagad ir verificēta. Citi lietotāji to redzēs kā uzticamu.",
-    "%(brand)s Android": "%(brand)s Android",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s Web": "%(brand)s Web",
     "Use Security Key": "Izmantojiet drošības atslēgu",
     "Create account": "Izveidot kontu",
     "Registration Successful": "Reģistrācija ir veiksmīga",
@@ -1349,8 +1162,6 @@
     "Scan this unique code": "Noskenējiet šo unikālo kodu",
     "Verify this session by completing one of the following:": "Verificējiet šo sesiju, veicot vienu no šīm darbībām:",
     "The other party cancelled the verification.": "Pretējā puse pārtrauca verificēšanu.",
-    "Incoming call": "Ienākošais zvans",
-    "Incoming video call": "Ienākošais video zvans",
     "Video Call": "Video zvans",
     "Show shortcuts to recently viewed rooms above the room list": "Rādīt saīsnes uz nesen skatītajām istabām istabu saraksta augšpusē",
     "Show rooms with unread notifications first": "Rādīt istabas ar nelasītiem paziņojumiem vispirms",
@@ -1377,7 +1188,6 @@
     "Don't miss a reply": "Nepalaidiet garām atbildi",
     "Later": "Vēlāk",
     "Review": "Pārlūkot",
-    "Verify all your sessions to ensure your account & messages are safe": "Verificējiet visas savas sesijas, lai nodrošinātos, ka jūsu konts un ziņas ir drošībā",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Pārliecinieties par stabilu internet savienojumu vai sazinieties ar servera administratoru",
     "Could not find user in room": "Lietotājs istabā netika atrasts",
     "Unrecognised room address:": "Neatpazīta istabas adrese:",
@@ -1397,9 +1207,7 @@
     "Latvia": "Latvija",
     "Link to selected message": "Saite uz izvēlēto ziņu",
     "Share Room Message": "Dalīties ar istabas ziņu",
-    "Share Message": "Dalīties ar ziņu",
     "Unable to load! Check your network connectivity and try again.": "Ielāde neizdevās! Pārbaudiet interneta savienojumu un mēģiniet vēlreiz.",
-    "Open": "Atvērt",
     "Are you sure you want to sign out?": "Vai tiešām vēlaties izrakstīties?",
     "Almost there! Is %(displayName)s showing the same shield?": "Gandrīz galā! Vai %(displayName)s tiek parādīts tas pats vairogs?",
     "Almost there! Is your other session showing the same shield?": "Gandrīz galā! Vai jūsu otrā sesijā tiek parādīts tas pats vairogs?",
@@ -1416,7 +1224,6 @@
     "Decline (%(counter)s)": "Noraidīt (%(counter)s)",
     "Incoming Verification Request": "Ienākošais veifikācijas pieprasījums",
     "%(name)s is requesting verification": "%(name)s pieprasa verifikāciju",
-    "Self-verification request": "Pašverifikācijas pieprasījums",
     "Verification Requests": "Verifikācijas pieprasījumi",
     "Verification Request": "Verifikācijas pieprasījums",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Jūsu drošības atslēga ir drošības tīkls - jūs to var izmantot, lai atjaunotu piekļuvi šifrētām ziņām, ja esat aizmirsis savu slepeno frāzi.",
@@ -1427,13 +1234,7 @@
     "Currently indexing: %(currentRoom)s": "Pašlaik indeksē: %(currentRoom)s",
     "A private space for you and your teammates": "Privāta vieta jums un jūsu komandas dalībniekiem",
     "A private space to organise your rooms": "Privāta vieta, kur organizēt jūsu istabas",
-    "Default Rooms": "Noklusējuma istabas",
-    "Add existing rooms & spaces": "Pievienot eksistējošas istabas un vietas",
     "<inviter/> invites you": "<inviter/> uzaicina jūs",
-    "%(count)s rooms and 1 space|one": "%(count)s istaba un viena vieta",
-    "%(count)s rooms and 1 space|other": "%(count)s istabas un 1 vieta",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s istaba un %(numSpaces)s vietas",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s istabas un %(numSpaces)s vietas",
     "%(count)s rooms|one": "%(count)s istaba",
     "%(count)s rooms|other": "%(count)s istabas",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Vai tiešām vēlaties pamest vietu '%(spaceName)s'?",
@@ -1450,7 +1251,6 @@
     "Add image (optional)": "Pievienot attēlu (izvēles)",
     "Add another email": "Pievienot citu epasta adresi",
     "Create a new room": "Izveidot jaunu istabu",
-    "Add existing spaces/rooms": "Pievienot eksistējošas vietas/istabas",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Vai tiešām vēlaties dzēst <b>%(serverName)s</b>",
     "All rooms": "Visas istabas",
     "Continue with %(provider)s": "Turpināt ar %(provider)s",
@@ -1458,7 +1258,6 @@
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sneveica nekādas izmaiņas %(count)s reizes",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sneveica nekādas izmaiņas",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sneveica nekādas izmaiņas %(count)s reizes",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reaģēja ar %(content)s</reactedWith>",
     "Declining …": "Noraida …",
     "Accepting …": "Akceptē …",
     "%(name)s cancelled": "%(name)s atcēla",
@@ -1505,12 +1304,10 @@
     "about a minute from now": "aptuveni minūti kopš šī brīža",
     "a few seconds from now": "dažas sekundes kopš šī brīža",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) pierakstījās jaunā sesijā, neveicot tās verifikāciju:",
-    "(an error occurred)": "(notika kļūda)",
     "Actions": "Darbības",
     "Denmark": "Dānija",
     "American Samoa": "Amerikāņu Samoa",
     "Algeria": "Alžīrija",
-    "Verify with another session": "Verificēt ar citu sesiju",
     "Original event source": "Oriģinālais notikuma pirmkods",
     "Decrypted event source": "Atšifrēt notikuma pirmkods",
     "Removing...": "Dzēš…",
@@ -1519,7 +1316,6 @@
     "Attach files from chat or just drag and drop them anywhere in a room.": "Pievienojiet failus no čata vai vienkārši velciet un nometiet tos jebkur istabā.",
     "No files visible in this room": "Šajā istabā nav redzamu failu",
     "Remove for everyone": "Dzēst visiem",
-    "Verify other session": "Verificēt citu sesiju",
     "Share User": "Dalīties ar lietotāja kontaktdatiem",
     "Verify session": "Verificēt sesiju",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verificējot šo ierīci, tā tiks atzīmēta kā uzticama, un ierīci verificējušie lietotāji tai uzticēsies.",
@@ -1582,5 +1378,422 @@
     "Upload files": "Failu augšupielāde",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Šie faili <b>pārsniedz</b> augšupielādes izmēra limitu %(limit)s.",
     "Upload files (%(current)s of %(total)s)": "Failu augšupielāde (%(current)s no %(total)s)",
-    "Check your devices": "Pārskatiet savas ierīces"
+    "Check your devices": "Pārskatiet savas ierīces",
+    "Integration manager": "Integrācija pārvaldnieks",
+    "Identity server is": "Indentifikācijas serveris ir",
+    "Identity server": "Identitāšu serveris",
+    "Could not connect to identity server": "Neizdevās pieslēgties identitāšu serverim",
+    "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.": "Jūs varat reģistrēties, taču dažas funkcijas nebūs pieejamas, kamēr nebūs pieejams identitāšu serveris. Ja arī turpmāk redzat šo brīdinājumu, lūdzu, pārbaudiet konfigurāciju vai sazinieties ar servera administratoru.",
+    "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.": "Jūs varat atstatīt paroli, taču dažas funkcijas/opcijas nebūs pieejamas, kamēr nebūs pieejams identitāšu serveris. Ja arī turpmāk redzat šo brīdinājumu, lūdzu, pārbaudiet konfigurāciju vai sazinieties ar servera administratoru.",
+    "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.": "Jūs varat ierakstīties, taču dažas funkcijas nebūs pieejamas, kamēr nebūs pieejams identitāšu serveris. Ja arī turpmāk redzat šo brīdinājumu, lūdzu, pārbaudiet konfigurāciju vai sazinieties ar servera administratoru.",
+    "Cannot reach identity server": "Neizdodas sasniegt identitāšu serveri",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Paprasiet %(brand)s administratoram pārbaudīt, vai <a> jūsu konfigurācijas failā</a> nav nepareizu vai dublējošos ierakstu.",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Redzēt jūsu aktīvajā telpā izliktās <b>%(msgtype)s</b> ziņas",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Redzēt šajā telpā izliktās <b>%(msgtype)s</b> ziņas",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Sūtīt <b>%(msgtype)s</b> ziņas savā vārdā savā aktīvajā telpā",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Sūtīt <b>%(msgtype)s</b> ziņas savā vārdā šajā telpā",
+    "See general files posted to your active room": "Redzēt jūsu aktīvajā telpā izliktos failus",
+    "See general files posted to this room": "Redzēt šajā telpā izliktos failus",
+    "Send general files as you in your active room": "Sūtīt failus savā vārdā jūsu aktīvajā telpā",
+    "Send general files as you in this room": "Sūtīt failus savā vārdā šajā telpā",
+    "See videos posted to your active room": "Redzēt video, kuri izlikti jūsu aktīvajā telpā",
+    "See videos posted to this room": "Redzēt video, kuri izlikti šajā telpā",
+    "Send videos as you in your active room": "Sūtīt video savā vārdā savā aktīvajā telpā",
+    "Send videos as you in this room": "Sūtīt video savā vārdā šajā telpā",
+    "See images posted to your active room": "Redzēt attēlus, kuri izlikti jūsu aktīvajā telpā",
+    "See images posted to this room": "Redzēt attēlus, kuri izlikti šajā telpā",
+    "Send images as you in your active room": "Sūtīt attēlus savā vārdā savā aktīvajā telpā",
+    "Send images as you in this room": "Sūtīt attēlus savā vārdā šajā telpā",
+    "See emotes posted to your active room": "Redzēt emocijas, kuras izvietotas jūsu aktīvajā telpā",
+    "See emotes posted to this room": "Redzēt emocijas, kuras izvietotas šajā telpā",
+    "Send emotes as you in your active room": "Nosūtīt emocijas savā vārdā uz savu aktīvo telpu",
+    "Send emotes as you in this room": "Nosūtīt emocijas savā vārdā uz šo telpu",
+    "See text messages posted to your active room": "Redzēt teksta ziņas, kuras izvietotas jūsu aktīvajā telpā",
+    "See text messages posted to this room": "Redzēt teksta ziņas, kas izvietotas šajā telpā",
+    "Send text messages as you in your active room": "Sūtīt teksta ziņas savā vārdā jūsu aktīvajā telpā",
+    "Send text messages as you in this room": "Sūtīt teksta ziņas savā vārdā šajā telpā",
+    "See messages posted to your active room": "Redzēt ziņas, kas izvietotas jūsu aktīvajā telpā",
+    "See messages posted to this room": "Redzēt ziņas, kas izvietotas šajā telpā",
+    "Send messages as you in your active room": "Sūtiet ziņas savā vārdā jūsu aktīvajā telpā",
+    "Send messages as you in this room": "Sūtīt ziņas savā vārdā šajā telpā",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> iespējas",
+    "See <b>%(eventType)s</b> events posted to your active room": "Redzēt, kad <b>%(eventType)s</b> notikumi izvietoti jūsu aktīvajā telpā",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Sūtīt <b>%(eventType)s</b> notikumus savā vārdā savā aktīvajā telpā",
+    "See <b>%(eventType)s</b> events posted to this room": "Redzēt <b>%(eventType)s</b>  notikumus, kas izvietoti šajā telpā",
+    "Send <b>%(eventType)s</b> events as you in this room": "Sūtiet <b>%(eventType)s</b> notikumus jūsu vārdā šajā telpā",
+    "with state key %(stateKey)s": "ar stāvokļa/statusa atslēgu %(stateKey)s",
+    "with an empty state key": "ar tukšu stāvokļa/statusa atslēgu",
+    "See when anyone posts a sticker to your active room": "Redzēt, kad kāds izvieto stikeri jūsu aktīvajā telpā",
+    "Send stickers to your active room as you": "Nosūtiet uzlīmes savā vārdā uz savu aktīvo telpu",
+    "See when a sticker is posted in this room": "Redzēt, kad šajā telpā parādās stikers",
+    "Send stickers to this room as you": "Nosūtīt stikerus savā vārdā uz šo telpu",
+    "See when people join, leave, or are invited to your active room": "Redzēt, kad cilvēki ienāk/pievienojas, pamet/atvienojas vai ir uzaicināti uz jūsu aktīvo telpu",
+    "Kick, ban, or invite people to this room, and make you leave": "Izspert, liegt vai uzaicināt cilvēkus uz šo telpu un likt jums aiziet",
+    "Kick, ban, or invite people to your active room, and make you leave": "Izspert, liegt vai uzaicināt cilvēkus uz jūsu aktīvo telpu un likt jums aiziet",
+    "See when people join, leave, or are invited to this room": "Redzēt, kad cilvēki ienāk/pievienojas, pamet/atvienojas vai ir uzaicināti uz šo telpu",
+    "See when the avatar changes in your active room": "Redzēt, kad notiek jūsu aktīvās istabas avatara izmaiņas",
+    "Change the avatar of your active room": "Mainīt jūsu aktīvās telpas avataru",
+    "See when the avatar changes in this room": "Redzēt, kad notiek šīs istabas avatara izmaiņas",
+    "Change the avatar of this room": "Mainīt šīs istabas avataru",
+    "See when the name changes in your active room": "Redzēt, kad notiek aktīvās telpas nosaukuma izmaiņas",
+    "Change the name of your active room": "Mainīt jūsu aktīvās telpas nosaukumu",
+    "See when the name changes in this room": "Redzēt, kad mainās šīs telpas nosaukums",
+    "Change the name of this room": "Mainīt šīs telpas nosaukumu",
+    "See when the topic changes in this room": "Redzēt, kad mainās šīs telpas temats",
+    "See when the topic changes in your active room": "Redzēt, kad mainās pašreizējā tērziņa temats",
+    "Change the topic of your active room": "Nomainīt jūsu aktīvās istabas tematu",
+    "Change the topic of this room": "Nomainīt šīs telpas tematu",
+    "Change which room, message, or user you're viewing": "Nomainīt telpu, ziņu vai lietotāju, kurš ir fokusā (kuru jūs skatiet)",
+    "Change which room you're viewing": "Nomainīt telpu, kuru jūs skatiet",
+    "Send stickers into your active room": "Iesūtīt stikerus jūsu aktīvajā telpā",
+    "Send stickers into this room": "Šajā telpā iesūtīt stikerus",
+    "Remain on your screen while running": "Darbības laikā paliek uz ekrāna",
+    "Remain on your screen when viewing another room, when running": "Darbības laikā paliek uz ekrāna, kad tiek skatīta cita telpa",
+    "Dark": "Tumša",
+    "Light": "Gaiša",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s pārjaunoja lieguma noteikumu šablonu %(oldGlob)s uz šablonu %(newGlob)s dēļ %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aizstāja noteikumu, kas piekļuvi liedza serveriem, kas atbilst pazīmei %(oldGlob)s, ar atbilstošu pazīmei %(newGlob)s dēļ %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aizstāja noteikumu, kurš liedza %(oldGlob)s pazīmei atbilstošas telpas ar jaunu noteikumu, kurš liedz %(newGlob)s dēļ %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aizstāja noteikumu, kurš aizliedza lietotājus %(oldGlob)s ar jaunu noteikumu, kurš aizliedz %(newGlob)s dēļ %(reason)s",
+    "%(senderName)s has updated the widget layout": "%(senderName)s ir aktualizējis vidžeta/logrīka izkārtojumu",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s mainīja telpas <a>piekabinātās ziņas</a>.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s modernizēja šo telpu.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s izspēra %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s izspēra %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s atsauca %(targetName)s paredzēto uzaicinājumu",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s atsauca %(targetName)s paredzēto uzaicinājumu: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s noņēma liegumu/atbanoja %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s pameta/atvienojās no telpas",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s pameta/atvienojās no telpas: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s noraidīja uzaicinājumu",
+    "%(targetName)s joined the room": "%(targetName)s ienāca (pievienojās) telpā",
+    "%(senderName)s made no change": "%(senderName)s neizdarīja izmaiņas",
+    "%(senderName)s set a profile picture": "%(senderName)s iestatīja profila attēlu",
+    "%(senderName)s changed their profile picture": "%(senderName)s nomainīja savu profila attēlu",
+    "%(senderName)s removed their profile picture": "%(senderName)s dzēsa savu profila attēlu",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s dzēsa savu redzamo vārdu (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s iestatīja %(displayName)s kā savu redzamo vārdu",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s nomainīja savu redzamo vārdu uz %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s aizliedza/nobanoja %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s aizliedza/nobanoja %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s uzaicināja %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s pieņēma uzaicinājumu",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s pieņēma uzaicinājumu uz %(displayName)s",
+    "Converts the DM to a room": "Pārvērst DM par telpu",
+    "Converts the room to a DM": "Pārvērst telpu par DM",
+    "Places the call in the current room on hold": "Iepauzē sarunu šajā telpā",
+    "Takes the call in the current room off hold": "Šajā telpā iepauzētās sarunas atpauzēšana",
+    "Sends a message to the given user": "Nosūtīt ziņu dotajam lietotājam",
+    "Opens chat with the given user": "Izveidot tērziņu ar doto lietotāju",
+    "Send a bug report with logs": "Nosūtīt kļūdas ziņojumu ar žurnāliem/logiem",
+    "Displays information about a user": "Parāda lietotāja informāciju",
+    "Displays list of commands with usages and descriptions": "Parāda komandu sarakstu ar pielietojumiem un aprakstiem",
+    "Sends the given emote coloured as a rainbow": "Nosūta šo emociju iekrāsotu varavīksnes krāsās",
+    "Sends the given message coloured as a rainbow": "Nosūta šo ziņu iekrāsotu varavīksnes krāsās",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Piespiedu kārtā atmet/izbeidz pašreizējo izejošo grupas sesiju šifrētajā telpā",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Jūsu iesniegtā parakstīšanas atslēga atbilst parakstīšanas atslēgai, kuru saņēmāt no %(userId)s sesijas %(deviceId)s. Sesija atzīmēta kā verificēta.",
+    "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!": "BRĪDINĀJUMS: ATSLĒGU VERIFIKĀCIJA NEIZDEVĀS! Parakstīšanas atslēga lietotājam %(userId)s un sesijai %(deviceId)s ir \"%(fprint)s\", kura neatbilst norādītajai atslēgai \"%(fingerprint)s\". Tas var nozīmēt, ka jūsu saziņa tiek pārtverta!",
+    "Verifies a user, session, and pubkey tuple": "Verificē lietotāju, sesiju un publiskās atslēgas",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "BRĪDINĀJUMS: Sesija jau ir verificēta, bet atslēgas NESAKRĪT!",
+    "Unknown (user, session) pair:": "Nezināms (lietotājs, sesija) pāris:",
+    "You cannot modify widgets in this room.": "Jūs šajā telpā nevarat mainīt vidžetus/logrīkus.",
+    "Please supply a https:// or http:// widget URL": "Lūdzu ievadiet logrīka URL https:// vai http:// formā",
+    "Please supply a widget URL or embed code": "Ievadiet vidžeta/logrīka URL vai ievietojiet kodu",
+    "Adds a custom widget by URL to the room": "Pievieno telpai individuālu/pielāgotu logrīku/vidžetu ar URL-adresi",
+    "Command failed": "Neizdevās izpildīt komandu",
+    "Joins room with given address": "Pievienojas telpai ar šādu adresi",
+    "Use an identity server to invite by email. Manage in Settings.": "Izmantojiet identitātes serveri, lai uzaicinātu pa e-pastu. Pārvaldība pieejama Iestatījumos.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Izmantojiet identitātes serveri, lai uzaicinātu pa e-pastu. Noklikšķiniet uz Turpināt, lai izmantotu noklusējuma identitātes serveri (%(defaultIdentityServerName)s) vai nomainītu to Iestatījumos.",
+    "Use an identity server": "Izmantot identitāšu serveri",
+    "Sets the room name": "Iestata telpas nosaukumu",
+    "Gets or sets the room topic": "Nolasa vai iestata telpas tematu",
+    "Changes your avatar in all rooms": "Maina jūsu avataru visām telpām",
+    "Changes your avatar in this current room only": "Maina jūsu avataru tikai šajā telpā",
+    "Changes the avatar of the current room": "Maina šīs telpas avataru",
+    "Changes your display nickname in the current room only": "Maina rādāmo pseidonīmu/segvārdu tikai šai telpai",
+    "Upgrades a room to a new version": "Modernizē telpu uz Jauno versiju",
+    "Sends a message as html, without interpreting it as markdown": "Nosūta ziņu kā HTML, to neinterpretējot kā Markdown",
+    "Sends a message as plain text, without interpreting it as markdown": "Nosūta ziņu kā vienkāršu tekstu, to neinterpretējot kā Markdown",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Pievieno ( ͡° ͜ʖ ͡°) pirms vienkārša teksta ziņas",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Pievieno ┬──┬ ノ( ゜-゜ノ) pirms vienkārša teksta ziņas",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Pievieno (╯°□°）╯︵ ┻━┻ pirms vienkārša teksta ziņas",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Pievieno ¯\\_(ツ)_/¯ pirms vienkārša teksta ziņas",
+    "Sends the given message as a spoiler": "Nosūta norādīto ziņu kā spoileri",
+    "Effects": "Efekti",
+    "Messages": "Ziņas",
+    "Setting up keys": "Atslēgu iestatīšana",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Pārējiem uzaicinājumi tika nosūtīti, bet zemāk norādītos cilvēkus uz <RoomName/> nevarēja uzaicināt",
+    "Some invites couldn't be sent": "Dažus uzaicinājumus nevarēja nosūtīt",
+    "Zimbabwe": "Zimbabve",
+    "Zambia": "Zambija",
+    "Yemen": "Jemena",
+    "Western Sahara": "Rietumsahāra",
+    "Wallis & Futuna": "Volisa & Futuna",
+    "Vietnam": "Vjetnama",
+    "Venezuela": "Venecuēla",
+    "Vatican City": "Vatikāns",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistāna",
+    "Uruguay": "Urugvaja",
+    "United Arab Emirates": "Apvienotie arābu emirāti",
+    "Ukraine": "Ukraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "ASV Virdžīnu salas",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Tērksas un Kaikosas salas",
+    "Turkmenistan": "Turkmenistāna",
+    "Turkey": "Turcija",
+    "Tunisia": "Tunisija",
+    "Trinidad & Tobago": "Trinidāda & Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Austrumtimora",
+    "Thailand": "Taizeme",
+    "Tanzania": "Tanzānija",
+    "Tajikistan": "Tadžikistāna",
+    "Taiwan": "Taivana",
+    "São Tomé & Príncipe": "Santome un Prinsipi",
+    "Syria": "Sīrija",
+    "Switzerland": "Šveice",
+    "Sweden": "Zviedrija",
+    "Swaziland": "Svazilenda - Esvatini",
+    "Svalbard & Jan Mayen": "Svalbāra un Jans Mejens",
+    "Suriname": "Sirinama",
+    "Sudan": "Sudāna",
+    "St. Vincent & Grenadines": "Sentvinsenta un Grenadīnas",
+    "St. Pierre & Miquelon": "Sentpjērs un Mikelons",
+    "St. Martin": "Sen-Marten",
+    "St. Lucia": "Sentlūsija",
+    "St. Kitts & Nevis": "Sentkitsa un Nevisa",
+    "St. Helena": "Svētās Helēnas sala",
+    "St. Barthélemy": "Sen-bartelemi",
+    "Sri Lanka": "Šrilanka",
+    "Spain": "Spānija",
+    "South Sudan": "Dienvidsudāna",
+    "South Korea": "Dienvidkoreja",
+    "South Georgia & South Sandwich Islands": "Dienviddžordžija un Dienvidsendviču salas",
+    "South Africa": "Dienvidāfrika",
+    "Somalia": "Somālija",
+    "Solomon Islands": "Solomona salas",
+    "Slovenia": "Slovēnija",
+    "Slovakia": "Slovākija",
+    "Sint Maarten": "Sintmartēna",
+    "Singapore": "Singapūra",
+    "Sierra Leone": "Sjerra-leone",
+    "Seychelles": "Seišeļu salas",
+    "Serbia": "Serbija",
+    "Senegal": "Senegāla",
+    "Saudi Arabia": "Saudu Arābija",
+    "San Marino": "Sanmarino",
+    "Samoa": "Samoa",
+    "Réunion": "Rejunjona",
+    "Rwanda": "Ruanda",
+    "Russia": "Krievija",
+    "Romania": "Rumānija",
+    "Qatar": "Katāra",
+    "Puerto Rico": "Puertoriko",
+    "Portugal": "Portugāle",
+    "Poland": "Polija",
+    "Pitcairn Islands": "Pitkērnas salas",
+    "Peru": "Peru",
+    "Paraguay": "Paragvaja",
+    "Papua New Guinea": "Papua Jaungvineja",
+    "Panama": "Panama",
+    "Palestine": "Palestīna",
+    "Palau": "Palau",
+    "Pakistan": "Pakistāna",
+    "Oman": "Omāna",
+    "Norway": "Norvēģija",
+    "Northern Mariana Islands": "Ziemeļu Marianas salas",
+    "North Korea": "Ziemeļkoreja",
+    "Norfolk Island": "Norfolka sala",
+    "Niue": "Niuve",
+    "Nigeria": "Nigērija",
+    "Niger": "Nigēra",
+    "Nicaragua": "Nikaragva",
+    "New Zealand": "Jaunzelande",
+    "New Caledonia": "Jaunkaledonija",
+    "Netherlands": "Nīderlande",
+    "Nepal": "Nepāla",
+    "Nauru": "Nauru",
+    "Namibia": "Namībija",
+    "Myanmar": "Mjanma",
+    "Mozambique": "Mozambika",
+    "Morocco": "Maroka",
+    "Montserrat": "Monserata",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolija",
+    "Monaco": "Monako",
+    "Moldova": "Moldova",
+    "Micronesia": "Mikronēzija",
+    "Mexico": "Meksika",
+    "Mayotte": "Majotta",
+    "Mauritius": "Mauritānija",
+    "Mauritania": "Mauritānija",
+    "Martinique": "Martinika",
+    "Marshall Islands": "Maršala salas",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldaivu salas",
+    "Malaysia": "Malaizija",
+    "Liechtenstein": "Lihtenšteina",
+    "Libya": "Lībija",
+    "Liberia": "Libērija",
+    "Lesotho": "Lesoto",
+    "Laos": "Laosa",
+    "Kyrgyzstan": "Kirgiztāna",
+    "Kuwait": "Kuveita",
+    "Kosovo": "Kosova",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenija",
+    "Kazakhstan": "Kazahstāna",
+    "Jordan": "Jordāna",
+    "Jersey": "Džersija",
+    "Japan": "Japāna",
+    "Jamaica": "Jamaika",
+    "Italy": "Itālija",
+    "Israel": "Izraēla",
+    "Isle of Man": "Menas sala",
+    "Ireland": "Īrija",
+    "Iraq": "Irāka",
+    "Iran": "Irāna",
+    "Indonesia": "Indonēzija",
+    "India": "Indija",
+    "Iceland": "Islande",
+    "Hungary": "Ungārija",
+    "Hong Kong": "Honkonga",
+    "Honduras": "Hondurasa",
+    "Heard & McDonald Islands": "Herda & McDonalda salas",
+    "Haiti": "Haiti",
+    "Guyana": "Gajana",
+    "Guinea-Bissau": "Gvineja-bissau",
+    "Guinea": "Gvineja",
+    "Guernsey": "Gērnsija",
+    "Guatemala": "Gvatemala",
+    "Guam": "Guama",
+    "Guadeloupe": "Gvadelope",
+    "Grenada": "Grenāda",
+    "Greenland": "Grenlande",
+    "Greece": "Grieķija",
+    "Gibraltar": "Gibraltārs",
+    "Ghana": "Gana",
+    "Germany": "Vācija",
+    "Georgia": "Gruzija",
+    "Gambia": "Gambija",
+    "Gabon": "Gabona",
+    "French Southern Territories": "Franču Dienvidu teritorijas",
+    "French Polynesia": "Franču polinēzija",
+    "French Guiana": "Franču gviāna",
+    "France": "Francija",
+    "Finland": "Somija",
+    "Fiji": "Fidži",
+    "Faroe Islands": "Farēru salas",
+    "Falkland Islands": "Folklandu salas",
+    "Ethiopia": "Etiopija",
+    "Estonia": "Igaunija",
+    "Eritrea": "Eritreja",
+    "Equatorial Guinea": "Ekvatoriālā gvineja",
+    "El Salvador": "Salvadora",
+    "Egypt": "Ēģipte",
+    "Ecuador": "Ekvadora",
+    "Dominican Republic": "Dominikānas republika",
+    "Dominica": "Dominika",
+    "Djibouti": "Džibuti",
+    "Côte d’Ivoire": "Ziloņkaula krasts",
+    "Czech Republic": "Čehija",
+    "Cyprus": "Kipra",
+    "Curaçao": "Kurasao",
+    "Cuba": "Kuba",
+    "Croatia": "Horvātija",
+    "Costa Rica": "Kostarika",
+    "Cook Islands": "Kuka salas",
+    "Congo - Kinshasa": "Kongo - Kinšasa (Kongo demokrātiskā republika)",
+    "Congo - Brazzaville": "Kongo - Brazaville",
+    "Comoros": "Komoras salas",
+    "Colombia": "Kolumbija",
+    "Cocos (Keeling) Islands": "Kokosa (Kīlinga) salas",
+    "Christmas Island": "Ziemassvētku sala",
+    "China": "Ķīna",
+    "Chile": "Čīle",
+    "Chad": "Čada",
+    "Central African Republic": "Centrālāfrikas republika",
+    "Cayman Islands": "Kaimanu salas",
+    "Caribbean Netherlands": "Nīderlandes Karību salas (Bonaire, Sint Eustatius un Saba)",
+    "Cape Verde": "Keipverde",
+    "Canada": "Kanāda",
+    "Cameroon": "Kamerūna",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkinafaso",
+    "Bulgaria": "Bulgārija",
+    "Brunei": "Bruneja",
+    "British Virgin Islands": "Britu Virdžīnu salas",
+    "British Indian Ocean Territory": "Britu Indijas okeāna teritorija",
+    "Brazil": "Brazīlija",
+    "Bouvet Island": "Buvē sala",
+    "Botswana": "Botsvana",
+    "Bosnia": "Bosnija",
+    "Bolivia": "Bolīvija",
+    "Bhutan": "Butāna",
+    "Bermuda": "Bermudas",
+    "Benin": "Benīna",
+    "Belize": "Belīze",
+    "Belgium": "Beļģija",
+    "Belarus": "Baltkrievija",
+    "Barbados": "Barbadosa",
+    "Bahrain": "Bahreina",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaidžāna",
+    "Austria": "Austrija",
+    "Australia": "Austrālija",
+    "Aruba": "Aruba",
+    "Armenia": "Armēnija",
+    "Argentina": "Argentīna",
+    "Antigua & Barbuda": "Antigua & Barbuda",
+    "Antarctica": "Antarktika",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andora",
+    "Åland Islands": "Ālandu salas",
+    "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.": "Jūsu bāzes/mājas serveris noraidīja jūsu ierakstīšanās mēģinājumu. Tas varētu būt saistīts ar to, ka ierakstīšanās prasīja pārāk ilgu laiku. Lūdzu mēģiniet vēlreiz. Ja tas tā turpinās, lūdzu, sazinieties ar bāzes/mājas servera administratoru.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Jūsu bāzes/mājas serveris nebija sasniedzams un jums nebija iespējams ieraksīties. Lūdzu, mēģiniet vēlreiz. Ja situācija nemainās, lūdzu, sazinieties ar bāzes/mājas servera administratoru.",
+    "Try again": "Mēģiniet vēlreiz",
+    "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.": "Mēs lūdzām tīmekļa pārlūkprogrammai atcerēties, kuru bāzes/mājas serveri izmantojat, lai ļautu jums pierakstīties, bet diemžēl jūsu pārlūkprogramma to ir aizmirsusi. Dodieties uz ierakstīšanās lapu un mēģiniet vēlreiz.",
+    "We couldn't log you in": "Neizdevās jūs ierakstīt sistēmā",
+    "Trust": "Uzticamība",
+    "Only continue if you trust the owner of the server.": "Turpiniet tikai gadījumā, ja uzticaties servera īpašniekam.",
+    "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.": "Šai darbībai ir nepieciešama piekļuve noklusējuma identitātes serverim <server />, lai validētu e-pasta adresi vai tālruņa numuru, taču serverim nav pakalpojumu sniegšanas noteikumu.",
+    "Identity server has no terms of service": "Identitātes serverim nav pakalpojumu sniegšanas noteikumu",
+    "Failed to transfer call": "Neizdevās pārsūtīt/pāradresēt zvanu",
+    "Transfer Failed": "Pāradresēšana/pārsūtīšana neizdevās",
+    "Unable to transfer call": "Neizdevās pārsūtīt zvanu",
+    "There was an error looking up the phone number": "Meklējot tālruņa numuru, radās kļūda",
+    "Unable to look up phone number": "Nevar atrast tālruņa numuru",
+    "No other application is using the webcam": "Neviena cita lietotne neizmanto kameru",
+    "Permission is granted to use the webcam": "Piešķirta atļauja izmantot kameru",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofons un kamera ir pievienoti un pareizi konfigurēti",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Zvans neizdevās, jo nevarēja piekļūt kamerai vai mikrofonam. Pārbaudiet, vai:",
+    "Unable to access webcam / microphone": "Nevar piekļūt kamerai / mikrofonam",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Zvans neizdevās, jo nebija piekļuves mikrofonam. Pārliecinieties, vai mikrofons ir pievienots un pareizi konfigurēts.",
+    "Unable to access microphone": "Nav pieejas mikrofonam",
+    "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.": "Varat arī iemēģināt izmantot publisko serveri vietnē <code> turn.matrix.org </code>, taču tas nebūs tik droši, un šajā serverī nonāks jūsu IP adrese. To var arī pārvaldīt iestatījumos.",
+    "The call was answered on another device.": "Uz zvanu tika atbildēts no citas ierīces.",
+    "Answered Elsewhere": "Atbildēja citur",
+    "The call could not be established": "Savienojums nevarēja tikt izveidots",
+    "The user you called is busy.": "Lietotājs, kuram zvanāt, ir aizņemts.",
+    "User Busy": "Lietotājs aizņemts",
+    "Your user agent": "Jūsu lietotāja-aģents",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Vai izmantojiet %(brand)s kā instalētu progresīvo tīmekļa lietotni",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Vai izmantojat %(brand)s ierīcē, kurā skārnienjūtīgs ekrāns ir galvenais ievades mehānisms",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Šī telpa tiek izmantota svarīgiem ziņojumiem no bāzes servera, tāpēc jūs nevarat to atstāt.",
+    "Can't leave Server Notices room": "Nevar iziet no servera Paziņojumu telpas",
+    "Unexpected server error trying to leave the room": "Mēģinot atstāt telpu radās negaidīta servera kļūme",
+    "Unable to connect to Homeserver. Retrying...": "Nevar izveidot savienojumu ar bāzes/mājas serveri. Mēģinam vēlreiz ...",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Lūdzu <a>sazinieties ar savu administratoru</a>, lai turpinātu izmantot pakalpojumu.",
+    "This homeserver has exceeded one of its resource limits.": "Šis bāzes/mājas serveris ir pārsniedzis vienu no tā resursu ierobežojumiem.",
+    "This homeserver has been blocked by its administrator.": "Šo bāzes/mājas serveri ir bloķējis tā administrators.",
+    "This homeserver has hit its Monthly Active User limit.": "Šis bāzes/mājas serveris ir sasniedzis ikmēneša aktīvo lietotāju ierobežojumu.",
+    "Unexpected error resolving identity server configuration": "Negaidīta kļūda identitātes servera konfigurācijā",
+    "Unexpected error resolving homeserver configuration": "Negaidīta kļūme mājas servera konfigurācijā"
 }
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 6183fe7de2..1e25c28f26 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -2,7 +2,6 @@
     "Cancel": "റദ്ദാക്കുക",
     "Close": "അടയ്ക്കുക",
     "Create new room": "പുതിയ റൂം സൃഷ്ടിക്കുക",
-    "Custom Server Options": "കസ്റ്റം സെര്‍വര്‍ ഓപ്ഷനുകള്‍",
     "Dismiss": "ഒഴിവാക്കുക",
     "Error": "എറര്‍",
     "Failed to forget room %(errCode)s": "%(errCode)s റൂം ഫോര്‍ഗെറ്റ് ചെയ്യുവാന്‍ സാധിച്ചില്ല",
@@ -12,7 +11,6 @@
     "Operation failed": "ശ്രമം പരാജയപ്പെട്ടു",
     "powered by Matrix": "മാട്രിക്സില്‍ പ്രവര്‍ത്തിക്കുന്നു",
     "Remove": "നീക്കം ചെയ്യുക",
-    "Room directory": "റൂം ഡയറക്ടറി",
     "Search": "തിരയുക",
     "Settings": "സജ്ജീകരണങ്ങള്‍",
     "Start chat": "ചാറ്റ് തുടങ്ങുക",
@@ -23,15 +21,12 @@
     "Microphone": "മൈക്രോഫോൺ",
     "Camera": "ക്യാമറ",
     "Fetching third party location failed": "തേഡ് പാര്‍ട്ടി ലൊക്കേഷന്‍ ഫെച്ച് ചെയ്യാന്‍ കഴിഞ്ഞില്ല",
-    "All notifications are currently disabled for all targets.": "അറിയിപ്പുകളെല്ലാം നിര്‍ത്തിയിരിയ്ക്കുന്നു.",
-    "Uploading report": "റിപ്പോര്‍ട്ട് അപ്ലോഡ് ചെയ്യുന്നു",
     "Sunday": "ഞായര്‍",
     "Guests can join": "അതിഥികള്‍ക്കും പ്രവേശിക്കാം",
     "Messages sent by bot": "ബോട്ട് അയയ്ക്കുന്ന സന്ദേശങ്ങള്‍ക്ക്",
     "Notification targets": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റുകള്‍",
     "Failed to set direct chat tag": "ഡയറക്റ്റ് ചാറ്റ് ടാഗ് സെറ്റ് ചെയ്യാനായില്ല",
     "Today": "ഇന്ന്",
-    "You are not receiving desktop notifications": "നിങ്ങള്‍ക്ക് ഇപ്പോള്‍ ഡെസ്ക്ടോപ്പ് നോട്ടിഫിക്കേഷനുകള്‍ ലഭിക്കുന്നില്ല",
     "Friday": "വെള്ളി",
     "Update": "പുതുക്കുക",
     "What's New": "പുതിയ വിശേഷങ്ങള്‍",
@@ -39,11 +34,7 @@
     "Changelog": "മാറ്റങ്ങളുടെ നാള്‍വഴി",
     "Waiting for response from server": "സെര്‍വറില്‍ നിന്നുള്ള പ്രതികരണത്തിന് കാക്കുന്നു",
     "Leave": "വിടവാങ്ങുക",
-    "Advanced notification settings": "അറിയപ്പുകളുടെ സങ്കീര്‍ണമായ സജ്ജീകരണങ്ങള്‍",
-    "Forget": "മറക്കുക",
     "World readable": "ആർക്കും വായിക്കാവുന്നത്",
-    "You cannot delete this image. (%(code)s)": "നിങ്ങള്‍ക്ക് ഈ ചിത്രം നീക്കം ചെയ്യാനാകില്ല. (%(code)s)",
-    "Cancel Sending": "അയയ്ക്കുന്നത് റദ്ദാക്കുക",
     "Warning": "മുന്നറിയിപ്പ്",
     "This Room": "ഈ മുറി",
     "Noisy": "ഉച്ചത്തില്‍",
@@ -51,41 +42,21 @@
     "Messages containing my display name": "എന്റെ പേര് അടങ്ങിയിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്ക്",
     "Messages in one-to-one chats": "നേര്‍ക്കുനേര്‍ ചാറ്റിലെ സന്ദേശങ്ങള്‍ക്ക്",
     "Unavailable": "ലഭ്യമല്ല",
-    "View Decrypted Source": "ഡീക്രിപ്റ്റ് ചെയ്ത സോഴ്സ് കാണുക",
-    "Failed to update keywords": "കീവേഡുകള്‍ പുതുക്കുവാന്‍ സാധിച്ചില്ല",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "ഈ പറയുന്ന കീവേർഡുകളെ പറ്റിയുള്ള അറിയിപ്പുകൾ പിൻതുടരുന്ന നിയമങ്ങൾ ഇവിടെ കാണിക്കുവാൻ സാധ്യമല്ല:",
-    "Please set a password!": "ദയവായി ഒരു രഹസ്യവാക്ക് ക്രമീകരിക്കുക!",
-    "You have successfully set a password!": "രഹസ്യവാക്ക് സജ്ജീകരിച്ചിരിക്കുന്നു!",
-    "An error occurred whilst saving your email notification preferences.": "ഇ-മെയില്‍ വഴി അറിയിയ്ക്കാനുള്ള നിങ്ങളുടെ സജ്ജീകരണങ്ങള്‍ സൂക്ഷിക്കുന്നതില്‍ ഒരു പ്രശ്നമുണ്ടായി.",
     "Source URL": "സോഴ്സ് യു ആര്‍ എല്‍",
     "Failed to add tag %(tagName)s to room": "റൂമിന് %(tagName)s എന്ന ടാഗ് ആഡ് ചെയ്യുവാന്‍ സാധിച്ചില്ല",
     "Members": "അംഗങ്ങള്‍",
     "No update available.": "അപ്ഡേറ്റുകള്‍ ലഭ്യമല്ല.",
     "Resend": "വീണ്ടും അയയ്ക്കുക",
-    "Files": "ഫയലുകള്‍",
     "Collecting app version information": "ആപ്പ് പതിപ്പു വിവരങ്ങള്‍ ശേഖരിക്കുന്നു",
-    "Keywords": "കീവേഡുകള്‍",
-    "Enable notifications for this account": "ഈ അക്കൌണ്ടില്‍ നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
-    "Messages containing <span>keywords</span>": "<span>കീവേഡുകള്‍</span>അടങ്ങിയ സന്ദേശങ്ങള്‍ക്ക്",
-    "Error saving email notification preferences": "ഇമെയില്‍ നോട്ടിഫിക്കേഷന്‍ സജ്ജീകരണങ്ങള്‍ സൂക്ഷിക്കവേ എറര്‍ നേരിട്ടു",
     "Tuesday": "ചൊവ്വ",
-    "Enter keywords separated by a comma:": "കീവേഡുകളെ കോമ കൊണ്ട് വേര്‍ത്തിരിച്ച് ടൈപ്പ് ചെയ്യുക :",
-    "I understand the risks and wish to continue": "കുഴപ്പമാകാന്‍ സാധ്യതയുണ്ടെന്നെനിയ്ക്കു് മനസ്സിലായി, എന്നാലും മുന്നോട്ട് പോകുക",
     "Remove %(name)s from the directory?": "%(name)s കള്‍ ഡയറക്റ്ററിയില്‍ നിന്നും മാറ്റണോ ?",
     "Unnamed room": "പേരില്ലാത്ത റൂം",
-    "All messages (noisy)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
     "Saturday": "ശനി",
-    "Remember, you can always set an email address in user settings if you change your mind.": "ഓര്‍ക്കുക, വേണ്ട സമയത്ത് യൂസര്‍ സെറ്റിങ്സില്‍ ഒരു ഇമെയില്‍ വിലാസം നല്‍കാം.",
-    "Direct Chat": "നേരിട്ടുള്ള ചാറ്റ്",
     "The server may be unavailable or overloaded": "സെര്‍വര്‍ ലഭ്യമല്ല അല്ലെങ്കില്‍ ഓവര്‍ലോഡഡ് ആണ്",
     "Reject": "നിരസിക്കുക",
-    "Failed to set Direct Message status of room": "റൂമില്‍ നിന്നും ഡയറക്റ്റ് മെസേജ് സ്റ്റാറ്റസ് സജ്ജീകരിക്കാന്‍ കഴിഞ്ഞില്ല",
     "Monday": "തിങ്കള്‍",
     "Remove from Directory": "ഡയറക്റ്ററിയില്‍ നിന്നും നീക്കം ചെയ്യുക",
-    "Enable them now": "ഇപ്പോള്‍ ഇനേബിള്‍ ചെയ്യുക",
-    "Forward Message": "സന്ദേശം ഫോര്‍വേഡ് ചെയ്യുക",
     "Collecting logs": "നാള്‍വഴി ശേഖരിക്കുന്നു",
-    "(HTTP status %(httpStatus)s)": "(HTTP സ്റ്റാറ്റസ് %(httpStatus)s)",
     "All Rooms": "എല്ലാ മുറികളും കാണുക",
     "Wednesday": "ബുധന്‍",
     "You cannot delete this message. (%(code)s)": "നിങ്ങള്‍ക്ക് ഈ സന്ദേശം നീക്കം ചെയ്യാനാകില്ല. (%(code)s)",
@@ -95,40 +66,28 @@
     "All messages": "എല്ലാ സന്ദേശങ്ങളും",
     "Call invitation": "വിളിയ്ക്കുന്നു",
     "Downloading update...": "അപ്ഡേറ്റ് ഡൌണ്‍ലോഡ് ചെയ്യുന്നു...",
-    "You have successfully set a password and an email address!": "ഇമെയില്‍ വിലാസവും രഹസ്യവാക്കും വിജയകരമായി ക്രമീകരിച്ചിരിക്കുന്നു!",
     "What's new?": "എന്തൊക്കെ പുതിയ വിശേഷങ്ങള്‍ ?",
-    "Notify me for anything else": "ബാക്കി ഏതിനും എനിക്ക് അറിയിപ്പു നൽകുക",
     "When I'm invited to a room": "ഞാന്‍ ഒരു റൂമിലേക്ക് ക്ഷണിക്കപ്പെടുമ്പോള്‍",
-    "Can't update user notification settings": "ഉപയോക്താവിനെ അറിയിയ്ക്കാനുള്ള സജ്ജീകരണം പുതുക്കാനായില്ല",
-    "Notify for all other messages/rooms": "ബാക്കി എല്ലാ സന്ദേശങ്ങൾക്കും/റൂമുകൾക്കും അറിയിപ്പു നൽകുക",
     "Unable to look up room ID from server": "സെര്‍വറില്‍ നിന്നും റൂം ഐഡി കണ്ടെത്താനായില്ല",
     "Couldn't find a matching Matrix room": "ആവശ്യപ്പെട്ട മാട്രിക്സ് റൂം കണ്ടെത്താനായില്ല",
     "Invite to this room": "ഈ റൂമിലേക്ക് ക്ഷണിക്കുക",
     "Thursday": "വ്യാഴം",
     "Search…": "തിരയുക…",
     "Back": "തിരികെ",
-    "Unhide Preview": "പ്രിവ്യു കാണിക്കുക",
     "Unable to join network": "നെറ്റ്‍വര്‍ക്കില്‍ ജോയിന്‍ ചെയ്യാന്‍ കഴിയില്ല",
-    "Uploaded on %(date)s by %(user)s": "%(date)s ല്‍ %(user)s അപ്ലോഡ് ചെയ്തത്",
     "Messages in group chats": "ഗ്രൂപ്പ് ചാറ്റുകളിലെ സന്ദേശങ്ങള്‍ക്ക്",
     "Yesterday": "ഇന്നലെ",
     "Error encountered (%(errorDetail)s).": "എറര്‍ നേരിട്ടു (%(errorDetail)s).",
     "Low Priority": "താഴ്ന്ന പരിഗണന",
-    "Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല",
-    "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക",
     "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.",
     "Off": "ഓഫ്",
-    "Mentions only": "മെന്‍ഷനുകള്‍ മാത്രം",
     "Failed to remove tag %(tagName)s from room": "റൂമില്‍ നിന്നും %(tagName)s ടാഗ് നീക്കം ചെയ്യുവാന്‍ സാധിച്ചില്ല",
-    "You can now return to your account after signing out, and sign in on other devices.": "നിങ്ങള്‍ക്ക് ഇപ്പോള്‍ സൈന്‍ ഔട്ട് ചെയ്ത ശേഷവും നിങ്ങളുടെ അക്കൌണ്ടിലേക്ക് തിരികെ വരാം, അതു പോലെ മറ്റ് ഡിവൈസുകളില്‍ സൈന്‍ ഇന്‍ ചെയ്യുകയുമാവാം.",
-    "Enable email notifications": "ഇമെയില്‍ നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
     "No rooms to show": "കാണിക്കാന്‍ റൂമുകളില്ല",
-    "Download this file": "ഈ ഫയല്‍ ഡൌണ്‍ലോഡ് ചെയ്യുക",
-    "Failed to change settings": "സജ്ജീകരണങ്ങള്‍ മാറ്റുന്നവാന്‍ സാധിച്ചില്ല",
     "View Source": "സോഴ്സ് കാണുക",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "നിങ്ങളുടെ ഇപ്പോളത്തെ ബ്രൌസര്‍ റയട്ട് പ്രവര്‍ത്തിപ്പിക്കാന്‍ പൂര്‍ണമായും പര്യാപത്മല്ല. പല ഫീച്ചറുകളും പ്രവര്‍ത്തിക്കാതെയിരിക്കാം. ഈ ബ്രൌസര്‍ തന്നെ ഉപയോഗിക്കണമെങ്കില്‍ മുന്നോട്ട് പോകാം. പക്ഷേ നിങ്ങള്‍ നേരിടുന്ന പ്രശ്നങ്ങള്‍ നിങ്ങളുടെ ഉത്തരവാദിത്തത്തില്‍ ആയിരിക്കും!",
     "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു...",
     "Explore rooms": "മുറികൾ കണ്ടെത്തുക",
     "Sign In": "പ്രവേശിക്കുക",
-    "Create Account": "അക്കൗണ്ട് സൃഷ്ടിക്കുക"
+    "Create Account": "അക്കൗണ്ട് സൃഷ്ടിക്കുക",
+    "Integration manager": "സംയോജക മാനേജർ",
+    "Identity server": "തിരിച്ചറിയൽ സെർവർ"
 }
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index d3be9cd2ea..93fe437e3d 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1,5 +1,4 @@
 {
-    "Room directory": "Romkatalog",
     "This email address is already in use": "Denne e-postadressen er allerede i bruk",
     "This phone number is already in use": "Dette mobilnummeret er allerede i bruk",
     "Failed to verify email address: make sure you clicked the link in the email": "Klarte ikke verifisere e-postadressen: dobbelsjekk at du trykket på lenken i e-posten",
@@ -8,54 +7,33 @@
     "Your language of choice": "Ditt valgte språk",
     "Your homeserver's URL": "Din hjemmetjeners URL",
     "Fetching third party location failed": "Kunne ikke hente tredjeparts lokalisering",
-    "Advanced notification settings": "Avanserte varslingsinnstillinger",
     "Sunday": "Søndag",
     "Guests can join": "Gjester kan bli med",
     "Messages sent by bot": "Meldinger sendt av bot",
     "Notification targets": "Mål for varsel",
     "Failed to set direct chat tag": "Kunne ikke angi direkte chat-tagg",
     "Today": "I dag",
-    "Files": "Filer",
-    "You are not receiving desktop notifications": "Du mottar ikke skrivebordsvarsler",
     "Friday": "Fredag",
     "Notifications": "Varsler",
-    "Unable to fetch notification target list": "Kunne ikke hente varsel-mål liste",
     "On": "På",
     "Leave": "Forlat",
-    "All notifications are currently disabled for all targets.": "Alle varsler er deaktivert for alle mottakere.",
-    "Forget": "Glem",
     "World readable": "Lesbar for alle",
-    "You cannot delete this image. (%(code)s)": "Du kan ikke slette dette bildet. (%(code)s)",
     "Source URL": "Kilde URL",
     "Resend": "Send på nytt",
-    "Error saving email notification preferences": "Feil ved lagring av e-postvarselinnstillinger",
     "Messages in one-to-one chats": "Meldinger i en-til-en samtaler",
-    "View Decrypted Source": "Vis dekryptert kilde",
-    "Failed to update keywords": "Kunne ikke oppdatere nøkkelord",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsler på de følgende nøkkelordene følger regler som ikke kan vises her:",
     "Room not found": "Rommet ble ikke funnet",
     "Favourite": "Favoritt",
-    "Cancel Sending": "Avbryt sending",
     "Failed to add tag %(tagName)s to room": "Kunne ikke legge til tagg %(tagName)s til rom",
     "Members": "Medlemmer",
     "Noisy": "Bråkete",
-    "Enable notifications for this account": "Aktiver varsler for denne konto",
-    "Messages containing <span>keywords</span>": "Meldinger som inneholder <span>nøkkelord</span>",
     "When I'm invited to a room": "Når jeg blir invitert til et rom",
     "Tuesday": "Tirsdag",
-    "Enter keywords separated by a comma:": "Angi nøkkelord adskilt med komma:",
-    "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra katalogen?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s benytter mange avanserte nettleserfunksjoner, og noen av disse er ikke tilgjengelige eller er eksperimentelle på din nåværende nettleser.",
     "Unnamed room": "Rom uten navn",
-    "All messages (noisy)": "Alle meldinger (høy)",
-    "Direct Chat": "Direkte Chat",
     "The server may be unavailable or overloaded": "Serveren kan være utilgjengelig eller overbelastet",
     "Reject": "Avvis",
-    "Failed to set Direct Message status of room": "Kunne ikke angi status for direkte melding i rommet",
     "Monday": "Mandag",
     "Remove from Directory": "Fjern fra katalogen",
-    "Enable them now": "Aktiver dem nå",
     "Failed to forget room %(errCode)s": "Kunne ikke glemme rommet %(errCode)s",
     "Wednesday": "Onsdag",
     "Error": "Feil",
@@ -63,12 +41,8 @@
     "Call invitation": "Anropsinvitasjon",
     "Messages containing my display name": "Meldinger som inneholder mitt visningsnavn",
     "powered by Matrix": "Drevet av Matrix",
-    "Notify me for anything else": "Varsle meg om alt annet",
     "View Source": "Vis kilde",
-    "Keywords": "Nøkkelord",
     "Close": "Lukk",
-    "Can't update user notification settings": "Kan ikke oppdatere brukervarsel innstillinger",
-    "Notify for all other messages/rooms": "Varsler om alle andre meldinger/rom",
     "Unable to look up room ID from server": "Kunne ikke slå opp rom-ID fra serveren",
     "Couldn't find a matching Matrix room": "Kunne ikke finne et samsvarende Matrix rom",
     "Invite to this room": "Inviter til dette rommet",
@@ -76,23 +50,15 @@
     "Thursday": "Torsdag",
     "All messages": "Alle meldinger",
     "Unable to join network": "Kunne ikke bli med i nettverket",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklager, din nettleser er <b>ikke</b> i stand til å kjøre %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Lastet opp den %(date)s av %(user)s",
     "Messages in group chats": "Meldinger i gruppesamtaler",
     "Yesterday": "I går",
     "Low Priority": "Lav Prioritet",
     "%(brand)s does not know how to join a room on this network": "%(brand)s vet ikke hvordan man kan komme inn på et rom på dette nettverket",
-    "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av innstillinger for e-postvarsel.",
     "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.",
     "Off": "Av",
     "Failed to remove tag %(tagName)s from room": "Kunne ikke fjerne tagg %(tagName)s fra rommet",
     "Remove": "Fjern",
-    "Enable email notifications": "Aktiver e-postvarsler",
     "No rooms to show": "Ingen rom å vise",
-    "Download this file": "Last ned filen",
-    "Failed to change settings": "Kunne ikke endre innstillingene",
-    "Unhide Preview": "Vis forhåndsvisning",
-    "Custom Server Options": "Server-instillinger",
     "Quote": "Sitat",
     "Saturday": "Lørdag",
     "Dismiss": "Avvis",
@@ -107,17 +73,9 @@
     "The information being sent to us to help make %(brand)s better includes:": "Informasjonen som blir sendt til oss for å hjelpe oss med å lage %(brand)s bedre inkluderer:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Hvor denne siden inkluderer identifiserende informasjon, sånn som navnet på rommet, brukeren, og gruppe ID, men denne informasjonen blir fjernet før den blir sendt til tjeneren.",
     "Call Failed": "Oppringning mislyktes",
-    "Call Timeout": "Oppringningen be tidsavbrutt",
-    "The remote side failed to pick up": "Den andre svarte ikke",
-    "Unable to capture screen": "Klarte ikke ta opp skjermen",
-    "Existing Call": "Samtalen er allerede i gang",
-    "You are already in a call.": "Du er allerede i en samtale.",
     "VoIP is unsupported": "VoIP er ikke støttet",
     "You cannot place VoIP calls in this browser.": "Du kan ikke ringe via VoIP i denne nettleseren.",
     "You cannot place a call with yourself.": "Du kan ikke ringe deg selv.",
-    "Call in Progress": "Samtale pågår",
-    "A call is currently being placed!": "En samtale holder på å starte!",
-    "A call is already in progress!": "En samtale er allerede i gang!",
     "Permission Required": "Tillatelse kreves",
     "You do not have permission to start a conference call in this room": "Du har ikke tillatelse til å starte en konferansesamtale i dette rommet",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Filen \"%(fileName)s\" er større enn hjemmetjenerens grense for opplastninger",
@@ -177,7 +135,6 @@
     "Operation failed": "Operasjon mislyktes",
     "Failed to invite": "Klarte ikke invitere",
     "Failed to invite users to the room:": "Klarte ikke invitere brukere til rommet:",
-    "Failed to invite the following users to the %(roomName)s room:": "Klarte ikke invitere følgende brukere til %(roomName)s rommet:",
     "You need to be logged in.": "Du må være logget inn.",
     "You need to be able to invite users to do that.": "Du må kunne invitere andre brukere for å gjøre det.",
     "Unable to create widget.": "Klarte ikke lage widgeten.",
@@ -191,9 +148,6 @@
     "Room %(roomId)s not visible": "Rom %(roomId)s er ikke synlig",
     "Missing user_id in request": "Manglende user_id i forespørselen",
     "Usage": "Bruk",
-    "Searches DuckDuckGo for results": "Søker DuckDuckGo for resultater",
-    "/ddg is not a command": "/ddg er ikke en kommando",
-    "To use it, just wait for autocomplete results to load and tab through them.": "For å bruke dette, bare vent til autofullfør-resultatene laster, og tab deg gjennom dem.",
     "Upgrades a room to a new version": "Oppgraderer et rom til en ny versjon",
     "Changes your display nickname": "Endrer visningsnavnet ditt",
     "Chat with %(brand)s Bot": "Chat med %(brand)s Bot",
@@ -245,8 +199,6 @@
     "Sends the given emote coloured as a rainbow": "Sender gitte emote i regnbuens farger",
     "Displays list of commands with usages and descriptions": "Viser liste over kommandoer med bruks eksempler og beskrivelser",
     "Reason": "Årsak",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aksepterte invitasjonen til %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aksepterte en invitasjon.",
     "Add Email Address": "Legg til E-postadresse",
     "Add Phone Number": "Legg til telefonnummer",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Hvorvidt du bruker %(brand)s på en enhet som primært mottar inndata gjennom touchskjerm",
@@ -254,8 +206,6 @@
     "Cancel": "Avbryt",
     "Trust": "Stol på",
     "Sign In": "Logg inn",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterte %(targetName)s.",
-    "%(targetName)s joined the room.": "%(targetName)s ble med i rommet.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et bilde.",
     "Someone": "Noen",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendte en invitasjon til %(targetDisplayName)s om å bli med i rommet.",
@@ -312,7 +262,6 @@
     "Confirm password": "Bekreft passord",
     "Change Password": "Endre passordet",
     "ID": "ID",
-    "rooms.": "rom.",
     "Manage": "Administrér",
     "Enable": "Slå på",
     "<a>Upgrade</a> to your own domain": "<a>Oppgrader</a> til ditt eget domene",
@@ -360,8 +309,6 @@
     "Email Address": "E-postadresse",
     "Phone Number": "Telefonnummer",
     "Mod": "Mod",
-    "%(senderName)s sent an image": "%(senderName)s sendte et bilde",
-    "%(senderName)s sent a video": "%(senderName)s sendte en video",
     "Ban": "Utesteng",
     "Are you sure?": "Er du sikker?",
     "Invite": "Inviter",
@@ -381,14 +328,12 @@
     "Idle": "Rolig",
     "Offline": "Frakoblet",
     "Unknown": "Ukjent",
-    "Recent rooms": "Nylige rom",
     "Settings": "Innstillinger",
     "Search": "Søk",
     "Direct Messages": "Direktemeldinger",
     "Rooms": "Rom",
     "Joining room …": "Blir med i rommet …",
     "Sign Up": "Registrer deg",
-    "Not now": "Ikke nå",
     "Options": "Innstillinger",
     "All Rooms": "Alle rom",
     "Search…": "Søk …",
@@ -423,9 +368,6 @@
     "collapse": "skjul",
     "expand": "utvid",
     "Communities": "Samfunn",
-    "Rotate counter-clockwise": "Roter mot klokken",
-    "Rotate clockwise": "Roter med klokken",
-    "Add User": "Legg til bruker",
     "All rooms": "Alle rom",
     "%(networkName)s rooms": "%(networkName)s-rom",
     "Matrix rooms": "Matrix-rom",
@@ -448,33 +390,22 @@
     "An error has occurred.": "En feil har oppstått.",
     "Suggestions": "Forslag",
     "Go": "Gå",
-    "New session": "Ny økt",
     "Refresh": "Oppdater",
     "Email address": "E-postadresse",
     "Skip": "Hopp over",
     "Share Room Message": "Del rommelding",
-    "COPY": "KOPIER",
     "Terms of Service": "Vilkår for bruk",
     "Service": "Tjeneste",
     "Summary": "Oppsummering",
     "Document": "Dokument",
     "Next": "Neste",
     "Cancel All": "Avbryt alt",
-    "Allow": "Tillat",
-    "Deny": "Avvis",
-    "Enter recovery key": "Skriv inn gjenopprettingsnøkkel",
-    "Custom": "Tilpasset",
-    "Forward Message": "Videresend melding",
-    "Share Message": "Del melding",
     "Report Content": "Rapporter innhold",
     "Notification settings": "Varslingsvalg",
     "Set status": "Sett status",
     "Hide": "Skjul",
     "Home": "Hjem",
     "Sign in": "Logg inn",
-    "Help": "Hjelp",
-    "Reload": "Last på nytt",
-    "Take picture": "Ta bilde",
     "User Status": "Brukerstatus",
     "Code": "Kode",
     "Submit": "Send",
@@ -484,12 +415,9 @@
     "Enter password": "Skriv inn passord",
     "Enter username": "Skriv inn brukernavn",
     "Confirm": "Bekreft",
-    "Free": "Gratis",
-    "Premium": "Premium",
     "Featured Rooms:": "Fremhevede rom:",
     "Everyone": "Alle",
     "Description": "Beskrivelse",
-    "Explore": "Utforsk",
     "Filter": "Filter",
     "Logout": "Logg ut",
     "Preview": "Forhåndsvisning",
@@ -523,8 +451,6 @@
     "Show read receipts sent by other users": "Vis lesekvitteringer sendt av andre brukere",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vis tidsstempler i 12-timersformat (f.eks. 2:30pm)",
     "Always show message timestamps": "Alltid vis meldingenes tidsstempler",
-    "Autoplay GIFs and videos": "Auto-avspill GIF-er og videoer",
-    "Always show encryption icons": "Alltid vis krypteringsikoner",
     "Enable automatic language detection for syntax highlighting": "Skru på automatisk kodespråkoppdagelse for syntaksfremheving",
     "Show avatars in user and room mentions": "Vis avatarer i bruker- og romnevninger",
     "Enable big emoji in chat": "Skru på store emojier i chatrom",
@@ -534,7 +460,6 @@
     "Mirror local video feed": "Speil den lokale videostrømmen",
     "Enable Community Filter Panel": "Skru på samfunnsfilterpanelet",
     "Match system theme": "Bind fast til systemtemaet",
-    "Allow Peer-to-Peer for 1:1 calls": "Tillat P2P for samtaler under fire øyne",
     "Send analytics data": "Send analytiske data",
     "Enable inline URL previews by default": "Skru på URL-forhåndsvisninger inni meldinger som standard",
     "Prompt before sending invites to potentially invalid matrix IDs": "Si ifra før det sendes invitasjoner til potensielt ugyldige Matrix-ID-er",
@@ -581,7 +506,6 @@
     "Accept <policyLink /> to continue:": "Aksepter <policyLink /> for å fortsette:",
     "Public Name": "Offentlig navn",
     "Last seen": "Sist sett",
-    "Algorithm: ": "Algoritme: ",
     "Enable desktop notifications for this session": "Skru på skrivebordsvarsler for denne økten",
     "Show message in desktop notification": "Vis meldingen i skrivebordsvarselet",
     "Enable audible notifications for this session": "Skru på hørbare varsler for denne økten",
@@ -589,13 +513,9 @@
     "Checking server": "Sjekker tjeneren",
     "Change identity server": "Bytt ut identitetstjener",
     "You should:": "Du burde:",
-    "Identity Server": "Identitetstjener",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Å bruke en identitetstjener er valgfritt. Dersom du velger å ikke bruke en identitetstjener, vil du ikke kunne oppdages av andre brukere, og du vil ikke kunne invitere andre ut i fra E-postadresse eller telefonnummer.",
     "Do not use an identity server": "Ikke bruk en identitetstjener",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Bruk en integreringsbehandler <b>(%(serverName)s)</b> til å behandle botter, moduler, og klistremerkepakker.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Bruk en integreringsbehandler til å behandle botter, moduler, og klistremerkepakker.",
     "Manage integrations": "Behandle integreringer",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integreringsbehandlere mottar oppsettsdata, og kan endre på moduler, sende rominvitasjoner, og bestemme styrkenivåer på dine vegne.",
     "Flair": "Merkeskilt",
     "Theme added!": "Temaet er lagt til!",
     "Set a new account password...": "Velg et nytt kontopassord …",
@@ -610,8 +530,6 @@
     "Help & About": "Hjelp/Om",
     "Bug reporting": "Feilrapportering",
     "%(brand)s version:": "'%(brand)s'-versjon:",
-    "olm version:": "olm-versjon:",
-    "click to reveal": "klikk for å avsløre",
     "Ignored/Blocked": "Ignorert/Blokkert",
     "Server rules": "Tjenerregler",
     "User rules": "Brukerregler",
@@ -624,7 +542,6 @@
     "Cryptography": "Kryptografi",
     "Session ID:": "Økt-ID:",
     "Session key:": "Øktnøkkel:",
-    "Key backup": "Nøkkel-sikkerhetskopiering",
     "Message search": "Meldingssøk",
     "A session's public name is visible to people you communicate with": "Det offentlige navnet til en økt er synlig for folkene du kommuniserer med",
     "No media permissions": "Ingen mediatillatelser",
@@ -658,14 +575,9 @@
     "Change settings": "Endre innstillinger",
     "Kick users": "Spark ut brukere",
     "Ban users": "Bannlys brukere",
-    "Remove messages": "Fjern meldinger",
     "Roles & Permissions": "Roller og tillatelser",
     "Enable encryption?": "Vil du skru på kryptering?",
-    "Click here to fix": "Klikk her for å fikse det",
-    "Add a widget": "Legg til en modul",
-    "Drop File Here": "Slipp ned filen her",
     "Drop file here to upload": "Slipp ned en fil her for å laste opp",
-    " (unsupported)": " (ikke støttet)",
     "Edit message": "Rediger meldingen",
     "Unencrypted": "Ukryptert",
     "Disinvite": "Trekk tilbake invitasjon",
@@ -693,10 +605,6 @@
     "<userName/> invited you": "<userName/> inviterte deg",
     "%(roomName)s does not exist.": "%(roomName)s eksisterer ikke.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s er ikke tilgjengelig for øyeblikket.",
-    "Never lose encrypted messages": "Aldri mist krypterte beskjeder",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meldinger i dette rommet er sikret med start-til-mål-kryptering. Bare du og mottakeren(e) har nøklene til å lese disse beskjedene.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Ta sikkerhetskopier av nøklene dine på en sikker måte for å unngå å miste dem <a>Lær mer.</a>",
-    "Don't ask me again": "Ikke spør meg igjen",
     "This Room": "Dette rommet",
     "Server error": "Serverfeil",
     "Stickerpack": "Klistremerkepakke",
@@ -716,7 +624,6 @@
     "edited": "redigert",
     "You're not currently a member of any communities.": "Du er ikke medlem av noen samfunn for øyeblikket.",
     "What's new?": "Hva er nytt?",
-    "Set Password": "Bestem passord",
     "Your user ID": "Din bruker-ID",
     "Your theme": "Ditt tema",
     "%(brand)s URL": "%(brand)s-URL",
@@ -752,9 +659,7 @@
     "Session key": "Øktnøkkel",
     "Updating %(brand)s": "Oppdaterer %(brand)s",
     "Message edits": "Meldingsredigeringer",
-    "This wasn't me": "Det var ikke meg",
     "Send report": "Send inn rapport",
-    "Checking...": "Sjekker …",
     "Upload files": "Last opp filer",
     "Upload all": "Last opp alle",
     "Upload Error": "Opplastingsfeil",
@@ -762,14 +667,10 @@
     "No backup found!": "Ingen sikkerhetskopier ble funnet!",
     "Update status": "Oppdater statusen",
     "Country Dropdown": "Nedfallsmeny over land",
-    "Server Name": "Tjenernavn",
     "Sign in with": "Logg inn med",
     "Passwords don't match": "Passordene samsvarer ikke",
     "Email (optional)": "E-post (valgfritt)",
     "Phone (optional)": "Telefonnummer (valgfritt)",
-    "Homeserver URL": "Hjemmetjener-URL",
-    "Identity Server URL": "Identitetstjener-URL",
-    "Other servers": "Andre tjenere",
     "Add a Room": "Legg til et rom",
     "Add a User": "Legg til en bruker",
     "Leave Community": "Forlat samfunnet",
@@ -785,33 +686,21 @@
     "Add room": "Legg til et rom",
     "Search failed": "Søket mislyktes",
     "No more results": "Ingen flere resultater",
-    "Fill screen": "Fyll skjermen",
-    "Your profile": "Din profil",
     "Session verified": "Økten er verifisert",
     "Sign in instead": "Logg inn i stedet",
     "I have verified my email address": "Jeg har verifisert E-postadressen min",
     "Return to login screen": "Gå tilbake til påloggingsskjermen",
     "Set a new password": "Velg et nytt passord",
-    "Upload an avatar:": "Last opp en avatar:",
     "You're signed out": "Du er logget av",
-    "Results from DuckDuckGo": "Resultater fra DuckDuckGo",
-    "DuckDuckGo Results": "DuckDuckGo-resultater",
     "File to import": "Filen som skal importeres",
-    "Your recovery key": "Din gjenopprettingsnøkkel",
     "Upgrade your encryption": "Oppgrader krypteringen din",
     "Starting backup...": "Begynner sikkerhetskopieringen …",
-    "Don't ask again": "Ikke spør igjen",
     "Space used:": "Plass brukt:",
     "Indexed rooms:": "Indekserte rom:",
     "Verify this session": "Verifiser denne økten",
-    "Set up encryption": "Sett opp kryptering",
     "Create Account": "Opprett konto",
-    "%(senderName)s set a profile picture.": "%(senderName)s ordnet seg et profilbilde.",
-    "%(targetName)s left the room.": "%(targetName)s forlot rommet.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s endret rommets navn fra %(oldRoomName)s til %(newRoomName)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s endret rommets navn til %(roomName)s.",
-    "(not supported by this browser)": "(ikke støttet av denne nettleseren)",
-    "%(senderName)s ended the call.": "%(senderName)s avsluttet samtalen.",
     "Not Trusted": "Ikke betrodd",
     "%(items)s and %(count)s others|other": "%(items)s og %(count)s andre",
     "%(items)s and %(count)s others|one": "%(items)s og én annen",
@@ -825,8 +714,6 @@
     "Never send encrypted messages to unverified sessions in this room from this session": "Aldri send krypterte meldinger til uverifiserte økter i dette rommet fra denne økten",
     "Enable URL previews for this room (only affects you)": "Skru på URL-forhåndsvisninger for dette rommet (Påvirker bare deg)",
     "Enable URL previews by default for participants in this room": "Skru på URL-forhåndsvisninger som standard for deltakerne i dette rommet",
-    "Room Colour": "Romfarge",
-    "Low bandwidth mode": "Modus for lav båndbredde",
     "Manually verify all remote sessions": "Verifiser alle eksterne økter manuelt",
     "Show more": "Vis mer",
     "Warning!": "Advarsel!",
@@ -840,19 +727,14 @@
     "Your keys are <b>not being backed up from this session</b>.": "Dine nøkler <b>har ikke blitt sikkerhetskopiert fra denne økten</b>.",
     "Back up your keys before signing out to avoid losing them.": "Ta sikkerhetskopi av nøklene dine før du logger av for å unngå å miste dem.",
     "Start using Key Backup": "Begynn å bruke Nøkkelsikkerhetskopiering",
-    "Add an email address to configure email notifications": "Legg til en E-postadresse for å sette opp E-postvarsler",
-    "Identity Server (%(server)s)": "Identitetstjener (%(server)s)",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Hvis du ikke ønsker å bruke <server /> til å oppdage og bli oppdaget av eksisterende kontakter som du kjenner, skriv inn en annen identitetstjener nedenfor.",
     "Enter a new identity server": "Skriv inn en ny identitetstjener",
     "For help with using %(brand)s, click <a>here</a>.": "For å få hjelp til å bruke %(brand)s, klikk <a>her</a>.",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Dersom du har sendt inn en feilrapport på GitHub, kan avlusingsloggbøker hjelpe oss med å finne frem til problemet. Avlusingsloggbøker inneholder programbruksdata inkl. ditt brukernavn, ID-ene eller aliasene til rommene eller gruppene du har besøkt, og brukernavnene til andre brukere. De inneholder ikke noen meldinger.",
     "Submit debug logs": "Send inn avlusingsloggbøker",
     "Clear cache and reload": "Tøm mellomlageret og last inn siden på nytt",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "For å rapportere inn et Matrix-relatert sikkerhetsproblem, vennligst less Matrix.org sine <a>Retningslinjer for sikkerhetspublisering</a>.",
     "Keyboard Shortcuts": "Tastatursnarveier",
     "Homeserver is": "Hjemmetjeneren er",
-    "Identity Server is": "Identitetstjeneren er",
-    "Access Token:": "Tilgangssjetong:",
     "Import E2E room keys": "Importer E2E-romnøkler",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatlivet er viktig for oss, så vi samler ikke inn noe personlig eller identifiserbar data for våre analyser.",
@@ -867,14 +749,11 @@
     "Send %(eventType)s events": "Send %(eventType)s-hendelser",
     "Select the roles required to change various parts of the room": "Velg rollene som kreves for å endre på diverse deler av rommet",
     "Only people who have been invited": "Kun folk som har blitt invitert",
-    "Anyone who knows the room's link, apart from guests": "Alle som kjenner til rommets lenke, bortsett fra gjester",
-    "Anyone who knows the room's link, including guests": "Alle som kjenner til rommets lenke, inkludert gjester",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Endringer for hvem som kan lese historikken, vil kun bli benyttet for fremtidige meldinger i dette rommet. Synligheten til den eksisterende historikken vil forbli uendret.",
     "Members only (since the point in time of selecting this option)": "Kun medlemmer (f.o.m. da denne innstillingen ble valgt)",
     "Members only (since they were invited)": "Kun medlemmer (f.o.m. da de ble invitert)",
     "Members only (since they joined)": "Kun medlemmer (f.o.m. de ble med)",
     "Once enabled, encryption cannot be disabled.": "Dersom dette først har blitt skrudd på, kan kryptering aldri bli skrudd av.",
-    "Who can access this room?": "Hvem kan gå inn i dette rommet?",
     "Who can read history?": "Hvem kan lese historikken?",
     "Scroll to most recent messages": "Hopp bort til de nyeste meldingene",
     "Share Link to User": "Del en lenke til brukeren",
@@ -885,14 +764,12 @@
     "Room %(name)s": "Rom %(name)s",
     "Start chatting": "Begynn å chatte",
     "%(count)s unread messages.|one": "1 ulest melding.",
-    "Unread mentions.": "Uleste nevninger.",
     "Unread messages.": "Uleste meldinger.",
     "Send as message": "Send som en melding",
     "You don't currently have any stickerpacks enabled": "Du har ikke skrudd på noen klistremerkepakker for øyeblikket",
     "Add some now": "Legg til noen nå",
     "Hide Stickers": "Skjul klistremerker",
     "Show Stickers": "Vis klistremerker",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publiserte adresser kan brukes av alle på enhver tjener til å bli med i rommet ditt. For å publisere en adresse, må den bli satt til å være en lokal adresse først.",
     "No other published addresses yet, add one below": "Det er ingen publiserte adresser enda, legg til en nedenfor",
     "New published address (e.g. #alias:server)": "Ny publisert adresse (f.eks. #alias:tjener)",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Velg adresser for dette rommet slik at brukere kan finne dette rommet gjennom hjemmetjeneren din (%(localDomain)s)",
@@ -906,7 +783,6 @@
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Når noen legger til en URL i meldingene deres, kan en URL-forhåndsvisning bli vist for å gi mere informasjonen om den lenken, f.eks. tittelen, beskrivelsen, og et bilde fra nettstedet.",
     "Trusted": "Betrodd",
     "Not trusted": "Ikke betrodd",
-    "Direct message": "Direktemelding",
     "Verified": "Verifisert",
     "Compare emoji": "Sammenlign emojier",
     "Encryption enabled": "Kryptering er skrudd på",
@@ -923,7 +799,6 @@
     "Widget added by": "Modulen ble lagt til av",
     "Create new room": "Opprett et nytt rom",
     "Language Dropdown": "Språk-nedfallsmeny",
-    "Manage Integrations": "Behandle integreringer",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s ble med %(count)s ganger",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s ble med",
@@ -947,30 +822,17 @@
     "Send logs": "Send loggbøker",
     "Create Community": "Opprett et samfunn",
     "Please enter a name for the room": "Vennligst skriv inn et navn for rommet",
-    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, og man kan kun bli med etter invitasjon.",
     "Create a public room": "Opprett et offentlig rom",
     "Create a private room": "Opprett et privat rom",
     "Topic (optional)": "Tema (valgfritt)",
-    "Make this room public": "Gjør dette rommet offentlig",
     "Hide advanced": "Skjul avansert",
     "Show advanced": "Vis avansert",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Blokker brukere fra andre Matrix-hjemmetjenere fra å bli med i dette rommet (Denne innstillingen kan ikke bli endret på senere!)",
     "To continue, please enter your password:": "For å gå videre, vennligst skriv inn passordet ditt:",
     "Event Type": "Hendelsestype",
     "Developer Tools": "Utviklerverktøy",
     "Recent Conversations": "Nylige samtaler",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start en samtale med noen ut ifra deres navn, brukernavn (slik som <userId/>), eller E-postadresse.",
-    "Your account is not secure": "Kontoen din er ikke sikker",
-    "Your password": "Passordet ditt",
     "Room Settings - %(roomName)s": "Rominnstillinger - %(roomName)s",
-    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
-    "Please set a password!": "Vennligst velg et passord!",
-    "Integration Manager": "Integreringsbehandler",
     "To continue you need to accept the terms of this service.": "For å gå videre må du akseptere brukervilkårene til denne tjenesten.",
-    "Private Chat": "Privat chat",
-    "Public Chat": "Offentlig chat",
-    "Pin Message": "Fest fast meldingen",
-    "Mentions only": "Kun nevninger",
     "Set a new status...": "Velg en ny status …",
     "View Community": "Vis samfunnet",
     "Confirm your identity by entering your account password below.": "Bekreft identiteten din ved å skrive inn kontopassordet ditt nedenfor.",
@@ -980,23 +842,17 @@
     "Password is allowed, but unsafe": "Passordet er tillatt, men er ikke trygt",
     "Nice, strong password!": "Strålende, passordet er sterkt!",
     "Keep going...": "Fortsett sånn …",
-    "Doesn't look like a valid phone number": "Det ser ikke ut som et gyldig telefonnummer",
     "Use lowercase letters, numbers, dashes and underscores only": "Bruk kun småbokstaver, numre, streker og understreker",
     "You must join the room to see its files": "Du må bli med i rommet for å se filene dens",
-    "There are no visible files in this room": "Det er ingen synlig filer i dette rommet",
     "Failed to upload image": "Mislyktes i å laste opp bildet",
     "Featured Users:": "Fremhevede brukere:",
-    "Filter rooms…": "Filtrer rom …",
     "Signed Out": "Avlogget",
     "%(creator)s created and configured the room.": "%(creator)s opprettet og satte opp rommet.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Opprett et samfunn for å samle sammen brukere og rom! Lag en tilpasset hjemmeside for å markere territoriet ditt i Matrix-universet.",
-    "You have no visible notifications": "Du har ingen synlige varsler",
     "Find a room… (e.g. %(exampleRoom)s)": "Finn et rom… (f.eks. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Hvis du ikke finner rommet du leter etter, be om en invitasjon eller <a>Opprett et nytt rom</a>.",
-    "Active call": "Aktiv samtale",
     "Send Reset Email": "Send tilbakestillings-E-post",
     "Registration Successful": "Registreringen var vellykket",
-    "Create your account": "Opprett kontoen din",
     "Forgotten your password?": "Har du glemt passordet ditt?",
     "Export room keys": "Eksporter romnøkler",
     "Import room keys": "Importer romnøkler",
@@ -1017,15 +873,10 @@
     "Enter": "Send",
     "Space": "Mellomrom",
     "End": "Slutt",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Hvis du støter på noen programfeil eller har tilbakemeldinger som du vil dele, vennligst fortell oss om det på GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "For å unngå å lage duplikatrapporter, vennligst <existingIssuesLink>sjekk gjennom de eksisterende sakene</existingIssuesLink> først (og gi en tommel opp), eller <newIssueLink>opprett en ny saksrapport</newIssueLink> dersom du ikke finner noen tilsvarende saker.",
-    "Report bugs & give feedback": "Meld ifra om feil og gi tilbakemeldinger",
     "Enter passphrase": "Skriv inn passordfrase",
-    "(no answer)": "(intet svar)",
     "Avoid sequences": "Unngå sekvenser",
     "Avoid recent years": "Unngå nylige år",
     "Failed to join room": "Mislyktes i å bli med i rommet",
-    "unknown caller": "ukjent oppringer",
     "Cancelling…": "Avbryter …",
     "They match": "De samsvarer",
     "They don't match": "De samsvarer ikke",
@@ -1034,15 +885,10 @@
     "Restore from Backup": "Gjenopprett fra sikkerhetskopi",
     "Remove %(email)s?": "Vil du fjerne %(email)s?",
     "Invalid Email Address": "Ugyldig E-postadresse",
-    "%(senderName)s uploaded a file": "%(senderName)s lastet opp en fil",
     "Kick this user?": "Vil du sparke ut denne brukeren?",
-    "No pinned messages.": "Ingen klistrede meldinger.",
-    "Pinned Messages": "Klistrede meldinger",
-    "Unpin Message": "Løsne meldingen",
     "Try to join anyway": "Forsøk å bli med likevel",
     "%(count)s unread messages including mentions.|one": "1 ulest nevnelse.",
     "%(count)s unread messages.|other": "%(count)s uleste meldinger.",
-    "Add a topic": "Legg til et emne",
     "Command error": "Kommandofeil",
     "Room avatar": "Rommets avatar",
     "Start Verification": "Begynn verifisering",
@@ -1059,9 +905,6 @@
     "%(name)s wants to verify": "%(name)s ønsker å verifisere",
     "Failed to copy": "Mislyktes i å kopiere",
     "Submit logs": "Send inn loggføringer",
-    "Failed to remove widget": "Mislyktes i å fjerne modulen",
-    "Minimize apps": "Minimer apper",
-    "Maximize apps": "Maksimer apper",
     "were invited %(count)s times|other": "ble invitert %(count)s ganger",
     "was invited %(count)s times|other": "ble invitert %(count)s ganger",
     "were banned %(count)s times|other": "ble bannlyst %(count)s ganger",
@@ -1074,25 +917,16 @@
     "Verify session": "Verifiser økten",
     "Upload completed": "Opplasting fullført",
     "Unable to upload": "Mislyktes i å laste opp",
-    "Username not available": "Brukernavnet er utilgjengelig",
-    "Username available": "Brukernavnet er tilgjengelig",
     "Remove for everyone": "Fjern for alle",
-    "Remove for me": "Fjern for meg",
     "Syncing...": "Synkroniserer ...",
     "Signing In...": "Logger inn …",
     "Calls": "Samtaler",
     "Room List": "Romliste",
     "Never send encrypted messages to unverified sessions from this session": "Aldri send krypterte meldinger til uverifiserte økter fra denne økten",
-    "Verify yourself & others to keep your chats safe": "Verifiser deg selv og andre for å holde samtalene dine trygge",
-    "Cross-signing and secret storage are enabled.": "Kryssignering og hemmelig lagring er skrudd på.",
-    "Cross-signing and secret storage are not yet set up.": "Kryssignering og hemmelig lagring er ikke satt enda.",
-    "Reset cross-signing and secret storage": "Tilbakestill kryssignering og hemmelig lagring",
-    "Bootstrap cross-signing and secret storage": "Iverksett kryssignering og hemmelig lagring",
     "Cross-signing public keys:": "Offentlige nøkler for kryssignering:",
     "Cross-signing private keys:": "Private nøkler for kryssignering:",
     "Self signing private key:": "Selvsignert privat nøkkel:",
     "User signing private key:": "Brukersignert privat nøkkel:",
-    "Session backup key:": "Øktsikkerhetskopieringsnøkkel:",
     "Secret storage public key:": "Offentlig nøkkel for hemmelig lagring:",
     "Homeserver feature support:": "Hjemmetjener-funksjonsstøtte:",
     "Read Marker lifetime (ms)": "Lesemarkørens visningstid (ms)",
@@ -1108,7 +942,6 @@
     "Confirm adding email": "Bekreft tillegging av E-postadresse",
     "Confirm adding phone number": "Bekreft tillegging av telefonnummer",
     "Setting up keys": "Setter opp nøkler",
-    "Review where you’re logged in": "Gå gjennom der du er pålogget",
     "New login. Was this you?": "En ny pålogging. Var det deg?",
     "Sign In or Create Account": "Logg inn eller lag en konto",
     "Use an identity server": "Bruk en identitetstjener",
@@ -1116,16 +949,6 @@
     "Could not find user in room": "Klarte ikke å finne brukeren i rommet",
     "Session already verified!": "Økten er allerede verifisert!",
     "Displays information about a user": "Viser informasjon om en bruker",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannlyste %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endret visningsnavnet sitt til %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte visningsnavnet sitt til %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernet visningsnavnet sitt (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s fjernet profilbildet sitt.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s endret profilbildet sitt.",
-    "%(senderName)s made no change.": "%(senderName)s gjorde ingen endringer.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s avslo invitasjonen.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trakk tilbake invitasjonen til %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s sparket ut %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s endret temaet til «%(topic)s».",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernet rommets navn.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet.",
@@ -1134,7 +957,6 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s har hindret gjester fra å bli med i rommet.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s fjernet hovedadressen til dette rommet.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s endret adressene til dette rommet.",
-    "%(senderName)s answered the call.": "%(senderName)s svarte på oppringingen.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s gikk fra %(fromPowerLevel)s til %(toPowerLevel)s",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-modulen ble endret på av %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-modulen ble lagt til av %(senderName)s",
@@ -1156,8 +978,6 @@
     "This is a top-100 common password": "Dette er et topp-100 vanlig passord",
     "Message Pinning": "Meldingsklistring",
     "Aeroplane": "Fly",
-    "Verify all your sessions to ensure your account & messages are safe": "Verifiser alle øktene dine for å sikre at kontoen og meldingene dine er trygge",
-    "From %(deviceName)s (%(deviceId)s)": "Fra %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Avslå (%(counter)s)",
     "Upload new:": "Last opp ny:",
     "No display name": "Ingen visningsnavn",
@@ -1176,7 +996,6 @@
     "Muted Users": "Dempede brukere",
     "Incorrect verification code": "Ugyldig verifiseringskode",
     "Unable to add email address": "Klarte ikke å legge til E-postadressen",
-    "Invite only": "Kun ved invitasjon",
     "Close preview": "Lukk forhåndsvisning",
     "Failed to kick": "Mislyktes i å sparke ut",
     "Unban this user?": "Vil du oppheve bannlysingen av denne brukeren?",
@@ -1188,7 +1007,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (styrkenivå %(powerLevelNumber)s)",
     "Hangup": "Legg på røret",
     "The conversation continues here.": "Samtalen fortsetter her.",
-    "Jump to message": "Hopp til meldingen",
     "System Alerts": "Systemvarsler",
     "Rejecting invite …": "Avslår invitasjonen …",
     "You were kicked from %(roomName)s by %(memberName)s": "Du ble sparket ut fra %(roomName)s av %(memberName)s",
@@ -1209,7 +1027,6 @@
     "%(count)s verified sessions|other": "%(count)s verifiserte økter",
     "Hide verified sessions": "Skjul verifiserte økter",
     "Remove from community": "Fjern fra samfunnet",
-    "Error decrypting audio": "Feil under dekryptering av lyd",
     "Decrypt %(text)s": "Dekrypter %(text)s",
     "You verified %(name)s": "Du verifiserte %(name)s",
     "were kicked %(count)s times|other": "ble sparket ut %(count)s ganger",
@@ -1223,17 +1040,11 @@
     "a key signature": "en nøkkelsignatur",
     "Send Logs": "Send loggbøker",
     "Command Help": "Kommandohjelp",
-    "Share Permalink": "Del en permalenke",
     "Who can join this community?": "Hvem kan bli med i dette samfunnet?",
     "Long Description (HTML)": "Lang beskrivelse (HTML)",
     "Welcome to %(appName)s": "Velkommen til %(appName)s",
     "Send a Direct Message": "Send en direktemelding",
-    "Failed to leave room": "Mislyktes i å forlate rommet",
     "Connectivity to the server has been lost.": "Tilkoblingen til tjeneren er nede.",
-    "Click to unmute video": "Klikk for å høre videoen",
-    "Click to mute video": "Klikk for å dempe videoen",
-    "Click to unmute audio": "Klikk for å høre lyden",
-    "Click to mute audio": "Klikk for å dempe lyden",
     "Uploading %(filename)s and %(count)s others|zero": "Laster opp %(filename)s",
     "Could not load user profile": "Klarte ikke å laste inn brukerprofilen",
     "Verify this login": "Verifiser denne påloggingen",
@@ -1241,57 +1052,37 @@
     "New passwords must match each other.": "De nye passordene må samsvare med hverandre.",
     "This account has been deactivated.": "Denne kontoen har blitt deaktivert.",
     "Incorrect username and/or password.": "Feil brukernavn og/eller passord.",
-    "Set a display name:": "Velg et visningsnavn:",
     "Continue with previous account": "Fortsett med tidligere konto",
     "Clear personal data": "Tøm personlige data",
     "Passphrases must match": "Passfrasene må samsvare",
     "Passphrase must not be empty": "Passfrasen kan ikke være tom",
     "Confirm passphrase": "Bekreft passfrasen",
-    "Great! This recovery passphrase looks strong enough.": "Strålende! Denne gjenopprettingspassfrasen ser solid nok ut.",
-    "Enter a recovery passphrase": "Skriv inn en gjenopprettingspassfrase",
-    "Set up with a recovery key": "Sett det opp med en gjenopprettingsnøkkel",
     "That matches!": "Det samsvarer!",
     "That doesn't match.": "Det samsvarer ikke.",
     "Go back to set it again.": "Gå tilbake for å velge på nytt.",
-    "Enter your recovery passphrase a second time to confirm it.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte den.",
-    "Confirm your recovery passphrase": "Bekreft gjenopprettingspassfrasen din",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Gjenopprettingsnøkkelen din er et sikkerhetsnett - du kan bruke den til å gjenopprette tilgangen til dine krypterte meldinger dersom du glemmer gjenopprettingspassfrasen din.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Ha en kopi av den på et trygt sted, f.eks. en passordbehandler eller til og med i en safe.",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Gjenopprettingsnøkkelen din har blitt <b>kopiert til utklippstavlen din</b>, lim den inn i:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Gjenopprettingsnøkkelen din er i <b>Nedlastinger</b>-mappen din.",
     "<b>Print it</b> and store it somewhere safe": "<b>Skriv den ut</b> og lagre den på et sikkert sted",
     "<b>Save it</b> on a USB key or backup drive": "<b>Lagre den</b> på en USB-pinne eller backup-harddisk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopier den</b> til din personlige skylagring",
-    "Make a copy of your recovery key": "Lag en kopi av gjenopprettingsnøkkelen din",
-    "Please enter your recovery passphrase a second time to confirm.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte.",
-    "Repeat your recovery passphrase...": "Gjenta gjenopprettingspassfrasen din …",
     "Other users may not trust it": "Andre brukere kan kanskje mistro den",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(shortName)s</reactedWith>",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikke forhåndsvises. Vil du bli med i den?",
     "Messages in this room are end-to-end encrypted.": "Meldinger i dette rommet er start-til-slutt-kryptert.",
     "Messages in this room are not end-to-end encrypted.": "Meldinger i dette rommet er ikke start-til-slutt-kryptert.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldinger i dette rommet er start-til-slutt-kryptert. Lær mer og verifiser denne brukeren i brukerprofilen deres.",
     "Use a different passphrase?": "Vil du bruke en annen passfrase?",
     "Emoji picker": "Emojivelger",
     "Jump to read receipt": "Hopp til lesekvitteringen",
     "Mention": "Nevn",
     "Community Name": "Samfunnets navn",
     "Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen",
-    "If you cancel now, you won't complete verifying your other session.": "Hvis du avbryter nå, vil du ikke ha fullført verifiseringen av den andre økten din.",
     "Room name or address": "Rommets navn eller adresse",
     "Light": "Lys",
     "Dark": "Mørk",
     "Verify your other session using one of the options below.": "Verifiser den andre økten din med en av metodene nedenfor.",
     "User %(user_id)s does not exist": "Brukeren %(user_id)s eksisterer ikke",
     "Use a few words, avoid common phrases": "Bruk noen få ord, unngå vanlig fraser",
-    "I want to help": "Jeg vil hjelpe til",
     "Ok": "OK",
-    "Set password": "Bestem passord",
     "Encryption upgrade available": "Krypteringsoppdatering tilgjengelig",
-    "Verify the new login accessing your account: %(name)s": "Verifiser den nye påloggingen som vil ha tilgang til kontoen din: %(name)s",
-    "Restart": "Start på nytt",
-    "Font scaling": "Skrifttypeskalering",
     "Font size": "Skriftstørrelse",
     "You've successfully verified this user.": "Du har vellykket verifisert denne brukeren.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Venter på at den andre økten din, %(deviceName)s (%(deviceId)s), skal verifisere …",
@@ -1299,7 +1090,6 @@
     "Santa": "Julenisse",
     "Delete %(count)s sessions|other": "Slett %(count)s økter",
     "Delete %(count)s sessions|one": "Slett %(count)s økt",
-    "Backup version: ": "Sikkerhetskopiversjon: ",
     "wait and try again later": "vent og prøv igjen senere",
     "Size must be a number": "Størrelsen må være et nummer",
     "Customise your appearance": "Tilpass utseendet du bruker",
@@ -1309,18 +1099,14 @@
     "Remove %(phone)s?": "Vil du fjerne %(phone)s?",
     "Online for %(duration)s": "På nett i %(duration)s",
     "Favourites": "Favoritter",
-    "Create room": "Opprett et rom",
     "People": "Folk",
     "Sort by": "Sorter etter",
     "Activity": "Aktivitet",
     "A-Z": "A-Å",
-    "Unread rooms": "Uleste rom",
-    "Always show first": "Alltid vis først",
     "Show": "Vis",
     "Message preview": "Meldingsforhåndsvisning",
     "Leave Room": "Forlat rommet",
     "This room has no local addresses": "Dette rommet har ikke noen lokale adresser",
-    "Waiting for you to accept on your other session…": "Venter på at du aksepterer på den andre økten din …",
     "Remove recent messages by %(user)s": "Fjern nylige meldinger fra %(user)s",
     "Remove %(count)s messages|other": "Slett %(count)s meldinger",
     "Remove %(count)s messages|one": "Slett 1 melding",
@@ -1341,7 +1127,6 @@
     "QR Code": "QR-kode",
     "Room address": "Rommets adresse",
     "This address is available to use": "Denne adressen er allerede i bruk",
-    "ex. @bob:example.com": "f.eks. @bob:example.com",
     "Failed to send logs: ": "Mislyktes i å sende loggbøker: ",
     "Incompatible Database": "Inkompatibel database",
     "Event Content": "Hendelsesinnhold",
@@ -1351,28 +1136,15 @@
     "Confirm to continue": "Bekreft for å fortsette",
     "Clear cache and resync": "Tøm mellomlageret og synkroniser på nytt",
     "Manually export keys": "Eksporter nøkler manuelt",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Bruk denne økten til å verifisere din nye økt, som vil gi den tilgang til krypterte meldinger:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Dersom det ikke var du som logget deg på økten, kan kontoen din ha blitt kompromittert.",
-    "Automatically invite users": "Inviter brukere automatisk",
     "Verification Pending": "Avventer verifisering",
-    "Username invalid: %(errMessage)s": "Brukernavnet er ugyldig: %(errMessage)s",
-    "An error occurred: %(error_string)s": "En feil oppstod: %(error_string)s",
     "Share Room": "Del rommet",
     "Share User": "Del brukeren",
     "Upload %(count)s other files|other": "Last opp %(count)s andre filer",
     "Upload %(count)s other files|one": "Last opp %(count)s annen fil",
     "Appearance": "Utseende",
-    "Verify other session": "Verifiser en annen økt",
     "Keys restored": "Nøklene ble gjenopprettet",
-    "Address (optional)": "Adresse (valgfritt)",
     "Reject invitation": "Avslå invitasjonen",
-    "Resend edit": "Send redigeringen på nytt",
-    "Resend removal": "Send slettingen på nytt",
     "Start authentication": "Begynn autentisering",
-    "The email field must not be blank.": "E-postfeltet kan ikke stå tomt.",
-    "The username field must not be blank.": "Brukernavnfeltet kan ikke stå tomt.",
-    "The phone number field must not be blank.": "Telefonnummerfeltet kan ikke stå tomt.",
-    "The password field must not be blank.": "Passordfeltet kan ikke stå tomt.",
     "Couldn't load page": "Klarte ikke å laste inn siden",
     "Add to summary": "Legg til i oppsummeringen",
     "Unable to accept invite": "Klarte ikke å akseptere invitasjonen",
@@ -1386,7 +1158,6 @@
     "Create a Group Chat": "Opprett en gruppechat",
     "Review terms and conditions": "Gå gjennom betingelser og vilkår",
     "delete the address.": "slette adressen.",
-    "%(count)s of your messages have not been sent.|one": "Meldingen din ble ikke sendt.",
     "Jump to first invite.": "Hopp til den første invitasjonen.",
     "You seem to be uploading files, are you sure you want to quit?": "Du ser til å laste opp filer, er du sikker på at du vil avslutte?",
     "Switch to light mode": "Bytt til lys modus",
@@ -1403,9 +1174,6 @@
     "Toggle Quote": "Veksle siteringsformat",
     "Upload a file": "Last opp en fil",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Bekreft at emotene nedenfor vises på begge økter, i samme rekkefølge:",
-    "Not sure of your password? <a>Set a new one</a>": "Er du usikker på passordet ditt? <a>Velg et nytt et</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Logg inn på Matrix-kontoen din på %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Logg inn på Matrix-kontoen din på <underlinedServerName />",
     "If you've joined lots of rooms, this might take a while": "Hvis du har blitt med i mange rom, kan dette ta en stund",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Den nye økten din er nå verifisert. Den har tilgang til dine krypterte meldinger, og andre brukere vil se at den blir stolt på.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde fremtidig romhistorikk synlig for alle rommedlemmer, fra det tidspunktet de ble/blir invitert.",
@@ -1413,13 +1181,9 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde fremtidig romhistorikk synlig for alle rommedlemmer.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde fremtidig romhistorikk synlig for alle.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde fremtidig romhistorikk synlig for alle rommedlemmer (%(visibility)s).",
-    "To return to your account in future you need to set a password": "For å komme tilbake til kontoen din senere, må du velge et passord",
     "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)": "Vennligst glem alle meldingene jeg har sendt når kontoen min er deaktivert (<b>Advarsel:</b> Dette vil føre til at fremtidige brukere ser en ufullstendig visning av samtaler)",
     "To help us prevent this in future, please <a>send us logs</a>.": "For å hjelpe oss med å forhindre dette i fremtiden, vennligst <a>send oss loggfiler</a>.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ingen identitetstjener er satt opp, så du kan ikke bruke en E-postadresse til å tilbakestille passordet ditt senere.",
-    "Incoming call": "Innkommende samtale",
     "Lock": "Lås",
-    "Compact": "Kompakt",
     "Modern": "Moderne",
     "Server or user ID to ignore": "Tjener- eller bruker-ID-en som skal ignoreres",
     "Show %(count)s more|other": "Vis %(count)s til",
@@ -1439,12 +1203,8 @@
     "Looks good!": "Ser bra ut!",
     "Security & privacy": "Sikkerhet og personvern",
     "User menu": "Brukermeny",
-    "Use Recovery Key": "Bruk gjenopprettingsnøkkel",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Android": "%(brand)s Android",
     "Add image (optional)": "Legg til bilde (valgfritt)",
     "Enter name": "Skriv navn",
-    "Please select the destination room for this message": "Vennligst velg mottagerrom for denne meldingen",
     "Your message was sent": "Meldingen ble sendt",
     "Encrypting your message...": "Krypterer meldingen...",
     "Sending your message...": "Sender meldingen...",
@@ -1490,12 +1250,10 @@
     "Use Single Sign On to continue": "Bruk Single Sign On for å fortsette",
     "Appearance Settings only affect this %(brand)s session.": "Stilendringer gjelder kun i denne %(brand)s sesjonen.",
     "Use Ctrl + Enter to send a message": "Bruk Ctrl + Enter for å sende en melding",
-    "Use Ctrl + F to search": "Bruk Ctrl + F for å søke",
     "%(count)s people|other": "%(count)s personer",
     "%(count)s unread messages including mentions.|other": "%(count)s uleste meldinger inkludert der du nevnes.",
     "Creating...": "Oppretter...",
     "User settings": "Brukerinnstillinger",
-    "Open": "Åpne",
     "Try using one of the following valid address types: %(validTypesList)s.": "Prøv å bruke en av følgende gyldige adresser: %(validTypesList)s.",
     "The user '%(displayName)s' could not be removed from the summary.": "Brukeren '%(displayName)s' kunne ikke fjernes fra oversikten.",
     "Belgium": "Belgia",
@@ -1549,19 +1307,15 @@
     "Unable to access webcam / microphone": "Ingen tilgang til webkamera / mikrofon",
     "The call was answered on another device.": "Samtalen ble besvart på en annen enhet.",
     "The call could not be established": "Samtalen kunne ikke etableres",
-    "The other party declined the call.": "Den andre parten avviste samtalen.",
-    "Call Declined": "Samtale avvist",
     "Click the button below to confirm adding this phone number.": "Klikk knappen nedenfor for å bekrefte dette telefonnummeret.",
     "Single Sign On": "Single Sign On",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bekreft dette telefonnummeret ved å bruke Single Sign On for å bevise din identitet.",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Befrekt denne e-postadressen ved å bruke Single Sign On for å bevise din identitet.",
     "Show stickers button": "Vis klistremerkeknappen",
     "Recently visited rooms": "Nylig besøkte rom",
-    "Windows": "Vinduer",
     "Abort": "Avbryt",
     "You have unverified logins": "Du har uverifiserte pålogginger",
     "Check your devices": "Sjekk enhetene dine",
-    "Record a voice message": "Send en stemmebeskjed",
     "Edit devices": "Rediger enheter",
     "Homeserver": "Hjemmetjener",
     "Edit Values": "Rediger verdier",
@@ -1590,7 +1344,6 @@
     "Accept on your other login…": "Aksepter på din andre pålogging …",
     "Value:": "Verdi:",
     "Leave Space": "Forlat området",
-    "View dev tools": "Vis utviklerverktøy",
     "Saving...": "Lagrer …",
     "Save Changes": "Lagre endringer",
     "Verify other login": "Verifiser en annen pålogging",
@@ -1612,10 +1365,8 @@
     "Leave space": "Forlat området",
     "Warn before quitting": "Advar før avslutning",
     "Quick actions": "Hurtigvalg",
-    "Screens": "Skjermer",
     "%(count)s people you know have already joined|other": "%(count)s personer du kjenner har allerede blitt med",
     "Add existing rooms": "Legg til eksisterende rom",
-    "Don't want to add an existing room?": "Vil du ikke legge til et eksisterende rom?",
     "Create a new room": "Opprett et nytt rom",
     "Adding...": "Legger til …",
     "Settings Explorer": "Innstillingsutforsker",
@@ -1651,7 +1402,6 @@
     "Got an account? <a>Sign in</a>": "Har du en konto? <a>Logg på</a>",
     "You created this room.": "Du opprettet dette rommet.",
     "Security Phrase": "Sikkerhetsfrase",
-    "Start a Conversation": "Start en samtale",
     "Open dial pad": "Åpne nummerpanelet",
     "Message deleted on %(date)s": "Meldingen ble slettet den %(date)s",
     "Approve": "Godkjenn",
@@ -1741,7 +1491,6 @@
     "Upgrade Room Version": "Oppgrader romversjon",
     "You cancelled verification.": "Du avbrøt verifiseringen.",
     "Ask %(displayName)s to scan your code:": "Be %(displayName)s om å skanne koden:",
-    "Role": "Rolle",
     "Failed to deactivate user": "Mislyktes i å deaktivere brukeren",
     "Accept all %(invitedRooms)s invites": "Aksepter alle %(invitedRooms)s-invitasjoner",
     "<not supported>": "<ikke støttet>",
@@ -1782,9 +1531,6 @@
     "Use a longer keyboard pattern with more turns": "Bruke et lengre og mer uventet tastatur mønster",
     "No need for symbols, digits, or uppercase letters": "Ikke nødvendig med symboler, sifre eller bokstaver",
     "See images posted to this room": "Se bilder som er lagt ut i dette rommet",
-    "%(senderName)s declined the call.": "%(senderName)s avslo oppringingen.",
-    "(an error occurred)": "(en feil oppstod)",
-    "(connection failed)": "(tilkobling mislyktes)",
     "Change the topic of this room": "Endre dette rommets tema",
     "Effects": "Effekter",
     "Zimbabwe": "Zimbabwe",
@@ -1981,5 +1727,13 @@
     "Costa Rica": "Costa Rica",
     "Cook Islands": "Cook-øyene",
     "All keys backed up": "Alle nøkler er sikkerhetskopiert",
-    "Secret storage:": "Hemmelig lagring:"
+    "Secret storage:": "Hemmelig lagring:",
+    "Integration manager": "Integreringsbehandler",
+    "Identity server is": "Identitetstjeneren er",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integreringsbehandlere mottar oppsettsdata, og kan endre på moduler, sende rominvitasjoner, og bestemme styrkenivåer på dine vegne.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Bruk en integreringsbehandler til å behandle botter, moduler, og klistremerkepakker.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Bruk en integreringsbehandler <b>(%(serverName)s)</b> til å behandle botter, moduler, og klistremerkepakker.",
+    "Identity server": "Identitetstjener",
+    "Identity server (%(server)s)": "Identitetstjener (%(server)s)",
+    "Could not connect to identity server": "Kunne ikke koble til identitetsserveren"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 16f74e7b2d..8fe877544c 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1,8 +1,5 @@
 {
-    "%(targetName)s accepted an invitation.": "%(targetName)s heeft een uitnodiging aanvaard.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s heeft de uitnodiging voor %(displayName)s aanvaard.",
     "Account": "Account",
-    "Access Token:": "Toegangstoken:",
     "Admin": "Beheerder",
     "Advanced": "Geavanceerd",
     "Always show message timestamps": "Altijd tijdstempels van berichten tonen",
@@ -11,41 +8,26 @@
     "and %(count)s others...|other": "en %(count)s anderen…",
     "and %(count)s others...|one": "en één andere…",
     "A new password must be entered.": "Er moet een nieuw wachtwoord ingevoerd worden.",
-    "%(senderName)s answered the call.": "%(senderName)s heeft de oproep beantwoord.",
     "An error has occurred.": "Er is een fout opgetreden.",
-    "Anyone who knows the room's link, apart from guests": "Iedereen die de koppeling van het gesprek kent, behalve gasten",
-    "Anyone who knows the room's link, including guests": "Iedereen die de koppeling van het gesprek kent, inclusief gasten",
     "Are you sure?": "Weet u het zeker?",
     "Are you sure you want to reject the invitation?": "Weet u zeker dat u de uitnodiging wilt weigeren?",
     "Attachment": "Bijlage",
-    "Autoplay GIFs and videos": "GIF’s en video’s automatisch afspelen",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s heeft %(targetName)s verbannen.",
     "Ban": "Verbannen",
-    "Banned users": "Verbannen gebruikers",
-    "Bans user with given id": "Verbant de gebruiker met de gegeven ID",
-    "Call Timeout": "Oproeptime-out",
+    "Banned users": "Verbannen personen",
+    "Bans user with given id": "Verbant de persoon met de gegeven ID",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan geen verbinding maken met de homeserver via HTTP wanneer er een HTTPS-URL in uw browserbalk staat. Gebruik HTTPS of <a>schakel onveilige scripts in</a>.",
-    "Change Password": "Wachtwoord veranderen",
-    "%(senderName)s changed their profile picture.": "%(senderName)s heeft een nieuwe profielfoto ingesteld.",
+    "Change Password": "Wachtwoord wijzigen",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de gespreksnaam gewijzigd naar %(roomName)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de kamernaam gewijzigd naar %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar ‘%(topic)s’.",
     "Changes your display nickname": "Verandert uw weergavenaam",
-    "Click here to fix": "Klik hier om dit op te lossen",
-    "Click to mute audio": "Klik om het geluid uit te zetten",
-    "Click to mute video": "Klik om het geluid van de video uit te zetten",
-    "click to reveal": "klik om te tonen",
-    "Click to unmute video": "Klik om het geluid van de video weer aan te zetten",
-    "Click to unmute audio": "Klik om het geluid weer aan te zetten",
     "Command error": "Opdrachtfout",
     "Commands": "Opdrachten",
     "Confirm password": "Bevestig wachtwoord",
     "Continue": "Doorgaan",
     "Cancel": "Annuleren",
     "Accept": "Aannemen",
-    "Active call (%(roomName)s)": "Actieve oproep (%(roomName)s)",
     "Add": "Toevoegen",
-    "Add a topic": "Voeg een onderwerp toe",
     "Admin Tools": "Beheerdersgereedschap",
     "No Microphones detected": "Geen microfoons gevonden",
     "No Webcams detected": "Geen webcams gevonden",
@@ -58,7 +40,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Weet u zeker dat u het gesprek ‘%(roomName)s’ wilt verlaten?",
     "Close": "Sluiten",
     "Create new room": "Nieuw gesprek aanmaken",
-    "Custom Server Options": "Aangepaste serverinstellingen",
     "Dismiss": "Sluiten",
     "Error": "Fout",
     "Failed to forget room %(errCode)s": "Vergeten van gesprek is mislukt %(errCode)s",
@@ -68,7 +49,6 @@
     "Operation failed": "Handeling is mislukt",
     "powered by Matrix": "draait op Matrix",
     "Remove": "Verwijderen",
-    "Room directory": "Gesprekscatalogus",
     "Settings": "Instellingen",
     "Start chat": "Gesprek beginnen",
     "unknown error code": "onbekende foutcode",
@@ -78,24 +58,19 @@
     "Moderator": "Moderator",
     "Name": "Naam",
     "not specified": "niet opgegeven",
-    "(not supported by this browser)": "(niet ondersteund door deze browser)",
     "<not supported>": "<niet ondersteund>",
     "No display name": "Geen weergavenaam",
     "No more results": "Geen resultaten meer",
     "No results": "Geen resultaten",
-    "No users have specific privileges in this room": "Geen enkele gebruiker heeft specifieke bevoegdheden in dit gesprek",
-    "olm version:": "olm-versie:",
+    "No users have specific privileges in this room": "Geen enkele persoon heeft specifieke bevoegdheden in deze kamer",
     "Password": "Wachtwoord",
     "Passwords can't be empty": "Wachtwoorden kunnen niet leeg zijn",
     "Permissions": "Rechten",
     "Phone": "Telefoonnummer",
-    "Private Chat": "Privégesprek",
-    "Privileged Users": "Bevoegde gebruikers",
+    "Privileged Users": "Bevoegde personen",
     "Profile": "Profiel",
-    "Public Chat": "Openbaar gesprek",
     "Reason": "Reden",
     "Register": "Registreren",
-    "%(targetName)s rejected the invitation.": "%(targetName)s heeft de uitnodiging geweigerd.",
     "Reject invitation": "Uitnodiging weigeren",
     "Start authentication": "Authenticatie starten",
     "Submit": "Bevestigen",
@@ -122,42 +97,32 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s, %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s, %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s, %(time)s",
-    "Set a display name:": "Stel een weergavenaam in:",
-    "Upload an avatar:": "Upload een avatar:",
     "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.": "Geen verbinding met de homeserver - controleer uw verbinding, zorg ervoor dat het <a>SSL-certificaat van de homeserver</a> vertrouwd is en dat er geen browserextensies verzoeken blokkeren.",
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de gespreksnaam verwijderd.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de kamernaam verwijderd.",
     "Create Room": "Gesprek aanmaken",
-    "/ddg is not a command": "/ddg is geen opdracht",
     "Deactivate Account": "Account Sluiten",
     "Decline": "Weigeren",
     "Decrypt %(text)s": "%(text)s ontsleutelen",
     "Disinvite": "Uitnodiging intrekken",
     "Download %(text)s": "%(text)s downloaden",
-    "Drop File Here": "Versleep het bestand naar hier",
     "Email": "E-mailadres",
     "Email address": "E-mailadres",
-    "Custom": "Aangepast",
     "Custom level": "Aangepast niveau",
-    "Deops user with given id": "Ontmachtigt gebruiker met de gegeven ID",
+    "Deops user with given id": "Ontmachtigt persoon met de gegeven ID",
     "Default": "Standaard",
     "Displays action": "Toont actie",
     "Emoji": "Emoji",
-    "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
     "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",
     "Export": "Wegschrijven",
     "Export E2E room keys": "E2E-gesprekssleutels exporteren",
-    "Failed to ban user": "Verbannen van gebruiker is mislukt",
+    "Failed to ban user": "Verbannen van persoon is mislukt",
     "Failed to change power level": "Wijzigen van machtsniveau is mislukt",
-    "Failed to fetch avatar URL": "Ophalen van avatar-URL is mislukt",
     "Failed to join room": "Toetreden tot gesprek is mislukt",
-    "Failed to leave room": "Verlaten van gesprek is mislukt",
     "Failed to load timeline position": "Laden van tijdslijnpositie is mislukt",
-    "Failed to mute user": "Dempen van gebruiker is mislukt",
+    "Failed to mute user": "Dempen van persoon is mislukt",
     "Failed to reject invite": "Weigeren van uitnodiging is mislukt",
     "Failed to reject invitation": "Weigeren van uitnodiging is mislukt",
     "Failed to send email": "Versturen van e-mail is mislukt",
@@ -166,50 +131,39 @@
     "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 je de koppeling in de e-mail hebt aangeklikt",
-    "Failure to create room": "Aanmaken van gesprek is mislukt",
+    "Failure to create room": "Aanmaken van kamer is mislukt",
     "Favourites": "Favorieten",
-    "Fill screen": "Scherm vullen",
     "Filter room members": "Gespreksleden filteren",
     "Forget room": "Gesprek vergeten",
-    "For security, this session has been signed out. Please sign in again.": "Wegens veiligheidsredenen is deze sessie uitgelogd. Gelieve opnieuw inloggen.",
+    "For security, this session has been signed out. Please sign in again.": "Wegens veiligheidsredenen is deze sessie uitgelogd. Log opnieuw in.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s van %(fromPowerLevel)s naar %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Gasten - zelfs speficiek uitgenodigde - kunnen niet aan dit gesprek deelnemen.",
     "Hangup": "Ophangen",
     "Historical": "Historisch",
     "Home": "Thuis",
     "Homeserver is": "Homeserver is",
-    "Identity Server is": "Identiteitsserver is",
     "I have verified my email address": "Ik heb mijn e-mailadres geverifieerd",
     "Import": "Inlezen",
     "Import E2E room keys": "E2E-gesprekssleutels importeren",
-    "Incoming call from %(name)s": "Inkomende oproep van %(name)s",
-    "Incoming video call from %(name)s": "Inkomende video-oproep van %(name)s",
-    "Incoming voice call from %(name)s": "Inkomende spraakoproep van %(name)s",
-    "Incorrect username and/or password.": "Onjuiste gebruikersnaam en/of wachtwoord.",
+    "Incorrect username and/or password.": "Onjuiste inlognaam en/of wachtwoord.",
     "Incorrect verification code": "Onjuiste verificatiecode",
     "Invalid Email Address": "Ongeldig e-mailadres",
     "Invalid file%(extra)s": "Ongeldig bestand %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s heeft %(targetName)s uitgenodigd.",
     "Invited": "Uitgenodigd",
     "Invites": "Uitnodigingen",
-    "Invites user with given id to current room": "Nodigt de gebruiker met de gegeven ID uit in het huidige gesprek",
+    "Invites user with given id to current room": "Nodigt een persoon met de gegeven ID uit in de huidige kamer",
     "Sign in with": "Inloggen met",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Deelnemen met <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Gesprek toetreden",
-    "%(targetName)s joined the room.": "%(targetName)s is tot het gesprek toegetreden.",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
     "Labs": "Labs",
     "Last seen": "Laatst gezien",
-    "Leave room": "Gesprek verlaten",
-    "%(targetName)s left the room.": "%(targetName)s heeft het gesprek verlaten.",
+    "Leave room": "Kamer verlaten",
     "Logout": "Uitloggen",
     "Low priority": "Lage prioriteit",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze uitgenodigd zijn.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze toegetreden zijn.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor iedereen.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
-    "Manage Integrations": "Integraties beheren",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige kamergeschiedenis zichtbaar gemaakt voor alle leden, vanaf het moment dat ze uitgenodigd zijn.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige kamergeschiedenis zichtbaar gemaakt voor alle leden, vanaf het moment dat ze toegetreden zijn.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige kamergeschiedenis zichtbaar gemaakt voor alle leden.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige kamergeschiedenis zichtbaar gemaakt voor iedereen.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige kamergeschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
     "Missing room_id in request": "room_id ontbreekt in verzoek",
     "Missing user_id in request": "user_id ontbreekt in verzoek",
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
@@ -217,116 +171,86 @@
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekijk uw e-mail en klik op de koppeling daarin. Klik vervolgens op ‘Verder gaan’.",
     "Power level must be positive integer.": "Machtsniveau moet een positief geheel getal zijn.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s heeft de weergavenaam (%(oldDisplayName)s) afgelegd.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s heeft zijn/haar profielfoto verwijderd.",
     "Failed to kick": "Uit het gesprek zetten is mislukt",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s heeft een VoIP-vergadering aangevraagd.",
-    "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
     "Return to login screen": "Terug naar het loginscherm",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s heeft geen toestemming u meldingen te sturen - controleer uw browserinstellingen",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s kreeg geen toestemming u meldingen te sturen - probeer het opnieuw",
     "%(brand)s version:": "%(brand)s-versie:",
-    "Room %(roomId)s not visible": "Gesprek %(roomId)s is niet zichtbaar",
-    "Room Colour": "Gesprekskleur",
+    "Room %(roomId)s not visible": "Kamer %(roomId)s is niet zichtbaar",
     "%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is op dit moment niet toegankelijk.",
-    "Rooms": "Gesprekken",
+    "Rooms": "Kamers",
     "Save": "Opslaan",
     "Search failed": "Zoeken mislukt",
-    "Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
     "Seen by %(userName)s at %(dateTime)s": "Gezien door %(userName)s om %(dateTime)s",
     "Send Reset Email": "E-mail voor opnieuw instellen versturen",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s heeft een afbeelding gestuurd.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s heeft %(targetDisplayName)s in het gesprek uitgenodigd.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s heeft %(targetDisplayName)s in deze kamer 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 je bent een bug 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.",
     "Kick": "Uit het gesprek sturen",
-    "Kicks user with given id": "Stuurt de gebruiker met de gegeven ID uit het gesprek",
-    "%(senderName)s set a profile picture.": "%(senderName)s heeft een profielfoto ingesteld.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s heeft %(displayName)s als weergavenaam aangenomen.",
+    "Kicks user with given id": "Stuurt de persoon met de gegeven ID uit de kamer",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Tijd in 12-uursformaat tonen (bv. 2:30pm)",
     "Signed Out": "Uitgelogd",
     "Sign in": "Inloggen",
     "Sign out": "Uitloggen",
-    "%(count)s of your messages have not been sent.|other": "Enkele van uw berichten zijn niet verstuurd.",
     "Someone": "Iemand",
-    "The phone number entered looks invalid": "Het ingevoerde telefoonnummer ziet er ongeldig uit",
     "This email address is already in use": "Dit e-mailadres is al in gebruik",
     "This email address was not found": "Dit e-mailadres is niet gevonden",
     "The email address linked to your account must be entered.": "Het aan uw account gekoppelde e-mailadres dient ingevoerd worden.",
-    "The remote side failed to pick up": "De andere kant heeft niet opgenomen",
     "This room has no local addresses": "Dit gesprek heeft geen lokale adressen",
-    "This room is not recognised.": "Dit gesprek wordt niet herkend.",
+    "This room is not recognised.": "Deze kamer wordt niet herkend.",
     "This doesn't appear to be a valid email address": "Het ziet er niet naar uit dat dit een geldig e-mailadres is",
     "This phone number is already in use": "Dit telefoonnummer is al in gebruik",
     "This room": "Dit gesprek",
     "This room is not accessible by remote Matrix servers": "Dit gesprek is niet toegankelijk vanaf externe Matrix-servers",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht u tot de autoaanvullen resultaten geladen zijn en tabt u erdoorheen.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U probeert een punt in de tijdlijn van dit gesprek te laden, maar u heeft niet voldoende rechten om het bericht te lezen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar kon dit niet vinden.",
     "Unable to add email address": "Kan e-mailadres niet toevoegen",
     "Unable to remove contact information": "Kan contactinformatie niet verwijderen",
     "Unable to verify email address.": "Kan e-mailadres niet verifiëren.",
     "Unban": "Ontbannen",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s heeft %(targetName)s ontbannen.",
-    "Unable to capture screen": "Kan geen schermafdruk maken",
     "Unable to enable Notifications": "Kan meldingen niet inschakelen",
-    "unknown caller": "onbekende beller",
     "Unmute": "Niet dempen",
-    "Unnamed Room": "Naamloos gesprek",
+    "Unnamed Room": "Naamloze Kamer",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt geüpload",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander worden geüpload",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere worden geüpload",
-    "Upload avatar": "Avatar uploaden",
+    "Upload avatar": "Afbeelding uploaden",
     "Upload Failed": "Uploaden mislukt",
     "Upload file": "Bestand uploaden",
     "Upload new:": "Upload er een nieuwe:",
     "Usage": "Gebruik",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Ongeldige gebruikersnaam: %(errMessage)s",
-    "Users": "Gebruikers",
+    "Users": "Personen",
     "Verification Pending": "Verificatie in afwachting",
     "Verified key": "Geverifieerde sleutel",
     "Video call": "Video-oproep",
     "Voice call": "Spraakoproep",
-    "VoIP conference finished.": "VoIP-vergadering beëindigd.",
-    "VoIP conference started.": "VoIP-vergadering gestart.",
     "VoIP is unsupported": "VoIP wordt niet ondersteund",
-    "(could not connect media)": "(mediaverbinding mislukt)",
-    "(no answer)": "(geen antwoord)",
-    "(unknown failure: %(reason)s)": "(onbekende fout: %(reason)s)",
     "Warning!": "Let op!",
-    "Who can access this room?": "Wie mag er deelnemen aan dit gesprek?",
     "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.": "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>.",
-    "You have no visible notifications": "U heeft geen zichtbare meldingen",
     "You must <a>register</a> to use this functionality": "U dient u te <a>registreren</a> om deze functie te gebruiken",
-    "You need to be able to invite users to do that.": "Dit vereist de bevoegdheid gebruikers uit te nodigen.",
+    "You need to be able to invite users to do that.": "Dit vereist de bevoegdheid om personen uit te nodigen.",
     "You need to be logged in.": "Hiervoor dient u ingelogd te zijn.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zo te zien is uw e-mailadres op deze homeserver niet aan een Matrix-ID gekoppeld.",
     "You seem to be in a call, are you sure you want to quit?": "Het ziet er naar uit dat u in gesprek bent, weet u zeker dat u wilt afsluiten?",
     "You seem to be uploading files, are you sure you want to quit?": "Het ziet er naar uit dat u bestanden aan het uploaden bent, weet u zeker dat u wilt afsluiten?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U zult deze veranderingen niet terug kunnen draaien, daar u de gebruiker tot uw eigen niveau promoveert.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U zult deze veranderingen niet terug kunnen draaien, omdat u de persoon tot uw eigen machtsniveau promoveert.",
     "This server does not support authentication with a phone number.": "Deze server biedt geen ondersteuning voor authenticatie met een telefoonnummer.",
-    "An error occurred: %(error_string)s": "Er is een fout opgetreden: %(error_string)s",
-    "There are no visible files in this room": "Er zijn geen zichtbare bestanden in dit gesprek",
     "Room": "Gesprek",
     "Connectivity to the server has been lost.": "De verbinding met de server is verbroken.",
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichten zullen opgeslagen worden totdat uw verbinding hersteld is.",
     "(~%(count)s results)|one": "(~%(count)s resultaat)",
     "(~%(count)s results)|other": "(~%(count)s resultaten)",
-    "Active call": "Actieve oproep",
-    "Please select the destination room for this message": "Selecteer het bestemmingsgesprek voor dit bericht",
     "New Password": "Nieuw wachtwoord",
     "Start automatically after system login": "Automatisch starten na systeemlogin",
     "Analytics": "Gebruiksgegevens",
@@ -338,14 +262,13 @@
     "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.",
+    "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 kamers naar een lokaal bestand wegschrijven. Als u dat bestand dan in een andere Matrix-cliënt inleest kan het 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.": "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",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen weigeren",
     "Failed to invite": "Uitnodigen is mislukt",
-    "Failed to invite the following users to the %(roomName)s room:": "Kon de volgende gebruikers niet uitnodigen voor gesprek %(roomName)s:",
     "Confirm Removal": "Verwijdering bevestigen",
     "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.": "Weet u zeker dat u deze gebeurtenis wilt verwijderen? Besef wel dat het verwijderen van een van een gespreksnaams- of onderwerpswijziging die wijziging mogelijk teniet doet.",
     "Unknown error": "Onbekende fout",
@@ -353,58 +276,42 @@
     "Unable to restore session": "Herstellen van sessie mislukt",
     "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.": "Als u een recentere versie van %(brand)s heeft gebruikt is uw sessie mogelijk niet geschikt voor deze versie. Sluit dit venster en ga terug naar die recentere versie.",
     "Unknown Address": "Onbekend adres",
-    "ex. @bob:example.com": "bv. @jan:voorbeeld.com",
-    "Add User": "Gebruiker toevoegen",
-    "Please check your email to continue registration.": "Bekijk uw e-mail om verder te gaan met de registratie.",
     "Token incorrect": "Bewijs onjuist",
     "Please enter the code it contains:": "Voer de code in die het bevat:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Als u geen e-mailadres opgeeft, zult u uw wachtwoord niet opnieuw kunnen instellen. Weet u het zeker?",
-    "Error decrypting audio": "Fout bij het ontsleutelen van de audio",
     "Error decrypting image": "Fout bij het ontsleutelen van de afbeelding",
     "Error decrypting video": "Fout bij het ontsleutelen van de video",
     "Add an Integration": "Voeg een integratie toe",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "U wordt zo dadelijk naar een derdepartijwebsite gebracht zodat u de account kunt legitimeren voor gebruik met %(integrationsUrl)s. Wilt u doorgaan?",
     "URL Previews": "URL-voorvertoningen",
     "Drop file here to upload": "Versleep het bestand naar hier om het te uploaden",
-    " (unsupported)": " (niet ondersteund)",
-    "Ongoing conference call%(supportedText)s.": "Lopend vergadergesprek %(supportedText)s.",
     "Online": "Online",
     "Idle": "Afwezig",
     "Offline": "Offline",
     "Check for update": "Controleren op updates",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s heeft de gespreksavatar aangepast naar <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s heeft de gespreksavatar verwijderd.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s heeft de avatar van %(roomName)s veranderd",
-    "Username available": "Gebruikersnaam beschikbaar",
-    "Username not available": "Gebruikersnaam niet beschikbaar",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s heeft de kamerafbeelding aangepast naar <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s heeft de kamerafbeelding verwijderd.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s heeft de afbeelding van %(roomName)s veranderd",
     "Something went wrong!": "Er is iets misgegaan!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dit zal uw accountnaam worden op de <span></span>-thuisserver, of u kunt een <a>andere server</a> kiezen.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Als u al een Matrix-account heeft, kunt u zich meteen <a>aanmelden</a>.",
     "Your browser does not support the required cryptography extensions": "Uw browser ondersteunt de benodigde cryptografie-extensies niet",
     "Not a valid %(brand)s keyfile": "Geen geldig %(brand)s-sleutelbestand",
     "Authentication check failed: incorrect password?": "Aanmeldingscontrole mislukt: onjuist wachtwoord?",
     "Do you want to set an email address?": "Wilt u een e-mailadres instellen?",
     "This will allow you to reset your password and receive notifications.": "Zo kunt u een nieuw wachtwoord instellen en meldingen ontvangen.",
     "Skip": "Overslaan",
-    "Define the power level of a user": "Bepaal het machtsniveau van een gebruiker",
-    "Add a widget": "Widget toevoegen",
-    "Allow": "Toestaan",
-    "Cannot add any more widgets": "Er kunnen niet nog meer widgets toegevoegd worden",
+    "Define the power level of a user": "Bepaal het machtsniveau van een persoon",
     "Delete widget": "Widget verwijderen",
     "Edit": "Bewerken",
     "Enable automatic language detection for syntax highlighting": "Automatische taaldetectie voor zinsbouwmarkeringen inschakelen",
-    "Publish this room to the public in %(domain)s's room directory?": "Dit gesprek vermelden in de openbare gesprekkencatalogus van %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Deze kamer vermelden in de publieke kamersgids van %(domain)s?",
     "AM": "AM",
     "PM": "PM",
-    "The maximum permitted number of widgets have already been added to this room.": "Het maximum aan toegestane widgets voor dit gesprek is al bereikt.",
-    "To get started, please pick a username!": "Kies eerst een gebruikersnaam!",
     "Unable to create widget.": "Kan widget niet aanmaken.",
-    "You are not in this room.": "U maakt geen deel uit van dit gesprek.",
-    "You do not have permission to do that in this room.": "U bent niet bevoegd dat in dit gesprek te doen.",
+    "You are not in this room.": "U maakt geen deel uit van deze kamer.",
+    "You do not have permission to do that in this room.": "U heeft geen rechten om dat in deze kamer te doen.",
     "Example": "Voorbeeld",
     "Create": "Aanmaken",
-    "Featured Rooms:": "Prominente gesprekken:",
-    "Featured Users:": "Prominente gebruikers:",
+    "Featured Rooms:": "Uitgelichte kamers:",
+    "Featured Users:": "Uitgelichte personen:",
     "Automatically replace plain text Emoji": "Tekst automatisch vervangen door emoji",
     "Failed to upload image": "Uploaden van afbeelding is mislukt",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd door %(senderName)s",
@@ -412,44 +319,40 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast door %(senderName)s",
     "Copied!": "Gekopieerd!",
     "Failed to copy": "Kopiëren mislukt",
-    "Unpin Message": "Bericht losmaken",
-    "Add rooms to this community": "Voeg gesprekken toe aan deze gemeenschap",
+    "Add rooms to this community": "Voeg kamers toe aan deze gemeenschap",
     "Call Failed": "Oproep mislukt",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Let op: elke persoon die u toevoegt aan een gemeenschap zal publiek zichtbaar zijn voor iedereen die de gemeenschaps-ID kent",
     "Invite new community members": "Nodig nieuwe gemeenschapsleden uit",
-    "Which rooms would you like to add to this community?": "Welke gesprekken wilt u toevoegen aan deze gemeenschap?",
+    "Which rooms would you like to add to this community?": "Welke kamers 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 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 openbare gesprekkenlijst?",
-    "Add rooms to the community": "Voeg gesprekken toe aan de gemeenschap",
+    "Show these rooms to non-members on the community page and room list?": "Deze kamers tonen aan niet-leden op de gemeenschapspagina en publieke kamersgids?",
+    "Add rooms to the community": "Voeg kamers 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:",
-    "Failed to invite users to community": "Uitnodigen van gebruikers tot de gemeenschap is mislukt",
-    "Failed to invite users to %(groupId)s": "Uitnodigen van gebruikers tot %(groupId)s is mislukt",
-    "Failed to add the following rooms to %(groupId)s:": "Toevoegen van volgende gesprekken aan %(groupId)s is mislukt:",
+    "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende personen tot %(groupId)s is mislukt:",
+    "Failed to invite users to community": "Uitnodigen van personen tot de gemeenschap is mislukt",
+    "Failed to invite users to %(groupId)s": "Uitnodigen van personen tot %(groupId)s is mislukt",
+    "Failed to add the following rooms to %(groupId)s:": "Toevoegen van de volgende kamers aan %(groupId)s is mislukt:",
     "Restricted": "Beperkte toegang",
-    "Ignored user": "Genegeerde gebruiker",
+    "Ignored user": "Genegeerde persoon",
     "You are now ignoring %(userId)s": "U negeert nu %(userId)s",
-    "Unignored user": "Niet-genegeerde gebruiker",
+    "Unignored user": "Niet-genegeerde persoon",
     "You are no longer ignoring %(userId)s": "U negeert %(userId)s niet meer",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s heeft de vastgeprikte boodschappen voor het gesprek gewijzigd.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s heeft de vastgeprikte boodschappen voor de kamer gewijzigd.",
     "Send": "Versturen",
     "Message Pinning": "Bericht vastprikken",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "Enable inline URL previews by default": "Inline URL-voorvertoning standaard inschakelen",
     "Enable URL previews for this room (only affects you)": "URL-voorvertoning in dit gesprek inschakelen (geldt alleen voor u)",
     "Enable URL previews by default for participants in this room": "URL-voorvertoning voor alle deelnemers aan dit gesprek standaard inschakelen",
-    "%(senderName)s sent an image": "%(senderName)s heeft een afbeelding gestuurd",
-    "%(senderName)s sent a video": "%(senderName)s heeft een video gestuurd",
-    "%(senderName)s uploaded a file": "%(senderName)s heeft een bestand geüpload",
-    "Disinvite this user?": "Uitnodiging van deze gebruiker intrekken?",
-    "Kick this user?": "Deze gebruiker uit het gesprek zetten?",
-    "Unban this user?": "Deze gebruiker ontbannen?",
-    "Ban this user?": "Deze gebruiker verbannen?",
+    "Disinvite this user?": "Uitnodiging van deze persoon intrekken?",
+    "Kick this user?": "Deze persoon verwijderen?",
+    "Unban this user?": "Deze persoon ontbannen?",
+    "Ban this user?": "Deze persoon verbannen?",
     "Mirror local video feed": "Lokale videoaanvoer ook elders opslaan (spiegelen)",
-    "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.": "Zelfdegradatie is onomkeerbaar. Als u de laatste bevoorrechte gebruiker in het gesprek bent zullen deze rechten voorgoed verloren gaan.",
+    "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.": "Zelfdegradatie is onomkeerbaar. Als u de laatste gemachtigde persoon in de kamer bent zullen deze rechten voorgoed verloren gaan.",
     "Unignore": "Niet meer negeren",
     "Ignore": "Negeren",
     "Jump to read receipt": "Naar het laatst gelezen bericht gaan",
@@ -457,10 +360,7 @@
     "Invite": "Uitnodigen",
     "Send an encrypted reply…": "Verstuur een versleuteld antwoord…",
     "Send an encrypted message…": "Verstuur een versleuteld bericht…",
-    "Jump to message": "Naar bericht springen",
-    "No pinned messages.": "Geen vastgeprikte berichten.",
     "Loading...": "Bezig met laden…",
-    "Pinned Messages": "Vastgeprikte berichten",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)su",
@@ -471,11 +371,10 @@
     "Unknown for %(duration)s": "Onbekend voor %(duration)s",
     "Unknown": "Onbekend",
     "Replying": "Aan het beantwoorden",
-    "No rooms to show": "Geen weer te geven gesprekken",
+    "No rooms to show": "Geen kamers om weer te geven",
     "Unnamed room": "Naamloos gesprek",
     "World readable": "Leesbaar voor iedereen",
     "Guests can join": "Gasten kunnen toetreden",
-    "Community Invites": "Gemeenschapsuitnodigingen",
     "Banned by %(displayName)s": "Verbannen door %(displayName)s",
     "Members only (since the point in time of selecting this option)": "Alleen deelnemers (vanaf het moment dat deze optie wordt geselecteerd)",
     "Members only (since they were invited)": "Alleen deelnemers (vanaf het moment dat ze uitgenodigd zijn)",
@@ -488,13 +387,12 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "Nieuwe gemeenschaps-ID (bv. +foo:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "URL-voorvertoningen zijn voor deelnemers van dit gesprek standaard ingeschakeld.",
     "URL previews are disabled by default for participants in this room.": "URL-voorvertoningen zijn voor deelnemers van dit gesprek standaard uitgeschakeld.",
-    "An email has been sent to %(emailAddress)s": "Er is een e-mail naar %(emailAddress)s verstuurd",
     "A text message has been sent to %(msisdn)s": "Er is een sms naar %(msisdn)s verstuurd",
     "Remove from community": "Verwijderen uit gemeenschap",
-    "Disinvite this user from community?": "Uitnodiging voor deze gebruiker tot de gemeenschap intrekken?",
-    "Remove this user from community?": "Deze gebruiker uit de gemeenschap verwijderen?",
+    "Disinvite this user from community?": "Uitnodiging voor deze persoon tot de gemeenschap intrekken?",
+    "Remove this user from community?": "Deze persoon uit de gemeenschap verwijderen?",
     "Failed to withdraw invitation": "Intrekken van uitnodiging is mislukt",
-    "Failed to remove user from community": "Verwijderen van gebruiker uit gemeenschap is mislukt",
+    "Failed to remove user from community": "Verwijderen van persoon uit gemeenschap is mislukt",
     "Filter community members": "Gemeenschapsleden filteren",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Weet u zeker dat u ‘%(roomName)s’ uit %(groupId)s wilt verwijderen?",
     "Removing a room from the community will also remove it from the community page.": "Het gesprek uit de gemeenschap verwijderen zal dit ook van de gemeenschapspagina verwijderen.",
@@ -504,29 +402,28 @@
     "Visibility in Room List": "Zichtbaarheid in gesprekslijst",
     "Visible to everyone": "Zichtbaar voor iedereen",
     "Only visible to community members": "Alleen zichtbaar voor gemeenschapsleden",
-    "Filter community rooms": "Gemeenschapsgesprekken filteren",
+    "Filter community rooms": "Gemeenschapskamers filteren",
     "Something went wrong when trying to get your communities.": "Er ging iets mis bij het ophalen van uw gemeenschappen.",
-    "Display your community flair in rooms configured to show it.": "Toon uw gemeenschapsbadge in gesprekken die daarvoor ingesteld zijn.",
+    "Display your community flair in rooms configured to show it.": "Toon uw gemeenschapsbadge in kamers die daarvoor ingesteld zijn.",
     "You're not currently a member of any communities.": "U bent momenteel geen lid van een gemeenschap.",
-    "Minimize apps": "Apps minimaliseren",
     "Communities": "Gemeenschappen",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s zijn %(count)s keer toegetreden",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s zijn toegetreden",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s is %(count)s keer toegetreden",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s is toegetreden",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s is %(count)s keer weggegaan",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s zijn weggegaan",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s is %(count)s keer weggegaan",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s is weggegaan",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s zijn %(count)s keer toegetreden en weggegaan",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s zijn toegetreden en weggegaan",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s is %(count)s keer toegetreden en weggegaan",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s is toegetreden en weggegaan",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s zijn %(count)s keer weggegaan en weer toegetreden",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s zijn weggegaan en weer toegetreden",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s is %(count)s keer weggegaan en weer toegetreden",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is weggegaan en weer toegetreden",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s is %(count)s keer vertrokken",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s zijn vertrokken",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s is %(count)s keer vertrokken",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s is vertrokken",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s zijn %(count)s keer toegetreden en vertrokken",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s zijn toegetreden en vertrokken",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s is toegetreden en %(count)s zijn er vertrokken",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s is toegetreden en vertrokken",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s zijn vertrokken en %(count)s keer weer toegetreden",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s zijn vertrokken en weer toegetreden",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s is %(count)s keer vertrokken en weer toegetreden",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is vertrokken en weer toegetreden",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s maal afgeslagen",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgeslagen",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s maal geweigerd",
@@ -552,12 +449,12 @@
     "was kicked %(count)s times|one": "is uit het gesprek gezet",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s hebben hun naam %(count)s keer gewijzigd",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s hebben hun naam gewijzigd",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)s maal van naam veranderd",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)s keer van naam veranderd",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s is van naam veranderd",
-    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s hebben hun avatar %(count)s keer gewijzigd",
-    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s hebben hun avatar gewijzigd",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s is %(count)s maal van profielfoto veranderd",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s is van profielfoto veranderd",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s hebben hun afbeelding %(count)s keer gewijzigd",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s hebben hun afbeelding gewijzigd",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s is %(count)s maal van afbeelding veranderd",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s is van afbeelding veranderd",
     "%(items)s and %(count)s others|other": "%(items)s en %(count)s andere",
     "%(items)s and %(count)s others|one": "%(items)s en één ander",
     "collapse": "dichtvouwen",
@@ -576,20 +473,19 @@
     "Community Name": "Gemeenschapsnaam",
     "Community ID": "Gemeenschaps-ID",
     "example": "voorbeeld",
-    "<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 voor uw gemeenschapspagina</h1>\n<p>\n    Gebruik de lange beschrijving om nieuwe leden in de gemeenschap te introduceren of om belangrijke <a href=\"foo\">koppelingen</a> aan te bieden.\n</p>\n<p>\n    U kunt zelfs ‘img’-tags gebruiken.\n</p>\n",
-    "Add rooms to the community summary": "Voeg gesprekken aan het gemeenschapsoverzicht toe",
-    "Which rooms would you like to add to this summary?": "Welke gesprekken zou u aan dit overzicht willen toevoegen?",
+    "Add rooms to the community summary": "Voeg kamers aan het gemeenschapsoverzicht toe",
+    "Which rooms would you like to add to this summary?": "Welke kamers zou u aan dit overzicht willen toevoegen?",
     "Add to summary": "Toevoegen aan overzicht",
-    "Failed to add the following rooms to the summary of %(groupId)s:": "Kon de volgende gesprekken niet aan het overzicht van %(groupId)s toevoegen:",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Kon de volgende kamers niet aan het overzicht van %(groupId)s toevoegen:",
     "Add a Room": "Voeg een gesprek toe",
     "Failed to remove the room from the summary of %(groupId)s": "Kon het gesprek niet uit het overzicht van %(groupId)s verwijderen",
     "The room '%(roomName)s' could not be removed from the summary.": "Het gesprek ‘%(roomName)s’ kan niet uit het overzicht verwijderd worden.",
-    "Add users to the community summary": "Voeg gebruikers aan het gemeenschapsoverzicht toe",
+    "Add users to the community summary": "Voeg personen aan het gemeenschapsoverzicht toe",
     "Who would you like to add to this summary?": "Wie zou u aan het overzicht willen toevoegen?",
-    "Failed to add the following users to the summary of %(groupId)s:": "Kon de volgende gebruikers niet aan het overzicht van %(groupId)s toevoegen:",
-    "Add a User": "Voeg een gebruiker toe",
-    "Failed to remove a user from the summary of %(groupId)s": "Verwijderen van gebruiker uit het overzicht van %(groupId)s is mislukt",
-    "The user '%(displayName)s' could not be removed from the summary.": "De gebruiker ‘%(displayName)s’ kon niet uit het overzicht verwijderd worden.",
+    "Failed to add the following users to the summary of %(groupId)s:": "Kon de volgende personen niet aan het overzicht van %(groupId)s toevoegen:",
+    "Add a User": "Voeg een persoon toe",
+    "Failed to remove a user from the summary of %(groupId)s": "Verwijderen van persoon uit het overzicht van %(groupId)s is mislukt",
+    "The user '%(displayName)s' could not be removed from the summary.": "De persoon ‘%(displayName)s’ kon niet uit het overzicht verwijderd worden.",
     "Failed to update community": "Bijwerken van gemeenschap is mislukt",
     "Unable to accept invite": "Kan de uitnodiging niet aannemen",
     "Unable to reject invite": "Kan de uitnodiging niet weigeren",
@@ -597,7 +493,7 @@
     "Leave %(groupName)s?": "%(groupName)s verlaten?",
     "Leave": "Verlaten",
     "Community Settings": "Gemeenschapsinstellingen",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Op de gemeenschapspagina worden deze gesprekken getoond aan gemeenschapsleden, die er dan aan kunnen deelnemen door erop te klikken.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Op de gemeenschapspagina worden deze kamers getoond aan gemeenschapsleden, die er dan aan kunnen deelnemen door erop te klikken.",
     "%(inviter)s has invited you to join this community": "%(inviter)s heeft u uitgenodigd in deze gemeenschap",
     "You are an administrator of this community": "U bent een beheerder van deze gemeenschap",
     "You are a member of this community": "U bent lid van deze gemeenschap",
@@ -611,23 +507,19 @@
     "Your Communities": "Uw gemeenschappen",
     "Error whilst fetching joined communities": "Er is een fout opgetreden bij het ophalen van de gemeenschappen waarvan u lid bent",
     "Create a new community": "Maak een nieuwe gemeenschap aan",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om gebruikers en gesprekken bijeen te brengen! Schep met een startpagina op maat uw eigen plaats in het Matrix-universum.",
-    "%(count)s of your messages have not been sent.|one": "Uw bericht is niet verstuurd.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alles nu opnieuw versturen</resendText> of <cancelText>annuleren</cancelText>. U kunt ook individuele berichten selecteren om opnieuw te versturen of te annuleren.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Bericht opnieuw versturen</resendText> of <cancelText>bericht annuleren</cancelText>.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om personen en kamers bijeen te brengen! Schep met een startpagina op maat uw eigen plaats in het Matrix-universum.",
     "Warning": "Let op",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Er is niemand anders hier! Wilt u <inviteText>anderen uitnodigen</inviteText> of <nowarnText>de waarschuwing over het lege gesprek stoppen</nowarnText>?",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is belangrijk voor ons, dus we verzamelen geen persoonlijke of identificeerbare gegevens voor onze gegevensanalyse.",
     "Learn more about how we use analytics.": "Lees meer over hoe we uw gegevens gebruiken.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Er is een e-mail naar %(emailAddress)s verstuurd. Klik hieronder van zodra u de koppeling erin hebt gevolgd.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Let op dat u inlogt bij de %(hs)s-server, niet matrix.org.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Deze homeserver heeft geen loginmethodes die door deze cliënt worden ondersteund.",
-    "Ignores a user, hiding their messages from you": "Negeert een gebruiker, waardoor de berichten ervan onzichtbaar voor u worden",
-    "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een gebruiker, hierdoor worden de berichten van de gebruiker weer zichtbaar",
+    "Ignores a user, hiding their messages from you": "Negeert een persoon, waardoor de berichten ervan onzichtbaar voor u worden",
+    "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een persoon, hierdoor worden de berichten van de persoon weer zichtbaar",
     "Notify the whole room": "Laat dit aan het hele groepsgesprek weten",
     "Room Notification": "Groepsgespreksmelding",
     "The information being sent to us to help make %(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.",
+    "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 kamer-, persoon- of groep-ID, zullen deze gegevens verwijderd worden voordat ze naar de server gestuurd worden.",
     "The platform you're on": "Het platform dat u gebruikt",
     "The version of %(brand)s": "De versie van %(brand)s",
     "Your language of choice": "De door jou gekozen taal",
@@ -637,10 +529,8 @@
     "<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",
-    "%(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 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",
@@ -653,24 +543,18 @@
     "Code": "Code",
     "Unable to join community": "Kan niet toetreden tot de gemeenschap",
     "Unable to leave community": "Kan de gemeenschap niet verlaten",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Veranderingen aan uw gemeenschaps<bold1>naam</bold1> en -<bold2>avatar</bold2> zullen mogelijk niet gezien worden door anderen tot maximaal 30 minuten.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Veranderingen aan uw gemeenschaps<bold1>naam</bold1> en -<bold2>afbeelding</bold2> zullen mogelijk nog niet gezien worden door anderen voor 30 minuten.",
     "Join this community": "Toetreden tot deze gemeenschap",
     "Who can join this community?": "Wie kan er tot deze gemeenschap toetreden?",
     "Everyone": "Iedereen",
     "Leave this community": "Deze gemeenschap verlaten",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Voor het oplossen van, via GitHub, gemelde bugs helpen foutenlogboeken ons enorm. Deze bevatten wel uw gebruiksgegevens, maar geen berichten. Het bevat onder meer uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht en de namen van andere gebruikers.",
     "Submit debug logs": "Foutenlogboek versturen",
     "Opens the Developer Tools dialog": "Opent het dialoogvenster met ontwikkelaarsgereedschap",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
-    "I understand the risks and wish to continue": "Ik begrijp de risico’s en wil graag verdergaan",
     "Send Account Data": "Accountgegevens versturen",
-    "All notifications are currently disabled for all targets.": "Alle meldingen voor alle bestemmingen zijn momenteel uitgeschakeld.",
-    "Uploading report": "Rapport wordt geüpload",
     "Sunday": "Zondag",
     "Notification targets": "Meldingsbestemmingen",
     "Today": "Vandaag",
-    "Files": "Bestanden",
-    "You are not receiving desktop notifications": "U ontvangt momenteel geen bureaubladmeldingen",
     "Friday": "Vrijdag",
     "Update": "Updaten",
     "What's New": "Wat is er nieuw",
@@ -678,24 +562,13 @@
     "Changelog": "Wijzigingslogboek",
     "Waiting for response from server": "Wachten op antwoord van de server",
     "Send Custom Event": "Aangepaste gebeurtenis versturen",
-    "Advanced notification settings": "Geavanceerde meldingsinstellingen",
-    "Forget": "Vergeten",
-    "You cannot delete this image. (%(code)s)": "U kunt deze afbeelding niet verwijderen. (%(code)s)",
-    "Cancel Sending": "Versturen annuleren",
     "This Room": "Dit gesprek",
     "Resend": "Opnieuw versturen",
-    "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
     "Messages containing my display name": "Berichten die mijn weergavenaam bevatten",
-    "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
+    "Messages in one-to-one chats": "Berichten in één-op-één chats",
     "Unavailable": "Niet beschikbaar",
-    "View Decrypted Source": "Ontsleutelde bron bekijken",
-    "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!",
-    "You have successfully set a password!": "U heeft een wachtwoord ingesteld!",
-    "An error occurred whilst saving your email notification preferences.": "Er is een fout opgetreden tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
-    "Explore Room State": "Gesprekstoestand verkennen",
+    "Explore Room State": "Kamertoestand ontdekken",
     "Source URL": "Bron-URL",
     "Messages sent by bot": "Berichten verzonden door een bot",
     "Filter results": "Resultaten filteren",
@@ -703,33 +576,21 @@
     "No update available.": "Geen update beschikbaar.",
     "Noisy": "Lawaaierig",
     "Collecting app version information": "App-versieinformatie wordt verzameld",
-    "Keywords": "Trefwoorden",
-    "Enable notifications for this account": "Meldingen voor dit account inschakelen",
     "Invite to this community": "Uitnodigen in deze gemeenschap",
-    "Messages containing <span>keywords</span>": "Berichten die <span>trefwoorden</span> bevatten",
     "Room not found": "Gesprek niet gevonden",
     "Tuesday": "Dinsdag",
-    "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gescheiden door een komma:",
     "Search…": "Zoeken…",
-    "You have successfully set a password and an email address!": "U heeft een wachtwoord en e-mailadres ingesteld!",
     "Remove %(name)s from the directory?": "%(name)s uit de catalogus verwijderen?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s gebruikt veel geavanceerde browserfuncties, waarvan enkele niet (of slechts experimenteel) in uw browser beschikbaar zijn.",
     "Developer Tools": "Ontwikkelgereedschap",
-    "Explore Account Data": "Accountgegevens verkennen",
+    "Explore Account Data": "Accountgegevens ontdekken",
     "Remove from Directory": "Verwijderen uit catalogus",
     "Saturday": "Zaterdag",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd nog een e-mailadres kunt instellen in de gebruikersinstellingen.",
-    "Direct Chat": "Tweegesprek",
     "The server may be unavailable or overloaded": "De server is mogelijk onbereikbaar of overbelast",
     "Reject": "Weigeren",
-    "Failed to set Direct Message status of room": "Instellen van tweegesprekstoestand van gesprek is mislukt",
     "Monday": "Maandag",
-    "All messages (noisy)": "Alle berichten (luid)",
-    "Enable them now": "Deze nu inschakelen",
     "Toolbox": "Gereedschap",
     "Collecting logs": "Logs worden verzameld",
     "You must specify an event type!": "U dient een gebeurtenistype op te geven!",
-    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
     "Invite to this room": "Uitnodigen voor dit gesprek",
     "Send logs": "Logs versturen",
     "All messages": "Alle berichten",
@@ -738,48 +599,31 @@
     "State Key": "Toestandssleutel",
     "Failed to send custom event.": "Versturen van aangepaste gebeurtenis is mislukt.",
     "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 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",
-    "All Rooms": "Alle gesprekken",
+    "All Rooms": "Alle kamers",
     "You cannot delete this message. (%(code)s)": "U kunt dit bericht niet verwijderen. (%(code)s)",
     "Thursday": "Donderdag",
-    "Forward Message": "Bericht doorsturen",
     "Back": "Terug",
     "Reply": "Beantwoorden",
     "Show message in desktop notification": "Bericht in bureaubladmelding tonen",
-    "Unhide Preview": "Voorvertoning weergeven",
     "Unable to join network": "Kon niet toetreden tot dit netwerk",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, uw browser werkt <b>niet</b> met %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Geüpload door %(user)s op %(date)s",
     "Messages in group chats": "Berichten in groepsgesprekken",
     "Yesterday": "Gisteren",
     "Error encountered (%(errorDetail)s).": "Er is een fout opgetreden (%(errorDetail)s).",
     "Low Priority": "Lage prioriteit",
-    "Unable to fetch notification target list": "Kan de bestemmingslijst voor meldingen niet ophalen",
-    "Set Password": "Wachtwoord instellen",
     "Off": "Uit",
     "%(brand)s does not know how to join a room on this network": "%(brand)s weet niet hoe het moet deelnemen aan een gesprek op dit netwerk",
-    "Mentions only": "Alleen vermeldingen",
     "Wednesday": "Woensdag",
-    "You can now return to your account after signing out, and sign in on other devices.": "Na afmelding kunt u terugkeren tot uw account, en u op andere apparaten aanmelden.",
-    "Enable email notifications": "E-mailmeldingen inschakelen",
     "Event Type": "Gebeurtenistype",
-    "Download this file": "Dit bestand downloaden",
-    "Pin Message": "Bericht vastprikken",
-    "Failed to change settings": "Wijzigen van instellingen mislukt",
     "View Community": "Gemeenschap weergeven",
     "Event sent!": "Gebeurtenis verstuurd!",
     "View Source": "Bron bekijken",
     "Event Content": "Gebeurtenisinhoud",
     "Thank you!": "Bedankt!",
-    "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!": "Met uw huidige browser kan de toepassing er volledig onjuist uitzien. Tevens is het mogelijk dat niet alle functies naar behoren werken. U kunt doorgaan als u het toch wilt proberen, maar bij problemen bent u volledig op uzelf aangewezen!",
     "Checking for an update...": "Bezig met controleren op updates…",
     "Logs sent": "Logs verstuurd",
-    "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.": "Foutenlogboeken bevatten gebruiksgegevens van de app inclusief uw gebruikersnaam, de ID’s of bijnamen van de gesprekken die u heeft bezocht, en de gebruikersnamen van andere gebruikers. Ze bevatten geen berichten.",
     "Failed to send logs: ": "Versturen van logs mislukt: ",
     "Preparing to send logs": "Logs voorbereiden voor versturen",
     "e.g. %(exampleValue)s": "bv. %(exampleValue)s",
@@ -787,15 +631,14 @@
     "e.g. <CurrentPageURL>": "bv. <CurrentPageURL>",
     "Your device resolution": "De resolutie van je apparaat",
     "Missing roomId.": "roomId ontbreekt.",
-    "Always show encryption icons": "Versleutelingspictogrammen altijd tonen",
     "Send analytics data": "Gebruiksgegevens delen",
     "Enable widget screenshots on supported widgets": "Widget-schermafbeeldingen inschakelen op ondersteunde widgets",
-    "Muted Users": "Gedempte gebruikers",
+    "Muted Users": "Gedempte personen",
     "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>",
+    "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 persoon-ID kunnen registreren. Hierdoor zal uw account alle kamers waar u aan 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 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.",
+    "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 vergelijkbaar met e-mail. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde personen, maar geregistreerde personen 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 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 uitloggen",
@@ -803,67 +646,56 @@
     "Refresh": "Herladen",
     "We encountered an error trying to restore your previous session.": "Het herstel van uw vorige sessie is mislukt.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Het wissen van de browseropslag zal het probleem misschien verhelpen, maar zal u ook uitloggen en uw gehele versleutelde gespreksgeschiedenis onleesbaar maken.",
-    "Collapse Reply Thread": "Reactieketting dichtvouwen",
     "Can't leave Server Notices room": "Kan servermeldingsgesprek niet verlaten",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek is bedoeld voor belangrijke berichten van de homeserver, dus u kunt het niet verlaten.",
     "Terms and Conditions": "Gebruiksvoorwaarden",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s-homeserver te blijven gebruiken, zult u de gebruiksvoorwaarden moeten bestuderen en aanvaarden.",
     "Review terms and conditions": "Gebruiksvoorwaarden lezen",
-    "Call in Progress": "Lopend gesprek",
-    "A call is currently being placed!": "Er wordt al een oproep gemaakt!",
-    "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": "Je hebt geen toestemming in dit groepsgesprek een vergadergesprek te starten",
+    "You do not have permission to start a conference call in this room": "U heeft geen rechten in deze kamer om een vergadering te starten",
     "This event could not be displayed": "Deze gebeurtenis kon niet weergegeven worden",
     "Demote yourself?": "Uzelf degraderen?",
     "Demote": "Degraderen",
-    "Share Link to User": "Koppeling naar gebruiker delen",
+    "Share Link to User": "Koppeling naar persoon delen",
     "Share room": "Gesprek delen",
     "System Alerts": "Systeemmeldingen",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde gesprekken zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw homeserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde kamers zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw homeserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
     "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.": "Als iemand een URL in een bericht invoegt, kan er een URL-voorvertoning weergegeven worden met meer informatie over de koppeling, zoals de titel, omschrijving en een afbeelding van de website.",
-    "The email field must not be blank.": "Het e-mailveld mag niet leeg zijn.",
-    "The phone number field must not be blank.": "Het telefoonnummerveld mag niet leeg zijn.",
-    "The password field must not be blank.": "Het wachtwoordveld mag niet leeg zijn.",
-    "Failed to remove widget": "Widget kon niet worden verwijderd",
-    "An error ocurred whilst trying to remove the widget from the room": "Er trad een fout op bij de verwijderpoging van de widget uit dit gesprek",
     "Share Room": "Gesprek delen",
     "Link to most recent message": "Koppeling naar meest recente bericht",
-    "Share User": "Gebruiker delen",
+    "Share User": "Persoon delen",
     "Share Community": "Gemeenschap delen",
     "Share Room Message": "Bericht uit gesprek delen",
     "Link to selected message": "Koppeling naar geselecteerd bericht",
-    "COPY": "KOPIËREN",
-    "Share Message": "Bericht delen",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "U kunt geen berichten sturen totdat u <consentLink>onze algemene voorwaarden</consentLink> heeft gelezen en aanvaard.",
     "No Audio Outputs detected": "Geen geluidsuitgangen gedetecteerd",
     "Audio Output": "Geluidsuitgang",
-    "Ignored users": "Genegeerde gebruikers",
+    "Ignored users": "Genegeerde personen",
     "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 hit its Monthly Active User limit.": "Deze homeserver heeft zijn limiet voor maandelijks actieve personen 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 je gebruikersnaam niet op)",
+    "Whether or not you're logged in (we don't record your username)": "Of u al dan niet ingelogd bent (we slaan uw inlognaam 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 je netwerktoegang en probeer het nogmaals.",
-    "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:",
+    "Failed to invite users to the room:": "Kon de volgende personen hier niet uitnodigen:",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór een bericht zonder opmaak",
-    "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.",
-    "Sets the room name": "Stelt de gespreksnaam in",
-    "%(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.",
+    "Upgrades a room to a new version": "Upgrade deze kamer naar een nieuwere versie",
+    "Changes your display nickname in the current room only": "Stelt uw weergavenaam alleen in de huidige kamer in",
+    "Gets or sets the room topic": "Verkrijgt het onderwerp van de kamer of stelt het in",
+    "This room has no topic.": "Deze kamer heeft geen onderwerp.",
+    "Sets the room name": "Stelt de kamernaam in",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s heeft deze kamer geüpgraded.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s heeft de kamer toegankelijk gemaakt voor iedereen die het adres weet.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s heeft de kamer enkel op uitnodiging toegankelijk gemaakt.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s heeft de toegangsregel veranderd naar ‘%(rule)s’",
-    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s heeft gasten toegestaan het gesprek te betreden.",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s heeft gasten de toegang tot het gesprek ontzegd.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s heeft gasten toegestaan de kamer te betreden.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s heeft gasten de toegang tot de kamer ontzegd.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s heeft de toegangsregel voor gasten op ‘%(rule)s’ ingesteld",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s heeft badges voor %(groups)s in dit gesprek ingeschakeld.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s heeft badges voor %(groups)s in dit gesprek uitgeschakeld.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s heeft badges in dit gesprek voor %(newGroups)s in-, en voor %(oldGroups)s uitgeschakeld.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s heeft %(address)s als hoofdadres voor dit gesprek ingesteld.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s heeft het hoofdadres voor dit gesprek verwijderd.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s heeft badges voor %(groups)s in deze kamer ingeschakeld.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s heeft badges voor %(groups)s in deze kamer uitgeschakeld.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s heeft badges in deze kamer voor %(newGroups)s in-, en voor %(oldGroups)s uitgeschakeld.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s heeft %(address)s als hoofdadres voor deze kamer ingesteld.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s heeft het hoofdadres voor deze kamer verwijderd.",
     "%(displayName)s is typing …": "%(displayName)s is aan het typen…",
     "%(names)s and %(count)s others are typing …|other": "%(names)s en %(count)s anderen zijn aan het typen…",
     "%(names)s and %(count)s others are typing …|one": "%(names)s en nog iemand zijn aan het typen…",
@@ -871,11 +703,11 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Gelieve <a>contact op te nemen met uw systeembeheerder</a> om deze dienst te blijven gebruiken.",
     "Unable to connect to Homeserver. Retrying...": "Kon geen verbinding met de homeserver maken. Nieuwe poging…",
     "Unrecognised address": "Adres niet herkend",
-    "You do not have permission to invite people to this room.": "U bent niet bevoegd anderen tot dit gesprek uit te nodigen.",
-    "User %(userId)s is already in the room": "De gebruiker %(userId)s is al aanwezig",
-    "User %(user_id)s does not exist": "Er bestaat geen gebruiker %(user_id)s",
-    "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen gebruiker %(user_id)s",
-    "The user must be unbanned before they can be invited.": "De gebruiker kan niet uitgenodigd worden voordat diens ban teniet is gedaan.",
+    "You do not have permission to invite people to this room.": "U bent niet bevoegd anderen in deze kamer uit te nodigen.",
+    "User %(userId)s is already in the room": "De persoon %(userId)s is al aanwezig",
+    "User %(user_id)s does not exist": "Er bestaat geen persoon %(user_id)s",
+    "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen persoon %(user_id)s",
+    "The user must be unbanned before they can be invited.": "De persoon kan niet uitgenodigd worden totdat zijn ban is verwijderd.",
     "Unknown server error": "Onbekende serverfout",
     "Use a few words, avoid common phrases": "Gebruik enkele woorden - maar geen bekende uitdrukkingen",
     "No need for symbols, digits, or uppercase letters": "Hoofdletters, cijfers of speciale tekens hoeven niet, mogen wel",
@@ -904,37 +736,35 @@
     "Common names and surnames are easy to guess": "Voor- en achternamen zijn eenvoudig te raden",
     "Straight rows of keys are easy to guess": "Zo’n aaneengesloten rijtje toetsen is eenvoudig te raden",
     "Short keyboard patterns are easy to guess": "Korte patronen op het toetsenbord worden gemakkelijk geraden",
-    "There was an error joining the room": "Er is een fout opgetreden bij het betreden van het gesprek",
-    "Sorry, your homeserver is too old to participate in this room.": "Helaas - uw homeserver is te oud voor dit gesprek.",
+    "There was an error joining the room": "Er is een fout opgetreden bij het betreden van de kamer",
+    "Sorry, your homeserver is too old to participate in this room.": "Helaas, uw server is te oud deel te nemen aan deze kamer.",
     "Please contact your homeserver administrator.": "Gelieve contact op te nemen met de beheerder van uw homeserver.",
-    "Custom user status messages": "Aangepaste gebruikersstatusberichten",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Gesprekken groeperen en filteren volgens eigen labels (herlaad om de verandering te zien)",
-    "Render simple counters in room header": "Eenvoudige tellers bovenaan het gesprek tonen",
+    "Custom user status messages": "Aangepaste statusberichten",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Kamers groeperen en filteren volgens eigen labels (herlaad om de verandering te zien)",
+    "Render simple counters in room header": "Eenvoudige tellers bovenaan de kamer tonen",
     "Enable Emoji suggestions while typing": "Emoticons voorstellen tijdens het typen",
     "Show a placeholder for removed messages": "Verwijderde berichten vulling tonen",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Berichten over toe- en uittredingen tonen (dit heeft geen effect op uitnodigingen, berispingen of verbanningen)",
-    "Show avatar changes": "Veranderingen van avatar tonen",
+    "Show avatar changes": "Veranderingen van afbeelding tonen",
     "Show display name changes": "Veranderingen van weergavenamen tonen",
-    "Show read receipts sent by other users": "Door andere gebruikers verstuurde leesbevestigingen tonen",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Herinnering tonen om veilig berichtherstel in te schakelen in versleutelde gesprekken",
-    "Show avatars in user and room mentions": "Vermelde gebruikers- of gesprekkenavatars tonen",
-    "Enable big emoji in chat": "Grote emoji in gesprekken inschakelen",
+    "Show read receipts sent by other users": "Door andere personen verstuurde leesbevestigingen tonen",
+    "Show avatars in user and room mentions": "Vermelde personen- of kamerafbeelding tonen",
+    "Enable big emoji in chat": "Grote emoji in kamers inschakelen",
     "Send typing notifications": "Typmeldingen versturen",
     "Enable Community Filter Panel": "Gemeenschapsfilterpaneel inschakelen",
-    "Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer voor één-op-één oproepen toestaan",
     "Prompt before sending invites to potentially invalid matrix IDs": "Uitnodigingen naar mogelijk ongeldige Matrix-ID’s bevestigen",
     "Show developer tools": "Ontwikkelgereedschap tonen",
-    "Messages containing my username": "Berichten die mijn gebruikersnaam bevatten",
+    "Messages containing my username": "Berichten die mijn inlognaam bevatten",
     "Messages containing @room": "Berichten die ‘@room’ bevatten",
-    "Encrypted messages in one-to-one chats": "Versleutelde berichten in één-op-één gesprekken",
+    "Encrypted messages in one-to-one chats": "Versleutelde berichten in één-op-één chats",
     "Encrypted messages in group chats": "Versleutelde berichten in groepsgesprekken",
     "The other party cancelled the verification.": "De tegenpartij heeft de verificatie geannuleerd.",
     "Verified!": "Geverifieerd!",
-    "You've successfully verified this user.": "U heeft deze gebruiker geverifieerd.",
-    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Beveiligde berichten met deze gebruiker zijn eind-tot-eind-versleuteld en kunnen niet door derden worden gelezen.",
+    "You've successfully verified this user.": "U heeft deze persoon geverifieerd.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Beveiligde berichten met deze persoon zijn eind-tot-eind-versleuteld en kunnen niet door derden worden gelezen.",
     "Got It": "Ik snap het",
-    "Verify this user by confirming the following emoji appear on their screen.": "Verifieer deze gebruiker door te bevestigen dat hun scherm de volgende emoji toont.",
-    "Verify this user by confirming the following number appears on their screen.": "Verifieer deze gebruiker door te bevestigen dat hun scherm het volgende getal toont.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifieer deze persoon door te bevestigen dat hun scherm de volgende emoji toont.",
+    "Verify this user by confirming the following number appears on their screen.": "Verifieer deze persoon door te bevestigen dat hun scherm het volgende getal toont.",
     "Unable to find a supported verification method.": "Kan geen ondersteunde verificatiemethode vinden.",
     "Dog": "Hond",
     "Cat": "Kat",
@@ -1011,12 +841,9 @@
     "Back up your keys before signing out to avoid losing them.": "Maak een back-up van uw sleutels vooraleer u zich afmeldt om ze niet te verliezen.",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s sleutels worden geback-upt…",
     "All keys backed up": "Alle sleutels zijn geback-upt",
-    "Backup version: ": "Back-upversie: ",
-    "Algorithm: ": "Algoritme: ",
     "Chat with %(brand)s Bot": "Met %(brand)s-robot chatten",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Dwingt tot verwerping van de huidige uitwaartse groepssessie in een versleuteld gesprek",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Dwingt tot verwerping van de huidige uitwaartse groepssessie in een versleutelde kamer",
     "Start using Key Backup": "Begin sleutelback-up te gebruiken",
-    "Add an email address to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen in te stellen",
     "Unable to verify phone number.": "Kan telefoonnummer niet verifiëren.",
     "Verification code": "Verificatiecode",
     "Phone Number": "Telefoonnummer",
@@ -1034,30 +861,29 @@
     "Legal": "Juridisch",
     "Credits": "Met dank aan",
     "For help with using %(brand)s, click <a>here</a>.": "Klik <a>hier</a> voor hulp bij het gebruiken van %(brand)s.",
-    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Klik <a>hier</a> voor hulp bij het gebruiken van %(brand)s, of begin een gesprek met onze robot met de knop hieronder.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Klik <a>hier</a> voor hulp bij het gebruiken van %(brand)s of begin een gesprek met onze robot met de knop hieronder.",
     "Help & About": "Hulp & info",
     "Bug reporting": "Bug meldingen",
     "FAQ": "FAQ",
     "Versions": "Versies",
-    "Preferences": "Instellingen",
+    "Preferences": "Voorkeuren",
     "Composer": "Opsteller",
     "Timeline": "Tijdslijn",
     "Room list": "Gesprekslijst",
     "Autocomplete delay (ms)": "Vertraging voor autoaanvullen (ms)",
     "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen aannemen",
-    "Key backup": "Sleutelback-up",
     "Security & Privacy": "Veiligheid & privacy",
     "Missing media permissions, click the button below to request.": "Mediatoestemmingen ontbreken, klik op de knop hieronder om deze aan te vragen.",
     "Request media permissions": "Mediatoestemmingen verzoeken",
     "Voice & Video": "Spraak & video",
     "Room information": "Gespreksinformatie",
     "Internal room ID:": "Interne gespreks-ID:",
-    "Room version": "Gespreksversie",
-    "Room version:": "Gespreksversie:",
+    "Room version": "Kamerversie",
+    "Room version:": "Kamerversie:",
     "Developer options": "Ontwikkelaarsopties",
     "Open Devtools": "Ontwikkelgereedschap openen",
     "Room Addresses": "Gespreksadressen",
-    "Change room avatar": "Gespreksavatar wijzigen",
+    "Change room avatar": "Kamerafbeelding wijzigen",
     "Change room name": "Gespreksnaam wijzigen",
     "Change main address for the room": "Hoofdadres voor het gesprek wijzigen",
     "Change history visibility": "Zichtbaarheid van geschiedenis wijzigen",
@@ -1066,28 +892,22 @@
     "Modify widgets": "Widgets aanpassen",
     "Default role": "Standaardrol",
     "Send messages": "Berichten versturen",
-    "Invite users": "Gebruikers uitnodigen",
+    "Invite users": "Personen uitnodigen",
     "Change settings": "Instellingen wijzigen",
-    "Kick users": "Gebruikers uit het gesprek verwijderen",
-    "Ban users": "Gebruikers verbannen",
-    "Remove messages": "Berichten verwijderen",
+    "Kick users": "Personen verwijderen",
+    "Ban users": "Personen verbannen",
     "Notify everyone": "Iedereen melden",
     "Send %(eventType)s events": "%(eventType)s-gebeurtenissen versturen",
     "Roles & Permissions": "Rollen & rechten",
     "Select the roles required to change various parts of the room": "Selecteer de vereiste rollen om verschillende delen van het gesprek te wijzigen",
     "Enable encryption?": "Versleuteling inschakelen?",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Gespreksversleuteling is onomkeerbaar. Berichten in versleutelde gesprekken zijn niet leesbaar voor de server; enkel voor de gespreksdeelnemers. Veel robots en overbruggingen werken niet correct in versleutelde gesprekken. <a>Lees meer over versleuteling.</a>",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Kamerversleuteling is onomkeerbaar. Berichten in versleutelde kamers zijn niet leesbaar voor de server; enkel voor de deelnemers. Veel robots en bruggen werken niet correct in versleutelde kamers. <a>Lees meer over versleuteling.</a>",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wijzigingen aan wie de geschiedenis kan lezen gelden enkel voor toekomstige berichten in dit gesprek. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
     "Encryption": "Versleuteling",
     "Once enabled, encryption cannot be disabled.": "Eenmaal ingeschakeld kan versleuteling niet meer worden uitgeschakeld.",
     "Encrypted": "Versleuteld",
     "This room has been replaced and is no longer active.": "Dit gesprek is vervangen en niet langer actief.",
     "The conversation continues here.": "Het gesprek gaat hier verder.",
-    "Never lose encrypted messages": "Verlies nooit uw versleutelde berichten",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "De berichten in dit gesprek worden beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en u hebben de leessleutels voor deze berichten.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Maak een veilige back-up van uw sleutels om ze niet te verliezen. <a>Lees meer.</a>",
-    "Not now": "Nu niet",
-    "Don't ask me again": "Vraag het me niet opnieuw",
     "Only room administrators will see this warning": "Enkel gespreksbeheerders zullen deze waarschuwing zien",
     "Add some now": "Voeg er nu een paar toe",
     "Error updating main address": "Fout bij bijwerken van hoofdadres",
@@ -1095,7 +915,7 @@
     "Main address": "Hoofdadres",
     "Error updating flair": "Fout bij bijwerken van badge",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Er is een fout opgetreden bij het bijwerken van de badge voor dit gesprek. Wellicht ondersteunt de server dit niet, of er is een tijdelijke fout opgetreden.",
-    "Room avatar": "Gespreksavatar",
+    "Room avatar": "Kamerafbeelding",
     "Room Name": "Gespreksnaam",
     "Room Topic": "Gespreksonderwerp",
     "This room is a continuation of another conversation.": "Dit gesprek is een voortzetting van een ander gesprek.",
@@ -1104,7 +924,7 @@
     "Join": "Deelnemen",
     "Power level": "Machtsniveau",
     "That doesn't look like a valid email address": "Dit is geen geldig e-mailadres",
-    "The following users may not exist": "Volgende gebruikers bestaan mogelijk niet",
+    "The following users may not exist": "Volgende personen bestaan mogelijk niet",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kan geen profielen voor de Matrix-ID’s hieronder vinden - wilt u ze toch uitnodigen?",
     "Invite anyway and never warn me again": "Alsnog uitnodigen en mij nooit meer waarschuwen",
     "Invite anyway": "Alsnog uitnodigen",
@@ -1113,46 +933,35 @@
     "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": "Om uw gespreksgeschiedenis niet te verliezen vóór het uitloggen dient u uw veiligheidssleutel te exporteren. Dat moet vanuit de nieuwere versie van %(brand)s",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze gebruiker om hem/haar als vertrouwd te markeren. Gebruikers vertrouwen geeft u extra gemoedsrust bij het gebruik van eind-tot-eind-versleutelde berichten.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze persoon om als vertrouwd te markeren. Personen vertrouwen geeft u extra zekerheid bij het gebruik van eind-tot-eind-versleutelde berichten.",
     "Waiting for partner to confirm...": "Wachten op bevestiging van partner…",
     "Incoming Verification Request": "Inkomend verificatieverzoek",
     "You've previously used %(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.": "U heeft voorheen %(brand)s op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. De lokale cache is niet compatibel tussen deze twee instellingen, zodat %(brand)s uw account moet hersynchroniseren.",
     "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.": "Indien de andere versie van %(brand)s nog open staat in een ander tabblad kunt u dat beter sluiten, want het geeft problemen als %(brand)s op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld draait.",
     "Incompatible local cache": "Incompatibele lokale cache",
     "Clear cache and resync": "Cache wissen en hersynchroniseren",
-    "%(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 verbruikt nu 3-5x minder geheugen, door informatie over andere gebruikers enkel te laden wanneer nodig. Even geduld, we hersynchroniseren met de server!",
+    "%(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 verbruikt nu 3-5x minder geheugen, door informatie over andere personen enkel te laden wanneer nodig. Even geduld, we synchroniseren met de server!",
     "Updating %(brand)s": "%(brand)s wordt bijgewerkt",
     "I don't want my encrypted messages": "Ik wil mijn versleutelde berichten niet",
     "Manually export keys": "Sleutels handmatig wegschrijven",
     "You'll lose access to your encrypted messages": "U zult de toegang tot uw versleutelde berichten verliezen",
     "Are you sure you want to sign out?": "Weet u zeker dat u wilt uitloggen?",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Als u fouten zou tegenkomen of voorstellen zou hebben, laat het ons dan weten op GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Voorkom dubbele meldingen: doorzoek eerst de <existingIssuesLink>bestaande meldingen</existingIssuesLink> (en voeg desgewenst een +1 toe). Maak enkel <newIssueLink>een nieuwe melding</newIssueLink> aan indien u niets kunt vinden.",
-    "Report bugs & give feedback": "Fouten melden & feedback geven",
     "Go back": "Terug",
     "Room Settings - %(roomName)s": "Gespreksinstellingen - %(roomName)s",
-    "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",
+    "Failed to upgrade room": "Kamerupgrade mislukt",
+    "The room upgrade could not be completed": "Het upgraden van de kamer kon niet worden voltooid",
+    "Upgrade this room to version %(version)s": "Upgrade de kamer naar versie %(version)s",
+    "Upgrade Room Version": "Kamerversie upgraden",
+    "Create a new room with the same name, description and avatar": "Een nieuw kamer aanmaken met dezelfde naam, beschrijving en afbeelding",
     "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": "Mensen verhinderen aan de oude versie van het gesprek bij te dragen en daar een bericht te plaatsen dat de gebruikers verwijst naar het nieuwe gesprek",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Personen verhinderen om aan de oude versie van de kamer bij te dragen en plaats een bericht te dat de personen verwijst naar de nieuwe kamer",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Bovenaan het nieuwe gesprek naar het oude verwijzen, om oude berichten te lezen",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Een gebruikersnaam mag enkel kleine letters, cijfers en ‘=_-./’ bevatten",
-    "Checking...": "Bezig met controleren…",
     "Unable to load backup status": "Kan back-upstatus niet laden",
     "Unable to restore backup": "Kan back-up niet terugzetten",
     "No backup found!": "Geen back-up gevonden!",
     "Failed to decrypt %(failedCount)s sessions!": "Ontsleutelen van %(failedCount)s sessies is mislukt!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let op</b>: stel sleutelback-up enkel in op een vertrouwde computer.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Verkrijg toegang tot uw beveiligde berichtgeschiedenis en stel beveiligd chatten in door uw herstelwachtwoord in te voeren.",
     "Next": "Volgende",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Als u uw herstelwachtwoord vergeten bent, kunt u <button1>uw herstelsleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
-    "This looks like a valid recovery key!": "Dit is een geldige herstelsleutel!",
-    "Not a valid recovery key": "Geen geldige herstelsleutel",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrijg toegang tot uw beveiligde berichtgeschiedenis en stel beveiligd chatten in door uw herstelsleutel in te voeren.",
-    "Share Permalink": "Permalink delen",
     "Clear status": "Status wissen",
     "Update status": "Status bijwerken",
     "Set status": "Status instellen",
@@ -1161,37 +970,21 @@
     "This homeserver would like to make sure you are not a robot.": "Deze homeserver wil graag weten of u geen robot bent.",
     "Please review and accept all of the homeserver's policies": "Gelieve het beleid van de homeserver door te nemen en te aanvaarden",
     "Please review and accept the policies of this homeserver:": "Gelieve het beleid van deze homeserver door te nemen en te aanvaarden:",
-    "Your Modular server": "Uw Modular-server",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Voer de locatie van uw Modular-thuisserver in. Deze kan uw eigen domeinnaam gebruiken, of een subdomein van <a>modular.im</a> zijn.",
-    "Server Name": "Servernaam",
-    "The username field must not be blank.": "Het gebruikersnaamveld mag niet leeg zijn.",
-    "Username": "Gebruikersnaam",
-    "Not sure of your password? <a>Set a new one</a>": "Onzeker over uw wachtwoord? <a>Stel een nieuw in</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Aanmelden met uw Matrix-account op %(serverName)s",
+    "Username": "Inlognaam",
     "Change": "Wijzigen",
-    "Create your Matrix account on %(serverName)s": "Maak uw Matrix-account op %(serverName)s aan",
     "Email (optional)": "E-mailadres (optioneel)",
     "Phone (optional)": "Telefoonnummer (optioneel)",
     "Confirm": "Bevestigen",
-    "Other servers": "Andere servers",
-    "Homeserver URL": "Thuisserver-URL",
-    "Identity Server URL": "Identiteitsserver-URL",
-    "Free": "Gratis",
-    "Join millions for free on the largest public server": "Doe mee met miljoenen anderen op de grootste openbare server",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium hosting voor organisaties <a>Lees meer</a>",
+    "Join millions for free on the largest public server": "Neem deel aan de grootste publieke server samen met miljoenen anderen",
     "Other": "Overige",
-    "Find other public servers or use a custom server": "Zoek andere publieke servers, of gebruik een aangepaste server",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> voor de beste gebruikservaring.",
     "Couldn't load page": "Kon pagina niet laden",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "U bent een beheerder van deze gemeenschap. U zult niet opnieuw kunnen toetreden zonder een uitnodiging van een andere beheerder.",
     "Want more than a community? <a>Get your own server</a>": "Wilt u meer dan een gemeenschap? <a>Verkrijg uw eigen server</a>",
     "This homeserver does not support communities": "Deze homeserver biedt geen ondersteuning voor gemeenschappen",
-    "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.": "Uw bericht is niet verstuurd omdat deze homeserver zijn limiet voor maandelijks actieve gebruikers heeft bereikt. <a>Neem contact op met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
+    "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.": "Uw bericht is niet verstuurd omdat deze homeserver zijn limiet voor maandelijks actieve personen heeft bereikt. <a>Neem contact op met uw beheerder</a> om de dienst te blijven gebruiken.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Uw bericht is niet verstuurd omdat deze homeserver een systeembronlimiet heeft overschreden. <a>Neem contact op met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
     "Guest": "Gast",
-    "Could not load user profile": "Kon gebruikersprofiel niet laden",
-    "Your Matrix account on %(serverName)s": "Uw Matrix-account op %(serverName)s",
+    "Could not load user profile": "Kon persoonsprofiel niet laden",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Er is een verificatie-e-mail naar u gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.",
     "Sign in instead": "In plaats daarvan inloggen",
     "Your password has been reset.": "Uw wachtwoord is opnieuw ingesteld.",
@@ -1199,14 +992,13 @@
     "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.",
+    "This homeserver does not support login using email address.": "Deze homeserver biedt geen ondersteuning voor inloggen met een 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.",
     "Failed to perform homeserver discovery": "Ontdekken van homeserver is mislukt",
     "Sign in with single sign-on": "Inloggen met eenmalig inloggen",
     "Create account": "Registeren",
     "Registration has been disabled on this homeserver.": "Registratie is uitgeschakeld op deze homeserver.",
     "Unable to query for supported registration methods.": "Kan ondersteunde registratiemethoden niet opvragen.",
-    "Create your account": "Maak uw account aan",
     "Keep going...": "Doe verder…",
     "For maximum security, this should be different from your account password.": "Voor maximale veiligheid moet dit verschillen van uw accountwachtwoord.",
     "That matches!": "Dat komt overeen!",
@@ -1222,48 +1014,38 @@
     "Success!": "Klaar!",
     "Unable to create key backup": "Kan sleutelback-up niet aanmaken",
     "Retry": "Opnieuw proberen",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Zonder veilig berichtherstel in te stellen, zult u uw versleutelde berichtgeschiedenis verliezen wanneer u zich afmeldt.",
-    "If you don't want to set this up now, you can later in Settings.": "Als u dit nu niet wilt instellen, kunt u dit later doen in de instellingen.",
     "Set up": "Instellen",
-    "Don't ask again": "Niet opnieuw vragen",
     "New Recovery Method": "Nieuwe herstelmethode",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Er zijn een nieuw herstelwachtwoord en een nieuwe herstelsleutel voor beveiligde berichten gedetecteerd.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat een aanvaller toegang tot uw account probeert te krijgen. Wijzig onmiddellijk uw wachtwoord en stel bij instellingen een nieuwe herstelmethode in.",
     "Go to Settings": "Ga naar instellingen",
     "Set up Secure Messages": "Beveiligde berichten instellen",
     "Recovery Method Removed": "Herstelmethode verwijderd",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u de herstelmethode niet heeft verwijderd, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw wachtwoord en stel bij instellingen een nieuwe herstelmethode in.",
-    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let op</b>: gesprekken bijwerken <i>voegt gespreksleden niet automatisch toe aan de nieuwe versie van het gesprek</i>. Er komt in het oude gesprek een koppeling naar het nieuwe, waarop gespreksleden moeten klikken om aan het nieuwe gesprek deel te nemen.",
-    "Adds a custom widget by URL to the room": "Voegt met een URL een aangepaste widget toe aan het gesprek",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let op</b>: kamers bijwerken <i>voegt leden niet automatisch toe aan de nieuwe versie van de kamer</i>. Er komt in de oude kamer een koppeling naar de nieuwe, waarop leden moeten klikken om aan de nieuwe kamer deel te nemen.",
+    "Adds a custom widget by URL to the room": "Voegt met een URL een aangepaste widget toe aan de kamer",
     "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": "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.",
+    "You cannot modify widgets in this room.": "U kunt de widgets in deze kamer 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 deze kamer ingetrokken.",
+    "Upgrade this room to the recommended room version": "Upgrade deze kamer naar de aanbevolen kamerversie",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Deze kamer draait op kamerversie <roomVersion />, die door deze server 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",
     "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",
     "Invited by %(sender)s": "Uitgenodigd door %(sender)s",
-    "Maximize apps": "Apps maximaliseren",
-    "A widget would like to verify your identity": "Een widget wil uw identiteit nagaan",
-    "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.": "Een widget op %(widgetUrl)s wil uw identiteit nagaan. Staat u dit toe, dan zal de widget wel uw gebruikers-ID kunnen nagaan, maar niet als u kunnen handelen.",
     "Remember my selection for this widget": "Onthoud mijn keuze voor deze widget",
-    "Deny": "Weigeren",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s kon de protocollijst niet ophalen van de homeserver. Mogelijk is de homeserver te oud om derde-partij-netwerken te ondersteunen.",
-    "%(brand)s failed to get the public room list.": "%(brand)s kon de lijst met openbare gesprekken niet verkrijgen.",
+    "%(brand)s failed to get the public room list.": "%(brand)s kon de lijst met publieke kamers niet verkrijgen.",
     "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 u al dan niet de afbeeldingen voor recent bekeken kamers (boven de lijst met kamers) 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. 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",
     "GitHub issue": "GitHub-melding",
     "Notes": "Opmerkingen",
-    "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.": "Gelieve alle verdere informatie die zou kunnen helpen het probleem te analyseren (wat u aan het doen was, relevante gespreks-ID’s, gebruikers-ID’s, enz.) bij te voegen.",
+    "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.": "Alle verdere informatie die zou kunnen helpen het probleem te analyseren graag toevoegen (wat u aan het doen was, relevante kamer-ID’s, persoon-ID’s, etc.).",
     "Sign out and remove encryption keys?": "Uitloggen en versleutelingssleutels verwijderen?",
     "To help us prevent this in future, please <a>send us logs</a>.": "<a>Stuur ons uw logs</a> om dit in de toekomst te helpen voorkomen.",
     "Missing session data": "Sessiegegevens ontbreken",
@@ -1272,24 +1054,24 @@
     "Upload files (%(current)s of %(total)s)": "Bestanden versturen (%(current)s van %(total)s)",
     "Upload files": "Bestanden versturen",
     "Upload": "Versturen",
-    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Dit bestand is <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s, maar dit bestand is %(sizeOfThisFile)s.",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Dit bestand is <b>te groot</b> om te versturen. Het limiet is %(limit)s en dit bestand is %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Deze bestanden zijn <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Sommige bestanden zijn <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s.",
     "Upload %(count)s other files|other": "%(count)s overige bestanden versturen",
     "Upload %(count)s other files|one": "%(count)s overig bestand versturen",
     "Cancel All": "Alles annuleren",
     "Upload Error": "Fout bij versturen van bestand",
-    "The server does not support the room version specified.": "De server ondersteunt deze versie van gesprekken niet.",
+    "The server does not support the room version specified.": "De server ondersteunt deze versie van kamers niet.",
     "Name or Matrix ID": "Naam of Matrix-ID",
-    "Changes your avatar in this current room only": "Verandert uw avatar enkel in het huidige gesprek",
-    "Unbans user with given ID": "Ontbant de gebruiker met de gegeven ID",
+    "Changes your avatar in this current room only": "Verandert uw afbeelding alleen in de huidige kamer",
+    "Unbans user with given ID": "Ontbant de persoon met de gegeven ID",
     "Sends the given message coloured as a rainbow": "Verstuurt het gegeven bericht in regenboogkleuren",
     "Sends the given emote coloured as a rainbow": "Verstuurt de gegeven emoticon in regenboogkleuren",
     "No homeserver URL provided": "Geen homeserver-URL opgegeven",
     "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.",
+    "The user's homeserver does not support the version of the room.": "De homeserver van de persoon biedt geen ondersteuning voor deze kamerversie.",
     "Show hidden events in timeline": "Verborgen gebeurtenissen op de tijdslijn weergeven",
-    "When rooms are upgraded": "Wanneer gesprekken geüpgraded worden",
+    "When rooms are upgraded": "Wanneer kamers geüpgraded worden",
     "this room": "dit gesprek",
     "View older messages in %(roomName)s.": "Bekijk oudere berichten in %(roomName)s.",
     "Joining room …": "Deelnemen aan gesprek…",
@@ -1323,8 +1105,6 @@
     "Rotate Right": "Rechts draaien",
     "Edit message": "Bericht bewerken",
     "View Servers in Room": "Servers in gesprek bekijken",
-    "Unable to validate homeserver/identity server": "Kan thuis-/identiteitsserver niet valideren",
-    "Sign in to your Matrix account on <underlinedServerName />": "Meld u met uw Matrix-account op <underlinedServerName /> aan",
     "Use an email address to recover your account": "Gebruik een e-mailadres om uw account te herstellen",
     "Enter email address (required on this homeserver)": "Voer een e-mailadres in (vereist op deze homeserver)",
     "Doesn't look like a valid email address": "Dit lijkt geen geldig e-mailadres",
@@ -1332,21 +1112,16 @@
     "Password is allowed, but unsafe": "Wachtwoord is toegestaan, maar onveilig",
     "Nice, strong password!": "Dit is een sterk wachtwoord!",
     "Passwords don't match": "Wachtwoorden komen niet overeen",
-    "Other users can invite you to rooms using your contact details": "Andere gebruikers kunnen u in gesprekken uitnodigen op basis van uw contactgegevens",
+    "Other users can invite you to rooms using your contact details": "Andere personen kunnen u in kamers uitnodigen op basis van uw contactgegevens",
     "Enter phone number (required on this homeserver)": "Voer telefoonnummer in (vereist op deze homeserver)",
-    "Doesn't look like a valid phone number": "Dit lijkt geen geldig telefoonnummer",
-    "Enter username": "Voer gebruikersnaam in",
+    "Enter username": "Voer inlognaam in",
     "Some characters not allowed": "Sommige tekens zijn niet toegestaan",
-    "Create your Matrix account on <underlinedServerName />": "Maak uw Matrix-account op <underlinedServerName /> aan",
     "Add room": "Gesprek toevoegen",
-    "Your profile": "Uw profiel",
-    "Your Matrix account on <underlinedServerName />": "Uw Matrix-account op <underlinedServerName />",
     "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",
     "Identity server URL does not appear to be a valid identity server": "De identiteitsserver-URL lijkt geen geldige identiteitsserver",
-    "Low bandwidth mode": "Lagebandbreedtemodus",
     "Uploaded sound": "Geüpload-geluid",
     "Sounds": "Geluiden",
     "Notification sound": "Meldingsgeluid",
@@ -1374,18 +1149,15 @@
     "Message edits": "Berichtbewerkingen",
     "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:": "Dit gesprek bijwerken vereist dat u de huidige instantie ervan afsluit en in de plaats een nieuw gesprek aanmaakt. Om gespreksleden de best mogelijke ervaring te bieden, zullen we:",
     "Show all": "Alles tonen",
-    "%(senderName)s made no change.": "%(senderName)s heeft niets gewijzigd.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s hebben %(count)s keer niets gewijzigd",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s hebben niets gewijzigd",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s heeft %(count)s keer niets gewijzigd",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s heeft niets gewijzigd",
-    "Changes your avatar in all rooms": "Verandert uw avatar in alle gesprekken",
+    "Changes your avatar in all rooms": "Verandert uw afbeelding in alle kamer",
     "Removing…": "Bezig met verwijderen…",
     "Clear all data": "Alle gegevens wissen",
     "Your homeserver doesn't seem to support this feature.": "Uw homeserver biedt geen ondersteuning voor deze functie.",
-    "Resend edit": "Bewerking opnieuw versturen",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s reactie(s) opnieuw versturen",
-    "Resend removal": "Verwijdering opnieuw versturen",
     "Failed to re-authenticate due to a homeserver problem": "Opnieuw inloggen is mislukt wegens een probleem met de homeserver",
     "Failed to re-authenticate": "Opnieuw inloggen is mislukt",
     "Enter your password to sign in and regain access to your account.": "Voer uw wachtwoord in om u aan te melden en toegang tot uw account te herkrijgen.",
@@ -1393,7 +1165,6 @@
     "You're signed out": "U bent uitgelogd",
     "Clear personal data": "Persoonlijke gegevens wissen",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Laat ons weten wat er verkeerd is gegaan, of nog beter, maak een foutrapport aan op GitHub, waarin u het probleem beschrijft.",
-    "Identity Server": "Identiteitsserver",
     "Find others by phone or email": "Vind anderen via telefoonnummer of e-mailadres",
     "Be found by phone or email": "Wees vindbaar via telefoonnummer of e-mailadres",
     "Use bots, bridges, widgets and sticker packs": "Gebruik robots, bruggen, widgets en stickerpakketten",
@@ -1402,21 +1173,16 @@
     "Summary": "Samenvatting",
     "Sign in and regain access to your account.": "Meld u aan en herkrijg toegang tot uw account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "U kunt niet inloggen met uw account. Neem voor meer informatie contact op met de beheerder van uw homeserver.",
-    "This account has been deactivated.": "Deze account is gesloten.",
+    "This account has been deactivated.": "Dit account is gesloten.",
     "Messages": "Berichten",
     "Actions": "Acties",
     "Displays list of commands with usages and descriptions": "Toont een lijst van beschikbare opdrachten, met hun gebruiken en beschrijvingen",
-    "Identity Server URL must be HTTPS": "Identiteitsserver-URL moet HTTPS zijn",
-    "Not a valid Identity Server (status code %(code)s)": "Geen geldige identiteitsserver (statuscode %(code)s)",
-    "Could not connect to Identity Server": "Kon geen verbinding maken met de identiteitsserver",
     "Checking server": "Server wordt gecontroleerd",
     "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 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.": "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": "Vindbaarheid",
     "Deactivate account": "Account sluiten",
     "Always show the window menu bar": "De venstermenubalk altijd tonen",
@@ -1431,7 +1197,6 @@
     "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.",
     "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 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.",
@@ -1446,15 +1211,13 @@
     "Remove %(phone)s?": "%(phone)s verwijderen?",
     "Sends a message as plain text, without interpreting it as markdown": "Verstuurt een bericht als platte tekst, zonder het als markdown te interpreteren",
     "You do not have the required permissions to use this command.": "U beschikt niet over de vereiste machtigingen om deze opdracht uit te voeren.",
-    "Changes the avatar of the current room": "Wijzigt de afbeelding van het huidige gesprek",
+    "Changes the avatar of the current room": "Wijzigt de afbeelding van de huidige kamer",
     "Use an identity server": "Gebruik een identiteitsserver",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Gebruik een identiteitsserver om uit te nodigen via e-mail. Klik op ‘Doorgaan’ om de standaardidentiteitsserver (%(defaultIdentityServerName)s) te gebruiken, of beheer de server in de instellingen.",
     "Use an identity server to invite by email. Manage in Settings.": "Gebruik een identiteitsserver om uit te nodigen via e-mail. Beheer de server in de instellingen.",
-    "Multiple integration managers": "Meerdere integratiebeheerders",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Verstuur leesbevestigingen voor berichten (uitschakelen vereist een compatibele thuisserver)",
     "Accept <policyLink /> to continue:": "Aanvaard <policyLink /> om door te gaan:",
     "ID": "ID",
-    "Public Name": "Openbare naam",
+    "Public Name": "Publieke naam",
     "Change identity server": "Identiteitsserver wisselen",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Verbinding met identiteitsserver <current /> verbreken en in plaats daarvan verbinden met <new />?",
     "Disconnect identity server": "Verbinding met identiteitsserver verbreken",
@@ -1472,7 +1235,7 @@
     "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.",
     "Error changing power level": "Fout bij wijzigen van machtsniveau",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van het machtsniveau van de gebruiker. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van het machtsniveau van de persoon. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.",
     "Verify the link in your inbox": "Verifieer de koppeling in uw postvak",
     "Complete": "Voltooien",
     "No recent messages by %(user)s found": "Geen recente berichten door %(user)s gevonden",
@@ -1481,9 +1244,9 @@
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "U staat op het punt %(count)s berichten van %(user)s te verwijderen. Dit kan niet teruggedraaid worden. Wilt u doorgaan?",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Bij een groot aantal berichten kan dit even duren. Herlaad uw cliënt niet gedurende deze tijd.",
     "Remove %(count)s messages|other": "%(count)s berichten verwijderen",
-    "Deactivate user?": "Gebruiker deactiveren?",
-    "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?": "Deze gebruiker deactiveren zal deze gebruiker uitloggen en verhinderen dat de gebruiker weer inlogt. Bovendien zal de gebruiker alle gesprekken waaraan de gebruiker deelneemt verlaten. Deze actie is niet terug te draaien. Weet u zeker dat u deze gebruiker wilt deactiveren?",
-    "Deactivate user": "Gebruiker deactiveren",
+    "Deactivate user?": "Persoon deactiveren?",
+    "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?": "Deze persoon deactiveren zal deze persoon uitloggen en verhinderen dat de persoon weer inlogt. Bovendien zal de persoon alle kamers waaraan de persoon deelneemt verlaten. Deze actie is niet terug te draaien. Weet u zeker dat u deze persoon wilt deactiveren?",
+    "Deactivate user": "Persoon deactiveren",
     "Remove recent messages": "Recente berichten verwijderen",
     "Bold": "Vet",
     "Italics": "Cursief",
@@ -1497,52 +1260,42 @@
     "Share this email in Settings to receive invites directly in %(brand)s.": "Deel in de instellingen dit e-mailadres om uitnodigingen direct in %(brand)s te ontvangen.",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Gebruik een identiteitsserver om uit te nodigen op e-mailadres. <default>Gebruik de standaardserver (%(defaultIdentityServerName)s)</default> of beheer de server in de <settings>Instellingen</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Gebruik een identiteitsserver om anderen uit te nodigen via e-mail. Beheer de server in de <settings>Instellingen</settings>.",
-    "Please fill why you're reporting.": "Gelieve aan te geven waarom u deze melding indient.",
+    "Please fill why you're reporting.": "Geef aan waarom u deze melding indient.",
     "Report Content to Your Homeserver Administrator": "Inhoud melden aan de beheerder van uw homeserver",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Dit bericht melden zal zijn unieke ‘gebeurtenis-ID’ versturen naar de beheerder van uw homeserver. Als de berichten in dit gesprek versleuteld zijn, zal de beheerder van uw homeserver het bericht niet kunnen lezen, noch enige bestanden of afbeeldingen zien.",
     "Send report": "Rapport versturen",
     "Report Content": "Inhoud melden",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Stel een e-mailadres voor accountherstel in. Gebruik eventueel een e-mailadres of telefoonnummer om vindbaar te zijn voor bestaande contacten.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Stel een e-mailadres voor accountherstel in.  Gebruik eventueel een e-mailadres om vindbaar te zijn voor bestaande contacten.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Voer uw aangepaste thuisserver-URL in <a>Wat betekent dit?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Voer uw aangepaste identiteitsserver-URL in <a>Wat betekent dit?</a>",
-    "Explore": "Ontdekken",
     "Filter": "Filteren",
-    "Filter rooms…": "Filter de gesprekken…",
     "Preview": "Voorbeeld",
     "View": "Bekijken",
     "Find a room…": "Zoek een gesprek…",
     "Find a room… (e.g. %(exampleRoom)s)": "Zoek een gesprek… (bv. %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u het gesprek dat u zoekt niet kunt vinden, vraag dan een uitnodiging, of <a>Maak een nieuw gesprek aan</a>.",
-    "Explore rooms": "Gesprekken ontdekken",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u de kamer niet kunt vinden is het mogelijk privé, vraag dan om een uitnodiging of <a>maak een nieuwe kamer aan</a>.",
+    "Explore rooms": "Ontdek kamers",
     "Show previews/thumbnails for images": "Miniaturen voor afbeeldingen tonen",
     "Clear cache and reload": "Cache wissen en herladen",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan gemaakt worden. Wilt u doorgaan?",
     "Remove %(count)s messages|one": "1 bericht verwijderen",
     "%(count)s unread messages including mentions.|other": "%(count)s ongelezen berichten, inclusief vermeldingen.",
     "%(count)s unread messages.|other": "%(count)s ongelezen berichten.",
-    "Unread mentions.": "Ongelezen vermeldingen.",
     "Show image": "Afbeelding tonen",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Maak een nieuwe issue aan</newIssueLink> op GitHub zodat we deze bug kunnen onderzoeken.",
     "e.g. my-room": "bv. mijn-gesprek",
     "Close dialog": "Dialoog sluiten",
     "Please enter a name for the room": "Geef een naam voor het gesprek op",
-    "This room is private, and can only be joined by invitation.": "Dit gesprek is privé, en kan enkel op uitnodiging betreden worden.",
     "Create a public room": "Maak een openbaar gesprek aan",
     "Create a private room": "Maak een privégesprek aan",
     "Topic (optional)": "Onderwerp (optioneel)",
-    "Make this room public": "Dit gesprek openbaar maken",
     "Hide advanced": "Geavanceerde info verbergen",
     "Show advanced": "Geavanceerde info tonen",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Verhinder gebruikers op andere Matrix-thuisservers de toegang tot dit gesprek (Deze instelling kan later niet meer aangepast worden!)",
     "To continue you need to accept the terms of this service.": "Om door te gaan dient u de dienstvoorwaarden te aanvaarden.",
     "Document": "Document",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Publieke sleutel van captcha ontbreekt in homeserverconfiguratie. Meld dit aan de beheerder van uw homeserver.",
     "Community Autocomplete": "Gemeenschappen autoaanvullen",
     "Emoji Autocomplete": "Emoji autoaanvullen",
     "Notification Autocomplete": "Meldingen autoaanvullen",
-    "Room Autocomplete": "Gesprekken autoaanvullen",
-    "User Autocomplete": "Gebruikers autoaanvullen",
+    "Room Autocomplete": "Kamers autoaanvullen",
+    "User Autocomplete": "Personen autoaanvullen",
     "Add Email Address": "E-mailadres toevoegen",
     "Add Phone Number": "Telefoonnummer toevoegen",
     "Your email address hasn't been verified yet": "Uw e-mailadres is nog niet geverifieerd",
@@ -1552,41 +1305,38 @@
     "Verify this session": "Verifieer deze sessie",
     "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",
     "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": "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:",
+    "Error upgrading room": "Upgraden van kamer mislukt",
+    "Double check that your server supports the room version chosen and try again.": "Ga nogmaals na dat de server de gekozen kamerversie ondersteunt, en probeer het dan opnieuw.",
+    "Verifies a user, session, and pubkey tuple": "Verifieert de combinatie van persoon, sessie en publieke sleutel",
+    "Unknown (user, session) pair:": "Onbekende combinatie persoon en sessie:",
     "Session already verified!": "Sessie al geverifieerd!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "PAS OP: de sessie is al geverifieerd, maar de sleutels komen NIET OVEREEN!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "PAS OP: sleutelverificatie MISLUKT! De combinatie %(userId)s + sessie %(deviceId)s is ondertekend met ‘%(fprint)s’ - maar de opgegeven sleutel is ‘%(fingerprint)s’.  Wellicht worden uw berichten onderschept!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "De door u verschafte en de van %(userId)ss sessie %(deviceId)s verkregen sleutels komen overeen. De sessie is daarmee geverifieerd.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "De door u verschafte sleutel en de van %(userId)ss sessie %(deviceId)s verkregen sleutels komen overeen. De sessie is daarmee geverifieerd.",
     "%(senderName)s placed a voice call.": "%(senderName)s probeert u te bellen.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s poogt u te bellen, maar uw browser ondersteunt dat niet",
     "%(senderName)s placed a video call.": "%(senderName)s doet een video-oproep.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s doet een video-oproep, maar uw browser ondersteunt dat niet",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s heeft de banregel voor gebruikers die met %(glob)s stroken verwijderd",
-    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s heeft de banregel voor gesprekken die met %(glob)s stroken verwijderd",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s heeft de banregel voor personen die met %(glob)s stroken verwijderd",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s heeft de banregel voor kamers met %(glob)s verwijderd",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s heeft de banregel voor servers die met %(glob)s stroken verwijderd",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s heeft een banregel die met %(glob)s strookt verwijderd",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s heeft een ongeldige banregel bijgewerkt",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die gebruikers die met %(glob)s sporen verbant vanwege %(reason)s",
-    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die gesprekken die met %(glob)s sporen verbant vanwege %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die personen die met %(glob)s sporen verbant vanwege %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die kamers met %(glob)s verbant vanwege %(reason)s",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die servers die met %(glob)s sporen verbant vanwege %(reason)s",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s heeft een banregel vanwege %(reason)s die met %(glob)s spoort bijgewerkt",
-    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat gebruikers die met %(glob)s sporen verbannen worden vanwege %(reason)s",
-    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat gesprekken die met %(glob)s sporen verbannen worden vanwege %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat personen die met %(glob)s sporen verbannen worden vanwege %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat kamers met %(glob)s verbannen worden vanwege %(reason)s",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat servers die met %(glob)s sporen verbannen worden vanwege %(reason)s",
     "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat alles wat met %(glob)s spoort verbannen wordt vanwege %(reason)s",
-    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor gebruikers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
-    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor gesprekken wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor personen wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor kamers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor servers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
-    "The message you are trying to send is too large.": "Uw bericht is te lang om te versturen.",
     "a few seconds ago": "enige tellen geleden",
     "about a minute ago": "ongeveer een minuut geleden",
     "%(num)s minutes ago": "%(num)s minuten geleden",
@@ -1603,20 +1353,19 @@
     "%(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 personen te negeren uitproberen (nog in ontwikkeling)",
-    "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
+    "Show info about bridges in room settings": "Toon bruginformatie in kamerinstellingen",
     "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",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in dit gesprek versturen",
-    "Enable message search in encrypted rooms": "Zoeken in versleutelde gesprekken inschakelen",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in deze kamer versturen",
+    "Enable message search in encrypted rooms": "Zoeken in versleutelde kamers inschakelen",
     "How fast should messages be downloaded.": "Ophaalfrequentie van berichten.",
     "My Ban List": "Mijn banlijst",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/gebruikers. Verlaat dit gesprek niet!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/personen. Verlaat deze kamer niet!",
     "Waiting for %(displayName)s to verify…": "Wachten tot %(displayName)s geverifieerd heeft…",
     "They match": "Ze komen overeen",
     "They don't match": "Ze komen niet overeen",
     "To be secure, do this in person or use a trusted way to communicate.": "Doe dit voor de zekerheid onder vier ogen, of via een betrouwbaar communicatiemedium.",
     "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": "Upgraden",
     "Verify": "Verifiëren",
@@ -1625,8 +1374,6 @@
     "Decline (%(counter)s)": "Afwijzen (%(counter)s)",
     "This bridge was provisioned by <user />.": "Dank aan <user /> voor de brug.",
     "This bridge is managed by <user />.": "Brug onderhouden door <user />.",
-    "Workspace: %(networkName)s": "Werkruimte: %(networkName)s",
-    "Channel: %(channelName)s": "Kanaal: %(channelName)s",
     "Show less": "Minder tonen",
     "Show more": "Meer tonen",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle 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.",
@@ -1638,9 +1385,7 @@
     "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 Progressieve 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.",
+    "Your user agent": "Uw persoonsagent",
     "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 handelingen te doen:",
@@ -1658,10 +1403,10 @@
     "not stored": "niet opgeslagen",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zult geen pushmeldingen op uw andere sessies meer ontvangen, totdat u zichzelf daar opnieuw inlogt",
     "Ignored/Blocked": "Genegeerd/geblokkeerd",
-    "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde gebruiker/server",
+    "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde persoon/server",
     "Something went wrong. Please try again or view your console for hints.": "Er is iets fout gegaan. Probeer het opnieuw of bekijk de console om voor meer informatie.",
     "Error subscribing to list": "Fout bij het abonneren op de lijst",
-    "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde gebruiker/server",
+    "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde persoon/server",
     "Error unsubscribing from list": "Fout bij het opzeggen van een abonnement op de lijst",
     "Please try again or view your console for hints.": "Probeer het opnieuw of bekijk de console voor meer informatie.",
     "None": "Geen",
@@ -1671,15 +1416,15 @@
     "Unsubscribe": "Abonnement opzeggen",
     "View rules": "Bekijk regels",
     "You are currently subscribed to:": "U heeft een abonnement op:",
-    "⚠ These settings are meant for advanced users.": "⚠ Deze instellingen zijn bedoeld voor gevorderde gebruikers.",
-    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van gebruikers gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het abonneren op een banlijst betekent dat u de gebruikers/servers die op de lijst staan niet meer zult zien.",
+    "⚠ These settings are meant for advanced users.": "⚠ Deze instellingen zijn bedoeld voor gevorderde personen.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van personen gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het abonneren op een banlijst betekent dat u de personen/servers die op de lijst staan niet meer zult zien.",
     "Personal ban list": "Persoonlijke banlijst",
-    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle gebruikers/server waar u geen berichten meer van wilt zien. Nadat u een gebruiker/server heeft genegeerd, zal er een nieuw gesprek worden aangemaakt met de naam ‘Mijn banlijst’. Om de lijst actief te houden dient u het gesprek niet te verlaten.",
-    "Server or user ID to ignore": "Server of gebruikers-ID om te negeren",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle personen/servers waar u geen berichten meer van wilt zien. Nadat u een persoon/server heeft genegeerd, zal er een nieuw kamer worden aangemaakt met de naam ‘Mijn banlijst’. Om de lijst actief te houden dient u de kamer niet te verlaten.",
+    "Server or user ID to ignore": "Server of persoon-ID om te negeren",
     "eg: @bot:* or example.org": "bijvoorbeeld: @bot:* of voorbeeld.org",
     "Subscribed lists": "Abonnementen op lijsten",
     "Subscribing to a ban list will cause you to join it!": "Wanneer u zich abonneert op een banlijst zal u eraan worden toegevoegd!",
-    "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om gebruikers te negeren.",
+    "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om personen te negeren.",
     "Subscribe": "Abonneren",
     "Enable desktop notifications for this session": "Bureaubladmeldingen voor deze sessie inschakelen",
     "Enable audible notifications for this session": "Meldingen met geluid voor deze sessie inschakelen",
@@ -1687,51 +1432,40 @@
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "uw browserextensies bekijken voor extensies die mogelijk de identiteitsserver blokkeren (zoals Privacy Badger)",
     "contact the administrators of identity server <idserver />": "contact opnemen met de beheerders van de identiteitsserver <idserver />",
     "wait and try again later": "wachten en het later weer proberen",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder <b>(%(serverName)s)</b> om robots, widgets en stickerpakketten te beheren.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder om robots, widgets en stickerpakketten te beheren.",
     "Manage integrations": "Integratiebeheerder",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integratiebeheerders ontvangen configuratie-informatie en kunnen widgets aanpassen, gespreksuitnodigingen versturen en machtsniveau’s namens u aanpassen.",
     "Ban list rules - %(roomName)s": "Banlijstregels - %(roomName)s",
     "Server rules": "Serverregels",
-    "User rules": "Gebruikersregels",
+    "User rules": "Persoonsregels",
     "Show tray icon and minimize window to it on close": "Geef een pictogram weer in de systeembalk en minimaliseer het venster wanneer het wordt gesloten",
     "Session ID:": "Sessie-ID:",
     "Session key:": "Sessiesleutel:",
     "Message search": "Berichten zoeken",
-    "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",
+    "A session's public name is visible to people you communicate with": "De publieke 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",
-    "This user has not verified all of their sessions.": "Deze gebruiker heeft niet al zijn sessies geverifieerd.",
-    "You have not verified this user.": "U heeft deze gebruiker niet geverifieerd.",
-    "You have verified this user. This user has verified all of their sessions.": "U heeft deze gebruiker geverifieerd. Deze gebruiker heeft al zijn sessies geverifieerd.",
+    "This user has not verified all of their sessions.": "Deze persoon heeft niet al zijn sessies geverifieerd.",
+    "You have not verified this user.": "U heeft deze persoon niet geverifieerd.",
+    "You have verified this user. This user has verified all of their sessions.": "U heeft deze persoon geverifieerd. Deze persoon heeft al zijn sessies geverifieerd.",
     "Someone is using an unknown session": "Iemand gebruikt een onbekende sessie",
     "This room is end-to-end encrypted": "Dit gesprek is eind-tot-eind-versleuteld",
     "Everyone in this room is verified": "Iedereen in dit gesprek is geverifieerd",
     "Mod": "Mod",
-    "rooms.": "gesprekken.",
-    "Recent rooms": "Actuele gesprekken",
     "Direct Messages": "Direct gesprek",
-    "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde gesprekken.",
-    "Indexed rooms:": "Geïndexeerde gesprekken:",
-    "Cross-signing and secret storage are enabled.": "Kruiselings ondertekenen en sleutelopslag zijn ingeschakeld.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde kamers.",
+    "Indexed rooms:": "Geïndexeerde kamers:",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar die wordt nog niet vertrouwd door de huidige sessie.",
-    "Cross-signing and secret storage are not yet set up.": "Kruiselings ondertekenen en sleutelopslag zijn nog niet ingesteld.",
-    "Bootstrap cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag instellen",
-    "Reset cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag opnieuw instellen",
     "Cross-signing public keys:": "Publieke sleutels voor kruiselings ondertekenen:",
     "Cross-signing private keys:": "Privésleutels voor kruiselings ondertekenen:",
     "in secret storage": "in de sleutelopslag",
     "Secret storage public key:": "Sleutelopslag publieke sleutel:",
     "in account data": "in accountinformatie",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten veilig lokaal op opdat ze doorzocht kunnen worden, middels ",
-    " to store messages from ": " om berichten op te slaan van ",
     "Manage": "Beheren",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u zich afmeldt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
     "Connect this session to Key Backup": "Verbind deze sessie met de sleutelback-up",
-    "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>geldige</validity> ondertekening van deze gebruiker",
-    "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze gebruiker",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> gebruiker met ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>geldige</validity> ondertekening van deze persoon",
+    "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze persoon",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> persoon met ID %(deviceId)s",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> sessie met ID %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "De back-up heeft een <validity>geldige</validity> ondertekening van deze sessie",
     "Backup has an <validity>invalid</validity> signature from this session": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze sessie",
@@ -1741,7 +1475,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>ongeldige</validity> ondertekening van een <verify>ongeverifieerde</verify> sessie <device></device>",
     "Backup is not signed by any of your sessions": "De back-up is door geen van uw sessies ondertekend",
     "This backup is trusted because it has been restored on this session": "Deze back-up is vertrouwd omdat hij hersteld is naar deze sessie",
-    "Backup key stored: ": "Back-upsleutel opgeslagen: ",
     "Your keys are <b>not being backed up from this session</b>.": "Uw sleutels worden <b>niet geback-upt van deze sessie</b>.",
     "Clear notifications": "Meldingen wissen",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "U moet uw <b>persoonlijke informatie</b> van de identiteitsserver <idserver /> <b>verwijderen</b> voordat u zich ontkoppelt. Helaas kan de identiteitsserver <idserver /> op dit moment niet worden bereikt. Mogelijk is hij offline.",
@@ -1750,15 +1483,14 @@
     "exists": "aanwezig",
     "Sign In or Create Account": "Meld u aan of maak een account aan",
     "Use your account or create a new one to continue.": "Gebruik uw bestaande account of maak een nieuwe aan om verder te gaan.",
-    "Create Account": "Registeren",
-    "Displays information about a user": "Geeft informatie weer over een gebruiker",
-    "Order rooms by name": "Gesprekken sorteren op naam",
-    "Show rooms with unread notifications first": "Gesprekken met ongelezen meldingen eerst tonen",
-    "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de gesprekken die u recent heeft bekeken bovenaan de gesprekslijst weergeven",
+    "Create Account": "Registreren",
+    "Displays information about a user": "Geeft informatie weer over een persoon",
+    "Order rooms by name": "Kamers sorteren op naam",
+    "Show rooms with unread notifications first": "Kamers met ongelezen meldingen eerst tonen",
+    "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de kamers die u recent heeft bekeken bovenaan de kamerlijst weergeven",
     "Cancelling…": "Bezig met annuleren…",
     "%(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>.": "In %(brand)s ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten. Wilt u deze functie uittesten, compileer dan een aangepaste versie van %(brand)s Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Deze sessie <b>maakt geen back-ups van uw sleutels</b>, maar u beschikt over een reeds bestaande back-up waaruit u kunt herstellen en waaraan u nieuwe sleutels vanaf nu kunt toevoegen.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliseer uw ervaring met experimentele labs functies. <a>Lees verder</a>.",
     "Cross-signing": "Kruiselings ondertekenen",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Uw sleuteldeelverzoek is verstuurd - controleer de sleuteldeelverzoeken op uw andere sessies.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Sleuteldeelverzoeken worden automatisch naar andere sessies verstuurd. Als u op uw andere sessies het sleuteldeelverzoek geweigerd of genegeerd hebt, kunt u hier klikken op de sleutels voor deze sessie opnieuw aan te vragen.",
@@ -1768,15 +1500,14 @@
     "Encrypted by an unverified session": "Versleuteld door een niet-geverifieerde sessie",
     "Unencrypted": "Onversleuteld",
     "Encrypted by a deleted session": "Versleuteld door een verwijderde sessie",
-    "Invite only": "Enkel op uitnodiging",
     "Close preview": "Voorbeeld sluiten",
-    "Failed to deactivate user": "Deactiveren van gebruiker is mislukt",
+    "Failed to deactivate user": "Deactiveren van persoon is mislukt",
     "Send a reply…": "Verstuur een antwoord…",
     "Send a message…": "Verstuur een bericht…",
     "Room %(name)s": "Gesprek %(name)s",
-    "<userName/> wants to chat": "<userName/> wil een gesprek met u beginnen",
+    "<userName/> wants to chat": "<userName/> wil een chat met u beginnen",
     "Start chatting": "Gesprek beginnen",
-    "Reject & Ignore user": "Weigeren en gebruiker negeren",
+    "Reject & Ignore user": "Weigeren en persoon negeren",
     "%(count)s unread messages including mentions.|one": "1 ongelezen vermelding.",
     "%(count)s unread messages.|one": "1 ongelezen bericht.",
     "Unread messages.": "Ongelezen berichten.",
@@ -1790,17 +1521,17 @@
     "Start Verification": "Verificatie beginnen",
     "Messages in this room are end-to-end encrypted.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Uw berichten zijn beveiligd, en enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
-    "Verify User": "Gebruiker verifiëren",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "Als extra beveiliging kunt u deze gebruiker verifiëren door een eenmalige code op uw toestellen te controleren.",
+    "Verify User": "Persoon verifiëren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Als extra beveiliging kunt u deze persoon verifiëren door een eenmalige code op jullie toestellen te controleren.",
     "Your messages are not secure": "Uw berichten zijn niet veilig",
     "One of the following may be compromised:": "Eén van volgende onderdelen kan gecompromitteerd zijn:",
     "Your homeserver": "Uw homeserver",
-    "The homeserver the user you’re verifying is connected to": "De homeserver waarmee de gebruiker die u probeert te verifiëren verbonden is",
-    "Yours, or the other users’ internet connection": "De internetverbinding van uzelf of de andere gebruiker",
-    "Yours, or the other users’ session": "De sessie van uzelf of de andere gebruiker",
+    "The homeserver the user you’re verifying is connected to": "De homeserver waarmee de persoon die u probeert te verifiëren verbonden is",
+    "Yours, or the other users’ internet connection": "De internetverbinding van uzelf of de andere persoon",
+    "Yours, or the other users’ session": "De sessie van uzelf of de andere persoon",
     "Not Trusted": "Niet vertrouwd",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s%(userId)s heeft zich aangemeld bij een nieuwe sessie zonder deze te verifiëren:",
-    "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker haar/zijn sessie te verifiëren, of verifieer die hieronder handmatig.",
+    "Ask this user to verify their session, or manually verify it below.": "Vraag deze persoon de sessie te verifiëren, of verifieer het handmatig hieronder.",
     "Done": "Klaar",
     "Trusted": "Vertrouwd",
     "Not trusted": "Niet vertrouwd",
@@ -1810,8 +1541,6 @@
     "%(count)s sessions|other": "%(count)s sessies",
     "%(count)s sessions|one": "%(count)s sessie",
     "Hide sessions": "Sessies verbergen",
-    "Direct message": "Direct gesprek",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "Deze cliënt biedt geen ondersteuning voor eind-tot-eind-versleuteling.",
     "Messages in this room are not end-to-end encrypted.": "De berichten in dit gesprek worden niet eind-tot-eind-versleuteld.",
     "Security": "Beveiliging",
@@ -1824,12 +1553,11 @@
     "You've successfully verified %(displayName)s!": "U heeft %(displayName)s geverifieerd!",
     "Got it": "Ik snap het",
     "Encryption enabled": "Versleuteling ingeschakeld",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld. Kom hier meer over te weten en verifieer de gebruiker via zijn/haar gebruikersprofiel.",
     "Encryption not enabled": "Versleuteling niet ingeschakeld",
     "The encryption used by this room isn't supported.": "De versleuteling gebruikt in dit gesprek wordt niet ondersteund.",
     "React": "Reageren",
     "Message Actions": "Berichtacties",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "U heeft deze gebruiker genegeerd, dus zijn/haar berichten worden verborgen. <a>Toch tonen?</a>",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "U heeft deze persoon genegeerd, dus de berichten worden verborgen. <a>Toch tonen?</a>",
     "You verified %(name)s": "U heeft %(name)s geverifieerd",
     "You cancelled verifying %(name)s": "U heeft de verificatie van %(name)s geannuleerd",
     "%(name)s cancelled verifying": "%(name)s heeft de verificatie geannuleerd",
@@ -1844,7 +1572,6 @@
     "%(name)s wants to verify": "%(name)s wil verifiëren",
     "You sent a verification request": "U heeft een verificatieverzoek verstuurd",
     "Reactions": "Reacties",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> heeft gereageerd met %(content)s</reactedWith>",
     "Frequently Used": "Vaak gebruikt",
     "Smileys & People": "Smileys & Personen",
     "Animals & Nature": "Dieren en natuur",
@@ -1858,13 +1585,12 @@
     "Cancel search": "Zoeken annuleren",
     "Any of the following data may be shared:": "De volgende gegevens worden mogelijk gedeeld:",
     "Your display name": "Uw weergavenaam",
-    "Your avatar URL": "De URL van uw profielfoto",
-    "Your user ID": "Uw gebruikers-ID",
+    "Your avatar URL": "De URL van uw afbeelding",
+    "Your user ID": "Uw persoon-ID",
     "Your theme": "Uw thema",
     "%(brand)s URL": "%(brand)s-URL",
     "Room ID": "Gespreks-ID",
     "Widget ID": "Widget-ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Deze widget gebruiken deelt mogelijk gegevens <helpIcon /> met %(widgetDomain)s en uw integratiebeheerder.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Deze widget gebruiken deelt mogelijk gegevens <helpIcon /> met %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Widgets gebruiken geen berichtversleuteling.",
     "Widget added by": "Widget toegevoegd door",
@@ -1880,86 +1606,55 @@
     "Session name": "Sessienaam",
     "Session key": "Sessiesleutel",
     "Verification Requests": "Verificatieverzoeken",
-    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Deze gebruiker verifiëren zal de sessie als vertrouwd markeren voor u en voor hem/haar.",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifieer dit apparaat om het als vertrouwd te markeren. Door dit apparaat te vertrouwen geeft u extra gemoedsrust aan uzelf en andere gebruikers bij het gebruik van eind-tot-eind-versleutelde berichten.",
-    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Dit apparaat verifiëren zal het als vertrouwd markeren, en gebruikers die met u geverifieerd hebben zullen het vertrouwen.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Deze persoon verifiëren zal de sessie als vertrouwd markeren voor u beide.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifieer dit apparaat om het als vertrouwd te markeren. Door dit apparaat te vertrouwen geeft u extra zekerheid aan uzelf en andere personen bij het gebruik van eind-tot-eind-versleutelde berichten.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Dit apparaat verifiëren zal het als vertrouwd markeren, en personen die met u geverifieerd hebben zullen het vertrouwen.",
     "Integrations are disabled": "Integraties zijn uitgeschakeld",
     "Enable 'Manage Integrations' in Settings to do this.": "Schakel de ‘Integratiebeheerder’ in in uw Instellingen om dit te doen.",
     "Integrations not allowed": "Integraties niet toegestaan",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Uw %(brand)s laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Het uitnodigen van volgende gebruikers voor gesprek is mislukt: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Uw direct gesprek kon niet aangemaakt worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
-    "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de gebruikers.",
-    "We couldn't invite those users. Please check the users you want to invite and try again.": "Deze gebruikers konden niet uitgenodigd worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
-    "Failed to find the following users": "Kon volgende gebruikers niet vinden",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Volgende gebruikers bestaan mogelijk niet of zijn ongeldig, en kunnen dan ook niet uitgenodigd worden: %(csvNames)s",
+    "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de personen.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Deze personen konden niet uitgenodigd worden. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.",
+    "Failed to find the following users": "Kon volgende personen niet vinden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Volgende personen bestaan mogelijk niet of zijn ongeldig, en kunnen niet uitgenodigd worden: %(csvNames)s",
     "Recent Conversations": "Recente gesprekken",
     "Suggestions": "Suggesties",
-    "Recently Direct Messaged": "Recente gesprekken",
+    "Recently Direct Messaged": "Recente directe gesprekken",
     "Go": "Start",
-    "Your account is not secure": "Uw account is onveilig",
-    "Your password": "Uw wachtwoord",
-    "This session, or the other session": "Deze sessie, of de andere sessie",
-    "The internet connection either session is using": "De internetverbinding gebruikt door een van de sessies",
-    "We recommend you change your password and recovery key in Settings immediately": "We raden u aan onmiddellijk uw wachtwoord en herstelsleutel te wijzigen in de instellingen",
-    "New session": "Nieuwe sessie",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Gebruik deze sessie om uw nieuwe sessie te verifiëren, waardoor deze laatste toegang verkrijgt tot versleutelde berichten:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account wellicht geschonden.",
-    "This wasn't me": "Dat was ik niet",
-    "Automatically invite users": "Gebruikers automatisch uitnodigen",
     "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 bugs, 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 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.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U upgrade deze kamer van <oldVersion /> naar <newVersion />.",
     "Verification Request": "Verificatieverzoek",
-    "Recovery key mismatch": "Herstelsleutel komt niet overeen",
-    "Incorrect recovery passphrase": "Onjuist herstelwachtwoord",
-    "Enter recovery passphrase": "Voer het herstelwachtwoord in",
-    "Enter recovery key": "Voer de herstelsleutel in",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Let op</b>: stel sleutelback-up enkel in op een vertrouwde computer.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Als u uw herstelsleutel vergeten bent, kunt u <button>nieuwe herstelopties instellen</button>",
     "Notification settings": "Meldingsinstellingen",
-    "Reload": "Herladen",
-    "Take picture": "Neem een foto",
     "Remove for everyone": "Verwijderen voor iedereen",
-    "Remove for me": "Verwijderen voor mezelf",
-    "User Status": "Gebruikersstatus",
+    "User Status": "Persoonsstatus",
     "Country Dropdown": "Landselectie",
     "Confirm your identity by entering your account password below.": "Bevestig uw identiteit door hieronder uw wachtwoord in te voeren.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Er is geen identiteitsserver geconfigureerd, dus u kunt geen e-mailadres toevoegen om in de toekomst een nieuw wachtwoord in te stellen.",
     "Jump to first unread room.": "Ga naar het eerste ongelezen gesprek.",
     "Jump to first invite.": "Ga naar de eerste uitnodiging.",
     "Session verified": "Sessie geverifieerd",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. U heeft nu toegang tot uw versleutelde berichten, en deze sessie zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
-    "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Als u de beveiliging van deze sessie niet vervolledigt, zal ze geen toegang hebben tot uw versleutelde berichten.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. U heeft nu toegang tot uw versleutelde berichten en deze sessie zal voor andere personen als vertrouwd gemarkeerd worden.",
+    "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Deze zal voor andere personen als vertrouwd gemarkeerd worden.",
     "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 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.": "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 wilt inloggen met een andere account.",
     "Command Autocomplete": "Opdrachten autoaanvullen",
-    "DuckDuckGo Results": "DuckDuckGo-resultaten",
     "Enter your account password to confirm the upgrade:": "Voer uw wachtwoord 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 moeten inloggen 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",
+    "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. Hiermee krijgen de andere sessies toegang tot uw versleutelde berichten en is het voor andere personen als vertrouwd gemarkeerd .",
     "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": "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.",
     "Create key backup": "Sleutelback-up aanmaken",
     "This session is encrypting history using the new recovery method.": "Deze sessie versleutelt uw geschiedenis aan de hand van de nieuwe herstelmethode.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Deze sessie heeft gedetecteerd dat uw herstelwachtwoord en -sleutel voor beveiligde berichten verwijderd zijn.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Als u dit per ongeluk heeft gedaan, kunt u beveiligde berichten op deze sessie instellen, waarmee de berichtgeschiedenis van deze sessie opnieuw zal versleuteld worden aan de hand van een nieuwe herstelmethode.",
     "Disable": "Uitschakelen",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s bewaart versleutelde berichten veilig in het lokale cachegeheugen om ze in uw zoekresultaten te laten verschijnen:",
@@ -1971,7 +1666,7 @@
     "Not currently indexing messages for any room.": "Er worden momenteel voor geen enkel gesprek berichten geïndexeerd.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s",
     "Where you’re logged in": "Waar u bent ingelogd",
-    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Beheer hieronder de namen van uw sessies en meld ze af. <a>Of verifieer ze in uw gebruikersprofiel</a>.",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Beheer hieronder de namen van uw sessies, verwijder ze <a>of verifieer ze in op uw profiel</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 je identiteit met je eenmalige aanmelding om dit e-mailadres toe te voegen.",
     "Single Sign On": "Eenmalige aanmelding",
@@ -1980,60 +1675,48 @@
     "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.",
-    "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",
     "Command failed": "Opdracht mislukt",
-    "Could not find user in room": "Kon die deelnemer aan het gesprek niet vinden",
+    "Could not find user in room": "Kan die persoon in de kamer niet vinden",
     "Please supply a widget URL or embed code": "Gelieve een widgetURL of in te bedden code te geven",
     "Send a bug report with logs": "Stuur een bugrapport met logs",
-    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s heeft het gesprek %(oldRoomName)s hernoemd tot %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft dit gesprek de nevenadressen %(addresses)s toegekend.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft dit gesprek het nevenadres %(addresses)s toegekend.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft de nevenadressen %(addresses)s voor dit gesprek geschrapt.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft het nevenadres %(addresses)s voor dit gesprek geschrapt.",
-    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s heeft de nevenadressen voor dit gesprek gewijzigd.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s heeft hoofd- en nevenadressen voor dit gesprek gewijzigd.",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s heeft de adressen voor dit gesprek gewijzigd.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s heeft de kamer %(oldRoomName)s hernoemd tot %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft dit kamer de nevenadressen %(addresses)s toegekend.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft deze kamer het nevenadres %(addresses)s toegekend.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft de nevenadressen %(addresses)s voor deze kamer geschrapt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft het nevenadres %(addresses)s voor deze kamer geschrapt.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s heeft de nevenadressen voor deze kamer gewijzigd.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s heeft hoofd- en nevenadressen voor deze kamer gewijzigd.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s heeft de adressen voor deze kamer gewijzigd.",
     "You signed in to a new session without verifying it:": "U heeft zich bij een nog niet geverifieerde sessie aangemeld:",
     "Verify your other session using one of the options below.": "Verifieer uw andere sessie op een van onderstaande wijzen.",
     "Manually Verify by Text": "Handmatig middels een tekst",
     "Interactively verify by Emoji": "Interactief middels emojis",
     "Support adding custom themes": "Sta maatwerkthema's toe",
-    "Opens chat with the given user": "Start een gesprek met die gebruiker",
-    "Sends a message to the given user": "Zendt die gebruiker een bericht",
-    "Font scaling": "Lettergrootte",
-    "Verify all your sessions to ensure your account & messages are safe": "Controleer al uw sessies om zeker te zijn dat uw account & berichten veilig zijn",
-    "Verify the new login accessing your account: %(name)s": "Verifieer de nieuwe login op uw account: %(name)s",
+    "Opens chat with the given user": "Start een chat met die persoon",
+    "Sends a message to the given user": "Zendt die persoon een bericht",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bevestig de deactivering van uw account door gebruik te maken van eenmalige aanmelding om uw identiteit te bewijzen.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten? Dit is onomkeerbaar.",
     "Confirm account deactivation": "Bevestig accountsluiting",
-    "Room name or address": "Gespreksnaam of -adres",
-    "Joins room with given address": "Neem aan het gesprek met dat adres deel",
-    "Unrecognised room address:": "Gespreksadres niet herkend:",
+    "Room name or address": "Kamernaam of -adres",
+    "Joins room with given address": "Neem aan de kamer met dat adres deel",
+    "Unrecognised room address:": "Kameradres niet herkend:",
     "Help us improve %(brand)s": "Help ons %(brand)s nog beter te maken",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Stuur <UsageDataLink>anonieme gebruiksinformatie</UsageDataLink> waarmee we %(brand)s kunnen verbeteren. Dit plaatst een <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "Ik wil helpen",
-    "Your homeserver has exceeded its user limit.": "Uw homeserver heeft het maximaal aantal gebruikers overschreden.",
+    "Your homeserver has exceeded its user limit.": "Uw homeserver heeft het maximaal aantal personen overschreden.",
     "Your homeserver has exceeded one of its resource limits.": "Uw homeserver heeft een van zijn limieten overschreden.",
     "Ok": "Oké",
     "Light": "Helder",
     "Dark": "Donker",
-    "Set password": "Stel wachtwoord in",
-    "To return to your account in future you need to set a password": "Zonder wachtwoord kunt u later niet tot uw account terugkeren",
-    "Restart": "Herstarten",
     "People": "Personen",
-    "Set a room address to easily share your room with other people.": "Geef het gesprek een adres om het gemakkelijk met anderen te kunnen delen.",
     "Invite people to join %(communityName)s": "Stuur uitnodigingen voor %(communityName)s",
     "Unable to access microphone": "Je microfoon lijkt niet beschikbaar",
     "The call was answered on another device.": "De oproep werd op een ander toestel beantwoord.",
     "Answered Elsewhere": "Ergens anders beantwoord",
     "The call could not be established": "De oproep kon niet worden volbracht",
-    "The other party declined the call.": "De tegenpartij heeft je oproep afgewezen.",
-    "Call Declined": "Oproep Afgewezen",
     "Bahrain": "Bahrein",
     "Bahamas": "Bahama's",
     "Azerbaijan": "Azerbeidzjan",
@@ -2296,17 +1979,16 @@
     "Belarus": "Wit-Rusland",
     "Barbados": "Barbados",
     "Bangladesh": "Bangladesh",
-    "See when the name changes in your active room": "Zien wanneer de naam in uw actieve gesprek veranderd",
-    "Change the name of your active room": "Verander de naam van uw actieve gesprek",
-    "See when the name changes in this room": "Zien wanneer de naam in dit gesprek veranderd",
-    "Change the name of this room": "Verander de naam van dit gesprek",
-    "See when the topic changes in your active room": "Zien wanneer het onderwerp veranderd van uw actieve gesprek",
-    "Change the topic of your active room": "Verander het onderwerp van uw actieve gesprek",
-    "See when the topic changes in this room": "Zien wanneer het onderwerp van dit gesprek veranderd",
-    "Change the topic of this room": "Verander het onderwerp van dit gesprek",
-    "Change which room, message, or user you're viewing": "Verander welk gesprek, bericht of welke gebruiker u ziet",
-    "Change which room you're viewing": "Verander welk gesprek u ziet",
-    "(connection failed)": "(verbinden mislukt)",
+    "See when the name changes in your active room": "Zien wanneer de naam in uw actieve kamer veranderd",
+    "Change the name of your active room": "Verander de naam van uw actieve kamer",
+    "See when the name changes in this room": "Zien wanneer de naam in deze kamer veranderd",
+    "Change the name of this room": "Verander de naam van deze kamer",
+    "See when the topic changes in your active room": "Zien wanneer het onderwerp veranderd van uw actieve kamer",
+    "Change the topic of your active room": "Verander het onderwerp van uw actieve kamer",
+    "See when the topic changes in this room": "Zien wanneer het onderwerp van deze kamer veranderd",
+    "Change the topic of this room": "Verander het onderwerp van deze kamer",
+    "Change which room, message, or user you're viewing": "Verander welk kamer, bericht of welke persoon u ziet",
+    "Change which room you're viewing": "Verander welke kamer u ziet",
     "Places the call in the current room on hold": "De huidige oproep in de wacht zetten",
     "Effects": "Effecten",
     "Are you sure you want to cancel entering passphrase?": "Weet u zeker, dat u het invoeren van uw wachtwoord wilt afbreken?",
@@ -2318,22 +2000,22 @@
     "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.": "De browser is verzocht uw homeserver te onthouden die u gebruikt om in te loggen, maar helaas heeft de browser deze vergeten. Ga naar de inlog-pagina en probeer het opnieuw.",
     "We couldn't log you in": "We konden u niet inloggen",
     "Room Info": "Gespreksinfo",
-    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is de grootste openbare homeserver van de wereld, dus het is een goede plek voor vele.",
-    "Explore Public Rooms": "Verken openbare gesprekken",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privégesprekken zijn alleen zichtbaar en toegankelijk met een uitnodiging. Openbare gesprekken zijn zichtbaar en toegankelijk voor iedereen in deze gemeenschap.",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is de grootste publieke homeserver van de wereld, en dus een goede plek voor de meeste.",
+    "Explore Public Rooms": "Publieke kamers ontdekken",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privékamers zijn alleen zichtbaar en toegankelijk met een uitnodiging. Publieke kamers zijn zichtbaar en toegankelijk voor iedereen in deze gemeenschap.",
     "This room is public": "Dit gesprek is openbaar",
     "Show previews of messages": "Voorvertoning van berichten inschakelen",
-    "Show message previews for reactions in all rooms": "Toon berichtvoorbeelden voor reacties in alle gesprekken",
-    "Explore public rooms": "Verken openbare gesprekken",
+    "Show message previews for reactions in all rooms": "Berichtvoorbeelden voor reacties in alle kamers tonen",
+    "Explore public rooms": "Publieke kamers ontdekken",
     "Leave Room": "Gesprek verlaten",
     "Room options": "Gesprekopties",
-    "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.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start een gesprek met iemand door hun naam, e-mailadres of inlognaam (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 afbeelding.",
+    "%(creator)s created this DM.": "%(creator)s maakte deze directe chat.",
     "Switch to dark mode": "Naar donkere modus wisselen",
     "Switch to light mode": "Naar lichte modus wisselen",
     "Appearance": "Weergave",
-    "All settings": "Alle instellingen",
+    "All settings": "Instellingen",
     "Error removing address": "Fout bij verwijderen van adres",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Er is een fout opgetreden bij het verwijderen van dit adres. Deze bestaat mogelijk niet meer, of er is een tijdelijke fout opgetreden.",
     "You don't have permission to delete the address.": "U heeft geen toestemming om het adres te verwijderen.",
@@ -2343,18 +2025,17 @@
     "Favourited": "Favoriet",
     "Forget Room": "Gesprek vergeten",
     "Notification options": "Meldingsinstellingen",
-    "Use default": "Gebruik standaardinstelling",
+    "Use default": "Standaardinstelling gebruiken",
     "Show %(count)s more|one": "Toon %(count)s meer",
     "Show %(count)s more|other": "Toon %(count)s meer",
-    "Show rooms with unread messages first": "Gesprekken met ongelezen berichten als eerste tonen",
+    "Show rooms with unread messages first": "Kamers met ongelezen berichten als eerste tonen",
     "%(count)s results|one": "%(count)s resultaten",
     "%(count)s results|other": "%(count)s resultaten",
-    "Explore all public rooms": "Verken alle openbare gespreken",
+    "Explore all public rooms": "Alle publieke kamers ontdekken",
     "Start a new chat": "Nieuw gesprek beginnen",
     "Can't see what you’re looking for?": "Niet kunnen vinden waar u naar zocht?",
     "Custom Tag": "Aangepast label",
-    "Explore community rooms": "Gemeenschapsgesprekken verkennen",
-    "Start a Conversation": "Begin een gesprek",
+    "Explore community rooms": "Gemeenschapskamers ontdekken",
     "Show Widgets": "Widgets tonen",
     "Hide Widgets": "Widgets verbergen",
     "This is the start of <roomName/>.": "Dit is het begin van <roomName/>.",
@@ -2363,7 +2044,7 @@
     "Topic: %(topic)s ": "Onderwerp: %(topic)s ",
     "Topic: %(topic)s (<a>edit</a>)": "Onderwerp: %(topic)s (<a>bewerken</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Dit is het begin van de geschiedenis van uw direct gesprek met <displayName/>.",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "De beheerder van uw server heeft eind-tot-eind-versleuteling standaard uitgeschakeld in alle privégesprekken en directe gesprekken.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "De beheerder van uw server heeft eind-tot-eind-versleuteling standaard uitgeschakeld in alle privékamers en directe gesprekken.",
     "Scroll to most recent messages": "Spring naar meest recente bericht",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "De echtheid van dit versleutelde bericht kan op dit apparaat niet worden gegarandeerd.",
     "To link to this room, please add an address.": "Voeg een adres toe om naar dit gesprek te kunnen verwijzen.",
@@ -2373,7 +2054,6 @@
     "Appearance Settings only affect this %(brand)s session.": "Weergave-instellingen zijn alleen van toepassing op deze %(brand)s sessie.",
     "Customise your appearance": "Weergave aanpassen",
     "Modern": "Modern",
-    "Compact": "Compact",
     "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",
@@ -2385,8 +2065,6 @@
     "Backup version:": "Versie reservekopie:",
     "The operation could not be completed": "De handeling kon niet worden voltooid",
     "Failed to save your profile": "Profiel opslaan mislukt",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "U heeft ze mogelijk ingesteld in een andere cliënt dan %(brand)s. U kunt ze niet aanpassen in %(brand)s, maar ze zijn wel actief.",
-    "There are advanced notifications which are not shown here.": "Er zijn geavanceerde meldingen die hier niet getoond worden.",
     "Delete sessions|one": "Verwijder sessie",
     "Delete sessions|other": "Verwijder sessies",
     "Click the button below to confirm deleting these sessions.|one": "Bevestig het verwijderen van deze sessie door op de knop hieronder te drukken.",
@@ -2398,14 +2076,10 @@
     "cached locally": "lokaal opgeslagen",
     "not found in storage": "Niet gevonden in de opslag",
     "Channel: <channelLink/>": "Kanaal: <channelLink/>",
-    "From %(deviceName)s (%(deviceId)s)": "Van %(deviceName)s %(deviceId)s",
     "Waiting for your other session to verify…": "Wachten op uw andere sessie om te verifiëren…",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Wachten op uw andere sessie, %(deviceName)s (%(deviceId)s), om te verifiëren…",
     "Verify this session by confirming the following number appears on its screen.": "Verifieer deze sessie door te bevestigen dat het scherm het volgende getal toont.",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Bevestig dat de emoji's hieronder op beide sessies in dezelfde volgorde worden getoond:",
-    "Incoming call": "Inkomende oproep",
-    "Incoming video call": "Inkomende video-oproep",
-    "Incoming voice call": "Inkomende spraakoproep",
     "Unknown caller": "Onbekende beller",
     "There was an error looking up the phone number": "Bij het zoeken naar het telefoonnummer is een fout opgetreden",
     "Unable to look up phone number": "Kan telefoonnummer niet opzoeken",
@@ -2420,12 +2094,9 @@
     "Uploading logs": "Logs uploaden",
     "Use Ctrl + Enter to send a message": "Gebruik Ctrl + Enter om een bericht te sturen",
     "Use Command + Enter to send a message": "Gebruik Command (⌘) + Enter om een bericht te sturen",
-    "Use Ctrl + F to search": "Ctrl + F om te zoeken gebruiken",
-    "Use Command + F to search": "Command (⌘) + F om te zoeken gebruiken",
     "Use a more compact ‘Modern’ layout": "Compacte 'Modern'-layout inschakelen",
     "Use custom size": "Aangepaste lettergrootte gebruiken",
     "Font size": "Lettergrootte",
-    "Enable advanced debugging for the room list": "Geavanceerde bugopsporing voor de gesprekkenlijst inschakelen",
     "Render LaTeX maths in messages": "Weergeef LaTeX-wiskundenotatie in berichten",
     "Change notification settings": "Meldingsinstellingen wijzigen",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
@@ -2442,24 +2113,21 @@
     "Call in progress": "Oproep gaande",
     "%(senderName)s joined the call": "%(senderName)s neemt deel aan de oproep",
     "You joined the call": "U heeft deelgenomen aan de oproep",
-    "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.",
+    "The person who invited you already left the room, or their server is offline.": "De persoon door wie u ben uitgenodigd heeft de kamer al verlaten, of hun server is offline.",
+    "The person who invited you already left the room.": "De persoon door wie u ben uitgenodigd heeft de kamer al verlaten.",
     "New version of %(brand)s is available": "Nieuwe versie van %(brand)s is beschikbaar",
     "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)",
     "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.": "U heeft eerder een nieuwere versie van %(brand)s in deze sessie gebruikt. Om deze versie opnieuw met eind-tot-eind-versleuteling te gebruiken, zult u moeten uitloggen en opnieuw inloggen.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Weiger iedereen die geen deel uitmaakt van %(serverName)s aan dit gesprek deel te nemen.",
     "Create a room in %(communityName)s": "Een gesprek aanmaken in %(communityName)s",
     "Enable end-to-end encryption": "Eind-tot-eind-versleuteling inschakelen",
     "Your server requires encryption to be enabled in private rooms.": "Uw server vereist dat versleuteling in een privégesprek is ingeschakeld.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privégesprekken zijn alleen zichtbaar en toegankelijk met een uitnodiging. Openbare gesprekken zijn zichtbaar en toegankelijk voor iedereen.",
     "An image will help people identify your community.": "Een afbeelding zal anderen helpen uw gemeenschap te vinden.",
     "Add image (optional)": "Afbeelding toevoegen (niet vereist)",
     "Enter name": "Naam invoeren",
     "What's the name of your community or team?": "Welke naam heeft uw gemeenschap of team?",
-    "You can change this later if needed.": "Indien nodig kunt u dit later nog veranderen.",
+    "You can change this later if needed.": "Indien nodig kunt u dit later nog wijzigen.",
     "Community ID: +<localpart />:%(domain)s": "Gemeenschaps-ID: +<localpart />:%(domain)s",
     "Reason (optional)": "Reden (niet vereist)",
     "Send %(count)s invites|one": "Stuur %(count)s uitnodiging",
@@ -2474,7 +2142,7 @@
     "Matrix": "Matrix",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Weet u zeker dat u <b>%(serverName)s</b> wilt verwijderen",
     "Your server": "Uw server",
-    "Can't find this server or its room list": "Kan deze server of de gesprekkenlijst niet vinden",
+    "Can't find this server or its room list": "Kan de server of haar kamergids niet vinden",
     "Looks good": "Ziet er goed uit",
     "Enter a server name": "Geef een servernaam",
     "Continue with %(provider)s": "Doorgaan met %(provider)s",
@@ -2483,7 +2151,6 @@
     "Server Options": "Server opties",
     "This address is already in use": "Dit adres is al in gebruik",
     "This address is available to use": "Dit adres kan worden gebruikt",
-    "Please provide a room address": "Geef een gespreksadres",
     "Room address": "Gespreksadres",
     "QR Code": "QR-code",
     "Information": "Informatie",
@@ -2505,7 +2172,6 @@
     "You've successfully verified your device!": "U heeft uw apparaat geverifieerd!",
     "Almost there! Is %(displayName)s showing the same shield?": "Bijna klaar! Toont %(displayName)s hetzelfde schild?",
     "Almost there! Is your other session showing the same shield?": "Bijna klaar! Toont uw andere sessie hetzelfde schild?",
-    "Role": "Rol",
     "Room settings": "Gespreksinstellingen",
     "Show files": "Bestanden tonen",
     "%(count)s people|other": "%(count)s personen",
@@ -2515,9 +2181,8 @@
     "Unpin a widget to view it in this panel": "Maak een widget los om het in dit deel te weergeven",
     "Unpin": "Losmaken",
     "You can only pin up to %(count)s widgets|other": "U kunt maar %(count)s widgets vastzetten",
-    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In versleutelde gesprekken zijn uw berichten beveiligd, enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
-    "Waiting for you to accept on your other session…": "Wachten totdat u uw uitnodiging in uw andere sessie aanneemt…",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Stel een adres in zodat gebruikers dit gesprek via uw homeserver (%(localDomain)s) kunnen vinden",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In versleutelde kamers zijn uw berichten beveiligd, enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Stel een adres in zodat personen dit gesprek via uw homeserver (%(localDomain)s) kunnen vinden",
     "Local Addresses": "Lokale adressen",
     "Local address": "Lokaal adres",
     "The server has denied your request.": "De server heeft uw verzoek afgewezen.",
@@ -2529,12 +2194,12 @@
     "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>.": "Let op, wanneer u geen e-mailadres toevoegt en uw wachtwoord vergeet, kunt u <b>toegang tot uw account permanent verliezen</b>.",
     "Continuing without email": "Doorgaan zonder e-mail",
     "If they don't match, the security of your communication may be compromised.": "Als deze niet overeenkomen, dan wordt deze sessie mogelijk door iemand anders onderschept.",
-    "Confirm by comparing the following with the User Settings in your other session:": "Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar Gebruikersinstellingen van deze sessie overeenkomt met de sleutel hieronder:",
+    "Confirm by comparing the following with the User Settings in your other session:": "Bevestig door het volgende te vergelijken met de persoonsinstellingen in uw andere sessie:",
     "Signature upload failed": "Versturen van ondertekening mislukt",
     "Signature upload success": "Ondertekening succesvol verstuurd",
     "Unable to upload": "Versturen niet mogelijk",
     "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.",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Start een gesprek met iemand door hun naam of inlognaam (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",
     "Click the button below to confirm your identity.": "Druk op de knop hieronder om uw identiteit te bevestigen.",
@@ -2554,7 +2219,6 @@
     "Show stickers button": "Stickers-knop tonen",
     "Offline encrypted messaging using dehydrated devices": "Offline versleutelde berichten met gebruik van uitgedroogde apparaten",
     "Show message previews for reactions in DMs": "Toon berichtvoorbeelden voor reacties in DM's",
-    "New spinner design": "Nieuw laadicoonontwerp",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Gemeenschappen v2 prototypes. Vereist een compatibele homeserver. Zeer experimenteel - gebruik met voorzichtigheid.",
     "Safeguard against losing access to encrypted messages & data": "Beveiliging tegen verlies van toegang tot versleutelde berichten en gegevens",
     "Set up Secure Backup": "Beveiligde back-up instellen",
@@ -2564,64 +2228,63 @@
     "Use app for a better experience": "Gebruik de app voor een betere ervaring",
     "Enable desktop notifications": "Bureaubladmeldingen inschakelen",
     "Don't miss a reply": "Mis geen antwoord",
-    "Unknown App": "Onbekende App",
-    "Error leaving room": "Fout bij verlaten gesprek",
-    "Unexpected server error trying to leave the room": "Onverwachte serverfout bij het verlaten van dit gesprek",
-    "See <b>%(msgtype)s</b> messages posted to your active room": "Zie <b>%(msgtype)s</b>-berichten verstuurd in uw actieve gesprek",
-    "See <b>%(msgtype)s</b> messages posted to this room": "Zie <b>%(msgtype)s</b>-berichten verstuurd in dit gesprek",
-    "Send <b>%(msgtype)s</b> messages as you in your active room": "Stuur <b>%(msgtype)s</b>-berichten als uzelf in uw actieve gesprek",
-    "Send <b>%(msgtype)s</b> messages as you in this room": "Stuur <b>%(msgtype)s</b>-berichten als uzelf in dit gesprek",
-    "See general files posted to your active room": "Zie bestanden verstuurd naar uw actieve gesprek",
-    "See general files posted to this room": "Zie bestanden verstuurd naar dit gesprek",
-    "Send general files as you in your active room": "Stuur bestanden als uzelf in uw actieve gesprek",
-    "Send general files as you in this room": "Stuur bestanden als uzelf in dit gesprek",
-    "See videos posted to your active room": "Zie videos verstuurd naar uw actieve gesprek",
-    "See videos posted to this room": "Zie videos verstuurd naar dit gesprek",
-    "Send videos as you in your active room": "Stuur videos als uzelf in uw actieve gesprek",
-    "Send videos as you in this room": "Stuur videos als uzelf in dit gesprek",
-    "See images posted to your active room": "Zie afbeeldingen verstuurd in uw actieve gesprek",
-    "See images posted to this room": "Zie afbeeldingen verstuurd in dit gesprek",
-    "Send images as you in your active room": "Stuur afbeeldingen als uzelf in uw actieve gesprek",
-    "Send images as you in this room": "Stuur afbeeldingen als uzelf in dit gesprek",
-    "See emotes posted to your active room": "Zie emoticons verstuurd naar uw actieve gesprek",
-    "See emotes posted to this room": "Zie emoticons verstuurd naar dit gesprek",
-    "Send emotes as you in your active room": "Stuur emoticons als uzelf in uw actieve gesprek",
-    "Send emotes as you in this room": "Stuur emoticons als uzelf in dit gesprek",
-    "See text messages posted to your active room": "Zie tekstberichten verstuurd naar uw actieve gesprek",
-    "See text messages posted to this room": "Zie tekstberichten verstuurd naar dit gesprek",
-    "Send text messages as you in your active room": "Stuur tekstberichten als uzelf in uw actieve gesprek",
-    "Send text messages as you in this room": "Stuur tekstberichten als uzelf in dit gesprek",
-    "See messages posted to your active room": "Zie berichten verstuurd naar uw actieve gesprek",
-    "See messages posted to this room": "Zie berichten verstuurd naar dit gesprek",
-    "Send messages as you in your active room": "Stuur berichten als uzelf in uw actieve gesprek",
-    "Send messages as you in this room": "Stuur berichten als uzelf in dit gesprek",
+    "Unknown App": "Onbekende app",
+    "Error leaving room": "Fout bij verlaten kamer",
+    "Unexpected server error trying to leave the room": "Onverwachte serverfout bij het verlaten van deze kamer",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Zie <b>%(msgtype)s</b>-berichten verstuurd in uw actieve kamer",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Zie <b>%(msgtype)s</b>-berichten verstuurd in deze kamer",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Stuur <b>%(msgtype)s</b>-berichten als uzelf in uw actieve kamer",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Stuur <b>%(msgtype)s</b>-berichten als uzelf in deze kamer",
+    "See general files posted to your active room": "Zie bestanden verstuurd naar uw actieve kamer",
+    "See general files posted to this room": "Zie bestanden verstuurd naar deze kamer",
+    "Send general files as you in your active room": "Stuur bestanden als uzelf in uw actieve kamer",
+    "Send general files as you in this room": "Stuur bestanden als uzelf in deze kamer",
+    "See videos posted to your active room": "Zie videos verstuurd naar uw actieve kamer",
+    "See videos posted to this room": "Zie videos verstuurd naar deze kamer",
+    "Send videos as you in your active room": "Stuur videos als uzelf in uw actieve kamer",
+    "Send videos as you in this room": "Stuur videos als uzelf in deze kamer",
+    "See images posted to your active room": "Zie afbeeldingen verstuurd in uw actieve kamer",
+    "See images posted to this room": "Zie afbeeldingen verstuurd in deze kamer",
+    "Send images as you in your active room": "Stuur afbeeldingen als uzelf in uw actieve kamer",
+    "Send images as you in this room": "Stuur afbeeldingen als uzelf in deze kamer",
+    "See emotes posted to your active room": "Zie emoticons verstuurd naar uw actieve kamer",
+    "See emotes posted to this room": "Zie emoticons verstuurd naar deze kamer",
+    "Send emotes as you in your active room": "Stuur emoticons als uzelf in uw actieve kamer",
+    "Send emotes as you in this room": "Stuur emoticons als uzelf in deze kamer",
+    "See text messages posted to your active room": "Zie tekstberichten verstuurd naar uw actieve kamer",
+    "See text messages posted to this room": "Zie tekstberichten verstuurd naar deze kamer",
+    "Send text messages as you in your active room": "Stuur tekstberichten als uzelf in uw actieve kamer",
+    "Send text messages as you in this room": "Stuur tekstberichten als uzelf in deze kamer",
+    "See messages posted to your active room": "Zie berichten verstuurd naar uw actieve kamer",
+    "See messages posted to this room": "Zie berichten verstuurd naar deze kamer",
+    "Send messages as you in your active room": "Stuur berichten als uzelf in uw actieve kamer",
+    "Send messages as you in this room": "Stuur berichten als uzelf in deze kamer",
     "End": "End",
     "The <b>%(capability)s</b> capability": "De <b>%(capability)s</b> mogelijkheid",
-    "See <b>%(eventType)s</b> events posted to your active room": "Stuur <b>%(eventType)s</b> gebeurtenissen verstuurd in uw actieve gesprek",
-    "Send <b>%(eventType)s</b> events as you in your active room": "Stuur <b>%(eventType)s</b> gebeurtenissen als uzelf in uw actieve gesprek",
-    "See <b>%(eventType)s</b> events posted to this room": "Zie <b>%(eventType)s</b> gebeurtenissen verstuurd in dit gesprek",
-    "Send <b>%(eventType)s</b> events as you in this room": "Stuur <b>%(eventType)s</b> gebeurtenis als uzelf in dit gesprek",
+    "See <b>%(eventType)s</b> events posted to your active room": "Stuur <b>%(eventType)s</b> gebeurtenissen verstuurd in uw actieve kamer",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Stuur <b>%(eventType)s</b> gebeurtenissen als uzelf in uw actieve kamer",
+    "See <b>%(eventType)s</b> events posted to this room": "Zie <b>%(eventType)s</b> gebeurtenissen verstuurd in deze kamer",
+    "Send <b>%(eventType)s</b> events as you in this room": "Stuur <b>%(eventType)s</b> gebeurtenis als uzelf in deze kamer",
     "with state key %(stateKey)s": "met statussleutel %(stateKey)s",
     "with an empty state key": "met een lege statussleutel",
-    "See when anyone posts a sticker to your active room": "Zien wanneer iemand een sticker in uw actieve gesprek verstuurd",
-    "Send stickers to your active room as you": "Stuur stickers naar uw actieve gesprek als uzelf",
-    "See when a sticker is posted in this room": "Zien wanneer stickers in dit gesprek zijn verstuurd",
-    "Send stickers to this room as you": "Stuur stickers in dit gesprek als uzelf",
-    "See when the avatar changes in your active room": "Zien wanneer de avatar in uw actieve gesprek veranderd",
-    "Change the avatar of your active room": "Wijzig de avatar van uw actieve gesprek",
-    "See when the avatar changes in this room": "Zien wanneer de avatar in dit gesprek veranderd",
-    "Change the avatar of this room": "Wijzig de gespreksavatar",
-    "Send stickers into your active room": "Stuur stickers in uw actieve gesprek",
-    "Send stickers into this room": "Stuur stickers in dit gesprek",
+    "See when anyone posts a sticker to your active room": "Zien wanneer iemand een sticker in uw actieve kamer verstuurd",
+    "Send stickers to your active room as you": "Stuur stickers naar uw actieve kamer als uzelf",
+    "See when a sticker is posted in this room": "Zien wanneer stickers in deze kamer zijn verstuurd",
+    "Send stickers to this room as you": "Stuur stickers in deze kamer als uzelf",
+    "See when the avatar changes in your active room": "Zien wanneer de afbeelding in uw actieve kamer veranderd",
+    "Change the avatar of your active room": "Wijzig de afbeelding van uw actieve kamer",
+    "See when the avatar changes in this room": "Zien wanneer de afbeelding in deze kamer veranderd",
+    "Change the avatar of this room": "Wijzig de kamerafbeelding",
+    "Send stickers into your active room": "Stuur stickers in uw actieve kamer",
+    "Send stickers into this room": "Stuur stickers in deze kamer",
     "Remain on your screen while running": "Blijft op uw scherm terwijl het beschikbaar is",
-    "Remain on your screen when viewing another room, when running": "Blijft op uw scherm wanneer u een andere gesprek bekijkt, zolang het beschikbaar is",
-    "(their device couldn't start the camera / microphone)": "(hun toestel kon de camera / microfoon niet starten)",
-    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alle servers zijn verbannen van deelname! Dit gesprek kan niet langer gebruikt worden.",
-    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s vernaderde de server ACL's voor dit gesprek.",
-    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s stelde de server ACL's voor dit gesprek in.",
-    "Converts the room to a DM": "Verandert dit groepsgesprek in een DM",
-    "Converts the DM to a room": "Verandert deze DM in een groepsgesprek",
-    "Takes the call in the current room off hold": "De huidige oproep in huidige gesprek in de wacht zetten",
+    "Remain on your screen when viewing another room, when running": "Blijft op uw scherm wanneer u een andere kamer bekijkt, zolang het bezig is",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alle servers zijn verbannen van deelname! Deze kamer kan niet langer gebruikt worden.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s veranderde de server ACL's voor deze kamer.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s stelde de server ACL's voor deze kamer in.",
+    "Converts the room to a DM": "Verandert deze kamer in een directe chat",
+    "Converts the DM to a room": "Verandert deze directe chat in een kamer",
+    "Takes the call in the current room off hold": "De huidige oproep in huidige kamer in de wacht zetten",
     "São Tomé & Príncipe": "Sao Tomé en Principe",
     "Swaziland": "Swaziland",
     "Sudan": "Soedan",
@@ -2634,21 +2297,20 @@
     "Oman": "Oman",
     "Theme added!": "Thema toegevoegd!",
     "Add theme": "Thema toevoegen",
-    "No recently visited rooms": "Geen onlangs bezochte gesprekken",
+    "No recently visited rooms": "Geen onlangs bezochte kamers",
     "Use the <a>Desktop app</a> to see all encrypted files": "Gebruik de <a>Desktop-app</a> om alle versleutelde bestanden te zien",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Herinnering: Uw browser wordt niet ondersteund. Dit kan een negatieve impact hebben op uw ervaring.",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Gebruik dit om anderen naar uw gemeenschap te verwijzen. De gemeenschaps-ID kan later niet meer veranderd worden.",
     "Please go into as much detail as you like, so we can track down the problem.": "Gebruik a.u.b. zoveel mogelijk details, zodat wij uw probleem kunnen vinden.",
     "There are two ways you can provide feedback and help us improve %(brand)s.": "U kunt op twee manieren feedback geven en ons helpen %(brand)s te verbeteren.",
     "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bekijk eerst de <existingIssuesLink>bestaande bugs op GitHub</existingIssuesLink>. <newIssueLink>Maak een nieuwe aan</newIssueLink> wanneer u uw bugs niet heeft gevonden.",
-    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, e-mailadres, gebruikersnaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
-    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, gebruikersnaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, e-mailadres, inlognaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, inlognaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
     "Send feedback": "Feedback versturen",
     "Feedback": "Feedback",
     "Feedback sent": "Feedback verstuurd",
     "Workspace: <networkLink/>": "Werkplaats: <networkLink/>",
     "Your firewall or anti-virus is blocking the request.": "Uw firewall of antivirussoftware blokkeert de aanvraag.",
-    "Show chat effects": "Gesprekseffecten tonen",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Stel de naam in van een lettertype dat op uw systeem is geïnstalleerd en %(brand)s zal proberen het te gebruiken.",
     "Toggle this dialog": "Dit dialoogvenster in- of uitschakelen",
     "Toggle right panel": "Rechterpaneel in- of uitschakelen",
@@ -2661,8 +2323,8 @@
     "Go to Home View": "Ga naar welkomscherm",
     "Activate selected button": "Geselecteerde knop activeren",
     "Close dialog or context menu": "Dialoogvenster of contextmenu sluiten",
-    "Previous/next room or DM": "Vorige/volgende gesprek",
-    "Previous/next unread room or DM": "Vorige/volgende ongelezen gesprek",
+    "Previous/next room or DM": "Vorige/volgende kamer of directe chat",
+    "Previous/next unread room or DM": "Vorige/volgende ongelezen kamer of directe chat",
     "Clear room list filter field": "Gespreklijst filter wissen",
     "Expand room list section": "Gespreklijst selectie uitvouwen",
     "Collapse room list section": "Gespreklijst selectie invouwen",
@@ -2696,7 +2358,6 @@
     "Calls": "Oproepen",
     "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 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",
@@ -2708,7 +2369,6 @@
     "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 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.",
@@ -2723,17 +2383,10 @@
     "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 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. 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",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(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 -wachtwoord",
     "Decide where your account is hosted": "Kies waar uw account wordt gehost",
@@ -2741,31 +2394,29 @@
     "Already have an account? <a>Sign in here</a>": "Heeft u al een account? <a>Inloggen</a>",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s of %(usernamePassword)s",
     "Continue with %(ssoButtons)s": "Ga verder met %(ssoButtons)s",
-    "That username already exists, please try another.": "Die gebruikersnaam bestaat al, probeer een andere.",
+    "That username already exists, please try another.": "Die inlognaam bestaat al, probeer een andere.",
     "New? <a>Create account</a>": "Nieuw? <a>Maak een account aan</a>",
-    "If you've joined lots of rooms, this might take a while": "Als u zich bij veel gesprekken heeft aangesloten, kan dit een tijdje duren",
+    "If you've joined lots of rooms, this might take a while": "Als u zich bij veel kamers heeft aangesloten, kan dit een tijdje duren",
     "Signing In...": "Inloggen...",
     "Syncing...": "Synchroniseren...",
     "There was a problem communicating with the homeserver, please try again later.": "Er was een communicatieprobleem met de homeserver, probeer het later opnieuw.",
-    "Community and user menu": "Gemeenschaps- en gebruikersmenu",
-    "User menu": "Gebruikersmenu",
+    "Community and user menu": "Gemeenschaps- en persoonsmenu",
+    "User menu": "Persoonsmenu",
     "Switch theme": "Thema wisselen",
     "Community settings": "Gemeenschapsinstellingen",
-    "User settings": "Gebruikersinstellingen",
+    "User settings": "Persoonsinstellingen",
     "Security & privacy": "Veiligheid & privacy",
     "New here? <a>Create an account</a>": "Nieuw hier? <a>Maak een account</a>",
     "Got an account? <a>Sign in</a>": "Heeft u een account? <a>Inloggen</a>",
     "Failed to find the general chat for this community": "De algemene chat voor deze gemeenschap werd niet gevonden",
     "Filter rooms and people": "Gespreken en personen filteren",
-    "Explore rooms in %(communityName)s": "Ontdek de gesprekken van %(communityName)s",
+    "Explore rooms in %(communityName)s": "Kamers van %(communityName)s ontdekken",
     "delete the address.": "het adres verwijderen.",
-    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Het gespreksadres %(alias)s en %(name)s uit de catalogus verwijderen?",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Het kameradres %(alias)s en %(name)s uit de gids verwijderen?",
     "You have no visible notifications.": "U hebt geen zichtbare meldingen.",
     "You’re all caught up": "U bent helemaal bij",
-    "Self-verification request": "Verzoek om zelfverificatie",
-    "You do not have permission to create rooms in this community.": "U hebt geen toestemming om gesprekken te maken in deze gemeenschap.",
+    "You do not have permission to create rooms in this community.": "U hebt geen toestemming om kamers te maken in deze gemeenschap.",
     "Cannot create rooms in this community": "Kan geen gesprek maken in deze gemeenschap",
-    "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 personen weten dat u het bent.",
@@ -2803,7 +2454,7 @@
     "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 ontsleuteld met dit veiligheidswachtwoord: controleer of u het juiste veiligheidswachtwoord hebt ingevoerd.",
-    "Incorrect Security Phrase": "Onjuist Veiligheidswachtwoord",
+    "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",
@@ -2821,7 +2472,7 @@
     "Looks good!": "Ziet er goed uit!",
     "Wrong file type": "Verkeerd bestandstype",
     "Remember this": "Onthoud dit",
-    "The widget will verify your user ID, but won't be able to perform actions for you:": "De widget zal uw gebruikers-ID verifiëren, maar zal geen acties voor u kunnen uitvoeren:",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "De widget zal uw persoon-ID verifiëren, maar zal geen acties voor u kunnen uitvoeren:",
     "Allow this widget to verify your identity": "Sta deze widget toe om uw identiteit te verifiëren",
     "Decline All": "Alles weigeren",
     "Approve": "Goedkeuren",
@@ -2835,10 +2486,9 @@
     "A connection error occurred while trying to contact the server.": "Er is een verbindingsfout opgetreden tijdens het contact maken met de server.",
     "Your area is experiencing difficulties connecting to the internet.": "Uw regio ondervindt problemen bij de verbinding met het internet.",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Uw server reageert niet op sommige van uw verzoeken. Hieronder staan enkele van de meest waarschijnlijke redenen.",
-    "We recommend you change your password and Security Key in Settings immediately": "Wij raden u aan uw wachtwoord en veiligheidssleutel in de instellingen onmiddellijk te wijzigen",
     "Data on this screen is shared with %(widgetDomain)s": "Gegevens op dit scherm worden gedeeld met %(widgetDomain)s",
     "Modal Widget": "Modale widget",
-    "Confirm this user's session by comparing the following with their User Settings:": "Bevestig de sessie van deze gebruiker door het volgende te vergelijken met zijn gebruikersinstellingen:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Bevestig de sessie van deze persoon door het volgende te vergelijken met zijn persoonsinstellingen:",
     "Cancelled signature upload": "Geannuleerde ondertekening upload",
     "%(brand)s encountered an error during upload of:": "%(brand)s is een fout tegengekomen tijdens het uploaden van:",
     "a key signature": "een sleutel ondertekening",
@@ -2846,8 +2496,8 @@
     "a new cross-signing key signature": "een nieuwe kruiselings ondertekenen ondertekening",
     "a new master key signature": "een nieuwe hoofdsleutel ondertekening",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Dit zal ze niet uitnodigen voor %(communityName)s. Als u iemand wilt uitnodigen voor %(communityName)s, klik <a>hier</a>",
-    "Failed to transfer call": "Gesprek niet doorverbonden",
-    "A call can only be transferred to a single user.": "Een oproep kan slechts naar één gebruiker worden doorverbonden.",
+    "Failed to transfer call": "Oproep niet doorverbonden",
+    "A call can only be transferred to a single user.": "Een oproep kan slechts naar één personen worden doorverbonden.",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Meer informatie vindt u in onze <privacyPolicyLink />, <termsOfServiceLink /> en <cookiePolicyLink />.",
     "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Door tijdelijk door te gaan, krijgt het installatieproces van %(hostSignupBrand)s toegang tot uw account om geverifieerde e-mailadressen op te halen. Deze gegevens worden niet opgeslagen.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Kan geen verbinding maken met uw homeserver. Sluit dit dialoogvenster en probeer het opnieuw.",
@@ -2859,7 +2509,6 @@
     "Server did not require any authentication": "Server heeft geen authenticatie nodig",
     "There was a problem communicating with the server. Please try again.": "Er was een communicatie probleem met de server. Probeer het opnieuw.",
     "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.": "U zou dit kunnen uitschakelen als dit gesprek gebruikt zal worden om samen te werken met externe teams die hun eigen homeserver hebben. Dit kan later niet meer veranderd worden.",
-    "Verify other session": "Verifier andere sessies",
     "About homeservers": "Over homeservers",
     "Learn more": "Lees verder",
     "Other homeserver": "Andere homeserver",
@@ -2878,18 +2527,15 @@
     "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.",
     "Preparing to download logs": "Klaarmaken om logs te downloaden",
-    "Matrix rooms": "Matrix-gesprekken",
-    "%(networkName)s rooms": "%(networkName)s gesprekken",
-    "Enter the name of a new server you want to explore.": "Voer de naam in van een nieuwe server die u wilt verkennen.",
+    "Matrix rooms": "Matrix-kamers",
+    "%(networkName)s rooms": "%(networkName)s kamers",
+    "Enter the name of a new server you want to explore.": "Voer de naam in van een nieuwe server die u wilt ontdekken.",
     "Remove server": "Server verwijderen",
-    "All rooms": "Alle gesprekken",
-    "Windows": "Windows",
-    "Screens": "Schermen",
-    "Share your screen": "Uw scherm delen",
+    "All rooms": "Alle kamers",
     "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 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 het veilig is.",
+    "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 deze kamer zijn eind-tot-eind-versleuteld. Als personen deelnemen, kan u ze verifiëren in hun profiel, tik hiervoor op hun afbeelding.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Controleer alle personen in versleutelde kamers om er zeker van te zijn dat het veilig is.",
+    "Verify all users in a room to ensure it's secure.": "Controleer alle personen in een kamer om er zeker van te zijn dat het veilig is.",
     "%(count)s people|one": "%(count)s persoon",
     "Add widgets, bridges & bots": "Widgets, bruggen & bots toevoegen",
     "Edit widgets, bridges & bots": "Widgets, bruggen & bots bewerken",
@@ -2897,17 +2543,16 @@
     "New published address (e.g. #alias:server)": "Nieuw gepubliceerd adres (b.v. #alias:server)",
     "No other published addresses yet, add one below": "Nog geen andere gepubliceerde adressen, voeg er hieronder een toe",
     "Other published addresses:": "Andere gepubliceerde adressen:",
-    "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.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om aan je groep deel te nemen. Om een adres te publiceren moet het eerste ingesteld worden als lokaaladres.",
     "Published Addresses": "Gepubliceerde adressen",
     "Mentions & Keywords": "Vermeldingen & Trefwoorden",
-    "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuw gesprek te beginnen of ontdek de bestaande gesprekken hieronder",
+    "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuwe kamer te beginnen of ontdek de bestaande kamers hieronder",
     "Open dial pad": "Kiestoetsen openen",
-    "Recently visited rooms": "Onlangs geopende gesprekken",
+    "Recently visited rooms": "Onlangs geopende kamers",
     "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",
-    "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.": "Voeg hier gebruikers en servers toe die u wilt negeren. Gebruik asterisken om %(brand)s met alle tekens te laten overeenkomen. Bijvoorbeeld, <code>@bot:*</code> zou alle gebruikers negeren die de naam 'bot' hebben op elke server.",
+    "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.": "Voeg hier personen en servers toe die u wilt negeren. Gebruik asterisken om %(brand)s met alle tekens te laten overeenkomen. Bijvoorbeeld, <code>@bot:*</code> zou alle personen negeren die de naam 'bot' hebben op elke server.",
     "Please verify the room ID or address and try again.": "Controleer het gesprek-ID of het adres en probeer het opnieuw.",
     "Message layout": "Berichtlayout",
     "Custom theme URL": "Aangepaste thema-URL",
@@ -2920,9 +2565,9 @@
     "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.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprekken.",
-    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifieer elke sessie die door een gebruiker wordt gebruikt afzonderlijk. Dit markeert hem als vertrouwd zonder te vertrouwen op kruislings ondertekende apparaten.",
-    "User signing private key:": "Gebruikerondertekening-privésleutel:",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s kamers.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifieer elke sessie die door een persoon wordt gebruikt afzonderlijk. Dit markeert hem als vertrouwd zonder te vertrouwen op kruislings ondertekende apparaten.",
+    "User signing private key:": "Persoonsondertekening-privésleutel:",
     "Master private key:": "Hoofdprivésleutel:",
     "Self signing private key:": "Zelfondertekening-privésleutel:",
     "Cross-signing is not set up.": "Kruiselings ondertekenen is niet ingesteld.",
@@ -2940,7 +2585,6 @@
     "Enable experimental, compact IRC style layout": "Compacte IRC-layout (experimenteel) inschakelen",
     "Minimize dialog": "Dialoog minimaliseren",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Als u nu annuleert, kunt u versleutelde berichten en gegevens verliezen als u geen toegang meer heeft tot uw login.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Bevestig uw identiteit door deze login te verifiëren vanuit een van uw andere sessies, waardoor u toegang krijgt tot uw versleutelde berichten.",
     "Verify this login": "Deze inlog verifiëren",
     "To continue, use Single Sign On to prove your identity.": "Om verder te gaan, gebruik uw eenmalige aanmelding om uw identiteit te bewijzen.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Plakt ( ͡° ͜ʖ ͡°) vóór een bericht zonder opmaak",
@@ -2951,7 +2595,7 @@
     "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 de personen weten waar het over gaat.",
-    "Upgrade to %(hostSignupBrand)s": "Upgrade naar %(hostSignupBrand)s",
+    "Upgrade to %(hostSignupBrand)s": "%(hostSignupBrand)s upgrade",
     "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:",
@@ -2971,212 +2615,149 @@
     "Value": "Waarde",
     "Setting ID": "Instellingen-ID",
     "Failed to save settings": "Kan geen instellingen opslaan",
-    "Settings Explorer": "Instellingen Ontdekken",
+    "Settings Explorer": "Instellingen ontdekken",
     "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 by username": "Op inlognaam 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",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Het uitnodigen van de volgende personen voor uw ruimte is mislukt: %(csvUsers)s",
+    "A private space for you and your teammates": "Een privéruimte 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...",
+    "Creating rooms...": "Kamers aanmaken...",
     "Skip for now": "Voorlopig overslaan",
-    "Failed to create initial space rooms": "Het maken van de space gesprekken is mislukt",
+    "Failed to create initial space rooms": "Het maken van de ruimte kamers 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 server does not support showing space hierarchies.": "Uw server heeft geen ondersteuning voor het weergeven van ruimte-indelingen.",
     "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",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Weet u zeker dat u de ruimte '%(spaceName)s' wilt verlaten?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Deze ruimte is niet openbaar. Zonder uitnodiging zult u niet opnieuw kunnen toetreden.",
+    "Start audio stream": "Audiostream starten",
     "Failed to start livestream": "Starten van livestream is mislukt",
-    "Unable to start audio streaming.": "Kan audio-streaming niet starten.",
+    "Unable to start audio streaming.": "Kan audiostream 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",
+    "Leave Space": "Ruimte verlaten",
+    "Failed to save space settings.": "Het opslaan van de ruimte-instellingen is mislukt.",
+    "Space settings": "Ruimte-instellingen",
+    "Edit settings relating to your space.": "Bewerk instellingen gerelateerd aan uw ruimte.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, inlognaam (zoals <userId/>) of <a>deel deze ruimte</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, e-mail, inlognaam (zoals <userId/>) of <a>deel deze ruimte</a>.",
+    "Unnamed Space": "Naamloze ruimte",
     "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": "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.",
+    "Spaces": "Ruimtes",
+    "Space selection": "Ruimte-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 persoon 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",
+    "You do not have permissions to add rooms to this space": "U hebt geen toestemming om kamers toe te voegen in deze ruimte",
+    "Add existing room": "Bestaande kamers toevoegen",
+    "You do not have permissions to create new rooms in this space": "U hebt geen toestemming om kamers te maken in deze ruimte",
     "Send message": "Bericht versturen",
-    "Invite to this space": "Uitnodigen voor deze space",
+    "Invite to this space": "Voor deze ruimte uitnodigen",
     "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",
+    "Space options": "Ruimte-opties",
+    "Leave space": "Ruimte verlaten",
     "Invite people": "Personen uitnodigen",
-    "Share your public space": "Deel uw openbare space",
-    "Invite members": "Leden uitnodigen",
-    "Invite by email or username": "Uitnodigen per e-mail of gebruikersnaam",
+    "Share your public space": "Deel uw publieke ruimte",
     "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",
+    "Collapse space panel": "Ruimte-paneel invouwen",
+    "Expand space panel": "Ruimte-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",
+    "Your private space": "Uw privéruimte",
+    "Your public space": "Uw publieke ruimte",
     "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",
+    "Open space for anyone, best for communities": "Publieke ruimte 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",
+    "Create a space": "Ruimte maken",
     "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.",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifieer deze login om toegang te krijgen tot uw versleutelde berichten en om anderen te bewijzen dat deze login echt van u is.",
-    "Verify with another session": "Verifieer met een andere sessie",
-    "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We zullen voor elk een gesprek maken. U kunt er later meer toevoegen, inclusief al bestaande gesprekken.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Laten we voor elk een gesprek maken. U kunt er later meer toevoegen, inclusief al bestaande gesprekken.",
-    "Make sure the right people have access. You can invite more later.": "Controleer of de juiste mensen toegang hebben. U kunt later meer mensen uitnodigen.",
-    "A private space to organise your rooms": "Een privé space om uw gesprekken te organiseren",
+    "Already in call": "Al in de oproep",
+    "You're already in a call with this person.": "U bent al een oproep met deze persoon.",
+    "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We zullen voor elk een kamer maken. U kunt er later meer toevoegen, inclusief al bestaande kamers.",
+    "Make sure the right people have access. You can invite more later.": "Controleer of de juiste personen toegang hebben. U kunt later meer personen uitnodigen.",
+    "A private space to organise your rooms": "Een privéruimte om uw kamers te organiseren",
     "Just me": "Alleen ik",
-    "Make sure the right people have access to %(name)s": "Controleer of de juiste mensen toegang hebben tot %(name)s",
+    "Make sure the right people have access to %(name)s": "Controleer of de juiste personen toegang hebben tot %(name)s",
     "Go to my first room": "Ga naar mijn eerste gesprek",
     "It's just you at the moment, it will be even better with others.": "Het is alleen u op dit moment, het zal nog beter zijn met anderen.",
     "Share %(name)s": "Deel %(name)s",
-    "Private space": "Privé space",
-    "Public space": "Openbare space",
+    "Private space": "Privéruimte",
+    "Public space": "Publieke ruimte",
     "<inviter/> invites you": "<inviter/> nodigt u uit",
-    "Search names and description": "Zoek in namen en beschrijvingen",
-    "Create room": "Gesprek aanmaken",
     "You may want to try a different search or check for typos.": "U kunt een andere zoekterm proberen of controleren op een typefout.",
     "No results found": "Geen resultaten gevonden",
     "Mark as suggested": "Markeer als aanbeveling",
     "Mark as not suggested": "Markeer als geen aanbeveling",
     "Removing...": "Verwijderen...",
-    "Failed to remove some rooms. Try again later": "Het verwijderen van sommige gesprekken is mislukt. Probeer het opnieuw",
-    "%(count)s rooms and 1 space|one": "%(count)s gesprek en 1 space",
-    "%(count)s rooms and 1 space|other": "%(count)s gesprekken en 1 space",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s gesprek en %(numSpaces)s spaces",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s gesprekken en %(numSpaces)s spaces",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Als u uw gesprek niet kan vinden, vraag dan om een uitnodiging of <a>maak een nieuw gesprek</a>.",
+    "Failed to remove some rooms. Try again later": "Het verwijderen van sommige kamers is mislukt. Probeer het opnieuw",
     "Suggested": "Aanbevolen",
     "This room is suggested as a good one to join": "Dit is een aanbevolen gesprek om aan deel te nemen",
     "%(count)s rooms|one": "%(count)s gesprek",
-    "%(count)s rooms|other": "%(count)s gesprekken",
+    "%(count)s rooms|other": "%(count)s kamers",
     "You don't have permission": "U heeft geen toestemming",
-    "Open": "Openen",
     "%(count)s messages deleted.|one": "%(count)s bericht verwijderd.",
     "%(count)s messages deleted.|other": "%(count)s berichten verwijderd.",
     "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.": "Normaal gesproken heeft dit alleen invloed op het verwerken van het gesprek op de server. Als u problemen ervaart met %(brand)s, stuur dan een bugmelding.",
     "Invite to %(roomName)s": "Uitnodiging voor %(roomName)s",
     "Edit devices": "Apparaten bewerken",
-    "Invite People": "Mensen uitnodigen",
-    "Invite with email or username": "Uitnodigen per e-mail of gebruikersnaam",
+    "Invite People": "Personen uitnodigen",
+    "Invite with email or username": "Uitnodigen per e-mail of inlognaam",
     "You can change these anytime.": "U kan dit elk moment nog aanpassen.",
-    "Add some details to help people recognise it.": "Voeg details toe zodat mensen het herkennen.",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Spaces zijn een nieuwe manier voor het groeperen van gesprekken. Voor deelname aan een bestaande space heeft u een uitnodiging nodig.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Van %(deviceName)s (%(deviceId)s) op %(ip)s",
+    "Add some details to help people recognise it.": "Voeg details toe zodat personen het herkennen.",
     "Check your devices": "Controleer uw apparaten",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Een nieuwe login heeft toegang tot uw account: %(name)s (%(deviceID)s) op %(ip)s",
     "You have unverified logins": "U heeft ongeverifieerde logins",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Zonder verifiëren heeft u geen toegang tot al uw berichten en kan u als onvertrouwd aangemerkt staan bij anderen.",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Verifeer uw identiteit om toegang te krijgen tot uw versleutelde berichten en om uw identiteit te bewijzen voor anderen.",
     "Use another login": "Gebruik andere login",
     "Please choose a strong password": "Kies een sterk wachtwoord",
-    "You can add more later too, including already existing ones.": "U kunt er later nog meer toevoegen, inclusief al bestaande gesprekken.",
+    "You can add more later too, including already existing ones.": "U kunt er later nog meer toevoegen, inclusief al bestaande kamers.",
     "Let's create a room for each of them.": "Laten we voor elk een los gesprek maken.",
     "What are some things you want to discuss in %(spaceName)s?": "Wat wilt u allemaal bespreken in %(spaceName)s?",
     "Verification requested": "Verificatieverzocht",
-    "Avatar": "Avatar",
+    "Avatar": "Afbeelding",
     "Verify other login": "Verifieer andere login",
     "You most likely do not want to reset your event index store": "U wilt waarschijnlijk niet uw gebeurtenisopslag-index resetten",
     "Reset event store?": "Gebeurtenisopslag resetten?",
     "Reset event store": "Gebeurtenisopslag resetten",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Als u dit wilt, let op uw berichten worden niet verwijderd, zal het zoeken tijdelijk minder goed werken terwijl we uw index opnieuw opbouwen",
     "Consult first": "Eerst overleggen",
     "Invited people will be able to read old messages.": "Uitgenodigde personen kunnen de oude berichten lezen.",
     "We couldn't create your DM.": "We konden uw DM niet aanmaken.",
     "Adding...": "Toevoegen...",
-    "Add existing rooms": "Bestaande gesprekken toevoegen",
+    "Add existing rooms": "Bestaande kamers toevoegen",
     "%(count)s people you know have already joined|one": "%(count)s persoon die u kent is al geregistreerd",
     "%(count)s people you know have already joined|other": "%(count)s personen die u kent hebben zijn al geregistreerd",
     "Accept on your other login…": "Accepteer op uw andere login…",
-    "Stop & send recording": "Stop & verstuur opname",
-    "Record a voice message": "Audiobericht opnemen",
-    "Invite messages are hidden by default. Click to show the message.": "Uitnodigingen zijn standaard verborgen. Klik om de uitnodigingen weer te geven.",
     "Quick actions": "Snelle acties",
     "Invite to just this room": "Uitnodigen voor alleen dit gesprek",
     "Warn before quitting": "Waarschuwen voordat u afsluit",
-    "Message search initilisation failed": "Zoeken in berichten opstarten is mislukt",
-    "Manage & explore rooms": "Beheer & ontdek gesprekken",
+    "Manage & explore rooms": "Beheer & ontdek kamers",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Overleggen met %(transferTarget)s. <a>Verstuur naar %(transferee)s</a>",
     "unknown person": "onbekend persoon",
-    "Share decryption keys for room history when inviting users": "Deel ontsleutelsleutels voor de gespreksgeschiedenis wanneer u personen uitnodigd",
-    "Send and receive voice messages (in development)": "Verstuur en ontvang audioberichten (in ontwikkeling)",
     "%(deviceId)s from %(ip)s": "%(deviceId)s van %(ip)s",
     "Review to ensure your account is safe": "Controleer ze zodat uw account veilig is",
     "Sends the given message as a spoiler": "Verstuurt het bericht als een spoiler",
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "U bent de enige persoon hier. Als u weggaat, zal niemand in de toekomst kunnen toetreden, u ook niet.",
-    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Als u alles reset, zult u opnieuw opstarten zonder vertrouwde sessies, zonder vertrouwde gebruikers, en zult u misschien geen vroegere berichten meer kunnen zien.",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Als u alles reset zult u opnieuw opstarten zonder vertrouwde sessies, zonder vertrouwde personen, en zult u misschien geen oude berichten meer kunnen zien.",
     "Only do this if you have no other device to complete verification with.": "Doe dit alleen als u geen ander apparaat hebt om de verificatie mee uit te voeren.",
     "Reset everything": "Alles opnieuw instellen",
-    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Alles vergeten of alle herstelmethoden verloren? <a>Alles opnieuw instellen</a>",
+    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Alles vergeten en alle herstelmethoden verloren? <a>Alles opnieuw instellen</a>",
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Als u dat doet, let wel geen van uw berichten wordt verwijderd, maar de zoekresultaten zullen gedurende enkele ogenblikken verslechteren terwijl de index opnieuw wordt aangemaakt",
     "View message": "Bericht bekijken",
     "Zoom in": "Inzoomen",
@@ -3193,36 +2774,29 @@
     "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s leden inclusief %(commaSeparatedMembers)s",
     "Including %(commaSeparatedMembers)s": "Inclusief %(commaSeparatedMembers)s",
     "View all %(count)s members|one": "1 lid bekijken",
-    "View all %(count)s members|other": "Bekijk alle %(count)s leden",
+    "View all %(count)s members|other": "Bekijk alle %(count)s personen",
     "Failed to send": "Verzenden is mislukt",
     "Enter your Security Phrase a second time to confirm it.": "Voor uw veiligheidswachtwoord een tweede keer in om het te bevestigen.",
-    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Kies een gesprek om hem toe te voegen. Dit is een space voor u, niemand zal hiervan een melding krijgen. U kan er later meer toevoegen.",
+    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Kies een kamer of gesprek om hem toe te voegen. Dit is een ruimte voor u, niemand zal hiervan een melding krijgen. U kan er later meer toevoegen.",
     "What do you want to organise?": "Wat wilt u organiseren?",
-    "Filter all spaces": "Alle spaces filteren",
-    "Delete recording": "Opname verwijderen",
-    "Stop the recording": "Opname stoppen",
-    "%(count)s results in all spaces|one": "%(count)s resultaat in alle spaces",
-    "%(count)s results in all spaces|other": "%(count)s resultaten in alle spaces",
-    "You have no ignored users.": "U heeft geen gebruiker genegeerd.",
+    "Filter all spaces": "Alle ruimtes filteren",
+    "%(count)s results in all spaces|one": "%(count)s resultaat in alle ruimtes",
+    "%(count)s results in all spaces|other": "%(count)s resultaten in alle ruimtes",
+    "You have no ignored users.": "U heeft geen persoon genegeerd.",
     "Play": "Afspelen",
     "Pause": "Pauze",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Dit is een experimentele functie.</b> Voorlopig moeten nieuwe personen die een uitnodiging krijgen de <link/> gebruiken om daadwerkelijk deel te nemen.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Om aan %(spaceName)s deel te nemen moet u de <a>Spaces beta</a> inschakelen",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Om %(spaceName)s te bekijken moet u de <a>Spaces beta</a> inschakelen",
     "Select a room below first": "Start met selecteren van een gesprek hieronder",
-    "Communities are changing to Spaces": "Gemeenschappen worden vervangen door Spaces",
     "Join the beta": "Beta inschakelen",
     "Leave the beta": "Beta verlaten",
     "Beta": "Beta",
     "Tap for more info": "Klik voor meer info",
-    "Spaces is a beta feature": "Spaces zijn in beta",
+    "Spaces is a beta feature": "Ruimtes zijn in beta",
     "Want to add a new room instead?": "Wilt u anders een nieuw gesprek toevoegen?",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Gesprek toevoegen...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Gesprekken toevoegen... (%(progress)s van %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)|other": "Kamers toevoegen... (%(progress)s van %(count)s)",
     "Not all selected were added": "Niet alle geselecteerden zijn toegevoegd",
-    "You can add existing spaces to a space.": "U kunt bestaande spaces toevoegen aan een space.",
-    "Feeling experimental?": "Zin in een experiment?",
-    "You are not allowed to view this server's rooms list": "U heeft geen toegang tot deze server zijn gesprekkenlijst",
+    "You are not allowed to view this server's rooms list": "U heeft geen toegang tot deze server zijn kamergids",
     "Error processing voice message": "Fout bij verwerking spraakbericht",
     "We didn't find a microphone on your device. Please check your settings and try again.": "We hebben geen microfoon gevonden op uw apparaat. Controleer uw instellingen en probeer het opnieuw.",
     "No microphone found": "Geen microfoon gevonden",
@@ -3231,35 +2805,364 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Zin in een experiment? Labs is de beste manier om dingen vroeg te krijgen, nieuwe functies uit te testen en ze te helpen vormen voordat ze daadwerkelijk worden gelanceerd. <a>Lees meer</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "Uw toegangstoken geeft u toegang to uw account. Deel hem niet met anderen.",
     "Access Token": "Toegangstoken",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Spaces zijn de nieuwe manier om gesprekken en personen te groeperen. Om aan een bestaande space deel te nemen heeft u een uitnodiging nodig.",
-    "Please enter a name for the space": "Vul een naam in voor deze space",
+    "Please enter a name for the space": "Vul een naam in voor deze ruimte",
     "Connecting": "Verbinden",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Peer-to-peer voor 1op1 oproepen toestaan (als u dit inschakelt kunnen andere personen mogelijk uw ipadres zien)",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "De beta is beschikbaar voor web, desktop en Android. Sommige functies zijn nog niet beschikbaar op uw homeserver.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "U kunt de beta elk moment verlaten via instellingen of door op de beta badge hierboven te klikken.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s zal herladen met Spaces ingeschakeld. Gemeenschappen en labels worden verborgen.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "De beta is beschikbaar voor web, desktop en Android. Bedankt dat u de beta wilt proberen.",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s zal herladen met Spaces uitgeschakeld. Gemeenschappen en labels zullen weer zichtbaar worden.",
-    "Spaces are a new way to group rooms and people.": "Spaces zijn de nieuwe manier om gesprekken en personen te groeperen.",
+    "Spaces are a new way to group rooms and people.": "Ruimtes zijn de nieuwe manier om kamers en personen te groeperen.",
     "Message search initialisation failed": "Zoeken in berichten opstarten is mislukt",
-    "Spaces are a beta feature.": "Spaces zijn een beta functie.",
     "Search names and descriptions": "Namen en beschrijvingen zoeken",
     "You may contact me if you have any follow up questions": "U mag contact met mij opnemen als u nog vervolg vragen heeft",
     "To leave the beta, visit your settings.": "Om de beta te verlaten, ga naar uw instellingen.",
-    "Your platform and username will be noted to help us use your feedback as much as we can.": "Uw platform en gebruikersnaam zullen worden opgeslagen om onze te helpen uw feedback zo goed mogelijk te gebruiken.",
+    "Your platform and username will be noted to help us use your feedback as much as we can.": "Uw platform en inlognaam zullen worden opgeslagen om onze te helpen uw feedback zo goed mogelijk te gebruiken.",
     "%(featureName)s beta feedback": "%(featureName)s beta feedback",
     "Thank you for your feedback, we really appreciate it.": "Bedankt voor uw feedback, we waarderen het enorm.",
-    "Beta feedback": "Beta feedback",
     "Add reaction": "Reactie toevoegen",
-    "Send and receive voice messages": "Stuur en ontvang spraakberichten",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Uw feedback maakt spaces beter. Hoe meer details u kan geven, des te beter.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Als u de pagina nu verlaat zal %(brand)s herladen met Spaces uitgeschakeld. Gemeenschappen en labels zullen weer zichtbaar worden.",
-    "Space Autocomplete": "Space Autocomplete",
-    "Go to my space": "Ga naar mijn space",
+    "Space Autocomplete": "Ruimte autocomplete",
+    "Go to my space": "Ga naar mijn ruimte",
     "sends space invaders": "verstuur space invaders",
-    "Sends the given message with a space themed effect": "Verstuur het bericht met een space-thema-effect",
-    "See when people join, leave, or are invited to your active room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd in uw actieve gesprek",
-    "Kick, ban, or invite people to your active room, and make you leave": "Verwijder, verban of nodig personen uit voor uw actieve gesprek en uzelf laten vertrekken",
-    "See when people join, leave, or are invited to this room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd voor dit gesprek",
-    "Kick, ban, or invite people to this room, and make you leave": "Verwijder, verban of verwijder personen uit dit gesprek en uzelf laten vertrekken"
+    "Sends the given message with a space themed effect": "Verstuur het bericht met een ruimte-thema-effect",
+    "See when people join, leave, or are invited to your active room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd in uw actieve kamer",
+    "Kick, ban, or invite people to your active room, and make you leave": "Verwijder, verban of nodig personen uit voor uw actieve kamer en uzelf laten vertrekken",
+    "See when people join, leave, or are invited to this room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd voor deze kamer",
+    "Kick, ban, or invite people to this room, and make you leave": "Verwijder, verban of verwijder personen uit deze kamer en uzelf laten vertrekken",
+    "Currently joining %(count)s rooms|one": "Momenteel aan het toetreden tot %(count)s gesprek",
+    "Currently joining %(count)s rooms|other": "Momenteel aan het toetreden tot %(count)s kamers",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Probeer andere woorden of controleer op typefouten. Sommige resultaten zijn mogelijk niet zichtbaar omdat ze privé zijn of u een uitnodiging nodig heeft om deel te nemen.",
+    "No results for \"%(query)s\"": "Geen resultaten voor \"%(query)s\"",
+    "The user you called is busy.": "De persoon die u belde is bezet.",
+    "User Busy": "Persoon Bezet",
+    "Teammates might not be able to view or join any private rooms you make.": "Teamgenoten zijn mogelijk niet in staat zijn om privékamers die u maakt te bekijken of er lid van te worden.",
+    "Or send invite link": "Of verstuur uw uitnodigingslink",
+    "If you can't see who you’re looking for, send them your invite link below.": "Als u niet kunt vinden wie u zoekt, stuur ze dan uw uitnodigingslink hieronder.",
+    "Some suggestions may be hidden for privacy.": "Sommige suggesties kunnen om privacyredenen verborgen zijn.",
+    "Search for rooms or people": "Zoek naar kamers of personen",
+    "Message preview": "Voorbeeld van bericht",
+    "Forward message": "Bericht doorsturen",
+    "Open link": "Koppeling openen",
+    "Sent": "Verstuurd",
+    "You don't have permission to do this": "U heeft geen rechten om dit te doen",
+    "Error - Mixed content": "Fout - Gemengde inhoud",
+    "Error loading Widget": "Fout bij laden Widget",
+    "Pinned messages": "Vastgeprikte berichten",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Als u de rechten heeft, open dan het menu op elk bericht en selecteer <b>Vastprikken</b> om ze hier te zetten.",
+    "Nothing pinned, yet": "Nog niks vastgeprikt",
+    "End-to-end encryption isn't enabled": "Eind-tot-eind-versleuteling is uitgeschakeld",
+    "[number]": "[number]",
+    "To view %(spaceName)s, you need an invite": "Om %(spaceName)s te bekijken heeft u een uitnodiging nodig",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "U kunt op elk moment op een afbeelding klikken in het filterpaneel om alleen de kamers en personen te zien die geassocieerd zijn met die gemeenschap.",
+    "Move down": "Omlaag",
+    "Move up": "Omhoog",
+    "Report": "Melden",
+    "Collapse reply thread": "Antwoorddraad invouwen",
+    "Show preview": "Preview weergeven",
+    "View source": "Bron bekijken",
+    "Forward": "Vooruit",
+    "Settings - %(spaceName)s": "Instellingen - %(spaceName)s",
+    "Report the entire room": "Rapporteer het hele gesprek",
+    "Spam or propaganda": "Spam of propaganda",
+    "Illegal Content": "Illegale Inhoud",
+    "Toxic Behaviour": "Giftig Gedrag",
+    "Disagree": "Niet mee eens",
+    "Please pick a nature and describe what makes this message abusive.": "Kies een reden en beschrijf wat dit bericht kwetsend maakt.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Een andere reden. Beschrijf alstublieft het probleem.\nDit zal gerapporteerd worden aan de gesprekmoderators.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Dit gesprek is gewijd aan illegale of giftige inhoud of de moderators falen om illegale of giftige inhoud te modereren.\nDit zal gerapporteerd worden aan de beheerders van %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Dit gesprek is gewijd aan illegale of giftige inhoud of de moderators falen om illegale of giftige inhoud te modereren.\nDit zal gerapporteerd worden aan de beheerders van %(homeserver)s. De beheerders zullen NIET in staat zijn om de versleutelde inhoud van dit gesprek te lezen.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Deze persoon spamt de kamer met advertenties, links naar advertenties of propaganda.\nDit zal gerapporteerd worden aan de moderators van dit gesprek.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Deze persoon vertoont illegaal gedrag, bijvoorbeeld door doxing van personen of te dreigen met geweld.\nDit zal gerapporteerd worden aan de moderators van dit gesprek die dit kunnen doorzetten naar de gerechtelijke autoriteiten.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Wat deze persoon schrijft is verkeerd.\nDit zal worden gerapporteerd aan de gesprekmoderators.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Deze persoon vertoont giftig gedrag, bijvoorbeeld door het beledigen van andere personen of het delen van inhoud voor volwassenen in een gezinsvriendelijke gesprek of het op een andere manier overtreden van de regels van dit gesprek.\nDit zal worden gerapporteerd aan de gesprekmoderators.",
+    "Please provide an address": "Geef een adres op",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s veranderde de server ACLs",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s veranderde de server ACLs %(count)s keer",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s veranderden de server ACLs",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s veranderden de server ACLs %(count)s keer",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Bericht zoeken initialisatie mislukt, controleer <a>uw instellingen</a> voor meer informatie",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Stel adressen in voor deze ruimte zodat personen deze ruimte kunnen vinden via uw server (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Om een adres te publiceren, moet het eerst als een lokaaladres worden ingesteld.",
+    "Published addresses can be used by anyone on any server to join your room.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om bij uw gesprek te komen.",
+    "Published addresses can be used by anyone on any server to join your space.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om uw ruimte te betreden.",
+    "This space has no local addresses": "Deze ruimte heeft geen lokaaladres",
+    "Space information": "Ruimte-informatie",
+    "Collapse": "Invouwen",
+    "Expand": "Uitvouwen",
+    "Recommended for public spaces.": "Aanbevolen voor publieke ruimtes.",
+    "Allow people to preview your space before they join.": "Personen toestaan een voorvertoning van uw ruimte te zien voor deelname.",
+    "Preview Space": "Ruimte voorvertoning",
+    "Decide who can view and join %(spaceName)s.": "Bepaal wie kan lezen en deelnemen aan %(spaceName)s.",
+    "Visibility": "Zichtbaarheid",
+    "This may be useful for public spaces.": "Dit kan nuttig zijn voor publieke ruimtes.",
+    "Guests can join a space without having an account.": "Gasten kunnen deelnemen aan een ruimte zonder een account.",
+    "Enable guest access": "Gastentoegang inschakelen",
+    "Failed to update the history visibility of this space": "Het bijwerken van de geschiedenis leesbaarheid voor deze ruimte is mislukt",
+    "Failed to update the guest access of this space": "Het bijwerken van de gastentoegang van deze ruimte is niet gelukt",
+    "Failed to update the visibility of this space": "Het bijwerken van de zichtbaarheid van deze ruimte is mislukt",
+    "Address": "Adres",
+    "e.g. my-space": "v.b. mijn-ruimte",
+    "Silence call": "Oproep dempen",
+    "Sound on": "Geluid aan",
+    "Show all rooms in Home": "Alle kamers in Thuis tonen",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Meld aan moderators prototype. In kamers die moderatie ondersteunen, kunt u met de `melden` knop misbruik melden aan de kamermoderators",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s heeft de <a>vastgeprikte berichten</a> voor de kamer gewijzigd.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s heeft %(targetName)s verwijderd",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s heeft %(targetName)s verbannen: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s heeft de uitnodiging van %(targetName)s ingetrokken",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s heeft de uitnodiging van %(targetName)s ingetrokken: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s heeft %(targetName)s ontbannen",
+    "%(targetName)s left the room": "%(targetName)s heeft de kamer verlaten",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s heeft de kamer verlaten: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s heeft de uitnodiging geweigerd",
+    "%(targetName)s joined the room": "%(targetName)s is tot de kamer toegetreden",
+    "%(senderName)s made no change": "%(senderName)s maakte geen wijziging",
+    "%(senderName)s set a profile picture": "%(senderName)s profielfoto is ingesteld",
+    "%(senderName)s changed their profile picture": "%(senderName)s profielfoto is gewijzigd",
+    "%(senderName)s removed their profile picture": "%(senderName)s profielfoto is verwijderd",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s weergavenaam (%(oldDisplayName)s) is verwijderd",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s heeft de weergavenaam %(displayName)s aangenomen",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s heeft %(displayName)s als weergavenaam aangenomen",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s verbande %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s verbande %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s nodigde %(targetName)s uit",
+    "%(targetName)s accepted an invitation": "%(targetName)s accepteerde de uitnodiging",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepteerde de uitnodiging voor %(displayName)s",
+    "Some invites couldn't be sent": "Sommige uitnodigingen konden niet verstuurd worden",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "De anderen zijn verstuurd, maar de volgende personen konden niet worden uitgenodigd voor <RoomName/>",
+    "Unnamed audio": "Naamloze audio",
+    "Error processing audio message": "Fout bij verwerking audiobericht",
+    "Show %(count)s other previews|one": "%(count)s andere preview weergeven",
+    "Show %(count)s other previews|other": "%(count)s andere previews weergeven",
+    "Images, GIFs and videos": "Afbeeldingen, GIF's en video's",
+    "Code blocks": "Codeblokken",
+    "Displaying time": "Tijdsweergave",
+    "To view all keyboard shortcuts, click here.": "Om alle sneltoetsen te zien, klik hier.",
+    "Keyboard shortcuts": "Sneltoetsen",
+    "Use Ctrl + F to search timeline": "Gebruik Ctrl +F om te zoeken in de tijdlijn",
+    "Use Command + F to search timeline": "Gebruik Command + F om te zoeken in de tijdlijn",
+    "User %(userId)s is already invited to the room": "De persoon %(userId)s is al uitgenodigd voor deze kamer",
+    "Integration manager": "Integratiebeheerder",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Uw %(brand)s laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Met het gebruik van deze widget deelt u mogelijk gegevens <helpIcon /> met %(widgetDomain)s & uw integratiebeheerder.",
+    "Identity server is": "Identiteitsserver is",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integratiebeheerders ontvangen configuratie-informatie en kunnen widgets aanpassen, gespreksuitnodigingen versturen en machtsniveau’s namens u aanpassen.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder om bots, widgets en stickerpakketten te beheren.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder <b>(%(serverName)s)</b> om bots, widgets en stickerpakketten te beheren.",
+    "Identity server": "Identiteitsserver",
+    "Identity server (%(server)s)": "Identiteitsserver (%(server)s)",
+    "Could not connect to identity server": "Kon geen verbinding maken met de identiteitsserver",
+    "Not a valid identity server (status code %(code)s)": "Geen geldige identiteitsserver (statuscode %(code)s)",
+    "Identity server URL must be HTTPS": "Identiteitsserver-URL moet HTTPS zijn",
+    "User Directory": "Personengids",
+    "There was an error loading your notification settings.": "Er was een fout bij het laden van uw meldingsvoorkeuren.",
+    "Mentions & keywords": "Vermeldingen & trefwoorden",
+    "Global": "Overal",
+    "New keyword": "Nieuw trefwoord",
+    "Keyword": "Trefwoord",
+    "Enable email notifications for %(email)s": "E-mailmeldingen inschakelen voor %(email)s",
+    "Enable for this account": "Voor dit account inschakelen",
+    "An error occurred whilst saving your notification preferences.": "Er is een fout opgetreden tijdens het opslaan van uw meldingsvoorkeuren.",
+    "Error saving notification preferences": "Fout bij het opslaan van meldingsvoorkeuren",
+    "Messages containing keywords": "Berichten met trefwoord",
+    "Transfer Failed": "Doorverbinden is mislukt",
+    "Unable to transfer call": "Doorverbinden is mislukt",
+    "Unable to copy a link to the room to the clipboard.": "Kopiëren van gesprekslink naar het klembord is mislukt.",
+    "Unable to copy room link": "Kopiëren van gesprekslink is mislukt",
+    "Copy Room Link": "Kopieer gesprekslink",
+    "Message bubbles": "Berichtenbubbels",
+    "IRC": "IRC",
+    "New layout switcher (with message bubbles)": "Nieuwe layout schakelaar (met berichtenbubbels)",
+    "The call is in an unknown state!": "Deze oproep heeft een onbekende status!",
+    "Call back": "Terugbellen",
+    "No answer": "Geen antwoord",
+    "An unknown error occurred": "Er is een onbekende fout opgetreden",
+    "Their device couldn't start the camera or microphone": "Het andere apparaat kon de camera of microfoon niet starten",
+    "Connection failed": "Verbinding mislukt",
+    "Could not connect media": "Mediaverbinding mislukt",
+    "Spaces with access": "Ruimtes met toegang",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Iedereen in een ruimte kan zoeken en deelnemen. <a>Wijzig hier welke ruimtes toegang hebben.</a>",
+    "Currently, %(count)s spaces have access|other": "Momenteel hebben %(count)s ruimtes toegang",
+    "& %(count)s more|other": "& %(count)s meer",
+    "Upgrade required": "Upgrade noodzakelijk",
+    "Anyone can find and join.": "Iedereen kan hem vinden en deelnemen.",
+    "Only invited people can join.": "Alleen uitgenodigde personen kunnen deelnemen.",
+    "Private (invite only)": "Privé (alleen op uitnodiging)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Deze upgrade maakt het mogelijk voor leden van geselecteerde ruimtes om toegang te krijgen tot deze kamer zonder een uitnodiging.",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Dit maakt het makkelijk om kamers privé te houden voor een ruimte, terwijl personen in de ruimte hem kunnen vinden en aan deelnemen. Alle nieuwe kamers in deze ruimte hebben deze optie beschikbaar.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Om ruimte leden te helpen met het vinden van en deel te nemen aan privékamers, ga naar uw kamerinstellingen voor veiligheid & privacy.",
+    "Help space members find private rooms": "Help ruimte leden privékamers te vinden",
+    "Help people in spaces to find and join private rooms": "Help personen in ruimtes om privékamers te vinden en aan deel te nemen",
+    "New in the Spaces beta": "Nieuw in de ruimtes beta",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Iedereen in <SpaceName/> kan deze kamer vinden en aan deelnemen.",
+    "Image": "Afbeelding",
+    "Sticker": "Sticker",
+    "Access": "Toegang",
+    "People with supported clients will be able to join the room without having a registered account.": "Personen met geschikte apps zullen aan de kamer kunnen deelnemen zonder een account te hebben.",
+    "Decide who can join %(roomName)s.": "Kies wie kan deelnemen aan %(roomName)s.",
+    "Space members": "Ruimte leden",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Iedereen in een ruimte kan zoeken en deelnemen. U kunt meerdere ruimtes selecteren.",
+    "Visible to space members": "Zichtbaar voor ruimte leden",
+    "Public room": "Openbaar gesprek",
+    "Private room (invite only)": "Privégesprek (alleen op uitnodiging)",
+    "Create a room": "Gesprek aanmaken",
+    "Only people invited will be able to find and join this room.": "Alleen uitgenodigde personen kunnen dit gesprek vinden en aan deelnemen.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Iedereen kan deze kamer vinden en aan deelnemen, niet alleen leden van <SpaceName/>.",
+    "You can change this at any time from room settings.": "U kan dit op elk moment wijzigen vanuit de gespreksinstellingen.",
+    "Error downloading audio": "Fout bij downloaden van audio",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Let op bijwerken maakt een nieuwe versie van dit gesprek</b>. Alle huidige berichten blijven in dit gearchiveerde gesprek.",
+    "Automatically invite members from this room to the new one": "Automatisch leden uitnodigen van dit gesprek in de nieuwe",
+    "These are likely ones other room admins are a part of.": "Dit zijn waarschijnlijk kamers waar andere kamerbeheerders deel van uitmaken.",
+    "Other spaces or rooms you might not know": "Andere ruimtes of kamers die u misschien niet kent",
+    "Spaces you know that contain this room": "Ruimtes die u kent met deze kamer",
+    "Search spaces": "Ruimtes zoeken",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Kies welke ruimtes toegang hebben tot deze kamer. Als een ruimte is geselecteerd kunnen deze leden <RoomName/> vinden en aan deelnemen.",
+    "Select spaces": "Ruimte selecteren",
+    "You're removing all spaces. Access will default to invite only": "U verwijderd alle ruimtes. De toegang zal teruggezet worden naar alleen op uitnodiging",
+    "Room visibility": "Gesprekszichtbaarheid",
+    "Anyone will be able to find and join this room.": "Iedereen kan de kamer vinden en aan deelnemen.",
+    "Share content": "Deel inhoud",
+    "Application window": "Deel een app",
+    "Share entire screen": "Deel uw gehele scherm",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "U kunt uw schermdelen door te klikken op schermdelen-knop tijdens een oproep. U kunt dit zelfs doen tijdens een audiogesprek als de ontvanger het ook ondersteund!",
+    "Screen sharing is here!": "Schermdelen is hier!",
+    "Your camera is still enabled": "Uw camera is nog ingeschakeld",
+    "Your camera is turned off": "Uw camera staat uit",
+    "%(sharerName)s is presenting": "%(sharerName)s is aan het presenteren",
+    "You are presenting": "U bent aan het presenteren",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Dankuwel voor het gebruiken van ruimtes. Uw feedback helpt ons volgende versies te maken.",
+    "Spaces feedback": "Ruimtes feedback",
+    "Spaces are a new feature.": "Ruimtes zijn een nieuwe functie.",
+    "All rooms you're in will appear in Home.": "Alle kamers waar u in bent zullen in Home verschijnen.",
+    "Send pseudonymous analytics data": "Pseudonieme analytische gegevens verzenden",
+    "We're working on this, but just want to let you know.": "We zijn er nog mee bezig en wilde het u even laten weten.",
+    "Search for rooms or spaces": "Kamers of ruimtes zoeken",
+    "Add space": "Ruimte toevoegen",
+    "Leave %(spaceName)s": "%(spaceName)s verlaten",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "U bent de enige beheerder van sommige kamers of spaces die u wilt verlaten. Door deze te verlaten hebben ze geen beheerder meer.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "U bent de enige beheerder van deze ruimte. Door het te verlaten zal er niemand meer controle over hebben.",
+    "You won't be able to rejoin unless you are re-invited.": "U kunt niet opnieuw deelnemen behalve als u opnieuw wordt uitgenodigd.",
+    "Search %(spaceName)s": "Zoek %(spaceName)s",
+    "Want to add an existing space instead?": "Een bestaande ruimte toevoegen?",
+    "Private space (invite only)": "Privéruimte (alleen op uitnodiging)",
+    "Space visibility": "Ruimte zichtbaarheid",
+    "Add a space to a space you manage.": "Voeg een ruimte toe aan een ruimte die u beheerd.",
+    "Only people invited will be able to find and join this space.": "Alleen uitgenodigde personen kunnen deze ruimte vinden en aan deelnemen.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Iedereen zal in staat zijn om deze ruimte te vinden en aan deel te nemen, niet alleen leden van <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Iedereen in <SpaceName/> zal in staat zijn om te zoeken en deel te nemen.",
+    "Adding spaces has moved.": "Ruimtes toevoegen is verplaatst.",
+    "Search for rooms": "Naar kamers zoeken",
+    "Search for spaces": "Naar ruimtes zoeken",
+    "Create a new space": "Maak een nieuwe ruimte",
+    "Want to add a new space instead?": "Een nieuwe ruimte toevoegen?",
+    "Add existing space": "Bestaande ruimte toevoegen",
+    "Decrypting": "Ontsleutelen",
+    "Show all rooms": "Alle kamers tonen",
+    "Give feedback.": "Feedback geven.",
+    "Missed call": "Oproep gemist",
+    "Call declined": "Oproep geweigerd",
+    "Surround selected text when typing special characters": "Geselecteerde tekst omsluiten bij het typen van speciale tekens",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s wijzigden de <a>vastgeprikte berichten</a> voor de kamer %(count)s keer.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s wijzigde de <a>vastgeprikte berichten</a> voor de kamer %(count)s keren.",
+    "Stop recording": "Opname stoppen",
+    "Send voice message": "Spraakbericht versturen",
+    "Olm version:": "Olm-versie:",
+    "Mute the microphone": "Microfoon uitschakelen",
+    "Unmute the microphone": "Microfoon inschakelen",
+    "Dialpad": "Toetsen",
+    "More": "Meer",
+    "Show sidebar": "Zijbalk weergeven",
+    "Hide sidebar": "Zijbalk verbergen",
+    "Start sharing your screen": "Schermdelen starten",
+    "Stop sharing your screen": "Schermdelen stoppen",
+    "Stop the camera": "Camera stoppen",
+    "Start the camera": "Camera starten",
+    "If a community isn't shown you may not have permission to convert it.": "Als een gemeenschap niet zichtbaar is heeft u geen rechten om hem om te zetten.",
+    "Show my Communities": "Mijn gemeenschappen weergeven",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Gemeenschappen zijn gearchiveerd voor de nieuwe functie ruimtes, maar u kunt uw gemeenschap nog omzetten naar een ruimte hieronder. Hierdoor bent u er zeker van dat uw gesprekken de nieuwste functies krijgen.",
+    "Create Space": "Ruimte maken",
+    "Open Space": "Ruimte openen",
+    "You can change this later.": "U kan dit later aanpassen.",
+    "What kind of Space do you want to create?": "Wat voor soort ruimte wilt u maken?",
+    "Delete avatar": "Afbeelding verwijderen",
+    "Don't send read receipts": "Geen leesbevestigingen versturen",
+    "Created from <Community />": "Gemaakt van <Community />",
+    "Communities won't receive further updates.": "Gemeenschappen zullen geen updates meer krijgen.",
+    "Spaces are a new way to make a community, with new features coming.": "Ruimtes zijn de nieuwe gemeenschappen, met binnenkort meer nieuwe functies.",
+    "Communities can now be made into Spaces": "Gemeenschappen kunnen nu omgezet worden in ruimtes",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Vraag een <a>beheerder</a> van deze gemeenschap om hem om te zetten in een ruimte en kijk uit naar de uitnodiging.",
+    "You can create a Space from this community <a>here</a>.": "U kunt <a>hier</a> een ruimte maken van uw gemeenschap.",
+    "This description will be shown to people when they view your space": "Deze omschrijving zal getoond worden aan personen die uw ruimte bekijken",
+    "Flair won't be available in Spaces for the foreseeable future.": "Badges zijn niet beschikbaar in ruimtes in de nabije toekomst.",
+    "All rooms will be added and all community members will be invited.": "Alle kamers zullen worden toegevoegd en alle gemeenschapsleden zullen worden uitgenodigd.",
+    "A link to the Space will be put in your community description.": "In de gemeenschapsomschrijving zal een link naar deze ruimte worden geplaatst.",
+    "Create Space from community": "Ruimte van gemeenschap maken",
+    "Failed to migrate community": "Omzetten van de gemeenschap is mislukt",
+    "To create a Space from another community, just pick the community in Preferences.": "Om een Space te maken van een gemeenschap kiest u de gemeenschap in Instellingen.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> is gemaakt en iedereen die lid was van de gemeenschap is ervoor uitgenodigd.",
+    "Space created": "Ruimte aangemaakt",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Om ruimtes te zien, verberg gemeenschappen in uw <a>Instellingen</a>",
+    "This community has been upgraded into a Space": "Deze gemeenschap is geupgrade naar een ruimte",
+    "Unknown failure: %(reason)s": "Onbekende fout: %(reason)s",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug logs bevatten applicatie gebruiksgegevens inclusief uw inlognaam, de ID's of aliassen van de kamers of groepen die u hebt bezocht, welke UI elementen u het laatst hebt gebruikt, en de inlognamen van andere personen. Ze bevatten geen berichten.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Als u een bug hebt ingediend via GitHub, kunnen debug logs ons helpen het probleem op te sporen. Debug logs bevatten applicatie gebruiksgegevens inclusief uw inlognaam, de ID's of aliassen van de kamers of groepen die u hebt bezocht, welke UI elementen u het laatst hebt gebruikt, en de inlognamen van andere personen. Ze bevatten geen berichten.",
+    "Rooms and spaces": "Kamers en ruimtes",
+    "Results": "Resultaten",
+    "Enable encryption in settings.": "Versleuteling inschakelen in instellingen.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Uw privéberichten zijn versleuteld, maar deze kamer niet. Dit komt vaak doordat u een niet ondersteund apparaat of methode, zoals e-mailuitnodigingen.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Om problemen te voorkomen, maak een<a>nieuwe publieke kamer</a> voor de gesprekken die u wilt voeren.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Het wordt afgeraden om publieke kamers te versleutelen.</b> Het betekend dat iedereen u kan vinden en aan deelnemen, dus iedereen kan al de berichten lezen. U krijgt dus geen voordelen bij versleuteling. Versleutelde berichten in een publieke kamer maakt het ontvangen en versturen van berichten langzamer.",
+    "Are you sure you want to make this encrypted room public?": "Weet u zeker dat u deze publieke kamer wilt versleutelen?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Om deze problemen te voorkomen, maak een <a>nieuwe versleutelde kamer</a> voor de gesprekken die u wilt voeren.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Het wordt afgeraden om versleuteling in te schakelen voor publieke kamers.</b>Iedereen kan publieke kamers vinden en aan deelnemen, dus iedereen kan de berichten lezen. U krijgt geen voordelen van de versleuteling en u kunt het later niet uitschakelen. Berichten versleutelen in een publieke kamer maakt het ontvangen en versturen van berichten langzamer.",
+    "Are you sure you want to add encryption to this public room?": "Weet u zeker dat u versleuteling wil inschakelen voor deze publieke kamer?",
+    "Cross-signing is ready but keys are not backed up.": "Kruiselings ondertekenen is klaar, maar de sleutels zijn nog niet geback-upt.",
+    "Low bandwidth mode (requires compatible homeserver)": "Lage bandbreedte modus (compatibele homeserver vereist)",
+    "Multiple integration managers (requires manual setup)": "Meerdere integratiemanagers (vereist handmatige instelling)",
+    "Thread": "Draad",
+    "Show threads": "Draad weergeven",
+    "Threaded messaging": "Draad berichten",
+    "The above, but in <Room /> as well": "Het bovenstaande, maar ook in <Room />",
+    "The above, but in any room you are joined or invited to as well": "Het bovenstaande, maar in elke kamer waar u aan deelneemt en voor uitgenodigd bent",
+    "Autoplay videos": "Videos automatisch afspelen",
+    "Autoplay GIFs": "GIF's automatisch afspelen",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s maakte een vastgeprikt bericht los van deze kamer. Bekijk alle vastgeprikte berichten.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s maakte <a>een vastgeprikt bericht</a> los van deze kamer. Bekijk alle <b>vastgeprikte berichten</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s prikte een bericht vast aan deze kamer. Bekijk alle vastgeprikte berichten.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s prikte <a>een bericht</a> aan deze kamer. Bekijk alle <b>vastgeprikte berichten</b>.",
+    "Currently, %(count)s spaces have access|one": "Momenteel heeft één ruimte toegang",
+    "& %(count)s more|one": "& %(count)s meer",
+    "Some encryption parameters have been changed.": "Enkele versleutingsparameters zijn gewijzigd.",
+    "Role in <RoomName/>": "Rol in <RoomName/>",
+    "Explore %(spaceName)s": "%(spaceName)s ontdekken",
+    "Send a sticker": "Verstuur een sticker",
+    "Reply to thread…": "Reageer op draad…",
+    "Reply to encrypted thread…": "Reageer op versleutelde draad…",
+    "Add emoji": "Emoji toevoegen",
+    "Unknown failure": "Onbekende fout",
+    "Failed to update the join rules": "Het updaten van de deelname regels is mislukt",
+    "Select the roles required to change various parts of the space": "Selecteer de rollen die vereist zijn om onderdelen van de ruimte te wijzigen",
+    "Change description": "Omschrijving wijzigen",
+    "Change main address for the space": "Hoofdadres van ruimte wijzigen",
+    "Change space name": "Ruimtenaam wijzigen",
+    "Change space avatar": "Ruimte-afbeelding wijzigen",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Iedereen in <spaceName/> kan zoeken en deelnemen. U kunt ook andere ruimtes selecteren.",
+    "Message didn't send. Click for info.": "Bericht is niet verstuur. Klik voor meer info.",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Om aan %(communityName)s deel te nemen, wissel naar gemeenschappen in uw <a>instellingen</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Om %(communityName)s te bekijken, wissel naar gemeenschappen in uw <a>instellingen</a>",
+    "Private community": "Privégemeenschap",
+    "Public community": "Publieke gemeenschap",
+    "Message": "Bericht",
+    "Upgrade anyway": "Upgrade alsnog uitvoeren",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Deze kamer is in ruimtes waar u geen beheerder van bent. In deze ruimtes zal de oude kamer nog worden getoond, maar leden zullen een melding krijgen om deel te nemen aan de nieuwe kamer.",
+    "Before you upgrade": "Voordat u upgrade",
+    "To join a space you'll need an invite.": "Om te kunnen deelnemen aan een ruimte heeft u een uitnodiging nodig.",
+    "You can also make Spaces from <a>communities</a>.": "U kunt ook ruimtes maken van uw <a>gemeenschappen</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Tijdelijk gemeenschappen tonen in plaats van ruimtes voor deze sessie. Ondersteuning zal worden verwijderd in de nabije toekomst. Dit zal Element herladen.",
+    "Display Communities instead of Spaces": "Gemeenschappen tonen ipv ruimtes",
+    "Joining space …": "Deelnemen aan ruimte…",
+    "To join this Space, hide communities in your <a>preferences</a>": "Om deel te nemen aan de ruimte, verberg gemeenschappen in uw <a>instellingen</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "Om deze ruimte te bekijken, verberg gemeenschappen in uw <a>instellingen</a>",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reageerde met %(content)s",
+    "Would you like to leave the rooms in this space?": "Wilt u de kamers verlaten in deze ruimte?",
+    "You are about to leave <spaceName/>.": "U staat op het punt <spaceName/> te verlaten.",
+    "Leave some rooms": "Sommige kamers verlaten",
+    "Leave all rooms": "Alle kamers verlaten",
+    "Don't leave any rooms": "Geen kamers verlaten"
 }
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 478f05b5cb..c383a578ec 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -6,13 +6,9 @@
     "The information being sent to us to help make %(brand)s better includes:": "Informasjon sendt til oss for å forbetre %(brand)s inkluderar:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Der denne sida inneheld gjenkjenneleg informasjon, slik som ein rom-, brukar- eller gruppeID, vert denne informasjonen sletta før han sendast til tenar.",
     "Call Failed": "Oppringjing Mislukkast",
-    "You are already in a call.": "Du er allereie i ei samtale.",
     "VoIP is unsupported": "VoIP er ikkje støtta",
     "You cannot place VoIP calls in this browser.": "Du kan ikkje utføra samtalar med VoIP i denne nettlesaren.",
     "You cannot place a call with yourself.": "Du kan ikkje samtala med deg sjølv.",
-    "Call in Progress": "Ei Samtale er i Gang",
-    "A call is currently being placed!": "Ei samtale held allereie på å starta!",
-    "A call is already in progress!": "Ei samtale er i gang allereie!",
     "Permission Required": "Tillating er Naudsynt",
     "You do not have permission to start a conference call in this room": "Du har ikkje tillating til å starta ei gruppesamtale i dette rommet",
     "Upload Failed": "Opplasting mislukkast",
@@ -64,7 +60,6 @@
     "Admin": "Administrator",
     "Operation failed": "Handling mislukkast",
     "Failed to invite": "Fekk ikkje til å invitera",
-    "Failed to invite the following users to the %(roomName)s room:": "Fekk ikkje til å invitera følgjande brukarar til %(roomName)s:",
     "You need to be logged in.": "Du må vera logga inn.",
     "You need to be able to invite users to do that.": "Du må ha lov til å invitera brukarar for å gjera det.",
     "Unable to create widget.": "Klarte ikkje å laga widget.",
@@ -78,10 +73,8 @@
     "Room %(roomId)s not visible": "Rommet %(roomId)s er ikkje synleg",
     "Missing user_id in request": "Manglande user_id i førespurnad",
     "Usage": "Bruk",
-    "Searches DuckDuckGo for results": "Søker på DuckDuckGo for resultat",
     "Your language of choice": "Ditt valde mål",
     "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
-    "/ddg is not a command": "/ddg er ikkje ein kommando",
     "Changes your display nickname": "Forandrar kallenamnet ditt",
     "Invites user with given id to current room": "Inviter brukarar med fylgjande ID inn i gjeldande rom",
     "Leave room": "Forlat rommet",
@@ -100,46 +93,17 @@
     "Every page you use in the app": "Alle sider du brukar i programmet",
     "e.g. <CurrentPageURL>": "t.d. <CurrentPageURL>",
     "Analytics": "Statistikk",
-    "Unable to capture screen": "Klarte ikkje ta opp skjermen",
-    "Existing Call": "Samtale er i gang",
-    "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka den, vent på at resultata fyller seg ut og tab gjennom dei.",
     "Deops user with given id": "AvOPar brukarar med den gjevne IDen",
     "Opens the Developer Tools dialog": "Opnar Utviklarverktøy-tekstboksen",
     "Which officially provided instance you are using, if any": "Kva offisielt gjevne instanse du brukar, viss nokon",
-    "The remote side failed to pick up": "Den andre sida tok ikkje røret",
     "Verified key": "Godkjend nøkkel",
     "Displays action": "Visar handlingar",
     "Reason": "Grunnlag",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s sa ja til innbydinga frå %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s sa ja til ei innbyding.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s bad om ei VoIP-gruppesamtale.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterte %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s stengde %(targetName)s ute.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endra visingsnamnet sitt til %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s sette visningsnamnet sitt som %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjerna visningsnamnet sitt (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s fjerna profilbiletet sitt.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s endra profilbiletet sitt.",
-    "%(senderName)s set a profile picture.": "%(senderName)s sette seg eit profilbilete.",
-    "VoIP conference started.": "Ei VoIP-gruppesamtale starta.",
-    "%(targetName)s joined the room.": "%(targetName)s kom inn i rommet.",
-    "VoIP conference finished.": "VoIP-gruppesamtale enda.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s sa nei til innbydinga.",
-    "%(targetName)s left the room.": "%(targetName)s fór frå rommet.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s fjerna utestenginga til %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s sparka %(targetName)s ut.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s tok attende %(targetName)s si innbyding.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s gjorde emnet om til \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjerna romnamnet.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s gjorde romnamnet om til %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sende eit bilete.",
     "Someone": "Nokon",
-    "(not supported by this browser)": "(ikkje støtta av denne nettlesaren)",
-    "%(senderName)s answered the call.": "%(senderName)s svarde på samtalen.",
-    "(could not connect media)": "(klarte ikkje å kopla media saman)",
-    "(no answer)": "(ingen svar)",
-    "(unknown failure: %(reason)s)": "(ukjend feil: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s avslutta samtalen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterte %(targetDisplayName)s til å bli med i rommet.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemmar frå då dei vart invitert.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde slik at framtidig romhistorie er tilgjengeleg for alle rommedlemmar frå då dei kom inn.",
@@ -163,18 +127,14 @@
     "Message Pinning": "Meldingsfesting",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vis tidspunkt i 12-timarsform (t.d. 2:30pm)",
     "Always show message timestamps": "Vis alltid meldingstidspunkt",
-    "Autoplay GIFs and videos": "Spel av GIFar og videoar med ein gong",
-    "Always show encryption icons": "Vis alltid krypteringsikon",
     "Automatically replace plain text Emoji": "Erstatt Emojiar i klartekst av seg sjølv",
     "Mirror local video feed": "Spegl den lokale videofeeden",
     "Send analytics data": "Send statistikkdata",
     "Enable URL previews for this room (only affects you)": "Skru URL-førehandsvisingar på for dette rommet (påverkar deg åleine)",
     "Enable URL previews by default for participants in this room": "Skru URL-førehandsvisingar på som utgangspunkt for deltakarar i dette rommet",
-    "Room Colour": "Romfarge",
     "Enable widget screenshots on supported widgets": "Skru widget-skjermbilete på for støtta widgetar",
     "Collecting app version information": "Samlar versjonsinfo for programmet",
     "Collecting logs": "Samlar loggar",
-    "Uploading report": "Lastar rapport opp",
     "Waiting for response from server": "Ventar på svar frå tenaren",
     "Messages containing my display name": "Meldingar som inneheld visingsnamnet mitt",
     "Messages in one-to-one chats": "Meldingar i ein-til-ein-samtalar",
@@ -182,11 +142,6 @@
     "When I'm invited to a room": "Når eg blir invitert til eit rom",
     "Call invitation": "Samtaleinvitasjonar",
     "Messages sent by bot": "Meldingar sendt frå ein bot",
-    "Active call (%(roomName)s)": "Pågåande samtale (%(roomName)s)",
-    "unknown caller": "ukjend ringar",
-    "Incoming voice call from %(name)s": "Innkommande talesamtale frå %(name)s",
-    "Incoming video call from %(name)s": "%(name)s ynskjer ei videosamtale",
-    "Incoming call from %(name)s": "%(name)s ynskjer ei samtale",
     "Decline": "Sei nei",
     "Accept": "Sei ja",
     "Error": "Noko gjekk gale",
@@ -210,42 +165,16 @@
     "Authentication": "Authentisering",
     "Last seen": "Sist sedd",
     "Failed to set display name": "Fekk ikkje til å setja visningsnamn",
-    "Error saving email notification preferences": "Klarte ikkje å lagra varslingsinnstillingar for e-post",
-    "An error occurred whilst saving your email notification preferences.": "Noko gjekk gale med lagringa av varslingsinnstillingar for e-post.",
-    "Keywords": "Nøkkelord",
-    "Enter keywords separated by a comma:": "Skriv inn nøkkelord med komma imellom:",
     "OK": "Greitt",
-    "Failed to change settings": "Klarte ikkje å endra innstillingar",
-    "Can't update user notification settings": "Kan ikkje oppdatera brukarvarselinstillingar",
-    "Failed to update keywords": "Fekk ikkje til å oppdatera nøkkelord",
-    "Messages containing <span>keywords</span>": "Meldingar som inneheld <span>nøkkelord</span>",
-    "Notify for all other messages/rooms": "Varsl for alle andre meldingar/rom",
-    "Notify me for anything else": "Varsl meg for kva som helst anna",
-    "Enable notifications for this account": "Aktiver varslingar for denne kontoen",
-    "All notifications are currently disabled for all targets.": "Alle varsel er for akkurat no skrudd av for alle mål.",
-    "Enable email notifications": "Skru epostvarsel på",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsel på fylgjande nøkkelord følgjer reglar som ikkje kan visast her:",
-    "Unable to fetch notification target list": "Klarte ikkje å henta varselmållista",
     "Notification targets": "Varselmål",
-    "Advanced notification settings": "Avanserte varslingsinnstillingar",
     "Show message in desktop notification": "Vis meldinga i eit skriverbordsvarsel",
     "Off": "Av",
     "On": "På",
     "Noisy": "Bråkete",
-    "Cannot add any more widgets": "Kan ikkje leggja fleire widgets til",
-    "Add a widget": "Legg til ein widget",
-    "Drop File Here": "Slepp Fila Her",
     "Drop file here to upload": "Slipp ein fil her for å lasta opp",
-    " (unsupported)": " (ustøtta)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå inn med <voiceText>tale</voiceText> eller <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Ein gruppesamtale er i gang%(supportedText)s.",
     "This event could not be displayed": "Denne hendingen kunne ikkje visast",
-    "%(senderName)s sent an image": "%(senderName)s sende eit bilete",
-    "%(senderName)s sent a video": "%(senderName)s sende ein video",
-    "%(senderName)s uploaded a file": "%(senderName)s lasta ei fil opp",
     "Options": "Innstillingar",
     "Key request sent.": "Nykelforespurnad er send.",
-    "Please select the destination room for this message": "Vel kva rom som skal få denne meldinga",
     "Disinvite": "Fjern invitasjon",
     "Kick": "Spark ut",
     "Disinvite this user?": "Fjern invitasjonen for denne brukaren?",
@@ -287,12 +216,7 @@
     "Server error": "Noko gjekk gale med tenaren",
     "Server unavailable, overloaded, or something else went wrong.": "Tenar utilgjengeleg, overlasta eller har eit anna problem.",
     "Command error": "Noko gjekk gale med kommandoen",
-    "The maximum permitted number of widgets have already been added to this room.": "Det største mogelege talet widgets finst allereie på dette rommet.",
-    "Unpin Message": "Fjern festa melding",
-    "Jump to message": "Hopp til melding",
-    "No pinned messages.": "Ingen festa meldingar.",
     "Loading...": "Lastar...",
-    "Pinned Messages": "Festa meldingar",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)st",
@@ -320,7 +244,6 @@
     "Forget room": "Gløym rom",
     "Search": "Søk",
     "Share room": "Del rom",
-    "Community Invites": "Fellesskapsinvitasjonar",
     "Invites": "Invitasjonar",
     "Favourites": "Yndlingar",
     "Rooms": "Rom",
@@ -339,12 +262,7 @@
     "Muted Users": "Dempa brukarar",
     "Banned users": "Utestengde brukarar",
     "Favourite": "Yndling",
-    "Guests cannot join this room even if explicitly invited.": "Gjester kan ikkje bli med i dette rommet, sjølv om dei vart spesifikt invitert.",
-    "Click here to fix": "Klikk her for å retta opp i det",
-    "Who can access this room?": "Kven har tilgang til rommet?",
     "Only people who have been invited": "Berre dei som har vorte inviterte",
-    "Anyone who knows the room's link, apart from guests": "Dei som kjenner lenkja til rommet, sett vekk frå gjester",
-    "Anyone who knows the room's link, including guests": "Dei som kjenner lenkja til rommet, gjester òg",
     "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sin romkatalog?",
     "Who can read history?": "Kven kan lesa historia?",
     "Anyone": "Kven som helst",
@@ -353,7 +271,6 @@
     "Members only (since they joined)": "Berre medlemmar (frå då dei kom inn)",
     "Permissions": "Tillatelsar",
     "Advanced": "Avansert",
-    "Add a topic": "Legg til eit emne",
     "Search…": "Søk…",
     "This Room": "Dette rommet",
     "All Rooms": "Alle rom",
@@ -386,7 +303,6 @@
     "Saturday": "laurdag",
     "Today": "i dag",
     "Yesterday": "i går",
-    "Error decrypting audio": "Noko gjekk gale med ljoddekrypteringa",
     "Error decrypting attachment": "Noko gjekk gale med vedleggsdekrypteringa",
     "Decrypt %(text)s": "Dekrypter %(text)s",
     "Download %(text)s": "Last %(text)s ned",
@@ -399,20 +315,14 @@
     "Copied!": "Kopiert!",
     "Failed to copy": "Noko gjekk gale med kopieringa",
     "Dismiss": "Avvis",
-    "An email has been sent to %(emailAddress)s": "En epost vart send til %(emailAddress)s",
-    "Please check your email to continue registration.": "Ver venleg og sjekk eposten din for å gå vidare med påmeldinga.",
     "A text message has been sent to %(msisdn)s": "Ei tekstmelding vart send til %(msisdn)s",
     "Please enter the code it contains:": "Ver venleg og skriv koden den inneheld inn:",
     "Code": "Kode",
     "Start authentication": "Start authentisering",
     "powered by Matrix": "Matrixdriven",
-    "The email field must not be blank.": "Epostfeltet kan ikkje vera tomt.",
-    "The phone number field must not be blank.": "Telefonnummerfeltet kan ikkje vera tomt.",
-    "The password field must not be blank.": "Passordfeltet kan ikkje vera tomt.",
     "Sign in with": "Logg inn med",
     "Email address": "Epostadresse",
     "Sign in": "Logg inn",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Viss du ikkje seier kva epostadresse du vil bruka vil du ikkje kunna attendestille passordet ditt. Er du sikker?",
     "Register": "Meld deg inn",
     "Remove from community": "Fjern frå fellesskapet",
     "Disinvite this user from community?": "Fjerne denne brukaren sin invitasjon til fellesskapet?",
@@ -432,32 +342,23 @@
     "Something went wrong when trying to get your communities.": "Noko gjekk gale under innlasting av fellesskapa du er med i.",
     "Display your community flair in rooms configured to show it.": "Vis fellesskaps-etiketten din i rom som er stilt inn til å visa det.",
     "You're not currently a member of any communities.": "Du er for tida ikkje medlem i nokon fellesskap.",
-    "You are not receiving desktop notifications": "Du fær ikkje skrivebordsvarsel",
-    "Enable them now": "Skru dei på no",
     "What's New": "Kva er nytt",
     "Update": "Oppdatering",
     "What's new?": "Kva er nytt?",
-    "Set Password": "Set Passord",
     "Error encountered (%(errorDetail)s).": "Noko gjekk gale (%(errorDetail)s).",
     "Checking for an update...": "Ser etter oppdateringar...",
     "No update available.": "Inga oppdatering er tilgjengeleg.",
     "Downloading update...": "Lastar oppdatering ned...",
     "Warning": "Åtvaring",
     "Unknown Address": "Ukjend Adresse",
-    "Allow": "Tillat",
     "Delete Widget": "Slett Widgeten",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Å sletta ein widget fjernar den for alle brukarane i rommet. Er du sikker på at du vil sletta denne widgeten?",
     "Delete widget": "Slett widgeten",
-    "Failed to remove widget": "Fekk ikkje til å fjerna widgeten",
-    "An error ocurred whilst trying to remove the widget from the room": "Noko gjekk gale med fjerninga av widgeten frå rommet",
     "Edit": "Gjer om",
     "Create new room": "Lag nytt rom",
     "No results": "Ingen resultat",
     "Communities": "Fellesskap",
     "Home": "Heim",
-    "You cannot delete this image. (%(code)s)": "Du kan ikkje sletta dette biletet. (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Lasta opp %(date)s av %(user)s",
-    "Download this file": "Last denne fila ned",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s har kome inn %(count)s gonger",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s kom inn",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s har kome inn %(count)s gonger",
@@ -512,11 +413,8 @@
     "collapse": "Slå saman",
     "expand": "Utvid",
     "<a>In reply to</a> <pill>": "<a>Som svar til</a> <pill>",
-    "Room directory": "Romkatalog",
     "Start chat": "Start samtale",
     "And %(count)s more...|other": "Og %(count)s til...",
-    "ex. @bob:example.com": "t.d. @ivar:eksempel.no",
-    "Add User": "Legg Brukar til",
     "Matrix ID": "Matrix-ID",
     "Matrix Room ID": "Matrixrom-ID",
     "email address": "epostadresse",
@@ -540,7 +438,6 @@
     "Create Room": "Lag eit Rom",
     "World readable": "Kan lesast av alle",
     "not specified": "Ikkje spesifisert",
-    "Minimize apps": "Minimer applikasjonar",
     "Confirm Removal": "Godkjenn Fjerning",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Er du sikker på at du vil fjerna (sletta) denne hendingen? Merk deg at vis du slettar eit romnamn eller ei emneendring kan det gjera om på endringa.",
     "Community IDs cannot be empty.": "Feltet Fellesskap-ID kan ikkje vera tomt.",
@@ -579,63 +476,30 @@
     "Unable to verify email address.": "Klarte ikkje å stadfesta epostadressa.",
     "This will allow you to reset your password and receive notifications.": "Dette tillèt deg å attendestilla passordet ditt og å få varsel.",
     "Skip": "Hopp over",
-    "Username not available": "Brukarnamnet er ikkje tilgjengeleg",
-    "Username invalid: %(errMessage)s": "Brukarnamnet er ugangbart: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Noko gjekk gale: %(error_string)s",
-    "Username available": "Brukarnamnet er tilgjengeleg",
-    "To get started, please pick a username!": "For å koma i gang, ver venleg og vel eit brukarnman!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dette vert brukarnamnet ditt på <span></span> heimtenaren, elles so kan du velja ein <a>annan tenar</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Viss du har ein Matrixbrukar allereie kan du <a>logga på</a> i staden.",
-    "You have successfully set a password!": "Du sette passordet ditt!",
-    "You have successfully set a password and an email address!": "Du sette passordet og epostadressa di!",
-    "You can now return to your account after signing out, and sign in on other devices.": "Du kan no gå attende til brukaren din etter å ha logga ut, og logga inn på andre einingar.",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Hugs at du alltid kan setja ei epostadresse i brukarinnstillingar viss du skiftar meining.",
     "Failed to change password. Is your password correct?": "Fekk ikkje til å skifta passord. Er passordet rett?",
-    "(HTTP status %(httpStatus)s)": "(HTTP-tilstand %(httpStatus)s)",
-    "Please set a password!": "Ver venleg og set eit passord!",
     "Share Room": "Del Rom",
     "Link to most recent message": "Lenk til den nyaste meldinga",
     "Share User": "Del Brukar",
     "Share Community": "Del Fellesskap",
     "Share Room Message": "Del Rommelding",
     "Link to selected message": "Lenk til den valde meldinga",
-    "COPY": "KOPIER",
-    "Private Chat": "Lukka Samtale",
-    "Public Chat": "Offentleg Samtale",
     "Reject invitation": "Sei nei til innbyding",
     "Are you sure you want to reject the invitation?": "Er du sikker på at du vil seia nei til innbydinga?",
     "Unable to reject invite": "Klarte ikkje å seia nei til innbydinga",
     "Reject": "Avslå",
     "You cannot delete this message. (%(code)s)": "Du kan ikkje sletta meldinga. (%(code)s)",
     "Resend": "Send på nytt",
-    "Cancel Sending": "Bryt Sending av",
-    "Forward Message": "Vidaresend Melding",
     "Reply": "Svar",
-    "Pin Message": "Fest Meldinga",
     "View Source": "Sjå Kjelda",
-    "View Decrypted Source": "Sjå den Dekrypterte Kjelda",
-    "Unhide Preview": "Vis førehandsvising",
-    "Share Message": "Del Melding",
     "Quote": "Sitat",
     "Source URL": "Kjelde-URL",
-    "Collapse Reply Thread": "Slå Svartråden saman",
-    "All messages (noisy)": "Alle meldingar (bråkete)",
     "All messages": "Alle meldingar",
-    "Mentions only": "Berre når eg vert nemnd",
     "Leave": "Forlat",
-    "Forget": "Gløym",
     "Low Priority": "Lågrett",
-    "Direct Chat": "Direktesamtale",
     "View Community": "Sjå Fellesskap",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklagar, nettlesaren din klarer <b>ikkje</b> å køyra %(brand)s.",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s brukar mange avanserte nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller under utprøving i nettlesaren din.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med denne nettlesaren, er det mogleg at synet og kjensla av applikasjonen er fullstendig gale, og nokre eller alle funksjonar verkar kanskje ikkje. Viss du vil prøva likevel kan du gå fram, men då du må sjølv handtera alle vanskar du møter på!",
-    "I understand the risks and wish to continue": "Eg forstår farane og vil gå fram",
     "Name": "Namn",
     "You must <a>register</a> to use this functionality": "Du må <a>melda deg inn</a> for å bruka denne funksjonen",
     "You must join the room to see its files": "Du må fare inn i rommet for å sjå filene dets",
-    "There are no visible files in this room": "Det er ingen synlege filer i dette rommet",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML for fellesskapssida di</h1>\n<p>\n    Bruk den Lange Skildringa for å ynskja nye medlemmar velkomen, eller gje ut viktige <a href=\"foo\">lenkjer</a>\n</p>\n<p>\n    Du kan til og med bruka 'img' HTML-taggar!\n</p>\n",
     "Add rooms to the community summary": "Legg rom til i samandraget for fellesskapet",
     "Which rooms would you like to add to this summary?": "Kva rom ynskjer du å leggja til i samanfattinga?",
     "Add to summary": "Legg til i samanfattinga",
@@ -677,7 +541,6 @@
     "Failed to reject invitation": "Fekk ikkje til å seia nei til innbyding",
     "This room is not public. You will not be able to rejoin without an invite.": "Dette rommet er ikkje offentleg. Du kjem ikkje til å kunna koma inn att utan ei innbyding.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Er du sikker på at du vil forlate rommet '%(roomName)s'?",
-    "Failed to leave room": "Fekk ikkje til å forlate rommet",
     "Can't leave Server Notices room": "Kan ikkje forlate Systemvarsel-rommet",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dette rommet er for viktige meldingar frå Heimtenaren, så du kan ikkje forlate det.",
     "Signed Out": "Logga Ut",
@@ -691,10 +554,8 @@
     "Your Communities": "Dine fellesskap",
     "Error whilst fetching joined communities": "Noko gjekk gale under innlasting av fellesskapa du med er i",
     "Create a new community": "Opprett nytt fellesskap",
-    "You have no visible notifications": "Du har ingen synlege varsel",
     "Members": "Medlemmar",
     "Invite to this room": "Inviter til dette rommet",
-    "Files": "Filer",
     "Notifications": "Varsel",
     "Invite to this community": "Inviter til dette fellesskapet",
     "The server may be unavailable or overloaded": "Tenaren er kanskje utilgjengeleg eller overlasta",
@@ -707,25 +568,14 @@
     "Couldn't find a matching Matrix room": "Kunne ikkje finna eit samsvarande Matrix-rom",
     "Fetching third party location failed": "Noko gjekk gale under henting av tredjepartslokasjon",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kan ikkje senda meldingar før du les over og godkjenner våre <consentLink>bruksvilkår</consentLink>.",
-    "%(count)s of your messages have not been sent.|other": "Nokre av meldingane dine vart ikkje sende.",
-    "%(count)s of your messages have not been sent.|one": "Meldinga di vart ikkje send.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Send alle på nytt</resendText> eller <cancelText>avbryt alle</cancelText>. Du kan og markere enkelte meldingar for å sende på nytt eller avbryte.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Send melding på nytt</resendText> eller <cancelText>avbryt</cancelText>.",
     "Connectivity to the server has been lost.": "Tilkoplinga til tenaren vart tapt.",
     "Sent messages will be stored until your connection has returned.": "Sende meldingar vil lagrast lokalt fram til nettverket er oppe att.",
-    "Active call": "Pågåande samtale",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det er ingen andre her! Vil du <inviteText>invitera andre</inviteText> eller <nowarnText>skru av varselet om det tomme rommet?</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Det ser ut til at du lastar opp filer, er du sikker på at du vil avslutte?",
     "You seem to be in a call, are you sure you want to quit?": "Det ser ut til at du er i ein samtale, er du sikker på at du vil avslutte?",
     "Search failed": "Søket feila",
     "No more results": "Ingen fleire resultat",
     "Room": "Rom",
     "Failed to reject invite": "Fekk ikkje til å avstå invitasjonen",
-    "Fill screen": "Fyll skjermen",
-    "Click to unmute video": "Klikk for slå på video",
-    "Click to mute video": "Klikk for å slå av video",
-    "Click to unmute audio": "Klikk for å slå på lyd",
-    "Click to mute audio": "Klikk for å slå av lyd",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Prøvde å laste eit bestemt punkt i rommet sin historikk, men du har ikkje lov til å sjå den spesifike meldingen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Prøvde å lasta eit bestemt punkt i rommet sin historikk, men klarde ikkje å finna det.",
     "Failed to load timeline position": "Innlasting av punkt i historikken feila.",
@@ -737,7 +587,6 @@
     "<not supported>": "<ikkje støtta>",
     "Import E2E room keys": "Hent E2E-romnøklar inn",
     "Cryptography": "Kryptografi",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Viss du har rapportert inn feil via GitHub, kan feil-loggar hjelpa oss med å finna problemet. Feil-loggar inneheld data om applikasjonsbruk som; brukarnamn, ID-ar, alias på rom eller grupper du har besøkt og brukarnamn for andre brukarar.  Loggane inneheld ikkje meldingar.",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s samlar anonym statistikk inn slik at ein kan forbetre applikasjonen.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Personvern er viktig for oss, så vi samlar ikkje personlege eller identifiserbare data for statistikken vår.",
     "Learn more about how we use analytics.": "Finn ut meir om korleis vi brukar statistikk.",
@@ -756,11 +605,8 @@
     "Camera": "Kamera",
     "Email": "Epost",
     "Account": "Brukar",
-    "click to reveal": "klikk for å visa",
     "Homeserver is": "Heimtenaren er",
-    "Identity Server is": "Identitetstenaren er",
     "%(brand)s version:": "%(brand)s versjon:",
-    "olm version:": "olm versjon:",
     "Failed to send email": "Fekk ikkje til å senda eposten",
     "The email address linked to your account must be entered.": "Du må skriva epostadressa som er tilknytta brukaren din inn.",
     "A new password must be entered.": "Du må skriva eit nytt passord inn.",
@@ -771,16 +617,10 @@
     "Send Reset Email": "Send e-post for nullstilling",
     "Incorrect username and/or password.": "Feil brukarnamn og/eller passord.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk deg at du loggar inn på %(hs)s-tenaren, ikkje matrix.org.",
-    "The phone number entered looks invalid": "Det innskrivne telefonnummeret virkar å vere ugyldig",
-    "Error: Problem communicating with the given homeserver.": "Feil: Det gjekk ikkje an å kommunisera med den spesifiserte heimetenaren.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan ikkje kobla til heimetenaren via HTTP fordi URL-adressa i nettlesaren er HTTPS. Bruk HTTPS, eller <a>aktiver usikre skript</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Kan ikkje kopla til heimtenaren - ver venleg og sjekk tilkoplinga di, og sjå til at <a>heimtenaren din sitt CCL-sertifikat</a> er stolt på og at ein nettlesartillegg ikkje hindrar førespurnader.",
-    "Failed to fetch avatar URL": "Klarte ikkje å henta avatar-URLen",
-    "Set a display name:": "Set eit visningsnamn:",
-    "Upload an avatar:": "Last opp ein avatar:",
     "This server does not support authentication with a phone number.": "Denne tenaren støttar ikkje stadfesting gjennom telefonnummer.",
     "Commands": "Kommandoar",
-    "Results from DuckDuckGo": "Resultat frå DuckDuckGo",
     "Emoji": "Emoji",
     "Notify the whole room": "Varsle heile rommet",
     "Room Notification": "Romvarsel",
@@ -791,7 +631,6 @@
     "Enter passphrase": "Skriv inn passfrase",
     "Confirm passphrase": "Stadfest passfrase",
     "You must specify an event type!": "Du må oppgje ein handlingssort!",
-    "Call Timeout": "Tidsavbrot i Samtala",
     "Enable automatic language detection for syntax highlighting": "Skru automatisk måloppdaging på for syntax-understreking",
     "Export E2E room keys": "Hent E2E-romnøklar ut",
     "Jump to read receipt": "Hopp til lesen-lappen",
@@ -800,31 +639,24 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du held på å verta teken til ei tredje-partisside so du kan godkjenna brukaren din til bruk med %(integrationsUrl)s. Vil du gå fram?",
     "Token incorrect": "Teiknet er gale",
     "Filter community members": "Filtrer fellesskapssmedlemmar",
-    "Custom Server Options": "Tilpassa tenar-innstillingar",
     "Filter community rooms": "Filtrer rom i fellesskapet",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du brukar Riktekst-innstillinga på Riktekstfeltet",
     "This room is not accessible by remote Matrix servers": "Rommet er ikkje tilgjengeleg for andre Matrix-heimtenarar",
     "Add an Integration": "Legg tillegg til",
     "Popout widget": "Popp widget ut",
-    "Manage Integrations": "Sjå over Innlegg",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Custom level": "Tilpassa nivå",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Klarte ikkje å lasta handlinga som vert svara til. Anten finst ho ikkje elles har du ikkje tilgang til å sjå ho.",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Feil-loggar inneheld data om applikasjonsbruk som; brukarnamn, ID-ar, alias på rom eller grupper du har besøkt og brukarnamn for andre brukarar.  Loggane inneheld ikkje meldingar.",
     "Send Custom Event": "Send Sjølvsett Hending",
     "Failed to send custom event.": "Fekk ikkje til å senda sjølvsett hending.",
     "State Key": "Tilstandsnykel",
     "Filter results": "Filtrer resultat",
-    "Custom": "Sjølvsett",
-    "Failed to set Direct Message status of room": "Fekk ikkje til å setja Direktemelding-tilstanden til rommet",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Visste du at: du kan bruka fellesskap for å filtrera %(brand)s-opplevinga di!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "For å setja opp eit filter, dra ein fellesskapsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det fellesskapet.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit fellesskap for å føra saman brukarar og rom! Lag ei tilpassa heimeside for å markere din del av Matrix-universet.",
     "Unable to look up room ID from server": "Klarte ikkje å henta rom-ID frå tenaren",
     "Server may be unavailable, overloaded, or search timed out :(": "Tenaren er kanskje utilgjengeleg, overlasta, elles så vart søket tidsavbrote :(",
     "Clear filter": "Tøm filter",
     "Profile": "Brukar",
-    "Access Token:": "Tilgangs-token:",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Heimetenaren tilbyr ingen innloggingsmetodar som er støtta av denne klienten.",
     "Export room keys": "Eksporter romnøklar",
     "Export": "Eksporter",
@@ -854,11 +686,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s uleste varslingar i ein tidligare versjon av dette rommet.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Du har %(count)s ulest varsel i ein tidligare versjon av dette rommet.",
     "Guest": "Gjest",
-    "Your profile": "Din profil",
     "Could not load user profile": "Klarde ikkje å laste brukarprofilen",
-    "Your Matrix account on %(serverName)s": "Din Matrix-konto på %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Din Matrix-konto på <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetstenar er satt opp: legg til ein i innstillingane for å nullstille passordet ditt.",
     "Sign in instead": "Logg inn istaden",
     "A verification email will be sent to your inbox to confirm setting your new password.": "For å stadfeste tilbakestilling av passordet, vil ein e-post vil bli sendt til din innboks.",
     "Your password has been reset.": "Passodet ditt vart nullstilt.",
@@ -884,7 +712,6 @@
     "<a>Log in</a> to your new account.": "<a>Logg på</a> den nye kontoen din.",
     "You can now close this window or <a>log in</a> to your new account.": "Du kan lukke dette vindauget eller<a>logge inn</a> med din nye konto.",
     "Registration Successful": "Registrering fullført",
-    "Create your account": "Lag din konto",
     "Failed to re-authenticate due to a homeserver problem": "Fekk ikkje til å re-authentisere grunna ein feil på heimetenaren",
     "Failed to re-authenticate": "Fekk ikkje til å re-autentisere",
     "Enter your password to sign in and regain access to your account.": "Skriv inn ditt passord for å logge på og ta tilbake tilgang til kontoen din.",
@@ -907,12 +734,8 @@
     "Success!": "Suksess!",
     "Unable to create key backup": "Klarte ikkje å lage sikkerheitskopi av nøkkelen",
     "Retry": "Prøv om att",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Utan å sette opp sikker gjenoppretting for meldingar (Secure Message Recovery) vil meldingshistorikken gå tapt når du loggar av.",
-    "If you don't want to set this up now, you can later in Settings.": "Ønskjer du ikkje å sette opp dette no, kan du gjere det seinare i innstillingane.",
     "Set up": "Sett opp",
-    "Don't ask again": "Ikkje spør igjen",
     "New Recovery Method": "Ny gjenopprettingsmetode",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Ein ny gjenopprettingspassfrase og nøkkel for sikre meldingar vart funne.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Har du ikkje satt opp den nye gjenopprettingsmetoden, kan ein angripar prøve å bryte seg inn på kontoen din.  Endre ditt kontopassord og sett opp gjenoppretting umiddelbart under instillingane.",
     "Go to Settings": "Gå til innstillingar",
     "Set up Secure Messages": "Sett opp sikre meldingar (Secure Messages)",
@@ -955,19 +778,15 @@
     "Forces the current outbound group session in an encrypted room to be discarded": "Tvingar i eit kryptert rom kassering av gjeldande utgåande gruppe-økt",
     "Sends the given message coloured as a rainbow": "Sender den bestemte meldinga farga som ein regnboge",
     "Displays list of commands with usages and descriptions": "Viser ei liste over kommandoar med bruksområde og skildringar",
-    "%(senderName)s made no change.": "%(senderName)s utførde ingen endring.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Om du brukar %(brand)s på ein innretning som er satt opp for touch-skjerm",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Om du nyttar funksjonen 'breadcrumbs' (avatarane over romkatalogen)",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Om din %(brand)s er installert som ein webapplikasjon (Progressive Web App)",
     "Your user agent": "Din nettlesar (User-Agent)",
-    "If you cancel now, you won't complete verifying the other user.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre brukaren.",
-    "If you cancel now, you won't complete verifying your other session.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre økta.",
     "Cancel entering passphrase?": "Avbryte inntasting av passfrase ?",
     "Setting up keys": "Setter opp nøklar",
     "Verify this session": "Stadfest denne økta",
     "Encryption upgrade available": "Kryptering kan oppgraderast",
-    "Set up encryption": "Sett opp kryptering",
     "Identity server has no terms of service": "Identitetstenaren manglar bruksvilkår",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetstenar) for å verifisere e-post eller telefonnummer, men tenaren manglar bruksvilkår.",
     "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av tenaren.",
@@ -1022,7 +841,6 @@
     "Error changing power level": "Feil under endring av tilgangsnivå",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Ein feil skjedde under endring av tilgangsnivå. Sjekk at du har lov til dette, deretter prøv på nytt.",
     "Invite users": "Inviter brukarar",
-    "Invite only": "Berre invitasjonar",
     "Scroll to most recent messages": "Gå til dei nyaste meldingane",
     "Close preview": "Lukk førehandsvisninga",
     "No recent messages by %(user)s found": "Fann ingen nyare meldingar frå %(user)s",
@@ -1046,7 +864,6 @@
     "Strikethrough": "Gjennomstreka",
     "Code block": "Kodeblokk",
     "Room %(name)s": "Rom %(name)s",
-    "Recent rooms": "Siste rom",
     "Direct Messages": "Folk",
     "Joining room …": "Blir med i rommet…",
     "Loading …": "Lastar…",
@@ -1080,11 +897,6 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikkje førehandsvisast. Ynskjer du å bli med ?",
     "This room doesn't exist. Are you sure you're at the right place?": "Dette rommet eksisterar ikkje. Er du sikker på at du er på rett plass?",
     "Try again later, or ask a room admin to check if you have access.": "Prøv om att seinare, eller spør ein rom-administrator om du har tilgang.",
-    "Never lose encrypted messages": "Aldri la krypterte meldingar gå tapt",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meldingane i rommet er sikra med ende-til-ende kryptering. Berre du og mottakarane har krypteringsnøklane for desse meldingane.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopier nøklane dine for å unngå i miste dei. <a>Les meir.</a>",
-    "Not now": "Ikkje no",
-    "Don't ask me again": "Ikkje spør meg igjen",
     "%(count)s unread messages.|other": "%(count)s uleste meldingar.",
     "%(count)s unread messages.|one": "1 ulesen melding.",
     "Unread messages.": "Uleste meldingar.",
@@ -1103,7 +915,6 @@
     "Main address": "Hovudadresse",
     "Local address": "Lokal adresse",
     "Published Addresses": "Publisert adresse",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publiserte adresser kan bli brukt av alle uansett tenar for å bli med i rommet. For å publisera ei adresse, må den vere sett som ei lokal adresse fyrst.",
     "Other published addresses:": "Andre publiserte adresser:",
     "No other published addresses yet, add one below": "Ingen publiserte adresser til no, legg til ei under",
     "New published address (e.g. #alias:server)": "Ny publisert adresse  (t.d. #alias:tenar)",
@@ -1153,7 +964,6 @@
     "Change settings": "Endre innstillingar",
     "Kick users": "Sparke brukarar",
     "Ban users": "Stenge ute brukarar",
-    "Remove messages": "Fjerne meldingar",
     "Notify everyone": "Varsle alle",
     "Send %(eventType)s events": "Sende %(eventType)s hendelsar",
     "Roles & Permissions": "Roller & Tilgangsrettar",
@@ -1192,7 +1002,6 @@
     "When rooms are upgraded": "Når rom blir oppgraderte",
     "My Ban List": "Mi blokkeringsliste",
     "Upgrade": "Oppgrader",
-    "Add an email address to configure email notifications": "Legg til ei e-postadresse for å sette opp e-postvarslingar",
     "Enable desktop notifications for this session": "Aktiver skrivebordsvarslingar for denne øka",
     "Enable audible notifications for this session": "Aktiver høyrbare varslingar for denne økta",
     "<a>Upgrade</a> to your own domain": "<a>Oppgrader</a> til ditt eige domene",
@@ -1215,11 +1024,7 @@
     "Capitalization doesn't help very much": "Store bokstavar hjelp dessverre lite",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Forutsigbare teiknbytte som '@' istaden for 'a' hjelp dessverre lite",
     "Try out new ways to ignore people (experimental)": "Prøv ut nye måtar å ignorere folk på (eksperimentelt)",
-    "Cross-signing and secret storage are enabled.": "Krysssignering og hemmeleg lager er aktivert.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Kontoen din har ein kryss-signert identitet det hemmelege lageret, økta di stolar ikkje på denne enno.",
-    "Cross-signing and secret storage are not yet set up.": "Krysssignering og hemmeleg lager er endå ikkje sett opp.",
-    "Reset cross-signing and secret storage": "Tilbakestill krysssignering og hemmeleg lager",
-    "Bootstrap cross-signing and secret storage": "Førebur krysssignering og hemmeleg lager",
     "in secret storage": "i hemmeleg lager",
     "Secret storage public key:": "Public-nøkkel for hemmeleg lager:",
     "Keyboard Shortcuts": "Tastatursnarvegar",
@@ -1230,15 +1035,8 @@
     "Matrix rooms": "Matrix-rom",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Om du har meir info rundt korleis problemet oppstod, som kva du prøvde å gjere på det tidspunktet, brukar-IDar m.m ,inkluder gjerne den informasjonen her.",
     "Topic (optional)": "Emne (valfritt)",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "For å unngå duplikate feilrapportar, sjekk <existingIssuesLink>eksisterande innmeldte feil</existingIssuesLink> fyrst (og legg på ein +1) eller <newIssueLink>meld inn ny feil</newIssueLink> viss du ikkje finn den der.",
     "Command Help": "Kommandohjelp",
     "To help us prevent this in future, please <a>send us logs</a>.": "For å bistå med å forhindre dette i framtida, gjerne <a>send oss loggar</a>.",
-    "Incorrect recovery passphrase": "Feil gjenopprettingspassfrase",
-    "Enter recovery passphrase": "Skriv inn gjennopprettingspassfrase",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Få tilgang til sikker meldingshistorikk og sett opp sikker meldingsutveksling, ved å skrive inn gjennopprettingspassfrasen.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Har du gløymt gjennopprettingspassfrasen kan du <button1>bruka ein gjennopprettingsnøkkel</button1> eller <button2>setta opp nye gjennopprettingsval</button2>",
-    "Help": "Hjelp",
-    "Explore": "Utforsk",
     "%(creator)s created and configured the room.": "%(creator)s oppretta og konfiguerte dette rommet.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s klarde ikkje å hente protokolllister frå heimetenaren. Det kan hende at tenaren er for gammal til å støtte tredjeparts-nettverk",
     "The homeserver may be unavailable or overloaded.": "Heimetenaren kan vere overlasta eller utilgjengeleg.",
@@ -1250,7 +1048,6 @@
     "Jump to first unread room.": "Hopp til fyrste uleste rom.",
     "Jump to first invite.": "Hopp til fyrste invitasjon.",
     "Unable to set up secret storage": "Oppsett av hemmeleg lager feila",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Denne økta har oppdaga at gjenopprettingspassfrasen og nøkkelen for sikre meldingar vart fjerna.",
     "Toggle microphone mute": "Slå av/på demping av mikrofon",
     "Confirm": "Stadfest",
     "Confirm adding email": "Stadfest at du ynskjer å legga til e-postadressa",
@@ -1280,9 +1077,7 @@
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s endre den alternative adressa for dette rommet.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s endra hovud- og alternativ-adressene for dette rommet.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s endre adressene for dette rommet.",
-    "Review where you’re logged in": "Sjå over kvar du er logga inn",
     "Later": "Seinare",
-    "Allow Peer-to-Peer for 1:1 calls": "Tillat peer-to-peer (P2P) for ein-til-ein samtalar",
     "Never send encrypted messages to unverified sessions from this session": "Aldri send krypterte meldingar til ikkje-verifiserte sesjonar frå denne sesjonen",
     "Never send encrypted messages to unverified sessions in this room from this session": "Aldri send krypterte meldingar i dette rommet til ikkje-verifiserte sesjonar frå denne sesjonen",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Tillat å bruka assistansetenaren turn.matrix.org for talesamtalar viss heimetenaren din ikkje tilbyr dette (IP-adressa di vil bli delt under talesamtalen)",
@@ -1304,30 +1099,24 @@
     "This room is end-to-end encrypted": "Dette rommet er ende-til-ende kryptert",
     "Encrypted by an unverified session": "Kryptert av ein ikkje-verifisert sesjon",
     "Encrypted by a deleted session": "Kryptert av ein sletta sesjon",
-    "Create room": "Lag rom",
     "Messages in this room are end-to-end encrypted.": "Meldingar i dette rommet er ende-til-ende kryptert.",
     "Messages in this room are not end-to-end encrypted.": "Meldingar i dette rommet er ikkje ende-til-ende kryptert.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Når du nyttar krypterte rom er meldingane din sikra. Berre du og mottakaren har unike nøklar som kan gjere meldingane lesbare.",
     "This client does not support end-to-end encryption.": "Denne klienten støttar ikkje ende-til-ende kryptering.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "Når du nyttar krypterte rom, verifiser alle brukarar for å vere trygg på at det er sikkert.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldingar i dette rommet er ende-til-ende krypterte. Meir om dette, samt verifisering av denne brukaren finn du under deira brukarprofil.",
     "Join": "Bli med",
     "Remove server": "Ta vekk tenar",
     "Matrix": "Matrix",
     "Add a new server": "Legg til ein ny tenar",
     "Add a new server...": "Legg til ein ny tenar",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Tømming av data frå denne sesjonen er permanent. Krypterte meldingar vil gå tapt med mindre krypteringsnøklane har blitt sikkerheitskopierte.",
-    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, brukarar kan berre bli med viss dei har ein invitasjon",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kan ikkje skru av dette seinare. Bruer og dei fleste botar vil ikkje fungere enno.",
     "Enable end-to-end encryption": "Skru på ende-til-ende kryptering",
     "Create a private room": "Lag eit privat rom",
-    "Make this room public": "Gjer dette rommet offentleg",
     "Hide advanced": "Gøym avanserte alternativ",
     "Show advanced": "Vis avanserte alternativ",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Utesteng brukarar på andre Matrix heimetenarar frå å koma inn i rommet (Dette kan endrast seinare!)",
     "I don't want my encrypted messages": "Eg treng ikkje mine krypterte meldingar",
     "You'll lose access to your encrypted messages": "Du vil miste tilgangen til dine krypterte meldingar",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ingen identitetstenar er konfiguert, så i framtida kan ikkje legge til ei e-postadresse for å nullstille passordet.",
     "Join millions for free on the largest public server": "Kom ihop med millionar av andre på den største offentlege tenaren",
     "Order rooms by name": "Sorter rom etter namn",
     "Show rooms with unread notifications first": "Vis rom med ulesne varsel fyrst",
@@ -1344,7 +1133,6 @@
     "Delete Backup": "Slett sikkerheitskopi",
     "Restore from Backup": "Gjenopprett frå sikkerheitskopi",
     "This session is backing up your keys. ": "Denne økta har aktivert sikkerheitskopiering av nøklane dine ",
-    "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.": "Lag sikkerheitskopiar av krypteringsnøklane saman med kontoinnstillingane, slik at du kan gjenopprette data viss det skulle skje at du å mister tilgang til øktene dine. Sikkerheitskopiane er beskytta med ein unik gjenopprettingsnøkkel (Recovery Key).",
     "Encryption": "Kryptografi",
     "Use Ctrl + Enter to send a message": "Bruk Ctrl + Enter for å sende meldingar",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Skriv  namnet på skrifttypen(fonten) og %(brand)s forsøka å henta den frå operativsystemet.",
@@ -1372,9 +1160,14 @@
     "Explore Public Rooms": "Utforsk offentlege rom",
     "Explore all public rooms": "Utforsk alle offentlege rom",
     "Explore public rooms": "Utforsk offentlege rom",
-    "Use Ctrl + F to search": "Bruk Ctrl + F for søk",
-    "Identity Server": "Identitetstenar",
     "Email Address": "E-postadresse",
     "Go Back": "Gå attende",
-    "Notification settings": "Varslingsinnstillingar"
+    "Notification settings": "Varslingsinnstillingar",
+    "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 bør <b>fjerne dine personlege data</b> frå identitetstenaren <idserver /> før du koplar frå. Dessverre er identitetstenaren <idserver /> utilgjengeleg og kan ikkje nåast akkurat no.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Vi tilrår at du slettar personleg informasjon, som e-postadresser og telefonnummer frå identitetstenaren før du koplar frå.",
+    "Privacy": "Personvern",
+    "Versions": "Versjonar",
+    "Legal": "Juridisk",
+    "Identity server is": "Identitetstenaren er",
+    "Identity server": "Identitetstenar"
 }
diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json
index d882b04ac9..d7fb0a83d2 100644
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -19,8 +19,6 @@
     "Bold": "Gras",
     "Quote": "Citacion",
     "Loading...": "Cargament…",
-    "Pinned Messages": "Messatges penjats",
-    "Unpin Message": "Despenjar lo messatge",
     "Online for %(duration)s": "En linha dempuèi %(duration)s",
     "Idle for %(duration)s": "Inactiu dempuèi %(duration)s",
     "Offline for %(duration)s": "Fòra linha dempuèi %(duration)s",
@@ -29,7 +27,6 @@
     "Idle": "Inactiu",
     "Offline": "Fòra linha",
     "Unknown": "Desconegut",
-    "Recent rooms": "Salas recentas",
     "No rooms to show": "Cap de sala a mostrar",
     "Unnamed room": "Sala sens nom",
     "Settings": "Paramètres",
@@ -53,8 +50,6 @@
     "Reject": "Regetar",
     "Reject & Ignore user": "Regetar e ignorar",
     "%(roomName)s does not exist.": "%(roomName)s existís pas.",
-    "Not now": "Pas ara",
-    "Don't ask me again": "Me demandar pas mai",
     "Options": "Opcions",
     "This Room": "Aquesta sala",
     "All Rooms": "Totas les salas",
@@ -112,10 +107,7 @@
     "Upgrade": "Metre a jorn",
     "Verify": "Verificar",
     "Update": "Mesa a jorn",
-    "Restart": "Reaviar",
     "Font size": "Talha de poliça",
-    "Incoming video call": "Sonada vidèo entranta",
-    "Incoming call": "Sonada entranta",
     "Accept": "Acceptar",
     "Start": "Començament",
     "Cancelling…": "Anullacion…",
@@ -151,7 +143,6 @@
     "Manage": "Manage",
     "Enable": "Activar",
     "Restore from Backup": "Restablir a partir de l'archiu",
-    "Keywords": "Mots clau",
     "Clear notifications": "Escafar",
     "Off": "Atudat",
     "Display Name": "Nom d'afichatge",
@@ -160,7 +151,6 @@
     "Go back": "Precedent",
     "Change": "Cambiar",
     "Theme": "Tèma",
-    "Compact": "Ordenador",
     "Success": "Succès",
     "Profile": "Perfil",
     "Account": "Compte",
@@ -253,8 +243,6 @@
     "No results": "Pas cap de resultat",
     "Rotate Left": "Pivotar cap a èrra",
     "Rotate Right": "Pivotar cap a drecha",
-    "Rotate clockwise": "Pivotar dins lo sens de las agulhas d'un relòtge",
-    "Add User": "Apondre un utilizaire",
     "Matrix": "Matritz",
     "Server name": "Títol del servidor",
     "email address": "adreça de messatjariá",
@@ -275,11 +263,9 @@
     "Suggestions": "Prepausicions",
     "Go": "Validar",
     "Session name": "Nom de session",
-    "Your password": "Vòstre senhal",
     "Refresh": "Actualizada",
     "Email address": "Adreça de corrièl",
     "Skip": "Ignorar",
-    "Checking...": "Verificacion en cors...",
     "Copy": "Copiar",
     "Terms of Service": "Terms of Service",
     "Service": "Servici",
@@ -287,16 +273,10 @@
     "Document": "Document",
     "Next": "Seguent",
     "Upload files": "Mandar de fichièrs",
-    "Allow": "Autorizar",
-    "Deny": "Refusar",
-    "Custom": "Personalizada",
-    "Address (optional)": "Adreça (opcionala)",
     "Leave": "Quitar",
-    "Forget": "Doblidar",
     "Hide": "Amagar",
     "Home": "Dorsièr personal",
     "Sign in": "Connexion",
-    "Reload": "Tornar cargar",
     "Away": "Absent",
     "Submit": "Mandar",
     "Enter password": "Sasissètz lo senhal",
@@ -305,8 +285,6 @@
     "Phone": "Telefòn",
     "Passwords don't match": "Los senhals correspondon pas",
     "Register": "S'enregistrar",
-    "Free": "Liure",
-    "Premium": "De la melhora qualitat",
     "Everyone": "Tot lo monde",
     "Description": "descripcion",
     "Unknown error": "Error desconeguda",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 83c6c25833..174f77d955 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -3,15 +3,11 @@
     "This will allow you to reset your password and receive notifications.": "To pozwoli Ci zresetować Twoje hasło i otrzymać powiadomienia.",
     "Your browser does not support the required cryptography extensions": "Twoja przeglądarka nie wspiera wymaganych rozszerzeń kryptograficznych",
     "Something went wrong!": "Coś poszło nie tak!",
-    "Username not available": "Nazwa użytkownika niedostępna",
-    "Username available": "Nazwa użytkownika dostępna",
-    "Add User": "Dodaj użytkownika",
     "Unknown Address": "Nieznany adres",
     "Incorrect password": "Nieprawidłowe hasło",
     "Unknown error": "Nieznany błąd",
     "Options": "Opcje",
     "New Password": "Nowe hasło",
-    "Room directory": "Spis pokojów",
     "Start chat": "Rozpocznij rozmowę",
     "Create new room": "Utwórz nowy pokój",
     "Cancel": "Anuluj",
@@ -64,18 +60,12 @@
     "Settings": "Ustawienia",
     "unknown error code": "nieznany kod błędu",
     "OK": "OK",
-    "Custom Server Options": "Niestandardowe opcje serwera",
     "Dismiss": "Zamknij",
     "Failed to forget room %(errCode)s": "Nie mogłem zapomnieć o pokoju %(errCode)s",
     "Favourite": "Ulubiony",
     "Mute": "Wycisz",
     "powered by Matrix": "napędzany przez Matrix",
     "Failed to change password. Is your password correct?": "Zmiana hasła nie powiodła się. Czy Twoje hasło jest poprawne?",
-    "Add a topic": "Dodaj temat",
-    "%(targetName)s accepted an invitation.": "%(targetName)s zaakceptował(a) zaproszenie.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s zaakceptował(a) zaproszenie dla %(displayName)s.",
-    "Access Token:": "Jednorazowy kod dostępu:",
-    "Active call (%(roomName)s)": "Aktywne połączenie (%(roomName)s)",
     "Admin": "Administrator",
     "Admin Tools": "Narzędzia Administracyjne",
     "No Microphones detected": "Nie wykryto żadnego mikrofonu",
@@ -88,42 +78,24 @@
     "Authentication": "Uwierzytelnienie",
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
     "A new password must be entered.": "Musisz wprowadzić nowe hasło.",
-    "%(senderName)s answered the call.": "%(senderName)s odebrał połączenie.",
     "An error has occurred.": "Wystąpił błąd.",
     "Anyone": "Każdy",
-    "Anyone who knows the room's link, apart from guests": "Każdy kto posiada łącze do pokoju, poza gośćmi",
-    "Anyone who knows the room's link, including guests": "Każdy kto posiada łącze do pokoju, łącznie z gośćmi",
     "Are you sure you want to leave the room '%(roomName)s'?": "Czy na pewno chcesz opuścić pokój '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Czy na pewno chcesz odrzucić zaproszenie?",
-    "Autoplay GIFs and videos": "Automatycznie odtwarzaj GIFy i filmiki",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s zbanował(a) %(targetName)s.",
     "Ban": "Zbanuj",
     "Bans user with given id": "Blokuje użytkownika o podanym ID",
-    "Add a widget": "Dodaj widżet",
-    "Allow": "Pozwól",
     "and %(count)s others...|other": "i %(count)s innych...",
     "and %(count)s others...|one": "i jeden inny...",
-    "Call Timeout": "Upłynął limit czasu łączenia",
     "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.": "Nie można nawiązać połączenia z serwerem - proszę sprawdź twoje połączenie, upewnij się, że <a>certyfikat SSL serwera</a> jest zaufany, i że dodatki przeglądarki nie blokują żądania.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nie można nawiązać połączenia z serwerem przy użyciu HTTP podczas korzystania z HTTPS dla bieżącej strony. Użyj HTTPS lub <a>włącz niebezpieczne skrypty</a>.",
-    "Cannot add any more widgets": "Nie można dodać już więcej widżetów",
-    "%(senderName)s changed their profile picture.": "%(senderName)s zmienił(a) swoje zdjęcie profilowe.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił(a) poziom mocy %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmienił(a) nazwę pokoju na %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s usunął(-ęła) nazwę pokoju.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmienił(a) temat na \"%(topic)s\".",
     "Changes your display nickname": "Zmienia Twój wyświetlany pseudonim",
-    "Click here to fix": "Kliknij tutaj, aby naprawić",
-    "Click to mute audio": "Kliknij, aby wyciszyć dźwięk",
-    "Click to mute video": "Kliknij, aby wyłączyć obraz",
-    "click to reveal": "kliknij, aby ujawnić",
-    "Click to unmute video": "Kliknij, aby włączyć obraz",
-    "Click to unmute audio": "Kliknij, aby włączyć dźwięk",
     "Command error": "Błąd polecenia",
     "Commands": "Polecenia",
-    "Custom": "Własny",
     "Custom level": "Własny poziom",
-    "/ddg is not a command": "/ddg nie jest poleceniem",
     "Deactivate Account": "Dezaktywuj konto",
     "Decline": "Odrzuć",
     "Decrypt %(text)s": "Odszyfruj %(text)s",
@@ -133,25 +105,19 @@
     "Disinvite": "Anuluj zaproszenie",
     "Displays action": "Wyświetla akcję",
     "Download %(text)s": "Pobierz %(text)s",
-    "Drop File Here": "Upuść plik tutaj",
     "Edit": "Edytuj",
     "Email": "E-mail",
     "Email address": "Adres e-mail",
     "Emoji": "Emoji",
     "Enable automatic language detection for syntax highlighting": "Włącz automatyczne rozpoznawanie języka dla podświetlania składni",
-    "%(senderName)s ended the call.": "%(senderName)s zakończył(a) połączenie.",
     "Enter passphrase": "Wpisz frazę",
     "Error decrypting attachment": "Błąd odszyfrowywania załącznika",
-    "Error: Problem communicating with the given homeserver.": "Błąd: wystąpił problem podczas komunikacji z podanym serwerem.",
-    "Existing Call": "Istniejące połączenie",
     "Export": "Eksport",
     "Export E2E room keys": "Eksportuj klucze E2E pokojów",
     "Failed to ban user": "Nie udało się zbanować użytkownika",
     "Failed to change power level": "Nie udało się zmienić poziomu mocy",
-    "Failed to fetch avatar URL": "Nie udało się pobrać awatara",
     "Failed to join room": "Nie udało się dołączyć do pokoju",
     "Failed to kick": "Nie udało się wykopać użytkownika",
-    "Failed to leave room": "Nie udało się opuścić pokoju",
     "Failed to load timeline position": "Nie udało się wczytać pozycji osi czasu",
     "Failed to mute user": "Nie udało się wyciszyć użytkownika",
     "Failed to reject invite": "Nie udało się odrzucić zaproszenia",
@@ -164,43 +130,32 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Nie udało się zweryfikować adresu e-mail: upewnij się że kliknąłeś w link w e-mailu",
     "Failure to create room": "Nie udało się stworzyć pokoju",
     "Favourites": "Ulubione",
-    "Fill screen": "Wypełnij ekran",
     "Filter room members": "Filtruj uczestników pokoju",
     "Forget room": "Zapomnij pokój",
     "For security, this session has been signed out. Please sign in again.": "Ze względów bezpieczeństwa ta sesja została wylogowana. Zaloguj się jeszcze raz.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "Deops user with given id": "Usuwa prawa administratora użytkownikowi o danym ID",
-    "Guests cannot join this room even if explicitly invited.": "Goście nie mogą dołączać do tego pokoju, nawet jeśli zostali specjalnie zaproszeni.",
     "Hangup": "Rozłącz się",
     "Home": "Strona startowa",
     "Homeserver is": "Serwer domowy to",
-    "Identity Server is": "Serwer tożsamości to",
     "I have verified my email address": "Zweryfikowałem swój adres e-mail",
     "Import": "Importuj",
     "Import E2E room keys": "Importuj klucze pokoju E2E",
-    "Incoming call from %(name)s": "Połączenie przychodzące od %(name)s",
-    "Incoming video call from %(name)s": "Przychodzące połączenie wideo od %(name)s",
-    "Incoming voice call from %(name)s": "Przychodzące połączenie głosowe od %(name)s",
     "Incorrect username and/or password.": "Nieprawidłowa nazwa użytkownika i/lub hasło.",
     "Incorrect verification code": "Nieprawidłowy kod weryfikujący",
     "Invalid Email Address": "Nieprawidłowy adres e-mail",
     "Invalid file%(extra)s": "Nieprawidłowy plik %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s zaprosił(a) %(targetName)s.",
     "Invited": "Zaproszeni",
     "Invites": "Zaproszenia",
     "Invites user with given id to current room": "Zaprasza użytkownika o danym ID do obecnego pokoju",
     "Sign in with": "Zaloguj się używając",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Dołącz <voiceText>głosowo</voiceText> lub przez <videoText>wideo</videoText>.",
     "Join Room": "Dołącz do pokoju",
-    "%(targetName)s joined the room.": "%(targetName)s dołączył(a) do pokoju.",
     "Jump to first unread message.": "Przeskocz do pierwszej nieprzeczytanej wiadomości.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s wyrzucił %(targetName)s.",
     "Kick": "Wyrzuć",
     "Kicks user with given id": "Wyrzuca użytkownika o danym ID",
     "Labs": "Laboratoria",
     "Last seen": "Ostatnio widziany(-a)",
     "Leave room": "Opuść pokój",
-    "%(targetName)s left the room.": "%(targetName)s opuścił(a) pokój.",
     "Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
     "Logout": "Wyloguj",
     "Low priority": "Niski priorytet",
@@ -209,7 +164,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla każdego.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
-    "Manage Integrations": "Zarządzaj integracjami",
     "Missing room_id in request": "Brakujące room_id w żądaniu",
     "Missing user_id in request": "Brakujące user_id w żądaniu",
     "Moderator": "Moderator",
@@ -217,7 +171,6 @@
     "New passwords don't match": "Nowe hasła nie zgadzają się",
     "New passwords must match each other.": "Nowe hasła muszą się zgadzać.",
     "not specified": "nieokreślony",
-    "(not supported by this browser)": "(niewspierany przez tę przeglądarkę)",
     "<not supported>": "<niewspierany>",
     "AM": "AM",
     "PM": "PM",
@@ -225,7 +178,6 @@
     "No more results": "Nie ma więcej wyników",
     "No results": "Brak wyników",
     "No users have specific privileges in this room": "Żadni użytkownicy w tym pokoju nie mają specyficznych uprawnień",
-    "olm version:": "wersja olm:",
     "Only people who have been invited": "Tylko ludzie, którzy zostali zaproszeni",
     "Password": "Hasło",
     "Passwords can't be empty": "Hasła nie mogą być puste",
@@ -233,31 +185,22 @@
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Sprawdź swój e-mail i kliknij link w nim zawarty. Kiedy już to zrobisz, kliknij \"kontynuuj\".",
     "Power level must be positive integer.": "Poziom uprawnień musi być liczbą dodatnią.",
-    "Private Chat": "Rozmowa prywatna",
     "Privileged Users": "Użytkownicy uprzywilejowani",
     "Profile": "Profil",
-    "Public Chat": "Rozmowa publiczna",
     "Reason": "Powód",
     "Register": "Rejestracja",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odrzucił zaproszenie.",
     "Reject invitation": "Odrzuć zaproszenie",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s usunął(-ęła) swoją wyświetlaną nazwę (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s usunął(-ęła) swoje zdjęcie profilowe.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s zażądał(a) grupowego połączenia głosowego VoIP.",
-    "Results from DuckDuckGo": "Wyniki z DuckDuckGo",
     "Return to login screen": "Wróć do ekranu logowania",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nie ma uprawnień, by wysyłać Ci powiadomienia - sprawdź ustawienia swojej przeglądarki",
     "Historical": "Historyczne",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nie otrzymał uprawnień do wysyłania powiadomień - spróbuj ponownie",
     "%(brand)s version:": "wersja %(brand)s:",
     "Room %(roomId)s not visible": "Pokój %(roomId)s nie jest widoczny",
-    "Room Colour": "Kolor pokoju",
     "%(roomName)s does not exist.": "%(roomName)s nie istnieje.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s nie jest dostępny w tym momencie.",
     "Rooms": "Pokoje",
     "Save": "Zapisz",
     "Search failed": "Wyszukiwanie nie powiodło się",
-    "Searches DuckDuckGo for results": "Używa DuckDuckGo dla wyników",
     "Seen by %(userName)s at %(dateTime)s": "Widziane przez %(userName)s o %(dateTime)s",
     "Send Reset Email": "Wyślij e-mail resetujący hasło",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
@@ -267,39 +210,28 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Serwer może być niedostępny, przeciążony, lub trafiłeś na błąd.",
     "Server unavailable, overloaded, or something else went wrong.": "Serwer może być niedostępny, przeciążony, lub coś innego poszło źle.",
     "Session ID": "Identyfikator sesji",
-    "%(senderName)s set a profile picture.": "%(senderName)s ustawił zdjęcie profilowe.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ustawił swoją nazwę na %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pokaż czas w formacie 12-sto godzinnym (n.p. 2:30pm)",
     "Signed Out": "Wylogowano",
     "Sign in": "Zaloguj",
     "Sign out": "Wyloguj",
-    "%(count)s of your messages have not been sent.|other": "Niektóre z twoich wiadomości nie zostały wysłane.",
     "Someone": "Ktoś",
     "Start authentication": "Rozpocznij uwierzytelnienie",
     "Submit": "Wyślij",
     "Success": "Sukces",
-    "The maximum permitted number of widgets have already been added to this room.": "Do tego pokoju dodano już maksymalną dozwoloną liczbę widżetów.",
-    "The phone number entered looks invalid": "Wprowadzony numer telefonu wygląda na niepoprawny",
     "This email address is already in use": "Podany adres e-mail jest już w użyciu",
     "This email address was not found": "Podany adres e-mail nie został znaleziony",
     "The email address linked to your account must be entered.": "Musisz wpisać adres e-mail połączony z twoim kontem.",
-    "The remote side failed to pick up": "Druga strona nie odebrała",
     "This room has no local addresses": "Ten pokój nie ma lokalnych adresów",
     "This room is not recognised.": "Ten pokój nie został rozpoznany.",
     "This doesn't appear to be a valid email address": "Ten adres e-mail zdaje się nie być poprawny",
     "This phone number is already in use": "Ten numer telefonu jest już zajęty",
     "This room": "Ten pokój",
     "This room is not accessible by remote Matrix servers": "Ten pokój nie jest dostępny na zdalnych serwerach Matrix",
-    "To get started, please pick a username!": "Aby rozpocząć, wybierz nazwę użytkownika!",
     "Unable to add email address": "Nie można dodać adresu e-mail",
     "Unable to create widget.": "Nie można utworzyć widżetu.",
     "Unable to remove contact information": "Nie można usunąć informacji kontaktowych",
     "Unable to verify email address.": "Weryfikacja adresu e-mail nie powiodła się.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s odblokował(a) %(targetName)s.",
-    "Unable to capture screen": "Nie można zrobić zrzutu ekranu",
     "Unable to enable Notifications": "Nie można włączyć powiadomień",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Żeby tego użyć, należy poczekać na załadowanie się autouzupełnienia i naciskać przycisk \"Tab\", by wybierać.",
-    "unknown caller": "nieznany dzwoniący",
     "Unmute": "Wyłącz wyciszenie",
     "Unnamed Room": "Pokój bez nazwy",
     "Uploading %(filename)s and %(count)s others|zero": "Przesyłanie %(filename)s",
@@ -309,36 +241,24 @@
     "Upload Failed": "Błąd przesyłania",
     "Upload new:": "Prześlij nowy:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (moc uprawnień administratorskich %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Niepoprawna nazwa użytkownika: %(errMessage)s",
     "Verification Pending": "Oczekuje weryfikacji",
     "Verified key": "Zweryfikowany klucz",
     "Video call": "Rozmowa wideo",
     "Voice call": "Rozmowa głosowa",
-    "VoIP conference finished.": "Zakończono grupowe połączenie głosowe VoIP.",
-    "VoIP conference started.": "Rozpoczęto grupowe połączenie głosowe VoIP.",
     "VoIP is unsupported": "Rozmowy głosowe VoIP nie są obsługiwane",
-    "(could not connect media)": "(brak możliwości połączenia się z mediami)",
-    "(no answer)": "(brak odpowiedzi)",
-    "(unknown failure: %(reason)s)": "(nieznany błąd: %(reason)s)",
-    "Who can access this room?": "Kto może uzyskać dostęp do tego pokoju?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s wycofał(a) zaproszenie %(targetName)s.",
-    "You are already in a call.": "Jesteś już w trakcie połączenia.",
     "You are not in this room.": "Nie jesteś w tym pokoju.",
     "You do not have permission to do that in this room.": "Nie masz pozwolenia na wykonanie tej akcji w tym pokoju.",
     "You cannot place a call with yourself.": "Nie możesz wykonać połączenia do siebie.",
     "You cannot place VoIP calls in this browser.": "Nie możesz przeprowadzić rozmowy głosowej VoIP w tej przeglądarce.",
     "You do not have permission to post to this room": "Nie masz uprawnień do pisania w tym pokoju",
     "You have <a>disabled</a> URL previews by default.": "Masz domyślnie <a>wyłączone</a> podglądy linków.",
-    "You have no visible notifications": "Nie masz widocznych powiadomień",
     "You must <a>register</a> to use this functionality": "Musisz się <a>zarejestrować</a> aby móc używać tej funkcji",
     "You need to be able to invite users to do that.": "Aby to zrobić musisz mieć możliwość zapraszania użytkowników.",
     "You need to be logged in.": "Musisz być zalogowany.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Twój adres e-mail zdaje się nie być powiązany z żadnym Matrix ID na tym serwerze.",
     "You seem to be in a call, are you sure you want to quit?": "Wygląda na to, że prowadzisz z kimś rozmowę; jesteś pewien że chcesz wyjść?",
     "You seem to be uploading files, are you sure you want to quit?": "Wygląda na to, że jesteś w trakcie przesyłania plików; jesteś pewien, że chcesz wyjść?",
-    "Set a display name:": "Ustaw nazwę ekranową:",
     "This server does not support authentication with a phone number.": "Ten serwer nie wspiera autentykacji za pomocą numeru telefonu.",
-    "There are no visible files in this room": "Nie ma widocznych plików w tym pokoju",
     "Connectivity to the server has been lost.": "Połączenie z serwerem zostało utracone.",
     "Create": "Utwórz",
     "Online": "Dostępny(-a)",
@@ -349,13 +269,9 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Upload an avatar:": "Prześlij awatar:",
-    "An error occurred: %(error_string)s": "Wystąpił błąd: %(error_string)s",
     "Sent messages will be stored until your connection has returned.": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.",
     "(~%(count)s results)|one": "(~%(count)s wynik)",
     "(~%(count)s results)|other": "(~%(count)s wyników)",
-    "Active call": "Aktywna rozmowa",
-    "Please select the destination room for this message": "Wybierz pokój docelowy dla tej wiadomości",
     "Start automatically after system login": "Uruchom automatycznie po zalogowaniu się do systemu",
     "Analytics": "Analityka",
     "Passphrases must match": "Hasła szyfrujące muszą być identyczne",
@@ -370,31 +286,23 @@
     "You must join the room to see its files": "Należy dołączyć do pokoju by zobaczyć jego pliki",
     "Reject all %(invitedRooms)s invites": "Odrzuć wszystkie zaproszenia do %(invitedRooms)s",
     "Failed to invite": "Wysłanie zaproszenia nie powiodło się",
-    "Failed to invite the following users to the %(roomName)s room:": "Wysłanie zaproszenia do następujących użytkowników do pokoju %(roomName)s nie powiodło się:",
     "Confirm Removal": "Potwierdź usunięcie",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Jesteś pewien że chcesz usunąć to wydarzenie? Pamiętaj, że jeśli usuniesz nazwę pokoju lub aktualizację tematu pokoju, zmiana może zostać cofnięta.",
     "Unable to restore session": "Przywrócenie sesji jest niemożliwe",
     "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.": "Jeśli wcześniej używałeś/aś nowszej wersji %(brand)s, Twoja sesja może być niekompatybilna z tą wersją. Zamknij to okno i powróć do nowszej wersji.",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s zbiera anonimowe dane analityczne, aby umożliwić nam rozwijanie aplikacji.",
-    "ex. @bob:example.com": "np. @jan:example.com",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nastąpiła próba załadowania danego punktu w historii tego pokoju, lecz nie masz uprawnień, by zobaczyć określoną wiadomość.",
     "You have <a>enabled</a> URL previews by default.": "Masz domyślnie <a>włączone</a> podglądy linków.",
-    "Please check your email to continue registration.": "Sprawdź swój e-mail, aby kontynuować rejestrację.",
     "Please enter the code it contains:": "Wpisz kod, który jest tam zawarty:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeśli nie ustawisz adresu e-mail, nie będzie możliwe zresetowanie Twojego hasła. Kontynuować?",
-    "Error decrypting audio": "Błąd deszyfrowania audio",
     "Error decrypting image": "Błąd deszyfrowania obrazu",
     "Error decrypting video": "Błąd deszyfrowania wideo",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Próbowano załadować konkretny punkt na osi czasu w tym pokoju, ale nie można go znaleźć.",
     "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.": "Wyeksportowany plik pozwoli każdej osobie będącej w stanie go odczytać na deszyfrację jakichkolwiek zaszyfrowanych wiadomości, które możesz zobaczyć, tak więc zalecane jest zachowanie ostrożności. Aby w tym pomóc, powinieneś/aś wpisać hasło poniżej; hasło to będzie użyte do zaszyfrowania wyeksportowanych danych. Późniejsze zaimportowanie tych danych będzie możliwe tylko po uprzednim podaniu owego hasła.",
-    " (unsupported)": " (niewspierany)",
     "Idle": "Bezczynny(-a)",
     "Check for update": "Sprawdź aktualizacje",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmienił(a) awatar pokoju na <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s usunął(-ęła) awatar pokoju.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmienił(a) awatar %(roomName)s",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "To będzie twoja nazwa konta na <span></span> serwerze domowym; możesz też wybrać <a>inny serwer</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Jeśli już posiadasz konto Matrix możesz się <a>zalogować</a>.",
     "Not a valid %(brand)s keyfile": "Niepoprawny plik klucza %(brand)s",
     "Authentication check failed: incorrect password?": "Próba autentykacji nieudana: nieprawidłowe hasło?",
     "Do you want to set an email address?": "Czy chcesz ustawić adres e-mail?",
@@ -404,13 +312,11 @@
     "Failed to upload image": "Przesyłanie obrazka nie powiodło się",
     "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?": "Za chwilę zostaniesz przekierowany/a na zewnętrzną stronę w celu powiązania Twojego konta z %(integrationsUrl)s. Czy chcesz kontynuować?",
     "URL Previews": "Podglądy linków",
-    "Ongoing conference call%(supportedText)s.": "Połączenie grupowe %(supportedText)s w toku.",
     "Featured Rooms:": "Wyróżnione pokoje:",
     "Featured Users:": "Wyróżnieni użytkownicy:",
     "%(widgetName)s widget added by %(senderName)s": "Widżet %(widgetName)s został dodany przez %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Widżet %(widgetName)s został usunięty przez %(senderName)s",
     "%(widgetName)s widget modified by %(senderName)s": "Widżet %(widgetName)s został zmodyfikowany przez %(senderName)s",
-    "Unpin Message": "Odepnij Wiadomość",
     "Add rooms to this community": "Dodaj pokoje do tej społeczności",
     "Invite to Community": "Zaproś do Społeczności",
     "Which rooms would you like to add to this community?": "Które pokoje chcesz dodać do tej społeczności?",
@@ -434,17 +340,13 @@
     "Ignored user": "Ignorowany użytkownik",
     "You are now ignoring %(userId)s": "Ignorujesz teraz %(userId)s",
     "You are no longer ignoring %(userId)s": "Nie ignorujesz już %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s zmienił(a) swoją wyświetlaną nazwę na %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmienił(a) przypiętą wiadomość dla tego pokoju.",
     "Message Pinning": "Przypinanie wiadomości",
     "Send": "Wyślij",
-    "Mirror local video feed": "Powiel lokalne wideo",
+    "Mirror local video feed": "Lustrzane odbicie wideo",
     "Enable inline URL previews by default": "Włącz domyślny podgląd URL w tekście",
     "Enable URL previews for this room (only affects you)": "Włącz podgląd URL dla tego pokoju (dotyczy tylko Ciebie)",
     "Enable URL previews by default for participants in this room": "Włącz domyślny podgląd URL dla uczestników w tym pokoju",
-    "%(senderName)s sent an image": "%(senderName)s wysłał(a) obrazek",
-    "%(senderName)s sent a video": "%(senderName)s wysłał(a) wideo",
-    "%(senderName)s uploaded a file": "%(senderName)s wysłał(a) plik",
     "Key request sent.": "Prośba o klucz wysłana.",
     "Kick this user?": "Wyrzucić tego użytkownika?",
     "Unban this user?": "Odbanować tego użytkownika?",
@@ -455,10 +357,7 @@
     "Invite": "Zaproś",
     "Send an encrypted reply…": "Wyślij zaszyfrowaną odpowiedź…",
     "Send an encrypted message…": "Wyślij zaszyfrowaną wiadomość…",
-    "Jump to message": "Skocz do wiadomości",
-    "No pinned messages.": "Brak przypiętych wiadomości.",
     "Loading...": "Ładowanie...",
-    "Pinned Messages": "Przypięte Wiadomości",
     "Online for %(duration)s": "Online przez %(duration)s",
     "Idle for %(duration)s": "Bezczynny(-a) przez %(duration)s",
     "Offline for %(duration)s": "Offline przez %(duration)s",
@@ -470,14 +369,11 @@
     "Guests can join": "Goście mogą dołączyć",
     "Fetching third party location failed": "Pobranie lokalizacji zewnętrznej nie powiodło się",
     "Send Account Data": "Wyślij dane konta",
-    "All notifications are currently disabled for all targets.": "Wszystkie powiadomienia są obecnie wyłączone dla wszystkich celów.",
-    "Uploading report": "Raport wysyłania",
     "Sunday": "Niedziela",
     "Failed to add tag %(tagName)s to room": "Nie można dodać tagu %(tagName)s do pokoju",
     "Notification targets": "Cele powiadomień",
     "Failed to set direct chat tag": "Nie udało się ustawić znacznika rozmów bezpośrednich",
     "Today": "Dzisiaj",
-    "You are not receiving desktop notifications": "Nie otrzymujesz powiadomień na pulpit",
     "Friday": "Piątek",
     "Update": "Zaktualizuj",
     "What's New": "Co nowego",
@@ -486,25 +382,15 @@
     "Waiting for response from server": "Czekam na odpowiedź serwera",
     "Leave": "Opuść",
     "Send Custom Event": "Wyślij niestandardowe wydarzenie",
-    "Advanced notification settings": "Zaawansowane ustawienia powiadomień",
     "Failed to send logs: ": "Niepowodzenie wysyłki zapisu rozmów ",
-    "Forget": "Zapomnij",
     "World readable": "Całkowicie publiczne",
-    "You cannot delete this image. (%(code)s)": "Nie możesz usunąć tego obrazka. (%(code)s)",
-    "Cancel Sending": "Anuluj wysyłanie",
     "Warning": "Ostrzeżenie",
     "This Room": "Ten pokój",
     "Resend": "Wyślij jeszcze raz",
-    "Error saving email notification preferences": "Wystąpił błąd podczas zapisywania ustawień powiadomień e-mailowych",
     "Messages containing my display name": "Wiadomości zawierające moją wyświetlaną nazwę",
     "Messages in one-to-one chats": "Wiadomości w rozmowach jeden-na-jeden",
     "Unavailable": "Niedostępny",
-    "View Decrypted Source": "Pokaż zdeszyfrowane źródło",
     "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Powiadomienia o słowach kluczowych spełniają reguły, które nie mogą być tu wyświetlone:",
-    "Please set a password!": "Proszę, ustaw hasło!",
-    "You have successfully set a password!": "Hasło zostało zmienione z powodzeniem!",
-    "An error occurred whilst saving your email notification preferences.": "Podczas zapisywania ustawień powiadomień e-mail wystąpił błąd.",
     "Explore Room State": "Przeglądaj stan pokoju",
     "Source URL": "Źródłowy URL",
     "Messages sent by bot": "Wiadomości wysłane przez bota",
@@ -512,42 +398,26 @@
     "Members": "Członkowie",
     "No update available.": "Brak aktualizacji.",
     "Noisy": "Głośny",
-    "Files": "Pliki",
     "Collecting app version information": "Zbieranie informacji o wersji aplikacji",
-    "Keywords": "Słowa kluczowe",
-    "Enable notifications for this account": "Włącz powiadomienia na tym koncie",
     "Invite to this community": "Zaproś do tej społeczności",
-    "Messages containing <span>keywords</span>": "Wiadomości zawierające <span>słowa kluczowe</span>",
     "Room not found": "Pokój nie znaleziony",
     "Tuesday": "Wtorek",
-    "Enter keywords separated by a comma:": "Wpisz słowa kluczowe oddzielone przecinkami:",
-    "Forward Message": "Przekaż wiadomość",
-    "You have successfully set a password and an email address!": "Z powodzeniem ustawiono hasło i adres e-mail dla Twojego konta!",
     "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s używa wiele zaawansowanych technologii, które nie są dostępne lub są w fazie testów w Twojej przeglądarce.",
     "Developer Tools": "Narzędzia programistyczne",
     "Preparing to send logs": "Przygotowywanie do wysłania zapisu rozmów",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Pamiętaj, że zawsze możesz zmienić swój e-mail lub hasło w panelu ustawień użytkownika.",
     "Explore Account Data": "Odkryj dane konta",
-    "All messages (noisy)": "Wszystkie wiadomości (głośno)",
     "Saturday": "Sobota",
-    "I understand the risks and wish to continue": "Rozumiem ryzyko i chcę kontynuować",
-    "Direct Chat": "Rozmowa bezpośrednia",
     "The server may be unavailable or overloaded": "Serwer jest nieosiągalny lub jest przeciążony",
     "Reject": "Odrzuć",
-    "Failed to set Direct Message status of room": "Nie udało się ustawić statusu Rozmów Bezpośrednich dla pokoju",
     "Monday": "Poniedziałek",
     "Remove from Directory": "Usuń z katalogu",
-    "Enable them now": "Włącz je teraz",
     "Toolbox": "Przybornik",
     "Collecting logs": "Zbieranie dzienników",
     "You must specify an event type!": "Musisz określić typ wydarzenia!",
-    "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
     "All Rooms": "Wszystkie pokoje",
     "Wednesday": "Środa",
     "You cannot delete this message. (%(code)s)": "Nie możesz usunąć tej wiadomości. (%(code)s)",
     "Quote": "Cytuj",
-    "Failed to update keywords": "Nie udało się zaktualizować słów kluczowych",
     "Send logs": "Wyślij logi",
     "All messages": "Wszystkie wiadomości",
     "Call invitation": "Zaproszenie do rozmowy",
@@ -555,10 +425,7 @@
     "State Key": "Klucz stanu",
     "Failed to send custom event.": "Wysyłanie niestandardowego wydarzenia nie powiodło się.",
     "What's new?": "Co nowego?",
-    "Notify me for anything else": "Powiadom mnie o całej reszcie",
     "When I'm invited to a room": "Kiedy zostanę zaproszony do pokoju",
-    "Can't update user notification settings": "Nie można zaktualizować ustawień powiadomień użytkownika",
-    "Notify for all other messages/rooms": "Powiadamiaj o wszystkich innych wiadomośsciach/pokojach",
     "Unable to look up room ID from server": "Nie można wyszukać ID pokoju na serwerze",
     "Couldn't find a matching Matrix room": "Nie można znaleźć pasującego pokoju Matrix",
     "Invite to this room": "Zaproś do tego pokoju",
@@ -568,36 +435,22 @@
     "Back": "Powrót",
     "Reply": "Odpowiedz",
     "Show message in desktop notification": "Pokaż wiadomość w notyfikacji na pulpicie",
-    "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.": "Dziennik błędów zawiera dane użytkowania aplikacji, w tym: twoją nazwę użytkownika, numery ID, aliasy pokojów i grup które odwiedzałeś i loginy innych użytkowników. Nie zawiera wiadomości.",
-    "Unhide Preview": "Odkryj podgląd",
     "Unable to join network": "Nie można dołączyć do sieci",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Wysłano %(date)s przez %(user)s",
     "Messages in group chats": "Wiadomości w czatach grupowych",
     "Yesterday": "Wczoraj",
     "Error encountered (%(errorDetail)s).": "Wystąpił błąd (%(errorDetail)s).",
     "Low Priority": "Niski priorytet",
-    "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
-    "Set Password": "Ustaw hasło",
     "Off": "Wyłącz",
     "%(brand)s does not know how to join a room on this network": "%(brand)s nie wie, jak dołączyć do pokoju w tej sieci",
-    "Mentions only": "Tylko, gdy wymienieni",
     "Failed to remove tag %(tagName)s from room": "Nie udało się usunąć tagu %(tagName)s z pokoju",
-    "You can now return to your account after signing out, and sign in on other devices.": "Teraz możesz powrócić do swojego konta na innych urządzeniach po wylogowaniu i ponownym zalogowaniu się.",
-    "Enable email notifications": "Włącz powiadomienia e-mailowe",
     "Event Type": "Typ wydarzenia",
-    "Download this file": "Pobierz plik",
-    "Pin Message": "Przypnij wiadomość",
-    "Failed to change settings": "Nie udało się zmienić ustawień",
     "View Community": "Pokaż społeczność",
     "Event sent!": "Wydarzenie wysłane!",
     "View Source": "Pokaż źródło",
     "Event Content": "Zawartość wydarzenia",
     "Thank you!": "Dziękujemy!",
-    "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!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!",
     "Checking for an update...": "Sprawdzanie aktualizacji...",
     "e.g. %(exampleValue)s": "np. %(exampleValue)s",
-    "Always show encryption icons": "Zawsze wyświetlaj ikony szyfrowania",
     "Send analytics data": "Wysyłaj dane analityczne",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
@@ -608,7 +461,6 @@
     "Members only (since they joined)": "Tylko członkowie (od kiedy dołączyli)",
     "Copied!": "Skopiowano!",
     "Failed to copy": "Kopiowanie nieudane",
-    "An email has been sent to %(emailAddress)s": "E-mail został wysłany do %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
     "Code": "Kod",
     "Delete Widget": "Usuń widżet",
@@ -639,7 +491,6 @@
     "Share Link to User": "Udostępnij odnośnik do użytkownika",
     "Replying": "Odpowiadanie",
     "Share room": "Udostępnij pokój",
-    "Community Invites": "Zaproszenia do społeczności",
     "Banned by %(displayName)s": "Zbanowany przez %(displayName)s",
     "Muted Users": "Wyciszeni użytkownicy",
     "Invalid community ID": "Błędne ID społeczności",
@@ -664,7 +515,6 @@
     "Filter community rooms": "Filtruj pokoje społeczności",
     "Something went wrong when trying to get your communities.": "Coś poszło nie tak podczas pobierania Twoich społeczności.",
     "You're not currently a member of any communities.": "Nie jesteś obecnie członkiem żadnej społeczności.",
-    "Minimize apps": "Zminimalizuj aplikacje",
     "Matrix Room ID": "ID pokoju Matrix",
     "You have entered an invalid address.": "Podałeś nieprawidłowy adres.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Spróbuj użyć jednego z następujących poprawnych typów adresów: %(validTypesList)s.",
@@ -688,11 +538,7 @@
     "Share Community": "Udostępnij Społeczność",
     "Share Room Message": "Udostępnij wiadomość w pokoju",
     "Link to selected message": "Link do zaznaczonej wiadomości",
-    "COPY": "KOPIUJ",
     "Unable to reject invite": "Nie udało się odrzucić zaproszenia",
-    "Share Message": "Udostępnij wiadomość",
-    "Collapse Reply Thread": "Zwiń wątek odpowiedzi",
-    "<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>Strona HTML dla Twojej Społeczności</h1>\n<p>\n    Skorzystaj z długiego opisu aby wprowadzić nowych członków do Społeczności lub rozpowszechnić\n    ważne <a href=\"blabla\">linki</a>.\n</p>\n<p>\n    Możesz nawet używać tagów 'img'.\n</p>\n",
     "Add rooms to the community summary": "Dodaj pokoje do podsumowania Społeczności",
     "Which rooms would you like to add to this summary?": "Które pokoje chcesz dodać do tego podsumowania?",
     "Add to summary": "Dodaj do podsumowania",
@@ -737,14 +583,10 @@
     "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.": "Dane ze starszej wersji %(brand)s zostały wykryte. Spowoduje to błędne działanie kryptografii typu end-to-end w starszej wersji. Wiadomości szyfrowane end-to-end wymieniane ostatnio podczas korzystania ze starszej wersji mogą być niemożliwe do odszyfrowywane w tej wersji. Może to również spowodować niepowodzenie wiadomości wymienianych z tą wersją. Jeśli wystąpią problemy, wyloguj się i zaloguj ponownie. Aby zachować historię wiadomości, wyeksportuj i ponownie zaimportuj klucze.",
     "Your Communities": "Twoje Społeczności",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Czy wiesz, że: możesz używać Społeczności do filtrowania swoich doświadczeń z %(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.": "Aby ustawić filtr, przeciągnij awatar Społeczności do panelu filtra po lewej stronie ekranu. Możesz kliknąć awatar w panelu filtra w dowolnym momencie, aby zobaczyć tylko pokoje i osoby powiązane z tą społecznością.",
     "Error whilst fetching joined communities": "Błąd podczas pobierania dołączonych społeczności",
     "Create a new community": "Utwórz nową Społeczność",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Utwórz Społeczność, aby grupować użytkowników i pokoje! Zbuduj niestandardową stronę główną, aby zaznaczyć swoją przestrzeń we wszechświecie Matrix.",
-    "%(count)s of your messages have not been sent.|one": "Twoja wiadomość nie została wysłana.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Nikogo tu nie ma! Czy chcesz <inviteText>zaprosić inne osoby</inviteText> lub <nowarnText>przestać ostrzegać o pustym pokoju</nowarnText>?",
     "Clear filter": "Wyczyść filtr",
-    "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.": "Jeśli zgłosiłeś błąd za pośrednictwem GitHuba, dzienniki błędów mogą nam pomóc wyśledzić problem. Dzienniki błędów zawierają dane o użytkowaniu aplikacji, w tym nazwę użytkownika, identyfikatory lub aliasy odwiedzonych pomieszczeń lub grup oraz nazwy użytkowników innych użytkowników. Nie zawierają wiadomości.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Prywatność jest dla nas ważna, dlatego nie gromadzimy żadnych danych osobowych ani danych identyfikujących w naszych analizach.",
     "Learn more about how we use analytics.": "Dowiedz się więcej co analizujemy.",
     "No Audio Outputs detected": "Nie wykryto wyjść audio",
@@ -758,24 +600,17 @@
     "Demote": "Zdegraduj",
     "Hide Stickers": "Ukryj Naklejki",
     "Show Stickers": "Pokaż naklejki",
-    "The email field must not be blank.": "Pole e-mail nie może być puste.",
-    "The phone number field must not be blank.": "Pole numeru telefonu nie może być puste.",
-    "The password field must not be blank.": "Pole hasła nie może być puste.",
     "Call Failed": "Nieudane połączenie",
     "Flair": "Wyróżnik społeczności",
     "Showing flair for these communities:": "Wyświetlanie wyróżników dla tych społeczności:",
     "This room is not showing flair for any communities": "Ten pokój nie wyświetla wyróżników dla żadnych społeczności",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sdołączyło",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Wyślij ponownie wiadomość</resendText> lub <cancelText>anuluj wiadomość</cancelText>.",
     "was invited %(count)s times|other": "został(a) zaproszony(-a) %(count)s razy",
     "was invited %(count)s times|one": "został(a) zaproszony(-a)",
     "was banned %(count)s times|one": "został(a) zablokowany(-a)",
     "was kicked %(count)s times|one": "został wyrzucony",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Czy używasz bądź nie trybu edytora tekstu sformatowanego",
-    "Call in Progress": "Łączenie w toku",
     "Permission Required": "Wymagane Uprawnienia",
-    "A call is currently being placed!": "W tej chwili trwa rozmowa!",
-    "A call is already in progress!": "Połączenie już trwa!",
     "You do not have permission to start a conference call in this room": "Nie posiadasz uprawnień do rozpoczęcia rozmowy grupowej w tym pokoju",
     "Unignored user": "Nieignorowany użytkownik",
     "Forces the current outbound group session in an encrypted room to be discarded": "Wymusza odrzucenie bieżącej sesji grupy wychodzącej w zaszyfrowanym pokoju",
@@ -814,7 +649,6 @@
     "And %(count)s more...|other": "I %(count)s więcej…",
     "Delete Backup": "Usuń Kopię Zapasową",
     "Unable to load! Check your network connectivity and try again.": "Nie można załadować! Sprawdź połączenie sieciowe i spróbuj ponownie.",
-    "Algorithm: ": "Algorytm: ",
     "Use a few words, avoid common phrases": "Użyj kilku słów, unikaj typowych zwrotów",
     "Avoid repeated words and characters": "Unikaj powtarzających się słów i znaków",
     "Avoid sequences": "Unikaj sekwencji",
@@ -825,7 +659,6 @@
     "Recent years are easy to guess": "Ostatnie lata są łatwe do odgadnięcia",
     "Dates are often easy to guess": "Daty są często łatwe do odgadnięcia",
     "This is a very common password": "To jest bardzo popularne hasło",
-    "Backup version: ": "Wersja kopii zapasowej: ",
     "Reversed words aren't much harder to guess": "Odwrócone słowa nie są trudniejsze do odgadnięcia",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Przewidywalne podstawienia, takie jak \"@\" zamiast \"a\", nie pomagają zbytnio",
     "Repeats like \"aaa\" are easy to guess": "Powtórzenia takie jak \"aaa\" są łatwe do odgadnięcia",
@@ -859,7 +692,6 @@
     "Failed to invite users to the room:": "Nie udało się zaprosić użytkowników do pokoju:",
     "Add some now": "Dodaj teraz kilka",
     "Please review and accept all of the homeserver's policies": "Przeczytaj i zaakceptuj wszystkie zasady dotyczące serwera domowego",
-    "Failed to remove widget": "Nie udało się usunąć widżetu",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)swyszło i dołączyło ponownie %(count)s razy",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)swyszło i dołączyło ponownie",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)swyszedł(-ła) i dołączył(a) ponownie %(count)s razy",
@@ -877,15 +709,11 @@
     "Capitalization doesn't help very much": "Kapitalizacja nie pomaga bardzo",
     "This is a top-10 common password": "To jest 10 najpopularniejszych haseł",
     "This is a top-100 common password": "To jest 100 najpopularniejszych haseł",
-    "This looks like a valid recovery key!": "To wygląda na prawidłowy klucz odzyskiwania!",
-    "Not a valid recovery key": "Nieprawidłowy klucz odzyskiwania",
-    "If you don't want to set this up now, you can later in Settings.": "Jeśli nie chcesz tego teraz ustawiać, możesz to zrobić później w Ustawieniach.",
     "Retry": "Ponów",
     "Unable to create key backup": "Nie można utworzyć kopii zapasowej klucza",
     "Download": "Pobierz",
     "Next": "Dalej",
     "No backup found!": "Nie znaleziono kopii zapasowej!",
-    "Checking...": "Sprawdzanie…",
     "Create a new room with the same name, description and avatar": "Utwórz nowy pokój o tej samej nazwie, opisie i awatarze",
     "That doesn't look like a valid email address": "To nie wygląda na poprawny adres e-mail",
     "was kicked %(count)s times|other": "został(a) wyrzucony(-a) %(count)s razy",
@@ -896,7 +724,6 @@
     "was unbanned %(count)s times|other": "został(a) odbanowany(-a) %(count)s razy",
     "were unbanned %(count)s times|other": "zostali odbanowani %(count)s razy",
     "Please review and accept the policies of this homeserver:": "Przeczytaj i zaakceptuj zasady tego serwera domowego:",
-    "Don't ask again": "Nie pytaj ponownie",
     "Messages containing @room": "Wiadomości zawierające @room",
     "This is similar to a commonly used password": "Jest to podobne do powszechnie stosowanego hasła",
     "<b>Print it</b> and store it somewhere safe": "<b>Wydrukuj</b> przechowuj w bezpiecznym miejscu",
@@ -992,7 +819,6 @@
     "Default role": "Domyślna rola",
     "Send messages": "Wysyłanie wiadomości",
     "Change settings": "Zmienianie ustawień",
-    "Remove messages": "Usuwanie wiadomości",
     "Notify everyone": "Powiadamianie wszystkich",
     "Roles & Permissions": "Role i uprawnienia",
     "Encryption": "Szyfrowanie",
@@ -1006,7 +832,6 @@
     "Room Topic": "Temat pokoju",
     "Power level": "Poziom uprawnień",
     "Room Settings - %(roomName)s": "Ustawienia pokoju - %(roomName)s",
-    "Doesn't look like a valid phone number": "To nie wygląda na poprawny numer telefonu",
     "Globe": "Ziemia",
     "Smiley": "Uśmiech",
     "Spanner": "Klucz francuski",
@@ -1022,7 +847,6 @@
     "Sends the given message coloured as a rainbow": "Wysyła podaną wiadomość w kolorach tęczy",
     "Restore from Backup": "Przywróć z kopii zapasowej",
     "Deactivating your account is a permanent action - be careful!": "Dezaktywacja konta jest czynnością nieodwracalną — uważaj!",
-    "Key backup": "Kopia zapasowa klucza",
     "Unable to restore backup": "Przywrócenie kopii zapasowej jest niemożliwe",
     "Email Address": "Adres e-mail",
     "Room version": "Wersja pokoju",
@@ -1045,7 +869,6 @@
     "Set a new custom sound": "Ustaw nowy niestandardowy dźwięk",
     "Browse": "Przeglądaj",
     "Once enabled, encryption cannot be disabled.": "Po włączeniu szyfrowanie nie może zostać wyłączone.",
-    "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.": "Aby uniknąć duplikowania problemów, prosimy najpierw <existingIssuesLink>przejrzeć istniejące problemy</existingIssuesLink> (i dodać +1) lub <newIssueLink>utworzyć nowy problem</newIssueLink>, jeżeli nie możesz go znaleźć.",
     "Go back": "Wróć",
     "Whether or not you're logged in (we don't record your username)": "Czy jesteś zalogowany(-a) lub niezalogowany(-a) (nie zapisujemy Twojej nazwy użytkownika)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Czy używasz korzystasz z funkcji „okruchów” (awatary nad listą pokoi)",
@@ -1075,7 +898,6 @@
     "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.": "Możesz również spróbować skorzystać z publicznego serwera <code>turn.matrix.org</code>, lecz nie będzie aż tak niezawodny i Twój adres IP zostanie przesłany temu serwerowi. Możesz zarządzać tym w Ustawieniach.",
     "Sends the given emote coloured as a rainbow": "Wysyła podaną emotkę w kolorach tęczy",
     "Displays list of commands with usages and descriptions": "Wyświetla listę komend z przykładami i opisami",
-    "%(senderName)s made no change.": "%(senderName)s nic nie zmienił(a).",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s ustawił(a) pokój jako publiczny dla każdego znającego link.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s ustawił(a) pokój jako tylko dla zaproszonych.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s zmienił(a) zasadę dołączania na %(rule)s",
@@ -1104,14 +926,11 @@
     "Show a placeholder for removed messages": "Pokaż symbol zastępczy dla usuniętych wiadomości",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Pokaż powiadomienia o dołączeniu/opuszczeniu (bez wpływu na zaproszenia/wyrzucenia/bany)",
     "Show read receipts sent by other users": "Pokaż potwierdzenia odczytania wysyłane przez innych użytkowników",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Pokaż przypomnienie o aktywowaniu Odzyskiwania Bezpiecznych Wiadomości w pokojach zaszyfrowanych",
     "Show avatars in user and room mentions": "Pokaż awatary we wzmiankach o użytkowniku lub pokoju",
     "Enable big emoji in chat": "Aktywuj duże emoji na czacie",
     "Enable Community Filter Panel": "Aktywuj Panel Filtrów Społeczności",
-    "Allow Peer-to-Peer for 1:1 calls": "Pozwól na połączenia 1:1 w technologii Peer-to-Peer",
     "Prompt before sending invites to potentially invalid matrix IDs": "Powiadamiaj przed wysłaniem zaproszenia do potencjalnie nieprawidłowych ID matrix",
     "Show hidden events in timeline": "Pokaż ukryte wydarzenia na linii czasowej",
-    "Low bandwidth mode": "Tryb wolnej przepustowości",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Pozwól na awaryjny serwer wspomagania połączeń turn.matrix.org, gdy Twój serwer domowy takiego nie oferuje (Twój adres IP będzie udostępniony podczas połączenia)",
     "Messages containing my username": "Wiadomości zawierające moją nazwę użytkownika",
     "Encrypted messages in one-to-one chats": "Zaszyforwane wiadomości w rozmowach jeden-do-jednego",
@@ -1137,11 +956,7 @@
     "All keys backed up": "Utworzono kopię zapasową wszystkich kluczy",
     "Back up your keys before signing out to avoid losing them.": "Utwórz kopię zapasową kluczy przed wylogowaniem, aby ich nie utracić.",
     "Start using Key Backup": "Rozpocznij z użyciem klucza kopii zapasowej",
-    "Add an email address to configure email notifications": "Dodaj adres poczty elektronicznej, aby skonfigurować powiadomienia pocztowe",
     "Profile picture": "Obraz profilowy",
-    "Identity Server URL must be HTTPS": "URL serwera tożsamości musi być HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Nieprawidłowy serwer tożsamości (kod statusu %(code)s)",
-    "Could not connect to Identity Server": "Nie można połączyć z Serwerem Tożsamości",
     "Checking server": "Sprawdzanie serwera",
     "Terms of service not accepted or the identity server is invalid.": "Warunki użytkowania nieakceptowane lub serwer tożsamości jest nieprawidłowy.",
     "Identity server has no terms of service": "Serwer tożsamości nie posiada warunków użytkowania",
@@ -1149,15 +964,12 @@
     "Only continue if you trust the owner of the server.": "Kontynuj tylko wtedy, gdy ufasz właścicielowi serwera.",
     "Disconnect from the identity server <idserver />?": "Odłączyć od serwera tożsamości <idserver />?",
     "Disconnect": "Odłącz",
-    "Identity Server (%(server)s)": "Serwer tożsamości (%(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.": "Używasz <server></server>, aby odnajdywać i móc być odnajdywanym przez istniejące kontakty, które znasz. Możesz zmienić serwer tożsamości poniżej.",
-    "Identity Server": "Serwer Tożsamości",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Nie używasz serwera tożsamości. Aby odkrywać i być odkrywanym przez istniejące kontakty które znasz, dodaj jeden poniżej.",
     "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.": "Odłączenie się od serwera tożsamości oznacza, że inni nie będą mogli Cię odnaleźć ani Ty nie będziesz w stanie zaprosić nikogo za pomocą e-maila czy telefonu.",
     "Enter a new identity server": "Wprowadź nowy serwer tożsamości",
     "Change": "Zmień",
     "<a>Upgrade</a> to your own domain": "<a>Zaktualizuj</a> do swojej własnej domeny",
-    "Integration Manager": "Menedżer Integracji",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Wyrażasz zgodę na warunki użytkowania serwera%(serverName)s aby pozwolić na odkrywanie Ciebie za pomocą adresu e-mail oraz numeru telefonu.",
     "Discovery": "Odkrywanie",
     "Deactivate account": "Dezaktywuj konto",
@@ -1205,7 +1017,6 @@
     "eg: @bot:* or example.org": "np: @bot:* lub przykład.pl",
     "Composer": "Kompozytor",
     "Autocomplete delay (ms)": "Opóźnienie autouzupełniania (ms)",
-    "Explore": "Przeglądaj",
     "Filter": "Filtruj",
     "Add room": "Dodaj pokój",
     "Request media permissions": "Zapytaj o uprawnienia",
@@ -1236,13 +1047,10 @@
     "Do you want to join %(roomName)s?": "Czy chcesz dołączyć do %(roomName)s?",
     "<userName/> invited you": "<userName/> zaprosił(a) CIę",
     "You're previewing %(roomName)s. Want to join it?": "Przeglądasz %(roomName)s. Czy chcesz dołączyć do pokoju?",
-    "Not now": "Nie teraz",
-    "Don't ask me again": "Nie pytaj ponownie",
     "%(count)s unread messages including mentions.|other": "%(count)s nieprzeczytanych wiadomości, wliczając wzmianki.",
     "%(count)s unread messages including mentions.|one": "1 nieprzeczytana wzmianka.",
     "%(count)s unread messages.|other": "%(count)s nieprzeczytanych wiadomości.",
     "%(count)s unread messages.|one": "1 nieprzeczytana wiadomość.",
-    "Unread mentions.": "Nieprzeczytane wzmianki.",
     "Unread messages.": "Nieprzeczytane wiadomości.",
     "Join": "Dołącz",
     "%(creator)s created and configured the room.": "%(creator)s stworzył(a) i skonfigurował(a) pokój.",
@@ -1256,8 +1064,6 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nie zdołano wczytać zdarzenia, na które odpowiedziano, może ono nie istnieć lub nie masz uprawnienia, by je zobaczyć.",
     "e.g. my-room": "np. mój-pokój",
     "Some characters not allowed": "Niektóre znaki niedozwolone",
-    "Report bugs & give feedback": "Zgłoś błędy & sugestie",
-    "Filter rooms…": "Filtruj pokoje…",
     "Find a room…": "Znajdź pokój…",
     "Find a room… (e.g. %(exampleRoom)s)": "Znajdź pokój… (np. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Jeżeli nie możesz znaleźć szukanego pokoju, poproś o zaproszenie albo <a>stwórz nowy pokój</a>.",
@@ -1268,10 +1074,7 @@
     "Upload": "Prześlij",
     "Remove recent messages": "Usuń ostatnie wiadomości",
     "Rotate Left": "Obróć w lewo",
-    "Rotate counter-clockwise": "Obróć w kierunku przeciwnym do ruchu wskazówek zegara",
     "Rotate Right": "Obróć w prawo",
-    "Rotate clockwise": "Obróć zgodnie z ruchem wskazówek zegara",
-    "Help": "Pomoc",
     "Passwords don't match": "Hasła nie zgadzają się",
     "Never send encrypted messages to unverified sessions from this session": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji z tej sesji",
     "Enable desktop notifications for this session": "Włącz powiadomienia na pulpicie dla tej sesji",
@@ -1300,7 +1103,6 @@
     "Published Addresses": "Opublikowane adresy",
     "Local Addresses": "Lokalne adresy",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Ustaw adresy tego pokoju, aby użytkownicy mogli go znaleźć za pośrednictwem Twojego serwera domowego (%(localDomain)s)",
-    "Sign in to your Matrix account on %(serverName)s": "Zaloguj się do Twojego konta Matrix na %(serverName)s",
     "Couldn't load page": "Nie można załadować strony",
     "Create account": "Utwórz konto",
     "Navigation": "Nawigacja",
@@ -1344,24 +1146,18 @@
     "Server name": "Nazwa serwera",
     "Add a new server...": "Dodaj nowy serwer…",
     "Please enter a name for the room": "Proszę podać nazwę pokoju",
-    "This room is private, and can only be joined by invitation.": "Ten pokój jest prywatny i można do niego dołączyć tylko za zaproszeniem.",
     "Enable end-to-end encryption": "Włącz szyfrowanie end-to-end",
     "Create a public room": "Utwórz publiczny pokój",
     "Create a private room": "Utwórz prywatny pokój",
     "Topic (optional)": "Temat (opcjonalnie)",
-    "Make this room public": "Upublicznij ten pokój",
     "Hide advanced": "Ukryj zaawansowane",
     "Show advanced": "Pokaż zaawansowane",
     "Recent Conversations": "Najnowsze rozmowy",
     "Suggestions": "Propozycje",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Rozpocznij rozmowę z kimś, kto używa swojej nazwy, nazwy użytkownika (jak <userId/>) lub adresu e-mail.",
-    "Your password": "Twoje hasło",
     "Upload files (%(current)s of %(total)s)": "Prześlij pliki (%(current)s z %(total)s)",
     "Upload files": "Prześlij pliki",
     "Upload all": "Prześlij wszystko",
     "Cancel All": "Anuluj wszystko",
-    "Resend edit": "Wyślij ponownie edycję",
-    "Share Permalink": "Udostępnij odnośnik bezpośredni",
     "Report Content": "Zgłoś treść",
     "Notification settings": "Ustawienia powiadomień",
     "Clear status": "Wyczyść status",
@@ -1369,26 +1165,15 @@
     "Set status": "Ustaw status",
     "Set a new status...": "Ustaw nowy status…",
     "Hide": "Ukryj",
-    "Take picture": "Zrób zdjęcie",
     "Remove for everyone": "Usuń dla wszystkich",
-    "Remove for me": "Usuń dla mnie",
     "User Status": "Status użytkownika",
-    "Server Name": "Nazwa serwera",
-    "The username field must not be blank.": "Pole nazwy użytkownika nie może być puste.",
     "Username": "Nazwa użytkownika",
-    "Not sure of your password? <a>Set a new one</a>": "Nie jesteś pewien swojego hasła? <a>Ustaw nowe</a>",
     "Enter password": "Wprowadź hasło",
     "Password is allowed, but unsafe": "Hasło jest dozwolone, ale niebezpieczne",
     "Nice, strong password!": "Ładne, silne hasło!",
     "Enter phone number (required on this homeserver)": "Wprowadź numer telefonu (wymagane na tym serwerze domowym)",
     "Enter username": "Wprowadź nazwę użytkownika",
-    "Homeserver URL": "Adres URL serwera domowego",
-    "Other servers": "Inne serwery",
-    "Sign in to your Matrix account on <underlinedServerName />": "Zaloguj się do swojego konta Matrix na <underlinedServerName />",
     "Explore rooms": "Przeglądaj pokoje",
-    "Your profile": "Twój profil",
-    "Your Matrix account on %(serverName)s": "Twoje konto Matrix na %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Twoje konto Matrix na <underlinedServerName />",
     "A verification email will be sent to your inbox to confirm setting your new password.": "E-mail weryfikacyjny zostanie wysłany do skrzynki odbiorczej w celu potwierdzenia ustawienia nowego hasła.",
     "Set a new password": "Ustaw nowe hasło",
     "Go Back": "Wróć",
@@ -1405,7 +1190,6 @@
     "%(count)s sessions|other": "%(count)s sesji",
     "%(count)s sessions|one": "%(count)s sesja",
     "Hide sessions": "Ukryj sesje",
-    "Direct message": "Wiadomość bezpośrednia",
     "Security": "Bezpieczeństwo",
     "Integrations are disabled": "Integracje są wyłączone",
     "Enable 'Manage Integrations' in Settings to do this.": "Włącz „Zarządzaj integracjami” w ustawieniach, aby to zrobić.",
@@ -1418,7 +1202,6 @@
     "Session ID:": "Identyfikator sesji:",
     "Session key:": "Klucz sesji:",
     "Accept all %(invitedRooms)s invites": "Zaakceptuj wszystkie zaproszenia do %(invitedRooms)s",
-    "Invite only": "Tylko dla zaproszonych",
     "Close preview": "Zamknij podgląd",
     "Send a reply…": "Wyślij odpowiedź…",
     "Send a message…": "Wyślij wiadomość…",
@@ -1431,14 +1214,10 @@
     "Session name": "Nazwa sesji",
     "Session key": "Klucz sesji",
     "Go": "Przejdź",
-    "Your account is not secure": "Twoje konto nie jest bezpieczne",
-    "New session": "Nowa sesja",
-    "Deny": "Zabroń",
     "Email (optional)": "Adres e-mail (opcjonalnie)",
     "Guest": "Gość",
     "Setting up keys": "Konfigurowanie kluczy",
     "Verify this session": "Zweryfikuj tę sesję",
-    "Set up encryption": "Skonfiguruj szyfrowanie",
     "%(name)s is requesting verification": "%(name)s prosi o weryfikację",
     "Failed to set topic": "Nie udało się ustawić tematu",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s zmienił(a) nazwę pokoju z %(oldRoomName)s na %(newRoomName)s.",
@@ -1452,7 +1231,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s wykonał(a) połączenie wideo.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s wykonał(a) połączenie wideo. (nie obsługiwane przez tę przeglądarkę)",
     "Done": "Gotowe",
-    "The message you are trying to send is too large.": "Wiadomość, którą próbujesz wysłać jest za duża.",
     "about a minute ago": "około minuty temu",
     "about an hour ago": "około godziny temu",
     "about a day ago": "około dzień temu",
@@ -1464,14 +1242,12 @@
     "Bold": "Pogrubienie",
     "Italics": "Kursywa",
     "Strikethrough": "Przekreślenie",
-    "Recent rooms": "Ostatnie pokoje",
     "Reason: %(reason)s": "Powód: %(reason)s",
     "Reject & Ignore user": "Odrzuć i zignoruj użytkownika",
     "Show image": "Pokaż obraz",
     "Verify session": "Zweryfikuj sesję",
     "Upload completed": "Przesyłanie zakończone",
     "Message edits": "Edycje wiadomości",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jeśli napotkasz jakieś błędy lub masz opinię, którą chcesz się podzielić, daj nam znać na GitHubie.",
     "Terms of Service": "Warunki użytkowania",
     "Upload %(count)s other files|other": "Prześlij %(count)s innych plików",
     "Upload %(count)s other files|one": "Prześlij %(count)s inny plik",
@@ -1480,14 +1256,12 @@
     "Create a Group Chat": "Utwórz czat grupowy",
     "<a>Log in</a> to your new account.": "<a>Zaloguj się</a> do nowego konta.",
     "Registration Successful": "Pomyślnie zarejestrowano",
-    "DuckDuckGo Results": "Wyniki z DuckDuckGo",
     "Enter your account password to confirm the upgrade:": "Wprowadź hasło do konta, aby potwierdzić aktualizację:",
     "Autocomplete": "Autouzupełnienie",
     "Toggle Bold": "Przełącz pogrubienie",
     "Toggle Italics": "Przełącz kursywę",
     "Toggle Quote": "Przełącz cytowanie",
     "Cancel autocomplete": "Anuluj autouzupełnienie",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania.",
     "Confirm adding email": "Potwierdź dodanie e-maila",
     "Click the button below to confirm adding this email address.": "Naciśnij przycisk poniżej aby zatwierdzić dodawanie adresu e-mail.",
     "Confirm adding phone number": "Potwierdź dodanie numeru telefonu",
@@ -1506,7 +1280,6 @@
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Potwierdź dodanie tego adresu e-mail przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość.",
     "Single Sign On": "Pojedyncze logowanie",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potwierdź dodanie tego numeru telefonu przy użyciu pojedynczego logowania, aby potwierdzić swoją tożsamość.",
-    "Learn More": "Dowiedz się więcej",
     "Light": "Jasny",
     "Dark": "Ciemny",
     "Font size": "Rozmiar czcionki",
@@ -1532,11 +1305,6 @@
     "Switch to dark mode": "Przełącz na tryb ciemny",
     "Switch theme": "Przełącz motyw",
     "All settings": "Wszystkie ustawienia",
-    "This requires the latest %(brand)s on your other devices:": "To wymaga najnowszy %(brand)s na pozostałych urządzeniach:",
-    "%(brand)s Desktop": "%(brand)s na komputer",
-    "%(brand)s Web": "%(brand)s w przeglądarce",
-    "%(brand)s iOS": "%(brand)s na iOS",
-    "%(brand)s Android": "%(brand)s na Android",
     "You're signed out": "Wylogowano",
     "That matches!": "Zgadza się!",
     "New Recovery Method": "Nowy sposób odzyskiwania",
@@ -1548,17 +1316,13 @@
     "Upload a file": "Wyślij plik",
     "Unknown (user, session) pair:": "Nieznana para (użytkownik, sesja):",
     "Verifies a user, session, and pubkey tuple": "Weryfikuje użytkownika, sesję oraz klucz publiczny",
-    "Find other public servers or use a custom server": "Znajdź inne publiczne serwery lub podaj własny",
     "Join millions for free on the largest public server": "Dołącz do milionów za darmo na największym publicznym serwerze",
-    "Free": "Za darmo",
     "Enter your password to sign in and regain access to your account.": "Podaj hasło, aby zalogować się i odzyskać dostęp do swojego konta.",
     "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.": "Odzyskaj dostęp do swojego konta i klucze zachowane w tej sesji. Bez nich nie uda się odczytać bezpiecznych wiadomości w żadnej sesji.",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Ci użytkownicy mogą nie istnieć lub są nieprawidłowi, i nie mogą zostać zaproszeni: %(csvNames)s",
     "Failed to find the following users": "Nie udało się znaleźć tych użytkowników",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Nie udało się zaprosić tych użytkowników. Proszę sprawdzić zaproszonych użytkowników i spróbować ponownie.",
     "Something went wrong trying to invite the users.": "Coś poszło nie tak podczas zapraszania użytkowników.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Nie udało się utworzyć wiadomości. Proszę sprawdzić zaproszonych użytkowników i spróbować ponownie.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Nie udało się zaprosić tych użytkowników do rozmowy: %(csvUsers)s",
     "Invite by email": "Zaproś przez e-mail",
     "Invite anyway and never warn me again": "Zaproś mimo to i nie ostrzegaj ponownie",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nie znaleziono profilów wymienionych ID Matriksa — czy zaprosić ich mimo to?",
@@ -1569,8 +1333,6 @@
     "The call could not be established": "Nie udało się nawiązać połączenia",
     "Answered Elsewhere": "Odebrane gdzie indziej",
     "The call was answered on another device.": "Połączenie zostało odebrane na innym urządzeniu.",
-    "The other party declined the call.": "Połączenie zostało odrzucone przez drugą stronę.",
-    "Call Declined": "Połączenie odrzucone",
     "Messages in this room are end-to-end encrypted.": "Wiadomości w tym pokoju są szyfrowane end-to-end.",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Klucz podpisujący, który podano jest taki sam jak klucz podpisujący otrzymany od %(userId)s oraz sesji %(deviceId)s. Sesja została oznaczona jako zweryfikowana.",
     "Sends a message to the given user": "Wysyła wiadomość do wybranego użytkownika",
@@ -1604,7 +1366,6 @@
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Zmiany tego, kto może przeglądać historię wyszukiwania dotyczą tylko przyszłych wiadomości w pokoju. Widoczność wcześniejszej historii nie zmieni się.",
     "No other published addresses yet, add one below": "Brak innych opublikowanych adresów, dodaj jakiś poniżej",
     "Other published addresses:": "Inne opublikowane adresy:",
-    "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.": "Opublikowane adresy mogą być używane, aby każdy mógł dołączyć do Twojego pokoju. Aby opublikować adres, należy wcześniej ustawić lokalny adres.",
     "Room settings": "Ustawienia pokoju",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Wiadomości w tym pokoju są szyfrowane end-to-end. Jeżeli ludzie dołączą do niego, możesz zweryfikować ich na ich profilu, naciskając na ich awatar.",
     "Messages in this room are not end-to-end encrypted.": "Wiadomości w tym pokoju nie są szyfrowane end-to-end.",
@@ -1622,7 +1383,6 @@
     "Send report": "Wyślij zgłoszenie",
     "Report Content to Your Homeserver Administrator": "Zgłoś zawartość do administratora swojego serwera",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Prywatne pokoje można odnaleźć i dołączyć do nich tylko przez zaproszenie. Do publicznych pokojów może dołączyć każdy w tej społeczności.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Prywatne pokoje można odnaleźć i dołączyć do nich tylko przez zaproszenie. Do publicznych pokojów każdy może dołączyć.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Możesz ustawić tę opcję, jeżeli pokój będzie używany wyłącznie do współpracy wewnętrznych zespołów na Twoim serwerze. To nie może być później zmienione.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Zablokuj wszystkich niebędących użytkownikami %(serverName)s w tym pokoju.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Nie możesz wyłączyć tego później. Mostki i większość botów nie będą działać.",
@@ -1650,7 +1410,6 @@
     "A session's public name is visible to people you communicate with": "Publiczna nazwa sesji jest widoczna dla osób z którymi się komunikujesz",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Zarządzaj nazwami i unieważnaj sesje poniżej, lub <a>weryfikuj je na swoim profilu</a>.",
     "Where you’re logged in": "Gdzie jesteś zalogowany(-a)",
-    "Review where you’re logged in": "Przejrzyj, gdzie jesteś zalogowany(-a)",
     "Show tray icon and minimize window to it on close": "Pokazuj ikonę w zasobniku i minimalizuj okno do zasobnika przy zamknięciu",
     "Display your community flair in rooms configured to show it.": "Wyświetlaj swój wyróżnik społeczności w pokojach skonfigurowanych, aby go używać.",
     "System font name": "Nazwa czcionki systemowej",
@@ -1661,13 +1420,10 @@
     "Use custom size": "Użyj niestandardowego rozmiaru",
     "Appearance Settings only affect this %(brand)s session.": "Ustawienia wyglądu wpływają tylko na tę sesję %(brand)s.",
     "Customise your appearance": "Dostosuj wygląd",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji aby zarządzać botami, widżetami i pakietami naklejek.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji <b>%(serverName)s</b> aby zarządzać botami, widżetami i pakietami naklejek.",
     "There are two ways you can provide feedback and help us improve %(brand)s.": "Są dwa sposoby na przekazanie informacji zwrotnych i pomoc w usprawnieniu %(brand)s.",
     "Feedback sent": "Wysłano informacje zwrotne",
     "Send feedback": "Wyślij informacje zwrotne",
     "Feedback": "Informacje zwrotne",
-    "You have no visible notifications in this room.": "Nie masz widocznych powiadomień w tym pokoju.",
     "%(creator)s created this DM.": "%(creator)s utworzył(a) tę wiadomość bezpośrednią.",
     "You do not have permission to create rooms in this community.": "Nie masz uprawnień do tworzenia pokojów w tej społeczności.",
     "Cannot create rooms in this community": "Nie można utworzyć pokojów w tej społeczności",
@@ -1836,19 +1592,16 @@
     "Syncing...": "Synchronizacja…",
     "General failure": "Ogólny błąd",
     "Removing…": "Usuwanie…",
-    "Premium": "Premium",
     "Cancelling…": "Anulowanie…",
     "Algorithm:": "Algorytm:",
     "Bulk options": "Masowe działania",
     "Modern": "Współczesny",
-    "Compact": "Kompaktowy",
     "Approve": "Zatwierdź",
     "Incompatible Database": "Niekompatybilna baza danych",
     "Show": "Pokaż",
     "Information": "Informacje",
     "Categories": "Kategorie",
     "Reactions": "Reakcje",
-    "Role": "Rola",
     "Trusted": "Zaufane",
     "Accepting…": "Akceptowanie…",
     "Re-join": "Dołącz ponownie",
@@ -2014,10 +1767,6 @@
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s usunął regułę banującą serwery pasujące do wzorca %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s usunął regułę banującą pokoje pasujące do wzorca %(glob)s",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s usunął regułę banującą użytkowników pasujących do wzorca %(glob)s",
-    "%(senderName)s declined the call.": "%(senderName)s odrzucił(a) połączenie.",
-    "(an error occurred)": "(wystąpił błąd)",
-    "(their device couldn't start the camera / microphone)": "(ich urządzenie nie może uruchomić kamery / mikrofonu)",
-    "(connection failed)": "(połączenie nieudane)",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s usunął(-ęła) alternatywny adres %(addresses)s tego pokoju.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s usunął(-ęła) alternatywny adres %(addresses)s tego pokoju.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Wszystkie serwery zostały wykluczone z uczestnictwa! Ten pokój nie może być już używany.",
@@ -2038,7 +1787,6 @@
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Użyj serwera tożsamości, aby zapraszać przez e-mail. Zarządzaj w <settings>Ustawieniach</settings>.",
     "Got it": "Rozumiem",
     "Space used:": "Użyta powierzchnia:",
-    "This wasn't me": "To nie byłem(-am) ja",
     "Verify by emoji": "Weryfikuj z użyciem emoji",
     "Your messages are not secure": "Twoje wiadomości nie są bezpieczne",
     "Start Verification": "Rozpocznij weryfikację",
@@ -2047,7 +1795,6 @@
     "Verify User": "Weryfikuj użytkownika",
     "Verification Request": "Żądanie weryfikacji",
     "Widgets do not use message encryption.": "Widżety nie używają szyfrowania wiadomości.",
-    "Automatically invite users": "Automatycznie zapraszaj użytkowników",
     "This widget may use cookies.": "Ten widżet może używać plików cookies.",
     "Widget added by": "Widżet dodany przez",
     "Widget ID": "ID widżetu",
@@ -2122,11 +1869,8 @@
     "in secret storage": "w tajnej pamięci",
     "in memory": "w pamięci",
     "Set up": "Konfiguruj",
-    "Channel: %(channelName)s": "Kanał: %(channelName)s",
-    "Workspace: %(networkName)s": "Przestrzeń robocza: %(networkName)s",
     "This bridge is managed by <user />.": "Ten mostek jest zarządzany przez <user />.",
     "Your server isn't responding to some <a>requests</a>.": "Twój serwer nie odpowiada na niektóre <a>zapytania</a>.",
-    "From %(deviceName)s (%(deviceId)s)": "Z %(deviceName)s (%(deviceId)s)",
     "Verify this session by confirming the following number appears on its screen.": "Weryfikuj tę sesję potwierdzając, że następująca liczba pojawia się na jego ekranie.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Oczekiwanie na weryfikację przez Twoją drugą sesję, %(deviceName)s (%(deviceId)s)…",
     "Waiting for your other session to verify…": "Oczekiwanie na weryfikację przez Twoją drugą sesję…",
@@ -2139,7 +1883,6 @@
     "or": "lub",
     "Scan this unique code": "Zeskanuj ten unikatowy kod",
     "Verify this session by completing one of the following:": "Weryfikuj tę sesję wykonując jedno z następujących:",
-    "Incoming call": "Połączenie przychodzące",
     "Unknown caller": "Nieznany rozmówca",
     "Return to call": "Wróć do połączenia",
     "Uploading logs": "Wysyłanie logów",
@@ -2149,9 +1892,7 @@
     "Use Ctrl + Enter to send a message": "Użyj Ctrl + Enter, aby wysłać wiadomość",
     "How fast should messages be downloaded.": "Jak szybko powinny być pobierane wiadomości.",
     "IRC display name width": "Szerokość nazwy wyświetlanej IRC",
-    "Show chat effects": "Pokazuj efekty czatu",
     "Render LaTeX maths in messages": "Renderuj działania LaTeX w wiadomościach",
-    "Multiple integration managers": "Wiele menedżerów integracji",
     "Change notification settings": "Zmień ustawienia powiadomień",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
@@ -2163,7 +1904,6 @@
     "Call ended": "Połączenie zakończone",
     "%(senderName)s ended the call": "%(senderName)s zakończył(a) połączenie",
     "The person who invited you already left the room.": "Osoba, która Cię zaprosiła, już opuściła pokój.",
-    "Verify the new login accessing your account: %(name)s": "Zweryfikuj nowe logowanie z dostępem do Twojego konta: %(name)s",
     "You joined the call": "Dołączyłeś(-aś) do połączenia",
     "%(senderName)s joined the call": "%(senderName)s dołączył(a) do połączenia",
     "Call in progress": "Połączenie w trakcie",
@@ -2173,7 +1913,6 @@
     "Your homeserver has exceeded one of its resource limits.": "Twój homeserver przekroczył jeden z limitów zasobów.",
     "Your homeserver has exceeded its user limit.": "Twój homeserver przekroczył limit użytkowników.",
     "Review": "Przejrzyj",
-    "Verify all your sessions to ensure your account & messages are safe": "Zweryfikuj wszystkie swoje sesje, aby upewnić się, że Twoje konto i wiadomości są bezpieczne",
     "Error leaving room": "Błąd opuszczania pokoju",
     "Unexpected server error trying to leave the room": "Nieoczekiwany błąd serwera podczas próby opuszczania pokoju",
     "%(num)s days from now": "za %(num)s dni",
@@ -2205,12 +1944,10 @@
     "This room is end-to-end encrypted": "Ten pokój jest szyfrowany end-to-end",
     "This message cannot be decrypted": "Ta wiadomość nie może zostać odszyfrowana",
     "Scroll to most recent messages": "Przewiń do najnowszych wiadomości",
-    "Incoming video call": "Przychodzące połączenie wideo",
     "Video Call": "Połączenie wideo",
     "Fill Screen": "Wypełnij ekran",
     "The integration manager is offline or it cannot reach your homeserver.": "Menedżer integracji jest offline, lub nie może połączyć się z Twoim homeserverem.",
     "Cannot connect to integration manager": "Nie udało się połączyć z menedżerem integracji",
-    "Incoming voice call": "Przychodzące połączenie głosowe",
     "Voice Call": "Połączenie głosowe",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Aby zgłosić błąd związany z bezpieczeństwem Matriksa, przeczytaj <a>Politykę odpowiedzialnego ujawniania informacji</a> Matrix.org.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Czy używasz %(brand)s na urządzeniu, gdzie dotyk jest główną metodą wprowadzania",
@@ -2226,19 +1963,10 @@
     "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.": "Możesz użyć własnych opcji serwera aby zalogować się na inny serwer Matrixa, określając inny adres URL serwera. To pozwala Ci na używanie Elementu z użyciem istniejącego konta Matrixa na innym serwerze.",
     "Server Options": "Opcje serwera",
     "<b>Copy it</b> to your personal cloud storage": "<b>Skopiuj go</b> do osobistego dysku w chmurze",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Twój klucz przywracania jest w Twoim folderze <b>Pobrane</b>.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Zachowaj jego kopię w bezpiecznym miejscu, np. w menedżerze haseł, czy nawet w sejfie.",
-    "Your recovery key": "Twój klucz przywracania",
-    "Make a copy of your recovery key": "Dokonaj kopii swojego klucza przywracania",
-    "Enter your recovery passphrase a second time to confirm it.": "Wprowadź swoje hasło przywracania drugi raz, aby je potwierdzić.",
-    "Confirm your recovery passphrase": "Potwierdź swoje hasło przywracania",
-    "Please enter your recovery passphrase a second time to confirm.": "Wprowadź swoje hasło przywracania drugi raz, aby je potwierdzić.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Ostrzeżenie</b>: Kopia zapasowa klucza powinna być konfigurowana tylko z zaufanego komputera.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Ostrzeżenie</b>: kopia zapasowa klucza powinna być konfigurowana tylko z zaufanego komputera.",
     "For maximum security, this should be different from your account password.": "Dla maksymalnego bezpieczeństwa, powinno się ono różnić od hasła do Twojego konta.",
-    "Enter recovery passphrase": "Wprowadź hasło przywracania",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Będziemy przechowywać zaszyfrowaną kopię Twoich kluczy na naszym serwerze. Zabezpiecz swoją kopię zapasową hasłem przywracania.",
-    "Secure your backup with a recovery passphrase": "Zabezpiecz swoją kopię zapasową z hasłem przywracania",
     "Discovery options will appear once you have added an email above.": "Opcje odkrywania pojawią się, gdy dodasz adres e-mail powyżej.",
     "Discovery options will appear once you have added a phone number above.": "Opcje odkrywania pojawią się, gdy dodasz numer telefonu powyżej.",
     "Show shortcuts to recently viewed rooms above the room list": "Pokazuj skróty do ostatnio wyświetlonych pokoi nad listą pokoi",
@@ -2271,5 +1999,94 @@
     "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.": "Poprosiliśmy przeglądarkę o zapamiętanie, z którego serwera głównego korzystasz, aby umożliwić Ci logowanie, ale niestety Twoja przeglądarka o tym zapomniała. Przejdź do strony logowania i spróbuj ponownie.",
     "We couldn't log you in": "Nie mogliśmy Cię zalogować",
     "You're already in a call with this person.": "Prowadzisz już rozmowę z tą osobą.",
-    "Already in call": "Już dzwoni"
+    "Already in call": "Już dzwoni",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji z tej sesji w tym pokoju",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Użyj <a>aplikacji desktopowej</a>, aby zobaczyć wszystkie szyfrowane pliki",
+    "You’re all caught up": "Jesteś na bieżąco",
+    "Verification requested": "Zażądano weryfikacji",
+    "You have no visible notifications.": "Nie masz widocznych powiadomień.",
+    "Connecting": "Łączenie",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Twój klucz bezpieczeństwa został <b>skopiowany do schowka</b>, wklej go:",
+    "Your Security Key": "Twój klucz bezpieczeństwa",
+    "Create key backup": "Utwórz kopię zapasową klucza",
+    "Generate a Security Key": "Wygeneruj klucz bezpieczeństwa",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Zabezpiecz się przed utratą dostępu do szyfrowanych wiadomości i danych, tworząc kopię zapasową kluczy szyfrowania na naszym serwerze.",
+    "Safeguard against losing access to encrypted messages & data": "Zabezpiecz się przed utratą dostępu do szyfrowanych wiadomości i danych",
+    "Access Token": "Token dostępu",
+    "Your access token gives full access to your account. Do not share it with anyone.": "Twój token dostępu daje pełen dostęp do Twojego konta. Nie dziel się nim z nikim.",
+    "Avatar": "Awatar",
+    "Leave the beta": "Opuść betę",
+    "Beta": "Beta",
+    "Tap for more info": "Naciśnij aby dowiedzieć się więcej",
+    "Move right": "Przenieś w prawo",
+    "Move left": "Przenieś w lewo",
+    "Join the beta": "Dołącz do bety",
+    "No results found": "Nie znaleziono wyników",
+    "Removing...": "Usuwanie…",
+    "Your server does not support showing space hierarchies.": "Twój serwer nie obsługuje wyświetlania hierarchii przestrzeni.",
+    "You can select all or individual messages to retry or delete": "Możesz zaznaczyć wszystkie lub wybrane wiadomości aby spróbować ponownie lub usunąć je",
+    "Sending": "Wysyłanie",
+    "Delete all": "Usuń wszystkie",
+    "Some of your messages have not been sent": "Niektóre z Twoich wiadomości nie zostały wysłane",
+    "Filter rooms and people": "Filtruj pokoje i ludzi",
+    "No results for \"%(query)s\"": "Brak wyników dla „%(query)s”",
+    "Explore rooms in %(communityName)s": "Eksploruj pokoje w %(communityName)s",
+    "Retry all": "Spróbuj ponownie wszystkie",
+    "Suggested": "Polecany",
+    "This room is suggested as a good one to join": "Ten pokój jest polecany jako dobry do dołączenia",
+    "%(count)s rooms|one": "%(count)s pokój",
+    "%(count)s rooms|other": "%(count)s pokoi",
+    "%(count)s members|one": "%(count)s członek",
+    "%(count)s members|other": "%(count)s członkowie",
+    "You don't have permission": "Nie masz uprawnień",
+    "Failed to remove some rooms. Try again later": "Nie udało się usunąć niektórych pokoi. Spróbuj ponownie później",
+    "Select a room below first": "Najpierw wybierz poniższy pokój",
+    "Filter all spaces": "Filtruj wszystkie przestrzenie",
+    "Spaces is a beta feature": "Przestrzenie są funkcją beta",
+    "%(count)s results in all spaces|one": "%(count)s wynik we wszystkich przestrzeniach",
+    "%(count)s results in all spaces|other": "%(count)s wyników we wszystkich przestrzeniach",
+    "Spaces are a new way to group rooms and people.": "Przestrzenie to nowy sposób grupowania pokoi i ludzi.",
+    "Spaces": "Przestrzenie",
+    "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Chcesz eksperymentować? Laboratoria to najlepszy sposób na uzyskanie nowości wcześniej, przetestowanie nowych funkcji i pomoc w kształtowaniu ich zanim będą ogólnodostępne. <a>Dowiedz się więcej</a>.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Będziemy przechowywać zaszyfrowaną kopię Twoich kluczy na naszym serwerze. Zabezpiecz swoją kopię zapasową frazą bezpieczeństwa.",
+    "Secure Backup": "Bezpieczna kopia zapasowa",
+    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Pozwól na wykorzystanie peer-to-peer w rozmowach 1:1 (jeżeli włączono, druga strona może zobaczyć Twój adres IP)",
+    "Jump to the bottom of the timeline when you send a message": "Przejdź na dół osi czasu po wysłaniu wiadomości",
+    "Show line numbers in code blocks": "Pokazuj numery wierszy w blokach kodu",
+    "Expand code blocks by default": "Domyślnie rozwijaj bloki kodu",
+    "Show stickers button": "Pokaż przycisk naklejek",
+    "Converts the DM to a room": "Zmienia wiadomości bezpośrednie w pokój",
+    "Converts the room to a DM": "Zmienia pokój w wiadomość bezpośrednią",
+    "Sends the given message as a spoiler": "Wysyła podaną wiadomość jako spoiler",
+    "User Busy": "Użytkownik zajęty",
+    "The user you called is busy.": "Użytkownik do którego zadzwoniłeś(-aś) jest zajęty.",
+    "End-to-end encryption isn't enabled": "Szyfrowanie end-to-end nie jest włączone",
+    "Nothing pinned, yet": "Nie przypięto tu jeszcze niczego",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Jeżeli masz uprawnienia, przejdź do menu dowolnej wiadomości i wybierz <b>Przypnij</b>, aby przyczepić ją tutaj.",
+    "Pinned messages": "Przypięte wiadomości",
+    "Error loading Widget": "Błąd ładowania widżetu",
+    "Error - Mixed content": "Błąd — zawartość mieszana",
+    "You don't have permission to do this": "Nie masz uprawnień aby to zrobić",
+    "Sent": "Wysłano",
+    "Open link": "Otwórz odnośnik",
+    "Forward message": "Przekaż wiadomość",
+    "Message preview": "Podgląd wiadomości",
+    "Search for rooms or people": "Szukaj pokojów i ludzi",
+    "Some suggestions may be hidden for privacy.": "Niektóre propozycje mogą być ukryte z uwagi na prywatność.",
+    "If you can't see who you’re looking for, send them your invite link below.": "Jeżeli nie możesz zobaczyć osób, których szukasz, wyślij im poniższy odnośnik z zaproszeniem.",
+    "Or send invite link": "Lub wyślij odnośnik z zaproszeniem",
+    "Integration manager": "Menedżer Integracji",
+    "Identity server is": "Serwer tożsamości to",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Zarządcy integracji otrzymują dane konfiguracji, mogą modyfikować widżety, wysyłać zaproszenia do pokoi i ustawiać poziom uprawnień w Twoim imieniu.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji aby zarządzać botami, widżetami i pakietami naklejek.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji <b>%(serverName)s</b> aby zarządzać botami, widżetami i pakietami naklejek.",
+    "Identity server": "Serwer toższamości",
+    "Identity server (%(server)s)": "Serwer tożsamości (%(server)s)",
+    "Could not connect to identity server": "Nie można połączyć z serwerem tożsamości",
+    "Not a valid identity server (status code %(code)s)": "Nieprawidłowy serwer tożsamości (kod statusu %(code)s)",
+    "Identity server URL must be HTTPS": "URL serwera tożsamości musi być HTTPS",
+    "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.": "Twój serwer domowy odrzucił twoją próbę zalogowania się. Może być to spowodowane zbyt długim czasem oczekiwania. Prosimy spróbować ponownie. Jeśli problem się powtórzy, prosimy o kontakt z administratorem twojego serwera domowego.",
+    "Failed to transfer call": "Nie udało się przekazać połączenia",
+    "Transfer Failed": "Transfer nie powiódł się",
+    "Unable to transfer call": "Nie udało się przekazać połączenia"
 }
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 4047aae760..2d72998514 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -4,14 +4,11 @@
     "Advanced": "Avançado",
     "New passwords don't match": "As novas senhas não conferem",
     "A new password must be entered.": "Uma nova senha precisa ser informada.",
-    "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
-    "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes",
     "Are you sure you want to reject the invitation?": "Você tem certeza que deseja rejeitar este convite?",
     "Banned users": "Usuárias/os banidas/os",
     "Bans user with given id": "Banir usuários com o identificador informado",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes your display nickname": "Troca o seu apelido",
-    "Click here to fix": "Clique aqui para resolver isso",
     "Commands": "Comandos",
     "Confirm password": "Confirme a nova senha",
     "Continue": "Continuar",
@@ -26,7 +23,6 @@
     "Error": "Erro",
     "Export E2E room keys": "Exportar chaves ponta-a-ponta da sala",
     "Failed to change password. Is your password correct?": "Falha ao alterar a palavra-passe. A sua palavra-passe está correta?",
-    "Failed to leave room": "Falha ao tentar deixar a sala",
     "Failed to reject invitation": "Falha ao tentar rejeitar convite",
     "Failed to unban": "Não foi possível desfazer o banimento",
     "Favourite": "Favorito",
@@ -34,11 +30,9 @@
     "Filter room members": "Filtrar integrantes da sala",
     "Forget room": "Esquecer sala",
     "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
-    "Guests cannot join this room even if explicitly invited.": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os.",
     "Hangup": "Desligar",
     "Historical": "Histórico",
     "Homeserver is": "Servidor padrão é",
-    "Identity Server is": "O servidor de identificação é",
     "I have verified my email address": "Eu verifiquei o meu endereço de email",
     "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
     "Invalid Email Address": "Endereço de email inválido",
@@ -50,7 +44,6 @@
     "Leave room": "Sair da sala",
     "Logout": "Sair",
     "Low priority": "Baixa prioridade",
-    "Manage Integrations": "Gerenciar integrações",
     "Moderator": "Moderador/a",
     "Name": "Nome",
     "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
@@ -68,9 +61,7 @@
     "Reject invitation": "Rejeitar convite",
     "Remove": "Remover",
     "Return to login screen": "Retornar à tela de login",
-    "Room Colour": "Cores da sala",
     "Rooms": "Salas",
-    "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
     "Send Reset Email": "Enviar email para redefinição de senha",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -94,12 +85,8 @@
     "Verification Pending": "Verificação pendente",
     "Video call": "Chamada de vídeo",
     "Voice call": "Chamada de voz",
-    "VoIP conference finished.": "Conferência VoIP encerrada.",
-    "VoIP conference started.": "Conferência VoIP iniciada.",
-    "Who can access this room?": "Quem pode acessar esta sala?",
     "Who can read history?": "Quem pode ler o histórico da sala?",
     "You do not have permission to post to this room": "Você não tem permissão de postar nesta sala",
-    "You have no visible notifications": "Voce não possui notificações visíveis",
     "Sun": "Dom",
     "Mon": "Seg",
     "Tue": "Ter",
@@ -121,27 +108,13 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
-    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
-    "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
-    "click to reveal": "clique para ver",
-    "/ddg is not a command": "/ddg não é um comando",
-    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
-    "Existing Call": "Chamada em andamento",
     "Failed to send email": "Falha ao enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
-    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
-    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s deixou o histórico futuro da sala visível para todas as pessoas da sala.",
@@ -149,61 +122,38 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
-    "(not supported by this browser)": "(não é compatível com este navegador)",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Reason": "Razão",
-    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
-    "The remote side failed to pick up": "Houve alguma falha que não permitiu a outra pessoa atender à chamada",
     "This room is not recognised.": "Esta sala não é reconhecida.",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
-    "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
-    "You are already in a call.": "Você já está em  uma chamada.",
     "You cannot place a call with yourself.": "Você não pode iniciar uma chamada.",
     "You cannot place VoIP calls in this browser.": "Você não pode fazer chamadas de voz neste navegador.",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
     "You need to be logged in.": "Você tem que estar logado.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor.",
-    "Set a display name:": "Defina um nome público para você:",
-    "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
     "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
-    "An error occurred: %(error_string)s": "Um erro ocorreu: %(error_string)s",
-    "There are no visible files in this room": "Não há arquivos públicos nesta sala",
     "Connectivity to the server has been lost.": "A conexão com o servidor foi perdida. Verifique sua conexão de internet.",
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
-    "Active call": "Chamada ativa",
     "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "and %(count)s others...|other": "e %(count)s outros...",
     "and %(count)s others...|one": "e um outro...",
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
-    "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s às %(time)s",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Não consigo conectar ao servidor padrão através de HTTP quando uma URL HTTPS está na barra de endereços do seu navegador. Use HTTPS ou então <a>habilite scripts não seguros no seu navegador</a>.",
     "Change Password": "Alterar senha",
-    "Click to mute audio": "Clique para colocar o áudio no mudo",
-    "Click to mute video": "Clique para desabilitar imagens de vídeo",
-    "Click to unmute video": "Clique para voltar a mostrar imagens de vídeo",
-    "Click to unmute audio": "Clique para retirar áudio do mudo",
     "Command error": "Erro de comando",
     "Decrypt %(text)s": "Descriptografar %(text)s",
     "Disinvite": "Desconvidar",
@@ -216,7 +166,6 @@
     "Failed to mute user": "Não foi possível remover notificações da/do usuária/o",
     "Failed to reject invite": "Não foi possível rejeitar o convite",
     "Failed to set display name": "Houve falha ao definir o nome público",
-    "Fill screen": "Tela cheia",
     "Incorrect verification code": "Código de verificação incorreto",
     "Join Room": "Ingressar na sala",
     "Jump to first unread message.": "Ir diretamente para a primeira das mensagens não lidas.",
@@ -230,7 +179,6 @@
     "Server error": "Erro no servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(",
     "Server unavailable, overloaded, or something else went wrong.": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou.",
-    "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
@@ -241,7 +189,6 @@
     "Room": "Sala",
     "Cancel": "Cancelar",
     "Ban": "Banir",
-    "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
     "An error has occurred.": "Ocorreu um erro.",
@@ -250,13 +197,11 @@
     "Error decrypting attachment": "Erro ao descriptografar o anexo",
     "Invalid file%(extra)s": "Arquivo inválido %(extra)s",
     "Mute": "Silenciar",
-    "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
     "%(brand)s version:": "versão do %(brand)s:",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar os horários em formato de 12h (p.ex: 2:30pm)",
     "Unmute": "Tirar do mudo",
     "Warning!": "Atenção!",
-    "Please select the destination room for this message": "Por favor, escolha a sala para onde quer encaminhar esta mensagem",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
@@ -273,7 +218,6 @@
     "You must join the room to see its files": "Você precisa ingressar na sala para ver seus arquivos",
     "Reject all %(invitedRooms)s invites": "Rejeitar todos os %(invitedRooms)s convites",
     "Failed to invite": "Falha ao enviar o convite",
-    "Failed to invite the following users to the %(roomName)s room:": "Falha ao convidar as(os) seguintes usuárias(os) para a sala %(roomName)s:",
     "Confirm Removal": "Confirmar a remoção",
     "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.": "Você tem certeza que quer apagar este evento? Note que se você apaga o nome de uma sala ou uma mudança de tópico, esta ação não poderá ser desfeita.",
     "Unknown error": "Erro desconhecido",
@@ -281,23 +225,15 @@
     "Unable to restore session": "Não foi possível restaurar a sessão",
     "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.": "Se você já usou antes uma versão mais recente do %(brand)s, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
     "Unknown Address": "Endereço desconhecido",
-    "ex. @bob:example.com": "p.ex: @joao:exemplo.com",
-    "Add User": "Adicionar usuária(o)",
-    "Custom Server Options": "Opções para Servidor Personalizado",
     "Dismiss": "Descartar",
-    "Please check your email to continue registration.": "Por favor, verifique o seu e-mail para continuar o processo de registro.",
     "Token incorrect": "Token incorreto",
     "Please enter the code it contains:": "Por favor, entre com o código que está na mensagem:",
     "powered by Matrix": "powered by Matrix",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se não especificar um endereço de e-mail, você não poderá redefinir sua senha. Tem certeza?",
-    "Error decrypting audio": "Erro ao descriptografar o áudio",
     "Error decrypting image": "Erro ao descriptografar a imagem",
     "Error decrypting video": "Erro ao descriptografar o vídeo",
     "Add an Integration": "Adicionar uma integração",
     "URL Previews": "Pré-visualização de links",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
-    " (unsupported)": " (não suportado)",
-    "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
     "Online": "Online",
     "Idle": "Ocioso",
     "Offline": "Offline",
@@ -309,7 +245,6 @@
     "Import": "Importar",
     "Incorrect username and/or password.": "Nome de usuária(o) e/ou senha incorreto.",
     "Invited": "Convidada(o)",
-    "Results from DuckDuckGo": "Resultados de DuckDuckGo",
     "Verified key": "Chave verificada",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
@@ -321,7 +256,6 @@
     "Default Device": "Dispositivo padrão",
     "Microphone": "Microfone",
     "Camera": "Câmera de vídeo",
-    "Add a topic": "Adicionar um tópico",
     "Anyone": "Qualquer pessoa",
     "Are you sure you want to leave the room '%(roomName)s'?": "Você tem certeza que deseja sair da sala '%(roomName)s'?",
     "Custom level": "Nível personalizado",
@@ -332,53 +266,31 @@
     "This room": "Esta sala",
     "Create new room": "Criar nova sala",
     "No display name": "Sem nome público de usuária(o)",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será seu nome de conta no Servidor de Base <span></span>, ou então você pode escolher um <a>servidor diferente</a>.",
     "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Upload new:": "Enviar novo:",
-    "Private Chat": "Conversa privada",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
-    "Public Chat": "Conversa pública",
     "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
     "Admin Tools": "Ferramentas de administração",
-    "Incoming video call from %(name)s": "Chamada de vídeo de %(name)s recebida",
-    "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
-    "Error: Problem communicating with the given homeserver.": "Erro: problema de comunicação com o Servidor de Base fornecido.",
     "Failed to upload profile picture!": "Falha ao enviar a imagem de perfil!",
-    "Room directory": "Lista de salas",
-    "Failed to fetch avatar URL": "Falha ao obter a URL da imagem de perfil",
-    "Incoming call from %(name)s": "Chamada de %(name)s recebida",
     "Last seen": "Último uso",
-    "Drop File Here": "Arraste o arquivo aqui",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s em %(dateTime)s",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
-    "Username not available": "Nome de usuária(o) indisponível",
     "(~%(count)s results)|other": "(~%(count)s resultados)",
-    "unknown caller": "a pessoa que está chamando é desconhecida",
     "Start authentication": "Iniciar autenticação",
     "(~%(count)s results)|one": "(~%(count)s resultado)",
     "New Password": "Nova senha",
-    "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
-    "Incoming voice call from %(name)s": "Chamada de voz de %(name)s recebida",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Participar por <voiceText>voz</voiceText> ou por <videoText>vídeo</videoText>.",
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
-    "Username available": "Nome de usuária(o) disponível",
     "Close": "Fechar",
     "Decline": "Recusar",
-    "Custom": "Personalizado",
     "Add": "Adicionar",
     "Unnamed Room": "Sala sem nome",
-    "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
     "Home": "Início",
     "Something went wrong!": "Algo deu errado!",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nível de permissão %(powerLevelNumber)s)",
     "Start chat": "Iniciar conversa",
     "Accept": "Aceitar",
     "%(roomName)s is not accessible at this time.": "%(roomName)s não está acessível neste momento.",
-    "Add a widget": "Adicionar widget",
-    "Allow": "Permitir",
-    "Cannot add any more widgets": "Não é possível adicionar mais widgets",
     "Delete widget": "Apagar widget",
     "Define the power level of a user": "Definir o nível de privilégios de um utilizador",
     "Edit": "Editar",
@@ -386,12 +298,7 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala ao público no diretório de salas de %(domain)s's?",
     "AM": "AM",
     "PM": "PM",
-    "The maximum permitted number of widgets have already been added to this room.": "O número máximo de widgets permitido já foi adicionado a esta sala.",
-    "To get started, please pick a username!": "Para começar, escolha um nome de utilizador!",
     "Unable to create widget.": "Não foi possível criar o widget.",
-    "(could not connect media)": "(não foi possível conectar-se ao media)",
-    "(no answer)": "(sem resposta)",
-    "(unknown failure: %(reason)s)": "(falha desconhecida: %(reason)s)",
     "You are not in this room.": "Não se encontra nesta sala.",
     "You do not have permission to do that in this room.": "Não tem permissão para fazer isso nesta sala.",
     "Copied!": "Copiado!",
@@ -428,43 +335,27 @@
     "Ignores a user, hiding their messages from you": "Ignora um utilizador, deixando de mostrar as mensagens dele",
     "Banned by %(displayName)s": "Banido por %(displayName)s",
     "Fetching third party location failed": "Falha ao obter localização de terceiros",
-    "I understand the risks and wish to continue": "Entendo os riscos e pretendo continuar",
-    "Advanced notification settings": "Configurações avançadas de notificação",
-    "Uploading report": "A enviar o relatório",
     "Sunday": "Domingo",
     "Guests can join": "Convidados podem entrar",
     "Messages sent by bot": "Mensagens enviadas por bots",
     "Notification targets": "Alvos de notificação",
     "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
     "Today": "Hoje",
-    "You are not receiving desktop notifications": "Não está a receber notificações de desktop",
     "Friday": "Sexta-feira",
     "Update": "Atualizar",
     "What's New": "Novidades",
     "On": "Ativado",
     "Changelog": "Histórico de alterações",
     "Waiting for response from server": "À espera de resposta do servidor",
-    "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
     "Send Custom Event": "Enviar evento personalizado",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desativadas para todos os casos.",
-    "Forget": "Esquecer",
     "World readable": "Público",
-    "You cannot delete this image. (%(code)s)": "Não pode apagar esta imagem. (%(code)s)",
-    "Cancel Sending": "Cancelar o envio",
     "Warning": "Aviso",
     "This Room": "Esta sala",
     "Resend": "Reenviar",
-    "Error saving email notification preferences": "Erro ao guardar as preferências de notificação por e-mail",
     "Messages containing my display name": "Mensagens contendo o meu nome público",
     "Messages in one-to-one chats": "Mensagens em conversas pessoais",
     "Unavailable": "Indisponível",
-    "View Decrypted Source": "Ver a fonte desencriptada",
-    "Failed to update keywords": "Falha ao atualizar as palavras-chave",
     "remove %(name)s from the directory.": "remover %(name)s da lista pública de salas.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:",
-    "Please set a password!": "Por favor, defina uma palavra-passe!",
-    "You have successfully set a password!": "Palavra-passe definida com sucesso!",
-    "An error occurred whilst saving your email notification preferences.": "Ocorreu um erro ao guardar as suas preferências de notificação por email.",
     "Explore Room State": "Explorar estado da sala",
     "Source URL": "URL fonte",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
@@ -472,32 +363,20 @@
     "Members": "Membros",
     "No update available.": "Nenhuma atualização disponível.",
     "Noisy": "Barulhento",
-    "Files": "Ficheiros",
     "Collecting app version information": "A recolher informação da versão da app",
-    "Keywords": "Palavras-chave",
-    "Enable notifications for this account": "Ativar notificações para esta conta",
-    "Messages containing <span>keywords</span>": "Mensagens contendo <span>palavras-chave</span>",
     "Room not found": "Sala não encontrada",
     "Tuesday": "Terça-feira",
-    "Enter keywords separated by a comma:": "Insira palavras-chave separadas por vírgula:",
     "Search…": "Pesquisar…",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "O %(brand)s usa muitas funcionalidades avançadas do navegador, algumas das quais não estão disponíveis ou ainda são experimentais no seu navegador atual.",
     "Developer Tools": "Ferramentas de desenvolvedor",
     "Unnamed room": "Sala sem nome",
     "Remove from Directory": "Remover da lista pública de salas",
     "Saturday": "Sábado",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre-se, pode sempre definir um endereço de e-mail nas definições de utilizador se mudar de ideias.",
-    "Direct Chat": "Conversa pessoal",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
     "Reject": "Rejeitar",
-    "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
     "Monday": "Segunda-feira",
-    "All messages (noisy)": "Todas as mensagens (alto)",
-    "Enable them now": "Ativar agora",
     "Collecting logs": "A recolher logs",
     "You must specify an event type!": "Tem que especificar um tipo de evento!",
-    "(HTTP status %(httpStatus)s)": "(Estado HTTP %(httpStatus)s)",
     "Invite to this room": "Convidar para esta sala",
     "State Key": "Chave de estado",
     "Send": "Enviar",
@@ -505,46 +384,31 @@
     "All messages": "Todas as mensagens",
     "Call invitation": "Convite para chamada",
     "Downloading update...": "A transferir atualização...",
-    "You have successfully set a password and an email address!": "Palavra passe e endereço de e-mail definidos com sucesso!",
     "Failed to send custom event.": "Falha ao enviar evento personalizado.",
     "What's new?": "O que há de novo?",
-    "Notify me for anything else": "Notificar-me sobre qualquer outro evento",
     "When I'm invited to a room": "Quando sou convidado para uma sala",
-    "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
-    "Notify for all other messages/rooms": "Notificar para todas as outras mensagens/salas",
     "Unable to look up room ID from server": "Não foi possível obter a identificação da sala do servidor",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "All Rooms": "Todas as salas",
     "You cannot delete this message. (%(code)s)": "Não pode apagar esta mensagem. (%(code)s)",
     "Thursday": "Quinta-feira",
-    "Forward Message": "Encaminhar",
     "Back": "Voltar",
-    "Unhide Preview": "Mostrar a pré-visualização novamente",
     "Unable to join network": "Não foi possível juntar-se à rede",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Desculpe, o seu navegador <b>não</b> é capaz de executar o %(brand)s.",
     "Messages in group chats": "Mensagens em salas",
     "Yesterday": "Ontem",
     "Error encountered (%(errorDetail)s).": "Erro encontrado (%(errorDetail)s).",
     "Low Priority": "Baixa prioridade",
-    "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
-    "Set Password": "Definir palavra-passe",
     "Off": "Desativado",
     "%(brand)s does not know how to join a room on this network": "O %(brand)s não sabe como entrar numa sala nesta rede",
-    "Mentions only": "Apenas menções",
     "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
     "Wednesday": "Quarta-feira",
-    "You can now return to your account after signing out, and sign in on other devices.": "Pode agora voltar à sua conta no fim de terminar sessão, e iniciar sessão noutros dispositivos.",
-    "Enable email notifications": "Ativar notificações por e-mail",
     "Event Type": "Tipo de evento",
     "No rooms to show": "Não existem salas a serem exibidas",
-    "Download this file": "Transferir este ficheiro",
-    "Failed to change settings": "Falha ao alterar as configurações",
     "Event sent!": "Evento enviado!",
     "View Source": "Ver a fonte",
     "Event Content": "Conteúdo do evento",
     "Thank you!": "Obrigado!",
     "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!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se quiser tentar de qualquer maneira pode continuar, mas  está por sua conta com algum problema que possa encontrar!",
     "Checking for an update...": "A procurar uma atualização...",
     "Add Email Address": "Adicione adresso de e-mail",
     "Add Phone Number": "Adicione número de telefone",
@@ -572,5 +436,7 @@
     "Your user agent": "O seu user agent",
     "Explore rooms": "Explorar rooms",
     "Sign In": "Iniciar sessão",
-    "Create Account": "Criar conta"
+    "Create Account": "Criar conta",
+    "Not a valid identity server (status code %(code)s)": "Servidor de Identidade inválido (código de status %(code)s)",
+    "Identity server URL must be HTTPS": "O link do servidor de identidade deve começar com HTTPS"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 8497ae7164..3a2f1aeb08 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -4,14 +4,11 @@
     "Advanced": "Avançado",
     "New passwords don't match": "As novas senhas não conferem",
     "A new password must be entered.": "Uma nova senha precisa ser inserida.",
-    "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
-    "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes",
     "Are you sure you want to reject the invitation?": "Tem certeza de que deseja recusar o convite?",
     "Banned users": "Usuários banidos",
     "Bans user with given id": "Bane o usuário com o ID indicado",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s alterou a descrição para \"%(topic)s\".",
     "Changes your display nickname": "Altera o seu nome e sobrenome",
-    "Click here to fix": "Clique aqui para resolver isso",
     "Commands": "Comandos",
     "Confirm password": "Confirme a nova senha",
     "Continue": "Continuar",
@@ -26,7 +23,6 @@
     "Error": "Erro",
     "Export E2E room keys": "Exportar chaves ponta-a-ponta da sala",
     "Failed to change password. Is your password correct?": "Não foi possível alterar a senha. A sua senha está correta?",
-    "Failed to leave room": "Falha ao tentar deixar a sala",
     "Failed to reject invitation": "Falha ao tentar recusar o convite",
     "Failed to unban": "Não foi possível remover o banimento",
     "Favourite": "Favoritar",
@@ -34,11 +30,9 @@
     "Filter room members": "Pesquisar participantes da sala",
     "Forget room": "Esquecer sala",
     "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
-    "Guests cannot join this room even if explicitly invited.": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os.",
     "Hangup": "Desligar",
     "Historical": "Histórico",
     "Homeserver is": "Servidor padrão é",
-    "Identity Server is": "O servidor de identificação é",
     "I have verified my email address": "Eu confirmei o meu endereço de e-mail",
     "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
     "Invalid Email Address": "Endereço de e-mail inválido",
@@ -50,7 +44,6 @@
     "Leave room": "Sair da sala",
     "Logout": "Sair",
     "Low priority": "Baixa prioridade",
-    "Manage Integrations": "Gerenciar integrações",
     "Moderator": "Moderador/a",
     "Name": "Nome",
     "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
@@ -68,9 +61,7 @@
     "Reject invitation": "Recusar o convite",
     "Remove": "Apagar",
     "Return to login screen": "Retornar à tela de login",
-    "Room Colour": "Cores da sala",
     "Rooms": "Salas",
-    "Searches DuckDuckGo for results": "Buscar resultados no DuckDuckGo",
     "Send Reset Email": "Enviar e-mail para redefinição de senha",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -94,12 +85,8 @@
     "Verification Pending": "Confirmação pendente",
     "Video call": "Chamada de vídeo",
     "Voice call": "Chamada de voz",
-    "VoIP conference finished.": "Chamada em grupo encerrada.",
-    "VoIP conference started.": "Chamada em grupo iniciada.",
-    "Who can access this room?": "Quem pode acessar esta sala?",
     "Who can read history?": "Quem pode ler o histórico da sala?",
     "You do not have permission to post to this room": "Você não tem permissão para digitar nesta sala",
-    "You have no visible notifications": "Voce não possui notificações visíveis",
     "Sun": "Dom",
     "Mon": "Seg",
     "Tue": "Ter",
@@ -121,27 +108,13 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
-    "%(senderName)s answered the call.": "%(senderName)s aceitou a chamada.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s baniu %(targetName)s.",
-    "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their profile picture.": "%(senderName)s alterou a foto de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissão de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
-    "click to reveal": "clique para ver",
-    "/ddg is not a command": "/ddg não é um comando",
-    "%(senderName)s ended the call.": "%(senderName)s encerrou a chamada.",
-    "Existing Call": "Chamada em andamento",
     "Failed to send email": "Não foi possível enviar e-mail",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to verify email address: make sure you clicked the link in the email": "Falha ao confirmar o endereço de e-mail: certifique-se de clicar no link do e-mail",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
-    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
-    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s deixou o histórico futuro da sala visível para todos os participantes da sala, a partir de quando foram convidados.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s deixou o histórico futuro da sala visível para todos os participantes da sala, a partir de quando entraram.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s deixou o histórico futuro da sala visível para todas as pessoas da sala.",
@@ -149,61 +122,38 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
-    "(not supported by this browser)": "(não é compatível com este navegador)",
     "Power level must be positive integer.": "O nível de permissão precisa ser um número inteiro e positivo.",
     "Reason": "Razão",
-    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o nome e sobrenome (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removeu a foto de perfil.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s deseja iniciar uma chamada em grupo.",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s não tem permissão para lhe enviar notificações - confirme as configurações do seu navegador",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s não tem permissão para lhe enviar notificações - tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma foto de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu o nome e sobrenome para %(displayName)s.",
-    "This email address is already in use": "Este endereço de e-mail já está em uso",
+    "This email address is already in use": "Este endereço de email já está em uso",
     "This email address was not found": "Este endereço de e-mail não foi encontrado",
-    "The remote side failed to pick up": "A pessoa não atendeu a chamada",
     "This room is not recognised.": "Esta sala não é reconhecida.",
     "This phone number is already in use": "Este número de telefone já está em uso",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar este recurso, aguarde o carregamento dos resultados de preenchimento automático, e então escolha dentre as opções.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s removeu o banimento de %(targetName)s.",
-    "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "VoIP is unsupported": "Chamadas de voz não são suportadas",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
-    "You are already in a call.": "Você já está em uma chamada.",
     "You cannot place a call with yourself.": "Você não pode iniciar uma chamada consigo mesmo.",
     "You cannot place VoIP calls in this browser.": "Chamadas de voz não são suportadas neste navegador.",
     "You need to be able to invite users to do that.": "Para fazer isso, precisa ter permissão para convidar outras pessoas.",
     "You need to be logged in.": "Você precisa estar logado.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu endereço de e-mail não parece estar associado a uma conta de usuária/o Matrix neste servidor.",
-    "Set a display name:": "Defina um nome e sobrenome:",
-    "Upload an avatar:": "Enviar uma foto de perfil:",
     "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
-    "An error occurred: %(error_string)s": "Um erro ocorreu: %(error_string)s",
-    "There are no visible files in this room": "Não há arquivos públicos nesta sala",
     "Connectivity to the server has been lost.": "A conexão com o servidor foi perdida. Verifique sua conexão de internet.",
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
-    "Active call": "Chamada em andamento",
     "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "and %(count)s others...|one": "e um outro...",
     "and %(count)s others...|other": "e %(count)s outros...",
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
-    "Autoplay GIFs and videos": "Reproduzir GIFs e vídeos automaticamente",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s às %(time)s",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Uma conexão com o servidor local via HTTP não pode ser estabelecida se a barra de endereços do navegador contiver um endereço HTTPS. Use HTTPS ou, em vez disso, permita ao navegador executar <a>scripts não seguros</a>.",
     "Change Password": "Alterar senha",
-    "Click to mute audio": "Clique para colocar o áudio no mudo",
-    "Click to mute video": "Clique para desativar o som do vídeo",
-    "Click to unmute video": "Clique para ativar o som do vídeo",
-    "Click to unmute audio": "Clique para retirar áudio do mudo",
     "Command error": "Erro de comando",
     "Decrypt %(text)s": "Descriptografar %(text)s",
     "Disinvite": "Desconvidar",
@@ -216,7 +166,6 @@
     "Failed to mute user": "Não foi possível remover notificações da/do usuária/o",
     "Failed to reject invite": "Não foi possível recusar o convite",
     "Failed to set display name": "Falha ao definir o nome e sobrenome",
-    "Fill screen": "Tela cheia",
     "Incorrect verification code": "Código de confirmação incorreto",
     "Join Room": "Ingressar na sala",
     "Jump to first unread message.": "Ir diretamente para a primeira das mensagens não lidas.",
@@ -230,7 +179,6 @@
     "Server error": "Erro no servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(",
     "Server unavailable, overloaded, or something else went wrong.": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou.",
-    "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Não foi possível carregar um trecho específico da conversa desta sala, porque parece que você não tem permissão para ler a mensagem em questão.",
@@ -241,7 +189,6 @@
     "Room": "Sala",
     "Cancel": "Cancelar",
     "Ban": "Banir da sala",
-    "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
     "An error has occurred.": "Ocorreu um erro.",
@@ -250,13 +197,11 @@
     "Error decrypting attachment": "Erro ao descriptografar o anexo",
     "Invalid file%(extra)s": "Arquivo inválido %(extra)s",
     "Mute": "Mudo",
-    "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
     "%(brand)s version:": "versão do %(brand)s:",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar os horários em formato de 12h (p.ex: 2:30pm)",
     "Unmute": "Tirar do mudo",
     "Warning!": "Atenção!",
-    "Please select the destination room for this message": "Por favor, escolha a sala para onde quer encaminhar esta mensagem",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
@@ -273,7 +218,6 @@
     "You must join the room to see its files": "Você precisa ingressar na sala para ver seus arquivos",
     "Reject all %(invitedRooms)s invites": "Recusar todos os %(invitedRooms)s convites",
     "Failed to invite": "Falha ao enviar o convite",
-    "Failed to invite the following users to the %(roomName)s room:": "Falha ao convidar as(os) seguintes usuárias(os) para a sala %(roomName)s:",
     "Confirm Removal": "Confirmar a remoção",
     "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.": "Tem certeza de que deseja apagar este evento? Observe que, se você apagar a alteração do nome ou descrição de uma sala, isso reverterá a alteração.",
     "Unknown error": "Erro desconhecido",
@@ -281,23 +225,15 @@
     "Unable to restore session": "Não foi possível restaurar a sessão",
     "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.": "Se você já usou antes uma versão mais recente do %(brand)s, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
     "Unknown Address": "Endereço desconhecido",
-    "ex. @bob:example.com": "p.ex: @joao:exemplo.com",
-    "Add User": "Adicionar usuária(o)",
-    "Custom Server Options": "Opções para Servidor Personalizado",
-    "Dismiss": "Descartar",
-    "Please check your email to continue registration.": "Por favor, confirme o seu e-mail para continuar a inscrição.",
+    "Dismiss": "Dispensar",
     "Token incorrect": "Token incorreto",
     "Please enter the code it contains:": "Por favor, entre com o código que está na mensagem:",
     "powered by Matrix": "oferecido por Matrix",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se não especificar um endereço de e-mail, você não poderá redefinir sua senha. Tem certeza?",
-    "Error decrypting audio": "Erro ao descriptografar o áudio",
     "Error decrypting image": "Erro ao descriptografar a imagem",
     "Error decrypting video": "Erro ao descriptografar o vídeo",
     "Add an Integration": "Adicionar uma integração",
     "URL Previews": "Pré-visualização de links",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
-    " (unsupported)": " (não suportado)",
-    "Ongoing conference call%(supportedText)s.": "Chamada em grupo em andamento%(supportedText)s.",
     "Online": "Conectada/o",
     "Idle": "Ocioso",
     "Offline": "Offline",
@@ -309,7 +245,6 @@
     "Import": "Importar",
     "Incorrect username and/or password.": "Nome de usuário e/ou senha incorreto.",
     "Invited": "Convidada(o)",
-    "Results from DuckDuckGo": "Resultados de DuckDuckGo",
     "Verified key": "Chave confirmada",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a foto da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a foto da sala %(roomName)s",
@@ -321,7 +256,6 @@
     "Default Device": "Aparelho padrão",
     "Microphone": "Microfone",
     "Camera": "Câmera",
-    "Add a topic": "Adicionar uma descrição",
     "Anyone": "Qualquer pessoa",
     "Are you sure you want to leave the room '%(roomName)s'?": "Tem certeza de que deseja sair da sala '%(roomName)s'?",
     "Custom level": "Nível personalizado",
@@ -330,55 +264,33 @@
     "You have <a>disabled</a> URL previews by default.": "Você <a>desativou</a> pré-visualizações de links por padrão.",
     "You have <a>enabled</a> URL previews by default.": "Você <a>ativou</a> pré-visualizações de links por padrão.",
     "Add": "Adicionar",
-    "Error: Problem communicating with the given homeserver.": "Erro: problema de comunicação com o Servidor de Base fornecido.",
-    "Failed to fetch avatar URL": "Falha ao obter o link da foto de perfil",
     "Home": "Home",
-    "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
     "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
-    "Username invalid: %(errMessage)s": "Nome de usuário inválido: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para usar este recurso",
     "Create new room": "Criar nova sala",
-    "Room directory": "Lista pública de salas",
     "Start chat": "Iniciar conversa",
     "New Password": "Nova senha",
-    "Username available": "Nome de usuário disponível",
-    "Username not available": "Nome de usuário indisponível",
     "Something went wrong!": "Não foi possível carregar!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Esse será o nome da sua conta no <span></span>servidor principal, ou então você pode escolher um <a>servidor diferente</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</a>.",
     "Accept": "Aceitar",
-    "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
     "Admin Tools": "Ferramentas de administração",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
     "Close": "Fechar",
-    "Custom": "Personalizado",
     "Decline": "Recusar",
-    "Drop File Here": "Arraste o arquivo aqui",
     "Failed to upload profile picture!": "Falha ao enviar a foto de perfil!",
-    "Incoming call from %(name)s": "Recebendo chamada de %(name)s",
-    "Incoming video call from %(name)s": "Recebendo chamada de vídeo de %(name)s",
-    "Incoming voice call from %(name)s": "Recebendo chamada de voz de %(name)s",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Participar por <voiceText>voz</voiceText> ou por <videoText>vídeo</videoText>.",
     "Last seen": "Visto por último às",
     "No display name": "Nenhum nome e sobrenome",
-    "Private Chat": "Conversa privada",
-    "Public Chat": "Conversa pública",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s não está acessível neste momento.",
     "Seen by %(userName)s at %(dateTime)s": "Lida por %(userName)s em %(dateTime)s",
     "Start authentication": "Iniciar autenticação",
     "This room": "Esta sala",
-    "unknown caller": "a pessoa que está chamando é desconhecida",
     "Unnamed Room": "Sala sem nome",
     "Upload new:": "Enviar novo:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nível de permissão %(powerLevelNumber)s)",
     "(~%(count)s results)|one": "(~%(count)s resultado)",
     "(~%(count)s results)|other": "(~%(count)s resultados)",
-    "(could not connect media)": "(não foi possível conectar-se à mídia)",
-    "(no answer)": "(sem resposta)",
-    "(unknown failure: %(reason)s)": "(falha desconhecida: %(reason)s)",
     "Your browser does not support the required cryptography extensions": "O seu navegador não suporta as extensões de criptografia necessárias",
     "Not a valid %(brand)s keyfile": "Não é um arquivo de chave válido do %(brand)s",
     "Authentication check failed: incorrect password?": "Falha ao checar a autenticação: senha incorreta?",
@@ -398,7 +310,6 @@
     "Ignored user": "Usuário bloqueado",
     "You are no longer ignoring %(userId)s": "Você não está mais bloqueando %(userId)s",
     "Edit": "Editar",
-    "Unpin Message": "Desafixar Mensagem",
     "Add rooms to this community": "Adicionar salas na comunidade",
     "The version of %(brand)s": "A versão do %(brand)s",
     "The platform you're on": "A plataforma que você está usando",
@@ -420,7 +331,6 @@
     "Unable to create widget.": "Não foi possível criar o widget.",
     "You are now ignoring %(userId)s": "Agora você está bloqueando %(userId)s",
     "Unignored user": "Usuário desbloqueado",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s alterou o nome e sobrenome para %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s alterou as mensagens fixadas da sala.",
     "%(widgetName)s widget modified by %(senderName)s": "O widget %(widgetName)s foi modificado por %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "O widget %(widgetName)s foi criado por %(senderName)s",
@@ -433,12 +343,6 @@
     "Enable inline URL previews by default": "Ativar, por padrão, a visualização de resumo de links",
     "Enable URL previews for this room (only affects you)": "Ativar, para esta sala, a visualização de links (só afeta você)",
     "Enable URL previews by default for participants in this room": "Ativar, para todos os participantes desta sala, a visualização de links",
-    "Cannot add any more widgets": "Não é possível adicionar novos widgets",
-    "The maximum permitted number of widgets have already been added to this room.": "O número máximo de widgets permitidos já foi atingido nesta sala.",
-    "Add a widget": "Adicionar um widget",
-    "%(senderName)s sent an image": "%(senderName)s enviou uma imagem",
-    "%(senderName)s sent a video": "%(senderName)s enviou um vídeo",
-    "%(senderName)s uploaded a file": "%(senderName)s enviou um arquivo",
     "Disinvite this user?": "Desconvidar esta/e usuária/o?",
     "Kick this user?": "Remover este usuário?",
     "Unban this user?": "Remover o banimento deste usuário?",
@@ -451,10 +355,7 @@
     "Invite": "Convidar",
     "Send an encrypted reply…": "Digite sua resposta criptografada…",
     "Send an encrypted message…": "Digite uma mensagem criptografada…",
-    "Jump to message": "Pular para mensagem",
-    "No pinned messages.": "Nenhuma mensagem fixada.",
     "Loading...": "Carregando...",
-    "Pinned Messages": "Mensagens fixas",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -469,7 +370,6 @@
     "Unnamed room": "Sala sem nome",
     "World readable": "Aberto publicamente à leitura",
     "Guests can join": "Convidadas/os podem entrar",
-    "Community Invites": "Convites a comunidades",
     "Banned by %(displayName)s": "Banido por %(displayName)s",
     "Publish this room to the public in %(domain)s's room directory?": "Quer publicar esta sala na lista pública de salas da %(domain)s?",
     "Members only (since the point in time of selecting this option)": "Apenas participantes (a partir do momento em que esta opção for selecionada)",
@@ -485,7 +385,6 @@
     "URL previews are disabled by default for participants in this room.": "Pré-visualizações de links estão desativadas por padrão para participantes desta sala.",
     "Copied!": "Copiado!",
     "Failed to copy": "Não foi possível copiar",
-    "An email has been sent to %(emailAddress)s": "Um e-mail foi enviado para %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Uma mensagem de texto foi enviada para %(msisdn)s",
     "Remove from community": "Remover da comunidade",
     "Disinvite this user from community?": "Desconvidar esta pessoa da comunidade?",
@@ -505,11 +404,9 @@
     "Something went wrong when trying to get your communities.": "Não foi possível carregar suas comunidades.",
     "Display your community flair in rooms configured to show it.": "Mostrar o ícone da sua comunidade nas salas que o permitem.",
     "You're not currently a member of any communities.": "No momento, você não é participante de nenhuma comunidade.",
-    "Allow": "Permitir",
     "Delete Widget": "Apagar widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Remover um widget o remove para todas as pessoas desta sala. Tem certeza que quer remover este widget?",
     "Delete widget": "Remover widget",
-    "Minimize apps": "Minimizar app",
     "Communities": "Comunidades",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s entraram %(count)s vezes",
@@ -580,8 +477,6 @@
     "Community ID": "ID da comunidade",
     "example": "exemplo",
     "Create": "Criar",
-    "To get started, please pick a username!": "Para começar, escolha um nome de usuário!",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a página da sua comunidade</h1>\n<p>\n    Use a descrição longa para apresentar a comunidade para novas/os participantes,\n    ou compartilhe <a href=\"foo\">links</a> importantes.\n</p>\n<p>\n    Você pode até mesmo usar tags 'img' em HTML\n</p>\n",
     "Add rooms to the community summary": "Adicionar salas para o índice da comunidade",
     "Which rooms would you like to add to this summary?": "Quais salas você gostaria de adicionar a este índice?",
     "Add to summary": "Adicionar ao índice",
@@ -620,11 +515,7 @@
     "Error whilst fetching joined communities": "Erro baixando comunidades das quais você faz parte",
     "Create a new community": "Criar nova comunidade",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crie uma comunidade para agrupar em um mesmo local pessoas e salas! Monte uma página inicial personalizada para dar uma identidade ao seu espaço no universo Matrix.",
-    "%(count)s of your messages have not been sent.|one": "Sua mensagem não foi enviada.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todas</resendText> ou <cancelText>cancelar todas</cancelText> agora. Você também pode selecionar mensagens individualmente a serem reenviadas ou canceladas.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensagem</resendText> ou <cancelText>cancelar mensagem</cancelText> agora.",
     "Warning": "Atenção",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Não há mais ninguém aqui! Você deseja <inviteText>convidar outras pessoas</inviteText> ou <nowarnText>remover este alerta sobre a sala vazia</nowarnText>?",
     "Clear filter": "Remover filtro",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A privacidade é importante para nós, portanto nós não coletamos nenhum dado pessoa ou identificável para nossas estatísticas.",
     "Learn more about how we use analytics.": "Saiba mais sobre como nós usamos os dados estatísticos.",
@@ -641,42 +532,25 @@
     "Failed to remove tag %(tagName)s from room": "Falha ao remover a tag %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Você sabia? Você pode usar comunidades para filtrar a sua experiência no %(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.": "Para criar um filtro, arraste a foto de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na foto de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade.",
     "Key request sent.": "Requisição de chave enviada.",
     "Fetching third party location failed": "Falha ao acessar a localização de terceiros",
-    "I understand the risks and wish to continue": "Entendo os riscos e desejo continuar",
     "Send Account Data": "Enviar Dados da Conta",
-    "Advanced notification settings": "Configurações avançadas de notificação",
-    "Uploading report": "Enviando o relatório",
     "Sunday": "Domingo",
     "Notification targets": "Aparelhos notificados",
     "Today": "Hoje",
-    "You are not receiving desktop notifications": "Você não está recebendo notificações na área de trabalho",
     "Friday": "Sexta-feira",
     "Update": "Atualizar",
     "What's New": "Novidades",
     "On": "Ativado",
     "Changelog": "Registro de alterações",
     "Waiting for response from server": "Aguardando a resposta do servidor",
-    "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
     "Send Custom Event": "Enviar Evento Customizado",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão desativadas para todos os casos.",
-    "Forget": "Esquecer",
-    "You cannot delete this image. (%(code)s)": "Você não pode apagar esta imagem. (%(code)s)",
-    "Cancel Sending": "Cancelar o envio",
     "This Room": "Esta sala",
     "Resend": "Reenviar",
-    "Error saving email notification preferences": "Erro ao salvar a configuração de notificações por e-mail",
     "Messages containing my display name": "Mensagens contendo meu nome e sobrenome",
     "Messages in one-to-one chats": "Mensagens em conversas individuais",
     "Unavailable": "Indisponível",
-    "View Decrypted Source": "Ver código-fonte descriptografado",
-    "Failed to update keywords": "Falha ao alterar as palavras-chave",
     "remove %(name)s from the directory.": "remover %(name)s da lista pública de salas.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:",
-    "Please set a password!": "Por favor, defina uma senha!",
-    "You have successfully set a password!": "Você definiu sua senha com sucesso!",
-    "An error occurred whilst saving your email notification preferences.": "Ocorreu um erro ao salvar sua configuração de notificações por e-mail.",
     "Explore Room State": "Explorar estado da sala",
     "Source URL": "Link do código-fonte",
     "Messages sent by bot": "Mensagens enviadas por bots",
@@ -684,35 +558,22 @@
     "Members": "Participantes",
     "No update available.": "Nenhuma atualização disponível.",
     "Noisy": "Ativado com som",
-    "Files": "Arquivos",
     "Collecting app version information": "Coletando informação sobre a versão do app",
-    "Keywords": "Palavras-chave",
-    "Enable notifications for this account": "Receba notificações de novas mensagens",
     "Invite to this community": "Convidar para essa comunidade",
-    "Messages containing <span>keywords</span>": "Mensagens contendo <span>palavras-chave</span>",
     "Room not found": "Sala não encontrada",
     "Tuesday": "Terça-feira",
-    "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:",
     "Search…": "Buscar…",
-    "You have successfully set a password and an email address!": "Você definiu uma senha e um endereço de e-mail com sucesso!",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s usa muitos recursos avançados, e alguns deles não estão disponíveis ou ainda são experimentais no seu navegador de internet atual.",
     "Developer Tools": "Ferramentas do desenvolvedor",
     "Explore Account Data": "Explorar dados da conta",
     "Remove from Directory": "Remover da lista pública de salas",
     "Saturday": "Sábado",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre-se: você pode sempre definir um endereço de e-mail nas configurações de usuário, se mudar de ideia.",
-    "Direct Chat": "Conversa pessoal",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
     "Reject": "Recusar",
-    "Failed to set Direct Message status of room": "Falha em definir a descrição da conversa",
     "Monday": "Segunda-feira",
-    "All messages (noisy)": "Todas as mensagens (com som)",
-    "Enable them now": "Ativar agora",
     "Toolbox": "Ferramentas",
     "Collecting logs": "Coletando logs",
     "You must specify an event type!": "Você precisa especificar um tipo do evento!",
-    "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
     "Invite to this room": "Convidar para esta sala",
     "Send logs": "Enviar relatórios",
     "All messages": "Todas as mensagens novas",
@@ -721,51 +582,33 @@
     "State Key": "Chave do Estado",
     "Failed to send custom event.": "Falha ao enviar evento personalizado.",
     "What's new?": "O que há de novidades?",
-    "Notify me for anything else": "Notificar-me sobre qualquer outro evento",
     "When I'm invited to a room": "Quando eu for convidada(o) a uma sala",
-    "Can't update user notification settings": "Não foi possível atualizar a configuração das notificações",
-    "Notify for all other messages/rooms": "Notificar para todas as outras mensagens e salas",
     "Unable to look up room ID from server": "Não foi possível buscar identificação da sala no servidor",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "All Rooms": "Todas as salas",
     "You cannot delete this message. (%(code)s)": "Você não pode apagar esta mensagem. (%(code)s)",
     "Thursday": "Quinta-feira",
-    "Forward Message": "Encaminhar",
     "Back": "Voltar",
     "Reply": "Responder",
     "Show message in desktop notification": "Mostrar a mensagem na notificação da área de trabalho",
-    "Unhide Preview": "Mostrar a pré-visualização",
     "Unable to join network": "Não foi possível conectar na rede",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Infelizmente, o seu navegador <b>não</b> é capaz de rodar o %(brand)s.",
     "Messages in group chats": "Mensagens em salas",
     "Yesterday": "Ontem",
     "Error encountered (%(errorDetail)s).": "Erro encontrado (%(errorDetail)s).",
     "Low Priority": "Baixa prioridade",
-    "Unable to fetch notification target list": "Não foi possível obter a lista de aparelhos notificados",
-    "Set Password": "Definir senha",
     "Off": "Desativado",
-    "Mentions only": "Apenas menções",
     "Wednesday": "Quarta-feira",
-    "You can now return to your account after signing out, and sign in on other devices.": "Agora você pode retornar à sua conta depois de sair, e fazer login em outros aparelhos.",
-    "Enable email notifications": "Ativar notificações por e-mail",
     "Event Type": "Tipo do Evento",
-    "Download this file": "Baixar este arquivo",
-    "Pin Message": "Fixar Mensagem",
-    "Failed to change settings": "Falha ao alterar as configurações",
     "View Community": "Ver a comunidade",
     "Event sent!": "Evento enviado!",
     "View Source": "Ver código-fonte",
     "Event Content": "Conteúdo do Evento",
     "Thank you!": "Obrigado!",
     "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!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e alguns dos recursos poderão não funcionar. Você ainda pode prosseguir, mas estará sozinho diante de problemas que possam surgir!",
     "Checking for an update...": "Verificando se há atualizações...",
     "Every page you use in the app": "Toda a página que você usa no aplicativo",
     "e.g. <CurrentPageURL>": "por exemplo: <CurrentPageURL>",
     "Your device resolution": "A resolução do seu aparelho",
-    "Call in Progress": "Chamada em andamento",
-    "A call is currently being placed!": "Uma chamada já está em andamento!",
-    "A call is already in progress!": "Uma chamada já está em andamento!",
     "Permission Required": "Permissão necessária",
     "You do not have permission to start a conference call in this room": "Você não tem permissão para iniciar uma chamada em grupo nesta sala",
     "Unable to load! Check your network connectivity and try again.": "Não foi possível carregar! Verifique sua conexão de rede e tente novamente.",
@@ -813,8 +656,6 @@
     "Sorry, your homeserver is too old to participate in this room.": "Desculpe, seu homeserver é muito velho para participar desta sala.",
     "Please contact your homeserver administrator.": "Por favor, entre em contato com o administrador do seu homeserver.",
     "Custom user status messages": "Mensagens de status de usuário personalizadas",
-    "Always show encryption icons": "Mostrar sempre ícones de criptografia",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar um lembrete para ativar a recuperação de mensagens seguras em salas criptografadas",
     "Send analytics data": "Enviar dados analíticos",
     "Enable widget screenshots on supported widgets": "Ativar capturas de tela do widget em widgets suportados",
     "Show developer tools": "Mostrar ferramentas de desenvolvedor",
@@ -823,8 +664,6 @@
     "Encrypted messages in group chats": "Mensagens criptografadas em salas",
     "Delete Backup": "Remover backup",
     "Unable to load key backup status": "Não foi possível carregar o status do backup da chave",
-    "Backup version: ": "Versão do Backup: ",
-    "Algorithm: ": "Algoritmo: ",
     "This event could not be displayed": "Este evento não pôde ser exibido",
     "Use a longer keyboard pattern with more turns": "Use um padrão de teclas em diferentes direções e sentido",
     "Share Link to User": "Compartilhar este usuário",
@@ -833,7 +672,6 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Lida por %(displayName)s (%(userName)s) em %(dateTime)s",
     "Share room": "Compartilhar sala",
     "System Alerts": "Alertas do sistema",
-    "Don't ask again": "Não perguntar novamente",
     "Set up": "Configurar",
     "Muted Users": "Usuários silenciados",
     "Open Devtools": "Abrir as Ferramentas de Desenvolvimento",
@@ -852,19 +690,13 @@
     "Please review and accept all of the homeserver's policies": "Por favor, revise e aceite todas as políticas do homeserver",
     "Please review and accept the policies of this homeserver:": "Por favor, revise e aceite as políticas deste servidor local:",
     "Code": "Código",
-    "The email field must not be blank.": "O campo de e-mail não pode estar em branco.",
-    "The phone number field must not be blank.": "O campo do número de telefone não pode estar em branco.",
-    "The password field must not be blank.": "O campo da senha não pode ficar em branco.",
     "Failed to load group members": "Falha ao carregar participantes da comunidade",
-    "Failed to remove widget": "Falha ao remover o widget",
-    "An error ocurred whilst trying to remove the widget from the room": "Ocorreu um erro ao tentar remover o widget da sala",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Não é possível carregar o evento que foi respondido, ele não existe ou você não tem permissão para visualizá-lo.",
     "That doesn't look like a valid email address": "Este não parece ser um endereço de e-mail válido",
     "Preparing to send logs": "Preparando para enviar relatórios",
     "Logs sent": "Relatórios enviados",
     "Failed to send logs: ": "Falha ao enviar os relatórios:· ",
     "Submit debug logs": "Enviar relatórios de erros",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os relatórios de erros contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou nomes das salas ou comunidades que você visitou e os nomes de usuários de seus contatos. Eles não contêm mensagens.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Antes de enviar os relatórios, você deve <a>criar um bilhete de erro no GitHub</a> para descrever seu problema.",
     "Unable to load commit detail: %(msg)s": "Não foi possível carregar os detalhes do envio: %(msg)s",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder seu histórico de bate-papo, você precisa exportar as chaves da sua sala antes de se desconectar. Quando entrar novamente, você precisará usar a versão mais atual do %(brand)s",
@@ -893,29 +725,20 @@
     "Refresh": "Recarregar",
     "We encountered an error trying to restore your previous session.": "Encontramos um erro ao tentar restaurar sua sessão anterior.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpar o armazenamento do seu navegador pode resolver o problema, mas você será deslogado e isso fará que qualquer histórico de bate-papo criptografado fique ilegível.",
-    "Checking...": "Checando...",
     "Share Room": "Compartilhar sala",
     "Link to most recent message": "Link da mensagem mais recente",
     "Share User": "Compartilhar usuário",
     "Share Community": "Compartilhar Comunidade",
     "Share Room Message": "Compartilhar Mensagem da Sala",
     "Link to selected message": "Link da mensagem selecionada",
-    "COPY": "COPIAR",
     "Unable to load backup status": "Não foi possível carregar o status do backup",
     "Unable to restore backup": "Não foi possível restaurar o backup",
     "No backup found!": "Nenhum backup encontrado!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acesse seu histórico de mensagens seguras e configure mensagens seguras digitando sua frase secreta de recuperação.",
     "Next": "Próximo",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se você esqueceu sua frase secreta de recuperação, você pode <button1>usar sua chave de recuperação</button1> ou <button2>configurar novas opções de recuperação</button2>",
-    "This looks like a valid recovery key!": "A chave de recuperação está correta!",
-    "Not a valid recovery key": "Não é uma chave de recuperação válida",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Acesse seu histórico seguro de mensagens e configure mensagens seguras inserindo sua chave de recuperação.",
-    "Share Message": "Compartilhar Mensagem",
     "Popout widget": "Widget Popout",
     "Send Logs": "Enviar relatórios",
     "Failed to decrypt %(failedCount)s sessions!": "Falha ao descriptografar as sessões de %(failedCount)s!",
     "Set a new status...": "Definir um novo status ...",
-    "Collapse Reply Thread": "Recolher grupo de respostas",
     "Clear status": "Limpar status",
     "Unable to join community": "Não é possível participar da comunidade",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Você é um administrador dessa comunidade. Você não poderá se reingressar sem um convite de outro administrador.",
@@ -933,7 +756,6 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Você não pode enviar nenhuma mensagem até revisar e concordar com <consentLink>nossos termos e condições</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.": "Sua mensagem não foi enviada porque este homeserver atingiu seu Limite de usuário ativo mensal. Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
     "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.": "Sua mensagem não foi enviada porque este servidor local excedeu o limite de recursos. Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Se você informou um erro por meio do GitHub, os relatórios de erros podem nos ajudar a rastrear o problema. Os relatórios de erros contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou apelidos das salas ou comunidades que você visitou e os nomes de usuários de seus contatos. Eles não contêm mensagens.",
     "Legal": "Legal",
     "No Audio Outputs detected": "Nenhuma caixa de som detectada",
     "Audio Output": "Caixa de som",
@@ -953,8 +775,6 @@
     "Set up Secure Message Recovery": "Configurar Recuperação Segura de Mensagens",
     "Unable to create key backup": "Não foi possível criar backup da chave",
     "Retry": "Tentar novamente",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Sem configurar a Recuperação Segura de Mensagens, você perderá seu histórico de mensagens seguras quando fizer logout.",
-    "If you don't want to set this up now, you can later in Settings.": "Se você não quiser configurá-lo agora, poderá fazê-lo posteriormente em Configurações.",
     "New Recovery Method": "Nova opção de recuperação",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se você não definiu a nova opção de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina uma nova opção de recuperação imediatamente nas Configurações.",
     "Set up Secure Messages": "Configurar mensagens seguras",
@@ -998,7 +818,6 @@
     "Enable big emoji in chat": "Ativar emojis grandes no bate-papo",
     "Send typing notifications": "Permitir que saibam quando eu estiver digitando",
     "Enable Community Filter Panel": "Ativar o painel de comunidades",
-    "Allow Peer-to-Peer for 1:1 calls": "Permitir Peer-to-Peer para chamadas 1:1",
     "Messages containing my username": "Mensagens contendo meu nome de usuário",
     "The other party cancelled the verification.": "Seu contato cancelou a confirmação.",
     "Verified!": "Confirmado!",
@@ -1086,7 +905,6 @@
     "Backing up %(sessionsRemaining)s keys...": "Fazendo o backup das chaves de %(sessionsRemaining)s...",
     "All keys backed up": "O backup de todas as chaves foi realizado",
     "Start using Key Backup": "Comece a usar backup de chave",
-    "Add an email address to configure email notifications": "Adicione um endereço de e-mail para configurar notificações por e-mail",
     "Unable to verify phone number.": "Não foi possível confirmar o número de telefone.",
     "Verification code": "Código de confirmação",
     "Phone Number": "Número de telefone",
@@ -1116,7 +934,6 @@
     "Ignored users": "Usuários bloqueados",
     "Bulk options": "Opções em massa",
     "Accept all %(invitedRooms)s invites": "Aceite todos os convites de %(invitedRooms)s",
-    "Key backup": "Backup da chave",
     "Security & Privacy": "Segurança & Privacidade",
     "Missing media permissions, click the button below to request.": "Permissões de mídia ausentes, clique no botão abaixo para solicitar.",
     "Request media permissions": "Solicitar permissões de mídia",
@@ -1169,14 +986,10 @@
     "Only continue if you trust the owner of the server.": "Continue apenas se você confia em quem possui este servidor.",
     "Trust": "Confiança",
     "%(name)s is requesting verification": "%(name)s está solicitando confirmação",
-    "Use your account to sign in to the latest version": "Use sua conta para logar na última versão",
-    "We’re excited to announce Riot is now Element": "Estamos muito felizes em anunciar que Riot agora é Element",
-    "Riot is now Element!": "Riot agora é Element!",
-    "Learn More": "Saiba mais",
     "Sign In or Create Account": "Faça login ou crie uma conta",
     "Use your account or create a new one to continue.": "Use sua conta ou crie uma nova para continuar.",
     "Create Account": "Criar Conta",
-    "Sign In": "Entrar",
+    "Sign In": "Fazer signin",
     "Custom (%(level)s)": "Personalizado (%(level)s)",
     "Messages": "Mensagens",
     "Actions": "Ações",
@@ -1214,7 +1027,6 @@
     "Send a bug report with logs": "Envia um relatório de erro",
     "Opens chat with the given user": "Abre um chat com determinada pessoa",
     "Sends a message to the given user": "Envia uma mensagem para determinada pessoa",
-    "%(senderName)s made no change.": "%(senderName)s não fez nenhuma alteração.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s alterou o nome da sala de %(oldRoomName)s para %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s adicionou os endereços alternativos %(addresses)s desta sala.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s adicionou o endereço alternativo %(addresses)s desta sala.",
@@ -1266,7 +1078,6 @@
     "No homeserver URL provided": "Nenhum endereço fornecido do servidor local",
     "Unexpected error resolving homeserver configuration": "Erro inesperado buscando a configuração do servidor",
     "Unexpected error resolving identity server configuration": "Erro inesperado buscando a configuração do servidor de identidade",
-    "The message you are trying to send is too large.": "A mensagem que você está tentando enviar é muito grande.",
     "a few seconds ago": "há alguns segundos",
     "about a minute ago": "há aproximadamente um minuto",
     "%(num)s minutes ago": "há %(num)s minutos",
@@ -1285,35 +1096,22 @@
     "The user's homeserver does not support the version of the room.": "O servidor desta(e) usuária(o) não suporta a versão desta sala.",
     "Help us improve %(brand)s": "Ajude-nos a melhorar o %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Envie <UsageDataLink>dados anônimos de uso</UsageDataLink> que nos ajudam a melhorar o %(brand)s. Isso necessitará do uso de um <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "Quero ajudar",
-    "Review where you’re logged in": "Revisar onde você está logada(o)",
-    "Verify all your sessions to ensure your account & messages are safe": "Confirme todas as suas sessões para garantir que sua conta e mensagens estão seguras",
     "Review": "Revisar",
     "Later": "Mais tarde",
     "Your homeserver has exceeded its user limit.": "Seu servidor ultrapassou seu limite de usuárias(os).",
     "Your homeserver has exceeded one of its resource limits.": "Seu servidor local excedeu um de seus limites de recursos.",
     "Contact your <a>server admin</a>.": "Entre em contato com sua(seu) <a>administrador(a) do servidor</a>.",
     "Ok": "Ok",
-    "Set password": "Definir senha",
-    "To return to your account in future you need to set a password": "Para retornar à sua conta no futuro, você precisa definir uma senha",
-    "Set up encryption": "Configurar a criptografia",
     "Encryption upgrade available": "Atualização de criptografia disponível",
     "Verify this session": "Confirmar esta sessão",
     "Upgrade": "Atualizar",
     "Verify": "Confirmar",
-    "Verify yourself & others to keep your chats safe": "Confirme a sua conta e as dos seus contatos, para manter suas conversas seguras",
     "Other users may not trust it": "Outras(os) usuárias(os) podem não confiar nela",
     "New login. Was this you?": "Novo login. Foi você?",
-    "Verify the new login accessing your account: %(name)s": "Verifique o novo login na sua conta: %(name)s",
-    "Restart": "Reiniciar",
-    "Upgrade your %(brand)s": "Atualize o seu %(brand)s",
-    "A new version of %(brand)s is available!": "Uma nova versão do %(brand)s está disponível!",
     "Guest": "Convidada(o)",
     "You joined the call": "Você entrou na chamada",
     "%(senderName)s joined the call": "%(senderName)s entrou na chamada",
     "Call in progress": "Chamada em andamento",
-    "You left the call": "Você saiu da chamada",
-    "%(senderName)s left the call": "%(senderName)s saiu da chamada",
     "Call ended": "Chamada encerrada",
     "You started a call": "Você iniciou uma chamada",
     "%(senderName)s started a call": "%(senderName)s iniciou uma chamada",
@@ -1323,11 +1121,8 @@
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "New spinner design": "Nova aparência do símbolo de carregamento",
-    "Multiple integration managers": "Múltiplos gestores de integrações",
     "Try out new ways to ignore people (experimental)": "Tente novas maneiras de bloquear pessoas (experimental)",
     "Support adding custom themes": "Permite adicionar temas personalizados",
-    "Enable advanced debugging for the room list": "Ativar a depuração avançada para a lista de salas",
     "Show info about bridges in room settings": "Exibir informações sobre integrações nas configurações das salas",
     "Font size": "Tamanho da fonte",
     "Use custom size": "Usar tamanho personalizado",
@@ -1342,9 +1137,7 @@
     "Show rooms with unread notifications first": "Mostrar primeiro as salas com notificações não lidas",
     "Show shortcuts to recently viewed rooms above the room list": "Mostrar atalhos para salas recentemente visualizadas acima da lista de salas",
     "Show hidden events in timeline": "Mostrar eventos ocultos nas conversas",
-    "Low bandwidth mode": "Modo de baixo uso de dados",
     "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 a assistência do servidor de chamadas reserva turn.matrix.org quando seu servidor não oferecer este serviço (seu endereço IP será transmitido quando você ligar)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar confirmação de leitura para mensagens (necessita um servidor compatível para desativar)",
     "Show previews/thumbnails for images": "Mostrar miniaturas e resumos para imagens",
     "Enable message search in encrypted rooms": "Ativar busca de mensagens em salas criptografadas",
     "How fast should messages be downloaded.": "Com qual rapidez as mensagens devem ser baixadas.",
@@ -1355,9 +1148,6 @@
     "My Ban List": "Minha lista de banidos",
     "This is your list of users/servers you have blocked - don't leave the room!": "Esta é a sua lista de usuárias(os)/servidores que você bloqueou - não saia da sala!",
     "Unknown caller": "Pessoa desconhecida ligando",
-    "Incoming voice call": "Recebendo chamada de voz",
-    "Incoming video call": "Recebendo chamada de vídeo",
-    "Incoming call": "Recebendo chamada",
     "Verify this session by completing one of the following:": "Confirme esta sessão completando um dos seguintes:",
     "Scan this unique code": "Escaneie este código único",
     "or": "ou",
@@ -1374,23 +1164,16 @@
     "They don't match": "Elas não são correspondentes",
     "To be secure, do this in person or use a trusted way to communicate.": "Para sua segurança, faça isso pessoalmente ou use uma forma confiável de comunicação.",
     "Lock": "Cadeado",
-    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Recusar (%(counter)s)",
     "Accept <policyLink /> to continue:": "Aceitar <policyLink /> para continuar:",
     "Upload": "Enviar",
     "This bridge was provisioned by <user />.": "Esta integração foi disponibilizada por <user />.",
     "This bridge is managed by <user />.": "Esta integração é desenvolvida por <user />.",
-    "Workspace: %(networkName)s": "Espaço de trabalho: %(networkName)s",
-    "Channel: %(channelName)s": "Canal: %(channelName)s",
     "Show less": "Mostrar menos",
     "Show more": "Mostrar mais",
     "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.": "Ao mudar a senha, você apagará todas as chaves de criptografia de ponta a ponta existentes em todas as sessões, fazendo com que o histórico de conversas criptografadas fique ilegível, a não ser que você exporte as salas das chaves criptografadas antes de mudar a senha e então as importe novamente depois. No futuro, isso será melhorado.",
     "Your homeserver does not support cross-signing.": "Seu servidor não suporta a autoverificação.",
-    "Cross-signing and secret storage are enabled.": "A autoverificação e o armazenamento secreto estão ativados.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Sua conta tem uma identidade autoverificada em armazenamento secreto, mas ainda não é considerada confiável por esta sessão.",
-    "Cross-signing and secret storage are not yet set up.": "A autoverificação e o armazenamento seguro ainda não foram configurados.",
-    "Reset cross-signing and secret storage": "Refazer a autoverificação e o armazenamento secreto",
-    "Bootstrap cross-signing and secret storage": "Fazer a autoverificação e o armazenamento secreto",
     "well formed": "bem formado",
     "unexpected type": "tipo inesperado",
     "Cross-signing public keys:": "Chaves públicas de autoverificação:",
@@ -1402,7 +1185,6 @@
     "cached locally": "armazenado localmente",
     "not found locally": "não encontrado localmente",
     "User signing private key:": "Chave privada de assinatura da(do) usuária(o):",
-    "Session backup key:": "Chave de cópia (backup) da sessão:",
     "Secret storage public key:": "Chave pública do armazenamento secreto:",
     "in account data": "nos dados de conta",
     "Homeserver feature support:": "Recursos suportados pelo servidor:",
@@ -1421,9 +1203,6 @@
     "ID": "ID",
     "Public Name": "Nome público",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifique individualmente cada sessão usada por um usuário para marcá-la como confiável, em vez de confirmar em aparelhos autoverificados.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Armazene mensagens criptografadas localmente para que elas apareçam nas buscas, usando· ",
-    " to store messages from ": " para armazenar mensagens de ",
-    "rooms.": "salas.",
     "Manage": "Gerenciar",
     "Securely cache encrypted messages locally for them to appear in search results.": "Armazene mensagens criptografadas de forma segura localmente para que possam aparecer nos resultados das buscas.",
     "Enable": "Ativar",
@@ -1449,7 +1228,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "O backup tem uma assinatura <validity>inválida</validity> de uma sessão <verify>não confirmada</verify> <device></device>",
     "Backup is not signed by any of your sessions": "O backup não foi assinado por nenhuma de suas sessões",
     "This backup is trusted because it has been restored on this session": "Este backup é confiável, pois foi restaurado nesta sessão",
-    "Backup key stored: ": "Chave de segurança (backup) armazenada: ",
     "Your keys are <b>not being backed up from this session</b>.": "Suas chaves <b>não estão sendo copiadas desta sessão</b>.",
     "wait and try again later": "aguarde e tente novamente mais tarde",
     "Please verify the room ID or address and try again.": "Por favor, verifique o ID ou endereço da sala e tente novamente.",
@@ -1477,11 +1255,8 @@
     "Encrypted by a deleted session": "Criptografada por uma sessão já apagada",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "A autenticidade desta mensagem criptografada não pode ser garantida neste aparelho.",
     "People": "Pessoas",
-    "Create room": "Criar sala",
     "Start chatting": "Começar a conversa",
     "Try again later, or ask a room admin to check if you have access.": "Tente novamente mais tarde, ou peça a um(a) administrador(a) da sala para verificar se você tem acesso.",
-    "Never lose encrypted messages": "Nunca perca mensagens criptografadas",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensagens nesta sala estão protegidas com a criptografia de ponta a ponta. Apenas você e a(s) demais pessoa(s) desta sala têm a chave para ler estas mensagens.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Atualizar esta sala irá fechar a instância atual da sala e criar uma sala atualizada com o mesmo nome.",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Dica: Inicie sua mensagem com <code>//</code> para iniciar com uma barra.",
     "Start Verification": "Iniciar confirmação",
@@ -1503,7 +1278,6 @@
     "Start verification again from the notification.": "Iniciar a confirmação novamente, após a notificação.",
     "Start verification again from their profile.": "Iniciar a confirmação novamente, a partir do perfil deste usuário.",
     "Encryption enabled": "Criptografia ativada",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "As mensagens nesta sala estão criptografadas de ponta a ponta. Lembre-se de confirmar este usuário no perfil dele/dela.",
     "Encryption not enabled": "Criptografia desativada",
     "The encryption used by this room isn't supported.": "A criptografia usada nesta sala não é suportada.",
     "%(name)s wants to verify": "%(name)s solicita confirmação",
@@ -1513,17 +1287,13 @@
     "Enter the name of a new server you want to explore.": "Digite o nome do novo servidor que você deseja explorar.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, diga-nos o que aconteceu de errado ou, ainda melhor, crie um bilhete de erro no GitHub que descreva o problema.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Apagar todos os dados desta sessão é uma ação permanente. Mensagens criptografadas serão perdidas, a não ser que as chaves delas tenham sido copiadas para o backup.",
-    "Set a room address to easily share your room with other people.": "Defina um endereço de sala para facilmente compartilhar sua sala com outras pessoas.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Você não poderá desativar isso mais tarde. Integrações e a maioria dos bots não funcionarão.",
     "Enable end-to-end encryption": "Ativar a criptografia de ponta a ponta",
     "Create a public room": "Criar uma sala pública",
     "Create a private room": "Criar uma sala privada",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Impedir usuários de outros servidores na rede Matrix de entrarem nesta sala (Essa configuração não pode ser alterada posteriormente!)",
     "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.": "Você já usou uma versão mais recente do %(brand)s nesta sessão. Para usar esta versão novamente com a criptografia de ponta a ponta, você terá que se desconectar e entrar novamente.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Confirme este usuário para torná-lo confiável. Confiar nos usuários fornece segurança adicional ao trocar mensagens criptografadas de ponta a ponta.",
     "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.": "Confirme este aparelho para torná-lo confiável. Confiar neste aparelho fornecerá segurança adicional para você e aos outros ao trocarem mensagens criptografadas de ponta a ponta.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Não conseguimos criar sua mensagem direta. Por favor, verifique os usuários que você deseja convidar e tente novamente.",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Comece uma conversa com alguém usando o seu respectivo nome e sobrenome, nome de usuário (por exemplo: <userId/>) ou endereço de e-mail.",
     "a new master key signature": "uma nova chave mestra de assinatura",
     "a new cross-signing key signature": "uma nova chave de autoverificação",
     "a key signature": "uma assinatura de chave",
@@ -1531,36 +1301,15 @@
     "You'll lose access to your encrypted messages": "Você perderá acesso às suas mensagens criptografadas",
     "Session key": "Chave da sessão",
     "Verify session": "Confirmar sessão",
-    "We recommend you change your password and recovery key in Settings immediately": "Nós recomendamos que você altere imediatamente sua senha e chave de recuperação nas Configurações",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Use esta sessão para confirmar a sua nova sessão, dando a ela acesso às mensagens criptografadas:",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Você já está logada(o) e pode começar a usar à vontade, mas você também pode buscar pelas últimas versões do app em todas as plataformas em <a>element.io/get-started</a>.",
-    "Go to Element": "Ir a Element",
-    "We’re excited to announce Riot is now Element!": "Estamos muito felizes de anunciar que agora Riot é Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Saiba mais em <a>element.io/previously-riot</a>",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para evitar a duplicação de registro de problemas, por favor <existingIssuesLink>veja os problemas existentes</existingIssuesLink> antes e adicione um +1, ou então <newIssueLink>crie um novo item</newIssueLink> se seu problema ainda não foi reportado.",
     "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 esta mensagem enviará o seu 'event ID' único para o/a administrador/a do seu Homeserver. Se as mensagens nesta sala são criptografadas, o/a administrador/a não conseguirá ler o texto da mensagem nem ver nenhuma imagem ou arquivo.",
     "Sign out and remove encryption keys?": "Fazer logout e remover as chaves de criptografia?",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Alguns dados de sessão, incluindo chaves de mensagens criptografadas, estão faltando. Desconecte-se e entre novamente para resolver isso, o que restaurará as chaves do backup.",
-    "Verify other session": "Confirmar outra sessão",
-    "A widget would like to verify your identity": "Um widget deseja confirmar sua identidade",
-    "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.": "Um widget localizado em %(widgetUrl)s deseja confirmar sua identidade. Permitindo isso, o widget poderá verificar sua ID de usuário, mas não poderá realizar nenhuma ação em seu nome.",
-    "Wrong Recovery Key": "Chave de recuperação errada",
-    "Invalid Recovery Key": "Chave de recuperação inválida",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Não foi possível acessar o armazenamento secreto. Por favor, verifique que você digitou a frase de recuperação correta.",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Entre com sua Frase de Segurança ou <button>use sua Chave de Segurança</button> para continuar.",
     "Security Key": "Chave de Segurança",
     "Use your Security Key to continue.": "Use sua Chave de Segurança para continuar.",
-    "Recovery key mismatch": "Chave de recuperação incorreta",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "O backup não pôde ser descriptografado com esta chave de recuperação: por favor, verifique se você digitou a chave de recuperação correta.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "O backup não pôde ser descriptografado com esta frase de recuperação: por favor, verifique se você digitou a frase de recuperação correta.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Atenção</b>: você só deve configurar o backup de chave em um computador de sua confiança.",
-    "Enter recovery key": "Digite a chave de recuperação",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Atenção</b>: Você só deve configurar o backup de chave em um computador de sua confiança.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se você esqueceu sua chave de recuperação, pode <button>configurar novas opções de recuperação</button>",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Está faltando a chave pública do captcha no Servidor (homeserver). Por favor, reporte isso aos(às) administradores(as) do servidor.",
-    "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>.": "Entre com a localização do seu Servidor Matrix. Pode ser seu próprio domínio ou ser um subdomínio de <a>element.io</a>.",
-    "Create your Matrix account on %(serverName)s": "Criar sua conta Matrix em %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Crie sua conta Matrix em <underlinedServerName />",
     "Welcome to %(appName)s": "Boas-vindas ao %(appName)s",
     "Liberate your communication": "Liberte sua comunicação",
     "Send a Direct Message": "Enviar uma mensagem",
@@ -1573,12 +1322,7 @@
     "Verify this login": "Confirmar este login",
     "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.": "Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça um backup das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.",
     "Create account": "Criar conta",
-    "Create your account": "Criar sua conta",
-    "Use Recovery Key or Passphrase": "Use a chave de recuperação, ou a frase de recuperação",
-    "Use Recovery Key": "Usar a chave de recuperação",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirme sua identidade através da confirmação deste login em qualquer uma de suas outras sessões, garantindo a elas acesso a mensagens criptografadas.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sua nova sessão está agora confirmada. Ela tem acesso às suas mensagens criptografadas, e outros usuários poderão ver esta sessão como confiável.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Sem completar os procedimentos de segurança nesta sessão, você não terá acesso a mensagens criptografadas.",
     "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 acesso à sua conta e restaure as chaves de criptografia armazenadas nesta sessão. Sem elas, você não conseguirá ler todas as suas mensagens seguras em nenhuma sessão.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Atenção: Seus dados pessoais (incluindo chaves de criptografia) ainda estão armazenados nesta sessão. Apague-os quando tiver finalizado esta sessão, ou se quer entrar com outra conta.",
     "Confirm encryption setup": "Confirmar a configuração de criptografia",
@@ -1593,19 +1337,10 @@
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se você cancelar agora, poderá perder mensagens e dados criptografados se você perder acesso aos seus logins atuais.",
     "Upgrade your encryption": "Atualizar sua criptografia",
     "Save your Security Key": "Salve sua Chave de Segurança",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Nós armazenaremos uma cópia criptografada de suas chaves no nosso servidor. Por favor, proteja este backup com uma frase de recuperação.",
-    "Set up with a recovery key": "Configurar com uma chave de recuperação",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Sua chave de recuperação é uma rede de proteção - você pode usá-la para restaurar o acesso às suas mensagens criptografadas se você esquecer sua frase de recuperação.",
-    "Your recovery key": "Sua chave de recuperação",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Sua chave de recuperação foi <b>copiada para sua área de transferência</b>. Cole-a em:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Sua chave de recuperação está na sua pasta de <b>Downloads</b>.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Sem configurar a Recuperação Segura de Mensagens, você não será capaz de restaurar seu histórico de mensagens criptografadas e fizer logout ou usar outra sessão.",
-    "Make a copy of your recovery key": "Fazer uma cópia de sua chave de recuperação",
     "Starting backup...": "Começando o backup...",
     "Create key backup": "Criar backup de chave",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Uma nova frase e chave de recuperação para Mensagens Seguras foram detectadas.",
     "This session is encrypting history using the new recovery method.": "Esta sessão está criptografando o histórico de mensagens usando a nova opção de recuperação.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Esta sessão detectou que sua frase e chave de recuperação para Mensagens Seguras foram removidas.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Se você fez isso acidentalmente, você pode configurar Mensagens Seguras nesta sessão, o que vai re-criptografar o histórico de mensagens desta sessão com uma nova opção de recuperação.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Se desativado, as mensagens de salas criptografadas não aparecerão em resultados de buscas.",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s está armazenando de forma segura as mensagens criptografadas localmente, para que possam aparecer nos resultados das buscas:",
@@ -1613,7 +1348,6 @@
     "Jump to start/end of the composer": "Pule para o início/fim do campo de texto",
     "Click the button below to confirm adding this phone number.": "Clique no botão abaixo para confirmar a adição deste número de telefone.",
     "Clear notifications": "Limpar notificações",
-    "There are advanced notifications which are not shown here.": "Existem notificações avançadas que não são mostradas aqui.",
     "Enable desktop notifications for this session": "Ativar notificações na área de trabalho nesta sessão",
     "Mentions & Keywords": "Apenas @menções e palavras-chave",
     "Notification options": "Alterar notificações",
@@ -1632,7 +1366,6 @@
     "You sent a verification request": "Você enviou uma solicitação de confirmação",
     "Show all": "Mostrar tudo",
     "Reactions": "Reações",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagiu com %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagiu com %(shortName)s</reactedWith>",
     "Message deleted": "Mensagem apagada",
     "Message deleted by %(name)s": "Mensagem apagada por %(name)s",
@@ -1660,13 +1393,10 @@
     "Widget ID": "ID do widget",
     "Widget added by": "Widget adicionado por",
     "This widget may use cookies.": "Este widget pode usar cookies.",
-    "Maximize apps": "Maximizar app",
     "More options": "Mais opções",
     "Join": "Entrar",
     "Rotate Left": "Girar para a esquerda",
-    "Rotate counter-clockwise": "Girar no sentido anti-horário",
     "Rotate Right": "Girar para a direita",
-    "Rotate clockwise": "Girar no sentido horário",
     "Language Dropdown": "Menu suspenso de idiomas",
     "QR Code": "Código QR",
     "Room address": "Endereço da sala",
@@ -1689,8 +1419,6 @@
     "Clear all data in this session?": "Limpar todos os dados nesta sessão?",
     "Clear all data": "Limpar todos os dados",
     "Please enter a name for the room": "Digite um nome para a sala",
-    "This room is private, and can only be joined by invitation.": "Esta sala é privada, e só pode ser acessada por convite.",
-    "Make this room public": "Tornar pública esta sala",
     "Hide advanced": "Esconder configurações avançadas",
     "Show advanced": "Mostrar configurações avançadas",
     "Are you sure you want to deactivate your account? This is irreversible.": "Tem certeza de que deseja desativar sua conta? Isso é irreversível.",
@@ -1720,7 +1448,6 @@
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Esta sala está executando a versão <roomVersion />, que este servidor marcou como <i>instável</i>.",
     "Local address": "Endereço local",
     "Published Addresses": "Endereços publicados",
-    "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.": "Os endereços publicados podem ser usados por qualquer pessoa em qualquer servidor para entrar na sala. Para publicar um endereço, primeiramente ele precisa ser definido como um endereço local.",
     "Other published addresses:": "Outros endereços publicados:",
     "New published address (e.g. #alias:server)": "Novo endereço publicado (por exemplo, #nome:server)",
     "Local Addresses": "Endereços locais",
@@ -1729,14 +1456,12 @@
     "Your avatar URL": "Link da sua foto de perfil",
     "Your user ID": "Sua ID de usuário",
     "%(brand)s URL": "Link do %(brand)s",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Se você usar esse widget, os dados poderão ser compartilhados <helpIcon /> com %(widgetDomain)s & seu Gerenciador de Integrações.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Se você usar esse widget, os dados <helpIcon /> poderão ser compartilhados com %(widgetDomain)s.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s não fizeram alterações %(count)s vezes",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s não fizeram alterações",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s não fez alterações %(count)s vezes",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s não fez alterações",
     "Power level": "Nível de permissão",
-    "Please provide a room address": "Digite um endereço para a sala",
     "Looks good": "Muito bem",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Tem certeza de que deseja remover <b>%(serverName)s</b>",
     "%(networkName)s rooms": "Salas em %(networkName)s",
@@ -1750,7 +1475,6 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Se você confirmar esse usuário, a sessão será marcada como confiável para você e para ele.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Confirmar este aparelho o marcará como confiável para você e para os usuários que se confirmaram com você.",
     "Keep going...": "Continue...",
-    "The username field must not be blank.": "O campo do nome de usuário não pode ficar em branco.",
     "Username": "Nome de usuário",
     "Use an email address to recover your account": "Use um endereço de e-mail para recuperar sua conta",
     "Enter email address (required on this homeserver)": "Digite o endereço de e-mail (necessário neste servidor)",
@@ -1758,21 +1482,15 @@
     "Passwords don't match": "As senhas não correspondem",
     "Other users can invite you to rooms using your contact details": "Outros usuários podem convidá-lo para salas usando seus detalhes de contato",
     "Enter phone number (required on this homeserver)": "Digite o número de celular (necessário neste servidor)",
-    "Doesn't look like a valid phone number": "Este não parece ser um número de telefone válido",
     "Use lowercase letters, numbers, dashes and underscores only": "Use apenas letras minúsculas, números, traços e sublinhados",
     "Enter username": "Digite o nome de usuário",
     "Email (optional)": "E-mail (opcional)",
     "Phone (optional)": "Número de celular (opcional)",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Defina um e-mail para recuperação da conta. Opcionalmente, use e-mail ou número de celular para ser encontrado por seus contatos.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Você não pôde se conectar na sua conta. Entre em contato com o administrador do servidor para obter mais informações.",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirme a adição deste número de telefone usando o Login Único para provar sua identidade.",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use um servidor de identidade para convidar por e-mail. Clique em continuar para usar o servidor de identidade padrão (%(defaultIdentityServerName)s) ou gerencie nas Configurações.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Você pode ter configurado estas opções em um aplicativo que não seja o %(brand)s. Você não pode ajustar essas opções no %(brand)s, mas elas ainda se aplicam.",
     "Enable audible notifications for this session": "Ativar o som de notificações nesta sessão",
     "Display Name": "Nome e sobrenome",
-    "Identity Server URL must be HTTPS": "O link do servidor de identidade deve começar com HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Servidor de Identidade inválido (código de status %(code)s)",
-    "Could not connect to Identity Server": "Não foi possível conectar-se ao Servidor de Identidade",
     "Checking server": "Verificando servidor",
     "Change identity server": "Alterar o servidor de identidade",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Desconectar-se do servidor de identidade <current /> e conectar-se em <new /> em vez disso?",
@@ -1789,10 +1507,8 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Você ainda está <b>compartilhando seus dados pessoais</b> no servidor de identidade <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Recomendamos que você remova seus endereços de e-mail e números de telefone do servidor de identidade antes de desconectar.",
     "Go back": "Voltar",
-    "Identity Server (%(server)s)": "Servidor de identidade (%(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.": "No momento, você está usando <server></server> para descobrir e ser descoberto pelos contatos existentes que você conhece. Você pode alterar seu servidor de identidade abaixo.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se você não quiser usar <server /> para descobrir e ser detectável pelos contatos existentes, digite outro servidor de identidade abaixo.",
-    "Identity Server": "Servidor de identidade",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "No momento, você não está usando um servidor de identidade. Para descobrir e ser descoberto pelos contatos existentes, adicione um abaixo.",
     "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.": "Desconectar-se do servidor de identidade significa que você não poderá ser descoberto por outros usuários e não poderá convidar outras pessoas por e-mail ou número de celular.",
     "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 um servidor de identidade é opcional. Se você optar por não usar um servidor de identidade, não poderá ser descoberto por outros usuários e não poderá convidar outras pessoas por e-mail ou por número de celular.",
@@ -1811,7 +1527,6 @@
     "Custom theme URL": "Link do tema personalizado",
     "Add theme": "Adicionar tema",
     "Message layout": "Aparência da mensagem",
-    "Compact": "Compacto",
     "Modern": "Moderno",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Defina o nome de uma fonte instalada no seu sistema e o %(brand)s tentará usá-la.",
     "Customise your appearance": "Personalize sua aparência",
@@ -1864,9 +1579,6 @@
     "You're previewing %(roomName)s. Want to join it?": "Você está visualizando %(roomName)s. Deseja participar?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s não pode ser visualizado. Deseja participar?",
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala não existe. Tem certeza de que você está no lugar certo?",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Faça backup de suas chaves com segurança para evitar perdê-las. <a>Saiba mais.</a>",
-    "Not now": "Agora não",
-    "Don't ask me again": "Não pergunte novamente",
     "Appearance": "Aparência",
     "Show rooms with unread messages first": "Mostrar salas não lidas em primeiro",
     "Show previews of messages": "Mostrar pré-visualizações de mensagens",
@@ -1879,7 +1591,6 @@
     "Send as message": "Enviar como mensagem",
     "Room Topic": "Descrição da sala",
     "React": "Adicionar reação",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Se você encontrar algum erro ou tiver um comentário que gostaria de compartilhar, informe-nos no GitHub.",
     "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s reações",
     "Notification settings": "Configurar notificações",
     "Want more than a community? <a>Get your own server</a>": "Quer mais do que uma comunidade? <a>Obtenha seu próprio servidor</a>",
@@ -1891,7 +1602,6 @@
     "Clear personal data": "Limpar dados pessoais",
     "Command Autocomplete": "Preenchimento automático do comando",
     "Community Autocomplete": "Preenchimento automático da comunidade",
-    "DuckDuckGo Results": "Resultados no DuckDuckGo",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se você não excluiu a opção de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina imediatamente uma nova opção de recuperação nas Configurações.",
     "Room List": "Lista de salas",
     "Autocomplete": "Preencher automaticamente",
@@ -1919,11 +1629,7 @@
     "Expand room list section": "Mostrar seção da lista de salas",
     "The person who invited you already left the room.": "A pessoa que convidou você já saiu da sala.",
     "The person who invited you already left the room, or their server is offline.": "A pessoa que convidou você já saiu da sala, ou o servidor dela está indisponível.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use o Gerenciador de Integrações em <b>(%(serverName)s)</b> para gerenciar bots, widgets e pacotes de figurinhas.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use o Gerenciador de Integrações para gerenciar bots, widgets e pacotes de figurinhas.",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "O Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.",
     "Keyboard Shortcuts": "Atalhos do teclado",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personalize sua experiência com os recursos experimentais. <a>Saiba mais</a>.",
     "Ignored/Blocked": "Bloqueado",
     "Error adding ignored user/server": "Erro ao adicionar usuário/servidor bloqueado",
     "Something went wrong. Please try again or view your console for hints.": "Não foi possível carregar. Por favor, tente novamente ou veja seu console para obter dicas.",
@@ -1952,7 +1658,6 @@
     "Upgrade the room": "Atualizar a sala",
     "Kick users": "Remover usuários",
     "Ban users": "Banir usuários",
-    "Remove messages": "Apagar mensagens dos outros",
     "Notify everyone": "Notificar todos",
     "Your email address hasn't been verified yet": "Seu endereço de e-mail ainda não foi confirmado",
     "Revoke": "Revogar",
@@ -1995,7 +1700,6 @@
     "Main address": "Endereço principal",
     "Room Name": "Nome da sala",
     "Room avatar": "Foto da sala",
-    "Waiting for you to accept on your other session…": "Aguardando sua confirmação na sua outra sessão…",
     "Waiting for %(displayName)s to accept…": "Aguardando %(displayName)s aceitar…",
     "Accepting…": "Aceitando…",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Suas mensagens são protegidas e somente você e o destinatário têm as chaves exclusivas para desbloqueá-las.",
@@ -2014,7 +1718,6 @@
     "Remove %(count)s messages|other": "Apagar %(count)s mensagens para todos",
     "Remove %(count)s messages|one": "Remover 1 mensagem",
     "Remove recent messages": "Apagar mensagens desta pessoa na sala",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> em %(roomName)s",
     "Deactivate user?": "Desativar usuário?",
     "Deactivate user": "Desativar usuário",
     "Failed to deactivate user": "Falha ao desativar o usuário",
@@ -2034,31 +1737,23 @@
     "Destroy cross-signing keys?": "Destruir chaves autoverificadas?",
     "Waiting for partner to confirm...": "Aguardando seu contato confirmar...",
     "Enable 'Manage Integrations' in Settings to do this.": "Para fazer isso, ative 'Gerenciar Integrações' nas Configurações.",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Seu %(brand)s não permite que você use o Gerenciador de Integrações para fazer isso. Entre em contato com o administrador.",
     "Confirm to continue": "Confirme para continuar",
     "Click the button below to confirm your identity.": "Clique no botão abaixo para confirmar sua identidade.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Falha ao convidar os seguintes usuários para a conversa: %(csvUsers)s",
     "Something went wrong trying to invite the users.": "Ocorreu um erro ao tentar convidar os usuários.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Não foi possível convidar esses usuários. Por favor, tente novamente.",
     "Failed to find the following users": "Falha ao encontrar os seguintes usuários",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Os seguintes usuários não puderam ser convidados porque não existem ou são inválidos: %(csvNames)s",
     "Recent Conversations": "Conversas recentes",
     "Suggestions": "Sugestões",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Convide alguém buscando o seu respectivo nome e sobrenome, nome de usuário (por exemplo: <userId/>), endereço de e-mail ou <a>compartilhe esta sala</a>.",
-    "Use your account to sign in to the latest version of the app at <a />": "Use sua conta para fazer login na versão mais recente do aplicativo em <a />",
-    "Report bugs & give feedback": "Relatar erros & enviar comentários",
     "Room Settings - %(roomName)s": "Configurações da sala - %(roomName)s",
-    "Automatically invite users": "Convidar usuários automaticamente",
     "Upgrade private room": "Atualizar a sala privada",
     "Upgrade public room": "Atualizar a sala pública",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Atualizar uma sala é uma ação avançada e geralmente é recomendada quando uma sala está instável devido a erros, recursos ausentes ou vulnerabilidades de seguranç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>.": "Isso geralmente afeta apenas como a sala é processada no servidor. Se você tiver problemas com o %(brand)s, <a>informe um erro</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Você atualizará esta sala de <oldVersion /> para <newVersion />.",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Um nome de usuário só pode ter letras minúsculas, números e '=_-./'",
     "Command Help": "Ajuda com Comandos",
     "To help us prevent this in future, please <a>send us logs</a>.": "Para nos ajudar a evitar isso no futuro, <a>envie-nos os relatórios</a>.",
     "Your browser likely removed this data when running low on disk space.": "O seu navegador provavelmente removeu esses dados quando o espaço de armazenamento ficou insuficiente.",
-    "Integration Manager": "Gerenciador de Integrações",
     "Find others by phone or email": "Encontre outras pessoas por telefone ou e-mail",
     "Use bots, bridges, widgets and sticker packs": "Use bots, integrações, widgets e pacotes de figurinhas",
     "Terms of Service": "Termos de serviço",
@@ -2078,36 +1773,19 @@
     "Upload Error": "Erro no envio",
     "Verification Request": "Solicitação de confirmação",
     "Remember my selection for this widget": "Lembrar minha escolha para este widget",
-    "Deny": "Rejeitar",
     "Wrong file type": "Tipo errado de arquivo",
-    "Address (optional)": "Endereço (opcional)",
     "Report Content": "Denunciar conteúdo",
     "Update status": "Atualizar status",
     "Set status": "Definir status",
     "Hide": "Esconder",
-    "Help": "Ajuda",
     "Remove for everyone": "Remover para todos",
-    "Remove for me": "Remover para mim",
     "User Status": "Status do usuário",
     "This homeserver would like to make sure you are not a robot.": "Este servidor local quer se certificar de que você não é um robô.",
     "Confirm your identity by entering your account password below.": "Confirme sua identidade digitando sua senha abaixo.",
-    "Unable to validate homeserver/identity server": "Não foi possível validar seu servidor local/servidor de identidade",
-    "Server Name": "Nome do servidor",
     "Enter password": "Digite a senha",
     "Nice, strong password!": "Muito bem, uma senha forte!",
     "Password is allowed, but unsafe": "Esta senha é permitida, mas não é segura",
-    "Not sure of your password? <a>Set a new one</a>": "Esqueceu sua senha? <a>Defina uma nova</a>",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Defina um e-mail para poder recuperar a conta. Este e-mail também pode ser usado para encontrar seus contatos.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Digite o endereço de um servidor local <a>O que isso significa?</a>",
-    "Homeserver URL": "Endereço do servidor local",
-    "Identity Server URL": "Endereço do servidor de identidade",
-    "Other servers": "Outros servidores",
-    "Free": "Gratuito",
-    "Find other public servers or use a custom server": "Encontre outros servidores públicos ou use um servidor personalizado",
-    "Sign in to your Matrix account on %(serverName)s": "Faça login com sua conta Matrix em %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Faça login com sua conta Matrix em <underlinedServerName />",
     "Sign in with SSO": "Faça login com SSO (Login Único)",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale o <chromeLink>Chrome</chromeLink>, o <firefoxLink>Firefox</firefoxLink> ou o <safariLink>Safari</safariLink> para obter a melhor experiência de uso.",
     "Couldn't load page": "Não foi possível carregar a página",
     "This homeserver does not support communities": "Este servidor local não suporta o recurso de comunidades",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s não conseguiu obter a lista de protocolos do servidor local. O servidor local pode ser muito antigo para suportar redes de terceiros.",
@@ -2119,16 +1797,12 @@
     "View": "Ver",
     "Find a room…": "Encontrar uma sala…",
     "Find a room… (e.g. %(exampleRoom)s)": "Encontrar uma sala… (por exemplo: %(exampleRoom)s)",
-    "Search rooms": "Buscar salas",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
     "Feedback": "Fale conosco",
     "User menu": "Menu do usuário",
     "Could not load user profile": "Não foi possível carregar o perfil do usuário",
     "Session verified": "Sessão confirmada",
-    "Your Matrix account on %(serverName)s": "Sua conta Matrix em %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Sua conta Matrix em <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "Nenhum servidor de identidade está configurado: adicione um nas configurações do servidor para redefinir sua senha.",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Um e-mail de verificação será enviado para sua caixa de entrada para confirmar sua nova senha.",
     "Your password has been reset.": "Sua senha foi alterada.",
     "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.": "Você foi desconectado de todas as sessões e não receberá mais notificações. Para reativar as notificações, faça login novamente em cada aparelho.",
@@ -2137,7 +1811,6 @@
     "Invalid base_url for m.identity_server": "base_url inválido para m.identity_server",
     "This account has been deactivated.": "Esta conta foi desativada.",
     "Syncing...": "Sincronizando...",
-    "%(brand)s Web": "%(brand)s Web",
     "Your new session is now verified. Other users will see it as trusted.": "Sua nova sessão agora está confirmada. Para outros usuários ela será vista como confiável.",
     "Forgotten your password?": "Esqueceu sua senha?",
     "Restore": "Restaurar",
@@ -2163,11 +1836,9 @@
     "Notification sound": "Som de notificação",
     "Unable to revoke sharing for email address": "Não foi possível revogar o compartilhamento do endereço de e-mail",
     "Unable to share email address": "Não foi possível compartilhar o endereço de e-mail",
-    "Direct message": "Enviar mensagem",
     "Incoming Verification Request": "Recebendo solicitação de confirmação",
     "Recently Direct Messaged": "Conversas recentes",
     "Direct Messages": "Conversas",
-    "Your account is not secure": "Sua conta não está segura",
     "Server isn't responding": "O servidor não está respondendo",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Seu servidor não está respondendo a algumas de suas solicitações. Abaixo estão alguns dos motivos mais prováveis.",
     "The server (%(serverName)s) took too long to respond.": "O servidor (%(serverName)s) demorou muito para responder.",
@@ -2175,7 +1846,6 @@
     "The server is offline.": "O servidor está fora do ar.",
     "The server is not configured to indicate what the problem is (CORS).": "O servidor não está configurado para indicar qual é o problema (CORS).",
     "Recent changes that have not yet been received": "Alterações recentes que ainda não foram recebidas",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Isso permitirá que você retorne à sua conta depois de se desconectar e fazer login em outras sessões.",
     "Missing session data": "Dados de sessão ausentes",
     "Be found by phone or email": "Seja encontrada/o por número de celular ou por e-mail",
     "Looks good!": "Muito bem!",
@@ -2183,23 +1853,10 @@
     "Restoring keys from backup": "Restaurando chaves do backup",
     "Fetching keys from server...": "Obtendo chaves do servidor...",
     "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s chaves restauradas",
-    "Incorrect recovery passphrase": "Frase de recuperação incorreta",
     "Keys restored": "Chaves restauradas",
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s chaves foram restauradas com sucesso",
-    "Enter recovery passphrase": "Digite a senha de recuperação",
-    "Resend edit": "Reenviar edição",
-    "Resend removal": "Reenviar a exclusão",
-    "Share Permalink": "Compartilhar link",
-    "Reload": "Recarregar",
-    "Take picture": "Tirar uma foto",
     "Country Dropdown": "Selecione o país",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Você pode usar as opções personalizadas do servidor para entrar em outros servidores Matrix especificando um endereço de servidor local diferente. Isso permite que você use o %(brand)s com uma conta Matrix existente em um servidor local diferente.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nenhum servidor de identidade está configurado, portanto você não pode adicionar um endereço de e-mail para redefinir sua senha no futuro.",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Digite o endereço do servidor de identidade personalizado <a>O que isso significa?</a>",
     "Join millions for free on the largest public server": "Junte-se a milhões de pessoas gratuitamente no maior servidor público",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Hospedagem premium para organizações <a>Saiba mais</a>",
-    "Self-verification request": "Solicitação de auto-verificação",
     "Switch theme": "Escolha um tema",
     "Signing In...": "Entrando...",
     "<a>Log in</a> to your new account.": "<a>Entrar</a> em sua nova conta.",
@@ -2223,7 +1880,6 @@
     "Homeserver URL does not appear to be a valid Matrix homeserver": "O endereço do servidor local não parece indicar um servidor local válido na Matrix",
     "Identity server URL does not appear to be a valid identity server": "O endereço do servidor de identidade não parece indicar um servidor de identidade válido",
     "This homeserver does not support login using email address.": "Este servidor local não suporta login usando endereço de e-mail.",
-    "or another cross-signing capable Matrix client": "ou outro cliente Matrix com capacidade de autoverificação",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Quando há muitas mensagens, isso pode levar algum tempo. Por favor, não recarregue o seu cliente enquanto isso.",
     "<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>Atenção</b>: ao atualizar uma sala, <i>os participantes da sala não são migrados automaticamente para a versão atualizada da sala.</i> Publicaremos um link da nova sala na versão antiga da sala - os participantes da sala terão que clicar neste link para entrar na nova sala.",
     "Upgrade this room to the recommended room version": "Atualizar a versão desta sala",
@@ -2251,23 +1907,13 @@
     "If they don't match, the security of your communication may be compromised.": "Se eles não corresponderem, a segurança da sua comunicação pode estar comprometida.",
     "Your homeserver doesn't seem to support this feature.": "O seu servidor local não parece suportar este recurso.",
     "Message edits": "Edições na mensagem",
-    "Your password": "Sua senha",
-    "This session, or the other session": "Esta sessão, ou a outra sessão",
-    "The internet connection either session is using": "A conexão de internet que cada sessão está usando",
-    "New session": "Nova sessão",
-    "If you didn’t sign in to this session, your account may be compromised.": "Se você não fez login nesta sessão, sua conta pode estar comprometida.",
-    "This wasn't me": "Não foi eu",
     "Please fill why you're reporting.": "Por favor, descreva porque você está reportando.",
     "Send report": "Enviar relatório",
     "A browser extension is preventing the request.": "Uma extensão do navegador está impedindo a solicitação.",
     "The server has denied your request.": "O servidor recusou a sua solicitação.",
     "No files visible in this room": "Nenhum arquivo nesta sala",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Anexe arquivos na conversa, ou simplesmente arraste e solte arquivos em qualquer lugar na sala.",
-    "You have no visible notifications in this room.": "Nenhuma notificação nesta sala",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Sua nova conta (%(newAccountId)s) foi registrada, mas você já está conectado a uma conta diferente (%(loggedInUserId)s).",
-    "%(brand)s Desktop": "%(brand)s para Computador",
-    "%(brand)s iOS": "%(brand)s para iOS",
-    "%(brand)s Android": "%(brand)s para Android",
     "Failed to re-authenticate due to a homeserver problem": "Falha em autenticar novamente devido à um problema no servidor local",
     "Failed to re-authenticate": "Falha em autenticar novamente",
     "Enter your password to sign in and regain access to your account.": "Digite sua senha para entrar e recuperar o acesso à sua conta.",
@@ -2277,8 +1923,6 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Você precisará se autenticar no servidor para confirmar a atualização.",
     "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.": "Digite uma frase de segurança que só você conheça, usada para proteger segredos em seu servidor.",
     "Use a different passphrase?": "Usar uma frase secreta diferente?",
-    "Enter your recovery passphrase a second time to confirm it.": "Digite sua senha de recuperação uma segunda vez para confirmá-la.",
-    "Confirm your recovery passphrase": "Confirme a sua frase de recuperação",
     "Page Up": "Page Up",
     "Page Down": "Page Down",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Você confirmou %(deviceName)s (%(deviceId)s) com êxito!",
@@ -2296,18 +1940,11 @@
     "Send %(count)s invites|one": "Enviar %(count)s convite",
     "Community ID: +<localpart />:%(domain)s": "ID da comunidade: +<localpart />:%(domain)s",
     "Enter name": "Digitar nome",
-    "End Call": "Encerrar chamada",
-    "Remove the group call from the room?": "Remover esta chamada em grupo da sala?",
-    "You don't have permission to remove the call from the room": "Você não tem permissão para remover a chamada da sala",
-    "Group call modified by %(senderName)s": "Chamada em grupo modificada por %(senderName)s",
-    "Group call started by %(senderName)s": "Chamada em grupo iniciada por %(senderName)s",
-    "Group call ended by %(senderName)s": "Chamada em grupo encerrada por %(senderName)s",
     "Unknown App": "App desconhecido",
     "eg: @bot:* or example.org": "por exemplo: @bot:* ou exemplo.org",
     "Privacy": "Privacidade",
     "Room Info": "Informações da sala",
     "Widgets": "Widgets",
-    "Unpin app": "Desafixar app",
     "Edit widgets, bridges & bots": "Editar widgets, integrações & bots",
     "Add widgets, bridges & bots": "Adicionar widgets, integrações & bots",
     "%(count)s people|other": "%(count)s pessoas",
@@ -2316,8 +1953,6 @@
     "Room settings": "Configurações da sala",
     "Almost there! Is your other session showing the same shield?": "Quase lá! A sua outra sessão está mostrando o mesmo escudo?",
     "Take a picture": "Tirar uma foto",
-    "Minimize widget": "Minimizar widget",
-    "Maximize widget": "Maximizar widget",
     "Use the <a>Desktop app</a> to see all encrypted files": "Use o <a>app para Computador</a> para ver todos os arquivos criptografados",
     "Use the <a>Desktop app</a> to search encrypted messages": "Use o <a>app para Computador</a> para buscar mensagens criptografadas",
     "This version of %(brand)s does not support viewing some encrypted files": "Esta versão do %(brand)s não permite visualizar alguns arquivos criptografados",
@@ -2342,7 +1977,6 @@
     "Backup key cached:": "Backup da chave em cache:",
     "Secure Backup": "Backup online",
     "Your keys are being backed up (the first backup could take a few minutes).": "O backup de suas chaves está sendo feito (o primeiro backup pode demorar alguns minutos).",
-    "Secure your backup with a recovery passphrase": "Proteja o seu backup com uma frase de recuperação",
     "You can also set up Secure Backup & manage your keys in Settings.": "Você também pode configurar o Backup online & configurar as suas senhas nas Configurações.",
     "End conference": "Terminar conferência",
     "This will end the conference for everyone. Continue?": "Isso encerrará a chamada para todos. Prosseguir?",
@@ -2354,7 +1988,6 @@
     "Failed to save your profile": "Houve uma falha ao salvar o seu perfil",
     "The operation could not be completed": "A operação não foi concluída",
     "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.": "Faça backup de suas chaves de criptografia com os dados da sua conta, para se prevenir a perder o acesso às suas sessões. Suas chaves serão protegidas com uma chave de recuperação exclusiva.",
     "Secret storage:": "Armazenamento secreto:",
     "ready": "pronto",
     "not ready": "não está pronto",
@@ -2376,8 +2009,6 @@
     "%(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 apareceu ao tentar entrar na sala. Se você recebeu essa mensagem por engano, <issueLink>envie um relatório de erro</issueLink>.",
     "Not encrypted": "Não criptografada",
     "About": "Sobre a sala",
-    "Pin to room": "Fixar na sala",
-    "You can only pin 2 widgets at a time": "Você só pode fixar 2 widgets ao mesmo tempo",
     "Ignored attempt to disable encryption": "A tentativa de desativar a criptografia foi ignorada",
     "Message Actions": "Ações da mensagem",
     "Join the conference at the top of this room": "Entre na chamada em grupo no topo desta sala",
@@ -2389,7 +2020,6 @@
     "Download logs": "Baixar relatórios",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Use esta informação para indicar a sua comunidade para outras pessoas. O ID da comunidade não pode ser alterado.",
     "You can change this later if needed.": "Você poderá alterar esta informação posteriormente, se for necessário.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Salas privadas são encontradas e acessadas apenas por meio de convite. Por sua vez, salas públicas são encontradas e acessadas por qualquer pessoa.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Salas privadas são encontradas e acessadas apenas por meio de convite. Por sua vez, salas públicas são encontradas e acessadas por qualquer integrante desta comunidade.",
     "Your server requires encryption to be enabled in private rooms.": "O seu servidor demanda que a criptografia esteja ativada em salas privadas.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Você pode ativar essa opção se a sala for usada apenas para colaboração dentre equipes internas em seu servidor local. Essa opção não poderá ser alterado mais tarde.",
@@ -2427,14 +2057,9 @@
     "Unable to query for supported registration methods.": "Não foi possível consultar as opções de registro suportadas.",
     "Registration has been disabled on this homeserver.": "O registro de contas foi desativado neste servidor local.",
     "Continue with previous account": "Continuar com a conta anterior",
-    "This requires the latest %(brand)s on your other devices:": "Esta funcionalidade requer o %(brand)s mais recente em seus outros aparelhos:",
     "Emoji Autocomplete": "Preenchimento automático de emoji",
     "Room Autocomplete": "Preenchimento automático de sala",
     "User Autocomplete": "Preenchimento automático de usuário",
-    "Enter a recovery passphrase": "Digite uma frase de recuperação",
-    "Great! This recovery passphrase looks strong enough.": "Ótimo! Essa frase de recuperação é forte o suficiente.",
-    "Please enter your recovery passphrase a second time to confirm.": "Digite a sua frase de recuperação uma segunda vez para confirmar, por favor.",
-    "Repeat your recovery passphrase...": "Digite a sua frase de recuperação novamente...",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Mantenha uma cópia em algum lugar seguro, como em um gerenciador de senhas ou até mesmo em um cofre.",
     "Unable to query secret storage status": "Não foi possível obter o status do armazenamento secreto",
     "Set a Security Phrase": "Defina uma frase de segurança",
@@ -2456,20 +2081,10 @@
     "Move autocomplete selection up/down": "Alternar para cima/baixo a opção do preenchimento automático",
     "Cancel autocomplete": "Cancelar o preenchimento automático",
     "Offline encrypted messaging using dehydrated devices": "Envio de mensagens criptografadas offline, usando dispositivos específicos",
-    "Calling...": "Chamando...",
-    "Call connecting...": "Iniciando chamada...",
-    "Starting camera...": "Iniciando a câmera...",
-    "Starting microphone...": "Iniciando o microfone...",
-    "(their device couldn't start the camera / microphone)": "(o aparelho não conseguiu iniciar a câmera/microfone)",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s alterou a lista de controle de acesso do servidor para esta sala.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s definiu a lista de controle de acesso do servidor para esta sala.",
     "The call could not be established": "Não foi possível iniciar a chamada",
-    "The other party declined the call.": "O contato recusou a chamada.",
-    "%(senderName)s declined the call.": "%(senderName)s recusou a chamada.",
-    "(an error occurred)": "(ocorreu um erro)",
-    "(connection failed)": "(a conexão falhou)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Todos os servidores foram banidos desta sala! Esta sala não pode mais ser utilizada.",
-    "Call Declined": "Chamada recusada",
     "You can only pin up to %(count)s widgets|other": "Você pode fixar até %(count)s widgets",
     "Move right": "Mover para a direita",
     "Move left": "Mover para a esquerda",
@@ -2761,7 +2376,6 @@
     "Topic: %(topic)s (<a>edit</a>)": "Descrição: %(topic)s (<a>editar</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Este é o início do seu histórico da conversa com <displayName/>.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Apenas vocês dois estão nesta conversa, a menos que algum de vocês convide mais alguém.",
-    "Call Paused": "Chamada em pausa",
     "Takes the call in the current room off hold": "Retoma a chamada na sala atual",
     "Places the call in the current room on hold": "Pausa a chamada na sala atual",
     "Yemen": "Iêmen",
@@ -2770,9 +2384,6 @@
     "Vatican City": "Cidade do Vaticano",
     "Vanuatu": "Vanuatu",
     "Uzbekistan": "Uzbequistão",
-    "Role": "Função",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s sala.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas.",
     "Filter": "Pesquisar",
     "Start a new chat": "Iniciar uma nova conversa",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s sala.",
@@ -2856,9 +2467,7 @@
     "No other application is using the webcam": "Nenhum outro aplicativo está usando a câmera",
     "Permission is granted to use the webcam": "Permissão concedida para usar a câmera",
     "A microphone and webcam are plugged in and set up correctly": "Um microfone e uma câmera estão conectados e configurados corretamente",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "A chamada falhou porque não foi possível acessar alguma câmera ou microfone. Verifique se:",
     "Unable to access webcam / microphone": "Não é possível acessar a câmera/microfone",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada falhou porque não foi possível acessar algum microfone. Verifique se o microfone está conectado e configurado corretamente.",
     "Unable to access microphone": "Não é possível acessar o microfone",
     "New? <a>Create account</a>": "Quer se registrar? <a>Crie uma conta</a>",
     "Decide where your account is hosted": "Decida onde a sua conta será hospedada",
@@ -2877,7 +2486,6 @@
     "Learn more": "Saiba mais",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "Use o seu servidor local Matrix preferido, ou hospede o seu próprio servidor.",
     "Other homeserver": "Outro servidor local",
-    "We call the places you where you can host your account ‘homeservers’.": "Chamamos de \"servidores locais\" os locais onde você pode hospedar a sua conta.",
     "Sign into your homeserver": "Faça login em seu servidor local",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org é o maior servidor local público do mundo, então é um bom lugar para muitas pessoas.",
     "Specify a homeserver": "Digite um servidor local",
@@ -2895,7 +2503,6 @@
     "Unable to validate homeserver": "Não foi possível validar o servidor local",
     "sends confetti": "envia confetes",
     "Sends the given message with confetti": "Envia a mensagem com confetes",
-    "Show chat effects": "Mostrar efeitos em conversas",
     "Effects": "Efeitos",
     "Hold": "Pausar",
     "Resume": "Retomar",
@@ -2903,7 +2510,6 @@
     "You held the call <a>Resume</a>": "Você pausou a chamada <a>Retomar</a>",
     "You've reached the maximum number of simultaneous calls.": "Você atingiu o número máximo de chamadas simultâneas.",
     "Too Many Calls": "Muitas chamadas",
-    "%(name)s paused": "%(name)s pausou",
     "You held the call <a>Switch</a>": "Você pausou a chamada <a>Retomar</a>",
     "%(name)s on hold": "%(name)s em espera",
     "sends snowfall": "envia neve caindo",
@@ -2923,7 +2529,6 @@
     "Your Security Key": "Sua Chave de Segurança",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "A sua Chave de Segurança é uma prevenção - você pode usá-la para restaurar o acesso às suas mensagens criptografadas, se esquecer a sua Frase de Segurança.",
     "Repeat your Security Phrase...": "Repita a sua Frase de Segurança...",
-    "Please enter your Security Phrase a second time to confirm.": "Digite a sua Frase de Segurança uma segunda vez para confirmá-la.",
     "Set up with a Security Key": "Configurar uma Chave de Segurança",
     "Great! This Security Phrase looks strong enough.": "Ótimo! Essa frase de segurança parece ser segura o suficiente.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Armazenaremos uma cópia criptografada de suas chaves em nosso servidor. Proteja o seu backup com uma Frase de Segurança.",
@@ -2944,7 +2549,6 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Não foi possível acessar o armazenamento secreto. Verifique se você digitou a Frase de Segurança correta.",
     "Invalid Security Key": "Chave de Segurança inválida",
     "Wrong Security Key": "Chave de Segurança errada",
-    "We recommend you change your password and Security Key in Settings immediately": "Recomendamos que você altere imediatamente a sua senha e Chave de Segurança nas Configurações",
     "Transfer": "Transferir",
     "Failed to transfer call": "Houve uma falha ao transferir a chamada",
     "A call can only be transferred to a single user.": "Uma chamada só pode ser transferida para um único usuário.",
@@ -2952,7 +2556,6 @@
     "Active Widgets": "Widgets ativados",
     "Set my room layout for everyone": "Definir a minha aparência da sala para todos",
     "Open dial pad": "Abrir o teclado de discagem",
-    "Start a Conversation": "Começar uma conversa",
     "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.": "Faça backup de suas chaves de criptografia com os dados da sua conta, para se prevenir a perder o acesso às suas sessões. Suas chaves serão protegidas por uma Chave de Segurança exclusiva.",
     "Channel: <channelLink/>": "Canal: <channelLink/>",
     "Workspace: <networkLink/>": "Espaço de trabalho: <networkLink/>",
@@ -2962,19 +2565,13 @@
     "Change which room, message, or user you're viewing": "Alterar a sala, mensagem ou usuário que você está visualizando",
     "%(senderName)s has updated the widget layout": "%(senderName)s atualizou a aparência do widget",
     "Search (must be enabled)": "Pesquisar (deve estar ativado)",
-    "Upgrade to pro": "Atualizar para a versão pro",
     "Something went wrong in confirming your identity. Cancel and try again.": "Algo deu errado ao confirmar a sua identidade. Cancele e tente novamente.",
     "Remember this": "Lembre-se disso",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "O widget verificará o seu ID de usuário, mas não poderá realizar ações para você:",
     "Allow this widget to verify your identity": "Permitir que este widget verifique a sua identidade",
     "Privacy Policy": "Política de privacidade",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Saiba mais em nossa <privacyPolicyLink />, <termsOfServiceLink /> e <cookiePolicyLink />.",
-    "Windows": "Windows",
-    "Screens": "Telas",
-    "Share your screen": "Compartilhar a sua tela",
     "Recently visited rooms": "Salas visitadas recentemente",
-    "Use Command + F to search": "Use Command + F para pesquisar",
-    "Use Ctrl + F to search": "Use Ctrl + F para pesquisar",
     "Show line numbers in code blocks": "Mostrar o número da linha em blocos de código",
     "Expand code blocks by default": "Expandir blocos de código por padrão",
     "Show stickers button": "Mostrar o botão de figurinhas",
@@ -3024,8 +2621,6 @@
     "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",
@@ -3038,30 +2633,16 @@
     "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.",
-    "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.",
@@ -3069,13 +2650,8 @@
     "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",
@@ -3084,31 +2660,304 @@
     "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"
+    "Original event source": "Fonte do evento original",
+    "Integration manager": "Gerenciador de integrações",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Seu %(brand)s não permite que você use o gerenciador de integrações para fazer isso. Entre em contato com o administrador.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Se você usar esse widget, os dados poderão ser compartilhados <helpIcon /> com %(widgetDomain)s & seu gerenciador de integrações.",
+    "Identity server is": "O servidor de identificação é",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "O gerenciador de integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Use o gerenciador de integrações para gerenciar bots, widgets e pacotes de figurinhas.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use o gerenciador de integrações em <b>(%(serverName)s)</b> para gerenciar bots, widgets e pacotes de figurinhas.",
+    "Identity server": "Servidor de identidade",
+    "Identity server (%(server)s)": "Servidor de identidade (%(server)s)",
+    "Could not connect to identity server": "Não foi possível conectar-se ao servidor de identidade",
+    "Not a valid identity server (status code %(code)s)": "Servidor de identidade inválido (código de status %(code)s)",
+    "Identity server URL must be HTTPS": "O link do servidor de identidade deve começar com HTTPS",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s baniu %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s baniu %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s convidou %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s aceitou o convite",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s aceitou o convite para %(displayName)s",
+    "Sends the given message as a spoiler": "Envia esta mensagem como spoiler",
+    "Some invites couldn't be sent": "Alguns convites não puderam ser enviados",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Nós enviamos aos outros, mas as pessoas abaixo não puderam ser convidadas para <RoomName/>",
+    "Transfer Failed": "A Transferência Falhou",
+    "Already in call": "Já em um chamada",
+    "Unable to transfer call": "Não foi possível transferir chamada",
+    "The user you called is busy.": "O usuário que você chamou está ocupado.",
+    "User Busy": "Usuário Ocupado",
+    "Accept on your other login…": "Aceite no seu outro login…",
+    "This space has no local addresses": "Este espaço não tem endereços locais",
+    "No microphone found": "Nenhum microfone encontrado",
+    "Unable to access your microphone": "Não foi possível acessar seu microfone",
+    "Copy Room Link": "Copiar o Link da Sala",
+    "Invite People": "Convidar Pessoas",
+    "Quick actions": "Ações rápidas",
+    "Screen sharing is here!": "Compartilhamento de tela está aqui!",
+    "View message": "Ver mensagem",
+    "End-to-end encryption isn't enabled": "Criptografia de ponta-a-ponta não está habilitada",
+    "Invite to just this room": "Convidar apenas a esta sala",
+    "%(seconds)ss left": "%(seconds)s restantes",
+    "Failed to send": "Falhou a enviar",
+    "Access": "Acesso",
+    "Decide who can join %(roomName)s.": "Decida quem pode entrar em %(roomName)s.",
+    "Space members": "Membros do espaço",
+    "Spaces with access": "Espaço com acesso",
+    "& %(count)s more|other": "e %(count)s mais",
+    "Upgrade required": "Atualização necessária",
+    "Anyone can find and join.": "Todos podem encontrar e entrar.",
+    "Only invited people can join.": "Apenas pessoas convidadas podem entrar.",
+    "Private (invite only)": "Privado (convite apenas)",
+    "Change server ACLs": "Mudar o ACL do servidor",
+    "You have no ignored users.": "Você não tem usuários ignorados.",
+    "Space information": "Informações do espaço",
+    "Images, GIFs and videos": "Imagens, GIFs e vídeos",
+    "Code blocks": "Blocos de código",
+    "To view all keyboard shortcuts, click here.": "Para ver todos os atalhos de teclado, clique aqui.",
+    "Keyboard shortcuts": "Teclas de atalho do teclado",
+    "Warn before quitting": "Avisar antes de sair",
+    "Access Token": "Símbolo de acesso",
+    "Message bubbles": "Balões de mensagem",
+    "IRC": "IRC",
+    "Mentions & keywords": "Menções e palavras-chave",
+    "Global": "Global",
+    "New keyword": "Nova palavra-chave",
+    "Keyword": "Palavra-chave",
+    "Enable for this account": "Habilitar para esta conta",
+    "Error saving notification preferences": "Erro ao salvar as preferências de notificações",
+    "Messages containing keywords": "Mensagens contendo palavras-chave",
+    "Collapse": "Colapsar",
+    "Expand": "Expandir",
+    "Recommended for public spaces.": "Recomendado para espaços públicos.",
+    "Preview Space": "Previsualizar o Espaço",
+    "Visibility": "Visibilidade",
+    "This may be useful for public spaces.": "Isso pode ser útil para espaços públicos.",
+    "Enable guest access": "Habilitar acesso a convidados",
+    "Invite with email or username": "Convidar com email ou nome de usuário",
+    "Show all rooms": "Mostrar todas as salas",
+    "You can change these anytime.": "Você pode mudá-los a qualquer instante.",
+    "Address": "Endereço",
+    "e.g. my-space": "e.g. meu-espaco",
+    "Give feedback.": "Enviar feedback.",
+    "Spaces feedback": "Feedback dos espaços",
+    "Spaces are a new feature.": "Espaços são uma nova funcionalidade.",
+    "Please enter a name for the space": "Por favor entre o nome do espaço",
+    "Your camera is still enabled": "Sua câmera ainda está habilitada",
+    "Your camera is turned off": "Sua câmera está desligada",
+    "%(sharerName)s is presenting": "%(sharerName)s está apresentando",
+    "You are presenting": "Você está apresentando",
+    "Connecting": "Conectando",
+    "unknown person": "pessoa desconhecida",
+    "sends space invaders": "envia os invasores do espaço",
+    "All rooms you're in will appear in Home.": "Todas as salas que você estiver presente aparecerão no Início.",
+    "Show all rooms in Home": "Mostrar todas as salas no Início",
+    "Use Ctrl + F to search timeline": "Use Ctrl + F para pesquisar a linha de tempo",
+    "Use Command + F to search timeline": "Use Command + F para pesquisar a linha de tempo",
+    "Send pseudonymous analytics data": "Enviar dados analíticos de pseudônimos",
+    "Show options to enable 'Do not disturb' mode": "Mostrar opções para habilitar o modo 'Não perturbe'",
+    "Spaces are a new way to group rooms and people.": "Espaços são uma nova forma para agrupar salas e pessoas.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Ajudar membros do espaço a encontrar e entrar uma sala privada, vá para as configurações de Segurança e Privacidade da sala.",
+    "Help people in spaces to find and join private rooms": "Ajude pessoas dos espaços a encontrarem e entrarem em salas privadas",
+    "Help space members find private rooms": "Ajude os membros do espaço a encontrarem salas privadas",
+    "New in the Spaces beta": "Novo nos Espaços beta",
+    "Check your devices": "Confira seus dispositivos",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s de %(ip)s",
+    "Silence call": "Silenciar chamado",
+    "Sound on": "Som ligado",
+    "Review to ensure your account is safe": "Revise para assegurar que sua conta está segura",
+    "You have unverified logins": "Você tem logins não verificados",
+    "User %(userId)s is already invited to the room": "O usuário %(userId)s já foi convidado para a sala",
+    "See when people join, leave, or are invited to your active room": "Ver quando as pessoas entram, saem, ou são convidadas para sua sala ativa",
+    "Kick, ban, or invite people to your active room, and make you leave": "Expulsar, banir ou convidar pessoas para sua sala ativa, e fazer você sair",
+    "See when people join, leave, or are invited to this room": "Ver quando as pessoas entrarem, sairem ou são convidadas para esta sala",
+    "Kick, ban, or invite people to this room, and make you leave": "Expulsar, banir, ou convidar pessoas para esta sala, e fazer você sair",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s mudou a <a>mensagem fixada</a> da sala.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s expulsou %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s expulsou %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s recusou o convite de %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s recusou o convite de %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s desbaniu %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s saiu da sala",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s saiu da sala: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s rejeitou o convite",
+    "%(targetName)s joined the room": "%(targetName)s entrou na sala",
+    "%(senderName)s made no change": "%(senderName)s não fez mudanças",
+    "%(senderName)s set a profile picture": "%(senderName)s definiu sua foto de perfil",
+    "%(senderName)s changed their profile picture": "%(senderName)s mudou sua foto de perfil",
+    "%(senderName)s removed their profile picture": "%(senderName)s removeu sua foto de perfil",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu seu nome de exibição (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome de exibição para %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s mudou seu nome de exibição para %(displayName)s",
+    "If a community isn't shown you may not have permission to convert it.": "Se uma comunidade não é exibida você pode não ter a permissão para convertê-la.",
+    "Show my Communities": "Mostre minhas Comunidades",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Comunidades foram arquivadas para abrir caminho para os Espaços, mas você pode converter suas comunidades em Espaços logo abaixo. Convertê-las garantirá que suas conversas tenhas as novidades mais recentes.",
+    "Create Space": "Criar um Espaço",
+    "Open Space": "Espaço Aberto",
+    "Your access token gives full access to your account. Do not share it with anyone.": "Seu token de acesso dá acesso total à sua conta. Não o compartilhe com ninguém.",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Se você informou um bug através do GitHub, os relatórios de erros podem nos ajudar a encontrar o problema. Os relatórios de erros contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou apelidos das salas ou comunidades que você visitou e os nomes de usuários de seus contatos. Eles não contêm suas mensagens.",
+    "Olm version:": "Versão do Olm:",
+    "There was an error loading your notification settings.": "Um erro ocorreu ao carregar suas configurações de notificação.",
+    "Enable email notifications for %(email)s": "Habilita notificação por emails para %(email)s",
+    "An error occurred whilst saving your notification preferences.": "Um erro ocorreu enquanto suas preferências de notificação eram salvas.",
+    "Upgrade anyway": "Faça o upgrade mesmo assim",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Esta sala está em alguns espaços que você não é um administrador. Nestes espaços, a sala antiga ainda será exibida, mas as pessoas receberão um prompt para se juntarem a sala nova.",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Qualquer um em um espaço pode encontrar e se juntar. Você pode selecionar múltiplos espaços.",
+    "Message search initialisation failed": "Falha na inicialização da pesquisa de mensagens",
+    "Allow people to preview your space before they join.": "Permite que pessoas vejam seu espaço antes de entrarem.",
+    "Failed to update the visibility of this space": "Falha ao atualizar a visibilidade deste espaço",
+    "Decide who can view and join %(spaceName)s.": "Decide quem pode ver e se juntar a %(spaceName)s.",
+    "Guests can join a space without having an account.": "Convidados podem se juntar a um espaço sem ter uma conta.",
+    "Failed to update the history visibility of this space": "Falha ao atualizar a visibilidade do histórico deste espaço",
+    "Failed to update the guest access of this space": "Falha ao atualizar o acesso de convidados a este espaço",
+    "Add some details to help people recognise it.": "Adicione alguns detalhes para ajudar as pessoas a reconhecê-lo.",
+    "To join a space you'll need an invite.": "Para se juntar a um espaço você precisará de um convite.",
+    "You can also make Spaces from <a>communities</a>.": "Você também pode criar Espaços a partir de <a>comunidades</a>.",
+    "Invite only, best for yourself or teams": "Somente convite, melhor para si mesmo(a) ou para equipes",
+    "You can change this later.": "Você pode mudar isso depois.",
+    "What kind of Space do you want to create?": "Que tipo de espaço você deseja criar?",
+    "Delete avatar": "Remover foto de perfil",
+    "Mute the microphone": "Silenciar o microfone",
+    "Unmute the microphone": "Desmutar o microfone",
+    "Dialpad": "Teclado de discagem",
+    "More": "Mais",
+    "Show sidebar": "Exibir a barra lateral",
+    "Hide sidebar": "Esconder a barra lateral",
+    "Start sharing your screen": "Começar a compartilhar sua tela",
+    "Stop sharing your screen": "Parar de compartilhar sua tela",
+    "Stop the camera": "Desligar a câmera",
+    "Start the camera": "Ativar a câmera",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Temporariamente exibe comunidades ao invés de Espaços nesta sessão. Suporte para isto será removido no futuro próximo. Isto recarregará o Element.",
+    "Display Communities instead of Spaces": "Exibe Comunidades ao invés de Espaços",
+    "Low bandwidth mode (requires compatible homeserver)": "Modo de internet lenta (requer um servidor compatível)",
+    "Autoplay videos": "Reproduzir vídeos automaticamente",
+    "Autoplay GIFs": "Reproduzir GIFs automaticamente",
+    "Don't send read receipts": "Não enviar confirmações de leitura",
+    "New layout switcher (with message bubbles)": "Novo gerenciador de layouts (com mensagens em bolhas)",
+    "Multiple integration managers (requires manual setup)": "Múltiplos gerenciadores de integração (requer configuração manual)",
+    "Threaded messaging": "Mensagens em fios",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Protótipo de reportar para os moderadores. Em salas que tem suporte a moderação, o botão `reportar` lhe permitirá reportar abuso para os moderadores da sala",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Isto facilita com que salas se mantenham privadas em um espaço, enquanto permitem que pessoas que se juntem ao espaço as encontrem e entrem. Todas as salas novas em um espaço terão esta opção disponível.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fixou uma mensagem nesta sala. Veja todas as mensagens fixadas.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fixou <a>uma mensagens</a> nesta sala. Veja todas as <b>mensagens fixadas</b>.",
+    "You may contact me if you have any follow up questions": "Vocês podem me contactar se tiverem quaisquer perguntas subsequentes",
+    "Thank you for your feedback, we really appreciate it.": "Agradecemos pelo seu feedback, realmente apreciamos isso.",
+    "Search for rooms or people": "Procurar por salas ou pessoas",
+    "Forward message": "Encaminhar",
+    "Open link": "Abrir link",
+    "Sent": "Enviado",
+    "Sending": "Enviando",
+    "You don't have permission to do this": "Você não tem permissão para fazer isso",
+    "Adding...": "Adicionando…",
+    "Add a space to a space you manage.": "Adicionar um espaço à um espaço que você gerencia.",
+    "Only people invited will be able to find and join this space.": "Apenas convidados poderão encontrar e entrar neste espaço.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Qualquer um poderá encontrar e entrar neste espaço, não somente membros de <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Todos em <SpaceName/> poderão ver e entrar.",
+    "Public space": "Espaço público",
+    "Private space (invite only)": "Espaço privado (apenas com convite)",
+    "Space visibility": "Visibilidade do Espaço",
+    "This description will be shown to people when they view your space": "Esta descrição será exibida para as pessoas quando elas virem seu espaço",
+    "All rooms will be added and all community members will be invited.": "Todas as salas serão adicionadas e todos os membros da comunidade serão convidados.",
+    "A link to the Space will be put in your community description.": "Um link para o Espaço será colocado na descrição da sua comunidade.",
+    "Create Space from community": "Criar Espaço a partir da comunidade",
+    "Failed to migrate community": "Falha ao migrar a comunidade",
+    "To create a Space from another community, just pick the community in Preferences.": "Para criar um Espaço a partir de outra comunidade, apenas escolha a comunidade nas Preferências.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> foi criado e todos que eram parte da comunidade foram convidados.",
+    "Space created": "Espaço criado",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Para ver os Espaços, esconda as comunidades em <a>Preferências</a>",
+    "Visible to space members": "Visível para membros do espaço",
+    "Public room": "Sala pública",
+    "Private room (invite only)": "Sala privada (apenas com convite)",
+    "Room visibility": "Visibilidade da sala",
+    "Create a room": "Criar uma sala",
+    "Only people invited will be able to find and join this room.": "Apenas convidados poderão encontrar e entrar nesta sala.",
+    "Anyone will be able to find and join this room.": "Qualquer um poderá encontrar e entrar nesta sala.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Qualquer um poderá encontrar e entrar nesta sala, não somente membros de <SpaceName/>.",
+    "You can change this at any time from room settings.": "Você pode mudar isto em qualquer momento nas configurações da sala.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Todos em <SpaceName/> podersão ver e entrar nesta sala.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Os relatórios de erros contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou nomes das salas ou comunidades que você visitou e os nomes de usuários de seus contatos. Eles não contêm suas mensagens.",
+    "To leave the beta, visit your settings.": "Para sair do beta, vá nas suas configurações.",
+    "Search for rooms": "Buscar salas",
+    "Add existing rooms": "Adicionar salas existentes",
+    "Adding rooms... (%(progress)s out of %(count)s)|one": "Adicionando sala…",
+    "Adding rooms... (%(progress)s out of %(count)s)|other": "Adicionando salas… (%(progress)s de %(count)s)",
+    "Create a new space": "Criar um novo espaço",
+    "Add existing space": "Adicionar espaço existente",
+    "You are not allowed to view this server's rooms list": "Você não tem a permissão para ver a lista de salas deste servidor",
+    "Please provide an address": "Por favor, digite um endereço",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s mudou as <a>mensagens fixadas</a> para a sala %(count)s vezes.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)smudaram as <a>mensagens fixadas</a> para a sala %(count)s vezes.",
+    "%(count)s people you know have already joined|one": "%(count)s pessoa que você conhece já entrou",
+    "%(count)s people you know have already joined|other": "%(count)s pessoas que você conhece já entraram",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "Including %(commaSeparatedMembers)s": "Incluindo %(commaSeparatedMembers)s",
+    "View all %(count)s members|one": "Ver 1 membro",
+    "View all %(count)s members|other": "Ver todos os %(count)s membros",
+    "Share content": "Compatilhe conteúdo",
+    "Application window": "Janela da aplicação",
+    "Share entire screen": "Compartilhe a tela inteira",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Falha na inicialização da pesquisa por mensagem, confire <a>suas configurações</a> para mais informações",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reagiram com %(content)s",
+    "Add reaction": "Adicionar reação",
+    "Error processing voice message": "Erro ao processar a mensagem de voz",
+    "Image": "Imagem",
+    "Sticker": "Figurinha",
+    "Error processing audio message": "Erro ao processar a mensagem de áudio",
+    "Some encryption parameters have been changed.": "Alguns parâmetros de criptografia foram modificados.",
+    "Decrypting": "Decriptando",
+    "The call is in an unknown state!": "A chamada está em um estado desconhecido!",
+    "Missed call": "Chamada perdida",
+    "Unknown failure: %(reason)s": "Falha desconhecida: %(reason)s",
+    "An unknown error occurred": "Um erro desconhecido ocorreu",
+    "Their device couldn't start the camera or microphone": "Este dispositivo não conseguiu iniciar a câmera ou microfone",
+    "Connection failed": "Falha na conexão",
+    "Could not connect media": "Não foi possível conectar-se à mídia",
+    "No answer": "Sem resposta",
+    "Call back": "Chamar de volta",
+    "Call declined": "Chamada recusada",
+    "Edit devices": "Editar dispositivos",
+    "Role in <RoomName/>": "Cargo em <RoomName/>",
+    "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.": "Você não poderá desfazer esta mudança, já que está tirando seu próprio cargo, e se você for o último usuário com privilégios neste espaço será impossível ganhá-los novamente.",
+    "Message": "Mensagem",
+    "Pinned messages": "Mensagens fixadas",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Caso você tenha a permissão para isso, abra o menu em qualquer mensagem e selecione <b>Fixar</b> para fixá-la aqui.",
+    "Nothing pinned, yet": "Nada fixado ainda",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Defina endereços para este espaço para que usuários possam encontrá-lo através do seu servidor local (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Para publicar um endereço, ele precisa ser configurado como um endereço local primeiro.",
+    "Published addresses can be used by anyone on any server to join your room.": "Endereços publicados podem ser usados por qualquer um em qualquer servidor para entrar em sua sala.",
+    "Published addresses can be used by anyone on any server to join your space.": "Endereços publicados podem ser usados por qualquer um em qualquer servidor para entrar em seu espaço.",
+    "Stop recording": "Parar a gravação",
+    "We didn't find a microphone on your device. Please check your settings and try again.": "Não foi possível encontrar um microfone em seu dispositivo. Confira suas configurações e tente novamente.",
+    "We were unable to access your microphone. Please check your browser settings and try again.": "Não foi possível acessar seu microfone. Por favor, confira as configurações do seu navegador e tente novamente.",
+    "Joining space …": "Entrando no espaço …",
+    "%(count)s results in all spaces|one": "%(count)s resultado em todos os espaços",
+    "%(count)s results in all spaces|other": "%(count)s resultados em todos os espaços",
+    "Explore %(spaceName)s": "Explore %(spaceName)s",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Você agora pode compartilhar sua tela pressionando o botão \"compartilhar a tela\" durante uma chamada. Você pode fazer isso até mesmo em chamadas de áudio se ambos os lados tiverem suporte para isto!",
+    "Message didn't send. Click for info.": "A mensagem não foi enviada. Clique para mais informações.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Suas mensagens privadas normalmente são criptografadas, mas esta sala não é. Isto acontece normalmente por conta de um dispositivo ou método usado sem suporte, como convites via email, por exemplo.",
+    "Send voice message": "Enviar uma mensagem de voz",
+    "Send a sticker": "Enviar uma figurinha",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Para evitar esses problemas, crie uma <a>nova sala pública</a> para a conversa que você planeja ter.",
+    "Are you sure you want to make this encrypted room public?": "Tem certeza que fazer com que esta sala criptografada seja pública?",
+    "Unknown failure": "Falha desconhecida",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Para evitar esses problemas, crie uma <a>nova sala criptografada</a> para a conversa que você planeja ter.",
+    "Are you sure you want to add encryption to this public room?": "Tem certeza que deseja adicionar criptografia para esta sala pública?",
+    "Select the roles required to change various parts of the space": "Selecionar os cargos necessários para alterar certas partes do espaço",
+    "Change main address for the space": "Mudar o endereço principal para o espaço"
 }
diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json
index 062a89f2e3..32d10b82ae 100644
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@@ -17,17 +17,9 @@
     "The information being sent to us to help make %(brand)s better includes:": "Informațiile care ne sunt trimise pentru a ne ajuta să facem mai bine %(brand)s includ:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "În cazul în care această pagină include informații care pot fi identificate, cum ar fi o cameră, un utilizator sau un ID de grup, aceste date sunt eliminate înainte de a fi trimise la server.",
     "Call Failed": "Apel eșuat",
-    "Call Timeout": "Durata apelurilor",
-    "The remote side failed to pick up": "Partea de la distanță nu a reușit să se ridice",
-    "Unable to capture screen": "Imposibil de captat ecran",
-    "Existing Call": "Existența apelului",
-    "You are already in a call.": "Sunteți deja într-un apel.",
     "VoIP is unsupported": "VoIP nu este acceptat",
     "You cannot place VoIP calls in this browser.": "Nu puteți efectua apeluri VoIP în acest browser.",
     "You cannot place a call with yourself.": "Nu poți apela cu tine însuți.",
-    "Call in Progress": "Apel în curs",
-    "A call is currently being placed!": "Un apel este în curs de plasare!",
-    "A call is already in progress!": "Un apel este deja în curs!",
     "Permission Required": "Permisul Obligatoriu",
     "You do not have permission to start a conference call in this room": "Nu aveți permisiunea de a începe un apel de conferință în această cameră",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Fișierul %(fileName)s întrece limita admisă",
@@ -74,5 +66,41 @@
     "Explore rooms": "Explorează camerele",
     "Sign In": "Autentificare",
     "Create Account": "Înregistare",
-    "Dismiss": "Închide"
+    "Dismiss": "Închide",
+    "You've reached the maximum number of simultaneous calls.": "Ați atins numărul maxim de apeluri simultane.",
+    "Too Many Calls": "Prea multe apeluri",
+    "No other application is using the webcam": "Nicio altă aplicație nu folosește camera web",
+    "Permission is granted to use the webcam": "Permisiunea de a utiliza camera web este acordată",
+    "A microphone and webcam are plugged in and set up correctly": "Microfonul și camera web sunt conectate și configurate corect",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Apelul nu a reușit deoarece camera web sau microfonul nu au putut fi accesate. Verifică:",
+    "Unable to access webcam / microphone": "Imposibil de accesat camera web / microfonul",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Apelul nu a reușit deoarece microfonul nu a putut fi accesat. Verificați dacă un microfon este conectat și configurați corect.",
+    "Unable to access microphone": "Nu se poate accesa microfonul",
+    "OK": "OK",
+    "Try using turn.matrix.org": "Încercați să utilizați turn.matrix.org",
+    "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, puteți încerca să utilizați serverul public la <code>turn.matrix.org</code>, dar acest lucru nu va fi la fel de fiabil și va partaja adresa dvs. IP cu acel server. Puteți gestiona acest lucru și în Setări.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vă rugăm să cereți administratorului serverului dvs. (<code>%(homeserverDomain)s</code>) să configureze un server TURN pentru ca apelurile să funcționeze în mod fiabil.",
+    "Call failed due to misconfigured server": "Apelul nu a reușit din cauza serverului configurat greșit",
+    "The call was answered on another device.": "Apelul a primit răspuns pe un alt dispozitiv.",
+    "Answered Elsewhere": "A răspuns în altă parte",
+    "The call could not be established": "Apelul nu a putut fi stabilit",
+    "The user you called is busy.": "Utilizatorul pe care l-ați sunat este ocupat.",
+    "User Busy": "Utilizator ocupat",
+    "Unable to load! Check your network connectivity and try again.": "Imposibil de incarcat! Verificați conectivitatea rețelei și încercați din nou.",
+    "Error": "Eroare",
+    "Your user agent": "Agentul dvs. de utilizator",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Dacă utilizați %(brand)s ca aplicație web progresivă instalată",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Dacă utilizați sau nu funcția „breadcrumbs” (avatare deasupra listei de camere)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Dacă utilizați %(brand)s pe un dispozitiv în care atingerea este principalul mecanism de intrare",
+    "Add Phone Number": "Adaugă numărul de telefon",
+    "Click the button below to confirm adding this phone number.": "Faceți clic pe butonul de mai jos pentru a confirma adăugarea acestui număr de telefon.",
+    "Confirm adding phone number": "Confirmați adăugarea numărului de telefon",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirmați adăugarea acestui număr de telefon utilizând Single Sign On pentru a vă dovedi identitatea.",
+    "Add Email Address": "Adăugați o adresă de e-mail",
+    "Confirm": "Confirmă",
+    "Click the button below to confirm adding this email address.": "Faceți clic pe butonul de mai jos pentru a confirma adăugarea acestei adrese de e-mail.",
+    "Confirm adding email": "Confirmați adăugarea e-mailului",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirmați adăugarea acestei adrese de e-mail utilizând Single Sign On pentru a vă dovedi identitatea.",
+    "Use Single Sign On to continue": "Utilizați Single Sign On pentru a continua"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index da42347b49..40d6935a82 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3,13 +3,10 @@
     "Admin": "Администратор",
     "Advanced": "Подробности",
     "A new password must be entered.": "Введите новый пароль.",
-    "Anyone who knows the room's link, apart from guests": "Все, у кого есть ссылка на эту комнату, кроме гостей",
-    "Anyone who knows the room's link, including guests": "Все, у кого есть ссылка на эту комнату, включая гостей",
     "Are you sure you want to reject the invitation?": "Вы уверены что хотите отклонить приглашение?",
     "Banned users": "Заблокированные пользователи",
     "Bans user with given id": "Блокирует пользователя с заданным ID",
     "Changes your display nickname": "Изменяет ваш псевдоним",
-    "Click here to fix": "Нажмите здесь, чтобы исправить это",
     "Commands": "Команды",
     "Continue": "Продолжить",
     "Create Room": "Создать комнату",
@@ -22,7 +19,6 @@
     "Error": "Ошибка",
     "Export E2E room keys": "Экспорт ключей шифрования",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
-    "Failed to leave room": "Не удалось покинуть комнату",
     "Failed to reject invitation": "Не удалось отклонить приглашение",
     "Failed to send email": "Ошибка отправки email",
     "Failed to unban": "Не удалось разблокировать",
@@ -34,7 +30,6 @@
     "Hangup": "Повесить трубку",
     "Historical": "Архив",
     "Homeserver is": "Домашний сервер",
-    "Identity Server is": "Сервер идентификации",
     "I have verified my email address": "Я подтвердил свой email",
     "Import E2E room keys": "Импорт ключей шифрования",
     "Invalid Email Address": "Недопустимый email",
@@ -46,7 +41,6 @@
     "Leave room": "Покинуть комнату",
     "Logout": "Выйти",
     "Low priority": "Маловажные",
-    "Manage Integrations": "Управление интеграциями",
     "Moderator": "Модератор",
     "Name": "Имя",
     "New passwords must match each other.": "Новые пароли должны совпадать.",
@@ -71,35 +65,16 @@
     "Verification Pending": "В ожидании подтверждения",
     "Video call": "Видеовызов",
     "Voice call": "Голосовой вызов",
-    "VoIP conference finished.": "Конференц-звонок окончен.",
-    "VoIP conference started.": "Конференц-звонок начался.",
     "Warning!": "Внимание!",
-    "Who can access this room?": "Кто может войти в эту комнату?",
     "Who can read history?": "Кто может читать историю?",
     "You do not have permission to post to this room": "Вы не можете писать в эту комнату",
-    "You have no visible notifications": "Нет видимых уведомлений",
-    "%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
-    "Active call": "Активный вызов",
-    "%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s забанил(а) %(targetName)s.",
-    "Call Timeout": "Нет ответа",
-    "%(senderName)s changed their profile picture.": "%(senderName)s изменил(а) свой аватар.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s изменил(а) уровни прав %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s изменил(а) название комнаты на %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
-    "/ddg is not a command": "/ddg — это не команда",
-    "%(senderName)s ended the call.": "%(senderName)s завершил(а) звонок.",
-    "Existing Call": "Текущий вызов",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email: убедитесь, что вы перешли по ссылке в письме",
     "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.",
-    "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s исключил(а) %(targetName)s.",
-    "%(targetName)s left the room.": "%(targetName)s покинул(а) комнату.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников.",
@@ -107,21 +82,14 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).",
     "Missing room_id in request": "Отсутствует room_id в запросе",
     "Missing user_id in request": "Отсутствует user_id в запросе",
-    "(not supported by this browser)": "(не поддерживается этим браузером)",
     "Connectivity to the server has been lost.": "Связь с сервером потеряна.",
     "Sent messages will be stored until your connection has returned.": "Отправленные сообщения будут сохранены, пока соединение не восстановится.",
-    "There are no visible files in this room": "В этой комнате нет видимых файлов",
-    "Set a display name:": "Введите отображаемое имя:",
     "This server does not support authentication with a phone number.": "Этот сервер не поддерживает аутентификацию по номеру телефона.",
-    "An error occurred: %(error_string)s": "Произошла ошибка: %(error_string)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Upload an avatar:": "Загрузите аватар:",
     "You need to be logged in.": "Вы должны войти в систему.",
     "You need to be able to invite users to do that.": "Для этого вы должны иметь возможность приглашать пользователей.",
     "You cannot place VoIP calls in this browser.": "Звонки не поддерживаются в этом браузере.",
-    "You are already in a call.": "Идет разговор.",
     "You cannot place a call with yourself.": "Вы не можете позвонить самому себе.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s отозвал(а) свое приглашение %(targetName)s.",
     "Sep": "Сен",
     "Jan": "Янв",
     "Feb": "Фев",
@@ -143,9 +111,6 @@
     "Fri": "Пт",
     "Sat": "Сб",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш email не связан ни с одним пользователем на этом сервере.",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Чтобы воспользоваться этой функцией, дождитесь загрузки результатов в окне автодополнения, а затем используйте Tab для прокрутки.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s разблокировал(а) %(targetName)s.",
-    "Unable to capture screen": "Не удается сделать снимок экрана",
     "Unable to enable Notifications": "Не удалось включить уведомления",
     "Upload Failed": "Сбой отправки файла",
     "Usage": "Использование",
@@ -153,11 +118,6 @@
     "and %(count)s others...|other": "и %(count)s других...",
     "and %(count)s others...|one": "и еще один...",
     "Are you sure?": "Вы уверены?",
-    "Autoplay GIFs and videos": "Автоматически воспроизводить GIF-анимации и видео",
-    "Click to mute audio": "Щелкните, чтобы выключить звук",
-    "Click to mute video": "Щелкните, чтобы выключить видео",
-    "Click to unmute video": "Щелкните, чтобы включить видео",
-    "Click to unmute audio": "Щелкните, чтобы включить звук",
     "Decrypt %(text)s": "Расшифровать %(text)s",
     "Disinvite": "Отозвать приглашение",
     "Download %(text)s": "Скачать %(text)s",
@@ -165,10 +125,8 @@
     "Failed to change power level": "Не удалось изменить уровень прав",
     "Failed to forget room %(errCode)s": "Не удалось забыть комнату: %(errCode)s",
     "Failed to join room": "Не удалось войти в комнату",
-    "Access Token:": "Токен доступа:",
     "Always show message timestamps": "Всегда показывать время отправки сообщений",
     "Authentication": "Аутентификация",
-    "olm version:": "Версия olm:",
     "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
     "An error has occurred.": "Произошла ошибка.",
     "Attachment": "Вложение",
@@ -183,7 +141,6 @@
     "Failed to mute user": "Не удалось заглушить пользователя",
     "Failed to reject invite": "Не удалось отклонить приглашение",
     "Failed to set display name": "Не удалось задать отображаемое имя",
-    "Fill screen": "Заполнить экран",
     "Incorrect verification code": "Неверный код подтверждения",
     "Join Room": "Войти в комнату",
     "Kick": "Выгнать",
@@ -198,16 +155,11 @@
     "Power level must be positive integer.": "Уровень прав должен быть положительным целым числом.",
     "Profile": "Профиль",
     "Reason": "Причина",
-    "%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
     "Reject invitation": "Отклонить приглашение",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил своё отображаемое имя (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s удалил свой аватар.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s запросил конференц-звонок.",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "У %(brand)s нет разрешения на отправку уведомлений — проверьте настройки браузера",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
     "%(brand)s version:": "версия %(brand)s:",
     "Room %(roomId)s not visible": "Комната %(roomId)s невидима",
-    "Room Colour": "Цвет комнаты",
     "Rooms": "Комнаты",
     "Search": "Поиск",
     "Search failed": "Поиск не удался",
@@ -215,14 +167,12 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s пригласил(а) %(targetDisplayName)s в комнату.",
     "Sign in": "Войти",
     "Sign out": "Выйти",
-    "%(count)s of your messages have not been sent.|other": "Некоторые сообщения не были отправлены.",
     "Someone": "Кто-то",
     "Submit": "Отправить",
     "Success": "Успех",
     "This email address is already in use": "Этот email уже используется",
     "This email address was not found": "Этот адрес электронной почты не найден",
     "The email address linked to your account must be entered.": "Введите адрес электронной почты, связанный с вашей учётной записью.",
-    "The remote side failed to pick up": "Собеседник не ответил на ваш звонок",
     "This room has no local addresses": "У этой комнаты нет адресов на вашем сервере",
     "This room is not recognised.": "Эта комната не опознана.",
     "This doesn't appear to be a valid email address": "Похоже, это недействительный адрес email",
@@ -233,11 +183,9 @@
     "Cancel": "Отмена",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не удается подключиться к домашнему серверу через HTTP, так как в адресной строке браузера указан адрес HTTPS. Используйте HTTPS или <a>включите небезопасные скрипты</a>.",
     "Dismiss": "Закрыть",
-    "Custom Server Options": "Параметры другого сервера",
     "Mute": "Приглушить",
     "Operation failed": "Сбой операции",
     "powered by Matrix": "основано на Matrix",
-    "Add a topic": "Задать тему",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Отображать время в 12-часовом формате (напр. 2:30 ПП)",
     "No Microphones detected": "Микрофоны не обнаружены",
     "Camera": "Камера",
@@ -247,7 +195,6 @@
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s собирает анонимные данные, позволяющие нам улучшить приложение.",
     "Default Device": "Устройство по умолчанию",
     "No Webcams detected": "Веб-камера не обнаружена",
-    "Guests cannot join this room even if explicitly invited.": "Посторонние не смогут войти в эту комнату, даже если они будут приглашены.",
     "No media permissions": "Нет разрешённых носителей",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Вам необходимо предоставить %(brand)s доступ к микрофону или веб-камере вручную",
     "Anyone": "Все",
@@ -264,16 +211,12 @@
     "Jump to first unread message.": "Перейти к первому непрочитанному сообщению.",
     "Privileged Users": "Привилегированные пользователи",
     "Register": "Зарегистрироваться",
-    "Results from DuckDuckGo": "Результаты от DuckDuckGo",
     "Save": "Сохранить",
-    "Searches DuckDuckGo for results": "Поиск с помощью DuckDuckGo",
     "Server error": "Ошибка сервера",
     "Server may be unavailable, overloaded, or search timed out :(": "Сервер может быть недоступен, перегружен или поиск прекращен по тайм-ауту :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
     "Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
     "Session ID": "ID сессии",
-    "%(senderName)s set a profile picture.": "%(senderName)s установил себе аватар.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
     "This room is not accessible by remote Matrix servers": "Это комната недоступна из других серверов Matrix",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
@@ -284,7 +227,6 @@
     "You have <a>enabled</a> URL previews by default.": "Предпросмотр ссылок по умолчанию <a>включен</a> для вас.",
     "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Вы не сможете отменить это действие, так как этот пользователь получит уровень прав, равный вашему.",
-    "Please select the destination room for this message": "Выберите, куда отправить это сообщение",
     "Options": "Настройки",
     "Passphrases must match": "Пароли должны совпадать",
     "Passphrase must not be empty": "Пароль не должен быть пустым",
@@ -300,7 +242,6 @@
     "You must join the room to see its files": "Вы должны войти в комнату, чтобы просмотреть файлы",
     "Reject all %(invitedRooms)s invites": "Отклонить все %(invitedRooms)s приглашения",
     "Failed to invite": "Пригласить не удалось",
-    "Failed to invite the following users to the %(roomName)s room:": "Не удалось пригласить этих пользователей в %(roomName)s:",
     "Confirm Removal": "Подтвердите удаление",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Вы действительно хотите удалить это событие? Обратите внимание, что если это смена названия комнаты или темы, то удаление отменит это изменение.",
     "Unknown error": "Неизвестная ошибка",
@@ -308,21 +249,14 @@
     "Unable to restore session": "Восстановление сессии не удалось",
     "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.": "Если вы использовали более новую версию %(brand)s, то ваша сессия может быть несовместима с этой версией. Закройте это окно и вернитесь к более новой версии.",
     "Unknown Address": "Неизвестный адрес",
-    "ex. @bob:example.com": "например @bob:example.com",
-    "Add User": "Добавить пользователя",
-    "Please check your email to continue registration.": "Чтобы продолжить регистрацию, проверьте электронную почту.",
     "Token incorrect": "Неверный код проверки",
     "Please enter the code it contains:": "Введите полученный код:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Вы уверены?",
-    "Error decrypting audio": "Ошибка расшифровки аудиозаписи",
     "Error decrypting image": "Ошибка расшифровки изображения",
     "Error decrypting video": "Ошибка расшифровки видео",
     "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?": "Вы будете перенаправлены на внешний сайт, чтобы войти в свою учётную запись для использования с %(integrationsUrl)s. Продолжить?",
     "URL Previews": "Предпросмотр содержимого ссылок",
     "Drop file here to upload": "Перетащите файл сюда для отправки",
-    " (unsupported)": " (не поддерживается)",
-    "Ongoing conference call%(supportedText)s.": "Идет конференц-звонок%(supportedText)s.",
     "Online": "Онлайн",
     "Idle": "Неактивен",
     "Offline": "Не в сети",
@@ -330,55 +264,33 @@
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s удалил(а) аватар комнаты.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s сменил(а) аватар %(roomName)s",
     "Create new room": "Создать комнату",
-    "Room directory": "Каталог комнат",
     "Start chat": "Начать чат",
     "Add": "Добавить",
-    "Error: Problem communicating with the given homeserver.": "Ошибка: проблема связи с данным сервером.",
-    "Failed to fetch avatar URL": "Не удалось извлечь URL-адрес аватара",
-    "The phone number entered looks invalid": "Введенный номер телефона недействителен",
     "Uploading %(filename)s and %(count)s others|zero": "Отправка %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Отправка %(filename)s и %(count)s другой",
     "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других",
-    "Username invalid: %(errMessage)s": "Неверное имя пользователя: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a>, чтобы использовать эту функцию",
     "New Password": "Новый пароль",
-    "Username available": "Имя пользователя доступно",
-    "Username not available": "Имя пользователя недоступно",
     "Something went wrong!": "Что-то пошло не так!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Это будет имя вашей учётной записи на  <span></span> домашнем сервере, либо вы можете выбрать <a>другой сервер</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Если у вас уже есть учётная запись Matrix, вы можете <a>войти</a>.",
     "Home": "Home",
     "Accept": "Принять",
-    "Active call (%(roomName)s)": "Текущий вызов (%(roomName)s)",
     "Admin Tools": "Инструменты администратора",
     "Close": "Закрыть",
-    "Drop File Here": "Перетащите файл сюда",
     "Failed to upload profile picture!": "Не удалось загрузить аватар!",
-    "Incoming call from %(name)s": "Входящий вызов от %(name)s",
-    "Incoming video call from %(name)s": "Входящий видеовызов от %(name)s",
-    "Incoming voice call from %(name)s": "Входящий голосовой вызов от %(name)s",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Присоединиться <voiceText>с голосом</voiceText> или <videoText>с видео</videoText>.",
     "Last seen": "Последний вход",
     "No display name": "Нет отображаемого имени",
-    "Private Chat": "Приватный чат",
-    "Public Chat": "Публичный чат",
     "Start authentication": "Начать аутентификацию",
     "This room": "Эта комната",
     "(~%(count)s results)|other": "(~%(count)s результатов)",
-    "Custom": "Пользовательские",
     "Decline": "Отклонить",
     "%(roomName)s does not exist.": "%(roomName)s не существует.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s на данный момент недоступна.",
     "Seen by %(userName)s at %(dateTime)s": "Прочитано %(userName)s в %(dateTime)s",
-    "unknown caller": "неизвестный абонент",
     "Unnamed Room": "Комната без названия",
     "Upload new:": "Загрузить новый:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (уровень прав %(powerLevelNumber)s)",
     "(~%(count)s results)|one": "(~%(count)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.": "Не удается подключиться к домашнему серверу - проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
-    "(could not connect media)": "(сбой подключения)",
-    "(no answer)": "(нет ответа)",
-    "(unknown failure: %(reason)s)": "(неизвестная ошибка: %(reason)s)",
     "Not a valid %(brand)s keyfile": "Недействительный файл ключей %(brand)s",
     "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает необходимые криптографические расширения",
     "Authentication check failed: incorrect password?": "Ошибка аутентификации: возможно, неправильный пароль?",
@@ -386,17 +298,12 @@
     "This will allow you to reset your password and receive notifications.": "Это позволит при необходимости сбросить пароль и получать уведомления.",
     "Skip": "Пропустить",
     "Check for update": "Проверить наличие обновлений",
-    "Add a widget": "Добавить виджет",
-    "Allow": "Принять",
-    "Cannot add any more widgets": "Невозможно добавить больше виджетов",
     "Delete widget": "Удалить виджет",
     "Define the power level of a user": "Определить уровень прав пользователя",
     "Edit": "Изменить",
     "Enable automatic language detection for syntax highlighting": "Автоматически определять язык подсветки синтаксиса",
     "AM": "ДП",
     "PM": "ПП",
-    "The maximum permitted number of widgets have already been added to this room.": "Максимально допустимое количество виджетов уже добавлено в эту комнату.",
-    "To get started, please pick a username!": "Чтобы начать, выберите имя пользователя!",
     "Unable to create widget.": "Не удалось создать виджет.",
     "You are not in this room.": "Вас сейчас нет в этой комнате.",
     "You do not have permission to do that in this room.": "У вас нет разрешения на это в данной комнате.",
@@ -438,7 +345,6 @@
     "Add to summary": "Добавить в сводку",
     "Failed to add the following users to the summary of %(groupId)s:": "Не удалось добавить следующих пользователей в сводку %(groupId)s:",
     "Which rooms would you like to add to this summary?": "Какие комнаты вы хотите добавить в эту сводку?",
-    "Pinned Messages": "Закреплённые сообщения",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закреплённые в этой комнате сообщения.",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Не удалось добавить следующие комнаты в сводку %(groupId)s:",
     "Failed to remove the room from the summary of %(groupId)s": "Не удалось удалить комнату из сводки %(groupId)s",
@@ -452,9 +358,6 @@
     "email address": "email",
     "Try using one of the following valid address types: %(validTypesList)s.": "Попробуйте использовать один из следующих допустимых типов адресов: %(validTypesList)s.",
     "You have entered an invalid address.": "Введен неправильный адрес.",
-    "Unpin Message": "Открепить сообщение",
-    "Jump to message": "Перейти к сообщению",
-    "No pinned messages.": "Нет прикреплённых сообщений.",
     "Loading...": "Загрузка...",
     "Unnamed room": "Комната без названия",
     "World readable": "Открыта для чтения",
@@ -508,9 +411,6 @@
     "Mention": "Упомянуть",
     "Failed to withdraw invitation": "Не удалось отозвать приглашение",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID сообществ могут содержать только символы a-z, 0-9, или '=_-./'",
-    "%(senderName)s sent an image": "%(senderName)s отправил(а) изображение",
-    "%(senderName)s sent a video": "%(senderName)s отправил(а) видео",
-    "%(senderName)s uploaded a file": "%(senderName)s отправил(а) файл",
     "Disinvite this user?": "Отозвать приглашение этого пользователя?",
     "Kick this user?": "Выгнать этого пользователя?",
     "Unban this user?": "Разблокировать этого пользователя?",
@@ -518,7 +418,6 @@
     "Members only (since the point in time of selecting this option)": "Только участники (с момента выбора этого параметра)",
     "Members only (since they were invited)": "Только участники (с момента их приглашения)",
     "Members only (since they joined)": "Только участники (с момента их входа)",
-    "An email has been sent to %(emailAddress)s": "Письмо было отправлено на %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Текстовое сообщение отправлено на %(msisdn)s",
     "Disinvite this user from community?": "Отозвать приглашение в сообщество этого участника?",
     "Remove this user from community?": "Исключить этого участника из сообщества?",
@@ -567,7 +466,6 @@
     "%(items)s and %(count)s others|one": "%(items)s и еще кто-то",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Сообщение отправлено на %(emailAddress)s. После перехода по ссылке в отправленном вам письме, щелкните ниже.",
     "Room Notification": "Уведомления комнаты",
-    "Community Invites": "Приглашения в сообщества",
     "Notify the whole room": "Уведомить всю комнату",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Эти комнаты отображаются для участников сообщества на странице сообщества. Участники сообщества могут присоединиться к комнатам, щелкнув на них.",
     "Show these rooms to non-members on the community page and room list?": "Следует ли показывать эти комнаты посторонним на странице сообщества и в списке комнат?",
@@ -590,7 +488,6 @@
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sотклонил(а) приглашение %(count)s раз",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sотозвал(а) приглашение",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org.",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML для страницы вашего сообщества</h1>\n<p>\n    Используйте подробное описание для представления вашего сообщества новым участникам, или\n    поделитесь чем-нибудь важным, например <a href=\"foo\">ссылками</a>\n</p>\n<p>\n    Также вы можете использовать теги 'img'\n</p>\n",
     "%(duration)ss": "%(duration)s сек",
     "%(duration)sm": "%(duration)s мин",
     "%(duration)sh": "%(duration)s ч",
@@ -600,7 +497,6 @@
     "Offline for %(duration)s": "Не в сети %(duration)s",
     "Idle for %(duration)s": "Неактивен %(duration)s",
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?",
     "Something went wrong when trying to get your communities.": "Что-то пошло не так при попытке получить список ваших сообществ.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Этот домашний сервер не предлагает ни один метод входа, поддерживаемый клиентом.",
     "Call Failed": "Звонок не удался",
@@ -615,13 +511,9 @@
     "Flair": "Значки сообществ",
     "Display your community flair in rooms configured to show it.": "Вы можете показывать значки своих сообществ в комнатах, в которых это разрешено.",
     "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.": "После понижения своих привилегий вы не сможете это отменить. Если вы являетесь последним привилегированным пользователем в этой комнате, выдать права кому-либо заново будет невозможно.",
-    "%(count)s of your messages have not been sent.|one": "Ваше сообщение не было отправлено.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Отправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для отправки или отмены.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Отправить</resendText> или <cancelText>отменить</cancelText> сообщение сейчас.",
     "Send an encrypted reply…": "Отправить зашифрованный ответ…",
     "Send an encrypted message…": "Отправить зашифрованное сообщение…",
     "Replying": "Отвечает",
-    "Minimize apps": "Свернуть приложения",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Конфиденциальность важна для нас, поэтому мы не собираем никаких личных или идентифицирующих данных для нашей аналитики.",
     "Learn more about how we use analytics.": "Подробнее о том, как мы используем аналитику.",
     "The information being sent to us to help make %(brand)s better includes:": "Информация, которая отправляется нам для улучшения %(brand)s, включает в себя:",
@@ -636,16 +528,13 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег диалога",
     "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
     "Clear filter": "Очистить фильтр",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Чтобы настроить фильтр, перетащите аватар сообщества на панель фильтров в левой части экрана. Вы можете нажать на аватар в панели фильтров в любое время, чтобы увидеть только комнаты и людей, связанных с этим сообществом.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в %(brand)s!",
     "Key request sent.": "Запрос ключа отправлен.",
     "Code": "Код",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Если вы отправили ошибку через GitHub, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
     "Submit debug logs": "Отправить отладочные журналы",
     "Opens the Developer Tools dialog": "Открывает инструменты разработчика",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Прочитано %(displayName)s (%(userName)s) в %(dateTime)s",
@@ -660,42 +549,25 @@
     "Hide Stickers": "Скрыть стикеры",
     "Show Stickers": "Показать стикеры",
     "Fetching third party location failed": "Не удалось извлечь местоположение третьей стороны",
-    "I understand the risks and wish to continue": "Я понимаю риски и желаю продолжить",
     "Send Account Data": "Отправка данных учётной записи",
-    "All notifications are currently disabled for all targets.": "Все оповещения для всех устройств отключены.",
-    "Uploading report": "Отправка отчета",
     "Sunday": "Воскресенье",
     "Notification targets": "Устройства для уведомлений",
     "Today": "Сегодня",
-    "Files": "Файлы",
-    "You are not receiving desktop notifications": "Вы не получаете системные уведомления",
     "Friday": "Пятница",
     "Update": "Обновить",
     "What's New": "Что изменилось",
     "On": "Включить",
     "Changelog": "История изменений",
     "Waiting for response from server": "Ожидание ответа от сервера",
-    "Uploaded on %(date)s by %(user)s": "Загружено %(user)s в %(date)s",
     "Send Custom Event": "Отправить произвольное событие",
-    "Advanced notification settings": "Дополнительные параметры уведомлений",
     "Failed to send logs: ": "Не удалось отправить журналы: ",
-    "Forget": "Забыть",
-    "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
-    "Cancel Sending": "Отменить отправку",
     "This Room": "В этой комнате",
     "Noisy": "Вкл. (со звуком)",
     "Room not found": "Комната не найдена",
     "Messages containing my display name": "Сообщения с моим именем",
     "Messages in one-to-one chats": "Сообщения в 1:1 чатах",
     "Unavailable": "Недоступен",
-    "Error saving email notification preferences": "Ошибка сохранения настроек email-уведомлений",
-    "View Decrypted Source": "Расшифрованный исходный код",
-    "Failed to update keywords": "Не удалось обновить ключевые слова",
     "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по этим ключевым словам соответствуют правилам, которые нельзя отобразить здесь:",
-    "Please set a password!": "Пожалуйста, установите пароль!",
-    "You have successfully set a password!": "Вы успешно установили пароль!",
-    "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек email-уведомлений.",
     "Explore Room State": "Просмотр состояния комнаты",
     "Source URL": "Исходная ссылка",
     "Messages sent by bot": "Сообщения от ботов",
@@ -704,34 +576,22 @@
     "No update available.": "Нет доступных обновлений.",
     "Resend": "Переотправить",
     "Collecting app version information": "Сбор информации о версии приложения",
-    "Keywords": "Ключевые слова",
-    "Enable notifications for this account": "Включить уведомления для этой учётной записи",
     "Invite to this community": "Пригласить в это сообщество",
-    "Messages containing <span>keywords</span>": "Сообщения, содержащие определённые <span>ключевые слова</span>",
     "View Source": "Исходный код",
     "Tuesday": "Вторник",
-    "Enter keywords separated by a comma:": "Введите ключевые слова, разделённые запятой:",
     "Search…": "Поиск…",
-    "You have successfully set a password and an email address!": "Вы успешно установили пароль и email!",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s использует многие передовые возможности браузера, некоторые из которых недоступны или являются экспериментальным в вашем текущем браузере.",
     "Developer Tools": "Инструменты разработчика",
     "Preparing to send logs": "Подготовка к отправке журналов",
     "Explore Account Data": "Просмотр данных учётной записи",
-    "All messages (noisy)": "Все сообщения (со звуком)",
     "Saturday": "Суббота",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Помните, что вы всегда сможете задать email в настройках пользователя, если передумаете.",
-    "Direct Chat": "Прямой чат",
     "The server may be unavailable or overloaded": "Сервер, вероятно, недоступен или перегружен",
     "Reject": "Отклонить",
-    "Failed to set Direct Message status of room": "Не удалось установить статус прямого сообщения в комнате",
     "Monday": "Понедельник",
     "Remove from Directory": "Удалить из каталога",
-    "Enable them now": "Включить их сейчас",
     "Toolbox": "Панель инструментов",
     "Collecting logs": "Сбор журналов",
     "You must specify an event type!": "Необходимо указать тип события!",
-    "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
     "Invite to this room": "Пригласить в комнату",
     "Send logs": "Отправить журналы",
     "All messages": "Все сообщения",
@@ -740,46 +600,30 @@
     "State Key": "Ключ состояния",
     "Failed to send custom event.": "Не удалось отправить произвольное событие.",
     "What's new?": "Что нового?",
-    "Notify me for anything else": "Уведомлять во всех остальных случаях",
     "When I'm invited to a room": "Приглашения в комнаты",
-    "Can't update user notification settings": "Не удалось обновить пользовательские настройки оповещения",
-    "Notify for all other messages/rooms": "Уведомлять обо всех остальных сообщениях и комнатах",
     "Unable to look up room ID from server": "Не удалось найти ID комнаты на сервере",
     "Couldn't find a matching Matrix room": "Не удалось найти подходящую комнату Matrix",
     "All Rooms": "Везде",
     "You cannot delete this message. (%(code)s)": "Это сообщение нельзя удалить. (%(code)s)",
     "Thursday": "Четверг",
-    "Forward Message": "Переслать сообщение",
     "Logs sent": "Журналы отправлены",
     "Back": "Назад",
     "Reply": "Ответить",
     "Show message in desktop notification": "Показывать текст сообщения в уведомлениях на рабочем столе",
-    "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.": "Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
-    "Unhide Preview": "Показать предварительный просмотр",
     "Unable to join network": "Не удается подключиться к сети",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "К сожалению, ваш браузер <b>не способен</b> запустить %(brand)s.",
     "Messages in group chats": "Сообщения в конференциях",
     "Yesterday": "Вчера",
     "Error encountered (%(errorDetail)s).": "Обнаружена ошибка (%(errorDetail)s).",
     "Low Priority": "Маловажные",
-    "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений",
-    "Set Password": "Задать пароль",
     "Off": "Выключить",
     "%(brand)s does not know how to join a room on this network": "%(brand)s не знает, как присоединиться к комнате в этой сети",
-    "Mentions only": "Только при упоминаниях",
     "Wednesday": "Среда",
-    "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учётной записи после выхода и войти на других устройствах.",
-    "Enable email notifications": "Включить уведомления на email",
     "Event Type": "Тип события",
-    "Download this file": "Скачать файл",
-    "Pin Message": "Закрепить сообщение",
-    "Failed to change settings": "Не удалось изменить настройки",
     "View Community": "Просмотр сообщества",
     "Event sent!": "Событие отправлено!",
     "Event Content": "Содержимое события",
     "Thank you!": "Спасибо!",
     "Quote": "Цитата",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "В текущем браузере внешний вид приложения может быть полностью неверным, а некоторые или все функции могут не работать. Если вы хотите попробовать в любом случае, то можете продолжить, но с теми проблемами, с которыми вы можете столкнуться вам придется разбираться самостоятельно!",
     "Checking for an update...": "Проверка обновлений…",
     "Missing roomId.": "Отсутствует идентификатор комнаты.",
     "You don't currently have any stickerpacks enabled": "У вас нет стикеров",
@@ -787,7 +631,6 @@
     "Every page you use in the app": "Каждая страница, которую вы используете в приложении",
     "e.g. <CurrentPageURL>": "напр. <CurrentPageURL>",
     "Your device resolution": "Разрешение вашего устройства",
-    "Always show encryption icons": "Всегда показывать значки шифрования",
     "Send Logs": "Отправить логи",
     "Clear Storage and Sign Out": "Очистить хранилище и выйти",
     "Refresh": "Обновить",
@@ -795,7 +638,6 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена, и зашифрованная история чата станет нечитаемой.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджетов для поддерживаемых виджетов",
-    "Collapse Reply Thread": "Свернуть ответы",
     "Send analytics data": "Отправить данные аналитики",
     "Muted Users": "Приглушённые пользователи",
     "Terms and Conditions": "Условия и положения",
@@ -818,25 +660,15 @@
     "Share User": "Поделиться пользователем",
     "Share Community": "Поделиться сообществом",
     "Link to selected message": "Ссылка на выбранное сообщение",
-    "COPY": "КОПИРОВАТЬ",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "В зашифрованных комнатах, подобных этой, предварительный просмотр URL-адресов отключен по умолчанию, чтобы гарантировать, что ваш сервер (где создаются предварительные просмотры) не может собирать информацию о ссылках, которые вы видите в этой комнате.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Когда кто-то вставляет URL-адрес в свое сообщение, то можно просмотреть его, чтобы получить дополнительную информацию об этой ссылке, такую как название, описание и изображение с веб-сайта.",
-    "The email field must not be blank.": "Поле email не должно быть пустым.",
-    "The phone number field must not be blank.": "Поле номера телефона не должно быть пустым.",
-    "The password field must not be blank.": "Поле пароля не должно быть пустым.",
-    "Call in Progress": "Выполнение вызова",
-    "A call is already in progress!": "Вызов выполняется!",
     "Share Room Message": "Поделиться сообщением",
-    "Share Message": "Поделиться сообщением",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>.",
     "Demote": "Понижение",
     "Demote yourself?": "Понизить самого себя?",
     "This event could not be displayed": "Не удалось отобразить это событие",
     "Permission Required": "Требуется разрешение",
     "You do not have permission to start a conference call in this room": "У вас нет разрешения на запуск конференции в этой комнате",
-    "A call is currently being placed!": "Есть активный вызов!",
-    "Failed to remove widget": "Не удалось удалить виджет",
-    "An error ocurred whilst trying to remove the widget from the room": "Произошла ошибка при удалении виджета из комнаты",
     "System Alerts": "Системные оповещения",
     "Only room administrators will see this warning": "Только администраторы комнат увидят это предупреждение",
     "Please <a>contact your service administrator</a> to continue using the service.": "Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использование сервиса.",
@@ -853,7 +685,7 @@
     "Sets the room name": "Устанавливает название комнаты",
     "Forces the current outbound group session in an encrypted room to be discarded": "Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s модернизировал эту комнату.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s установил %(address)s в качестве главного адреса комнаты.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s установил(а) %(address)s в качестве главного адреса комнаты.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s удалил главный адрес комнаты.",
     "%(displayName)s is typing …": "%(displayName)s печатает…",
     "%(names)s and %(count)s others are typing …|other": "%(names)s и %(count)s других печатают…",
@@ -902,7 +734,6 @@
     "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, выгоны и баны)",
     "Show avatar changes": "Показывать изменения аватара",
     "Show display name changes": "Показывать изменения отображаемого имени",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Напоминать включить Безопасное Восстановление Сообщений в зашифрованных комнатах",
     "Show avatars in user and room mentions": "Показывать аватары в упоминаниях пользователей и комнат",
     "Enable big emoji in chat": "Включить большие смайлики в чате",
     "Send typing notifications": "Оправлять уведомления о наборе текста",
@@ -920,9 +751,6 @@
     "No": "Нет",
     "Email Address": "Адрес электронной почты",
     "Delete Backup": "Удалить резервную копию",
-    "Backup version: ": "Версия резервной копии: ",
-    "Algorithm: ": "Алгоритм: ",
-    "Add an email address to configure email notifications": "Добавьте адрес для настройки уведомлений по электронной почте",
     "Unable to verify phone number.": "Невозможно проверить номер телефона.",
     "Verification code": "Код подтверждения",
     "Phone Number": "Номер телефона",
@@ -951,11 +779,9 @@
     "Encryption": "Шифрование",
     "Encrypted": "Зашифровано",
     "Ignored users": "Игнорируемые пользователи",
-    "Key backup": "Резервное копирование ключей",
     "Voice & Video": "Голос и видео",
     "The conversation continues here.": "Разговор продолжается здесь.",
     "Set up": "Настроить",
-    "Don't ask again": "Больше не спрашивать",
     "Main address": "Главный адрес",
     "Room Name": "Название комнаты",
     "Room Topic": "Тема комнаты",
@@ -985,38 +811,24 @@
     "Incoming Verification Request": "Входящий запрос о проверке",
     "Clear cache and resync": "Очистить кэш и выполнить повторную синхронизацию",
     "Updating %(brand)s": "Обновление %(brand)s",
-    "Report bugs & give feedback": "Сообщайте об ошибках и оставляйте отзывы",
     "Go back": "Назад",
     "Failed to upgrade room": "Не удалось обновить комнату",
     "The room upgrade could not be completed": "Невозможно завершить обновление комнаты",
     "Upgrade this room to version %(version)s": "Обновить эту комнату до версии %(version)s",
-    "Checking...": "Проверка...",
     "Unable to load backup status": "Невозможно загрузить статус резервной копии",
     "Unable to restore backup": "Невозможно восстановить резервную копию",
     "No backup found!": "Резервных копий не найдено!",
     "Starting backup...": "Запуск резервного копирования...",
     "Download": "Скачать",
-    "Create your account": "Создать учётную запись",
     "Username": "Имя пользователя",
-    "Not sure of your password? <a>Set a new one</a>": "Не помните пароль? <a>Установите новый</a>",
-    "The username field must not be blank.": "Имя пользователя не должно быть пустым.",
-    "Server Name": "Название сервера",
-    "Your Modular server": "Ваш Модульный сервер",
     "Email (optional)": "Адрес электронной почты (не обязательно)",
     "Phone (optional)": "Телефон (не обязательно)",
     "Confirm": "Подтвердить",
-    "Other servers": "Другие серверы",
-    "Homeserver URL": "URL сервера",
-    "Identity Server URL": "URL сервера идентификации",
-    "Free": "Бесплатный",
-    "Premium": "Премиум",
     "Other": "Другие",
     "Go to Settings": "Перейти в настройки",
     "Set up Secure Messages": "Настроить безопасные сообщения",
     "Recovery Method Removed": "Метод восстановления удален",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Обнаружена новая парольная фраза восстановления и ключ для безопасных сообщений.",
     "New Recovery Method": "Новый метод восстановления",
-    "If you don't want to set this up now, you can later in Settings.": "Это можно сделать позже в настройках.",
     "Set up Secure Message Recovery": "Настройка безопасного восстановления сообщений",
     "<b>Copy it</b> to your personal cloud storage": "<b>Скопируйте</b> в персональное облачное хранилище",
     "<b>Save it</b> on a USB key or backup drive": "<b>Сохраните</b> на USB-диске или на резервном диске",
@@ -1097,7 +909,6 @@
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s меняет гостевой доступ на \"%(rule)s\"",
     "User %(userId)s is already in the room": "Пользователь %(userId)s уже находится в комнате",
     "The user must be unbanned before they can be invited.": "Пользователь должен быть разблокирован прежде чем может быть приглашён.",
-    "Allow Peer-to-Peer for 1:1 calls": "Разрешить прямое соединение (p2p) для прямых звонков (один на один)",
     "Verify this user by confirming the following emoji appear on their screen.": "Проверьте собеседника, убедившись, что на его экране отображаются следующие символы (смайлы).",
     "Unable to find a supported verification method.": "Невозможно определить поддерживаемый метод верификации.",
     "Scissors": "Ножницы",
@@ -1124,16 +935,13 @@
     "Default role": "Роль по умолчанию",
     "Send messages": "Отправить сообщения",
     "Change settings": "Изменить настройки",
-    "Remove messages": "Удалить сообщения",
     "Notify everyone": "Уведомить всех",
     "Enable encryption?": "Разрешить шифрование?",
-    "Not now": "Не сейчас",
     "Error updating main address": "Ошибка обновления основного адреса",
     "Incompatible local cache": "Несовместимый локальный кэш",
     "You'll lose access to your encrypted messages": "Вы потеряете доступ к вашим шифрованным сообщениям",
     "Are you sure you want to sign out?": "Вы уверены, что хотите выйти?",
     "Room Settings - %(roomName)s": "Настройки комнаты - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Имя пользователя может содержать только буквы нижнего регистра, цифры и знаки  '=_-./'",
     "Composer": "Редактор",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Используете ли вы функцию \"хлебные крошки\" (аватары над списком комнат) или нет",
     "Replying With Files": "Ответ файлами",
@@ -1201,10 +1009,6 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Эта комната не существует. Вы уверены, что находитесь в правильном месте?",
     "Try again later, or ask a room admin to check if you have access.": "Повторите попытку позже или попросите администратора комнаты проверить, есть ли у вас доступ.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s был возвращен при попытке доступа в комнату. Если вы считаете, что видите это сообщение по ошибке, пожалуйста, <issueLink> отправьте отчет об ошибке </issueLink>.",
-    "Never lose encrypted messages": "Никогда не теряйте зашифрованные сообщения",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Сообщения в этой комнате защищены сквозным шифрованием. Только у вас и получателя(ей) есть ключи для чтения этих сообщений.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Надежно сохраните резервную копию ваших ключей, чтобы избежать их потери. <a>Подробнее</a>",
-    "Don't ask me again": "Больше не спрашивать",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Обновление этой комнаты отключит текущий экземпляр комнаты и создаст обновлённую комнату с тем же именем.",
     "This room has already been upgraded.": "Эта комната уже была обновлена.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Версия этой комнаты — <roomVersion />, этот домашний сервер считает её <i>нестабильной</i>.",
@@ -1218,11 +1022,8 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "При обновлении стиля для этой комнаты произошла ошибка. Сервер может не разрешить это или произошла временная ошибка.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>отреагировал с %(shortName)s</reactedWith>",
     "edited": "изменено",
-    "Maximize apps": "Развернуть приложения",
     "Rotate Left": "Повернуть влево",
-    "Rotate counter-clockwise": "Повернуть против часовой стрелки",
     "Rotate Right": "Повернуть вправо",
-    "Rotate clockwise": "Повернуть по часовой стрелке",
     "Edit message": "Редактировать сообщение",
     "Power level": "Уровень прав",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Не удалось найти профили для перечисленных ниже Matrix ID. Вы всё равно хотите их пригласить?",
@@ -1240,10 +1041,7 @@
     "%(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 теперь использует в 3-5 раз меньше памяти, загружая информацию о других пользователях только когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
     "I don't want my encrypted messages": "Мне не нужны мои зашифрованные сообщения",
     "Manually export keys": "Экспортировать ключи вручную",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы заметили ошибку или хотите оставить отзыв, пожалуйста, сообщите нам на GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Чтобы избежать повторяющихся проблем, сначала <existingIssuesLink>просмотрите существующие задачи</existingIssuesLink> (и добавьте +1), либо <newIssueLink>создайте новую задачу</newIssueLink>, если вы не можете ее найти.",
     "Sign out and remove encryption keys?": "Выйти и удалить ключи шифрования?",
-    "Low bandwidth mode": "Режим низкой пропускной способности",
     "To help us prevent this in future, please <a>send us logs</a>.": "Чтобы помочь нам предотвратить это в будущем, пожалуйста, <a>отправьте нам логи</a>.",
     "Missing session data": "Отсутствуют данные сессии",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Отсутствуют некоторые данные сессии, в том числе ключи шифрования сообщений. Выйдите и войдите, чтобы восстановить ключи из резервной копии.",
@@ -1258,19 +1056,10 @@
     "Upload %(count)s other files|one": "Загрузка %(count)s другого файла",
     "Cancel All": "Отменить все",
     "Upload Error": "Ошибка загрузки",
-    "A widget would like to verify your identity": "Виджет хотел бы проверить вашу личность",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Виджет расположенный в %(widgetUrl)s, хотел бы подтвердить вашу личность. Разрешая это, виджет сможет проверять ваш ID пользователя, но не выполнять действия как вы.",
     "Remember my selection for this widget": "Запомнить мой выбор для этого виджета",
-    "Deny": "Отказать",
     "Failed to decrypt %(failedCount)s sessions!": "Не удалось расшифровать %(failedCount)s сессии!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Предупреждение</b>: вам следует настроить резервное копирование ключей только с доверенного компьютера.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя пароль для восстановления.",
     "Next": "Далее",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Если вы забыли пароль для восстановления, вы можете <button1>использовать свой ключ восстановления</button1> или <button2>, чтобы настроить новые параметры восстановления</button2>",
-    "This looks like a valid recovery key!": "Это похоже на действительный ключ восстановления!",
-    "Not a valid recovery key": "Недействительный ключ восстановления",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя свой ключ восстановления.",
-    "Share Permalink": "Поделиться постоянной ссылкой",
     "Clear status": "Удалить статус",
     "Update status": "Обновить статус",
     "Set status": "Установить статус",
@@ -1279,10 +1068,6 @@
     "This homeserver would like to make sure you are not a robot.": "Этот сервер хотел бы убедиться, что вы не робот.",
     "Please review and accept all of the homeserver's policies": "Пожалуйста, просмотрите и примите все правила сервера",
     "Please review and accept the policies of this homeserver:": "Пожалуйста, просмотрите и примите политику этого сервера:",
-    "Unable to validate homeserver/identity server": "Невозможно проверить сервер/сервер идентификации",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Введите местоположение вашего Modula homeserver. Он может использовать ваше собственное доменное имя или быть поддоменом <a>modular.im</a>.",
-    "Sign in to your Matrix account on %(serverName)s": "Вход в учётную запись Matrix на сервере %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Вход в учётную запись Matrix на сервере <underlinedServerName />",
     "Change": "Изменить",
     "Use an email address to recover your account": "Используйте почтовый адрес, чтобы восстановить доступ к учётной записи",
     "Enter email address (required on this homeserver)": "Введите адрес электронной почты (требуется для этого сервера)",
@@ -1294,15 +1079,9 @@
     "Passwords don't match": "Пароли не совпадают",
     "Other users can invite you to rooms using your contact details": "Другие пользователи могут приглашать вас в комнаты, используя ваши контактные данные",
     "Enter phone number (required on this homeserver)": "Введите номер телефона (требуется на этом сервере)",
-    "Doesn't look like a valid phone number": "Не похоже на действительный номер телефона",
     "Enter username": "Введите имя пользователя",
     "Some characters not allowed": "Некоторые символы не разрешены",
-    "Create your Matrix account on %(serverName)s": "Создайте свою учётную запись Matrix на %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Создайте учётную запись Matrix на <underlinedServerName />",
     "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам на крупнейшем общедоступном сервере",
-    "Premium hosting for organisations <a>Learn more</a>": "Премиум-хостинг для организаций <a>Подробнее</a>",
-    "Find other public servers or use a custom server": "Найти другие общедоступные серверы или использовать другой сервер",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Пожалуйста, установите <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> для наилучшего результата.",
     "Couldn't load page": "Невозможно загрузить страницу",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вы являетесь администратором этого сообщества. Вы не сможете вернуться без приглашения от другого администратора.",
     "Want more than a community? <a>Get your own server</a>": "Хотите больше, чем просто сообщество? <a>Получите свой собственный сервер</a>",
@@ -1314,10 +1093,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "У вас есть %(count)s непрочитанных уведомлений в предыдущей версии этой комнаты.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "В предыдущей версии этой комнаты у вас есть непрочитанное уведомление %(count)s.",
     "Guest": "Гость",
-    "Your profile": "Ваш профиль",
     "Could not load user profile": "Не удалось загрузить профиль пользователя",
-    "Your Matrix account on %(serverName)s": "Ваша учётная запись Matrix на сервере %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Ваша учётная запись Matrix на сервере <underlinedServerName />",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Письмо с подтверждением будет отправлено на ваш почтовый ящик, чтобы подтвердить установку нового пароля.",
     "Sign in instead": "Войдите, вместо этого",
     "Your password has been reset.": "Ваш пароль был сброшен.",
@@ -1350,7 +1126,6 @@
     "Success!": "Успешно!",
     "Unable to create key backup": "Невозможно создать резервную копию ключа",
     "Retry": "Попробуйте снова",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Без настройки безопасного восстановления сообщений при выходе из системы вы потеряете историю защищенных сообщений.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не задали новый способ восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу же задайте новый способ восстановления в настройках.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не убрали метод восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу задайте новый способ восстановления в настройках.",
     "Cannot reach homeserver": "Не удаётся связаться с сервером",
@@ -1367,7 +1142,6 @@
     "You can now close this window or <a>log in</a> to your new account.": "Можно закрыть это окно или <a>войти</a> в новую учётную запись.",
     "Registration Successful": "Регистрация успешно завершена",
     "Changes your avatar in all rooms": "Изменяет ваш аватар во всех комнатах",
-    "%(senderName)s made no change.": "%(senderName)s не внёс изменений.",
     "Loading room preview": "Загрузка предпросмотра комнаты",
     "Show all": "Показать все",
     "Edited at %(date)s. Click to view edits.": "Изменено %(date)s. Нажмите для посмотра истории изменений.",
@@ -1381,7 +1155,6 @@
     "Your homeserver doesn't seem to support this feature.": "Ваш сервер, похоже, не поддерживает эту возможность.",
     "Message edits": "Правки сообщения",
     "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:": "Модернизация этой комнаты требует закрытие комнаты в текущем состояние и создания новой комнаты вместо неё. Чтобы упростить процесс для участников, будет сделано:",
-    "Identity Server": "Сервер идентификаций",
     "Find others by phone or email": "Найти других по номеру телефона или email",
     "Be found by phone or email": "Будут найдены по номеру телефона или email",
     "Use bots, bridges, widgets and sticker packs": "Использовать боты, мосты, виджеты и наборы стикеров",
@@ -1389,9 +1162,7 @@
     "Service": "Сервис",
     "Summary": "Сводка",
     "Upload all": "Загрузить всё",
-    "Resend edit": "Отправить исправление повторно",
     "Resend %(unsentCount)s reaction(s)": "Отправить повторно %(unsentCount)s реакций",
-    "Resend removal": "Отправить удаление повторно",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Учётная запись (%(newAccountId)s) зарегистрирована, но вы уже вошли в другую учётную запись (%(loggedInUserId)s).",
     "Continue with previous account": "Продолжить с предыдущей учётной записью",
     "Failed to re-authenticate due to a homeserver problem": "Ошибка повторной аутентификации из-за проблем на сервере",
@@ -1410,13 +1181,9 @@
     "Displays list of commands with usages and descriptions": "Отображает список команд с описанием и использованием",
     "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 для надежной работы звонков.",
     "You do not have the required permissions to use this command.": "У вас нет необходимых разрешений для использования этой команды.",
-    "Multiple integration managers": "Несколько менеджеров интеграции",
     "Accept <policyLink /> to continue:": "Примите <policyLink /> для продолжения:",
     "ID": "ID",
     "Public Name": "Публичное имя",
-    "Identity Server URL must be HTTPS": "URL-адрес сервера идентификации должен быть HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Неправильный Сервер идентификации (код статуса %(code)s)",
-    "Could not connect to Identity Server": "Не смог подключиться к серверу идентификации",
     "Checking server": "Проверка сервера",
     "Terms of service not accepted or the identity server is invalid.": "Условия использования не приняты или сервер идентификации недействителен.",
     "Identity server has no terms of service": "Сервер идентификации не имеет условий предоставления услуг",
@@ -1424,10 +1191,8 @@
     "Only continue if you trust the owner of the server.": "Продолжайте, только если доверяете владельцу сервера.",
     "Disconnect from the identity server <idserver />?": "Отсоединиться от сервера идентификации <idserver />?",
     "Disconnect": "Отключить",
-    "Identity Server (%(server)s)": "Сервер идентификации (%(server)s)",
     "Do not use an identity server": "Не использовать сервер идентификации",
     "Enter a new identity server": "Введите новый идентификационный сервер",
-    "Integration Manager": "Менеджер интеграции",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Кроме того, вы можете попытаться использовать общедоступный сервер по адресу <code> turn.matrix.org </code>, но это не будет настолько надежным, и он предоставит ваш IP-адрес этому серверу. Вы также можете управлять этим в настройках.",
     "Sends a message as plain text, without interpreting it as markdown": "Посылает сообщение в виде простого текста, не интерпретируя его как разметку",
     "Use an identity server": "Используйте сервер идентификации",
@@ -1438,15 +1203,11 @@
     "Add Phone Number": "Добавить номер телефона",
     "Changes the avatar of the current room": "Меняет аватарку текущей комнаты",
     "Change identity server": "Изменить сервер идентификации",
-    "Explore": "Обзор",
     "Filter": "Поиск",
-    "Filter rooms…": "Поиск комнат…",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Если не удаётся найти комнату, то можно запросить приглашение или <a>Создать новую комнату</a>.",
     "Create a public room": "Создать публичную комнату",
     "Create a private room": "Создать приватную комнату",
     "Topic (optional)": "Тема (опционально)",
-    "Make this room public": "Сделать комнату публичной",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Отправлять подтверждения о прочтении сообщений (требуется совместимый домашний сервер для отключения)",
     "Show previews/thumbnails for images": "Показать превью / миниатюры для изображений",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Отключиться от сервера идентификации <current /> и вместо этого подключиться к <new />?",
     "Disconnect identity server": "Отключить идентификационный сервер",
@@ -1483,7 +1244,7 @@
     "Verify the link in your inbox": "Проверьте ссылку в вашем почтовом ящике(папка \"Входящие\")",
     "Complete": "Выполнено",
     "Revoke": "Отмена",
-    "Share": "Делиться",
+    "Share": "Поделиться",
     "Discovery options will appear once you have added an email above.": "Параметры поиска по электронной почты появятся после добавления её выше.",
     "Unable to revoke sharing for phone number": "Не удалось отменить общий доступ к номеру телефона",
     "Unable to share phone number": "Не удается предоставить общий доступ к номеру телефона",
@@ -1508,12 +1269,10 @@
     "Strikethrough": "Перечёркнутый",
     "Code block": "Блок кода",
     "%(count)s unread messages.|other": "%(count)s непрочитанных сообщений.",
-    "Unread mentions.": "Непрочитанные упоминания.",
     "Show image": "Показать изображение",
     "e.g. my-room": "например, моя-комната",
     "Close dialog": "Закрыть диалог",
     "Please enter a name for the room": "Пожалуйста, введите название комнаты",
-    "This room is private, and can only be joined by invitation.": "Эта комната приватная, в неё можно войти только по приглашению.",
     "Hide advanced": "Скрыть дополнительные настройки",
     "Show advanced": "Показать дополнительные настройки",
     "Please fill why you're reporting.": "Пожалуйста, заполните, почему вы сообщаете.",
@@ -1537,23 +1296,16 @@
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Пожалуйста, <newIssueLink> создайте новую проблему/вопрос </newIssueLink> на GitHub, чтобы мы могли расследовать эту ошибку.",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. <default>Используйте значение по умолчанию (%(defaultIdentityServerName)s)</default> или управляйте в <settings>Настройках</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в <settings>Настройки</settings>.",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Отсутствует Капча открытого ключа в конфигурации домашнего сервера. Пожалуйста, сообщите об этом администратору вашего домашнего сервера.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Задайте адрес электронной почты для восстановления учетной записи. Чтобы знакомые могли вас найти, задайте адрес почты или номер телефона.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Задайте адрес электронной почты для восстановления учетной записи. Чтобы знакомые могли вас найти, задайте адрес почты.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Введите ссылку на другой домашний сервер <a>Что это значит?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Введите ссылку на другой сервер идентификации <a>Что это значит?</a>",
-    "%(creator)s created and configured the room.": "%(creator)s создал и настроил комнату.",
+    "%(creator)s created and configured the room.": "%(creator)s создал(а) и настроил(а) комнату.",
     "Preview": "Заглянуть",
     "View": "Просмотр",
     "Find a room…": "Поиск комнат…",
     "Find a room… (e.g. %(exampleRoom)s)": "Поиск комнат... (напр. %(exampleRoom)s)",
     "Explore rooms": "Список комнат",
-    "No identity server is configured: add one in server settings to reset your password.": "Идентификационный сервер не настроен: добавьте его в настройки сервера, чтобы сбросить пароль.",
     "Command Autocomplete": "Автозаполнение команды",
     "Community Autocomplete": "Автозаполнение сообщества",
-    "DuckDuckGo Results": "DuckDuckGo результаты",
     "Emoji Autocomplete": "Автодополнение смайлов",
     "Notification Autocomplete": "Автозаполнение уведомлений",
     "Room Autocomplete": "Автозаполнение комнаты",
@@ -1571,8 +1323,6 @@
     "React": "Реакция",
     "Cancel search": "Отменить поиск",
     "Room %(name)s": "Комната %(name)s",
-    "Recent rooms": "Недавние комнаты",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Сервер идентификации не настроен, поэтому вы не можете добавить адрес электронной почты, чтобы в будущем сбросить пароль.",
     "Jump to first unread room.": "Перейти в первую непрочитанную комнату.",
     "Jump to first invite.": "Перейти к первому приглашению.",
     "Trust": "Доверие",
@@ -1595,16 +1345,11 @@
     "Delete %(count)s sessions|other": "Удалить %(count)s сессий",
     "Enable desktop notifications for this session": "Включить уведомления для рабочего стола для этой сессии",
     "Enable audible notifications for this session": "Включить звуковые уведомления для этой сессии",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и стикерами.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями для управления ботами, виджетами и стикерами.",
     "Manage integrations": "Управление интеграциями",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджеры интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
     "Direct Messages": "Диалоги",
     "%(count)s sessions|other": "%(count)s сессий",
     "Hide sessions": "Скрыть сессии",
     "Enable 'Manage Integrations' in Settings to do this.": "Включите «Управление интеграциями» в настройках, чтобы сделать это.",
-    "Help": "Помощь",
-    "If you cancel now, you won't complete verifying your other session.": "Если вы отмените сейчас, вы не завершите проверку вашей другой сессии.",
     "Verify this session": "Проверьте эту сессию",
     "Verifies a user, session, and pubkey tuple": "Проверяет пользователя, сессию и публичные ключи",
     "Unknown (user, session) pair:": "Неизвестная пара (пользователь, сессия):",
@@ -1616,11 +1361,9 @@
     "Subscribed lists": "Подписанные списки",
     "Subscribe": "Подписаться",
     "A session's public name is visible to people you communicate with": "Ваши собеседники видят публичные имена сессий",
-    "If you cancel now, you won't complete verifying the other user.": "Если вы сейчас отмените, у вас не будет завершена проверка других пользователей.",
     "Cancel entering passphrase?": "Отмена ввода пароль?",
     "Setting up keys": "Настройка ключей",
     "Encryption upgrade available": "Доступно обновление шифрования",
-    "Set up encryption": "Настройка шифрования",
     "Double check that your server supports the room version chosen and try again.": "Убедитесь, что ваш сервер поддерживает выбранную версию комнаты и попробуйте снова.",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: сессия уже подтверждена, но ключи НЕ совпадают!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: ПРОВЕРКА КЛЮЧА НЕ ПРОШЛА! Ключом подписи для %(userId)s и сессии %(deviceId)s является \"%(fprint)s\", что не соответствует указанному ключу \"%(fingerprint)s\". Это может означать, что ваши сообщения перехватываются!",
@@ -1661,7 +1404,6 @@
     "They don't match": "Они не совпадают",
     "To be secure, do this in person or use a trusted way to communicate.": "Чтобы быть в безопасности, делайте это лично или используйте надежный способ связи.",
     "Lock": "Заблокировать",
-    "Verify yourself & others to keep your chats safe": "Подтвердите себя и других для безопасности ваших бесед",
     "Other users may not trust it": "Другие пользователи могут не доверять этому",
     "Upgrade": "Обновление",
     "Verify": "Проверить",
@@ -1670,8 +1412,6 @@
     "Decline (%(counter)s)": "Отклонить (%(counter)s)",
     "This bridge was provisioned by <user />.": "Этот мост был подготовлен пользователем <user />.",
     "This bridge is managed by <user />.": "Этот мост управляется <user />.",
-    "Workspace: %(networkName)s": "Рабочая область: %(networkName)s",
-    "Channel: %(channelName)s": "Канал: %(channelName)s",
     "Show less": "Показать меньше",
     "Show more": "Показать больше",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Если вы не экспортируете ключи для этой комнаты и не импортируете их в будущем, смена пароля приведёт к сбросу всех ключей сквозного шифрования и сделает невозможным чтение истории чата. В будущем это будет улучшено.",
@@ -1712,17 +1452,12 @@
     "Manually Verify by Text": "Ручная проверка с помощью текста",
     "Interactively verify by Emoji": "Интерактивная проверка со смайликами",
     "Done": "Готово",
-    "The message you are trying to send is too large.": "Ваше сообщение слишком большое.",
     "Support adding custom themes": "Поддержка сторонних тем",
     "Order rooms by name": "Сортировать комнаты по названию",
     "Show rooms with unread notifications first": "Показывать в начале комнаты с непрочитанными уведомлениями",
     "Show shortcuts to recently viewed rooms above the room list": "Показывать ссылки на недавние комнаты над списком комнат",
     "Manually verify all remote sessions": "Подтверждать вручную все сессии на других устройствах",
     "Your homeserver does not support cross-signing.": "Ваш домашний сервер не поддерживает кросс-подписи.",
-    "Cross-signing and secret storage are enabled.": "Кросс-подпись и секретное хранилище разрешены.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Попробуйте экспериментальные возможности. <a>Подробнее</a>.",
-    "Cross-signing and secret storage are not yet set up.": "Кросс-подпись и секретное хранилище ещё не настроены.",
-    "Reset cross-signing and secret storage": "Сбросить кросс-подпись и секретное хранилище",
     "Cross-signing public keys:": "Публичные ключи для кросс-подписи:",
     "in memory": "в памяти",
     "not found": "не найдено",
@@ -1731,7 +1466,6 @@
     "cached locally": "сохранено локально",
     "not found locally": "не найдено локально",
     "User signing private key:": "Приватный ключ подписи пользователей:",
-    "Session backup key:": "Резервная копия сессионного ключа:",
     "Secret storage public key:": "Публичный ключ секретного хранилища:",
     "in account data": "в данных учётной записи",
     "Homeserver feature support:": "Поддержка со стороны домашнего сервера:",
@@ -1797,9 +1531,7 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Убедитесь, что смайлики ниже отображаются в обеих сессиях в том же порядке:",
     "Verify this session by confirming the following number appears on its screen.": "Подтвердите эту сессию, убедившись, что следующее число отображается на экране.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Ожидание других ваших сессий, %(deviceName)s %(deviceId)s, для подтверждения…",
-    "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "У вашей учётной записи есть кросс-подпись в секретное хранилище, но она пока не является доверенной в этой сессии.",
-    "Bootstrap cross-signing and secret storage": "Инициализация кросс-подпись и секретного хранилища",
     "well formed": "корректный",
     "unexpected type": "непредвиденный тип",
     "Self signing private key:": "Самоподписанный приватный ключ:",
@@ -1809,7 +1541,6 @@
     "Click the button below to confirm deleting these sessions.|other": "Нажмите кнопку ниже для удаления этих сессий.",
     "Click the button below to confirm deleting these sessions.|one": "Нажмите кнопку ниже для удаления этой сессии.",
     "Delete sessions": "Удалить сессии",
-    "rooms.": "комнаты.",
     "Manage": "Управление",
     "Custom theme URL": "Ссылка на стороннюю тему",
     "⚠ These settings are meant for advanced users.": "⚠ Эти настройки рассчитаны для опытных пользователей.",
@@ -1831,7 +1562,6 @@
     "Encrypted by an unverified session": "Зашифровано неподтверждённой сессией",
     "Unencrypted": "Не зашифровано",
     "Encrypted by a deleted session": "Зашифровано удалённой сессией",
-    "Invite only": "Только по приглашениям",
     "Scroll to most recent messages": "Перейти к последним сообщениям",
     "Close preview": "Закрыть предпросмотр",
     "Send a reply…": "Отправить ответ…",
@@ -1846,12 +1576,10 @@
     "Mark all as read": "Отметить всё как прочитанное",
     "Local address": "Локальный адрес",
     "Published Addresses": "Публичные адреса",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Публичные адреса позволяют кому угодно зайти в вашу комнату с любого сервера. Чтобы опубликовать адрес, сначала задайте его в качестве локального адреса.",
     "Other published addresses:": "Прочие публичные адреса:",
     "No other published addresses yet, add one below": "Пока нет других публичных адресов, добавьте их ниже",
     "New published address (e.g. #alias:server)": "Новый публичный адрес (напр. #alias:server)",
     "Local Addresses": "Локальные адреса",
-    "Waiting for you to accept on your other session…": "Ожидание принятия в другой вашей сессии…",
     "Waiting for %(displayName)s to accept…": "Ожидание принятия от %(displayName)s…",
     "Accepting…": "Принятие…",
     "Start Verification": "Начать проверку",
@@ -1866,7 +1594,6 @@
     "%(count)s verified sessions|one": "1 подтверждённая сессия",
     "Hide verified sessions": "Скрыть подтверждённые сессии",
     "%(count)s sessions|one": "%(count)s сессия",
-    "Direct message": "Начать диалог",
     "Verification timed out.": "Таймаут подтверждения.",
     "You cancelled verification on your other session.": "Вы отменили подтверждение в другой вашей сессии.",
     "You cancelled verification.": "Вы отменили подтверждение.",
@@ -1883,7 +1610,6 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Подтвердите удаление учётной записи с помощью единой точки входа.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Вы уверены, что хотите деактивировать свою учётную запись? Это необратимое действие.",
     "Confirm account deactivation": "Подтвердите деактивацию учётной записи",
-    "Your account is not secure": "Ваша учётная запись не в безопасности",
     "Backup has a <validity>valid</validity> signature from this user": "У резервной копии <validity>верная</validity> подпись этого пользователя",
     "Backup has a <validity>invalid</validity> signature from this user": "У резервной копии <validity>неверная</validity> подпись этого пользователя",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "У резервной копии подпись <verify>неизвестного</verify> пользователя с ID %(deviceId)s",
@@ -1910,7 +1636,6 @@
     "%(name)s wants to verify": "%(name)s желает подтвердить",
     "You sent a verification request": "Вы отправили запрос подтверждения",
     "Reactions": "Реакции",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> отреагировал(а) с %(content)s</reactedWith>",
     "Your display name": "Отображаемое имя",
     "Your avatar URL": "Ссылка на ваш аватар",
     "One of the following may be compromised:": "Что-то из этого может быть скомпрометировано:",
@@ -1945,24 +1670,14 @@
     "Verify session": "Подтвердить сессию",
     "Session name": "Название сессии",
     "Session key": "Ключ сессии",
-    "Backup key stored: ": "Резервная копия ключа сохранена: ",
     "Command failed": "Не удалось выполнить команду",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Установить адрес этой комнаты, чтобы пользователи могли найти ее на вашем сервере (%(localDomain)s)",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Начните диалог с кем-нибудь по его имени, имени пользователя (например, <userId/>) или адресу почты.",
-    "Great! This recovery passphrase looks strong enough.": "Отлично! Этот пароль восстановления достаточно надёжен.",
-    "Enter recovery passphrase": "Введите пароль восстановления",
-    "Enter a recovery passphrase": "Введите пароль восстановления",
-    "Enter your recovery passphrase a second time to confirm it.": "Введите пароль восстановления ещё раз для подтверждения.",
-    "Please enter your recovery passphrase a second time to confirm.": "Введите пароль восстановления повторно для подтверждения.",
-    "If you cancel now, you won't complete your operation.": "Если вы отмените операцию сейчас, она не завершится.",
     "Failed to set topic": "Не удалось установить тему",
     "Could not find user in room": "Не удалось найти пользователя в комнате",
     "Please supply a widget URL or embed code": "Укажите URL или код вставки виджета",
     "Send a bug report with logs": "Отправить отчёт об ошибке с логами",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Отдельно подтверждать каждую сессию пользователя как доверенную, не доверяя кросс-подписанным устройствам.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Кэшировать шифрованные сообщения локально, чтобы они выводились в результатах поиска, используя: ",
-    " to store messages from ": " хранить сообщения от ",
     "Securely cache encrypted messages locally for them to appear in search results.": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
     "%(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, чтобы безопасно кэшировать шифрованные сообщения локально. Если вы хотите попробовать эту возможность, соберите самостоятельно %(brand)s Desktop с <nativeLink>добавлением поисковых компонентов</nativeLink>.",
     "not stored": "не сохранено",
@@ -1978,9 +1693,7 @@
     "Your key share request has been sent - please check your other sessions for key share requests.": "Запрос ключа был отправлен - проверьте другие ваши сессии на предмет таких запросов.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Вы не сможете расшифровать это сообщение в других сессиях, если у них нет ключа для него.",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Для дополнительной безопасности подтвердите этого пользователя, сравнив одноразовый код на ваших устройствах.",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong>в %(roomName)s",
     "Start verification again from their profile.": "Начните подтверждение заново в профиле пользователя.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователя в его профиле.",
     "Send a Direct Message": "Отправить сообщение",
     "Light": "Светлая",
     "Dark": "Темная",
@@ -1994,10 +1707,6 @@
     "Signature upload failed": "Сбой отправки отпечатка",
     "Room name or address": "Имя или адрес комнаты",
     "Unrecognised room address:": "Не удалось найти адрес комнаты:",
-    "Use your account to sign in to the latest version": "Используйте свой аккаунт для входа в последнюю версию",
-    "We’re excited to announce Riot is now Element": "Мы рады объявить, что Riot теперь Element",
-    "Riot is now Element!": "Riot теперь Element!",
-    "Learn More": "Узнать больше",
     "Joins room with given address": "Присоединиться к комнате с указанным адресом",
     "Opens chat with the given user": "Открыть чат с данным пользователем",
     "Sends a message to the given user": "Отправить сообщение данному пользователю",
@@ -2005,118 +1714,53 @@
     "Verify your other session using one of the options below.": "Подтвердите другую сессию, используя один из вариантов ниже.",
     "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>.",
-    "I want to help": "Я хочу помочь",
-    "Review where you’re logged in": "Проверьте, где вы вошли",
-    "Verify all your sessions to ensure your account & messages are safe": "Подтвердите все свои сессии, чтобы убедиться, что ваша учетная запись и сообщения в безопасности",
     "Your homeserver has exceeded its user limit.": "Ваш домашний сервер превысил свой лимит пользователей.",
     "Your homeserver has exceeded one of its resource limits.": "Ваш домашний сервер превысил один из своих лимитов ресурсов.",
     "Are you sure you want to cancel entering passphrase?": "Вы уверены, что хотите отменить ввод пароля?",
     "Go Back": "Назад",
     "Contact your <a>server admin</a>.": "Обратитесь к <a>администратору сервера</a>.",
     "Ok": "Хорошо",
-    "Set password": "Установить пароль",
-    "To return to your account in future you need to set a password": "Чтобы вернуться в свой аккаунт в будущем, вам необходимо установить пароль",
     "New login. Was this you?": "Новый вход в вашу учётную запись. Это были Вы?",
-    "Verify the new login accessing your account: %(name)s": "Проверьте новый вход в вашу учётную запись: %(name)s",
-    "Restart": "Перезапустить",
-    "Upgrade your %(brand)s": "Обновите ваш %(brand)s",
-    "A new version of %(brand)s is available!": "Доступна новая версия %(brand)s!",
     "You joined the call": "Вы присоединились к звонку",
     "%(senderName)s joined the call": "%(senderName)s присоединился к звонку",
     "Call in progress": "Звонок в процессе",
-    "You left the call": "Вы покинули звонок",
-    "%(senderName)s left the call": "%(senderName)s покинул звонок",
     "Call ended": "Звонок завершён",
     "You started a call": "Вы начали звонок",
     "%(senderName)s started a call": "%(senderName)s начал(а) звонок",
     "Waiting for answer": "Ждём ответа",
     "%(senderName)s is calling": "%(senderName)s звонит",
-    "You created the room": "Вы создали комнату",
-    "%(senderName)s created the room": "%(senderName)s создал(а) комнату",
-    "You made the chat encrypted": "Вы включили шифрование в комнате",
-    "%(senderName)s made the chat encrypted": "%(senderName)s включил(а) шифрование в комнате",
-    "You made history visible to new members": "Вы сделали историю видимой для новых участников",
-    "%(senderName)s made history visible to new members": "%(senderName)s сделал(а) историю видимой для новых участников",
-    "You made history visible to anyone": "Вы сделали историю видимой для всех",
-    "%(senderName)s made history visible to anyone": "%(senderName)s сделал(а) историю видимой для всех",
-    "You made history visible to future members": "Вы сделали историю видимой для будущих участников",
-    "%(senderName)s made history visible to future members": "%(senderName)s сделал(а) историю видимой для будущих участников",
-    "You were invited": "Вы были приглашены",
-    "%(targetName)s was invited": "%(targetName)s был(а) приглашен(а)",
-    "You left": "Вы покинули комнату",
-    "%(targetName)s left": "%(targetName)s покинул комнату",
-    "You were kicked (%(reason)s)": "Вас исключили из комнаты (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s был(а) исключен(а) из комнаты (%(reason)s)",
-    "You were kicked": "Вас исключили из комнаты",
-    "%(targetName)s was kicked": "%(targetName)s был(а) исключен(а) из комнаты",
-    "You rejected the invite": "Вы отклонили приглашение",
-    "%(targetName)s rejected the invite": "%(targetName)s отклонил(а) приглашение",
-    "You were uninvited": "Вам отменили приглашение",
-    "%(targetName)s was uninvited": "Приглашение для %(targetName)s отменено",
-    "You were banned (%(reason)s)": "Вас забанили (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s был(а) исключен(а) из комнаты (%(reason)s)",
-    "You were banned": "Вас заблокировали",
-    "%(targetName)s was banned": "%(targetName)s был(а) забанен(а)",
-    "You joined": "Вы вошли",
-    "%(targetName)s joined": "%(targetName)s присоединился(ась)",
-    "You changed your name": "Вы поменяли своё имя",
-    "%(targetName)s changed their name": "%(targetName)s поменял(а) своё имя",
-    "You changed your avatar": "Вы поменяли свой аватар",
-    "%(targetName)s changed their avatar": "%(targetName)s поменял(а) свой аватар",
-    "You changed the room name": "Вы поменяли имя комнаты",
     "Enable experimental, compact IRC style layout": "Включить экспериментальный, компактный стиль IRC",
     "Unknown caller": "Неизвестный абонент",
-    "Incoming call": "Входящий звонок",
     "Waiting for your other session to verify…": "Ожидание вашей другой сессии для начала подтверждения…",
     "%(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 не может безопасно кэшировать зашифрованные сообщения локально во время работы в веб-браузере. Используйте <desktopLink>%(brand)s Desktop</desktopLink>, чтобы зашифрованные сообщения появились в результатах поиска.",
-    "There are advanced notifications which are not shown here.": "Есть расширенные уведомления, которые здесь не отображаются.",
-    "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, но они все еще применяются.",
     "New version available. <a>Update now.</a>": "Доступна новая версия. <a>Обновить сейчас.</a>",
     "Hey you. You're the best!": "Эй! Ты лучший!",
     "Size must be a number": "Размер должен быть числом",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Пользовательский размер шрифта может быть только между %(min)s pt и %(max)s pt",
     "Use between %(min)s pt and %(max)s pt": "Введите значение между %(min)s pt и %(max)s pt",
     "Message layout": "Макет сообщения",
-    "Compact": "Компактно",
     "Modern": "Новый",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Установите имя шрифта, установленного в вашей системе, и %(brand)s попытается его использовать.",
     "Customise your appearance": "Настройка внешнего вида",
-    "Reload": "Перезагрузить",
-    "Take picture": "Сделать снимок",
     "Remove for everyone": "Убрать для всех",
-    "Remove for me": "Убрать для меня",
     "User Status": "Статус пользователя",
     "Country Dropdown": "Выпадающий список стран",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "%(senderName)s changed the room name": "%(senderName)s изменил(а) название комнаты",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Вы отозвали приглашение %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s отозвал(а) приглашение %(targetName)s",
-    "You invited %(targetName)s": "Вы пригласили %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s пригласил(а) %(targetName)s",
-    "You changed the room topic": "Вы изменили тему комнаты",
-    "%(senderName)s changed the room topic": "%(senderName)s изменил(а) тему комнаты",
-    "Enable advanced debugging for the room list": "Разрешить расширенную отладку списка комнат",
     "Font size": "Размер шрифта",
     "Use custom size": "Использовать другой размер",
     "Use a more compact ‘Modern’ layout": "Использовать компактную 'современную' тему оформления",
     "Use a system font": "Использовать системный шрифт",
     "System font name": "Название системного шрифта",
-    "Incoming voice call": "Входящий звонок",
-    "Incoming video call": "Входящий видеозвонок",
     "Please verify the room ID or address and try again.": "Проверьте ID комнаты или адрес и попробуйте снова.",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и диалогах.",
-    "Make this room low priority": "Сделать эту комнату маловажной",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Маловажные комнаты отображаются в конце списка в отдельной секции",
     "People": "Люди",
     "%(networkName)s rooms": "Комнаты %(networkName)s",
     "Explore Public Rooms": "Просмотреть публичные комнаты",
-    "Search rooms": "Поиск комнат",
     "Where you’re logged in": "Где вы вошли",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Ниже вы можете изменить названия сессий или выйти из них, либо <a>подтвердите их в своём профиле</a>.",
-    "Create room": "Создать комнату",
     "Custom Tag": "Пользовательский тег",
     "Appearance": "Внешний вид",
     "Show rooms with unread messages first": "Комнаты с непрочитанными сообщениями в начале",
@@ -2130,8 +1774,6 @@
     "Favourited": "В избранном",
     "Leave Room": "Покинуть комнату",
     "Room options": "Настройки комнаты",
-    "Set a room address to easily share your room with other people.": "Присвойте комнате адрес, чтобы поделиться ею с другими людьми.",
-    "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.": "Вы можете ввести адрес домашнего сервера вручную, чтобы войти на другой сервер. Таким образом, вы сможете использовать %(brand)s с существующей учётной записью Matrix на другом сервере.",
     "Welcome to %(appName)s": "Добро пожаловать в %(appName)s",
     "Liberate your communication": "Освободите общение",
     "Create a Group Chat": "Создать групповой чат",
@@ -2139,7 +1781,6 @@
     "All settings": "Все настройки",
     "Feedback": "Отзыв",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
-    "New spinner design": "Новый дизайн спиннера",
     "Appearance Settings only affect this %(brand)s session.": "Настройки внешнего вида работают только в этой сессии %(brand)s.",
     "Emoji picker": "Смайлики",
     "Show %(count)s more|one": "Показать ещё %(count)s",
@@ -2167,7 +1808,6 @@
     "Widgets do not use message encryption.": "Виджеты не используют шифрование сообщений.",
     "QR Code": "QR код",
     "Room address": "Адрес комнаты",
-    "Please provide a room address": "Укажите адрес комнаты",
     "This address is available to use": "Этот адрес доступен",
     "This address is already in use": "Этот адрес уже используется",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Вы уверены, что хотите удалить <b>%(serverName)s</b>",
@@ -2191,7 +1831,6 @@
     "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 creating that address. It may not be allowed by the server or a temporary failure occurred.": "При создании этого адреса произошла ошибка. Это может быть запрещено сервером или произошел временный сбой.",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Произошла ошибка при удалении этого адреса. Возможно, он больше не существует или произошла временная ошибка.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Используя этот виджет, вы можете делиться данными <helpIcon /> с %(widgetDomain)s и вашим Менеджером Интеграции.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Используя этот виджет, вы можете делиться данными <helpIcon /> с %(widgetDomain)s.",
     "Can't find this server or its room list": "Не можем найти этот сервер или его список комнат",
     "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.": "Удаление ключей кросс-подписи является мгновенным и необратимым действием. Любой, с кем вы прошли проверку, увидит предупреждения безопасности. Вы почти наверняка не захотите этого делать, если только не потеряете все устройства, с которых можно совершать кросс-подпись.",
@@ -2206,19 +1845,15 @@
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Проверка этого устройства пометит его как доверенное, и пользователи, которые проверили его вместе с вами, будут доверять этому устройству.",
     "Integrations are disabled": "Интеграции отключены",
     "Integrations not allowed": "Интеграции не разрешены",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ваш %(brand)s не позволяет вам использовать для этого Менеджер Интеграции. Пожалуйста, свяжитесь с администратором.",
     "To continue, use Single Sign On to prove your identity.": "Чтобы продолжить, используйте единый вход, чтобы подтвердить свою личность.",
     "Confirm to continue": "Подтвердите, чтобы продолжить",
     "Click the button below to confirm your identity.": "Нажмите кнопку ниже, чтобы подтвердить свою личность.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Не удалось пригласить в чат этих пользователей: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Мы не смогли создать ваши ЛС. Пожалуйста, проверьте пользователей, которых вы хотите пригласить, и повторите попытку.",
     "Something went wrong trying to invite the users.": "Пытаясь пригласить пользователей, что-то пошло не так.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Мы не могли пригласить этих пользователей. Пожалуйста, проверьте пользователей, которых вы хотите пригласить, и повторите попытку.",
     "Failed to find the following users": "Не удалось найти этих пользователей",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следующие пользователи могут не существовать или быть недействительными и не могут быть приглашены: %(csvNames)s",
     "Recently Direct Messaged": "Недавно отправленные личные сообщения",
     "Go": "Вперёд",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Пригласите кого-нибудь, используя свое имя, имя пользователя (например, <userId/>), адрес электронной почты или <a>поделиться этой комнатой</a>.",
     "a new master key signature": "новая подпись мастер-ключа",
     "a new cross-signing key signature": "новый ключ подписи для кросс-подписи",
     "a device cross-signing signature": "подпись устройства для кросс-подписи",
@@ -2226,20 +1861,6 @@
     "Confirm by comparing the following with the User Settings in your other session:": "Подтвердите, сравнив следующие параметры с настройками пользователя в другой вашей сессии:",
     "Confirm this user's session by comparing the following with their User Settings:": "Подтвердите сессию этого пользователя, сравнив следующие параметры с его пользовательскими настройками:",
     "If they don't match, the security of your communication may be compromised.": "Если они не совпадают, безопасность вашего общения может быть поставлена под угрозу.",
-    "Your password": "Ваш пароль",
-    "This session, or the other session": "Эта сессия или другая сессия",
-    "The internet connection either session is using": "Подключение к интернету, используемое любой из сессий",
-    "We recommend you change your password and recovery key in Settings immediately": "Мы рекомендуем вам немедленно изменить свой пароль и ключ восстановления в настройках",
-    "New session": "Новая сессия",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Используйте эту сессию для проверки новой сессии, чтобы предоставить ей доступ к зашифрованным сообщениям:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Если вы не входили в эту сессию, ваша учетная запись может быть скомпрометирована.",
-    "This wasn't me": "Это был не я",
-    "Use your account to sign in to the latest version of the app at <a />": "Используйте свою учетную запись для входа в последнюю версию приложения по адресу <a />",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Вы уже вошли в систему и можете остаться здесь, но вы также можете получить последние версии приложения на всех платформах по адресу <a>element.io/get-started</a>.",
-    "Go to Element": "Перейти к Element",
-    "We’re excited to announce Riot is now Element!": "Мы рады сообщить, что Riot теперь стал Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Узнайте больше на сайте  <a>element.io/previously-riot</a>",
-    "Automatically invite users": "Автоматически приглашать пользователей",
     "Upgrade private room": "Модернизировать приватную комнату",
     "Upgrade public room": "Модернизировать публичную комнату",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Модернизация комнаты - это расширенное действие, которое обычно рекомендуется, когда комната нестабильна из-за ошибок, отсутствующих функций или уязвимостей безопасности.",
@@ -2257,35 +1878,21 @@
     "A connection error occurred while trying to contact the server.": "Произошла ошибка при подключении к серверу.",
     "The server is not configured to indicate what the problem is (CORS).": "Сервер не настроен должным образом, чтобы определить проблему (CORS).",
     "Recent changes that have not yet been received": "Последние изменения, которые еще не были получены",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Это позволит вам вернуться в свою учетную запись после выхода из системы и войти в другие сессии.",
-    "Verify other session": "Проверьте другую сессию",
     "Verification Request": "Запрос на подтверждение",
     "Wrong file type": "Неправильный тип файла",
     "Looks good!": "Выглядит неплохо!",
-    "Wrong Recovery Key": "Неверный ключ восстановления",
-    "Invalid Recovery Key": "Неверный ключ восстановления",
     "Security Phrase": "Секретная фраза",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Невозможно получить доступ к секретному хранилищу. Пожалуйста, убедитесь, что вы ввели правильную парольную фразу восстановления.",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Введите свою секретную фразу или <button>Используйте ваш ключ безопасности</button>, чтобы продолжить.",
     "Security Key": "Ключ безопасности",
     "Use your Security Key to continue.": "Чтобы продолжить, используйте свой ключ безопасности.",
     "Restoring keys from backup": "Восстановление ключей из резервной копии",
     "Fetching keys from server...": "Получение ключей с сервера...",
     "%(completed)s of %(total)s keys restored": "%(completed)s из %(total)s ключей восстановлено",
-    "Recovery key mismatch": "Несоответствие ключа восстановления",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Резервная копия не может быть расшифрована с помощью этого ключа восстановления: пожалуйста, убедитесь, что вы ввели правильный ключ восстановления.",
-    "Incorrect recovery passphrase": "Неверная парольная фраза восстановления",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Резервная копия не может быть расшифрована с помощью этой парольной фразы восстановления: пожалуйста, убедитесь, что вы ввели правильную парольную фразу восстановления.",
     "Keys restored": "Ключи восстановлены",
     "Successfully restored %(sessionCount)s keys": "Успешно восстановлено %(sessionCount)s ключей",
-    "Enter recovery key": "Введите ключ восстановления",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Предупреждение</b>: вы должны настроивать резервное копирование ключей только с доверенного компьютера.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Если вы забыли свой ключ восстановления, вы можете <button>настроить новые параметры восстановления</button>",
-    "Address (optional)": "Адрес (необязательно)",
     "Confirm your identity by entering your account password below.": "Подтвердите свою личность, введя пароль учетной записи ниже.",
-    "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>.": "Укажите путь к вашему серверу Element Matrix Services. Он может использовать ваше собственное доменное имя или быть поддоменом <a>element.io</a>.",
     "Sign in with SSO": "Вход с помощью SSO",
-    "Self-verification request": "Запрос самопроверки",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Удалить адрес комнаты %(alias)s и удалить %(name)s из каталога?",
     "delete the address.": "удалить адрес.",
     "Switch theme": "Сменить тему",
@@ -2297,18 +1904,8 @@
     "Syncing...": "Синхронизация…",
     "Signing In...": "Выполняется вход...",
     "If you've joined lots of rooms, this might take a while": "Если вы присоединились к большому количеству комнат, это может занять некоторое время",
-    "Use Recovery Key or Passphrase": "Используйте ключ восстановления или парольную фразу",
-    "Use Recovery Key": "Используйте ключ восстановления",
-    "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:": "Для этого требуется последняя версия %(brand)s на других ваших устройствах:",
-    "%(brand)s Web": "Веб-версия %(brand)s",
-    "%(brand)s Desktop": "Настольный клиент %(brand)s",
-    "%(brand)s iOS": "iOS клиент %(brand)s",
-    "%(brand)s X for Android": "%(brand)s X для Android",
-    "or another cross-signing capable Matrix client": "или другой, поддерживаемый кросс-подпись Matrix клиент",
     "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.": "Ваша новая сессия теперь проверена. Другие пользователи будут считать её доверенной.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Без подтверждения этой сессии, у неё не будет доступа к зашифрованным сообщениям.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Восстановите доступ к своей учетной записи и восстановите ключи шифрования, хранящиеся в этой сессии. Без них вы не сможете прочитать никакие защищённые сообщения ни в одной сессии.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Предупреждение: ваши личные данные (включая ключи шифрования) всё ещё хранятся в этой сессии. Удалите их, если вы хотите завершить эту сессию или войти в другую учетную запись.",
     "Confirm encryption setup": "Подтвердите настройку шифрования",
@@ -2325,32 +1922,20 @@
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Модернизируйте эту сессию, чтобы она могла проверять другие сессии, предоставляя им доступ к зашифрованным сообщениям и помечая их как доверенные для других пользователей.",
     "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.": "Введите секретную фразу, известную только вам, поскольку она используется для защиты ваших данных. Для безопасности фраза должна отличаться от пароля вашей учетной записи.",
     "Use a different passphrase?": "Используйте другой пароль?",
-    "Confirm your recovery passphrase": "Подтвердите пароль для восстановления",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе, так как он используется для защиты ваших зашифрованных данных.",
     "Copy": "Копировать",
     "Unable to query secret storage status": "Невозможно запросить состояние секретного хранилища",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Если вы отмените сейчас, вы можете потерять зашифрованные сообщения и данные, если потеряете доступ к своим логинам.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Вы также можете настроить безопасное резервное копирование и управлять своими ключами в настройках.",
-    "Set up Secure backup": "Настройка безопасного резервного копирования",
     "Upgrade your encryption": "Обновите свое шифрование",
     "Set a Security Phrase": "Задайте секретную фразу",
     "Confirm Security Phrase": "Подтвердите секретную фразу",
     "Save your Security Key": "Сохраните свой ключ безопасности",
     "Unable to set up secret storage": "Невозможно настроить секретное хранилище",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию с помощью пароля восстановления.",
-    "Set up with a recovery key": "Настройка с помощью ключа восстановления",
-    "Repeat your recovery passphrase...": "Настройка с помощью ключа восстановления повторите свой пароль восстановления...",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Ваш ключ восстановления - это защитная сетка - вы можете использовать его для восстановления доступа к зашифрованным сообщениям, если забудете пароль восстановления.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Храните его копию в надежном месте, например, в менеджере паролей или даже в сейфе.",
-    "Your recovery key": "Ваш ключ восстановления",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ваш ключ восстановления был <b>скопирован в буфер обмена</b>, вставьте его в:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Ваш ключ восстановления находится в папке <b>Загрузки</b>.",
     "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.": "Без настройки безопасного восстановления сообщений вы не сможете восстановить свою зашифрованную историю сообщений, если выйдете из системы или воспользуетесь другой сессией.",
-    "Secure your backup with a recovery passphrase": "Защитите свою резервную копию с помощью пароля восстановления",
-    "Make a copy of your recovery key": "Сделайте копию вашего ключа восстановления",
     "Create key backup": "Создать резервную копию ключа",
     "This session is encrypting history using the new recovery method.": "Эта сессия шифрует историю с помощью нового метода восстановления.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Эта сессия обнаружила, что ваша парольная фраза восстановления и ключ для защищенных сообщений были удалены.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Если вы сделали это по ошибке, вы можете настроить безопасные сообщения в этой сессии, которая перешифрует историю сообщений в этой сессии с помощью нового метода восстановления.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Если этот параметр отключен, сообщения из зашифрованных комнат не будут отображаться в результатах поиска.",
     "Disable": "Отключить",
@@ -2403,8 +1988,6 @@
     "No files visible in this room": "Нет видимых файлов в этой комнате",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Прикрепите файлы из чата или просто перетащите их в комнату.",
     "You’re all caught up": "Нет непрочитанных сообщений",
-    "You have no visible notifications in this room.": "Нет видимых уведомлений в этой комнате.",
-    "%(brand)s Android": "%(brand)s Android",
     "Master private key:": "Приватный мастер-ключ:",
     "Show message previews for reactions in DMs": "Показывать превью сообщений для реакций в ЛС",
     "Show message previews for reactions in all rooms": "Показывать предварительный просмотр сообщений для реакций во всех комнатах",
@@ -2439,9 +2022,6 @@
     "An image will help people identify your community.": "Изображение поможет людям идентифицировать ваше сообщество.",
     "Create a room in %(communityName)s": "Создать комнату в %(communityName)s",
     "Create community": "Создать сообщество",
-    "Cross-signing and secret storage are ready for use.": "Кросс-подпись и секретное хранилище готовы к использованию.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Кросс-подпись готова к использованию, но секретное хранилище в настоящее время не используется для резервного копирования ваших ключей.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Приватные комнаты можно найти и присоединиться только по приглашению. Публичные комнаты может найти и присоединиться к ним кто угодно.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Приватные комнаты можно найти и присоединиться только по приглашению. Публичные комнаты могут находить и присоединяться к ним любые участники этого сообщества.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Вы можете включить это, если комната будет использоваться только для совместной работы с внутренними командами на вашем домашнем сервере. Это не может быть изменено позже.",
     "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.": "Вы можете отключить это, если комната будет использоваться для совместной работы с внешними командами, у которых есть собственный домашний сервер. Это не может быть изменено позже.",
@@ -2449,7 +2029,6 @@
     "There was an error updating your community. The server is unable to process your request.": "Произошла ошибка в обновлении вашего сообщества. Сервер не может обработать ваш запрос.",
     "Update community": "Обновить сообщество",
     "May include members not in %(communityName)s": "Может включать участников, не входящих в %(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>.": "Начните разговор с кем-нибудь, используя имя, имя пользователя (например, <userId/>) или адрес электронной почты. Это не пригласит их в %(communityName)s. Чтобы пригласить кого-нибудь в %(communityName)s, нажмите <a>здесь</a>.",
     "Failed to find the general chat for this community": "Не удалось найти общий чат для этого сообщества",
     "Community settings": "Настройки сообщества",
     "User settings": "Пользовательские настройки",
@@ -2459,10 +2038,6 @@
     "Unknown App": "Неизвестное приложение",
     "%(count)s results|one": "%(count)s результат",
     "Room Info": "Информация о комнате",
-    "Apps": "Приложения",
-    "Unpin app": "Открепить приложение",
-    "Edit apps, bridges & bots": "Редактировать приложения, мосты и ботов",
-    "Add apps, bridges & bots": "Добавить приложения, мосты и ботов",
     "Not encrypted": "Не зашифровано",
     "About": "О приложение",
     "%(count)s people|other": "%(count)s человек",
@@ -2470,34 +2045,22 @@
     "Show files": "Показать файлы",
     "Room settings": "Настройки комнаты",
     "Take a picture": "Сделать снимок",
-    "Pin to room": "Закрепить в комнате",
-    "You can only pin 2 apps at a time": "Вы можете закрепить только 2 приложения за раз",
     "Unpin": "Открепить",
     "Cross-signing is ready for use.": "Кросс-подпись готова к использованию.",
     "Cross-signing is not set up.": "Кросс-подпись не настроена.",
     "Backup version:": "Версия резервной копии:",
     "Algorithm:": "Алгоритм:",
-    "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.": "Сделайте резервную копию ключей шифрования с данными вашей учетной записи на случай, если вы потеряете доступ к своим сеансам. Ваши ключи будут защищены уникальным ключом восстановления.",
     "Backup key stored:": "Резервный ключ сохранён:",
     "Backup key cached:": "Резервный ключ кэширован:",
     "Secret storage:": "Секретное хранилище:",
     "ready": "готов",
     "not ready": "не готов",
     "Secure Backup": "Безопасное резервное копирование",
-    "Group call modified by %(senderName)s": "%(senderName)s изменил(а) групповой вызов",
-    "Group call started by %(senderName)s": "Групповой вызов начат %(senderName)s",
-    "Group call ended by %(senderName)s": "%(senderName)s завершил(а) групповой вызов",
-    "End Call": "Завершить звонок",
-    "Remove the group call from the room?": "Удалить групповой вызов из комнаты?",
-    "You don't have permission to remove the call from the room": "У вас нет разрешения на удаление звонка из комнаты",
     "Safeguard against losing access to encrypted messages & data": "Защита от потери доступа к зашифрованным сообщениям и данным",
     "not found in storage": "не найдено в хранилище",
     "Widgets": "Виджеты",
     "Edit widgets, bridges & bots": "Редактировать виджеты, мосты и ботов",
     "Add widgets, bridges & bots": "Добавить виджеты, мосты и ботов",
-    "You can only pin 2 widgets at a time": "Вы можете закрепить только 2 виджета за раз",
-    "Minimize widget": "Свернуть виджет",
-    "Maximize widget": "Развернуть виджет",
     "Your server requires encryption to be enabled in private rooms.": "Вашему серверу необходимо включить шифрование в приватных комнатах.",
     "Start a conversation with someone using their name or username (like <userId/>).": "Начните разговор с кем-нибудь, используя его имя или имя пользователя (например, <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Это не пригласит их в %(communityName)s. Чтобы пригласить кого-нибудь в %(communityName)s, нажмите <a>здесь</a>",
@@ -2518,10 +2081,6 @@
     "This will end the conference for everyone. Continue?": "Это завершит конференцию для всех. Продолжить?",
     "Failed to save your profile": "Не удалось сохранить ваш профиль",
     "The operation could not be completed": "Операция не может быть выполнена",
-    "Calling...": "Звонок…",
-    "Call connecting...": "Устанавливается соединение…",
-    "Starting camera...": "Запуск камеры…",
-    "Starting microphone...": "Запуск микрофона…",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Все серверы запрещены к участию! Эта комната больше не может быть использована.",
     "Remove messages sent by others": "Удалить сообщения, отправленные другими",
     "Offline encrypted messaging using dehydrated devices": "Автономный обмен зашифрованными сообщениями с сохранёнными устройствами",
@@ -2535,17 +2094,11 @@
     "You can only pin up to %(count)s widgets|other": "Вы можете закрепить не более %(count)s виджетов",
     "Show Widgets": "Показать виджеты",
     "Hide Widgets": "Скрыть виджеты",
-    "%(senderName)s declined the call.": "%(senderName)s отклонил(а) вызов.",
-    "(an error occurred)": "(произошла ошибка)",
-    "(their device couldn't start the camera / microphone)": "(их устройство не может запустить камеру / микрофон)",
-    "(connection failed)": "(ошибка соединения)",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s изменил(а) серверные разрешения для этой комнаты.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s устанавливает серверные разрешения для этой комнаты.",
     "The call was answered on another device.": "На звонок ответили на другом устройстве.",
     "Answered Elsewhere": "Ответил в другом месте",
     "The call could not be established": "Звонок не может быть установлен",
-    "The other party declined the call.": "Другой абонент отклонил звонок.",
-    "Call Declined": "Вызов отклонён",
     "Send feedback": "Отправить отзыв",
     "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "СОВЕТ ДЛЯ ПРОФЕССИОНАЛОВ: если вы запустите ошибку, отправьте <debugLogsLink>журналы отладки</debugLogsLink>, чтобы помочь нам отследить проблему.",
     "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Сначала просмотрите <existingIssuesLink>существующий список ошибок в Github</existingIssuesLink>. Нет совпадений? <newIssueLink>Открыть новую</newIssueLink>.",
@@ -2567,7 +2120,6 @@
     "Open the link in the email to continue registration.": "Откройте ссылку в письме, чтобы продолжить регистрацию.",
     "A confirmation email has been sent to %(emailAddress)s": "Письмо с подтверждением отправлено на %(emailAddress)s",
     "Start a new chat": "Начать новый чат",
-    "Role": "Роль",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Сообщения в этой комнате полностью зашифрованы. Когда люди присоединяются, вы можете проверить их в их профиле, просто нажмите на их аватар.",
     "This is the start of <roomName/>.": "Это начало <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Добавьте фото, чтобы люди могли легко заметить вашу комнату.",
@@ -2595,9 +2147,7 @@
     "No other application is using the webcam": "Никакое другое приложение не использует веб-камеру",
     "Permission is granted to use the webcam": "Разрешение на использование еб-камеры предоставлено",
     "A microphone and webcam are plugged in and set up correctly": "Микрофон и веб-камера подключены и правильно настроены",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "Вызов не удался, потому что не удалось получить доступ к веб-камере или микрофону. Проверьте это:",
     "Unable to access webcam / microphone": "Невозможно получить доступ к веб-камере / микрофону",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Вызов не удался, потому что нет доступа к микрофону. Убедитесь, что микрофон подключен и правильно настроен.",
     "Unable to access microphone": "Нет доступа к микрофону",
     "Video Call": "Видеовызов",
     "Voice Call": "Голосовой вызов",
@@ -2614,7 +2164,6 @@
     "Sign into your homeserver": "Войдите на свой домашний сервер",
     "with state key %(stateKey)s": "с ключом состояния %(stateKey)s",
     "%(creator)s created this DM.": "%(creator)s начал(а) этот чат.",
-    "Show chat effects": "Показать эффекты чата",
     "Host account on": "Ваша учётная запись обслуживается",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s или %(usernamePassword)s",
     "Continuing without email": "Продолжить без электронной почты",
@@ -2961,7 +2510,6 @@
     "Resume": "Возобновить",
     "%(peerName)s held the call": "%(peerName)s удерживает звонок",
     "You held the call <a>Resume</a>": "Вы удерживаете звонок <a>Возобновить</a>",
-    "%(name)s paused": "%(name)s приостановлен",
     "You've reached the maximum number of simultaneous calls.": "Вы достигли максимального количества одновременных звонков.",
     "Too Many Calls": "Слишком много звонков",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Добавляет ┬──┬ ノ( ゜-゜ノ) в начало сообщения",
@@ -2980,7 +2528,6 @@
     "Active Widgets": "Активные виджеты",
     "Open dial pad": "Открыть панель набора номера",
     "Dial pad": "Панель набора номера",
-    "Start a Conversation": "Начать разговор",
     "There was an error looking up the phone number": "При поиске номера телефона произошла ошибка",
     "Unable to look up phone number": "Невозможно найти номер телефона",
     "Change which room, message, or user you're viewing": "Измените комнату, сообщение или пользователя, которого вы просматриваете",
@@ -2997,13 +2544,11 @@
     "Your Security Key": "Ваш ключ безопасности",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Ваш ключ безопасности является защитной сеткой - вы можете использовать его для восстановления доступа к своим зашифрованным сообщениям, если вы забыли секретную фразу.",
     "Repeat your Security Phrase...": "Повторите секретную фразу…",
-    "Please enter your Security Phrase a second time to confirm.": "Пожалуйста, введите секретную фразу второй раз для подтверждения.",
     "Set up with a Security Key": "Настройка с помощью ключа безопасности",
     "Great! This Security Phrase looks strong enough.": "Отлично! Эта контрольная фраза выглядит достаточно сильной.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию с помощью секретной фразы.",
     "Use Security Key": "Используйте ключ безопасности",
     "Use Security Key or Phrase": "Используйте ключ безопасности или секретную фразу",
-    "Upgrade to pro": "Перейти на Pro",
     "Allow this widget to verify your identity": "Разрешите этому виджету проверить ваш идентификатор",
     "Something went wrong in confirming your identity. Cancel and try again.": "Что-то пошло не так при вашей идентификации. Отмените последнее действие и попробуйте еще раз.",
     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Если вы забыли свой ключ безопасности, вы можете <button>настроить новые параметры восстановления</button>",
@@ -3023,7 +2568,6 @@
     "Wrong Security Key": "Неправильный ключ безопасности",
     "Remember this": "Запомнить это",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "Виджет проверит ваш идентификатор пользователя, но не сможет выполнять за вас действия:",
-    "We recommend you change your password and Security Key in Settings immediately": "Мы рекомендуем вам немедленно сменить пароль и ключ безопасности в настройках",
     "Minimize dialog": "Свернуть диалог",
     "Maximize dialog": "Развернуть диалог",
     "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Настройка",
@@ -3036,14 +2580,9 @@
     "Abort": "Отмена",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Вы уверены, что хотите прервать создание хоста? Процесс не может быть продолжен.",
     "Confirm abort of host creation": "Подтвердите отмену создания хоста",
-    "Windows": "Окна",
-    "Screens": "Экраны",
-    "Share your screen": "Поделитесь своим экраном",
     "Set my room layout for everyone": "Установить мой макет комнаты для всех",
     "Recently visited rooms": "Недавно посещённые комнаты",
     "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.": "Сделайте резервную копию ключей шифрования с данными вашей учетной записи на случай, если вы потеряете доступ к своим сеансам. Ваши ключи будут защищены уникальным ключом безопасности.",
-    "Use Ctrl + F to search": "Нажмите Ctrl + F для поиска",
-    "Use Command + F to search": "Нажмите Command (⌘) + F для поиска",
     "Show line numbers in code blocks": "Показывать номера строк в блоках кода",
     "Expand code blocks by default": "По умолчанию отображать блоки кода целиком",
     "Show stickers button": "Показать кнопку стикеров",
@@ -3082,7 +2621,6 @@
     "%(count)s members|one": "%(count)s участник",
     "%(count)s members|other": "%(count)s участников",
     "You don't have permission": "У вас нет разрешения",
-    "Open": "Открыть",
     "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>, чтобы продолжить использование сервиса.",
     "%(count)s messages deleted.|one": "%(count)s сообщение удалено.",
     "%(count)s messages deleted.|other": "%(count)s сообщений удалено.",
@@ -3093,9 +2631,7 @@
     "Failed to start livestream": "Не удалось запустить прямую трансляцию",
     "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.": "Не удалось сохранить настройки пространства.",
@@ -3106,21 +2642,14 @@
     "Unnamed Space": "Безымянное пространство",
     "Invite to %(spaceName)s": "Пригласить в %(spaceName)s",
     "Setting definition:": "Установка определения:",
-    "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": "Выбор пространства",
     "Edit devices": "Редактировать устройства",
     "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.": "Вы не сможете отменить это изменение, поскольку вы понижаете свои права, если вы являетесь последним привилегированным пользователем в пространстве, будет невозможно восстановить привилегии вбудущем.",
     "Invite People": "Пригласить людей",
     "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": "У вас нет разрешений для создания новых комнат в этом пространстве",
@@ -3131,11 +2660,8 @@
     "Sending your message...": "Отправка вашего сообщения…",
     "Spell check dictionaries": "Словари для проверки орфографии",
     "Space options": "Настройки пространства",
-    "Space Home": "Домашняя страница пространства",
-    "New room": "Новая комната",
     "Leave space": "Покинуть пространство",
     "Share your public space": "Поделитесь своим публичным пространством",
-    "Invite members": "Пригласить участников",
     "Invite with email or username": "Пригласить по электронной почте или имени пользователя",
     "Invite people": "Пригласить людей",
     "Share invite link": "Поделиться ссылкой на приглашение",
@@ -3143,7 +2669,6 @@
     "Collapse space panel": "Свернуть панель пространств",
     "Expand space panel": "Развернуть панель пространств",
     "Creating...": "Создание…",
-    "You can change this later": "Вы можете изменить это позже",
     "You can change these anytime.": "Вы можете изменить их в любое время.",
     "Add some details to help people recognise it.": "Добавьте некоторые подробности, чтобы помочь людям узнать его.",
     "Your private space": "Ваше приватное пространство",
@@ -3153,23 +2678,16 @@
     "Open space for anyone, best for communities": "Открытое пространство для всех, лучший вариант для сообществ",
     "Public": "Публичное",
     "Create a space": "Создать пространство",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Пространства являются новыми способами группировки комнат и людей. Чтобы присоединиться к существующему пространству, вам понадобится приглашение.",
     "Delete": "Удалить",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "От %(deviceName)s (%(deviceId)s) %(ip)s",
     "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.": "Прототип пространства. Несовместимо с сообществами, сообществами версии 2 и пользовательскими тегами. Требуется совместимый домашний сервер для некоторых функций.",
     "Check your devices": "Проверьте ваши устройства",
     "You have unverified logins": "У вас есть непроверенные входы в систему",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Новый вход в систему через вашу учётную запись: %(name)s (%(deviceID)s) %(ip)s",
     "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": "Уже в вызове",
     "Original event source": "Оригинальный исходный код",
     "Decrypted event source": "Расшифрованный исходный код",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s комната и %(numSpaces)s пространств",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s комнат и %(numSpaces)s пространств",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Если вы не можете найти комнату, попросите приглашение или <a>создайте новую комнату</a>.",
     "Values at explicit levels in this room:": "Значения уровня чувствительности в этой комнате:",
     "Values at explicit levels:": "Значения уровня чувствительности:",
     "Values at explicit levels in this room": "Значения уровня чувствительности в этой комнате",
@@ -3198,18 +2716,427 @@
     "Random": "Случайный",
     "Welcome to <name/>": "Добро пожаловать в <name/>",
     "Your server does not support showing space hierarchies.": "Ваш сервер не поддерживает отображение пространственных иерархий.",
-    "Add existing rooms & spaces": "Добавить существующие комнаты и пространства",
     "Private space": "Приватное пространство",
     "Public space": "Публичное пространство",
     "<inviter/> invites you": "<inviter/> пригласил(а) тебя",
-    "Search names and description": "Искать имена и описание",
     "You may want to try a different search or check for typos.": "Вы можете попробовать другой поиск или проверить опечатки.",
     "No results found": "Результаты не найдены",
     "Mark as suggested": "Отметить как рекомендуется",
     "Mark as not suggested": "Отметить как не рекомендуется",
     "Removing...": "Удаление…",
     "Failed to remove some rooms. Try again later": "Не удалось удалить несколько комнат. Попробуйте позже",
-    "%(count)s rooms and 1 space|one": "%(count)s комната и одно пространство",
-    "%(count)s rooms and 1 space|other": "%(count)s комнат и одно пространство",
-    "Sends the given message as a spoiler": "Отправить данное сообщение под спойлером"
+    "Sends the given message as a spoiler": "Отправить данное сообщение под спойлером",
+    "Play": "Воспроизведение",
+    "Pause": "Пауза",
+    "Connecting": "Подключение",
+    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Разрешить прямые соединения для вызовов 1:1 (при включении данной опции другая сторона может узнать ваш IP адрес)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s с %(ip)s",
+    "The user you called is busy.": "Вызываемый пользователь занят.",
+    "User Busy": "Пользователь занят",
+    "Integration manager": "Менеджер интеграции",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Ваш %(brand)s не позволяет вам использовать для этого Менеджер Интеграции. Пожалуйста, свяжитесь с администратором.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Используя этот виджет, вы можете делиться данными <helpIcon /> с %(widgetDomain)s и вашим Менеджером Интеграции.",
+    "Identity server is": "Сервер идентификации",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджеры интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями для управления ботами, виджетами и стикерами.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и стикерами.",
+    "Identity server": "Сервер идентификаций",
+    "Identity server (%(server)s)": "Сервер идентификации (%(server)s)",
+    "Could not connect to identity server": "Не удалось подключиться к серверу идентификации",
+    "Not a valid identity server (status code %(code)s)": "Неправильный Сервер идентификации (код статуса %(code)s)",
+    "Identity server URL must be HTTPS": "URL-адрес сервера идентификации должен быть HTTPS",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Общение с %(transferTarget)s. <a>Перевод на %(transferee)s</a>",
+    "[number]": "[номер]",
+    "Enter your Security Phrase a second time to confirm it.": "Введите секретную фразу второй раз, чтобы подтвердить ее.",
+    "Space Autocomplete": "Автозаполнение пространства",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Без проверки вы не сможете получить доступ ко всем своим сообщениям и можете показаться другим людям недоверенным.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Проверьте свою личность, чтобы получить доступ к зашифрованным сообщениям и доказать свою личность другим.",
+    "Use another login": "Используйте другой логин",
+    "Please choose a strong password": "Пожалуйста, выберите надежный пароль",
+    "Currently joining %(count)s rooms|one": "Сейчас вы присоединяетесь к %(count)s комнате",
+    "Currently joining %(count)s rooms|other": "Сейчас вы присоединяетесь к %(count)s комнатам",
+    "You can add more later too, including already existing ones.": "Позже можно добавить и другие, в том числе уже существующие.",
+    "Let's create a room for each of them.": "Давайте создадим для каждого из них отдельную комнату.",
+    "What are some things you want to discuss in %(spaceName)s?": "Какие вещи вы хотите обсуждать в %(spaceName)s?",
+    "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Это экспериментальная функция.</b> Пока что новые пользователи, получившие приглашение, должны будут открыть приглашение на <link/>, чтобы присоединиться.",
+    "We're working on this, but just want to let you know.": "Мы работаем над этим, но просто хотим, чтобы вы знали.",
+    "Teammates might not be able to view or join any private rooms you make.": "Члены команды могут не иметь возможности просматривать или присоединяться к созданным вами личным комнатам.",
+    "Go to my space": "В моё пространство",
+    "Search for rooms or spaces": "Поиск комнат или пространств",
+    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Выберите комнаты или разговоры для добавления. Это просто место для вас, никто не будет проинформирован. Вы можете добавить больше позже.",
+    "What do you want to organise?": "Что вы хотели бы организовать?",
+    "To view %(spaceName)s, you need an invite": "Для просмотра %(spaceName)s необходимо приглашение",
+    "Search names and descriptions": "Искать имена и описания",
+    "Select a room below first": "Сначала выберите комнату ниже",
+    "You can select all or individual messages to retry or delete": "Вы можете выбрать все или отдельные сообщения для повторной попытки или удаления",
+    "Retry all": "Повторить все",
+    "Delete all": "Удалить все",
+    "Some of your messages have not been sent": "Некоторые из ваших сообщений не были отправлены",
+    "Filter all spaces": "Отфильтровать все пространства",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Попробуйте использовать другие слова или проверьте опечатки. Некоторые результаты могут быть не видны, так как они приватные и для участия в них необходимо приглашение.",
+    "No results for \"%(query)s\"": "Нет результатов для \"%(query)s\"",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Вы можете в любой момент нажать на аватар в панели фильтров, чтобы увидеть только комнаты и людей, связанных с этим сообществом.",
+    "Verification requested": "Запрос на проверку отправлен",
+    "Unable to copy a link to the room to the clipboard.": "Не удалось скопировать ссылку на комнату в буфер обмена.",
+    "Unable to copy room link": "Не удалось скопировать ссылку на комнату",
+    "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Вы здесь единственный человек. Если вы уйдете, никто не сможет присоединиться в будущем, включая вас.",
+    "Error downloading audio": "Ошибка загрузки аудио",
+    "Unnamed audio": "Безымянное аудио",
+    "Avatar": "Аватар",
+    "Join the beta": "Присоединиться к бета-версии",
+    "Leave the beta": "Покинуть бета-версию",
+    "Beta": "Бета",
+    "Tap for more info": "Нажмите для получения дополнительной информации",
+    "Spaces is a beta feature": "Пространства - это бета функция",
+    "Move down": "Опустить",
+    "Move up": "Поднять",
+    "Manage & explore rooms": "Управление и список комнат",
+    "Add space": "Добавить простанство",
+    "Report": "Сообщить",
+    "Collapse reply thread": "Свернуть ответы",
+    "Show preview": "Предпросмотр",
+    "View source": "Исходный код",
+    "Forward": "Переслать",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Если вы сбросите все настройки, вы перезагрузитесь без доверенных сессий, без доверенных пользователей и, возможно, не сможете просматривать прошлые сообщения.",
+    "Only do this if you have no other device to complete verification with.": "Делайте это только в том случае, если у вас нет другого устройства для завершения проверки.",
+    "Reset everything": "Сбросить все",
+    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Забыли или потеряли все методы восстановления? <a>Сбросить все</a>",
+    "Verify other login": "Подтвердить другой вход",
+    "Settings - %(spaceName)s": "Настройки - %(spaceName)s",
+    "Reset event store": "Сброс хранилища событий",
+    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Если вы это сделаете, обратите внимание, что ни одно из ваших сообщений не будет удалено, но работа поиска может быть ухудшена на несколько мгновений, пока индекс не будет воссоздан",
+    "You most likely do not want to reset your event index store": "Скорее всего, вы не захотите сбрасывать индексное хранилище событий",
+    "Reset event store?": "Сбросить хранилище событий?",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>При обновлении будет создана новая версия комнаты</b>. Все текущие сообщения останутся в этой архивной комнате.",
+    "Automatically invite members from this room to the new one": "Автоматическое приглашение участников из этой комнаты в новую комнату",
+    "Report the entire room": "Сообщить обо всей комнате",
+    "Spam or propaganda": "Спам или пропаганда",
+    "Illegal Content": "Незаконный контент",
+    "Toxic Behaviour": "Токсичное поведение",
+    "Disagree": "Я не согласен с содержанием",
+    "Please pick a nature and describe what makes this message abusive.": "Пожалуйста, выберите характер и опишите, что делает это сообщение оскорбительным.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Любая другая причина. Пожалуйста, опишите проблему.\nОб этом будет сообщено модераторам комнаты.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Эта комната посвящена незаконному или токсичному контенту, или модераторы не справляются с модерацией незаконного или токсичного контента.\n Об этом будет сообщено администраторам %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Эта комната посвящена незаконному или токсичному контенту, или модераторы не справляются с модерацией незаконного или токсичного контента.\nОб этом будет сообщено администраторам %(homeserver)s. Администраторы НЕ смогут прочитать зашифрованное содержимое этой комнаты.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Этот пользователь спамит комнату рекламой, ссылками на рекламу или пропагандой.\nОб этом будет сообщено модераторам комнаты.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Этот пользователь демонстрирует незаконное поведение, например, домогается до людей или угрожает насилием.\nОб этом будет сообщено модераторам комнаты, которые могут передать дело в юридические органы.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Этот пользователь демонстрирует токсичное поведение, например, оскорбляет других пользователей или делится контентом только для взрослых в комнате, предназначенной для семейного отдыха, или иным образом нарушает правила этой комнаты.\nОб этом будет сообщено модераторам комнаты.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "То, что пишет этот пользователь, неправильно.\nОб этом будет сообщено модераторам комнаты.",
+    "These are likely ones other room admins are a part of.": "Это, скорее всего, те, в которых участвуют другие администраторы комнат.",
+    "Other spaces or rooms you might not know": "Другие пространства или комнаты, которые вы могли не знать",
+    "Spaces you know that contain this room": "Пространства, которые вы знаете, уже содержат эту комнату",
+    "Search spaces": "Поиск пространств",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Определите, какие пространства могут получить доступ к этой комнате. Если пространство выбрано, его члены могут найти и присоединиться к <RoomName/>.",
+    "Select spaces": "Выберите пространства",
+    "You're removing all spaces. Access will default to invite only": "Вы удаляете все пространства. Доступ будет по умолчанию только по приглашениям",
+    "Leave %(spaceName)s": "Покинуть %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Вы являетесь единственным администратором некоторых комнат или пространств, которые вы хотите покинуть. Покинув их, вы оставите их без администраторов.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Вы единственный администратор этого пространства. Если вы его оставите, это будет означать, что никто не имеет над ним контроля.",
+    "You won't be able to rejoin unless you are re-invited.": "Вы сможете присоединиться только после повторного приглашения.",
+    "Search %(spaceName)s": "Поиск %(spaceName)s",
+    "User Directory": "Каталог пользователей",
+    "Consult first": "Сначала спросить",
+    "Invited people will be able to read old messages.": "Приглашенные люди смогут читать старые сообщения.",
+    "Or send invite link": "Или отправьте ссылку на приглашение",
+    "If you can't see who you’re looking for, send them your invite link below.": "Если вы не видите того, кого ищете, отправьте ему свое приглашение по ссылке ниже.",
+    "Some suggestions may be hidden for privacy.": "Некоторые предложения могут быть скрыты в целях конфиденциальности.",
+    "We couldn't create your DM.": "Мы не смогли создать ваш диалог.",
+    "You may contact me if you have any follow up questions": "Вы можете связаться со мной, если у вас возникнут какие-либо последующие вопросы",
+    "Your platform and username will be noted to help us use your feedback as much as we can.": "Ваша платформа и имя пользователя будут отмечены, чтобы мы могли максимально использовать ваш отзыв.",
+    "Thank you for your feedback, we really appreciate it.": "Спасибо за ваш отзыв, мы очень ценим его.",
+    "Search for rooms or people": "Поиск комнат или людей",
+    "Message preview": "Просмотр сообщения",
+    "Forward message": "Переслать сообщение",
+    "Open link": "Открыть ссылку",
+    "Sent": "Отправлено",
+    "Sending": "Отправка",
+    "You don't have permission to do this": "У вас нет на это разрешения",
+    "Adding...": "Добавление…",
+    "Want to add an existing space instead?": "Хотите добавить существующее пространство?",
+    "Private space (invite only)": "Приватное пространство (только по приглашению)",
+    "Space visibility": "Видимость пространства",
+    "Add a space to a space you manage.": "Добавьте пространство в пространство, которым вы управляете.",
+    "Only people invited will be able to find and join this space.": "Только приглашенные люди смогут найти и присоединиться к этому пространству.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Любой сможет найти и присоединиться к этому пространству, а не только члены <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Любой человек в <SpaceName/> сможет найти и присоединиться.",
+    "Visible to space members": "Видимая для участников пространства",
+    "Public room": "Публичная комната",
+    "Private room (invite only)": "Приватная комната (только по приглашению)",
+    "Room visibility": "Видимость комнаты",
+    "Create a room": "Создать комнату",
+    "Only people invited will be able to find and join this room.": "Только приглашенные люди смогут найти и присоединиться к этой комнате.",
+    "Anyone will be able to find and join this room.": "Любой желающий сможет найти эту комнату и присоединиться к ней.",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Это обновление позволит участникам выбранных пространств получить доступ в эту комнату без приглашения.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Любой сможет найти и присоединиться к этой комнате, а не только участники <SpaceName/>.",
+    "You can change this at any time from room settings.": "Вы можете изменить это в любое время из настроек комнаты.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Все в <SpaceName/> смогут найти и присоединиться к этой комнате.",
+    "To leave the beta, visit your settings.": "Чтобы выйти из бета-версии, зайдите в настройки.",
+    "%(featureName)s beta feedback": "%(featureName)s бета-отзыв",
+    "Adding spaces has moved.": "Добавление пространств перемещено.",
+    "Search for rooms": "Поиск комнат",
+    "Want to add a new room instead?": "Хотите добавить новую комнату?",
+    "Add existing rooms": "Добавить существующие комнаты",
+    "Adding rooms... (%(progress)s out of %(count)s)|one": "Добавление комнаты…",
+    "Adding rooms... (%(progress)s out of %(count)s)|other": "Добавление комнат… (%(progress)s из %(count)s)",
+    "Not all selected were added": "Не все выбранные добавлены",
+    "Search for spaces": "Поиск пространств",
+    "Create a new space": "Создать новое пространство",
+    "Want to add a new space instead?": "Хотите добавить новое пространство?",
+    "Add existing space": "Добавить существующее пространство",
+    "You are not allowed to view this server's rooms list": "Вам не разрешено просматривать список комнат этого сервера",
+    "Please provide an address": "Пожалуйста, укажите адрес",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s изменил разрешения сервера",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s изменил разрешения сервера %(count)s раз",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s изменили разрешения сервера",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s изменили разрешения сервера %(count)s раз",
+    "Zoom in": "Увеличить",
+    "Zoom out": "Уменьшить",
+    "%(count)s people you know have already joined|one": "%(count)s человек, которого вы знаете, уже присоединился",
+    "%(count)s people you know have already joined|other": "%(count)s человек, которых вы знаете, уже присоединились",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s участников, включая %(commaSeparatedMembers)s",
+    "Including %(commaSeparatedMembers)s": "Включая %(commaSeparatedMembers)s",
+    "View all %(count)s members|one": "Посмотреть 1 участника",
+    "View all %(count)s members|other": "Просмотреть всех %(count)s участников",
+    "Share content": "Поделиться содержимым",
+    "Application window": "Окно приложения",
+    "Share entire screen": "Поделиться всем экраном",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Инициализация поиска сообщений не удалась, проверьте <a>ваши настройки</a> для получения дополнительной информации",
+    "Error - Mixed content": "Ошибка - Смешанное содержание",
+    "Error loading Widget": "Ошибка загрузки виджета",
+    "Add reaction": "Добавить реакцию",
+    "Error processing voice message": "Ошибка при обработке голосового сообщения",
+    "Image": "Изображение",
+    "Sticker": "Стикер",
+    "Error processing audio message": "Ошибка обработки звукового сообщения",
+    "Decrypting": "Расшифровка",
+    "The call is in an unknown state!": "Вызов в неизвестном состоянии!",
+    "An unknown error occurred": "Произошла неизвестная ошибка",
+    "Their device couldn't start the camera or microphone": "Их устройство не может запустить камеру или микрофон",
+    "Connection failed": "Ошибка соединения",
+    "Could not connect media": "Сбой подключения",
+    "Missed call": "Пропущенный вызов",
+    "Call back": "Перезвонить",
+    "Call declined": "Вызов отклонён",
+    "Pinned messages": "Прикреплённые сообщения",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Если у вас есть разрешения, откройте меню на любом сообщении и выберите <b>Прикрепить</b>, чтобы поместить их сюда.",
+    "Nothing pinned, yet": "Пока ничего не прикреплено",
+    "Accept on your other login…": "Примите под другим логином…",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Установите адреса для этого пространства, чтобы пользователи могли найти это пространство через ваш домашний сервер (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Чтобы опубликовать адрес, его сначала нужно установить как локальный адрес.",
+    "Published addresses can be used by anyone on any server to join your room.": "Опубликованные адреса могут быть использованы любым человеком на любом сервере, чтобы присоединиться к вашей комнате.",
+    "Published addresses can be used by anyone on any server to join your space.": "Опубликованные адреса могут быть использованы любым человеком на любом сервере для присоединения к вашему пространству.",
+    "This space has no local addresses": "У этого пространства нет локальных адресов",
+    "Stop recording": "Остановить запись",
+    "Send voice message": "Отправить голосовое сообщение",
+    "We didn't find a microphone on your device. Please check your settings and try again.": "Мы не нашли микрофон на вашем устройстве. Пожалуйста, проверьте настройки и повторите попытку.",
+    "No microphone found": "Микрофон не найден",
+    "We were unable to access your microphone. Please check your browser settings and try again.": "Мы не смогли получить доступ к вашему микрофону. Пожалуйста, проверьте настройки браузера и повторите попытку.",
+    "Unable to access your microphone": "Не удалось получить доступ к микрофону",
+    "Copy Room Link": "Скопировать ссылку на комнату",
+    "%(count)s results in all spaces|one": "%(count)s результат по всем пространствам",
+    "%(count)s results in all spaces|other": "%(count)s результатов по всем пространствам",
+    "Quick actions": "Быстрые действия",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Теперь вы можете поделиться своим экраном, нажав кнопку \"Поделиться экраном\" во время вызова. Это можно делать даже в аудиовызовах, если оба собеседника поддерживают эту функцию!",
+    "Screen sharing is here!": "Совместное использование экрана здесь!",
+    "View message": "Посмотреть сообщение",
+    "End-to-end encryption isn't enabled": "Сквозное шифрование не включено",
+    "Invite to just this room": "Пригласить только в эту комнату",
+    "%(seconds)ss left": "%(seconds)s осталось",
+    "Show %(count)s other previews|one": "Показать %(count)s другой предварительный просмотр",
+    "Show %(count)s other previews|other": "Показать %(count)s других предварительных просмотров",
+    "Failed to send": "Не удалось отправить",
+    "Access": "Доступ",
+    "People with supported clients will be able to join the room without having a registered account.": "Люди с поддерживаемыми клиентами смогут присоединиться к комнате, не имея зарегистрированной учётной записи.",
+    "Decide who can join %(roomName)s.": "Укажите, кто может присоединиться к %(roomName)s.",
+    "Space members": "Участники пространства",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Любой человек в пространстве может найти и присоединиться. Вы можете выбрать несколько пространств.",
+    "Spaces with access": "Пространства с доступом",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Любой человек в пространстве может найти и присоединиться. <a>Укажите здесь, какие пространства могут получить доступ.</a>",
+    "Currently, %(count)s spaces have access|other": "В настоящее время %(count)s пространств имеют доступ",
+    "& %(count)s more|other": "и %(count)s ещё",
+    "Upgrade required": "Требуется обновление",
+    "Anyone can find and join.": "Любой желающий может найти и присоединиться.",
+    "Only invited people can join.": "Присоединиться могут только приглашенные люди.",
+    "Private (invite only)": "Приватное (только по приглашению)",
+    "Change server ACLs": "Изменить серверные разрешения",
+    "Space information": "Информация о пространстве",
+    "You have no ignored users.": "У вас нет игнорируемых пользователей.",
+    "Images, GIFs and videos": "Изображения, GIF и видео",
+    "Code blocks": "Блоки кода",
+    "Displaying time": "Отображение времени",
+    "To view all keyboard shortcuts, click here.": "Чтобы просмотреть все сочетания клавиш, нажмите здесь.",
+    "Keyboard shortcuts": "Горячие клавиши",
+    "Warn before quitting": "Предупредить перед выходом",
+    "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Чувствуете себя экспериментатором? Лаборатории - это лучший способ получить информацию раньше, протестировать новые функции и помочь сформировать их до того, как они будут запущены. <a>Узнайте больше</a>.",
+    "Your access token gives full access to your account. Do not share it with anyone.": "Ваш токен доступа даёт полный доступ к вашей учётной записи. Не передавайте его никому.",
+    "Access Token": "Токен доступа",
+    "Message bubbles": "Пузыри сообщений",
+    "IRC": "IRC",
+    "There was an error loading your notification settings.": "Произошла ошибка при загрузке настроек уведомлений.",
+    "Mentions & keywords": "Упоминания и ключевые слова",
+    "Global": "Глобально",
+    "New keyword": "Новое ключевое слово",
+    "Keyword": "Ключевое слово",
+    "Enable email notifications for %(email)s": "Включить уведомления по электронной почте для %(email)s",
+    "Enable for this account": "Включить для этого аккаунта",
+    "An error occurred whilst saving your notification preferences.": "При сохранении ваших настроек уведомлений произошла ошибка.",
+    "Error saving notification preferences": "Ошибка при сохранении настроек уведомлений",
+    "Messages containing keywords": "Сообщения с ключевыми словами",
+    "Message search initialisation failed": "Инициализация поиска сообщений не удалась",
+    "Collapse": "Свернуть",
+    "Expand": "Развернуть",
+    "Recommended for public spaces.": "Рекомендуется для публичных пространств.",
+    "Allow people to preview your space before they join.": "Дайте людям возможность предварительно ознакомиться с вашим пространством, прежде чем они присоединятся к нему.",
+    "Preview Space": "Предварительный просмотр пространства",
+    "Decide who can view and join %(spaceName)s.": "Определите, кто может просматривать и присоединяться к %(spaceName)s.",
+    "Visibility": "Видимость",
+    "This may be useful for public spaces.": "Это может быть полезно для публичных пространств.",
+    "Guests can join a space without having an account.": "Гости могут присоединиться к пространству, не имея учётной записи.",
+    "Enable guest access": "Включить гостевой доступ",
+    "Failed to update the history visibility of this space": "Не удалось обновить видимость истории этого пространства",
+    "Failed to update the guest access of this space": "Не удалось обновить гостевой доступ к этому пространству",
+    "Failed to update the visibility of this space": "Не удалось обновить видимость этого пространства",
+    "Show all rooms": "Показать все комнаты",
+    "Address": "Адрес",
+    "e.g. my-space": "например, my-space",
+    "Give feedback.": "Дать отзыв.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Спасибо, что попробовали пространства. Ваши отзывы помогут при разработке следующих версий.",
+    "Spaces feedback": "Отзыв о пространствах",
+    "Spaces are a new feature.": "Пространства - это новая функция.",
+    "Please enter a name for the space": "Пожалуйста, введите название пространства",
+    "Your camera is still enabled": "Ваша камера всё ещё включена",
+    "Your camera is turned off": "Ваша камера выключена",
+    "%(sharerName)s is presenting": "%(sharerName)s показывает",
+    "You are presenting": "Вы показываете",
+    "unknown person": "Неизвестное лицо",
+    "Mute the microphone": "Заглушить микрофон",
+    "Unmute the microphone": "Включить звук микрофона",
+    "Dialpad": "Панель набора номера",
+    "More": "Больше",
+    "Show sidebar": "Показать боковую панель",
+    "Hide sidebar": "Скрыть боковую панель",
+    "Start sharing your screen": "Начать делиться экраном",
+    "Stop sharing your screen": "Перестать делиться экраном",
+    "Stop the camera": "Остановить камеру",
+    "Start the camera": "Запуск камеры",
+    "sends space invaders": "отправляет космических захватчиков",
+    "Sends the given message with a space themed effect": "Отправляет заданное сообщение с космическим тематическим эффектом",
+    "All rooms you're in will appear in Home.": "Все комнаты, в которых вы находитесь, будут отображаться в Главной.",
+    "Show all rooms in Home": "Показать все комнаты в Главной",
+    "Surround selected text when typing special characters": "Обводить выделенный текст при вводе специальных символов",
+    "Use Ctrl + F to search timeline": "Используйте Ctrl + F для поиска по временной шкале",
+    "Use Command + F to search timeline": "Используйте Command + F для поиска по временной шкале",
+    "New layout switcher (with message bubbles)": "Новый переключатель макета (с пузырями сообщений)",
+    "Send pseudonymous analytics data": "Отправка псевдонимных аналитических данных",
+    "Show options to enable 'Do not disturb' mode": "Показать опции для включения режима \"Не беспокоить\"",
+    "Spaces are a new way to group rooms and people.": "Пространства - это новый способ группировки комнат и людей.",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Прототип \"Сообщить модераторам\". В комнатах, поддерживающих модерацию, кнопка `сообщить` позволит вам сообщать о злоупотреблениях модераторам комнаты",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Это позволяет комнатам оставаться приватными для пространства, в то же время позволяя людям в пространстве находить их и присоединяться к ним. Все новые комнаты в пространстве будут иметь эту опцию.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Чтобы помочь участникам пространства найти и присоединиться к приватной комнате, перейдите в настройки безопасности и конфиденциальности этой комнаты.",
+    "Help space members find private rooms": "Помогите участникам пространства найти приватные комнаты",
+    "Help people in spaces to find and join private rooms": "Помогите людям в пространствах находить приватные комнаты и присоединяться к ним",
+    "New in the Spaces beta": "Новое в бета-версии пространств",
+    "Silence call": "Тихий вызов",
+    "Sound on": "Звук включен",
+    "Review to ensure your account is safe": "Проверьте, чтобы убедиться, что ваша учетная запись в безопасности",
+    "User %(userId)s is already invited to the room": "Пользователь %(userId)s уже приглашен(а) в комнату",
+    "See when people join, leave, or are invited to your active room": "Просмотрите, когда люди присоединяются, уходят или приглашают в вашу активную комнату",
+    "Kick, ban, or invite people to your active room, and make you leave": "Выгонять, блокировать или приглашать людей в вашу активную комнату и заставлять покинуть ее",
+    "See when people join, leave, or are invited to this room": "Посмотрите, когда люди присоединяются, покидают или приглашают в эту комнату",
+    "Kick, ban, or invite people to this room, and make you leave": "Выгнать, заблокировать или пригласить людей в эту комнату и заставить покинуть ее",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s изменил(а) <a>прикреплённые сообщения</a> для комнаты.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s выгнал(а) %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s выгнал(а) %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s отозвал(а) приглашение %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s отозвал(а) приглашение %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s разблокировал(а) %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s покинул(а) комнату",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s покинул(а) комнату: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s отклонил(а) приглашение",
+    "%(targetName)s joined the room": "%(targetName)s присоединился(-ась) к комнате",
+    "%(senderName)s made no change": "%(senderName)s не сделал(а) изменений",
+    "%(senderName)s set a profile picture": "%(senderName)s установил(а) фотографию профиля",
+    "%(senderName)s changed their profile picture": "%(senderName)s изменил(а) фотографию своего профиля",
+    "%(senderName)s removed their profile picture": "%(senderName)s удалил(а) фотографию своего профиля",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s удалил(а) своё отображаемое имя (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s установил(а) своё отображаемое имя на %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s изменил(а) своё отображаемое имя на %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s заблокировал(а) %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s заблокировал(а) %(targetName)s: %(reason)s",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s принял(а) приглашение для %(displayName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s принял(а) приглашение",
+    "Some invites couldn't be sent": "Некоторые приглашения не могут быть отправлены",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Мы отправили остальных, но нижеперечисленные люди не могут быть приглашены в <RoomName/>",
+    "Transfer Failed": "Перевод не удался",
+    "Unable to transfer call": "Не удалось перевести звонок",
+    "Olm version:": "Версия Olm:",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s изменил(а) <a>прикреплённые сообщения</a> в комнате %(count)s раз.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s изменили <a>прикреплённые сообщения</a> в комнате %(count)s раз.",
+    "Delete avatar": "Удалить аватар",
+    "Don't send read receipts": "Не отправлять уведомления о прочтении",
+    "Created from <Community />": "Создано из <Community />",
+    "Rooms and spaces": "Комнаты и пространства",
+    "Results": "Результаты",
+    "Communities won't receive further updates.": "Сообщества не будут получать дальнейших обновлений.",
+    "Spaces are a new way to make a community, with new features coming.": "Пространства - это новый способ создания сообщества с новыми возможностями.",
+    "Communities can now be made into Spaces": "Сообщества теперь можно преобразовать в пространства",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Попросите <a>администраторов</a> этого сообщества сделать его пространством и следите за приглашением в него.",
+    "You can create a Space from this community <a>here</a>.": "Вы можете создать пространство из этого сообщества <a>здесь</a>.",
+    "This description will be shown to people when they view your space": "Это описание будет показано людям, когда они будут просматривать ваше пространство",
+    "Flair won't be available in Spaces for the foreseeable future.": "В ближайшем будущем значки не будут доступны в пространствах.",
+    "All rooms will be added and all community members will be invited.": "Будут добавлены все комнаты и приглашены все участники сообщества.",
+    "A link to the Space will be put in your community description.": "Ссылка на пространство будет размещена в описании вашего сообщества.",
+    "Create Space from community": "Создать пространство из сообщества",
+    "Failed to migrate community": "Не удалось преобразовать сообщество",
+    "To create a Space from another community, just pick the community in Preferences.": "Чтобы создать пространство из другого сообщества, просто выберите сообщество в настройках.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> было создано, и все, кто был частью сообщества, были приглашены в него.",
+    "Space created": "Пространство создано",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Чтобы просмотреть Пространства, скройте сообщества в <a>Параметрах</a>",
+    "This community has been upgraded into a Space": "Это сообщество было обновлено в пространство",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, с какими элементами пользовательского интерфейса вы взаимодействовали в последний раз, а также имена пользователей других пользователей. Они не содержат сообщений.",
+    "Some encryption parameters have been changed.": "Некоторые параметры шифрования были изменены.",
+    "Unknown failure: %(reason)s": "Неизвестная ошибка: %(reason)s",
+    "No answer": "Нет ответа",
+    "Role in <RoomName/>": "Роль в <RoomName/>",
+    "Explore %(spaceName)s": "Исследовать %(spaceName)s",
+    "Enable encryption in settings.": "Включите шифрование в настройках.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Ваши личные сообщения обычно шифруются, но эта комната не шифруется. Обычно это связано с использованием неподдерживаемого устройства или метода, например, приглашения по электронной почте.",
+    "Send a sticker": "Отправить стикер",
+    "Add emoji": "Добавить смайлик",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Чтобы избежать этих проблем, создайте <a>новую публичную комнату</a> для разговора, который вы планируете провести.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Не рекомендуется делать зашифрованные комнаты публичными.</b> Это означает, что любой может найти и присоединиться к комнате, а значит, любой может читать сообщения. Вы не получите ни одного из преимуществ шифрования. Шифрование сообщений в публичной комнате сделает получение и отправку сообщений более медленной.",
+    "Are you sure you want to make this encrypted room public?": "Вы уверены, что хотите сделать эту зашифрованную комнату публичной?",
+    "Unknown failure": "Неизвестная ошибка",
+    "Failed to update the join rules": "Не удалось обновить правила присоединения",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Чтобы избежать этих проблем, создайте <a>новую зашифрованную комнату</a> для разговора, который вы планируете провести.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Не рекомендуется добавлять шифрование в публичные комнаты.</b> Любой может найти и присоединиться к публичным комнатам, поэтому любой может прочитать сообщения в них. Вы не получите ни одного из преимуществ шифрования, и вы не сможете отключить его позже. Шифрование сообщений в публичной комнате замедляет получение и отправку сообщений.",
+    "Are you sure you want to add encryption to this public room?": "Вы уверены, что хотите добавить шифрование в эту публичную комнату?",
+    "Select the roles required to change various parts of the space": "Выберите роли, необходимые для изменения различных частей пространства",
+    "Change description": "Изменить описание",
+    "Change main address for the space": "Изменить основной адрес для пространства",
+    "Change space name": "Изменить название пространства",
+    "Change space avatar": "Изменить аватар пространства",
+    "If a community isn't shown you may not have permission to convert it.": "Если сообщество не показано, у вас может не быть разрешения на его преобразование.",
+    "Show my Communities": "Показать мои сообщества",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Сообщества были архивированы, чтобы освободить место для пространств, но вы можете преобразовать свои сообщества в пространства ниже. Преобразование позволит вашим беседам получить новейшие функции.",
+    "Create Space": "Создать пространство",
+    "Open Space": "Открыть пространство",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Если вы отправили ошибку через GitHub, журналы отладки могут помочь нам отследить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, с какими элементами пользовательского интерфейса вы взаимодействовали в последний раз, а также имена других пользователей. Они не содержат сообщений.",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Любой человек в <spaceName/> может найти и присоединиться. Вы можете выбрать и другие пространства.",
+    "Currently, %(count)s spaces have access|one": "В настоящее время пространство имеет доступ",
+    "& %(count)s more|one": "и %(count)s еще",
+    "Cross-signing is ready but keys are not backed up.": "Кросс-подпись готова, но ключи не резервируются.",
+    "You can change this later.": "Вы можете изменить это позже.",
+    "What kind of Space do you want to create?": "Какое пространство вы хотите создать?",
+    "Low bandwidth mode (requires compatible homeserver)": "Режим низкой пропускной способности (требуется совместимый домашний сервер)",
+    "Autoplay videos": "Автовоспроизведение видео",
+    "Autoplay GIFs": "Автовоспроизведение GIF",
+    "Multiple integration managers (requires manual setup)": "Несколько менеджеров интеграции (требуется ручная настройка)",
+    "The above, but in <Room /> as well": "Вышеописанное, но также в <Room />",
+    "The above, but in any room you are joined or invited to as well": "Вышеперечисленное, но также в любой комнате, в которую вы вошли или приглашены",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s открепляет сообщение из этой комнаты. Просмотрите все прикрепленые сообщения.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s открепляет <a>сообщение</a> из этой комнаты. Просмотрите все <b>прикрепленые сообщения</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s прикрепляет сообщение в этой комнате. Просмотрите все прикрепленные сообщения.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s прикрепляет <a>сообщение</a> в этой комнате. Просмотрите все <b>прикрепленые сообщения</b>."
 }
diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json
index 5a81da879f..5b9031fc05 100644
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@@ -4,6 +4,9 @@
     "Use Single Sign On to continue": "ඉදිරියට යාමට තනි පුරනය වීම භාවිතා කරන්න",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "ඔබගේ අනන්‍යතාවය සනාථ කිරීම සඳහා තනි පුරනය භාවිතා කිරීමෙන් මෙම විද්‍යුත් තැපැල් ලිපිනය එක් කිරීම තහවුරු කරන්න.",
     "Confirm": "තහවුරු කරන්න",
-    "Add Email Address": "විද්‍යුත් තැපැල් ලිපිනය එක් කරන්න",
-    "Sign In": "පිවිසෙන්න"
+    "Add Email Address": "වි-තැපැල් ලිපිනය එකතු කරන්න",
+    "Sign In": "පිවිසෙන්න",
+    "Dismiss": "ඉවතලන්න",
+    "Explore rooms": "කාමර බලන්න",
+    "Create Account": "ගිණුමක් සාදන්න"
 }
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 0ee0c6cbc3..879b1b8457 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -2,11 +2,6 @@
     "This email address is already in use": "Táto emailová adresa sa už používa",
     "This phone number is already in use": "Toto telefónne číslo sa už používa",
     "Failed to verify email address: make sure you clicked the link in the email": "Nepodarilo sa overiť emailovú adresu: Uistite sa, že ste správne klikli na odkaz v emailovej správe",
-    "Call Timeout": "Časový limit hovoru",
-    "The remote side failed to pick up": "Vzdialenej strane sa nepodarilo prijať hovor",
-    "Unable to capture screen": "Nie je možné zachytiť obrazovku",
-    "Existing Call": "Prebiehajúci hovor",
-    "You are already in a call.": "Už ste súčasťou iného hovoru.",
     "VoIP is unsupported": "VoIP nie je podporovaný",
     "You cannot place VoIP calls in this browser.": "Pomocou tohoto webového prehliadača nemôžete uskutočňovať VoIP hovory.",
     "You cannot place a call with yourself.": "Nemôžete zavolať samému sebe.",
@@ -57,7 +52,6 @@
     "Admin": "Správca",
     "Operation failed": "Operácia zlyhala",
     "Failed to invite": "Pozvanie zlyhalo",
-    "Failed to invite the following users to the %(roomName)s room:": "Do miestnosti %(roomName)s sa nepodarilo pozvať nasledujúcich používateľov:",
     "You need to be logged in.": "Mali by ste byť prihlásení.",
     "You need to be able to invite users to do that.": "Na uskutočnenie tejto akcie by ste mali byť schopní pozývať používateľov.",
     "Unable to create widget.": "Nie je možné vytvoriť widget.",
@@ -70,43 +64,17 @@
     "Room %(roomId)s not visible": "Miestnosť %(roomId)s nie je viditeľná",
     "Missing user_id in request": "V požiadavke chýba user_id",
     "Usage": "Použitie",
-    "/ddg is not a command": "/ddg nie je žiaden príkaz",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Ak to chcete použiť, len počkajte na načítanie výsledkov automatického dopĺňania a cyklicky prechádzajte stláčaním klávesu tab..",
     "Ignored user": "Ignorovaný používateľ",
     "You are now ignoring %(userId)s": "Od teraz ignorujete používateľa %(userId)s",
     "Unignored user": "Ignorácia zrušená",
     "You are no longer ignoring %(userId)s": "Od teraz viac neignorujete používateľa %(userId)s",
     "Verified key": "Kľúč overený",
     "Reason": "Dôvod",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie do %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s prijal pozvanie.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VoIP konferenciu.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s zakázal vstup %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si nastavil zobrazované meno %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstránil svoje zobrazované meno (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s si z profilu odstránil obrázok.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s si zmenil obrázok v profile.",
-    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil obrázok v profile.",
-    "VoIP conference started.": "Začala VoIP konferencia.",
-    "%(targetName)s joined the room.": "%(targetName)s vstúpil do miestnosti.",
-    "VoIP conference finished.": "Skončila VoIP konferencia.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odmietol pozvanie.",
-    "%(targetName)s left the room.": "%(targetName)s opustil miestnosť.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s povolil vstup %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykázal %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s stiahol pozvanie %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmenil tému na \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstránil názov miestnosti.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmenil názov miestnosti na %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal obrázok.",
     "Someone": "Niekto",
-    "(not supported by this browser)": "(Nepodporované v tomto prehliadači)",
-    "%(senderName)s answered the call.": "%(senderName)s prijal hovor.",
-    "(could not connect media)": "(nie je možné spojiť médiá)",
-    "(no answer)": "(žiadna odpoveď)",
-    "(unknown failure: %(reason)s)": "(neznáma chyba: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ukončil hovor.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s pozval %(targetDisplayName)s vstúpiť do miestnosti.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
@@ -128,11 +96,6 @@
     "Not a valid %(brand)s keyfile": "Toto nie je správny súbor s kľúčami %(brand)s",
     "Authentication check failed: incorrect password?": "Kontrola overenia zlyhala: Nesprávne heslo?",
     "Failed to join room": "Nepodarilo sa vstúpiť do miestnosti",
-    "Active call (%(roomName)s)": "Aktívny hovor (%(roomName)s)",
-    "unknown caller": "neznámeho volajúceho",
-    "Incoming voice call from %(name)s": "Prichádzajúci audio hovor od %(name)s",
-    "Incoming video call from %(name)s": "Prichádzajúci video hovor od %(name)s",
-    "Incoming call from %(name)s": "Prichádzajúci hovor od %(name)s",
     "Decline": "Odmietnuť",
     "Accept": "Prijať",
     "Error": "Chyba",
@@ -156,19 +119,8 @@
     "Last seen": "Naposledy aktívne",
     "Failed to set display name": "Nepodarilo sa nastaviť zobrazované meno",
     "Authentication": "Overenie",
-    "Cannot add any more widgets": "Nie je možné pridať ďalšie widgety",
-    "The maximum permitted number of widgets have already been added to this room.": "Do tejto miestnosti už bol pridaný maximálny povolený počet widgetov.",
-    "Add a widget": "Pridať widget",
-    "Drop File Here": "Pretiahnite sem súbor",
     "Drop file here to upload": "Pretiahnutím sem nahráte súbor",
-    " (unsupported)": " (nepodporované)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pripojte sa ako <voiceText>audio</voiceText> alebo <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Práve prebieha %(supportedText)s konferenčný hovor.",
-    "%(senderName)s sent an image": "%(senderName)s poslal obrázok",
-    "%(senderName)s sent a video": "%(senderName)s poslal video",
-    "%(senderName)s uploaded a file": "%(senderName)s nahral súbor",
     "Options": "Možnosti",
-    "Please select the destination room for this message": "Prosím, vyberte cieľovú miestnosť pre túto správu",
     "Disinvite": "Stiahnuť pozvanie",
     "Kick": "Vykázať",
     "Disinvite this user?": "Stiahnuť pozvanie tohoto používateľa?",
@@ -205,11 +157,7 @@
     "Server error": "Chyba servera",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, preťažený, alebo sa pokazilo niečo iné.",
     "Command error": "Chyba príkazu",
-    "Unpin Message": "Zrušiť pripnutie správy",
-    "Jump to message": "Preskočiť na správu",
-    "No pinned messages.": "Žiadne pripnuté správy.",
     "Loading...": "Načítavanie…",
-    "Pinned Messages": "Pripnuté správy",
     "Online": "Pripojený",
     "Idle": "Nečinný",
     "Offline": "Nedostupný",
@@ -227,7 +175,6 @@
     "Settings": "Nastavenia",
     "Forget room": "Zabudnúť miestnosť",
     "Search": "Hľadať",
-    "Community Invites": "Pozvánky do komunity",
     "Invites": "Pozvánky",
     "Favourites": "Obľúbené",
     "Rooms": "Miestnosti",
@@ -246,22 +193,15 @@
     "This room is not accessible by remote Matrix servers": "Táto miestnosť nie je prístupná zo vzdialených Matrix serverov",
     "Leave room": "Opustiť miestnosť",
     "Favourite": "Obľúbená",
-    "Guests cannot join this room even if explicitly invited.": "Hostia nemôžu vstúpiť do tejto miestnosti ani ak ich priamo pozvete.",
-    "Click here to fix": "Kliknutím sem to opravíte",
-    "Who can access this room?": "Kto môže vstúpiť do tejto miestnosti?",
     "Only people who have been invited": "Len pozvaní ľudia",
-    "Anyone who knows the room's link, apart from guests": "Ktokoľvek, kto pozná odkaz do miestnosti (okrem hostí)",
-    "Anyone who knows the room's link, including guests": "Ktokoľvek, kto pozná odkaz do miestnosti (vrátane hostí)",
     "Publish this room to the public in %(domain)s's room directory?": "Uverejniť túto miestnosť v adresári miestností na serveri %(domain)s?",
     "Who can read history?": "Kto môže čítať históriu?",
     "Anyone": "Ktokoľvek",
     "Members only (since the point in time of selecting this option)": "Len členovia (odkedy je aktívna táto voľba)",
     "Members only (since they were invited)": "Len členovia (odkedy boli pozvaní)",
     "Members only (since they joined)": "Len členovia (odkedy vstúpili)",
-    "Room Colour": "Farba miestnosti",
     "Permissions": "Povolenia",
     "Advanced": "Pokročilé",
-    "Add a topic": "Pridať tému",
     "Cancel": "Zrušiť",
     "Jump to first unread message.": "Preskočiť na prvú neprečítanú správu.",
     "Close": "Zatvoriť",
@@ -273,7 +213,6 @@
     "You have <a>disabled</a> URL previews by default.": "Predvolene máte <a>zakázané</a> náhľady URL adries.",
     "You have <a>enabled</a> URL previews by default.": "Predvolene máte <a>povolené</a> náhľady URL adries.",
     "URL Previews": "Náhľady URL adries",
-    "Error decrypting audio": "Chyba pri dešifrovaní zvuku",
     "Error decrypting attachment": "Chyba pri dešifrovaní prílohy",
     "Decrypt %(text)s": "Dešifrovať %(text)s",
     "Download %(text)s": "Stiahnuť %(text)s",
@@ -287,10 +226,7 @@
     "Failed to copy": "Nepodarilo sa skopírovať",
     "Add an Integration": "Pridať integráciu",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Budete presmerovaní na stránku tretej strany, aby ste mohli overiť svoj účet na použitie s %(integrationsUrl)s. Chcete pokračovať?",
-    "Custom Server Options": "Vlastné možnosti servera",
     "Dismiss": "Zamietnuť",
-    "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s bola odoslaná správa",
-    "Please check your email to continue registration.": "Prosím, skontrolujte si emaily, aby ste mohli pokračovať v registrácii.",
     "Token incorrect": "Neplatný token",
     "A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s bola odoslaná textová správa",
     "Please enter the code it contains:": "Prosím, zadajte kód z tejto správy:",
@@ -299,7 +235,6 @@
     "Sign in with": "Na prihlásenie sa použije",
     "Email address": "Emailová adresa",
     "Sign in": "Prihlásiť sa",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ak nezadáte vašu emailovú adresu, nebudete si môcť obnoviť heslo. Ste si istí?",
     "Register": "Zaregistrovať",
     "Remove from community": "Odstrániť z komunity",
     "Disinvite this user from community?": "Zrušiť pozvanie tohoto používateľa z komunity?",
@@ -319,7 +254,6 @@
     "Only visible to community members": "Viditeľná len pre členov komunity",
     "Filter community rooms": "Filtrovať miestnosti v komunite",
     "Unknown Address": "Neznáma adresa",
-    "Allow": "Povoliť",
     "Delete Widget": "Vymazať widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Týmto vymažete widget pre všetkých používateľov v tejto miestnosti. Ste si istí, že chcete vymazať tento widget?",
     "Delete widget": "Vymazať widget",
@@ -327,7 +261,6 @@
     "Create new room": "Vytvoriť novú miestnosť",
     "No results": "Žiadne výsledky",
     "Home": "Domov",
-    "Manage Integrations": "Spravovať integrácie",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstúpili",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)svstúpili",
@@ -381,11 +314,8 @@
     "%(items)s and %(count)s others|one": "%(items)s a jeden ďalší",
     "%(items)s and %(lastItem)s": "%(items)s a tiež %(lastItem)s",
     "Custom level": "Vlastná úroveň",
-    "Room directory": "Adresár miestností",
     "Start chat": "Začať konverzáciu",
     "And %(count)s more...|other": "A %(count)s ďalších…",
-    "ex. @bob:example.com": "pr. @jan:priklad.sk",
-    "Add User": "Pridať používateľa",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "ID Matrix miestnosti",
     "email address": "emailová adresa",
@@ -416,21 +346,9 @@
     "Unable to verify email address.": "Nie je možné overiť emailovú adresu.",
     "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnoviť si heslo a prijímať oznámenia emailom.",
     "Skip": "Preskočiť",
-    "Username not available": "Používateľské meno nie je k dispozícii",
-    "Username invalid: %(errMessage)s": "Neplatné používateľské meno: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Vyskytla sa chyba: %(error_string)s",
-    "Username available": "Používateľské meno je k dispozícii",
-    "To get started, please pick a username!": "Začnite tým, že si zvolíte používateľské meno!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude názov vašeho účtu na domovskom serveri <span></span>, alebo si môžete zvoliť <a>iný server</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Ak už máte Matrix účet, môžete sa hneď <a>Prihlásiť</a>.",
-    "Private Chat": "Súkromná konverzácia",
-    "Public Chat": "Verejná konverzácia",
-    "Custom": "Vlastné",
     "Name": "Názov",
     "You must <a>register</a> to use this functionality": "Aby ste mohli použiť túto vlastnosť, musíte byť <a>zaregistrovaný</a>",
     "You must join the room to see its files": "Aby ste si mohli zobraziť zoznam súborov, musíte vstúpiť do miestnosti",
-    "There are no visible files in this room": "V tejto miestnosti nie sú žiadne viditeľné súbory",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML kód hlavnej stránky komunity</h1>\n<p>\n    Dlhý popis môžete použiť na predstavenie komunity novým členom, alebo uvedenie \n    dôležitých <a href=\"foo\">odkazov</a>\n</p>\n<p>\n    Môžete tiež používať HTML značku 'img'\n</p>\n",
     "Add rooms to the community summary": "Pridať miestnosti do prehľadu komunity",
     "Which rooms would you like to add to this summary?": "Ktoré miestnosti si želáte pridať do tohoto prehľadu?",
     "Add to summary": "Pridať do prehľadu",
@@ -468,7 +386,6 @@
     "Are you sure you want to reject the invitation?": "Ste si istí, že chcete odmietnuť toto pozvanie?",
     "Failed to reject invitation": "Nepodarilo sa odmietnuť pozvanie",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ste si istí, že chcete opustiť miestnosť '%(roomName)s'?",
-    "Failed to leave room": "Nepodarilo sa opustiť miestnosť",
     "Signed Out": "Ste odhlásení",
     "For security, this session has been signed out. Please sign in again.": "Kôli bezpečnosti ste boli odhlásení z tejto relácie. Prosím, prihláste sa znovu.",
     "Logout": "Odhlásiť sa",
@@ -477,30 +394,21 @@
     "Error whilst fetching joined communities": "Pri získavaní vašich komunít sa vyskytla chyba",
     "Create a new community": "Vytvoriť novú komunitu",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvorte si komunitu s cieľom zoskupiť miestnosti a používateľov! Zostavte si vlastnú domovskú stránku a vymedzte tak svoj priestor vo svete Matrix.",
-    "You have no visible notifications": "Nie sú k dispozícii žiadne oznámenia",
     "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.",
     "Sent messages will be stored until your connection has returned.": "Odoslané správy ostanú uložené, kým sa spojenie nenadviaže znovu.",
-    "Active call": "Aktívny hovor",
     "You seem to be uploading files, are you sure you want to quit?": "Zdá sa, že práve nahrávate súbory, ste si istí, že chcete skončiť?",
     "You seem to be in a call, are you sure you want to quit?": "Zdá sa, že máte prebiehajúci hovor, ste si istí, že chcete skončiť?",
-    "%(count)s of your messages have not been sent.|other": "Niektoré vaše správy ešte neboli odoslané.",
     "Search failed": "Hľadanie zlyhalo",
     "Server may be unavailable, overloaded, or search timed out :(": "Server môže byť nedostupný, preťažený, alebo vypršal časový limit hľadania :(",
     "No more results": "Žiadne ďalšie výsledky",
     "Room": "Miestnosť",
     "Failed to reject invite": "Nepodarilo sa odmietnuť pozvanie",
-    "Fill screen": "Vyplniť obrazovku",
-    "Click to unmute video": "Kliknutím zrušíte stlmenie videa",
-    "Click to mute video": "Kliknutím stlmíte video",
-    "Click to unmute audio": "Kliknutím zrušíte stlmenie zvuku",
-    "Click to mute audio": "Kliknutím stlmíte zvuk",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Pri pokuse načítať konkrétny bod v histórii tejto miestnosti sa vyskytla chyba, nemáte povolenie na zobrazenie zodpovedajúcej správy.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Pri pokuse načítať konkrétny bod v histórii tejto miestnosti sa vyskytla chyba, Správu nie je možné nájsť.",
     "Failed to load timeline position": "Nepodarilo sa načítať pozíciu na časovej osi",
     "Uploading %(filename)s and %(count)s others|other": "Nahrávanie %(filename)s a %(count)s ďalších súborov",
     "Uploading %(filename)s and %(count)s others|zero": "Nahrávanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Nahrávanie %(filename)s a %(count)s ďalší súbor",
-    "Autoplay GIFs and videos": "Automaticky prehrávať animované GIF obrázky a videá",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
@@ -530,12 +438,8 @@
     "Notifications": "Oznámenia",
     "Profile": "Profil",
     "Account": "Účet",
-    "Access Token:": "Prístupový token:",
-    "click to reveal": "Odkryjete kliknutím",
     "Homeserver is": "Domovský server je",
-    "Identity Server is": "Server totožností je",
     "%(brand)s version:": "Verzia %(brand)s:",
-    "olm version:": "Verzia olm:",
     "Failed to send email": "Nepodarilo sa odoslať email",
     "The email address linked to your account must be entered.": "Musíte zadať emailovú adresu prepojenú s vašim účtom.",
     "A new password must be entered.": "Musíte zadať nové heslo.",
@@ -545,13 +449,8 @@
     "Return to login screen": "Vrátiť sa na prihlasovaciu obrazovku",
     "Send Reset Email": "Poslať obnovovací email",
     "Incorrect username and/or password.": "Nesprávne meno používateľa a / alebo heslo.",
-    "The phone number entered looks invalid": "Zdá sa, že zadané telefónne číslo je neplatné",
-    "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
     "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>.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo <a>povolte nezabezpečené skripty</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vášho pripojenia na internet. Uistite sa že <a>certifikát domovského servera</a> je dôveryhodný a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
-    "Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu obrázka",
-    "Set a display name:": "Nastaviť zobrazované meno:",
-    "Upload an avatar:": "Nahrať obrázok:",
     "This server does not support authentication with a phone number.": "Tento server nepodporuje overenie telefónnym číslom.",
     "Displays action": "Zobrazí akciu",
     "Bans user with given id": "Zakáže vstup používateľovi so zadaným ID",
@@ -560,11 +459,9 @@
     "Invites user with given id to current room": "Pošle používateľovi so zadaným ID pozvanie do tejto miestnosti",
     "Kicks user with given id": "Vykáže používateľa so zadaným ID",
     "Changes your display nickname": "Zmení vaše zobrazované meno",
-    "Searches DuckDuckGo for results": "Vyhľadá výsledky na DuckDuckGo",
     "Ignores a user, hiding their messages from you": "Ignoruje používateľa a skrije všetky jeho správy",
     "Stops ignoring a user, showing their messages going forward": "Prestane ignorovať používateľa a začne zobrazovať jeho správy",
     "Commands": "Príkazy",
-    "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
     "Emoji": "Emoji",
     "Notify the whole room": "Oznamovať celú miestnosť",
     "Room Notification": "Oznámenie miestnosti",
@@ -591,7 +488,6 @@
     "Enable URL previews by default for participants in this room": "Predvolene povoliť náhľady URL adries pre členov tejto miestnosti",
     "URL previews are enabled by default for participants in this room.": "Náhľady URL adries sú predvolene povolené pre členov tejto miestnosti.",
     "URL previews are disabled by default for participants in this room.": "Náhľady URL adries sú predvolene zakázané pre členov tejto miestnosti.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?",
     "Call Failed": "Zlyhanie hovoru",
     "Send": "Odoslať",
     "%(duration)ss": "%(duration)ss",
@@ -617,10 +513,6 @@
     "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…",
     "Send an encrypted message…": "Odoslať šifrovanú správu…",
     "Replying": "Odpoveď",
-    "Minimize apps": "Minimalizovať aplikácie",
-    "%(count)s of your messages have not been sent.|one": "Vaša správa nebola odoslaná.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Znovu poslať všetky</resendText> alebo <cancelText>zrušiť všetky</cancelText> teraz. Vybratím môžete tiež znovu odoslať alebo zrušiť jednotlivé správy.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Znovu odoslať správu</resendText> alebo <cancelText>zrušiť správu</cancelText> teraz.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Vaše súkromie je pre nás dôležité, preto nezhromažďujeme žiadne osobné údaje alebo údaje, na základe ktorých je možné vás identifikovať.",
     "Learn more about how we use analytics.": "Zistite viac o tom, ako spracúvame analytické údaje.",
     "The information being sent to us to help make %(brand)s better includes:": "Informácie, ktoré nám posielate, aby sme zlepšili %(brand)s, zahŕňajú:",
@@ -631,7 +523,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Či pri písaní správ používate rozbalenú lištu formátovania textu",
     "Your homeserver's URL": "URL adresa vami používaného domovského servera",
     "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si zmenil zobrazované meno na %(displayName)s.",
     "Failed to set direct chat tag": "Nepodarilo sa nastaviť značku priama konverzácia",
     "Failed to remove tag %(tagName)s from room": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
@@ -647,7 +538,6 @@
     "Leave this community": "Opustiť túto komunitu",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Vedeli ste: Že prácu s %(brand)s si môžete spríjemníť použitím komunít!",
     "Clear filter": "Zrušiť filter",
-    "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.": "Ak ste nám poslali hlásenie o chybe cez Github, ladiace záznamy nám môžu pomôcť lepšie identifikovať chybu. Ladiace záznamy obsahujú údaje o používaní aplikácii, vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, ku ktorým ste sa pripojili a mená ostatných používateľov. Tieto záznamy neobsahujú samotný obsah vašich správ.",
     "Submit debug logs": "Odoslať ladiace záznamy",
     "Opens the Developer Tools dialog": "Otvorí dialóg nástroje pre vývojárov",
     "Stickerpack": "Balíček nálepiek",
@@ -658,38 +548,23 @@
     "Everyone": "Ktokoľvek",
     "Fetching third party location failed": "Nepodarilo sa získať umiestnenie tretej strany",
     "Send Account Data": "Odoslať Údaje Účtu",
-    "All notifications are currently disabled for all targets.": "Momentálne sú zakázané všetky oznámenia pre všetky ciele.",
-    "Uploading report": "Prebieha odovzdanie hlásenia",
     "Sunday": "Nedeľa",
     "Notification targets": "Ciele oznámení",
     "Today": "Dnes",
-    "Files": "Súbory",
-    "You are not receiving desktop notifications": "Nedostávate oznámenia na pracovnej ploche",
     "Friday": "Piatok",
     "Update": "Aktualizovať",
-    "Unable to fetch notification target list": "Nie je možné získať zoznam cieľov oznámení",
     "On": "Povolené",
     "Changelog": "Zoznam zmien",
     "Waiting for response from server": "Čakanie na odpoveď zo servera",
-    "Uploaded on %(date)s by %(user)s": "Nahral používateľ %(user)s dňa %(date)s",
     "Send Custom Event": "Odoslať vlastnú udalosť",
-    "Advanced notification settings": "Pokročilé nastavenia oznámení",
     "Failed to send logs: ": "Nepodarilo sa odoslať záznamy: ",
-    "Forget": "Zabudnuť",
-    "You cannot delete this image. (%(code)s)": "Nemôžete vymazať tento obrázok. (%(code)s)",
-    "Cancel Sending": "Zrušiť odosielanie",
     "This Room": "V tejto miestnosti",
     "Resend": "Poslať znovu",
     "Room not found": "Miestnosť nenájdená",
     "Downloading update...": "Sťahovanie aktualizácie…",
     "Messages in one-to-one chats": "Správy v priamych konverzáciách",
     "Unavailable": "Nedostupné",
-    "View Decrypted Source": "Zobraziť dešifrovaný zdroj",
-    "Failed to update keywords": "Nepodarilo sa aktualizovať kľúčové slová",
     "remove %(name)s from the directory.": "odstrániť %(name)s z adresára.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Oznámenia nasledujúcich kľúčových slov sa riadia pravidlami, ktoré nie je možné zobraziť na tomto mieste:",
-    "Please set a password!": "Prosím, nastavte si heslo!",
-    "You have successfully set a password!": "Ǔspešne ste si nastavili heslo!",
     "Explore Room State": "Preskúmať Stav Miestnosti",
     "Source URL": "Pôvodná URL",
     "Messages sent by bot": "Správy odosielané robotmi",
@@ -698,34 +573,21 @@
     "No update available.": "K dispozícii nie je žiadna aktualizácia.",
     "Noisy": "Hlučné",
     "Collecting app version information": "Získavajú sa informácie o verzii aplikácii",
-    "Keywords": "Kľúčové slová",
-    "Enable notifications for this account": "Povoliť oznámenia pre tento účet",
     "Invite to this community": "Pozvať do tejto komunity",
     "Search…": "Hľadať…",
-    "Messages containing <span>keywords</span>": "Správy obsahujúce <span>kľúčové slová</span>",
-    "Error saving email notification preferences": "Chyba pri ukladaní nastavení oznamovania emailom",
     "Tuesday": "Utorok",
-    "Enter keywords separated by a comma:": "Zadajte kľúčové slová oddelené čiarkou:",
-    "Forward Message": "Preposlať správu",
     "Remove %(name)s from the directory?": "Odstrániť miestnosť %(name)s z adresára?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s sa spolieha na mnohé pokročilé vlastnosti prehliadača internetu, a niektoré z nich sú vo vašom prehliadači experimentálne alebo nie sú k dispozícii vôbec.",
     "Event sent!": "Udalosť odoslaná!",
     "Preparing to send logs": "príprava odoslania záznamov",
     "Explore Account Data": "Preskúmať Údaje účtu",
-    "All messages (noisy)": "Všetky správy (hlučné)",
     "Saturday": "Sobota",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Všimnite si, Emailovú adresu môžete pridať aj neskôr v časti nastavenia, ak zmeníte svoj názor.",
-    "Direct Chat": "Priama konverzácia",
     "The server may be unavailable or overloaded": "Server môže byť nedostupný alebo preťažený",
     "Reject": "Odmietnuť",
-    "Failed to set Direct Message status of room": "Nepodarilo sa nastaviť stav miestnosti priama konverzácia",
     "Monday": "Pondelok",
     "Remove from Directory": "Odstrániť z adresára",
-    "Enable them now": "Povolte si ich teraz",
     "Toolbox": "Nástroje",
     "Collecting logs": "Získavajú sa záznamy",
     "You must specify an event type!": "Musíte nastaviť typ udalosti!",
-    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "All Rooms": "Vo všetkych miestnostiach",
     "State Key": "Stavový kľúč",
     "Wednesday": "Streda",
@@ -734,43 +596,27 @@
     "All messages": "Všetky správy",
     "Call invitation": "Audio / Video hovory",
     "Messages containing my display name": "Správy obsahujúce moje zobrazované meno",
-    "You have successfully set a password and an email address!": "Úspešne ste si nastavili heslo aj emailovú adresu!",
     "Failed to send custom event.": "Odoslanie vlastnej udalosti zlyhalo.",
     "What's new?": "Čo je nové?",
-    "Notify me for anything else": "Oznamovať mi všetko ostatné",
     "When I'm invited to a room": "Pozvania vstúpiť do miestnosti",
-    "Can't update user notification settings": "Nie je možné aktualizovať používateľské nastavenia oznamovania",
-    "Notify for all other messages/rooms": "oznamovať všetky ostatné správy / miestnosti",
     "Unable to look up room ID from server": "Nie je možné vyhľadať ID miestnosti na serveri",
     "Couldn't find a matching Matrix room": "Nie je možné nájsť zodpovedajúcu Matrix miestnosť",
     "Invite to this room": "Pozvať do tejto miestnosti",
     "You cannot delete this message. (%(code)s)": "Nemôžete vymazať túto správu. (%(code)s)",
     "Thursday": "Štvrtok",
-    "I understand the risks and wish to continue": "Rozumiem riziku a chcem pokračovať",
     "Logs sent": "Záznamy boli odoslané",
     "Back": "Naspäť",
     "Reply": "Odpovedať",
     "Show message in desktop notification": "Zobraziť text správy v oznámení na pracovnej ploche",
-    "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.": "Ladiace záznamy obsahujú údaje o používaní aplikácii, vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, ku ktorým ste sa pripojili a mená ostatných používateľov. Tieto záznamy neobsahujú samotný obsah vašich správ.",
-    "Unhide Preview": "Zobraziť náhľad",
     "Unable to join network": "Nie je možné sa pripojiť k sieti",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Prepáčte, vo vašom prehliadači <b>nie je</b> možné spustiť %(brand)s.",
     "Messages in group chats": "Správy v skupinových konverzáciách",
     "Yesterday": "Včera",
     "Error encountered (%(errorDetail)s).": "Vyskytla sa chyba (%(errorDetail)s).",
     "Event Type": "Typ Udalosti",
     "Low Priority": "Nízka priorita",
     "What's New": "Čo Je Nové",
-    "Set Password": "Nastaviť Heslo",
-    "An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.",
     "Off": "Zakázané",
     "%(brand)s does not know how to join a room on this network": "%(brand)s nedokáže vstúpiť do miestnosti na tejto sieti",
-    "Mentions only": "Len zmienky",
-    "You can now return to your account after signing out, and sign in on other devices.": "Odteraz sa budete k svojmu účtu vedieť vrátiť aj po odhlásení, alebo tiež prihlásiť na iných zariadeniach.",
-    "Enable email notifications": "Povoliť oznamovanie emailom",
-    "Download this file": "Stiahnuť tento súbor",
-    "Pin Message": "Pripnúť správu",
-    "Failed to change settings": "Nepodarilo sa zmeniť nastavenia",
     "View Community": "Zobraziť komunitu",
     "Developer Tools": "Vývojárske Nástroje",
     "View Source": "Zobraziť zdroj",
@@ -782,14 +628,12 @@
     "Your device resolution": "Rozlíšenie obrazovky vašeho zariadenia",
     "Popout widget": "Otvoriť widget v novom okne",
     "Missing roomId.": "Chýba ID miestnosti.",
-    "Always show encryption icons": "Vždy zobrazovať ikony stavu šifrovania",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nie je možné načítať udalosť odkazovanú v odpovedi. Takáto udalosť buď neexistuje alebo nemáte povolenie na jej zobrazenie.",
     "Send Logs": "Odoslať záznamy",
     "Clear Storage and Sign Out": "Vymazať úložisko a Odhlásiť sa",
     "Refresh": "Obnoviť",
     "We encountered an error trying to restore your previous session.": "Počas obnovovania vašej predchádzajúcej relácie sa vyskytla chyba.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vymazaním úložiska prehliadača možno opravíte váš problém, no zároveň sa týmto odhlásite a história vašich šifrovaných konverzácií sa pre vás môže stať nečitateľná.",
-    "Collapse Reply Thread": "Zbaliť vlákno odpovedí",
     "e.g. %(exampleValue)s": "príklad %(exampleValue)s",
     "Send analytics data": "Odosielať analytické údaje",
     "Enable widget screenshots on supported widgets": "Umožniť zachytiť snímku obrazovky pre podporované widgety",
@@ -811,26 +655,16 @@
     "Share User": "Zdieľať používateľa",
     "Share Community": "Zdieľať komunitu",
     "Link to selected message": "Odkaz na vybratú správu",
-    "COPY": "Kopírovať",
-    "Share Message": "Zdieľať správu",
     "No Audio Outputs detected": "Neboli rozpoznané žiadne zariadenia pre výstup zvuku",
     "Audio Output": "Výstup zvuku",
     "Share Room Message": "Zdieľať správu z miestnosti",
-    "The email field must not be blank.": "Email nemôže ostať prázdny.",
-    "The phone number field must not be blank.": "Telefónne číslo nemôže ostať prázdne.",
-    "The password field must not be blank.": "Heslo nemôže ostať prázdne.",
     "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.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania.",
     "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.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky.",
-    "Call in Progress": "Prebiehajúci hovor",
-    "A call is already in progress!": "Jeden hovor už prebieha!",
-    "A call is currently being placed!": "Práve prebieha iný hovor!",
     "Permission Required": "Vyžaduje sa povolenie",
     "You do not have permission to start a conference call in this room": "V tejto miestnosti nemáte povolenie začať konferenčný hovor",
     "This event could not be displayed": "Nie je možné zobraziť túto udalosť",
     "Demote yourself?": "Znížiť vlastnú úroveň moci?",
     "Demote": "Znížiť",
-    "Failed to remove widget": "Nepodarilo sa odstrániť widget",
-    "An error ocurred whilst trying to remove the widget from the room": "Pri odstraňovaní widgetu z  miestnosti sa vyskytla chyba",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nemôžete posielať žiadne správy, kým si neprečítate a neodsúhlasíte <consentLink>naše zmluvné podmienky</consentLink>.",
     "Sorry, your homeserver is too old to participate in this room.": "Prepáčte, nie je možné prijímať a odosielať do tejto miestnosti, pretože váš domovský server je zastaralý.",
     "Please contact your homeserver administrator.": "Prosím, kontaktujte správcu domovského servera.",
@@ -898,16 +732,12 @@
     "Short keyboard patterns are easy to guess": "Krátke vzory z klávesov je ľahké uhádnuť",
     "There was an error joining the room": "Pri vstupovaní do miestnosti sa vyskytla chyba",
     "Custom user status messages": "Vlastné správy o stave používateľa",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "V šifrovaných konverzáciách zobrazovať upozornenie na možnosť aktivovať Bezpečné obnovenie správ",
     "Show developer tools": "Zobraziť nástroje pre vývojárov",
     "Messages containing @room": "Správy obsahujúce @room",
     "Encrypted messages in one-to-one chats": "Šifrované správy v priamych konverzáciách",
     "Encrypted messages in group chats": "Šifrované správy v skupinových konverzáciách",
     "Delete Backup": "Vymazať zálohu",
     "Unable to load key backup status": "Nie je možné načítať stav zálohy kľúčov",
-    "Backup version: ": "Verzia zálohy: ",
-    "Algorithm: ": "Algoritmus: ",
-    "Don't ask again": "Viac sa nepýtať",
     "Set up": "Nastaviť",
     "Open Devtools": "Otvoriť nástroje pre vývojárov",
     "Add some now": "Pridajte si nejaké teraz",
@@ -924,21 +754,15 @@
     "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.": "Ak máte %(brand)s s iným nastavením otvorený na ďalšej karte, prosím zatvorte ju, pretože použitie %(brand)s s rôznym nastavením na jednom zariadení vám spôsobí len problémy.",
     "Incompatible local cache": "Nekompatibilná lokálna vyrovnávacia pamäť",
     "Clear cache and resync": "Vymazať vyrovnávaciu pamäť a synchronizovať znovu",
-    "Checking...": "Kontrola…",
     "Unable to load backup status": "Nie je možné načítať stav zálohy",
     "Unable to restore backup": "Nie je možné obnoviť zo zálohy",
     "No backup found!": "Nebola nájdená žiadna záloha!",
     "Failed to decrypt %(failedCount)s sessions!": "Nepodarilo sa dešifrovať %(failedCount)s relácií!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Získajte prístup k šifrovanej histórií správ a nastavte šiforvanú komunikáciu zadaním vášho (dlhého) hesla obnovenia.",
     "Prompt before sending invites to potentially invalid matrix IDs": "Upozorniť pred odoslaním pozvaní na potenciálne neexistujúce Matrix ID",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nie je možné nájsť používateľský profil pre Matrix ID zobrazené nižšie. Chcete ich napriek tomu pozvať?",
     "Invite anyway and never warn me again": "Napriek tomu pozvať a viac neupozorňovať",
     "Invite anyway": "Napriek tomu pozvať",
     "Next": "Ďalej",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Ak ste zabudli heslo obnovenia, môžete <button1>použiť kľúč obnovenia</button1> alebo <button2>nastaviť bezpečné obnovenie znovu</button2>",
-    "This looks like a valid recovery key!": "Zdá sa, že toto je platný kľúč obnovenia!",
-    "Not a valid recovery key": "Neplatný kľúč obnovenia",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Získajte prístup k šifrovanej histórií správ a nastavte šiforvanú komunikáciu zadaním vášho kľúča obnovenia.",
     "Set a new status...": "Nastaviť nový stav…",
     "Clear status": "Zrušiť stav",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Ste správcom tejto komunity. Nebudete môcť znovu vstúpiť bez pozvania od iného správcu.",
@@ -957,8 +781,6 @@
     "Set up Secure Message Recovery": "Nastaviť bezpečné obnovenie správ",
     "Unable to create key backup": "Nie je možné vytvoriť zálohu šifrovacích kľúčov",
     "Retry": "Skúsiť znovu",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ak si nenastavíte Bezpečné obnovenie správ, po odhlásení stratíte prístup k histórii šifrovaných konverzácií.",
-    "If you don't want to set this up now, you can later in Settings.": "Ak nechcete pokračovať v nastavení teraz, môžete sa k tomu vrátiť neskôr v časti nastavenia.",
     "New Recovery Method": "Nový spôsob obnovy",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste si nenastavili nový spôsob obnovenia, je možné, že útočník sa pokúša dostať k vášmu účtu. Radšej si ihneď zmeňte vaše heslo a nastavte si nový spôsob obnovenia v Nastaveniach.",
     "Set up Secure Messages": "Nastaviť bezpečné obnovenie správ",
@@ -999,7 +821,6 @@
     "Enable big emoji in chat": "Povoliť veľké emoji v konverzáciách",
     "Send typing notifications": "Posielať oznámenia, keď píšete",
     "Enable Community Filter Panel": "Povoliť panel filter komunít",
-    "Allow Peer-to-Peer for 1:1 calls": "Povoliť P2P počas priamych audio/video hovorov",
     "Messages containing my username": "Správy obsahujúce moje meno používateľa",
     "The other party cancelled the verification.": "Proti strana zrušila overovanie.",
     "Verified!": "Overený!",
@@ -1083,7 +904,6 @@
     "Backing up %(sessionsRemaining)s keys...": "Zálohovanie %(sessionsRemaining)s kľúčov…",
     "All keys backed up": "Všetky kľúče sú zálohované",
     "Start using Key Backup": "Začnite používať zálohovanie kľúčov",
-    "Add an email address to configure email notifications": "Oznámenia emailom nastavíte pridaním emailovej adresy",
     "Unable to verify phone number.": "Nie je možné overiť telefónne číslo.",
     "Verification code": "Overovací kód",
     "Phone Number": "Telefónne číslo",
@@ -1114,7 +934,6 @@
     "Ignored users": "Ignorovaní používatelia",
     "Bulk options": "Hromadné možnosti",
     "Accept all %(invitedRooms)s invites": "Prijať všetkých %(invitedRooms)s pozvaní",
-    "Key backup": "Zálohovanie kľúčov",
     "Security & Privacy": "Bezpečnosť & Súkromie",
     "Missing media permissions, click the button below to request.": "Chýbajú povolenia na médiá, vyžiadate klepnutím na tlačidlo nižšie.",
     "Request media permissions": "Požiadať o povolenia pristupovať k médiám",
@@ -1138,7 +957,6 @@
     "Change settings": "Zmeniť nastavenia",
     "Kick users": "Vykázať používateľov",
     "Ban users": "Zakázať používateľom vstup",
-    "Remove messages": "Odstrániť správy",
     "Notify everyone": "Poslať oznámenie všetkým",
     "Send %(eventType)s events": "Poslať udalosti %(eventType)s",
     "Roles & Permissions": "Role & Povolenia",
@@ -1149,11 +967,6 @@
     "Encryption": "Šifrovanie",
     "Once enabled, encryption cannot be disabled.": "Po aktivovaní šifrovanie nie je možné deaktivovať.",
     "Encrypted": "Zašifrované",
-    "Never lose encrypted messages": "Nikdy neprídete o zašifrované správy",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Správy v tejto miestnosti sú zabezpečené E2E šifrov. Ku kľúčom potrebných na ich čítanie máte prístup len vy a ich adresát(i).",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Bezpečne si zálohujte šifrovacie kľúče, aby ste o ne neprišli. <a>Zistiť viac.</a>",
-    "Not now": "Teraz nie",
-    "Don't ask me again": "Viac sa nepýtať",
     "Error updating main address": "Chyba pri aktualizácii hlavnej adresy",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Pri aktualizácii hlavnej adresy miestnosti nastala chyba. Nie je to povolené na servery, alebo sa jedná o dočasný problém.",
     "Main address": "Hlavná adresa",
@@ -1171,46 +984,25 @@
     "Manually export keys": "Ručne exportovať kľúče",
     "You'll lose access to your encrypted messages": "Stratíte prístup ku zašifrovaným správam",
     "Are you sure you want to sign out?": "Naozaj sa chcete odhlásiť?",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ak spozorujete chyby, alebo sa s nami chcete podeliť o spätnú väzbu, dajte nám vedieť cez Github.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Prosím nezakladajte duplicity. <existingIssuesLink>Pozrite si najprv existujúce hlásenia</existingIssuesLink>, pridajte k nim +1 alebo svoje komentáre a až ak neviete nájsť hlásenie svojho problému, <newIssueLink>vytvorte nové hlásenie</newIssueLink>.",
-    "Report bugs & give feedback": "Nahlasovanie chýb & spätná väzba",
     "Go back": "Naspäť",
     "Room Settings - %(roomName)s": "Nastavenia miestnosti - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Meno používateľa môže obsahovať len malé písmená, číslice a znaky „=_-./“",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Pozor</b>: Zálohovanie šifrovacích kľúčov by ste mali nastavovať na dôverihodnom počítači.",
-    "Share Permalink": "Zdieľať trvalý odkaz",
     "Update status": "Aktualizovať stav",
     "Set status": "Nastaviť stav",
     "Hide": "Skryť",
     "This homeserver would like to make sure you are not a robot.": "Tento domovský server by sa rád uistil, že nie ste robot.",
-    "Your Modular server": "Váš server Modular",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Zadajte umiestnenie vášho domovského servera modular. Môže to byť buď vaša doména alebo subdoména <a>modular.im</a>.",
-    "Server Name": "Názov servera",
-    "The username field must not be blank.": "Pole meno používateľa nesmie ostať prázdne.",
     "Username": "Meno používateľa",
-    "Not sure of your password? <a>Set a new one</a>": "Nie ste si istí vašim heslom? <a>Nastavte si nové</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Prihláste sa k svojmu Matrix účtu na servery %(serverName)s",
     "Change": "Zmeniť",
-    "Create your Matrix account on %(serverName)s": "Vytvorte si Matrix účet na servery %(serverName)s",
     "Email (optional)": "Email (nepovinné)",
     "Phone (optional)": "Telefón (nepovinné)",
     "Confirm": "Potvrdiť",
-    "Other servers": "Ostatné servery",
-    "Homeserver URL": "URL adresa domovského servera",
-    "Identity Server URL": "URL adresa servera totožností",
-    "Free": "Zdarma",
     "Join millions for free on the largest public server": "Pripojte sa k mnohým používateľom najväčšieho verejného domovského servera zdarma",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Platený hosting pre organizácie <a>Zistiť viac</a>",
     "Other": "Ďalšie",
-    "Find other public servers or use a custom server": "Nájdite ďalšie verejné domovské servery alebo nastavte pripojenie k serveru ručne",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Prosím, nainštalujte si <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink> pre najlepší zážitok.",
     "Couldn't load page": "Nie je možné načítať stránku",
     "Want more than a community? <a>Get your own server</a>": "Chceli by ste viac než komunitu? <a>Získajte vlastný server</a>",
     "This homeserver does not support communities": "Tento domovský server nepodporuje komunity",
     "Guest": "Hosť",
     "Could not load user profile": "Nie je možné načítať profil používateľa",
-    "Your Matrix account on %(serverName)s": "Váš Matrix účet na serveri %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Na emailovú adresu vám odošleme overovaciu správu, aby bolo možné potvrdiť nastavenie vašeho nového hesla.",
     "Sign in instead": "Radšej sa prihlásiť",
     "Your password has been reset.": "Vaše heslo bolo obnovené.",
@@ -1219,13 +1011,11 @@
     "Create account": "Vytvoriť účet",
     "Registration has been disabled on this homeserver.": "Na tomto domovskom servery nie je povolená registrácia.",
     "Unable to query for supported registration methods.": "Nie je možné požiadať o podporované metódy registrácie.",
-    "Create your account": "Vytvorte si váš účet",
     "Keep going...": "Pokračujte…",
     "For maximum security, this should be different from your account password.": "Aby ste zachovali maximálnu mieru zabezpečenia, (dlhé) heslo by malo byť odlišné od hesla, ktorým sa prihlasujete do vášho účtu.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Zálohovanie kľúčov máte aktívne (prvé zálohovanie môže trvať niekoľko minút).",
     "Starting backup...": "Začína sa zálohovanie…",
     "Success!": "Úspech!",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Nové (dlhé) heslo na obnovu zálohy a kľúč pre bezpečné správy boli spozorované.",
     "Recovery Method Removed": "Odstránený spôsob obnovenia",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste neodstránili spôsob obnovenia vy, je možné, že útočník sa pokúša dostať k vášmu účtu. Radšej si ihneď zmeňte vaše heslo a nastavte si nový spôsob obnovenia v Nastaveniach.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Či používate alebo nie funkcionalitu známu ako „omrvinky“ (obrázky nad zoznamom miestností)",
@@ -1250,7 +1040,6 @@
     "Sends the given message coloured as a rainbow": "Odošle zadanú dúhovú správu",
     "Sends the given emote coloured as a rainbow": "Odošle zadaný dúhový pocit",
     "Displays list of commands with usages and descriptions": "Zobrazí zoznam príkazov s popisom a príkladmi použitia",
-    "%(senderName)s made no change.": "%(senderName)s neurobil žiadne zmeny.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odvolal pozvanie vstúpiť do miestnosti pre %(targetDisplayName)s.",
     "Cannot reach homeserver": "Nie je možné pripojiť sa k domovskému serveru",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Uistite sa, že máte stabilné pripojenie na internet, alebo kontaktujte správcu servera",
@@ -1264,15 +1053,11 @@
     "Unexpected error resolving identity server configuration": "Neočakávaná chyba pri zisťovaní nastavení servera totožností",
     "The user's homeserver does not support the version of the room.": "Používateľov domovský server nepodporuje verziu miestnosti.",
     "Show hidden events in timeline": "Zobrazovať skryté udalosti v histórii obsahu miestností",
-    "Low bandwidth mode": "Režim šetrenia údajov",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Ak váš domovský server neposkytuje pomocný server pri uskutočňovaní hovorov, povoliť použitie záložného servera turn.matrix.org (týmto počas hovoru zdieľate svoju adresu IP)",
     "When rooms are upgraded": "Keď sú miestnosti upgradované",
     "Accept <policyLink /> to continue:": "Ak chcete pokračovať, musíte prijať <policyLink />:",
     "ID": "ID",
     "Public Name": "Verejný názov",
-    "Identity Server URL must be HTTPS": "URL adresa servera totožností musí začínať HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Toto nie je funkčný server totožností (kód stavu %(code)s)",
-    "Could not connect to Identity Server": "Nie je možné sa pripojiť k serveru totožností",
     "Checking server": "Kontrola servera",
     "Terms of service not accepted or the identity server is invalid.": "Neprijali ste Podmienky poskytovania služby alebo to nie je správny server.",
     "Identity server has no terms of service": "Server totožností nemá žiadne podmienky poskytovania služieb",
@@ -1313,19 +1098,13 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť z domovských serverov pôvodne sa zhodujúcich s %(oldGlob)s na servery zhodujúce sa s %(newGlob)s, dôvod: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť pôvodne sa zhodujúce s %(oldGlob)s na %(newGlob)s, dôvod: %(reason)s",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Multiple integration managers": "Viac integračných serverov",
     "Try out new ways to ignore people (experimental)": "Vyskúšajte si nový spôsob ignorovania používateľov (experiment)",
     "Match system theme": "Prispôsobiť sa vzhľadu systému",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)",
     "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov",
     "My Ban List": "Môj zoznam zakázať vstúpiť",
     "Decline (%(counter)s)": "Zamietnuť (%(counter)s)",
-    "The message you are trying to send is too large.": "Správa, ktorú sa usilujete odoslať, je príliš veľká.",
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je zoznam používateľov / serverov, ktorých ste zablokovali - neopúšťajte miestnosť!",
     "Upload": "Nahrať",
-    "Cross-signing and secret storage are enabled.": "Krížové podpisovanie a bezpečné úložisko sú zapnuté.",
-    "Cross-signing and secret storage are not yet set up.": "Krížové podpisovanie a bezpečné úložisko zatiaľ nie sú nastavené.",
-    "Bootstrap cross-signing and secret storage": "Zaviesť podpisovanie naprieč zariadeniami a bezpečné úložisko",
     "Cross-signing public keys:": "Verejné kľúče krížového podpisovania:",
     "not found": "nenájdené",
     "Cross-signing private keys:": "Súkromné kľúče krížového podpisovania:",
@@ -1339,7 +1118,6 @@
     "Backup has a <validity>valid</validity> signature from this user": "Záloha je podpísaná <validity>platným</validity> kľúčom od tohoto používateľa",
     "Backup has a <validity>invalid</validity> signature from this user": "Záloha je podpísaná <validity>neplatným</validity> kľúčom od tohoto používateľa",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Podpis zálohy pochádza od <verify>neznámeho</verify> používateľa ID %(deviceId)s",
-    "Backup key stored: ": "Záloha kľúčov uložená: ",
     "Clear notifications": "Vymazať oznámenia",
     "Change identity server": "Zmeniť server totožností",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Naozaj si želáte odpojiť od servera totožností <current /> a pripojiť sa namiesto toho k serveru <new />?",
@@ -1354,24 +1132,18 @@
     "Disconnect anyway": "Napriek tomu sa odpojiť",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Stále <b>zdielate vaše osobné údaje</b> so serverom totožnosti <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Odporúčame, aby ste ešte pred odpojením sa zo servera totožností odstránili vašu emailovú adresu a telefónne číslo.",
-    "Identity Server (%(server)s)": "Server totožností (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdení kontaktmi ktorých poznáte používate <server></server>. Zmeniť server totožností môžete nižšie.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ak nechcete na vyhľadávanie kontaktov a možnosť byť nájdení používať <server />, zadajte adresu servera totožností nižšie.",
-    "Identity Server": "Server totožností",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Momentálne nepoužívate žiaden server totožností. Ak chcete vyhľadávať kontakty a zároveň umožniť ostatným vašim kontaktom, aby mohli nájsť vás, nastavte si server totožností nižšie.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ak sa odpojíte od servera totožností, vaše kontakty vás nebudú môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy a telefónneho čísla.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Používanie servera totožností je voliteľné. Ak sa rozhodnete, že nebudete používať server totožností, nebudú vás vaši známi môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy alebo telefónneho čísla.",
     "Do not use an identity server": "Nepoužívať server totožností",
     "Enter a new identity server": "Zadať nový server totožností",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Použiť integračný server <b>(%(serverName)s)</b> na správu botov, widgetov a balíčkov s nálepkami.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použiť integračný server na správu botov, widgetov a balíčkov s nálepkami.",
     "Manage integrations": "Spravovať integrácie",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integračné servery zhromažďujú údaje nastavení, môžu spravovať widgety, odosielať vo vašom mene pozvánky alebo meniť úroveň moci.",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlaste s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
     "Discovery": "Objaviť",
     "Deactivate account": "Deaktivovať účet",
     "Clear cache and reload": "Vymazať vyrovnávaciu pamäť a načítať znovu",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Prispôsobte si zážitok z používania aktivovaním experimentálnych vlastností. <a>Zistiť viac</a>.",
     "Ignored/Blocked": "Ignorovaní / Blokovaní",
     "Error adding ignored user/server": "Chyba pri pridávaní ignorovaného používateľa / servera",
     "Something went wrong. Please try again or view your console for hints.": "Niečo sa nepodarilo. Prosím, skúste znovu neskôr alebo si prečítajte ďalšie usmernenia zobrazením konzoly.",
@@ -1388,17 +1160,10 @@
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Či používate %(brand)s na zariadení, ktorého hlavným vstupným mechanizmom je dotyk (mobil, tablet,...)",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Či používate %(brand)s ako nainštalovanú Progresívnu Webovú Aplikáciu",
     "Your user agent": "Identifikátor vášho prehliadača",
-    "If you cancel now, you won't complete verifying the other user.": "Pokiaľ teraz proces zrušíte, nedokončíte overenie druhého používateľa.",
-    "If you cancel now, you won't complete verifying your other session.": "Pokiaľ teraz proces zrušíte, nedokončíte overenie vašej druhej relácie.",
-    "If you cancel now, you won't complete your operation.": "Pokiaľ teraz proces zrušíte, nedokončíte ho.",
     "Cancel entering passphrase?": "Želáte si zrušiť zadávanie hesla?",
     "Setting up keys": "Príprava kľúčov",
     "Verify this session": "Overiť túto reláciu",
-    "Enter recovery passphrase": "Zadajte (dlhé) heslo pre obnovu zálohy",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nemožno sa dostať do tajného úložiska. Prosím, overte, že ste zadali správne (dlhé) heslo pre obnovu zálohy.",
     "Encryption upgrade available": "Je dostupná aktualizácia šifrovania",
-    "Set up encryption": "Nastaviť šifrovanie",
-    "Review where you’re logged in": "Zobraziť, kde ste prihlásený",
     "New login. Was this you?": "Nové pihlásenie. Ste to vy?",
     "%(name)s is requesting verification": "%(name)s žiada o overenie",
     "Sign In or Create Account": "Prihlásiť sa alebo vytvoriť nový účet",
@@ -1414,8 +1179,6 @@
     "Unknown (user, session) pair:": "Neznámy pár (používateľ, relácia):",
     "Session already verified!": "Relácia je už overená!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVANIE: Relácia je už overená, ale kľúče sa NEZHODUJÚ!",
-    "Incorrect recovery passphrase": "Nesprávne (dlhé) heslo pre obnovu zálohy",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Záloha nemohla byť rozšifrovaná pomocou tohto (dlhého) helsa na obnovu zálohy: prosím, overte, či ste zadali správne (dlhé) helso na obnovu zálohy.",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVANIE: OVERENIE KĽÚČOV ZLYHALO! Podpisovaný kľúč používateľa %(userId)s a relácia %(deviceId)s je \"%(fprint)s\" čo nezodpovedá zadanému kľúču \"%(fingerprint)s\". Môže to znamenať, že vaša komunikácia je infiltrovaná!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisovací kľúč sa zhoduje s podpisovacím kľúčom od relácie %(deviceId)s používateľa %(userId)s. Relácia je označená ako overená.",
     "Displays information about a user": "Zobrazuje informácie o používateľovi",
@@ -1449,7 +1212,6 @@
     "Support adding custom themes": "Umožniť pridávať vlastný vzhľad",
     "Your homeserver does not support cross-signing.": "Váš domovský server nepodporuje krížové podpisovanie.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Váš účet má krížovo podpísanú identitu v bezpečnom úložisku, ale zatiaľ nie je nedôveryhodná pre túto reláciu.",
-    "Reset cross-signing and secret storage": "Obnoviť krížové podpisovanie a bezpečné úložisko",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individuálne overte každú používateľskú reláciu a označte ju za dôveryhodnú, bez dôvery krížovo podpísaných zariadení.",
     "Cross-signing": "Krížové podpisovanie",
     "Destroy cross-signing keys?": "Zmazať kľúče pre krížové podpisovanie?",
@@ -1457,23 +1219,18 @@
     "Clear cross-signing keys": "Zmazať kľúče pre krížové podpisovanie",
     "a new cross-signing key signature": "nový podpis kľúča pre krížové podpisovanie",
     "a device cross-signing signature": "podpis krížovo podpísaného zariadenia",
-    "or another cross-signing capable Matrix client": "alebo iný Matrixový klient podporujúci krížové podpisovanie",
     "Removing…": "Odstraňovanie…",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Váš nový účet (%(newAccountId)s) je registrovaný, ale už ste prihlásený pod iným účtom (%(loggedInUserId)s).",
     "Continue with previous account": "Pokračovať s predošlým účtom",
     "<a>Log in</a> to your new account.": "<a>Prihláste sa</a> do vášho nového účtu.",
     "You can now close this window or <a>log in</a> to your new account.": "Teraz môžete toto okno zavrieť alebo sa <a>prihlásiť</a> do vášho nového účtu.",
     "Registration Successful": "Úspešná registrácia",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Potvrďte svoju identitu overením tohto účtu z jednej z vašich iných relácií, čím mu povolíte prístup k šifrovaným správam.",
-    "This requires the latest %(brand)s on your other devices:": "Toto vyžaduje najnovší %(brand)s na vašich ostatných zariadeniach:",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaša nová relácia je teraz overená. Má prístup k vašim šifrovaným správam a ostatný používatelia ju uvidia ako dôveryhodnú.",
     "Your new session is now verified. Other users will see it as trusted.": "Vaša nová relácia je teraz overená. Ostatný používatelia ju uvidia ako dôveryhodnú.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Bez dokončenia overenia nebude mať táto relácia prístup k šifrovaným správam.",
     "Go Back": "Späť",
     "Failed to re-authenticate due to a homeserver problem": "Opätovná autentifikácia zlyhala kvôli problému domovského servera",
     "Failed to re-authenticate": "Opätovná autentifikácia zlyhala",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Znovuzískajte prístup k vášmu účtu a obnovte šifrovacie kľúče uložené v tejto relácií. Bez nich nebudete môcť čítať všetky vaše šifrované správy vo všetkých reláciach.",
-    "Font scaling": "Škálovanie písma",
     "Show info about bridges in room settings": "Zobraziť informácie o mostoch v nastaveniach miestnosti",
     "Font size": "Veľkosť písma",
     "Show typing notifications": "Posielať oznámenia, keď píšete",
@@ -1503,7 +1260,6 @@
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varovanie: Vaše osobné údaje (vrátane šifrovacích kľúčov) sú stále uložené v tejto relácií. Zmažte ich, ak chcete túto reláciu zahodiť alebo sa chcete prihlásiť cez iný účet.",
     "Command Autocomplete": "Automatické dopĺňanie príkazov",
     "Community Autocomplete": "Automatické dopĺňanie skupín",
-    "DuckDuckGo Results": "Výsledky hľadania DuckDuckGo",
     "Emoji Autocomplete": "Automatické dopĺňanie emoji",
     "Notification Autocomplete": "Automatické dopĺňanie oznámení",
     "Room Autocomplete": "Automatické dopĺňanie miestností",
@@ -1522,22 +1278,16 @@
     "Verify by comparing unique emoji.": "Overenie porovnaním jedinečnej kombinácie emotikonov.",
     "Verify by emoji": "Overte pomocou emoji",
     "Compare emoji": "Porovnajte emoji",
-    "Verify all your sessions to ensure your account & messages are safe": "Overte všetky vaše relácie, aby ste si boli istý, že sú vaše správy a účet bezpečné",
     "Review": "Prehliadnuť",
     "Later": "Neskôr",
     "Upgrade": "Upgradovať",
     "Verify": "Overiť",
-    "Verify yourself & others to keep your chats safe": "Overte seba a ostatných, aby vaše komunikácie boli bezpečné",
     "Other users may not trust it": "Ostatní používatelia jej nemusia veriť",
-    "Verify the new login accessing your account: %(name)s": "Overte nové prihlásenie na váš účet: %(name)s",
-    "From %(deviceName)s (%(deviceId)s)": "Od %(deviceName)s (%(deviceId)s)",
     "This bridge was provisioned by <user />.": "Tento most poskytuje <user />.",
     "Room name or address": "Meno alebo adresa miestnosti",
     "Joins room with given address": "Pridať sa do miestnosti s danou adresou",
     "Unrecognised room address:": "Nerozpoznaná adresa miestnosti:",
     "This bridge is managed by <user />.": "Tento most spravuje <user />.",
-    "Workspace: %(networkName)s": "Pracovisko: %(networkName)s",
-    "Channel: %(channelName)s": "Kanál: %(channelName)s",
     "Show less": "Zobraziť menej",
     "Show more": "Zobraziť viac",
     "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.": "Zmena hesla reštartuje všetky šifrovacie kľúče pre všetky vaše relácie. Šifrované správy sa stanú nečitateľnými, pokiaľ najprv nevyexportujete vaše kľúče a po zmene ich nenaimportujete. V budúcnosti sa tento proces zjednoduší.",
@@ -1548,7 +1298,6 @@
     "cached locally": "uložené do lokálnej vyrovnávacej pamäťe",
     "not found locally": "nenájdené lokálne",
     "User signing private key:": "Používateľom podpísané súkromné kľúče:",
-    "Session backup key:": "Kľúč na zálohu relácie:",
     "Homeserver feature support:": "Funkcie podporované domovským serverom:",
     "exists": "existuje",
     "Your homeserver does not support session management.": "Váš domovský server nepodporuje správu relácií.",
@@ -1585,96 +1334,36 @@
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Vlastná veľkosť písma môže byť len v rozmedzí %(min)s pt až %(max)s pt",
     "Help us improve %(brand)s": "Pomôžte nám zlepšovať %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Posielať <UsageDataLink>anonymné dáta o používaní</UsageDataLink>, ktoré nám pomôžu zlepšiť %(brand)s. Toto bude vyžadovať <PolicyLink>sušienku</PolicyLink>.",
-    "I want to help": "Chcem pomôcť",
     "Your homeserver has exceeded its user limit.": "Na vašom domovskom serveri bol prekročený limit počtu používateľov.",
     "Your homeserver has exceeded one of its resource limits.": "Na vašom domovskom serveri bol prekročený jeden z limitov systémových zdrojov.",
     "Contact your <a>server admin</a>.": "Kontaktujte svojho <a>administrátora serveru</a>.",
     "Ok": "Ok",
-    "Set password": "Nastaviť heslo",
-    "To return to your account in future you need to set a password": "Aby ste sa k účtu mohli vrátiť aj neskôr, je potrebné nastaviť heslo",
-    "Restart": "Reštartovať",
-    "Upgrade your %(brand)s": "Upgradujte svoj %(brand)s",
-    "A new version of %(brand)s is available!": "Nová verzia %(brand)su je dostupná!",
     "Which officially provided instance you are using, if any": "Ktorú oficiálne poskytovanú inštanciu používate, ak nejakú",
-    "Use your account to sign in to the latest version": "Použite svoj účet na prihlásenie sa do najnovšej verzie",
-    "We’re excited to announce Riot is now Element": "Sme nadšený oznámiť, že Riot je odteraz Element",
-    "Riot is now Element!": "Riot je odteraz Element!",
-    "Learn More": "Dozvedieť sa viac",
     "Light": "Svetlý",
     "Dark": "Tmavý",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Požiadajte správcu vášho %(brand)su, aby skontroloval <a>vašu konfiguráciu</a>. Pravdepodobne obsahuje chyby alebo duplikáty.",
     "You joined the call": "Pridali ste sa do hovoru",
     "%(senderName)s joined the call": "%(senderName)s sa pridal/a do hovoru",
     "Call in progress": "Práve prebieha hovor",
-    "You left the call": "Opustili ste hovor",
-    "%(senderName)s left the call": "%(senderName)s opustil/a hovor",
     "Call ended": "Hovor skončil",
     "You started a call": "Začali ste hovor",
     "%(senderName)s started a call": "%(senderName)s začal/a hovor",
     "Waiting for answer": "Čakám na odpoveď",
     "%(senderName)s is calling": "%(senderName)s volá",
-    "You created the room": "Vytvorili ste miestnosť",
-    "%(senderName)s created the room": "%(senderName)s vytvoril/a miestnosť",
-    "You made the chat encrypted": "Zašifrovali ste čet",
-    "%(senderName)s made the chat encrypted": "%(senderName)s zašifroval/a čet",
-    "You made history visible to new members": "Zviditeľnili ste históriu pre nových členov",
-    "%(senderName)s made history visible to new members": "%(senderName)s zviditeľnil/a históriu pre nových členov",
-    "You made history visible to anyone": "Zviditeľnili ste históriu pre všetkých",
-    "%(senderName)s made history visible to anyone": "%(senderName)s zviditeľnil/a históriu pre všetkých",
-    "You made history visible to future members": "Zviditeľnili ste históriu pre budúcich členov",
-    "%(senderName)s made history visible to future members": "%(senderName)s zviditeľnil/a históriu pre budúcich členov",
-    "You were invited": "Boli ste pozvaný/á",
-    "%(targetName)s was invited": "%(targetName)s vás pozval/a",
-    "You left": "Odišli ste",
-    "%(targetName)s left": "%(targetName)s odišiel/odišla",
-    "You were kicked (%(reason)s)": "Boli ste vykopnutý/á (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s bol vykopnutý/á (%(reason)s)",
-    "You were kicked": "Boli ste vykopnutý/á",
-    "%(targetName)s was kicked": "%(targetName)s bol vykopnutý/á",
-    "You rejected the invite": "Odmietli ste pozvánku",
-    "%(targetName)s rejected the invite": "%(targetName)s odmietol/odmietla pozvánku",
-    "You were uninvited": "Boli ste odpozvaný/á",
-    "%(targetName)s was uninvited": "%(targetName)s bol odpozvaný/á",
-    "You were banned (%(reason)s)": "Boli ste vyhostený/á (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s bol vyhostený/á (%(reason)s)",
-    "You were banned": "Boli ste vyhostený/á",
-    "%(targetName)s was banned": "%(targetName)s bol vyhostený/á",
-    "You joined": "Pridali ste sa",
-    "%(targetName)s joined": "%(targetName)s sa pridal/a",
-    "You changed your name": "Zmenili ste vaše meno",
-    "%(targetName)s changed their name": "%(targetName)s zmenil/a svoje meno",
-    "You changed your avatar": "Zmenili ste svojho avatara",
-    "%(targetName)s changed their avatar": "%(targetName)s zmenil/a svojho avatara",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Zmenili ste meno miestnosti",
-    "%(senderName)s changed the room name": "%(senderName)s zmenil/a meno miestnosti",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Odpozvali ste používateľa %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s odpozval/a používateľa %(targetName)s",
-    "You invited %(targetName)s": "Pozvali ste používateľa %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s pozval/a používateľa %(targetName)s",
-    "You changed the room topic": "Zmenili ste tému miestnosti",
-    "%(senderName)s changed the room topic": "%(senderName)s zmenil/a tému miestnosti",
-    "New spinner design": "Nový točivý štýl",
-    "Use the improved room list (will refresh to apply changes)": "Použiť vylepšený list miestností (obnový stránku, aby sa aplikovali zmeny)",
     "Use custom size": "Použiť vlastnú veľkosť",
     "Use a more compact ‘Modern’ layout": "Použiť kompaktnejšie 'moderné' rozloženie",
     "Use a system font": "Použiť systémové písmo",
     "System font name": "Meno systémového písma",
     "Enable experimental, compact IRC style layout": "Povoliť experimentálne, kompaktné rozloženie v štýle IRC",
     "Unknown caller": "Neznámy volajúci",
-    "Incoming voice call": "Prichádzajúci hovor",
-    "Incoming video call": "Prichádzajúci video hovor",
-    "Incoming call": "Prichádzajúci hovor",
-    "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.": "Vytvorte si filter, potiahnite avatara komunity do panelu filtrov na ľavý okraj obrazovky. Môžete kliknúť na avatara v paneli filtorv, aby ste videli len miestnosti a ľudí patriacich do danej komunity.",
     "%(num)s minutes ago": "pred %(num)s min",
     "%(num)s hours ago": "pred %(num)s hodinami",
     "%(num)s days ago": "pred %(num)s dňami",
     "%(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 nemôže bezpečne cachovať šiforvané správy lokálne pomocou prehlliadača. Použite <desktopLink>%(brand)s Desktop</desktopLink> na zobrazenie výsledkov vyhľadávania šiforavných správ.",
-    "There are advanced notifications which are not shown here.": "Sú tam pokročilé notifikácie, ktoré tu nie sú zobrazené.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Možno ste ich nakonfigurovali v inom kliente než v %(brand)se. Nemôžete ich napasovať do %(brand)su, ale stále platia.",
     "New version available. <a>Update now.</a>": "Je dostupná nová verzia. <a>Aktualizovať.</a>",
     "Hey you. You're the best!": "Hej, ty. Si borec/borka!",
     "Use between %(min)s pt and %(max)s pt": "Použite veľkosť mezi %(min)s pt a %(max)s pt",
@@ -1684,7 +1373,6 @@
     "Custom theme URL": "URL adresa vlastného vzhľadu",
     "Add theme": "Pridať vzhľad",
     "Message layout": "Rozloženie správy",
-    "Compact": "Kompaktný",
     "Modern": "Moderný",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Nastavte meno písma, ktoré máte nainštalované na vašom systéme & %(brand)s sa ho pokúsi použiť.",
     "Customise your appearance": "Upravte si svoj výzor",
@@ -1730,8 +1418,6 @@
     "Upgrade this room to the recommended room version": "Upgradujte túto miestnosť na odporúčanú verziu",
     "this room": "táto miestnosť",
     "View older messages in %(roomName)s.": "Zobraziť staršie správy v miestnosti %(roomName)s.",
-    "Make this room low priority": "Priradiť tejto miestnosti nízku prioritu",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Miestnosti s nízkou prioritou sa zobrazia vo vyhradenej sekcií na konci vášho zoznamu miestností",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Táto miestnosť premosťuje správy s nasledujúcimi platformami. <a>Viac informácií</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Táto miestnosť nepremosťuje správy so žiadnymi ďalšími platformami. <a>Viac informácií</a>",
     "Bridges": "Mosty",
@@ -1778,10 +1464,6 @@
     "The person who invited you already left the room, or their server is offline.": "Osoba, ktorá Vás pozvala už opustila miestnosť, alebo je jej server offline.",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Change notification settings": "Upraviť nastavenia upozornení",
-    "Enable advanced debugging for the room list": "Zapnúť pokročilé nástroje ladenia pre zoznam miestností",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Bezpečne uchovávať šifrované správy na tomto zariadení, aby sa v nich dalo vyhľadávať pomocou ",
-    " to store messages from ": " na uchovanie správ z ",
-    "rooms.": "miestnosti.",
     "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Váš osobný zoznam blokácií obsahuje všetkých používateľov a servery, ktoré nechcete vidieť. Po ignorovaní prvého používateľa/servera sa vytvorí nová miestnosť 'Môj zoznam blokácií' - zostaňte v ňom, aby zoznam platil.",
     "Discovery options will appear once you have added an email above.": "Možnosti nastavenia verejného profilu sa objavia po pridaní e-mailovej adresy vyššie.",
     "Discovery options will appear once you have added a phone number above.": "Možnosti nastavenia verejného profilu sa objavia po pridaní telefónneho čísla vyššie.",
@@ -1794,7 +1476,6 @@
     "Hide advanced": "Skryť pokročilé možnosti",
     "Show advanced": "Ukázať pokročilé možnosti",
     "Explore rooms": "Preskúmať miestnosti",
-    "Search rooms": "Hľadať miestnosti",
     "Security & privacy": "Bezpečnosť & súkromie",
     "All settings": "Všetky nastavenia",
     "Feedback": "Spätná väzba",
@@ -1807,7 +1488,6 @@
     "Italics": "Kurzíva",
     "Strikethrough": "Preškrtnuté",
     "Leave Room": "Opustiť miestnosť",
-    "Direct message": "Priama správa",
     "Security": "Zabezpečenie",
     "Send a Direct Message": "Poslať priamu správu",
     "User menu": "Používateľské menu",
@@ -2079,6 +1759,13 @@
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Hovor zlyhal, pretože nebolo možné získať prístup k mikrofónu. Skontrolujte, či je mikrofón pripojený a správne nastavený.",
     "The call was answered on another device.": "Hovor bol prijatý na inom zariadení.",
     "The call could not be established": "Hovor nemohol byť realizovaný",
-    "The other party declined the call.": "Druhá strana odmietla hovor.",
-    "Call Declined": "Hovor odmietnutý"
+    "Integration manager": "Správca integrácií",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integračné servery zhromažďujú údaje nastavení, môžu spravovať widgety, odosielať vo vašom mene pozvánky alebo meniť úroveň moci.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Použiť integračný server na správu botov, widgetov a balíčkov s nálepkami.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Použiť integračný server <b>(%(serverName)s)</b> na správu botov, widgetov a balíčkov s nálepkami.",
+    "Identity server": "Server totožností",
+    "Identity server (%(server)s)": "Server totožností (%(server)s)",
+    "Could not connect to identity server": "Nie je možné sa pripojiť k serveru totožností",
+    "Not a valid identity server (status code %(code)s)": "Toto nie je funkčný server totožností (kód stavu %(code)s)",
+    "Identity server URL must be HTTPS": "URL adresa servera totožností musí začínať HTTPS"
 }
diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json
index aa2019ad45..5dbf5a303d 100644
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -8,7 +8,6 @@
     "Chat with %(brand)s Bot": "Klepetajte z %(brand)s Botom",
     "Sign In": "Prijava",
     "powered by Matrix": "poganja Matrix",
-    "Custom Server Options": "Možnosti strežnika po meri",
     "Your language of choice": "Vaš jezik po izbiri",
     "Use Single Sign On to continue": "Uporabi Single Sign On za prijavo",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Potrdite dodajanje tega e-poštnega naslova z enkratno prijavo, da dokažete svojo identiteto.",
@@ -22,7 +21,6 @@
     "Click the button below to confirm adding this phone number.": "Pritisnite gumb spodaj da potrdite dodajanje te telefonske številke.",
     "Add Phone Number": "Dodaj telefonsko številko",
     "Analytics": "Analitika",
-    "Call Declined": "Klic zavrnjen",
     "Call Failed": "Klic ni uspel",
     "Your homeserver's URL": "URL domačega strežnika",
     "End": "Konec",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index bd294093f9..4bfd16b802 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -12,11 +12,6 @@
     "The information being sent to us to help make %(brand)s better includes:": "Te të dhënat e dërguara te ne për të na ndihmuar ta bëjmë %(brand)s-in më të mirë përfshihen:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kur kjo faqe përfshin të dhëna të identifikueshme, të tilla si një ID dhome përdoruesi apo grupi, këto të dhëna hiqen përpara se të dërgohet te shërbyesi.",
     "Call Failed": "Thirrja Dështoi",
-    "Call Timeout": "Mbarim kohe Thirrjeje",
-    "The remote side failed to pick up": "Ana e largët dështoi të përgjigjet",
-    "Unable to capture screen": "S’arrihet të fotografohet ekrani",
-    "Existing Call": "Thirrje Ekzistuese",
-    "You are already in a call.": "Jeni tashmë në një thirrje.",
     "VoIP is unsupported": "VoIP nuk mbulohet",
     "You cannot place VoIP calls in this browser.": "S’mund të bëni thirrje VoIP që nga ky shfletues.",
     "You cannot place a call with yourself.": "S’mund të bëni thirrje me vetveten.",
@@ -72,7 +67,6 @@
     "Admin": "Përgjegjës",
     "Operation failed": "Veprimi dështoi",
     "Failed to invite": "S’u arrit të ftohej",
-    "Failed to invite the following users to the %(roomName)s room:": "S’u arrit të ftoheshin përdoruesit vijues te dhoma %(roomName)s:",
     "You need to be logged in.": "Lypset të jeni i futur në llogarinë tuaj.",
     "You need to be able to invite users to do that.": "Që ta bëni këtë, lypset të jeni në gjendje të ftoni përdorues.",
     "Unable to create widget.": "S’arrihet të krijohet widget-i.",
@@ -83,40 +77,28 @@
     "You do not have permission to do that in this room.": "S’keni leje për ta bërë këtë në këtë dhomë.",
     "Room %(roomId)s not visible": "Dhoma %(roomId)s s’është e dukshme",
     "Usage": "Përdorim",
-    "/ddg is not a command": "/ddg s’është urdhër",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Për ta përdorur, thjesht pritni që të ngarkohen përfundimet e vetëplotësimit dhe shihini një nga një.",
     "Ignored user": "Përdorues i shpërfillur",
     "You are now ignoring %(userId)s": "Tani po e shpërfillni %(userId)s",
     "Unignored user": "U hoq shpërfillja për përdoruesin",
     "Fetching third party location failed": "Dështoi prurja e vendndodhjes së palës së tretë",
     "Send Account Data": "Dërgo të Dhëna Llogarie",
-    "All notifications are currently disabled for all targets.": "Krejt njoftimet hëpërhë janë çaktivizuar për krejt objektivat.",
-    "Uploading report": "Po ngarkohet raporti",
     "Sunday": "E diel",
     "Guests can join": "Vizitorët mund të marrin pjesë",
     "Notification targets": "Objektiva njoftimesh",
     "Today": "Sot",
-    "Files": "Kartela",
-    "You are not receiving desktop notifications": "Nuk po merrni njoftime për desktop",
     "Friday": "E premte",
     "Update": "Përditësoje",
     "Notifications": "Njoftime",
-    "Unable to fetch notification target list": "S’arrihet të sillet listë objektivash njoftimi",
     "On": "On",
     "Changelog": "Regjistër ndryshimesh",
     "Reject": "Hidheni tej",
     "Waiting for response from server": "Po pritet për përgjigje nga shërbyesi",
     "Failed to change password. Is your password correct?": "S’u arrit të ndryshohej fjalëkalimi. A është i saktë fjalëkalimi juaj?",
-    "Uploaded on %(date)s by %(user)s": "Ngarkuar më %(date)s nga %(user)s",
     "OK": "OK",
     "Send Custom Event": "Dërgoni Akt Vetjak",
-    "Advanced notification settings": "Rregullime të mëtejshme për njoftimet",
     "Failed to send logs: ": "S’u arrit të dërgoheshin regjistra: ",
-    "Forget": "Harroje",
     "World readable": "E lexueshme nga bota",
     "Mute": "Pa Zë",
-    "You cannot delete this image. (%(code)s)": "S’mund ta fshini këtë figurë. (%(code)s)",
-    "Cancel Sending": "Anuloje Dërgimin",
     "Warning": "Sinjalizim",
     "This Room": "Këtë Dhomë",
     "Resend": "Ridërgoje",
@@ -124,12 +106,7 @@
     "Downloading update...": "Po shkarkohet përditësim…",
     "Messages in one-to-one chats": "Mesazhe në fjalosje tek për tek",
     "Unavailable": "Jo i passhëm",
-    "View Decrypted Source": "Shihni Burim të Shfshehtëzuar",
-    "Failed to update keywords": "S’u arrit të përditësoheshin fjalëkyçe",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Njoftimet e shkaktuara nga fjalëkyçet vijuese ndjekin rregulla që s’mund të shfaqen këtu:",
-    "Please set a password!": "Ju lutemi, caktoni një fjalëkalim!",
     "powered by Matrix": "bazuar në Matrix",
-    "You have successfully set a password!": "Caktuat me sukses një fjalëkalim!",
     "Favourite": "E parapëlqyer",
     "All Rooms": "Krejt Dhomat",
     "Explore Room State": "Eksploroni Gjendje Dhome",
@@ -141,41 +118,24 @@
     "No update available.": "S’ka përditësim gati.",
     "Noisy": "I zhurmshëm",
     "Collecting app version information": "Po grumbullohen të dhëna versioni aplikacioni",
-    "Keywords": "Fjalëkyçe",
-    "Unpin Message": "Shfiksojeni Mesazhin",
-    "Enable notifications for this account": "Aktivizo njoftime për këtë llogari",
     "Remove": "Hiqe",
     "Invite to this community": "Ftojeni te kjo bashkësi",
     "Search…": "Kërkoni…",
-    "Messages containing <span>keywords</span>": "Mesazhe që përmbajnë <span>fjalëkyçe</span>",
-    "Error saving email notification preferences": "Gabim në ruajtje parapëlqimesh për njoftime me email",
     "Tuesday": "E martë",
-    "Enter keywords separated by a comma:": "Jepni fjalëkyçe ndarë me presje:",
-    "Forward Message": "Përcille Mesazhin",
-    "You have successfully set a password and an email address!": "Keni caktuar me sukses një fjalëkalim dhe një adresë email!",
     "Remove %(name)s from the directory?": "Të hiqet %(name)s prej drejtorisë?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s-i përdor mjaft veçori të përparuara të shfletuesve, disa prej të cilave s’janë gati ose janë eksperimentale në shfletuesin tuaj të tanishëm.",
     "Event sent!": "Akti u dërgua!",
     "Preparing to send logs": "Po përgatitet për dërgim regjistrash",
     "Unnamed room": "Dhomë e paemërtuar",
     "Dismiss": "Mos e merr parasysh",
     "Explore Account Data": "Eksploroni të Dhëna Llogarie",
-    "All messages (noisy)": "Krejt mesazhet (e zhurmshme)",
     "Saturday": "E shtunë",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Mos harroni, mundeni përherë të caktoni një adresë email te rregullimet e përdoruesit, nëse ndërroni mendje.",
-    "Direct Chat": "Fjalosje e Drejtpërdrejtë",
     "The server may be unavailable or overloaded": "Shërbyesi mund të jetë i pakapshëm ose i mbingarkuar",
     "Online": "Në linjë",
-    "Failed to set Direct Message status of room": "S’u arrit të caktohej gjendje Mesazhesh të Drejtpërdrejtë në dhomë",
     "Monday": "E hënë",
-    "Download this file": "Shkarkoje këtë kartelë",
     "Remove from Directory": "Hiqe prej Drejtorie",
-    "Enable them now": "Aktivizoji tani",
     "Toolbox": "Grup mjetesh",
     "Collecting logs": "Po grumbullohen regjistra",
     "Search": "Kërkoni",
-    "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.": "Regjistrat e diagnostikimeve përmbajnë të dhëna përdorimi të aplikacioneve, përfshi emrin tuaj të përdoruesit, ID ose aliase të dhomave apo grupeve që keni vizituar dhe emrat e përdoruesve të përdoruesve të tjerë. Nuk përmbajnë mesazhe.",
-    "(HTTP status %(httpStatus)s)": "(Gjendje HTTP %(httpStatus)s)",
     "Failed to forget room %(errCode)s": "S’u arrit të harrohej dhoma %(errCode)s",
     "Submit debug logs": "Parashtro regjistra diagnostikimi",
     "Wednesday": "E mërkurë",
@@ -190,71 +150,50 @@
     "State Key": "Kyç Gjendjesh",
     "Failed to send custom event.": "S’u arrit të dërgohet akt vetjak.",
     "What's new?": "Ç’ka të re?",
-    "Notify me for anything else": "Njoftomë për gjithçka tjetër",
     "When I'm invited to a room": "Kur ftohem në një dhomë",
     "Close": "Mbylle",
-    "Can't update user notification settings": "S’përditësohen dot rregullime njoftimi të përdoruesit",
-    "Notify for all other messages/rooms": "Njofto për krejt mesazhet/dhomat e tjera",
     "Unable to look up room ID from server": "S’arrihet të kërkohet ID dhome nga shërbyesi",
     "Couldn't find a matching Matrix room": "S’u gjet dot një dhomë Matrix me përputhje",
     "Invite to this room": "Ftojeni te kjo dhomë",
     "You cannot delete this message. (%(code)s)": "S’mund ta fshini këtë mesazh. (%(code)s)",
     "Thursday": "E enjte",
-    "I understand the risks and wish to continue": "I kuptoj rreziqet dhe dëshiroj të vazhdoj",
     "Logs sent": "Regjistrat u dërguan",
     "Back": "Mbrapsht",
     "Reply": "Përgjigje",
     "Show message in desktop notification": "Shfaq mesazh në njoftim për desktop",
     "You must specify an event type!": "Duhet të përcaktoni një lloj akti!",
-    "Unhide Preview": "Shfshihe Paraparjen",
     "Unable to join network": "S’arrihet të hyhet në rrjet",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Na ndjeni, shfletuesi juaj <b>nuk</b> është në gjendje të xhirojë %(brand)s-in.",
     "Messages in group chats": "Mesazhe në fjalosje në grup",
     "Yesterday": "Dje",
     "Error encountered (%(errorDetail)s).": "U has gabim (%(errorDetail)s).",
     "Event Type": "Lloj Akti",
     "Low Priority": "Përparësi e Ulët",
     "What's New": "Ç’ka të Re",
-    "Set Password": "Caktoni Fjalëkalim",
-    "An error occurred whilst saving your email notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftime me email.",
     "Register": "Regjistrohuni",
     "Off": "Off",
     "Edit": "Përpuno",
     "%(brand)s does not know how to join a room on this network": "%(brand)s-i nuk di si të hyjë në një dhomë në këtë rrjet",
-    "Mentions only": "Vetëm përmendje",
     "remove %(name)s from the directory.": "hiqe %(name)s prej drejtorie.",
-    "You can now return to your account after signing out, and sign in on other devices.": "Mund të ktheheni te llogaria juaj, pasi të keni bërë daljen, dhe të bëni hyrjen nga pajisje të tjera.",
     "Continue": "Vazhdo",
-    "Enable email notifications": "Aktivizo njoftime me email",
     "No rooms to show": "S’ka dhoma për shfaqje",
     "Add rooms to this community": "Shtoni dhoma te kjo bashkësi",
-    "Pin Message": "Fiksojeni Mesazhin",
-    "Failed to change settings": "S’u arrit të ndryshoheshin rregullimet",
     "Leave": "Dilni",
     "View Community": "Shihni Bashkësinë",
     "Developer Tools": "Mjete Zhvilluesi",
     "View Source": "Shihini Burimin",
-    "Custom Server Options": "Mundësi Shërbyesi Vetjak",
     "Event Content": "Lëndë Akti",
     "Rooms": "Dhoma",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Me shfletuesin tuaj të tanishëm, pamja dhe ndjesitë nga aplikacioni mund të jenë plotësisht të pasakta, dhe disa nga ose krejt veçoritë të mos funksionojnë. Nëse doni ta provoni sido qoftë, mund të vazhdoni, por mos u ankoni për çfarëdo problemesh që mund të hasni!",
     "Checking for an update...": "Po kontrollohet për një përditësim…",
     "PM": "PM",
     "AM": "AM",
     "Verified key": "Kyç i verifikuar",
     "Reason": "Arsye",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s kërkoi një konferencë VoIP.",
-    "VoIP conference started.": "Konferenca VoIP filloi.",
-    "VoIP conference finished.": "Konferenca VoIP përfundoi.",
     "Someone": "Dikush",
-    "(no answer)": "(s’ka përgjigje)",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur janë ftuar.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur morën pjesë.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për këdo.",
     "Always show message timestamps": "Shfaq përherë vula kohore për mesazhet",
-    "Room Colour": "Ngjyrë Dhome",
-    "unknown caller": "thirrës i panjohur",
     "Decline": "Hidhe poshtë",
     "Accept": "Pranoje",
     "Incorrect verification code": "Kod verifikimi i pasaktë",
@@ -278,15 +217,9 @@
     "This room has no local addresses": "Kjo dhomë s’ka adresë vendore",
     "Invalid community ID": "ID bashkësie e pavlefshme",
     "URL Previews": "Paraparje URL-sh",
-    "Add a widget": "Shtoni një widget",
-    "Drop File Here": "Hidheni Kartelën Këtu",
     "Drop file here to upload": "Hidheni kartelën këtu që të ngarkohet",
-    " (unsupported)": " (e pambuluar)",
-    "%(senderName)s sent an image": "%(senderName)s dërgoi një figurë",
-    "%(senderName)s sent a video": "%(senderName)s dërgoi një video",
     "Options": "Mundësi",
     "Key request sent.": "Kërkesa për kyç u dërgua.",
-    "Please select the destination room for this message": "Ju lutemi, përzgjidhni dhomën vendmbërritje për këtë mesazh",
     "Kick": "Përzëre",
     "Kick this user?": "Të përzihet ky përdorues?",
     "Unban": "Hiqja dëbimin",
@@ -312,8 +245,6 @@
     "Server error": "Gabim shërbyesi",
     "Command error": "Gabim urdhri",
     "Loading...": "Po ngarkohet…",
-    "Pinned Messages": "Mesazhe të Fiksuar",
-    "Jump to message": "Kalo te mesazhi",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -330,7 +261,6 @@
     "Upload avatar": "Ngarkoni avatar",
     "Settings": "Rregullime",
     "Forget room": "Harroje dhomën",
-    "Community Invites": "Ftesa Bashkësie",
     "Invites": "Ftesa",
     "Favourites": "Të parapëlqyer",
     "Low priority": "Me përparësi të ulët",
@@ -340,20 +270,14 @@
     "Privileged Users": "Përdorues të Privilegjuar",
     "Banned users": "Përdorues të dëbuar",
     "Leave room": "Dilni nga dhomë",
-    "Click here to fix": "Klikoni këtu për ta ndrequr",
-    "Who can access this room?": "Kush mund të hyjë në këtë dhomë?",
     "Only people who have been invited": "Vetëm persona që janë ftuar",
-    "Anyone who knows the room's link, apart from guests": "Cilido që di lidhjen e dhomës, hiq vizitorët",
-    "Anyone who knows the room's link, including guests": "Cilido që di lidhjen e dhomës, përfshi vizitorë",
     "Who can read history?": "Kush mund të lexojë historikun?",
     "Anyone": "Cilido",
     "Permissions": "Leje",
     "Advanced": "Të mëtejshme",
-    "Add a topic": "Shtoni një temë",
     "Decrypt %(text)s": "Shfshehtëzoje %(text)s",
     "Copied!": "U kopjua!",
     "Add an Integration": "Shtoni një Integrim",
-    "Please check your email to continue registration.": "Ju lutemi, që të vazhdojë regjistrimi, kontrolloni email-in tuaj.",
     "Please enter the code it contains:": "Ju lutemi, jepni kodin që përmbahet:",
     "Code": "Kod",
     "Start authentication": "Fillo mirëfilltësim",
@@ -368,12 +292,10 @@
     "Filter community rooms": "Filtroni dhoma bashkësie",
     "You're not currently a member of any communities.": "Hëpërhë, s’jeni anëtar i ndonjë bashkësie.",
     "Unknown Address": "Adresë e Panjohur",
-    "Allow": "Lejoje",
     "Create new room": "Krijoni dhomë të re",
     "No results": "S’ka përfundime",
     "Communities": "Bashkësi",
     "Home": "Kreu",
-    "Manage Integrations": "Administroni Integrime",
     "were invited %(count)s times|one": "janë ftuar",
     "was invited %(count)s times|other": "është ftuar %(count)s herë",
     "was invited %(count)s times|one": "është ftuar",
@@ -393,9 +315,7 @@
     "expand": "zgjeroje",
     "Custom level": "Nivel vetjak",
     "<a>In reply to</a> <pill>": "<a>Në Përgjigje të</a> <pill>",
-    "Room directory": "Drejtori Dhome",
     "Start chat": "Filloni fjalosje",
-    "Add User": "Shtoni Përdorues",
     "Matrix ID": "ID Matrix",
     "Matrix Room ID": "ID Matrix dhome",
     "email address": "adresë email",
@@ -416,12 +336,6 @@
     "This doesn't appear to be a valid email address": "Kjo s’duket se është adresë email e vlefshme",
     "Verification Pending": "Verifikim Në Pritje të Miratimit",
     "Skip": "Anashkaloje",
-    "Username not available": "Emri i përdoruesit s’është i lirë",
-    "Username invalid: %(errMessage)s": "Emër përdoruesi i pavlefshëm: %(errMessage)s",
-    "Username available": "Emri i përdoruesit është i lirë",
-    "Private Chat": "Fjalosje Private",
-    "Public Chat": "Fjalosje Publike",
-    "Custom": "Vetjak",
     "Name": "Emër",
     "You must <a>register</a> to use this functionality": "Që të përdorni këtë funksion, duhet të <a>regjistroheni</a>",
     "Add rooms to the community summary": "Shtoni dhoma te përmbledhja mbi bashkësinë",
@@ -446,10 +360,6 @@
     "Logout": "Dalje",
     "Your Communities": "Bashkësitë Tuaja",
     "Create a new community": "Krijoni një bashkësi të re",
-    "You have no visible notifications": "S’keni njoftime të dukshme",
-    "%(count)s of your messages have not been sent.|other": "Disa nga mesazhet tuaj s’janë dërguar.",
-    "%(count)s of your messages have not been sent.|one": "Mesazhi juaj s’u dërgua.",
-    "Active call": "Thirrje aktive",
     "You seem to be in a call, are you sure you want to quit?": "Duket se jeni në një thirrje, jeni i sigurt se doni të dilet?",
     "Search failed": "Kërkimi shtoi",
     "No more results": "Jo më tepër përfundime",
@@ -472,23 +382,16 @@
     "Email": "Email",
     "Profile": "Profil",
     "Account": "Llogari",
-    "Access Token:": "Token Hyrjesh:",
-    "Identity Server is": "Shërbyes Identitetesh është",
     "%(brand)s version:": "Version %(brand)s:",
-    "olm version:": "version olm:",
     "The email address linked to your account must be entered.": "Duhet dhënë adresa email e lidhur me llogarinë tuaj.",
     "Return to login screen": "Kthehuni te skena e hyrjeve",
     "Send Reset Email": "Dërgo Email Ricaktimi",
     "Incorrect username and/or password.": "Emër përdoruesi dhe/ose fjalëkalim i pasaktë.",
-    "The phone number entered looks invalid": "Numri i telefonit që u dha duket i pavlefshëm",
-    "Set a display name:": "Caktoni emër ekrani:",
-    "Upload an avatar:": "Ngarkoni një avatar:",
     "This server does not support authentication with a phone number.": "Ky shërbyes nuk mbulon mirëfilltësim me një numër telefoni.",
     "Bans user with given id": "Dëbon përdoruesin me ID-në e dhënë",
     "Kicks user with given id": "Përzë përdoruesin me ID-në e dhënë",
     "Opens the Developer Tools dialog": "Hap dialogun Mjete Zhvilluesi",
     "Commands": "Urdhra",
-    "Results from DuckDuckGo": "Përfundimet vijnë nga DuckDuckGo",
     "Notify the whole room": "Njofto krejt dhomën",
     "Room Notification": "Njoftim Dhome",
     "Users": "Përdorues",
@@ -507,12 +410,8 @@
     "Missing user_id in request": "Mungon user_id te kërkesa",
     "Failed to join room": "S’u arrit të hyhej në dhomë",
     "Mirror local video feed": "Pasqyro prurje vendore videoje",
-    "Incoming voice call from %(name)s": "Thirrje audio ardhëse nga %(name)s",
-    "Incoming video call from %(name)s": "Thirrje video ardhëse nga %(name)s",
-    "Incoming call from %(name)s": "Thirrje ardhëse nga %(name)s",
     "Failed to upload profile picture!": "S’u arrit të ngarkohej foto profili!",
     "New community ID (e.g. +foo:%(localDomain)s)": "ID bashkësie të re (p.sh. +foo:%(localDomain)s)",
-    "Ongoing conference call%(supportedText)s.": "Thirrje konference që po zhvillohet%(supportedText)s.",
     "Failed to kick": "S’u arrit të përzihej",
     "Unban this user?": "Të hiqet dëbimi për këtë përdorues?",
     "Failed to ban user": "S’u arrit të dëbohej përdoruesi",
@@ -521,7 +420,6 @@
     "Unmute": "Ktheji zërin",
     "Invited": "I ftuar",
     "Hangup": "Mbylle Thirrjen",
-    "No pinned messages.": "S’ka mesazhe të fiksuar.",
     "Replying": "Po përgjigjet",
     "Failed to unban": "S’u arrit t’i hiqej dëbimi",
     "Members only (since the point in time of selecting this option)": "Vetëm anëtarët (që nga çasti i përzgjedhjes së kësaj mundësie)",
@@ -535,14 +433,11 @@
     "Failed to withdraw invitation": "S’u arrit të tërhiqej mbrapsht ftesa",
     "Failed to remove user from community": "S’u arrit të hiqej përdoruesi nga bashkësia",
     "Failed to remove room from community": "S’u arrit të hiqej dhoma nga bashkësia",
-    "Minimize apps": "Minimizoji aplikacionet",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sndryshoi avatarin e vet",
     "Unable to restore session": "S’arrihet të rikthehet sesioni",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ju lutemi, kontrolloni email-in tuaj dhe klikoni mbi lidhjen që përmban. Pasi të jetë bërë kjo, klikoni që të vazhdohet.",
     "Unable to add email address": "S’arrihet të shtohet adresë email",
     "Unable to verify email address.": "S’arrihet të verifikohet adresë email.",
-    "To get started, please pick a username!": "Që t’ia filloni, ju lutemi, zgjidhni një emër përdoruesi!",
-    "There are no visible files in this room": "S’ka kartela të dukshme në këtë dhomë",
     "Failed to upload image": "S’u arrit të ngarkohej figurë",
     "Failed to update community": "S’u arrit të përditësohej bashkësia",
     "Unable to accept invite": "S’arrihet të pranohet ftesë",
@@ -551,8 +446,6 @@
     "Featured Users:": "Përdorues të Zgjedhur:",
     "Failed to load %(groupId)s": "S’u arrit të ngarkohej %(groupId)s",
     "Failed to reject invitation": "S’u arrit të hidhej poshtë ftesa",
-    "Failed to leave room": "S’u arrit të braktisej",
-    "Fill screen": "Mbushe ekranin",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "U provua të ngarkohej një pikë të dhënë prej rrjedhës kohore në këtë dhomë, por s’u arrit të gjendej.",
     "Failed to load timeline position": "S’u arrit të ngarkohej pozicion rrjedhe kohore",
     "Unable to remove contact information": "S’arrihet të hiqen të dhëna kontakti",
@@ -560,40 +453,21 @@
     "Homeserver is": "Shërbyesi Home është",
     "Failed to send email": "S’u arrit të dërgohej email",
     "I have verified my email address": "E kam verifikuar adresën time email",
-    "Failed to fetch avatar URL": "S’u arrit të sillej URL avatari",
     "Invites user with given id to current room": "Fton te dhoma e tanishme përdoruesin me ID-në e dhënë",
-    "Searches DuckDuckGo for results": "Kërkon te DuckDuckGo për përfundime",
     "Ignores a user, hiding their messages from you": "Shpërfill një përdorues, duke ju fshehur krejt mesazhet prej tij",
     "File to import": "Kartelë për importim",
     "Import": "Importo",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s pranoi ftesën për %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s pranoi një ftesë.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ftoi %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s dëboi %(targetName)s.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s hoqi foton e vet të profilit.",
-    "%(senderName)s set a profile picture.": "%(senderName)s caktoi një foto profili.",
-    "%(targetName)s joined the room.": "%(targetName)s hyri në dhomë.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s hodhi tej ftesën.",
-    "%(targetName)s left the room.": "%(targetName)s doli nga dhoma.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s përzuri %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ndryshoi temën në \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hoqi emrin e dhomës.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s dërgoi një figurë.",
-    "%(senderName)s answered the call.": "%(senderName)s iu përgjigj thirrjes.",
-    "(could not connect media)": "(s’lidhi dot median)",
-    "(unknown failure: %(reason)s)": "(dështim i panjohur: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s e përfundoi thirrjen.",
     "Failed to set display name": "S’u arrit të caktohej emër ekrani",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' s’është ID i vlefshëm bashkësish",
-    "Cannot add any more widgets": "S’mund të shtohen më tepër widget-e",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (pushtet %(powerLevelNumber)si)",
     "(~%(count)s results)|other": "(~%(count)s përfundime)",
     "(~%(count)s results)|one": "(~%(count)s përfundim)",
-    "Error decrypting audio": "Gabim në shfshehtëzim audioje",
     "Download %(text)s": "Shkarko %(text)s",
     "Error decrypting image": "Gabim në shfshehtëzim figure",
     "Error decrypting video": "Gabim në shfshehtëzim videoje",
-    "An email has been sent to %(emailAddress)s": "U dërgua një email te %(emailAddress)s",
     "Delete Widget": "Fshije Widget-in",
     "Delete widget": "Fshije widget-in",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)shynë dhe dolën",
@@ -604,11 +478,7 @@
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sndryshoi emrin e vet",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sndryshuan avatarët e tyre",
     "And %(count)s more...|other": "Dhe %(count)s të tjerë…",
-    "ex. @bob:example.com": "p.sh., @bob:example.com",
-    "An error occurred: %(error_string)s": "Ndodhi një gabim: %(error_string)s",
     "Connectivity to the server has been lost.": "Humbi lidhja me shërbyesin.",
-    "Click to mute video": "Klikoni që të heshtet videoja",
-    "Click to mute audio": "Klikoni që të heshtet audioja",
     "<not supported>": "<nuk mbulohet>",
     "A new password must be entered.": "Duhet dhënë një fjalëkalim i ri.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Te %(emailAddress)s u dërgua një email. Pasi të ndiqni lidhjen që përmban, klikoni më poshtë.",
@@ -619,21 +489,12 @@
     "Emoji": "Emoji",
     "Failed to set direct chat tag": "S’u arrit të caktohej etiketa e fjalosjes së drejtpërdrejtë",
     "You are no longer ignoring %(userId)s": "Nuk e shpërfillni më %(userId)s",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s caktoi për veten emër ekrani %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s hoqi emrin e tij në ekran (%(oldDisplayName)s).",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ndryshoi foton e vet të profilit.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hoqi dëbimin për %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s tërhoqi mbrapsht ftesën për %(targetName)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ndryshoi emrin e dhomës në %(roomName)s.",
-    "(not supported by this browser)": "(s’mbulohet nga ky shfletues)",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s dërgoi një ftesë për %(targetDisplayName)s që të marrë pjesë në dhomë.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s e kaloi historikun e ardhshëm të dhomës të dukshëm për të panjohurit (%(visibility)s).",
     "%(widgetName)s widget removed by %(senderName)s": "Widget-i %(widgetName)s u hoq nga %(senderName)s",
     "Authentication check failed: incorrect password?": "Dështoi kontrolli i mirëfilltësimit: fjalëkalim i pasaktë?",
     "Message Pinning": "Fiksim Mesazhi",
-    "Autoplay GIFs and videos": "Vetëluaj GIF-e dhe video",
-    "Active call (%(roomName)s)": "Thirrje aktive (%(roomName)s)",
-    "%(senderName)s uploaded a file": "%(senderName)s ngarkoi një kartelë",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Parë nga %(displayName)s (%(userName)s) më %(dateTime)s",
     "%(roomName)s is not accessible at this time.": "Te %(roomName)s s’hyhet dot tani.",
     "Error decrypting attachment": "Gabim në shfshehtëzim bashkëngjitjeje",
@@ -659,16 +520,9 @@
     "Which rooms would you like to add to this summary?": "Cilat dhoma do të donit të shtonit te kjo përmbledhje?",
     "Community %(groupId)s not found": "S’u gjet bashkësia %(groupId)s",
     "You seem to be uploading files, are you sure you want to quit?": "Duket se jeni duke ngarkuar kartela, jeni i sigurt se doni të dilet?",
-    "Click to unmute video": "Klikoni që të hiqet heshtja për videon",
-    "Click to unmute audio": "Klikoni që të hiqet heshtja për audion",
-    "click to reveal": "klikoni që të zbulohet",
-    "Call in Progress": "Thirrje në Kryerje e Sipër",
-    "A call is already in progress!": "Ka tashmë një thirrje në kryerje e sipër!",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ndryshoi emrin e tij në ekran si %(displayName)s.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s caktoi %(address)s si adresë kryesore për këtë dhomë.",
     "%(widgetName)s widget modified by %(senderName)s": "Widget-i %(widgetName)s u modifikua nga %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Widget-i %(widgetName)s u shtua nga %(senderName)s",
-    "Always show encryption icons": "Shfaq përherë ikona fshehtëzimi",
     "Add some now": "Shtohen ca tani",
     "Click here to see older messages.": "Klikoni këtu për të parë mesazhe më të vjetër.",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)shynë dhe dolën %(count)s herë",
@@ -680,7 +534,6 @@
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sndryshoi avatarin e vet %(count)s herë",
     "Clear cache and resync": "Spastro fshehtinën dhe rinjëkohëso",
     "Clear Storage and Sign Out": "Spastro Depon dhe Dil",
-    "COPY": "KOPJOJE",
     "e.g. %(exampleValue)s": "p.sh., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "p.sh., <CurrentPageURL>",
     "Permission Required": "Lypset Leje",
@@ -698,10 +551,6 @@
     "Only room administrators will see this warning": "Këtë sinjalizim mund ta shohin vetëm përgjegjësit e dhomës",
     "Hide Stickers": "Fshihi Ngjitësat",
     "Show Stickers": "Shfaq Ngjitës",
-    "The email field must not be blank.": "Fusha email s’duhet të jetë e zbrazët.",
-    "The phone number field must not be blank.": "Fusha numër telefoni s’duhet të jetë e zbrazët.",
-    "The password field must not be blank.": "Fusha fjalëkalim s’duhet të jetë e zbrazët.",
-    "Failed to remove widget": "S’u arrit të hiqej widget-i",
     "Popout widget": "Widget flluskë",
     "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.": "Dukshmëria e mesazheve në Matrix është e ngjashme me atë në email. Harrimi i mesazheve nga ana jonë do të thotë që mesazhet që keni dërguar nuk do të ndahen me çfarëdo përdoruesi të ri apo të paregjistruar, por përdoruesit e regjistruar, që kanë tashmë hyrje në këto mesazhe, do të kenë prapëseprapë hyrje te kopja e tyre.",
     "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)": "Të lutem, harro krejt mesazhet që kamë dërguar, kur të çaktivizohet llogaria ime (<b>Kujdes</b>: kjo do të bëjë që përdorues të ardhshëm të shohin një pamje jo të plotë të bisedave)",
@@ -728,7 +577,6 @@
     "Open Devtools": "Hapni Mjete Zhvilluesi",
     "Show developer tools": "Shfaq mjete zhvilluesi",
     "Your device resolution": "Qartësi e pajisjes tuaj",
-    "A call is currently being placed!": "Është duke u bërë një thirrje!",
     "You do not have permission to start a conference call in this room": "S’keni leje për të nisur një thirrje konferencë këtë në këtë dhomë",
     "Missing roomId.": "Mungon roomid.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s hoqi adresën kryesore për këtë dhomë.",
@@ -750,8 +598,6 @@
     "Share Room": "Ndani Dhomë Me të Tjerë",
     "Share Community": "Ndani Bashkësi Me të Tjerë",
     "Share Room Message": "Ndani Me të Tjerë Mesazh Dhome",
-    "Share Message": "Ndani Mesazh me të tjerë",
-    "Collapse Reply Thread": "Tkurre Rrjedhën e Përgjigjeve",
     "Failed to add the following users to the summary of %(groupId)s:": "S’u arrit të ftoheshin përdoruesit vijues te përmbledhja e %(groupId)s:",
     "Unable to join community": "S’arrihet të bëhet pjesë e bashkësisë",
     "Unable to leave community": "S’arrihet të braktiset bashkësia",
@@ -766,12 +612,10 @@
     "A text message has been sent to %(msisdn)s": "Te %(msisdn)s u dërgua një mesazh tekst",
     "Failed to remove '%(roomName)s' from %(groupId)s": "S’u arrit të hiqej '%(roomName)s' nga %(groupId)s",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Fshirja e një widget-i e heq atë për krejt përdoruesit në këtë dhomë. Jeni i sigurt se doni të fshihet ky widget?",
-    "An error ocurred whilst trying to remove the widget from the room": "Ndodhi një gabim teksa provohej të hiqej widget-i nga dhoma",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Përpara se të parashtroni regjistra, duhet <a>të krijoni një çështje në GitHub issue</a> që të përshkruani problemin tuaj.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID-të e bashkësive mund të përmbajnë vetëm shenjat a-z, 0-9, ose '=_-./'",
     "Create a new room with the same name, description and avatar": "Krijoni një dhomë të re me po atë emër, përshkrim dhe avatar",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML për faqen e bashkësisë tuaj</h1>\n<p>\n    Përshkrimin e gjatë përdoreni për t’u paraqitur përdoruesve të rinj bashkësinë, ose për të dhënë\n    një a disa <a href=\"foo\">lidhje</a> të rëndësishme\n</p>\n<p>\n    Mund të përdorni madje etiketa 'img'\n</p>\n",
     "Failed to add the following rooms to the summary of %(groupId)s:": "S’u arrit të shtoheshin dhomat vijuese te përmbledhja e %(groupId)s:",
     "Failed to remove the room from the summary of %(groupId)s": "S’u arrit të hiqej dhoma prej përmbledhjes së %(groupId)s",
     "Failed to remove a user from the summary of %(groupId)s": "S’u arrit të hiqej një përdorues nga përmbledhja e %(groupId)s",
@@ -781,36 +625,28 @@
     "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.": "Janë pikasur të dhëna nga një version i dikurshëm i %(brand)s-it. Kjo do të bëjë që kriptografia skaj-më-skaj te versioni i dikurshëm të mos punojë si duhet. Mesazhet e fshehtëzuar skaj-më-skaj tani së fundi teksa përdorej versioni i dikurshëm mund të mos jenë të shfshehtëzueshëm në këtë version. Kjo mund bëjë edhe që mesazhet e shkëmbyera me këtë version të dështojnë. Nëse ju dalin probleme, bëni daljen dhe rihyni në llogari. Që të ruhet historiku i mesazheve, eksportoni dhe riimportoni kyçet tuaj.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "E dinit se: mund t’i përdorni bashkësitë për të filtruar punimin tuaj në %(brand)s?",
     "Error whilst fetching joined communities": "Gabim teksa silleshin bashkësitë ku merret pjesë",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Ridërgojini krejt</resendText> ose <cancelText>anulojini krejt</cancelText> tani. Për ridërgim ose anulim, mundeni edhe të përzgjidhni mesazhe individualë.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Ridërgojeni mesazhin</resendText> ose <cancelText>anulojeni mesazhin</cancelText> tani.",
     "Audio Output": "Sinjal Audio",
-    "Error: Problem communicating with the given homeserver.": "Gabim: Problem komunikimi me shërbyesin e dhënë Home.",
     "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>.": "S’lidhet dot te shërbyes Home përmes HTTP-je, kur te shtylla e shfletuesit tuaj jepet një URL HTTPS. Ose përdorni HTTPS-në, ose <a>aktivizoni përdorimin e programtheve jo të sigurt</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "S’lidhet dot te shërbyes Home - ju lutemi, kontrolloni lidhjen tuaj, sigurohuni që <a>dëshmia SSL e shërbyesit tuaj Home</a> besohet, dhe që s’ka ndonjë zgjerim shfletuesi që po bllokon kërkesat tuaja.",
     "Failed to remove tag %(tagName)s from room": "S’u arrit të hiqej etiketa %(tagName)s nga dhoma",
     "Failed to add tag %(tagName)s to room": "S’u arrit të shtohej në dhomë etiketa %(tagName)s",
     "Enable widget screenshots on supported widgets": "Aktivizo foto ekrani widget-esh për widget-e që e mbulojnë",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Merrni pjesë me <voiceText>zë</voiceText> ose me <videoText>video</videoText>.",
     "Demote yourself?": "Të zhgradohet vetvetja?",
     "Demote": "Zhgradoje",
     "Server unavailable, overloaded, or something else went wrong.": "Shërbyesi është i pakapshëm, i mbingarkuar, ose diç tjetër shkoi ters.",
     "No users have specific privileges in this room": "S’ka përdorues me privilegje të caktuara në këtë dhomë",
-    "Guests cannot join this room even if explicitly invited.": "Vizitorët s’mund të marrin pjesë në këtë edhe po të jenë ftuar shprehimisht.",
     "Publish this room to the public in %(domain)s's room directory?": "Të bëhet publike kjo dhomë te drejtoria e dhomave %(domain)s?",
     "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.": "Në dhoma të fshehtëzuara, si kjo, paraparja e URL-ve është e çaktivizuar, si parazgjedhje, për të garantuar që shërbyesi juaj home (ku edhe prodhohen paraparjet) të mos grumbullojë të dhëna rreth lidhjesh që shihni në këtë dhomë.",
     "Please review and accept the policies of this homeserver:": "Ju lutemi, shqyrtoni dhe pranoni rregullat e këtij shërbyesi home:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Nëse nuk përcaktoni një adresë email, s’do të jeni në gjendje të bëni ricaktime të fjalëkalimit tuaj. Jeni i sigurt?",
     "Removing a room from the community will also remove it from the community page.": "Heqja e një dhome nga bashkësia do ta heqë atë edhe nga faqja e bashkësisë.",
     "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.": "Nëse versioni tjetër i %(brand)s-it është ende i hapur në një skedë tjetër, ju lutemi, mbylleni, ngaqë përdorimi njëkohësisht i %(brand)s-it në të njëjtën strehë, në njërën anë me <em>lazy loading</em> të aktivizuar dhe në anën tjetër të çaktivizuar do të shkaktojë probleme.",
     "%(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-i tani përdor 3 deri 5 herë më pak kujtesë, duke ngarkuar të dhëna mbi përdorues të tjerë vetëm kur duhen. Ju lutemi, prisni, teksa njëkohësojmë të dhënat me shërbyesin!",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Vendosni në krye të dhomës së re një lidhje për te dhoma e vjetër, që njerëzit të mund të shohin mesazhet e vjetër",
     "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "Nëse më herët keni përdorur një version më të freskët të %(brand)s-it, sesioni juaj mund të jetë i papërputhshëm me këtë version. Mbylleni këtë dritare dhe kthehuni te versioni më i ri.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Spastrimi i gjërave të depozituara në shfletuesin tuaj mund ta ndreqë problemin, por kjo do të sjellë nxjerrjen tuaj nga llogari dhe do ta bëjë të palexueshëm çfarëdo historiku të fshehtëzuar të bisedës.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Nëse keni tashmë një llogari Matrix, mund <a>të bëni hyrjen</a>.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Krijoni një bashkësi që të bëni tok përdorues dhe dhoma! Krijoni një faqe hyrëse vetjake, që të ravijëzoni hapësirën tuaj në universin Matrix.",
     "Sent messages will be stored until your connection has returned.": "Mesazhet e dërguar do të depozitohen deri sa lidhja juaj të jetë rikthyer.",
     "Server may be unavailable, overloaded, or search timed out :(": "Shërbyesi mund të jetë i pakapshëm, i mbingarkuar, ose kërkimit i mbaroi koha :(",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Nëse parashtruat një të metë përmes GitHub-it, regjistrat e diagnostikimit mund të na ndihmojnë të ndjekim problemin. Regjistrat e diagnostikimit përmbajnë të dhëna përdorimi, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhet.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatësia është e rëndësishme për ne, ndaj nuk grumbullojmë ndonjë të dhënë personale apo të identifikueshme për analizat tona.",
     "Learn more about how we use analytics.": "Mësoni më tepër se si i përdorim analizat.",
     "Reject all %(invitedRooms)s invites": "Mos prano asnjë ftesë për në %(invitedRooms)s",
@@ -820,7 +656,6 @@
     "Your browser does not support the required cryptography extensions": "Shfletuesi juaj nuk mbulon zgjerimet kriptografike të domosdoshme",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vulat kohore shfaqi në formatin 12 orësh (p.sh. 2:30pm)",
     "Enable inline URL previews by default": "Aktivizo, si parazgjedhje, paraparje URL-sh brendazi",
-    "The maximum permitted number of widgets have already been added to this room.": "Në këtë dhomë është shtuar tashmë numri maksimum i lejuar për widget-et.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "S’do të jeni në gjendje ta zhbëni këtë, ngaqë po zhgradoni veten, nëse jeni përdoruesi i fundit i privilegjuar te dhoma do të jetë e pamundur të rifitoni privilegjet.",
     "Jump to read receipt": "Hidhuni te leximi i faturës",
     "Unknown for %(duration)s": "I panjohur për %(duration)s",
@@ -842,7 +677,6 @@
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Ndalojuni përdoruesve të flasin në versionin e vjetër të dhomës, dhe postoni një mesazh që u këshillon atyre të hidhen te dhoma e re",
     "We encountered an error trying to restore your previous session.": "Hasëm një gabim teksa provohej të rikthehej sesioni juaj i dikurshëm.",
     "This will allow you to reset your password and receive notifications.": "Kjo do t’ju lejojë të ricaktoni fjalëkalimin tuaj dhe të merrni njoftime.",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ky do të jetë emri i llogarisë tuaj te <span></span> shërbyesi home, ose mund të zgjidhni një <a>shërbyes tjetër</a>.",
     "You must join the room to see its files": "Duhet të hyni në dhomë, pa të shihni kartelat e saj",
     "The room '%(roomName)s' could not be removed from the summary.": "Dhoma '%(roomName)s' s’u hoq dot nga përmbledhja.",
     "The user '%(displayName)s' could not be removed from the summary.": "Përdoruesi '%(displayName)s' s’u hoq dot nga përmbledhja.",
@@ -851,11 +685,9 @@
     "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!": "Bashkësia juaj s’ka ndonjë Përshkrim të Gjatë, një faqe HTML për t’ua shfaqur anëtarëve të bashkësisë.<br />Klikoni këtu që të hapni rregullimet dhe t’i krijoni një të tillë!",
     "This room is not public. You will not be able to rejoin without an invite.": "Kjo dhomë s’është publike. S’do të jeni në gjendje të rihyni në të pa një ftesë.",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Kjo dhomë përdoret për mesazhe të rëndësishëm nga shërbyesi Home, ndaj s’mund ta braktisni.",
-    "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.": "Që të ndërtoni një filtër, tërhiqeni avatarin e një bashkësie te paneli i filtrimeve në skajin e majtë të ekranit. Për të parë vetëm dhomat dhe personat e përshoqëruar asaj bashkësie, mund të klikoni në çfarëdo kohe mbi një avatar te panelit të filtrimeve.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "S’mund të dërgoni ndonjë mesazh, përpara se të shqyrtoni dhe pajtoheni me <consentLink>termat dhe kushtet tona</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.": "Mesazhi juaj s’u dërgua, ngaqë ky shërbyes Home ka mbërritur në Kufirin Mujor të Përdoruesve Aktivë. Ju lutemi, që të vazhdoni ta përdorni këtë shërbim, <a>lidhuni me përgjegjësin e shërbimit tuaj</a>.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Mesazhi juaj s’u dërgua, ngaqë ky shërbyes Home ka tejkaluar kufirin e një burimi. Ju lutemi, që të vazhdoni ta përdorni këtë shërbim, <a>lidhuni me përgjegjësin e shërbimit tuaj</a>.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "S’ka njeri këtu! Do të donit të <inviteText>ftoni të tjerë</inviteText> apo <nowarnText>të reshtet së njoftuari për dhomë të zbrazët</nowarnText>?",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U provua të ngarkohej një pikë e caktuar në kronologjinë e kësaj dhome, por nuk keni leje për ta parë mesazhin në fjalë.",
     "Start automatically after system login": "Nisu vetvetiu pas hyrjes në sistem",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Lypset të lejoni dorazi %(brand)s-in të përdorë mikrofonin/kamerën tuaj web",
@@ -877,8 +709,6 @@
     "Forces the current outbound group session in an encrypted room to be discarded": "E detyron të hidhet tej sesionin e tanishëm outbound grupi në një dhomë të fshehtëzuar",
     "Delete Backup": "Fshije Kopjeruajtjen",
     "Unable to load key backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje kyçesh",
-    "Backup version: ": "Version kopjeruajtjeje: ",
-    "Algorithm: ": "Algoritëm: ",
     "Next": "Pasuesja",
     "That matches!": "U përputhën!",
     "That doesn't match.": "S’përputhen.",
@@ -894,11 +724,6 @@
     "Unable to restore backup": "S’arrihet të rikthehet kopjeruajtje",
     "No backup found!": "S’u gjet kopjeruajtje!",
     "Failed to decrypt %(failedCount)s sessions!": "S’u arrit të shfshehtëzohet sesioni %(failedCount)s!",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë frazëkalimin tuaj të rimarrjeve.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Nëse keni harruar frazëkalimin tuaj të rimarrjeve, mund të <button1>përdorni kyçin tuaj të rimarrjeve</button1> ose <button2>rregulloni mundësi të reja rimarrjesh</button2>",
-    "This looks like a valid recovery key!": "Ky duket si kyç i vlefshëm rimarrjesh!",
-    "Not a valid recovery key": "Kyç rimarrjesh jo i vlefshëm",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë kyçin tuaj të rimarrjeve.",
     "Sign in with single sign-on": "Bëni hyrjen me hyrje njëshe",
     "Failed to perform homeserver discovery": "S’u arrit të kryhej zbulim shërbyesi Home",
     "Invalid homeserver discovery response": "Përgjigje e pavlefshme zbulimi shërbyesi Home",
@@ -933,16 +758,11 @@
     "User %(user_id)s does not exist": "Përdoruesi %(user_id)s nuk ekziston",
     "Unknown server error": "Gabim i panjohur shërbyesi",
     "There was an error joining the room": "Pati një gabim ardhjeje në dhomë",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Shfaq një kujtues për aktivizim Rimarrjeje Mesazhesh të Sigurt në dhoma të fshehtëzuara",
-    "Don't ask again": "Mos pyet sërish",
     "Set up": "Rregulloje",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, do të humbni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen nga llogaria.",
-    "If you don't want to set this up now, you can later in Settings.": "Nëse s’doni ta rregulloni tani këtë, mund ta bëni më vonë që nga Rregullimet.",
     "Messages containing @room": "Mesazhe që përmbajnë @room",
     "Encrypted messages in one-to-one chats": "Mesazhe të fshehtëzuar në fjalosje tek-për-tek",
     "Encrypted messages in group chats": "Mesazhe të fshehtëzuar në fjalosje në grup",
     "That doesn't look like a valid email address": "Kjo s’duket si adresë email e vlefshme",
-    "Checking...": "Po kontrollohet…",
     "Invalid identity server discovery response": "Përgjigje e pavlefshme zbulimi identiteti shërbyesi",
     "New Recovery Method": "Metodë e Re Rimarrjesh",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rimarrjeve s’e keni caktuar ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh.",
@@ -992,7 +812,6 @@
     "Email Address": "Adresë Email",
     "Backing up %(sessionsRemaining)s keys...": "Po kopjeruhen kyçet për %(sessionsRemaining)s…",
     "All keys backed up": "U kopjeruajtën krejt kyçet",
-    "Add an email address to configure email notifications": "Shtoni një adresë email që të formësoni njoftime me email",
     "Unable to verify phone number.": "S’arrihet të verifikohet numër telefoni.",
     "Verification code": "Kod verifikimi",
     "Phone Number": "Numër Telefoni",
@@ -1031,7 +850,6 @@
     "Encrypted": "I fshehtëzuar",
     "Ignored users": "Përdorues të shpërfillur",
     "Bulk options": "Veprime masive",
-    "Key backup": "Kopjeruajtje kyçi",
     "Missing media permissions, click the button below to request.": "Mungojnë leje mediash, klikoni mbi butonin më poshtë që të kërkohen.",
     "Request media permissions": "Kërko leje mediash",
     "Voice & Video": "Zë & Video",
@@ -1044,30 +862,15 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifikojeni këtë përdorues që t’i vihet shenjë si i besuar. Përdoruesit e besuar ju më tepër siguri kur përdorni mesazhe të fshehtëzuar skaj-më-skaj.",
     "Waiting for partner to confirm...": "Po pritet ripohimi nga partneri…",
     "Incoming Verification Request": "Kërkesë Verifikimi e Ardhur",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Për të na ndihmuar të shmangim çështje të përsëdytura, ju lutemi, së pari <existingIssuesLink>shihni çështjet ekzistuese</existingIssuesLink> (dhe shtoni një +1) ose <newIssueLink>krijoni një çështje të re</newIssueLink>, nëse nuk gjeni gjë.",
-    "Report bugs & give feedback": "Njoftoni të meta & jepni përshtypjet",
     "Go back": "Kthehu mbrapsht",
     "Update status": "Përditëso gendjen",
     "Set status": "Caktojini gjendjen",
-    "Your Modular server": "Shërbyesi juaj Modular",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Jepni vendndodhjen e shërbyesit tuaj Home Modular. Mund të përdorë emrin e përkatësisë tuaj ose të jetë një nënpërkatësi e <a>modular.im</a>.",
-    "Server Name": "Emër Shërbyesi",
-    "The username field must not be blank.": "Fusha e emrit të përdoruesit s’duhet të jetë e zbrazët.",
     "Username": "Emër përdoruesi",
-    "Not sure of your password? <a>Set a new one</a>": "S’jeni i sigurt për fjalëkalimin tuaj? <a>Caktoni një të ri</a>",
-    "Create your account": "Krijoni llogarinë tuaj",
     "Email (optional)": "Email (në daçi)",
     "Phone (optional)": "Telefoni (në daçi)",
     "Confirm": "Ripohojeni",
-    "Other servers": "Shërbyes të tjerë",
-    "Homeserver URL": "URL Shërbyesi Home",
-    "Identity Server URL": "URL Shërbyesi Identitetesh",
-    "Free": "Falas",
     "Join millions for free on the largest public server": "Bashkojuni milionave, falas, në shërbyesin më të madh publik",
-    "Premium": "Me Pagesë",
-    "Premium hosting for organisations <a>Learn more</a>": "Strehim Me Pagesë për ente <a>Mësoni më tepër</a>",
     "Other": "Tjetër",
-    "Find other public servers or use a custom server": "Gjeni shërbyes të tjerë publikë ose përdorni një shërbyes vetjak",
     "Guest": "Mysafir",
     "Sign in instead": "Hyni, më mirë",
     "Set a new password": "Caktoni fjalëkalim të ri",
@@ -1075,7 +878,6 @@
     "Create account": "Krijoni llogari",
     "Keep going...": "Vazhdoni kështu…",
     "Starting backup...": "Po fillohet kopjeruajtje…",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Janë pikasur një frazëkalim dhe kyç i ri rimarrjesh për Mesazhe të Sigurt.",
     "Recovery Method Removed": "U hoq Metodë Rimarrje",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rimarrjeve s’e keni hequr ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh.",
     "Disinvite this user?": "T’i hiqet ftesa këtij përdoruesi?",
@@ -1167,11 +969,6 @@
     "Restore from Backup": "Riktheje prej Kopjeruajtje",
     "Back up your keys before signing out to avoid losing them.": "Kopjeruajini kyçet tuaj, përpara se të dilni, që të shmangni humbjen e tyre.",
     "Start using Key Backup": "Fillo të përdorësh Kopjeruajtje Kyçesh",
-    "Never lose encrypted messages": "Mos humbni kurrë mesazhe të fshehtëzuar",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesazhet në këtë dhomë janë të siguruar përmes fshehtëzimi skaj-më-skaj. Vetëm ju dhe marrësi(t) kanë kyçet për të lexuar këto mesazhe.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopjeruajini kyçet tuaj në mënyrë të sigurt, për të shmangur humbjen e tyre. <a>Mësoni më tepër.</a>",
-    "Not now": "Jo tani",
-    "Don't ask me again": "Mos më pyet sërish",
     "I don't want my encrypted messages": "Nuk i dua mesazhet e mia të fshehtëzuar",
     "Manually export keys": "Eksporto dorazi kyçet",
     "You'll lose access to your encrypted messages": "Do të humbni hyrje te mesazhet tuaj të fshehtëzuar",
@@ -1181,9 +978,7 @@
     "For maximum security, this should be different from your account password.": "Për maksimumin e sigurisë, ky do të duhej të ishte i ndryshëm nga fjalëkalimi juaj për llogarinë.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Kyçet tuaj po kopjeruhen (kopjeruajtja e parë mund të hajë disa minuta).",
     "Success!": "Sukses!",
-    "Allow Peer-to-Peer for 1:1 calls": "Lejo Peer-to-Peer për thirrje tek për tek",
     "Credits": "Kredite",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Nëse hasni çfarëdo të mete apo keni përshtypje për të na dhënë, ju lutemi, na i bëni të ditura në GitHub.",
     "Changes your display nickname in the current room only": "Bën ndryshimin e emrit tuaj në ekran vetëm në dhomën e tanishme",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktivizoi flair-in për %(groups)s në këtë grup.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s çaktivizoi flair-in për %(groups)s në këtë dhomë.",
@@ -1196,12 +991,7 @@
     "Error updating flair": "Gabim gjatë përditësimit të flair-it",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pati një gabim me përditësimin e flair-it për këtë dhomë. Shërbyesi mund të mos e lejojë ose mund të ketë ndodhur një gabim i përkohshëm.",
     "Room Settings - %(roomName)s": "Rregullime Dhome - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Emri i përdoruesit mund të përmbajë vetëm shkronja të vogla, numra dhe '=_-./'",
-    "Share Permalink": "Permalidhje Ndarjeje Me të Tjerë",
-    "Sign in to your Matrix account on %(serverName)s": "Hyni në llogarinë tuaj Matrix te %(serverName)s",
-    "Create your Matrix account on %(serverName)s": "Krijoni llogarinë tuaj Matrix te %(serverName)s",
     "Could not load user profile": "S’u ngarkua dot profili i përdoruesit",
-    "Your Matrix account on %(serverName)s": "Llogaria juaj Matrix te %(serverName)s",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Parashtoji ¯\\_(ツ)_/¯ një mesazhi tekst të thjeshtë",
     "User %(userId)s is already in the room": "Përdoruesi %(userId)s gjendet tashmë në dhomë",
     "The user must be unbanned before they can be invited.": "Para se të ftohen, përdoruesve u duhet hequr dëbimi.",
@@ -1220,7 +1010,6 @@
     "Change settings": "Ndryshoni rregullime",
     "Kick users": "Përzini përdoruesi",
     "Ban users": "Dëboni përdorues",
-    "Remove messages": "Hiqni mesazhe",
     "Notify everyone": "Njoftoni gjithkënd",
     "Send %(eventType)s events": "Dërgo akte %(eventType)s",
     "Select the roles required to change various parts of the room": "Përzgjidhni rolet e domosdoshme për të ndryshuar anë të ndryshme të dhomës",
@@ -1228,7 +1017,6 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Pasi të aktivizohet, fshehtëzimi për një dhomë nuk mund të çaktivizohet. Mesazhet e dërguar në një dhomë të fshehtëzuar s’mund të shihen nga shërbyesi, vetëm nga pjesëmarrësit në dhomë. Aktivizimi i fshehtëzimit mund të pengojë funksionimin si duhet të mjaft robotëve dhe urave. <a>Mësoni më tepër rreth fshehtëzimit.</a>",
     "Want more than a community? <a>Get your own server</a>": "Doni më shumë se një bashkësi? <a>Merrni një shërbyes tuajin</a>",
     "Power level": "Shkallë pushteti",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ju lutemi, për funksionimin më të mirë, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
     "Replying With Files": "Përgjigje Me Kartela",
     "The file '%(fileName)s' failed to upload.": "Dështoi ngarkimi i kartelës '%(fileName)s'.",
     "Name or Matrix ID": "Emër ose ID Matrix-i",
@@ -1263,11 +1051,8 @@
     "Revoke invite": "Shfuqizoje ftesën",
     "Invited by %(sender)s": "Ftuar nga %(sender)s",
     "edited": "e përpunuar",
-    "Maximize apps": "Maksimizoni aplikacione",
     "Rotate Left": "Rrotulloje Majtas",
-    "Rotate counter-clockwise": "Rrotulloje në kah kundërorar",
     "Rotate Right": "Rrotulloje Djathtas",
-    "Rotate clockwise": "Rrotulloje në kah orar",
     "Edit message": "Përpunoni mesazhin",
     "GitHub issue": "Çështje në GitHub",
     "Notes": "Shënime",
@@ -1281,8 +1066,6 @@
     "Cancel All": "Anuloji Krejt",
     "Upload Error": "Gabim Ngarkimi",
     "Remember my selection for this widget": "Mbaje mend përzgjedhjen time për këtë widget",
-    "Deny": "Hidhe Tej",
-    "Sign in to your Matrix account on <underlinedServerName />": "Bëni hyrjen te llogaria juaj Matrix në <underlinedServerName />",
     "Use an email address to recover your account": "Përdorni një adresë email që të rimerrni llogarinë tuaj",
     "Enter email address (required on this homeserver)": "Jepni adresë email (e domosdoshme në këtë shërbyes Home)",
     "Doesn't look like a valid email address": "S’duket si adresë email e vlefshme",
@@ -1292,15 +1075,11 @@
     "Passwords don't match": "Fjalëkalimet s’përputhen",
     "Other users can invite you to rooms using your contact details": "Përdorues të tjerë mund t’ju ftojnë te dhoma duke përdorur hollësitë tuaja për kontakt",
     "Enter phone number (required on this homeserver)": "Jepni numër telefoni (e domosdoshme në këtë shërbyes Home)",
-    "Doesn't look like a valid phone number": "S’duket si numër telefoni i vlefshëm",
     "Enter username": "Jepni emër përdoruesi",
     "Some characters not allowed": "Disa shenja nuk lejohen",
-    "Create your Matrix account on <underlinedServerName />": "Krijoni llogarinë tuaj Matrix te <underlinedServerName />",
     "%(brand)s failed to get the public room list.": "%(brand)s-i s’arriti të merrte listën e dhomave publike.",
     "The homeserver may be unavailable or overloaded.": "Shërbyesi Home mund të jetë i pakapshëm ose i mbingarkuar.",
     "Add room": "Shtoni dhomë",
-    "Your profile": "Profili juaj",
-    "Your Matrix account on <underlinedServerName />": "Llogaria juaj Matrix te <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "S’u arrit të merrej formësim vetëzbulimi nga shërbyesi",
     "Invalid base_url for m.homeserver": "Parametër base_url i pavlefshëm për m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "URL-ja e shërbyesit Home s’duket të jetë një shërbyes Home i vlefshëm",
@@ -1314,7 +1093,6 @@
     "Unexpected error resolving homeserver configuration": "Gabim i papritur gjatë ftillimit të formësimit të shërbyesit Home",
     "The user's homeserver does not support the version of the room.": "Shërbyesi Home i përdoruesit s’e mbulon versionin e dhomës.",
     "Show hidden events in timeline": "Shfaq te rrjedha kohore veprimtari të fshehura",
-    "Low bandwidth mode": "Mënyrë gjerësi e ulët bande",
     "Something went wrong with your invite to %(roomName)s": "Diç shkoi ters me ftesën tuaj për te %(roomName)s",
     "You can only join it with a working invite.": "Mund të merrni pjesë në të vetëm me një ftesë funksionale.",
     "You can still join it because this is a public room.": "Mundeni prapëseprapë të merrni pjesë, ngaqë është një dhomë publike.",
@@ -1334,9 +1112,6 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Kjo kartelë është <b>shumë e madhe</b> për ngarkim. Caku për madhësi kartelash është %(limit)s, ndërsa kjo kartelë është %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Këto kartela janë <b>shumë të mëdha</b> për ngarkim. Caku për madhësi kartelash është %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Disa kartela janë <b>shumë të mëdha</b> për ngarkim. Caku për madhësi kartelash është %(limit)s.",
-    "A widget would like to verify your identity": "Një widget do të donte të verifikonte identitetin tuaj",
-    "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.": "Një widget që gjendet te %(widgetUrl)s do të donte të verifikonte identitetin tuaj. Përmes lejimit të kësaj, widget-i do të jetë në gjendje të verifiojë ID-në tuaj të përdoruesit, por pa mundur të kryejë veprime në këmbë tuajën.",
-    "Unable to validate homeserver/identity server": "S’arrihet të vleftësohet shërbyesi Home/shërbyesi i identiteteve",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s-i s’arriti të merrte listë protokollesh nga shërbyesi Home. Shërbyesi Home mund të jetë shumë i vjetër për mbulim rrjetesh nga palë të treta.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Keni %(count)s njoftime të palexuar në një version të mëparshëm të kësaj dhome.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Keni %(count)s njoftim të palexuar në një version të mëparshëm të kësaj dhome.",
@@ -1368,14 +1143,11 @@
     "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:": "Përmirësimi i kësaj dhome lyp mbylljen e instancës së tanishme të dhomës dhe krijimin e një dhome të re në vend të saj. Për t’u dhënë anëtarëve të dhomës më të mirën, do të:",
     "Loading room preview": "Po ngarkohet paraparje dhome",
     "Show all": "Shfaqi krejt",
-    "%(senderName)s made no change.": "%(senderName)s s’bëri ndryshime.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s s’bënë ndryshime gjatë %(count)s herësh",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s s’bënë ndryshime",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)ss’bënë ndryshime gjatë %(count)s herësh",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)ss’bëri ndryshime",
-    "Resend edit": "Ridërgoje përpunimin",
     "Resend %(unsentCount)s reaction(s)": "Ridërgo %(unsentCount)s reagim(e)",
-    "Resend removal": "Ridërgo heqjen",
     "Changes your avatar in all rooms": "Ndryshon avatarin tuaj në krejt dhomat",
     "Your homeserver doesn't seem to support this feature.": "Shërbyesi juaj Home nuk duket se e mbulon këtë veçori.",
     "You're signed out": "Keni bërë dalje",
@@ -1398,14 +1170,12 @@
     "Removing…": "Po hiqet…",
     "Share User": "Ndani Përdorues",
     "Command Help": "Ndihmë Urdhri",
-    "Identity Server": "Shërbyes Identitetesh",
     "Find others by phone or email": "Gjeni të tjerë përmes telefoni ose email-i",
     "Be found by phone or email": "Bëhuni i gjetshëm përmes telefoni ose email-i",
     "Use bots, bridges, widgets and sticker packs": "Përdorni robotë, ura, widget-e dhe paketa ngjitësish",
     "Terms of Service": "Kushte Shërbimi",
     "Service": "Shërbim",
     "Summary": "Përmbledhje",
-    "No identity server is configured: add one in server settings to reset your password.": "S’ka të formësuar shërbyes identitetesh: shtoni një të tillë te rregullimet e shërbyesit që të ricaktoni fjalëkalimin tuaj.",
     "This account has been deactivated.": "Kjo llogari është çaktivizuar.",
     "Failed to re-authenticate due to a homeserver problem": "S’u arrit të ribëhej mirëfilltësimi, për shkak të një problemi me shërbyesin Home",
     "Failed to re-authenticate": "S’u arrit të ribëhej mirëfilltësimi",
@@ -1415,13 +1185,9 @@
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "S’mund të bëni hyrjen në llogarinë tuaj. Ju lutemi, për më tepër hollësi, lidhuni me përgjegjësin e shërbyesit tuaj Home.",
     "Clear personal data": "Spastro të dhëna personale",
     "Spanner": "Çelës",
-    "Identity Server URL must be HTTPS": "URL-ja e Shërbyesit të Identiteteve duhet të jetë HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Shërbyes Identitetesh i pavlefshëm (kod gjendjeje %(code)s)",
-    "Could not connect to Identity Server": "S’u lidh dot me Shërbyes Identitetesh",
     "Checking server": "Po kontrollohet shërbyesi",
     "Disconnect from the identity server <idserver />?": "Të shkëputet prej shërbyesit të identiteteve <idserver />?",
     "Disconnect": "Shkëputu",
-    "Identity Server (%(server)s)": "Shërbyes Identitetesh (%(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.": "Jeni duke përdorur <server></server> për të zbuluar dhe për t’u zbuluar nga kontakte ekzistues që njihni. Shërbyesin tuaj të identiteteve mund ta ndryshoni më poshtë.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "S’po përdorni ndonjë shërbyes identitetesh. Që të zbuloni dhe të jeni i zbulueshëm nga kontakte ekzistues që njihni, shtoni një të tillë më poshtë.",
     "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.": "Shkëputja prej shërbyesit tuaj të identiteteve do të thotë se s’do të jeni i zbulueshëm nga përdorues të tjerë dhe s’do të jeni në gjendje të ftoni të tjerë përmes email-i apo telefoni.",
@@ -1439,11 +1205,9 @@
     "Only continue if you trust the owner of the server.": "Vazhdoni vetëm nëse i besoni të zotit të shërbyesit.",
     "Terms of service not accepted or the identity server is invalid.": "S’janë pranuar kushtet e shërbimit ose shërbyesi i identiteteve është i pavlefshëm.",
     "Enter a new identity server": "Jepni një shërbyes të ri identitetesh",
-    "Integration Manager": "Përgjegjës Integrimesh",
     "Remove %(email)s?": "Të hiqet %(email)s?",
     "Remove %(phone)s?": "Të hiqet %(phone)s?",
     "You do not have the required permissions to use this command.": "S’keni lejet e domosdoshme për përdorimin e këtij urdhri.",
-    "Multiple integration managers": "Përgjegjës të shumtë integrimesh",
     "Accept <policyLink /> to continue:": "Që të vazhdohet, pranoni <policyLink />:",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Nëse s’doni të përdoret <server /> për të zbuluar dhe për të qenë i zbulueshëm nga kontakte ekzistuese që njihni, jepni më poshtë një tjetër shërbyes identitetesh.",
     "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.": "Përdorimi i një shërbyesi identitetesh është opsional. Nëse zgjidhni të mos përdoret një shërbyes identitetesh, s’do të jeni i zbulueshëm nga përdorues të tjerë dhe s’do të jeni në gjendje të ftoni të tjerë me anë email-esh apo telefoni.",
@@ -1451,10 +1215,6 @@
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Pajtohuni me Kushtet e Shërbimit të shërbyesit të identiteteve (%(serverName)s) që të lejoni veten të jetë e zbulueshme me anë adrese email ose numri telefoni.",
     "Discovery": "Zbulueshmëri",
     "Upgrade the room": "Përmirësoni dhomën",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Caktoni një email për rimarrje llogarie. Përdorni email ose telefon që të jeni, në daçi, i zbulueshëm nga kontakte ekzistues.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Caktoni një email për rimarrje llogarie. Përdorni email që të jeni, në daçi, i zbulueshëm nga kontakte ekzistues.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Jepni URL-në e shërbyesit tuaj vetjak Home <a>Ç’do të thotë kjo?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Jepni URL-në e shërbyesit tuaj vetjak të identiteteve <a>Ç’do të thotë kjo?</a>",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Përdorni një shërbyes identitetesh për të ftuar me email. <default>Përdorni parazgjedhjen (%(defaultIdentityServerName)s)</default> ose administrojeni që nga <settings>Rregullimet</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Përdorni një shërbyes identitetesh për të ftuar me email. Administrojeni që nga <settings>Rregullimet</settings>.",
     "Enable room encryption": "Aktivizoni fshehtëzim dhome",
@@ -1477,7 +1237,6 @@
     "Italics": "Të pjerrëta",
     "Strikethrough": "Hequrvije",
     "Code block": "Bllok kodi",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Dërgo dëftesa leximi për mesazhe (lyp shërbyes Home të përputhshëm për çaktivizim)",
     "Change identity server": "Ndryshoni shërbyes identitetesh",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Të shkëputet më mirë nga shërbyesi i identiteteve <current /> dhe të lidhet me <new />?",
     "Disconnect identity server": "Shkëpute shërbyesin e identiteteve",
@@ -1493,9 +1252,7 @@
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Për një sasi të madhe mesazhesh, kjo mund të dojë ca kohë. Ju lutemi, mos e rifreskoni klientin tuaj gjatë kësaj kohe.",
     "Remove %(count)s messages|other": "Hiq %(count)s mesazhe",
     "Remove recent messages": "Hiq mesazhe së fundi",
-    "Explore": "Eksploroni",
     "Filter": "Filtër",
-    "Filter rooms…": "Filtroni dhoma…",
     "Preview": "Paraparje",
     "View": "Shihni",
     "Find a room…": "Gjeni një dhomë…",
@@ -1509,18 +1266,15 @@
     "e.g. my-room": "p.sh., dhoma-ime",
     "Close dialog": "Mbylle dialogun",
     "Please enter a name for the room": "Ju lutemi, jepni një emër për dhomën",
-    "This room is private, and can only be joined by invitation.": "Kjo dhomë është private dhe në të mund të hyhet vetëm me ftesë.",
     "Create a public room": "Krijoni një dhomë publike",
     "Create a private room": "Krijoni një dhomë private",
     "Topic (optional)": "Temë (në daçi)",
-    "Make this room public": "Bëje publike këtë dhomë",
     "Hide advanced": "Fshihi të mëtejshmet",
     "Show advanced": "Shfaqi të mëtejshmet",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Bllokojua hyrjen në këtë dhomë përdoruesve prej shërbyesish Matrix të tjerë Home (Ky rregullim s’mund të ndryshohet më vonë!)",
     "Please fill why you're reporting.": "Ju lutemi, plotësoni arsyen pse po raportoni.",
     "Report Content to Your Homeserver Administrator": "Raportoni Lëndë te Përgjegjësi i Shërbyesit Tuaj Home",
     "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.": "Raportimi i këtij mesazhi do të shkaktojë dërgimin e 'ID-së së aktit' unike te përgjegjësi i shërbyesit tuaj Home. Nëse mesazhet në këtë dhomë fshehtëzohen, përgjegjësi i shërbyesit tuaj Home s’do të jetë në gjendje të lexojë tekstin e mesazhit apo të shohë çfarëdo kartelë apo figurë.",
-    "Send report": "Dërgoje raportin",
+    "Send report": "Dërgoje njoftimin",
     "To continue you need to accept the terms of this service.": "Që të vazhdohet, lypset të pranoni kushtet e këtij shërbimi.",
     "Document": "Dokument",
     "Report Content": "Raportoni Lëndë",
@@ -1540,13 +1294,11 @@
     "Remove %(count)s messages|one": "Hiq 1 mesazh",
     "%(count)s unread messages including mentions.|other": "%(count)s mesazhe të palexuar, përfshi përmendje.",
     "%(count)s unread messages.|other": "%(count)s mesazhe të palexuar.",
-    "Unread mentions.": "Përmendje të palexuara.",
     "Show image": "Shfaq figurë",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Ju lutemi, <newIssueLink>krijoni një çështje të re</newIssueLink> në GitHub, që të mund ta hetojmë këtë të metë.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Mungon kyç publik captcha-je te formësimi i shërbyesit Home. Ju lutemi, njoftojani këtë përgjegjësit të shërbyesit tuaj Home.",
     "%(creator)s created and configured the room.": "%(creator)s krijoi dhe formësoi dhomën.",
     "Command Autocomplete": "Vetëplotësim Urdhrash",
-    "DuckDuckGo Results": "Përfundime nga DuckDuckGo",
     "Emoji Autocomplete": "Vetëplotësim Emoji-sh",
     "Notification Autocomplete": "Vetëplotësim NJoftimesh",
     "Room Autocomplete": "Vetëplotësim Dhomash",
@@ -1556,7 +1308,6 @@
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Show tray icon and minimize window to it on close": "Me mbylljen, shfaq ikonë paneli dhe minimizo dritaren",
     "Room %(name)s": "Dhoma %(name)s",
-    "Recent rooms": "Dhoma së fundi",
     "%(count)s unread messages including mentions.|one": "1 përmendje e palexuar.",
     "%(count)s unread messages.|one": "1 mesazh i palexuar.",
     "Unread messages.": "Mesazhe të palexuar.",
@@ -1585,7 +1336,6 @@
     "Flags": "Flamuj",
     "Quick Reactions": "Reagime të Shpejta",
     "Cancel search": "Anulo kërkimin",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "S’ka shërbyes identitetesh të formësuar, ndaj s’mund të shtoni një adresë email që të mund të ricaktoni fjalëkalimin tuaj në të ardhmen.",
     "Jump to first unread room.": "Hidhu te dhoma e parë e palexuar.",
     "Jump to first invite.": "Hidhu te ftesa e parë.",
     "Try out new ways to ignore people (experimental)": "Provoni rrugë të reja për shpërfillje personash (eksperimentale)",
@@ -1623,8 +1373,6 @@
     "Custom (%(level)s)": "Vetjak (%(level)s)",
     "Trusted": "E besuar",
     "Not trusted": "Jo e besuar",
-    "Direct message": "Mesazh i Drejtpërdrejtë",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> në %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Mesazhet në këtë dhomë janë të fshehtëzuara skaj-më-skaj.",
     "Security": "Siguri",
     "Verify": "Verifikoje",
@@ -1636,7 +1384,6 @@
     "%(brand)s URL": "URL %(brand)s-i",
     "Room ID": "ID dhome",
     "Widget ID": "ID widget-i",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash <helpIcon /> me %(widgetDomain)s & Përgjegjësin tuaj të Integrimeve.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash <helpIcon /> me %(widgetDomain)s.",
     "Widget added by": "Widget i shtuar nga",
     "This widget may use cookies.": "Ky <em>widget</em> mund të përdorë <em>cookies</em>.",
@@ -1644,21 +1391,14 @@
     "Connecting to integration manager...": "Po lidhet me përgjegjës integrimesh…",
     "Cannot connect to integration manager": "S’lidhet dot te përgjegjës integrimesh",
     "The integration manager is offline or it cannot reach your homeserver.": "Përgjegjësi i integrimeve s’është në linjë ose s’kap dot shërbyesin tuaj Home.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Përdorni një Përgjegjës Integrimesh <b>(%(serverName)s)</b> që të administroni robotë, widget-e dhe paketa ngjitësish.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Përdorni një Përgjegjës Integrimesh që të administroni robotë, widget-e dhe paketa ngjitësish.",
     "Manage integrations": "Administroni integrime",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Përgjegjësit e Integrimeve marrin të dhëna formësimi, dhe mund të ndryshojnë widget-e, të dërgojnë ftesa dhome, dhe të caktojnë shkallë pushteti në emër tuajin.",
     "Failed to connect to integration manager": "S’u arrit të lidhet te përgjegjës integrimesh",
     "Widgets do not use message encryption.": "Widget-et s’përdorin fshehtëzim mesazhesh.",
     "More options": "Më tepër mundësi",
     "Integrations are disabled": "Integrimet janë të çaktivizuara",
     "Enable 'Manage Integrations' in Settings to do this.": "Që të bëhet kjo, aktivizoni “Administroni Integrime”, te Rregullimet.",
     "Integrations not allowed": "Integrimet s’lejohen",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s-i juah nuk ju lejon të përdorni një Përgjegjës Integrimesh për të bërë këtë. Ju lutemi, lidhuni me përgjegjësin.",
-    "Reload": "Ringarkoje",
-    "Take picture": "Bëni një foto",
     "Remove for everyone": "Hiqe për këdo",
-    "Remove for me": "Hiqe për mua",
     "Verification Request": "Kërkesë Verifikimi",
     "Error upgrading room": "Gabim në përditësim dhome",
     "Double check that your server supports the room version chosen and try again.": "Rikontrolloni që shërbyesi juaj e mbulon versionin e zgjedhur për dhomën dhe riprovoni.",
@@ -1673,14 +1413,11 @@
     "Secret storage public key:": "Kyç publik depozite të fshehtë:",
     "in account data": "në të dhëna llogarie",
     "Clear notifications": "Spastro njoftimet",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Përshtateni punimin tuaj me veçori eksperimentale. <a>Mësoni më tepër</a>.",
     "This message cannot be decrypted": "Ky mesazh s'mund të shfshehtëzohet",
     "Unencrypted": "Të pafshehtëzuara",
     "<userName/> wants to chat": "<userName/> dëshiron të bisedojë",
     "Start chatting": "Filloni të bisedoni",
     "Reactions": "Reagime",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagoi me %(content)s</reactedWith>",
-    "Automatically invite users": "Fto përdorues automatikisht",
     "Upgrade private room": "Përmirëso dhomë private",
     "Upgrade public room": "Përmirëso dhomë publike",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Përmirësimi i një dhome është një veprim i thelluar dhe zakonisht rekomandohet kur një dhomë është e papërdorshme, për shkak të metash, veçorish që i mungojnë ose cenueshmëri sigurie.",
@@ -1688,12 +1425,8 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Do ta përmirësoni këtë dhomë nga <oldVersion /> në <newVersion />.",
     "Upgrade": "Përmirësoje",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Kujdes</b>: duhet të ujdisni kopjeruajtje kyçesh vetëm nga një kompjuter i besuar.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Nëse keni harruar kyçin tuaj të rimarrjeve, mund të <button>ujdisni mundësi të reja rimarrjeje</button>",
     "Notification settings": "Rregullime njoftimesh",
     "User Status": "Gjendje Përdoruesi",
-    "Set up with a recovery key": "Rregullojeni me një kyç rimarrjesh",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Kyçi juaj i rimarrjeve është <b>kopjuar te e papastra juaj</b>, ngjiteni te:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Kyçi juaj i rimarrjeve gjendet te dosja juaj <b>Shkarkime</b>.",
     "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s hoqi rregullin për dëbim përdoruesish që kanë përputhje me %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s hoqi rregullin që dëbon dhoma që kanë përputhje me %(glob)s",
@@ -1712,12 +1445,10 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte dhoma me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte shërbyes me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s përditësoi një rregull dëbimesh mbi përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
-    "The message you are trying to send is too large.": "Mesazhi që po rrekeni të dërgoni është shumë i madh.",
     "not stored": "e padepozituar",
     "Backup has a <validity>valid</validity> signature from this user": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej këtij përdoruesi",
     "Backup has a <validity>invalid</validity> signature from this user": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej këtij përdoruesi",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një përdorues i <verify>panjohur</verify> me ID %(deviceId)s",
-    "Backup key stored: ": "Kyç kopjeruajtjeje i depozituar: ",
     "Close preview": "Mbylle paraparjen",
     "Hide verified sessions": "Fshih sesione të verifikuar",
     "%(count)s verified sessions|other": "%(count)s sesione të verifikuar",
@@ -1727,7 +1458,6 @@
     "Recent Conversations": "Biseda Së Fundi",
     "Direct Messages": "Mesazhe të Drejtpërdrejtë",
     "Go": "Shko",
-    "Help": "Ndihmë",
     "Country Dropdown": "Menu Hapmbyll Vendesh",
     "Show info about bridges in room settings": "Shfaq te rregullime dhome të dhëna rreth urash",
     "This bridge is managed by <user />.": "Kjo urë administrohet nga <user />.",
@@ -1747,14 +1477,11 @@
     "%(num)s days from now": "%(num)s ditë nga tani",
     "Other users may not trust it": "Përdorues të tjerë mund të mos e besojnë",
     "Later": "Më vonë",
-    "Cross-signing and secret storage are enabled.": "<em>Cross-signing</em> dhe depozitimi i fshehtë janë aktivizuar.",
-    "Cross-signing and secret storage are not yet set up.": "<em>Cross-signing</em> dhe depozitimi i fshehtë s’janë ujdisur ende.",
     "Cross-signing private keys:": "Kyçe privatë për <em>cross-signing</em>:",
     "Labs": "Labs",
     "Complete": "E plotë",
     "This room is end-to-end encrypted": "Kjo dhomë është e fshehtëzuar skaj-më-skaj",
     "Everyone in this room is verified": "Gjithkush në këtë dhomë është verifikuar",
-    "Invite only": "Vetëm me ftesa",
     "Send a reply…": "Dërgoni një përgjigje…",
     "Send a message…": "Dërgoni një mesazh…",
     "Reject & Ignore user": "Hidhe poshtë & Shpërfille përdoruesin",
@@ -1766,8 +1493,6 @@
     "Verify User": "Verifikoni Përdoruesin",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Për siguri ekstra, verifikojeni këtë përdorues duke kontrolluar në të dyja pajisjet tuaja një kod njëpërdorimsh.",
     "Start Verification": "Fillo Verifikimin",
-    "Failed to invite the following users to chat: %(csvUsers)s": "S’u arrit të ftoheshin për bisedë përdoruesit vijues: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "S’e krijuam dot DM-në tuaj. Ju lutemi, kontrolloni përdoruesit që doni të ftoni dhe riprovoni.",
     "Something went wrong trying to invite the users.": "Diç shkoi ters teksa provohej të ftoheshin përdoruesit.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "S’i ftuam dot këta përdorues. Ju lutemi, kontrolloni përdoruesit që doni të ftoni dhe riprovoni.",
     "Failed to find the following users": "S’u arrit të gjendeshin përdoruesit vijues",
@@ -1782,14 +1507,10 @@
     "Enter your account password to confirm the upgrade:": "Që të ripohohet përmirësimi, jepni fjalëkalimin e llogarisë tuaj:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Do t’ju duhet të bëni mirëfilltësimin me shërbyesin që të ripohohet përmirësimi.",
     "Upgrade your encryption": "Përmirësoni fshehtëzimin tuaj",
-    "Set up encryption": "Ujdisni fshehtëzim",
     "Verify this session": "Verifikoni këtë sesion",
     "Encryption upgrade available": "Ka të gatshëm përmirësim fshehtëzimi",
     "Review": "Shqyrtojeni",
     "Enable message search in encrypted rooms": "Aktivizo kërkim mesazhesh në dhoma të fshehtëzuara",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi, duke përdorur ",
-    " to store messages from ": " për të depozituar mesazhe nga ",
-    "rooms.": "dhoma.",
     "Manage": "Administroni",
     "Securely cache encrypted messages locally for them to appear in search results.": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi.",
     "Enable": "Aktivizoje",
@@ -1800,8 +1521,6 @@
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s-i po ruan lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi:",
     "Space used:": "Hapësirë e përdorur:",
     "Indexed messages:": "Mesazhe të indeksuar:",
-    "If you cancel now, you won't complete verifying the other user.": "Nëse e anuloni tani, s’do të plotësoni verifikimin e përdoruesit tjetër.",
-    "If you cancel now, you won't complete verifying your other session.": "Nëse e anuloni tani, s’do të plotësoni verifikimin e sesionit tuaj tjetër.",
     "Cancel entering passphrase?": "Të anulohet dhënue frazëkalimi?",
     "Setting up keys": "Ujdisje kyçesh",
     "Verifies a user, session, and pubkey tuple": "Verifikon një përdorues, sesion dhe një set kyçesh publikë",
@@ -1817,10 +1536,7 @@
     "They match": "Përputhen",
     "They don't match": "S’përputhen",
     "To be secure, do this in person or use a trusted way to communicate.": "Për të qenë i sigurt, bëjeni këtë duke qenë vetë i pranishëm ose përdorni për të komunikuar një rrugë të besuar.",
-    "Verify yourself & others to keep your chats safe": "Verifikoni veten & të tjerët, që t’i mbani bisedat tuaja të sigurta",
     "This bridge was provisioned by <user />.": "Kjo urë është dhënë nga <user />.",
-    "Workspace: %(networkName)s": "Hapësirë pune: %(networkName)s",
-    "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Show less": "Shfaq më pak",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ndryshimi i fjalëkalimit do të sjellë zerimin e çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt sesionet, duke e bërë të palexueshëm historikun e fshehtëzuar të bisedave, hiq rastin kur i eksportoni më parë kyçet tuaj të dhomës dhe i ri-importoni ata më pas. Në të ardhmen kjo do të përmirësohet.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Llogaria juaj ka një identitet <em>cross-signing</em> në depozitë të fshehtë, por s’është ende i besuar në këtë sesion.",
@@ -1881,7 +1597,6 @@
     "You've successfully verified %(displayName)s!": "E verifikuat me sukses %(displayName)s!",
     "Got it": "E mora vesh",
     "Encryption enabled": "Fshehtëzim i aktivizuar",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesazhet në këtë dhomë fshehtëzohen skaj-më-skaj. Mësoni më tepër & verifikoni këtë përdorues në profilin e tij.",
     "Encryption not enabled": "Fshehtëzim jo i aktivizuar",
     "The encryption used by this room isn't supported.": "Fshehtëzimi i përdorur nga kjo dhomë nuk mbulohet.",
     "Clear all data in this session?": "Të pastrohen krejt të dhënat në këtë sesion?",
@@ -1892,18 +1607,8 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifikimi i këtij përdoruesi do t’i vërë shenjë sesionit të tij si të besuar dhe sesionit tuaj si të besuar për ta.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Që t’i vihet shenjë si e besuar, verifikojeni këtë pajisje. Besimi i kësaj pajisjeje ju jep juve dhe përdoruesve të tjerë ca qetësi më tepër, kur përdoren mesazhe të fshehtëzuar skaj-më-skaj.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifikimi i kësaj pajisjeje do të t’i vërë shenjë si të besuar dhe përdoruesit që janë verifikuar me ju do ta besojnë këtë pajisje.",
-    "New session": "Sesion i ri",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Përdoreni këtë sesion për të verifikuar atë tuajin të ri, duke i akorduar hyrje te mesazhe të fshehtëzuar:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Nëse s’bëtë hyrjen te ky sesion, llogaria muaj mund të jetë komprometuar.",
-    "This wasn't me": "Ky s’jam unë",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Kjo do t’ju lejojë të riktheheni te llogaria juaj pasi të keni bërë daljen, dhe të hyni në sesione të tjerë.",
-    "Recovery key mismatch": "Mospërputhje kyçesh rimarrjeje",
-    "Incorrect recovery passphrase": "Frazëkalim rimarrjeje i pasaktë",
-    "Enter recovery passphrase": "Jepni frazëkalim rimarrjesh",
-    "Enter recovery key": "Jepni kyç rimarrjesh",
     "Confirm your identity by entering your account password below.": "Ripohoni identitetin tuaj duke dhënë më poshtë fjalëkalimin e llogarisë tuaj.",
     "Your new session is now verified. Other users will see it as trusted.": "Sesioni juaj i ri tani është i verifikuar. Përdoruesit e tjerë do të shohin si të besuar.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Pa plotësuar sigurinë në këtë sesion, s’do të ketë hyrje te mesazhe të fshehtëzuar.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Ndryshimi i fjalëkalimit tuaj do të sjellë zerim të çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt sesionet tuaj, duke e bërë të palexueshëm historikun e bisedave të fshehtëzuara. Ujdisni një Kopjeruajtje Kyçesh ose eksportoni kyçet e dhomës tuaj prej një tjetër sesioni, përpara se të ricaktoni fjalëkalimin tuaj.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jeni nxjerrë jashtë krejt sesioneve dhe nuk do të merrni më njoftime push. Që të riaktivizoni njoftimet, bëni sërish hyrjen në çdo pajisje.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Rifitoni hyrjen te llogaria juaj dhe rimerrni kyçe fshehtëzimi të depozituar në këtë sesion. Pa ta, s’do të jeni në gjendje të lexoni krejt mesazhet tuaj të siguruar në çfarëdo sesion.",
@@ -1911,13 +1616,10 @@
     "Restore your key backup to upgrade your encryption": "Që të përmirësoni fshehtëzimin tuaj, riktheni kopjeruajtjen e kyçeve tuaj",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Përmirësojeni këtë sesion për ta lejuar të verifikojë sesione të tjerë, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuar për përdorues të tjerë.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Mbajeni kyçin tuaj të rimarrjeve diku në një vend pak a shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh ose madje në një kasafortë.",
-    "Your recovery key": "Kyçi juaj i rimarrjeve",
     "Copy": "Kopjoje",
-    "Make a copy of your recovery key": "Bëni një kopje të kyçit tuaj të rimarrjeve",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, s’do të jeni në gjendje të riktheni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen ose përdorni një sesion tjetër.",
     "Create key backup": "Krijo kopjeruajtje kyçesh",
     "This session is encrypting history using the new recovery method.": "Ky sesion e fshehtëzon historikun duke përdorur metodë të re rimarrjesh.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ky sesion ka pikasur se frazëkalimi dhe kyçi juaj i rimarrjeve për Mesazhe të Sigurt janë hequr.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë sesion, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të sesionit me një metodë të re rimarrjesh.",
     "Indexed rooms:": "Dhoma të indeksuara:",
     "Message downloading sleep time(ms)": "Kohë fjetjeje shkarkimi mesazhi(ms)",
@@ -1951,11 +1653,6 @@
     "Accepting …": "Po pranohet …",
     "Declining …": "Po hidhet poshtë …",
     "Verification Requests": "Kërkesa Verifikimi",
-    "Your account is not secure": "Llogaria juaj s’është e sigurt",
-    "Your password": "Fjalëkalimi juaj",
-    "This session, or the other session": "Ky sesion, ose sesioni tjetër",
-    "The internet connection either session is using": "Lidhja internet që përdor cilido nga dy sesionet",
-    "We recommend you change your password and recovery key in Settings immediately": "Këshillojmë të ndryshoni menjëherë te Rregullimet fjalëkalimin tuaj dhe kyçin e rimarrjeve",
     "Sign In or Create Account": "Hyni ose Krijoni një Llogari",
     "Use your account or create a new one to continue.": "Që të vazhdohet, përdorni llogarinë tuaj të përdoruesit ose krijoni një të re.",
     "Create Account": "Krijoni Llogari",
@@ -1982,7 +1679,6 @@
     "Local address": "Adresë vendore",
     "Published Addresses": "Adresa të Publikuara",
     "Scroll to most recent messages": "Rrëshqit te mesazhet më të freskët",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Adresat e publikuara mund të përdoren nga cilido në çfarëdo shërbyesi për të hyrë në dhomën tuaj. Që të publikoni një adresë, lypset së pari të caktohet si adresë vendore.",
     "Other published addresses:": "Adresa të tjera të publikuara:",
     "No other published addresses yet, add one below": "Ende pa adresa të tjera të publikuara, shtoni një më poshtë",
     "New published address (e.g. #alias:server)": "Adresë e re e publikuar (p.sh., #alias:server)",
@@ -2001,7 +1697,6 @@
     "Add a new server...": "Shtoni një shërbyes të ri…",
     "%(networkName)s rooms": "Dhoma %(networkName)s",
     "Matrix rooms": "Dhoma Matrix",
-    "Reset cross-signing and secret storage": "Rikthe te parazgjedhjet <em>cross-signing</em> dhe depozitën e fshehtë",
     "Keyboard Shortcuts": "Shkurtore Tastiere",
     "Matrix": "Matrix",
     "a new master key signature": "një nënshkrim i ri kyçi të përgjithshëm",
@@ -2049,7 +1744,6 @@
     "End": "End",
     "Manually Verify by Text": "Verifikojeni Dorazi përmes Teksti",
     "Interactively verify by Emoji": "Verifikojeni në mënyrë ndërvepruese përmes Emoji-sh",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Nisni një bisedë me dikë duke përdorur emrin e tij, emrin e përdoruesit për të (bie fjala, <userId/>) ose adresë email.",
     "Confirm by comparing the following with the User Settings in your other session:": "Ripohojeni duke krahasuar sa vijon me Rregullimet e Përdoruesit te sesioni juaj tjetër:",
     "Confirm this user's session by comparing the following with their User Settings:": "Ripohojeni këtë sesion përdoruesi duke krahasuar sa vijon me Rregullimet e tij të Përdoruesit:",
     "If they don't match, the security of your communication may be compromised.": "Nëse s’përputhen, siguria e komunikimeve tuaja mund të jetë komprometuar.",
@@ -2071,7 +1765,6 @@
     "Verified": "I verifikuar",
     "Verification cancelled": "Verifikimi u anulua",
     "Compare emoji": "Krahasoni emoji",
-    "Session backup key:": "Kyç kopjeruajtjeje sesioni:",
     "Use Single Sign On to continue": "Që të vazhdohet, përdorni Hyrje Njëshe",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Ripohoni shtimin e kësaj adrese email duke përdorur Hyrje Njëshe për të provuar identitetin tuaj.",
     "Single Sign On": "Hyrje Njëshe",
@@ -2084,12 +1777,10 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Ripohoni se emoxhit më poshtë shfaqen në të dy sesionet, nën të njëjtën radhë:",
     "Verify this session by confirming the following number appears on its screen.": "Verifikojeni këtë sesion duke ripohuar se numri vijues shfaqet në ekranin e sesionit.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Po pritet që të verifikohet sesioni juaj tjetër, %(deviceName)s (%(deviceId)s)…",
-    "From %(deviceName)s (%(deviceId)s)": "Nga %(deviceName)s (%(deviceId)s)",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Ripohoni fshirjen e këtyre sesioneve duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
     "Confirm deleting these sessions": "Ripohoni fshirjen e këtyre sesioneve",
     "Click the button below to confirm deleting these sessions.": "Që të ripohoni fshirjen e këtyre sesioneve, klikoni mbi butonin më poshtë.",
     "Delete sessions": "Fshini sesione",
-    "Waiting for you to accept on your other session…": "Po pritet që të pranoni në sesionin tuaj tjetër…",
     "Almost there! Is your other session showing the same shield?": "Thuajse mbërritëm! A shfaq sesioni juaj tjetër të njëjtën mburojë?",
     "Almost there! Is %(displayName)s showing the same shield?": "Thuaje mbërritëm! A shfaq %(displayName)s të njëjtën mburojë?",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Keni verifikuar me sukses %(deviceName)s (%(deviceId)s)!",
@@ -2100,7 +1791,6 @@
     "%(displayName)s cancelled verification.": "%(displayName)s anuloi verifikimin.",
     "You cancelled verification.": "Anuluat verifikimin.",
     "Sign in with SSO": "Hyni me HNj",
-    "Self-verification request": "Kërkesë vetë-verifikimi",
     "Cancel replying to a message": "Anulo përgjigjen te një mesazh",
     "%(name)s is requesting verification": "%(name)s po kërkon verifikim",
     "unexpected type": "lloj i papritur",
@@ -2127,32 +1817,15 @@
     "Server did not require any authentication": "Shërbyesi s’kërkoi ndonjë mirëfilltësim",
     "Server did not return valid authentication information.": "Shërbyesi s’ktheu ndonjë të dhënë të vlefshme mirëfilltësimi.",
     "There was a problem communicating with the server. Please try again.": "Pati një problem në komunikimin me shërbyesin. Ju lutemi, riprovoni.",
-    "If you cancel now, you won't complete your operation.": "Nëse e anuloni tani, s’do ta plotësoni veprimin tuaj.",
-    "Verify other session": "Verifikoni tjetër sesion",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "S’arrihet të hyhet në depozitë të fshehtë. Ju lutemi, verifikoni se dhatë frazëkalimin e duhur për rimarrje.",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Kopjeruajtja s’u shfshehtëzua dot me këtë kyç rimarrjesh: ju lutemi, verifikoni se keni dhënë kyçin e saktë të rimarrjeve.",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Kopjeruajtja s’u shfshehtëzua dot me këtë frazëkalim rimarrjesh: ju lutemi, verifikoni se keni dhënë frazëkalimin e saktë të rimarrjeve.",
     "Syncing...": "Po njëkohësohet…",
     "Signing In...": "Po hyhet…",
     "If you've joined lots of rooms, this might take a while": "Nëse jeni pjesë e shumë dhomave, kjo mund të zgjasë ca",
-    "Great! This recovery passphrase looks strong enough.": "Bukur! Ky frazëkalim rimarrjesh duket mjaftueshëm i fuqishëm.",
-    "Enter a recovery passphrase": "Jepni një frazëkalim rimarrjesh",
-    "Enter your recovery passphrase a second time to confirm it.": "Për ta ripohuar, jepeni edhe një herë frazëkalimin tuaj të rimarrjeve.",
-    "Confirm your recovery passphrase": "Ripohoni frazëkalimin tuaj të rimarrjeve",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Kyçi juaj i rimarrjeve është një rrjet sigurie - mund ta përdorni për të rifituar hyrje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj të rimarrjeve.",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Do të ruajmë një kopje të fshehtëzuar të kyçeve tuaj në shërbyesin tonë. Siguroni kopjeruajtjen tuaj me një frazëkalim rimarrjesh.",
-    "Please enter your recovery passphrase a second time to confirm.": "Ju lutemi, jepeni frazëkalimin tuaj të rimarrjeve edhe një herë, për ta ripohuar.",
-    "Repeat your recovery passphrase...": "Përsëritni frazëkalimin tuaj të rimarrjeve…",
-    "Secure your backup with a recovery passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim rimarrjesh",
-    "Review where you’re logged in": "Shqyrtojini kur të jeni i futur",
     "New login. Was this you?": "Hyrje e re. Ju qetë?",
     "Please supply a widget URL or embed code": "Ju lutemi, furnizoni një URL widget-i ose kod trupëzimi",
     "Send a bug report with logs": "Dërgoni një njoftim të metash me regjistra",
     "You signed in to a new session without verifying it:": "Bëtë hyrjen në një sesion të ri pa e verifikuar:",
     "Verify your other session using one of the options below.": "Verifikoni sesionit tuaj tjetër duke përdorur një nga mundësitë më poshtë.",
     "Lock": "Kyçje",
-    "Verify all your sessions to ensure your account & messages are safe": "Verifikoni krejt sesionet tuaj që të siguroheni se llogaria & mesazhet tuaja janë të sigurt",
-    "Verify the new login accessing your account: %(name)s": "Verifikoni kredencialet e reja për hyrje te llogaria juaj: %(name)s",
     "Cross-signing": "<em>Cross-signing</em>",
     "Where you’re logged in": "Kur të jeni i futur",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Administroni emrat dhe bëni daljen pre sesioneve tuaj më poshtë ose <a>verifikojini te Profili juaj i Përdoruesit</a>.",
@@ -2167,9 +1840,6 @@
     "Keys restored": "Kyçet u rikthyen",
     "Successfully restored %(sessionCount)s keys": "U rikthyen me sukses %(sessionCount)s kyçe",
     "Verify this login": "Verifikoni këto kredenciale hyrjeje",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjesh prej një nga sesionet tuaj të tjerë, duke i akorduar hyrje te mesazhet e fshehtëzuar.",
-    "This requires the latest %(brand)s on your other devices:": "Kjo lyp %(brand)s-in më të ri te pajisjet tuaja të tjera:",
-    "or another cross-signing capable Matrix client": "ose një tjetër klient Matrix i aftë për <em>cross-signing</em",
     "Unable to query secret storage status": "S’u arrit të merret gjendje depozite të fshehtë",
     "Currently indexing: %(currentRoom)s": "Indeksim aktual: %(currentRoom)s",
     "Opens chat with the given user": "Hap fjalosje me përdoruesin e dhënë",
@@ -2182,35 +1852,26 @@
     "To continue, use Single Sign On to prove your identity.": "Që të vazhdohet, përdorni Hyrje Njëshe, që të provoni identitetin tuaj.",
     "Confirm to continue": "Ripohojeni që të vazhdohet",
     "Click the button below to confirm your identity.": "Klikoni mbi butonin më poshtë që të ripohoni identitetin tuaj.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Ftoni dikë duke përdorur emrin e tij, emrin e përdoruesit (bie fjala, <userId/>), adresën email ose <a>duke ndarë me të këtë dhomë</a>.",
     "Confirm encryption setup": "Ripohoni ujdisje fshehtëzimi",
     "Click the button below to confirm setting up encryption.": "Klikoni mbi butonin më poshtë që të ripohoni ujdisjen e fshehtëzimit.",
     "Dismiss read marker and jump to bottom": "Mos merr parasysh piketë leximi dhe hidhu te fundi",
     "Jump to oldest unread message": "Hidhu te mesazhi më i vjetër i palexuar",
     "Upload a file": "Ngarkoni një kartelë",
-    "Font scaling": "Përshkallëzim shkronjash",
     "Font size": "Madhësi shkronjash",
     "IRC display name width": "Gjerësi shfaqjeje emrash IRC",
     "Size must be a number": "Madhësia duhet të jetë një numër",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Madhësia vetjake për shkronjat mund të jetë vetëm mes vlerave %(min)s pt dhe %(max)s pt",
     "Use between %(min)s pt and %(max)s pt": "Përdor me %(min)s pt dhe %(max)s pt",
     "Appearance": "Dukje",
-    "Create room": "Krijo dhomë",
     "Room name or address": "Emër ose adresë dhome",
     "Joins room with given address": "Hyhet në dhomën me adresën e dhënë",
     "Unrecognised room address:": "Adresë dhome që s’njihet:",
     "Help us improve %(brand)s": "Ndihmonani të përmirësojmë %(brand)s-in",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Dërgoni <UsageDataLink>të dhëna anonime përdorimi</UsageDataLink> të cilat na ndihmojnë të përmirësojmë %(brand)s-in. Kjo do të përdorë një <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "Dua të ndihmoj",
     "Your homeserver has exceeded its user limit.": "Shërbyesi juaj Home ka tejkaluar kufijtë e tij të përdorimit.",
     "Your homeserver has exceeded one of its resource limits.": "Shërbyesi juaj Home ka tejkaluar një nga kufijtë e tij të burimeve.",
     "Contact your <a>server admin</a>.": "Lidhuni me <a>përgjegjësin e shërbyesit tuaj</a>.",
     "Ok": "OK",
-    "Set password": "Caktoni fjalëkalim",
-    "To return to your account in future you need to set a password": "Që të ktheheni te llogaria juaj në të ardhmen, duhet të caktoni një fjalëkalim",
-    "Restart": "Rinise",
-    "Upgrade your %(brand)s": "Përmirësoni %(brand)s-in tuaj",
-    "A new version of %(brand)s is available!": "Ka gati një version të ri të %(brand)s-it!",
     "Please verify the room ID or address and try again.": "Ju lutemi, verifikoni ID-në ose adresën e dhomës dhe riprovoni.",
     "Room ID or address of ban list": "ID dhome ose adresë prej liste ndalimi",
     "To link to this room, please add an address.": "Që të lidhni këtë dhomë, ju lutemi, jepni një adresë.",
@@ -2221,12 +1882,9 @@
     "Error removing address": "Gabim në heqje adrese",
     "Categories": "Kategori",
     "Room address": "Adresë dhome",
-    "Please provide a room address": "Ju lutemi, jepni një adresë dhome",
     "This address is available to use": "Kjo adresë është e lirë për përdorim",
     "This address is already in use": "Kjo adresë është e përdorur tashmë",
-    "Set a room address to easily share your room with other people.": "Caktoni një adresë dhome që të ndani dhomën tuaj me persona të tjerë.",
     "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.": "Me këtë sesion, keni përdorur më herët një version më të ri të %(brand)s-it. Që të ripërdorni këtë version me fshehtëzim skaj më skaj, do t’ju duhet të bëni daljen dhe të rihyni.",
-    "Address (optional)": "Adresë (opsionale)",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Të fshihet adresa e dhomës %(alias)s dhe të hiqet %(name)s nga drejtoria?",
     "delete the address.": "fshije adresën.",
     "Use a different passphrase?": "Të përdoret një frazëkalim tjetër?",
@@ -2243,8 +1901,6 @@
     "Feedback": "Mendime",
     "No recently visited rooms": "S’ka dhoma të vizituara së fundi",
     "Sort by": "Renditi sipas",
-    "Unread rooms": "Dhoma të palexuara",
-    "Always show first": "Shfaq përherë të parën",
     "Show": "Shfaqe",
     "Message preview": "Paraparje mesazhi",
     "List options": "Mundësi liste",
@@ -2259,76 +1915,28 @@
     "Activity": "Veprimtari",
     "A-Z": "A-Z",
     "Looks good!": "Mirë duket!",
-    "Use Recovery Key or Passphrase": "Përdorni Kyç ose Frazëkalim Rimarrjesh",
-    "Use Recovery Key": "Përdorni Kyç Rimarrjesh",
-    "Use the improved room list (will refresh to apply changes)": "Përdor listën e përmirësuar të dhomave (do të rifreskohet, që të aplikohen ndryshimet)",
     "Use custom size": "Përdor madhësi vetjake",
     "Hey you. You're the best!": "Hej, ju. S’u ka kush shokun!",
     "Message layout": "Skemë mesazhesh",
-    "Compact": "Kompakte",
     "Modern": "Moderne",
     "Use a system font": "Përdor një palë shkronja sistemi",
     "System font name": "Emër shkronjash sistemi",
     "You joined the call": "U bëtë pjesë e thirrjes",
     "%(senderName)s joined the call": "%(senderName)s u bë pjesë e thirrjes",
     "Call in progress": "Thirrje në ecuri e sipër",
-    "You left the call": "E braktisët thirrjen",
-    "%(senderName)s left the call": "%(senderName)s e braktisi thirrjen",
     "Call ended": "Thirrja përfundoi",
     "You started a call": "Filluat një thirrje",
     "%(senderName)s started a call": "%(senderName)s filluat një thirrje",
     "Waiting for answer": "Po pritet për përgjigje",
     "%(senderName)s is calling": "%(senderName)s po thërret",
-    "You created the room": "Krijuat dhomën",
-    "%(senderName)s created the room": "%(senderName)s krijoi dhomën",
-    "You made the chat encrypted": "E bëtë të fshehtëzuar fjalosjen",
-    "%(senderName)s made the chat encrypted": "%(senderName)s e bëri të fshehtëzuar fjalosjen",
-    "You made history visible to new members": "E bëtë historikun të dukshëm për anëtarë të rinj",
-    "%(senderName)s made history visible to new members": "%(senderName)s e bëri historikun të dukshëm për anëtarë të rinj",
-    "You made history visible to anyone": "E bëtë historikun të dukshëm për këdo",
-    "%(senderName)s made history visible to anyone": "%(senderName)s e bëri historikun të dukshëm për këdo",
-    "You made history visible to future members": "E bëtë historikun të dukshëm për anëtarë të ardhshëm",
-    "%(senderName)s made history visible to future members": "%(senderName)s e bëri historikun të dukshëm për anëtarë të ardhshëm",
-    "You were invited": "U ftuat",
-    "%(targetName)s was invited": "%(targetName)s u ftua",
-    "You left": "Dolët",
-    "%(targetName)s left": "%(targetName)s doli",
-    "You were kicked (%(reason)s)": "U përzutë (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s u përzu (%(reason)s)",
-    "You were kicked": "U përzutë",
-    "%(targetName)s was kicked": "%(targetName)s u përzu",
-    "You rejected the invite": "S’pranuat ftesën",
-    "%(targetName)s rejected the invite": "%(targetName)s s’pranoi ftesën",
-    "You were uninvited": "Ju shfuqizuan ftesën",
-    "%(targetName)s was uninvited": "%(targetName)s i shfuqizuan ftesën",
-    "You were banned (%(reason)s)": "U dëbuat (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s u dëbua (%(reason)s)",
-    "You were banned": "U dëbuat",
-    "%(targetName)s was banned": "%(targetName)s u dëbua",
-    "You joined": "U bëtë pjesë",
-    "%(targetName)s joined": "%(targetName)s u bë pjesë",
-    "You changed your name": "Ndryshuat emrin",
-    "%(targetName)s changed their name": "%(targetName)s ndryshoi emrin e vet",
-    "You changed your avatar": "Ndryshuat avatarin tuaj",
-    "%(targetName)s changed their avatar": "%(targetName)s ndryshoi avatarin e vet",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "Ndryshuat emrin e dhomës",
-    "%(senderName)s changed the room name": "%(senderName)s ndryshoi emrin e dhomës",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "Shfuqizuat ftesën për %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s shfuqizoi ftesën për %(targetName)s",
-    "You invited %(targetName)s": "Ftuat %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s ftoi %(targetName)s",
-    "You changed the room topic": "Ndryshuat temën e dhomës",
-    "%(senderName)s changed the room topic": "%(senderName)s ndryshoi temën e dhomës",
     "Use a more compact ‘Modern’ layout": "Përdorni një skemë ‘Modern’ më kompakte",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Mirëfilltësia e këtij mesazhi të fshehtëzuar s’mund të garantohet në këtë pajisje.",
     "Message deleted on %(date)s": "Mesazh i fshirë më %(date)s",
     "Wrong file type": "Lloj i gabuar kartele",
-    "Wrong Recovery Key": "Kyç Rimarrjesh i Gabuar",
-    "Invalid Recovery Key": "Kyç Rimarrjesh i Pavlefshëm",
     "Security Phrase": "Frazë Sigurie",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Që të vazhdohet, jepni Frazën tuaj të Sigurisë ose <button>Përdorni Kyçin tuaj të Sigurisë</button>.",
     "Security Key": "Kyç Sigurie",
@@ -2342,27 +1950,14 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Depozitojeni Kyçin tuaj të Sigurisë diku të parrezik, bie fjala në një përgjegjës fjalëkalimesh ose në një kasafortë, ngaqë përdoret për të mbrojtur të dhënat tuaja të fshehtëzuara.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Nëse e anuloni tani, mund të humbni mesazhe & të dhëna të fshehtëzuara, nëse humbni hyrjen te kredencialet tuaja të hyrjeve.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Mundeni edhe të ujdisni Kopjeruajtje të Sigurt & administroni kyçet tuaj që nga Rregullimet.",
-    "Set up Secure backup": "Ujdisni kopjeruajtje të Sigurt",
     "Set a Security Phrase": "Caktoni një Frazë Sigurie",
     "Confirm Security Phrase": "Ripohoni Frazë Sigurie",
     "Save your Security Key": "Ruani Kyçin tuaj të Sigurisë",
-    "Use your account to sign in to the latest version": "Përdorni llogarinë tuaj për të bërë hyrjen te versioni më i ri",
-    "We’re excited to announce Riot is now Element": "Jemi të ngazëllyer t’ju njoftojmë se Riot tanimë është Element",
-    "Riot is now Element!": "Riot-i tani është Element!",
-    "Learn More": "Mësoni Më Tepër",
     "Are you sure you want to cancel entering passphrase?": "Jeni i sigurt se doni të anulohet dhënie frazëkalimi?",
-    "Enable advanced debugging for the room list": "Aktivizo diagnostikim të thelluar për listën e dhomave",
     "Enable experimental, compact IRC style layout": "Aktivizo skemë eksperimentale, kompakte, IRC-je",
     "Unknown caller": "Thirrës i panjohur",
-    "Incoming voice call": "Thirrje zanore ardhëse",
-    "Incoming video call": "Thirrje video ardhëse",
-    "Incoming call": "Thirrje ardhëse",
     "%(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 s’mund të ruajë lokalisht në fshehtinë në mënyrë të siguruar mesazhe të fshehtëzuar, teksa xhirohet në një shfletues. Që mesazhet e fshehtëzuar të shfaqen te përfundime kërkimi, përdorni <desktopLink>%(brand)s Desktop</desktopLink>.",
-    "There are advanced notifications which are not shown here.": "Ka njoftime të thelluara që s’janë shfaqur këtu.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Mund t’i keni formësuar në një klient tjetër nga %(brand)s. S’mund t’i përimtoni në %(brand)s, por janë ende të vlefshëm.",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Caktoni emrin e një palë shkronjash të instaluara në sistemin tuaj & %(brand)s do të provojë t’i përdorë.",
-    "Make this room low priority": "Bëje këtë dhomë të përparësisë së ulët",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Dhomat me përparësi të ulët shfaqen në fund të listës tuaj të dhomave, në një ndarje enkas në fund të listës tuaj të dhomave",
     "Show rooms with unread messages first": "Së pari shfaq dhoma me mesazhe të palexuar",
     "Show previews of messages": "Shfaq paraparje mesazhesh",
     "Use default": "Përdor parazgjedhjen",
@@ -2373,19 +1968,7 @@
     "Away": "I larguar",
     "Edited at %(date)s": "Përpunuar më %(date)s",
     "Click to view edits": "Klikoni që të shihni përpunime",
-    "Use your account to sign in to the latest version of the app at <a />": "Përdorni llogarinë tuaj për të hyrë te versioni më i ri i aplikacionit te <a />",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Keni bërë tashmë hyrjen këtu dhe jeni në rregull, por mundeni edhe të merrnit versionet më të reja të aplikacioneve në krejt platformat, te <a>element.io/get-started</a>.",
-    "Go to Element": "Shko te Element-i",
-    "We’re excited to announce Riot is now Element!": "Jemi të ngazëllyer të njoftojmë se Riot-i tani e tutje është Element-i!",
-    "Learn more at <a>element.io/previously-riot</a>": "Mësoni më tepër te <a>element.io/previously-riot</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.": "Mund të përdorni mundësitë vetjake për shërbyesin Që të bëni hyrjen te shërbyes të tjerë Matrix, duke specifikuar një URL të një shërbyesi Home tjetër. Kjo ju lejon të përdorni %(brand)s në një tjetër shërbyes Home me një llogari Matrix ekzistuese.",
-    "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>.": "Jepni vendndodhjen e shërbyesit tuaj vatër Element Matrix Services. Mund të përdorë emrin e përkatësisë tuaj vetjake ose të jetë një nënpërkatësi e <a>element.io</a>.",
-    "Search rooms": "Kërkoni në dhoma",
     "User menu": "Menu përdoruesi",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X për Android",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Custom Tag": "Etiketë Vetjake",
     "The person who invited you already left the room.": "Personi që ju ftoi ka dalë nga dhoma tashmë.",
@@ -2405,9 +1988,7 @@
     "Recent changes that have not yet been received": "Ndryshime tani së fundi që s’janë marrë ende",
     "No files visible in this room": "S’ka kartela të dukshme në këtë dhomë",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Bashkëngjitni kartela prej fjalosjeje ose thjesht tërhiqini dhe lërini kudo qoftë brenda dhomës.",
-    "You have no visible notifications in this room.": "S’ka njoftime të dukshme për ju në këtë dhomë.",
     "Master private key:": "Kyç privat i përgjithshëm:",
-    "%(brand)s Android": "%(brand)s Android",
     "Show message previews for reactions in DMs": "Shfaq paraparje mesazhi për reagime në MD",
     "Show message previews for reactions in all rooms": "Shfaq paraparje mesazhi për reagime në krejt dhomat",
     "Uploading logs": "Po ngarkohen regjistra",
@@ -2425,15 +2006,10 @@
     "Set up Secure Backup": "Ujdisni Kopjeruajtje të Sigurt",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Një mesazhi tekst të thjeshtë vëri përpara ( ͡° ͜ʖ ͡°)",
     "Unknown App": "Aplikacion i Panjohur",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "<em>Cross-signing</em> është gati për përdorim, por depozita e fshehtë s’është duke u përdorur për kopjeruajtje të kyçeve tuaj.",
     "Privacy": "Privatësi",
     "Explore community rooms": "Eksploroni dhoma bashkësie",
     "%(count)s results|one": "%(count)s përfundim",
     "Room Info": "Të dhëna Dhome",
-    "Apps": "Aplikacione",
-    "Unpin app": "Shfiksoje aplikacionin",
-    "Edit apps, bridges & bots": "Përpunoni aplikacione, ura & robotë",
-    "Add apps, bridges & bots": "Shtoni aplikacione, ura & robotë",
     "Not encrypted": "Jo e fshehtëzuar",
     "About": "Mbi",
     "%(count)s people|other": "%(count)s vetë",
@@ -2441,8 +2017,6 @@
     "Show files": "Shfaq kartela",
     "Room settings": "Rregullime dhome",
     "Take a picture": "Bëni një foto",
-    "Pin to room": "Fiksoje te dhoma",
-    "You can only pin 2 apps at a time": "Mund të fiksoni vetëm 2 aplikacione në herë",
     "Information": "Informacion",
     "Add another email": "Shtoni email tjetër",
     "People you know on %(brand)s": "Persona që njihni në %(brand)s",
@@ -2457,7 +2031,6 @@
     "Enter name": "Jepni emër",
     "Add image (optional)": "Shtoni figurë (në daçi)",
     "An image will help people identify your community.": "Një figurë do t’i ndihmojë njerëzit të identifikojnë bashkësinë tuaj.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Dhoma private mund të gjenden dhe në to të hyhet vetëm me ftesë. Dhomat publike mund të gjenden dhe në to të hyhet nga kushdo.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Dhoma private mund të gjenden dhe në to të hyhet vetëm me ftesë. Dhomat publike mund të gjenden dhe në to të hyhet nga kushdo në këtë bashkësi.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Këtë mund ta aktivizonit, nëse kjo dhomë do të përdoret vetëm për bashkëpunim me ekipe të brendshëm në shërbyesin tuaj Home. Kjo s’mund të ndryshohet më vonë.",
     "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.": "Këtë mund të çaktivizonit, nëse dhoma do të përdoret për bashkëpunim me ekipe të jashtëm që kanë shërbyesin e tyre Home. Kjo s’mund të ndryshohet më vonë.",
@@ -2466,24 +2039,16 @@
     "There was an error updating your community. The server is unable to process your request.": "Pati një gabim teksa përditësohej bashkësia juaj. Shërbyesi s’është në gjendje të merret me kërkesën tuaj.",
     "Update community": "Përditësoni bashkësinë",
     "May include members not in %(communityName)s": "Mund të përfshijë anëtarë jo në %(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>.": "Filloni një bisedë me dikë duke përdorur emrin e tij, emrin e përdoruesit (bie fjala, <userId/>) ose adresën e tij email. Kjo s’do të përbëjë ftesë për ta për t’u bërë pjesë e %(communityName)s. Për të ftuar dikë te %(communityName)s, klikoni <a>këtu</a>.",
     "Unpin": "Shfiksoje",
     "Create community": "Krijoni bashkësi",
     "Failed to find the general chat for this community": "S’u arrit të gjendej fjalosja e përgjithshme për këtë bashkësi",
     "Community settings": "Rregullime bashkësie",
     "User settings": "Rregullime përdoruesi",
     "Community and user menu": "Menu bashkësie dhe përdoruesish",
-    "End Call": "Përfundoje Thirrjen",
-    "Remove the group call from the room?": "Të hiqet nga dhoma thirrja e grupit?",
-    "You don't have permission to remove the call from the room": "S’keni leje të hiqni thirrjen nga dhoma",
-    "Group call modified by %(senderName)s": "Thirrja e grupit u modifikua nga %(senderName)s",
-    "Group call started by %(senderName)s": "Thirrje grupi e nisur nga %(senderName)s",
-    "Group call ended by %(senderName)s": "Thirrje grupi e përfunduar nga %(senderName)s",
     "Safeguard against losing access to encrypted messages & data": "Mbrohuni nga humbja e hyrjes te mesazhe & të dhëna të fshehtëzuara",
     "not found in storage": "s’u gjet në depozitë",
     "Backup version:": "Version kopjeruajtjeje:",
     "Algorithm:": "Algoritëm:",
-    "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.": "Kopjeruani kyçet tuaj të fshehtëzimit me të dhënat e llogarisë tuaj, për rastin kur humbni hyrje te sesionet tuaj. Kyçet tuaj do të sigurohen me një Kyç unik Rimarrjesh.",
     "Backup key stored:": "Kyç kopjeruajtjesh i depozituar:",
     "Backup key cached:": "Kyç kopjeruajtjesh i ruajtur në fshehtinë:",
     "Secret storage:": "Depozitë e fshehtë:",
@@ -2493,9 +2058,6 @@
     "Widgets": "Widget-e",
     "Edit widgets, bridges & bots": "Përpunoni widget-e, ura & robotë",
     "Add widgets, bridges & bots": "Shtoni widget-e, ura & robotë",
-    "You can only pin 2 widgets at a time": "Mundeni të fiksoni vetëm 2 widget-e në herë",
-    "Minimize widget": "Minimizoje widget-in",
-    "Maximize widget": "Maksimizoj widget-in",
     "Your server requires encryption to be enabled in private rooms.": "Shërbyesi juaj lyp që fshehtëzimi të jetë i aktivizuar në dhoma private.",
     "Start a conversation with someone using their name or username (like <userId/>).": "Nisni një bisedë me dikë duke përdorur emrin e tij ose emrin e tij të përdoruesit (bie fjala, <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Kjo s’do ta ftojë te %(communityName)s. Që të ftoni dikë te %(communityName)s, klikoni <a>këtu</a>",
@@ -2521,20 +2083,10 @@
     "You do not have permission to create rooms in this community.": "S’keni leje të krijoni dhoma në këtë bashkësi.",
     "Failed to save your profile": "S’u arrit të ruhej profili juaj",
     "The operation could not be completed": "Veprimi s’u plotësua dot",
-    "Starting microphone...": "Po vihet mikrofoni në punë…",
-    "Starting camera...": "Po vihet kamera në punë…",
-    "Call connecting...": "Po bëhet lidhja për thirrje…",
-    "Calling...": "Po thirret…",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Janë dëbuar nga pjesëmarrja krejt shërbyesit! Kjo dhomë s’mund të përdoret më.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ndryshoi ACL-ra shërbyesi për këtë dhomë.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s caktoi ACL-ra shërbyesi për këtë dhomë.",
-    "%(senderName)s declined the call.": "%(senderName)s hodhi poshtë thirrjen.",
-    "(an error occurred)": "(ndodhi një gabim)",
-    "(their device couldn't start the camera / microphone)": "(pajisja e tyre s’vuri dot në punë kamerën / mikrofonin)",
-    "(connection failed)": "(dështoi lidhja)",
     "The call could not be established": "Thirrja s’u nis dot",
-    "The other party declined the call.": "Pala tjetër hodhi poshtë thirrjen.",
-    "Call Declined": "Thirrja u Hodh Poshtë",
     "Move right": "Lëvize djathtas",
     "Move left": "Lëvize majtas",
     "Revoke permissions": "Shfuqizoji lejet",
@@ -2709,7 +2261,6 @@
     "Singapore": "Singapor",
     "Costa Rica": "Kosta Rika",
     "Ghana": "Ganë",
-    "Call Paused": "Thirrja u Ndal",
     "Mayotte": "Majot",
     "Cape Verde": "Kepi i Gjelbërt",
     "Belize": "Belize",
@@ -2838,7 +2389,6 @@
     "Filter rooms and people": "Filtroni dhoma dhe njerëz",
     "Open the link in the email to continue registration.": "Që të vazhdohet regjistrimi, hapni lidhjen te email-i.",
     "A confirmation email has been sent to %(emailAddress)s": "Te %(emailAddress)s u dërgua një email ripohimi",
-    "Role": "Rol",
     "Start a new chat": "Nisni një fjalosje të re",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhomë.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhoma.",
@@ -2916,9 +2466,7 @@
     "No other application is using the webcam": "Kamerën s’po e përdor aplikacion tjetër",
     "Permission is granted to use the webcam": "Është dhënë leje për përdorimin e kamerës",
     "A microphone and webcam are plugged in and set up correctly": "Një mikrofon dhe një kamerë janë futur dhe ujdisur si duhet",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "Thirrja dështoi, ngaqë s’u bë dot hyrje në kamerë ose mikrofon. Kontrolloni që:",
     "Unable to access webcam / microphone": "S’arrihet të përdoret kamerë / mikrofon",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Thirrja dështoi, ngaqë s’u hap dot ndonjë mikrofon. Shihni që të jetë futur një mikrofon dhe ujdiseni saktë.",
     "Unable to access microphone": "S’arrihet të përdoret mikrofoni",
     "Decide where your account is hosted": "Vendosni se ku të ruhet llogaria juaj",
     "Host account on": "Strehoni llogari në",
@@ -2937,7 +2485,6 @@
     "Learn more": "Mësoni më tepër",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "Përdorni shërbyesin tuaj Home të parapëlqyer Matrix, nëse keni një të tillë, ose strehoni një tuajin.",
     "Other homeserver": "Tjetër shërbyes home",
-    "We call the places you where you can host your account ‘homeservers’.": "Vendet ku mund të strehoni llogarinë tuaj i quajmë “shërbyes Home”.",
     "Sign into your homeserver": "Bëni hyrjen te shërbyesi juaj Home",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org është shërbyesi Home më i madh në botë, ndaj është një vend i mirë për shumë vetë.",
     "Specify a homeserver": "Tregoni një shërbyes Home",
@@ -2953,12 +2500,10 @@
     "Invalid URL": "URL e pavlefshme",
     "Unable to validate homeserver": "S’arrihet të vlerësohet shërbyesi Home",
     "Reason (optional)": "Arsye (opsionale)",
-    "%(name)s paused": "%(name)s pushoi",
     "%(peerName)s held the call": "%(peerName)s mbajti thirrjen",
     "You held the call <a>Resume</a>": "E mbajtët thirrjen <a>Rimerreni</a>",
     "sends confetti": "dërgon bonbone",
     "Sends the given message with confetti": "E dërgon mesazhin e dhënë me bonbone",
-    "Show chat effects": "Shfaq efekte fjalosjeje",
     "Effects": "Efekte",
     "You've reached the maximum number of simultaneous calls.": "Keni mbërritur në numrin maksimum të thirrjeve të njëkohshme.",
     "Too Many Calls": "Shumë Thirrje",
@@ -2978,7 +2523,6 @@
     "There was an error finding this widget.": "Pati një gabim në gjetjen e këtij widget-i.",
     "Active Widgets": "Widget-e Aktivë",
     "Open dial pad": "Hap butonat e numrave",
-    "Start a Conversation": "Filloni një Bisedë",
     "Dial pad": "Butona numrash",
     "There was an error looking up the phone number": "Pati një gabim gjatë kërkimit të numrit të telefonit",
     "Unable to look up phone number": "S’arrihet të kërkohet numër telefoni",
@@ -2992,7 +2536,6 @@
     "Confirm your Security Phrase": "Ripohoni Frazën tuaj të Sigurisë",
     "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.",
     "Use Security Key or Phrase": "Përdorni Kyç ose Frazë Sigurie",
     "Great! This Security Phrase looks strong enough.": "Bukur! Kjo Frazë Sigurie duket goxha e fuqishme.",
@@ -3013,7 +2556,6 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "S’arrihet të hyhet në depozitë të fshehtë. Ju lutemi, verifikoni se keni dhënë Frazën e saktë të Sigurisë.",
     "Invalid Security Key": "Kyç Sigurie i Pavlefshëm",
     "Wrong Security Key": "Kyç Sigurie i Gabuar",
-    "We recommend you change your password and Security Key in Settings immediately": "Rekomandojmë të ndryshoni menjëherë fjalëkalimin dhe Kyçin e Sigurisë, te Rregullimet",
     "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.": "Kopjeruani kyçet tuaj të fshehtëzimit me të dhënat e llogarisë tuaj, për ditën kur mund të humbni hyrje në sesionet tuaja. Kyçet tuaj do të jenë të siguruar me një Kyç unik Sigurie.",
     "Channel: <channelLink/>": "Kanal: <channelLink/>",
     "Workspace: <networkLink/>": "Hapësirë pune: <networkLink/>",
@@ -3025,8 +2567,6 @@
     "Allow this widget to verify your identity": "Lejojeni këtë widget të verifikojë identitetin tuaj",
     "Set my room layout for everyone": "Ujdise skemën e dhomës time për këdo",
     "You held the call <a>Switch</a>": "Mbajtët të shtypur <a>Butonin</a> e thirrjeve",
-    "Use Ctrl + F to search": "Që të kërkoni, përdorni tastet Ctrl + F",
-    "Use Command + F to search": "Që të kërkoni, përdorni tastet Command + F",
     "Use app": "Përdorni aplikacionin",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web në celular është eksperimental. Për një funksionim më të mirë dhe për veçoritë më të reja, përdorni aplikacionin falas, atë për platformën tuaj.",
     "Use app for a better experience": "Për një punim më të mirë, përdorni aplikacionin",
@@ -3038,13 +2578,10 @@
     "Try again": "Riprovoni",
     "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.": "I kërkuam shfletuesit të mbajë mend cilin shërbyes Home përdorni, për t’ju lënë të bëni hyrje, por për fat të keq, shfletuesi juaj e ka harruar këtë. Kaloni te faqja e hyrjeve dhe riprovoni.",
     "We couldn't log you in": "S’ju nxorëm dot nga llogaria juaj",
-    "Screens": "Ekrane",
-    "Share your screen": "Tregojuni ekranin tuaj të tjerëve",
     "Show line numbers in code blocks": "Shfaq numra rreshtat në blloqe kodi",
     "Expand code blocks by default": "Zgjeroji blloqet e kodit, si parazgjedhje",
     "Show stickers button": "Shfaq buton ngjitësish",
     "Recently visited rooms": "Dhoma të vizituara së fundi",
-    "Upgrade to pro": "Përmirësojeni me pro",
     "Minimize dialog": "Minimizoje dialogun",
     "Maximize dialog": "Zmadhoje plotësisht dialogun",
     "%(hostSignupBrand)s Setup": "Ujdisje %(hostSignupBrand)s",
@@ -3079,22 +2616,14 @@
     "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",
@@ -3102,24 +2631,9 @@
     "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ë.",
@@ -3127,9 +2641,7 @@
     "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.",
@@ -3139,19 +2651,12 @@
     "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ë",
@@ -3162,40 +2667,28 @@
     "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",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifikoni këto kredenciale për hyrje te mesazhet tuaja të fshehtëzuara dhe dëshmojuni të tjerëve se këto kredenciale hyrjeje janë vërtet tuajat.",
-    "Verify with another session": "Verifikojeni me tjetër sesion",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Do të krijojmë dhoma për çdo një prej tyre. Mund të shtoni edhe të tjera më vonë, përfshi ato ekzistueset tashmë.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Le të krijojmë një dhomë për secilën prej tyre. Mund të shtoni të tjera më vonë, përfshi ato ekzistuese tashmë.",
     "Make sure the right people have access. You can invite more later.": "Siguroni se kanë hyrje personat e duhur. Mund të shtoni të tjerë më vonë.",
     "A private space to organise your rooms": "Një hapësirë private për të sistemuar dhomat tuaja",
     "Just me": "Vetëm unë",
@@ -3206,18 +2699,12 @@
     "Private space": "Hapësirë private",
     "Public space": "Hapësirë publike",
     "<inviter/> invites you": "<inviter/> ju fton",
-    "Search names and description": "Kërkoni emra dhe përshkrim",
     "You may want to try a different search or check for typos.": "Mund të doni të provoni një tjetër kërkim ose të kontrolloni për gabime shkrimi.",
     "No results found": "S’u gjetën përfundime",
     "Mark as suggested": "Vëri shenjë si e sugjeruar",
     "Mark as not suggested": "Hiqi shenjë si e sugjeruar",
     "Removing...": "Po hiqet…",
     "Failed to remove some rooms. Try again later": "S’ua arrit të hiqen disa dhoma. Riprovoni më vonë",
-    "%(count)s rooms and 1 space|one": "%(count)s dhomë dhe 1 hapësirë",
-    "%(count)s rooms and 1 space|other": "%(count)s dhoma dhe 1 hapësirë",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s dhomë dhe %(numSpaces)s hapësira",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s dhoma dhe %(numSpaces)s hapësira",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Nëse s’gjeni dot dhomën që po kërkoni, kërkoni një ftesë ose <a>krijoni një dhomë të re</a>.",
     "Suggested": "E sugjeruar",
     "This room is suggested as a good one to join": "Kjo dhomë sugjerohet si një e mirë për të marrë pjesë",
     "%(count)s rooms|one": "%(count)s dhomë",
@@ -3230,16 +2717,12 @@
     "You're all caught up.": "Jeni në rregull.",
     "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.": "Kjo zakonisht prek vetëm mënyrën se si përpunohet dhoma te shërbyesi. Nëse keni probleme me %(brand)s-in, ju lutemi, njoftoni një të metë.",
     "Invite to %(roomName)s": "Ftojeni te %(roomName)s",
-    "Windows": "Windows",
     "Edit devices": "Përpunoni pajisje",
     "Invite People": "Ftoni Njerëz",
     "Invite with email or username": "Ftoni përmes email-i ose emri përdoruesi",
     "You can change these anytime.": "Këto mund t’i ndryshoni në çfarëdo kohe.",
     "Add some details to help people recognise it.": "Shtoni ca hollësi që të ndihmoni njerëzit ta dallojnë.",
-    "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ë.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Nga %(deviceName)s (%(deviceId)s) te %(ip)s",
     "Check your devices": "Kontrolloni pajisjet tuaja",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Në llogarinë tuaj po hyhet nga një palë kredenciale të reja: %(name)s (%(deviceID)s) te %(ip)s",
     "You have unverified logins": "Keni kredenciale të erifikuar",
     "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Pa e verifikuar, s’do të mund të hyni te krejt mesazhet tuaja dhe mund të dukeni jo i besueshëm për të tjerët.",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Verifikoni identitetin tuaj që të hyhet në mesazhe të fshehtëzuar dhe t’u provoni të tjerëve identitetin tuaj.",
@@ -3251,7 +2734,6 @@
     "Verification requested": "U kërkua verifikim",
     "Avatar": "Avatar",
     "Verify other login": "Verifikoni kredencialet e tjera për hyrje",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Nëse e bëni, ju lutemi, kini parasysh se s’do të fshihet asnjë prej mesazheve tuaja, por puna me kërkimet mund të bjerë, për ca çaste, teksa rikrijohet treguesi",
     "Consult first": "Konsultohu së pari",
     "Invited people will be able to read old messages.": "Personat e ftuar do të jenë në gjendje të lexojnë mesazhe të vjetër.",
     "We couldn't create your DM.": "S’e krijuam dot DM-në tuaj.",
@@ -3259,18 +2741,12 @@
     "Add existing rooms": "Shtoni dhoma ekzistuese",
     "%(count)s people you know have already joined|one": "%(count)s person që e njihni është bërë pjesë tashmë",
     "%(count)s people you know have already joined|other": "%(count)s persona që i njihni janë bërë pjesë tashmë",
-    "Stop & send recording": "Ndale & dërgo incizimin",
-    "Record a voice message": "Incizoni një mesazh zanor",
-    "Invite messages are hidden by default. Click to show the message.": "Mesazhet e ftesave, si parazgjedhje, janë të fshehur. Klikoni që të shfaqet mesazhi.",
     "Quick actions": "Veprime të shpejta",
     "Invite to just this room": "Ftoje thjesht te kjo dhomë",
     "Warn before quitting": "Sinjalizo përpara daljes",
-    "Message search initilisation failed": "Dështoi gatitje kërkimi mesazhesh",
     "Manage & explore rooms": "Administroni & eksploroni dhoma",
     "unknown person": "person i panjohur",
     "Sends the given message as a spoiler": "E dërgon mesazhin e dhënë si <em>spoiler</em>",
-    "Share decryption keys for room history when inviting users": "Ndani me përdorues kyçe shfshehtëzimi, kur ftohen përdorues",
-    "Send and receive voice messages (in development)": "Dërgoni dhe merrni mesazhe zanorë (në zhvillim)",
     "%(deviceId)s from %(ip)s": "%(deviceId)s prej %(ip)s",
     "Review to ensure your account is safe": "Shqyrtojeni për t’u siguruar se llogaria është e parrezik",
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Jeni i vetmi person këtu. Nëse e braktisni, askush s’do të jetë në gjendje të hyjë në të ardhmen, përfshi ju.",
@@ -3299,20 +2775,14 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Zgjidhni dhoma ose biseda që të shtohen. Kjo është thjesht një hapësirë për ju, s’do ta dijë kush tjetër. Mund të shtoni të tjerë më vonë.",
     "What do you want to organise?": "Ç’doni të sistemoni?",
     "Filter all spaces": "Filtro krejt hapësirat",
-    "Delete recording": "Fshije regjistrimin",
-    "Stop the recording": "Ndale regjistrimin",
     "%(count)s results in all spaces|one": "%(count)s përfundim në krejt hapësirat",
     "%(count)s results in all spaces|other": "%(count)s përfundime në krejt hapësirat",
     "You have no ignored users.": "S’keni përdorues të shpërfillur.",
     "Play": "Luaje",
     "Pause": "Ndalesë",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Kjo është një veçori eksperimentale.</b> Hëpërhë, përdoruesve të rinj që marrin një ftesë, do t’u duhet ta hapin ftesën në <link/>, që të marrin pjesë.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "Për të hyrë në %(spaceName)s, aktivizoni <a>beta-n për Hapësira</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "Për të parë %(spaceName)s, aktivizoni <a>beta-n për Hapësira</a>",
-    "Spaces are a beta feature.": "Hapësirat janë një veçori në version beta.",
     "Search names and descriptions": "Kërko te emra dhe përshkrime",
     "Select a room below first": "Së pari, përzgjidhni më poshtë një dhomë",
-    "Communities are changing to Spaces": "Bashkësitë po ndryshojnë në Hapësira",
     "Join the beta": "Merrni pjesë te beta",
     "Leave the beta": "Braktiseni beta-n",
     "Beta": "Beta",
@@ -3323,13 +2793,10 @@
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Platforma dhe emri juaj i përdoruesit do të mbahen shënim, për të na ndihmuar t’i përdorim përshtypjet tuaja sa më shumë që të mundemi.",
     "%(featureName)s beta feedback": "Përshtypje për beta %(featureName)s",
     "Thank you for your feedback, we really appreciate it.": "Faleminderit për përshtypjet tuaja, vërtet e çmojmë.",
-    "Beta feedback": "Përshtypje për versionin Beta",
     "Want to add a new room instead?": "Doni të shtohet një dhomë e re, në vend të kësaj?",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Po shtohet dhomë…",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Po shtohen dhoma… (%(progress)s nga %(count)s)",
     "Not all selected were added": "S’u shtuan të gjithë të përzgjedhurit",
-    "You can add existing spaces to a space.": "Mund të shtoni hapësira ekzistuese te një hapësirë.",
-    "Feeling experimental?": "Ndiheni eksperimentues?",
     "You are not allowed to view this server's rooms list": "S’keni leje të shihni listën e dhomave të këtij shërbyesi",
     "Zoom in": "Zmadhoje",
     "Zoom out": "Zvogëloje",
@@ -3343,23 +2810,356 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Ndiheni eksperimentues? Laboratorët janë rruga më e mirë për t’u marrë herët me gjërat, për të provuar veçori të reja dhe për të ndihmuar t’u jepet formë atyre, përpara se të hidhen faktikisht në qarkullim. <a>Mësoni më tepër</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "Tokeni-i juaj i hyrjeve jep hyrje të plotë në llogarinë tuaj. Mos ia jepni kujt.",
     "Access Token": "Token Hyrjesh",
-    "Spaces are a new way 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ë.",
     "Please enter a name for the space": "Ju lutemi, jepni një emër për hapësirën",
     "Connecting": "Po lidhet",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Lejo Tek-për-Tek për thirrje 1:1 (nëse e aktivizoni këtë, pala tjetër mund të jetë në gjendje të shohë adresën tuaj IP)",
-    "New spinner design": "Rrotullues i ri",
-    "Send and receive voice messages": "Dërgoni dhe merrni mesazhe zanorë",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Përshtypjet tuaja do t’i bëjnë hapësirat më të mira. Sa më shumë hollësi që të jepni, aq më mirë.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta e gatshme për web, desktop dhe Android. Disa veçori mund të mos jenë të përdorshme në shërbyesin tuaj Home.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Beta-n mund ta braktisni në çfarëdo kohe, që nga rregullimet, ose duke prekur një stemë beta, si ajo më sipër.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s do të ringarkohet me Hapësirat të aktivizuara. Bashkësitë dhe etiketat vetjake do të jenë të fshehura.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta e gatshme për web, desktop dhe Android. Faleminderit që provoni beta-n.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Nëse ikni, %(brand)s-i do të ringarkohet me Hapësira të çaktivizuara. Bashkësitë dhe etiketat vetjake do të jenë sërish të dukshme.",
     "Spaces are a new way to group rooms and people.": "Hapësirat janë një rrugë e re për të grupuar dhoma dhe njerëz.",
     "Message search initialisation failed": "Dështoi gatitje kërkimi mesazhesh",
     "Go to my space": "Kalo te hapësira ime",
     "sends space invaders": "dërgon pushtues hapësire",
     "Sends the given message with a space themed effect": "E dërgon mesazhin e dhënë me një efekt teme hapësinore",
     "See when people join, leave, or are invited to your active room": "Shihni kur persona vijnë, ikin ose janë ftuar në dhomën tuaj aktive",
-    "See when people join, leave, or are invited to this room": "Shihni kur persona vijnë, ikin ose janë ftuar në këtë dhomë"
+    "See when people join, leave, or are invited to this room": "Shihni kur persona vijnë, ikin ose janë ftuar në këtë dhomë",
+    "Space Autocomplete": "Vetëplotësim Hapësire",
+    "Currently joining %(count)s rooms|one": "Aktualisht duke hyrë në %(count)s dhomë",
+    "Currently joining %(count)s rooms|other": "Aktualisht duke hyrë në %(count)s dhoma",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Provoni fjalë të ndryshme, ose kontrolloni për gabime shkrimi. Disa përfundime mund të mos jenë të dukshme, ngaqë janë private dhe ju duhet një ftesë për të marrë pjesë në to.",
+    "No results for \"%(query)s\"": "S’ka përfundime për \"%(query)s\"",
+    "The user you called is busy.": "Përdoruesi që thirrët është i zënë.",
+    "User Busy": "Përdoruesi Është i Zënë",
+    "Kick, ban, or invite people to your active room, and make you leave": "Përzini, dëboni, ose ftoni persona te dhoma juaj aktive, dhe bëni largimin tuaj",
+    "Kick, ban, or invite people to this room, and make you leave": "Përzini, dëboni, ose ftoni persona në këtë dhomë, dhe bëni largimin tuaj",
+    "Teammates might not be able to view or join any private rooms you make.": "Anëtarët e ekipit mund të mos jenë në gjendje të shohin ose hyjnë në çfarëdo dhome private që krijoni.",
+    "Or send invite link": "Ose dërgoni një lidhje ftese",
+    "If you can't see who you’re looking for, send them your invite link below.": "Nëse s’e shihni atë që po kërkoni, dërgojini nga më poshtë një lidhje ftese.",
+    "Some suggestions may be hidden for privacy.": "Disa sugjerime mund të jenë fshehur, për arsye privatësie.",
+    "Search for rooms or people": "Kërkoni për dhoma ose persona",
+    "Forward message": "Përcille mesazhin",
+    "Open link": "Hape lidhjen",
+    "You don't have permission to do this": "S’keni leje ta bëni këtë",
+    "Error - Mixed content": "Gabim - Lëndë e përzierë",
+    "Error loading Widget": "Gabim në ngarkim Widget-i",
+    "Pinned messages": "Mesazhe të fiksuar",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Nëse keni leje, hapni menunë për çfarëdo mesazhi dhe përzgjidhni <b>Fiksoje</b>, për ta ngjitur këtu.",
+    "Nothing pinned, yet": "Ende pa fiksuar gjë",
+    "End-to-end encryption isn't enabled": "Fshehtëzimi skaj-më-skaj s’është i aktivizuar",
+    "Sound on": "Me zë",
+    "[number]": "[numër]",
+    "To view %(spaceName)s, you need an invite": "Që të shihni %(spaceName)s, ju duhet një ftesë",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Për të parë vetëm dhomat dhe personat e përshoqëruar asaj bashkësie, mund të klikoni në çfarëdo kohe mbi një avatar te paneli i filtrimeve.",
+    "Move down": "Zbrite",
+    "Move up": "Ngjite",
+    "Report": "Raportoje",
+    "Collapse reply thread": "Tkurre rrjedhën e përgjigjeve",
+    "Show preview": "Shfaq paraparje",
+    "View source": "Shihni burimin",
+    "Settings - %(spaceName)s": "Rregullime - %(spaceName)s",
+    "Report the entire room": "Raporto krejt dhomën",
+    "Spam or propaganda": "Mesazh i padëshiruar ose propagandë",
+    "Illegal Content": "Lëndë e Paligjshme",
+    "Toxic Behaviour": "Sjellje Toksike",
+    "Disagree": "S’pajtohem",
+    "Please pick a nature and describe what makes this message abusive.": "Ju lutemi, zgjidhni një karakterizim dhe përshkruani se ç’e bën këtë mesazh abuziv.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Çfarëdo arsye tjetër. Ju lutemi, përshkruani problemin.\nKjo do t’u raportohet moderatorëve të dhomës.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Kjo dhomë merret me lëndë të paligjshme ose toksike, ose moderatorët nuk moderojnë lëndë të paligjshme ose toksike.\nKjo do t’u njoftohet përgjegjësve të %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Kjo dhomë merret me lëndë të paligjshme ose toksike, ose moderatorët nuk moderojnë lëndë të paligjshme ose toksike.\nKjo do t’u njoftohet përgjegjësve të %(homeserver)s. Përgjegjësit NUK do të jenë në gjendje të lexojnë lëndë të fshehtëzuar të kësaj dhome.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Ky përdorues dërgon në dhomë reklama të padëshiruara, lidhje për te reklama të tilla ose te propagandë e padëshiruar.\nKjo do t’u njoftohet përgjegjësve të dhomës.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Ky përdorues shfaq sjellje të paligjshme, bie fjala, duke zbuluar identitet personash ose duke kërcënuar me dhunë.\nKjo do t’u njoftohet përgjegjësve të dhomës, të cilët mund ta përshkallëzojnë punën drejt autoriteteve ligjore.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Ky përdorues shfaq sjellje të paligjshme, bie fjala, duke fyer përdorues të tjerë ose duke dhënë lëndë vetëm për të rritur në një dhomë të menduar për familje, ose duke shkelur në mënyra të tjera rregullat e kësaj dhome.\nKjo do t’u njoftohet përgjegjësve të dhomës.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Ajo ç’shkruan ky përdorues është gabim.\nKjo do t’u njoftohet përgjegjësve të dhomës.",
+    "Please provide an address": "Ju lutemi, jepni një adresë",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sndryshoi ACL-ra shërbyesi",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sndryshoi ACL-ra shërbyesi %(count)s herë",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sndryshuan ACL-ra shërbyesi",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sndryshuan ACL-ra shërbyesi %(count)s herë",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Dështoi gatitja e kërkimit në mesazhe, për më tepër hollësi, shihni <a>rregullimet tuaja</a>",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Caktoni adresa për këtë hapësirë, që kështu përdoruesit të gjejnë këtë dhomë përmes shërbyesit tuaj Home (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "Që të bëni publike një adresë, lypset të ujdiset së pari si një adresë vendore.",
+    "Published addresses can be used by anyone on any server to join your room.": "Adresat e publikuara mund të përdoren nga cilido, në cilindo shërbyes, për të hyrë në dhomën tuaj.",
+    "Published addresses can be used by anyone on any server to join your space.": "Adresat e publikuara mund të përdoren nga cilido, në cilindo shërbyes, për të hyrë në hapësirën tuaj.",
+    "This space has no local addresses": "Kjo hapësirë s’ka adresa vendore",
+    "Space information": "Hollësi hapësire",
+    "Collapse": "Tkurre",
+    "Expand": "Zgjeroje",
+    "Recommended for public spaces.": "E rekomanduar për hapësira publike.",
+    "Allow people to preview your space before they join.": "Lejojini personat të parashohin hapësirën tuaj para se të hyjnë në të.",
+    "Preview Space": "Parashiheni Hapësirën",
+    "Decide who can view and join %(spaceName)s.": "Vendosni se cilët mund të shohin dhe marrin pjesë te %(spaceName)s.",
+    "Visibility": "Dukshmëri",
+    "This may be useful for public spaces.": "Kjo mund të jetë e dobishme për hapësira publike.",
+    "Guests can join a space without having an account.": "Mysafirët mund të hyjnë në një hapësirë pa pasur llogari.",
+    "Enable guest access": "Lejo hyrje si vizitor",
+    "Failed to update the history visibility of this space": "S’arrihet të përditësohet dukshmëria e historikut të kësaj hapësire",
+    "Failed to update the guest access of this space": "S’arrihet të përditësohet hyrja e mysafirëve të kësaj hapësire",
+    "Failed to update the visibility of this space": "S’arrihet të përditësohet dukshmëria e kësaj hapësire",
+    "Address": "Adresë",
+    "e.g. my-space": "p.sh., hapësira-ime",
+    "Silence call": "Heshtoje thirrjen",
+    "Show all rooms in Home": "Shfaq krejt dhomat te Home",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototip “Njoftojuani moderatorëve”. Në dhoma që mbulojnë moderim, butoni `raportojeni` do t’ju lejojë t’u njoftoni abuzim moderatorëve të dhomës",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s ndryshoi <a>mesazhin e fiksuar</a> për këtë dhomë.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s përzuri %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s përzuri %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s tërhoqi mbrapsht ftesën për %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s tërhoqi mbrapsht ftesën për %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s hoqi dëbimin për %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s doli nga dhoma",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s doli nga dhoma: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s hodhi tej ftesën",
+    "%(targetName)s joined the room": "%(targetName)s hyri në dhomë",
+    "%(senderName)s made no change": "%(senderName)s s’bëri ndryshime",
+    "%(senderName)s set a profile picture": "%(senderName)s caktoi një foto profili",
+    "%(senderName)s changed their profile picture": "%(senderName)s ndryshoi foton e vet të profilit",
+    "%(senderName)s removed their profile picture": "%(senderName)s hoqi foton e vet të profilit",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s hoqi emrin e vet në ekran (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s caktoi për veten emër ekrani %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s ndryshoi emrin e vet në ekran si %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s dëboi %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s dëboi %(targetName)s: %(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s pranoi një ftesë",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s pranoi ftesën për %(displayName)s",
+    "Some invites couldn't be sent": "S’u dërguan dot disa nga ftesat",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "I dërguam të tjerat, por personat më poshtë s’u ftuan dot te <RoomName/>",
+    "Unnamed audio": "Audio pa emër",
+    "Forward": "Përcille",
+    "Sent": "U dërgua",
+    "Error processing audio message": "Gabim në përpunim mesazhi audio",
+    "Show %(count)s other previews|one": "Shfaq %(count)s paraparje tjetër",
+    "Show %(count)s other previews|other": "Shfaq %(count)s paraparje të tjera",
+    "Images, GIFs and videos": "Figura, GIF-e dhe video",
+    "Code blocks": "Blloqe kodi",
+    "To view all keyboard shortcuts, click here.": "Që të shihni krejt shkurtoret e tastierës, klikoni këtu.",
+    "Keyboard shortcuts": "Shkurtore tastiere",
+    "Use Ctrl + F to search timeline": "Përdorni Ctrl + F që të kërkohet te rrjedha kohore",
+    "Use Command + F to search timeline": "Përdorni Command + F që të kërkohet te rrjedha kohore",
+    "User %(userId)s is already invited to the room": "Përdoruesi %(userId)s është ftuar tashmë te dhoma",
+    "Integration manager": "Përgjegjës integrimesh",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s-i juaj nuk ju lejon të përdorni një përgjegjës integrimesh për të bërë këtë. Ju lutemi, lidhuni me përgjegjësin.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash <helpIcon /> me %(widgetDomain)s & përgjegjësin tuaj të integrimeve.",
+    "Identity server is": "Shërbyes identitetesh është",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Përgjegjësit e integrimeve marrin të dhëna formësimi, dhe mund të ndryshojnë widget-e, të dërgojnë ftesa dhome, dhe të caktojnë shkallë pushteti në emër tuajin.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Përdorni një përgjegjës integrimesh që të administroni robotë, widget-e dhe paketa ngjitësish.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Përdorni një përgjegjës integrimesh <b>(%(serverName)s)</b> që të administroni robotë, widget-e dhe paketa ngjitësish.",
+    "Identity server": "Shërbyes identitetesh",
+    "Identity server (%(server)s)": "Shërbyes identitetesh (%(server)s)",
+    "Could not connect to identity server": "S’u lidh dot te shërbyes identitetesh",
+    "Not a valid identity server (status code %(code)s)": "Shërbyes identitetesh i pavlefshëm (kod gjendjeje %(code)s)",
+    "Identity server URL must be HTTPS": "URL-ja e shërbyesit të identiteteve duhet të jetë HTTPS",
+    "Unable to transfer call": "S’arrihet të shpërngulet thirrje",
+    "Unable to copy a link to the room to the clipboard.": "S’arrihet të kopjohet në të papastër një lidhje për te dhoma.",
+    "Unable to copy room link": "S’arrihet të kopjohet lidhja e dhomës",
+    "User Directory": "Drejtori Përdoruesi",
+    "Displaying time": "Kohë shfaqjeje",
+    "There was an error loading your notification settings.": "Pati një gabim në ngarkimin e rregullimeve tuaja për njoftimet.",
+    "Mentions & keywords": "Përmendje & fjalëkyçe",
+    "Global": "Global",
+    "New keyword": "Fjalëkyç i ri",
+    "Keyword": "Fjalëkyç",
+    "Enable email notifications for %(email)s": "Aktivizo njoftime me email për %(email)s",
+    "Enable for this account": "Aktivizoje për këtë llogari",
+    "An error occurred whilst saving your notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftimet.",
+    "Error saving notification preferences": "Gabim në ruajtje parapëlqimesh për njoftimet",
+    "Messages containing keywords": "Mesazhe që përmbajnë fjalëkyçe",
+    "Transfer Failed": "Shpërngulja Dështoi",
+    "Copy Room Link": "Kopjo Lidhje Dhome",
+    "Message bubbles": "Flluska mesazhesh",
+    "IRC": "IRC",
+    "New layout switcher (with message bubbles)": "Këmbyes i ri skemash (me flluska mesazhesh)",
+    "The call is in an unknown state!": "Thirrja gjendet në një gjendje të panjohur!",
+    "Call back": "Thirreni ju",
+    "No answer": "S’ka përgjigje",
+    "An unknown error occurred": "Ndodhi një gabim i panjohur",
+    "Their device couldn't start the camera or microphone": "Pajisja e tyre s’nisi dot kamerën ose mikrofonin",
+    "Connection failed": "Lidhja dështoi",
+    "Could not connect media": "S’u lidh dot me median",
+    "Error downloading audio": "Gabim në shkarkim audioje",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Ju lutemi, kini parasysh se përmirësimi do të prodhojë një version të ri të dhomës</b>. Krejt mesazhet e tanishëm do të mbeten në këtë dhomë të arkivuar.",
+    "Automatically invite members from this room to the new one": "Fto automatikisht anëtarë prej kësaj dhome te e reja",
+    "These are likely ones other room admins are a part of.": "Këto ka shumë mundësi të jetë ato ku përgjegjës të tjerë dhomash janë pjesë.",
+    "Other spaces or rooms you might not know": "Hapësira ose dhoma të tjera që mund të mos i dini",
+    "Spaces you know that contain this room": "Hapësira që e dini se përmbajnë këtë dhomë",
+    "Search spaces": "Kërkoni në hapësira",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Vendosni se prej cilave hapësira mund të hyhet në këtë dhomë. Nëse përzgjidhet një hapësirë, anëtarët e saj do të mund ta gjejnë dhe hyjnë te <RoomName/>.",
+    "Select spaces": "Përzgjidhni hapësira",
+    "Room visibility": "Dukshmëri dhome",
+    "Visible to space members": "I dukshëm për anëtarë të hapësirë",
+    "Public room": "Dhomë publike",
+    "Private room (invite only)": "Dhomë private (vetëm me ftesa)",
+    "Create a room": "Krijoni një dhomë",
+    "Only people invited will be able to find and join this room.": "Vetëm personat e ftuar do të jenë në gjendje ta gjejnë dhe hyjnë në këtë dhomë.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Cilido do të jetë në gjendje të gjejë dhe hyjë në këtë dhomë, jo thjesht vetëm anëtarët e <SpaceName/>.",
+    "You can change this at any time from room settings.": "Këtë mund ta ndryshoni kurdo, që nga rregullimet e dhomës.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Cilido te <SpaceName/> do të jetë në gjendje të gjejë dhe hyjë në këtë dhomë.",
+    "Image": "Figurë",
+    "Sticker": "Ngjitës",
+    "Access": "Hyrje",
+    "People with supported clients will be able to join the room without having a registered account.": "Persona me klientë të mbuluar do të jenë në gjendje të hyjnë te dhoma pa pasur ndonjë llogari të regjistruar.",
+    "Decide who can join %(roomName)s.": "Vendosni se cilët mund të hyjnë te %(roomName)s.",
+    "Space members": "Anëtarë hapësire",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Mund të përzgjidhni një hapësirë që mund të gjejë dhe hyjë. Mund të përzgjidhni disa hapësira.",
+    "Spaces with access": "Hapësira me hyrje",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Cilido në një hapësirë mund ta gjejë dhe hyjë. <a>Përpunoni se cilat hapësira kanë hyrje këtu.</a>",
+    "Currently, %(count)s spaces have access|other": "Deri tani, %(count)s hapësira kanë hyrje",
+    "& %(count)s more|other": "& %(count)s më tepër",
+    "Upgrade required": "Lypset domosdo përmirësim",
+    "Anyone can find and join.": "Kushdo mund ta gjejë dhe hyjë në të.",
+    "Only invited people can join.": "Vetëm personat e ftuar mund të hyjnë.",
+    "Private (invite only)": "Private (vetëm me ftesa)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Ky përmirësim do t’u lejojë anëtarëve të hapësirave të përzgjedhura të hyjnë në këtë dhomë pa ndonjë ftesë.",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Kjo e bën të lehtë mbajtjen private të dhomave në një hapësirë, ndërkohë që u lejon njerëzve në hapësirë të gjejnë dhe hyjnë në të tilla. Krejt dhomat e reja në një hapësirë do ta ofrojnë këtë mundësi.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Që të ndihmoni anëtarë hapësirash të gjejnë dhe hyjnë në një dhomë private, kaloni te rregullimet e Sigurisë & Privatësisë së dhomës.",
+    "Help space members find private rooms": "Ndihmoni anëtarë hapësirash të gjejnë dhoma private",
+    "Help people in spaces to find and join private rooms": "Ndihmoni persona në hapësira të gjejnë dhe hyjnë në dhoma private",
+    "New in the Spaces beta": "E re në Hapësira beta",
+    "You're removing all spaces. Access will default to invite only": "Po hiqni krejt hapësirat. Hyrja do të kthehet te parazgjedhja, pra vetëm me ftesa",
+    "Anyone will be able to find and join this room.": "Gjithkush do të jetë në gjendje të gjejë dhe hyjë në këtë dhomë.",
+    "Share content": "Ndani lëndë",
+    "Application window": "Dritare aplikacioni",
+    "Share entire screen": "Nda krejt ekranin",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Tani mund t’u tregoni të tjerëve ekranin tuaj duke shtypur butonin “ndarje ekrani” gjatë thirrjes. Këtë mund ta bëni edhe në thirrje audio, nëse mbulohet nga të dy palët!",
+    "Screen sharing is here!": "Ndarja e ekranit me të tjerë erdhi!",
+    "Your camera is still enabled": "Kamera juaj është ende e aktivizuar",
+    "Your camera is turned off": "Kamera juaj është e fikur",
+    "%(sharerName)s is presenting": "%(sharerName)s përfaqëson",
+    "You are presenting": "Përfaqësoni",
+    "We're working on this, but just want to let you know.": "Po merremi me këtë, thjesht donim t’jua u bënim të ditur.",
+    "Search for rooms or spaces": "Kërkoni për dhoma ose hapësira",
+    "Add space": "Shtoni hapësirë",
+    "Leave %(spaceName)s": "Braktise %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Jeni përgjegjësi i vetëm i disa dhomave apo hapësirave që dëshironi t’i braktisni. Braktisja e tyre do t’i lërë pa ndonjë përgjegjës.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Jeni përgjegjësi i vetëm i kësaj hapësire. Braktisja e saj do të thotë se askush s’ka kontroll mbi të.",
+    "You won't be able to rejoin unless you are re-invited.": "S’do të jeni në gjendje të rihyni, para se të riftoheni.",
+    "Search %(spaceName)s": "Kërko te %(spaceName)s",
+    "Want to add an existing space instead?": "Në vend të kësaj, mos dëshironi të shtoni një hapësirë ekzistuese?",
+    "Private space (invite only)": "Hapësirë private (vetëm me ftesa)",
+    "Space visibility": "Dukshmëri hapësire",
+    "Add a space to a space you manage.": "Shtoni një hapësirë te një hapësirë që administroni.",
+    "Only people invited will be able to find and join this space.": "Vetëm personat e ftuar do të jenë në gjendje të gjejnë dhe hyjnë në këtë hapësirë.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Cilido do të jetë në gjendje ta gjejë dhe hyjë në këtë hapësirë, jo thjesht anëtarët e <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Cilido te <SpaceName/> do të jetë në gjendje ta gjejë dhe hyjë.",
+    "Adding spaces has moved.": "Shtimi i hapësirave është lëvizur.",
+    "Search for rooms": "Kërkoni për dhoma",
+    "Search for spaces": "Kërkoni për hapësira",
+    "Create a new space": "Krijoni një hapësirë të re",
+    "Want to add a new space instead?": "Në vend të kësaj, doni të shtoni një hapësirë të re?",
+    "Add existing space": "Shtoni hapësirë ekzistuese",
+    "Decrypting": "Po shfshehtëzohet",
+    "Show all rooms": "Shfaq krejt dhomat",
+    "Give feedback.": "Jepni përshtypjet.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Faleminderit që provoni Hapësirat. Përshtypjet tuaja do të ndihmojnë përmirësimin e versioneve të ardhshëm.",
+    "Spaces feedback": "Përshtypje mbi hapësirat",
+    "Spaces are a new feature.": "Hapësirat janë një veçori e re.",
+    "All rooms you're in will appear in Home.": "Krejt dhomat ku gjendeni, do të shfaqen te Home.",
+    "Send pseudonymous analytics data": "Dërgo të dhëna analitike pseudonimike",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën %(count)s herë.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)sndryshuan <a>mesazhet e fiksuara</a> për dhomën %(count)s herë.",
+    "Missed call": "Thirrje e humbur",
+    "Call declined": "Thirrja u hodh poshtë",
+    "Stop recording": "Ndale regjistrimin",
+    "Send voice message": "Dërgoni mesazh zanor",
+    "Olm version:": "Version Olm:",
+    "Mute the microphone": "Heshto mikrofonin",
+    "Unmute the microphone": "Hiq heshtimin e mikrofonit",
+    "More": "Më tepër",
+    "Show sidebar": "Shfaqe anështyllën",
+    "Hide sidebar": "Fshihe anështyllën",
+    "Start sharing your screen": "Nisni ndarjen e ekranit tuaj",
+    "Stop sharing your screen": "Reshtni dhënien e ekranit tuaj",
+    "Stop the camera": "Ndale kamerën",
+    "Start the camera": "Nise kamerën",
+    "Surround selected text when typing special characters": "Rrethoje tekstin e përzgjedhur, kur shtypen shenja speciale",
+    "Created from <Community />": "Krijuar prej <Community />",
+    "Communities won't receive further updates.": "Për bashkësitë s’do të ketë përditësime të mëtejshme.",
+    "Spaces are a new way to make a community, with new features coming.": "Hapësirat janë një rrugë e re për të krijuar një bashkësi, me veçori të reja së afërmi.",
+    "Communities can now be made into Spaces": "Tanimë bashkësitë mund të shndërrohen në Hapësira",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Kërkojini <a>përgjegjësve</a> të kësaj bashkësie ta shndërrojnë në një Hapësirë dhe hapni sytë për ftesën.",
+    "You can create a Space from this community <a>here</a>.": "<a>Këtu</a> mund të krijoni një Hapësirë prej kësaj bashkësie.",
+    "This description will be shown to people when they view your space": "Ky përshkrim do t’u tregohet personave kur shohin hapësirën tuaj",
+    "All rooms will be added and all community members will be invited.": "Do të shtohen krejt dhomat dhe do të ftohen krejt anëtarët e bashkësisë.",
+    "A link to the Space will be put in your community description.": "Një lidhje për te Hapësira do të vendoset te përshkrimi i bashkësisë tuaj.",
+    "Create Space from community": "Krijo Hapësirë prej bashkësie",
+    "Failed to migrate community": "S’u arrit të migrohej bashkësia",
+    "To create a Space from another community, just pick the community in Preferences.": "Që të krijoni një Hapësirë prej një bashkësie tjetër, thjesht zgjidhni bashkësinë te Parapëlqimet.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> është krijuar dhe cilido që qe pjesë e bashkësisë është ftuar në të.",
+    "Space created": "Hapësira u krijua",
+    "To view Spaces, hide communities in <a>Preferences</a>": "Që të shihni Hapësira, fshini bashkësitë te <a>Parapëlqime</a>",
+    "This community has been upgraded into a Space": "Kjo bashkësi është përmirësuar në një Hapësirë",
+    "If a community isn't shown you may not have permission to convert it.": "Nëse një bashkësi s’është shfaqur, mund të mos keni leje për ta shndërruar atë.",
+    "Show my Communities": "Shfaqi Bashkësitë e mia",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Bashkësitë janë arkivuar, për t’ua lënë vendin Hapësirave, por mundeni, më poshtë, të shndërroni bashkësitë tuaja në Hapësira. Shndërrimi do të garantojë që bisedat tuaja të marrin veçoritë më të reja.",
+    "Create Space": "Krijo Hapësirë",
+    "Open Space": "Hap Hapësirë",
+    "You can change this later.": "Këtë mund ta ndryshoni më vonë.",
+    "What kind of Space do you want to create?": "Ç’lloj Hapësire doni të krijoni?",
+    "Delete avatar": "Fshije avatarin",
+    "Don't send read receipts": "Mos dërgo dëftesa leximi",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Regjistrat e diagnostikimit përmbajnë të dhëna mbi përdorimin e aplikacionit, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar, me cilat elemente të UI-t keni ndërvepruar së fundi, dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhe.",
+    "Unknown failure: %(reason)s": "Dështim për arsye të panjohur: %(reason)s",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Nëse keni parashtruar një të metë përmes GitHub-it, regjistrat e diagnostikimit mund të na ndihmojnë të zbulojmë problemin. Regjistrat e diagnostikimit përmbajnë të dhëna mbi përdorimin e aplikacionit, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar, me cilat elemente të UI-t keni ndërvepruar së fundi, dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhe.",
+    "Enable encryption in settings.": "Aktivizoni fshehtëzimin te rregullimet.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Mesazhet tuaja private normalisht fshehtëzohen, por kjo dhomë s’fshehtëzohet. Zakonisht kjo vjen për shkak të përdorimit të një pajisjeje ose metode të pambuluar, bie fjala, ftesa me email.",
+    "Cross-signing is ready but keys are not backed up.": "“Cross-signing” është gati, por kyçet s’janë koperuajtur.",
+    "Rooms and spaces": "Dhoma dhe hapësira",
+    "Results": "Përfundime",
+    "Are you sure you want to add encryption to this public room?": "A jeni i sigurt se doni të shtohet fshehtëzim në këtë dhomë publike?",
+    "Thumbs up": "",
+    "Remain on your screen while running": "Rrini në ekran për deri sa është hapur",
+    "Remain on your screen when viewing another room, when running": "Të mbesë në ekranin tuaj, kur shihet një tjetër dhomë dhe widget-i është në punë",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nuk rekomandohet të bëhen publike dhoma të fshehtëzuara.</b> Kjo do të thoshte se cilido mund të gjejë dhe hyjë te dhoma, pra cilido mund të lexojë mesazhet. S’do të përfitoni asnjë nga të mirat e fshehtëzimit. Fshehtëzimi i mesazheve në një dhomë publike do ta ngadalësojë marrjen dhe dërgimin e tyre.",
+    "Are you sure you want to make this encrypted room public?": "Jeni i sigurt se doni ta bëni publike këtë dhomë të fshehtëzuar?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Për të shmangur këto probleme, krijoni një <a>dhomë të re të fshehtëzuar</a> për bisedën që keni në plan të bëni.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nuk rekomandohet të shtohet fshehtëzim në dhoma publike.</b>Dhomat publike mund t’i gjejë dhe hyjë në to kushdo, që cilido të mund të lexojë mesazhet në to. S’do të përfitoni asnjë nga të mirat e fshehtëzimit, dhe s’do të jeni në gjendje ta çaktivizoni më vonë. Fshehtëzimi i mesazheve në një dhomë publike do të ngadalësojë marrjen dhe dërgimin e mesazheve.",
+    "Thread": "Rrjedhë",
+    "Show threads": "Shfaq rrjedha",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Për të shmangur këto probleme, krijoni për bisedën që keni në plan një <a>dhomë të re publike</a>.",
+    "Low bandwidth mode (requires compatible homeserver)": "Mënyra trafik me shpejtësi të ulët (lyp shërbyes Home të përputhshëm)",
+    "Multiple integration managers (requires manual setup)": "Përgjegjës të shumtë integrimi (lyp ujdisje dorazi)",
+    "Threaded messaging": "Mesazhe me rrjedha",
+    "The above, but in <Room /> as well": "Atë më sipër, por edhe te <Room />",
+    "The above, but in any room you are joined or invited to as well": "Atë më sipër, por edhe në çfarëdo dhome ku keni hyrë ose jeni ftuar",
+    "Autoplay videos": "Vetëluaji videot",
+    "Autoplay GIFs": "Vetëluaji GIF-et",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s hoqi fiksimin e një mesazhi nga kjo dhomë. Shihni krejt mesazhet e fiksuar.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s hoqi fiksimin e <a>një mesazhi</a> nga kjo dhomë. Shihni krejt <b>mesazhet e fiksuar</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fiksoi një mesazh te kjo dhomë. Shihni krejt mesazhet e fiksuar.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fiksoi <a>një mesazh</a> te kjo dhomë. Shini krejt <b>mesazhet e fiksuar</b>.",
+    "Some encryption parameters have been changed.": "Janë ndryshuar disa parametra fshehtëzimi.",
+    "Role in <RoomName/>": "Rol në <RoomName/>",
+    "Currently, %(count)s spaces have access|one": "Aktualisht një hapësirë ka hyrje",
+    "& %(count)s more|one": "& %(count)s më tepër",
+    "Explore %(spaceName)s": "Eksploroni %(spaceName)s",
+    "Send a sticker": "Dërgoni një ngjitës",
+    "Reply to thread…": "Përgjigjuni te rrjedhë…",
+    "Reply to encrypted thread…": "Përgjigjuni te rrjedhë e fshehtëzuar…",
+    "Add emoji": "Shtoni emoji",
+    "Unknown failure": "Dështim i panjohur",
+    "Failed to update the join rules": "S’u arrit të përditësohen rregulla hyrjeje",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Cilido te <spaceName/> mund ta gjejë dhe hyjë në të. Mund të përzgjidhni gjithashtu hapësira të tjera.",
+    "Select the roles required to change various parts of the space": "Përzgjidhni rolet e domosdoshëm për të ndryshuar pjesë të ndryshme të hapësirës",
+    "Change description": "Ndryshoni përshkrimin",
+    "Change main address for the space": "Ndryshoni adresë kryesore për hapësirën",
+    "Change space name": "Ndryshoni emër hapësire",
+    "Change space avatar": "Ndryshoni avatar hapësire",
+    "To join this Space, hide communities in your <a>preferences</a>": "Që të hyni te kjo Hapësirë, fshihni bashkësitë te <a>parapëlqimet</a> tuaja",
+    "To view this Space, hide communities in your <a>preferences</a>": "Që të shihni këtë Hapësirë, fshihni bashkësitë te <a>parapëlqimet</a> tuaja",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Që të hyni te %(communityName)s, kaloni te bashkësitë, që nga <a>parapëlqimet</a> tuaja",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Që të shihni %(communityName)s, kaloni te bashkësitë, që nga <a>parapëlqimet</a> tuaja",
+    "Private community": "Bashkësi private",
+    "Public community": "Bashkësi publike",
+    "Message": "Mesazh",
+    "Message didn't send. Click for info.": "Mesazhi s’u dërgua. Klikoni për hollësi.",
+    "Upgrade anyway": "Përmirësoje, sido qoftë",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Kjo dhomë gjendet në disa hapësira për të cilat nuk jeni një nga përgjegjësit. Në këto hapësira, dhoma e vjetër prapë do të shfaqet, por njerëzve do t’u kërkohet të marrin pjesë te e reja.",
+    "Before you upgrade": "Para se të përmirësoni",
+    "To join a space you'll need an invite.": "Që të hyni në një hapësirë, do t’ju duhet një ftesë.",
+    "You can also make Spaces from <a>communities</a>.": "Mundeni edhe të krijoni Hapësira që nga <a>bashkësitë</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Për këtë sesion shfaq përkohësisht bashkësi, në vend se Hapësira. Mbulimi i kësaj do të hiqet në të ardhmen e afërt. Kjo do të sjellë ringarkim të Element-it.",
+    "Display Communities instead of Spaces": "Shfaq Bashkësi, në vend se Hapësira",
+    "Joining space …": "Po hyhet në hapësirë…",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reagoi me %(content)s",
+    "Would you like to leave the rooms in this space?": "Doni të braktisen dhomat në këtë hapësirë?",
+    "You are about to leave <spaceName/>.": "Ju ndan një hap nga braktisja e <spaceName/>.",
+    "Leave some rooms": "Braktis disa dhoma",
+    "Leave all rooms": "Braktisi krejt dhomat",
+    "Don't leave any rooms": "Mos braktis ndonjë dhomë"
 }
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 49f87321f7..236ad4c234 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -2,10 +2,6 @@
     "This email address is already in use": "Ова адреса е-поште се већ користи",
     "This phone number is already in use": "Овај број телефона се већ користи",
     "Failed to verify email address: make sure you clicked the link in the email": "Неуспела провера адресе е-поште: морате да кликнете на везу у поруци",
-    "The remote side failed to pick up": "Друга страна се није јавила",
-    "Unable to capture screen": "Не могу да ухватим садржај екрана",
-    "Existing Call": "Постојећи позив",
-    "You are already in a call.": "Већ сте у позиву.",
     "VoIP is unsupported": "VoIP није подржан",
     "You cannot place VoIP calls in this browser.": "Не можете правити VoIP позиве у овом прегледачу.",
     "You cannot place a call with yourself.": "Не можете позвати сами себе.",
@@ -58,7 +54,6 @@
     "Admin": "Админ",
     "Operation failed": "Радња није успела",
     "Failed to invite": "Нисам успео да пошаљем позивницу",
-    "Failed to invite the following users to the %(roomName)s room:": "Нисам успео да пошаљем позивницу корисницима за собу %(roomName)s:",
     "You need to be logged in.": "Морате бити пријављени.",
     "You need to be able to invite users to do that.": "Морате имати могућност слања позивница корисницима да бисте то урадили.",
     "Unable to create widget.": "Не могу да направим виџет.",
@@ -71,46 +66,19 @@
     "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
     "Missing user_id in request": "Недостаје user_id у захтеву",
     "Call Failed": "Позив неуспешан",
-    "Call Timeout": "Прекорачено време позивања",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Usage": "Коришћење",
-    "/ddg is not a command": "/ddg није наредба",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Да бисте је користили, само сачекајте да се исходи самодовршавања учитају и табом прођите кроз њих.",
     "Ignored user": "Занемарени корисник",
     "You are now ignoring %(userId)s": "Сада занемарујете корисника %(userId)s",
     "Unignored user": "Незанемарени корисник",
     "You are no longer ignoring %(userId)s": "Више не занемарујете корисника %(userId)s",
     "Verified key": "Проверени кључ",
     "Reason": "Разлог",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s је прихватио позивницу за %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s је прихватио позивницу.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s је поставио приказно име на %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s је себи уклонио профилну слику.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s је себи променио профилну слику.",
-    "%(senderName)s set a profile picture.": "%(senderName)s је себи поставио профилну слику.",
-    "VoIP conference started.": "VoIP конференција је започета.",
-    "%(targetName)s joined the room.": "%(targetName)s је ушао у собу.",
-    "VoIP conference finished.": "VoIP конференција је завршена.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s је одбацио позивницу.",
-    "%(targetName)s left the room.": "%(targetName)s је напустио собу.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s је скинуо забрану приступа са %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s је избацио %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s је повукао позивницу за %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s је променио тему у „%(topic)s“.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s је уклонио назив собе.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s је променио назив собе у %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s је послао слику.",
     "Someone": "Неко",
-    "(not supported by this browser)": "(није подржано од стране овог прегледача)",
-    "%(senderName)s answered the call.": "%(senderName)s се јавио.",
-    "(could not connect media)": "(не могу да повежем медије)",
-    "(no answer)": "(нема одговора)",
-    "(unknown failure: %(reason)s)": "(непозната грешка: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s је окончао позив.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s је послао позивницу за приступ соби ка %(targetDisplayName)s.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка позивања у собу.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка приступања соби.",
@@ -134,19 +102,12 @@
     "Message Pinning": "Закачене поруке",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Прикажи временске жигове у 12-сатном облику (нпр.: 2:30 ПоП)",
     "Always show message timestamps": "Увек прикажи временске жигове",
-    "Autoplay GIFs and videos": "Самостално пуштај GIF-ове и видео записе",
     "Enable automatic language detection for syntax highlighting": "Омогући самостално препознавање језика за истицање синтаксе",
     "Automatically replace plain text Emoji": "Самостално замени емоџије писане обичним текстом",
     "Mirror local video feed": "Копирај довод локалног видеа",
     "Enable inline URL previews by default": "Подразумевано укључи УРЛ прегледе",
     "Enable URL previews for this room (only affects you)": "Укључи УРЛ прегледе у овој соби (утиче само на вас)",
     "Enable URL previews by default for participants in this room": "Подразумевано омогући прегледе адреса за чланове ове собе",
-    "Room Colour": "Боја собе",
-    "Active call (%(roomName)s)": "Активни позив (%(roomName)s)",
-    "unknown caller": "непознати позивалац",
-    "Incoming voice call from %(name)s": "Долазни гласовни позив од корисника %(name)s",
-    "Incoming video call from %(name)s": "Долазни видео позив од корисника %(name)s",
-    "Incoming call from %(name)s": "Долазни позив од корисника %(name)s",
     "Decline": "Одбиј",
     "Accept": "Прихвати",
     "Error": "Грешка",
@@ -170,19 +131,8 @@
     "Authentication": "Идентификација",
     "Last seen": "Последњи пут виђен",
     "Failed to set display name": "Нисам успео да поставим приказно име",
-    "Cannot add any more widgets": "Не могу да додам још виџета",
-    "The maximum permitted number of widgets have already been added to this room.": "Највећи број дозвољених додатих виџета је прекорачен у овој соби.",
-    "Add a widget": "Додај виџет",
-    "Drop File Here": "Превуци датотеку овде",
     "Drop file here to upload": "Превуци датотеку овде да би је отпремио",
-    " (unsupported)": " (неподржано)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Приступи преко <voiceText>гласа</voiceText> или <videoText>видеа</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Текући конференцијски позив %(supportedText)s.",
-    "%(senderName)s sent an image": "Корисник %(senderName)s је послао слику",
-    "%(senderName)s sent a video": "Корисник %(senderName)s је послао видео",
-    "%(senderName)s uploaded a file": "Корисник %(senderName)s је отпремио датотеку",
     "Options": "Опције",
-    "Please select the destination room for this message": "Изаберите одредишну собу за ову поруку",
     "Disinvite": "Откажи позивницу",
     "Kick": "Избаци",
     "Disinvite this user?": "Отказати позивницу за овог корисника?",
@@ -222,11 +172,7 @@
     "Server error": "Грешка на серверу",
     "Server unavailable, overloaded, or something else went wrong.": "Сервер није доступан или је преоптерећен или је нешто пошло наопако.",
     "Command error": "Грешка у наредби",
-    "Unpin Message": "Откачи поруку",
-    "Jump to message": "Скочи на поруку",
-    "No pinned messages.": "Нема закачених порука.",
     "Loading...": "Учитавам...",
-    "Pinned Messages": "Закачене поруке",
     "%(duration)ss": "%(duration)sс",
     "%(duration)sm": "%(duration)sм",
     "%(duration)sh": "%(duration)sч",
@@ -253,7 +199,6 @@
     "Settings": "Подешавања",
     "Forget room": "Заборави собу",
     "Search": "Претрага",
-    "Community Invites": "Позивнице заједнице",
     "Invites": "Позивнице",
     "Favourites": "Омиљено",
     "Rooms": "Собе",
@@ -272,12 +217,7 @@
     "This room is not accessible by remote Matrix servers": "Ова соба није доступна са удаљених Матрикс сервера",
     "Leave room": "Напусти собу",
     "Favourite": "Омиљено",
-    "Guests cannot join this room even if explicitly invited.": "Гости не могу приступити овој соби чак и ако су експлицитно позвани.",
-    "Click here to fix": "Кликните овде да бисте поправили",
-    "Who can access this room?": "Ко може приступити овој соби?",
     "Only people who have been invited": "Само особе које су позване",
-    "Anyone who knows the room's link, apart from guests": "Свако ко има везу ка соби, осим гостију",
-    "Anyone who knows the room's link, including guests": "Свако ко има везу ка соби, укључујући и госте",
     "Publish this room to the public in %(domain)s's room directory?": "Објавити ову собу у јавној фасцикли соба на домену %(domain)s?",
     "Who can read history?": "Ко може читати историјат?",
     "Anyone": "Било ко",
@@ -286,7 +226,6 @@
     "Members only (since they joined)": "Само чланови (од приступања)",
     "Permissions": "Овлашћења",
     "Advanced": "Напредно",
-    "Add a topic": "Додај тему",
     "Cancel": "Откажи",
     "Jump to first unread message.": "Скочи на прву непрочитану поруку.",
     "Close": "Затвори",
@@ -303,7 +242,6 @@
     "URL previews are enabled by default for participants in this room.": "УРЛ прегледи су подразумевано укључени за чланове ове собе.",
     "URL previews are disabled by default for participants in this room.": "УРЛ прегледи су подразумевано искључени за чланове ове собе.",
     "URL Previews": "УРЛ прегледи",
-    "Error decrypting audio": "Грешка при дешифровању звука",
     "Error decrypting attachment": "Грешка при дешифровању прилога",
     "Decrypt %(text)s": "Дешифруј %(text)s",
     "Download %(text)s": "Преузми %(text)s",
@@ -317,10 +255,7 @@
     "Failed to copy": "Нисам успео да ископирам",
     "Add an Integration": "Додај уградњу",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Бићете пребачени на сајт треће стране да бисте се идентификовали са својим налогом зарад коришћења уградње %(integrationsUrl)s. Да ли желите да наставите?",
-    "Custom Server Options": "Прилагођене опције сервера",
     "Dismiss": "Одбаци",
-    "An email has been sent to %(emailAddress)s": "Мејл је послат на адресу %(emailAddress)s",
-    "Please check your email to continue registration.": "Проверите ваше сандуче да бисте наставили регистровање.",
     "Token incorrect": "Жетон је нетачан",
     "A text message has been sent to %(msisdn)s": "Текстуална порука је послата на %(msisdn)s",
     "Please enter the code it contains:": "Унесите код који се налази у њој:",
@@ -329,7 +264,6 @@
     "Sign in with": "Пријавите се преко",
     "Email address": "Мејл адреса",
     "Sign in": "Пријави се",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ако не наведете мејл адресу, нећете моћи да опоравите вашу лозинку. Да ли сте сигурни?",
     "Register": "Регистровање",
     "Remove from community": "Уклони из заједнице",
     "Disinvite this user from community?": "Отказати позивницу у заједницу овом кориснику?",
@@ -352,17 +286,14 @@
     "Display your community flair in rooms configured to show it.": "Приказује ваш беџ заједнице у собама које су подешене за то.",
     "You're not currently a member of any communities.": "Тренутно нисте члан било које заједнице.",
     "Unknown Address": "Непозната адреса",
-    "Allow": "Дозволи",
     "Delete Widget": "Обриши виџет",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Брисање виџета уклања виџет за све чланове ове собе. Да ли сте сигурни да желите обрисати овај виџет?",
     "Delete widget": "Обриши виџет",
-    "Minimize apps": "Умањи апликације",
     "Edit": "Уреди",
     "Create new room": "Направи нову собу",
     "No results": "Нема резултата",
     "Communities": "Заједнице",
     "Home": "Почетна",
-    "Manage Integrations": "Управљај уградњама",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s су ушли %(count)s пута",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s је ушло",
@@ -419,11 +350,8 @@
     "expand": "рашири",
     "Custom level": "Прилагођени ниво",
     "Quote": "Цитат",
-    "Room directory": "Фасцикла са собама",
     "Start chat": "Започни разговор",
     "And %(count)s more...|other": "И %(count)s других...",
-    "ex. @bob:example.com": "нпр.: @pera:domen.rs",
-    "Add User": "Додај корисника",
     "Matrix ID": "Матрикс ИД",
     "Matrix Room ID": "ИД Матрикс собе",
     "email address": "мејл адреса",
@@ -456,21 +384,9 @@
     "Unable to verify email address.": "Не могу да проверим мејл адресу.",
     "This will allow you to reset your password and receive notifications.": "Ово омогућава поновно постављање лозинке и примање обавештења.",
     "Skip": "Прескочи",
-    "Username not available": "Корисничко име није доступно",
-    "Username invalid: %(errMessage)s": "Корисничко име није исправно: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Догодила се грешка: %(error_string)s",
-    "Username available": "Корисничко име је доступно",
-    "To get started, please pick a username!": "Да бисте кренули, изаберите корисничко име!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ово ће бити назив вашег налога на <span></span> кућном серверу, или можете изабрати <a>други сервер</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Ако већ имате Матрикс налог, можете се већ <a>пријавити</a>.",
-    "Private Chat": "Приватно ћаскање",
-    "Public Chat": "Јавно ћаскање",
-    "Custom": "Прилагођено",
     "Name": "Име",
     "You must <a>register</a> to use this functionality": "Морате се <a>регистровати</a> да бисте користили ову могућност",
     "You must join the room to see its files": "Морате приступити соби да бисте видели њене датотеке",
-    "There are no visible files in this room": "Нема видљивих датотека у овој соби",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML за страницу ваше заједнице</h1>\n<p>\n    Користите дужи опис да бисте упознали нове чланове са заједницом, или поделили\n    неке важне <a href=\"foo\">везе</a>\n</p>\n<p>\n    Можете чак користити \"img\" ознаке\n</p>\n",
     "Add rooms to the community summary": "Додај собе у кратак опис заједнице",
     "Which rooms would you like to add to this summary?": "Које собе желите додати у овај кратак опис?",
     "Add to summary": "Додај у кратак опис",
@@ -508,7 +424,6 @@
     "Are you sure you want to reject the invitation?": "Да ли сте сигурни да желите одбити позивницу?",
     "Failed to reject invitation": "Нисам успео да одбијем позивницу",
     "Are you sure you want to leave the room '%(roomName)s'?": "Да ли сте сигурни да желите напустити собу „%(roomName)s“?",
-    "Failed to leave room": "Нисам успео да напустим собу",
     "Signed Out": "Одјављен",
     "For security, this session has been signed out. Please sign in again.": "Зарад безбедности, одјављени сте из ове сесије. Пријавите се поново.",
     "Old cryptography data detected": "Нађени су стари криптографски подаци",
@@ -521,7 +436,6 @@
     "Analytics": "Аналитика",
     "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.": "Ако страница садржи поверљиве податке (као што је назив собе, ИД корисника или групе), ти подаци се уклањају пре слања на сервер.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s је променио приказно име у %(displayName)s.",
     "Failed to set direct chat tag": "Нисам успео да поставим ознаку директног ћаскања",
     "Failed to remove tag %(tagName)s from room": "Нисам успео да скинем ознаку %(tagName)s са собе",
     "Failed to add tag %(tagName)s to room": "Нисам успео да додам ознаку %(tagName)s на собу",
@@ -533,16 +447,9 @@
     "Error whilst fetching joined communities": "Грешка приликом добављања списка са приступљеним заједницама",
     "Create a new community": "Направи нову заједницу",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Направите заједницу да бисте спојили кориснике и собе! Направите прилагођену почетну страницу да бисте означили ваш кутак у Матрикс универзуму.",
-    "You have no visible notifications": "Немате видљивих обавештења",
-    "%(count)s of your messages have not been sent.|other": "Неке ваше поруке нису послате.",
-    "%(count)s of your messages have not been sent.|one": "Ваша порука није послата.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Пошаљи поново</resendText> или <cancelText>откажи све</cancelText> сада. Такође можете изабрати појединачне поруке за поновно слање или отказивање.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Поново пошаљи поруку</resendText> или <cancelText>откажи поруку</cancelText> сада.",
     "Warning": "Упозорење",
     "Connectivity to the server has been lost.": "Веза ка серверу је прекинута.",
     "Sent messages will be stored until your connection has returned.": "Послате поруке биће сачуване док се веза не успостави поново.",
-    "Active call": "Текући позив",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Нема других чланова! Да ли желите да <inviteText>позовете друге</inviteText> или да <nowarnText>склоните упозорење о празној соби</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Изгледа да отпремате датотеке. Да ли сте сигурни да желите изаћи?",
     "You seem to be in a call, are you sure you want to quit?": "Изгледа да сте у позиву. Да ли сте сигурни да желите изаћи?",
     "Search failed": "Претрага је неуспешна",
@@ -550,11 +457,6 @@
     "No more results": "Нема више резултата",
     "Room": "Соба",
     "Failed to reject invite": "Нисам успео да одбацим позивницу",
-    "Fill screen": "Испуни екран",
-    "Click to unmute video": "Кликни да појачаш видео",
-    "Click to mute video": "Кликни да утишаш видео",
-    "Click to unmute audio": "Кликни да појачаш звук",
-    "Click to mute audio": "Кликни да утишаш звук",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Покушао сам да учитам одређену тачку у временској линији ове собе али ви немате овлашћења за преглед наведене поруке.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Покушао сам да учитам одређену тачку у временској линији ове собе али нисам могао да је нађем.",
     "Failed to load timeline position": "Нисам могао да учитам позицију у временској линији",
@@ -586,12 +488,8 @@
     "Notifications": "Обавештења",
     "Profile": "Профил",
     "Account": "Налог",
-    "Access Token:": "Приступни жетон:",
-    "click to reveal": "кликни за приказ",
     "Homeserver is": "Домаћи сервер је",
-    "Identity Server is": "Идентитетски сервер је",
     "%(brand)s version:": "%(brand)s издање:",
-    "olm version:": "olm издање:",
     "Failed to send email": "Нисам успео да пошаљем мејл",
     "The email address linked to your account must be entered.": "Морате унети мејл адресу која је везана за ваш налог.",
     "A new password must be entered.": "Морате унети нову лозинку.",
@@ -602,14 +500,9 @@
     "Send Reset Email": "Пошаљи мејл за опоравак",
     "Incorrect username and/or password.": "Нетачно корисничко име и/или лозинка.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Знајте да се пријављујете на сервер %(hs)s, не на matrix.org.",
-    "The phone number entered looks invalid": "Унети број телефона не изгледа исправно",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Овај домаћи сервер не пружа било који начин пријаве унутар овог клијента.",
-    "Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не могу да се повежем на сервер преко ХТТП када је ХТТПС УРЛ у траци вашег прегледача. Или користите HTTPS или <a>омогућите небезбедне скрипте</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на домаћи сервер. Проверите вашу интернет везу, постарајте се да је <a>ССЛ сертификат сервера</a> од поверења и да проширење прегледача не блокира захтеве.",
-    "Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара",
-    "Set a display name:": "Постави приказно име:",
-    "Upload an avatar:": "Отпреми аватар:",
     "This server does not support authentication with a phone number.": "Овај сервер не подржава идентификацију преко броја мобилног.",
     "Displays action": "Приказује радњу",
     "Bans user with given id": "Забрањује приступ кориснику са датим ИД",
@@ -618,11 +511,9 @@
     "Invites user with given id to current room": "Позива корисника са датим ИД у тренутну собу",
     "Kicks user with given id": "Избацује корисника са датим ИД",
     "Changes your display nickname": "Мења ваш приказни надимак",
-    "Searches DuckDuckGo for results": "Претражује DuckDuckGo за резултате",
     "Ignores a user, hiding their messages from you": "Занемарује корисника и тиме скрива њихове поруке од вас",
     "Stops ignoring a user, showing their messages going forward": "Престаје са занемаривањем корисника и тиме приказује њихове поруке одсад",
     "Commands": "Наредбе",
-    "Results from DuckDuckGo": "Резултати са DuckDuckGo-а",
     "Emoji": "Емоџи",
     "Notify the whole room": "Обавести све у соби",
     "Room Notification": "Собно обавештење",
@@ -644,40 +535,24 @@
     "Did you know: you can use communities to filter your %(brand)s experience!": "Да ли сте знали: можете користити заједнице за филтрирање вашег %(brand)s искуства!",
     "Clear filter": "Очисти филтер",
     "Key request sent.": "Захтев за дељење кључа послат.",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Да бисте поставили филтер, повуците аватар заједнице на површ филтрирања скроз на леву страну екрана. Можете кликнути на аватар у површи филтрирања било када да бисте видели само собе и особе везане за ту заједницу.",
     "Fetching third party location failed": "Добављање локације треће стране није успело",
     "Send Account Data": "Пошаљи податке налога",
-    "All notifications are currently disabled for all targets.": "Сва обавештења су тренутно онемогућена за све циљеве.",
-    "Uploading report": "Отпремам извештај",
     "Sunday": "Недеља",
     "Notification targets": "Циљеви обавештења",
     "Today": "Данас",
-    "Files": "Датотеке",
-    "You are not receiving desktop notifications": "Не примате стона обавештења",
     "Friday": "Петак",
     "Update": "Ажурирај",
-    "Unable to fetch notification target list": "Не могу да досегнем списак циљева за обавештења",
     "On": "Укључено",
     "Changelog": "Записник о изменама",
     "Waiting for response from server": "Чекам на одговор са сервера",
-    "Uploaded on %(date)s by %(user)s": "Отпремљено датума %(date)s од корисника %(user)s",
     "Send Custom Event": "Пошаљи прилагођени догађај",
     "Off": "Искључено",
-    "Advanced notification settings": "Напредна подешавања обавештења",
-    "Forget": "Заборави",
-    "You cannot delete this image. (%(code)s)": "Не можете обрисати ову слику. (%(code)s)",
-    "Cancel Sending": "Откажи слање",
     "This Room": "Ова соба",
     "Room not found": "Соба није пронађена",
     "Downloading update...": "Преузимам ажурирање...",
     "Messages in one-to-one chats": "Поруке у један-на-један ћаскањима",
     "Unavailable": "Недоступан",
-    "View Decrypted Source": "Погледај дешифровани извор",
-    "Failed to update keywords": "Нисам успео да ажурирам кључне речи",
     "remove %(name)s from the directory.": "уклони %(name)s из фасцикле.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Обавештења за следеће кључне речи прате правила која не могу бити приказана овде:",
-    "Please set a password!": "Поставите лозинку!",
-    "You have successfully set a password!": "Успешно сте поставили лозинку!",
     "Explore Room State": "Истражи стање собе",
     "Source URL": "Адреса извора",
     "Messages sent by bot": "Поруке послате од бота",
@@ -686,33 +561,20 @@
     "No update available.": "Нема нових ажурирања.",
     "Noisy": "Бучно",
     "Collecting app version information": "Прикупљам податке о издању апликације",
-    "Keywords": "Кључне речи",
-    "Enable notifications for this account": "Омогући обавештења за овај налог",
     "Invite to this community": "Позови у ову заједницу",
     "Search…": "Претрага…",
-    "Messages containing <span>keywords</span>": "Поруке које садрже <span>кључне речи</span>",
-    "Error saving email notification preferences": "Грешка при чувању поставки мејл обавештења",
     "Tuesday": "Уторак",
-    "Enter keywords separated by a comma:": "Унесите кључне речи одвојене зарезима:",
-    "Forward Message": "Проследи поруку",
     "Remove %(name)s from the directory?": "Уклонити %(name)s из фасцикле?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s користи напредне могућности прегледача од којих неке нису доступне или су у пробној фази, у вашем прегледачу.",
     "Event sent!": "Догађај је послат!",
     "Explore Account Data": "Истражи податке налога",
-    "All messages (noisy)": "Све поруке (гласно)",
     "Saturday": "Субота",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Запамтите, увек можете поставити мејл адресу у корисничким подешавањима, уколико се предомислите.",
-    "Direct Chat": "Директно ћаскање",
     "The server may be unavailable or overloaded": "Сервер је можда недоступан или преоптерећен",
     "Reject": "Одбаци",
-    "Failed to set Direct Message status of room": "Нисам успео да подесим стање директне поруке собе",
     "Monday": "Понедељак",
     "Remove from Directory": "Уклони из фасцикле",
-    "Enable them now": "Омогућите их сада",
     "Toolbox": "Алатница",
     "Collecting logs": "Прикупљам записнике",
     "You must specify an event type!": "Морате навести врсту догађаја!",
-    "(HTTP status %(httpStatus)s)": "(HTTP стање %(httpStatus)s)",
     "All Rooms": "Све собе",
     "State Key": "Кључ стања",
     "Wednesday": "Среда",
@@ -720,47 +582,31 @@
     "All messages": "Све поруке",
     "Call invitation": "Позивница за позив",
     "Messages containing my display name": "Поруке које садрже моје приказно име",
-    "You have successfully set a password and an email address!": "Успешно сте поставили лозинку и мејл адресу!",
     "Failed to send custom event.": "Нисам успео да пошаљем прилагођени догађај.",
     "What's new?": "Шта је ново?",
-    "Notify me for anything else": "Обавести ме за било шта друго",
     "When I'm invited to a room": "Када сам позван у собу",
-    "Can't update user notification settings": "Не могу да ажурирам корисничка подешавања обавештења",
-    "Notify for all other messages/rooms": "Обавести за све друге поруке и собе",
     "Unable to look up room ID from server": "Не могу да потражим ИД собе на серверу",
     "Couldn't find a matching Matrix room": "Не могу да нађем одговарајућу Матрикс собу",
     "Invite to this room": "Позови у ову собу",
     "You cannot delete this message. (%(code)s)": "Не можете обрисати ову поруку. (%(code)s)",
     "Thursday": "Четвртак",
-    "I understand the risks and wish to continue": "Разумем могуће последице и желим наставити",
     "Back": "Назад",
     "Reply": "Одговори",
     "Show message in desktop notification": "Прикажи поруку у стоном обавештењу",
-    "Unhide Preview": "Откриј преглед",
     "Unable to join network": "Не могу да приступим мрежи",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Нажалост, ваш прегледач <b>не може</b> да покреће %(brand)s.",
     "Messages in group chats": "Поруке у групним ћаскањима",
     "Yesterday": "Јуче",
     "Error encountered (%(errorDetail)s).": "Догодила се грешка (%(errorDetail)s).",
     "Event Type": "Врста догађаја",
     "Low Priority": "Најмања важност",
     "What's New": "Шта је ново",
-    "Set Password": "Постави лозинку",
-    "An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.",
     "Resend": "Поново пошаљи",
     "%(brand)s does not know how to join a room on this network": "%(brand)s не зна како да приступи соби на овој мрежи",
-    "Mentions only": "Само спомињања",
-    "You can now return to your account after signing out, and sign in on other devices.": "Можете се вратити у ваш налог након што се одјавите и пријавите поново, на другим уређајима.",
-    "Enable email notifications": "Омогући мејл обавештења",
-    "Download this file": "Преузми ову датотеку",
-    "Pin Message": "Закачи поруку",
-    "Failed to change settings": "Нисам успео да променим подешавања",
     "View Community": "Погледај заједницу",
     "Developer Tools": "Програмерске алатке",
     "View Source": "Погледај извор",
     "Event Content": "Садржај догађаја",
     "Thank you!": "Хвала вам!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Са вашим тренутним прегледачем изглед и угођај ове апликације може бити скроз неправилан и неке могућности можда неће радити. Уколико желите да ипак пробате, можете наставити али ћете бити без подршке за било које проблеме на које налетите!",
     "Checking for an update...": "Проверавам ажурирања...",
     "Every page you use in the app": "Свака страница коју користите у апликацији",
     "e.g. <CurrentPageURL>": "нпр. <CurrentPageURL>",
@@ -777,7 +623,6 @@
     "Logs sent": "Записници су послати",
     "Failed to send logs: ": "Нисам успео да пошаљем записнике: ",
     "Submit debug logs": "Пошаљи записнике за поправљање грешака",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Записници за поправљање грешака садрже податке о коришћењу апликације међу којима се налази ваше корисничко име, ИД или алијаси посећених соба или група и корисничка имена других корисника. Не садрже саме поруке.",
     "Unable to join community": "Не могу да приступим заједници",
     "Unable to leave community": "Не могу да напустим заједницу",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Измене које сте начинили у <bold1>имену</bold1> ваше заједнице и на <bold2>аватару</bold2> можда неће бити видљиве другим корисницима највише 30 минута.",
@@ -786,8 +631,6 @@
     "Who can join this community?": "Ко може приступити овој заједници?",
     "Everyone": "Свако",
     "Opens the Developer Tools dialog": "Отвори прозор програмерских алатки",
-    "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.": "Ако сте пријавили грешку преко Гитхаба, извештаји за поправљање грешака нам могу помоћи да лакше нађемо узрок. Извештаји садрже податке о коришћењу апликације и међу њих спада ваше корисничко име, ИД или алијаси посећених соба или група и корисничка имена других корисника. Не садрже саме поруке.",
-    "Always show encryption icons": "Увек прикажи иконице шифровања",
     "Send Logs": "Пошаљи записнике",
     "Clear Storage and Sign Out": "Очисти складиште и одјави ме",
     "Refresh": "Освежи",
@@ -799,7 +642,6 @@
     "Muted Users": "Утишани корисници",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не могу да учитам догађај на који је послат одговор, или не постоји или немате овлашћење да га погледате.",
     "To continue, please enter your password:": "Да бисте наставили, унесите вашу лозинку:",
-    "Collapse Reply Thread": "Скупи нит са одговорима",
     "Can't leave Server Notices room": "Не могу да напустим собу са напоменама сервера",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ова соба се користи за важне поруке са сервера. Не можете напустити ову собу.",
     "Terms and Conditions": "Услови коришћења",
@@ -817,13 +659,8 @@
     "Share Community": "Подели заједницу",
     "Share Room Message": "Подели поруку у соби",
     "Link to selected message": "Веза ка изабраној поруци",
-    "COPY": "КОПИРАЈ",
-    "Share Message": "Подели поруку",
     "No Audio Outputs detected": "Нема уочених излаза звука",
     "Audio Output": "Излаз звука",
-    "Call in Progress": "Позив је у току",
-    "A call is currently being placed!": "Успостављамо позив!",
-    "A call is already in progress!": "Позив је у току!",
     "Permission Required": "Неопходна је дозвола",
     "You do not have permission to start a conference call in this room": "Немате дозволу да започињете конференцијски позив у овој соби",
     "This event could not be displayed": "Овај догађај не може бити приказан",
@@ -839,30 +676,17 @@
     "Sets the room name": "Поставља назив собе",
     "Forces the current outbound group session in an encrypted room to be discarded": "Присиљава одбацивање тренутне одлазне сесије групе у шифрованој соби",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s је надоградио ову собу.",
-    "Free": "Бесплатан",
     "Join millions for free on the largest public server": "Придружите се милионима других бесплатно на највећем јавном серверу",
-    "Premium": "Премијум",
-    "Premium hosting for organisations <a>Learn more</a>": "Премијум плаћени хостинг за организације <a>Сазнајте више</a>",
-    "Find other public servers or use a custom server": "Пронађите друге јавне сервере или користите прилагођени сервер",
-    "Other servers": "Други сервери",
-    "Homeserver URL": "Адреса кућног сервера",
-    "Identity Server URL": "Адреса идентитетског сервера",
     "Next": "Следеће",
     "Sign in instead": "Пријава са постојећим налогом",
-    "Create your account": "Направите ваш налог",
     "Create account": "Направи налог",
     "Waiting for partner to confirm...": "Чекам да партнер потврди...",
     "Confirm": "Потврди",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Мејл потврде ће бити послат у ваше сандуче да бисмо потврдили постављање ваше нове лозинке.",
     "Email (optional)": "Мејл (изборно)",
-    "Your Modular server": "Ваш Модулар сервер",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Унесите адресу вашег Модулар кућног сервера. Можете користити ваш домен или унети поддомен на домену <a>modular.im</a>.",
-    "Server Name": "Назив сервера",
     "Change": "Промени",
     "Messages containing my username": "Поруке које садрже моје корисничко",
-    "The username field must not be blank.": "Поље корисничког имена не може бити празно.",
     "Username": "Корисничко име",
-    "Not sure of your password? <a>Set a new one</a>": "Не сећате се лозинке? <a>Поставите нову</a>",
     "Are you sure you want to sign out?": "Заиста желите да се одјавите?",
     "Call failed due to misconfigured server": "Позив неуспешан због лоше подешеног сервера",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Замолите администратора вашег сервера (<code>%(homeserverDomain)s</code>) да подеси „TURN“ сервер како би позиви радили поуздано.",
@@ -882,14 +706,8 @@
     "%(senderName)s placed a video call.": "%(senderName)s је започео видео позив.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s је започео видео позив. (није подржано од стране овог прегледача)",
     "You do not have permission to invite people to this room.": "Немате дозволу за позивање људи у ову собу.",
-    "Set up encryption": "Подеси шифровање",
     "Encryption upgrade available": "Надоградња шифровања је доступна",
-    "You changed the room name": "Променили сте назив собе",
-    "%(senderName)s changed the room name": "Корисник %(senderName)s је променио назив собе",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
-    "You changed the room topic": "Променили сте тему собе",
-    "%(senderName)s changed the room topic": "Корисник %(senderName)s је променио тему собе",
-    "Multiple integration managers": "Више управника уградњи",
     "Try out new ways to ignore people (experimental)": "Испробајте нове начине за игнорисање људи (у пробној фази)",
     "Show info about bridges in room settings": "Прикажи податке о мостовима у подешавањима собе",
     "Enable Emoji suggestions while typing": "Омогући предлоге емоџија приликом куцања",
@@ -921,11 +739,9 @@
     "Emoji picker": "Бирач емоџија",
     "Send a message…": "Пошаљи поруку…",
     "Direct Messages": "Директне поруке",
-    "Create room": "Направи собу",
     "People": "Људи",
     "Forget this room": "Заборави ову собу",
     "Start chatting": "Започни ћаскање",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Поруке у овој соби су обезбеђене шифровањем с краја на крај. Само ви и ваши саговорници имате кључеве потребне за читање ових порука.",
     "List options": "Прикажи опције",
     "Use default": "Користи подразумевано",
     "Mentions & Keywords": "Спомињања и кључне речи",
@@ -943,12 +759,10 @@
     "Remove recent messages by %(user)s": "Уклони недавне поруке корисника %(user)s",
     "Remove recent messages": "Уклони недавне поруке",
     "Encryption enabled": "Шифровање омогућено",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Поруке у овој соби су шифроване с краја на крај. Сазнајте више и потврдите овог корисника у његовом корисничком профилу.",
     "Encryption not enabled": "Шифровање није омогућено",
     "The encryption used by this room isn't supported.": "Начин шифровања унутар ове собе није подржан.",
     "React": "Реагуј",
     "Reactions": "Реакције",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> реаговали са %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>реаговали са %(shortName)s</reactedWith>",
     "Smileys & People": "Смешци и особе",
     "Quick Reactions": "Брзе реакције",
@@ -956,8 +770,6 @@
     "Join": "Приступи",
     "Enable end-to-end encryption": "Омогући шифровање с краја на крај",
     "Suggestions": "Предлози",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Позовите некога уз помоћ њихово имена, корисничког имена (типа <userId/>), мејл адресе или <a>поделите ову собу</a>.",
-    "Report bugs & give feedback": "Пријави грешке и пошаљи повратне податке",
     "Report Content to Your Homeserver Administrator": "Пријави садржај администратору вашег домаћег сервера",
     "Room Settings - %(roomName)s": "Подешавања собе - %(roomName)s",
     "Terms of Service": "Услови коришћења",
@@ -966,10 +778,8 @@
     "Summary": "Сажетак",
     "Document": "Документ",
     "Resend %(unsentCount)s reaction(s)": "Поново пошаљи укупно %(unsentCount)s реакција",
-    "Share Permalink": "Подели трајну везу",
     "Report Content": "Пријави садржај",
     "Notification settings": "Подешавања обавештења",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Инсталирајте <chromeLink>Хром</chromeLink>, <firefoxLink>Фајерфокс</firefoxLink>, или <safariLink>Сафари</safariLink> за најбољи доживљај.",
     "%(creator)s created and configured the room.": "Корисник %(creator)s је направио и подесио собу.",
     "Preview": "Преглед",
     "Switch to light mode": "Пребаци на светлу тему",
@@ -980,8 +790,6 @@
     "General failure": "Општа грешка",
     "Copy": "Копирај",
     "Go Back": "Назад",
-    "We’re excited to announce Riot is now Element": "Са радошћу објављујемо да је Рајот (Riot) сада Елемент (Element)",
-    "Riot is now Element!": "Рајот (Riot) је сада Елемент!",
     "Send a bug report with logs": "Пошаљи извештај о грешци са записницима",
     "Light": "Светла",
     "Dark": "Тамна",
@@ -1002,7 +810,6 @@
     "Enable experimental, compact IRC style layout": "Омогући пробни, збијенији распоред у IRC стилу",
     "Got It": "Разумем",
     "Light bulb": "сијалица",
-    "Algorithm: ": "Алгоритам: ",
     "Go back": "Назад",
     "Hey you. You're the best!": "Хеј! Само напред!",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Прилагођена величина фонта може бити између %(min)s и %(max)s тачака",
@@ -1036,11 +843,7 @@
     "Show advanced": "Прикажи напредно",
     "Recent Conversations": "Недавни разговори",
     "Recently Direct Messaged": "Недавне директне поруке",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Започните разговор са неким користећи њихово име, корисничко име (као нпр.: <userId/>) или мејл адресу.",
     "Go": "Напред",
-    "Go to Element": "Иди у Елемент",
-    "We’re excited to announce Riot is now Element!": "Са одушевљењем објављујемо да је Рајот (Riot) сада Елемент (Element)!",
-    "Learn more at <a>element.io/previously-riot</a>": "Сазнајте више на страници <a>element.io/previously-riot</a>",
     "Looks good!": "Изгледа добро!",
     "Send a Direct Message": "Пошаљи директну поруку",
     "Switch theme": "Промени тему",
@@ -1334,8 +1137,6 @@
     "The call was answered on another device.": "На позив је одговорено на другом уређају.",
     "Answered Elsewhere": "Одговорен другде",
     "The call could not be established": "Позив није могао да се успостави",
-    "The other party declined the call.": "Друга страна је одбила позив.",
-    "Call Declined": "Позив одбијен",
     "Your user agent": "Ваш кориснички агент",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Било да користите %(brand)s на уређају где је додир главни начин уноса",
     "Add Phone Number": "Додај број телефона",
@@ -1370,7 +1171,6 @@
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s је учини собу доступном само позивницом.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s је учини собу јавном за све који знају везу.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s је изменио назив собе из %(oldRoomName)s у %(newRoomName)s.",
-    "%(senderName)s made no change.": "%(senderName)s није направио никакву измену.",
     "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": "Шаље поруку наведеном кориснику",
@@ -1404,7 +1204,6 @@
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ако сте то случајно учинили, безбедне поруке можете подесити у овој сесији, која ће поново шифровати историју порука сесије помоћу новог начина опоравка.",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Сесија је открила да су ваша безбедносна фраза и кључ за безбедне поруке уклоњени.",
     "Cancel autocomplete": "Откажи само-довршавање",
-    "Direct message": "Директна порука",
     "Hide sessions": "Сакриј сесије",
     "Trusted": "поуздан",
     "Not trusted": "није поуздан",
@@ -1421,10 +1220,6 @@
     "Explore rooms": "Истражи собе",
     "%(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 је изменио алтернативне адресе за ову собу.",
@@ -1440,7 +1235,6 @@
     "We couldn't log you in": "Не могу да вас пријавим",
     "Double check that your server supports the room version chosen and try again.": "Добро проверите да ли сервер подржава изабрану верзију собе и пробајте поново.",
     "a few seconds from now": "за неколико секунди",
-    "The message you are trying to send is too large.": "Порука коју покушавате да пошаљете је предугачка.",
     "Pin": "чиода",
     "Folder": "фасцикла",
     "Headphones": "слушалице",
@@ -1510,7 +1304,6 @@
     "Cancelling…": "Отказујем…",
     "Show stickers button": "Прикажи дугме за налепнице",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s је локално сигурно кешира шифроване поруке да би се појавиле у резултатима претраге:",
-    "Search names and description": "Претражите имена и опис",
     "You may want to try a different search or check for typos.": "Можда ћете желети да испробате другачију претрагу или да проверите да ли имате правописне грешке.",
     "This version of %(brand)s does not support searching encrypted messages": "Ова верзија %(brand)s с не подржава претраживање шифрованих порука",
     "Cancel search": "Откажи претрагу",
@@ -1519,7 +1312,6 @@
     "Enable message search in encrypted rooms": "Омогућите претрагу порука у шифрованим собама",
     "Space settings": "Подешавања простора",
     "Failed to save space settings.": "Чување подешавања простора није успело.",
-    "We recommend you change your password and Security Key in Settings immediately": "Препоручујемо вам да одмах промените лозинку и безбедносни кључ у подешавањима",
     "Confirm this user's session by comparing the following with their User Settings:": "Потврдите сесију овог корисника упоређивањем следећег са њиховим корисничким подешавањима:",
     "Confirm by comparing the following with the User Settings in your other session:": "Потврдите упоређивањем следећег са корисничким подешавањима у вашој другој сесији:",
     "You can also set up Secure Backup & manage your keys in Settings.": "Такође можете да подесите Сигурносну копију и управљате својим тастерима у подешавањима.",
@@ -1679,10 +1471,7 @@
     "Are you sure you want to remove <b>%(serverName)s</b>": "Да ли сте сигурни да желите да уклоните <b>%(serverName)s</b>",
     "Your server": "Ваш сервер",
     "All rooms": "Све собе",
-    "Low bandwidth mode": "Режим ниског протока",
     "Who are you working with?": "Са ким радите?",
-    "Screens": "Екрани",
-    "Share your screen": "Поделите свој екран",
     "Alt Gr": "Алт Гр",
     "Alt": "Алт",
     "Autocomplete": "Аутоматско довршавање",
@@ -1700,7 +1489,6 @@
     "This widget may use cookies.": "Овај виџет може користити колачиће.",
     "Widget added by": "Додао је виџет",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Коришћење овог виџета може да дели податке <helpIcon /> са %(widgetDomain)s.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Коришћење овог виџета може да дели податке <helpIcon /> са %(widgetDomain)s и вашим интеграционим менаџером.",
     "Widget ID": "ИД виџета",
     "Room ID": "ИД собе",
     "%(brand)s URL": "%(brand)s УРЛ",
@@ -1739,7 +1527,6 @@
     "%(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",
-    "Open": "Отвори",
     "Accept all %(invitedRooms)s invites": "Прихвати све %(invitedRooms)s позивнице",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s је аужурирао неважеће правило о забрани",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s је уклонио правило о забрани које подудара са %(glob)s",
@@ -1760,5 +1547,7 @@
     "You're already in a call with this person.": "Већ разговарате са овом особом.",
     "Already in call": "Већ у позиву",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Без обзира да ли користите %(brand)s као инсталирану Прогресивну веб апликацију",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Без обзира да ли користите функцију „breadcrumbs“ (аватари изнад листе соба)"
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Без обзира да ли користите функцију „breadcrumbs“ (аватари изнад листе соба)",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Коришћење овог виџета може да дели податке <helpIcon /> са %(widgetDomain)s и вашим интеграционим менаџером.",
+    "Identity server is": "Идентитетски сервер је"
 }
diff --git a/src/i18n/strings/sr_Latn.json b/src/i18n/strings/sr_Latn.json
index 96a5d89411..f32193816e 100644
--- a/src/i18n/strings/sr_Latn.json
+++ b/src/i18n/strings/sr_Latn.json
@@ -17,7 +17,6 @@
     "Chat with %(brand)s Bot": "Ćaskajte sa %(brand)s botom",
     "Sign In": "Prijavite se",
     "powered by Matrix": "pokreće Matriks",
-    "Custom Server Options": "Prilagođene opcije servera",
     "Explore rooms": "Istražite sobe",
     "Send": "Pošalji",
     "Sun": "Ned",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index a50c039e9e..ea2e06e381 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1,8 +1,5 @@
 {
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepterade en inbjudan.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterade inbjudan för %(displayName)s.",
     "Account": "Konto",
-    "Add a topic": "Lägg till ett ämne",
     "Admin": "Administratör",
     "No Microphones detected": "Ingen mikrofon hittades",
     "No Webcams detected": "Ingen webbkamera hittades",
@@ -18,34 +15,21 @@
     "and %(count)s others...|other": "och %(count)s andra…",
     "and %(count)s others...|one": "och en annan…",
     "A new password must be entered.": "Ett nytt lösenord måste anges.",
-    "%(senderName)s answered the call.": "%(senderName)s svarade på samtalet.",
-    "Anyone who knows the room's link, including guests": "Alla som har rummets adress, inklusive gäster",
     "Anyone": "Vem som helst",
-    "Anyone who knows the room's link, apart from guests": "Alla som har rummets adress, förutom gäster",
     "An error has occurred.": "Ett fel har inträffat.",
     "Are you sure?": "Är du säker?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Vill du lämna rummet '%(roomName)s'?",
-    "Autoplay GIFs and videos": "Spela automatiskt upp GIF:ar och videor",
     "Are you sure you want to reject the invitation?": "Är du säker på att du vill avböja inbjudan?",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
     "Banned users": "Bannade användare",
     "Bans user with given id": "Bannar användaren med givet ID",
     "Ban": "Banna",
     "Attachment": "Bilaga",
-    "Call Timeout": "Samtalstimeout",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan inte ansluta till en hemserver via HTTP då adressen i webbläsaren är HTTPS. Använd HTTPS, eller <a>aktivera osäkra skript</a>.",
     "Change Password": "Byt lösenord",
-    "%(senderName)s changed their profile picture.": "%(senderName)s bytte sin profilbild.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s bytte rummets namn till %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
     "Changes your display nickname": "Ändrar ditt visningsnamn",
-    "Click here to fix": "Klicka här för att fixa",
-    "Click to mute audio": "Klicka för att tysta ljud",
-    "Click to mute video": "Klicka för att tysta videon",
-    "click to reveal": "klicka för att avslöja",
-    "Click to unmute video": "Klicka för att sluta tysta videon",
-    "Click to unmute audio": "Klicka för att sätta på ljud",
     "Command error": "Kommandofel",
     "Commands": "Kommandon",
     "Confirm password": "Bekräfta lösenord",
@@ -54,7 +38,6 @@
     "Cryptography": "Kryptografi",
     "Current password": "Nuvarande lösenord",
     "Custom level": "Anpassad nivå",
-    "/ddg is not a command": "/ddg är inte ett kommando",
     "Deactivate Account": "Inaktivera konto",
     "Decrypt %(text)s": "Avkryptera %(text)s",
     "Deops user with given id": "Degraderar användaren med givet ID",
@@ -65,10 +48,8 @@
     "Email": "E-post",
     "Email address": "E-postadress",
     "Emoji": "Emoji",
-    "%(senderName)s ended the call.": "%(senderName)s avslutade samtalet.",
     "Error": "Fel",
     "Error decrypting attachment": "Fel vid avkryptering av bilagan",
-    "Existing Call": "Existerande samtal",
     "Export": "Exportera",
     "Export E2E room keys": "Exportera krypteringsrumsnycklar",
     "Failed to ban user": "Misslyckades att banna användaren",
@@ -77,7 +58,6 @@
     "Failed to forget room %(errCode)s": "Misslyckades att glömma bort rummet %(errCode)s",
     "Failed to join room": "Misslyckades att gå med i rummet",
     "Failed to kick": "Misslyckades att kicka",
-    "Failed to leave room": "Det gick inte att lämna rummet",
     "Failed to load timeline position": "Misslyckades att hämta positionen på tidslinjen",
     "Failed to mute user": "Misslyckades att tysta användaren",
     "Failed to reject invite": "Misslyckades att avböja inbjudan",
@@ -89,66 +69,48 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Misslyckades att bekräfta e-postadressen: set till att du klickade på länken i e-postmeddelandet",
     "Favourite": "Favoritmarkera",
     "Accept": "Godkänn",
-    "Access Token:": "Åtkomsttoken:",
-    "Active call (%(roomName)s)": "Aktiv samtal (%(roomName)s)",
     "Add": "Lägg till",
     "Admin Tools": "Admin-verktyg",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Kan inte ansluta till hemservern - vänligen kolla din nätverksanslutning, se till att <a>hemserverns SSL-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
     "Close": "Stäng",
-    "Custom": "Egen",
     "Decline": "Avvisa",
-    "Drop File Here": "Dra filen hit",
     "Enter passphrase": "Ange lösenfras",
-    "Error: Problem communicating with the given homeserver.": "Fel: Problem med att kommunicera med den angivna hemservern.",
-    "Failed to fetch avatar URL": "Misslyckades att hämta avatar-URL",
     "Failed to upload profile picture!": "Misslyckades att ladda upp profilbild!",
     "Failure to create room": "Misslyckades att skapa rummet",
     "Favourites": "Favoriter",
-    "Fill screen": "Fyll skärmen",
     "Filter room members": "Filtrera rumsmedlemmar",
     "Forget room": "Glöm bort rum",
     "For security, this session has been signed out. Please sign in again.": "Av säkerhetsskäl har den här sessionen loggats ut. Vänligen logga in igen.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s från %(fromPowerLevel)s till %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Gäster kan inte gå med i det här rummet även om de är uttryckligen inbjudna.",
     "Hangup": "Lägg på",
     "Historical": "Historiska",
     "Home": "Hem",
     "Homeserver is": "Hemservern är",
-    "Identity Server is": "Identitetsservern är",
     "I have verified my email address": "Jag har verifierat min e-postadress",
     "Import": "Importera",
     "Import E2E room keys": "Importera rumskrypteringsnycklar",
-    "Incoming call from %(name)s": "Inkommande samtal från %(name)s",
-    "Incoming video call from %(name)s": "Inkommande videosamtal från %(name)s",
-    "Incoming voice call from %(name)s": "Inkommande röstsamtal från %(name)s",
     "Incorrect username and/or password.": "Fel användarnamn och/eller lösenord.",
     "Incorrect verification code": "Fel verifieringskod",
     "Invalid Email Address": "Ogiltig e-postadress",
     "Invalid file%(extra)s": "Felaktig fil%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s bjöd in %(targetName)s.",
     "Invited": "Inbjuden",
     "Invites": "Inbjudningar",
     "Invites user with given id to current room": "Bjuder in användare med givet ID till detta rum",
     "Sign in with": "Logga in med",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå med som <voiceText>röst</voiceText> eller <videoText>video</videoText>.",
     "Join Room": "Gå med i rum",
-    "%(targetName)s joined the room.": "%(targetName)s gick med i rummet.",
     "Jump to first unread message.": "Hoppa till första olästa meddelandet.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickade %(targetName)s.",
     "Kick": "Kicka",
     "Kicks user with given id": "Kickar användaren med givet ID",
     "Labs": "Experiment",
     "Last seen": "Senast sedd",
     "Leave room": "Lämna rummet",
-    "%(targetName)s left the room.": "%(targetName)s lämnade rummet.",
     "Logout": "Logga ut",
     "Low priority": "Låg prioritet",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde framtida rumshistorik synligt för alla.",
-    "Manage Integrations": "Hantera integrationer",
     "Missing room_id in request": "room_id saknas i förfrågan",
     "Missing user_id in request": "user_id saknas i förfrågan",
     "Moderator": "Moderator",
@@ -158,14 +120,12 @@
     "New passwords must match each other.": "De nya lösenorden måste matcha.",
     "not specified": "inte specificerad",
     "Notifications": "Aviseringar",
-    "(not supported by this browser)": "(stöds inte av webbläsaren)",
     "<not supported>": "<stöds inte>",
     "No display name": "Inget visningsnamn",
     "No more results": "Inga fler resultat",
     "No results": "Inga resultat",
     "No users have specific privileges in this room": "Inga användare har specifika privilegier i det här rummet",
     "OK": "OK",
-    "olm version:": "olm-version:",
     "Only people who have been invited": "Endast inbjudna",
     "Operation failed": "Handlingen misslyckades",
     "Password": "Lösenord",
@@ -174,32 +134,23 @@
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Öppna meddelandet i din e-post och klicka på länken i meddelandet. När du har gjort detta, klicka fortsätt.",
     "Power level must be positive integer.": "Behörighetsnivå måste vara ett positivt heltal.",
-    "Private Chat": "Privatchatt",
     "Privileged Users": "Privilegierade användare",
     "Profile": "Profil",
-    "Public Chat": "Offentlig chatt",
     "Reason": "Orsak",
     "Register": "Registrera",
-    "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
     "Reject invitation": "Avböj inbjudan",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s tog bort sin profilbild.",
     "Remove": "Ta bort",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s begärde ett VoIP-gruppsamtal.",
-    "Results from DuckDuckGo": "Resultat från DuckDuckGo",
     "Return to login screen": "Tillbaka till inloggningsskärmen",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s har inte tillstånd att skicka aviseringar - kontrollera webbläsarens inställningar",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s fick inte tillstånd att skicka aviseringar - försök igen",
     "%(brand)s version:": "%(brand)s-version:",
     "Room %(roomId)s not visible": "Rummet %(roomId)s är inte synligt",
-    "Room Colour": "Rumsfärg",
     "%(roomName)s does not exist.": "%(roomName)s finns inte.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s är inte tillgängligt för tillfället.",
     "Rooms": "Rum",
     "Save": "Spara",
     "Search": "Sök",
     "Search failed": "Sökning misslyckades",
-    "Searches DuckDuckGo for results": "Söker efter resultat på DuckDuckGo",
     "Seen by %(userName)s at %(dateTime)s": "Sedd av %(userName)s %(dateTime)s",
     "Send Reset Email": "Skicka återställningsmeddelande",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s skickade en bild.",
@@ -209,27 +160,19 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Servern kan vara otillgänglig eller överbelastad, eller så stötte du på en bugg.",
     "Server unavailable, overloaded, or something else went wrong.": "Servern är otillgänglig eller överbelastad, eller så gick något annat fel.",
     "Session ID": "Sessions-ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s satte en profilbild.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s bytte sitt visningnamn till %(displayName)s.",
     "Settings": "Inställningar",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Visa tidsstämplar i 12-timmarsformat (t.ex. 2:30em)",
     "Signed Out": "Loggade ut",
     "Sign in": "Logga in",
     "Sign out": "Logga ut",
-    "%(count)s of your messages have not been sent.|other": "Vissa av dina meddelanden har inte skickats.",
     "Someone": "Någon",
     "Start authentication": "Starta autentisering",
     "Cancel": "Avbryt",
     "Create new room": "Skapa nytt rum",
-    "Custom Server Options": "Anpassade serverinställningar",
     "Dismiss": "Avvisa",
     "powered by Matrix": "drivs av Matrix",
-    "Room directory": "Rumskatalog",
     "Start chat": "Starta chatt",
     "unknown error code": "okänd felkod",
-    "Add a widget": "Lägg till en widget",
-    "Allow": "Tillåt",
-    "Cannot add any more widgets": "Kan inte lägga till fler widgets",
     "Delete widget": "Radera widget",
     "Define the power level of a user": "Definiera behörighetsnivå för en användare",
     "Edit": "Ändra",
@@ -238,8 +181,6 @@
     "AM": "FM",
     "PM": "EM",
     "Submit": "Skicka in",
-    "The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillagts till rummet.",
-    "The phone number entered looks invalid": "Det angivna telefonnumret ser ogiltigt ut",
     "This email address is already in use": "Den här e-postadressen används redan",
     "This email address was not found": "Den här e-postadressen finns inte",
     "The email address linked to your account must be entered.": "E-postadressen som är kopplad till ditt konto måste anges.",
@@ -251,7 +192,6 @@
     "This phone number is already in use": "Detta telefonnummer används redan",
     "The version of %(brand)s": "Version av %(brand)s",
     "Call Failed": "Samtal misslyckades",
-    "You are already in a call.": "Du är redan i ett samtal.",
     "You cannot place a call with yourself.": "Du kan inte ringa till dig själv.",
     "Warning!": "Varning!",
     "Upload Failed": "Uppladdning misslyckades",
@@ -284,14 +224,11 @@
     "You are not in this room.": "Du är inte i det här rummet.",
     "You do not have permission to do that in this room.": "Du har inte behörighet att göra det i det här rummet.",
     "Fetching third party location failed": "Misslyckades att hämta platsdata från tredje part",
-    "All notifications are currently disabled for all targets.": "Alla aviseringar är för tillfället avstängda för alla mål.",
-    "Uploading report": "Laddar upp rapport",
     "Sunday": "söndag",
     "Messages sent by bot": "Meddelanden från bottar",
     "Notification targets": "Aviseringsmål",
     "Failed to set direct chat tag": "Misslyckades att markera rummet som direktchatt",
     "Today": "idag",
-    "You are not receiving desktop notifications": "Du får inte skrivbordsaviseringar",
     "Friday": "fredag",
     "Update": "Uppdatera",
     "What's New": "Vad är nytt",
@@ -299,11 +236,6 @@
     "Changelog": "Ändringslogg",
     "Waiting for response from server": "Väntar på svar från servern",
     "Leave": "Lämna",
-    "Uploaded on %(date)s by %(user)s": "Uppladdad av %(user)s vid %(date)s",
-    "Advanced notification settings": "Avancerade aviseringsinställningar",
-    "Forget": "Glöm bort",
-    "You cannot delete this image. (%(code)s)": "Du kan inte radera den här bilden. (%(code)s)",
-    "Cancel Sending": "Avbryt sändning",
     "Warning": "Varning",
     "This Room": "Det här rummet",
     "Noisy": "Högljudd",
@@ -311,13 +243,7 @@
     "Messages containing my display name": "Meddelanden som innehåller mitt visningsnamn",
     "Messages in one-to-one chats": "Meddelanden i en-till-en chattar",
     "Unavailable": "Otillgänglig",
-    "View Decrypted Source": "Visa avkrypterad källa",
-    "Failed to update keywords": "Kunde inte uppdatera nyckelorden",
     "remove %(name)s from the directory.": "ta bort %(name)s från katalogen.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Aviseringar för följande nyckelord följer regler som inte kan visas här:",
-    "Please set a password!": "Vänligen välj ett lösenord!",
-    "You have successfully set a password!": "Du har valt ett nytt lösenord!",
-    "An error occurred whilst saving your email notification preferences.": "Ett fel inträffade då e-postaviseringsinställningarna sparades.",
     "Explore Room State": "Utforska rumsstatus",
     "Source URL": "Käll-URL",
     "Failed to add tag %(tagName)s to room": "Misslyckades att lägga till etiketten %(tagName)s till rummet",
@@ -325,30 +251,16 @@
     "Members": "Medlemmar",
     "No update available.": "Ingen uppdatering tillgänglig.",
     "Resend": "Skicka igen",
-    "Files": "Filer",
     "Collecting app version information": "Samlar in appversionsinformation",
-    "Keywords": "Nyckelord",
-    "Enable notifications for this account": "Aktivera aviseringar för det här kontot",
-    "Messages containing <span>keywords</span>": "Meddelanden som innehåller <span>nyckelord</span>",
-    "Error saving email notification preferences": "Fel när e-postaviseringsinställningarna sparades",
     "Tuesday": "tisdag",
-    "Enter keywords separated by a comma:": "Skriv in nyckelord, separerade med kommatecken:",
     "Search…": "Sök…",
     "Remove %(name)s from the directory?": "Ta bort %(name)s från katalogen?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s använder flera avancerade webbläsaregenskaper, av vilka alla inte stöds eller är experimentella i din nuvarande webbläsare.",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Kom ihåg att du alltid kan välja en e-postadress i dina användarinställningar om du ändrar dig.",
-    "All messages (noisy)": "Alla meddelanden (högljudd)",
     "Saturday": "lördag",
-    "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
-    "Direct Chat": "Direkt-chatt",
     "The server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
     "Reject": "Avböj",
-    "Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet",
     "Monday": "måndag",
     "Remove from Directory": "Ta bort från katalogen",
-    "Enable them now": "Aktivera nu",
     "Collecting logs": "Samlar in loggar",
-    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
     "All Rooms": "Alla rum",
     "Wednesday": "onsdag",
     "You cannot delete this message. (%(code)s)": "Du kan inte radera det här meddelandet. (%(code)s)",
@@ -357,43 +269,27 @@
     "All messages": "Alla meddelanden",
     "Call invitation": "Inbjudan till samtal",
     "Downloading update...": "Laddar ned uppdatering…",
-    "You have successfully set a password and an email address!": "Du har framgångsrikt valt ett lösenord och en e-postadress!",
     "What's new?": "Vad är nytt?",
-    "Notify me for anything else": "Avisera för allt annat",
     "When I'm invited to a room": "När jag bjuds in till ett rum",
-    "Can't update user notification settings": "Kan inte uppdatera användaraviseringsinställningarna",
-    "Notify for all other messages/rooms": "Avisera för alla andra meddelanden/rum",
     "Unable to look up room ID from server": "Kunde inte hämta rums-ID:t från servern",
     "Couldn't find a matching Matrix room": "Kunde inte hitta ett matchande Matrix-rum",
     "Invite to this room": "Bjud in till rummet",
     "Thursday": "torsdag",
-    "Forward Message": "Vidarebefordra meddelande",
     "Back": "Tillbaka",
     "Reply": "Svara",
     "Show message in desktop notification": "Visa meddelande i skrivbordsavisering",
-    "Unhide Preview": "Visa förhandsgranskning",
     "Unable to join network": "Kunde inte ansluta till nätverket",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklagar, din webbläsare kan <b>inte</b> köra %(brand)s.",
     "Messages in group chats": "Meddelanden i gruppchattar",
     "Yesterday": "igår",
     "Error encountered (%(errorDetail)s).": "Fel påträffat (%(errorDetail)s).",
     "Low Priority": "Låg prioritet",
-    "Unable to fetch notification target list": "Kunde inte hämta aviseringsmållistan",
-    "Set Password": "Välj lösenord",
     "Off": "Av",
     "%(brand)s does not know how to join a room on this network": "%(brand)s vet inte hur den ska gå med i ett rum på det här nätverket",
-    "Mentions only": "Endast omnämnande",
     "Failed to remove tag %(tagName)s from room": "Misslyckades att radera etiketten %(tagName)s från rummet",
-    "You can now return to your account after signing out, and sign in on other devices.": "Du kan nu återgå till ditt konto efter att ha loggat ut, och logga in på andra enheter.",
-    "Enable email notifications": "Aktivera e-postaviseringar",
-    "Download this file": "Ladda ner filen",
-    "Failed to change settings": "Misslyckades att spara inställningarna",
     "View Source": "Visa källa",
     "Thank you!": "Tack!",
     "Quote": "Citera",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med din nuvarande webbläsare kan appens utseende vara helt fel, och vissa eller alla egenskaper kommer nödvändigtvis inte att fungera. Om du ändå vill försöka så kan du fortsätta, men gör det på egen risk!",
     "Checking for an update...": "Letar efter uppdateringar…",
-    "Who can access this room?": "Vilka kan komma åt detta rum?",
     "Who can read history?": "Vilka kan läsa historik?",
     "Members only (since the point in time of selecting this option)": "Endast medlemmar (från tidpunkten för när denna inställning valdes)",
     "Members only (since they were invited)": "Endast medlemmar (från när de blev inbjudna)",
@@ -410,16 +306,11 @@
     "You cannot place VoIP calls in this browser.": "Du kan inte ringa VoIP-samtal i den här webbläsaren.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din e-postadress verkar inte vara kopplad till något Matrix-ID på den här hemservern.",
     "Restricted": "Begränsad",
-    "Failed to invite the following users to the %(roomName)s room:": "Misslyckades att bjuda in följande användare till rummet %(roomName)s:",
     "Unable to create widget.": "Kunde inte skapa widgeten.",
     "Ignored user": "Ignorerad användare",
     "You are now ignoring %(userId)s": "Du ignorerar nu %(userId)s",
     "Unignored user": "Avignorerad användare",
     "You are no longer ignoring %(userId)s": "Du ignorerar inte längre %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s bytte sitt visningsnamn till %(displayName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s avbannade %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s drog tillbaka inbjudan för %(targetName)s.",
-    "(no answer)": "(inget svar)",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget har ändrats av %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget har lagts till av %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget har tagits bort av %(senderName)s",
@@ -428,7 +319,6 @@
     "Invite": "Bjud in",
     "Unignore": "Avignorera",
     "Ignore": "Ignorera",
-    "Jump to message": "Hoppa till meddelande",
     "Mention": "Nämn",
     "Voice call": "Röstsamtal",
     "Video call": "Videosamtal",
@@ -466,8 +356,6 @@
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sgick med och lämnade %(count)s gånger",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sgick med och lämnade",
     "And %(count)s more...|other": "Och %(count)s till…",
-    "ex. @bob:example.com": "t.ex. @kalle:exempel.com",
-    "Add User": "Lägg till användare",
     "Matrix ID": "Matrix-ID",
     "Matrix Room ID": "Matrixrums-ID",
     "email address": "e-postadress",
@@ -477,15 +365,10 @@
     "Logs sent": "Loggar skickade",
     "Failed to send logs: ": "Misslyckades att skicka loggar: ",
     "Submit debug logs": "Skicka felsökningsloggar",
-    "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.": "Felsökningsloggar innehåller användningsdata för applikationen inklusive ditt användarnamn, ID:n eller alias för de rum och grupper du har besökt och användarnamn för andra användare. De innehåller inte meddelanden.",
-    "An email has been sent to %(emailAddress)s": "Ett e-postmeddelande har skickats till %(emailAddress)s",
-    "Please check your email to continue registration.": "Vänligen kolla din e-post för att fortsätta registreringen.",
     "Token incorrect": "Felaktig token",
     "A text message has been sent to %(msisdn)s": "Ett SMS har skickats till %(msisdn)s",
     "Please enter the code it contains:": "Vänligen ange koden det innehåller:",
     "Code": "Kod",
-    "Set a display name:": "Ange ett visningsnamn:",
-    "Upload an avatar:": "Ladda upp en avatar:",
     "This server does not support authentication with a phone number.": "Denna server stöder inte autentisering via telefonnummer.",
     "Uploading %(filename)s and %(count)s others|other": "Laddar upp %(filename)s och %(count)s till",
     "Uploading %(filename)s and %(count)s others|zero": "Laddar upp %(filename)s",
@@ -495,25 +378,15 @@
     "Unable to add email address": "Kunde inte lägga till e-postadress",
     "Unable to verify email address.": "Kunde inte verifiera e-postadressen.",
     "Skip": "Hoppa över",
-    "Username not available": "Användarnamn inte tillgängligt",
-    "Username invalid: %(errMessage)s": "Ogiltigt användarnamn: %(errMessage)s",
-    "An error occurred: %(error_string)s": "Ett fel uppstod: %(error_string)s",
-    "Username available": "Användarnamn tillgängligt",
-    "To get started, please pick a username!": "För att komma igång, vänligen välj ett användarnamn!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Det här kommer bli ditt kontonamn på hemservern <span></span>, eller så kan du välja en <a>annan server</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Om du redan har ett Matrix-konto kan du <a>logga in</a> istället.",
     "You must <a>register</a> to use this functionality": "Du måste <a>registrera dig</a> för att använda den här funktionaliteten",
     "You must join the room to see its files": "Du måste gå med i rummet för att se tillhörande filer",
-    "There are no visible files in this room": "Det finns inga synliga filer i det här rummet",
     "Start automatically after system login": "Starta automatiskt vid systeminloggning",
     "This will allow you to reset your password and receive notifications.": "Det här låter dig återställa lösenordet och ta emot aviseringar.",
-    "You have no visible notifications": "Du har inga synliga aviseringar",
     "Failed to upload image": "Misslyckades att ladda upp bild",
     "New Password": "Nytt lösenord",
     "Do you want to set an email address?": "Vill du ange en e-postadress?",
     "Not a valid %(brand)s keyfile": "Inte en giltig %(brand)s-nyckelfil",
     "Authentication check failed: incorrect password?": "Autentiseringskontroll misslyckades: felaktigt lösenord?",
-    "Always show encryption icons": "Visa alltid krypteringsikoner",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s bytte avatar för %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s tog bort rummets avatar.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ändrade rummets avatar till <img/>",
@@ -524,13 +397,8 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
     "You seem to be uploading files, are you sure you want to quit?": "Du verkar ladda upp filer, är du säker på att du vill avsluta?",
     "You seem to be in a call, are you sure you want to quit?": "Du verkar vara i ett samtal, är du säker på att du vill avsluta?",
-    "Active call": "Aktivt samtal",
-    "%(count)s of your messages have not been sent.|one": "Ditt meddelande skickades inte.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Skicka om alla</resendText> eller <cancelText>avbryt alla</cancelText> nu. Du kan även välja enskilda meddelanden för att skicka om eller avbryta.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Skicka om meddelande</resendText> eller <cancelText>avbryt meddelande</cancelText> nu.",
     "Connectivity to the server has been lost.": "Anslutning till servern har brutits.",
     "Sent messages will be stored until your connection has returned.": "Skickade meddelanden kommer att lagras tills anslutningen är tillbaka.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det är ingen annan här! Vill du <inviteText>bjuda in någon</inviteText> eller <nowarnText>sluta varna om det tomma rummet</nowarnText>?",
     "Room": "Rum",
     "Clear filter": "Rensa filter",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Försökte ladda en viss punkt i det här rummets tidslinje, men du har inte behörighet att visa det aktuella meddelandet.",
@@ -545,7 +413,6 @@
     "Failed to copy": "Misslyckades att kopiera",
     "Delete Widget": "Radera widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Att radera en widget tar bort den för alla användare i rummet. Är du säker på att du vill radera den?",
-    "Minimize apps": "Minimera appar",
     "Failed to invite the following users to %(groupId)s:": "Misslyckades att bjuda in följande användare till %(groupId)s:",
     "Failed to invite users to %(groupId)s": "Misslyckades att bjuda in användare till %(groupId)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Det här rummet är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.",
@@ -559,14 +426,7 @@
     "Import room keys": "Importera rumsnycklar",
     "File to import": "Fil att importera",
     "Which officially provided instance you are using, if any": "Vilken officiellt tillhandahållen instans du använder, om någon",
-    "(unknown failure: %(reason)s)": "(okänt fel: %(reason)s)",
-    "(could not connect media)": "(kunde inte ansluta media)",
-    " (unsupported)": " (stöds ej)",
     "Drop file here to upload": "Släpp en fil här för att ladda upp",
-    "Ongoing conference call%(supportedText)s.": "Pågående gruppsamtal%(supportedText)s.",
-    "%(senderName)s sent an image": "%(senderName)s skickade en bild",
-    "%(senderName)s sent a video": "%(senderName)s skickade en video",
-    "%(senderName)s uploaded a file": "%(senderName)s laddade upp en fil",
     "Options": "Alternativ",
     "Replying": "Svarar",
     "Kick this user?": "Kicka användaren?",
@@ -599,22 +459,17 @@
     "We encountered an error trying to restore your previous session.": "Ett fel uppstod vid återställning av din tidigare session.",
     "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "Om du nyligen har använt en senare version av %(brand)s kan din session vara inkompatibel med den här versionen. Stäng det här fönstret och använd senare versionen istället.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Att rensa webbläsarens lagring kan lösa problemet, men då loggas du ut och krypterad chatthistorik blir oläslig.",
-    "Collapse Reply Thread": "Kollapsa svarstråd",
     "Terms and Conditions": "Villkor",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "För att fortsätta använda hemservern %(homeserverDomain)s måste du granska och godkänna våra villkor.",
     "Review terms and conditions": "Granska villkoren",
     "Old cryptography data detected": "Gammal kryptografidata upptäckt",
-    "Unable to capture screen": "Kunde inte ta skärmdump",
     "Failed to add the following rooms to %(groupId)s:": "Misslyckades att lägga till följande rum till %(groupId)s:",
     "Missing roomId.": "Rums-ID saknas.",
     "This room is not recognised.": "Detta rum känns inte igen.",
     "Usage": "Användande",
     "Verified key": "Verifierade nyckeln",
-    "VoIP conference started.": "VoIP-gruppsamtal startat.",
-    "VoIP conference finished.": "VoIP-gruppsamtal avslutat.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s satte framtida rumshistorik till okänd synlighet (%(visibility)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.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas datan bort innan den skickas till servern.",
-    "The remote side failed to pick up": "Mottagaren svarade inte",
     "Jump to read receipt": "Hoppa till läskvitto",
     "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.": "Denna process låter dig exportera nycklarna för meddelanden som du har fått i krypterade rum till en lokal fil. Du kommer sedan att kunna importera filen i en annan Matrix-klient i framtiden, så att den klienten också kan avkryptera meddelandena.",
     "Unknown for %(duration)s": "Okänt i %(duration)s",
@@ -673,7 +528,6 @@
     "Add to community": "Lägg till i gemenskap",
     "Failed to invite users to community": "Misslyckades att bjuda in användare till gemenskapen",
     "Mirror local video feed": "Spegla den lokala videoströmmen",
-    "Community Invites": "Community-inbjudningar",
     "Invalid community ID": "Ogiltigt gemenskaps-ID",
     "'%(groupId)s' is not a valid community ID": "%(groupId)s är inte ett giltigt gemenskaps-ID",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nytt gemenskaps-ID (t.ex. +foo:%(localDomain)s)",
@@ -693,7 +547,6 @@
     "Community Name": "Gemenskapsnamn",
     "Community ID": "Gemenskaps-ID",
     "View Community": "Visa gemenskap",
-    "<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 för din gemenskapssida</h1>\n<p>\n    Använd den långa beskrivningen för att introducera nya medlemmar till gemenskapen, eller dela\n    några viktiga <a href=\"foo\">länkar</a>\n</p>\n<p>\n    Du kan även använda 'img'-taggar\n</p>\n",
     "Add rooms to the community summary": "Lägg till rum i gemenskapsöversikten",
     "Add users to the community summary": "Lägg till användare i gemenskapsöversikten",
     "Failed to update community": "Misslyckades att uppdatera gemenskapen",
@@ -712,7 +565,6 @@
     "Who can join this community?": "Vem kan gå med i denna gemenskap?",
     "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!": "Din gemenskap har ingen lång beskrivning, en HTML-sida att visa för medlemmar.<br />Klicka här för att öppna inställningarna och lägga till en!",
     "Community %(groupId)s not found": "Gemenskapen %(groupId)s hittades inte",
-    "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.": "För att skapa ett filter, dra en gemenskapsavatar till filterpanelen längst till vänster på skärmen. Du kan när som helst klicka på en avatar i filterpanelen för att bara se rum och personer som är associerade med den gemenskapen.",
     "Create a new community": "Skapa en ny gemenskap",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Skapa en gemenskap för att gruppera användare och rum! Bygg en anpassad hemsida för att markera er plats i Matrix-universumet.",
     "Invite to this community": "Bjud in till denna gemenskap",
@@ -735,12 +587,9 @@
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Synligheten för '%(roomName)s' i %(groupId)s kunde inte uppdateras.",
     "Visibility in Room List": "Synlighet i rumslistan",
     "Visible to everyone": "Synligt för alla",
-    "Please select the destination room for this message": "Välj målrum för detta meddelande",
     "Disinvite this user?": "Häv användarens inbjudan?",
     "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 kommer inte att kunna ångra den här ändringen eftersom du degraderar dig själv. Om du är den sista privilegierade användaren i rummet blir det omöjligt att återfå behörigheter.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kommer inte att kunna ångra den här ändringen eftersom du höjer användaren till samma behörighetsnivå som dig själv.",
-    "unknown caller": "okänd uppringare",
-    "To use it, just wait for autocomplete results to load and tab through them.": "För att använda detta, vänta på att autokompletteringen laddas och tabba igenom resultatet.",
     "Enable inline URL previews by default": "Aktivera inbäddad URL-förhandsvisning som standard",
     "Enable URL previews for this room (only affects you)": "Aktivera URL-förhandsvisning för detta rum (påverkar bara dig)",
     "Enable URL previews by default for participants in this room": "Aktivera URL-förhandsvisning som standard för deltagare i detta rum",
@@ -771,12 +620,10 @@
     "Stickerpack": "Dekalpaket",
     "Hide Stickers": "Dölj dekaler",
     "Show Stickers": "Visa dekaler",
-    "Error decrypting audio": "Fel vid avkryptering av ljud",
     "Error decrypting image": "Fel vid avkryptering av bild",
     "Error decrypting video": "Fel vid avkryptering av video",
     "Add an Integration": "Lägg till 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?": "Du kommer att skickas till en tredjepartswebbplats så att du kan autentisera ditt konto för användning med %(integrationsUrl)s. Vill du fortsätta?",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Om du inte anger en e-postadress, kan du inte återställa ditt lösenord. Är du säker?",
     "Popout widget": "Poppa ut widget",
     "were unbanned %(count)s times|other": "blev avbannade %(count)s gånger",
     "were unbanned %(count)s times|one": "blev avbannade",
@@ -787,7 +634,6 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Meddelandesynlighet i Matrix liknar e-post. Att vi glömmer dina meddelanden innebär att meddelanden som du skickat inte delas med några nya eller oregistrerade användare, men registrerade användare som redan har tillgång till meddelandena kommer fortfarande ha tillgång till sin kopia.",
     "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)": "Glöm alla meddelanden som jag har skickat när mitt konto inaktiveras (<b>Varning:</b> detta kommer att göra så att framtida användare får se ofullständiga konversationer)",
     "To continue, please enter your password:": "För att fortsätta, ange ditt lösenord:",
-    "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.": "Om du har anmält en bugg via GitHub, kan felsökningsloggar hjälpa oss spåra problemet. Felsökningsloggarna innehåller användningsdata för applikationen inklusive ditt användarnamn, ID eller alias för rum och grupper du besökt och användarnamn för andra användare. De innehåller inte meddelanden.",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s samlar in anonym statistik för att vi ska kunna förbättra applikationen.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Integritet är viktig för oss, så vi samlar inte in några personliga eller identifierbara uppgifter i våran statistik.",
     "Learn more about how we use analytics.": "Läs mer om hur vi använder statistik.",
@@ -798,10 +644,6 @@
     "Confirm passphrase": "Bekräfta lösenfrasen",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ändrade fastnålade meddelanden för rummet.",
     "Message Pinning": "Fastnålning av meddelanden",
-    "Unpin Message": "Ta bort fastnålning",
-    "No pinned messages.": "Inga fastnålade meddelanden.",
-    "Pinned Messages": "Fastnålade meddelanden",
-    "Pin Message": "Fäst meddelande",
     "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.": "Den exporterade filen kommer att låta de som kan läsa den att dekryptera alla krypterade meddelanden som du kan se, så du bör vara noga med att hålla den säker. För att hjälpa till med detta, bör du ange en lösenfras nedan, som kommer att användas för att kryptera exporterad data. Det kommer bara vara möjligt att importera data genom att använda samma lösenfras.",
     "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.": "Denna process möjliggör import av krypteringsnycklar som tidigare exporterats från en annan Matrix-klient. Du kommer då kunna avkryptera alla meddelanden som den andra klienten kunde avkryptera.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den exporterade filen kommer vara skyddad med en lösenfras. Du måste ange lösenfrasen här, för att avkryptera filen.",
@@ -817,22 +659,12 @@
     "Share Community": "Dela gemenskap",
     "Share Room Message": "Dela rumsmeddelande",
     "Link to selected message": "Länk till valt meddelande",
-    "COPY": "KOPIERA",
-    "Share Message": "Dela meddelande",
     "No Audio Outputs detected": "Inga ljudutgångar hittades",
     "Audio Output": "Ljudutgång",
-    "Call in Progress": "Samtal pågår",
-    "A call is currently being placed!": "Ett samtal håller på att upprättas!",
-    "A call is already in progress!": "Ett samtal pågår redan!",
     "Permission Required": "Behörighet krävs",
     "You do not have permission to start a conference call in this room": "Du har inte behörighet att starta ett gruppsamtal i detta rum",
     "This event could not be displayed": "Den här händelsen kunde inte visas",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "I krypterade rum, som detta, är URL-förhandsvisning inaktiverad som förval för att säkerställa att din hemserver (där förhandsvisningar genereras) inte kan samla information om länkar du ser i rummet.",
-    "The email field must not be blank.": "E-postfältet får inte vara tomt.",
-    "The phone number field must not be blank.": "Telefonnummerfältet får inte vara tomt.",
-    "The password field must not be blank.": "Lösenordsfältet får inte vara tomt.",
-    "Failed to remove widget": "Misslyckades att radera widget",
-    "An error ocurred whilst trying to remove the widget from the room": "Ett fel inträffade vid borttagning av widget från rummet",
     "Demote yourself?": "Degradera dig själv?",
     "Demote": "Degradera",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "När någon lägger en URL i sitt meddelande, kan URL-förhandsgranskning ge mer information om länken, såsom titel, beskrivning, och en bild från webbplatsen.",
@@ -934,7 +766,6 @@
     "Enable big emoji in chat": "Aktivera stora emojier i chatt",
     "Send typing notifications": "Skicka \"skriver\"-statusar",
     "Enable Community Filter Panel": "Aktivera gemenskapsfilterpanel",
-    "Allow Peer-to-Peer for 1:1 calls": "Tillåt peer-to-peer-kommunikation för 1:1-samtal",
     "Messages containing my username": "Meddelanden som innehåller mitt användarnamn",
     "Messages containing @room": "Meddelanden som innehåller @room",
     "Encrypted messages in one-to-one chats": "Krypterade meddelanden i en-till-en chattar",
@@ -1004,7 +835,6 @@
     "Pin": "Häftstift",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Vi har skickat ett e-brev till dig för att verifiera din adress. Följ instruktionerna där och klicka sedan på knappen nedan.",
     "Email Address": "E-postadress",
-    "Add an email address to configure email notifications": "Lägg till en e-postadress för att konfigurera e-postaviseringar",
     "Unable to verify phone number.": "Kunde inte verifiera telefonnumret.",
     "Verification code": "Verifieringskod",
     "Phone Number": "Telefonnummer",
@@ -1045,26 +875,13 @@
     "Set a new status...": "Ange en ny status…",
     "Hide": "Dölj",
     "This homeserver would like to make sure you are not a robot.": "Denna hemserver vill se till att du inte är en robot.",
-    "Server Name": "Servernamn",
-    "The username field must not be blank.": "Användarnamnsfältet får inte vara tomt.",
     "Username": "Användarnamn",
-    "Not sure of your password? <a>Set a new one</a>": "Osäker på ditt lösenord? <a>Ange ett nytt</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Logga in med ditt Matrix-konto på %(serverName)s",
     "Change": "Ändra",
-    "Create your Matrix account on %(serverName)s": "Skapa ditt Matrix-konto på %(serverName)s",
     "Email (optional)": "E-post (valfritt)",
     "Phone (optional)": "Telefon (valfritt)",
     "Confirm": "Bekräfta",
-    "Other servers": "Andra servrar",
-    "Homeserver URL": "Hemserver-URL",
-    "Identity Server URL": "Identitetsserver-URL",
-    "Free": "Gratis",
     "Join millions for free on the largest public server": "Gå med miljontals användare gratis på den största publika servern",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium-servervärd för organisationer <a>Läs mer</a>",
     "Other": "Annat",
-    "Find other public servers or use a custom server": "Hitta andra offentliga servrar eller använd en anpassad server",
-    "Your Matrix account on %(serverName)s": "Ditt Matrix-konto på %(serverName)s",
     "Sign in instead": "Logga in istället",
     "Your password has been reset.": "Ditt lösenord har återställts.",
     "Set a new password": "Ange ett nytt lösenord",
@@ -1073,9 +890,7 @@
     "Create account": "Skapa konto",
     "Registration has been disabled on this homeserver.": "Registrering har inaktiverats på denna hemserver.",
     "Unable to query for supported registration methods.": "Kunde inte fråga efter stödda registreringsmetoder.",
-    "Create your account": "Skapa ditt konto",
     "Retry": "Försök igen",
-    "Don't ask again": "Fråga inte igen",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Lägger till ¯\\_(ツ)_/¯ i början på ett textmeddelande",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s begränsade rummet till endast inbjudna.",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktiverade emblem för %(groups)s i detta rum.",
@@ -1102,7 +917,6 @@
     "Change settings": "Ändra inställningar",
     "Kick users": "Kicka användare",
     "Ban users": "Banna användare",
-    "Remove messages": "Ta bort meddelanden",
     "Notify everyone": "Meddela alla",
     "Send %(eventType)s events": "Skicka %(eventType)s-händelser",
     "Roles & Permissions": "Roller & behörigheter",
@@ -1111,8 +925,6 @@
     "Encryption": "Kryptering",
     "Once enabled, encryption cannot be disabled.": "Efter aktivering kan kryptering inte inaktiveras.",
     "Encrypted": "Krypterat",
-    "Not now": "Inte nu",
-    "Don't ask me again": "Fråga mig inte igen",
     "Error updating main address": "Fel vid uppdatering av huvudadress",
     "Room avatar": "Rumsavatar",
     "Room Name": "Rumsnamn",
@@ -1124,7 +936,6 @@
     "Please supply a https:// or http:// widget URL": "Ange en widget-URL med https:// eller http://",
     "You cannot modify widgets in this room.": "Du kan inte ändra widgets i detta rum.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s återkallade inbjudan för %(targetDisplayName)s att gå med i rummet.",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Visa en påminnelse att sätta på säker meddelandeåterställning i krypterade rum",
     "The other party cancelled the verification.": "Den andra parten avbröt verifieringen.",
     "Verified!": "Verifierad!",
     "You've successfully verified this user.": "Du har verifierat den här användaren.",
@@ -1143,7 +954,6 @@
     "Upgrade this room to the recommended room version": "Uppgradera detta rum till rekommenderad rumsversion",
     "Select the roles required to change various parts of the room": "Välj de roller som krävs för att ändra olika delar av rummet",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Ändringar av vem som kan läsa historiken gäller endast för framtida meddelanden i detta rum. Synligheten för befintlig historik kommer att vara oförändrad.",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meddelanden i detta rum är säkrade med totalsträckskryptering. Bara du och mottagaren/na har nycklarna för att läsa dessa meddelanden.",
     "Failed to revoke invite": "Misslyckades att återkalla inbjudan",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kunde inte återkalla inbjudan. Servern kan ha ett tillfälligt problem eller så har du inte tillräckliga behörigheter för att återkalla inbjudan.",
     "Revoke invite": "Återkalla inbjudan",
@@ -1153,10 +963,7 @@
     "Error updating flair": "Fel vid uppdatering av emblem",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Ett fel inträffade vid uppdatering av emblem för detta rum. Servern kanske inte tillåter det, eller ett så inträffade tillfälligt fel.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifiera denna användare för att markera den som betrodd. Att lita på användare ger en extra sinnesfrid när man använder totalsträckskrypterade meddelanden.",
-    "A widget would like to verify your identity": "En widget vill verifiera din identitet",
-    "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.": "En widget på %(widgetUrl)s vill verifiera din identitet. Genom att tillåta detta kommer widgeten att kunna verifiera ditt användar-ID, men inte agera som dig.",
     "Remember my selection for this widget": "Kom ihåg mitt val för den här widgeten",
-    "Deny": "Neka",
     "Unable to load backup status": "Kunde inte ladda status för säkerhetskopia",
     "Guest": "Gäst",
     "Could not load user profile": "Kunde inte ladda användarprofil",
@@ -1165,14 +972,8 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Just nu är det inte möjligt att svara med en fil. Vill du ladda upp filen utan att svara?",
     "The file '%(fileName)s' failed to upload.": "Filen '%(fileName)s' kunde inte laddas upp.",
     "Composer": "Meddelandefält",
-    "Key backup": "Nyckelsäkerhetskopiering",
-    "Never lose encrypted messages": "Förlora aldrig krypterade meddelanden",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Säkerhetskopiera dina nycklar på ett säkert sätt för att undvika att förlora dem. <a>Lär dig mer.</a>",
     "Failed to load group members": "Misslyckades att ladda gruppmedlemmar",
-    "Maximize apps": "Maximera appar",
     "Join": "Gå med",
-    "Rotate counter-clockwise": "Rotera moturs",
-    "Rotate clockwise": "Rotera medurs",
     "Power level": "Behörighetsnivå",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kunde inte hitta profiler för de Matrix-ID:n som listas nedan - vill du bjuda in dem ändå?",
     "GitHub issue": "GitHub-ärende",
@@ -1186,14 +987,9 @@
     "Manually export keys": "Exportera nycklar manuellt",
     "You'll lose access to your encrypted messages": "Du kommer att förlora åtkomst till dina krypterade meddelanden",
     "Are you sure you want to sign out?": "Är du säker på att du vill logga ut?",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Om du stöter på några buggar eller har återkoppling du vill dela, vänligen meddela oss på GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "För att undvika dubbla ärenden, vänligen <existingIssuesLink>granska befintliga ärenden</existingIssuesLink> först (och lägg till +1) eller <newIssueLink>skapa ett nytt ärende</newIssueLink> om du inte hittar det.",
-    "Report bugs & give feedback": "Rapportera fel och ge återkoppling",
     "Go back": "Gå tillbaka",
     "Room Settings - %(roomName)s": "Rumsinställningar - %(roomName)s",
     "Sign out and remove encryption keys?": "Logga ut och ta bort krypteringsnycklar?",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Ett användarnamn får endast innehålla små bokstäver, siffror och '=_-./'",
-    "Checking...": "Kontrollerar…",
     "To help us prevent this in future, please <a>send us logs</a>.": "För att hjälpa oss att förhindra detta i framtiden, vänligen <a>skicka oss loggar</a>.",
     "Missing session data": "Sessionsdata saknas",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Vissa sessionsdata, inklusive krypteringsnycklar för meddelanden, saknas. Logga ut och logga in för att åtgärda detta genom återställning av nycklarna från säkerhetskopia.",
@@ -1224,7 +1020,6 @@
     "Sends the given message coloured as a rainbow": "Skickar angivet meddelande i regnbågsfärg",
     "Sends the given emote coloured as a rainbow": "Skickar angiven emoji i regnbågsfärg",
     "Displays list of commands with usages and descriptions": "Visar lista över kommandon med användande beskrivningar",
-    "%(senderName)s made no change.": "%(senderName)s gjorde ingen ändring.",
     "Cannot reach homeserver": "Kan inte nå hemservern",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Se till att du har en stabil internetanslutning, eller kontakta serveradministratören",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Be din %(brand)s-administratör att kolla <a>din konfiguration</a> efter felaktiga eller duplicerade poster.",
@@ -1234,17 +1029,11 @@
     "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 kan logga in, men vissa funktioner kommer inte att vara tillgängliga förrän identitetsservern är online igen. Om du fortsätter att se den här varningen, kontrollera din konfiguration eller kontakta en serveradministratör.",
     "No homeserver URL provided": "Ingen hemserver-URL angiven",
     "The user's homeserver does not support the version of the room.": "Användarens hemserver stöder inte versionen av rummet.",
-    "Multiple integration managers": "Flera integrationshanterare",
     "Show hidden events in timeline": "Visa dolda händelser i tidslinjen",
-    "Low bandwidth mode": "Läge för låg bandbredd",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Skicka läskvitton för meddelanden (kräver kompatibel hemserver för att inaktivera)",
     "When rooms are upgraded": "När rum uppgraderas",
     "Accept <policyLink /> to continue:": "Acceptera <policyLink /> för att fortsätta:",
     "ID": "ID",
     "Public Name": "Offentligt namn",
-    "Identity Server URL must be HTTPS": "URL för identitetsserver måste vara HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Inte en giltig identitetsserver (statuskod %(code)s)",
-    "Could not connect to Identity Server": "Kunde inte ansluta till identitetsservern",
     "Checking server": "Kontrollerar servern",
     "Change identity server": "Byt identitetsserver",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Koppla ifrån från identitetsservern <current /> och anslut till <new /> istället?",
@@ -1255,16 +1044,13 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Du <b>delar fortfarande dina personuppgifter</b> på identitetsservern <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Vi rekommenderar att du tar bort dina e-postadresser och telefonnummer från identitetsservern innan du kopplar från.",
     "Disconnect anyway": "Koppla ifrån ändå",
-    "Identity Server (%(server)s)": "Identitetsserver (%(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.": "Du använder för närvarande <server></server> för att upptäcka och upptäckas av befintliga kontakter som du känner. Du kan byta din identitetsserver nedan.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Om du inte vill använda <server /> för att upptäcka och upptäckas av befintliga kontakter som du känner, ange en annan identitetsserver nedan.",
-    "Identity Server": "Identitetsserver",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Du använder för närvarande inte en identitetsserver. Lägg till en nedan om du vill upptäcka och bli upptäckbar av befintliga kontakter som du känner.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Att koppla ifrån din identitetsserver betyder att du inte kan upptäckas av andra användare och att du inte kommer att kunna bjuda in andra via e-post eller telefon.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Att använda en identitetsserver är valfritt. Om du väljer att inte använda en identitetsserver kan du inte upptäckas av andra användare och inte heller bjuda in andra via e-post eller telefon.",
     "Do not use an identity server": "Använd inte en identitetsserver",
     "Enter a new identity server": "Ange en ny identitetsserver",
-    "Integration Manager": "Integrationshanterare",
     "Discovery": "Upptäckt",
     "Deactivate account": "Inaktivera konto",
     "Always show the window menu bar": "Visa alltid fönstermenyn",
@@ -1309,14 +1095,10 @@
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagerade med %(shortName)s</reactedWith>",
     "Edited at %(date)s. Click to view edits.": "Redigerat vid %(date)s. Klicka för att visa redigeringar.",
     "edited": "redigerat",
-    "Sign in to your Matrix account on <underlinedServerName />": "Logga in med ditt Matrix-konto på <underlinedServerName />",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installera <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> för den bästa upplevelsen.",
     "Couldn't load page": "Kunde inte ladda sidan",
     "Want more than a community? <a>Get your own server</a>": "Vill du ha mer än en gemenskap? <a>Skaffa din egen server</a>",
     "This homeserver does not support communities": "Denna hemserver stöder inte gemenskaper",
-    "Explore": "Utforska",
     "Filter": "Filtrera",
-    "Filter rooms…": "Filtrera rum…",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Be administratören för din hemserver (<code>%(homeserverDomain)s</code>) att konfigurera en TURN-server för att samtal ska fungera pålitligt.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativt kan du testa att använda den offentliga servern <code>turn.matrix.org</code>, men det är inte lika pålitligt och det kommer att dela din IP-adress med den servern. Du kan också hantera detta under Inställningar.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varning</b>: Uppgradering av ett rum <i>flyttar inte automatiskt rumsmedlemmar till den nya versionen av rummet.</i> Vi lägger ut en länk till det nya rummet i den gamla versionen av rummet - rumsmedlemmar måste klicka på den här länken för att gå med i det nya rummet.",
@@ -1354,13 +1136,9 @@
     "Connecting to integration manager...": "Ansluter till integrationshanterare…",
     "Cannot connect to integration manager": "Kan inte ansluta till integrationshanteraren",
     "The integration manager is offline or it cannot reach your homeserver.": "Integrationshanteraren är offline eller kan inte nå din hemserver.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Använd en integrationshanterare <b>(%(serverName)s)</b> för att hantera bottar, widgets och dekalpaket.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Använd en integrationshanterare för att hantera bottar, widgets och dekalpaket.",
     "Manage integrations": "Hantera integrationer",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationshanterare får konfigurationsdata och kan ändra widgetar, skicka rumsinbjudningar och ställa in behörighetsnivåer å dina vägnar.",
     "Close preview": "Stäng förhandsgranskning",
     "Room %(name)s": "Rum %(name)s",
-    "Recent rooms": "Senaste rummen",
     "Loading room preview": "Laddar förhandsgranskning av rummet",
     "Re-join": "Gå med igen",
     "Try to join anyway": "Försök att gå med ändå",
@@ -1390,7 +1168,6 @@
     "%(name)s wants to verify": "%(name)s vill verifiera",
     "You sent a verification request": "Du skickade en verifieringsbegäran",
     "Reactions": "Reaktioner",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagerade med %(content)s</reactedWith>",
     "Frequently Used": "Ofta använda",
     "Smileys & People": "Smileys & personer",
     "Animals & Nature": "Djur & natur",
@@ -1410,7 +1187,6 @@
     "%(brand)s URL": "%(brand)s-URL",
     "Room ID": "Rums-ID",
     "Widget ID": "Widget-ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Att använda denna widget kan dela data <helpIcon /> med %(widgetDomain)s och din integrationshanterare.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Att använda denna widget kan dela data <helpIcon /> med %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Widgets använder inte meddelandekryptering.",
     "Widget added by": "Widget tillagd av",
@@ -1441,11 +1217,9 @@
     "Integrations are disabled": "Integrationer är inaktiverade",
     "Enable 'Manage Integrations' in Settings to do this.": "Aktivera \"Hantera integrationer\" i inställningarna för att göra detta.",
     "Integrations not allowed": "Integrationer är inte tillåtna",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Din %(brand)s tillåter dig inte att använda en integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
     "Your homeserver doesn't seem to support this feature.": "Din hemserver verkar inte stödja den här funktionen.",
     "Message edits": "Meddelanderedigeringar",
     "Preview": "Förhandsgranska",
-    "The message you are trying to send is too large.": "Meddelandet du försöker skicka är för stort.",
     "Find others by phone or email": "Hitta andra via telefon eller e-post",
     "Be found by phone or email": "Bli hittad via telefon eller e-post",
     "Terms of Service": "Användarvillkor",
@@ -1456,13 +1230,10 @@
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Om du använder %(brand)s på en enhet där pekskärm är den primära inmatningsmekanismen",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Om du använder %(brand)s som en installerad progressiv webbapp",
     "Your user agent": "Din användaragent",
-    "If you cancel now, you won't complete verifying the other user.": "Om du avbryter nu kommer du inte att verifiera den andra användaren.",
-    "If you cancel now, you won't complete verifying your other session.": "Om du avbryter nu kommer du inte att verifiera din andra session.",
     "Cancel entering passphrase?": "Avbryta inmatning av lösenfras?",
     "Setting up keys": "Sätter upp nycklar",
     "Verify this session": "Verifiera denna session",
     "Encryption upgrade available": "Krypteringsuppgradering tillgänglig",
-    "Set up encryption": "Sätt upp kryptering",
     "Sign In or Create Account": "Logga in eller skapa konto",
     "Use your account or create a new one to continue.": "Använd ditt konto eller skapa ett nytt för att fortsätta.",
     "Create Account": "Skapa konto",
@@ -1483,18 +1254,12 @@
     "Verify session": "Verifiera sessionen",
     "Session name": "Sessionsnamn",
     "Session key": "Sessionsnyckel",
-    "Automatically invite users": "Bjuda in användare automatiskt",
     "Upgrade private room": "Uppgradera privat rum",
     "Upgrade public room": "Uppgradera offentligt rum",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Att uppgradera ett rum är en avancerad åtgärd och rekommenderas vanligtvis när ett rum är instabilt på grund av buggar, saknade funktioner eller säkerhetsproblem.",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Detta påverkar vanligtvis bara hur rummet bearbetas på servern. Om du har problem med %(brand)s, vänligen <a>rapportera ett fel</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du kommer att uppgradera detta rum från <oldVersion /> till <newVersion />.",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Detta gör att du kan återgå till ditt konto efter att du har loggat ut, och logga in på andra sessioner.",
-    "Help": "Hjälp",
-    "Reload": "Ladda om",
-    "Take picture": "Ta bild",
     "Remove for everyone": "Ta bort för alla",
-    "Remove for me": "Ta bort för mig",
     "User Status": "Användarstatus",
     "Confirm your identity by entering your account password below.": "Bekräfta din identitet genom att ange ditt kontolösenord nedan.",
     "Space used:": "Använt utrymme:",
@@ -1534,10 +1299,6 @@
     "Go Back": "Gå tillbaka",
     "Room name or address": "Rummets namn eller adress",
     "%(name)s is requesting verification": "%(name)s begär verifiering",
-    "Use your account to sign in to the latest version": "Använd ditt konto för att logga in till den senaste versionen",
-    "We’re excited to announce Riot is now Element": "Vi är glada att meddela att Riot är nu Element",
-    "Riot is now Element!": "Riot är nu Element!",
-    "Learn More": "Lär mer",
     "Sends a message as html, without interpreting it as markdown": "Skicka ett meddelande som HTML, utan att tolka det som Markdown",
     "Failed to set topic": "Misslyckades med att ställa in ämnet",
     "Community Autocomplete": "Autokomplettering av gemenskaper",
@@ -1603,34 +1364,22 @@
     "Error leaving room": "Fel när rummet lämnades",
     "Help us improve %(brand)s": "Hjälp oss att förbättra %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Skicka <UsageDataLink>anonym användningsdata</UsageDataLink> vilken hjälper oss att förbättra %(brand)s. Detta kommer att använda en <PolicyLink>kaka</PolicyLink>.",
-    "I want to help": "Jag vill hjälpa till",
-    "Review where you’re logged in": "Granska var du är inloggad",
-    "Verify all your sessions to ensure your account & messages are safe": "Verifiera alla dina sessioner för att försäkra att ditt konto och dina meddelanden är säkra",
     "Review": "Granska",
     "Later": "Senare",
     "Your homeserver has exceeded its user limit.": "Din hemserver har överskridit sin användargräns.",
     "Your homeserver has exceeded one of its resource limits.": "Din hemserver har överskridit en av sina resursgränser.",
     "Contact your <a>server admin</a>.": "Kontakta din <a>serveradministratör</a>.",
     "Ok": "OK",
-    "Set password": "Sätt lösenord",
-    "To return to your account in future you need to set a password": "För att komma tillbaka till ditt konto i framtiden behöver du sätta ett lösenord",
     "Set up": "Sätt upp",
     "Upgrade": "Uppgradera",
     "Verify": "Verifiera",
-    "Verify yourself & others to keep your chats safe": "Verifiera dig själv och andra för att hålla dina chattar säkra",
     "Other users may not trust it": "Andra användare kanske inta litar på den",
     "New login. Was this you?": "Ny inloggning. Var det du?",
-    "Verify the new login accessing your account: %(name)s": "Verifiera den nya inloggningen på ditt konto: %(name)s",
-    "Restart": "Starta om",
-    "Upgrade your %(brand)s": "Uppgradera din %(brand)s",
-    "A new version of %(brand)s is available!": "En ny version av %(brand)s är tillgänglig!",
     "The person who invited you already left the room.": "Personen som bjöd in dig har redan lämnat rummet.",
     "The person who invited you already left the room, or their server is offline.": "Personen som bjöd in dig har redan lämnat rummet, eller så är deras server offline.",
     "You joined the call": "Du gick med i samtalet",
     "%(senderName)s joined the call": "%(senderName)s gick med i samtalet",
     "Call in progress": "Samtal pågår",
-    "You left the call": "Du lämnade samtalet",
-    "%(senderName)s left the call": "%(senderName)s lämnade samtalet",
     "Call ended": "Samtalet avslutades",
     "You started a call": "Du startade ett samtal",
     "%(senderName)s started a call": "%(senderName)s startade ett samtal",
@@ -1642,11 +1391,9 @@
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Change notification settings": "Ändra aviseringsinställningar",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Gemenskap-v2-prototyper. Kräver kompatibel hemserver. Väldigt experimentellt - använd varsamt.",
-    "New spinner design": "Ny spinnerdesign",
     "Support adding custom themes": "Stöd tilläggning av anpassade teman",
     "Show message previews for reactions in DMs": "Visa meddelandeförhandsvisningar för reaktioner i DM:er",
     "Show message previews for reactions in all rooms": "Visa meddelandeförhandsvisningar för reaktioner i alla rum",
-    "Enable advanced debugging for the room list": "Aktivera avancerad avbuggning för rumslistan",
     "Show info about bridges in room settings": "Visa info om bryggor i rumsinställningar",
     "Font size": "Teckenstorlek",
     "Use custom size": "Använd anpassad storlek",
@@ -1669,9 +1416,6 @@
     "My Ban List": "Min bannlista",
     "This is your list of users/servers you have blocked - don't leave the room!": "Det här är din lista med användare och server du har blockerat - lämna inte rummet!",
     "Unknown caller": "Okänd uppringare",
-    "Incoming voice call": "Inkommande röstsamtal",
-    "Incoming video call": "Inkommande videosamtal",
-    "Incoming call": "Inkommande samtal",
     "Verify this session by completing one of the following:": "Verifiera den här sessionen genom att fullfölja en av följande:",
     "Scan this unique code": "Skanna den här unika koden",
     "or": "eller",
@@ -1689,20 +1433,12 @@
     "To be secure, do this in person or use a trusted way to communicate.": "För att vara säker, gör det här personligen eller använd en annan pålitlig kommunikationsform.",
     "Lock": "Lås",
     "Your server isn't responding to some <a>requests</a>.": "Din server svarar inte på vissa <a>förfrågningar</a>.",
-    "From %(deviceName)s (%(deviceId)s)": "Från %(deviceName)s (%(deviceId)s)",
     "This bridge was provisioned by <user />.": "Den här bryggan tillhandahålls av <user />.",
     "This bridge is managed by <user />.": "Den här bryggan tillhandahålls av <user />.",
-    "Workspace: %(networkName)s": "Arbetsyta: %(networkName)s",
-    "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Show less": "Visa mindre",
     "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.": "Att byta lösenord återställer just nu alla krypteringsnycklar på alla sessioner, vilket gör krypterad chatthistorik oläslig om du inte först exporterar dina rumsnycklar och sedan importerar dem igen efteråt. Detta kommer att förbättras i framtiden.",
     "Your homeserver does not support cross-signing.": "Din hemserver stöder inte korssignering.",
-    "Cross-signing and secret storage are ready for use.": "Korssignering och hemlig lagring är klara att använda.",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Korssignering är klar att använda, men hemlig lagring används just nu inte för att säkerhetskopiera dina nycklar.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Ditt konto har en korssigneringsidentitet i hemlig lagring, men den är inte betrodd av den här sessionen än.",
-    "Cross-signing and secret storage are not yet set up.": "Korssignering och hemlig lagring har inte blivit uppsatta än.",
-    "Reset cross-signing and secret storage": "Återställ korssignering och hemlig lagring",
-    "Bootstrap cross-signing and secret storage": "Sätt upp korssignering och hemlig lagring",
     "well formed": "välformaterad",
     "unexpected type": "oväntad typ",
     "Cross-signing public keys:": "Publika nycklar för korssignering:",
@@ -1714,7 +1450,6 @@
     "not found locally": "inte hittad lokalt",
     "Self signing private key:": "Privat nyckel för självsignering:",
     "User signing private key:": "Privat nyckel för användarsignering:",
-    "Session backup key:": "Sessionssäkerhetskopieringsnyckel:",
     "Secret storage public key:": "Publik nyckel för hemlig lagring:",
     "in account data": "i kontodata",
     "Homeserver feature support:": "Hemserverns funktionsstöd:",
@@ -1731,9 +1466,6 @@
     "Delete %(count)s sessions|other": "Radera %(count)s sessioner",
     "Delete %(count)s sessions|one": "Radera %(count)s session",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifiera individuellt varje session som används av en användare för att markera den som betrodd, och lita inte på korssignerade enheter.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Cacha krypterade meddelanden säkert lokalt för att de ska visas i sökresultat, med hjälp av ",
-    " to store messages from ": " för att lagra meddelanden från ",
-    "rooms.": "rum.",
     "Manage": "Hantera",
     "Securely cache encrypted messages locally for them to appear in search results.": "Cachar krypterade meddelanden säkert lokalt för att de ska visas i sökresultat.",
     "Enable": "Aktivera",
@@ -1756,15 +1488,10 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Säkerhetskopian har en <validity>ogiltig</validity> signatur från den <verify>overifierade</verify> sessionen <device></device>",
     "Backup is not signed by any of your sessions": "Säkerhetskopian är inte signerad av någon av dina sessioner",
     "This backup is trusted because it has been restored on this session": "Den här säkerhetskopian är betrodd för att den har återställts på den här sessionen",
-    "Backup version: ": "Säkerhetskopiaversion: ",
-    "Algorithm: ": "Algoritm: ",
-    "Backup key stored: ": "Säkerhetskopianyckel lagrad: ",
     "Your keys are <b>not being backed up from this session</b>.": "Dina nycklar <b>säkerhetskopieras inte från den här sessionen</b>.",
     "Back up your keys before signing out to avoid losing them.": "Säkerhetskopiera dina nycklar innan du loggar ut för att undvika att du blir av med dem.",
     "Start using Key Backup": "Börja använda nyckelsäkerhetskopiering",
     "Clear notifications": "Rensa aviseringar",
-    "There are advanced notifications which are not shown here.": "Det finns avancerade aviseringar som inte visas här.",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Du kanske har konfigurerat dem i en annan klient än %(brand)s. Du kan inte ändra dem i %(brand)s men de används ändå.",
     "Enable desktop notifications for this session": "Aktivera skrivbordsaviseringar för den här sessionen",
     "Enable audible notifications for this session": "Aktivera ljudaviseringar för den här sessionen",
     "<a>Upgrade</a> to your own domain": "<a>Uppgradera</a> till din egen domän",
@@ -1786,7 +1513,6 @@
     "Custom theme URL": "Anpassad tema-URL",
     "Add theme": "Lägg till tema",
     "Message layout": "Meddelandearrangemang",
-    "Compact": "Kompakt",
     "Modern": "Modernt",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Sätt namnet för ett teckensnitt installerat på ditt system så kommer %(brand)s att försöka använda det.",
     "Customise your appearance": "Anpassa ditt utseende",
@@ -1796,7 +1522,6 @@
     "Clear cache and reload": "Rensa cache och ladda om",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "För att rapportera ett Matrix-relaterat säkerhetsproblem, vänligen läs Matrix.orgs <a>riktlinjer för säkerhetspublicering</a>.",
     "Keyboard Shortcuts": "Tangentbordsgenvägar",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Anpassa din upplevelse med experimentella funktioner. <a>Lär dig mer</a>.",
     "Ignored/Blocked": "Ignorerade/blockerade",
     "Error adding ignored user/server": "Fel vid tilläggning av användare/server",
     "Something went wrong. Please try again or view your console for hints.": "Någonting gick fel. Vänligen försök igen eller kolla i din konsol efter ledtrådar.",
@@ -1930,13 +1655,11 @@
     "Error removing address": "Fel vi borttagning av adress",
     "Local address": "Lokal adress",
     "Published Addresses": "Publicerade adresser",
-    "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.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt rum. För att publicera en adress måste den ställas in som en lokal adress först.",
     "Other published addresses:": "Andra publicerade adresser:",
     "No other published addresses yet, add one below": "Inga andra publicerade adresser än, lägg till en nedan",
     "New published address (e.g. #alias:server)": "Ny publicerad adress (t.ex. #alias:server)",
     "Local Addresses": "Lokala adresser",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Ange adresser för det här rummet så att användare kan hitta det här rummet via din hemserver (%(localDomain)s)",
-    "Waiting for you to accept on your other session…": "Väntar på att du ska acceptera din andra session…",
     "Waiting for %(displayName)s to accept…": "Väntar på att %(displayName)s ska acceptera…",
     "Accepting…": "Accepterar…",
     "Start Verification": "Starta verifiering",
@@ -1960,10 +1683,8 @@
     "%(count)s sessions|other": "%(count)s sessioner",
     "%(count)s sessions|one": "%(count)s session",
     "Hide sessions": "Dölj sessioner",
-    "Direct message": "Direktmeddelande",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du håller på att ta bort 1 meddelande från %(user)s. Detta kan inte ångras. Vill du fortsätta?",
     "Remove %(count)s messages|one": "Ta bort 1 meddelande",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> i %(roomName)s",
     "Failed to deactivate user": "Misslyckades att inaktivera användaren",
     "This client does not support end-to-end encryption.": "Den här klienten stöder inte totalsträckskryptering.",
     "Security": "Säkerhet",
@@ -1991,7 +1712,6 @@
     "Verification cancelled": "Verifiering avbruten",
     "Compare emoji": "Jämför emoji",
     "Encryption enabled": "Kryptering aktiverad",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meddelanden i det här rummet är totalsträckskrypterade. Lär dig mer och verifiera den här användaren i deras användarprofil.",
     "Encryption not enabled": "Kryptering är inte aktiverad",
     "The encryption used by this room isn't supported.": "Krypteringen som används i det här rummet stöds inte.",
     "You declined": "Du avslog",
@@ -2009,7 +1729,6 @@
     "Information": "Information",
     "QR Code": "QR-kod",
     "Room address": "Rumsadress",
-    "Please provide a room address": "Vänligen välj en rumsadress",
     "This address is available to use": "Adressen är tillgänglig",
     "This address is already in use": "Adressen är upptagen",
     "Sign in with single sign-on": "Logga in med externt konto",
@@ -2054,7 +1773,6 @@
     "Add image (optional)": "Lägg till bild (valfritt)",
     "An image will help people identify your community.": "En bild hjälper folk att identifiera din gemenskap.",
     "Please enter a name for the room": "Vänligen ange ett namn för rummet",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privata rum kan endast hittas och gås med i med inbjudan. Offentliga rum kan hittas och gås med i av vem som helst.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privata rum kan endast hittas och gås med i med inbjudan. Offentliga rum kan hittas och gås med i av vem som helst i den här gemenskapen.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kan inte inaktivera det här senare. Bryggor och bottar kommer inte fungera än.",
     "Enable end-to-end encryption": "Aktivera totalsträckskryptering",
@@ -2064,7 +1782,6 @@
     "Create a private room": "Skapa ett privat rum",
     "Create a room in %(communityName)s": "Skapa ett rum i %(communityName)s",
     "Topic (optional)": "Ämne (valfritt)",
-    "Make this room public": "Gör det här rummet offentligt",
     "Hide advanced": "Dölj avancerat",
     "Show advanced": "Visa avancerat",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Blockera alla som inte är medlem i %(serverName)s från att någonsin gå med i det här rummet.",
@@ -2086,15 +1803,11 @@
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Att verifiera den här enheten kommer att markera den som betrodd, användare som har verifierat dig kommer att lita på den här enheten.",
     "To continue, use Single Sign On to prove your identity.": "För att fortsätta, använd externt konto för att bevisa din identitet.",
     "Click the button below to confirm your identity.": "Klicka på knappen nedan för att bekräfta din identitet.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Misslyckades att bjuda in följande användare till chatten: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Vi kunde inte skapa ditt DM. Vänligen kolla användarna du försöker bjuda in och försök igen.",
     "Something went wrong trying to invite the users.": "Någonting gick fel vid försök att bjuda in användarna.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Vi kunde inte bjuda in de användarna. Vänligen kolla användarna du vill bjuda in och försök igen.",
     "Failed to find the following users": "Misslyckades att hitta följande användare",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Följande användare kanske inte existerar eller är ogiltiga, och kan inte bjudas in: %(csvNames)s",
     "Recently Direct Messaged": "Nyligen direktmeddelade",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Starta en konversation med någon med deras namn, användarnamn (som <userId/>) eller e-postadress.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Bjud in någon med deras namn, användarnamn (som <userId/>) eller e-postadress eller <a>dela det här rummet</a>.",
     "a new master key signature": "en ny huvudnyckelsignatur",
     "a new cross-signing key signature": "en ny korssigneringssignatur",
     "a device cross-signing signature": "en enhets korssigneringssignatur",
@@ -2108,16 +1821,7 @@
     "Confirm by comparing the following with the User Settings in your other session:": "Bekräfta genom att jämföra följande med användarinställningarna i din andra session:",
     "Confirm this user's session by comparing the following with their User Settings:": "Bekräfta den här användarens session genom att jämföra följande med deras användarinställningar:",
     "If they don't match, the security of your communication may be compromised.": "Om de inte matchar så kan din kommunikations säkerhet vara äventyrad.",
-    "Your account is not secure": "Ditt konto är inte säkert",
-    "Your password": "Ditt lösenord",
-    "This session, or the other session": "Den här sessionen, eller den andra sessionen",
-    "The internet connection either session is using": "Internetuppkopplingen en av enheterna använder",
-    "We recommend you change your password and recovery key in Settings immediately": "Vi rekommenderar att du ändrar ditt lösenord och din återställningsnyckel i inställningarna omedelbart",
-    "New session": "Ny session",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Använd den här sessionen för att verifiera en ny och ge den åtkomst till krypterade meddelanden:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Om det inte var du som loggade in i den här sessionen så kan ditt konto vara äventyrat.",
-    "This wasn't me": "Det var inte jag",
-    "Please fill why you're reporting.": "Vänligen fyll i varför du rapporterar.",
+    "Please fill why you're reporting.": "Vänligen fyll i varför du anmäler.",
     "Report Content to Your Homeserver Administrator": "Rapportera innehåll till din hemserveradministratör",
     "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.": "Att rapportera det här meddelandet kommer att skicka dess unika 'händelse-ID' till administratören för din hemserver. Om meddelanden i det här rummet är krypterade kommer din hemserveradministratör inte att kunna läsa meddelandetexten eller se några filer eller bilder.",
     "Send report": "Skicka rapport",
@@ -2137,71 +1841,42 @@
     "Copy": "Kopiera",
     "Command Help": "Kommandohjälp",
     "Upload all": "Ladda upp alla",
-    "Verify other session": "Verifiera annan session",
     "Verification Request": "Verifikationsförfrågan",
     "Wrong file type": "Fel filtyp",
     "Looks good!": "Ser bra ut!",
-    "Wrong Recovery Key": "Fel återställningsnyckel",
-    "Invalid Recovery Key": "Ogiltig återställningsnyckel",
     "Security Phrase": "Säkerhetsfras",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Kunde inte komma åt hemlig lagring. Vänligen verifiera att du matade in rätt återställningslösenfras.",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Ange din säkerhetsfras eller <button>använd din säkerhetsnyckel</button> för att fortsätta.",
     "Security Key": "Säkerhetsnyckel",
     "Use your Security Key to continue.": "Använd din säkerhetsnyckel för att fortsätta.",
     "Restoring keys from backup": "Återställer nycklar från säkerhetskopia",
     "Fetching keys from server...": "Hämtar nycklar från servern…",
     "%(completed)s of %(total)s keys restored": "%(completed)s av %(total)s nycklar återställda",
-    "Recovery key mismatch": "Återställningsnyckeln matchade inte",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Säkerhetskopian kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du matade in rätt återställningsnyckel.",
-    "Incorrect recovery passphrase": "Fel återställningslösenfras",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Säkerhetskopian kunde inte avkrypteras med den här återställningslösenfrasen: vänligen verifiera att du matade in rätt återställningslösenfras.",
     "Unable to restore backup": "Kunde inte återställa säkerhetskopia",
     "No backup found!": "Ingen säkerhetskopia hittad!",
     "Keys restored": "Nycklar återställda",
     "Failed to decrypt %(failedCount)s sessions!": "Misslyckades att avkryptera %(failedCount)s sessioner!",
     "Successfully restored %(sessionCount)s keys": "Återställde framgångsrikt %(sessionCount)s nycklar",
-    "Enter recovery passphrase": "Ange återställningslösenfras",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varning</b>: Du bör endast sätta upp nyckelsäkerhetskopiering från en betrodd dator.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Kom åt din säkra meddelandehistorik och sätt upp säker kommunikation genom att skriva in din återställningslösenfras.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Om du har glömt din återställningslösenfras kan du <button1>använda din återställningsnyckel</button1> eller <button2>ställa in nya återställningsalternativ</button2>",
-    "Enter recovery key": "Skriv in återställningsnyckel",
-    "This looks like a valid recovery key!": "Det här ser ut som en giltig återställningsnyckel!",
-    "Not a valid recovery key": "Inte en giltig återställningsnyckel",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varning</b>: Du bör endast sätta upp nyckelsäkerhetskopiering från en betrodd dator.",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Kom åt din säkra meddelandehistorik och sätt upp säker kommunikation genom att skriva in din återställningsnyckel.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Om du har glömt din återställningsnyckel så kan du <button>sätta upp en ny i återställningsinställningarna</button>",
-    "Resend edit": "Skicka redigering igen",
     "Resend %(unsentCount)s reaction(s)": "Skicka %(unsentCount)s reaktion(er) igen",
-    "Resend removal": "Skicka borttagning igen",
-    "Share Permalink": "Dela permalänk",
     "Report Content": "Rapportera innehåll",
     "This room is public": "Det här rummet är offentligt",
     "Away": "Borta",
     "Country Dropdown": "Land-dropdown",
-    "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.": "Du kan använda de anpassade serveralternativen för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL. Detta gör att du kan använda %(brand)s med ett befintligt Matrix-konto på en annan hemserver.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Saknar publik nyckel för captcha i hemserverns konfiguration. Vänligen rapportera detta till din hemservers administratör.",
     "Please review and accept all of the homeserver's policies": "Vänligen granska och acceptera alla hemserverns policyer",
-    "Unable to validate homeserver/identity server": "Kunde inte validera hemserver/identitetsserver",
-    "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>.": "Ange platsen för din Element Matrix Services-hemserver. Den kan använda ditt eget domännamn eller vara en underdomän till <a>element.io</a>.",
     "Enter password": "Skriv in lösenord",
     "Nice, strong password!": "Bra, säkert lösenord!",
     "Password is allowed, but unsafe": "Lösenordet är tillåtet men osäkert",
     "Keep going...": "Fortsätt…",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ingen identitetsserver är konfigurerad så du kan inte lägga till en e-postadress för att återställa ditt lösenord i framtiden.",
     "Use an email address to recover your account": "Använd en a-postadress för att återställa ditt konto",
     "Enter email address (required on this homeserver)": "Skriv in e-postadress (krävs på den här hemservern)",
     "Doesn't look like a valid email address": "Det ser inte ut som en giltig e-postadress",
     "Passwords don't match": "Lösenorden matchar inte",
     "Other users can invite you to rooms using your contact details": "Andra användare kan bjuda in dig till rum med dina kontaktuppgifter",
     "Enter phone number (required on this homeserver)": "Skriv in telefonnummer (krävs på den här hemservern)",
-    "Doesn't look like a valid phone number": "Det ser inte ut som ett giltigt telefonnummer",
     "Use lowercase letters, numbers, dashes and underscores only": "Använd endast små bokstäver, siffror, bindestreck och understreck",
     "Enter username": "Skriv in användarnamn",
-    "Create your Matrix account on <underlinedServerName />": "Skapa ditt Matrix-konto på <underlinedServerName />",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Sätt en e-postadress för kontoåterställning. Använd valfritt en e-postadress eller ett telefonnummer för kunna upptäckas av existerande kontakter.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Sätt en e-postadress för kontoåterställning. Använd valfritt en e-postadress för kunna upptäckas av existerande kontakter.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Skriv in din hemserver-URL <a>Vad betyder det här?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Skriv in din anpassade identitetsserver-URL <a>Vad betyder det här?</a>",
     "Sign in with SSO": "Logga in med SSO",
     "No files visible in this room": "Inga filer synliga i det här rummet",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Bifoga filer från chatten eller dra och släpp dem vart som helst i rummet.",
@@ -2211,10 +1886,8 @@
     "Explore Public Rooms": "Utforska offentliga rum",
     "Create a Group Chat": "Skapa en gruppchatt",
     "Explore rooms": "Utforska rum",
-    "Self-verification request": "Självverifieringsförfrågan",
     "%(creator)s created and configured the room.": "%(creator)s skapade och konfigurerade rummet.",
     "You’re all caught up": "Du är ikapp",
-    "You have no visible notifications in this room.": "Du har inga synliga aviseringar i det här rummet.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s misslyckades att hämta protokollistan från hemservern. Hemservern kan vara för gammal för att stödja tredjepartsnätverk.",
     "%(brand)s failed to get the public room list.": "%(brand)s misslyckades att hämta listan över offentliga rum.",
     "The homeserver may be unavailable or overloaded.": "Hemservern kan vara otillgänglig eller överbelastad.",
@@ -2225,7 +1898,6 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Hitta ett rum… (t.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>.": "Om du inte hittar rummet du letar efter, be om en inbjudan eller <a>skapa ett nytt rum</a>.",
     "Explore rooms in %(communityName)s": "Utforska rum i %(communityName)s",
-    "Search rooms": "Sök bland rum",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s olästa aviseringar i en tidigare version av det här rummet.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Du har %(count)s oläst avisering i en tidigare version av det här rummet.",
     "Create community": "Skapa gemenskap",
@@ -2243,8 +1915,6 @@
     "Verify this login": "Verifiera den här inloggningen",
     "Session verified": "Session verifierad",
     "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.": "Om du ändrar lösenordet så kommer alla nycklar för totalsträckskryptering att återställas på alla dina sessioner, vilket gör krypterad chatthistorik oläslig. Ställ in nyckelsäkerhetskopiering eller exportera dina rumsnycklar från en annan session innan du återställer lösenordet.",
-    "Your Matrix account on <underlinedServerName />": "Ditt Matrix-konto på <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetsserver konfigurerad: lägg till en i serverinställningarna för att återställa ditt konto.",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Ett e-brev för verifiering skickas till din inkorg för att bekräfta ditt nya lösenord.",
     "Invalid homeserver discovery response": "Ogiltigt hemserverupptäcktssvar",
     "Failed to get autodiscovery configuration from server": "Misslyckades att få konfiguration för autoupptäckt från servern",
@@ -2259,7 +1929,6 @@
     "There was an error updating your community. The server is unable to process your request.": "Ett fel inträffade vid uppdatering av din gemenskap. Serven kan inte behandla din begäran.",
     "Update community": "Uppdatera gemenskap",
     "May include members not in %(communityName)s": "Kan inkludera medlemmar som inte är i %(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>.": "Starta en konversation med någon med deras namn, användarnamn (som <userId/>) eller e-postadress. Detta kommer inte att bjuda in dem till %(communityName)s. För att bjuda in någon till %(communityName)s, klicka <a>här</a>.",
     "Syncing...": "Synkar…",
     "Signing In...": "Loggar in…",
     "If you've joined lots of rooms, this might take a while": "Om du har gått med i många rum kan det här ta ett tag",
@@ -2268,18 +1937,8 @@
     "<a>Log in</a> to your new account.": "<a>Logga in</a> i ditt nya konto.",
     "You can now close this window or <a>log in</a> to your new account.": "Du kan nu stänga det här fönstret eller <a>logga in</a> i ditt nya konto.",
     "Registration Successful": "Registrering lyckades",
-    "Use Recovery Key or Passphrase": "Använd återställningsnyckel eller -lösenfras",
-    "Use Recovery Key": "Använd återställningsnyckel",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Bekräfta din identitet genom att verifiera den här inloggningen från en av dina andra sessioner och ge den åtkomst till krypterade meddelanden.",
-    "This requires the latest %(brand)s on your other devices:": "Det här kräver den senaste %(brand)s på dina andra enheter:",
-    "%(brand)s Web": "%(brand)s webb",
-    "%(brand)s Desktop": "%(brand)s skrivbord",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Android": "%(brand)s Android",
-    "or another cross-signing capable Matrix client": "eller en annan Matrix-klient som stöder korssignering",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Din nya session har nu verifierats. Den har tillgång till dina krypterade meddelanden, och andra användare kommer att se den som betrodd.",
     "Your new session is now verified. Other users will see it as trusted.": "Din nya session har nu verifierats. Andra användare kommer att se den som betrodd.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Utan att slutföra säkerheten på den här sessionen får den inte tillgång till krypterade meddelanden.",
     "Failed to re-authenticate due to a homeserver problem": "Misslyckades att återautentisera p.g.a. ett hemserverproblem",
     "Failed to re-authenticate": "Misslyckades att återautentisera",
     "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.": "Återfå tillgång till ditt konto och återställ krypteringsnycklar som lagrats i den här sessionen. Utan dem kan du inte läsa alla dina säkra meddelanden i någon session.",
@@ -2291,7 +1950,6 @@
     "Clear personal data": "Rensa personlig information",
     "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.": "Varning: Din personliga information (inklusive krypteringsnycklar) lagras fortfarande i den här sessionen. Rensa den om du är färdig med den här sessionen, eller vill logga in på ett annat konto.",
     "Command Autocomplete": "Autokomplettering av kommandon",
-    "DuckDuckGo Results": "DuckDuckGo-resultat",
     "Emoji Autocomplete": "Autokomplettering av emoji",
     "Notification Autocomplete": "Autokomplettering av aviseringar",
     "Room Autocomplete": "Autokomplettering av rum",
@@ -2309,14 +1967,10 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Du kommer behöva autentisera mot servern för att bekräfta uppgraderingen.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Uppgradera den här sessionen för att låta den verifiera andra sessioner, för att ge dem åtkomst till krypterade meddelanden och markera dem som betrodda för andra användare.",
     "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.": "Ange en säkerhetsfras endast du känner till, eftersom den används för att hålla din data säker. För att vara säker bör inte återanvända ditt kontolösenord.",
-    "Enter a recovery passphrase": "Ange en återställningslösenfras",
-    "Great! This recovery passphrase looks strong enough.": "Strålande! Den här återställningslösenfrasen ser stark nog ut.",
     "That matches!": "Det matchar!",
     "Use a different passphrase?": "Använd en annan lösenfras?",
     "That doesn't match.": "Det matchar inte.",
     "Go back to set it again.": "Gå tillbaka och sätt den igen.",
-    "Enter your recovery passphrase a second time to confirm it.": "Ange din återställningslösenfras en gång till för att bekräfta den.",
-    "Confirm your recovery passphrase": "Bekräfta din återställningslösenfras",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Förvara din säkerhetsnyckel någonstans säkert, som en lösenordshanterare eller ett kassaskåp, eftersom den används för att skydda dina krypterade data.",
     "Download": "Ladda ner",
     "Unable to query secret storage status": "Kunde inte fråga efter status på hemlig lagring",
@@ -2328,38 +1982,24 @@
     "Confirm Security Phrase": "Bekräfta säkerhetsfras",
     "Save your Security Key": "Spara din säkerhetsnyckel",
     "Unable to set up secret storage": "Kunde inte sätta upp hemlig lagring",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Vi lagrar en krypterad kopia av dina nycklar på vår server. Säkra din säkerhetskopia med en återställningslösenfras.",
     "For maximum security, this should be different from your account password.": "För maximal säkerhet bör det här skilja sig från ditt kontolösenord.",
-    "Set up with a recovery key": "Sätt en återställningsnyckel",
-    "Please enter your recovery passphrase a second time to confirm.": "Vänligen ange din återställningslösenfras en gång till för att bekräfta.",
-    "Repeat your recovery passphrase...": "Repetera din återställningslösenfras…",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Din återställningsnyckel är ett skyddsnät - du kan använda den för att återfå åtkomst till dina krypterade meddelanden om du glömmer din återställningslösenfras.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Förvara en kopia av den någonstans säkert, som en lösenordshanterare eller till och med ett kassaskåp.",
-    "Your recovery key": "Din återställningsnyckel",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Din återställningsnyckel har <b>kopierats till ditt klippbord</b>, klistra in den i:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Din återställningsnyckel är i din <b>Hämtningar</b>-mapp.",
     "<b>Print it</b> and store it somewhere safe": "<b>Skriv ut den</b> och förvara den någonstans säkert",
     "<b>Save it</b> on a USB key or backup drive": "<b>Spara den</b> på ett USB-minne eller en säkerhetskopieringshårddisk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiera den</b> till din personliga molnlagring",
     "Your keys are being backed up (the first backup could take a few minutes).": "Dina nycklar säkerhetskopieras (den första säkerhetskopieringen kan ta några minuter).",
     "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.": "Om du inte ställer in säker meddelandeåterställning kommer du inte kunna återställa din krypterade meddelandehistorik om du loggar ut eller använder en annan session.",
     "Set up Secure Message Recovery": "Ställ in säker meddelandeåterställning",
-    "Secure your backup with a recovery passphrase": "Säkra din säkerhetskopia med en återställningslösenfras",
-    "Make a copy of your recovery key": "Ta en kopia av din återställningsnyckel",
     "Starting backup...": "Startar säkerhetskopiering…",
     "Success!": "Framgång!",
     "Create key backup": "Skapa nyckelsäkerhetskopia",
     "Unable to create key backup": "Kunde inte skapa nyckelsäkerhetskopia",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Om du inte ställer in säker meddelandeåterställning så kommer du förlora åtkomst till din säkra meddelandehistorik när du loggar ut.",
-    "If you don't want to set this up now, you can later in Settings.": "Om du inte vill ställa in det här nu så kan du göra det senare i inställningarna.",
     "New Recovery Method": "Ny återställningsmetod",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "En ny återställningslösenfras och -nyckel för säkra meddelanden har hittats.",
     "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.": "Om du inte har ställt in den nya återställningsmetoden kan en angripare försöka komma åt ditt konto. Ändra ditt kontolösenord och ställ in en ny återställningsmetod omedelbart i inställningarna.",
     "This session is encrypting history using the new recovery method.": "Den här sessionen krypterar historik med den nya återställningsmetoden.",
     "Go to Settings": "Gå till inställningarna",
     "Set up Secure Messages": "Ställ in säkra meddelanden",
     "Recovery Method Removed": "Återställningsmetod borttagen",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Den här sessionen har detekterat att din återställningslösenfras och -nyckel för säkra meddelanden har tagits bort.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Om du gjorde det av misstag kan du ställa in säkra meddelanden på den här sessionen som krypterar sessionens meddelandehistorik igen med en ny återställningsmetod.",
     "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.": "Om du inte tog bort återställningsmetoden kan en angripare försöka komma åt ditt konto. Ändra ditt kontolösenord och ställ in en ny återställningsmetod omedelbart i inställningarna.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Om den är inaktiverad visas inte meddelanden från krypterade rum i sökresultaten.",
@@ -2396,10 +2036,6 @@
     "Unknown App": "Okänd app",
     "%(count)s results|one": "%(count)s resultat",
     "Room Info": "Rumsinfo",
-    "Apps": "Appar",
-    "Unpin app": "Avfäst app",
-    "Edit apps, bridges & bots": "Redigera appar, bryggor och bottar",
-    "Add apps, bridges & bots": "Lägg till appar, bryggor och bottar",
     "Not encrypted": "Inte krypterad",
     "About": "Om",
     "%(count)s people|other": "%(count)s personer",
@@ -2407,34 +2043,22 @@
     "Show files": "Visa filer",
     "Room settings": "Rumsinställningar",
     "Take a picture": "Ta en bild",
-    "Pin to room": "Fäst i rum",
-    "You can only pin 2 apps at a time": "Du kan bara fästa två appar på en gång",
     "Unpin": "Avfäst",
-    "Group call modified by %(senderName)s": "Gruppsamtal ändrat av %(senderName)s",
-    "Group call started by %(senderName)s": "Gruppsamtal startat av %(senderName)s",
-    "Group call ended by %(senderName)s": "Gruppsamtal avslutat av %(senderName)s",
     "Cross-signing is ready for use.": "Korssignering är klart att användas.",
     "Cross-signing is not set up.": "Korssignering är inte inställt.",
     "Backup version:": "Version av säkerhetskopia:",
     "Algorithm:": "Algoritm:",
-    "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.": "Säkerhetskopiera dina krypteringsnycklar med dina kontodata ifall du förlorar åtkomst till dina sessioner. Dina nycklar skyddas med en unik återställningsnyckel.",
     "Backup key stored:": "Lagrad säkerhetskopieringsnyckel:",
     "Backup key cached:": "Cachad säkerhetskopieringsnyckel:",
     "Secret storage:": "Hemlig lagring:",
     "ready": "klart",
     "not ready": "inte klart",
     "Secure Backup": "Säker säkerhetskopiering",
-    "End Call": "Avsluta samtal",
-    "Remove the group call from the room?": "Ta bort gruppsamtalet från rummet?",
-    "You don't have permission to remove the call from the room": "Du har inte behörighet från att ta bort samtalet från rummet",
     "Safeguard against losing access to encrypted messages & data": "Skydda mot att förlora åtkomst till krypterade meddelanden och data",
     "not found in storage": "hittades inte i lagring",
     "Widgets": "Widgets",
     "Edit widgets, bridges & bots": "Redigera widgets, bryggor och bottar",
     "Add widgets, bridges & bots": "Lägg till widgets, bryggor och bottar",
-    "You can only pin 2 widgets at a time": "Du kan bara fästa 2 widgets i taget",
-    "Minimize widget": "Minimera widget",
-    "Maximize widget": "Maximera widget",
     "Your server requires encryption to be enabled in private rooms.": "Din server kräver att kryptering ska användas i privata rum.",
     "Start a conversation with someone using their name or username (like <userId/>).": "Starta en konversation med någon med deras namn eller användarnamn (som <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Detta kommer inte att bjuda in dem till %(communityName)s. För att bjuda in någon till %(communityName)s, klicka <a>här</a>",
@@ -2458,20 +2082,10 @@
     "This version of %(brand)s does not support searching encrypted messages": "Den här versionen av %(brand)s stöder inte sökning bland krypterade meddelanden",
     "Cannot create rooms in this community": "Kan inte skapa rum i den här gemenskapen",
     "You do not have permission to create rooms in this community.": "Du har inte behörighet att skapa rum i den här gemenskapen.",
-    "Calling...": "Ringer…",
-    "Call connecting...": "Samtal ansluts…",
-    "Starting camera...": "Startar kamera…",
-    "Starting microphone...": "Startar mikrofon…",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alla servrar har bannats från att delta! Det här rummet kan inte längre användas.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ändrade server-ACL:erna för det här rummet.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s ställde in server-ACL:er för det här rummet.",
-    "%(senderName)s declined the call.": "%(senderName)s avböjde samtalet.",
-    "(an error occurred)": "(ett fel inträffade)",
-    "(their device couldn't start the camera / microphone)": "(deras enhet kunde inte starta kameran/mikrofonen)",
-    "(connection failed)": "(anslutning misslyckad)",
     "The call could not be established": "Samtalet kunde inte etableras",
-    "The other party declined the call.": "Den andra parten avböjde samtalet.",
-    "Call Declined": "Samtal avböjt",
     "Move right": "Flytta till höger",
     "Move left": "Flytta till vänster",
     "Revoke permissions": "Återkalla behörigheter",
@@ -2546,7 +2160,6 @@
     "Invite by email": "Bjud in via e-post",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Meddelanden i det här rummet är totalsträckskrypterade. När personer går med så kan du verifiera dem i deras profil, bara klicka på deras avatar.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Meddelanden här är totalsträckskrypterade. Verifiera %(displayName)s i deras profil - klicka på deras avatar.",
-    "Role": "Roll",
     "Use the + to make a new room or explore existing ones below": "Använd + för att skapa ett nytt rum eller utforska existerande nedan",
     "This is the start of <roomName/>.": "Det här är början på <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Lägg till en bild, så att folk lätt kan se ditt rum.",
@@ -2557,9 +2170,6 @@
     "Topic: %(topic)s (<a>edit</a>)": "Ämne: %(topic)s (<a>redigera</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Det här är början på din direktmeddelandehistorik med <displayName/>.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Bara ni två är i den här konversationen, om inte någon av er bjuder in någon annan.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Cacha säkert krypterade meddelande lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(count)s rum.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Cacha säkert krypterade meddelande lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(count)s rum.",
-    "Call Paused": "Samtal pausat",
     "%(senderName)s ended the call": "%(senderName)s avslutade samtalet",
     "You ended the call": "Du avslutade samtalet",
     "New version of %(brand)s is available": "Ny version av %(brand)s är tillgänglig",
@@ -2829,9 +2439,7 @@
     "No other application is using the webcam": "Inget annat program använder webbkameran",
     "Permission is granted to use the webcam": "Åtkomst till webbkameran har beviljats",
     "A microphone and webcam are plugged in and set up correctly": "En webbkamera och en mikrofon är inkopplad och korrekt inställd",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "Samtal misslyckades eftersom ingen webbkamera eller mikrofon kunde kommas åt. Kolla att:",
     "Unable to access webcam / microphone": "Kan inte komma åt webbkamera eller mikrofon",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Samtal misslyckades eftersom ingen mikrofon kunde kommas åt. Kolla att en mikrofon är inkopplad och korrekt inställd.",
     "Unable to access microphone": "Kan inte komma åt mikrofonen",
     "See <b>%(msgtype)s</b> messages posted to your active room": "Se <b>%(msgtype)s</b>-meddelanden som skickas i ditt aktiva rum",
     "See <b>%(msgtype)s</b> messages posted to this room": "Se <b>%(msgtype)s</b>-meddelanden som skickas i det här rummet",
@@ -2857,7 +2465,6 @@
     "Continuing without email": "Fortsätter utan e-post",
     "sends confetti": "skickar konfetti",
     "Sends the given message with confetti": "Skickar det givna meddelandet med konfetti",
-    "Show chat effects": "Visa chatteffekter",
     "Effects": "Effekter",
     "Call failed because webcam or microphone could not be accessed. Check that:": "Samtal misslyckades eftersom webbkamera eller mikrofon inte kunde kommas åt. Kolla att:",
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Samtal misslyckades eftersom att mikrofonen inte kunde kommas åt. Kolla att en mikrofon är inkopplat och korrekt inställd.",
@@ -2918,7 +2525,6 @@
     "There was an error finding this widget.": "Ett fel inträffade vid sökning efter widgeten.",
     "Active Widgets": "Aktiva widgets",
     "Open dial pad": "Öppna knappsats",
-    "Start a Conversation": "Starta en konversation",
     "Dial pad": "Knappsats",
     "There was an error looking up the phone number": "Ett fel inträffade vid uppslagning av telefonnumret",
     "Unable to look up phone number": "Kunde inte slå upp telefonnumret",
@@ -2927,13 +2533,10 @@
     "Remember this": "Kom ihåg det här",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "Den här widgeten kommer att verifiera ditt användar-ID, men kommer inte kunna utföra handlingar som dig:",
     "Allow this widget to verify your identity": "Tillåt att den här widgeten verifierar din identitet",
-    "We recommend you change your password and Security Key in Settings immediately": "Vi rekommenderar att du ändrar ditt lösenord och din säkerhetsnyckel i inställningarna omedelbart",
     "Set my room layout for everyone": "Sätt mitt rumsarrangemang för alla",
     "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.": "Säkerhetskopiera dina krypteringsnycklar med din kontodata ifall du skulle förlora åtkomst till dina sessioner. Dina nycklar kommer att säkras med en unik säkerhetsnyckel.",
     "Channel: <channelLink/>": "Kanal: <channelLink/>",
     "Workspace: <networkLink/>": "Arbetsyta: <networkLink/>",
-    "Use Ctrl + F to search": "Använd Ctrl + F för att söka",
-    "Use Command + F to search": "Använd kommando (⌘) + F för att söka",
     "Change which room, message, or user you're viewing": "Ändra vilket rum, vilket meddelande eller vilken användare du ser",
     "%(senderName)s has updated the widget layout": "%(senderName)s har uppdaterat widgetarrangemanget",
     "Converts the DM to a room": "Konverterar DMet till ett rum",
@@ -2943,7 +2546,6 @@
     "Use app": "Använd app",
     "Great! This Security Phrase looks strong enough.": "Fantastiskt! Den här säkerhetsfrasen ser tillräckligt stark ut.",
     "Set up with a Security Key": "Ställ in med en säkerhetsnyckel",
-    "Please enter your Security Phrase a second time to confirm.": "Vänligen ange din säkerhetsfras en gång till för att bekräfta.",
     "Repeat your Security Phrase...": "Repetera din säkerhetsfras…",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Din säkerhetsnyckel är ett skyddsnät - du kan använda den för att återfå åtkomst till dina krypterade meddelanden om du glömmer din säkerhetsfras.",
     "Your Security Key": "Din säkerhetsnyckel",
@@ -2972,9 +2574,6 @@
     "Use Security Key or Phrase": "Använd säkerhetsnyckel eller -fras",
     "Use Security Key": "Använd säkerhetsnyckel",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Vi kommer att lagra en krypterad kopia av dina nycklar på våran server. Säkra din säkerhetskopia med en säkerhetsfras.",
-    "Windows": "Fönster",
-    "Screens": "Skärmar",
-    "Share your screen": "Dela din skärm",
     "Recently visited rooms": "Nyligen besökta rum",
     "Show line numbers in code blocks": "Visa radnummer i kodblock",
     "Expand code blocks by default": "Expandera kodblock för förval",
@@ -2984,7 +2583,6 @@
     "Try again": "Försök igen",
     "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.": "Vi bad webbläsaren att komma ihåg vilken hemserver du använder för att logga in, men tyvärr har din webbläsare glömt det. Gå till inloggningssidan och försök igen.",
     "We couldn't log you in": "Vi kunde inte logga in dig",
-    "Upgrade to pro": "Uppgradera till pro",
     "Minimize dialog": "Minimera dialog",
     "Maximize dialog": "Maximera dialog",
     "%(hostSignupBrand)s Setup": "inställning av %(hostSignupBrand)s",
@@ -3021,22 +2619,14 @@
     "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",
@@ -3044,25 +2634,9 @@
     "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.",
@@ -3071,9 +2645,7 @@
     "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.",
@@ -3081,19 +2653,12 @@
     "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",
@@ -3104,40 +2669,28 @@
     "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",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verifiera den här inloggningen för att komma åt dina krypterade meddelanden och visa för andra att den här inloggningen verkligen är du.",
-    "Verify with another session": "Verifiera med en annan session",
     "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Vi kommer att skapa rum för varje. Du kan lägga till fler senare, inklusive såna som redan finns.",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Låt oss skapa ett rum för varje. Du kan lägga till fler sen, inklusive såna som redan finns.",
     "Make sure the right people have access. You can invite more later.": "Se till att rätt personer har tillgång. Du kan bjuda in fler senare.",
     "A private space to organise your rooms": "Ett privat utrymme för att organisera dina rum",
     "Just me": "Bara jag",
@@ -3148,25 +2701,17 @@
     "Private space": "Privat utrymme",
     "Public space": "Offentligt utrymme",
     "<inviter/> invites you": "<inviter/> bjuder in dig",
-    "Search names and description": "Sök bland namn och beskrivningar",
-    "Create room": "Skapa rum",
     "You may want to try a different search or check for typos.": "Du kanske vill pröva en annan söksträng eller kolla efter felstavningar.",
     "No results found": "Inga resultat funna",
     "Mark as suggested": "Markera som föreslaget",
     "Mark as not suggested": "Markera som inte föreslaget",
     "Removing...": "Tar bort…",
     "Failed to remove some rooms. Try again later": "Misslyckades att ta bort vissa rum. Försök igen senare",
-    "%(count)s rooms and 1 space|one": "%(count)s rum och 1 utrymme",
-    "%(count)s rooms and 1 space|other": "%(count)s rum och 1 utrymme",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s rum och %(numSpaces)s utrymmen",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s rum och %(numSpaces)s utrymmen",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Om du inte hittar rummet du letar efter, be om en inbjudan eller <a>skapa ett nytt rum</a>.",
     "Suggested": "Föreslaget",
     "This room is suggested as a good one to join": "Det här rummet föreslås som ett bra att gå med i",
     "%(count)s rooms|one": "%(count)s rum",
     "%(count)s rooms|other": "%(count)s rum",
     "You don't have permission": "Du har inte behörighet",
-    "Open": "Öppna",
     "%(count)s messages deleted.|one": "%(count)s meddelande raderat.",
     "%(count)s messages deleted.|other": "%(count)s meddelanden raderade.",
     "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.": "Detta påverkar normalt bara hur rummet hanteras på serven. Om du upplever problem med din %(brand)s, vänligen rapportera en bugg.",
@@ -3176,25 +2721,17 @@
     "Invite with email or username": "Bjud in med e-postadress eller användarnamn",
     "You can change these anytime.": "Du kan ändra dessa när som helst.",
     "Add some details to help people recognise it.": "Lägg till några detaljer för att hjälpa folk att känn igen det.",
-    "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.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Från %(deviceName)s %(deviceId)s på %(ip)s",
     "Check your devices": "Kolla dina enheter",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "En ny inloggning kommer åt ditt konto: %(name)s %(deviceID)s på %(ip)s",
     "You have unverified logins": "Du har overifierade inloggningar",
     "%(count)s people you know have already joined|other": "%(count)s personer du känner har redan gått med",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Om du gör det, observera att inga av dina meddelanden kommer att raderas, men din sökupplevelse kommer att degraderas en stund medans registret byggs upp igen",
     "What are some things you want to discuss in %(spaceName)s?": "Vad är några saker du vill diskutera i %(spaceName)s?",
     "You can add more later too, including already existing ones.": "Du kan lägga till flera senare också, inklusive redan existerande.",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Tillfrågar %(transferTarget)s. <a>%(transferTarget)sÖverför till %(transferee)s</a>",
     "Review to ensure your account is safe": "Granska för att försäkra dig om att ditt konto är säkert",
     "%(deviceId)s from %(ip)s": "%(deviceId)s från %(ip)s",
-    "Send and receive voice messages (in development)": "Skicka och ta emot röstmeddelanden (under utveckling)",
     "unknown person": "okänd person",
     "Warn before quitting": "Varna innan avslutning",
     "Invite to just this room": "Bjud in till bara det här rummet",
-    "Invite messages are hidden by default. Click to show the message.": "Inbjudningsmeddelanden är dolda som förval. Klicka för att visa meddelandet.",
-    "Record a voice message": "Spela in ett röstmeddelande",
-    "Stop & send recording": "Stoppa och skicka inspelning",
     "Accept on your other login…": "Acceptera på din andra inloggning…",
     "%(count)s people you know have already joined|one": "%(count)s person du känner har redan gått med",
     "Quick actions": "Snabbhandlingar",
@@ -3212,7 +2749,6 @@
     "Verification requested": "Verifiering begärd",
     "Sends the given message as a spoiler": "Skickar det angivna meddelandet som en spoiler",
     "Manage & explore rooms": "Hantera och utforska rum",
-    "Message search initilisation failed": "Initialisering av meddelandesökning misslyckades",
     "Please choose a strong password": "Vänligen välj ett starkt lösenord",
     "Use another login": "Använd annan inloggning",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Verifiera din identitet för att komma åt krypterade meddelanden och bevisa din identitet för andra.",
@@ -3244,19 +2780,14 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Välj rum eller konversationer att lägga till. Detta är bara ett utrymmer för dig, ingen kommer att informeras. Du kan lägga till fler senare.",
     "What do you want to organise?": "Vad vill du organisera?",
     "Filter all spaces": "Filtrera alla utrymmen",
-    "Delete recording": "Radera inspelningen",
-    "Stop the recording": "Stoppa inspelningen",
     "%(count)s results in all spaces|one": "%(count)s resultat i alla utrymmen",
     "%(count)s results in all spaces|other": "%(count)s resultat i alla utrymmen",
     "You have no ignored users.": "Du har inga ignorerade användare.",
     "Play": "Spela",
     "Pause": "Pausa",
     "Message search initialisation failed": "Initialisering av meddelandesökning misslyckades",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "För att se %(spaceName)s, aktivera <a>utrymmesbetan</a>",
-    "Spaces are a beta feature.": "Utrymmen är en betafunktion.",
     "Search names and descriptions": "Sök namn och beskrivningar",
     "Select a room below first": "Välj ett rum nedan först",
-    "Communities are changing to Spaces": "Gemenskaper byts ut mot utrymmen",
     "Join the beta": "Gå med i betan",
     "Leave the beta": "Lämna betan",
     "Beta": "Beta",
@@ -3267,13 +2798,10 @@
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Din plattform och ditt användarnamn kommer att noteras för att hjälpa oss att använda din återkoppling så mycket vi kan.",
     "%(featureName)s beta feedback": "%(featureName)s betaåterkoppling",
     "Thank you for your feedback, we really appreciate it.": "Tack för din återkoppling, vi uppskattar det verkligen.",
-    "Beta feedback": "Betaåterkoppling",
     "Want to add a new room instead?": "Vill du lägga till ett nytt rum istället?",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Lägger till rum…",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Lägger till rum… (%(progress)s av %(count)s)",
     "Not all selected were added": "Inte alla valda tillades",
-    "You can add existing spaces to a space.": "Du kan lägga till existerande utrymmen till ett utrymme.",
-    "Feeling experimental?": "Känner du dig äventyrlig?",
     "You are not allowed to view this server's rooms list": "Du tillåts inte att se den här serverns rumslista",
     "Add reaction": "Lägg till reaktion",
     "Error processing voice message": "Fel vid hantering av röstmeddelande",
@@ -3284,20 +2812,11 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Känner du dig äventyrlig? Experiment är det bästa sättet att få saker tidigt, testa nya funktioner och hjälpa till att forma dem innan de egentligen släpps <a>Läs mer</a>.",
     "Your access token gives full access to your account. Do not share it with anyone.": "Din åtkomsttoken ger full åtkomst till ditt konto. Dela den inte med någon.",
     "Access Token": "Åtkomsttoken",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "Utrymmen är ett nytt sätt att gruppera rum och personer. För att gå med i existerande utrymme så behöver du en inbjudan.",
     "Please enter a name for the space": "Vänligen ange ett namn för utrymmet",
     "Connecting": "Ansluter",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Tillåt peer-to-peer för 1:1-samtal (om du aktiverar det hör så kan den andra parten kanske se din IP-adress)",
-    "Send and receive voice messages": "Skicka och ta emot röstmeddelanden",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Din återkoppling kommer att hjälpa till att göra utrymmen bättre. Ju fler detaljer du kan ge desto bättre.",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta tillgänglig för webben, skrivbord och Android. Vissa funktioner kan vara otillgängliga på din hemserver.",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "Du kan lämna betan när som helst från inställningarna eller genom att trycka en betabricka, som den ovan.",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s kommer att ladda om med utrymmen aktiverade. Gemenskaper och anpassade taggar kommer att döljas.",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "Beta tillgänglig för webben, skrivbord och Android. Tack för att du provar betan.",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "Om du lämnar så kommer %(brand)s att ladda om med utrymmen inaktiverade. Gemenskaper och anpassade taggar kommer att synas igen.",
     "Spaces are a new way to group rooms and people.": "Utrymmen är nya sätt att gruppera rum och personer.",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Det här är en experimentell funktion.</b> För tillfället så behöver nya inbjudna användare öppna inbjudan på <link/> för att faktiskt gå med.",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "För att gå med i %(spaceName)s, aktivera <a>utrymmesbetan</a>",
     "Space Autocomplete": "Utrymmesautokomplettering",
     "Go to my space": "Gå till mitt utrymme",
     "sends space invaders": "skickar Space Invaders",
@@ -3305,5 +2824,340 @@
     "See when people join, leave, or are invited to your active room": "Se när folk går med, lämnar eller bjuds in till ditt aktiva rum",
     "Kick, ban, or invite people to your active room, and make you leave": "Kicka, banna eller bjuda in folk till ditt aktiva rum, och tvinga dig att lämna",
     "See when people join, leave, or are invited to this room": "Se när folk går med, lämnar eller bjuds in till det här rummet",
-    "Kick, ban, or invite people to this room, and make you leave": "Kicka, banna eller bjuda in folk till det här rummet, och tvinga dig att lämna"
+    "Kick, ban, or invite people to this room, and make you leave": "Kicka, banna eller bjuda in folk till det här rummet, och tvinga dig att lämna",
+    "Currently joining %(count)s rooms|one": "Går just nu med i %(count)s rum",
+    "Currently joining %(count)s rooms|other": "Går just nu med i %(count)s rum",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Testa andra ord eller kolla efter felskrivningar. Vissa resultat kanske inte visas för att de är privata och du behöver en inbjudan för att gå med i dem.",
+    "No results for \"%(query)s\"": "Inga resultat för \"%(query)s\"",
+    "The user you called is busy.": "Användaren du ringde är upptagen.",
+    "User Busy": "Användare upptagen",
+    "Teammates might not be able to view or join any private rooms you make.": "Teammedlemmar kanske inte kan se eller gå med i privata rum du skapar.",
+    "Or send invite link": "Eller skicka inbjudningslänk",
+    "If you can't see who you’re looking for, send them your invite link below.": "Om du inte kan se den du letar efter, skicka dem din inbjudningslänk nedan.",
+    "Some suggestions may be hidden for privacy.": "Vissa förslag kan vara dolda av sekretesskäl.",
+    "Search for rooms or people": "Sök efter rum eller personer",
+    "Message preview": "Meddelandeförhandsvisning",
+    "Forward message": "Vidarebefordra meddelande",
+    "Open link": "Öppna länk",
+    "Sent": "Skickat",
+    "You don't have permission to do this": "Du har inte behörighet att göra detta",
+    "Error - Mixed content": "Fel - blandat innehåll",
+    "Error loading Widget": "Fel vid laddning av widget",
+    "Pinned messages": "Fästa meddelanden",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Om du har behörighet, öppna menyn på ett meddelande och välj <b>Fäst</b> för att fösta dem här.",
+    "Nothing pinned, yet": "Inget fäst än",
+    "End-to-end encryption isn't enabled": "Totalsträckskryptering är inte aktiverat",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s ändrade <a>fästa meddelanden</a> för rummet.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s kickade %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s kickade %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s drog tillbaka inbjudan för %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s drog tillbaka inbjudan för %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s avbannade %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s lämnade rummet",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s lämnade rummet: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s avböjde inbjudan",
+    "%(targetName)s joined the room": "%(targetName)s gick med i rummet",
+    "%(senderName)s made no change": "%(senderName)s gjorde ingen ändring",
+    "%(senderName)s set a profile picture": "%(senderName)s satte en profilbild",
+    "%(senderName)s changed their profile picture": "%(senderName)s bytte sin profilbild",
+    "%(senderName)s removed their profile picture": "%(senderName)s tog bort sin profilbild",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s tog bort sitt visningsnamn %(oldDisplayName)s",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s satte sitt visningsnamn till %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s ändrade sitt visningsnamn till %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s bannade %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s bannade %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s bjöd in %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s accepterade inbjudan",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepterade inbjudan för %(displayName)s",
+    "Some invites couldn't be sent": "Vissa inbjudningar kunde inte skickas",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Vi skickade de andra, men personerna nedan kunde inte bjudas in till <RoomName/>",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Vad användaren skriver är fel.\nDetta kommer att anmälas till rumsmoderatorerna.",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Prototyp av anmälan till moderatorer. I rum som söder moderering så kommer `anmäl`-knappen att låta dig anmäla olämpligt beteende till rummets moderatorer",
+    "Report": "Rapportera",
+    "Integration manager": "Integrationshanterare",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Din %(brand)s tillåter dig inte att använda en integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Att använda denna widget kan dela data <helpIcon /> med %(widgetDomain)s och din integrationshanterare.",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationshanterare får konfigurationsdata och kan ändra widgetar, skicka rumsinbjudningar och ställa in behörighetsnivåer å dina vägnar.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Använd en integrationshanterare för att hantera bottar, widgets och dekalpaket.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Använd en integrationshanterare <b>(%(serverName)s)</b> för att hantera bottar, widgets och dekalpaket.",
+    "Identity server": "Identitetsserver",
+    "Identity server (%(server)s)": "Identitetsserver (%(server)s)",
+    "Could not connect to identity server": "Kunde inte ansluta till identitetsservern",
+    "Not a valid identity server (status code %(code)s)": "Inte en giltig identitetsserver (statuskod %(code)s)",
+    "Identity server URL must be HTTPS": "URL för identitetsserver måste vara HTTPS",
+    "Failed to update the history visibility of this space": "Misslyckades att uppdatera historiksynlighet för det här utrymmet",
+    "Failed to update the guest access of this space": "Misslyckades att uppdatera gäståtkomst för det här utrymmet",
+    "Failed to update the visibility of this space": "Misslyckades att uppdatera synligheten för det här utrymmet",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Tack för att du prövar utrymmen. Din återkoppling kommer att underrätta kommande versioner.",
+    "Show all rooms": "Visa alla rum",
+    "You can change this later.": "Du kan ändra detta senare.",
+    "What kind of Space do you want to create?": "Vad för slags utrymme vill du skapa?",
+    "Address": "Adress",
+    "e.g. my-space": "t.ex. mitt-utrymme",
+    "Give feedback.": "Ge återkoppling.",
+    "Spaces feedback": "Utrymmesåterkoppling",
+    "Spaces are a new feature.": "Utrymmen är en ny funktion.",
+    "Delete avatar": "Radera avatar",
+    "Mute the microphone": "Tysta mikrofonen",
+    "Unmute the microphone": "Avtysta mikrofonen",
+    "Dialpad": "Knappsats",
+    "More": "Mer",
+    "Show sidebar": "Visa sidopanel",
+    "Hide sidebar": "Göm sidopanel",
+    "Start sharing your screen": "Börja dela din skärm",
+    "Stop sharing your screen": "Sluta dela din skärm",
+    "Stop the camera": "Stoppa kameran",
+    "Start the camera": "Starta kameran",
+    "Your camera is still enabled": "Din kamera är fortfarande på",
+    "Your camera is turned off": "Din kamera är av",
+    "%(sharerName)s is presenting": "%(sharerName)s presenterar",
+    "You are presenting": "Du presenterar",
+    "All rooms you're in will appear in Home.": "Alla rum du är in kommer att visas i Hem.",
+    "Show all rooms in Home": "Visa alla rum i Hem",
+    "Surround selected text when typing special characters": "Inneslut valt text vid skrivning av specialtecken",
+    "Use Ctrl + F to search timeline": "Använd Ctrl + F för att söka på tidslinjen",
+    "Use Command + F to search timeline": "Använd Kommando + F för att söka på tidslinjen",
+    "Don't send read receipts": "Skicka inte läskvitton",
+    "New layout switcher (with message bubbles)": "Ny arrangemangsbytare (med meddelandebubblor)",
+    "Send pseudonymous analytics data": "Skicka pseudoanonym statistik",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "Det här gör det enkelt för rum att hållas privat för ett utrymme, medan personer i utrymmet kan hitta och gå med i det. Alla nya rum i ett utrymme kommer att ha det här tillgängligt.",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "För att hjälpa utrymmesmedlemmar att hitta och gå med i ett privat rum, gå till det rummets säkerhets- och sekretessinställningar.",
+    "Help space members find private rooms": "Hjälp utrymmesmedlemmar att hitta privata rum",
+    "Help people in spaces to find and join private rooms": "Hjälp folk i utrymmen att hitta och gå med i privata rum",
+    "New in the Spaces beta": "Nytt i utrymmesbetan",
+    "Silence call": "Tysta samtal",
+    "Sound on": "Ljud på",
+    "User %(userId)s is already invited to the room": "Användaren %(userId)s har redan bjudits in till rummet",
+    "Transfer Failed": "Överföring misslyckades",
+    "Unable to transfer call": "Kan inte överföra samtal",
+    "Space information": "Utrymmesinfo",
+    "Images, GIFs and videos": "Bilder, GIF:ar och videor",
+    "Code blocks": "Kodblock",
+    "Displaying time": "Visar tid",
+    "To view all keyboard shortcuts, click here.": "För att se alla tangentbordsgenvägar, klicka här.",
+    "Keyboard shortcuts": "Tangentbordsgenvägar",
+    "If a community isn't shown you may not have permission to convert it.": "Om en gemenskap inte syns så kanske du inte har behörighet att se den.",
+    "Show my Communities": "Visa mina gemenskaper",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Gemenskaper har arkiverats för att göra plats för utrymmen men du kan konvertera dina gemenskaper till utrymmen nedan. Konvertering säkerställer att dina konversationer får de senaste funktionerna.",
+    "Create Space": "Skapa utrymme",
+    "Open Space": "Öppna utrymme",
+    "Identity server is": "Identitetsserver är",
+    "Olm version:": "Olm-version:",
+    "There was an error loading your notification settings.": "Ett fel inträffade när dina aviseringsinställningar laddades.",
+    "Mentions & keywords": "Omnämnanden & nyckelord",
+    "Global": "Globalt",
+    "New keyword": "Nytt nyckelord",
+    "Keyword": "Nyckelord",
+    "Enable email notifications for %(email)s": "Aktivera e-postaviseringar för %(email)s",
+    "Enable for this account": "Aktivera för det här kontot",
+    "An error occurred whilst saving your notification preferences.": "Ett fel inträffade när dina aviseringsinställningar sparades.",
+    "Error saving notification preferences": "Fel vid sparning av aviseringsinställningar",
+    "Messages containing keywords": "Meddelanden som innehåller nyckelord",
+    "Message bubbles": "Meddelandebubblor",
+    "IRC": "IRC",
+    "Collapse": "Kollapsa",
+    "Expand": "Expandera",
+    "Recommended for public spaces.": "Rekommenderas för offentliga utrymmen.",
+    "Allow people to preview your space before they join.": "Låt personer granska ditt utrymme innan de går med.",
+    "Preview Space": "Granska utrymme",
+    "Decide who can view and join %(spaceName)s.": "Bestäm vem kan se och gå med i %(spaceName)s.",
+    "Visibility": "Synlighet",
+    "This may be useful for public spaces.": "Det här kan vara användbart för ett offentligt utrymme.",
+    "Guests can join a space without having an account.": "Gäster kan gå med i ett utrymme utan att ha ett konto.",
+    "Enable guest access": "Aktivera gäståtkomst",
+    "Stop recording": "Stoppa inspelning",
+    "Copy Room Link": "Kopiera rumslänk",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "Du kan nu dela din skärm genom att klicka på skärmdelningsknappen under ett samtal. Du kan till och med göra detta under ett ljudsamtal om båda ändar stöder det!",
+    "Screen sharing is here!": "Skärmdelning är här!",
+    "Send voice message": "Skicka röstmeddelande",
+    "Show %(count)s other previews|one": "Visa %(count)s annan förhandsgranskning",
+    "Show %(count)s other previews|other": "Visa %(count)s andra förhandsgranskningar",
+    "Access": "Åtkomst",
+    "People with supported clients will be able to join the room without having a registered account.": "Personer med stödda klienter kommer kunna gå med i rummet utan ett registrerat konto.",
+    "Decide who can join %(roomName)s.": "Bestäm vem som kan gå med i %(roomName)s.",
+    "Space members": "Utrymmesmedlemmar",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Vem som helst i ett utrymme kan hitta och gå med. Du kan välja flera utrymmen.",
+    "Spaces with access": "Utrymmen med åtkomst",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Vem som helst i ett utrymme kan hitta och gå med. <a>Redigera vilka utrymmen som kan komma åt här.</a>",
+    "Currently, %(count)s spaces have access|other": "Just nu har %(count)s utrymmen åtkomst",
+    "& %(count)s more|other": "& %(count)s till",
+    "Upgrade required": "Uppgradering krävs",
+    "Anyone can find and join.": "Vem som helst kan hitta och gå med.",
+    "Only invited people can join.": "Endast inbjudna personer kan gå med.",
+    "Private (invite only)": "Privat (endast inbjudan)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Den här uppgraderingen kommer att låta medlemmar i valda utrymmen komma åt det här rummet utan en inbjudan.",
+    "This space has no local addresses": "Det här utrymmet har inga lokala adresser",
+    "Image": "Bild",
+    "Sticker": "Dekal",
+    "Error processing audio message": "Fel vid hantering av ljudmeddelande",
+    "Decrypting": "Avkrypterar",
+    "The call is in an unknown state!": "Det här samtalet är i ett okänt läge!",
+    "Missed call": "Missat samtal",
+    "Unknown failure: %(reason)s": "Okänt fel: %(reason)s",
+    "An unknown error occurred": "Ett okänt fel inträffade",
+    "Their device couldn't start the camera or microphone": "Deras enhet kunde inte starta kameran eller mikrofonen",
+    "Connection failed": "Anslutning misslyckad",
+    "Could not connect media": "Kunde inte ansluta media",
+    "No answer": "Inget svar",
+    "Call back": "Ring tillbaka",
+    "Call declined": "Samtal nekat",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Sätt adresser för det här utrymmet så att användare kan hitta det genom din hemserver (%(localDomain)s)",
+    "To publish an address, it needs to be set as a local address first.": "För att publicera en adress så måste den vara satt som en lokal adress först.",
+    "Published addresses can be used by anyone on any server to join your room.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt rum.",
+    "Published addresses can be used by anyone on any server to join your space.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt utrymme.",
+    "Please provide an address": "Ange en adress, tack",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)sändrade de <a>fästa meddelandena</a> för rummet %(count)s gånger.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)sändrade de <a>fästa meddelandena</a> för rummet %(count)s gånger.",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sändrade server-ACL:erna",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sändrade server-ACL:erna %(count)s gånger",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sändrade server-ACL:erna",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sändrade server-ACL:erna %(count)s gånger",
+    "Share content": "Dela innehåll",
+    "Application window": "Programfönster",
+    "Share entire screen": "Dela hela skärmen",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Initialisering av meddelandesök misslyckades, kolla <a>dina inställningar</a> för mer information",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Om du har rapporterat en bugg via GitHub så kan felsökningsloggar hjälpa oss att hitta problemet. Felsökningsloggar innehåller användningsdata som inkluderar ditt användarnamn, ID:n eller alias för rum och grupper du har besökt, vilka UI-element du har interagerat med, och användarnamn för andra användare. De innehåller inte meddelanden.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Felsökningsloggar innehåller användningsdata som inkluderar ditt användarnamn, ID:n eller alias för rum och grupper du har besökt, vilka UI-element du har interagerat med, och användarnamn för andra användare. De innehåller inte meddelanden.",
+    "Adding spaces has moved.": "Tilläggning av utrymmen har flyttats.",
+    "Search for rooms": "Sök efter rum",
+    "Search for spaces": "Sök efter utrymmen",
+    "Create a new space": "Skapa ett nytt utrymme",
+    "Want to add a new space instead?": "Vill du lägga till ett nytt utrymme istället?",
+    "Add existing space": "Lägg till existerande utrymme",
+    "[number]": "[nummer]",
+    "We're working on this, but just want to let you know.": "Vi jobbar på detta, men vill bara låta dig veta.",
+    "Search for rooms or spaces": "Sök efter rum eller gemenskaper",
+    "Created from <Community />": "Skapad från <Community />",
+    "To view %(spaceName)s, you need an invite": "För att se %(spaceName)s så behöver du en inbjudan",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Du kan klicka på en avatar i filterpanelen när som helst för att se endast rum och personer associerade med gemenskapen.",
+    "Unable to copy a link to the room to the clipboard.": "Kunde inte kopiera en länk till rummet till klippbordet.",
+    "Unable to copy room link": "Kunde inte kopiera rumslänken",
+    "Communities won't receive further updates.": "Gemenskaper kommer inte att uppgraderas vidare.",
+    "Spaces are a new way to make a community, with new features coming.": "Utrymmen är att nytt sätt att skapa en gemenskap, med ny funktionalitet inkommande.",
+    "Communities can now be made into Spaces": "Gemenskaper kan nu göras om till utrymmen",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Be <a>administratören</a> för den här gemenskapen att göra om den till ett utrymme och håll utkik efter en inbjudan.",
+    "You can create a Space from this community <a>here</a>.": "Du kan skapa ett utrymme från den här gemenskapen <a>här</a>.",
+    "Error downloading audio": "Fel vid nedladdning av ljud",
+    "Unnamed audio": "Namnlöst ljud",
+    "Move down": "Flytta ner",
+    "Move up": "Flytta upp",
+    "Add space": "Lägg till utrymme",
+    "Collapse reply thread": "Kollapsa svarstråd",
+    "Show preview": "Visa förhandsgranskning",
+    "View source": "Visa källkod",
+    "Forward": "Vidarebefordra",
+    "Settings - %(spaceName)s": "Inställningar - %(spaceName)s",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Observera att en uppgradering kommer att skapa en ny version av rummet</b>. Alla nuvarande meddelanden kommer att stanna i det arkiverade rummet.",
+    "Automatically invite members from this room to the new one": "Bjud automatiskt in medlemmar från det här rummet till det nya",
+    "Report the entire room": "Rapportera hela rummet",
+    "Spam or propaganda": "Spam eller propaganda",
+    "Illegal Content": "Olagligt innehåll",
+    "Toxic Behaviour": "Stötande beteende",
+    "Disagree": "Håll inte med",
+    "Please pick a nature and describe what makes this message abusive.": "Välj en art och beskriv vad som gör detta meddelande kränkande.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Det här rummet är dedikerat till olagligt eller stötande innehåll, eller så modererar inte moderatorerna olagligt eller stötande innehåll ordentligt.\nDetta kommer att rapporteras till administratörerna för %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Det här rummet är dedikerat till olagligt eller stötande innehåll, eller så modererar inte moderatorerna olagligt eller stötande innehåll ordentligt.\nDetta kommer att rapporteras till administratörerna för %(homeserver)s. Administratörerna kommer inte kunna läsa krypterat innehåll i rummet.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Annan orsak. Beskriv problemet tack.\nDetta kommer att rapporteras till rumsmoderatorerna.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Användaren spammar rummet med reklam eller länkar till reklam eller propaganda.\nDetta kommer att rapporteras till rumsmoderatorerna.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Användaren påvisar olagligt beteende, som att doxa folk eller hota med våld.\nDetta kommer att rapporteras till rumsmoderatorerna som kanske eskalerar detta till juridiska myndigheter.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Användaren påvisar stötande beteende, som att förolämpa andra användare, att dela vuxet innehåll i ett familjevänligt rum eller på annat sätt bryta mot reglerna i rummet.\nDetta kommer att rapporteras till rummets moderatorer.",
+    "These are likely ones other room admins are a part of.": "Dessa är troligen såna andra rumsadmins är med i.",
+    "Other spaces or rooms you might not know": "Andra utrymmen du kanske inte känner till",
+    "Spaces you know that contain this room": "Utrymmen du känner till som innehåller det här rummet",
+    "Search spaces": "Sök i utrymmen",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Bestäm vilka utrymmen som kan komma åt det hör rummet. Om ett utrymme väljs så kan dess medlemmar hitta och gå med i <RoomName/>.",
+    "Select spaces": "Välj utrymmen",
+    "You're removing all spaces. Access will default to invite only": "Du tar bort alla utrymmen. Åtkomst kommer att sättas som förval till endast inbjudan",
+    "Leave %(spaceName)s": "Lämna %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Du är den enda administratören i vissa rum eller utrymmen du vill lämna. Om du lämnar så kommer vissa av dem sakna administratör.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Du är den enda administratören i utrymmet. Om du lämnar nu så kommer ingen ha kontroll över det.",
+    "You won't be able to rejoin unless you are re-invited.": "Du kommer inte kunna gå med igen om du inte bjuds in igen.",
+    "Search %(spaceName)s": "Sök i %(spaceName)s",
+    "User Directory": "Användarkatalog",
+    "Want to add an existing space instead?": "Vill du lägga till ett existerande utrymme istället?",
+    "Add a space to a space you manage.": "Lägg till ett utrymme till ett utrymme du kan hantera.",
+    "Only people invited will be able to find and join this space.": "Bara inbjudna personer kommer kunna hitta och gå med i det här utrymmet.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Vem som helst kommer kunna hitta och gå med i det här utrymme, inte bara medlemmar i <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Vem som helst i <SpaceName/> kommer kunna hitta och gå med.",
+    "Private space (invite only)": "Privat utrymme (endast inbjudan)",
+    "Space visibility": "Utrymmessynlighet",
+    "This description will be shown to people when they view your space": "Den här beskrivningen kommer att visas för personer när de ser ditt utrymme",
+    "Flair won't be available in Spaces for the foreseeable future.": "Emblem kommer inte vara tillgängliga i utrymmen i den överskådliga framtiden.",
+    "All rooms will be added and all community members will be invited.": "Alla rum kommer att läggas till och alla gemenskapsmedlemmar kommer att bjudas in .",
+    "A link to the Space will be put in your community description.": "En länk till utrymmet kommer att läggas i gemenskapens beskrivning.",
+    "Create Space from community": "Skapa utrymme av gemenskapen",
+    "Failed to migrate community": "Misslyckades att migrera gemenskap",
+    "To create a Space from another community, just pick the community in Preferences.": "För att skapa ett utrymme från en annan gemenskap, välj en gemenskap i inställningarna.",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> har skapats och alla som var med i gemenskapen har bjudits in till det.",
+    "Space created": "Utrymme skapat",
+    "To view Spaces, hide communities in <a>Preferences</a>": "För att se utrymmen, göm gemenskaper i <a>inställningarna</a>",
+    "This community has been upgraded into a Space": "Den här gemenskapen har uppgraderats till ett utrymme",
+    "Visible to space members": "Synligt för utrymmesmedlemmar",
+    "Public room": "Offentligt rum",
+    "Private room (invite only)": "Privat rum (endast inbjudan)",
+    "Room visibility": "Rumssynlighet",
+    "Create a room": "Skapa ett rum",
+    "Only people invited will be able to find and join this room.": "Bara inbjudna personer kommer kunna hitta och gå med i det här rummet.",
+    "Anyone will be able to find and join this room.": "Vem som helst kommer kunna hitta och gå med i det här rummet.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Vem som helst kommer kunna hitta och gå med i det här rummet, inta bara medlemmar i <SpaceName/>.",
+    "You can change this at any time from room settings.": "Du kan ändra detta när som helst i rumsinställningarna.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Alla i <SpaceName/> kommer kunna hitta och gå med i det här rummet.",
+    "Rooms and spaces": "Rum och utrymmen",
+    "Results": "Resultat",
+    "Enable encryption in settings.": "Aktivera kryptering i inställningarna.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Dina privata meddelanden är normalt krypterade, men det här rummet är inte det. Detta beror oftast på att en ostödd enhet eller metod används, som e-postinbjudningar.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "För att undvika dessa problem, skapa ett <a>nytt offentligt rum</a> för konversationen du planerar att ha.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Det rekommenderas inte att lägga till kryptering till offentliga rum.</b> Vem som helst kan hitta och gå med i offentliga rum, som vem som helst kan läsa meddelanden i dem. Du får inga av fördelarna med kryptering, och du kommer inte kunna stänga av det senare. Kryptering av meddelanden i ett offentligt rum kommer att göra sändning och mottagning av meddelanden långsammare.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Det rekommenderas inte att föra krypterade rum offentliga.</b> Det kommer betyda att vem som helst kan hitta och gå med i rummet, som vem som helst kan läsa meddelanden i dem. Du får inga av fördelarna med kryptering. Kryptering av meddelanden i ett offentligt rum kommer att göra sändning och mottagning av meddelanden långsammare.",
+    "Are you sure you want to make this encrypted room public?": "Är du säker på att du vill göra det här krypterade rummet offentligt?",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "För att undvika dessa problem, skapa ett <a>nytt krypterat rum</a> för konversationen du planerar att ha.",
+    "Are you sure you want to add encryption to this public room?": "Är du säker på att du vill lägga till kryptering till det här offentliga rummet?",
+    "Cross-signing is ready but keys are not backed up.": "Korssignering är klart, men nycklarna är inte säkerhetskopierade än.",
+    "Low bandwidth mode (requires compatible homeserver)": "Lågbandbreddsläge (kräver kompatibel hemserver)",
+    "Multiple integration managers (requires manual setup)": "Flera integrationshanterare (kräver manuell inställning)",
+    "Thread": "Trådar",
+    "Show threads": "Visa trådar",
+    "Autoplay videos": "Autospela videor",
+    "Autoplay GIFs": "Autospela GIF:ar",
+    "Threaded messaging": "Trådat meddelande",
+    "The above, but in <Room /> as well": "Det ovanstående, men i <Room /> också",
+    "The above, but in any room you are joined or invited to as well": "Det ovanstående, men i vilket som helst rum du är med i eller inbjuden till också",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s avfäste ett meddelande i det här rummet. Se alla fästa meddelanden.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s avfäste <a>ett meddelande</a> i det här rummet. Se alla <b>fästa meddelanden</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fäste ett meddelande i det här rummet. Se alla fästa meddelanden.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fäste <a>ett meddelande</a> i det här rummet. Se alla <b>fästa meddelanden</b>.",
+    "& %(count)s more|one": "& %(count)s till",
+    "Some encryption parameters have been changed.": "Vissa krypteringsparametrar har ändrats.",
+    "Role in <RoomName/>": "Roll i <RoomName/>",
+    "Explore %(spaceName)s": "Utforska %(spaceName)s",
+    "Send a sticker": "Skicka en dekal",
+    "Reply to thread…": "Svara på tråd…",
+    "Reply to encrypted thread…": "Svara på krypterad tråd…",
+    "Add emoji": "Lägg till emoji",
+    "Unknown failure": "Okänt fel",
+    "Failed to update the join rules": "Misslyckades att uppdatera regler för att gå med",
+    "Select the roles required to change various parts of the space": "Välj de roller som krävs för att ändra olika delar av utrymmet",
+    "Change description": "Ändra beskrivningen",
+    "Change main address for the space": "Byt huvudadress för utrymmet",
+    "Change space name": "Byt utrymmesnamn",
+    "Change space avatar": "Byt utrymmesavatar",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Vem som helst i <spaceName/> kan hitta och gå med. Du kan välja andra utrymmen också.",
+    "Currently, %(count)s spaces have access|one": "Just nu har ett utrymme åtkomst",
+    "To join this Space, hide communities in your <a>preferences</a>": "För att gå med i det här utrymmet, dölj gemenskaper i dina <a>inställningar</a>",
+    "To view this Space, hide communities in your <a>preferences</a>": "För att se det här utrymmet, dölj gemenskaper i dina <a>inställningar</a>",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "För att gå med i %(communityName)s, byt till gemenskaper i dina <a>inställningar</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "För att se %(communityName)s, byt till gemenskaper i dina <a>inställningar</a>",
+    "Private community": "Privat gemenskap",
+    "Public community": "Offentlig gemenskap",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reagerade med %(content)s",
+    "Message": "Meddelande",
+    "Joining space …": "Går med i utrymme…",
+    "Message didn't send. Click for info.": "Meddelande skickades inte. Klicka för info.",
+    "Upgrade anyway": "Uppgradera ändå",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Det här rummet är med i några utrymmen du inte är administratör för. I de utrymmena så kommer det gamla rummet fortfarande att visas, men folk kommer att uppmanas att gå med i det nya.",
+    "Before you upgrade": "Innan du uppgraderar",
+    "To join a space you'll need an invite.": "För att gå med i ett utrymme så behöver du en inbjudan.",
+    "You can also make Spaces from <a>communities</a>.": "Du kan också göra utrymmen av <a>gemenskaper</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Visa tillfälligt gemenskaper istället för utrymmen för den här sessionen. Stöd för detta kommer snart att tas bort. Detta kommer att ladda om Element.",
+    "Display Communities instead of Spaces": "Visa gemenskaper istället för utrymmen"
 }
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index 4f87230ef3..4b95e8f78d 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -1,63 +1,35 @@
 {
-    "Advanced notification settings": "மேம்பட்ட அறிவிப்பிற்கான அமைப்புகள்",
     "All messages": "அனைத்து செய்திகள்",
-    "All messages (noisy)": "அனைத்து செய்திகள் (உரக்க)",
     "All Rooms": "அனைத்து அறைகள்",
-    "All notifications are currently disabled for all targets.": "அனைத்து இலக்குகளுக்கான அனைத்து அறிவுப்புகளும் தற்போது முடக்கி வைக்கப்பட்டுள்ளது.",
-    "An error occurred whilst saving your email notification preferences.": "உங்கள் மின்னஞ்சல் அறிவிப்பு விருப்பங்களை சேமிப்பதில் ஏதோ பிழை ஏற்பட்டுள்ளது.",
     "Cancel": "ரத்து",
-    "Cancel Sending": "அனுப்புதலை ரத்து செய்",
     "Changelog": "மாற்றப்பதிவு",
     "Close": "மூடு",
     "Collecting app version information": "செயலியின் பதிப்பு தகவல்கள் சேகரிக்கப்படுகிறது",
     "Collecting logs": "பதிவுகள் சேகரிக்கப்படுகிறது",
     "Call invitation": "அழைப்பிற்கான விண்ணப்பம்",
-    "Can't update user notification settings": "பயனர் அறிவிப்பு அமைப்புகளை மாற்ற முடியவில்லை",
     "Couldn't find a matching Matrix room": "பொருத்தமான Matrix அறை கிடைக்கவில்லை",
-    "Custom Server Options": "விருப்பிற்கேற்ற வழங்கி இடப்புகள்",
-    "Direct Chat": "நேரடி அரட்டை",
     "Dismiss": "நீக்கு",
-    "Download this file": "இந்த கோப்பைத் தரவிறக்கு",
-    "Enable email notifications": "மின்னஞ்சல் அறிவிப்புகளை ஏதுவாக்கு",
-    "Enable notifications for this account": "இந்த கணக்கிற்கான அறிவிப்புகளை ஏதுவாக்கு",
-    "Enable them now": "இப்போது அவற்றை ஏதுவாக்கு",
-    "Error": "கோளாறு",
+    "Error": "பிழை",
     "Failed to add tag %(tagName)s to room": "%(tagName)s எனும் குறிச்சொல்லை அறையில் சேர்ப்பதில் தோல்வி",
-    "Failed to change settings": "அமைப்புகள் மாற்றத்தில் தோல்வி",
     "Failed to forget room %(errCode)s": "அறையை மறப்பதில் தோல்வி %(errCode)s",
-    "Failed to update keywords": "முக்கிய வார்த்தைகளை புதுப்பித்தலில் தோல்வி",
     "Favourite": "விருப்பமான",
-    "Files": "கோப்புகள்",
-    "Forget": "மற",
     "Guests can join": "விருந்தினர்கள் சேரலாம்",
     "Invite to this room": "இந்த அறைக்கு அழை",
-    "Keywords": "முக்கிய வார்த்தைகள்",
     "Leave": "வெளியேறு",
     "Low Priority": "குறைந்த முன்னுரிமை",
     "Members": "உறுப்பினர்கள்",
-    "Mentions only": "குறிப்பிடுகள் மட்டும்",
-    "Enter keywords separated by a comma:": "ஒரு comma மூலம் முக்கிய வார்த்தைகளை உள்ளிடவும்:",
-    "Error saving email notification preferences": "மின்னஞ்சல் அறிவிப்பு விருப்பங்களை சேமிப்பதில் கோளாறு",
     "Failed to remove tag %(tagName)s from room": "அறையில் இருந்து குறிச்சொல் %(tagName)s களை அகற்றுவது தோல்வியடைந்தது",
     "Failed to set direct chat tag": "நேரடி அரட்டை குறியை அமைப்பதில் தோல்வி",
-    "Failed to set Direct Message status of room": "அறையின் நேரடி செய்தி நிலையை அமைக்க தவறிவிட்டது",
     "Fetching third party location failed": "மூன்றாம் இடத்தில்  உள்ள  இடம் தோல்வி",
-    "Forward Message": "முன்னோடி செய்தி",
-    "(HTTP status %(httpStatus)s)": "(HTTP நிலைகள் %(httpStatus)s)",
-    "I understand the risks and wish to continue": "நான் அபாயங்களைப் புரிந்துகொண்டு தொடர விரும்புகிறேன்",
     "Messages containing my display name": "என் காட்சி பெயர் கொண்ட செய்திகள்",
     "Mute": "முடக்கு",
     "No rooms to show": "காண்பிக்க எந்த அறையும் இல்லை",
-    "Messages containing <span>keywords</span>": "<span>முக்கிய</span> கொண்ட செய்திகள்",
     "Messages in group chats": "குழு அரட்டைகளில் உள்ள செய்திகள்",
     "Messages in one-to-one chats": "ஒரு-க்கு-ஒரு அரட்டைகளில் உள்ள செய்திகள்",
     "Messages sent by bot": "bot மூலம் அனுப்பிய செய்திகள்",
     "Noisy": "சத்தம்",
     "Notification targets": "அறிவிப்பு இலக்குகள்",
     "Notifications": "அறிவிப்புகள்",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "பின்வரும் முக்கிய வார்த்தைகளில் அறிவிப்புகள் இங்கே காட்டப்பட முடியாத விதிகள் பின்பற்றப்படுகின்றன:",
-    "Notify for all other messages/rooms": "மற்ற எல்லா செய்திகளுக்கும் அறைகளுக்கும் தெரிவிக்கவும்",
-    "Notify me for anything else": "வேறு எதையும் எனக்கு தெரிவி",
     "Off": "அமை",
     "On": "மீது",
     "Operation failed": "செயல்பாடு தோல்வியுற்றது",
@@ -81,24 +53,16 @@
     "unknown error code": "தெரியாத பிழை குறி",
     "Unnamed room": "பெயரிடப்படாத அறை",
     "Update": "புதுப்பி",
-    "Uploaded on %(date)s by %(user)s": "%(date)s அன்று %(user)s ஆல் பதிவேற்றப்பட்டது",
-    "Uploading report": "அறிக்கை பதிவேற்றப்படுகிறது",
     "%(brand)s does not know how to join a room on this network": "இந்த வலையமைப்பில் உள்ள அறையில் எப்படி சேர்வதென்று %(brand)sற்க்கு தெரியவில்லை",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s பல மேம்பட்ட உலாவி வசதிகளைப் பயன்படுத்துகிறது, அதில் சிலவற்றைக் காணவில்லை அல்லது உங்கள் உலாவியில் பரிசோதனைக்காக உள்ளது.",
     "The server may be unavailable or overloaded": "வழங்கி அளவுமீறிய சுமையில் உள்ளது அல்லது செயல்பாட்டில் இல்லை",
-    "Unable to fetch notification target list": "அறிவிப்பு பட்டியலை பெற முடியவில்லை",
     "Unable to look up room ID from server": "வழங்கியிலிருந்து அறை ID யை காண முடியவில்லை",
-    "Unhide Preview": "முன்னோட்டத்தைக் காண்பி",
-    "View Decrypted Source": "மறையீடு நீக்கப்பட்ட மூலத்தைக் காண்பி",
     "View Source": "மூலத்தைக் காட்டு",
     "What's New": "புதிதாக வந்தவை",
     "What's new?": "புதிதாக என்ன?",
     "Waiting for response from server": "வழங்கியின் பதிலுக்காக காத்திருக்கிறது",
     "When I'm invited to a room": "நான் அறைக்கு அழைக்கப்பட்ட போது",
     "World readable": "உலகமே படிக்கும்படி",
-    "You cannot delete this image. (%(code)s)": "இந்த படத்தை நீங்கள் அழிக்க முடியாது. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "இந்த செய்தியை நீங்கள் அழிக்க முடியாது. (%(code)s)",
-    "You are not receiving desktop notifications": "திரை அறிவிப்புகளை நீங்கள் பெறவில்லை",
     "OK": "சரி",
     "Show message in desktop notification": "திரை அறிவிப்புகளில் செய்தியை காண்பிக்கவும்",
     "Sunday": "ஞாயிறு",
@@ -118,24 +82,21 @@
     "Event Type": "நிகழ்வு வகை",
     "Event Content": "நிகழ்வு உள்ளடக்கம்",
     "Edit": "தொகு",
-    "You have successfully set a password!": "நீங்கள் வெற்றிகரமாக கடவுச்சொல்லை அமைத்துவிட்டீர்கள்",
-    "You have successfully set a password and an email address!": "நீங்கள் வெற்றிகரமாக கடவுச்சொல் மற்றும் மின்னஞ்சல் முகவரியை அமைத்துவிட்டீர்கள்",
     "Continue": "தொடரவும்",
-    "Please set a password!": "தயவு செய்து கடவுச்சொல்லை அமைக்கவும்",
     "Register": "பதிவு செய்",
     "Rooms": "அறைகள்",
     "Add rooms to this community": "அறைகளை இந்த சமூகத்தில் சேர்க்கவும்",
-    "This email address is already in use": "இந்த மின் அஞ்சல் முகவரி ஏற்கனவே பயன்பாட்டில் உள்ளது",
-    "This phone number is already in use": "இந்த தொலைபேசி எண் ஏற்கனவே பயன்பாட்டில் உள்ளது",
-    "Failed to verify email address: make sure you clicked the link in the email": "மின்னஞ்சல் முகவரியைச் சரிபார்க்கத் தவறிவிட்டது: மின்னஞ்சலில் உள்ள இணைப்பைக் கிளிக் செய்துள்ளீர்கள் என்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்",
+    "This email address is already in use": "இந்த மின்னஞ்சல் முகவரி முன்னதாகவே பயன்பாட்டில் உள்ளது",
+    "This phone number is already in use": "இந்த தொலைபேசி எண் முன்னதாகவே பயன்பாட்டில் உள்ளது",
+    "Failed to verify email address: make sure you clicked the link in the email": "மின்னஞ்சல் முகவரியை சரிபார்க்க முடியவில்லை: மின்னஞ்சலில் உள்ள இணைப்பை அழுத்தியுள்ளீர்களா என்பதை உறுதிப்படுத்தவும்",
     "The platform you're on": "நீங்கள் இருக்கும் தளம்",
     "The version of %(brand)s": "%(brand)s இன் பதிப்பு",
     "Whether or not you're logged in (we don't record your username)": "நீங்கள் உள்நுழைந்திருந்தாலும் இல்லாவிட்டாலும் (உங்கள் பயனர்பெயரை நாங்கள் பதிவு செய்ய மாட்டோம்)",
     "Your language of choice": "நீங்கள் விரும்பும் மொழி",
-    "Which officially provided instance you are using, if any": "நீங்கள் பயன்படுத்தும் அதிகாரப்பூர்வமாக வழங்கப்பட்ட உதாரணம் ஏதேனும் இருந்தால்",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "பணக்கார உரை எடிட்டரின் ரிச்ச்டெக்ஸ்ட் பயன்முறையைப் பயன்படுத்துகிறீர்களா இல்லையா",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "நீங்கள் 'breadcrumbs' அம்சத்தைப் பயன்படுத்துகிறீர்களோ இல்லையோ (அறை பட்டியலுக்கு மேலே உள்ள அவதாரங்கள்)",
-    "Your homeserver's URL": "உங்கள் வீட்டு சேவையகத்தின் URL",
+    "Which officially provided instance you are using, if any": "நீங்கள் பயன்படுத்தும் அதிகாரப்பூர்வமாக வழங்கப்பட்ட நிகழ்வு ஏதேனும் இருந்தால்",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "நீங்கள் ரிச்டெக்ஸ்ட் உரைத்திருத்தியின் ரிச்டெக்ஸ்ட் பயன்முறையைப் பயன்படுத்துகிறீர்களா இல்லையா",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "நீங்கள் 'breadcrumbs' அம்சத்தைப் பயன்படுத்துகிறீர்களோ இல்லையோ (அறை பட்டியலுக்கு மேலே உள்ள பயனர் படங்கள்)",
+    "Your homeserver's URL": "உங்கள் வீட்டுச்சேவையகத்தின் URL",
     "e.g. %(exampleValue)s": "உதாரணமாக %(exampleValue)s",
     "Every page you use in the app": "பயன்பாட்டில் நீங்கள் பயன்படுத்தும் ஒவ்வொரு பக்கமும்",
     "Your %(brand)s is misconfigured": "உங்கள் %(brand)s தவறாக உள்ளமைக்கப்பட்டுள்ளது",
@@ -143,28 +104,20 @@
     "e.g. <CurrentPageURL>": "உதாரணமாக <CurrentPageURL>",
     "Your device resolution": "உங்கள் சாதனத் தீர்மானம்",
     "Analytics": "பகுப்பாய்வு",
-    "The information being sent to us to help make %(brand)s better includes:": "%(brand)s ஐ சிறப்பாகச் செய்ய எங்களுக்கு அனுப்பப்படும் தகவல்களில் பின்வருவன அடங்கும்:",
+    "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.": "இந்த பக்கம் ஒரு அறை, பயனர் அல்லது குழு ஐடி போன்ற அடையாளம் காணக்கூடிய தகவல்களை உள்ளடக்கியது, அந்த தரவு சேவையகத்திற்கு அனுப்பப்படுவதற்கு முன்பு அகற்றப்படும்.",
     "Call Failed": "அழைப்பு தோல்வியுற்றது",
-    "Call Timeout": "அழைப்பு நேரம் முடிந்தது",
-    "The remote side failed to pick up": "தொலைதூரப் பக்கத்தை எடுக்கத் தவறிவிட்டது",
-    "Unable to capture screen": "திரையைப் பிடிக்க முடியவில்லை",
-    "Existing Call": "இருக்கும் அழைப்பு",
-    "You are already in a call.": "நீங்கள் ஏற்கனவே அழைப்பில் உள்ளீர்கள்.",
     "VoIP is unsupported": "VoIP ஆதரிக்கப்படவில்லை",
-    "You cannot place VoIP calls in this browser.": "இந்த உலாவியில் நீங்கள் VoIP அழைப்புகளை வைக்க முடியாது.",
-    "You cannot place a call with yourself.": "உங்களுடன் அழைப்பை மேற்கொள்ள முடியாது.",
-    "Call in Progress": "அழைப்பு முன்னேற்றத்தில் உள்ளது",
-    "A call is currently being placed!": "தற்போது அழைப்பு வைக்கப்பட்டுள்ளது!",
-    "A call is already in progress!": "அழைப்பு ஏற்கனவே செயலில் உள்ளது!",
+    "You cannot place VoIP calls in this browser.": "இந்த உலாவியில் நீங்கள் VoIP அழைப்புகளை மேற்கொள்ள முடியாது.",
+    "You cannot place a call with yourself.": "நீங்கள் உங்களுடனே அழைப்பை மேற்கொள்ள முடியாது.",
     "Permission Required": "அனுமதி தேவை",
-    "You do not have permission to start a conference call in this room": "இந்த அறையில் ஒரு மாநாட்டு அழைப்பைத் தொடங்க உங்களுக்கு அனுமதி இல்லை",
+    "You do not have permission to start a conference call in this room": "இந்த அறையில் ஒரு கூட்டு அழைப்பைத் தொடங்க உங்களுக்கு அனுமதி இல்லை",
     "Replying With Files": "கோப்புகளுடன் பதிலளித்தல்",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "இந்த நேரத்தில் ஒரு கோப்புடன் பதிலளிக்க முடியாது. பதிலளிக்காமல் இந்த கோப்பை பதிவேற்ற விரும்புகிறீர்களா?",
     "The file '%(fileName)s' failed to upload.": "'%(fileName)s' கோப்பு பதிவேற்றத் தவறிவிட்டது.",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' கோப்பு பதிவேற்றங்களுக்கான இந்த ஹோம்சர்வரின் அளவு வரம்பை மீறுகிறது",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' கோப்பு இந்த வீட்டுச்சேவையகத்தின் பதிவேற்றங்களுக்கான அளவு வரம்பை மீறுகிறது",
     "Upload Failed": "பதிவேற்றம் தோல்வியுற்றது",
-    "Server may be unavailable, overloaded, or you hit a bug.": "சேவையகம் கிடைக்காமல் போகலாம், அதிக சுமை அல்லது பிழையைத் தாக்கலாம்.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "",
     "The server does not support the room version specified.": "குறிப்பிடப்பட்ட அறை பதிப்பை சேவையகம் ஆதரிக்கவில்லை.",
     "Failure to create room": "அறையை உருவாக்கத் தவறியது",
     "Sun": "ஞாயிறு",
@@ -181,5 +134,55 @@
     "May": "மே",
     "Jun": "ஜூன்",
     "Explore rooms": "அறைகளை ஆராயுங்கள்",
-    "Create Account": "உங்கள் கணக்கை துவங்குங்கள்"
+    "Create Account": "உங்கள் கணக்கை துவங்குங்கள்",
+    "Who would you like to add to this community?": "இந்த சமூகத்தில் யாரைச் சேர்க்க விரும்புகிறீர்கள்?",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "AM": "காலை",
+    "PM": "மாலை",
+    "Dec": "டிசம்பர்",
+    "Nov": "நவம்பர்",
+    "Oct": "அக்டோபர்",
+    "Sep": "செப்டம்பர்",
+    "Aug": "ஆகஸ்ட்",
+    "Jul": "ஜூலை",
+    "This will end the conference for everyone. Continue?": "இது அனைவருக்கும் கூட்டு அழைப்பை நிறுத்திவிடும். தொடரவா?",
+    "End conference": "கூட்டு அழைப்பை நிறுத்து",
+    "There was an error looking up the phone number": "தொலைபேசி எண்ணைத் தேடுவதில் பிழை ஏற்பட்டது",
+    "Unable to look up phone number": "தொலைபேசி எண்ணைத் தேட முடியவில்லை",
+    "You're already in a call with this person.": "நீங்கள் முன்னதாகவே இந்த நபருடன் அழைப்பில் உள்ளீர்கள்.",
+    "Already in call": "முன்னதாகவே அழைப்பில் உள்ளது",
+    "You've reached the maximum number of simultaneous calls.": "ஒரே நேரத்தில் அழைக்கக்கூடிய அதிகபட்ச அழைப்புகளை நீங்கள் அடைந்துவிட்டீர்கள்.",
+    "Too Many Calls": "மிக அதிக அழைப்புகள்",
+    "No other application is using the webcam": "வேறு எந்த பயன்பாடும் புகைப்படக்கருவியைப் பயன்படுத்துவதில்லை",
+    "Permission is granted to use the webcam": "புகைப்படக்கருவியைப் பயன்படுத்த அனுமதி வழங்கப்பட்டுள்ளது",
+    "A microphone and webcam are plugged in and set up correctly": "ஒரு ஒலிவாங்கி மற்றும் புகைப்படக்கருவி செருகப்பட்டு சரியாக அமைக்கப்பட்டுள்ளது",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "புகைப்படக்கருவி அல்லது ஒலிவாங்கியை அணுக முடியாததால் அழைப்பு தோல்வியடைந்தது. அதை சரிபார்க்கவும்:",
+    "Unable to access webcam / microphone": "புகைப்படக்கருவி / ஒலிவாங்கியை அணுக முடியவில்லை",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "ஒலிவாங்கியை அணுக முடியாததால் அழைப்பு தோல்வியடைந்தது. ஒலிவாங்கி செருகப்பட்டுள்ளதா, சரியாக அமைக்கவும் என சரிபார்க்கவும்.",
+    "Unable to access microphone": "ஒலிவாங்கியை அணுக முடியவில்லை",
+    "Try using turn.matrix.org": "turn.matrix.org ஐப் பயன்படுத்த முயற்சிக்கவும்",
+    "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> பயன்படுத்தி முயற்சி செய்யலாம், ஆனால் இது அவ்வளவு நம்பகமானதாக இருக்காது, மேலும் அது உங்கள் ஐபி முகவரியை அந்த சேவையகத்துடன் பகிர்ந்து கொள்ளும். இதை அமைப்புகளிலும் நிர்வகிக்கலாம்.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "அழைப்புகள் நம்பத்தகுந்த வகையில் இயங்குவதற்காக, TURN சேவையகத்தை உள்ளமைக்க உங்கள் வீட்டுசேவையகத்தின் (<code>%(homeserverDomain)s</code>) நிர்வாகியிடம் கேளுங்கள்.",
+    "Call failed due to misconfigured server": "தவறாக உள்ளமைக்கப்பட்ட சேவையகம் காரணமாக அழைப்பு தோல்வியடைந்தது",
+    "The call was answered on another device.": "அழைப்பு மற்றொரு சாதனத்தில் பதிலளிக்கப்பட்டது.",
+    "Answered Elsewhere": "வேறு எங்கோ பதிலளிக்கப்பட்டது",
+    "The call could not be established": "அழைப்பை நிறுவ முடியவில்லை",
+    "Unable to load! Check your network connectivity and try again.": "ஏற்ற முடியவில்லை! உங்கள் பிணைய இணைப்பைச் சரிபார்த்து மீண்டும் முயற்சிக்கவும்.",
+    "Your user agent": "உங்கள் பயனர் முகவர்",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "நிறுவப்பட்ட முற்போக்கான வலை பயன்பாடாக %(brand)s ஐப் பயன்படுத்துகிறீர்களா",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "தொடுதல் உள்ளீட்டு பொறிமுறை முதன்மையாக இருக்கும் சாதனத்தில் நீங்கள் %(brand)s ஐப் பயன்படுத்துகிறீர்களா",
+    "Add Phone Number": "தொலைபேசி எண்ணை சேர்க்கவும்",
+    "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.": "உங்கள் அடையாளத்தை நிரூபிக்க ஒற்றை உள்நுழைவைப் பயன்படுத்தி இந்த தொலைபேசி எண்ணைச் சேர்ப்பதை உறுதிப்படுத்தவும்.",
+    "Add Email Address": "மின்னஞ்சல் முகவரியை சேர்க்கவும்",
+    "Confirm": "உறுதிப்படுத்தவும்",
+    "Click the button below to confirm adding this email address.": "இந்த மின்னஞ்சல் முகவரியை சேர்ப்பதை உறுதிப்படுத்த கீழே உள்ள பொத்தானை அழுத்தவும்.",
+    "Confirm adding email": "மின்னஞ்சலை சேர்ப்பதை உறுதிப்படுத்தவும்",
+    "Single Sign On": "ஒற்றை உள்நுழைவு",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "உங்கள் அடையாளத்தை நிரூபிக்க ஒற்றை உள்நுழைவைப் பயன்படுத்தி இந்த மின்னஞ்சல் முகவரியை சேர்ப்பதை உறுதிப்படுத்தவும்.",
+    "Use Single Sign On to continue": "தொடர ஒற்றை உள்நுழைவைப் பயன்படுத்தவும்"
 }
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index 431c4571ea..5a991e13b0 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1,10 +1,7 @@
 {
     "Accept": "అంగీకరించు",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ఆహ్వానాన్ని అంగీకరించింది.",
     "Account": "ఖాతా",
-    "Access Token:": "యాక్సెస్ టోకెన్:",
     "Add": "చేర్చు",
-    "Add a topic": "అంశాన్ని జోడించండి",
     "Admin": "అడ్మిన్",
     "Admin Tools": "నిర్వాహక ఉపకరణాలు",
     "No Microphones detected": "మైక్రోఫోన్లు కనుగొనబడలేదు",
@@ -17,38 +14,23 @@
     "Always show message timestamps": "ఎల్లప్పుడూ సందేశాల సమయ ముద్రలు చూపించు",
     "Authentication": "ప్రామాణీకరణ",
     "You do not have permission to post to this room": "మీకు ఈ గదికి పోస్ట్ చేయడానికి అనుమతి లేదు",
-    "Active call (%(roomName)s)": "క్రియాశీల కాల్ల్ (%(roomName)s)",
     "A new password must be entered.": "కొత్త పాస్ వర్డ్ ను తప్పక నమోదు చేయాలి.",
-    "%(senderName)s answered the call.": "%(senderName)s కు సమాధానం ఇచ్చారు.",
     "An error has occurred.": "ఒక లోపము సంభవించినది.",
     "Anyone": "ఎవరైనా",
-    "Anyone who knows the room's link, apart from guests": "అతిథులు కాకుండా గది యొక్క లింక్ తెలిసిన వారు ఎవరైనా",
-    "Anyone who knows the room's link, including guests": "అతిథులతో సహా, గది లింక్ తెలిసిన వారు ఎవరైనా",
     "Are you sure?": "మీరు చెప్పేది నిజమా?",
     "Are you sure you want to leave the room '%(roomName)s'?": "మీరు ఖచ్చితంగా గది '%(roomName)s' వదిలివేయాలనుకుంటున్నారా?",
     "Are you sure you want to reject the invitation?": "మీరు ఖచ్చితంగా ఆహ్వానాన్ని తిరస్కరించాలనుకుంటున్నారా?",
     "Attachment": "జోడింపు",
-    "Autoplay GIFs and videos": "స్వీయ జిఐఫ్ లు మరియు వీడియోలు",
     "Ban": "బాన్",
     "Banned users": "నిషేధించిన వినియోగదారులు",
     "Bans user with given id": "ఇచ్చిన ఐడి తో వినియోగదారుని నిషేధించారు",
-    "Call Timeout": "కాల్ గడువు ముగిసింది",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "గృహనిర్వాహకులకు కనెక్ట్ చేయలేరు - దయచేసి మీ కనెక్టివిటీని తనిఖీ చేయండి, మీ <a> 1 హోమరుసు యొక్క ఎస్ఎస్ఎల్ సర్టిఫికేట్ </a> 2 ని విశ్వసనీయపరుచుకొని, బ్రౌజర్ పొడిగింపు అభ్యర్థనలను నిరోధించబడదని నిర్ధారించుకోండి.",
     "Change Password": "పాస్వర్డ్ మార్చండి",
-    "%(senderName)s changed their profile picture.": "%(senderName)s వారి ప్రొఫైల్ చిత్రాన్ని మార్చారు.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s గది పేరు తొలగించబడింది.",
     "Changes your display nickname": "మీ ప్రదర్శన మారుపేరుని మారుస్తుంది",
     "You cannot place a call with yourself.": "మీకు మీరే కాల్ చేయలేరు.",
-    "You are already in a call.": "మీరు ఇప్పటికే కాల్లో ఉన్నారు.",
     "You cannot place VoIP calls in this browser.": "మీరు ఈ బ్రౌజర్లో కాల్లను చేయలేరు.",
-    "You have no visible notifications": "మీకు కనిపించే నోటిఫికేషన్లు లేవు",
     "You need to be able to invite users to do that.": "మీరు దీన్ని చేయడానికి వినియోగదారులను ఆహ్వానించగలరు.",
-    "Click here to fix": "పరిష్కరించడానికి ఇక్కడ క్లిక్ చేయండి",
-    "Click to mute audio": "ఆడియోను మ్యూట్ చేయడానికి క్లిక్ చేయండి",
-    "Click to mute video": "వీడియో మ్యూట్ చేయడానికి క్లిక్ చేయండి",
-    "click to reveal": "బహిర్గతం చెయుటకు క్లిక్ చేయండి",
-    "Click to unmute video": "వీడియోను అన్మ్యూట్ చేయడానికి క్లిక్ చేయండి",
-    "Click to unmute audio": "ఆడియోని అన్మ్యూట్ చేయడానికి క్లిక్ చేయండి",
     "Close": "ముసివెయండి",
     "Command error": "కమాండ్ లోపం",
     "Commands": "కమ్మండ్స్",
@@ -57,9 +39,7 @@
     "Create Room": "రూమ్ ని సృష్టించండి",
     "Cryptography": "క్రిప్టోగ్రఫీ",
     "Current password": "ప్రస్తుత పాస్వర్డ్",
-    "Custom": "కస్టమ్",
     "Custom level": "అనుకూల స్థాయి",
-    "/ddg is not a command": "/ ddg కమాండ్ కాదు",
     "Deactivate Account": "ఖాతాను డీయాక్టివేట్ చేయండి",
     "Decline": "డిక్లైన్",
     "Deops user with given id": "ఇచ్చిన ID తో వినియోగదారుని విడదీస్తుంది",
@@ -88,12 +68,9 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s ,%(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "ప్రదర్శన పేరుని సెట్ చేయండి:",
     "Upload avatar": "అవతార్ను అప్లోడ్ చేయండి",
-    "Upload an avatar:": "అవతార్ను అప్లోడ్ చేయండి:",
     "This server does not support authentication with a phone number.": "ఈ సర్వర్ ఫోన్ నంబర్తో ప్రామాణీకరణకు మద్దతు ఇవ్వదు.",
     "New passwords don't match": "కొత్త పాస్వర్డ్లు సరిపోలడం లేదు",
-    "There are no visible files in this room": "ఈ గదిలో కనిపించే ఫైల్లు లేవు",
     "Connectivity to the server has been lost.": "సెర్వెర్ కనెక్టివిటీని కోల్పోయారు.",
     "Sent messages will be stored until your connection has returned.": "మీ కనెక్షన్ తిరిగి వచ్చే వరకు పంపిన సందేశాలు నిల్వ చేయబడతాయి.",
     "Cancel": "రద్దు",
@@ -103,9 +80,7 @@
     "Please enter the code it contains:": "దయచేసి దాన్ని కలిగి ఉన్న కోడ్ను నమోదు చేయండి:",
     "Unable to restore session": "సెషన్ను పునరుద్ధరించడానికి సాధ్యపడలేదు",
     "Remove": "తొలగించు",
-    "Room directory": "గది వివరము",
     "Create new room": "క్రొత్త గది సృష్టించండి",
-    "Custom Server Options": "మలచిన  సేవిక ఎంపికలు",
     "Dismiss": "రద్దుచేసే",
     "Error": "లోపం",
     "Favourite": "గుర్తుంచు",
@@ -115,7 +90,6 @@
     "Search": "శోధన",
     "Settings": "అమరికలు",
     "Fetching third party location failed": "మూడవ పార్టీ స్థానాన్ని పొందడం విఫలమైంది",
-    "Advanced notification settings": "ఆధునిక తాఖీదు అమరిక",
     "Sunday": "ఆదివారం",
     "Guests can join": "అతిథులు చేరవచ్చు",
     "Messages sent by bot": "బాట్ పంపిన సందేశాలు",
@@ -126,41 +100,24 @@
     "On": "వేయుము",
     "Changelog": "మార్పు వివరణ",
     "Leave": "వదిలి",
-    "All notifications are currently disabled for all targets.": "ప్రస్తుతానికి అన్ని చోట్లనుంచి అన్ని ప్రకటనలు ఆగి వున్నాయి.",
-    "Forget": "మర్చిపో",
     "Source URL": "మూల URL",
     "Warning": "హెచ్చరిక",
     "Noisy": "శబ్దం",
     "Room not found": "గది కనుగొనబడలేదు",
     "Messages containing my display name": "నా ప్రదర్శన పేరును కలిగి ఉన్న సందేశాలు",
     "Messages in one-to-one chats": "సందేశాలు నుండి ఒకరికి ఒకటి మాటామంతి",
-    "Failed to update keywords": "కీలక పదాలను నవీకరించడంలో విఫలమైంది",
     "remove %(name)s from the directory.": "వివరము నుండి %(name)s ను తొలిగించు.",
-    "Please set a password!": "దయచేసి మీ రహస్యపదాన్నీ అమర్చండి!",
-    "Cancel Sending": "పంపడాన్ని ఆపేయండి",
     "Failed to add tag %(tagName)s to room": "%(tagName)s ను బొందు జోడించడంలో విఫలమైంది",
     "Members": "సభ్యులు",
     "No update available.": "ఏ నవీకరణ అందుబాటులో లేదు.",
     "Resend": "మళ్ళి  పంపుము",
-    "Files": "దస్ర్తాలు",
     "Collecting app version information": "అనువర్తన సంస్కరణ సమాచారాన్ని సేకరించడం",
-    "Forward Message": "సందేశాన్ని మునుముందుకు చేయండి",
-    "Enable notifications for this account": "ఈ ఖాతా కోసం తాఖీదు ప్రారంభించండి",
-    "Messages containing <span>keywords</span>": "కీలక పదాలను</span>కలిగి ఉన్న సందేశం<span>",
-    "Error saving email notification preferences": "ఇమెయిల్ ప్రకటనలను ప్రాధాన్యతలను దాచు చేయడంలో లోపం",
     "Tuesday": "మంగళవారం",
-    "Enter keywords separated by a comma:": "కామాతో వేరు చేయబడిన కీలక పదాలను నమోదు చేయండి:",
-    "I understand the risks and wish to continue": "నేను నష్టాలను అర్థం చేసుకుంటాను మరియు కొనసాగించాలని కోరుకుంటున్నాను",
     "Remove %(name)s from the directory?": "వివరము నుండి %(name)s తొలిగించు?",
     "Remove from Directory": "`వివరము నుండి తొలిగించు",
-    "Direct Chat": "ప్రత్యక్ష మాటామంతి",
     "Reject": "తిరస్కరించు",
-    "Failed to set Direct Message status of room": "గది యొక్క ప్రత్యక్ష సందేశ స్థితి సెట్ చేయడంలో విఫలమైంది",
     "Monday": "సోమవారం",
-    "All messages (noisy)": "అన్ని సందేశాలు (గట్టిగ)",
-    "Enable them now": "ఇప్పుడే వాటిని ప్రారంభించండి",
     "Collecting logs": "నమోదు సేకరించడం",
-    "(HTTP status %(httpStatus)s)": "(HTTP స్థితి %(httpStatus)s)",
     "All Rooms": "అన్ని గదులు",
     "Wednesday": "బుధవారం",
     "Send": "పంపండి",
@@ -168,9 +125,6 @@
     "All messages": "అన్ని సందేశాలు",
     "Call invitation": "మాట్లాడడానికి ఆహ్వానం",
     "Downloading update...": "నవీకరణను దిగుమతి చేస్తోంది...",
-    "Keywords": "ముఖ్యపదాలు",
-    "Can't update user notification settings": "వినియోగదారు ప్రకటన ప్రాదాన్యాలు నవీకరించదడానేకి రాదు",
-    "Notify for all other messages/rooms": "అన్ని ఇతర సందేశాలు / గదులు కోసం తెలియజేయండి",
     "Couldn't find a matching Matrix room": "సరిపోలిక మ్యాట్రిక్స్ గదిని కనుగొనలేకపోయాము",
     "Invite to this room": "ఈ గదికి ఆహ్వానించండి",
     "Thursday": "గురువారం",
@@ -179,15 +133,9 @@
     "Yesterday": "నిన్న",
     "Error encountered (%(errorDetail)s).": "లోపం సంభవించింది (%(errorDetail)s).",
     "Low Priority": "తక్కువ ప్రాధాన్యత",
-    "Set Password": "రహస్యపదాన్నీ  అమర్చండి",
-    "An error occurred whilst saving your email notification preferences.": "మీ ఇమెయిల్ ప్రకటన ప్రాధాన్యాలు బద్రపరిచేతప్పుడు ఎదో తప్పు జరిగింది.",
     "Off": "ఆపు",
-    "Mentions only": "మాత్రమే ప్రస్తావిస్తుంది",
     "Failed to remove tag %(tagName)s from room": "గది నుండి బొందు %(tagName)s తొలగించడంలో విఫలమైంది",
-    "Enable email notifications": "ఇమెయిల్ ప్రకటనలను ప్రారంభించండి",
     "No rooms to show": "చూపించడానికి గదులు లేవు",
-    "Download this file": "ఈ దస్త్రం దిగుమతి చేయండి",
-    "Failed to change settings": "అమరిక మార్చడం విఫలమైంది",
     "Checking for an update...": "నవీకరణ కోసం చూస్తోంది...",
     "Saturday": "శనివారం",
     "This email address is already in use": "ఈ ఇమెయిల్ అడ్రస్ ఇప్పటికే వాడుకం లో ఉంది",
@@ -199,9 +147,5 @@
     "Every page you use in the app": "ఆప్ లో మీరు వాడే ప్రతి పేజి",
     "e.g. <CurrentPageURL>": "ఉ.దా. <CurrentPageURL>",
     "Call Failed": "కాల్ విఫలమయింది",
-    "The remote side failed to pick up": "అటు వైపు ఎత్తలేకపోయారు",
-    "Unable to capture screen": "తెరని చూపలేకపోతున్నారు",
-    "Existing Call": "నజుస్తున్న కాల్",
-    "VoIP is unsupported": "కాల్ చేయుట ఈ పరికరం పోషించలేదు",
-    "Call in Progress": "నడుస్తున్న కాల్"
+    "VoIP is unsupported": "కాల్ చేయుట ఈ పరికరం పోషించలేదు"
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 16a9e521c2..ebcff2e91a 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -9,7 +9,6 @@
     "Create Room": "สรัางห้อง",
     "Default": "ค่าเริ่มต้น",
     "Default Device": "อุปกรณ์เริ่มต้น",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s แบน %(targetName)s แล้ว",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
     "Decrypt %(text)s": "ถอดรหัส %(text)s",
     "Download %(text)s": "ดาวน์โหลด %(text)s",
@@ -23,7 +22,6 @@
     "Profile": "โปรไฟล์",
     "Reason": "เหตุผล",
     "Register": "ลงทะเบียน",
-    "Results from DuckDuckGo": "ผลจาก DuckDuckGo",
     "%(brand)s version:": "เวอร์ชัน %(brand)s:",
     "Cancel": "ยกเลิก",
     "Dismiss": "ปิด",
@@ -34,14 +32,9 @@
     "Search": "ค้นหา",
     "Settings": "การตั้งค่า",
     "unknown error code": "รหัสข้อผิดพลาดที่ไม่รู้จัก",
-    "olm version:": "เวอร์ชัน olm:",
     "Remove": "ลบ",
-    "Custom Server Options": "กำหนดเซิร์ฟเวอร์เอง",
     "Favourite": "รายการโปรด",
     "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ตอบรับคำเชิญแล้ว",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ตอบรับคำเชิญสำหรับ %(displayName)s แล้ว",
-    "Add a topic": "เพิ่มหัวข้อ",
     "Admin": "ผู้ดูแล",
     "No Webcams detected": "ไม่พบกล้องเว็บแคม",
     "No media permissions": "ไม่มีสิทธิ์เข้าถึงสื่อ",
@@ -50,47 +43,33 @@
     "%(items)s and %(lastItem)s": "%(items)s และ %(lastItem)s",
     "and %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
     "and %(count)s others...|other": "และอีก %(count)s ผู้ใช้...",
-    "%(senderName)s answered the call.": "%(senderName)s รับสายแล้ว",
     "An error has occurred.": "เกิดข้อผิดพลาด",
     "Anyone": "ทุกคน",
-    "Anyone who knows the room's link, apart from guests": "ทุกคนที่มีลิงก์ ยกเว้นแขก",
-    "Anyone who knows the room's link, including guests": "ทุกคนที่มีลิงก์ รวมถึงแขก",
     "Are you sure?": "คุณแน่ใจหรือไม่?",
     "Are you sure you want to leave the room '%(roomName)s'?": "คุณแน่ใจหรือว่าต้องการจะออกจากห้อง '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "คุณแน่ใจหรือว่าต้องการจะปฏิเสธคำเชิญ?",
     "Attachment": "ไฟล์แนบ",
-    "Autoplay GIFs and videos": "เล่น GIF และวิดิโออัตโนมัติ",
     "Banned users": "ผู้ใช้ที่ถูกแบน",
     "Bans user with given id": "ผู้ใช้และ id ที่ถูกแบน",
-    "%(senderName)s changed their profile picture.": "%(senderName)s เปลี่ยนรูปโปรไฟล์ของเขา",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ลบชื่อห้อง",
     "Changes your display nickname": "เปลี่ยนชื่อเล่นที่แสดงของคุณ",
-    "Click here to fix": "คลิกที่นี่เพื่อแก้ไข",
-    "Click to mute audio": "คลิกที่นี่เพื่อปิดเสียง",
-    "Click to mute video": "คลิกที่นี่เพื่อปิดกล้อง",
-    "click to reveal": "คลิกเพื่อแสดง",
-    "Click to unmute video": "คลิกเพื่อเปิดกล้อง",
-    "Click to unmute audio": "คลิกเพื่อเปิดเสียง",
     "Command error": "คำสั่งผิดพลาด",
     "Commands": "คำสั่ง",
     "Confirm password": "ยืนยันรหัสผ่าน",
     "Continue": "ดำเนินการต่อ",
     "Cryptography": "วิทยาการเข้ารหัส",
     "Current password": "รหัสผ่านปัจจุบัน",
-    "/ddg is not a command": "/ddg ไม่ใช่คำสั่ง",
     "Deactivate Account": "ปิดการใช้งานบัญชี",
     "Disinvite": "ถอนคำเชิญ",
     "Email": "อีเมล",
     "Email address": "ที่อยู่อีเมล",
-    "%(senderName)s ended the call.": "%(senderName)s จบการโทร",
     "Error decrypting attachment": "การถอดรหัสไฟล์แนบผิดพลาด",
     "Export": "ส่งออก",
     "Failed to ban user": "การแบนผู้ใช้ล้มเหลว",
     "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?",
     "Failed to join room": "การเข้าร่วมห้องล้มเหลว",
     "Failed to kick": "การเตะล้มเหลว",
-    "Failed to leave room": "การออกจากห้องล้มเหลว",
     "Failed to reject invite": "การปฏิเสธคำเชิญล้มเหลว",
     "Failed to reject invitation": "การปฏิเสธคำเชิญล้มเหลว",
     "Failed to send email": "การส่งอีเมลล้มเหลว",
@@ -106,32 +85,26 @@
     "Hangup": "วางสาย",
     "Historical": "ประวัติแชทเก่า",
     "Homeserver is": "เซิร์ฟเวอร์บ้านคือ",
-    "Identity Server is": "เซิร์ฟเวอร์ระบุตัวตนคือ",
     "I have verified my email address": "ฉันยืนยันที่อยู่อีเมลแล้ว",
     "Import": "นำเข้า",
     "Incorrect username and/or password.": "ชื่อผู้ใช้และ/หรือรหัสผ่านไม่ถูกต้อง",
     "Incorrect verification code": "รหัสยืนยันไม่ถูกต้อง",
     "Invalid Email Address": "ที่อยู่อีเมลไม่ถูกต้อง",
     "Invalid file%(extra)s": "ไฟล์ %(extra)s ไม่ถูกต้อง",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s เชิญ %(targetName)s แล้ว",
     "Invited": "เชิญแล้ว",
     "Invites": "คำเชิญ",
     "Invites user with given id to current room": "เชิญผู้ใช้ พร้อม id ของห้องปัจจุบัน",
     "Sign in with": "เข้าสู่ระบบด้วย",
     "Join Room": "เข้าร่วมห้อง",
-    "%(targetName)s joined the room.": "%(targetName)s เข้าร่วมห้องแล้ว",
     "Jump to first unread message.": "ข้ามไปยังข้อความแรกที่ยังไม่ได้อ่าน",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s เตะ %(targetName)s แล้ว",
     "Labs": "ห้องทดลอง",
     "Leave room": "ออกจากห้อง",
-    "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
     "Logout": "ออกจากระบบ",
     "Missing user_id in request": "ไม่พบ user_id ในคำขอ",
     "Moderator": "ผู้ช่วยดูแล",
     "New passwords don't match": "รหัสผ่านใหม่ไม่ตรงกัน",
     "New passwords must match each other.": "รหัสผ่านใหม่ทั้งสองช่องต้องตรงกัน",
     "not specified": "ไม่ได้ระบุ",
-    "(not supported by this browser)": "(เบราว์เซอร์นี้ไม่รองรับ)",
     "<not supported>": "<ไม่รองรับ>",
     "No more results": "ไม่มีผลลัพธ์อื่น",
     "No results": "ไม่มีผลลัพธ์",
@@ -140,26 +113,19 @@
     "Phone": "โทรศัพท์",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "กรุณาเช็คอีเมลและคลิกลิงก์ข้างใน หลังจากนั้น คลิกดำเนินการต่อ",
     "Privileged Users": "ผู้ใช้ที่มีสิทธิพิเศษ",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ปฏิเสธคำเชิญแล้ว",
     "Reject invitation": "ปฏิเสธคำเชิญ",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ลบชื่อที่แสดงแล้ว (%(oldDisplayName)s)",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ลบรูปโปรไฟล์ของเขาแล้ว",
     "Return to login screen": "กลับไปยังหน้าลงชื่อเข้าใช้",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s ไม่มีสิทธิ์ส่งการแจ้งเตือน - กรุณาตรวจสอบการตั้งค่าเบราว์เซอร์ของคุณ",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ไม่ได้รับสิทธิ์ส่งการแจ้งเตือน - กรุณาลองใหม่อีกครั้ง",
-    "Room Colour": "สีห้อง",
     "Rooms": "ห้องสนทนา",
     "Save": "บันทึก",
     "Search failed": "การค้นหาล้มเหลว",
-    "Searches DuckDuckGo for results": "ค้นหาบน DuckDuckGo",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ได้ส่งรูป",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
     "Server error": "เซิร์ฟเวอร์ผิดพลาด",
     "Server may be unavailable, overloaded, or search timed out :(": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือการค้นหาหมดเวลา :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือเจอจุดบกพร่อง",
     "Server unavailable, overloaded, or something else went wrong.": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือบางอย่างผิดปกติ",
-    "%(senderName)s set a profile picture.": "%(senderName)s ตั้งรูปโปรไฟล์",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ตั้งชื่อที่แสดงเป็น %(displayName)s",
     "Signed Out": "ออกจากระบบแล้ว",
     "Sign in": "เข้าสู่ระบบ",
     "Sign out": "ออกจากระบบ",
@@ -172,20 +138,15 @@
     "This email address was not found": "ไม่พบที่อยู่อีเมล",
     "This phone number is already in use": "หมายเลขโทรศัพท์นี้ถูกใช้งานแล้ว",
     "Create new room": "สร้างห้องใหม่",
-    "Room directory": "ไดเรกทอรีห้อง",
     "Start chat": "เริ่มแชท",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์บ้านผ่านทาง HTTP ได้เนื่องจาก URL ที่อยู่บนเบราว์เซอร์เป็น HTTPS กรุณาใช้ HTTPS หรือ<a>เปิดใช้งานสคริปต์ที่ไม่ปลอดภัย</a>.",
-    "Error: Problem communicating with the given homeserver.": "ข้อผิดพลาด: มีปัญหาในการติดต่อกับเซิร์ฟเวอร์บ้านที่กำหนด",
     "Export E2E room keys": "ส่งออกกุญแจถอดรหัส E2E",
     "Failed to change power level": "การเปลี่ยนระดับอำนาจล้มเหลว",
     "Import E2E room keys": "นำเข้ากุญแจถอดรหัส E2E",
-    "The phone number entered looks invalid": "ดูเหมือนว่าหมายเลขโทรศัพท์ที่กรอกรมาไม่ถูกต้อง",
     "The email address linked to your account must be entered.": "กรุณากรอกที่อยู่อีเมลที่เชื่อมกับบัญชีของคุณ",
     "Unable to add email address": "ไมาสามารถเพิ่มที่อยู่อีเมล",
     "Unable to verify email address.": "ไม่สามารถยืนยันที่อยู่อีเมล",
     "Unban": "ปลดแบน",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ปลดแบน %(targetName)s แล้ว",
-    "Unable to capture screen": "ไม่สามารถจับภาพหน้าจอ",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
     "Uploading %(filename)s and %(count)s others|zero": "กำลังอัปโหลด %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
@@ -194,7 +155,6 @@
     "Upload file": "อัปโหลดไฟล์",
     "Usage": "การใช้งาน",
     "Warning!": "คำเตือน!",
-    "Who can access this room?": "ใครสามารถเข้าถึงห้องนี้ได้?",
     "Who can read history?": "ใครสามารถอ่านประวัติแชทได้?",
     "You have <a>disabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>ปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
     "You have <a>enabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>เปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
@@ -222,7 +182,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "ตั้งชื่อที่แสดง:",
     "Room": "ห้อง",
     "New Password": "รหัสผ่านใหม่",
     "Options": "ตัวเลือก",
@@ -231,17 +190,13 @@
     "Import room keys": "นำเข้ากุณแจห้อง",
     "File to import": "ไฟล์ที่จะนำเข้า",
     "Failed to invite": "การเชิญล้มเหลว",
-    "Failed to invite the following users to the %(roomName)s room:": "การเชิญผู้ใช้เหล่านี้เข้าสู่ห้อง %(roomName)s ล้มเหลว:",
     "Confirm Removal": "ยืนยันการลบ",
     "Unknown error": "ข้อผิดพลาดที่ไม่รู้จัก",
     "Incorrect password": "รหัสผ่านไม่ถูกต้อง",
     "Unknown Address": "ที่อยู่ที่ไม่รู้จัก",
-    "ex. @bob:example.com": "เช่น @bob:example.com",
-    "Add User": "เพิ่มผู้ใช้",
     "Add": "เพิ่ม",
     "Accept": "ยอมรับ",
     "Close": "ปิด",
-    "Custom": "กำหนดเอง",
     "Decline": "ปฏิเสธ",
     "Home": "เมนูหลัก",
     "Last seen": "เห็นครั้งสุดท้าย",
@@ -251,9 +206,6 @@
     "(~%(count)s results)|other": "(~%(count)s ผลลัพท์)",
     "A new password must be entered.": "กรุณากรอกรหัสผ่านใหม่",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "ไม่สามารถเฃื่อมต่อไปหาเซิร์ฟเวอร์บ้านได้ - กรุณาตรวจสอบคุณภาพการเชื่อมต่อ, ตรวจสอบว่า<a>SSL certificate ของเซิร์ฟเวอร์บ้าน</a>ของคุณเชื่อถือได้, และวไม่มีส่วนขยายเบราว์เซอร์ใดบล๊อคการเชื่อมต่ออยู่",
-    "Drop File Here": "วางไฟล์ที่นี่",
-    "Private Chat": "แชทส่วนตัว",
-    "Public Chat": "แชทสาธารณะ",
     "Custom level": "กำหนดระดับเอง",
     "No display name": "ไม่มีชื่อที่แสดง",
     "Only people who have been invited": "เฉพาะบุคคลที่ได้รับเชิญ",
@@ -261,28 +213,20 @@
     "%(roomName)s does not exist.": "ไม่มีห้อง %(roomName)s อยู่จริง",
     "Enter passphrase": "กรอกรหัสผ่าน",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s เห็นแล้วเมื่อเวลา %(dateTime)s",
-    "unknown caller": "ไม่ทราบผู้โทร",
     "Upload new:": "อัปโหลดใหม่:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (ระดับอำนาจ %(powerLevelNumber)s)",
     "Users": "ผู้ใช้",
     "Verification Pending": "รอการตรวจสอบ",
-    "You are already in a call.": "คุณอยู่ในสายแล้ว",
     "You cannot place a call with yourself.": "คุณไม่สามารถโทรหาตัวเองได้",
-    "Error decrypting audio": "เกิดข้อผิดพลาดในการถอดรหัสเสียง",
     "Error decrypting image": "เกิดข้อผิดพลาดในการถอดรหัสรูป",
     "Error decrypting video": "เกิดข้อผิดพลาดในการถอดรหัสวิดิโอ",
     "Fetching third party location failed": "การเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว",
-    "I understand the risks and wish to continue": "ฉันเข้าใจความเสี่ยงและต้องการดำเนินการต่อ",
-    "Advanced notification settings": "ตั้งค่าการแจ้งเตือนขั้นสูง",
-    "Uploading report": "กำลังอัปโหลดรายงาน",
     "Sunday": "วันอาทิตย์",
     "Guests can join": "แขกเข้าร่วมได้",
     "Failed to add tag %(tagName)s to room": "การเพิ่มแท็ก %(tagName)s ของห้องนี้ล้มเหลว",
     "Notification targets": "เป้าหมายการแจ้งเตือน",
     "Failed to set direct chat tag": "การติดแท็กแชทตรงล้มเหลว",
     "Today": "วันนี้",
-    "Files": "ไฟล์",
-    "You are not receiving desktop notifications": "การแจ้งเตือนบนเดสก์ทอปถูกปิดอยู่",
     "Friday": "วันศุกร์",
     "Update": "อัปเดต",
     "What's New": "มีอะไรใหม่",
@@ -290,12 +234,7 @@
     "Changelog": "บันทึกการเปลี่ยนแปลง",
     "Waiting for response from server": "กำลังรอการตอบสนองจากเซิร์ฟเวอร์",
     "Leave": "ออกจากห้อง",
-    "Uploaded on %(date)s by %(user)s": "อัปโหลดเมื่อ %(date)s โดย %(user)s",
-    "All notifications are currently disabled for all targets.": "การแจ้งเตือนทั้งหมดถูกปิดใช้งานสำหรับทุกอุปกรณ์",
-    "Forget": "ลืม",
     "World readable": "ทุกคนอ่านได้",
-    "You cannot delete this image. (%(code)s)": "คุณไม่สามารถลบรูปนี้ได้ (%(code)s)",
-    "Cancel Sending": "ยกเลิกการส่ง",
     "Warning": "คำเตือน",
     "This Room": "ห้องนี้",
     "Resend": "ส่งใหม่",
@@ -303,81 +242,48 @@
     "Messages containing my display name": "ข้อความที่มีชื่อของฉัน",
     "Messages in one-to-one chats": "ข้อความในแชทตัวต่อตัว",
     "Unavailable": "ไม่มี",
-    "Error saving email notification preferences": "การบันทึกการตั้งค่าการแจ้งเตือนทางอีเมลผิดพลาด",
-    "View Decrypted Source": "ดูซอร์สที่ถอดรหัสแล้ว",
     "Send": "ส่ง",
     "remove %(name)s from the directory.": "ถอด %(name)s ออกจากไดเรกทอรี",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:",
-    "Please set a password!": "กรุณาตั้งรหัสผ่าน!",
-    "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!",
-    "An error occurred whilst saving your email notification preferences.": "เกิดข้อผิดพลาดระหว่างบันทึกการตั้งค่าการแจ้งเตือนทางอีเมล",
     "Source URL": "URL ต้นฉบับ",
     "Messages sent by bot": "ข้อความจากบอท",
     "Members": "สมาชิก",
     "No update available.": "ไม่มีอัปเดตที่ใหม่กว่า",
     "Noisy": "เสียงดัง",
     "Collecting app version information": "กำลังรวบรวมข้อมูลเวอร์ชันแอป",
-    "Enable notifications for this account": "เปิดใช้งานการแจ้งเตือนสำหรับบัญชีนี้",
-    "Messages containing <span>keywords</span>": "ข้อความที่มี<span>คีย์เวิร์ด</span>",
     "View Source": "ดูซอร์ส",
     "Tuesday": "วันอังคาร",
-    "Enter keywords separated by a comma:": "กรอกคีย์เวิร์ดทั้งหมด คั่นด้วยเครื่องหมายจุลภาค:",
     "Search…": "ค้นหา…",
     "Remove %(name)s from the directory?": "ถอด %(name)s ออกจากไดเรกทอรี?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s ใช้คุณสมบัติขั้นสูงในเบราว์เซอร์หลายประการ คุณสมบัติบางอย่างอาจยังไม่พร้อมใช้งานหรืออยู่ในขั้นทดลองในเบราว์เซอร์ปัจจุบันของคุณ",
     "Unnamed room": "ห้องที่ไม่มีชื่อ",
-    "All messages (noisy)": "ทุกข้อความ (เสียงดัง)",
     "Saturday": "วันเสาร์",
-    "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
-    "Direct Chat": "แชทโดยตรง",
     "The server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป",
     "Reject": "ปฏิเสธ",
-    "Failed to set Direct Message status of room": "การตั้งสถานะข้อความตรงของห้องล้มเหลว",
     "Monday": "วันจันทร์",
     "Remove from Directory": "ถอดออกจากไดเรกทอรี",
-    "Enable them now": "เปิดใช้งานเดี๋ยวนี้",
     "Collecting logs": "กำลังรวบรวมล็อก",
-    "(HTTP status %(httpStatus)s)": "(สถานะ HTTP %(httpStatus)s)",
     "All Rooms": "ทุกห้อง",
     "Wednesday": "วันพุธ",
-    "Failed to update keywords": "การอัปเดตคีย์เวิร์ดล้มเหลว",
     "Send logs": "ส่งล็อก",
     "All messages": "ทุกข้อความ",
     "Call invitation": "คำเชิญเข้าร่วมการโทร",
     "Downloading update...": "กำลังดาวน์โหลดอัปเดต...",
-    "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!",
     "What's new?": "มีอะไรใหม่?",
-    "Notify me for anything else": "แจ้งเตือนสำหรับอย่างอื่นทั้งหมด",
     "When I'm invited to a room": "เมื่อฉันได้รับคำเชิญเข้าห้อง",
-    "Keywords": "คีย์เวิร์ด",
-    "Can't update user notification settings": "ไม่สามารถอัปเดตการตั้งค่าการแจ้งเตือนของผู้ใช้",
-    "Notify for all other messages/rooms": "แจ้งเตือนจากห้อง/ข้อความอื่น ๆ ทั้งหมด",
     "Unable to look up room ID from server": "ไม่สามารถหา ID ห้องจากเซิร์ฟเวอร์ได้",
     "Couldn't find a matching Matrix room": "ไม่พบห้อง Matrix ที่ตรงกับคำค้นหา",
     "Invite to this room": "เชิญเข้าห้องนี้",
     "You cannot delete this message. (%(code)s)": "คุณไม่สามารถลบข้อความนี้ได้ (%(code)s)",
     "Thursday": "วันพฤหัสบดี",
-    "Forward Message": "ส่งต่อข้อความ",
-    "Unhide Preview": "แสดงตัวอย่าง",
     "Unable to join network": "ไม่สามารถเข้าร่วมเครือข่ายได้",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "ขออภัย เบราว์เซอร์ของคุณ<b>ไม่</b>สามารถ run %(brand)s ได้",
     "Messages in group chats": "ข้อความในแชทกลุ่ม",
     "Yesterday": "เมื่อวานนี้",
     "Error encountered (%(errorDetail)s).": "เกิดข้อผิดพลาด (%(errorDetail)s)",
     "Low Priority": "ความสำคัญต่ำ",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
-    "Set Password": "ตั้งรหัสผ่าน",
     "Off": "ปิด",
-    "Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น",
     "Failed to remove tag %(tagName)s from room": "การลบแท็ก %(tagName)s จากห้องล้มเหลว",
-    "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาสู่ระบบบนอุปกรณ์อื่น ๆ",
-    "Enable email notifications": "เปิดใช้งานการแจ้งเตือนทางอีเมล",
     "No rooms to show": "ไม่มีห้องที่จะแสดง",
-    "Download this file": "ดาวน์โหลดไฟล์นี้",
-    "Failed to change settings": "การแก้ไขการตั้งค่าล้มเหลว",
-    "Unable to fetch notification target list": "ไม่สามารถรับรายชื่ออุปกรณ์แจ้งเตือน",
     "Quote": "อ้างอิง",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "การแสดงผลของโปรแกรมอาจผิดพลาด ฟังก์ชันบางอย่างหรือทั้งหมดอาจไม่ทำงานในเบราว์เซอร์ปัจจุบันของคุณ หากคุณต้องการลองดำเนินการต่อ คุณต้องรับมือกับปัญหาที่อาจจะเกิดขึ้นด้วยตัวคุณเอง!",
     "Checking for an update...": "กำลังตรวจหาอัปเดต...",
     "Explore rooms": "สำรวจห้อง",
     "Sign In": "ลงชื่อเข้า",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index c5316ee2df..4cbd1e6bb5 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,12 +1,7 @@
 {
     "Accept": "Kabul Et",
-    "%(targetName)s accepted an invitation.": "%(targetName)s bir davetiyeyi kabul etti.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s %(displayName)s için davetiyeyi kabul etti.",
     "Account": "Hesap",
-    "Access Token:": "Erişim Anahtarı:",
-    "Active call (%(roomName)s)": "Aktif çağrı (%(roomName)s)",
     "Add": "Ekle",
-    "Add a topic": "Bir konu(topic) ekle",
     "Admin": "Admin",
     "Admin Tools": "Admin Araçları",
     "No Microphones detected": "Hiçbir Mikrofon bulunamadı",
@@ -23,36 +18,23 @@
     "and %(count)s others...|one": "ve bir diğeri...",
     "and %(count)s others...|other": "ve %(count)s diğerleri...",
     "A new password must be entered.": "Yeni bir şifre girilmelidir.",
-    "%(senderName)s answered the call.": "%(senderName)s aramayı cevapladı.",
     "An error has occurred.": "Bir hata oluştu.",
     "Anyone": "Kimse",
-    "Anyone who knows the room's link, apart from guests": "Misafirler dışında odanın bağlantısını bilen herkes",
-    "Anyone who knows the room's link, including guests": "Misafirler dahil , odanın bağlantısını bilen herkes",
     "Are you sure?": "Emin misiniz ?",
     "Are you sure you want to leave the room '%(roomName)s'?": "'%(roomName)s' odasından ayrılmak istediğinize emin misiniz ?",
     "Are you sure you want to reject the invitation?": "Daveti reddetmek istediğinizden emin misiniz ?",
     "Attachment": "Ek Dosya",
-    "Autoplay GIFs and videos": "GIF'leri ve Videoları otomatik olarak oynat",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s %(targetName)s'i banladı.",
     "Ban": "Yasak",
     "Banned users": "Yasaklanan(Banlanan) Kullanıcılar",
     "Bans user with given id": "Yasaklanan(Banlanan) Kullanıcılar , ID'leri ile birlikte",
-    "Call Timeout": "Arama Zaman Aşımı",
     "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.": "Ana Sunucu'ya bağlanılamıyor - lütfen bağlantınızı kontrol edin ,<a> Ana Sunucu SSL sertifikanızın </a> güvenilir olduğundan ve bir tarayıcı uzantısının istekleri engellemiyor olduğundan emin olun.",
     "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>.": "Tarayıcı çubuğunuzda bir HTTPS URL'si olduğunda Ana Sunusuna HTTP üzerinden bağlanılamıyor . Ya HTTPS kullanın veya <a> güvensiz komut dosyalarını</a> etkinleştirin.",
     "Change Password": "Şifre Değiştir",
-    "%(senderName)s changed their profile picture.": "%(senderName)s profil resmini değiştirdi.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s %(powerLevelDiffText)s'nin güç düzeyini değiştirdi.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s odanın ismini %(roomName)s olarak değiştirdi.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s oda adını kaldırdı.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s konuyu \"%(topic)s\" olarak değiştirdi.",
     "Changes your display nickname": "Görünen takma adınızı değiştirir",
-    "Click here to fix": "Düzeltmek için buraya tıklayın",
-    "Click to mute audio": "Sesi kapatmak için  tıklayın",
-    "Click to mute video": "Videoyu kapatmak için tıklayın",
-    "click to reveal": "Ortaya çıkarmak için tıklayın",
-    "Click to unmute video": "Videoyu açmak için tıklayın",
-    "Click to unmute audio": "Sesi açmak için tıklayın",
     "Close": "Kapat",
     "Command error": "Komut Hatası",
     "Commands": "Komutlar",
@@ -61,9 +43,7 @@
     "Create Room": "Oda Oluştur",
     "Cryptography": "Kriptografi",
     "Current password": "Şimdiki Şifre",
-    "Custom": "Özel",
     "Custom level": "Özel seviye",
-    "/ddg is not a command": "/ddg bir komut değildir",
     "Deactivate Account": "Hesabı Devre Dışı Bırakma",
     "Decline": "Reddet",
     "Decrypt %(text)s": "%(text)s metninin şifresini çöz",
@@ -72,26 +52,20 @@
     "Disinvite": "Daveti İptal Et",
     "Displays action": "Eylemi görüntüler",
     "Download %(text)s": "%(text)s metnini indir",
-    "Drop File Here": "Dosyayı Buraya Bırak",
     "Email": "E-posta",
     "Email address": "E-posta Adresi",
     "Emoji": "Emoji (Karakter)",
-    "%(senderName)s ended the call.": "%(senderName)s çağrıyı bitirdi.",
     "Enter passphrase": "Şifre deyimi Girin",
     "Error": "Hata",
     "Error decrypting attachment": "Ek şifresini çözme hatası",
-    "Error: Problem communicating with the given homeserver.": "Hata: verilen Ana Sunucu ile iletişim kurulamıyor.",
-    "Existing Call": "Mevcut Çağrı",
     "Export": "Dışa Aktar",
     "Export E2E room keys": "Uçtan uca Oda anahtarlarını Dışa Aktar",
     "Failed to ban user": "Kullanıcı yasaklama(Ban) başarısız",
     "Failed to change password. Is your password correct?": "Parola değiştirilemedi . Şifreniz doğru mu ?",
     "Failed to change power level": "Güç seviyesini değiştirme başarısız oldu",
-    "Failed to fetch avatar URL": "Avatar URL'i alınamadı",
     "Failed to forget room %(errCode)s": "Oda unutulması başarısız oldu %(errCode)s",
     "Failed to join room": "Odaya girme hatası",
     "Failed to kick": "Atma(Kick) işlemi başarısız oldu",
-    "Failed to leave room": "Odadan ayrılma başarısız oldu",
     "Failed to load timeline position": "Zaman çizelgesi konumu yüklenemedi",
     "Failed to mute user": "Kullanıcıyı sessize almak başarısız oldu",
     "Failed to reject invite": "Daveti reddetme başarısız oldu",
@@ -101,47 +75,36 @@
     "Failed to set display name": "Görünür ismi ayarlama başarısız oldu",
     "Failed to unban": "Yasağı kaldırmak başarısız oldu",
     "Failed to upload profile picture!": "Profil resmi yükleme başarısız oldu!",
-    "Failed to verify email address: make sure you clicked the link in the email": "Eposta adresini doğrulamadı: epostadaki bağlantıya tıkladığınızdan emin olun",
+    "Failed to verify email address: make sure you clicked the link in the email": "E-posta adresi doğrulanamadı: E-postadaki bağlantıya tıkladığınızdan emin olun",
     "Failure to create room": "Oda oluşturulamadı",
     "Favourite": "Favori",
     "Favourites": "Favoriler",
-    "Fill screen": "Ekranı Doldur",
     "Filter room members": "Oda üyelerini Filtrele",
     "Forget room": "Odayı Unut",
     "For security, this session has been signed out. Please sign in again.": "Güvenlik için , bu oturuma çıkış yapıldı . Lütfen tekrar oturum açın.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s den %(toPowerLevel)s ' ye",
-    "Guests cannot join this room even if explicitly invited.": "Misafirler açıkca davet edilseler bile bu odaya katılamazlar.",
     "Hangup": "Sorun",
     "Historical": "Tarihi",
     "Home": "Ev",
     "Homeserver is": "Ana Sunucusu",
-    "Identity Server is": "Kimlik Sunucusu",
     "I have verified my email address": "E-posta adresimi doğruladım",
     "Import": "İçe Aktar",
     "Import E2E room keys": "Uçtan uca Oda Anahtarlarını İçe Aktar",
-    "Incoming call from %(name)s": "%(name)s ' den gelen çağrı",
-    "Incoming video call from %(name)s": "%(name)s ' den görüntülü arama",
-    "Incoming voice call from %(name)s": "%(name)s ' den gelen sesli arama",
     "Incorrect username and/or password.": "Yanlış kullanıcı adı ve / veya şifre.",
     "Incorrect verification code": "Yanlış doğrulama kodu",
     "Invalid Email Address": "Geçersiz E-posta Adresi",
     "Invalid file%(extra)s": "Geçersiz dosya %(extra)s'ı",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s ' ı davet etti.",
     "Invited": "Davet Edildi",
     "Invites": "Davetler",
     "Invites user with given id to current room": "Mevcut odaya verilen kimliği olan kullanıcıyı davet eder",
     "Sign in with": "Şununla giriş yap",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText> ses </voiceText> veya <videoText> video </videoText> olarak katılın.",
     "Join Room": "Odaya Katıl",
-    "%(targetName)s joined the room.": "%(targetName)s odaya katıldı.",
     "Jump to first unread message.": "İlk okunmamış iletiye atla.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s' ı attı.",
     "Kick": "Atmak (Odadan atmak vs.)",
     "Kicks user with given id": "Verilen ID ' li kullanıcıyı at",
     "Labs": "Laboratuarlar",
     "Last seen": "Son görülme",
     "Leave room": "Odadan ayrıl",
-    "%(targetName)s left the room.": "%(targetName)s odadan ayrıldı.",
     "Logout": "Çıkış Yap",
     "Low priority": "Düşük öncelikli",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
@@ -149,7 +112,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gelecekte oda geçmişini görünür yaptı herhangi biri.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gelecekte oda geçmişini görünür yaptı bilinmeyen (%(visibility)s).",
-    "Manage Integrations": "Entegrasyonları Yönet",
     "Missing room_id in request": "İstekte eksik room_id",
     "Missing user_id in request": "İstekte user_id eksik",
     "Moderator": "Moderatör",
@@ -159,14 +121,12 @@
     "New passwords must match each other.": "Yeni şifreler birbirleriyle eşleşmelidir.",
     "not specified": "Belirtilmemiş",
     "Notifications": "Bildirimler",
-    "(not supported by this browser)": "(Bu tarayıcı tarafından desteklenmiyor)",
     "<not supported>": "<Desteklenmiyor>",
     "No display name": "Görünür isim yok",
     "No more results": "Başka sonuç yok",
     "No results": "Sonuç yok",
     "No users have specific privileges in this room": "Bu odada hiçbir kullanıcının belirli ayrıcalıkları yoktur",
     "OK": "Tamam",
-    "olm version:": "olm versiyon:",
     "Only people who have been invited": "Sadece davet edilmiş insanlar",
     "Operation failed": "Operasyon başarısız oldu",
     "Password": "Şifre",
@@ -175,32 +135,23 @@
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lütfen e-postanızı kontrol edin ve içerdiği bağlantıya tıklayın . Bu işlem tamamlandıktan sonra , 'devam et' e tıklayın .",
     "Power level must be positive integer.": "Güç seviyesi pozitif tamsayı olmalıdır.",
-    "Private Chat": "Özel Sohbet",
     "Privileged Users": "Ayrıcalıklı Kullanıcılar",
     "Profile": "Profil",
-    "Public Chat": "Genel Sohbet",
     "Reason": "Sebep",
     "Register": "Kaydolun",
-    "%(targetName)s rejected the invitation.": "%(targetName)s daveti reddetti.",
     "Reject invitation": "Daveti Reddet",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s görünen adı (%(oldDisplayName)s) kaldırdı.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s profil resmini kaldırdı.",
     "Remove": "Kaldır",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s bir VoIP konferansı talep etti.",
-    "Results from DuckDuckGo": "DuckDuckGo Sonuçları",
     "Return to login screen": "Giriş ekranına dön",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s size bildirim gönderme iznine sahip değil - lütfen tarayıcı ayarlarınızı kontrol edin",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s'a bildirim gönderme izni verilmedi - lütfen tekrar deneyin",
     "%(brand)s version:": "%(brand)s versiyon:",
     "Room %(roomId)s not visible": "%(roomId)s odası görünür değil",
-    "Room Colour": "Oda Rengi",
     "%(roomName)s does not exist.": "%(roomName)s mevcut değil.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s şu anda erişilebilir değil.",
     "Rooms": "Odalar",
     "Save": "Kaydet",
     "Search": "Ara",
     "Search failed": "Arama başarısız",
-    "Searches DuckDuckGo for results": "Sonuçlar için DuckDuckGo'yu arar",
     "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s ' de %(userName)s tarafından görüldü",
     "Send Reset Email": "E-posta Sıfırlama Gönder",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s bir resim gönderdi.",
@@ -210,40 +161,31 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Sunucu kullanılamıyor , aşırı yüklenmiş , veya bir hatayla karşılaşmış olabilirsiniz.",
     "Server unavailable, overloaded, or something else went wrong.": "Sunucu kullanılamıyor , aşırı yüklenmiş veya başka bir şey ters gitmiş olabilir.",
     "Session ID": "Oturum ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s bir profil resmi ayarladı.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s görünür ismini %(displayName)s ' a ayarladı.",
     "Settings": "Ayarlar",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zaman damgalarını 12 biçiminde göster (örn. 2:30 pm)",
     "Signed Out": "Oturum Kapatıldı",
     "Sign in": "Giriş Yap",
     "Sign out": "Çıkış Yap",
-    "%(count)s of your messages have not been sent.|other": "Bazı mesajlarınız gönderilemedi.",
     "Someone": "Birisi",
     "Start authentication": "Kimlik Doğrulamayı başlatın",
     "Submit": "Gönder",
     "Success": "Başarılı",
-    "The phone number entered looks invalid": "Girilen telefon numarası geçersiz görünüyor",
     "This email address is already in use": "Bu e-posta adresi zaten kullanımda",
     "This email address was not found": "Bu e-posta adresi bulunamadı",
     "The email address linked to your account must be entered.": "Hesabınıza bağlı e-posta adresi girilmelidir.",
-    "The remote side failed to pick up": "Karşı taraf cevaplayamadı",
     "This room has no local addresses": "Bu oda hiçbir yerel adrese sahip değil",
     "This room is not recognised.": "Bu oda tanınmıyor.",
     "This doesn't appear to be a valid email address": "Bu geçerli bir e-posta adresi olarak gözükmüyor",
     "This phone number is already in use": "Bu telefon numarası zaten kullanımda",
     "This room": "Bu oda",
     "This room is not accessible by remote Matrix servers": "Bu oda uzak Matrix Sunucuları tarafından erişilebilir değil",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Kullanmak için , otomatik tamamlama sonuçlarının yüklenmesini ve bitmesini bekleyin.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Bu odanın zaman çizelgesinde belirli bir nokta yüklemeye çalışıldı , ama geçerli mesajı görüntülemeye izniniz yok.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Bu odanın akışında belirli bir noktaya yüklemeye çalışıldı , ancak bulunamadı.",
     "Unable to add email address": "E-posta adresi eklenemiyor",
     "Unable to remove contact information": "Kişi bilgileri kaldırılamıyor",
     "Unable to verify email address.": "E-posta adresi doğrulanamıyor.",
     "Unban": "Yasağı Kaldır",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s 'in yasağını kaldırdı.",
-    "Unable to capture screen": "Ekran yakalanamadı",
     "Unable to enable Notifications": "Bildirimler aktif edilemedi",
-    "unknown caller": "bilinmeyen arayıcı",
     "unknown error code": "bilinmeyen hata kodu",
     "Unmute": "Sesi aç",
     "Unnamed Room": "İsimsiz Oda",
@@ -256,29 +198,19 @@
     "Upload new:": "Yeni yükle :",
     "Usage": "Kullanım",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (güç %(powerLevelNumber)s)",
-    "Username invalid: %(errMessage)s": "Kullanıcı ismi geçersiz : %(errMessage)s",
     "Users": "Kullanıcılar",
     "Verification Pending": "Bekleyen doğrulama",
     "Verified key": "Doğrulama anahtarı",
     "Video call": "Görüntülü arama",
     "Voice call": "Sesli arama",
-    "VoIP conference finished.": "VoIP konferansı bitti.",
-    "VoIP conference started.": "VoIP konferansı başladı.",
     "VoIP is unsupported": "VoIP desteklenmiyor",
-    "(could not connect media)": "(medya bağlanamadı)",
-    "(no answer)": "(cevap yok)",
-    "(unknown failure: %(reason)s)": "(bilinmeyen hata : %(reason)s)",
     "Warning!": "Uyarı!",
-    "Who can access this room?": "Bu odaya kimler erişebilir ?",
     "Who can read history?": "Geçmişi kimler okuyabilir ?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s %(targetName)s'nin davetinden çekildi.",
-    "You are already in a call.": "Zaten bir çağrıdasınız.",
     "You cannot place a call with yourself.": "Kendinizle görüşme yapamazsınız .",
     "You cannot place VoIP calls in this browser.": "Bu tarayıcıda VoIP çağrısı yapamazsınız.",
     "You do not have permission to post to this room": "Bu odaya göndermeye izniniz yok",
     "You have <a>disabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a> devre dışı </a> bıraktınız.",
     "You have <a>enabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a>etkinleştirdiniz</a>.",
-    "You have no visible notifications": "Hiçbir görünür bildiriminiz yok",
     "You must <a>register</a> to use this functionality": "Bu işlevi kullanmak için <a> Kayıt Olun </a>",
     "You need to be able to invite users to do that.": "Bunu yapmak için kullanıcıları davet etmeye ihtiyacınız var.",
     "You need to be logged in.": "Oturum açmanız gerekiyor.",
@@ -308,21 +240,14 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s , %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "Hafta - %(weekDayName)s , %(day)s -%(monthName)s -%(fullYear)s , %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Görünür isim ayarla :",
-    "Upload an avatar:": "Bir Avatar yükle :",
     "This server does not support authentication with a phone number.": "Bu sunucu bir telefon numarası ile kimlik doğrulamayı desteklemez.",
-    "An error occurred: %(error_string)s": "Bir hata oluştu : %(error_string)s",
-    "There are no visible files in this room": "Bu odada görünür hiçbir dosya yok",
     "Room": "Oda",
     "Connectivity to the server has been lost.": "Sunucuyla olan bağlantı kesildi.",
     "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.",
     "(~%(count)s results)|one": "(~%(count)s sonuç)",
     "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
     "Cancel": "İptal",
-    "Active call": "Aktif çağrı",
-    "Please select the destination room for this message": "Bu ileti için lütfen hedef oda seçin",
     "Create new room": "Yeni Oda Oluştur",
-    "Room directory": "Oda Rehberi",
     "Start chat": "Sohbet Başlat",
     "New Password": "Yeni Şifre",
     "Start automatically after system login": "Sisteme giriş yaptıktan sonra otomatik başlat",
@@ -342,7 +267,6 @@
     "You must join the room to see its files": "Dosyalarını görmek için odaya katılmalısınız",
     "Reject all %(invitedRooms)s invites": "Tüm %(invitedRooms)s davetlerini reddet",
     "Failed to invite": "Davet edilemedi",
-    "Failed to invite the following users to the %(roomName)s room:": "Aşağıdaki kullanıcılar %(roomName)s odasına davet edilemedi :",
     "Confirm Removal": "Kaldırma İşlemini Onayla",
     "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.": "Bu etkinliği kaldırmak(silmek) istediğinizden emin misiniz ? Bir odayı ismini silmeniz veya konu değiştirmeniz , geri alınabilir bir durumdur.",
     "Unknown error": "Bilinmeyen Hata",
@@ -350,35 +274,23 @@
     "Unable to restore session": "Oturum geri yüklenemiyor",
     "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.": "Eğer daha önce %(brand)s'un daha yeni bir versiyonunu kullandıysanız , oturumunuz bu sürümle uyumsuz olabilir . Bu pencereyi kapatın ve daha yeni sürüme geri dönün.",
     "Unknown Address": "Bilinmeyen Adres",
-    "ex. @bob:example.com": "örn. @bob:example.com",
-    "Add User": "Kullanıcı Ekle",
-    "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri",
     "Dismiss": "Kapat",
-    "Please check your email to continue registration.": "Kayıt işlemine devam etmek için lütfen e-postanızı kontrol edin.",
     "Token incorrect": "Belirteç(Token) hatalı",
     "Please enter the code it contains:": "Lütfen içerdiği kodu girin:",
     "powered by Matrix": "Matrix'den besleniyor",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Eğer bir e-posta adresi belirtmezseniz , şifrenizi sıfırlayamazsınız . Emin misiniz ?",
-    "Error decrypting audio": "Ses şifre çözme hatası",
     "Error decrypting image": "Resim şifre çözme hatası",
     "Error decrypting video": "Video şifre çözme hatası",
     "Add an Integration": "Entegrasyon ekleyin",
     "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?": "Hesabınızı %(integrationsUrl)s ile kullanmak üzere doğrulayabilmeniz için üçüncü taraf bir siteye götürülmek üzeresiniz. Devam etmek istiyor musunuz ?",
     "URL Previews": "URL önizlemeleri",
     "Drop file here to upload": "Yüklemek için dosyaları buraya bırakın",
-    " (unsupported)": " (desteklenmeyen)",
-    "Ongoing conference call%(supportedText)s.": "Devam eden konferans görüşmesi %(supportedText)s.",
     "Online": "Çevrimiçi",
     "Idle": "Boş",
     "Offline": "Çevrimdışı",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s odanın avatarını <img/> olarak çevirdi",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odanın avatarını kaldırdı.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s %(roomName)s için avatarı değiştirdi",
-    "Username available": "Kullanıcı ismi uygun",
-    "Username not available": "Kullanıcı ismi uygun değil",
     "Something went wrong!": "Bir şeyler yanlış gitti!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Bu sizin <span></span>Ana Sunucunuzdaki hesap adınız olacak , veya <a>farklı sunucu</a> seçebilirsiniz.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Eğer Matrix hesabınız varsa , bunun yerine <a>Giriş Yapabilirsiniz</a> .",
     "Your browser does not support the required cryptography extensions": "Tarayıcınız gerekli şifreleme uzantılarını desteklemiyor",
     "Not a valid %(brand)s keyfile": "Geçersiz bir %(brand)s anahtar dosyası",
     "Authentication check failed: incorrect password?": "Kimlik doğrulama denetimi başarısız oldu : yanlış şifre ?",
@@ -386,15 +298,12 @@
     "This will allow you to reset your password and receive notifications.": "Bu şifrenizi sıfırlamanızı ve bildirimler almanızı sağlayacak.",
     "Skip": "Atla",
     "Fetching third party location failed": "Üçüncü parti konumunu çekemedi",
-    "All notifications are currently disabled for all targets.": "Tüm bildirimler şu anda tüm hedefler için devre dışı bırakılmıştır.",
-    "Uploading report": "Rapor yükleniyor",
     "Sunday": "Pazar",
     "Guests can join": "Misafirler katılabilirler",
     "Messages sent by bot": "Bot tarafından gönderilen mesajlar",
     "Notification targets": "Bildirim hedefleri",
     "Failed to set direct chat tag": "Direkt sohbet etiketi ayarlanamadı",
     "Today": "Bugün",
-    "You are not receiving desktop notifications": "Masaüstü bildirimleri almıyorsunuz",
     "Friday": "Cuma",
     "Update": "Güncelleştirme",
     "What's New": "Yenilikler",
@@ -402,51 +311,27 @@
     "Changelog": "Değişiklikler",
     "Waiting for response from server": "Sunucudan yanıt bekleniyor",
     "Leave": "Ayrıl",
-    "Advanced notification settings": "Gelişmiş bildirim ayarları",
-    "Forget": "Unut",
     "World readable": "Okunabilir dünya",
-    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code)s)",
-    "Cancel Sending": "Göndermeyi İptal Et",
     "This Room": "Bu Oda",
     "Noisy": "Gürültülü",
     "Room not found": "Oda bulunamadı",
     "Messages in one-to-one chats": "Bire bir sohbetlerdeki mesajlar",
     "Unavailable": "Kullanım dışı",
-    "View Decrypted Source": "Şifresi Çözülmüş(Decrypted) Kaynağı Görüntüle",
-    "Failed to update keywords": "Anahtar kelimeler güncellenemedi",
     "remove %(name)s from the directory.": "%(name)s'i dizinden kaldır.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Aşağıdaki anahtar kelimeleri ile ilgili bildirimler burada gösterilemeyen kuralları takip eder:",
-    "Please set a password!": "Lütfen bir şifre ayarlayın !",
-    "You have successfully set a password!": "Başarıyla bir şifre ayarladınız!",
     "Source URL": "Kaynak URL",
     "Failed to add tag %(tagName)s to room": "%(tagName)s etiketi odaya eklenemedi",
     "Members": "Üyeler",
     "Resend": "Yeniden Gönder",
-    "Files": "Dosyalar",
     "Collecting app version information": "Uygulama sürümü bilgileri toplanıyor",
-    "Keywords": "Anahtar kelimeler",
-    "Enable notifications for this account": "Bu hesap için bildirimleri etkinleştir",
-    "Messages containing <span>keywords</span>": "<span> anahtar kelimeleri </span> içeren mesajlar",
-    "Error saving email notification preferences": "E-posta bildirim tercihlerini kaydetme hatası",
     "Tuesday": "Salı",
-    "Enter keywords separated by a comma:": "Anahtar kelimeleri virgül ile ayırarak girin:",
-    "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "Remove %(name)s from the directory?": "%(name)s'i dizinden kaldırılsın mı ?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
     "Unnamed room": "İsimsiz oda",
-    "All messages (noisy)": "Tüm mesajlar (uzun)",
     "Saturday": "Cumartesi",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Unutmayın , fikrinizi değiştirirseniz her zaman bir şifre ve e-posta adresi ayarlayabilirsiniz.",
-    "Direct Chat": "Doğrudan Sohbet",
     "The server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
     "Reject": "Reddet",
-    "Failed to set Direct Message status of room": "Odanın Direkt Mesaj durumu ayarlanamadı",
     "Monday": "Pazartesi",
     "Remove from Directory": "Dizinden Kaldır",
-    "Enable them now": "Onları şimdi etkinleştir",
-    "Forward Message": "Mesajı İlet",
     "Collecting logs": "Kayıtlar toplanıyor",
-    "(HTTP status %(httpStatus)s)": "(HTTP durumu %(httpStatus)s)",
     "All Rooms": "Tüm Odalar",
     "Wednesday": "Çarşamba",
     "Quote": "Alıntı",
@@ -455,38 +340,23 @@
     "All messages": "Tüm mesajlar",
     "Call invitation": "Arama davetiyesi",
     "Messages containing my display name": "İsmimi içeren mesajlar",
-    "You have successfully set a password and an email address!": "Başarıyla bir şifre ve e-posta adresi ayarladın !",
     "What's new?": "Yeni olan ne ?",
-    "Notify me for anything else": "Başka herhangi bir şey için bana bildirim yap",
     "When I'm invited to a room": "Bir odaya davet edildiğimde",
-    "Can't update user notification settings": "Kullanıcı bildirim ayarları güncellenemiyor",
-    "Notify for all other messages/rooms": "Diğer tüm mesajlar / odalar için bildirim yapın",
     "Unable to look up room ID from server": "Sunucudan oda ID'si aranamadı",
     "Couldn't find a matching Matrix room": "Eşleşen bir Matrix odası bulunamadı",
     "Invite to this room": "Bu odaya davet et",
     "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code)s)",
     "Thursday": "Perşembe",
     "Search…": "Arama…",
-    "Unhide Preview": "Önizlemeyi Göster",
     "Unable to join network": "Ağa bağlanılamıyor",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Üzgünüz , tarayıcınız %(brand)s'u  <b> çalıştıramıyor </b>.",
-    "Uploaded on %(date)s by %(user)s": "%(user)s tarafında %(date)s e yüklendi",
     "Messages in group chats": "Grup sohbetlerindeki mesajlar",
     "Yesterday": "Dün",
     "Low Priority": "Düşük Öncelikli",
-    "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
-    "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
     "Off": "Kapalı",
     "%(brand)s does not know how to join a room on this network": "%(brand)s bu ağdaki bir odaya nasıl gireceğini bilmiyor",
-    "Mentions only": "Sadece Mention'lar",
     "Failed to remove tag %(tagName)s from room": "Odadan %(tagName)s etiketi kaldırılamadı",
-    "You can now return to your account after signing out, and sign in on other devices.": "Şimdi oturumunuzu iptal ettikten sonra başka cihazda oturum açarak hesabınıza dönebilirsiniz.",
-    "Enable email notifications": "E-posta bildirimlerini etkinleştir",
     "No rooms to show": "Gösterilecek oda yok",
-    "Download this file": "Bu dosyayı indir",
-    "Failed to change settings": "Ayarlar değiştirilemedi",
     "View Source": "Kaynağı Görüntüle",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
     "The platform you're on": "Platformunuz",
     "The version of %(brand)s": "%(brand)s sürümü",
     "Your language of choice": "Dil seçiminiz",
@@ -499,8 +369,6 @@
     "Your device resolution": "Cihazınızın çözünürlüğü",
     "Call Failed": "Arama Başarısız",
     "Call failed due to misconfigured server": "Hatalı yapılandırılmış sunucu nedeniyle arama başarısız",
-    "Call in Progress": "Arama Yapılıyor",
-    "A call is already in progress!": "Zaten bir arama devam etmekte!",
     "Permission Required": "İzin Gerekli",
     "Replying With Files": "Dosyalarla Cevaplanıyor",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s%(monthName)s%(day)s%(fullYear)s",
@@ -545,7 +413,6 @@
     "No homeserver URL provided": "Ana sunucu adresi belirtilmemiş",
     "Unexpected error resolving homeserver configuration": "Ana sunucu yapılandırması çözümlenirken beklenmeyen hata",
     "Unexpected error resolving identity server configuration": "Kimlik sunucu yapılandırması çözümlenirken beklenmeyen hata",
-    "The message you are trying to send is too large.": "Göndermeye çalıştığın mesaj çok büyük.",
     "This homeserver has hit its Monthly Active User limit.": "Bu ana sunucu Aylık Aktif Kullanıcı limitine ulaştı.",
     "%(brand)s URL": "%(brand)s Linki",
     "Room ID": "Oda ID",
@@ -557,7 +424,6 @@
     "Communities": "Topluluklar",
     "Rotate Left": "Sola Döndür",
     "Rotate Right": "Sağa Döndür",
-    "Rotate clockwise": "Saat yönünde döndür",
     "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s kez katıldı",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s katıldı",
@@ -606,7 +472,6 @@
     "example": "örnek",
     "Create": "Oluştur",
     "Please enter a name for the room": "Lütfen oda için bir ad girin",
-    "This room is private, and can only be joined by invitation.": "Bu oda özel, sadece davet ile katılınabilir.",
     "Create a private room": "Özel bir oda oluştur",
     "Hide advanced": "Gelişmiş gizle",
     "Show advanced": "Gelişmiş göster",
@@ -634,7 +499,6 @@
     "Are you sure you want to sign out?": "Oturumdan çıkmak istediğinize emin misiniz?",
     "Your homeserver doesn't seem to support this feature.": "Ana sunucunuz bu özelliği desteklemiyor gözüküyor.",
     "Message edits": "Mesajları düzenle",
-    "Report bugs & give feedback": "Hataları raporla & geri bildirim yap",
     "Please fill why you're reporting.": "Lütfen neden raporlama yaptığınızı belirtin.",
     "Report Content to Your Homeserver Administrator": "Ana Sunucu Yöneticinize İçeriği Raporlayın",
     "Send report": "Rapor gönder",
@@ -643,25 +507,20 @@
     "The room upgrade could not be completed": "Oda güncelleme tamamlanamadı",
     "Upgrade this room to version %(version)s": "Bu odayı %(version)s versiyonuna yükselt",
     "Upgrade Room Version": "Oda Sürümünü Yükselt",
-    "Automatically invite users": "Otomatik olarak kullanıcıları davet et",
     "Upgrade private room": "Özel oda güncelle",
     "Upgrade": "Yükselt",
     "Sign out and remove encryption keys?": "Oturumu kapat ve şifreleme anahtarlarını sil?",
     "Clear Storage and Sign Out": "Depolamayı temizle ve Oturumu Kapat",
     "Send Logs": "Logları Gönder",
     "Refresh": "Yenile",
-    "Checking...": "Kontrol ediliyor...",
-    "To get started, please pick a username!": "Başlamak için lütfen bir kullanıcı adı seçin!",
     "Share Room": "Oda Paylaş",
     "Link to most recent message": "En son mesaja bağlantı",
     "Share User": "Kullanıcı Paylaş",
     "Share Community": "Topluluk Paylaş",
     "Share Room Message": "Oda Mesajı Paylaş",
     "Link to selected message": "Seçili mesaja bağlantı",
-    "COPY": "KOPYA",
     "Command Help": "Komut Yardımı",
     "Missing session data": "Kayıp oturum verisi",
-    "Integration Manager": "Bütünleştirme Yöneticisi",
     "Find others by phone or email": "Kişileri telefon yada e-posta ile bul",
     "Be found by phone or email": "Telefon veya e-posta ile bulunun",
     "Terms of Service": "Hizmet Şartları",
@@ -673,16 +532,11 @@
     "Upload all": "Hepsini yükle",
     "Cancel All": "Hepsi İptal",
     "Upload Error": "Yükleme Hatası",
-    "Allow": "İzin ver",
-    "This looks like a valid recovery key!": "Bu geçerli bir kurtarma anahtarına benziyor!",
-    "Not a valid recovery key": "Geçersiz bir kurtarma anahtarı",
     "Unable to load backup status": "Yedek durumu yüklenemiyor",
     "Unable to restore backup": "Yedek geri dönüşü yapılamıyor",
     "No backup found!": "Yedek bulunamadı!",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Uyarı</b>: Yedek anahtarı kurulumunu sadece güvenli bir bilgisayardan yapmalısınız.",
     "Unable to reject invite": "Davet reddedilemedi",
-    "Pin Message": "Pin Mesajı",
-    "Share Message": "Mesajı Paylaş",
     "Report Content": "İçeriği Raporla",
     "Notification settings": "Bildirim ayarları",
     "Clear status": "Durumu temizle",
@@ -691,20 +545,11 @@
     "Set a new status...": "Yeni bir durum ayarla...",
     "View Community": "Topluluğu Gör",
     "Hide": "Gizle",
-    "Reload": "Yeniden Yükle",
     "Remove for everyone": "Herkes için sil",
-    "Remove for me": "Benim için sil",
     "User Status": "Kullanıcı Durumu",
     "This homeserver would like to make sure you are not a robot.": "Bu ana sunucu sizin bir robot olup olmadığınızdan emin olmak istiyor.",
     "Country Dropdown": "Ülke Listesi",
     "Code": "Kod",
-    "Unable to validate homeserver/identity server": "Ana/kimlik sunucu doğrulanamıyor",
-    "Your Modular server": "Sizin Modüler sunucunuz",
-    "Server Name": "Sunucu Adı",
-    "The email field must not be blank.": "E-posta alanı boş bırakılamaz.",
-    "The username field must not be blank.": "Kullanıcı adı alanı boş bırakılamaz.",
-    "The phone number field must not be blank.": "Telefon numarası alanı boş bırakılamaz.",
-    "The password field must not be blank.": "Şifre alanı boş bırakılamaz.",
     "Username": "Kullanıcı Adı",
     "Use an email address to recover your account": "Hesabınızı kurtarmak için bir e-posta adresi kullanın",
     "Enter email address (required on this homeserver)": "E-posta adresi gir ( bu ana sunucuda gerekli)",
@@ -715,16 +560,10 @@
     "Keep going...": "Devam et...",
     "Passwords don't match": "Şifreler uyuşmuyor",
     "Enter phone number (required on this homeserver)": "Telefon numarası gir ( bu ana sunucuda gerekli)",
-    "Doesn't look like a valid phone number": "Geçerli bir telefon numarasına benzemiyor",
     "Enter username": "Kullanıcı adı gir",
     "Email (optional)": "E-posta (opsiyonel)",
     "Confirm": "Doğrula",
     "Phone (optional)": "Telefon (opsiyonel)",
-    "Create your Matrix account on %(serverName)s": "%(serverName)s üzerinde Matrix hesabınızı oluşturun",
-    "Create your Matrix account on <underlinedServerName />": "<underlinedServerName /> üzerinde Matrix hesabınızı oluşturun",
-    "Homeserver URL": "Ana sunucu URL",
-    "Identity Server URL": "Kimlik Sunucu URL",
-    "Other servers": "Diğer sunucular",
     "Couldn't load page": "Sayfa yüklenemiyor",
     "Add a Room": "Bir Oda Ekle",
     "Add a User": "Bir Kullanıcı Ekle",
@@ -747,7 +586,6 @@
     "This homeserver does not support communities": "Bu ana sunucu toplulukları desteklemiyor",
     "Failed to load %(groupId)s": "%(groupId)s yükleme başarısız",
     "Filter": "Filtre",
-    "Filter rooms…": "Odaları filtrele…",
     "Old cryptography data detected": "Eski kriptolama verisi tespit edildi",
     "Verification Request": "Doğrulama Talebi",
     "Your Communities": "Topluluklarınız",
@@ -758,15 +596,12 @@
     "View": "Görüntüle",
     "Find a room…": "Bir oda bul…",
     "Find a room… (e.g. %(exampleRoom)s)": "Bir oda bul... (örn. %(exampleRoom)s)",
-    "%(count)s of your messages have not been sent.|one": "Mesajınız gönderilmedi.",
     "Jump to first unread room.": "Okunmamış ilk odaya zıpla.",
     "Jump to first invite.": "İlk davete zıpla.",
     "Add room": "Oda ekle",
     "Clear filter": "Filtre temizle",
     "Guest": "Misafir",
-    "Your profile": "Profiliniz",
     "Could not load user profile": "Kullanıcı profili yüklenemedi",
-    "Your Matrix account on %(serverName)s": "%(serverName)s sunucusundaki Matrix hesabınız",
     "Your password has been reset.": "Parolanız sıfırlandı.",
     "Set a new password": "Yeni bir şifre belirle",
     "General failure": "Genel başarısızlık",
@@ -777,7 +612,6 @@
     "Continue with previous account": "Önceki hesapla devam et",
     "<a>Log in</a> to your new account.": "Yeni hesabınızla <a>Oturum aç</a>ın.",
     "Registration Successful": "Kayıt Başarılı",
-    "Create your account": "Hesabınızı oluşturun",
     "Forgotten your password?": "Parolanızı mı unuttunuz?",
     "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın.",
     "Whether or not you're logged in (we don't record your username)": "İster oturum açın yada açmayın (biz kullanıcı adınızı kaydetmiyoruz)",
@@ -797,7 +631,6 @@
     "You cannot modify widgets in this room.": "Bu odadaki görsel bileşenleri değiştiremezsiniz.",
     "Sends the given message coloured as a rainbow": "Verilen mesajı gökkuşağı renklerinde gönderir",
     "Displays list of commands with usages and descriptions": "Komutların listesini kullanımı ve tanımlarıyla gösterir",
-    "%(senderName)s made no change.": "%(senderName)s değişiklik yapmadı.",
     "%(senderName)s changed the pinned messages for the room.": "Oda için sabitlenmiş mesajları %(senderName)s değiştirdi.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından düzenlendi",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından eklendi",
@@ -818,11 +651,9 @@
     "Clear personal data": "Kişisel veri temizle",
     "Command Autocomplete": "Oto tamamlama komutu",
     "Community Autocomplete": "Oto tamlama topluluğu",
-    "DuckDuckGo Results": "DuckDuckGo Sonuçları",
     "Emoji Autocomplete": "Emoji Oto Tamamlama",
     "Notify the whole room": "Tüm odayı bilgilendir",
     "Room Notification": "Oda Bildirimi",
-    "Set up with a recovery key": "Kurtarma anahtarı ile kur",
     "That matches!": "Eşleşti!",
     "That doesn't match.": "Eşleşmiyor.",
     "Download": "İndir",
@@ -834,7 +665,6 @@
     "Set up Secure Message Recovery": "Güvenli Mesaj Kurtarma Kurulumu",
     "Starting backup...": "Yedeklemeye başlanıyor...",
     "Unable to create key backup": "Anahtar yedeği oluşturulamıyor",
-    "Don't ask again": "Yeniden sorma",
     "New Recovery Method": "Yeni Kurtarma Yöntemi",
     "Go to Settings": "Ayarlara Git",
     "Recovery Method Removed": "Kurtarma Yöntemi Silindi",
@@ -878,29 +708,23 @@
     "not stored": "depolanmadı",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s anahtar yedekleniyor...",
     "All keys backed up": "Bütün yedekler yedeklendi",
-    "Backup version: ": "Yedek sürümü: ",
-    "Algorithm: ": "Algoritma: ",
     "Start using Key Backup": "Anahtar Yedekleme kullanmaya başla",
     "Clear notifications": "Bildirimleri temizle",
     "Show message in desktop notification": "Masaüstü bildiriminde mesaj göster",
     "Display Name": "Ekran Adı",
     "Profile picture": "Profil resmi",
-    "Could not connect to Identity Server": "Kimlik Sunucusuna bağlanılamadı",
     "Checking server": "Sunucu kontrol ediliyor",
     "Change identity server": "Kimlik sunucu değiştir",
     "Sorry, your homeserver is too old to participate in this room.": "Üzgünüm, ana sunucunuz bu odaya katılabilmek için oldukça eski.",
     "Please contact your homeserver administrator.": "Lütfen anasunucu yöneticiniz ile bağlantıya geçin.",
     "Message Pinning": "Mesaj Sabitleme",
-    "Multiple integration managers": "Çoklu entegrasyon yöneticileri",
     "Enable Emoji suggestions while typing": "Yazarken Emoji önerilerini aç",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Katılma/ayrılma mesajları göster (davetler/atılmalar/yasaklamalar etkilenmeyecek)",
     "Show avatar changes": "Avatar değişikliklerini göster",
-    "Always show encryption icons": "Şifreleme ikonlarını her zaman göster",
     "Enable big emoji in chat": "Sohbette büyük emojileri aç",
     "Send typing notifications": "Yazma bildirimlerini gönder",
     "Send analytics data": "Analiz verilerini gönder",
     "Show developer tools": "Geliştirici araçlarını göster",
-    "Low bandwidth mode": "Düşük bant genişliği modu",
     "Messages containing my username": "Kullanıcı adımı içeren mesajlar",
     "When rooms are upgraded": "Odalar güncellendiğinde",
     "My Ban List": "Yasaklı Listem",
@@ -940,8 +764,6 @@
     "wait and try again later": "bekle ve tekrar dene",
     "Disconnect anyway": "Yinede bağlantıyı kes",
     "Go back": "Geri dön",
-    "Identity Server (%(server)s)": "(%(server)s) Kimlik Sunucusu",
-    "Identity Server": "Kimlik Sunucusu",
     "Do not use an identity server": "Bir kimlik sunucu kullanma",
     "Enter a new identity server": "Yeni bir kimlik sunucu gir",
     "Change": "Değiştir",
@@ -965,7 +787,6 @@
     "View rules": "Kuralları görüntüle",
     "Room list": "Oda listesi",
     "Autocomplete delay (ms)": "Oto tamamlama gecikmesi (ms)",
-    "Key backup": "Anahtar yedek",
     "Cross-signing": "Çapraz-imzalama",
     "Security & Privacy": "Güvenlik & Gizlilik",
     "Learn more about how we use analytics.": "Analizleri nasıl kullandığımız hakkında daha fazla öğrenin.",
@@ -997,7 +818,6 @@
     "Change settings": "Ayarları değiştir",
     "Kick users": "Kullanıcıları at",
     "Ban users": "Kullanıcıları yasakla",
-    "Remove messages": "Mesajları sil",
     "Notify everyone": "Herkesi bilgilendir",
     "Muted Users": "Sessizdeki Kullanıcılar",
     "Roles & Permissions": "Roller & İzinler",
@@ -1019,13 +839,7 @@
     "Email Address": "E-posta Adresi",
     "Remove %(phone)s?": "%(phone)s sil?",
     "Phone Number": "Telefon Numarası",
-    "Cannot add any more widgets": "Daha fazla görsel bileşen eklenemiyor",
-    "The maximum permitted number of widgets have already been added to this room.": "İzin verilen maksimum sayıda görsel bileşen bu odaya zaten eklenmiş.",
-    "Add a widget": "Bir görsel bileşen ekle",
     "Edit message": "Mesajı düzenle",
-    "%(senderName)s sent an image": "%(senderName)s bir resim gönderdi",
-    "%(senderName)s sent a video": "%(senderName)s bir video gönderdi",
-    "%(senderName)s uploaded a file": "%(senderName)s bir dosya yükledi",
     "Key request sent.": "Anahtar isteği gönderildi.",
     "This message cannot be decrypted": "Bu mesajın şifresi çözülemedi",
     "Unencrypted": "Şifrelenmemiş",
@@ -1045,9 +859,6 @@
     "Cross-signing private keys:": "Çarpraz-imzalama gizli anahtarları:",
     "Backup has a <validity>valid</validity> signature from this user": "Yedek bu kullanıcıdan <validity>geçerli</validity> anahtara sahip",
     "Backup has a <validity>invalid</validity> signature from this user": "Yedek bu kullanıcıdan <validity>geçersiz</validity> bir anahtara sahip",
-    "Add an email address to configure email notifications": "E-posta bildirimlerini yapılandırmak için bir e-posta adresi ekleyin",
-    "Identity Server URL must be HTTPS": "Kimlik Sunucu URL adresi HTTPS olmak zorunda",
-    "Not a valid Identity Server (status code %(code)s)": "Geçerli bir Kimlik Sunucu değil ( durum kodu %(code)s )",
     "Terms of service not accepted or the identity server is invalid.": "Hizmet şartları kabuk edilmedi yada kimlik sunucu geçersiz.",
     "The identity server you have chosen does not have any terms of service.": "Seçtiğiniz kimlik sunucu herhangi bir hizmet şartları sözleşmesine sahip değil.",
     "Disconnect identity server": "Kimlik sunucu bağlantısını kes",
@@ -1064,10 +875,7 @@
     "Bold": "Kalın",
     "Italics": "Eğik",
     "Code block": "Kod bloku",
-    "No pinned messages.": "Sabitlenmiş mesaj yok.",
     "Loading...": "Yükleniyor...",
-    "Pinned Messages": "Sabitlenmiş Mesajlar",
-    "Jump to message": "Mesaja git",
     "%(duration)ss": "%(duration)ssn",
     "%(duration)sm": "%(duration)sdk",
     "%(duration)sh": "%(duration)ssa",
@@ -1079,7 +887,6 @@
     "Replying": "Cevap yazıyor",
     "Room %(name)s": "Oda %(name)s",
     "Share room": "Oda paylaş",
-    "Community Invites": "Topluluk Davetleri",
     "System Alerts": "Sistem Uyarıları",
     "Joining room …": "Odaya giriliyor …",
     "Loading …": "Yükleniyor …",
@@ -1100,9 +907,6 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s odasında önizleme yapılamaz. Katılmak ister misin?",
     "This room doesn't exist. Are you sure you're at the right place?": "Bu oda mevcut değil. Doğru yerde olduğunuza emin misiniz?",
     "Try again later, or ask a room admin to check if you have access.": "Daha sonra deneyin, yada bir oda adminine erişiminiz olup olmadığını sorun.",
-    "Never lose encrypted messages": "Şifrelenmiş mesajları asla kaybetmeyin",
-    "Not now": "Şimdi değil",
-    "Don't ask me again": "Yeniden sorma",
     "%(count)s unread messages.|other": "%(count)s okunmamış mesaj.",
     "%(count)s unread messages.|one": "1 okunmamış mesaj.",
     "Unread messages.": "Okunmamış mesajlar.",
@@ -1125,7 +929,6 @@
     "Hide verified sessions": "Onaylı oturumları gizle",
     "%(count)s verified sessions|other": "%(count)s doğrulanmış oturum",
     "%(count)s verified sessions|one": "1 doğrulanmış oturum",
-    "Direct message": "Doğrudan mesaj",
     "Remove from community": "Topluluktan sil",
     "Remove this user from community?": "Bu kullanıcıyı topluluktan sil?",
     "Failed to withdraw invitation": "Davetin geri çekilmesi başarısız",
@@ -1260,11 +1063,9 @@
     "Mirror local video feed": "Yerel video beslemesi yansısı",
     "Enable Community Filter Panel": "Toluluk Filtre Panelini Aç",
     "Match system theme": "Sistem temasıyla eşle",
-    "Allow Peer-to-Peer for 1:1 calls": "1:1 çağrılar için eşten-eşe izin ver",
     "Missing media permissions, click the button below to request.": "Medya izinleri eksik, alttaki butona tıkayarak talep edin.",
     "Credits": "Katkıda Bulunanlar",
     "Clear cache and reload": "Belleği temizle ve yeniden yükle",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Deneysel laboratuar özellikler ile deneyiminizi özelleştirebilirsiniz. <a>Daha fazla</a>.",
     "Ignored/Blocked": "Yoksayılan/Bloklanan",
     "Error adding ignored user/server": "Yoksayılan kullanıcı/sunucu eklenirken hata",
     "Error subscribing to list": "Listeye abone olunurken hata",
@@ -1286,12 +1087,8 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s değişiklik yapmadı",
     "And %(count)s more...|other": "ve %(count)s kez daha...",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternatif olarak,<code>turn.matrix.org</code> adresindeki herkese açık sunucuyu kullanmayı deneyebilirsiniz. Fakat bu güvenilir olmayabilir. IP adresiniz bu sunucu ile paylaşılacaktır. Ayarlardan yönetebilirsiniz.",
-    "An error ocurred whilst trying to remove the widget from the room": "Görsel bileşen odadan silinmeye çalışılırken bir hata oluştu",
-    "Minimize apps": "Uygulamaları küçült",
-    "Maximize apps": "Uygulamaları büyült",
     "Popout widget": "Görsel bileşeni göster",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Lütfen GitHub’da <newIssueLink>Yeni bir talep</newIssueLink> oluşturun ki bu hatayı inceleyebilelim.",
-    "Rotate counter-clockwise": "Saat yönünün tersine döndür",
     "Language Dropdown": "Dil Listesi",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s, %(count)s kez ayrıldı",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s kez ayrıldı",
@@ -1325,7 +1122,6 @@
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Logları göndermeden önce, probleminizi betimleyen <a>bir GitHub talebi oluşturun</a>.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Topluluk ID leri sadece a-z, 0-9 ya da '=_-./' karakterlerini içerebilir",
     "Create a public room": "Halka açık bir oda oluşturun",
-    "Make this room public": "Bu odayı halka açık yap",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Sohbet tarihçesini kaybetmemek için, çıkmadan önce odanızın anahtarlarını dışarıya aktarın. Bunu yapabilmek için %(brand)sun daha yeni sürümü gerekli. Ulaşmak için geri gitmeye ihtiyacınız var",
     "Continue With Encryption Disabled": "Şifreleme Kapalı Şekilde Devam Et",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "%(fileName)s dosyası anasunucunun yükleme boyutu limitini aşıyor",
@@ -1333,7 +1129,6 @@
     "Changes your avatar in this current room only": "Sadece bu odadaki resminizi değiştirin",
     "Please supply a https:// or http:// widget URL": "Lütfen bir https:// ya da http:// olarak bir görsel bileşen URL i belirtin",
     "Sends the given emote coloured as a rainbow": "Verilen ifadeyi bir gökkuşağı gibi renklendirilmiş olarak gönderin",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ekran adını %(displayName)s olarak değiştirdi.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s odayı adresi bilen herkesin girebileceği şekilde halka açık hale getirdi.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s katılma kuralını %(rule)s şeklinde değiştirdi",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s misafir erişim kuralını %(rule)s şeklinde değiştirdi",
@@ -1378,14 +1173,11 @@
     "Click the link in the email you received to verify and then click continue again.": "Aldığınız e-postaki bağlantıyı tıklayarak doğrulayın ve sonra tekrar tıklayarak devam edin.",
     "Verify this session": "Bu oturumu doğrula",
     "Encryption upgrade available": "Şifreleme güncellemesi var",
-    "Set up encryption": "Şifrelemeyi ayarla",
     "You are no longer ignoring %(userId)s": "%(userId)s artık yoksayılmıyor",
     "Verifies a user, session, and pubkey tuple": "Bir kullanıcı, oturum ve açık anahtar çiftini doğrular",
     "Unknown (user, session) pair:": "Bilinmeyen (kullanıcı, oturum) çifti:",
     "Session already verified!": "Oturum zaten doğrulanmış!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "UYARI: Oturum zaten doğrulanmış, ama anahtarlar EŞLEŞMİYOR!",
-    "Your Matrix account on <underlinedServerName />": "Matrix hesabınız <underlinedServerName /> da yer almakta",
-    "No identity server is configured: add one in server settings to reset your password.": "Kimlik sunucusu yapılandırılmamış: sunucu ayarlarından ekleyerek parolanızı sıfırlayabilirsiniz.",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Yeni parolanızın ayarlandığını doğrulamak için bir e-posta gelen kutunuza gönderilecek.",
     "Invalid homeserver discovery response": "Geçersiz anasunucu keşif yanıtı",
     "Failed to get autodiscovery configuration from server": "Sunucudan otokeşif yapılandırması alınması başarısız",
@@ -1394,10 +1186,8 @@
     "Please <a>contact your service administrator</a> to continue using this service.": "Bu servisi kullanmaya devam etmek için lütfen <a>servis yöneticinizle bağlantı kurun</a>.",
     "Failed to perform homeserver discovery": "Anasunucu keşif işlemi başarısız",
     "Go back to set it again.": "Geri git ve yeniden ayarla.",
-    "Your recovery key": "Kurtarma anahtarınız",
     "Copy": "Kopyala",
     "Upgrade your encryption": "Şifrelemenizi güncelleyin",
-    "Make a copy of your recovery key": "Kurtarma anahtarınızın bir kopyasını oluşturun",
     "Create key backup": "Anahtar yedeği oluştur",
     "Set up Secure Messages": "Güvenli Mesajları Ayarla",
     "Space used:": "Kullanılan alan:",
@@ -1406,12 +1196,9 @@
     "Waiting for %(displayName)s to verify…": "%(displayName)s ın doğrulaması için bekleniyor…",
     "They match": "Eşleşiyorlar",
     "They don't match": "Eşleşmiyorlar",
-    "Verify yourself & others to keep your chats safe": "Sohbetlerinizi güvenli tutmak için kendinizi & diğerlerini doğrulayın",
     "Other users may not trust it": "Diğer kullanıcılar güvenmeyebilirler",
     "Later": "Sonra",
     "Review": "Gözden Geçirme",
-    "Workspace: %(networkName)s": "Çalışma alanı: %(networkName)s",
-    "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Show less": "Daha az göster",
     "Show more": "Daha fazla göster",
     "in memory": "hafızada",
@@ -1422,17 +1209,14 @@
     "Delete %(count)s sessions|other": "%(count)s oturumu sil",
     "Delete %(count)s sessions|one": "%(count)s oturum sil",
     "Public Name": "Açık İsim",
-    "rooms.": "odalar.",
     "Manage": "Yönet",
     "Enable": "Aç",
     "The integration manager is offline or it cannot reach your homeserver.": "Entegrasyon yöneticisi çevrim dışı veya anasunucunuza erişemiyor.",
     "Connect this session to Key Backup": "Anahtar Yedekleme için bu oturuma bağlanın",
     "Backup is not signed by any of your sessions": "Yedek hiç bir oturumunuz tarafından imzalanmadı",
     "This backup is trusted because it has been restored on this session": "Bu yedek güvenilir çünkü bu oturumda geri döndürüldü",
-    "Backup key stored: ": "Yedek anahtarı depolandı: ",
     "Enable desktop notifications for this session": "Bu oturum için masaüstü bildirimlerini aç",
     "<a>Upgrade</a> to your own domain": "Kendi etkinlik alanınızı <a>yükseltin</a>",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Botları, görsel bileşenleri ve çıkartma paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.",
     "Session ID:": "Oturum ID:",
     "Session key:": "Oturum anahtarı:",
     "This user has not verified all of their sessions.": "Bu kullanıcı bütün oturumlarında doğrulanmamış.",
@@ -1440,22 +1224,11 @@
     "Someone is using an unknown session": "Birisi bilinmeyen bir oturum kullanıyor",
     "Everyone in this room is verified": "Bu odadaki herkes doğrulanmış",
     "Your user agent": "Kullanıcı aracınız",
-    "If you cancel now, you won't complete verifying the other user.": "Şimdi iptal ederseniz, diğer kullanıcıyı doğrulamayı tamamlamış olmayacaksınız.",
-    "If you cancel now, you won't complete verifying your other session.": "Şimdi iptal ederseniz, diğer oturumu doğrulamış olmayacaksınız.",
     "Setting up keys": "Anahtarları ayarla",
     "Custom (%(level)s)": "Özel (%(level)s)",
     "Upload %(count)s other files|other": "%(count)s diğer dosyaları yükle",
     "Upload %(count)s other files|one": "%(count)s dosyayı sağla",
-    "A widget would like to verify your identity": "Bir görsel tasarım kimliğinizi teyit etmek istiyor",
     "Remember my selection for this widget": "Bu görsel bileşen işin seçimimi hatırla",
-    "Deny": "Reddet",
-    "Recovery key mismatch": "Kurtarma anahtarı uyumsuz",
-    "Enter recovery key": "Kurtarma anahtarı gir",
-    "Help": "Yardım",
-    "Take picture": "Resim çek",
-    "Premium": "Premium",
-    "Sign in to your Matrix account on %(serverName)s": "%(serverName)s adresindeki Matrix hesabınıza oturum açın",
-    "Sign in to your Matrix account on <underlinedServerName />": "<underlinedServerName /> adresindeki Matrix hesabına oturum açın",
     "Add to summary": "Özete ekle",
     "Add users to the community summary": "Topluluk özetine kullanıcıları ekle",
     "Who would you like to add to this summary?": "Bu özete kimi eklemek istersiniz?",
@@ -1484,7 +1257,6 @@
     "Add rooms to this community": "Bu topluluğa odaları ekle",
     "Filter community rooms": "Topluluk odalarını filtrele",
     "You're not currently a member of any communities.": "Şu anda hiç bir topluluğun bir üyesi değilsiniz.",
-    "Set Password": "Şifre oluştur",
     "Error encountered (%(errorDetail)s).": "Hata oluştu (%(errorDetail)s).",
     "Checking for an update...": "Güncelleme kontrolü...",
     "No update available.": "Güncelleme yok.",
@@ -1504,7 +1276,6 @@
     "Widget ID": "Görsel Bileşen ID si",
     "Delete Widget": "Görsel Bileşen Sil",
     "Delete widget": "Görsel bileşen sil",
-    "Failed to remove widget": "Görsel bileşen silme başarısız",
     "Destroy cross-signing keys?": "Çarpraz-imzalama anahtarlarını imha et?",
     "Clear cross-signing keys": "Çapraz-imzalama anahtarlarını temizle",
     "Clear all data in this session?": "Bu oturumdaki tüm verileri temizle?",
@@ -1516,11 +1287,6 @@
     "Suggestions": "Öneriler",
     "Recently Direct Messaged": "Güncel Doğrudan Mesajlar",
     "Go": "Git",
-    "Your account is not secure": "Hesabınız güvende değil",
-    "Your password": "Parolanız",
-    "This session, or the other session": "Bu oturum veya diğer oturum",
-    "New session": "Yeni oturum",
-    "This wasn't me": "Bu ben değildim",
     "Sign In or Create Account": "Oturum Açın veya Hesap Oluşturun",
     "Use your account or create a new one to continue.": "Hesabınızı kullanın veya devam etmek için yeni bir tane oluşturun.",
     "Create Account": "Hesap Oluştur",
@@ -1549,20 +1315,15 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "Diğer oturumlardan şifreleme anahtarlarını <requestLink>yeniden talep et</requestLink>.",
     "Encrypted by an unverified session": "Doğrulanmamış bir oturum tarafından şifrelenmiş",
     "Encrypted by a deleted session": "Silinen bir oturumla şifrelenmiş",
-    "Invite only": "Sadece davetliler",
     "Strikethrough": "Üstü çizili",
-    "Recent rooms": "Güncel odalar",
     "Reject & Ignore user": "Kullanıcı Reddet & Yoksay",
     "%(count)s unread messages including mentions.|one": "1 okunmamış bahis.",
-    "Unread mentions.": "Okunmamış bahisler.",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Davet geri çekilemiyor. Sunucu geçici bir problem yaşıyor olabilir yada daveti geri çekmek için gerekli izinlere sahip değilsin.",
     "Mark all as read": "Tümünü okunmuş olarak işaretle",
     "Incoming Verification Request": "Gelen Doğrulama İsteği",
     "Use bots, bridges, widgets and sticker packs": "Botları, köprüleri, görsel bileşenleri ve çıkartma paketlerini kullan",
-    "Not sure of your password? <a>Set a new one</a>": "Şifrenizden emin değil misiniz? <a>Yenisini ayalarla</a>",
     "Want more than a community? <a>Get your own server</a>": "Bir topluluktan fazlasınımı istiyorsunuz? <a>Kendi sunucunuzu edinin</a>",
     "Explore rooms": "Odaları keşfet",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Mesajı yeniden gönder</resendText> veya <cancelText> şimdi mesajı iptal et </cancelText>.",
     "Your new session is now verified. Other users will see it as trusted.": "Yeni oturumunuz şimdi doğrulandı. Diğer kullanıcılar güvenilir olarak görecek.",
     "Invalid base_url for m.homeserver": "m.anasunucu için geçersiz base_url",
     "Invalid base_url for m.identity_server": "m.kimlik_sunucu için geçersiz base_url",
@@ -1574,11 +1335,9 @@
     "Enter your account password to confirm the upgrade:": "Güncellemeyi başlatmak için hesap şifreni gir:",
     "Restore": "Geri yükle",
     "You'll need to authenticate with the server to confirm the upgrade.": "Güncellemeyi teyit etmek için sunucuda oturum açmaya ihtiyacınız var.",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Kurtarma anahtarı <b>İndirilenler</b> klasörünüzde.",
     "Unable to set up secret storage": "Sır deposu ayarlanamıyor",
     "For maximum security, this should be different from your account password.": "En üst düzey güvenlik için, bu şifre hesap şifrenizden farklı olmalı.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Anahtarlarınız yedekleniyor (ilk yedek bir kaç dakika sürebilir).",
-    "If you don't want to set this up now, you can later in Settings.": "Şimdi ayarlamak istemiyorsanız daha sonra Ayarlar menüsünden yapabilirsiniz.",
     "Set up": "Ayarla",
     "Cancel entering passphrase?": "Parola girişini iptal et?",
     "%(senderName)s changed the alternative addresses for this room.": "Bu oda için alternatif adresler %(senderName)s tarafından değiştirildi.",
@@ -1587,19 +1346,14 @@
     "Upgrade public room": "Açık odayı güncelle",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Bu odayı <oldVersion /> versiyonundan <newVersion /> versiyonuna güncelleyeceksiniz.",
     "We encountered an error trying to restore your previous session.": "Önceki oturumunuzu geri yüklerken bir hatayla karşılaştık.",
-    "A username can only contain lower case letters, numbers and '=_-./'": "Bir kullanıcı adı sadece küçük karakterler, numaralar ve  '=_-./' karakterlerini içerebilir",
     "To help us prevent this in future, please <a>send us logs</a>.": "Bunun gelecekte de olmasının önüne geçmek için lütfen <a>günceleri bize gönderin</a>.",
     "To continue you need to accept the terms of this service.": "Devam etmek için bu servisi kullanma şartlarını kabul etmeniz gerekiyor.",
     "Upload files (%(current)s of %(total)s)": "Dosyaları yükle (%(current)s / %(total)s)",
-    "Incorrect recovery passphrase": "Hatalı kurtarma parolası",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s adet oturum çözümlenemedi!",
-    "Enter recovery passphrase": "Kurtarma parolasını girin",
     "Confirm your identity by entering your account password below.": "Hesabınızın şifresini aşağıya girerek kimliğinizi teyit edin.",
-    "An email has been sent to %(emailAddress)s": "%(emailAddress)s adresine bir e-posta gönderildi",
     "A text message has been sent to %(msisdn)s": "%(msisdn)s ye bir metin mesajı gönderildi",
     "Use lowercase letters, numbers, dashes and underscores only": "Sadece küçük harfler, numara, tire ve alt tire kullanın",
     "Join millions for free on the largest public server": "En büyük açık sunucu üzerindeki milyonlara ücretsiz ulaşmak için katılın",
-    "Find other public servers or use a custom server": "Diğer açık sunucuları bulun ya da özel bir sunucu kullanın",
     "Add rooms to the community summary": "Topluluk özetine odaları ekleyin",
     "Which rooms would you like to add to this summary?": "Hangi odaları bu özete eklemek istersiniz?",
     "%(inviter)s has invited you to join this community": "%(inviter)s sizi bu topluluğa katılmanız için davet etti",
@@ -1608,7 +1362,6 @@
     "%(brand)s failed to get the public room list.": "Açık oda listesini getirirken %(brand)s başarısız oldu.",
     "Show these rooms to non-members on the community page and room list?": "Bu odaları oda listesinde ve topluluğun sayfasında üye olmayanlara göster?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bu odaya alternatif olarak %(addresses)s adreslerini ekledi.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Sohbet için gönderilen davetin başarısız olduğu kullanıcılar: %(csvUsers)s",
     "Something went wrong trying to invite the users.": "Kullanıcıların davet edilmesinde bir şeyler yanlış gitti.",
     "a new master key signature": "yeni bir master anahtar imzası",
     "a new cross-signing key signature": "yeni bir çapraz-imzalama anahtarı imzası",
@@ -1617,17 +1370,14 @@
     "Cancelled signature upload": "anahtar yükleme iptal edildi",
     "Signature upload success": "Anahtar yükleme başarılı",
     "Signature upload failed": "İmza yükleme başarısız",
-    "If you didn’t sign in to this session, your account may be compromised.": "Eğer bu oturuma bağlanmadıysanız, hesabınız ele geçirilmiş olabilir.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Bu dosyalar yükleme için <b>çok büyük</b>. Dosya boyut limiti %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Bazı dosyalar yükleme için <b>çok büyük</b>. Dosya boyutu limiti %(limit)s.",
     "Failed to re-authenticate due to a homeserver problem": "Anasunucu problemi yüzünden yeniden kimlik doğrulama başarısız",
     "Failed to re-authenticate": "Yeniden kimlik doğrulama başarısız",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Yeni bir kurtarma parolası ve Güvenli Mesajlar için anahtar tespit edildi.",
     "Not currently indexing messages for any room.": "Şu an hiç bir odada mesaj indeksleme yapılmıyor.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "%(brand)s'u ana giriş yöntemi dokunma olan bir cihazda kullanıyor olsanızda",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Breadcrumbs' özelliğini kullanıp kullanmadığınız (oda listesi üzerinde avatarlar)",
     "Whether you're using %(brand)s as an installed Progressive Web App": "%(brand)s'u gelişmiş web uygulaması olarak yükleyip yüklemediğinizi",
-    "A call is currently being placed!": "Bir çağrı şu anda başlatılıyor!",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Şu anda dosya ile birlikte mesaj yollamak mümkün değil. Dosyayı mesajsız yüklemek ister misiniz?",
     "PM": "24:00",
     "AM": "12:00",
@@ -1668,7 +1418,6 @@
     "Short keyboard patterns are easy to guess": "Kısa klavye desenleri kolay tahmin edilir",
     "Support adding custom themes": "Özel tema eklemeyi destekle",
     "Show read receipts sent by other users": "Diğer kullanıcılar tarafından gönderilen okundu bilgisini göster",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Şifrelenmiş odalarda güvenli mesaj kurtarmayı etkinleştirmek için hatırlatıcı göster",
     "Enable automatic language detection for syntax highlighting": "Sözdizimi vurgularken otomatik dil algılamayı etkinleştir",
     "Show avatars in user and room mentions": "Kullanıcı veya odadan bahsedilirken avatarlarını göster",
     "Automatically replace plain text Emoji": "Düz metini otomatik olarak emoji ile değiştir",
@@ -1695,15 +1444,11 @@
     "Visibility in Room List": "Oda Listesindeki Görünürlük",
     "Confirm adding email": "E-posta adresini eklemeyi onayla",
     "Click the button below to confirm adding this email address.": "E-posta adresini eklemeyi kabul etmek için aşağıdaki tuşa tıklayın.",
-    "Confirm adding phone number": "Telefon numayasını ekleyi onayla",
+    "Confirm adding phone number": "Telefon numarası eklemeyi onayla",
     "Click the button below to confirm adding this phone number.": "Telefon numarasını eklemeyi kabul etmek için aşağıdaki tuşa tıklayın.",
     "Are you sure you want to cancel entering passphrase?": "Parola girmeyi iptal etmek istediğinizden emin misiniz?",
     "Room name or address": "Oda adı ya da adresi",
     "%(name)s is requesting verification": "%(name)s doğrulama istiyor",
-    "Use your account to sign in to the latest version": "En son sürümde oturum açmak için hesabınızı kullanın",
-    "We’re excited to announce Riot is now Element": "Riot'ın artık Element olduğunu duyurmaktan heyecan duyuyoruz",
-    "Riot is now Element!": "Riot artık Element!",
-    "Learn More": "",
     "Sends a message as html, without interpreting it as markdown": "İletiyi MarkDown olarak göndermek yerine HTML olarak gönderir",
     "Failed to set topic": "Konu belirlenemedi",
     "Joins room with given address": "Belirtilen adres ile odaya katılır",
@@ -1717,47 +1462,19 @@
     "Dark": "Karanlık",
     "You signed in to a new session without verifying it:": "Yeni bir oturuma, doğrulamadan oturum açtınız:",
     "Verify your other session using one of the options below.": "Diğer oturumunuzu aşağıdaki seçeneklerden birini kullanarak doğrulayın.",
-    "I want to help": "Yardım etmek istiyorum",
-    "Review where you’re logged in": "Nerelerde oturum açığınızı inceleyin",
-    "Verify all your sessions to ensure your account & messages are safe": "Hesabınızın ve iletileriniz güvenliği için bütün oturumlarınızı doğrulayın",
     "Your homeserver has exceeded its user limit.": "Homeserver'ınız kullanıcı limitini aştı.",
     "Your homeserver has exceeded one of its resource limits.": "Homeserver'ınız kaynaklarından birisinin sınırını aştı.",
     "Contact your <a>server admin</a>.": "<a>Sunucu yöneticinize</a> başvurun.",
     "Ok": "Tamam",
-    "Set password": "Parola belirle",
-    "To return to your account in future you need to set a password": "İleride hesabınızı tekrar kullanabilmek için bir parola belirlemeniz gerek",
     "New login. Was this you?": "Yeni giriş. Bu siz miydiniz?",
-    "Restart": "Yeniden başlat",
     "You joined the call": "Çağrıya katıldınız",
     "%(senderName)s joined the call": "%(senderName)s çağrıya katıldı",
     "Call in progress": "Çağrı devam ediyor",
-    "You left the call": "Çağrıdan ayrıldınız",
-    "%(senderName)s left the call": "%(senderName)s çağrıdan ayrıldı",
     "Call ended": "Çağrı sonlandı",
     "You started a call": "Bir çağrı başlattınız",
     "%(senderName)s started a call": "%(senderName)s bir çağrı başlattı",
     "Waiting for answer": "Yanıt bekleniyor",
     "%(senderName)s is calling": "%(senderName)s arıyor",
-    "You created the room": "Odayı oluşturdunuz",
-    "%(senderName)s created the room": "%(senderName)s odayı oluşturdu",
-    "You made the chat encrypted": "Sohbeti şifrelediniz",
-    "%(senderName)s made the chat encrypted": "%(senderName)s sohbeti şifreledi",
-    "You made history visible to new members": "Yeni üyelere sohbet geçmişini görünür yaptınız",
-    "%(senderName)s made history visible to new members": "%(senderName)s yeni üyelere  sohbet geçmişini görünür yaptı",
-    "You made history visible to anyone": "Sohbet geçmişini herkese görünür yaptınız",
-    "%(senderName)s made history visible to anyone": "%(senderName)s sohbet geçmişini herkese görünür yaptı",
-    "You made history visible to future members": "Sohbet geçmişini gelecek kullanıcılara görünür yaptınız",
-    "%(senderName)s made history visible to future members": "%(senderName)s sohbet geçmişini gelecek kullanıcılara görünür yaptı",
-    "You were invited": "Davet edildiniz",
-    "%(targetName)s was invited": "%(targetName)s davet edildi",
-    "You left": "Ayrıldınız",
-    "%(targetName)s left": "%(targetName)s ayrıldı",
-    "You were kicked (%(reason)s)": "Atıldınız (%(reason)s)",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s atıldı (%(reason)s)",
-    "You were kicked": "Atıldınız",
-    "%(targetName)s was kicked": "%(targetName)s atıldı",
-    "You rejected the invite": "Daveti reddettiniz",
-    "%(targetName)s rejected the invite": "%(targetName)s daveti reddetti",
     "See when anyone posts a sticker to your active room": "Aktif odanızda birisi çıkartma paylaştığında görün",
     "See when a sticker is posted in this room": "Bu odada çıkartma paylaşıldığında görün",
     "See when the avatar changes in your active room": "Aktif odanızdaki avatar değişikliklerini görün",
@@ -1766,7 +1483,6 @@
     "The person who invited you already left the room.": "Seni davet eden kişi zaten odadan ayrılmış.",
     "New version of %(brand)s is available": "%(brand)s 'in yeni versiyonu hazır",
     "Update %(brand)s": "%(brand)s 'i güncelle",
-    "Verify the new login accessing your account: %(name)s": "Hesabınıza erişen yeni girişi onaylayın: %(name)s",
     "Safeguard against losing access to encrypted messages & data": "Şifrelenmiş mesajlara ve verilere erişimi kaybetmemek için koruma sağlayın",
     "Set up Secure Backup": "Güvenli Yedekleme kur",
     "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
@@ -1789,7 +1505,6 @@
     "Change the avatar of your active room": "Aktif odanın avatarını değiştir",
     "Change the avatar of this room": "Bu odanın avatarını değiştir",
     "Change the name of your active room": "Aktif odanızın ismini değiştirin",
-    "%(senderName)s declined the call.": "%(senderName)s aramayı reddetti.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tüm sunucuların katılımı yasaklanmıştır! Bu oda artık kullanılamaz.",
     "Change the name of this room": "Bu odanın ismini değiştirin",
     "Change the topic of your active room": "Aktif odanızın konusunu değiştirin",
@@ -1797,9 +1512,6 @@
     "Change which room you're viewing": "Görüntülediğiniz odayı değiştirin",
     "Send stickers into your active room": "Aktif odanıza çıkartma gönderin",
     "Send stickers into this room": "Bu odaya çıkartma gönderin",
-    "(an error occurred)": "(bir hata meydana geldi)",
-    "(their device couldn't start the camera / microphone)": "(Cihazları kamerayı/mikrofonu başlatamadı )",
-    "(connection failed)": "(bağlantı hatası)",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s bu oda için sunucu ACL'lerini değiştirdi.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s bu oda için sunucu ACL'lerini ayarladı.",
     "Takes the call in the current room off hold": "Mevcut odadaki aramayı beklemeden çıkarır",
@@ -2087,9 +1799,6 @@
     "See when the topic changes in this room": "Bu odada konu değişikliğini görün",
     "See when the topic changes in your active room": "Aktif odanızda konu değiştiğinde görün",
     "Remain on your screen when viewing another room, when running": "a",
-    "Incoming call": "Gelen arama",
-    "Incoming video call": "Gelen görüntülü arama",
-    "Incoming voice call": "Gelen sesli arama",
     "Unknown caller": "Bilinmeyen arayan",
     "%(name)s on hold": "%(name)s beklemede",
     "Return to call": "Aramaya dön",
@@ -2110,7 +1819,6 @@
     "Sends the given message with confetti": "Mesajı konfeti ile gönderir",
     "Downloading logs": "Günlükler indiriliyor",
     "Uploading logs": "Günlükler yükleniyor",
-    "Show chat effects": "Sohbet efektlerini gösterin",
     "Enable experimental, compact IRC style layout": "Deneysel, kompakt IRC tarzı düzeni etkinleştirin",
     "IRC display name width": "IRC görünen ad genişliği",
     "Manually verify all remote sessions": "Bütün uzaktan oturumları el ile onayla",
@@ -2123,7 +1831,6 @@
     "Use a more compact ‘Modern’ layout": "Daha kompakt \"Modern\" düzen",
     "Use custom size": "Özel büyüklük kullan",
     "Font size": "Yazı boyutu",
-    "Enable advanced debugging for the room list": "Oda listesi için gelişmiş hata ayıklamayı etkinleştirin",
     "Show message previews for reactions in DMs": "DM'lerdeki tepkiler için mesaj ön izlemelerini göster",
     "Show message previews for reactions in all rooms": "Tüm odalardaki tepkiler için mesaj ön izlemelerini göster",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Topluluklar v2 prototipleri. Uygun ana sunucu gerektirir. Deneysel - dikkatli kullanın.",
@@ -2145,7 +1852,6 @@
     "Published Addresses": "Yayınlanmış adresler",
     "No other published addresses yet, add one below": "Henüz yayınlanmış başka adres yok, aşağıdan bir tane ekle",
     "Other published addresses:": "Diğer yayınlanmış adresler:",
-    "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.": "Yayınlanmış adresler, odanıza katılmak için herhangi bir sunucudaki herkes tarafından kullanılabilir. Bir adresi yayınlamak için önce yerel adres olarak ayarlanması gerekir.",
     "Error removing address": "Adres kaldırılırken hata",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Adres kaldırılırken bir hata ile karşılaşıldı. Artık mevcut olmayabilir yada geçici bir oluştu.",
     "You don't have permission to delete the address.": "Bu adresi silmeye yetkiniz yok.",
@@ -2166,7 +1872,6 @@
     "Hide Widgets": "Widgetları gizle",
     "No recently visited rooms": "Yakında ziyaret edilen oda yok",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s %(userName)s tarafından %(dateTime)s tarihinde görüldü",
-    "Unpin Message": "Mesajın sabitlemesini kaldır",
     "This is the start of <roomName/>.": "Bu <roomName/> odasının başlangıcıdır.",
     "Add a photo, so people can easily spot your room.": "İnsanların odanı kolayca tanıması için bir fotoğraf ekle.",
     "%(displayName)s created this room.": "%(displayName)s bu odayı oluşturdu.",
@@ -2207,8 +1912,6 @@
     "Unable to access microphone": "Mikrofona erişilemiyor",
     "The call was answered on another device.": "Arama başka bir cihazda cevaplandı.",
     "The call could not be established": "Arama yapılamadı",
-    "The other party declined the call.": "Diğer taraf aramayı reddetti.",
-    "Call Declined": "Arama Reddedildi",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Kimliğinizi doğrulamak için Tek Seferlik Oturum Açma özelliğini kullanarak bu telefon numarasını eklemeyi onaylayın.",
     "Single Sign On": "Tek seferlik oturum aç",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Kimliğinizi doğrulamak için Tek Seferlik Oturum Açma özelliğini kullanarak bu e-posta adresini eklemeyi onaylayın.",
@@ -2232,7 +1935,6 @@
     "Send videos as you in this room": "Widget sizin adınıza bu odaya video göndersin",
     "See <b>%(eventType)s</b> events posted to your active room": "Aktif odanıza gönderilen <b>%(eventType)s</b> etkinlikleri gör",
     "Decline (%(counter)s)": "",
-    "From %(deviceName)s (%(deviceId)s)": "%(deviceName)s%(deviceId)s tarafından",
     "Thumbs up": "Başparmak havaya",
     "Santa": "Noel Baba",
     "Spanner": "Anahtar",
@@ -2267,10 +1969,8 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Emin misiniz? Eğer anahtarlarınız doğru bir şekilde yedeklemediyse, şifrelenmiş iletilerinizi kaybedeceksiniz.",
     "The operation could not be completed": "Eylem tamamlanamadı",
     "Failed to save your profile": "Profiliniz kaydedilemedi",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Onları %(brand)s dışında bir sunucuda yapılandırmış olabilirsin. Onları %(brand)s içinde ayarlayamazsın ama yine de geçerlidir.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Arama sonuçlarında gozükmeleri için iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Çapraz imzalı cihazlara güvenmeden, güvenilir olarak işaretlemek için, bir kullanıcı tarafından kullanılan her bir oturumu ayrı ayrı doğrulayın.",
-    "There are advanced notifications which are not shown here.": "Burada gösterilmeyen gelişmiş bildirimler var.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odasından %(size)s  yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odalardan %(size)s  yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
     "not found in storage": "Cihazda bulunamadı",
@@ -2308,19 +2008,12 @@
     "Room Autocomplete": "Otomatik Oda Tamamlama",
     "Notification Autocomplete": "Otomatik Bildirim Tamamlama",
     "Away": "Uzakta",
-    "Share Permalink": "Permalink'i Paylaş",
-    "Resend removal": "Kaldırmayı yeniden gönder",
-    "Resend edit": "Düzenlemeyi yeniden gönder",
     "Quick Reactions": "Hızlı Tepkiler",
     "Widgets": "Widgetlar",
     "Unpin": "Sabitlemeyi kaldır",
     "Create community": "Topluluk oluştur",
     "Enter name": "İsim gir",
     "Download logs": "Günlükleri indir",
-    "%(brand)s Android": "%(brand)s Android",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Desktop": "%(brand)s Masaüstü",
-    "%(brand)s Web": "%(brand)s Ağı",
     "User menu": "Kullanıcı menüsü",
     "Notification options": "Bildirim ayarları",
     "Use default": "Varsayılanı kullan",
@@ -2358,7 +2051,6 @@
     "Show": "Göster",
     "Homeserver": "Ana sunucu",
     "Information": "Bilgi",
-    "Role": "Rol",
     "About": "Hakkında",
     "Modern": "Modern",
     "Ctrl": "Ctrl",
@@ -2378,14 +2070,12 @@
     "Leave Room": "Odadan ayrıl",
     "Forget Room": "Odayı unut",
     "Open dial pad": "Arama tuşlarını aç",
-    "Start a Conversation": "Bir sohbet başlat",
     "Mod": "Mod",
     "Revoke": "İptal et",
     "Complete": "Tamamla",
     "Where you’re logged in": "Giriş yaptığınız yer",
     "Privacy": "Gizlilik",
     "New version available. <a>Update now.</a>": "Yeni sürüm mevcut: <a> Şimdi güncelle.</a>",
-    "Compact": "Kompakt",
     "Message layout": "Mesaj düzeni",
     "Use between %(min)s pt and %(max)s pt": "%(min)s ile %(max)s arasında girin",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Özel yazı tipi boyutu %(min)s ile %(max)s arasında olmalı",
@@ -2397,7 +2087,6 @@
     "Secret storage:": "Gizli depolama:",
     "Backup key cached:": "Yedekleme anahtarı önbelleğe alındı:",
     "Backup key stored:": "Yedekleme anahtarı depolandı:",
-    "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.": "Oturumlarınıza erişimi kaybetmeniz ihtimaline karşı, şifreleme anahtarlarınızı hesap verilerinizle yedekleyin. Anahtarlarınız benzersiz bir Kurtarma Anahtarı ile korunacaktır.",
     "unexpected type": "Bilinmeyen tür",
     "Back up your keys before signing out to avoid losing them.": "Anahtarlarını kaybetmemek için, çıkış yapmadan önce önleri yedekle.",
     "Algorithm:": "Algoritma:",
@@ -2424,7 +2113,6 @@
     "Add a new server...": "Yeni sunucu ekle...",
     "Preparing to download logs": "Loglar indirilmeye hazırlanıyor",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Hatırlatma:Tarayıcınız desteklenmiyor, deneyiminiz öngörülemiyor.",
-    "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.": "Hata ayıklama günlükleri, kullanıcı adınız, ziyaret ettiğiniz oda veya grupların kimlikleri veya takma adları ve diğer kullanıcıların kullanıcı adları dahil olmak üzere uygulama kullanım verilerini içerir. Mesaj içermezler.",
     "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>": "Bir oda için şifreleme bir kez etkinleştirildiğinde geri alınamaz. Şifrelenmiş bir odada gönderilen iletiler yalnızca ve yalnızca odadaki kullanıcılar tarafından görülebilir. Şifrelemeyi etkinleştirmek bir çok bot'un ve köprülemenin doğru çalışmasını etkileyebilir. <a>Şifrelemeyle ilgili daha fazla bilgi edinmek için.</a>",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Doğrudan %(brand)s uygulamasından davet isteği almak için bu e-posta adresini Ayarlardan kendi hesabınıza bağlayın.",
     "Failed to remove '%(roomName)s' from %(groupId)s": "",
@@ -2444,7 +2132,6 @@
     "Messages in this room are end-to-end encrypted.": "Bu odadaki iletiler uçtan uca şifrelenmiştir.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "İletileriniz şifreledir ve yalnızca sizde ve gönderdiğiniz kullanıcılarda iletileri açmak için anahtarlar vardır.",
     "Waiting for %(displayName)s to accept…": "%(displayName)s kullanıcısın onaylaması için bekleniliyor…",
-    "Waiting for you to accept on your other session…": "Diğer oturumunuzda onaylamanız için bekleniliyor…",
     "URL previews are disabled by default for participants in this room.": "URL ön izlemeleri, bu odadaki kullanıcılar için varsayılan olarak devre dışı bıraktırılmıştır.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Adanın alternatif adresini güncellerken bir hata oluştu. Bu eylem, sunucu tarafından izin verilmemiş olabilir ya da geçici bir sorun oluşmuş olabilir.",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Odanın ana adresini güncellerken bir sorun oluştu. Bu eylem, sunucu tarafından izin verilmemiş olabilir ya da geçici bir sorun oluşmuş olabilir.",
@@ -2477,7 +2164,6 @@
     "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.": "Kişisel engelleme listeniz, ileti almak istemediğiniz kullanıcı veya sunucuları bulundurur. İlk engellemenizde oda listenizde \"My Ban List\" adlı bir oda oluşturulacaktır. Engelleme listesinin yürürlüğünü sürdürmesini istiyorsanız o odada kalın.",
     "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.": "Kullanıcıları engelleme, hangi kullanıcıları engelleyeceğini belirleyen kurallar bulunduran bir engelleme listesi kullanılarak gerçekleşir. Bir engelleme listesine abone olmak, o listeden engellenen kullanıcıların veya sunucuların sizden gizlenmesi demektir.",
     "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.": "Görmezden gelmek istediğiniz kullanıcıları ya da sunucuları buraya ekleyin. %(brand)s uygulamasının herhangi bir karakteri eşleştirmesini istiyorsanız yıldız imi kullanın. Örneğin <code>@fobar:*</code>, \"foobar\" adlı kullanıcıların hepsini bütün sunucularda görmezden gelir.",
-    "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.": "Eğer GitHub aracılığıyla bir hata bildirdiyseniz hata kayıtları sorunu bulmamızda bize yardımcı olabilir. Hata kayıtları kullanıcı adınızı, daha önceden bulunmuş olduğunuz odaların veya grupların kimliklerini veya takma adlarını ve diğer kullanıcıların adlarını içerir. Hata kayıtları ileti içermez.",
     "Please verify the room ID or address and try again.": "Lütfen oda kimliğini ya da adresini doğrulayıp yeniden deneyin.",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "%(brand)s uygulamasına yardımcı olmak için <a>buraya</a> tıklayın ya da aşağıdaki tuşları kullanarak bot'umuzla sohbet edin.",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Başkaları tarafından e-posta adresi ya da telefon numarası ile bulunabilmek için %(serverName)s kimlik sunucusunun Kullanım Koşullarını kabul edin.",
@@ -2505,8 +2191,6 @@
     "Unable to look up phone number": "Telefon numarasına bakılamadı",
     "There was an error looking up the phone number": "Telefon numarasına bakarken bir hata oluştu",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "",
-    "Use Ctrl + F to search": "Arama yapmak için Ctrl + F",
-    "Use Command + F to search": "Arama yapmak için Command + F",
     "Show line numbers in code blocks": "Kod bloklarında satır sayısını göster",
     "Expand code blocks by default": "Varsayılan olarak kod bloklarını genişlet",
     "Show stickers button": "Çıkartma tuşunu göster",
@@ -2517,5 +2201,71 @@
     "Remain on your screen while running": "Uygulama çalışırken lütfen başka uygulamaya geçmeyin",
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Ana sunucunuza erişilemedi ve oturum açmanıza izin verilmedi. Lütfen yeniden deneyin. Eğer hata devam ederse ana sunucunuzun yöneticisine bildirin.",
     "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.": "Ana sunucunuz oturum açma isteğinizi reddetti. Bunun nedeni bağlantı yavaşlığı olabilir. Lütfen yeniden deneyin. Eğer hata devam ederse ana sunucunuzun yöneticisine bildirin.",
-    "Try again": "Yeniden deneyin"
+    "Try again": "Yeniden deneyin",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s odadaki <a>ileti sabitlemelerini</a> değiştirdi.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s, %(targetName)s kullanıcısını attı",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s, %(targetName)s kullanıcısını attı: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s, %(targetName)s kullanıcısının davetini geri çekti",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s,%(targetName)s kullanıcısının davetini geri çekti: %(reason)s",
+    "%(targetName)s left the room": "%(targetName)s odadan çıktı",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s odadan çıktı: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s daveti geri çevirdi",
+    "%(targetName)s joined the room": "%(targetName)s odaya katıldı",
+    "%(senderName)s made no change": " ",
+    "%(senderName)s set a profile picture": "%(senderName)s profil resmi belirledi",
+    "%(senderName)s changed their profile picture": "%(senderName)s profil resmini değiştirdi",
+    "%(senderName)s removed their profile picture": "%(senderName)s profil resmini kaldırdı",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s, %(oldDisplayName)s görünür adını kaldırdı",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s görünür adını %(displayName)s yaptı",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s görünür adını %(displayName)s yaptı",
+    "%(senderName)s invited %(targetName)s": "%(targetName)s kullanıcılarını %(senderName)s davet etti",
+    "%(senderName)s unbanned %(targetName)s": "%(targetName) tarafından %(senderName)s yasakları kaldırıldı",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s %(targetName)s kullanıcısını yasakladı: %(reason)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s %(targetName) kullanıcısını yasakladı: %(reason)s",
+    "Some invites couldn't be sent": "Bazı davetler gönderilemiyor",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Başkalarına davetler iletilmekle beraber, aşağıdakiler <RoomName/> odasına davet edilemedi",
+    "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.": "Tarayıcınıza bağlandığınız ana sunucuyu anımsamasını söyledik ama ne yazık ki tarayıcınız bunu unutmuş. Lütfen giriş sayfasına gidip tekrar deneyin.",
+    "We couldn't log you in": "Sizin girişinizi yapamadık",
+    "You're already in a call with this person.": "Bu kişi ile halihazırda çağrıdasınız.",
+    "The user you called is busy.": "Aradığınız kullanıcı meşgul.",
+    "User Busy": "Kullanıcı Meşgul",
+    "Got it": "Anlaşıldı",
+    "Verified": "Doğrulanmış",
+    "You've successfully verified %(displayName)s!": "%(displayName)s başarıyla doğruladınız!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s (%(deviceId)s) başarıyla doğruladınız!",
+    "You've successfully verified your device!": "Cihazınızı başarıyla doğruladınız!",
+    "Edit devices": "Cihazları düzenle",
+    "We didn't find a microphone on your device. Please check your settings and try again.": "Cihazınızda bir mikrofon bulamadık. Lütfen ayarlarınızı kontrol edin ve tekrar deneyin.",
+    "No microphone found": "Mikrofon bulunamadı",
+    "Empty room": "Boş oda",
+    "Suggested Rooms": "Önerilen Odalar",
+    "View message": "Mesajı görüntüle",
+    "Invite to just this room": "Sadece bu odaya davet et",
+    "%(seconds)ss left": "%(seconds)s saniye kaldı",
+    "Send message": "Mesajı gönder",
+    "Your message was sent": "Mesajınız gönderildi",
+    "Encrypting your message...": "Mesajınız şifreleniyor...",
+    "Sending your message...": "Mesajınız gönderiliyor...",
+    "Code blocks": "Kod blokları",
+    "Displaying time": "Zamanı görüntüle",
+    "To view all keyboard shortcuts, click here.": "Tüm klavye kısayollarını görmek için buraya tıklayın.",
+    "Keyboard shortcuts": "Klavye kısayolları",
+    "Visibility": "Görünürlük",
+    "Save Changes": "Değişiklikleri Kaydet",
+    "Saving...": "Kaydediliyor...",
+    "Invite with email or username": "E-posta veya kullanıcı adı ile davet et",
+    "Invite people": "İnsanları davet et",
+    "Share invite link": "Davet bağlantısını paylaş",
+    "Click to copy": "Kopyalamak için tıklayın",
+    "You can change these anytime.": "Bunları istediğiniz zaman değiştirebilirsiniz.",
+    "Change which room, message, or user you're viewing": "Görüntülediğiniz odayı, mesajı veya kullanıcıyı değiştirin",
+    "%(targetName)s accepted an invitation": "%(targetName)s daveti kabul etti",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s, %(displayName)s kişisinin davetini kabul etti",
+    "Integration manager": "Bütünleştirme Yöneticisi",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Botları, görsel bileşenleri ve çıkartma paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.",
+    "Identity server": "Kimlik sunucusu",
+    "Identity server (%(server)s)": "(%(server)s) Kimlik Sunucusu",
+    "Could not connect to identity server": "Kimlik Sunucusuna bağlanılamadı",
+    "Not a valid identity server (status code %(code)s)": "Geçerli bir Kimlik Sunucu değil ( durum kodu %(code)s )",
+    "Identity server URL must be HTTPS": "Kimlik Sunucu URL adresi HTTPS olmak zorunda"
 }
diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json
index f9ac9cf574..f8a741b568 100644
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -24,9 +24,7 @@
     "Tue": "Asn",
     "Mon": "Ayn",
     "Sun": "Asa",
-    "You are already in a call.": "tsuld Tellid g uɣuri.",
     "OK": "WAX",
-    "Call Declined": "Aɣuri issern",
     "Dismiss": "Nexxel",
     "Error": "Tazgelt",
     "e.g. <CurrentPageURL>": "a.m. <CurrentPageURL>",
@@ -35,7 +33,6 @@
     "The version of %(brand)s": "Taleqqemt n %(brand)s",
     "Add Phone Number": "Rnu uṭṭun n utilifun",
     "Add Email Address": "Rnu tasna imayl",
-    "Open": "Ṛẓem",
     "Permissions": "Tisirag",
     "Subscribe": "Zemmem",
     "Change": "Senfel",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index db5ce9b360..cccfb83610 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -2,7 +2,6 @@
     "Cancel": "Скасувати",
     "Close": "Закрити",
     "Create new room": "Створити нову кімнату",
-    "Custom Server Options": "Власні параметри сервера",
     "Dismiss": "Відхилити",
     "Error": "Помилка",
     "Failed to forget room %(errCode)s": "Не вдалось видалити кімнату %(errCode)s",
@@ -12,7 +11,6 @@
     "Operation failed": "Не вдалося виконати дію",
     "powered by Matrix": "працює на Matrix",
     "Remove": "Прибрати",
-    "Room directory": "Каталог кімнат",
     "Search": "Пошук",
     "Settings": "Налаштування",
     "Start chat": "Почати розмову",
@@ -20,20 +18,14 @@
     "OK": "Гаразд",
     "Failed to change password. Is your password correct?": "Не вдалось змінити пароль. Ви впевнені, що пароль введено правильно?",
     "Continue": "Продовжити",
-    "Accept": "Прийняти",
+    "Accept": "Погодитись",
     "Account": "Обліковий запис",
-    "%(targetName)s accepted an invitation.": "%(targetName)s приймає запрошення.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s приймає запрошення від %(displayName)s.",
-    "Access Token:": "Токен доступу:",
-    "Active call (%(roomName)s)": "Активний виклик (%(roomName)s)",
     "Add": "Додати",
-    "Add a topic": "Додати тему",
     "Admin": "Адміністратор",
     "Admin Tools": "Засоби адміністрування",
     "No Microphones detected": "Мікрофон не виявлено",
     "No Webcams detected": "Веб-камеру не виявлено",
     "Favourites": "Вибрані",
-    "Fill screen": "На весь екран",
     "No media permissions": "Нема дозволів на відео/аудіо",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Можливо, вам треба дозволити %(brand)s використання мікрофону/камери вручну",
     "Default Device": "Уставний пристрій",
@@ -41,58 +33,44 @@
     "Camera": "Камера",
     "Advanced": "Додаткові",
     "Always show message timestamps": "Завжди показувати часові позначки повідомлень",
-    "Authentication": "Впізнавання",
+    "Authentication": "Автентифікація",
     "%(items)s and %(lastItem)s": "%(items)s та %(lastItem)s",
     "and %(count)s others...|one": "і інше...",
     "and %(count)s others...|other": "та %(count)s інші...",
     "A new password must be entered.": "Має бути введений новий пароль.",
-    "Add a widget": "Добавити віджет",
-    "Allow": "Принюти",
-    "%(senderName)s answered the call.": "%(senderName)s відповів/ла на дзвінок.",
     "An error has occurred.": "Трапилась помилка.",
     "Anyone": "Кожний",
-    "Anyone who knows the room's link, apart from guests": "Кожний, хто знає посилання на кімнату, окрім гостей",
-    "Anyone who knows the room's link, including guests": "Кожний, хто знає посилання на кімнату, включно гостей",
     "Are you sure?": "Ви впевнені?",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Ви впевнені, що хочете залишити '%(roomName)s'?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ви впевнені, що хочете вийти з «%(roomName)s»?",
     "Are you sure you want to reject the invitation?": "Ви впевнені, що ви хочете відхилити запрошення?",
     "Attachment": "Прикріплення",
-    "Autoplay GIFs and videos": "Автовідтворення GIF і відео",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував/ла %(targetName)s.",
     "Ban": "Заблокувати",
     "Banned users": "Заблоковані користувачі",
-    "Bans user with given id": "Блокує користувача з вказаним ідентифікатором",
-    "Call Timeout": "Час очікування виклика",
+    "Bans user with given id": "Блокує користувача зі вказаним ID",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не вдається підключитись до домашнього серверу - перевірте підключення, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> є довіреним і що розширення браузера не блокує запити.",
-    "Cannot add any more widgets": "Неможливо додати більше віджетів",
     "Change Password": "Змінити пароль",
-    "%(senderName)s changed their profile picture.": "%(senderName)s змінює зображення профілю.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінює рівень повноважень %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінює назву кімнати на %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінює тему на %(topic)s.",
-    "Email": "е-пошта",
+    "Email": "Е-пошта",
     "Email address": "Адреса е-пошти",
     "Failed to send email": "Помилка надсилання електронного листа",
-    "Edit": "Відредагувати",
-    "Unpin Message": "Відкріпити повідомлення",
+    "Edit": "Змінити",
     "Register": "Зареєструватися",
     "Rooms": "Кімнати",
     "Add rooms to this community": "Додати кімнати в цю спільноту",
     "This email address is already in use": "Ця е-пошта вже використовується",
     "This phone number is already in use": "Цей телефонний номер вже використовується",
     "Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
-    "Messages in one-to-one chats": "Повідомлення у балачках віч-на-віч",
+    "Messages in one-to-one chats": "Повідомлення у бесідах віч-на-віч",
     "Send Account Data": "Надіслати дані облікового запису",
-    "Advanced notification settings": "Додаткові налаштування сповіщень",
-    "Uploading report": "Завантаження звіту",
     "Sunday": "Неділя",
     "Guests can join": "Гості можуть приєднуватися",
     "Failed to add tag %(tagName)s to room": "Не вдалось додати до кімнати мітку %(tagName)s",
     "Notification targets": "Цілі сповіщень",
-    "Failed to set direct chat tag": "Не вдалося встановити мітку прямого чату",
+    "Failed to set direct chat tag": "Не вдалося встановити мітку особистої бесіди",
     "Today": "Сьогодні",
-    "You are not receiving desktop notifications": "Ви не отримуєте системні сповіщення",
     "Friday": "П'ятниця",
     "Update": "Оновити",
     "What's New": "Що нового",
@@ -100,66 +78,40 @@
     "Changelog": "Журнал змін",
     "Waiting for response from server": "Очікується відповідь від сервера",
     "Leave": "Вийти",
-    "Send Custom Event": "Відправити приватний захід",
-    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей наразі момент вимкнені.",
-    "Failed to send logs: ": "Не вдалося відправити журнали: ",
-    "Forget": "Забути",
+    "Send Custom Event": "Надіслати не стандартну подію",
+    "Failed to send logs: ": "Не вдалося надіслати журнали: ",
     "World readable": "Відкрито для світу",
-    "You cannot delete this image. (%(code)s)": "Ви не можете видалити це зображення. (%(code)s)",
-    "Cancel Sending": "Скасувати надсилання",
     "Warning": "Попередження",
     "This Room": "Ця кімната",
     "Noisy": "Шумно",
-    "Error saving email notification preferences": "Помилка при збереженні параметрів сповіщень е-поштою",
     "Messages containing my display name": "Повідомлення, що містять моє видиме ім'я",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Пам'ятайте, що ви завжди можете встановити адресу е-пошти у користувацьких налаштуваннях, якщо передумаєте.",
     "Unavailable": "Нема в наявності",
-    "View Decrypted Source": "Переглянути розшифроване джерело",
-    "Failed to update keywords": "Не вдалось оновити ключові слова",
     "remove %(name)s from the directory.": "прибрати %(name)s з каталогу.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Сповіщення з наступних ключових слів дотримуються правил, що не можуть бути показані тут:",
-    "Please set a password!": "Встановіть пароль, будь ласка!",
-    "You have successfully set a password!": "Пароль успішно встановлено!",
-    "An error occurred whilst saving your email notification preferences.": "Під час збереження налаштувань сповіщень е-поштою трапилася помилка.",
     "Explore Room State": "Перегляд статуса кімнати",
-    "Source URL": "Джерельне посилання",
+    "Source URL": "Початкова URL-адреса",
     "Messages sent by bot": "Повідомлення, надіслані ботом",
     "Filter results": "Відфільтрувати результати",
     "Members": "Учасники",
     "No update available.": "Оновлення відсутні.",
     "Resend": "Перенадіслати",
-    "Files": "Файли",
     "Collecting app version information": "Збір інформації про версію застосунка",
-    "Keywords": "Ключові слова",
-    "Enable notifications for this account": "Увімкнути сповіщення для цього облікового запису",
     "Invite to this community": "Запросити в це суспільство",
-    "Messages containing <span>keywords</span>": "Повідомлення, що містять <span>ключові слова</span>",
     "When I'm invited to a room": "Коли мене запрошено до кімнати",
     "Tuesday": "Вівторок",
-    "Enter keywords separated by a comma:": "Введіть ключові слова через кому:",
-    "Forward Message": "Переслати повідомлення",
-    "You have successfully set a password and an email address!": "Пароль та адресу е-пошти успішно встановлено!",
     "Remove %(name)s from the directory?": "Прибрати %(name)s з каталогу?",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s використовує багато новітніх функцій, деякі з яких не доступні або є експериментальними у вашому оглядачі.",
     "Developer Tools": "Інструменти розробника",
-    "Preparing to send logs": "Підготовка до відправки журланлу",
+    "Preparing to send logs": "Приготування до надсилання журланла",
     "Unnamed room": "Неназвана кімната",
     "Explore Account Data": "Переглянути дані облікового запису",
-    "All messages (noisy)": "Усі повідомлення (гучно)",
     "Saturday": "Субота",
-    "I understand the risks and wish to continue": "Я усвідомлюю ризик і бажаю продовжити",
-    "Direct Chat": "Прямий чат",
     "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим",
     "Room not found": "Кімнату не знайдено",
     "Reject": "Відмовитись",
-    "Failed to set Direct Message status of room": "Не вдалося встановити статус прямого спілкування в кімнаті",
     "Monday": "Понеділок",
     "Remove from Directory": "Прибрати з каталогу",
-    "Enable them now": "Увімкнути їх зараз",
     "Toolbox": "Панель інструментів",
     "Collecting logs": "Збір журналів",
     "You must specify an event type!": "Необхідно вказати тип захода!",
-    "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
     "All Rooms": "Усі кімнати",
     "Wednesday": "Середа",
     "You cannot delete this message. (%(code)s)": "Ви не можете видалити це повідомлення. (%(code)s)",
@@ -170,12 +122,9 @@
     "Call invitation": "Запрошення до виклику",
     "Downloading update...": "Завантаженя оновлення…",
     "State Key": "Ключ стану",
-    "Failed to send custom event.": "Не вдалося відправити приватний захід.",
+    "Failed to send custom event.": "Не вдалося надіслати не стандартну подію.",
     "What's new?": "Що нового?",
-    "Notify me for anything else": "Сповіщати мене про будь-що інше",
-    "View Source": "Переглянути джерело",
-    "Can't update user notification settings": "Неможливо оновити налаштування користувацьких сповіщень",
-    "Notify for all other messages/rooms": "Сповіщати щодо всіх повідомлень/кімнат",
+    "View Source": "Переглянути код",
     "Unable to look up room ID from server": "Неможливо знайти ID кімнати на сервері",
     "Couldn't find a matching Matrix room": "Не вдалось знайти відповідну кімнату",
     "Invite to this room": "Запросити до цієї кімнати",
@@ -186,35 +135,22 @@
     "Reply": "Відповісти",
     "Show message in desktop notification": "Показувати повідомлення у стільничних сповіщеннях",
     "Unable to join network": "Неможливо приєднатись до мережі",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Вибачте, ваш оглядач <b>не</b> спроможний запустити %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Завантажено %(date)s користувачем %(user)s",
-    "Messages in group chats": "Повідомлення у групових балачках",
+    "Messages in group chats": "Повідомлення у групових бесідах",
     "Yesterday": "Вчора",
     "Error encountered (%(errorDetail)s).": "Трапилась помилка (%(errorDetail)s).",
     "Low Priority": "Неважливі",
-    "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
-    "Set Password": "Встановити пароль",
     "Off": "Вимкнено",
     "%(brand)s does not know how to join a room on this network": "%(brand)s не знає як приєднатись до кімнати у цій мережі",
-    "Mentions only": "Тільки згадки",
     "Failed to remove tag %(tagName)s from room": "Не вдалося прибрати з кімнати мітку %(tagName)s",
-    "You can now return to your account after signing out, and sign in on other devices.": "Тепер ви можете повернутися до свого облікового запису після виходу з нього, а також зайти з інших пристроїв.",
-    "Enable email notifications": "Увімкнути сповіщення е-поштою",
     "Event Type": "Тип західу",
     "No rooms to show": "Відсутні кімнати для показу",
-    "Download this file": "Звантажити цей файл",
-    "Pin Message": "Прикріпити повідомлення",
-    "Failed to change settings": "Не вдалось змінити налаштування",
-    "Event sent!": "Захід відправлено!",
-    "Unhide Preview": "Відкрити попередній перегляд",
+    "Event sent!": "Подію надіслано!",
     "Event Content": "Зміст заходу",
     "Thank you!": "Дякуємо!",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "У вашому оглядачі вигляд застосунку може бути повністю іншим, а деякі або навіть усі функції можуть не працювати. Якщо ви наполягаєте, то можете продовжити користування, але ви маєте впоратись з усіма можливими проблемами власноруч!",
     "Checking for an update...": "Перевірка оновлень…",
     "Check for update": "Перевірити на наявність оновлень",
     "Reject all %(invitedRooms)s invites": "Відхилити запрошення до усіх %(invitedRooms)s",
     "Profile": "Профіль",
-    "click to reveal": "натисніть щоб побачити",
     "Homeserver is": "Домашній сервер —",
     "The version of %(brand)s": "Версія %(brand)s",
     "Your language of choice": "Обрана мова",
@@ -231,10 +167,6 @@
     "The information being sent to us to help make %(brand)s better includes:": "Відсилана до нас інформація, що допомагає покращити %(brand)s, містить:",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Введіть пароль для захисту експортованого файлу. Щоб розшифрувати файл потрібно буде ввести цей пароль.",
     "Call Failed": "Виклик не вдався",
-    "The remote side failed to pick up": "На ваш дзвінок не змогли відповісти",
-    "Unable to capture screen": "Не вдалось захопити екран",
-    "Existing Call": "Наявний виклик",
-    "You are already in a call.": "Ви вже розмовляєте.",
     "VoIP is unsupported": "VoIP не підтримується",
     "You cannot place VoIP calls in this browser.": "Цей оглядач не підтримує VoIP дзвінки.",
     "You cannot place a call with yourself.": "Ви не можете подзвонити самим собі.",
@@ -266,13 +198,10 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
     "Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Там, де ця сторінка містить ототожненну інформацію, як-от назва кімнати, користувача чи групи, ці дані будуть вилучені перед надсиланням на сервер.",
-    "Call in Progress": "Іде виклик",
-    "A call is currently being placed!": "Зараз іде виклик!",
-    "A call is already in progress!": "Вже здійснюється дзвінок!",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Якщо ця сторінка містить ідентифікаційну інформацію, як-от назва кімнати, користувача або групи, ці дані видаляються перед надсиланням на сервер.",
     "Permission Required": "Потрібен дозвіл",
     "You do not have permission to start a conference call in this room": "У вас немає дозволу, щоб розпочати дзвінок-конференцію в цій кімнаті",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Зверніть увагу: будь-яка людина, яку ви додаєте до спільноти, буде публічно видимою тим, хто знає ідентифікатор спільноти",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Зверніть увагу: будь-яка людина, яку ви додаєте до спільноти, буде видима усім, хто знає ID спільноти",
     "Invite new community members": "Запросити до спільноти",
     "Invite to Community": "Запросити до спільноти",
     "Which rooms would you like to add to this community?": "Які кімнати ви хочете додати до цієї спільноти?",
@@ -287,15 +216,14 @@
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s не має дозволу надсилати сповіщення — будь ласка, спробуйте ще раз",
     "Unable to enable Notifications": "Не вдалося увімкнути сповіщення",
     "This email address was not found": "Не знайдено адресу електронної пошти",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Схоже, ваша адреса електронної пошти не пов'язана з жодним ідентифікатор Matrix на цьому домашньому сервері.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Схоже, ваша адреса е-пошти не пов'язана з жодним Matrix ID на цьому домашньому сервері.",
     "Restricted": "Обмежено",
     "Moderator": "Модератор",
     "Failed to invite": "Не вдалося запросити",
-    "Failed to invite the following users to the %(roomName)s room:": "Не вдалося запросити таких користувачів до кімнати %(roomName)s:",
     "You need to be logged in.": "Вам потрібно увійти.",
     "You need to be able to invite users to do that.": "Щоб це зробити, вам необхідно мати можливість запрошувати людей.",
-    "Unable to create widget.": "Неможливо створити віджет.",
-    "Missing roomId.": "Бракує ідентифікатора кімнати.",
+    "Unable to create widget.": "Неможливо створити розширення.",
+    "Missing roomId.": "Бракує ID кімнати.",
     "Failed to send request.": "Не вдалося надіслати запит.",
     "This room is not recognised.": "Кімнату не знайдено.",
     "Power level must be positive integer.": "Рівень повноважень мусить бути додатним цілим числом.",
@@ -305,13 +233,10 @@
     "Room %(roomId)s not visible": "Кімната %(roomId)s не видима",
     "Missing user_id in request": "У запиті пропущено user_id",
     "Usage": "Використання",
-    "Searches DuckDuckGo for results": "Здійснює пошук через DuckDuckGo",
-    "/ddg is not a command": "/ddg — це не команда",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Щоб цим скористатися, просто почекайте на підказки доповнення й перемикайтеся між ними клавішею TAB.",
     "Changes your display nickname": "Змінює ваш нік",
-    "Invites user with given id to current room": "Запрошує користувача з вказаним ідентифікатором до кімнати",
-    "Leave room": "Залишити кімнату",
-    "Kicks user with given id": "Викидає з кімнати користувача з вказаним ідентифікатором",
+    "Invites user with given id to current room": "Запрошує користувача зі вказаним ID до кімнати",
+    "Leave room": "Вийти з кімнати",
+    "Kicks user with given id": "Викидає з кімнати користувача зі вказаним ID",
     "Ignores a user, hiding their messages from you": "Ігнорує користувача, приховуючи його повідомлення від вас",
     "Ignored user": "Зігнорований користувач",
     "You are now ignoring %(userId)s": "Ви ігноруєте %(userId)s",
@@ -319,35 +244,15 @@
     "Unignored user": "Припинено ігнорування користувача",
     "You are no longer ignoring %(userId)s": "Ви більше не ігноруєте %(userId)s",
     "Define the power level of a user": "Вказати рівень повноважень користувача",
-    "Deops user with given id": "Знімає права оператора з користувача з вказаним ідентифікатором",
+    "Deops user with given id": "Знімає права оператора з користувача зі вказаним ID",
     "Opens the Developer Tools dialog": "Відкриває вікно інструментів розробника",
     "Verified key": "Звірений ключ",
-    "Displays action": "Відбиває дію",
+    "Displays action": "Показ дій",
     "Reason": "Причина",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s бажає розпочати дзвінок-конференцію.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s запрошує %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s змінює своє видиме ім'я на %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s зазначив(-ла) своє видиме ім'я: %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s видалив(-ла) своє видиме ім'я (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s вилучає зображення свого профілю.",
-    "%(senderName)s set a profile picture.": "%(senderName)s встановлює зображення профілю.",
-    "VoIP conference started.": "Розпочато дзвінок-конференцію.",
-    "%(targetName)s joined the room.": "%(targetName)s приєднується до кімнати.",
-    "VoIP conference finished.": "Дзвінок-конференцію завершено.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s відкинув/ла запрошення.",
-    "%(targetName)s left the room.": "%(targetName)s залишає кімнату.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s розблокував/ла %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s викинув/ла %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s відкликав/ла запрошення %(targetName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s надіслав(-ла) зображення.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s призначив(-ла) основну адресу цієї кімнати: %(address)s.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s прибрав(-ла) основу адресу цієї кімнати.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s встановлює основною адресою цієї кімнати %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s вилучає основу адресу цієї кімнати.",
     "Someone": "Хтось",
-    "(not supported by this browser)": "(не підтримується цією веб-переглядачкою)",
-    "(could not connect media)": "(не можливо під'єднати медіа)",
-    "(no answer)": "(немає відповіді)",
-    "(unknown failure: %(reason)s)": "(невідома помилка: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s завершує дзвінок.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s надіслав(-ла) запрошення %(targetDisplayName)s приєднатися до кімнати.",
     "Show developer tools": "Показувати розробницькі засоби",
     "Default": "Типово",
@@ -357,10 +262,10 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s зробив(-ла) майбутню історію кімнати видимою для всіх.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s зробив(-ла) майбутню історію видимою для невідомого значення (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s з %(fromPowerLevel)s до %(toPowerLevel)s",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінює приколоті повідомлення у кімнаті.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s змінює знадіб %(widgetName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s додав(-ла) знадіб %(widgetName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив(-ла) знадіб %(widgetName)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінює прикріплені повідомлення у кімнаті.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s змінює розширення %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s додає розширення %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучає розширення %(widgetName)s",
     "Failure to create room": "Не вдалося створити кімнату",
     "Server may be unavailable, overloaded, or you hit a bug.": "Сервер може бути недоступний, перевантажений, або ж ви натрапили на ваду.",
     "Unnamed Room": "Кімната без назви",
@@ -376,7 +281,6 @@
     "Failed to join room": "Не вдалося приєднатися до кімнати",
     "Message Pinning": "Закріплені повідомлення",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показувати час у 12-годинному форматі (напр. 2:30 пп)",
-    "Always show encryption icons": "Завжди показувати значки шифрування",
     "Enable automatic language detection for syntax highlighting": "Показувати автоматичне визначення мови для підсвічування синтаксису",
     "Automatically replace plain text Emoji": "Автоматично замінювати простотекстові емодзі",
     "Mirror local video feed": "Показувати локальне відео віддзеркалено",
@@ -384,19 +288,15 @@
     "Enable inline URL previews by default": "Увімкнути вбудований перегляд гіперпосилань за умовчанням",
     "Enable URL previews for this room (only affects you)": "Увімкнути попередній перегляд гіперпосилань в цій кімнаті (стосується тільки вас)",
     "Enable URL previews by default for participants in this room": "Увімкнути попередній перегляд гіперпосилань за умовчанням для учасників цієї кімнати",
-    "Room Colour": "Колір кімнати",
-    "Incoming voice call from %(name)s": "Вхідний дзвінок від %(name)s",
-    "Incoming video call from %(name)s": "Вхідний відеодзвінок від %(name)s",
-    "Incoming call from %(name)s": "Вхідний дзвінок від %(name)s",
     "Decline": "Відхилити",
     "Incorrect verification code": "Неправильний код перевірки",
     "Submit": "Надіслати",
     "Phone": "Телефон",
-    "Failed to upload profile picture!": "Не вдалося відвантажити зображення профілю!",
-    "Upload new:": "Відвантажити нову:",
-    "No display name": "Немає видимого імені",
+    "Failed to upload profile picture!": "Не вдалося вивантажити зображення профілю!",
+    "Upload new:": "Вивантажити нове:",
+    "No display name": "Немає показуваного імені",
     "New passwords don't match": "Нові паролі не збігаються",
-    "Passwords can't be empty": "Пароль не може бути пустим",
+    "Passwords can't be empty": "Пароль не може бути порожнім",
     "Export E2E room keys": "Експортувати ключі наскрізного шифрування кімнат",
     "Do you want to set an email address?": "Бажаєте вказати адресу е-пошти?",
     "Current password": "Поточний пароль",
@@ -404,20 +304,11 @@
     "New Password": "Новий пароль",
     "Confirm password": "Підтвердження пароля",
     "Last seen": "Востаннє в мережі",
-    "Failed to set display name": "Не вдалося зазначити видиме ім'я",
-    "The maximum permitted number of widgets have already been added to this room.": "Максимально дозволену кількість віджетів уже додано до цієї кімнати.",
-    "Drop File Here": "Киньте файл сюди",
-    "Drop file here to upload": "Киньте файл сюди, щоб відвантажити",
-    " (unsupported)": " (не підтримується)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Приєднатися <voiceText>голосом</voiceText> або <videoText>відео</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Триває дзвінок-конференція%(supportedText)s.",
+    "Failed to set display name": "Не вдалося вказати показуване ім'я",
+    "Drop file here to upload": "Перетягніть сюди файл, щоб вивантажити",
     "This event could not be displayed": "Неможливо показати цю подію",
-    "%(senderName)s sent an image": "%(senderName)s надіслав/ла зображення",
-    "%(senderName)s sent a video": "%(senderName)s надіслав/ла відео",
-    "%(senderName)s uploaded a file": "%(senderName)s надіслав/ла файл",
     "Options": "Параметри",
     "Key request sent.": "Запит ключа надіслано.",
-    "Please select the destination room for this message": "Будь ласка, виберіть кімнату, куди потрібно надіслати це повідомлення",
     "Disinvite": "Скасувати запрошення",
     "Kick": "Викинути",
     "Disinvite this user?": "Скасувати запрошення для цього користувача?",
@@ -432,9 +323,9 @@
     "Demote": "Знизити рівень прав",
     "Failed to mute user": "Не вдалося заглушити користувача",
     "Failed to change power level": "Не вдалося змінити рівень повноважень",
-    "Chat with %(brand)s Bot": "Балачка з %(brand)s-ботом",
+    "Chat with %(brand)s Bot": "Бесіда з %(brand)s-ботом",
     "Whether or not you're logged in (we don't record your username)": "Незалежно від того, увійшли ви чи ні (ми не записуємо ваше ім'я користувача)",
-    "The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не вийшло відвантажити.",
+    "The file '%(fileName)s' failed to upload.": "Не вдалося вивантажити файл '%(fileName)s'.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Файл '%(fileName)s' перевищує ліміт розміру для відвантажень домашнього сервера",
     "The server does not support the room version specified.": "Сервер не підтримує вказану версію кімнати.",
     "Add Email Address": "Додати адресу е-пошти",
@@ -445,7 +336,7 @@
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Також ви можете спробувати використати публічний сервер <code>turn.matrix.org</code>, але це буде не настільки надійно, а також цей сервер матиме змогу бачити вашу IP-адресу. Ви можете керувати цим у налаштуваннях.",
     "Try using turn.matrix.org": "Спробуйте використати turn.matrix.org",
     "Replying With Files": "Відповісти файлами",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете відвантажити цей файл без відповіді?",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти з файлом. Хочете вивантажити цей файл без відповіді?",
     "Name or Matrix ID": "Імʼя або Matrix ID",
     "Identity server has no terms of service": "Сервер ідентифікації не має умов надання послуг",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Щоб підтвердити адресу е-пошти або телефон ця дія потребує доступу до типового серверу ідентифікації <server />, але сервер не має жодних умов надання послуг.",
@@ -457,7 +348,7 @@
     "Actions": "Дії",
     "Other": "Інше",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Додає ¯\\_(ツ)_/¯ на початку текстового повідомлення",
-    "Sends a message as plain text, without interpreting it as markdown": "Надсилає повідомлення як чистий текст, не використовуючи markdown",
+    "Sends a message as plain text, without interpreting it as markdown": "Надсилає повідомлення у вигляді звичайного тексту, не інтерпретуючи його як розмітку",
     "Upgrades a room to a new version": "Покращує кімнату до нової версії",
     "You do not have the required permissions to use this command.": "Вам бракує дозволу на використання цієї команди.",
     "<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> Ми опублікуємо посилання на нову кімнату у старій версії кімнати, а учасники мають власноруч клацнути це посилання, щоб приєднатися до нової кімнати.",
@@ -470,16 +361,16 @@
     "Sets the room name": "Встановлює назву кімнати",
     "Use an identity server": "Використовувати сервер ідентифікації",
     "Use an identity server to invite by email. Manage in Settings.": "Використовувати сервер ідентифікації для запрошень через е-пошту. Керуйте у налаштуваннях.",
-    "Unbans user with given ID": "Розблоковує користувача з вказаним ідентифікатором",
-    "Adds a custom widget by URL to the room": "Додає власний віджет до кімнати за посиланням",
-    "Please supply a https:// or http:// widget URL": "Вкажіть посилання на віджет — https:// або http://",
-    "You cannot modify widgets in this room.": "Ви не можете змінювати віджети у цій кімнаті.",
+    "Unbans user with given ID": "Розблоковує користувача зі вказаним ID",
+    "Adds a custom widget by URL to the room": "Додає власне розширення до кімнати за посиланням",
+    "Please supply a https:// or http:// widget URL": "Вкажіть посилання на розширення — https:// або http://",
+    "You cannot modify widgets in this room.": "Ви не можете змінювати розширення у цій кімнаті.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Примусово відкидає поточний вихідний груповий сеанс у зашифрованій кімнаті",
     "Sends the given message coloured as a rainbow": "Надсилає вказане повідомлення, розфарбоване веселкою",
     "Your %(brand)s is misconfigured": "Ваш %(brand)s налаштовано неправильно",
     "Join the discussion": "Приєднатися до обговорення",
-    "Upload": "Обрати",
-    "Upload file": "Відвантажити файл",
+    "Upload": "Вивантажити",
+    "Upload file": "Вивантажити файл",
     "Send an encrypted message…": "Надіслати зашифроване повідомлення…",
     "The conversation continues here.": "Розмова триває тут.",
     "This room has been replaced and is no longer active.": "Ця кімната була замінена і не є активною.",
@@ -496,63 +387,52 @@
     "Clear Storage and Sign Out": "Очистити сховище та вийти",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очищення сховища вашого переглядача може усунути проблему, але воно виведе вас з системи та зробить непрочитною історію ваших зашифрованих листувань.",
     "Verification Pending": "Очікується перевірка",
-    "Upload files (%(current)s of %(total)s)": "Відвантажити файли (%(current)s з %(total)s)",
-    "Upload files": "Відвантажити файли",
-    "Upload all": "Відвантажити всі",
+    "Upload files (%(current)s of %(total)s)": "Вивантажити файли (%(current)s з %(total)s)",
+    "Upload files": "Вивантажити файли",
+    "Upload all": "Вивантажити всі",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Файл <b>є надто великим</b> для відвантаження. Допустимий розмір файлів — %(limit)s, але цей файл займає %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Ці файли є <b>надто великими</b> для відвантаження. Допустимий розмір файлів — %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Деякі файли є <b>надто великими</b> для відвантаження. Допустимий розмір файлів — %(limit)s.",
-    "Upload %(count)s other files|other": "Відвантажити %(count)s інших файли(ів)",
-    "Upload Error": "Помилка відвантаження",
-    "Failed to upload image": "Не вдалось відвантажити зображення",
-    "Upload avatar": "Завантажити аватар",
-    "For security, this session has been signed out. Please sign in again.": "З метою безпеки вашу сесію було завершено. Зайдіть, будь ласка, знову.",
-    "Upload an avatar:": "Завантажити аватар:",
+    "Upload %(count)s other files|other": "Вивантажити %(count)s інших файлів",
+    "Upload Error": "Помилка вивантаження",
+    "Failed to upload image": "Не вдалось вивантажити зображення",
+    "Upload avatar": "Вивантажити аватар",
+    "For security, this session has been signed out. Please sign in again.": "З метою безпеки ваш сеанс було завершено. Увійдіть знову.",
     "Custom (%(level)s)": "Власний (%(level)s)",
     "Error upgrading room": "Помилка оновлення кімнати",
     "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще.",
     "Liberate your communication": "Вивільни своє спілкування",
     "Send a Direct Message": "Надіслати особисте повідомлення",
     "Explore Public Rooms": "Дослідити прилюдні кімнати",
-    "Create a Group Chat": "Створити групову балачку",
-    "Explore": "Дослідити",
+    "Create a Group Chat": "Створити групову бесіду",
     "Filter": "Фільтрувати",
-    "Filter rooms…": "Фільтрувати кімнати…",
     "Failed to reject invitation": "Не вдалось відхилити запрошення",
     "This room is not public. You will not be able to rejoin without an invite.": "Ця кімната не є прилюдною. Ви не зможете перепід'єднатись без запрошення.",
-    "Failed to leave room": "Не вдалось залишити кімнату",
-    "Can't leave Server Notices room": "Неможливо залишити кімнату Оголошення Сервера",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ця кімната використовується для важливих повідомлень з домашнього сервера, тож ви не можете її залишити.",
+    "Can't leave Server Notices room": "Неможливо вийти з кімнати сповіщень сервера",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ця кімната використовується для важливих повідомлень з домашнього сервера, тож ви не можете з неї вийти.",
     "Use Single Sign On to continue": "Використати Single Sign On для продовження",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Підтвердьте додавання цієї адреси е-пошти через використання Single Sign On аби довести вашу ідентичність.",
     "Single Sign On": "Єдиний вхід",
     "Confirm adding email": "Підтвердити додавання е-пошти",
-    "Click the button below to confirm adding this email address.": "Клацніть на кнопці нижче щоб підтвердити додавання цієї адреси е-пошти.",
+    "Click the button below to confirm adding this email address.": "Клацніть на кнопку внизу, щоб підтвердити додавання цієї адреси е-пошти.",
     "Confirm": "Підтвердити",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Підтвердьте додавання цього телефонного номера через використання Single Sign On аби довести вашу ідентичність.",
     "Confirm adding phone number": "Підтвердьте додавання телефонного номера",
-    "Click the button below to confirm adding this phone number.": "Клацніть на кнопці нижче щоб підтвердити додавання цього телефонного номера.",
+    "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 як встановлений Progressive Web App",
     "Your user agent": "Ваш user agent",
-    "If you cancel now, you won't complete verifying the other user.": "Якщо ви скасуєте зараз, то не завершите звіряння іншого користувача.",
-    "If you cancel now, you won't complete verifying your other session.": "Якщо ви скасуєте зараз, то не завершите звіряння вашої іншої сесії.",
-    "If you cancel now, you won't complete your operation.": "Якщо ви скасуєте зараз, то не завершите вашу дію.",
     "Cancel entering passphrase?": "Скасувати введення парольної фрази?",
     "Enter passphrase": "Введіть парольну фразу",
     "Setting up keys": "Налаштовування ключів",
-    "Verify this session": "Звірити цю сесію",
+    "Verify this session": "Звірити цей сеанс",
     "Sign In or Create Account": "Увійти або створити обліковий запис",
-    "Use your account or create a new one to continue.": "Скористайтесь вашим обліковим записом або створіть нову, щоб продовжити.",
+    "Use your account or create a new one to continue.": "Скористайтесь вашим обліковим записом або створіть новий, щоб продовжити.",
     "Create Account": "Створити обліковий запис",
     "Sign In": "Увійти",
-    "Verify all your sessions to ensure your account & messages are safe": "Звірте усі ваші сеанси, аби переконатись, що ваш обліковий запис і повідомлення у безпеці",
     "Later": "Пізніше",
     "Review": "Переглянути",
-    "Verify yourself & others to keep your chats safe": "Верифікуйте себе й інших щоб зберегти ваше спілкування у безпеці",
     "Verify": "Звірити",
-    "Verify the new login accessing your account: %(name)s": "Звірити новий вхід, що доступається до вашого облікового запису: %(name)s",
-    "From %(deviceName)s (%(deviceId)s)": "Від %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Відхилити (%(counter)s)",
     "Language and region": "Мова та регіон",
     "Account management": "Керування обліковим записом",
@@ -562,15 +442,13 @@
     "Legal": "Правова інформація",
     "Credits": "Подяки",
     "For help with using %(brand)s, click <a>here</a>.": "Якщо необхідна допомога у користуванні %(brand)s'ом, клацніть <a>тут</a>.",
-    "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> або розпочніть балачку з нашим ботом, клацнувши на кнопці нижче.",
+    "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> або розпочніть бесіду з нашим ботом, клацнувши на кнопку внизу.",
     "Join the conversation with an account": "Приєднатись до бесіди з обліковим записом",
-    "Unable to restore session": "Неможливо відновити сесію",
-    "We encountered an error trying to restore your previous session.": "Ми натрапили на помилку, намагаючись відновити вашу попередню сесію.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, або <safariLink>Safari</safariLink>.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Ваш обліковий запис має перехресно-підписувану ідентичність у таємному сховищі, але вона ще не є довіреною у цій сесії.",
+    "Unable to restore session": "Не вдалося відновити сеанс",
+    "We encountered an error trying to restore your previous session.": "Ми натрапили на помилку, намагаючись відновити ваш попередній сеанс.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Ваш обліковий запис має перехресне підписування особи у таємному сховищі, але цей сеанс йому ще не довіряє.",
     "in account data": "у даних облікового запису",
     "Clear notifications": "Очистити сповіщення",
-    "Add an email address to configure email notifications": "Додати адресу е-пошти для налаштування поштових сповіщень",
     "Theme added!": "Тему додано!",
     "Email addresses": "Адреси е-пошти",
     "Phone numbers": "Номери телефонів",
@@ -578,24 +456,19 @@
     "Forget this room": "Забути цю кімнату",
     "Re-join": "Перепід'єднатись",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Це запрошення до %(roomName)s було надіслане на %(email)s, яка не пов'язана з вашим обліковим записом",
-    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Зв'яжіть цю е-пошту з вашим обліковим записом у Налаштуваннях щоб отримувати сповіщення прямо у %(brand)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": "Це запрошення до %(roomName)s було надіслане на %(email)s",
-    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Використовувати сервер ідентифікації у Налаштуваннях щоб отримувати запрошення прямо у %(brand)s.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Використовувати сервер ідентифікації у Налаштуваннях, щоб отримувати запрошення безпосередньо в %(brand)s.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Ви впевнені у тому, що бажаєте знедіяти ваш обліковий запис? Ця дія безповоротна.",
     "Confirm account deactivation": "Підтвердьте знедіювання облікового запису",
     "To continue, please enter your password:": "Щоб продовжити, введіть, будь ласка, ваш пароль:",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ваш обліковий запис стане назавжди невикористовним. Ви не матимете змоги увійти в нього і ніхто не зможе перереєструватись під цим користувацьким ID. Це призведе до виходу вашого облікового запису з усіх кімнат та до видалення деталей вашого облікового запису з вашого серверу ідентифікації. <b>Ця дія є безповоротною.</b>",
-    "Verify session": "Звірити сесію",
-    "Session name": "Назва сесії",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ви більше ніколи не зможете скористатися цим обліковим записом. Ви не зможете ввійти в нього і ніхто не зможе перереєструватись за цим користувацьким ID. Це призведе до виходу вашого облікового запису з усіх кімнат та до вилучення подробиць вашого облікового запису з вашого сервера ідентифікації. <b>Ця дія є безповоротною.</b>",
+    "Verify session": "Звірити сеанс",
+    "Session name": "Назва сеансу",
     "Session ID": "ID сеансу",
     "Session key": "Ключ сеансу",
-    "%(count)s of your messages have not been sent.|one": "Ваше повідомлення не було надіслано.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Перенадіслати усе</resendText> або <cancelText>скасувати усе</cancelText> зараз. Ви також можете перенадіслати або скасувати окремі повідомлення.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Перенадіслати повідомлення</resendText> або <cancelText>скасувати повідомлення</cancelText> зараз.",
     "Connectivity to the server has been lost.": "З'єднання з сервером було втрачено.",
     "Sent messages will be stored until your connection has returned.": "Надіслані повідомлення будуть збережені поки не з'явиться зв'язок.",
-    "Active call": "Активний виклик",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Тут нікого нема! Ви б хотіли <inviteText>запросити інших</inviteText> чи краще <nowarnText>припинити попереджати про порожню кімнату</nowarnText>?",
     "Jump to first unread room.": "Перейти до першої непрочитаної кімнати.",
     "Jump to first invite.": "Перейти до першого запрошення.",
     "Add room": "Додати кімнату",
@@ -609,7 +482,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Ви маєте %(count)s непрочитаних сповіщень у попередній версії цієї кімнати.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "У вас %(count)s непрочитане сповіщення у попередній версії цієї кімнати.",
     "Deactivate user?": "Знедіяти користувача?",
-    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Знедіювання цього користувача виведе їх з системи й унеможливить вхід у майбутньому. До того ж, вони залишать усі кімнати, в яких перебувають. Ця дія є безповоротною. Ви впевнені, що хочете знедіяти цього користувача?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Знедіювання цього користувача виведе їх з системи й унеможливить вхід у майбутньому. До того ж вони вийдуть з усіх кімнат, у яких перебувають. Ця дія є безповоротною. Ви впевнені, що хочете знедіяти цього користувача?",
     "Deactivate user": "Знедіяти користувача",
     "Failed to deactivate user": "Не вдалось знедіяти користувача",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Знедіювання вашого облікового запису <b>типово не призводить до забуття надісланих вами повідомлень.</b> Якщо ви бажаєте, щоб ми забули ваші повідомлення, поставте прапорець внизу.",
@@ -619,32 +492,25 @@
     "Go Back": "Назад",
     "Room name or address": "Назва та адреса кімнати",
     "%(name)s is requesting verification": "%(name)s робить запит на звірення",
-    "Use your account to sign in to the latest version": "Увійдіть до останньої версії через свій обліковий запис",
-    "We’re excited to announce Riot is now Element": "Ми раді повідомити, що Riot тепер називається Element",
-    "Riot is now Element!": "Riot тепер - Element!",
-    "Learn More": "Дізнатися більше",
     "Command error": "Помилка команди",
-    "Sends a message as html, without interpreting it as markdown": "Надсилає повідомлення як HTML, не інтерпритуючи Markdown",
+    "Sends a message as html, without interpreting it as markdown": "Надсилає повідомлення у вигляді HTML, не інтерпретуючи його як розмітку",
     "Failed to set topic": "Не вдалося встановити тему",
     "Once enabled, encryption cannot be disabled.": "Після увімкнення шифрування не можна буде вимкнути.",
-    "Please enter verification code sent via text.": "Будь ласка, введіть звірювальний код, відправлений у текстовому повідомленні.",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Текстове повідомлення було відправлено на номер +%(msisdn)s. Будь ласка, введіть звірювальний код, який воно містить.",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Повідомлення у цій кімнаті захищені наскрізним шифруванням. Тільки ви та одержувачі мають ключі для прочитання цих повідомлень.",
-    "Messages in this room are end-to-end encrypted.": "Повідомлення у цій кімнаті наскрізно зашифровані.",
+    "Please enter verification code sent via text.": "Введіть код перевірки, надісланий у текстовому повідомленні.",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Текстове повідомлення надіслано на номер +%(msisdn)s. Введіть код перевірки з нього.",
+    "Messages in this room are end-to-end encrypted.": "Повідомлення у цій кімнаті захищено наскрізним шифруванням.",
     "Messages in this room are not end-to-end encrypted.": "Повідомлення у цій кімнаті не захищено наскрізним шифруванням.",
     "Encryption enabled": "Шифрування увімкнено",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Повідомлення у цій кімнаті наскрізно зашифровані. Дізнайтеся більше та звіртеся з цим користувачем через його профіль.",
-    "You sent a verification request": "Ви відправили звірювальний запит",
+    "You sent a verification request": "Ви надіслали запит перевірки",
     "Direct Messages": "Особисті повідомлення",
     "Room Settings - %(roomName)s": "Налаштування кімнати - %(roomName)s",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "Ми відправимо перевіряльний електронний лист до вас для підтвердження зміни пароля.",
-    "To return to your account in future you need to set a password": "Щоб повернутися до своєї обліківки в майбутньому, вам потрібно встановити пароль",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Ми надішлемо вам електронний лист перевірки для підтвердження зміни пароля.",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Використовувати сервер ідентифікації, щоб запрошувати через е-пошту. Натисніть \"Продовжити\", щоб використовувати типовий сервер ідентифікації (%(defaultIdentityServerName)s) або змініть його у налаштуваннях.",
     "Joins room with given address": "Приєднатися до кімнати зі вказаною адресою",
     "Unrecognised room address:": "Невпізнана адреса кімнати:",
     "Command failed": "Не вдалося виконати команду",
     "Could not find user in room": "Не вдалося знайти користувача в кімнаті",
-    "Please supply a widget URL or embed code": "Вкажіть URL або код вставки віджету",
+    "Please supply a widget URL or embed code": "Вкажіть URL або код вбудовування розширення",
     "Verifies a user, session, and pubkey tuple": "Звіряє користувача, сеанс та кортеж відкритого ключа",
     "Unknown (user, session) pair:": "Невідома пара (користувача, сеансу):",
     "Session already verified!": "Сеанс вже підтверджений!",
@@ -653,11 +519,10 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Наданий вами ключ підпису збігається з ключем підпису, що ви отримали від сеансу %(deviceId)s %(userId)s. Сеанс позначено як звірений.",
     "Sends the given emote coloured as a rainbow": "Надсилає вказаний смайлик, розфарбований веселкою",
     "Displays list of commands with usages and descriptions": "Відбиває перелік команд із прикладами вжитку та описом",
-    "Displays information about a user": "Відбиває інформацію про користувача",
+    "Displays information about a user": "Показує відомості про користувача",
     "Send a bug report with logs": "Надіслати звіт про ваду разом з журналами",
-    "Opens chat with the given user": "Відкриває балачку з вказаним користувачем",
+    "Opens chat with the given user": "Відкриває бесіду з вказаним користувачем",
     "Sends a message to the given user": "Надсилає повідомлення вказаному користувачеві",
-    "%(senderName)s made no change.": "%(senderName)s не запровадив(-ла) жодних змін.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s змінює назву кімнати з %(oldRoomName)s на %(newRoomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s поліпшив(-ла) цю кімнату.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s зробив(-ла) кімнату відкритою для всіх, хто знає посилання.",
@@ -668,37 +533,37 @@
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s змінює гостьовий доступ на \"%(rule)s\"",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s увімкнув(-ла) значок для %(groups)s у цій кімнаті.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s вимкнув(-ла) значок для %(groups)s в цій кімнаті.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s прибрав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s прибрав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s змінює альтернативні адреси для цієї кімнати.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s змінює головні та альтернативні адреси для цієї кімнати.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s змінює адреси для цієї кімнати.",
-    "%(senderName)s placed a voice call.": "%(senderName)s розпочав(-ла) голосовий виклик.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s розпочав(-ла) голосовий виклик. (не підтримується цим переглядачем)",
-    "%(senderName)s placed a video call.": "%(senderName)s розпочав(-ла) відеовиклик.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s розпочав(-ла) відеовиклик. (не підтримується цим переглядачем)",
+    "%(senderName)s placed a voice call.": "%(senderName)s розпочинає голосовий виклик.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s розпочинає голосовий виклик. (не підтримується цим переглядачем)",
+    "%(senderName)s placed a video call.": "%(senderName)s розпочинає відеовиклик.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s розпочинає відеовиклик. (не підтримується цим переглядачем)",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s відкликав(-ла) запрошення %(targetDisplayName)s приєднання до кімнати.",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування користувачів зі збігом з %(glob)s",
-    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування кімнат зі збігом з %(glob)s",
-    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування серверів зі збігом з %(glob)s",
-    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s видалив(-ла) правило блокування зі збігом з %(glob)s",
-    "%(senderName)s updated an invalid ban rule": "%(senderName)s оновив(-ла) хибне правило блокування",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування серверів зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s оновив(-ла) правило блокування зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування серверів зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s вилучає правило заборони користувачів зі збігом з %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s вилучає правило блокування кімнат зі збігом з %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s вилучає правило блокування серверів зі збігом з %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s вилучає правило блокування зі збігом з %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s оновлює хибне правило блокування",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування серверів зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s оновлює правило блокування зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування користувачів зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування кімнат зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування серверів зі збігом з %(glob)s через %(reason)s",
     "Light": "Світла",
     "Dark": "Темна",
     "You signed in to a new session without verifying it:": "Ви увійшли в новий сеанс, не підтвердивши його:",
     "Verify your other session using one of the options below.": "Перевірте інший сеанс за допомогою одного із варіантів знизу.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) починає новий сеанс без його підтвердження:",
-    "Ask this user to verify their session, or manually verify it below.": "Попросіть цього користувача підтвердити сесію, або підтвердіть її власноруч нижче.",
-    "Not Trusted": "Недовірене",
+    "Ask this user to verify their session, or manually verify it below.": "Попросіть цього користувача підтвердити сеанс, або підтвердьте його власноруч унизу.",
+    "Not Trusted": "Не довірений",
     "Manually Verify by Text": "Ручна перевірка за допомогою тексту",
     "Interactively verify by Emoji": "Інтерактивно звірити за допомогою емодзі",
     "Done": "Зроблено",
@@ -711,7 +576,6 @@
     "No homeserver URL provided": "URL адресу домашнього сервера не вказано",
     "Unexpected error resolving homeserver configuration": "Неочікувана помилка в налаштуваннях домашнього серверу",
     "Unexpected error resolving identity server configuration": "Незрозуміла помилка при розборі параметру сервера ідентифікації",
-    "The message you are trying to send is too large.": "Ваше повідомлення було занадто велике.",
     "%(items)s and %(count)s others|other": "%(items)s та ще %(count)s учасників",
     "%(items)s and %(count)s others|one": "%(items)s і ще хтось",
     "a few seconds ago": "Декілька секунд тому",
@@ -723,7 +587,7 @@
     "a few seconds from now": "декілька секунд тому",
     "about a minute from now": "приблизно через хвилинку",
     "%(num)s minutes from now": "%(num)s хвилин по тому",
-    "about an hour from now": "приблизно через годинку",
+    "about an hour from now": "приблизно через годину",
     "%(num)s hours from now": "%(num)s годин по тому",
     "about a day from now": "приблизно через день",
     "%(num)s days from now": "%(num)s днів по тому",
@@ -731,7 +595,7 @@
     "You do not have permission to invite people to this room.": "У вас немає прав запрошувати людей у цю кімнату.",
     "User %(userId)s is already in the room": "Користувач %(userId)s вже перебуває в кімнаті",
     "User %(user_id)s does not exist": "Користувача %(user_id)s не існує",
-    "The user must be unbanned before they can be invited.": "Користувач має бути розблокованим(ою), перед тим як може бути запрошений(ая).",
+    "The user must be unbanned before they can be invited.": "Потрібно розблокувати користувача перед тим як їх можна буде запросити.",
     "The user's homeserver does not support the version of the room.": "Домашній сервер користувача не підтримує версію кімнати.",
     "Unknown server error": "Невідома помилка з боку сервера",
     "Use a few words, avoid common phrases": "Використовуйте декілька слів, уникайте звичайних фраз",
@@ -760,30 +624,21 @@
     "Straight rows of keys are easy to guess": "Прямі ради клавіш легко вгадувані",
     "Short keyboard patterns are easy to guess": "Короткі клавіатурні шаблони легко вгадувані",
     "Help us improve %(brand)s": "Допоможіть нам покращити %(brand)s",
-    "I want to help": "Я хочу допомогти",
     "No": "НІ",
-    "Review where you’re logged in": "Перевірте, де ви ввійшли",
     "Your homeserver has exceeded its user limit.": "Ваш домашній сервер перевищив свій ліміт користувачів.",
-    "Your homeserver has exceeded one of its resource limits.": "Ваш домашній сервер перевищив один із своїх ресурсних лімітів.",
-    "Contact your <a>server admin</a>.": "Зверніться до <a>адміністратора серверу</a>.",
+    "Your homeserver has exceeded one of its resource limits.": "Ваш домашній сервер перевищив одне із своїх обмежень ресурсів.",
+    "Contact your <a>server admin</a>.": "Зверніться до <a>адміністратора сервера</a>.",
     "Ok": "Гаразд",
-    "Set password": "Встановити пароль",
-    "Set up encryption": "Налаштування шифрування",
     "Encryption upgrade available": "Доступне поліпшене шифрування",
     "Set up": "Налаштувати",
     "Upgrade": "Поліпшити",
     "Other users may not trust it": "Інші користувачі можуть не довіряти цьому",
     "New login. Was this you?": "Новий вхід у вашу обліківку. Це були Ви?",
-    "Restart": "Перезапустити",
-    "Upgrade your %(brand)s": "Оновіть ваш %(brand)s",
-    "A new version of %(brand)s is available!": "Нова версія %(brand)s вже доступна!",
     "Guest": "Гість",
     "There was an error joining the room": "Помилка при вході в кімнату",
     "You joined the call": "Ви приєднались до виклику",
     "%(senderName)s joined the call": "%(senderName)s приєднується до виклику",
     "Call in progress": "Дзвінок у процесі",
-    "You left the call": "Ви припинили розмову",
-    "%(senderName)s left the call": "%(senderName)s покинув(ла) дзвінок",
     "Call ended": "Дзвінок завершено",
     "You started a call": "Ви почали дзвінок",
     "%(senderName)s started a call": "%(senderName)s почав(ла) дзвінок",
@@ -795,11 +650,9 @@
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Custom user status messages": "користувацький статус",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Групувати та фільтрувати кімнати за нетиповими наличками (оновіть, щоб застосувати зміни)",
-    "Multiple integration managers": "Декілька менджерів інтеграції",
     "Try out new ways to ignore people (experimental)": "Спробуйте нові способи ігнорувати людей (експериментальні)",
     "Support adding custom themes": "Підтримка користувацьких тем",
-    "Enable advanced debugging for the room list": "Увімкнути просунуте зневаджування для переліку кімнат",
-    "Show info about bridges in room settings": "Показувати інформацію про мости в налаштуваннях кімнати",
+    "Show info about bridges in room settings": "Показувати відомості про мости в налаштуваннях кімнати",
     "Font size": "Розмір шрифту",
     "Use custom size": "Використовувати нетиповий розмір",
     "Enable Emoji suggestions while typing": "Увімкнути пропонування емодзі при друкуванні",
@@ -808,7 +661,6 @@
     "Discovery": "Виявлення",
     "Help & About": "Допомога та про програму",
     "Bug reporting": "Звітування про вади",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Якщо ви подали ваду через GitHub, журнали зневадження можуть допомогти нам відстежити проблему. Журнали зневадження містять дані використання застосунку, включно з вашим користувацьким ім’ям, ідентифікаторами або псевдонімами відвіданих вами кімнат або груп, а також іменами інших користувачів. Вони не містять повідомлень.",
     "Submit debug logs": "Надіслати журнал зневадження",
     "Clear cache and reload": "Очистити кеш та перезавантажити",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Щоб повідомити про проблеми безпеки Matrix, будь ласка, прочитайте <a>Політику розкриття інформації</a> Matrix.org.",
@@ -816,15 +668,12 @@
     "Keyboard Shortcuts": "Гарячі клавіші",
     "Versions": "Версії",
     "%(brand)s version:": "версія %(brand)s:",
-    "olm version:": "Версія olm:",
-    "Identity Server is": "Сервер ідентифікації",
     "Labs": "Лабораторія",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Спробуйте експериментальні можливості. <a>Більше</a>.",
     "Ignored/Blocked": "Ігноровані/Заблоковані",
     "Error adding ignored user/server": "Помилка при додаванні ігнорованого користувача/сервера",
     "Something went wrong. Please try again or view your console for hints.": "Щось пішло не так. Спробуйте знову, або пошукайте підказки в консолі.",
     "Error subscribing to list": "Помилка при підписці на список",
-    "Please verify the room ID or address and try again.": "Перевірте ID кімнати, або адресу та попробуйте знову.",
+    "Please verify the room ID or address and try again.": "Перевірте ID кімнати, або адресу та повторіть спробу.",
     "Error removing ignored user/server": "Помилка при видаленні ігнорованого користувача/сервера",
     "Error unsubscribing from list": "Не вдалося відписатися від списку",
     "Please try again or view your console for hints.": "Спробуйте знову, або подивіться повідомлення в консолі.",
@@ -838,16 +687,16 @@
     "View rules": "Подивитись правила",
     "You are currently subscribed to:": "Ви підписані на:",
     "⚠ These settings are meant for advanced users.": "⚠ Ці налаштування розраховані на досвідчених користувачів.",
-    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ігнорування людей реалізовано через списки правил блокування. Підписка на список блокування призведе до приховування від вас користувачів і серверів, які в ньому перераховані.",
-    "Personal ban list": "Особистий бан-ліст",
-    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Ваш особистий список блокування містить всіх користувачів і сервери, повідомлення яких ви не хочете бачити. Після внесення туди першого користувача / сервера в списку кімнат з'явиться нова кімната 'Мій список блокування' - не покидає цю кімнату, щоб список блокування працював.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Нехтування людей реалізовано через списки правил блокування. Підписка на список блокування призведе до приховування від вас перелічених у ньому користувачів і серверів.",
+    "Personal ban list": "Особистий список блокування",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Ваш особистий список блокування містить усіх користувачів і сервери, повідомлення яких ви не хочете бачити. Після внесення туди першого користувача/сервера в списку кімнат з'явиться нова кімната «Мій список блокування» — не виходьте з неї, щоб список блокування працював.",
     "Server or user ID to ignore": "Сервер або ID користувача для ігнорування",
     "eg: @bot:* or example.org": "наприклад: @bot:* або example.org",
     "Ignore": "Ігнорувати",
     "Subscribed lists": "Підписані списки",
-    "Subscribing to a ban list will cause you to join it!": "При підписці на список блокування ви приєднаєтесь до нього!",
+    "Subscribing to a ban list will cause you to join it!": "Підписавшись на список блокування ви приєднаєтесь до нього!",
     "If this isn't what you want, please use a different tool to ignore users.": "Якщо вас це не влаштовує, спробуйте інший інструмент для ігнорування користувачів.",
-    "Room ID or address of ban list": "Ідентифікатор номера або адреса бан-лісту",
+    "Room ID or address of ban list": "ID кімнати або адреса списку блокування",
     "Subscribe": "Підписатись",
     "Start automatically after system login": "Автозапуск при вході в систему",
     "Always show the window menu bar": "Завжди показувати рядок меню",
@@ -855,7 +704,7 @@
     "Preferences": "Параметри",
     "Room list": "Перелік кімнат",
     "Composer": "Редактор",
-    "Security & Privacy": "Безпека та конфіденційність",
+    "Security & Privacy": "Безпека й приватність",
     "Where you’re logged in": "Де ви ввійшли",
     "Skip": "Пропустити",
     "Notification settings": "Налаштування сповіщень",
@@ -869,7 +718,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (повноваження %(powerLevelNumber)s)",
     "Send a message…": "Надіслати повідомлення…",
     "People": "Люди",
-    "Share this email in Settings to receive invites directly in %(brand)s.": "Поширте цю адресу е-пошти у налаштуваннях щоб отримувати запрошення прямо у %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Поширте цю адресу е-пошти у налаштуваннях, щоб отримувати запрошення безпосередньо в %(brand)s.",
     "Room options": "Параметри кімнати",
     "Send as message": "Надіслати як повідомлення",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Ви не зможете скасувати цю зміну через те, що ви підвищуєте рівень повноважень користувача до свого рівня.",
@@ -882,12 +731,9 @@
     "Enable 'Manage Integrations' in Settings to do this.": "Щоб зробити це увімкніть \"Керувати інтеграціями\" у налаштуваннях.",
     "Confirm by comparing the following with the User Settings in your other session:": "Підтвердьте шляхом порівняння наступного рядка з рядком у користувацьких налаштуваннях вашого іншого сеансу:",
     "Confirm this user's session by comparing the following with their User Settings:": "Підтвердьте сеанс цього користувача шляхом порівняння наступного рядка з рядком з їхніх користувацьких налаштувань:",
-    "We recommend you change your password and recovery key in Settings immediately": "Ми радимо невідкладно змінити ваші пароль та відновлювальний ключ у налаштуваннях",
-    "Share Message": "Поширити повідомлення",
     "Community Settings": "Налаштування спільноти",
     "All settings": "Усі налаштування",
     "User menu": "Користувацьке меню",
-    "If you don't want to set this up now, you can later in Settings.": "Якщо ви не бажаєте налаштовувати це зараз, ви можете зробити це пізніше у налаштуваннях.",
     "Go to Settings": "Перейти до налаштувань",
     "Compare unique emoji": "Порівняйте унікальні емодзі",
     "Cancelling…": "Скасування…",
@@ -895,11 +741,11 @@
     "Cat": "Кіт",
     "Lion": "Лев",
     "Horse": "Кінь",
-    "Pig": "Свиня",
+    "Pig": "Порося",
     "Elephant": "Слон",
     "Rabbit": "Кріль",
     "Panda": "Панда",
-    "Rooster": "Когут",
+    "Rooster": "Півень",
     "Penguin": "Пінгвін",
     "Turtle": "Черепаха",
     "Fish": "Риба",
@@ -935,11 +781,11 @@
     "Bicycle": "Велоcипед",
     "Aeroplane": "Літак",
     "Rocket": "Ракета",
-    "Trophy": "Приз",
+    "Trophy": "Кубок",
     "Ball": "М'яч",
     "Guitar": "Гітара",
     "Trumpet": "Труба",
-    "Bell": "Дзвін",
+    "Bell": "Дзвінок",
     "Anchor": "Якір",
     "Headphones": "Навушники",
     "Folder": "Тека",
@@ -953,60 +799,47 @@
     "Cactus": "Кактус",
     "Mushroom": "Гриб",
     "Globe": "Глобус",
-    "This bridge was provisioned by <user />.": "Цей місток був підготовленим <user />.",
+    "This bridge was provisioned by <user />.": "Цей міст було забезпечено <user />.",
     "This bridge is managed by <user />.": "Цей міст керується <user />.",
-    "Workspace: %(networkName)s": "Робочий простір: %(networkName)s",
-    "Channel: %(channelName)s": "Канал: %(channelName)s",
     "Show less": "Згорнути",
     "Show more": "Розгорнути",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Змінення пароля призведе до скидання всіх ключів наскрізного шифрування та унеможливить читання історії листування, якщо тільки ви не експортуєте ваші ключі кімнати та не імпортуєте їх згодом. Це буде вдосконалено у майбутньому.",
     "Santa": "Св. Миколай",
     "Gift": "Подарунок",
     "Lock": "Замок",
-    "Cross-signing and secret storage are not yet set up.": "Перехресне підписування та таємне сховище ще не налагоджені.",
-    "Your homeserver does not support cross-signing.": "Ваш домашній сервер не підтримує кросс-підпис.",
-    "Cross-signing and secret storage are enabled.": "Кросс-підпис та секретне сховище дозволені.",
+    "Your homeserver does not support cross-signing.": "Ваш домашній сервер не підтримує перехресного підписування.",
     "well formed": "добре сформований",
     "unexpected type": "несподіваний тип",
-    "Cross-signing public keys:": "Перехресно-підписувальні відкриті ключі:",
+    "Cross-signing public keys:": "Відкриті ключі перехресного підписування:",
     "in memory": "у пам'яті",
     "not found": "не знайдено",
-    "Cross-signing private keys:": "Приватні ключі для кросс-підпису:",
+    "Cross-signing private keys:": "Приватні ключі перехресного підписування:",
     "exists": "існує",
-    "Delete sessions|other": "Видалити сесії",
-    "Delete sessions|one": "Видалити сесію",
-    "Delete %(count)s sessions|other": "Видалити %(count)s сесій",
-    "Delete %(count)s sessions|one": "Видалити %(count)s сесій",
+    "Delete sessions|other": "Видалити сеанси",
+    "Delete sessions|one": "Видалити сеанс",
+    "Delete %(count)s sessions|other": "Видалити %(count)s сеансів",
+    "Delete %(count)s sessions|one": "Видалити %(count)s сеансів",
     "ID": "ID",
-    "Public Name": "Публічне ім'я",
-    " to store messages from ": " зберігання повідомлень від ",
-    "rooms.": "кімнати.",
+    "Public Name": "Загальнодоступне ім'я",
     "Manage": "Керування",
-    "Enable": "Дозволити",
+    "Enable": "Увімкнути",
     "Connecting to integration manager...": "З'єднання з менджером інтеграцій...",
     "Cannot connect to integration manager": "Не вдалося з'єднатися з менджером інтеграцій",
     "Delete Backup": "Видалити резервну копію",
     "Restore from Backup": "Відновити з резервної копії",
     "not stored": "не збережено",
     "All keys backed up": "Усі ключі збережено",
-    "Backup version: ": "Версія резервної копії: ",
-    "Algorithm: ": "Алгоритм: ",
-    "Backup key stored: ": "Резервна копія ключа збережена ",
     "Enable audible notifications for this session": "Увімкнути звукові сповіщення для цього сеансу",
     "Save": "Зберегти",
-    "Checking server": "Перевірка серверу",
-    "Disconnect": "Відключити",
+    "Checking server": "Перевірка сервера",
+    "Disconnect": "Від'єднатися",
     "You should:": "Вам варто:",
     "Disconnect anyway": "Відключити в будь-якому випадку",
-    "Identity Server (%(server)s)": "Сервер ідентифікації (%(server)s)",
-    "Identity Server": "Сервер ідентифікації",
     "Do not use an identity server": "Не використовувати сервер ідентифікації",
     "Enter a new identity server": "Введіть новий сервер ідентифікації",
     "Change": "Змінити",
     "Manage integrations": "Керування інтеграціями",
     "Size must be a number": "Розмір повинен бути числом",
-    "Incoming voice call": "Входовий голосовий виклик",
-    "Incoming video call": "Входовий відеовиклик",
     "<a>Upgrade</a> to your own domain": "<a>Поліпшити</a> до свого власного домену",
     "No Audio Outputs detected": "Звуковий вивід не виявлено",
     "Audio Output": "Звуковий вивід",
@@ -1020,8 +853,6 @@
     "Filter room members": "Відфільтрувати учасників кімнати",
     "Voice call": "Голосовий виклик",
     "Video call": "Відеовиклик",
-    "Not now": "Не зараз",
-    "Don't ask me again": "Не запитувати мене знову",
     "Appearance": "Вигляд",
     "Show rooms with unread messages first": "Спочатку показувати кімнати з непрочитаними повідомленнями",
     "Show previews of messages": "Показувати попередній перегляд повідомлень",
@@ -1032,7 +863,7 @@
     "Use default": "Типово",
     "Mentions & Keywords": "Згадки та ключові слова",
     "Notification options": "Параметри сповіщень",
-    "Leave Room": "Залишити кімнату",
+    "Leave Room": "Вийти з кімнати",
     "Forget Room": "Забути кімнату",
     "Favourited": "Улюблено",
     "%(count)s unread messages including mentions.|other": "%(count)s непрочитаних повідомлень включно зі згадками.",
@@ -1040,60 +871,37 @@
     "%(count)s unread messages.|other": "%(count)s непрочитаних повідомлень.",
     "%(count)s unread messages.|one": "1 непрочитане повідомлення.",
     "Unread messages.": "Непрочитані повідомлення.",
-    "This room is public": "Ця кімната є прилюдною",
+    "This room is public": "Ця кімната загальнодоступна",
     "Show Stickers": "Показати наліпки",
     "Failed to revoke invite": "Не вдалось відкликати запрошення",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Не вдалось відкликати запрошення. Сервер може мати тимчасові збої або у вас немає достатніх дозволів щоб відкликати запрошення.",
     "Revoke invite": "Відкликати запрошення",
     "Security": "Безпека",
-    "Report bugs & give feedback": "Відзвітувати про вади та залишити відгук",
-    "Report Content to Your Homeserver Administrator": "Поскаржитись на зміст адміністратору вашого домашнього сервера",
+    "Report Content to Your Homeserver Administrator": "Поскаржитися на вміст адміністратору вашого домашнього сервера",
     "Failed to upgrade room": "Не вдалось поліпшити кімнату",
     "The room upgrade could not be completed": "Поліпшення кімнати не може бути завершене",
     "Upgrade this room to version %(version)s": "Поліпшити цю кімнату до версії %(version)s",
     "Upgrade Room Version": "Поліпшити версію кімнати",
     "Upgrade private room": "Поліпшити закриту кімнату",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Ви поліпшите цю кімнату з <oldVersion /> до <newVersion /> версії.",
-    "Share Room Message": "Поширити повідомлення кімнати",
-    "Report Content": "Поскаржитись на зміст",
+    "Share Room Message": "Поділитися повідомленням кімнати",
+    "Report Content": "Поскаржитись на вміст",
     "Feedback": "Зворотній зв'язок",
     "General failure": "Загальний збій",
     "Enter your account password to confirm the upgrade:": "Введіть пароль вашого облікового запису щоб підтвердити поліпшення:",
-    "Security & privacy": "Безпека та конфіденційність",
+    "Security & privacy": "Безпека й приватність",
     "Secret storage public key:": "Таємне сховище відкритого ключа:",
-    "Key backup": "Резервне копіювання ключів",
     "Message search": "Пошук повідомлень",
     "Cross-signing": "Перехресне підписування",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Адміністратором вашого сервера було вимкнено початкове наскрізне шифрування у закритих кімнатах та особистих повідомленнях.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Адміністратором вашого сервера було вимкнено автоматичне наскрізне шифрування у приватних кімнатах і особистих повідомленнях.",
     "Something went wrong!": "Щось пішло не так!",
     "expand": "розгорнути",
-    "Wrong Recovery Key": "Неправильний відновлювальний ключ",
-    "Invalid Recovery Key": "Нечинний відновлювальний ключ",
-    "Recovery key mismatch": "Незбіг відновлювального ключа",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Резервна копія не може бути дешифрована з цим відновлювальним ключем: переконайтесь, будь ласка, що ви ввели правильний відновлювальний ключ.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Якщо ви забули відновлювальну парольну фразу, ви можете <button1>скористатись вашим відновлювальним ключем</button1> або <button2>налаштувати нові параметри відновлювання</button2>",
-    "Enter recovery key": "Введіть відновлювальний ключ",
-    "This looks like a valid recovery key!": "Це скидається на чинний відновлювальний ключ!",
-    "Not a valid recovery key": "Нечинний відновлювальний ключ",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Доступіться до вашої захищеної історії повідомлень та налаштуйте захищене листування шляхом вводження вашого відновлювального ключа.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Якщо ви забули ваш відновлювальний ключ, ви можете <button>наново налаштувати параметри відновлювання</button>",
     "Switch to light mode": "Світла тема",
     "Switch to dark mode": "Темна тема",
-    "Use Recovery Key or Passphrase": "Скористуйтесь відновлювальними ключем або парольною фразою",
-    "Use Recovery Key": "Скористуйтесь відновлювальним ключем",
-    "Set up with a recovery key": "Налаштувати з відновлювальним ключем",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Ваш відновлювальний ключ — це убезпека. Ви можете використовувати його щоб доступитись до ваших зашифрованих повідомлень у разі втрати вашої відновлювальної парольної фрази.",
-    "Your recovery key": "Ваш відновлювальний ключ",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ваш відновлювальний ключ було <b>скопійовано до буферу обміну</b>, вставте його у:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Ваш відновлювальний ключ у вашій теці <b>Завантаження</b>.",
-    "Make a copy of your recovery key": "Зробити копію вашого відновлювального ключа",
-    "Don't ask again": "Не запитувати знову",
-    "New Recovery Method": "Новий відновлювальний засіб",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Було виявлено нові відновлювальні парольну фразу та ключ від захищених повідомлень.",
+    "New Recovery Method": "Новий метод відновлення",
     "This session is encrypting history using the new recovery method.": "Цей сеанс зашифровує історію новим відновлювальним засобом.",
     "Set up Secure Messages": "Налаштувати захищені повідомлення",
     "Recovery Method Removed": "Відновлювальний засіб було видалено",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Цей сеанс виявив, що ваші відновлювальні парольна фраза та ключ від захищених повідомлень були видалені.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s увімкнув(-ла) значок для %(newGroups)s та вимкнув(-ла) значок для %(oldGroups)s у цій кімнаті.",
     "New version available. <a>Update now.</a>": "Доступна нова версія. <a>Оновити зараз</a>",
     "Upgrade public room": "Поліпшити відкриту кімнату",
@@ -1102,26 +910,25 @@
     "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 your encryption": "Поліпшити ваше шифрування",
     "Show a placeholder for removed messages": "Показувати замісну позначку замість видалених повідомлень",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Показувати повідомлення про приєднання/залишення (не впливає на запрошення/викидання/заборону)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Показувати повідомлення про приєднання/вихід (не впливає на запрошення/викидання/блокування)",
     "Show avatar changes": "Показувати зміни личини",
     "Show display name changes": "Показувати зміни видимого імені",
     "Show read receipts sent by other users": "Показувати мітки прочитання, надіслані іншими користувачами",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Показувати нагадку про ввімкнення відновлювання захищених повідомлень у зашифрованих кімнатах",
     "Show avatars in user and room mentions": "Показувати личини у згадках користувачів та кімнат",
     "Never send encrypted messages to unverified sessions from this session": "Ніколи не надсилати зашифровані повідомлення до незвірених сеансів з цього сеансу",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ніколи не надсилати зашифровані повідомлення до незвірених сеансів у цій кімнаті з цього сеансу",
     "Enable message search in encrypted rooms": "Увімкнути шукання повідомлень у зашифрованих кімнатах",
     "IRC display name width": "Ширина видимого імені IRC",
-    "Encrypted messages in one-to-one chats": "Зашифровані повідомлення у балачках віч-на-віч",
-    "Encrypted messages in group chats": "Зашифровані повідомлення у групових балачках",
+    "Encrypted messages in one-to-one chats": "Зашифровані повідомлення у бесідах віч-на-віч",
+    "Encrypted messages in group chats": "Зашифровані повідомлення у групових бесідах",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Захищені повідомлення з цим користувачем є наскрізно зашифрованими та непрочитними для сторонніх осіб.",
     "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'ові бракує деяких складників, необхідних для безпечного локального кешування зашифрованих повідомлень. Якщо ви хочете поекспериментувати з цією властивістю, зберіть спеціальну збірку %(brand)s Desktop із <nativeLink>доданням пошукових складників</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 не може безпечно локально кешувати зашифровані повідомлення під час виконання у переглядачі. Користуйтесь <desktopLink>%(brand)s Desktop</desktopLink>, в якому зашифровані повідомлення з'являються у результатах пошуку.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ви впевнені? Ви загубите ваші зашифровані повідомлення якщо копія ключів не була зроблена коректно.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифровані повідомлення захищені наскрізним шифруванням. Лише ви та отримувачі повідомлень мають ключі для їх читання.",
-    "Display Name": "Видиме ім'я",
-    "wait and try again later": "зачекайте та спопробуйте ще раз пізніше",
+    "Display Name": "Показуване ім'я",
+    "wait and try again later": "зачекати та повторити спробу пізніше",
     "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>",
     "Encrypted": "Зашифроване",
     "This room is end-to-end encrypted": "Ця кімната є наскрізно зашифрованою",
@@ -1131,39 +938,35 @@
     "Send an encrypted reply…": "Надіслати зашифровану відповідь…",
     "Replying": "Відповідання",
     "Low priority": "Неважливі",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "У зашифрованих кімнатах, подібних до цієї, попередній перегляд посилань є початково вимкненим. Це робиться задля гарантування того, що ваш домашній сервер (на якому генеруються перегляди) не матиме змоги збирати інформацію щодо посилань, які ви бачите у цій кімнаті.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "У кімнатах з шифруванням, як у цій, попередній перегляд посилань усталено вимкнено. Це робиться, щоб гарантувати, що ваш домашній сервер (на якому генеруються перегляди) не матиме змоги збирати дані щодо посилань, які ви бачите у цій кімнаті.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "У зашифрованих кімнатах ваші повідомлення є захищеними, тож тільки ви та отримувач маєте ключі для їх розблокування.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "У зашифрованих кімнатах звіряйте усіх користувачів щоб переконатись у безпеці спілкування.",
-    "Failed to copy": "Не вдалось скопіювати",
+    "Failed to copy": "Не вдалося скопіювати",
     "Your display name": "Ваше видиме ім'я",
-    "COPY": "СКОПІЮВАТИ",
-    "Set a display name:": "Зазначити видиме ім'я:",
     "Copy": "Скопіювати",
     "Cancel replying to a message": "Скасувати відповідання на повідомлення",
     "Page Up": "Page Up",
     "Page Down": "Page Down",
     "Esc": "Esc",
     "Enter": "Enter",
-    "Space": "Пропуск",
+    "Space": "Простір",
     "End": "End",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Видалення даних з цього сеансу є безповоротним. Зашифровані повідомлення будуть втрачені якщо їхні ключі не було продубльовано.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Звірте цього користувача щоб позначити його довіреним. Довіряння користувачам додає спокою якщо ви користуєтесь наскрізно зашифрованими повідомленнями.",
     "Verify this 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.": "Звірте цей пристрій щоб позначити його довіреним. Довіряння цьому пристрою додає вам та іншим користувачам спокою якщо ви користуєтесь наскрізно зашифрованими повідомленнями.",
     "I don't want my encrypted messages": "Мені не потрібні мої зашифровані повідомлення",
     "You'll lose access to your encrypted messages": "Ви втратите доступ до ваших зашифрованих повідомлень",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Використати цей сеанс для звірення вашого нового сеансу, надаючи йому доступ до зашифрованих повідомлень:",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Скарження на це повідомлення надішле його унікальний 'ідентифікатор події (event ID)' адміністраторові вашого домашнього сервера. Якщо повідомлення у цій кімнаті зашифровані, то адміністратор не зможе бачити ані тексту повідомлень, ані жодних файлів чи зображень.",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Зі скаргою на це повідомлення буде надіслано його унікальний «ID події» адміністраторові вашого домашнього сервера. Якщо повідомлення у цій кімнаті зашифровані, то адміністратор не зможе побачити ані тексту повідомлень, ані жодних файлів чи зображень.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Бракує деяких даних сеансу, включно з ключами зашифрованих повідомлень. Вийдіть та зайдіть знову щоб виправити цю проблему, відновлюючи ключі з дубля.",
     "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.": "Було виявлено дані зі старої версії %(brand)s. Це призведе до збоїння наскрізного шифрування у старій версії. Наскрізно зашифровані повідомлення, що обмінювані нещодавно, під час використання старої версії, можуть бути недешифровними у цій версії. Це може призвести до збоїв повідомлень, обмінюваних також і з цією версією. У разі виникнення проблем вийдіть з програми та зайдіть знову. Задля збереження історії повідомлень експортуйте та переімпортуйте ваші ключі.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Змінення паролю скине всі ключі наскрізного шифрування в усіх ваших сеансах, роблячи зашифровану історію листувань нечитабельною. Налагодьте дублювання ключів або експортуйте ключі кімнат з іншого сеансу перед скиданням пароля.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Підтвердьте вашу особу шляхом звіряння цього входу з одного з інших ваших сеансів, надаючи йому доступ до зашифрованих повідомлень.",
-    "Enable big emoji in chat": "Увімкнути великі емодзі у балачках",
+    "Enable big emoji in chat": "Увімкнути великі емоджі у бесідах",
     "Show typing notifications": "Сповіщати про друкування",
     "Show rooms with unread notifications first": "Спочатку показувати кімнати з непрочитаними сповіщеннями",
     "Show shortcuts to recently viewed rooms above the room list": "Показувати нещодавно бачені кімнати вгорі понад переліком кімнат",
     "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": "Порівняйте унікальну низку емодзі якщо ви не маєте камери на жодному пристрої",
+    "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:": "Підтвердьте, що емодзі внизу показано в обох сеансах в однаковому порядку:",
     "Verify this user by confirming the following emoji appear on their screen.": "Звірте цього користувача підтвердженням того, що наступні емодзі з'являються на його екрані.",
     "Emoji picker": "Обирач емодзі",
@@ -1172,31 +975,22 @@
     "Verify by comparing unique emoji.": "Звірити порівнянням унікальних емодзі.",
     "Verify by emoji": "Звірити за допомогою емодзі",
     "Compare emoji": "Порівняти емодзі",
-    "This requires the latest %(brand)s on your other devices:": "Це потребує найостаннішого %(brand)s на ваших інших пристроях:",
-    "%(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": "або інший здатний до перехресного підписування Matrix-клієнт",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ваш новий сеанс тепер є звірений. Він має доступ до ваших зашифрованих повідомлень, а інші користувачі бачитимуть його як довірений.",
     "Emoji": "Емодзі",
     "Emoji Autocomplete": "Самодоповнення емодзі",
-    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування зі збігом з %(glob)s через %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s створює правило блокування зі збігом з %(glob)s через %(reason)s",
     "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування користувачів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування кімнат зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування серверів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
-    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінєю правило блокування зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
+    "%(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",
     "Enable Community Filter Panel": "Увімкнути фільтр панелі спільнот",
     "Messages containing my username": "Повідомлення, що містять моє користувацьке ім'я",
     "Messages containing @room": "Повідомлення, що містять @room",
     "When rooms are upgraded": "Коли кімнати поліпшено",
     "Unknown caller": "Невідомий викликач",
-    "The integration manager is offline or it cannot reach your homeserver.": "Менеджер інтеграцій непід'єднаний або не може досягти вашого домашнього сервера.",
+    "The integration manager is offline or it cannot reach your homeserver.": "Менеджер інтеграцій не під'єднаний або не може зв'язатися з вашим домашнім сервером.",
     "Enable desktop notifications for this session": "Увімкнути стільничні сповіщення для цього сеансу",
     "Profile picture": "Зображення профілю",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій <b>%(serverName)s</b> для керування ботами, знадобами та паками наліпок.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій для керування ботами, знадобами та паками наліпок.",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджери інтеграцій отримують дані конфігурації та можуть змінювати знадоби, надсилати запрошення у кімнати й встановлювати рівні повноважень від вашого імені.",
     "Show %(count)s more|other": "Показати ще %(count)s",
     "Show %(count)s more|one": "Показати ще %(count)s",
     "Failed to connect to integration manager": "Не вдалось з'єднатись з менеджером інтеграцій",
@@ -1207,10 +1001,7 @@
     "Filter community members": "Відфільтрувати учасників спільноти",
     "Filter community rooms": "Відфільтрувати кімнати спільноти",
     "Display your community flair in rooms configured to show it.": "Відбивати ваш спільнотний значок у кімнатах, що налаштовані показувати його.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Користування цим знадобом може призвести до поширення ваших даних <helpIcon /> з %(widgetDomain)s та вашим менеджером інтеграцій.",
     "Show advanced": "Показати розширені",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ваш %(brand)s не дозволяє вам використовувати для цього менеджер інтеграцій. Зверніться, будь ласка, до адміністратора.",
-    "Integration Manager": "Менеджер інтеграцій",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Ваша спільнота не має великого опису (HTML-сторінки, показуваної членам спільноти). <br />Клацніть тут щоб відкрити налаштування й створити цей опис!",
     "Review terms and conditions": "Переглянути умови користування",
     "Old cryptography data detected": "Виявлено старі криптографічні дані",
@@ -1224,10 +1015,8 @@
     "Signing In...": "Входження…",
     "If you've joined lots of rooms, this might take a while": "Якщо ви приєднались до багатьох кімнат, це може тривати деякий час",
     "Create account": "Створити обліковий запис",
-    "Failed to fetch avatar URL": "Не вдалось вибрати URL личини",
     "Clear room list filter field": "Очистити поле фільтра списку кімнат",
     "Cancel autocomplete": "Скасувати самодоповнення",
-    "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.": "Журнали зневадження містять дані використання застосунку, включно з вашим користувацьким ім’ям, ідентифікаторами або псевдонімами відвіданих вами кімнат або груп, а також іменами інших користувачів. Вони не містять повідомлень.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Підтвердьте знедіяння вашого облікового запису через Single Sign On щоб підтвердити вашу особу.",
     "This account has been deactivated.": "Цей обліковий запис було знедіяно.",
     "End conference": "Завершити конференцію",
@@ -1235,32 +1024,28 @@
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Додає ( ͡° ͜ʖ ͡°) на початку текстового повідомлення",
     "about a day ago": "близько доби тому",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Unexpected server error trying to leave the room": "Виникла неочікувана помилка серверу під час спроби залишити кімнату",
+    "Unexpected server error trying to leave the room": "Під час спроби вийти з кімнати виникла неочікувана помилка сервера",
     "Unknown App": "Невідомий додаток",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Відправляти <UsageDataLink>анонімну статистику користування</UsageDataLink>, що дозволяє нам покращувати %(brand)s. Це використовує <PolicyLink>кукі</PolicyLink>.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Надсилати <UsageDataLink>анонімну статистику користування</UsageDataLink>, що дозволяє нам вдосконалювати %(brand)s. Це використовує <PolicyLink>кукі</PolicyLink>.",
     "Set up Secure Backup": "Налаштувати захищене резервне копіювання",
-    "Safeguard against losing access to encrypted messages & data": "Захист від втрати доступу до зашифрованих повідомлень та даних",
-    "The person who invited you already left the room.": "Особа, що вас запросила, вже залишила кімнату.",
-    "The person who invited you already left the room, or their server is offline.": "Особа, що вас запросила вже залишила кімнату, або її сервер відімкнено.",
+    "Safeguard against losing access to encrypted messages & data": "Захистіться від втрати доступу до зашифрованих повідомлень і даних",
+    "The person who invited you already left the room.": "Особа, що вас запросила, вже вийшла з кімнати.",
+    "The person who invited you already left the room, or their server is offline.": "Особа, що вас запросила вже вийшла з кімнати, або її сервер вимкнено.",
     "Change notification settings": "Змінити налаштування сповіщень",
     "Render simple counters in room header": "Показувати звичайні лічильники у заголовку кімнати",
     "Send typing notifications": "Надсилати сповіщення про набирання тексту",
     "Use a system font": "Використовувати системний шрифт",
     "System font name": "Ім’я системного шрифту",
-    "Allow Peer-to-Peer for 1:1 calls": "Дозволити Peer-to-Peer для дзвінків 1:1",
-    "Enable widget screenshots on supported widgets": "Увімкнути скріншоти віджетів для віджетів, що підтримуються",
+    "Enable widget screenshots on supported widgets": "Увімкнути знімки екрана розширень для підтримуваних розширень",
     "Prompt before sending invites to potentially invalid matrix IDs": "Запитувати перед надсиланням запрошень на потенційно недійсні matrix ID",
     "Order rooms by name": "Сортувати кімнати за назвою",
-    "Low bandwidth mode": "Режим для низької пропускної здатності",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Дозволити резервний сервер допоміжних викликів turn.matrix.org якщо ваш домашній сервер не пропонує такого (ваша IP-адреса буде розкрита для здійснення дзвінка)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Надсилати мітки прочитання повідомлень (необхідний сумісний домашній сервер для відімкнення)",
     "How fast should messages be downloaded.": "Як швидко повідомлення повинні завантажуватися.",
     "Enable experimental, compact IRC style layout": "Увімкнути експериментальне, компактне компонування IRC",
     "Uploading logs": "Відвантаження журналів",
     "Downloading logs": "Завантаження журналів",
     "My Ban List": "Мій список блокувань",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Це ваш список користувачів/серверів, які ви заблокували – не залишайте кімнату!",
-    "Incoming call": "Вхідний виклик",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Це ваш список користувачів/серверів, які ви заблокували – не виходьте з кімнати!",
     "The other party cancelled the verification.": "Друга сторона скасувала звірення.",
     "Verified!": "Звірено!",
     "You've successfully verified this user.": "Ви успішно звірили цього користувача.",
@@ -1321,8 +1106,6 @@
     "The call was answered on another device.": "На дзвінок відповіли на іншому пристрої.",
     "Answered Elsewhere": "Відповіли деінде",
     "The call could not be established": "Не вдалося встановити зв'язок",
-    "The other party declined the call.": "Інша сторона відхилила дзвінок.",
-    "Call Declined": "Дзвінок відхилено",
     "Falkland Islands": "Фолклендські (Мальвінські) Острови",
     "Ethiopia": "Ефіопія",
     "Estonia": "Естонія",
@@ -1527,9 +1310,9 @@
     "Filter rooms and people": "Відфільтрувати кімнати та людей",
     "Find a room… (e.g. %(exampleRoom)s)": "Знайти кімнату… (напр. %(exampleRoom)s)",
     "Find a room…": "Знайти кімнату…",
-    "Can't find this server or its room list": "Не вдалось знайти цей сервер у переліку кімнат",
+    "Can't find this server or its room list": "Не вдалося знайти цей сервер або список його кімнат",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Якщо ви не можете знайти потрібну кімнату, попросіть запрошення або <a>Створіть нову кімнату</a> власноруч.",
-    "Cannot reach homeserver": "Не вдається зв'язатися з домашнім сервером",
+    "Cannot reach homeserver": "Не вдалося зв'язатися з домашнім сервером",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Переконайтеся, що у ваше з'єднання з Інтернетом стабільне або зв’яжіться з системним адміністратором",
     "User %(user_id)s may or may not exist": "Користувач %(user_id)s можливо існує, а можливо й ні",
     "No need for symbols, digits, or uppercase letters": "Цифри або великі букви не вимагаються",
@@ -1537,10 +1320,6 @@
     "You're all caught up.": "Все готово.",
     "Hey you. You're the best!": "Гей, ти, так, ти. Ти найкращий!",
     "You’re all caught up": "Все готово",
-    "%(senderName)s declined the call.": "%(senderName)s відхиляє виклик.",
-    "(an error occurred)": "(сталася помилка)",
-    "(their device couldn't start the camera / microphone)": "(їхній пристрій не зміг запустити камеру / мікрофон)",
-    "(connection failed)": "(не вдалося з'єднатися)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Всім серверам заборонено доступ до кімнати! Нею більше не можна користуватися.",
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Збій виклику, оскільки не вдалося отримати доступ до мікрофона. Переконайтеся, що мікрофон під'єднано та налаштовано правильно.",
     "Effects": "Ефекти",
@@ -1562,8 +1341,7 @@
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sзмінили свої імена",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sзмінили свої імена %(count)s разів",
     "Error whilst fetching joined communities": "Помилка під час отримання спільнот до яких ви приєдналися",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Закриті кімнати можна знайти та приєднатися до них лише за запрошенням. Загальнодоступні кімнати може знайти і приєднатись кожен з цієї спільноти.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Закриті кімнати можна знайти та приєднатися до них лише за запрошенням. Загальнодоступні кімнати може знайти і приєднатись кожен.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Приватні кімнати можна знайти та приєднатися до них лише за запрошенням. Загальнодоступні кімнати може знайти та приєднатися кожен з цієї спільноти.",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sвиходить і повертається",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sвиходить і повертається %(count)s разів",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sвиходять і повертаються",
@@ -1580,7 +1358,6 @@
     "Manually verify all remote sessions": "Перевірити всі сеанси власноруч",
     "Explore rooms": "Каталог кімнат",
     "Session key:": "Ключ сеансу:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Якщо ви не входили в цей сеанс, можливо ваш обліковий запис зламано.",
     "Hide sessions": "Сховати сеанси",
     "Hide verified sessions": "Сховати підтверджені сеанси",
     "Session ID:": "ID сеансу:",
@@ -1588,7 +1365,7 @@
     "Confirm encryption setup": "Підтвердити налаштування шифрування",
     "Enable end-to-end encryption": "Увімкнути наскрізне шифрування",
     "Your server requires encryption to be enabled in private rooms.": "Ваш сервер вимагає увімкнення шифрування приватних кімнат.",
-    "Widgets do not use message encryption.": "Віджети не використовують шифрування повідомлень.",
+    "Widgets do not use message encryption.": "Розширення не використовують шифрування повідомлень.",
     "The encryption used by this room isn't supported.": "Шифрування, використане цією кімнатою не підтримується.",
     "Encryption not enabled": "Шифрування не ввімкнено",
     "Ignored attempt to disable encryption": "Знехтувані спроби вимкнути шифрування",
@@ -1601,6 +1378,737 @@
     "%(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 у їхньому профілі — натиснувши на їх аватар.",
-    "Open": "Відкрити",
-    "<a>In reply to</a> <pill>": "<a>У відповідь на</a> <pill>"
+    "<a>In reply to</a> <pill>": "<a>У відповідь на</a> <pill>",
+    "The user you called is busy.": "Користувач, якого ви викликаєте, зайнятий.",
+    "User Busy": "Користувач зайнятий",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Додає ┬──┬ ノ( ゜-゜ノ) на початку текстового повідомлення",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Додає (╯°□°）╯︵ ┻━┻ на початку текстового повідомлення",
+    "We couldn't log you in": "Нам не вдалося виконати вхід",
+    "You're already in a call with this person.": "Ви вже спілкуєтесь із цією особою.",
+    "Already in call": "Вже у виклику",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Ви не можете надсилати жодних повідомлень, поки не переглянете та не погодитесь з <consentLink>нашими умовами та положеннями</consentLink>.",
+    "Send message": "Надіслати повідомлення",
+    "Sending your message...": "Надсилання повідомлення...",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Ви можете скористатися <code>/help</code> для перегляду доступних команд. Ви мали намір надіслати це як повідомлення?",
+    "Send messages": "Надіслати повідомлення",
+    "sends confetti": "надсилає конфеті",
+    "sends fireworks": "надсилає феєрверк",
+    "sends space invaders": "надсилає тему про космічних загарбників",
+    "Sends the given message with a space themed effect": "Надсилає це повідомлення з космічними ефектами",
+    "unknown person": "невідома особа",
+    "Sends the given message with snowfall": "Надсилає це повідомлення зі снігопадом",
+    "Sends the given message with fireworks": "Надсилає це повідомлення з феєрверком",
+    "Sends the given message with confetti": "Надсилає це повідомлення з конфеті",
+    "Use Ctrl + Enter to send a message": "Натисніть Ctrl + Enter, щоб надіслати повідомлення",
+    "Use Command + Enter to send a message": "Натисніть Command + Enter, щоб надіслати повідомлення",
+    "Send text messages as you in this room": "Надіслати текстові повідомлення у цю кімнату від свого імені",
+    "Send messages as you in your active room": "Надіслати повідомлення у свою активну кімнату від свого імені",
+    "Send messages as you in this room": "Надіслати повідомлення у цю кімнату від свого імені",
+    "Sends the given message as a spoiler": "Надсилає вказане повідомлення згорненим",
+    "Integration manager": "Менеджер інтеграцій",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Ваш %(brand)s не дозволяє вам користуватись для цього менеджером інтеграцій. Зверніться до адміністратора.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Користування цим розширенням може призвести до поширення ваших даних <helpIcon /> через %(widgetDomain)s і ваш менеджер інтеграцій.",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджери інтеграцій отримують дані конфігурації та можуть змінювати розширення, надсилати запрошення у кімнати й встановлювати рівні повноважень від вашого імені.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій для керування ботами, розширеннями й пакунками наліпок.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Використовувати менеджер інтеграцій <b>%(serverName)s</b> для керування ботами, розширеннями й пакунками наліпок.",
+    "Identity server": "Сервер ідентифікації",
+    "Identity server (%(server)s)": "Сервер ідентифікації (%(server)s)",
+    "Could not connect to identity server": "Не вдалося під'єднатися до сервера ідентифікації",
+    "There was an error looking up the phone number": "Сталася помилка під час пошуку номеру телефону",
+    "Unable to look up phone number": "Неможливо знайти номер телефону",
+    "Not trusted": "Не довірений",
+    "Trusted": "Довірений",
+    "This backup is trusted because it has been restored on this session": "Ця резервна копія довірена, оскільки її було відновлено у цьому сеансі",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Індивідуально перевіряйте кожен сеанс, який використовується користувачем, щоб позначити його довіреним, не довіряючи пристроям перехресного підписування.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Для забезпечення безпеки зробіть це особисто або скористайтесь надійним способом зв'язку.",
+    "You can change this at any time from room settings.": "Ви завжди можете змінити це у налаштуваннях кімнати.",
+    "Room settings": "Налаштування кімнати",
+    "Link to most recent message": "Посилання на останнє повідомлення",
+    "Share Room": "Поділитись кімнатою",
+    "Share room": "Поділитись кімнатою",
+    "Show files": "Показати файли",
+    "%(count)s people|one": "%(count)s осіб",
+    "%(count)s people|other": "%(count)s людей",
+    "Invite People": "Запросити людей",
+    "Invite people": "Запросити людей",
+    "Next": "Далі",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Дякуємо, що спробували Простори. Ваш відгук допоможе вдосконалити подальші версії.",
+    "Document": "Документ",
+    "Add to summary": "Додати до опису",
+    "Which rooms would you like to add to this summary?": "Які кімнати ви бажаєте додати до цього опису?",
+    "Add rooms to the community summary": "Додати кімнату до опису спільноти",
+    "Summary": "Опис",
+    "Service": "Служба",
+    "To continue you need to accept the terms of this service.": "Погодьтесь з Умовами надання послуг, щоб продовжити.",
+    "Terms of Service": "Умови надання послуг",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Докладніше про <privacyPolicyLink />, <termsOfServiceLink /> та <cookiePolicyLink />.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Погодьтесь з Умовами надання послуг сервера ідентифікації (%(serverName)s), щоб дозволити знаходити вас за адресою електронної пошти або за номером телефону.",
+    "The identity server you have chosen does not have any terms of service.": "Вибраний вами сервер ідентифікації не містить жодних умов користування.",
+    "Terms of service not accepted or the identity server is invalid.": "Умови користування не прийнято або сервер ідентифікації недійсний.",
+    "About homeservers": "Про домашні сервери",
+    "About": "Відомості",
+    "Learn more about how we use analytics.": "Докладніше про використовування нами аналітики.",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s змінює <a>прикріплене повідомлення</a> для кімнати.",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s викидає %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s викидає %(targetName)s: %(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s відкликає запрошення %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s відкликає запрошення %(targetName)s: %(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s розблоковує %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s виходить з кімнати",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s виходить з кімнати: %(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s відхиляє запрошення",
+    "%(senderName)s made no change": "%(senderName)s нічого не змінює",
+    "%(senderName)s set a profile picture": "%(senderName)s встановлює зображення профілю",
+    "%(senderName)s removed their profile picture": "%(senderName)s вилучає своє зображення профілю",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s вилучає своє видиме ім'я (%(oldDisplayName)s)",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s встановлює видимим іменем %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s змінює видиме ім'я на %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s блокує %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s блокує %(targetName)s: %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s запрошує %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s приймає запрошення",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s приймає запрошення до %(displayName)s",
+    "Converts the DM to a room": "Перетворює приватну бесіду на кімнату",
+    "Converts the room to a DM": "Перетворює кімнату на приватну бесіду",
+    "Some invites couldn't be sent": "Деякі запрошення неможливо надіслати",
+    "Failed to transfer call": "Не вдалося переадресувати виклик",
+    "Transfer Failed": "Не вдалося переадресувати",
+    "Unable to transfer call": "Не вдалося переадресувати дзвінок",
+    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Виберіть кімнати або бесіди, які потрібно додати. Це простір лише для вас, ніхто не буде поінформований. Пізніше ви можете додати більше.",
+    "Join the conference from the room information card on the right": "Приєднуйтесь до конференції з інформаційної картки кімнати праворуч",
+    "Room Info": "Відомості про кімнату",
+    "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). Ви можете спробувати передати ці дані адміністратору кімнати.",
+    "Room information": "Відомості про кімнату",
+    "Send voice message": "Надіслати голосове повідомлення",
+    "%(targetName)s joined the room": "%(targetName)s приєднується до кімнати",
+    "edited": "змінено",
+    "Edited at %(date)s. Click to view edits.": "Змінено %(date)s. Натисніть, щоб переглянути зміни.",
+    "Edited at %(date)s": "Змінено %(date)s",
+    "%(senderName)s changed their profile picture": "%(senderName)s змінює зображення профілю",
+    "Phone Number": "Телефонний номер",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sвиходить",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sвийшли %(count)s разів",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sвийшли",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sвийшли %(count)s разів",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "Language Dropdown": "Спадне меню мов",
+    "Information": "Відомості",
+    "Rotate Right": "Обернути праворуч",
+    "Rotate Left": "Обернути ліворуч",
+    "Zoom in": "Збільшити",
+    "Zoom out": "Зменшити",
+    "collapse": "згорнути",
+    "No results": "Немає результатів",
+    "Application window": "Вікно застосунку",
+    "Error - Mixed content": "Помилка — змішаний вміст",
+    "Widget ID": "ID розширення",
+    "%(brand)s URL": "URL-адреса %(brand)s",
+    "Your theme": "Ваша тема",
+    "Your user ID": "Ваш ID користувача",
+    "Your avatar URL": "URL-адреса вашого аватара",
+    "Unknown Address": "Невідома адреса",
+    "Cancel search": "Скасувати пошук",
+    "Quick Reactions": "Швидкі реакції",
+    "Categories": "Категорії",
+    "Flags": "Прапори",
+    "Symbols": "Символи",
+    "Objects": "Об'єкти",
+    "Travel & Places": "Подорожі та місця",
+    "Food & Drink": "Їжа та напої",
+    "Animals & Nature": "Тварини та природа",
+    "Smileys & People": "Емоджі та люди",
+    "Frequently Used": "Часто використовувані",
+    "Activities": "Діяльність",
+    "Failed to unban": "Не вдалося розблокувати",
+    "Banned by %(displayName)s": "Блокує %(displayName)s",
+    "Ban users": "Блокування користувачів",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s блокує вас у %(roomName)s",
+    "were banned %(count)s times|other": "заблоковані %(count)s разів",
+    "were banned %(count)s times|one": "заблоковані",
+    "was banned %(count)s times|other": "заблоковано %(count)s разів",
+    "was banned %(count)s times|one": "заблоковано",
+    "were unbanned %(count)s times|other": "розблоковані %(count)s разів",
+    "were unbanned %(count)s times|one": "розблоковані",
+    "was unbanned %(count)s times|other": "розблоковано %(count)s разів",
+    "was unbanned %(count)s times|one": "розблоковано",
+    "This is the beginning of your direct message history with <displayName/>.": "Це початок історії вашого особистого спілкування з <displayName/>.",
+    "Publish this room to the public in %(domain)s's room directory?": "Опублікувати цю кімнату для всіх у каталозі кімнат %(domain)s?",
+    "Recently Direct Messaged": "Недавно надіслані особисті повідомлення",
+    "User Directory": "Каталог користувачів",
+    "Room version:": "Версія кімнати:",
+    "Change topic": "Змінити тему",
+    "Change the topic of this room": "Змінити тему цієї кімнати",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sзмінює серверні права доступу",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sзмінює серверні права доступу %(count)s разів",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sзмінює серверні права доступу",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sзмінює серверні права доступу %(count)s разів",
+    "Change server ACLs": "Змінити серверні права доступу",
+    "Change permissions": "Змінити дозволи",
+    "Change room name": "Змінити назву кімнати",
+    "Change the name of this room": "Змінити назву цієї кімнати",
+    "Change history visibility": "Змінити видимість історії",
+    "Change main address for the room": "Змінити основну адресу кімнати",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s змінює аватар кімнати на <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s змінює аватар %(roomName)s",
+    "Change room avatar": "Змінити аватар кімнати",
+    "Change the avatar of this room": "Змінює аватар цієї кімнати",
+    "Modify widgets": "Змінити розширення",
+    "Notify everyone": "Сповістити всіх",
+    "Remove messages sent by others": "Вилучити повідомлення надіслані іншими",
+    "Kick users": "Викинути користувачів",
+    "Invite users": "Запросити користувачів",
+    "Select the roles required to change various parts of the room": "Виберіть ролі, необхідні для зміни різних частин кімнати",
+    "Default role": "Типова роль",
+    "Privileged Users": "Привілейовані користувачі",
+    "Roles & Permissions": "Ролі й дозволи",
+    "Main address": "Основна адреса",
+    "Error updating main address": "Помилка оновлення основної адреси",
+    "No other published addresses yet, add one below": "Поки немає загальнодоступних адрес, додайте їх унизу",
+    "Other published addresses:": "Інші загальнодоступні адреси:",
+    "Published addresses can be used by anyone on any server to join your room.": "Загальнодоступні адреси можуть бути використані будь-ким на будь-якому сервері для приєднання до вашої кімнати.",
+    "Published addresses can be used by anyone on any server to join your space.": "Загальнодоступні адреси можуть бути використані будь-ким на будь-якому сервері для приєднання до вашого простору.",
+    "Published Addresses": "Загальнодоступні адреси",
+    "Room Addresses": "Адреси кімнати",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Ваш ключ безпеки перебуває у теці <b>Завантажень</b>.",
+    "Error downloading audio": "Помилка завантаження аудіо",
+    "Download logs": "Завантажити журнали",
+    "Preparing to download logs": "Приготування до завантаження журналів",
+    "Download %(text)s": "Завантажити %(text)s",
+    "Download": "Завантажити",
+    "Error downloading theme information.": "Помилка завантаження відомостей теми.",
+    "Matrix Room ID": "Matrix ID кімнати",
+    "Room ID": "ID кімнати",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Не вдалося вилучити «%(roomName)s» з %(groupId)s",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ви впевнені, що хочете вилучити «%(roomName)s» з %(groupId)s?",
+    "Decide who can join %(roomName)s.": "Вкажіть, хто може приєднуватися до %(roomName)s.",
+    "Internal room ID:": "Внутрішній ID кімнати:",
+    "User %(userId)s is already invited to the room": "Користувача %(userId)s вже запрошено до кімнати",
+    "Original event source": "Оригінальний початковий код",
+    "View source": "Переглянути код",
+    "Report": "Поскаржитися",
+    "Send report": "Надіслати звіт",
+    "Report the entire room": "Поскаржитися на всю кімнату",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Те, що пише цей користувач, неправильно.\nПро це буде повідомлено модераторам кімнати.",
+    "Please fill why you're reporting.": "Будь ласка, вкажіть, чому ви скаржитеся.",
+    "Report a bug": "Повідомити про ваду",
+    "Share %(name)s": "Поділитися %(name)s",
+    "Share Community": "Поділитися спільнотою",
+    "Share User": "Поділитися користувачем",
+    "Share content": "Поділитися вмістом",
+    "Share entire screen": "Поділитися всім екраном",
+    "Any of the following data may be shared:": "Можна поділитися будь-якими з цих даних:",
+    "Unable to share phone number": "Не вдалося надіслати телефонний номер",
+    "Share": "Поділитись",
+    "Unable to share email address": "Не вдалося надіслати адресу е-пошти",
+    "Share invite link": "Надіслати запрошувальне посилання",
+    "%(sharerName)s is presenting": "%(sharerName)s показує",
+    "Yes": "Так",
+    "Invite to %(spaceName)s": "Запросити до %(spaceName)s",
+    "Share your public space": "Поділитися своїм загальнодоступним простором",
+    "Forward": "Переслати",
+    "Forward message": "Переслати повідомлення",
+    "Join the beta": "Долучитися до бета-тестування",
+    "Spaces are a new way to group rooms and people.": "Простори — це новий спосіб згуртувати кімнати та людей.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Створіть спільноту, щоб об’єднати користувачів та кімнати! Створіть власну домашню сторінку, щоб позначити своє місце у всесвіті Matrix.",
+    "Some suggestions may be hidden for privacy.": "Деякі пропозиції можуть бути сховані для приватності.",
+    "Privacy Policy": "Політика приватності",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Приватність важлива для нас, тому ми не збираємо жодних особистих або ідентифікаційних даних для нашої аналітики.",
+    "Privacy": "Приватність",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "Щоб допомогти учасникам простору знайти та приєднатися до приватної кімнати, перейдіть у налаштування безпеки й приватності цієї кімнати.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Захистіться від втрати доступу до зашифрованих повідомлень і даних створенням резервної копії ключів шифрування на своєму сервері.",
+    "Secure Backup": "Безпечне резервне копіювання",
+    "Give feedback.": "Надіслати відгук.",
+    "You may contact me if you have any follow up questions": "Можете зв’язатися зі мною, якщо у вас виникнуть додаткові запитання",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Ми надіслали іншим, але вказаних людей, не вдалося запросити до <RoomName/>",
+    "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.": "Ваш домашній сервер був недоступний і вхід не виконано. Повторіть спробу. Якщо це триватиме й далі, зверніться до адміністратора свого домашнього сервера.",
+    "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.": "Ми попросили переглядач запам’ятати, який домашній сервер ви використовуєте, щоб дозволити вам увійти, але, на жаль, ваш переглядач забув його. Перейдіть на сторінку входу та повторіть спробу.",
+    "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!",
+    "Almost there! Is %(displayName)s showing the same shield?": "Майже готово! Ваш %(displayName)s показує той самий щит?",
+    "Almost there! Is your other session showing the same shield?": "Майже готово! Ваш інший сеанс показує той самий щит?",
+    "Verify by scanning": "Підтвердити скануванням",
+    "Remove recent messages by %(user)s": "Вилучити останні повідомлення від %(user)s",
+    "Remove recent messages": "Видалити останні повідомлення",
+    "Edit devices": "Керувати пристроями",
+    "Home": "Домівка",
+    "New here? <a>Create an account</a>": "Вперше тут? <a>Створіть обліковий запис</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 Element with an existing Matrix account on a different homeserver.": "Ви можете використовувати власні опції сервера для входу на інші сервери Matrix, вказавши іншу URL-адресу домашнього сервера. Це дозволяє користуватись Element із наявним обліковим записом Matrix на іншому домашньому сервері.",
+    "Server Options": "Опції сервера",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Підтвердьте свою особу, щоб отримати доступ до зашифрованих повідомлень і довести свою справжність іншим.",
+    "Allow this widget to verify your identity": "Дозволити цьому розширенню перевіряти вашу особу",
+    "Verify this login": "Підтвердити цей вхід",
+    "Verify other login": "Підтвердити інший вхід",
+    "Use another login": "Інший обліковий запис",
+    "Use Security Key": "Використати ключ безпеки",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Без підтвердження ви не матимете доступу до всіх своїх повідомлень, а інші бачитимуть вас ненадійними.",
+    "New? <a>Create account</a>": "Вперше тут? <a>Створіть обліковий запис</a>",
+    "Forgotten your password?": "Забули свій пароль?",
+    "Forgot password?": "Забули пароль?",
+    "<userName/> invited you": "<userName/> запрошує вас",
+    "Username": "Ім'я користувача",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s або %(usernamePassword)s",
+    "Sign in with": "Увійти за допомогою",
+    "Sign in with SSO": "Увійти за допомогою SSO",
+    "Sign in": "Увійти",
+    "Got an account? <a>Sign in</a>": "Маєте обліковий запис? <a>Увійти</a>",
+    "Sign in instead": "Натомість увійти",
+    "Homeserver": "Домашній сервер",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s відкріплює повідомлення з цієї кімнати. Перегляньте всі прикріплені повідомлення.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s відкріплює <a>повідомлення</a> з цієї кімнати. Перегляньте всі <b>прикріплені повідомлення</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s прикріплює повідомлення до цієї кімнати. Перегляньте всі прикріплені повідомлення.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s прикріплює <a>повідомлення</a> до цієї кімнати. Перегляньте всі <b>прикріплені повідомлення</b>.",
+    "Verify this user by confirming the following number appears on their screen.": "Перевірте цього користувача, підтвердивши, що на екрані з'явилося таке число.",
+    "Verify this session by confirming the following number appears on its screen.": "Перевірте цей сеанс, підтвердивши, що на екрані з'явилося це число.",
+    "They don't match": "Вони не збігаються",
+    "They match": "Вони збігаються",
+    "Return to call": "Повернутися до виклику",
+    "Voice Call": "Голосовий виклик",
+    "Video Call": "Відеовиклик",
+    "Connecting": "З'єднання",
+    "All rooms you're in will appear in Home.": "Всі кімнати, до яких ви приєднались, з'являться в домівці.",
+    "Show all rooms in Home": "Показати всі кімнати в Домівці",
+    "Show chat effects (animations when receiving e.g. confetti)": "Показувати ефекти бесід (анімації отримання, наприклад, конфеті)",
+    "Autoplay videos": "Автовідтворення відео",
+    "Autoplay GIFs": "Автовідтворення GIF",
+    "Show stickers button": "Показати кнопку наліпок",
+    "%(senderName)s ended the call": "%(senderName)s завершує виклик",
+    "You ended the call": "Ви завершили виклик",
+    "Help space members find private rooms": "Допоможіть учасникам просторів знайти приватні кімнати",
+    "Learn more": "Докладніше",
+    "Help people in spaces to find and join private rooms": "Допоможіть людям у просторах знайти приватні кімнати та приєднатися до них",
+    "New in the Spaces beta": "Нове у бета-версії Просторів",
+    "New version of %(brand)s is available": "Доступна нова версія %(brand)s",
+    "Update %(brand)s": "Оновити %(brand)s",
+    "Check your devices": "Перевірити свої пристрої",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s з %(ip)s",
+    "This homeserver has been blocked by it's administrator.": "Цей домашній сервер заблокований його адміністратором.",
+    "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": "Використовуйте застосунок для зручності",
+    "Silence call": "Тихий виклик",
+    "Sound on": "Звук увімкнено",
+    "Enable desktop notifications": "Увімкнути сповіщення стільниці",
+    "Don't miss a reply": "Не пропустіть відповідей",
+    "Review to ensure your account is safe": "Перевірте, щоб переконатися, що ваш обліковий запис у безпеці",
+    "You have unverified logins": "У вас є не підтверджені сеанси",
+    "Error leaving room": "Помилка під час виходу з кімнати",
+    "This homeserver has been blocked by its administrator.": "Цей домашній сервер заблокований адміністратором.",
+    "See when the name changes in your active room": "Бачити, коли зміниться назва активної кімнати",
+    "Change the name of your active room": "Змінити назву активної кімнати",
+    "See when the name changes in 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 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 has updated the widget layout": "%(senderName)s оновлює макет розширення",
+    "See when the avatar changes in your active room": "Бачити, коли змінюється аватар вашої активної кімнати",
+    "Change the avatar of your active room": "Змінити аватар вашої активної кімнати",
+    "See when the avatar changes in this room": "Бачити, коли змінюється аватар цієї кімнати",
+    "Click the button below to confirm deleting these sessions.|other": "Клацніть на кнопку внизу, щоб підтвердити видалення цих сеансів.",
+    "Click the button below to confirm deleting these sessions.|one": "Клацніть на кнопку внизу, щоб підтвердити видалення цього сеансу.",
+    "Click the button below to confirm your identity.": "Клацніть на кнопку внизу, щоб підтвердити свою особу.",
+    "Confirm to continue": "Підтвердьте, щоб продовжити",
+    "Starting backup...": "Запуск резервного копіювання...",
+    "Now, let's help you get started": "Тепер допоможімо вам почати",
+    "Start authentication": "Почати автентифікацію",
+    "Start": "Почати",
+    "Start Verification": "Почати перевірку",
+    "Start chatting": "Почати спілкування",
+    "Start a new chat": "Почати нову бесіду",
+    "This is the start of <roomName/>.": "Це початок <roomName/>.",
+    "Start sharing your screen": "Почати показ екрана",
+    "Start the camera": "Запустити камеру",
+    "Scan this unique code": "Скануйте цей унікальний код",
+    "Verify this session by completing one of the following:": "Підтвердьте цей сеанс одним із запропонованих способів:",
+    "Leave %(groupName)s?": "Вийти з %(groupName)s?",
+    "Leave Community": "Вийти зі спільноти",
+    "Add a User": "Додати користувача",
+    "Add a Room": "Додати кімнату",
+    "Couldn't load page": "Не вдалося завантажити сторінку",
+    "Phone (optional)": "Телефон (не обов'язково)",
+    "That phone number doesn't look quite right, please check and try again": "Цей номер телефону не правильний. Перевірте та повторіть спробу",
+    "Enter phone number": "Введіть телефонний номер",
+    "Enter email address": "Введіть адресу е-пошти",
+    "Enter username": "Введіть ім'я користувача",
+    "Keep going...": "Продовжуйте...",
+    "Password is allowed, but unsafe": "Пароль дозволений, але небезпечний",
+    "Nice, strong password!": "Хороший надійний пароль!",
+    "Enter password": "Введіть пароль",
+    "A confirmation email has been sent to %(emailAddress)s": "Електронний лист із підтвердженням надіслано на адресу %(emailAddress)s",
+    "Please review and accept the policies of this homeserver:": "Перегляньте та прийміть політику цього домашнього сервера:",
+    "Please review and accept all of the homeserver's policies": "Перегляньте та прийміть усі правила домашнього сервера",
+    "Confirm your identity by entering your account password below.": "Підтвердьте свою особу, ввівши внизу пароль до свого облікового запису.",
+    "Open the link in the email to continue registration.": "Відкрийте посилання в електронному листі, щоб продовжити реєстрацію.",
+    "A text message has been sent to %(msisdn)s": "Текстове повідомлення надіслано на %(msisdn)s",
+    "Code": "Код",
+    "Please enter the code it contains:": "Введіть отриманий код:",
+    "Token incorrect": "Хибний токен",
+    "Country Dropdown": "Спадний список країн",
+    "User Status": "Статус користувача",
+    "Avatar": "Аватар",
+    "Tap for more info": "Торкніться, щоб переглянути подробиці",
+    "Move right": "Посунути праворуч",
+    "Move left": "Посунути ліворуч",
+    "Revoke permissions": "Відкликати дозвіл",
+    "Remove for everyone": "Прибрати для всіх",
+    "Delete widget": "Видалити розширення",
+    "Delete Widget": "Видалити розширення",
+    "View Community": "Переглянути спільноту",
+    "Move down": "Опустити",
+    "Move up": "Підняти",
+    "Set a new status...": "Установлення нового статусу...",
+    "Set status": "Налаштувати статус",
+    "Update status": "Оновити статус",
+    "Clear status": "Очистити статус",
+    "Manage & explore rooms": "Керування і перегляд кімнат",
+    "Add space": "Додати простір",
+    "Collapse reply thread": "Згорнути відповіді",
+    "Adding...": "Додавання...",
+    "Public space": "Загальнодоступний простір",
+    "Private space (invite only)": "Приватний простір (лише за запрошенням)",
+    "Space visibility": "Видимість простору",
+    "Space created": "Простір створено",
+    "Create Room": "Створити кімнату",
+    "Visible to space members": "Видима для учасників простору",
+    "Public room": "Загальнодоступна кімната",
+    "Private room (invite only)": "Приватна кімната (лише за запрошенням)",
+    "Room visibility": "Видимість кімнати",
+    "Topic (optional)": "Тема (не обов'язково)",
+    "Create a private room": "Створити приватну кімнату",
+    "Create a public room": "Створити загальнодоступну кімнату",
+    "Create a room in %(communityName)s": "Створити кімнату в %(communityName)s",
+    "Create a room": "Створити кімнату",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Усі в <SpaceName/> зможуть знайти та приєднатися до цієї кімнати.",
+    "Please enter a name for the room": "Введіть назву кімнати",
+    "example": "приклад",
+    "Community ID": "ID спільноти",
+    "Example": "Приклад",
+    "Community Name": "Назва спільноти",
+    "Create Community": "Створити спільноту",
+    "Something went wrong whilst creating your community": "Під час створення вашої спільноти щось пішло не так",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID спільноти повинне містити лише символи a-z, 0-9, або «=_-./»",
+    "Community IDs cannot be empty.": "ID спільноти не може бути порожнім.",
+    "An image will help people identify your community.": "Зображення допоможе людям ідентифікувати вашу спільноту.",
+    "Reason (optional)": "Причина (не обов'язково)",
+    "Add image (optional)": "Додати зображення (не обов'язково)",
+    "Enter name": "Ввести назву",
+    "What's the name of your community or team?": "Як називається ваша спільнота чи команда?",
+    "You can change this later if needed.": "За потреби, це можна змінити пізніше.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Використовуйте його, коли ділитесь своєю спільнотою з іншими. ID спільноти змінити неможливо.",
+    "Community ID: +<localpart />:%(domain)s": "ID спільноти: +<localpart />:%(domain)s",
+    "Clear all data": "Очистити всі дані",
+    "Clear all data in this session?": "Очистити всі дані сеансу?",
+    "Confirm Removal": "Підтвердити вилучення",
+    "Removing…": "Вилучення…",
+    "Invite people to join %(communityName)s": "Запросити людей приєднатися до %(communityName)s",
+    "Send %(count)s invites|one": "Надіслати %(count)s запрошення",
+    "Send %(count)s invites|other": "Надіслати %(count)s запрошень",
+    "Show": "Показати",
+    "Hide": "Сховати",
+    "People you know on %(brand)s": "Люди, котрих ви знаєте у %(brand)s",
+    "Add another email": "Додати іншу адресу е-пошти",
+    "Notes": "Примітки",
+    "GitHub issue": "Обговорення на GitHub",
+    "Close dialog": "Закрити діалогове вікно",
+    "Invite anyway": "Усе одно запросити",
+    "Invite anyway and never warn me again": "Усе одно запросити й більше не попереджати",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Неможливо знайти профілі для Matrix ID, перерахованих унизу — все одно бажаєте запросити їх?",
+    "The following users may not exist": "Таких користувачів може не існувати",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Спробуйте скористатися одним із таких допустимих типів адрес: %(validTypesList)s.",
+    "You have entered an invalid address.": "Ви ввели хибну адресу.",
+    "That doesn't look like a valid email address": "Це не схоже на правильну адресу е-пошти",
+    "email address": "адреса е-пошти",
+    "Adding spaces has moved.": "Додавання просторів переміщено.",
+    "Search for rooms": "Пошук кімнат",
+    "Create a new room": "Створити нову кімнату",
+    "Want to add a new room instead?": "Хочете додати нову кімнату натомість?",
+    "Add existing rooms": "Додати наявні кімнати",
+    "Space selection": "Вибір простору",
+    "Adding rooms... (%(progress)s out of %(count)s)|one": "Додавання кімнат...",
+    "Adding rooms... (%(progress)s out of %(count)s)|other": "Додавання кімнат... (%(progress)s з %(count)s)",
+    "Not all selected were added": "Не всі вибрані додано",
+    "Search for spaces": "Пошук просторів",
+    "Create a new space": "Створити новий простір",
+    "Want to add a new space instead?": "Хочете натомість цього додати новий простір?",
+    "Add existing space": "Додати наявний простір",
+    "Matrix rooms": "Кімнати Matrix",
+    "%(networkName)s rooms": "Кімнати %(networkName)s",
+    "Add a new server...": "Додати новий сервер...",
+    "Server name": "Назва сервера",
+    "Enter the name of a new server you want to explore.": "Введіть назву нового сервера, який ви хочете переглянути.",
+    "Add a new server": "Додати новий сервер",
+    "Matrix": "Matrix",
+    "Remove server": "Вилучити сервер",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Ви справді бажаєте вилучити <b>%(serverName)s</b>",
+    "Show preview": "Попередній перегляд",
+    "Resend %(unsentCount)s reaction(s)": "Повторно надіслати %(unsentCount)s реакцій",
+    "Your server": "Ваш сервер",
+    "You are not allowed to view this server's rooms list": "Вам не дозволено переглядати список кімнат цього сервера",
+    "Looks good": "Все добре",
+    "Enter a server name": "Введіть назву сервера",
+    "And %(count)s more...|other": "І ще %(count)s...",
+    "Sign in with single sign-on": "Увійти за допомогою єдиного входу",
+    "Continue with %(provider)s": "Продовжити з %(provider)s",
+    "Join millions for free on the largest public server": "Приєднуйтесь безплатно до мільйонів інших на найбільшому загальнодоступному сервері",
+    "Unable to reject invite": "Не вдалося відхилити запрошення",
+    "This address is already in use": "Ця адреса вже використовується",
+    "This address is available to use": "Ця адреса доступна",
+    "Please provide an address": "Будь ласка, вкажіть адресу",
+    "Some characters not allowed": "Деякі символи не дозволені",
+    "e.g. my-room": "наприклад, моя-кімната",
+    "Room address": "Адреса кімнати",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не вдалося завантажити подію, на яку було надано відповідь, її або не існує, або у вас немає дозволу на її перегляд.",
+    "QR Code": "QR-код",
+    "Spaces": "Простори",
+    "Custom level": "Власний рівень",
+    "Matrix ID": "Matrix ID",
+    "%(featureName)s beta feedback": "%(featureName)s відгук про бета-версію",
+    "To leave the beta, visit your settings.": "Щоб вийти з бета-тестування, перейдіть до налаштувань.",
+    "Spaces is a beta feature": "Простори — це бета-функція",
+    "Beta": "Бета",
+    "Leave the beta": "Вийти з бета-тестування",
+    "[number]": "[цифра]",
+    "Upload a file": "Вивантажити файл",
+    "New line": "Новий рядок",
+    "Ctrl": "Ctrl",
+    "Super": "Super",
+    "Shift": "Shift",
+    "Alt Gr": "Правий Alt",
+    "Alt": "Alt",
+    "Autocomplete": "Автозаповнення",
+    "Room List": "Перелік кімнат",
+    "Calls": "Виклики",
+    "Navigation": "Навігація",
+    "Disable": "Вимкнути",
+    "Import": "Імпорт",
+    "File to import": "Файл для імпорту",
+    "Your Security Key": "Ваш ключ безпеки",
+    "User Autocomplete": "Автозаповнення користувача",
+    "Users": "Користувачі",
+    "Space Autocomplete": "Автозаповнення простору",
+    "Room Autocomplete": "Автозаповнення кімнати",
+    "Notification Autocomplete": "Автозаповнення сповіщення",
+    "Room Notification": "Сповіщення кімнати",
+    "Notify the whole room": "Сповістити всю кімнату",
+    "Community Autocomplete": "Автозаповнення спільноти",
+    "Command Autocomplete": "Команда автозаповнення",
+    "Commands": "Команди",
+    "Your new session is now verified. Other users will see it as trusted.": "Тепер ваша новий сеанс тепер підтверджено. Інші користувачі побачать її довіреною.",
+    "Registration Successful": "Реєстрацію успішно виконано",
+    "You can now close this window or <a>log in</a> to your new account.": "Тепер можете закрити це вікно або <a>увійти</a> до свого нового облікового запису.",
+    "<a>Log in</a> to your new account.": "<a>Увійти</a> до нового облікового запису.",
+    "Continue with previous account": "Продовжити з попереднім обліковим записом",
+    "Set a new password": "Установити новий пароль",
+    "Return to login screen": "Повернутися на сторінку входу",
+    "Send Reset Email": "Надіслати електронного листа скидання пароля",
+    "Session verified": "Сеанс підтверджено",
+    "User settings": "Користувацькі налаштування",
+    "Community settings": "Налаштування спільноти",
+    "Switch theme": "Змінити тему",
+    "Inviting...": "Запрошення...",
+    "Just me": "Лише я",
+    "Make sure the right people have access to %(name)s": "Переконайтеся, що потрібні люди мають доступ до %(name)s",
+    "Who are you working with?": "З ким ви працюєте?",
+    "Go to my space": "Перейти до мого простору",
+    "Go to my first room": "Перейти до моєї першої кімнати",
+    "It's just you at the moment, it will be even better with others.": "Зараз це лише для вас, якщо додати ще когось буде цікавіше.",
+    "Search for rooms or spaces": "Пошук кімнат або просторів",
+    "What do you want to organise?": "Що б ви хотіли організувати?",
+    "Creating rooms...": "Створення кімнат...",
+    "Skip for now": "Пропустити зараз",
+    "Failed to create initial space rooms": "Не вдалося створити початкові кімнати простору",
+    "Room name": "Назва кімнати",
+    "Support": "Підтримка",
+    "Random": "Випадковий",
+    "Welcome to <name/>": "Вітаємо у <name/>",
+    "Created from <Community />": "Створено з <Community />",
+    "To view %(spaceName)s, you need an invite": "Щоб приєднатися до %(spaceName)s, потрібне запрошення",
+    "<inviter/> invites you": "<inviter/> запрошує вас",
+    "Private space": "Приватний простір",
+    "Search names and descriptions": "Шукати назви та описи",
+    "Rooms and spaces": "Кімнати й простори",
+    "Results": "Результати",
+    "You may want to try a different search or check for typos.": "Ви можете спробувати інший пошуковий запит або перевірити помилки.",
+    "No results found": "Нічого не знайдено",
+    "Your server does not support showing space hierarchies.": "Ваш сервер не підтримує показ ієрархій простору.",
+    "Mark as suggested": "Позначити рекомендованим",
+    "Mark as not suggested": "Позначити не рекомендованим",
+    "Removing...": "Вилучення...",
+    "Failed to remove some rooms. Try again later": "Не вдалося вилучити кілька кімнат. Повторіть спробу пізніше",
+    "Select a room below first": "Спочатку виберіть кімнату внизу",
+    "Suggested": "Пропоновано",
+    "This room is suggested as a good one to join": "Ця кімната пропонується як хороша для приєднання",
+    "You don't have permission": "Ви не маєте дозволу",
+    "Explore rooms in %(communityName)s": "Переглянути кімнати у %(communityName)s",
+    "No results for \"%(query)s\"": "За запитом «%(query)s» нічого не знайдено",
+    "View": "Перегляд",
+    "Preview": "Попередній перегляд",
+    "Filter all spaces": "Фільтрувати всі простори",
+    "You can select all or individual messages to retry or delete": "Ви можете вибрати всі або окремі повідомлення, щоб повторити спробу або видалити",
+    "Retry all": "Повторити надсилання всіх",
+    "Delete all": "Видалити всі",
+    "Some of your messages have not been sent": "Деякі з ваших повідомлень не надіслано",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Цей сеанс <b>не створює резервну копію ваших ключів</b>, але у вас є резервна копія, з якої ви можете їх відновити.",
+    "Your keys are <b>not being backed up from this session</b>.": "<b>Резервна копія ваших ключів не створюється з цього сеансу</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Створіть резервну копію ключів перед виходом, щоб не втратити їх.",
+    "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.": "Резервне копіювання ключів шифрування з даними вашого облікового запису на випадок втрати доступу до сеансів. Ваші ключі будуть захищені унікальним ключем безпеки.",
+    "Backup key stored:": "Резервну копію ключа розміщено:",
+    "Backup key cached:": "Резервну копію ключа кешовано:",
+    "This session is backing up your keys. ": "Цей сеанс створює резервну копію ваших ключів. ",
+    "Unable to load key backup status": "Не вдалося завантажити стан резервного копіювання ключа",
+    "The operation could not be completed": "Неможливо завершити операцію",
+    "Failed to save your profile": "Не вдалося зберегти ваш профіль",
+    "There was an error loading your notification settings.": "Сталася помилка під час завантаження налаштувань сповіщень.",
+    "Mentions & keywords": "Згадки та ключові слова",
+    "Global": "Глобально",
+    "New keyword": "Нове ключове слово",
+    "Keyword": "Ключове слово",
+    "Enable email notifications for %(email)s": "Увімкнути сповіщення е-поштою для %(email)s",
+    "Enable for this account": "Увімкнути для цього облікового запису",
+    "An error occurred whilst saving your notification preferences.": "Сталася помилка під час збереження налаштувань сповіщень.",
+    "Error saving notification preferences": "Помилка збереження налаштувань сповіщень",
+    "Messages containing keywords": "Повідомлення, що містять ключові слова",
+    "Message bubbles": "Бульбашки повідомлень",
+    "Modern": "Сучасний",
+    "IRC": "IRC",
+    "Message layout": "Макет повідомлення",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Це оновлення дозволить учасникам обраних просторів доступитися до цієї кімнати без запрошення.",
+    "Space members": "Учасники простору",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Будь-хто у просторі може знайти та приєднатися. Можна вибрати кілька просторів.",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Будь-хто у <spaceName/> може знайти та приєднатися. Ви можете вибрати інші простори.",
+    "Spaces with access": "Простори з доступом",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Будь-хто у просторі може знайти та приєднатися. <a>Укажіть, які простори можуть отримати доступ сюди.</a>",
+    "Currently, %(count)s spaces have access|one": "На разі простір має доступ",
+    "contact the administrators of identity server <idserver />": "зв'язатися з адміністратором сервера ідентифікації <idserver />",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "перевірити плагіни переглядача на наявність будь-чого, що може заблокувати сервер ідентифікації (наприклад, Privacy Badger)",
+    "Disconnect from the identity server <idserver />?": "Від'єднатися від сервера ідентифікації <idserver />?",
+    "Disconnect identity server": "Від'єднатися від сервера ідентифікації",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Від'єднатися від сервера ідентифікації <current /> й натомість під'єднатися до <new />?",
+    "Change identity server": "Змінити сервер ідентифікації",
+    "Not a valid identity server (status code %(code)s)": "Хибний сервер ідентифікації (код статусу %(code)s)",
+    "Identity server URL must be HTTPS": "URL-адреса сервера ідентифікації повинна починатися з HTTPS",
+    "not ready": "не готове",
+    "ready": "готове",
+    "Secret storage:": "Таємне сховище:",
+    "Algorithm:": "Алгоритм:",
+    "Backup version:": "Версія резервної копії:",
+    "Currently, %(count)s spaces have access|other": "На разі доступ мають %(count)s просторів",
+    "& %(count)s more|one": "і ще %(count)s",
+    "& %(count)s more|other": "і ще %(count)s",
+    "Upgrade required": "Потрібне оновлення",
+    "Anyone can find and join.": "Будь-хто може знайти та приєднатися.",
+    "Only invited people can join.": "Приєднатися можуть лише запрошені люди.",
+    "Private (invite only)": "Приватно (лише за запрошенням)",
+    "Message search initialisation failed": "Не вдалося ініціалізувати пошук повідомлень",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Безпечно кешуйте зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку, використовуючи %(size)s для зберігання повідомлень з %(rooms)s кімнат.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Безпечно кешуйте зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку, використовуючи %(size)s для зберігання повідомлень з %(rooms)s кімнат.",
+    "Confirm deleting these sessions": "Підтвердити видалення цих сеансів",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Підтвердити видалення цього сеансу скориставшись єдиним входом, щоб підтвердити свою особу.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Підтвердити видалення цих сеансів скориставшись єдиним входом, щоб підтвердити свою особу.",
+    "Unable to load session list": "Неможливо завантажити список сеансів",
+    "Your homeserver does not support session management.": "Ваш домашній сервер не підтримує керування сеансами.",
+    "Homeserver feature support:": "Підтримка функції домашнім сервером:",
+    "User signing private key:": "Приватний ключ підпису користувача:",
+    "Self signing private key:": "Самопідписаний приватний ключ:",
+    "not found locally": "не знайдено локально",
+    "cached locally": "кешовано локально",
+    "Master private key:": "Головний приватний ключ:",
+    "not found in storage": "не знайдено у сховищі",
+    "in secret storage": "у таємному сховищі",
+    "Reset": "Скинути",
+    "Cross-signing is not set up.": "Перехресне підписування не налаштовано.",
+    "Cross-signing is ready but keys are not backed up.": "Перехресне підписування готове, але резервна копія ключів не створюється.",
+    "Cross-signing is ready for use.": "Перехресне підписування готове до користування.",
+    "Passwords don't match": "Паролі відрізняються",
+    "Channel: <channelLink/>": "Канал: <channelLink/>",
+    "Workspace: <networkLink/>": "Робочий простір: <networkLink/>",
+    "Space options": "Параметри простору",
+    "Collapse": "Згорнути",
+    "Expand": "Розгорнути",
+    "Recommended for public spaces.": "Рекомендовано для загальнодоступних просторів.",
+    "Allow people to preview your space before they join.": "Дозвольте людям переглядати ваш простір, перш ніж вони приєднаються.",
+    "Preview Space": "Попередній перегляд простору",
+    "Failed to update the visibility of this space": "Не вдалось оновити видимість цього простору",
+    "Decide who can view and join %(spaceName)s.": "Визначте хто може переглядати та приєднатися до %(spaceName)s.",
+    "Visibility": "Видимість",
+    "This may be useful for public spaces.": "Це може бути корисним для загальнодоступних просторів.",
+    "Guests can join a space without having an account.": "Гості можуть приєднатися до простору без облікового запису.",
+    "Enable guest access": "Увімкнути гостьовий доступ",
+    "Hide advanced": "Сховати розширені",
+    "Failed to update the history visibility of this space": "Не вдалося оновити видимість історії цього простору",
+    "Failed to update the guest access of this space": "Не вдалося оновити гостьовий доступ до цього простору",
+    "Leave Space": "Вийти з простору",
+    "Save Changes": "Зберегти зміни",
+    "Saving...": "Збереження...",
+    "Edit settings relating to your space.": "Змінити налаштування, що стосуються вашого простору.",
+    "Failed to save space settings.": "Не вдалося зберегти налаштування простору.",
+    "Invite with email or username": "Запросити за допомогою е-пошти або імені користувача",
+    "Copied!": "Скопійовано!",
+    "Click to copy": "Клацніть, щоб скопіювати",
+    "Collapse space panel": "Згорнути панель простору",
+    "Expand space panel": "Розгорнути панель простору",
+    "All rooms": "Усі кімнати",
+    "Show all rooms": "Показати всі кімнати",
+    "Create": "Створити",
+    "Creating...": "Створення...",
+    "You can change these anytime.": "Ви можете змінити це будь-коли.",
+    "Add some details to help people recognise it.": "Додайте якісь подробиці, щоб допомогти людям дізнатися про нього.",
+    "Your private space": "Ваш приватний простір",
+    "Your public space": "Ваш загальнодоступний простір",
+    "Go back": "Назад",
+    "Invite only, best for yourself or teams": "Лише за запрошенням, найкраще для себе чи для команди",
+    "Private": "Приватний",
+    "Open space for anyone, best for communities": "Відкритий простір для будь-кого, найкраще для спільнот",
+    "Public": "Загальнодоступний",
+    "You can change this later.": "Ви можете змінити це пізніше.",
+    "What kind of Space do you want to create?": "Який простір ви хочете створити?",
+    "Create a space": "Створити простір",
+    "Address": "Адреса",
+    "e.g. my-space": "наприклад, мій-простір",
+    "Spaces feedback": "Відгук про простори",
+    "Spaces are a new feature.": "Простори — це нова функція.",
+    "Please enter a name for the space": "Будь ласка, введіть назву простору",
+    "Description": "Опис",
+    "Name": "Назва",
+    "Delete": "Видалити",
+    "Delete avatar": "Видалити аватар",
+    "Your server isn't responding to some <a>requests</a>.": "Ваш сервер не відповідає на деякі <a>запити</a>.",
+    "Select room from the room list": "Вибрати кімнату з переліку",
+    "Collapse room list section": "Згорнути розділ з переліком кімнат",
+    "Go to Home View": "Перейти до домівки",
+    "Cancel All": "Скасувати все",
+    "Upload %(count)s other files|one": "Вивантажити %(count)s інший файл",
+    "Settings - %(spaceName)s": "Налаштування — %(spaceName)s",
+    "Refresh": "Оновити",
+    "Send Logs": "Надіслати журнали",
+    "Spam or propaganda": "Спам чи пропаганда",
+    "Illegal Content": "Протиправний вміст",
+    "Toxic Behaviour": "Токсична поведінка",
+    "Email (optional)": "Е-пошта (необов'язково)",
+    "Search spaces": "Пошук просторів",
+    "Select spaces": "Вибрати простори",
+    "%(count)s rooms|one": "%(count)s кімната",
+    "%(count)s rooms|other": "%(count)s кімнат",
+    "%(count)s members|one": "%(count)s учасник",
+    "%(count)s members|other": "%(count)s учасників",
+    "Value in this room:": "Значення у цій кімнаті:",
+    "Value:": "Значення:",
+    "Level": "Рівень",
+    "Caution:": "Попередження:",
+    "Setting:": "Налаштування:",
+    "Value in this room": "Значення у цій кімнаті",
+    "Value": "Значення",
+    "Setting ID": "ID налаштувань",
+    "Failed to save settings": "Не вдалося зберегти налаштування",
+    "There was an error finding this widget.": "Сталася помилка під час пошуку розширення.",
+    "Active Widgets": "Активні розширення",
+    "Verification Requests": "Запит перевірки",
+    "There was a problem communicating with the server. Please try again.": "Виникла проблема зв'язку з сервером. Повторіть спробу."
 }
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index eebbaef3d0..7bc986ae66 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -1,7 +1,7 @@
 {
     "This email address is already in use": "Email này hiện đã được sử dụng",
     "This phone number is already in use": "Số điện thoại này hiện đã được sử dụng",
-    "Failed to verify email address: make sure you clicked the link in the email": "Xác thực email thất bại: hãy đảm bảo bạn nhấp đúng đường dẫn đã gửi vào email",
+    "Failed to verify email address: make sure you clicked the link in the email": "Xác thực email thất bại: Hãy đảm bảo bạn nhấp đúng đường dẫn đã gửi vào email",
     "The platform you're on": "Nền tảng bạn đang tham gia",
     "The version of %(brand)s": "Phiên bản của %(brand)s",
     "Your language of choice": "Ngôn ngữ bạn chọn",
@@ -9,25 +9,17 @@
     "Whether or not you're logged in (we don't record your username)": "Dù bạn có đăng nhập hay không (chúng tôi không lưu tên đăng nhập của bạn)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Dù bạn có dùng chức năng Richtext của Rich Text Editor hay không",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Dù bạn có dùng chức năng breadcrumbs hay không (avatar trên danh sách phòng)",
-    "e.g. %(exampleValue)s": "ví dụ %(exampleValue)s",
+    "e.g. %(exampleValue)s": "Ví dụ %(exampleValue)s",
     "Every page you use in the app": "Mọi trang bạn dùng trong app",
-    "e.g. <CurrentPageURL>": "ví dụ <CurrentPageURL>",
+    "e.g. <CurrentPageURL>": "Ví dụ <CurrentPageURL>",
     "Your device resolution": "Độ phân giải thiết bị",
     "Analytics": "Phân tích",
     "The information being sent to us to help make %(brand)s better includes:": "Thông tin gửi lên máy chủ giúp cải thiện %(brand)s bao gồm:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Trường hợp trang này chứa thông tin định danh như phòng chat, người dùng hoặc mã nhóm, dữ liệu định danh sẽ được loại bỏ trước khi gửi lên máy chủ.",
     "Call Failed": "Cuộc gọi thất bại",
-    "Call Timeout": "Hết thời hạn gọi",
-    "The remote side failed to pick up": "Phía được gọi không thể trả lời",
-    "Unable to capture screen": "Không thể chụp màn hình",
-    "Existing Call": "Thoát khỏi cuộc gọi",
-    "You are already in a call.": "Bạn hiện đang trong một cuộc gọi.",
     "VoIP is unsupported": "VoIP không được hỗ trợ",
     "You cannot place VoIP calls in this browser.": "Bạn không thể gọi VoIP với trình duyệt này.",
     "You cannot place a call with yourself.": "Bạn không thể tự gọi cho chính mình.",
-    "Call in Progress": "Đang trong cuộc gọi",
-    "A call is currently being placed!": "Một cuộc gọi hiện đang được thực hiện!",
-    "A call is already in progress!": "Một cuộc gọi đang diễn ra!",
     "Permission Required": "Quyền được yêu cầu",
     "You do not have permission to start a conference call in this room": "Bạn không đủ quyền để khởi tạo một cuộc gọi nhóm trong phòng này",
     "Replying With Files": "Trả lời với tập tin",
@@ -84,7 +76,7 @@
     "Dismiss": "Bỏ qua",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s không có đủ quyền để gửi notification - vui lòng kiểm tra thiết lập trình duyệt",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s không được cấp quyền để gửi notification - vui lòng thử lại",
-    "Unable to enable Notifications": "Không thể bật Notification",
+    "Unable to enable Notifications": "Không thể bật thông báo",
     "This email address was not found": "Địa chỉ email này không tồn tại trong hệ thống",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Email của bạn không được liên kết với một mã Matrix ID nào trên Homeserver này.",
     "Register": "Đăng ký",
@@ -95,7 +87,6 @@
     "Operation failed": "Tác vụ thất bại",
     "Failed to invite": "Không thể mời",
     "Failed to invite users to the room:": "Mời thành viên vào phòng chat thất bại:",
-    "Failed to invite the following users to the %(roomName)s room:": "Không thể mời các thành viên sau vào phòng chat %(roomName)s:",
     "You need to be logged in.": "Bạn phải đăng nhập.",
     "You need to be able to invite users to do that.": "Bạn cần có khả năng mời người dùng để làm được việc này.",
     "Unable to create widget.": "Không thể tạo widget.",
@@ -110,9 +101,6 @@
     "Missing user_id in request": "Thiếu user_id trong yêu cầu",
     "Usage": "Mức sử dụng",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Xem ¯\\_(ツ)_/¯ là ký tự thông thường",
-    "Searches DuckDuckGo for results": "Tìm với DuckDuckGo",
-    "/ddg is not a command": "/ddg không phải là một câu lệnh",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Để sử dụng, hãy đợi kết quả tìm kiếm được hiển thị và chọn đối tượng.",
     "Upgrades a room to a new version": "Cập nhật phòng lên phiên bản mới",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Cảnh báo</b>: Nâng cấp phòng sẽ <i>không tự động mời thành viên vào phòng mới.</i> Thành viên sẽ phải click vào đường link đến phòng mới để tham gia.",
     "Changes your display nickname": "Đổi tên hiển thị của bạn",
@@ -145,26 +133,6 @@
     "Sends the given message coloured as a rainbow": "Gửi nội dung tin nhắn được tô màu cầu vồng",
     "Sends the given emote coloured as a rainbow": "Gửi hình emote được tô màu cầu vồng",
     "Reason": "Lí do",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s chấp nhận lời mời cho %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s chấp thuận lời mời.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s yêu cầu cuộc gọi hội nghị.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s mời %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s cấm %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s đổi tên thành %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s đặt tên hiển thị thành %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s loại bỏ tên hiển thị (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s loại bỏ hình đại diện của họ.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s đổi hình đại diện của họ.",
-    "%(senderName)s set a profile picture.": "%(senderName)s thiết lập hình đại diện.",
-    "%(senderName)s made no change.": "%(senderName)s không tạo thay đổi gì.",
-    "VoIP conference started.": "Cuộc gọi hội nghị bắt đầu.",
-    "%(targetName)s joined the room.": "%(targetName)s tham gia phòng.",
-    "VoIP conference finished.": "Cuộc gọi hội nghị kết thúc.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s từ chối lời mời.",
-    "%(targetName)s left the room.": "%(targetName)s đã rời phòng.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s gỡ lệnh cấm %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s rút lại lời mời %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s loại ra %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s đổi chủ đề thành \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s loại bỏ tên phòng chat.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s đổi tên phòng thành %(roomName)s.",
@@ -182,12 +150,6 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s thiết lập địa chỉ chính cho phòng thành %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s đã loại địa chỉ chính của phòng.",
     "Someone": "Ai đó",
-    "(not supported by this browser)": "(không hỗ trợ bởi trình duyệt)",
-    "%(senderName)s answered the call.": "%(senderName)s đã trả lời cuộc gọi.",
-    "(could not connect media)": "(không thể kết nối media)",
-    "(no answer)": "(không trả lời)",
-    "(unknown failure: %(reason)s)": "(thất bại: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s đã ngắt cuộc gọi.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s đã thu hồi lời mời %(targetDisplayName)s tham gia phòng.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s đã mời %(targetDisplayName)s tham gia phòng.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s đã đặt lịch sử phòng chat xem được bởi thành viên, tính từ lúc thành viên được mời.",
@@ -206,7 +168,7 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s và một người khác đang gõ …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s và %(lastPerson)s đang gõ …",
     "Cannot reach homeserver": "Không thể kết nối tới máy chủ",
-    "Ensure you have a stable internet connection, or get in touch with the server admin": "Đảm bảo bạn có kết nối Internet ổn địn, hoặc liên hệ Admin để được hỗ trợ",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Đảm bảo bạn có kết nối Internet ổn định, hoặc liên hệ quản trị viên để được hỗ trợ",
     "Your %(brand)s is misconfigured": "Hệ thống %(brand)s của bạn bị thiết lập sai",
     "Cannot reach identity server": "Không thể kết nối server định danh",
     "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.": "Bạn có thể đăng ký, nhưng một vài chức năng sẽ không sử đụng dược cho đến khi server định danh hoạt động trở lại. Nếu bạn thấy thông báo này, hãy kiểm tra thiết lập hoặc liên hệ Admin.",
@@ -276,9 +238,6 @@
     "Show read receipts sent by other users": "Hiển thị báo đã đọc gửi bởi người dùng khác",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Hiển thị thời gian theo mẫu 12 giờ (ví dụ 2:30pm)",
     "Always show message timestamps": "Luôn hiện mốc thời gian",
-    "Autoplay GIFs and videos": "Tự chạy file GIF và video",
-    "Always show encryption icons": "Luôn hiện biểu tượng mã hóa",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Hiện lời nhắc mở chức năng Phục hồi tin an toàn ở các phòng mã hóa",
     "Enable automatic language detection for syntax highlighting": "Bật chức năng tự động xác định ngôn ngữ đẻ hiển thị quy tắc",
     "Show avatars in user and room mentions": "Hiện hình đại diện ở phòng và người dùng được đề cập",
     "Enable big emoji in chat": "Bật chức năng emoji lớn ở tin nhắn",
@@ -286,14 +245,70 @@
     "Automatically replace plain text Emoji": "Tự động thay thế hình biểu tượng",
     "Mirror local video feed": "Lập đường dẫn video dự phòng",
     "Enable Community Filter Panel": "Bật khung bộ lọc cộng đồng",
-    "Allow Peer-to-Peer for 1:1 calls": "Cho cuộc gọi trực tiếp 1:1",
     "Send analytics data": "Gửi dữ liệu phân tích",
     "Enable inline URL previews by default": "Bật hiển thị mặc định xem trước nội dung đường link",
     "Enable URL previews for this room (only affects you)": "Bật hiển thị xem trước nội dung đường link trong phòng này (chỉ tác dụng với bạn)",
     "Enable URL previews by default for participants in this room": "Bật mặc định xem trước nội dung đường link cho mọi người trong phòng",
-    "Room Colour": "Màu phòng chat",
     "Enable widget screenshots on supported widgets": "Bật widget chụp màn hình cho các widget có hỗ trợ",
     "Sign In": "Đăng nhập",
     "Explore rooms": "Khám phá phòng chat",
-    "Create Account": "Tạo tài khoản"
+    "Create Account": "Tạo tài khoản",
+    "Theme": "Giao diện",
+    "Success": "Thành công",
+    "Ignore": "Không chấp nhận",
+    "Bug reporting": "Báo cáo lỗi",
+    "Vietnam": "Việt Nam",
+    "Video Call": "Gọi Video",
+    "Voice call": "Gọi thoại",
+    "%(senderName)s started a call": "%(senderName)s đã bắt đầu một cuộc gọi",
+    "You started a call": "Bạn đã bắt đầu một cuộc gọi",
+    "Call ended": "Cuộc gọi kết thúc",
+    "%(senderName)s ended the call": "%(senderName)s đã kết thúc cuộc gọi",
+    "You ended the call": "Bạn đã kết thúc cuộc gọi",
+    "Call in progress": "Cuộc gọi đang diễn ra",
+    "%(senderName)s joined the call": "%(senderName)s đã tham gia cuộc gọi",
+    "You joined the call": "Bạn đã tham gia cuộc gọi",
+    "Feedback": "Phản hồi",
+    "Invites": "Mời",
+    "Video call": "Gọi video",
+    "This account has been deactivated.": "Tài khoản này đã bị vô hiệu hoá.",
+    "Start": "Bắt đầu",
+    "or": "hoặc",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Các tin nhắn với người dùng này được mã hóa đầu cuối và các bên thứ ba không thể đọc được.",
+    "You've successfully verified this user.": "Bạn đã xác minh thành công người dùng này.",
+    "Verified!": "Đã xác minh!",
+    "Play": "Phát",
+    "Pause": "Tạm ngừng",
+    "Accept": "Chấp nhận",
+    "Decline": "Từ chối",
+    "Are you sure?": "Bạn có chắc không?",
+    "Confirm Removal": "Xác Nhận Loại Bỏ",
+    "Removing…": "Đang xóa…",
+    "Removing...": "Đang xóa...",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Thử cuộn lên trong dòng thời gian để xem có cái nào trước đó không.",
+    "No recent messages by %(user)s found": "Không tìm thấy tin nhắn gần đây của %(user)s",
+    "Failed to ban user": "Đã có lỗi khi chặn người dùng",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Bạn có chắc chắn rằng bạn muốn rời '%(roomName)s' chứ?",
+    "Use an email address to recover your account": "Sử dụng địa chỉ email của bạn để khôi phục tài khoản của bạn",
+    "Sign in": "Đăng nhập",
+    "Confirm adding phone number": "Xác nhận việc thêm số điện thoại",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Xác nhận việc thêm số điện thoại này bằng cách sử dụng Single Sign On để chứng minh danh tính của bạn",
+    "Add Email Address": "Thêm Địa Chỉ Email",
+    "Click the button below to confirm adding this email address.": "Nhấn vào nút dưới đây để xác nhận việc thêm địa chỉ email này.",
+    "Confirm adding email": "Xác nhận việc thêm email",
+    "Add Phone Number": "Thêm Số Điện Thoại",
+    "Click the button below to confirm adding this phone number.": "Nhấn vào nút dưới đây để xác nhận việc thêm số điện thoại này.",
+    "Confirm": "Xác nhận",
+    "No other application is using the webcam": "Không có ứng dụng nào khác đang sử dụng webcam",
+    "Permission is granted to use the webcam": "Quyền được cấp để sử dụng webcam",
+    "A microphone and webcam are plugged in and set up correctly": "Micro và webcam đã được cắm và thiết lập đúng cách",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Cuộc gọi không thành công vì không thể truy cập webcam hoặc micrô. Kiểm tra xem:",
+    "Unable to access webcam / microphone": "Không thể truy cập webcam / micro",
+    "The call could not be established": "Không thể thiết lập cuộc gọi",
+    "The user you called is busy.": "Người dùng mà bạn gọi đang bận",
+    "User Busy": "Người dùng đang bận",
+    "Your user agent": "Hành động của bạn",
+    "Single Sign On": "Đăng nhập một lần",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Xác nhận việc thêm địa chỉ email này bằng cách sử dụng Single Sign On để chứng minh danh tính của bạn.",
+    "Use Single Sign On to continue": "Sử dụng Signle Sign On để tiếp tục"
 }
diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index 75ab903ebe..c06456bc57 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -18,17 +18,9 @@
     "The information being sent to us to help make %(brand)s better includes:": "D’informoasje da noar uus wor verstuurd vo %(brand)s te verbetern betreft:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Woar da da blad hier identificeerboare informoasje bevat, gelyk e gespreks-, gebruukers- of groeps-ID, goan deze gegevens verwyderd wordn voorda ze noa de server gestuurd wordn.",
     "Call Failed": "Iproep mislukt",
-    "Call Timeout": "Iproeptime-out",
-    "The remote side failed to pick up": "Den andere kant èt nie ipgepakt",
-    "Unable to capture screen": "Kostege geen schermafdruk moakn",
-    "Existing Call": "Bestoanden iproep",
-    "You are already in a call.": "Je zyt al in gesprek.",
     "VoIP is unsupported": "VoIP wor nie oundersteund",
     "You cannot place VoIP calls in this browser.": "J’en kut in deezn browser gin VoIP-iproepen pleegn.",
     "You cannot place a call with yourself.": "J’en ku jezelve nie belln.",
-    "Call in Progress": "Loopnd gesprek",
-    "A call is currently being placed!": "’t Wordt al een iproep gemakt!",
-    "A call is already in progress!": "’t Es al e gesprek actief!",
     "Permission Required": "Toestemmienge vereist",
     "You do not have permission to start a conference call in this room": "J’en èt geen toestemmienge voor in da groepsgesprek hier e vergoaderiengsgesprek te begunn",
     "Replying With Files": "Beantwoordn me bestandn",
@@ -96,7 +88,6 @@
     "Operation failed": "Handelienge es mislukt",
     "Failed to invite": "Uutnodign es mislukt",
     "Failed to invite users to the room:": "Kostege de volgende gebruukers hier nie uutnodign:",
-    "Failed to invite the following users to the %(roomName)s room:": "Uutnodign van de volgende gebruukers in gesprek %(roomName)s es mislukt:",
     "You need to be logged in.": "Hiervoorn moe je angemeld zyn.",
     "You need to be able to invite users to do that.": "Hiervoorn moe je gebruukers kunn uutnodign.",
     "Unable to create widget.": "Kostege de widget nie anmoakn.",
@@ -111,9 +102,6 @@
     "Missing user_id in request": "user_id ountbrikt in verzoek",
     "Usage": "Gebruuk",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór e bericht zounder ipmoak",
-    "Searches DuckDuckGo for results": "Zoekt ip DuckDuckGo achter resultoatn",
-    "/ddg is not a command": "/ddg is geen ipdracht",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Voor ’t te gebruukn, wacht je toutda de automatisch angevulde resultoatn zyn geloadn en tab je derdeure.",
     "Upgrades a room to a new version": "Actualiseert ’t gesprek tout e nieuwe versie",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let ip</b>: ’t ipwoardeern van e gesprek goa <i>gespreksleedn nie automatisch verplatsn noa de nieuwe versie van ’t gesprek</i>. We goan e koppelienge noa ’t nieuw gesprek in d’oude versie van ’t gesprek platsn - gespreksleedn goan ton ip deze koppeliengen moetn klikkn vo ’t nieuw gesprek toe te treedn.",
     "Changes your display nickname": "Verandert je weergavenoame",
@@ -145,25 +133,6 @@
     "Sends the given message coloured as a rainbow": "Verstuurt ’t gegeevn bericht in regenboogkleurn",
     "Sends the given emote coloured as a rainbow": "Verstuurt de gegeevn emoticon in regenboogkleurn",
     "Reason": "Reedn",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s èt d’uutnodigienge vo %(displayName)s anveird.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s èt een uutnodigienge anveird.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s èt e VoIP-vergoaderienge angevroagd.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s èt %(targetName)s uutgenodigd.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s èt %(targetName)s verbann.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s èt zyn/heur weergavenoame gewyzigd noa %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s èt zyn/heur weergavenoame ingesteld ip %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s èt zyn/heur weergavenoame (%(oldDisplayName)s) verwyderd.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s èt zyn/heur profielfoto verwyderd.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s èt e nieuwe profielfoto ingesteld.",
-    "%(senderName)s set a profile picture.": "%(senderName)s èt e profielfoto ingesteld.",
-    "VoIP conference started.": "VoIP-vergoaderienge begunn.",
-    "%(targetName)s joined the room.": "%(targetName)s es tout ’t gesprek toegetreedn.",
-    "VoIP conference finished.": "VoIP-vergadering beëindigd.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s èt d’uutnodigienge geweigerd.",
-    "%(targetName)s left the room.": "%(targetName)s is uut ’t gesprek deuregegoan.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s èt %(targetName)s ountbann.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s èt %(targetName)s ’t gesprek uutgestuurd.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s èt d’uutnodigienge van %(targetName)s ingetrokkn.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s èt ’t ounderwerp gewyzigd noa ‘%(topic)s’.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s èt de gespreksnoame verwyderd.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s èt de gespreksnoame gewyzigd noa %(roomName)s.",
@@ -181,12 +150,6 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s èt %(address)s als hoofdadresse vo dit gesprek ingesteld.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s èt ’t hoofdadresse vo dit gesprek verwyderd.",
     "Someone": "Etwien",
-    "(not supported by this browser)": "(nie oundersteund deur dezen browser)",
-    "%(senderName)s answered the call.": "%(senderName)s èt den iproep beantwoord.",
-    "(could not connect media)": "(kan media nie verbindn)",
-    "(no answer)": "(geen antwoord)",
-    "(unknown failure: %(reason)s)": "(ounbekende foute: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s èt ipgehangn.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s èt d’uutnodigienge vo %(targetDisplayName)s vo toe te treedn tout ’t gesprek ingetrokkn.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s èt %(targetDisplayName)s in ’t gesprek uutgenodigd.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s èt de toekomstige gespreksgeschiedenisse zichtboar gemakt voor alle gespreksleedn, vanaf de moment dan ze uutgenodigd gewist zyn.",
@@ -267,9 +230,6 @@
     "Show read receipts sent by other users": "Deur andere gebruukers verstuurde leesbevestigiengn toogn",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Tyd in 12-uursformoat weregeevn (bv. 2:30pm)",
     "Always show message timestamps": "Assan de tydstempels van berichtn toogn",
-    "Autoplay GIFs and videos": "GIF’s en filmtjes automatisch afspeeln",
-    "Always show encryption icons": "Versleuteriengspictogrammn assan toogn",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Herinnerienge toogn vo veilig berichtherstel in te schoakeln in versleuterde gesprekkn",
     "Enable automatic language detection for syntax highlighting": "Automatische toaldetectie vo zinsbouwmarkeriengn inschoakeln",
     "Show avatars in user and room mentions": "Avatars toogn wanneer da gebruukers of gesprekkn vermeld wordn",
     "Enable big emoji in chat": "Grote emoticons in gesprekkn inschoakeln",
@@ -277,20 +237,16 @@
     "Automatically replace plain text Emoji": "Tekst automatisch vervangn deur emoticons",
     "Mirror local video feed": "Lokoale videoanvoer ook elders ipsloan (spiegeln)",
     "Enable Community Filter Panel": "Gemeenschapsfilterpaneel inschoakeln",
-    "Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer toeloatn voor twigesprekkn",
     "Send analytics data": "Statistische gegeevns (analytics) verstuurn",
     "Enable inline URL previews by default": "Inline URL-voorvertoniengn standoard inschoakeln",
     "Enable URL previews for this room (only affects you)": "URL-voorvertoniengn in dit gesprek inschoakeln (geldt alleene vo joun)",
     "Enable URL previews by default for participants in this room": "URL-voorvertoniengn standoard vo de gebruukers in dit gesprek inschoakeln",
-    "Room Colour": "Gesprekskleur",
     "Enable widget screenshots on supported widgets": "Widget-schermafdrukkn inschoakeln ip oundersteunde widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Bevestigienge vroagn voda uutnodigiengn noar meuglik oungeldige Matrix-ID’s wordn verstuurd",
     "Show developer tools": "Ontwikkeliengsgereedschap toogn",
     "Show hidden events in timeline": "Verborgn gebeurtenissn ip de tydslyn weregeevn",
-    "Low bandwidth mode": "Lagebandbreedtemodus",
     "Collecting app version information": "App-versieinformoasje wor verzoameld",
     "Collecting logs": "Logboekn worden verzoameld",
-    "Uploading report": "Rapport wordt ipgeloaden",
     "Waiting for response from server": "Wachtn ip antwoord van de server",
     "Messages containing my display name": "Berichtn da myn weergavenoame bevattn",
     "Messages containing my username": "Berichtn da myn gebruukersnoame bevattn",
@@ -303,11 +259,6 @@
     "Call invitation": "Iproep-uutnodigienge",
     "Messages sent by bot": "Berichtn verzoundn deur e robot",
     "When rooms are upgraded": "Wanneer da gesprekkn ipgewoardeerd wordn",
-    "Active call (%(roomName)s)": "Actieven iproep (%(roomName)s)",
-    "unknown caller": "ounbekende beller",
-    "Incoming voice call from %(name)s": "Inkommende sproakiproep van %(name)s",
-    "Incoming video call from %(name)s": "Inkommende video-iproep van %(name)s",
-    "Incoming call from %(name)s": "Inkommenden iproep van %(name)s",
     "Decline": "Weigern",
     "Accept": "Anveirdn",
     "The other party cancelled the verification.": "De tegenparty èt de verificoasje geannuleerd.",
@@ -418,29 +369,10 @@
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s sleuters wordn geback-upt…",
     "All keys backed up": "Alle sleuters zyn geback-upt",
     "Advanced": "Geavanceerd",
-    "Backup version: ": "Back-upversie: ",
-    "Algorithm: ": "Algoritme: ",
     "Back up your keys before signing out to avoid losing them.": "Makt een back-up van je sleuters vooraleer da je jen afmeldt vo ze nie kwyt te speeln.",
     "Start using Key Backup": "Begint me de sleuterback-up te gebruukn",
-    "Error saving email notification preferences": "Foute by ’t ipsloan van de meldingsvoorkeurn voor e-mail",
-    "An error occurred whilst saving your email notification preferences.": "’t Es e foute ipgetreedn tydens ’t ipsloan van jen e-mailmeldingsvoorkeurn.",
-    "Keywords": "Trefwoordn",
-    "Enter keywords separated by a comma:": "Voegt trefwoordn toe, gescheidn door e komma:",
     "OK": "Oké",
-    "Failed to change settings": "Wyzign van d’instelliengn es mislukt",
-    "Can't update user notification settings": "Kostege de meldiengsinstelliengn van de gebruuker nie bywerkn",
-    "Failed to update keywords": "Bywerkn van trefwoordn es mislukt",
-    "Messages containing <span>keywords</span>": "Berichtn da <span>trefwoordn</span> bevattn",
-    "Notify for all other messages/rooms": "Stuurt e meldienge voor alle andere berichtn/gesprekkn",
-    "Notify me for anything else": "Stuurt e meldienge voor oal de reste",
-    "Enable notifications for this account": "Meldiengn inschoakeln vo dezen account",
-    "All notifications are currently disabled for all targets.": "Alle meldiengn zyn vo de moment uutgeschoakeld voor alle bestemmiengn.",
-    "Add an email address to configure email notifications": "Voegt een e-mailadresse toe voor e-mailmeldiengn in te stelln",
-    "Enable email notifications": "E-mailmeldiengn inschoakeln",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Meldiengn ip de volgende trefwoordn volgn regels dat hier nie kunn getoogd wordn:",
-    "Unable to fetch notification target list": "Kostege de bestemmiengslyste vo meldiengn nie iphoaln",
     "Notification targets": "Meldiengsbestemmiengn",
-    "Advanced notification settings": "Geavanceerde meldiengsinstelliengn",
     "Show message in desktop notification": "Bericht toogn in bureaubladmeldienge",
     "Off": "Uut",
     "On": "An",
@@ -475,16 +407,11 @@
     "Check for update": "Controleern ip updates",
     "Help & About": "Hulp & Info",
     "Bug reporting": "Foutmeldiengn",
-    "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.": "Als j’e foute via GitHub èt ingediend ghed, kunn foutipsporiengslogboekn uus helpn me ’t probleem te viendn. Foutipsporiengslogboekn bevattn gebruuksgegeevns van de toepassienge, woarounder je gebruukersnoame, de ID’s of bynoamn van de gesprekkn en groepn da je bezocht ghed èt, evenals de gebruukersnoamn van andere gebruukers. Ze bevattn geen berichtn.",
     "Submit debug logs": "Foutipsporiengslogboekn indienn",
     "FAQ": "VGV",
     "Versions": "Versies",
     "%(brand)s version:": "%(brand)s-versie:",
-    "olm version:": "olm-versie:",
     "Homeserver is": "Thuusserver es",
-    "Identity Server is": "Identiteitsserver es",
-    "Access Token:": "Toegangstoken:",
-    "click to reveal": "klikt vo te toogn",
     "Labs": "Experimenteel",
     "Notifications": "Meldiengn",
     "Start automatically after system login": "Automatisch startn achter systeemanmeldienge",
@@ -501,7 +428,6 @@
     "Bulk options": "Bulkopties",
     "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn anveirdn",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn weigern",
-    "Key backup": "Sleuterback-up",
     "Security & Privacy": "Veiligheid & privacy",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s verzoamelt anonieme analysegegeevns da ’t meuglik moakn van de toepassienge te verbetern.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy es belangryk voor uus, dus me verzoameln geen persoonlike of identificeerboare gegeevns voor uzze gegeevnsanalyse.",
@@ -547,7 +473,6 @@
     "Change settings": "Instelliengn wyzign",
     "Kick users": "Gebruukers uut ’t gesprek verwydern",
     "Ban users": "Gebruukers verbann",
-    "Remove messages": "Berichtn verwydern",
     "Notify everyone": "Iedereen meldn",
     "No users have specific privileges in this room": "Geen gebruukers èn specifieke privileges in dit gesprek",
     "Privileged Users": "Bevoorrechte gebruukers",
@@ -559,11 +484,7 @@
     "Select the roles required to change various parts of the room": "Selecteert de rolln vereist vo verschillende deeln van ’t gesprek te wyzign",
     "Enable encryption?": "Versleuterienge inschoakeln?",
     "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>": "Van zodra da de versleuterienge voor e gesprek es ingeschoakeld gewist, es ’t nie mi meuglik van ’t were uut te schoakeln. Berichtn da in e versleuterd gesprek wordn verstuurd wordn nie gezien deur de server, alleene moa deur de deelnemers an ’t gesprek. Deur de versleuterienge in te schoakeln kunn veel robots en overbruggiengen nie juste functioneern. <a>Leest meer over de versleuterienge.</a>",
-    "Guests cannot join this room even if explicitly invited.": "Gastn kunn nie tout dit gesprek toetreedn, zelfst nie as ze uutdrukkelik uutgenodigd gewist zyn.",
-    "Click here to fix": "Klikt hier vo dit ip te lossen",
     "Only people who have been invited": "Alleen menschn dat uutgenodigd gewist zyn",
-    "Anyone who knows the room's link, apart from guests": "Iedereen da de koppelienge van ’t gesprek kent, behalve gastn",
-    "Anyone who knows the room's link, including guests": "Iedereen da de koppelienge van ’t gesprek kent, inclusief gastn",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wyzigiengn an wie da de geschiedenisse ku leezn zyn alleene moa van toepassienge ip toekomstige berichtn in dit gesprek. De zichtboarheid van de bestoande geschiedenisse bluuft ongewyzigd.",
     "Anyone": "Iedereen",
     "Members only (since the point in time of selecting this option)": "Alleen deelnemers (vanaf de moment da deze optie wor geselecteerd)",
@@ -572,22 +493,10 @@
     "Encryption": "Versleuterienge",
     "Once enabled, encryption cannot be disabled.": "Eenmoal ingeschoakeld ku versleuterienge nie mi wordn uutgeschoakeld.",
     "Encrypted": "Versleuterd",
-    "Who can access this room?": "Wien èt der toegank tout dit gesprek?",
     "Who can read history?": "Wien kut de geschiedenisse leezn?",
-    "Cannot add any more widgets": "’t Kunn nie nog meer widgets toegevoegd wordn",
-    "The maximum permitted number of widgets have already been added to this room.": "’t Maximoal antal toegeloatn widgets es al an dit gesprek toegevoegd.",
-    "Add a widget": "Widget toevoegn",
-    "Drop File Here": "Versleep ’t bestand noar hier",
     "Drop file here to upload": "Versleep ’t bestand noar hier vo ’t ip te loaden",
-    " (unsupported)": " (nie oundersteund)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Deelneemn me <voiceText>sproak</voiceText> of <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Loopnd vergoaderiengsgesprek %(supportedText)s.",
     "This event could not be displayed": "Deze gebeurtenisse kostege nie weergegeevn wordn",
-    "%(senderName)s sent an image": "%(senderName)s èt e fotootje gestuurd",
-    "%(senderName)s sent a video": "%(senderName)s èt e filmtje gestuurd",
-    "%(senderName)s uploaded a file": "%(senderName)s èt e bestand ipgeloaden",
     "Key request sent.": "Sleuterverzoek verstuurd.",
-    "Please select the destination room for this message": "Selecteer ’t bestemmingsgesprek vo dit bericht",
     "Disinvite": "Uutnodigienge intrekkn",
     "Kick": "Uut ’t gesprek stuurn",
     "Disinvite this user?": "Uutnodigienge vo deze gebruuker intrekkn?",
@@ -630,11 +539,7 @@
     "Server error": "Serverfoute",
     "Server unavailable, overloaded, or something else went wrong.": "De server is ounbereikboar of overbelast, of der is etwat anders foutgegoan.",
     "Command error": "Ipdrachtfoute",
-    "No pinned messages.": "Geen vastgeprikte berichtn.",
     "Loading...": "Bezig me loadn…",
-    "Pinned Messages": "Vastgeprikte berichtn",
-    "Unpin Message": "Bericht losmoakn",
-    "Jump to message": "Noar bericht spriengn",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)su",
@@ -650,7 +555,6 @@
     "Seen by %(userName)s at %(dateTime)s": "Gezien deur %(userName)s om %(dateTime)s",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Gezien deur %(displayName)s (%(userName)s) om %(dateTime)s",
     "Replying": "An ’t beantwoordn",
-    "Direct Chat": "Twigesprek",
     "No rooms to show": "Geen gesprekkn vo te toogn",
     "Unnamed room": "Noamloos gesprek",
     "World readable": "Leesboar voor iedereen",
@@ -662,7 +566,6 @@
     "Forget room": "Gesprek vergeetn",
     "Search": "Zoekn",
     "Share room": "Gesprek deeln",
-    "Community Invites": "Gemeenschapsuutnodigiengn",
     "Invites": "Uutnodigiengn",
     "Favourites": "Favorietn",
     "Start chat": "Gesprek beginn",
@@ -698,12 +601,6 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s es vo de moment nie toegankelik.",
     "Try again later, or ask a room admin to check if you have access.": "Probeer ’t loater nog e ki, of vroag e gespreksbeheerder vo te controleern of da je wel toegank èt.",
     "%(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 es getoogd by ’t toetreedn van ’t gesprek. A je meent da je dit bericht foutief te zien krygt, gelieve ton <issueLink>e foutmeldienge in te dienn</issueLink>.",
-    "Never lose encrypted messages": "Speelt nooit je versleuterde berichtn kwyt",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "De berichtn in dit gesprek wordn beveiligd met eind-tout-eind-versleuterienge. Alleene d’ountvanger(s) en gy èn de sleuters vo deze berichtn te leezn.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Makt e veilige back-up van je sleuters vo ze nie kwyt te speeln. <a>Leest meer.</a>",
-    "Not now": "Nu nie",
-    "Don't ask me again": "Vroag ’t myn nie nog e ki",
-    "Add a topic": "Voegt een ounderwerp toe",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Dit gesprek actualiseern goat de huudige instantie van ’t gesprek sluutn, en e geactualiseerde versie ounder dezelfste noame anmoakn.",
     "This room has already been upgraded.": "Dit gesprek es al ipgewoardeerd gewist.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek droait ip groepsgespreksversie <roomVersion />, da deur deze thuusserver als <i>ounstabiel</i> gemarkeerd gewist es.",
@@ -743,7 +640,6 @@
     "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 versleuterde gesprekkn lyk dat hier zyn URL-voorvertoniengn standoard uutgeschoakeld, vo te voorkommn da je thuusserver (woa da de voorvertoniengn wordn gemakt) informoasje ku verzoameln over de koppeliengn da j’hiere ziet.",
     "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.": "A ’t er etwien een URL in e bericht invoegt, kut er een URL-voorvertonienge getoogd wordn me meer informoasje over de koppelienge, gelyk den titel, omschryvienge en e fotootje van de website.",
     "Members": "Leedn",
-    "Files": "Bestandn",
     "Sunday": "Zundag",
     "Monday": "Moandag",
     "Tuesday": "Diesndag",
@@ -753,7 +649,6 @@
     "Saturday": "Zoaterdag",
     "Today": "Vandoage",
     "Yesterday": "Gistern",
-    "Error decrypting audio": "Foute by ’t ountsleutern van ’t geluud",
     "Reply": "Beantwoordn",
     "Edit": "Bewerkn",
     "Options": "Opties",
@@ -797,39 +692,25 @@
     "Something went wrong when trying to get your communities.": "’t Ging etwa verkeerd by ’t iphoaln van je gemeenschappn.",
     "Display your community flair in rooms configured to show it.": "Toogt je gemeenschapsbadge in gesprekkn da doarvoorn ingesteld gewist zyn.",
     "You're not currently a member of any communities.": "Je zy vo de moment geen lid van e gemeenschap.",
-    "You are not receiving desktop notifications": "J’ontvangt vo de moment geen bureaubladmeldiengn",
-    "Enable them now": "Deze nu inschoakeln",
     "What's New": "Wuk es ’t er nieuw",
     "Update": "Bywerkn",
     "What's new?": "Wuk es ’t er nieuw?",
-    "Set Password": "Paswoord instelln",
     "Error encountered (%(errorDetail)s).": "’t Es e foute ipgetreedn (%(errorDetail)s).",
     "Checking for an update...": "Bezig me te controleern ip updates…",
     "No update available.": "Geen update beschikboar.",
     "Downloading update...": "Update wor gedownload…",
     "Warning": "Let ip",
     "Unknown Address": "Ounbekend adresse",
-    "Allow": "Toeloatn",
     "Delete Widget": "Widget verwydern",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "E widget verwydern doet da voor alle gebruukers in dit gesprek. Zy je zeker da je deze widget wil verwydern?",
     "Delete widget": "Widget verwydern",
-    "Failed to remove widget": "Widget kostege nie verwyderd wordn",
-    "An error ocurred whilst trying to remove the widget from the room": "’t Es e foute ipgetreedn by ’t verwydern van de widget uut dit gesprek",
-    "Minimize apps": "Apps minimaliseern",
-    "Maximize apps": "Apps maximaliseern",
     "Popout widget": "Widget in e nieuwe veinster openn",
     "Create new room": "E nieuw gesprek anmoakn",
     "Join": "Deelneemn",
     "No results": "Geen resultoatn",
     "Communities": "Gemeenschappn",
-    "You cannot delete this image. (%(code)s)": "Je kut dit fotootje nie verwydern. (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Ipgeloadn deur %(user)s ip %(date)s",
     "Rotate Left": "Links droain",
-    "Rotate counter-clockwise": "Tegen de klok in droain",
     "Rotate Right": "Rechts droain",
-    "Rotate clockwise": "Me de klok mee droain",
-    "Download this file": "Dit bestand downloadn",
-    "Manage Integrations": "Integroasjes beheern",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s zyn %(count)s kis toegetreedn",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s zyn toegetreedn",
@@ -886,10 +767,7 @@
     "Custom level": "Angepast niveau",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kostege de gebeurtenisse woarip da der gereageerd gewist was nie loadn. Allichte bestoa ze nie, of è je geen toeloatienge vo ze te bekykn.",
     "<a>In reply to</a> <pill>": "<a>As antwoord ip</a> <pill>",
-    "Room directory": "Gesprekscataloog",
     "And %(count)s more...|other": "En %(count)s meer…",
-    "ex. @bob:example.com": "bv. @jan:voorbeeld.be",
-    "Add User": "Gebruuker toevoegn",
     "Matrix ID": "Matrix-ID",
     "Matrix Room ID": "Matrix-gespreks-ID",
     "email address": "e-mailadresse",
@@ -904,7 +782,6 @@
     "Logs sent": "Logboekn verstuurd",
     "Thank you!": "Merci!",
     "Failed to send logs: ": "Verstuurn van logboekn mislukt: ",
-    "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.": "Foutipsporiengslogboekn bevattn gebruuksgegeevns over de toepassienge, inclusief je gebruukersnoame, de ID’s of bynoamn van de gesprekkn en groepn da j’è bezocht, evenals de gebruukersnoamn van andere gebruukers. Ze bevattn geen berichtn.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer da je logboekn indient, moe j’e <a>meldienge openn ip GitHub</a> woarin da je je probleem beschryft.",
     "GitHub issue": "GitHub-meldienge",
     "Notes": "Ipmerkiengn",
@@ -965,9 +842,6 @@
     "Manually export keys": "Sleuters handmatig exporteern",
     "You'll lose access to your encrypted messages": "Je goat de toegank tou je versleuterde berichtn kwytspeeln",
     "Are you sure you want to sign out?": "Zy je zeker da je je wilt afmeldn?",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Moest je foutn tegenkommn of voorstelln èn, lat ’t uus ton weetn ip GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Bekykt eest de <existingIssuesLink>bestoande meldiengn</existingIssuesLink> (en voegt e +1 toe woa da je wilt), of <newIssueLink>makt e nieuwe meldienge an</newIssueLink> indien da je der geen ku viendn, azo voorkom je da j’een duplicate meldienge indient.",
-    "Report bugs & give feedback": "Foutn meldn & feedback geevn",
     "Go back": "Were",
     "Room Settings - %(roomName)s": "Gespreksinstelliengn - %(roomName)s",
     "Failed to upgrade room": "Actualiseern van ’t gesprek is mislukt",
@@ -991,28 +865,12 @@
     "Email address": "E-mailadresse",
     "This will allow you to reset your password and receive notifications.": "Hierdoor goa je je paswoord kunn herinstell en meldiengn ountvangn.",
     "Skip": "Oversloan",
-    "A username can only contain lower case letters, numbers and '=_-./'": "E gebruukersnoame kut enkel kleine letters, cyfers en ‘=_-./’ bevattn",
-    "Username not available": "Gebruukersnoame nie beschikboar",
-    "Username invalid: %(errMessage)s": "Gebruukersnoame oungeldig: %(errMessage)s",
-    "An error occurred: %(error_string)s": "’t Is e foute ipgetreedn: %(error_string)s",
-    "Checking...": "Bezig me te controleern…",
-    "Username available": "Gebruukersnoame beschikboar",
-    "To get started, please pick a username!": "Kiest vo te begunn e gebruukersnoame!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dit goa jen accountnoame wordn ip de <span></span>-thuusserver, of je kut een <a>andere server</a> kiezn.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "A j’al e Matrix-account èt, ku je je direct <a>anmeldn</a>.",
-    "You have successfully set a password!": "J’èt e paswoord ingesteld!",
-    "You have successfully set a password and an email address!": "J’èt e paswoord en e-mailadresse ingesteld!",
-    "You can now return to your account after signing out, and sign in on other devices.": "Je kun nu werekeern noa jen account nada je j’afgemeld èt, en jen anmeldn ip andere toestelln.",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Onthoudt da je nog assan een e-mailadresse kut instelln in de gebruukersinstelliengn.",
-    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
-    "Please set a password!": "Stelt e paswoord in!",
     "Share Room": "Gesprek deeln",
     "Link to most recent message": "Koppelienge noa ’t recentste bericht",
     "Share User": "Gebruuker deeln",
     "Share Community": "Gemeenschap deeln",
     "Share Room Message": "Bericht uut gesprek deeln",
     "Link to selected message": "Koppelienge noa geselecteerd bericht",
-    "COPY": "KOPIEERN",
     "To help us prevent this in future, please <a>send us logs</a>.": "Gelieve <a>uus logboekn te stuurn</a> vo dit in de toekomst t’helpn voorkomn.",
     "Missing session data": "Sessiegegeevns ountbreekn",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Sommige sessiegegeevns, inclusief sleuters vo versleuterde berichtn, ountbreekn. Meldt jen af en were an vo dit ip te lossn, en herstelt de sleuters uut den back-up.",
@@ -1027,48 +885,25 @@
     "Upload %(count)s other files|one": "%(count)s overig bestand iploadn",
     "Cancel All": "Alles annuleern",
     "Upload Error": "Iploadfout",
-    "A widget would like to verify your identity": "E widget zou geirn jen identiteit willn verifieern",
-    "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.": "E widget ip %(widgetUrl)s zou geirn jen identiteit willn verifieern. Deur dit toe te loatn, goat de widget je gebruukers-ID kunn verifieern, mo geen handeliengn in joun noame kunn uutvoern.",
     "Remember my selection for this widget": "Onthoudt myn keuze vo deze widget",
-    "Deny": "Weigern",
     "Unable to load backup status": "Kostege back-upstatus nie loadn",
     "Unable to restore backup": "Kostege back-up nie herstelln",
     "No backup found!": "Geen back-up gevoundn!",
     "Failed to decrypt %(failedCount)s sessions!": "Ountsleutern van %(failedCount)s sessies is mislukt!",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let ip</b>: stelt sleuterback-up alleene moar in ip e vertrouwde computer.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelpaswoord in te geevn.",
     "Next": "Volgende",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "A je jen herstelpaswoord zy vergeetn, ku je <button1>jen herstelsleuter gebruukn</button1> of <button2>nieuwe herstelopties instelln</button2>",
-    "This looks like a valid recovery key!": "Dit is e geldigen herstelsleuter!",
-    "Not a valid recovery key": "Geen geldigen herstelsleuter",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelsleuter in te geevn.",
-    "Private Chat": "Privégesprek",
-    "Public Chat": "Openboar gesprek",
-    "Custom": "Angepast",
     "Reject invitation": "Uutnodigienge weigern",
     "Are you sure you want to reject the invitation?": "Zy je zeker da je d’uutnodigienge wil weigern?",
     "Unable to reject invite": "Kostege d’uutnodigienge nie weigern",
     "You cannot delete this message. (%(code)s)": "Je kut dit bericht nie verwydern. (%(code)s)",
     "Resend": "Herverstuurn",
-    "Cancel Sending": "Verstuurn annuleern",
-    "Forward Message": "Bericht deurestuurn",
-    "Pin Message": "Bericht vastprikkn",
     "View Source": "Bron bekykn",
-    "View Decrypted Source": "Ountsleuterde bron bekykn",
-    "Unhide Preview": "Voorvertonienge toogn",
-    "Share Permalink": "Permalink deeln",
-    "Share Message": "Bericht deeln",
     "Quote": "Citeern",
     "Source URL": "Bron-URL",
-    "Collapse Reply Thread": "Reactiekettienge toeklappn",
-    "Failed to set Direct Message status of room": "Instelln van twigesprekstoestand van gesprek is mislukt",
     "unknown error code": "ounbekende foutcode",
     "Failed to forget room %(errCode)s": "Vergeetn van gesprek is mislukt %(errCode)s",
-    "All messages (noisy)": "Alle berichtn (luud)",
     "All messages": "Alle berichtn",
-    "Mentions only": "Alleen vermeldiengn",
     "Leave": "Deuregoan",
-    "Forget": "Vergeetn",
     "Favourite": "Favoriet",
     "Low Priority": "Leige prioriteit",
     "Clear status": "Status wissn",
@@ -1081,34 +916,19 @@
     "Sign in": "Anmeldn",
     "powered by Matrix": "meuglik gemakt deur Matrix",
     "This homeserver would like to make sure you are not a robot.": "Deze thuusserver wil geirn weetn of da je gy geen robot zyt.",
-    "Custom Server Options": "Angepaste serverinstelliengn",
     "Please review and accept all of the homeserver's policies": "Gelieve ’t beleid van de thuusserver te leezn en ’anveirdn",
     "Please review and accept the policies of this homeserver:": "Gelieve ’t beleid van deze thuusserver te leezn en t’anveirdn:",
-    "An email has been sent to %(emailAddress)s": "’t Is een e-mail noa %(emailAddress)s verstuurd gewist",
-    "Please check your email to continue registration.": "Bekyk jen e-mails vo verder te goan me de registroasje.",
     "Token incorrect": "Verkeerd bewys",
     "A text message has been sent to %(msisdn)s": "’t Is een smse noa %(msisdn)s verstuurd gewist",
     "Please enter the code it contains:": "Gift de code in da ’t er in stoat:",
     "Code": "Code",
     "Submit": "Bevestign",
     "Start authentication": "Authenticoasje beginn",
-    "Unable to validate homeserver/identity server": "Kostege de thuus-/identiteitsserver nie valideern",
-    "Your Modular server": "Joun Modular-server",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Gift de locoasje van je Modular-thuusserver in. Deze kan jen eigen domeinnoame gebruukn, of e subdomein van <a>modular.im</a> zyn.",
-    "Server Name": "Servernoame",
-    "The email field must not be blank.": "’t E-mailveld meug nie leeg zyn.",
-    "The username field must not be blank.": "’t Gebruukersnoamveld meug nie leeg zyn.",
-    "The phone number field must not be blank.": "’t Telefongnumeroveld mug nie leeg zyn.",
-    "The password field must not be blank.": "’t Paswoordveld meug nie leeg zyn.",
     "Email": "E-mailadresse",
     "Username": "Gebruukersnoame",
     "Phone": "Telefongnumero",
-    "Not sure of your password? <a>Set a new one</a>": "Ounzeker over je paswoord? <a>Stelt er e nieuw in</a>",
-    "Sign in to your Matrix account on %(serverName)s": "Anmeldn me je Matrix-account ip %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Meldt jen an me je Matrix-account ip <underlinedServerName />",
     "Change": "Wyzign",
     "Sign in with": "Anmeldn me",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "A je geen e-mailadresse ingift, goa je je paswoord nie kunn herinstelln. Zy je zeker?",
     "Use an email address to recover your account": "Gebruukt een e-mailadresse vo jen account t’herstelln",
     "Enter email address (required on this homeserver)": "Gift een e-mailadresse in (vereist ip deze thuusserver)",
     "Doesn't look like a valid email address": "Dit ziet der nie uut lik e geldig e-mailadresse",
@@ -1119,33 +939,16 @@
     "Passwords don't match": "Paswoordn kommn nie overeen",
     "Other users can invite you to rooms using your contact details": "Andere gebruukers kunn jen in gesprekkn uutnodign ip basis van je contactgegeevns",
     "Enter phone number (required on this homeserver)": "Gift den telefongnumero in (vereist ip deze thuusserver)",
-    "Doesn't look like a valid phone number": "Dit ziet der nie uut lik e geldige telefongnumero",
     "Enter username": "Gift de gebruukersnoame in",
     "Some characters not allowed": "Sommige tekens zyn nie toegeloatn",
     "Email (optional)": "E-mailadresse (optioneel)",
     "Confirm": "Bevestign",
     "Phone (optional)": "Telefongnumero (optioneel)",
-    "Create your Matrix account on %(serverName)s": "Mak je Matrix-account an ip %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Mak je Matrix-account an ip <underlinedServerName />",
-    "Other servers": "Andere servers",
-    "Homeserver URL": "Thuusserver-URL",
-    "Identity Server URL": "Identiteitsserver-URL",
-    "Free": "Gratis",
     "Join millions for free on the largest public server": "Doe mee me miljoenen anderen ip de grotste publieke server",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium hosting voor organisoasjes <a>Leest meer</a>",
     "Other": "Overige",
-    "Find other public servers or use a custom server": "Zoekt achter andere publieke servers, of gebruukt een angepaste server",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, je browser werkt <b>nie</b> me %(brand)s.",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s gebruukt veel geavanceerde browserfuncties, woavan enkele nie (of slechts experimenteel) in je browser beschikboar zyn.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeert <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> vo de beste gebruukservoarienge.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Me jen huudigen browser kut de toepassienge der geheel verkeerd uutzien. ’t Is ook meuglik da nie alle functies werkn lyk of dan ze zoudn moetn. Je kut verdergoan a je ’t algelyk wil probeern, moa by probleemn zy je gy ’t dan ’t goa moetn iplossn!",
-    "I understand the risks and wish to continue": "’k Verstoan de risico’s en ’k willn geirn verdergoan",
     "Couldn't load page": "Kostege ’t blad nie loadn",
     "You must <a>register</a> to use this functionality": "Je moe je <a>registreern</a> vo deze functie te gebruukn",
     "You must join the room to see its files": "Je moe tout ’t gesprek toetreedn vo de bestandn te kunn zien",
-    "There are no visible files in this room": "’t Zyn geen zichtboare bestandn in dit gesprek",
-    "<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 vo joun gemeenschapsblad</h1>\n<p>\n    Gebruukt de lange beschryvienge vo nieuwe leden in de gemeenschap t’introduceern of vo belangryke <a href=\"foo\">koppeliengn</a> an te biedn.\n</p>\n<p>\n    Je ku zelfst ‘img’-tags gebruukn.\n</p>\n",
     "Add rooms to the community summary": "Voegt gesprekkn an ’t gemeenschapsoverzicht toe",
     "Which rooms would you like to add to this summary?": "Welke gesprekkn zou j’an dit overzicht willn toevoegn?",
     "Add to summary": "Toevoegn an ’t overzicht",
@@ -1190,7 +993,6 @@
     "Failed to reject invitation": "Weigern van d’uutnodigienge is mislukt",
     "This room is not public. You will not be able to rejoin without an invite.": "Dit gesprek is nie openboar. Zounder uutnodigienge goa je nie were kunn toetreedn.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Zy je zeker da je wilt deuregoan uut ’t gesprek ‘%(roomName)s’?",
-    "Failed to leave room": "Deuregoan uut gesprek is mislukt",
     "Can't leave Server Notices room": "Kostege nie deuregoan uut ’t servermeldiengsgesprek",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek wor gebruukt vo belangryke berichtn van de thuusserver, dus je kut der nie uut deuregoan.",
     "Signed Out": "Afgemeld",
@@ -1203,11 +1005,9 @@
     "Logout": "Afmeldn",
     "Your Communities": "Je gemeenschappn",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Wist je da: je gemeenschappn kun gebruukn vo je %(brand)s-belevienge te 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.": "Verslipt e gemeenschapsavatar noa ’t filterpaneel helegans links ip ’t scherm voor e filter in te stelln. Doarachter ku j’ip den avatar in ’t filterpaneel klikkn wanneer da je je wil beperkn tout de gesprekkn en menschn uut die gemeenschap.",
     "Error whilst fetching joined communities": "’t Is e foute ipgetreedn by ’t iphoaln van de gemeenschappn da je lid van zyt",
     "Create a new community": "Makt e nieuwe gemeenschap an",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Makt e gemeenschap an vo gebruukers en gesprekkn by makoar te briengn! Schep met e startblad ip moet jen eigen pleksje in ’t Matrix-universum.",
-    "You have no visible notifications": "J’è geen zichtboare meldiengn",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s kostege de protocollyste nie iphoaln van de thuusserver. Meugliks is de thuusserver te oud vo derdepartynetwerkn t’oundersteunn.",
     "%(brand)s failed to get the public room list.": "%(brand)s kostege de lyste met openboare gesprekkn nie verkrygn.",
     "The homeserver may be unavailable or overloaded.": "De thuusserver is meugliks ounbereikboar of overbelast.",
@@ -1224,14 +1024,8 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Je ku geen berichtn stuurn toutda je <consentLink>uzze algemene voorwoardn</consentLink> geleezn en anveird ghed èt.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Je bericht is nie verstuurd gewist omda deze thuusserver z’n limiet vo moandeliks actieve gebruukers bereikt ghed èt. Gelieve <a>contact ip te neemn me jen dienstbeheerder</a> vo de dienst te bluuvn gebruukn.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Je bericht is nie verstuurd gewist omda deze thuusserver e systeembronlimiet overschreedn ghed èt. Gelieve <a>contact ip te neemn me jen dienstbeheerder</a> vo de dienst te bluuvn gebruukn.",
-    "%(count)s of your messages have not been sent.|other": "Enkele van je berichtn zyn nie verstuurd gewist.",
-    "%(count)s of your messages have not been sent.|one": "Je bericht is nie verstuurd gewist.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alles nu herverstuurn</resendText> of <cancelText>annuleern</cancelText>. Je kut ook individuele berichtn selecteern vo ze t’herverstuurn of t’annuleern.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Bericht herverstuurn</resendText> of <cancelText>bericht annuleern</cancelText>.",
     "Connectivity to the server has been lost.": "De verbindienge me de server is verbrookn.",
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichtn goan ipgesloagn wordn toutda je verbindienge hersteld is.",
-    "Active call": "Actieven iproep",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "’t Is hier geen katte! Wil jen <inviteText>etwien uutnodign</inviteText> of <nowarnText>de woarschuwienge over ’t leeg gesprek stoppn</nowarnText>?",
     "Add room": "Gesprek toevoegn",
     "You seem to be uploading files, are you sure you want to quit?": "’t Ziet er noar uut da je bestandn an ’t iploadn zyt, zy je zeker da je wilt afsluutn?",
     "You seem to be in a call, are you sure you want to quit?": "’t Ziet er noar uut da je nog in gesprek zyt, zy je zeker da je wilt afsluutn?",
@@ -1242,17 +1036,11 @@
     "Failed to reject invite": "Weigern van d’uutnodigienge is mislukt",
     "You have %(count)s unread notifications in a prior version of this room.|other": "J’èt %(count)s oungeleezn meldiengn in e voorgoande versie van dit gesprek.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "J’èt %(count)s oungeleezn meldieng in e voorgoande versie van dit gesprek.",
-    "Fill screen": "Scherm vulln",
-    "Click to unmute video": "Klikt vo ’t geluud van ’t filmtje were an te zettn",
-    "Click to mute video": "Klikt vo ’t geluud van ’t filmtje uut te zettn",
-    "Click to unmute audio": "Klikt vo ’t geluud were an te zettn",
-    "Click to mute audio": "Klikt vo ’t geluud uut te zettn",
     "Clear filter": "Filter wissn",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "J’è geprobeerd van e gegeven punt in de tydslyn van dit gesprek te loadn, moa j’è geen toeloatienge vo ’t desbetreffend bericht te zien.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd voor e gegeven punt in de tydslyn van dit gesprek te loadn, moar kostege dit nie viendn.",
     "Failed to load timeline position": "Loadn van tydslynpositie is mislukt",
     "Guest": "Gast",
-    "Your profile": "Joun profiel",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere wordn ipgeloadn",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt ipgeloadn",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander wordn ipgeloadn",
@@ -1261,8 +1049,6 @@
     "The email address linked to your account must be entered.": "’t E-mailadresse da me joun account verboundn is moet ingegeevn wordn.",
     "A new password must be entered.": "’t Moet e nieuw paswoord ingegeevn wordn.",
     "New passwords must match each other.": "Nieuwe paswoordn moetn overeenkommn.",
-    "Your Matrix account on %(serverName)s": "Je Matrix-account ip %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Je Matrix-account ip <underlinedServerName />",
     "A verification email will be sent to your inbox to confirm setting your new password.": "’t Is e verificoasje-e-mail noa joun gestuurd gewist vo ’t instelln van je nieuw paswoord te bevestign.",
     "Send Reset Email": "E-mail voor herinstelln verstuurn",
     "Sign in instead": "Anmeldn",
@@ -1284,22 +1070,15 @@
     "Incorrect username and/or password.": "Verkeerde gebruukersnoame en/of paswoord.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Zy je dervan bewust da je jen anmeldt by de %(hs)s-server, nie by matrix.org.",
     "Failed to perform homeserver discovery": "Ountdekkn van thuusserver is mislukt",
-    "The phone number entered looks invalid": "Den ingegeevn telefongnumero ziet er oungeldig uut",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Deze thuusserver è geen anmeldiengsmethodes da door deze cliënt wordn oundersteund.",
-    "Error: Problem communicating with the given homeserver.": "Foute: probleem by communicoasje me de gegeevn thuusserver.",
     "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>.": "Je ku geen verbindienge moakn me de thuusserver via HTTP wanneer dat der een HTTPS-URL in je browserbalk stoat. Gebruukt HTTPS of <a>schoakelt ounveilige scripts in</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Geen verbindienge met de thuusserver - controleer je verbindienge, zorgt dervoorn dan ’t <a>SSL-certificoat van de thuusserver</a> vertrouwd is en dat der geen browserextensies verzoekn blokkeern.",
     "Sign in with single sign-on": "Anmeldn met enkele anmeldienge",
     "Create account": "Account anmoakn",
-    "Failed to fetch avatar URL": "Iphoaln van avatar-URL is mislukt",
-    "Set a display name:": "Stelt e weergavenoame in:",
-    "Upload an avatar:": "Loadt een avatar ip:",
     "Registration has been disabled on this homeserver.": "Registroasje is uutgeschoakeld ip deze thuusserver.",
     "Unable to query for supported registration methods.": "Kostege d’oundersteunde registroasjemethodes nie ipvroagn.",
     "This server does not support authentication with a phone number.": "Deze server biedt geen oundersteunienge voor authenticoasje met e telefongnumero.",
-    "Create your account": "Mak jen account an",
     "Commands": "Ipdrachtn",
-    "Results from DuckDuckGo": "Resultoatn van DuckDuckGo",
     "Emoji": "Emoticons",
     "Notify the whole room": "Loat dit an gans ’t groepsgesprek weetn",
     "Room Notification": "Groepsgespreksmeldienge",
@@ -1333,12 +1112,8 @@
     "Success!": "Gereed!",
     "Unable to create key backup": "Kostege de sleuterback-up nie anmoakn",
     "Retry": "Herprobeern",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Zounder veilig berichtherstel in te stelln, goa je je versleuterde berichtgeschiedenisse kwytspeeln wanneer da je jen afmeldt.",
-    "If you don't want to set this up now, you can later in Settings.": "A je dit nu nie wilt instelln, ku je ’t loater algelyk nog doen in d’instelliengn.",
     "Set up": "Instelln",
-    "Don't ask again": "Vroag ’t myn nie nog e ki",
     "New Recovery Method": "Nieuwe herstelmethode",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "’t Zyn e nieuw herstelpaswoord en e nieuwen herstelsleuter vo beveiligde berichtn gedetecteerd.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "A je gy deze nieuwe herstelmethode nie èt ingesteld, is ’t meuglik dat der een anvaller toegank tout jen account probeert te verkrygn. Wyzigt ounmiddellik jen accountpaswoord en stelt e nieuwe herstelmethode in in d’instelliengn.",
     "Go to Settings": "Goa noa d’instelliengn",
     "Set up Secure Messages": "Beveiligde berichtn instelln",
@@ -1374,7 +1149,6 @@
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Je nieuwen account (%(newAccountId)s) is geregistreerd, mo je zyt al angemeld met een anderen account (%(loggedInUserId)s).",
     "Continue with previous account": "Verdergoan me de vorigen account",
     "Show all": "Alles toogn",
-    "%(senderName)s made no change.": "%(senderName)s èn nietent gewyzigd.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s èn %(count)s kis nietent gewyzigd",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s èn nietent gewyzigd",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s èt %(count)s kis nietent gewyzigd",
@@ -1384,12 +1158,9 @@
     "Removing…": "Bezig me te verwydern…",
     "Clear all data": "Alle gegeevns wissn",
     "Your homeserver doesn't seem to support this feature.": "Je thuusserver biedt geen oundersteunienge vo deze functie.",
-    "Resend edit": "Bewerkienge herverstuurn",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s reactie(s) herverstuurn",
-    "Resend removal": "Verwyderienge herverstuurn",
     "Failed to re-authenticate due to a homeserver problem": "’t Heranmeldn is mislukt omwille van e probleem me de thuusserver",
     "Failed to re-authenticate": "’t Heranmeldn is mislukt",
-    "Identity Server": "Identiteitsserver",
     "Find others by phone or email": "Viendt andere menschn via hunder telefongnumero of e-mailadresse",
     "Be found by phone or email": "Wor gevoundn via je telefongnumero of e-mailadresse",
     "Use bots, bridges, widgets and sticker packs": "Gebruukt robottn, bruggn, widgets en stickerpakkettn",
@@ -1406,17 +1177,12 @@
     "Messages": "Berichtn",
     "Actions": "Acties",
     "Displays list of commands with usages and descriptions": "Toogt e lyste van beschikboare ipdrachtn, met hunder gebruukn en beschryviengn",
-    "Identity Server URL must be HTTPS": "Den identiteitsserver-URL moet HTTPS zyn",
-    "Not a valid Identity Server (status code %(code)s)": "Geen geldigen identiteitsserver (statuscode %(code)s)",
-    "Could not connect to Identity Server": "Kostege geen verbindienge moakn me den identiteitsserver",
     "Checking server": "Server wor gecontroleerd",
     "Disconnect from the identity server <idserver />?": "Wil je de verbindienge me den identiteitsserver <idserver /> verbreekn?",
     "Disconnect": "Verbindienge verbreekn",
-    "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.": "Je makt vo de moment gebruuk van <server></server> vo deur je contactn gevoundn te kunn wordn, en von hunder te kunn viendn. Je kut hierounder jen identiteitsserver wyzign.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Je makt vo de moment geen gebruuk van een identiteitsserver. Voegt der hierounder één toe vo deur je contactn gevoundn te kunn wordn en von hunder te kunn viendn.",
     "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 verbindienge me jen identiteitsserver verbreekn goat dervoorn zorgn da je nie mi deur andere gebruukers gevoundn goa kunn wordn, en dat andere menschn je nie via e-mail of telefong goan kunn uutnodign.",
-    "Integration Manager": "Integroasjebeheerder",
     "Discovery": "Ountdekkienge",
     "Deactivate account": "Account deactiveern",
     "Always show the window menu bar": "De veinstermenubalk alsan toogn",
@@ -1431,7 +1197,6 @@
     "Discovery options will appear once you have added a phone number above.": "Ountdekkiengsopties goan verschynn a j’e telefongnumero toegevoegd ghed èt.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "’t Is een smse versteur noa +%(msisdn)s. Gift de verificoasjecode in da derin stoat.",
     "Command Help": "Hulp by ipdrachtn",
-    "No identity server is configured: add one in server settings to reset your password.": "’t Is geen identiteitsserver geconfigureerd gewist: voegt der één toe in de serverinstelliengn vo je paswoord herin te stelln.",
     "Call failed due to misconfigured server": "Iproep mislukt door verkeerd gecounfigureerde server",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vroagt an den beheerder van je thuusserver (<code>%(homeserverDomain)s</code>) vo e TURN-server te counfigureern tenende jen iproepn betrouwboar te doen werkn.",
     "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 kut ook de publieke server ip <code>turn.matrix.org</code> gebruukn, mo da goa minder betrouwboar zyn, en goa jen IP-adresse me die server deeln. Je kut dit ook beheern in d’Instelliengn.",
@@ -1445,5 +1210,11 @@
     "Remove %(email)s?": "%(email)s verwydern?",
     "Remove %(phone)s?": "%(phone)s verwydern?",
     "Explore rooms": "Gesprekkn ountdekkn",
-    "Create Account": "Account anmoakn"
+    "Create Account": "Account anmoakn",
+    "Integration manager": "Integroasjebeheerder",
+    "Identity server": "Identiteitsserver",
+    "Identity server (%(server)s)": "Identiteitsserver (%(server)s)",
+    "Could not connect to identity server": "Kostege geen verbindienge moakn me den identiteitsserver",
+    "Not a valid identity server (status code %(code)s)": "Geen geldigen identiteitsserver (statuscode %(code)s)",
+    "Identity server URL must be HTTPS": "Den identiteitsserver-URL moet HTTPS zyn"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index af02a40587..7ed706b61a 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -2,7 +2,6 @@
     "Create Room": "创建聊天室",
     "Cryptography": "加密",
     "Current password": "当前密码",
-    "/ddg is not a command": "/ddg 不是一个命令",
     "Deactivate Account": "停用账号",
     "Decrypt %(text)s": "解密 %(text)s",
     "Default": "默认",
@@ -12,17 +11,14 @@
     "Email": "电子邮箱",
     "Email address": "邮箱地址",
     "Emoji": "表情",
-    "%(senderName)s ended the call.": "%(senderName)s 结束了通话。",
     "Error": "错误",
     "Error decrypting attachment": "解密附件时出错",
-    "Existing Call": "当前通话",
     "Export E2E room keys": "导出聊天室的端到端加密密钥",
     "Failed to ban user": "封禁失败",
     "Failed to change password. Is your password correct?": "修改密码失败。确认原密码输入正确吗？",
     "Failed to forget room %(errCode)s": "忘记聊天室失败，错误代码： %(errCode)s",
     "Failed to join room": "无法加入聊天室",
     "Failed to kick": "移除失败",
-    "Failed to leave room": "无法退出聊天室",
     "Failed to load timeline position": "无法加载时间轴位置",
     "Failed to mute user": "禁言用户失败",
     "Failed to reject invite": "拒绝邀请失败",
@@ -35,31 +31,26 @@
     "Failure to create room": "创建聊天室失败",
     "Favourite": "收藏",
     "Favourites": "收藏夹",
-    "Fill screen": "满屏显示",
     "Filter room members": "过滤聊天室成员",
     "Forget room": "忘记聊天室",
     "For security, this session has been signed out. Please sign in again.": "出于安全考虑，此会话已被注销。请重新登录。",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "即使有人主动邀请，游客也不能加入此聊天室。",
     "Hangup": "挂断",
     "Historical": "历史",
-    "Homeserver is": "主服务器是",
-    "Identity Server is": "身份认证服务器是",
+    "Homeserver is": "主服务器地址",
     "I have verified my email address": "我已经验证了我的邮箱地址",
     "Import E2E room keys": "导入聊天室端到端加密密钥",
     "Incorrect verification code": "验证码错误",
     "Invalid Email Address": "邮箱地址格式错误",
-    "Invalid file%(extra)s": "无效文件%(extra)s",
+    "Invalid file%(extra)s": "无效文件 %(extra)s",
     "Return to login screen": "返回登录页面",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s 没有通知发送权限 - 请检查你的浏览器设置",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s 没有通知发送权限 - 请重试",
     "%(brand)s version:": "%(brand)s 版本：",
     "Room %(roomId)s not visible": "聊天室 %(roomId)s 已隐藏",
-    "Room Colour": "聊天室颜色",
     "Rooms": "聊天室",
     "Search": "搜索",
     "Search failed": "搜索失败",
-    "Searches DuckDuckGo for results": "使用 DuckDuckGo 搜索",
     "Send Reset Email": "发送密码重设邮件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发送了一张图片。",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。",
@@ -68,14 +59,11 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "当前服务器可能处于不可用或过载状态，或者你遇到了一个 bug。",
     "Server unavailable, overloaded, or something else went wrong.": "服务器可能不可用、超载，或者其他东西出错了.",
     "Session ID": "会话 ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 将昵称改为了 %(displayName)s。",
     "Settings": "设置",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小时制显示时间戳 （如：下午 2:30）",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "使用 12 小时制显示时间戳 （下午 2:30）",
     "Signed Out": "已退出登录",
     "Sign in": "登录",
     "Sign out": "注销",
-    "%(count)s of your messages have not been sent.|other": "部分消息未发送。",
     "Someone": "某位用户",
     "Submit": "提交",
     "Success": "成功",
@@ -85,22 +73,15 @@
     "Advanced": "高级",
     "Always show message timestamps": "总是显示消息时间戳",
     "A new password must be entered.": "必须输入新密码。",
-    "%(senderName)s answered the call.": "%(senderName)s 接了通话。",
     "An error has occurred.": "发生了一个错误。",
     "Attachment": "附件",
-    "Autoplay GIFs and videos": "自动播放 GIF 与视频",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s.",
     "Ban": "封禁",
     "Banned users": "被封禁的用户",
-    "Click here to fix": "点击这里以修复",
     "Confirm password": "确认密码",
     "Continue": "继续",
     "Join Room": "加入聊天室",
-    "%(targetName)s joined the room.": "%(targetName)s 已加入聊天室。",
     "Jump to first unread message.": "跳到第一条未读消息。",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 移除了 %(targetName)s。",
     "Leave room": "退出聊天室",
-    "Add a topic": "添加主题",
     "Admin": "管理员",
     "Admin Tools": "管理员工具",
     "No Microphones detected": "未检测到麦克风",
@@ -115,45 +96,28 @@
     "and %(count)s others...|other": "和其它 %(count)s 个...",
     "and %(count)s others...|one": "和其它一个...",
     "Anyone": "任何人",
-    "Anyone who knows the room's link, apart from guests": "任何知道聊天室链接的人，游客除外",
-    "Anyone who knows the room's link, including guests": "任何知道聊天室链接的人，包括游客",
     "Are you sure?": "你确定吗？",
     "Are you sure you want to leave the room '%(roomName)s'?": "你确定要退出聊天室 “%(roomName)s” 吗？",
     "Are you sure you want to reject the invitation?": "你确定要拒绝邀请吗？",
     "Bans user with given id": "按照 ID 封禁用户",
-    "Call Timeout": "通话超时",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "无法连接主服务器 - 请检查网络连接，确保你的<a>主服务器 SSL 证书</a>被信任，且没有浏览器插件拦截请求。",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "当浏览器地址栏里有 HTTPS 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者<a>允许不安全的脚本</a>。",
     "Change Password": "修改密码",
-    "%(senderName)s changed their profile picture.": "%(senderName)s 修改了头像。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 将聊天室名称改为 %(roomName)s。",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 移除了聊天室名称。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 将话题修改为 “%(topic)s”。",
     "Changes your display nickname": "修改昵称",
-    "Click to mute audio": "点此静音",
-    "Click to mute video": "点此静音",
-    "click to reveal": "点击展开",
-    "Click to unmute video": "点此打开声音",
-    "Click to unmute audio": "点此打开声音",
     "Close": "关闭",
     "Command error": "命令错误",
     "Commands": "命令",
-    "Custom": "自定义",
     "Custom level": "自定义级别",
     "Decline": "拒绝",
-    "Drop File Here": "把文件拖拽到这里",
     "Enter passphrase": "输入密语",
-    "Error: Problem communicating with the given homeserver.": "错误: 与指定的主服务器通信时出错。",
     "Export": "导出",
-    "Failed to fetch avatar URL": "获取 Avatar URL 失败",
     "Failed to upload profile picture!": "头像上传失败！",
     "Home": "主页面",
     "Import": "导入",
-    "Incoming call from %(name)s": "来自 %(name)s 的通话请求",
-    "Incoming video call from %(name)s": "来自 %(name)s 的视频通话请求",
-    "Incoming voice call from %(name)s": "来自 %(name)s 的语音通话请求",
     "Incorrect username and/or password.": "用户名或密码错误。",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀请了 %(targetName)s。",
     "Invited": "已邀请",
     "Invites": "邀请",
     "Invites user with given id to current room": "按照 ID 邀请指定用户加入当前聊天室",
@@ -166,7 +130,6 @@
     "New passwords don't match": "两次输入的新密码不符",
     "not specified": "未指定",
     "Notifications": "通知",
-    "(not supported by this browser)": "（此浏览器不支持）",
     "<not supported>": "<不支持>",
     "No display name": "无昵称",
     "No results": "没有更多结果",
@@ -178,36 +141,27 @@
     "Phone": "电话号码",
     "Cancel": "取消",
     "Create new room": "创建新聊天室",
-    "Custom Server Options": "自定义服务器选项",
     "Dismiss": "忽略",
     "powered by Matrix": "由 Matrix 驱动",
     "Remove": "移除",
-    "Room directory": "聊天室目录",
     "Start chat": "开始聊天",
     "unknown error code": "未知错误代码",
     "Account": "账号",
     "Add": "添加",
-    "Allow": "允许",
     "Edit": "编辑",
     "Labs": "实验室",
-    "%(targetName)s left the room.": "%(targetName)s 退出了聊天室。",
     "Logout": "登出",
     "Low priority": "低优先级",
     "No more results": "没有更多结果",
-    "olm version:": "olm 版本：",
     "Only people who have been invited": "只有被邀请的人",
-    "Private Chat": "私聊",
     "Privileged Users": "特权用户",
     "Reason": "理由",
     "Register": "注册",
-    "%(targetName)s rejected the invitation.": "%(targetName)s 拒绝了邀请。",
     "Reject invitation": "拒绝邀请",
     "Users": "用户",
     "Verified key": "已验证的密钥",
     "Video call": "视频通话",
     "Voice call": "语音通话",
-    "VoIP conference finished.": "VoIP 会议结束。",
-    "VoIP conference started.": "VoIP 会议开始。",
     "VoIP is unsupported": "不支持 VoIP",
     "Warning!": "警告！",
     "You must <a>register</a> to use this functionality": "你必须 <a>注册</a> 以使用此功能",
@@ -226,34 +180,26 @@
     "Unknown error": "未知错误",
     "Incorrect password": "密码错误",
     "Unable to restore session": "无法恢复会话",
-    "ex. @bob:example.com": "例如 @bob:example.com",
-    "Add User": "添加用户",
     "Token incorrect": "令牌错误",
     "URL Previews": "链接预览",
     "Drop file here to upload": "把文件拖到这里以上传",
     "Online": "在线",
     "Idle": "空闲",
     "Offline": "离线",
-    "Username available": "用户名可用",
-    "Username not available": "用户名不可用",
     "Skip": "跳过",
     "Example": "示例",
     "Create": "创建",
     "Failed to upload image": "上传图像失败",
-    "Add a widget": "添加小挂件",
     "Accept": "接受",
-    "Access Token:": "访问令牌：",
-    "Cannot add any more widgets": "无法添加更多小挂件",
     "Delete widget": "删除挂件",
-    "Define the power level of a user": "定义一位用户的滥权等级",
+    "Define the power level of a user": "定义一位用户的特权等级",
     "Enable automatic language detection for syntax highlighting": "启用语法高亮的自动语言检测",
-    "Failed to change power level": "滥权等级修改失败",
+    "Failed to change power level": "特权等级修改失败",
     "Kick": "移除",
     "Kicks user with given id": "按照 ID 移除用户",
     "Last seen": "最近一次上线",
     "New passwords must match each other.": "新密码必须互相匹配。",
-    "Power level must be positive integer.": "滥权等级必须是正整数。",
-    "Results from DuckDuckGo": "来自 DuckDuckGo 的结果",
+    "Power level must be positive integer.": "特权等级必须是正整数。",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "Save": "保存",
     "This room has no local addresses": "此聊天室没有本地地址",
@@ -263,9 +209,7 @@
     "This room is not accessible by remote Matrix servers": "此聊天室无法被远程 Matrix 服务器访问",
     "Unable to create widget.": "无法创建挂件。",
     "Unban": "解除封禁",
-    "Unable to capture screen": "无法录制屏幕",
     "Unable to enable Notifications": "无法启用通知",
-    "unknown caller": "未知呼叫者",
     "Unnamed Room": "未命名的聊天室",
     "Upload avatar": "上传头像",
     "Upload Failed": "上传失败",
@@ -273,21 +217,13 @@
     "Usage": "用法",
     "Who can read history?": "谁可以阅读历史消息？",
     "You are not in this room.": "你不在此聊天室中。",
-    "You have no visible notifications": "没有可见的通知",
     "Not a valid %(brand)s keyfile": "不是有效的 %(brand)s 密钥文件",
-    "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀请。",
     "Publish this room to the public in %(domain)s's room directory?": "是否将此聊天室发布至 %(domain)s 的聊天室目录中？",
-    "Manage Integrations": "管理集成",
     "No users have specific privileges in this room": "此聊天室中没有用户有特殊权限",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
-    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了头像。",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s 已请求发起 VoIP 会议。",
     "Seen by %(userName)s at %(dateTime)s": "在 %(dateTime)s 被 %(userName)s 看到",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 接受了 %(displayName)s 的邀请。",
-    "Active call (%(roomName)s)": "当前通话 (来自聊天室 %(roomName)s)",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 将级别调整至 %(powerLevelDiffText)s 。",
     "Deops user with given id": "按照 ID 取消特定用户的管理员权限",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "通过 <voiceText>语言</voiceText> 或者 <videoText>视频</videoText>加入.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员，从他们被邀请开始.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员，从他们加入开始.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员.",
@@ -296,55 +232,35 @@
     "AM": "上午",
     "PM": "下午",
     "Profile": "个人资料",
-    "Public Chat": "公开的",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此时无法访问。",
     "Start authentication": "开始认证",
-    "The maximum permitted number of widgets have already been added to this room.": "此聊天室可拥有的小挂件数量已达到上限。",
-    "The phone number entered looks invalid": "此电话号码似乎无效",
-    "The remote side failed to pick up": "对方未能接听",
     "This room is not recognised.": "无法识别此聊天室。",
-    "To get started, please pick a username!": "请点击用户名！",
     "Unable to add email address": "无法添加邮箱地址",
     "Automatically replace plain text Emoji": "将符号表情转换为 Emoji",
     "Unable to verify email address.": "无法验证邮箱地址。",
-    "(no answer)": "（无回复）",
-    "Who can access this room?": "谁有权访问此聊天室？",
-    "You are already in a call.": "您正在通话。",
     "You do not have permission to do that in this room.": "你没有进行此操作的权限。",
     "You cannot place VoIP calls in this browser.": "无法在此浏览器中发起 VoIP 通话。",
     "You do not have permission to post to this room": "你没有在此聊天室发送消息的权限",
     "You seem to be in a call, are you sure you want to quit?": "你似乎正在进行通话，确定要退出吗？",
     "You seem to be uploading files, are you sure you want to quit?": "你似乎正在上传文件，确定要退出吗？",
-    "Upload an avatar:": "上传头像：",
-    "An error occurred: %(error_string)s": "发生了一个错误： %(error_string)s",
-    "There are no visible files in this room": "此聊天室中没有可见的文件",
-    "Active call": "当前通话",
-    "Error decrypting audio": "解密音频时出错",
     "Error decrypting image": "解密图像时出错",
     "Error decrypting video": "解密视频时出错",
-    " (unsupported)": " （不支持）",
     "Check for update": "检查更新",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室头像。",
     "Something went wrong!": "出了点问题！",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "若您已经拥有 Matrix 帐号，您也可以 <a>登录</a>。",
     "Do you want to set an email address?": "你想要设置一个邮箱地址吗？",
     "Upload new:": "上传新的：",
-    "Username invalid: %(errMessage)s": "用户名无效： %(errMessage)s",
     "Verification Pending": "验证等待中",
-    "(unknown failure: %(reason)s)": "（未知错误：%(reason)s）",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 收回了 %(targetName)s 的邀请。",
     "You cannot place a call with yourself.": "你无法向自己发起通话。",
     "You have <a>disabled</a> URL previews by default.": "你已经默认<a>禁用</a>链接预览。",
     "You have <a>enabled</a> URL previews by default.": "你已经默认<a>启用</a>链接预览。",
-    "Set a display name:": "设置昵称：",
     "This server does not support authentication with a phone number.": "此服务器不支持使用电话号码认证。",
     "Copied!": "已复制！",
     "Failed to copy": "复制失败",
     "Sent messages will be stored until your connection has returned.": "已发送的消息会被保存直到你的连接回来。",
     "(~%(count)s results)|one": "（~%(count)s 个结果）",
     "(~%(count)s results)|other": "（~%(count)s 个结果）",
-    "Please select the destination room for this message": "请选择此消息的目标聊天室",
-    "Start automatically after system login": "在系统登录后自动启动",
+    "Start automatically after system login": "开机自启",
     "Analytics": "统计分析服务",
     "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 的邀请",
     "Sun": "周日",
@@ -367,24 +283,17 @@
     "Nov": "十一月",
     "Dec": "十二月",
     "You must join the room to see its files": "你必须加入聊天室以看到它的文件",
-    "Failed to invite the following users to the %(roomName)s room:": "邀请以下用户到 %(roomName)s 聊天室失败：",
     "Confirm Removal": "确认移除",
     "Unknown Address": "未知地址",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)s).",
     "Unable to remove contact information": "无法移除联系人信息",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s 收集匿名的分析数据以允许我们改善它。",
-    "Please check your email to continue registration.": "请查看你的电子邮件以继续注册。",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果不指定一个邮箱地址，您将无法重置你的密码。你确定吗？",
     "Add an Integration": "添加集成",
-    "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "这将会成为你在 <span></span> 主服务器上的账户名，或者你可以选择一个 <a>不同的服务器</a>。",
     "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
     "This will allow you to reset your password and receive notifications.": "这将允许你重置你的密码和接收通知。",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s 添加了 %(widgetName)s 挂件",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s 移除了 %(widgetName)s 挂件",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s 修改了 %(widgetName)s 挂件",
-    "Unpin Message": "取消置顶消息",
     "Add rooms to this community": "添加聊天室到此社群",
     "Call Failed": "呼叫失败",
     "Invite new community members": "邀请新社群成员",
@@ -393,31 +302,22 @@
     "You are now ignoring %(userId)s": "你忽略了 %(userId)s",
     "Unignored user": "未忽略的用户",
     "You are no longer ignoring %(userId)s": "你不再忽视 %(userId)s",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除了 %(targetName)s 的封禁。",
-    "(could not connect media)": "（无法连接媒体）",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 更改了聊天室的置顶消息。",
     "Send": "发送",
     "Message Pinning": "消息置顶",
     "Enable URL previews for this room (only affects you)": "在此聊天室中启用链接预览（仅影响你）",
     "Enable URL previews by default for participants in this room": "对此聊天室的所有成员默认启用链接预览",
-    "%(senderName)s sent an image": "%(senderName)s 发送了一张图片",
-    "%(senderName)s sent a video": "%(senderName)s 发送了一个视频",
-    "%(senderName)s uploaded a file": "%(senderName)s 上传了一个文件",
     "Unignore": "取消忽略",
     "Ignore": "忽略",
     "Jump to read receipt": "跳到阅读回执",
     "Mention": "提及",
     "Invite": "邀请",
-    "Jump to message": "跳到消息",
-    "No pinned messages.": "没有置顶消息。",
     "Loading...": "正在加载...",
-    "Pinned Messages": "置顶的消息",
     "Unknown": "未知的",
     "Unnamed room": "未命名的聊天室",
     "World readable": "公开可读",
     "Guests can join": "访客可以加入",
     "No rooms to show": "无聊天室",
-    "An email has been sent to %(emailAddress)s": "一封邮件已发送到 %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "一封短信已发送到 %(msisdn)s",
     "Visible to everyone": "对所有人可见",
     "Delete Widget": "删除挂件",
@@ -480,7 +380,6 @@
     "Send an encrypted reply…": "发送加密回复…",
     "Send an encrypted message…": "发送加密消息…",
     "Replying": "正在回复",
-    "Community Invites": "社区邀请",
     "Banned by %(displayName)s": "被 %(displayName)s 封禁",
     "Members only (since the point in time of selecting this option)": "仅成员（从选中此选项时开始）",
     "Members only (since they were invited)": "只有成员（从他们被邀请开始）",
@@ -508,15 +407,13 @@
     "Failed to add the following rooms to %(groupId)s:": "添加以下聊天室到 %(groupId)s 失败：",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "你似乎没有将此邮箱地址同在此主服务器上的任何一个 Matrix 账号绑定。",
     "Restricted": "受限用户",
-    "To use it, just wait for autocomplete results to load and tab through them.": "若要使用自动补全，只要等待自动补全结果加载完成，按 Tab 键切换即可。",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 将他们的昵称修改成了 %(displayName)s 。",
-    "Stickerpack": "贴图集",
-    "You don't currently have any stickerpacks enabled": "你目前没有启用任何贴图集",
+    "Stickerpack": "贴纸包",
+    "You don't currently have any stickerpacks enabled": "你目前未启用任何贴纸包",
     "Key request sent.": "已发送密钥共享请求。",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果你是房间中最后一位有权限的用户，在你降低自己的权限等级后将无法撤回此修改，因为你将无法重新获得权限。",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "你将无法撤回此修改，因为你正在将此用户的滥权等级提升至与你相同。",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果你是聊天室中最后一位拥有权限的用户，在你降低自己的权限等级后将无法撤销此修改，你将无法重新获得权限。",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "你将无法撤回此修改，因为此用户的等级将与你相同。",
     "Unmute": "取消静音",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（滥权等级 %(powerLevelNumber)s）",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（特权等级 %(powerLevelNumber)s）",
     "Hide Stickers": "隐藏贴图",
     "Show Stickers": "显示贴图",
     "%(duration)ss": "%(duration)s 秒",
@@ -538,7 +435,7 @@
     "Failed to remove user from community": "移除用户失败",
     "Filter community members": "过滤社群成员",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "你确定要从 %(groupId)s 中移除 %(roomName)s 吗？",
-    "Removing a room from the community will also remove it from the community page.": "从社群中移除房间时，同时也会将其从社群页面中移除。",
+    "Removing a room from the community will also remove it from the community page.": "从社群中移除聊天室时，同时也会将其从社群页面中移除。",
     "Failed to remove room from community": "从社群中移除聊天室失败",
     "Failed to remove '%(roomName)s' from %(groupId)s": "从 %(groupId)s 中移除 “%(roomName)s” 失败",
     "Only visible to community members": "仅对社群成员可见",
@@ -584,7 +481,6 @@
     "Please enter the code it contains:": "请输入其包含的代码：",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix 聊天室 ID",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "",
     "Add rooms to the community summary": "将聊天室添加到社群简介中",
     "Which rooms would you like to add to this summary?": "你想要将哪个聊天室添加到社群简介？",
     "Add to summary": "添加到简介",
@@ -612,7 +508,6 @@
     "Create a new community": "创建新社群",
     "Error whilst fetching joined communities": "获取已加入社群列表时出现错误",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社群，将用户与聊天室整合在一起！搭建自定义社群主页以在 Matrix 宇宙之中标出你的私人空间。",
-    "%(count)s of your messages have not been sent.|one": "您的消息尚未发送。",
     "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
     "Uploading %(filename)s and %(count)s others|zero": "正在上传 %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "正在上传 %(filename)s 与其他 %(count)s 个文件",
@@ -628,21 +523,15 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "此操作允许你导入之前从另一个 Matrix 客户端中导出的加密密钥文件。导入完成后，你将能够解密那个客户端可以解密的加密消息。",
     "Ignores a user, hiding their messages from you": "忽略用户，隐藏他们发送的消息",
     "Stops ignoring a user, showing their messages going forward": "解除忽略用户，显示他们的消息",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "如果你在 GitHub 提交了一个 bug，调试日志可以帮助我们追踪这个问题。 调试日志包含应用程序使用数据，也就包括你的用户名、你访问的房间或社群的 ID 或别名，以及其他用户的用户名，但不包括聊天记录。",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "尝试加载此聊天室的时间线的特定时间点，但是无法找到。",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "现在 <resendText>重新发送消息</resendText> 或 <cancelText>取消发送</cancelText> 。",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在 <resendText>重新发送消息</resendText> 或 <cancelText>取消发送</cancelText> 。你也可以单独选择消息以重新发送或取消。",
     "Visibility in Room List": "是否在聊天室目录中可见",
     "Something went wrong when trying to get your communities.": "获取你加入的社群时发生错误。",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除挂件时将为聊天室中的所有成员删除。你确定要删除此挂件吗？",
     "Fetching third party location failed": "获取第三方位置失败",
     "Send Account Data": "发送账号数据",
-    "All notifications are currently disabled for all targets.": "目前所有通知都已禁用。",
-    "Uploading report": "上传报告",
     "Sunday": "星期日",
     "Notification targets": "通知目标",
     "Today": "今天",
-    "You are not receiving desktop notifications": "您现在不会收到桌面通知",
     "Friday": "星期五",
     "Update": "更新",
     "What's New": "更新内容",
@@ -650,24 +539,13 @@
     "Changelog": "更改日志",
     "Waiting for response from server": "正在等待服务器响应",
     "Send Custom Event": "发送自定义事件",
-    "Advanced notification settings": "通知高级设置",
     "Failed to send logs: ": "无法发送日志： ",
-    "Forget": "忘记",
-    "You cannot delete this image. (%(code)s)": "无法删除此图片。(%(code)s)",
-    "Cancel Sending": "取消发送",
     "This Room": "此聊天室",
     "Noisy": "响铃",
-    "Error saving email notification preferences": "保存电子邮件通知选项时出错",
-    "Messages containing my display name": "消息中含有我的显示名称",
-    "Messages in one-to-one chats": "一对一聊天中的消息",
+    "Messages containing my display name": "当消息包含我的昵称时",
+    "Messages in one-to-one chats": "私聊中的消息",
     "Unavailable": "无法获得",
-    "View Decrypted Source": "查看解密的来源",
-    "Failed to update keywords": "无法更新关键词",
     "remove %(name)s from the directory.": "从目录中移除 %(name)s。",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "以下关键词依照规则将不会在此显示：",
-    "Please set a password!": "请设置密码！",
-    "You have successfully set a password!": "您已成功设置密码！",
-    "An error occurred whilst saving your email notification preferences.": "保存电子邮件通知选项时出现错误。",
     "Explore Room State": "检查聊天室状态",
     "Source URL": "源网址",
     "Messages sent by bot": "由机器人发出的消息",
@@ -675,52 +553,34 @@
     "Members": "成员",
     "No update available.": "没有可用更新。",
     "Resend": "重新发送",
-    "Files": "文件",
     "Collecting app version information": "正在收集应用版本信息",
-    "Keywords": "关键词",
-    "Enable notifications for this account": "对此账号启用通知",
     "Invite to this community": "邀请加入此社群",
-    "Messages containing <span>keywords</span>": "包含 <span>关键词</span> 的消息",
     "Room not found": "找不到聊天室",
     "Tuesday": "星期二",
-    "Enter keywords separated by a comma:": "输入以逗号间隔的关键词：",
-    "Forward Message": "转发消息",
-    "You have successfully set a password and an email address!": "您已经成功设置了密码和邮箱地址！",
     "Remove %(name)s from the directory?": "是否从目录中移除 %(name)s？",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s 使用了许多先进的浏览器功能，有些在你目前所用的浏览器上无法使用或仅为实验性的功能。",
     "Developer Tools": "开发者工具",
     "Preparing to send logs": "正在准备发送日志",
-    "Remember, you can always set an email address in user settings if you change your mind.": "请记住，如果您改变想法，您永远可以在用户设置中设置电子邮件。",
     "Explore Account Data": "检查账号数据",
-    "All messages (noisy)": "全部消息（响铃）",
     "Saturday": "星期六",
-    "I understand the risks and wish to continue": "我了解这些风险并愿意继续",
-    "Direct Chat": "私聊",
     "The server may be unavailable or overloaded": "服务器可能无法使用或超过负载",
     "Reject": "拒绝",
-    "Failed to set Direct Message status of room": "无法设置聊天室的私聊状态",
     "Monday": "星期一",
     "Remove from Directory": "从目录中移除",
-    "Enable them now": "现在启用",
     "Toolbox": "工具箱",
     "Collecting logs": "正在收集日志",
     "You must specify an event type!": "必须指定事件类型！",
-    "(HTTP status %(httpStatus)s)": "(HTTP 状态 %(httpStatus)s)",
     "All Rooms": "全部聊天室",
     "Wednesday": "星期三",
     "You cannot delete this message. (%(code)s)": "你无法删除这条消息。(%(code)s)",
     "Quote": "引述",
     "Send logs": "发送日志",
     "All messages": "全部消息",
-    "Call invitation": "语音邀请",
+    "Call invitation": "当受到通话邀请时",
     "Downloading update...": "正在下载更新…",
     "State Key": "状态键（State Key）",
     "Failed to send custom event.": "自定义事件发送失败。",
     "What's new?": "更新内容",
-    "Notify me for anything else": "通知所有消息",
     "When I'm invited to a room": "当我被邀请进入聊天室",
-    "Can't update user notification settings": "不能更新用户通知设置",
-    "Notify for all other messages/rooms": "为所有其他消息/聊天室显示通知",
     "Unable to look up room ID from server": "无法在服务器上找到聊天室 ID",
     "Couldn't find a matching Matrix room": "未找到符合的 Matrix 聊天室",
     "Invite to this room": "邀请别人加入此聊天室",
@@ -730,54 +590,35 @@
     "Back": "返回",
     "Reply": "回复",
     "Show message in desktop notification": "在桌面通知中显示信息",
-    "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.": "调试日志包含使用数据（包括你的用户名、你访问过的聊天室/群组的 ID 或别名，以及其他用户的用户名），不含聊天消息。",
-    "Unhide Preview": "取消隐藏预览",
     "Unable to join network": "无法加入网络",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "抱歉，您的浏览器 <b>无法</b> 运行 %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上传",
-    "Messages in group chats": "群组聊天中的消息",
+    "Messages in group chats": "群聊中的消息",
     "Yesterday": "昨天",
     "Error encountered (%(errorDetail)s).": "遇到错误 (%(errorDetail)s)。",
     "Low Priority": "低优先级",
-    "Unable to fetch notification target list": "无法获取通知目标列表",
-    "Set Password": "设置密码",
     "Off": "关闭",
     "%(brand)s does not know how to join a room on this network": "%(brand)s 不知道如何在此网络中加入聊天室",
-    "Mentions only": "只限提及",
-    "You can now return to your account after signing out, and sign in on other devices.": "您可以在注销后回到您的账号，并在其他设备上登录。",
-    "Enable email notifications": "启用电子邮件通知",
     "Event Type": "事件类型",
-    "Download this file": "下载该文件",
-    "Pin Message": "置顶消息",
-    "Failed to change settings": "更改设置失败",
     "View Community": "查看社群",
     "Event sent!": "事件已发送！",
     "View Source": "查看源码",
     "Event Content": "事件内容",
     "Thank you!": "谢谢！",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "您目前的浏览器，应用程序的外观和感觉完全不正确，有些或全部功能可能无法使用。如果您仍想继续尝试，可以继续，但请自行负担其后果！",
     "Checking for an update...": "正在检查更新…",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "这里没有其他人了！你是想 <inviteText>邀请用户</inviteText> 还是 <nowarnText>不再提示</nowarnText>？",
     "You need to be able to invite users to do that.": "你需要有邀请用户的权限才能进行此操作。",
     "Missing roomId.": "找不到此聊天室 ID 所对应的聊天室。",
     "e.g. <CurrentPageURL>": "例如：<CurrentPageURL>",
     "Your device resolution": "你的设备分辨率",
-    "Always show encryption icons": "总是显示加密标志",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "你将被带到一个第三方网站以便验证你的账号来使用 %(integrationsUrl)s 提供的集成。你希望继续吗？",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "无法更新聊天室 %(roomName)s 在社群 “%(groupId)s” 中的可见性。",
-    "Minimize apps": "最小化应用程序",
     "Popout widget": "在弹出式窗口中打开挂件",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "无法加载被回复的事件，它可能不存在，也可能是你没有权限查看它。",
     "And %(count)s more...|other": "和 %(count)s 个其他…",
     "Try using one of the following valid address types: %(validTypesList)s.": "请尝试使用以下的有效邮箱地址格式中的一种：%(validTypesList)s",
     "e.g. %(exampleValue)s": "例如：%(exampleValue)s",
-    "Call in Progress": "正在通话",
-    "A call is already in progress!": "您已在通话中！",
     "Send analytics data": "发送统计数据",
     "Enable widget screenshots on supported widgets": "对支持的挂件启用挂件截图",
     "Demote yourself?": "是否降低你自己的权限？",
     "Demote": "降权",
-    "A call is currently being placed!": "正在发起通话！",
     "Permission Required": "需要权限",
     "You do not have permission to start a conference call in this room": "你没有在此聊天室发起通话会议的权限",
     "This event could not be displayed": "无法显示此事件",
@@ -785,14 +626,9 @@
     "Share room": "分享聊天室",
     "System Alerts": "系统警告",
     "Muted Users": "被禁言的用户",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "在启用加密的聊天室中，比如此聊天室，链接预览被默认禁用，以确保主服务器（访问链接、生成预览的地方）无法获知聊天室中的链接及其信息。",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "在启用加密的聊天室中，比如这个，默认禁用链接预览，以确保主服务器（访问链接、生成预览的地方）无法获知聊天室中的链接及其信息。",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "当有人发送一条带有链接的消息后，可显示链接的预览，链接预览可包含此链接的网页标题、描述以及图片。",
-    "The email field must not be blank.": "必须输入电子邮箱。",
-    "The phone number field must not be blank.": "必须输入电话号码。",
-    "The password field must not be blank.": "必须输入密码。",
     "Display your community flair in rooms configured to show it.": "在启用“显示徽章”的聊天室中显示本社群的个性徽章。",
-    "Failed to remove widget": "移除小挂件失败",
-    "An error ocurred whilst trying to remove the widget from the room": "尝试从聊天室中移除小部件时发生了错误",
     "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.": "你确定要移除（删除）此事件吗？注意，如果删除了聊天室名称或话题的修改事件，就会撤销此更改。",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "这将使你的账号永远不再可用。你将不能登录，或使用相同的用户 ID 重新注册。你的账号将退出所有已加入的聊天室，身份服务器上的账号信息也会被删除。<b>此操作是不可逆的。</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "默认情况下，停用你的账号<b>不会忘记你发送的消息</b> 。如果你希望我们忘记你发送的消息，请勾选下面的选择框。",
@@ -806,9 +642,6 @@
     "The user '%(displayName)s' could not be removed from the summary.": "无法将用户“%(displayName)s”从简介中移除。",
     "Who would you like to add to this summary?": "你想将谁添加到简介中？",
     "Add users to the community summary": "添加用户至社群简介",
-    "Collapse Reply Thread": "收起回复",
-    "Share Message": "分享消息",
-    "COPY": "复制",
     "Share Room Message": "分享聊天室消息",
     "Share Community": "分享社群",
     "Share User": "分享用户",
@@ -827,7 +660,6 @@
     "Terms and Conditions": "条款与要求",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "若要继续使用主服务器 %(homeserverDomain)s，你必须浏览并同意我们的条款与要求。",
     "Review terms and conditions": "浏览条款与要求",
-    "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.": "若要设置社群过滤器，请将社群头像拖到屏幕最左侧的社群过滤器面板上。单击社群过滤器面板中的社群头像即可过滤出与此社群相关联的房间和人员。",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "在你查看并同意 <consentLink>我们的条款与要求</consentLink> 之前，你不能发送任何消息。",
     "Clear filter": "清除过滤器",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "尝试加载此聊天室时间轴上的某处，但你没有查看相关消息的权限。",
@@ -837,7 +669,7 @@
     "Forces the current outbound group session in an encrypted room to be discarded": "强制丢弃加密聊天室中的当前出站群组会话",
     "Unable to connect to Homeserver. Retrying...": "无法连接至主服务器。正在重试…",
     "Sorry, your homeserver is too old to participate in this room.": "抱歉，因你的主服务器的程序版本过旧，无法加入此聊天室。",
-    "Mirror local video feed": "镜像翻转本地视频源",
+    "Mirror local video feed": "镜像翻转画面",
     "This room has been replaced and is no longer active.": "此聊天室已被取代，且不再活跃。",
     "The conversation continues here.": "对话在这里继续。",
     "Only room administrators will see this warning": "此警告仅聊天室管理员可见",
@@ -866,11 +698,8 @@
     "There was an error joining the room": "加入聊天室时发生错误",
     "Custom user status messages": "自定义用户状态信息",
     "Show developer tools": "显示开发者工具",
-    "Messages containing @room": "含有 @room 的消息",
+    "Messages containing @room": "当消息包含 @room 时",
     "Delete Backup": "删除备份",
-    "Backup version: ": "备份版本： ",
-    "Algorithm: ": "算法： ",
-    "Don't ask again": "不再询问",
     "Set up": "设置",
     "Open Devtools": "打开开发者工具",
     "Failed to load group members": "聊天室成员加载失败",
@@ -878,7 +707,6 @@
     "Clear cache and resync": "清除缓存并重新同步",
     "Incompatible Database": "数据库不兼容",
     "Continue With Encryption Disabled": "在停用加密的情况下继续",
-    "Checking...": "正在检查…",
     "Updating %(brand)s": "正在更新 %(brand)s",
     "No backup found!": "找不到备份！",
     "Unable to restore backup": "无法还原备份",
@@ -944,19 +772,17 @@
     "Render simple counters in room header": "在聊天室标题中显示简单计数",
     "Enable Emoji suggestions while typing": "启用实时表情符号建议",
     "Show a placeholder for removed messages": "已移除的消息显示为一个占位符",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "显示 加入/离开 消息（邀请/移除/封禁 不受影响）",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "显示加入/离开提示（邀请/移除/封禁提示不受此影响）",
     "Show avatar changes": "显示头像更改",
     "Show display name changes": "显示昵称更改",
     "Show read receipts sent by other users": "显示其他用户发送的已读回执",
-    "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": "发送正在输入通知",
     "Enable Community Filter Panel": "启用社群筛选器面板",
-    "Allow Peer-to-Peer for 1:1 calls": "允许一对一通话使用 P2P",
     "Prompt before sending invites to potentially invalid matrix IDs": "在发送邀请之前提示可能无效的 Matrix ID",
-    "Messages containing my username": "包含我的用户名的消息",
-    "Encrypted messages in one-to-one chats": "一对一聊天中的加密消息",
+    "Messages containing my username": "当消息包含我的用户名时",
+    "Encrypted messages in one-to-one chats": "私聊中的加密消息",
     "Encrypted messages in group chats": "群聊中的加密消息",
     "The other party cancelled the verification.": "另一方取消了验证。",
     "Verified!": "已验证！",
@@ -1041,7 +867,6 @@
     "Backing up %(sessionsRemaining)s keys...": "正在备份 %(sessionsRemaining)s 个密钥...",
     "All keys backed up": "所有密钥都已备份",
     "Start using Key Backup": "开始使用密钥备份",
-    "Add an email address to configure email notifications": "添加电子邮件地址以配置电子邮件通知",
     "Unable to verify phone number.": "无法验证电话号码。",
     "Verification code": "验证码",
     "Phone Number": "电话号码",
@@ -1050,14 +875,14 @@
     "Set a new account password...": "设置一个新的账号密码...",
     "Email addresses": "电子邮箱地址",
     "Phone numbers": "电话号码",
-    "Language and region": "语言与区域",
+    "Language and region": "语言与地区",
     "Theme": "主题",
     "Account management": "账号管理",
     "Deactivating your account is a permanent action - be careful!": "停用你的账号是一项永久性操作 - 请小心！",
     "General": "通用",
     "Credits": "感谢",
-    "For help with using %(brand)s, click <a>here</a>.": "对使用 %(brand)s 的说明，请点击 <a>这里</a>。",
-    "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> 或者使用下面的按钮开始与我们的机器人聊聊。",
+    "For help with using %(brand)s, click <a>here</a>.": "关于 %(brand)s 的<a>使用说明</a>。",
+    "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>或者通过下方按钮同我们的机器人聊聊。",
     "Chat with %(brand)s Bot": "与 %(brand)s 机器人聊天",
     "Help & About": "帮助及关于",
     "Bug reporting": "错误上报",
@@ -1070,11 +895,10 @@
     "Autocomplete delay (ms)": "自动完成延迟 （毫秒）",
     "Ignored users": "已忽略的用户",
     "Bulk options": "批量选择",
-    "Key backup": "密钥备份",
-    "Security & Privacy": "安全与隐私",
+    "Security & Privacy": "隐私安全",
     "Missing media permissions, click the button below to request.": "缺少媒体权限，点击下面的按钮以请求权限。",
     "Request media permissions": "请求媒体权限",
-    "Voice & Video": "语音与视频",
+    "Voice & Video": "语音视频",
     "Room information": "聊天室信息",
     "Internal room ID:": "内部聊天室 ID：",
     "Room version": "聊天室版本",
@@ -1086,11 +910,6 @@
     "Encryption": "加密",
     "Once enabled, encryption cannot be disabled.": "加密一经启用，便无法禁用。",
     "Encrypted": "已加密",
-    "Never lose encrypted messages": "永不丢失加密消息",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "此聊天室中的消息已被端对端加密保护。只有您和拥有密钥的收件人才可以于都这些消息。",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "安全地备份您的密钥以免丢失。<a>了解更多。</a>",
-    "Not now": "现在不要",
-    "Don't ask me again": "不再询问",
     "Add some now": "立即添加",
     "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.": "更新聊天室的主要地址时发生错误。可能是此服务器不允许，也可能是出现了一个临时错误。",
@@ -1108,7 +927,7 @@
     "Invite anyway": "还是邀请",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "在提交日志之前，你必须<a>创建一个GitHub issue</a> 来描述你的问题。",
     "Unable to load commit detail: %(msg)s": "无法加载提交详情：%(msg)s",
-    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "为避免丢失聊天记录，你必须在登出前导出房间密钥。 你需要回到较新版本的 %(brand)s 才能执行此操作",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "为避免丢失聊天记录，你必须在登出前导出聊天室密钥。你需要切换至新版 %(brand)s 方可继续执行此操作",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "验证此用户并将其标记为已信任。在收发端到端加密消息时，信任用户可让你更加放心。",
     "Waiting for partner to confirm...": "等待对方确认中...",
     "Incoming Verification Request": "收到验证请求",
@@ -1118,20 +937,10 @@
     "Manually export keys": "手动导出密钥",
     "You'll lose access to your encrypted messages": "你将失去你的加密消息的访问权",
     "Are you sure you want to sign out?": "你确定要登出账号吗？",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "如果您碰到任何错误或者希望分享您的反馈，请在 Github 上联系我们。",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "要帮助避免提交重复的 issue，请您先 <existingIssuesLink>查阅是否为已存在的 issue</existingIssuesLink>  (如有则添加一个 +1 ) ，或者如果找不到则 <newIssueLink>新建一个 issue</newIssueLink> 。",
-    "Report bugs & give feedback": "上报错误及提供反馈",
     "Go back": "返回",
     "Room Settings - %(roomName)s": "聊天室设置 - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "用户名只能包含小写字母、数字和 '=_-./'",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s 个会话解密失败！",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>警告</b>：你应此只在受信任的电脑上设置密钥备份。",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "通过输入恢复密码来访问您的安全消息历史记录和设置安全通信。",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "如果忘记了恢复密码，您可以 <button1>使用恢复密钥</button1> 或者 <button2>设置新的恢复选项</button2>",
-    "This looks like a valid recovery key!": "看起来是有效的恢复密钥！",
-    "Not a valid recovery key": "不是有效的恢复密钥",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "通过输入恢复密钥来访问您的安全消息历史记录和设置安全通信。",
-    "Share Permalink": "分享永久链接",
     "Clear status": "清除状态",
     "Update status": "更新状态",
     "Set status": "设置状态",
@@ -1140,33 +949,18 @@
     "This homeserver would like to make sure you are not a robot.": "此主服务器想要确认你不是机器人。",
     "Please review and accept all of the homeserver's policies": "请阅读并接受此主服务器的所有政策",
     "Please review and accept the policies of this homeserver:": "请阅读并接受此主服务器的政策：",
-    "Your Modular server": "您的模组服务器",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "输入您的模组主服务器的位置。它可能使用的是您自己的域名或者 <a>modular.im</a> 的子域名。",
-    "Server Name": "服务器名称",
-    "The username field must not be blank.": "必须输入用户名。",
     "Username": "用户名",
-    "Not sure of your password? <a>Set a new one</a>": "密码不确定？<a>新建一个密码</a>",
-    "Sign in to your Matrix account on %(serverName)s": "在 %(serverName)s 登入您的 Matrix 账号",
     "Change": "更改",
-    "Create your Matrix account on %(serverName)s": "在 %(serverName)s 上创建 Matrix 账号",
     "Email (optional)": "电子邮箱（可选）",
     "Phone (optional)": "电话号码（可选）",
     "Confirm": "确认",
-    "Other servers": "其他服务器",
-    "Homeserver URL": "主服务器网址",
-    "Identity Server URL": "身份服务器网址",
-    "Free": "免费",
     "Join millions for free on the largest public server": "免费加入最大的公共服务器，成为数百万用户中的一员",
-    "Premium": "高级",
-    "Premium hosting for organisations <a>Learn more</a>": "组织机构的高级主机托管 <a>了解更多</a>",
     "Other": "其他",
-    "Find other public servers or use a custom server": "寻找其他公共服务器或使用自定义服务器",
     "Couldn't load page": "无法加载页面",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "你是此社群的管理员。 没有其他管理员的邀请，你将无法重新加入。",
     "This homeserver does not support communities": "此主服务器不支持社群功能",
     "Guest": "游客",
     "Could not load user profile": "无法加载用户资料",
-    "Your Matrix account on %(serverName)s": "您在 %(serverName)s 上的 Matrix 账号",
     "A verification email will be sent to your inbox to confirm setting your new password.": "一封验证电子邮件将发送到你的邮箱以确认你设置了新密码。",
     "Sign in instead": "登入",
     "Your password has been reset.": "你的密码已重置。",
@@ -1180,7 +974,6 @@
     "Create account": "创建账号",
     "Registration has been disabled on this homeserver.": "此主服务器已禁止注册。",
     "Unable to query for supported registration methods.": "无法查询支持的注册方法。",
-    "Create your account": "创建您的账号",
     "Keep going...": "请继续...",
     "For maximum security, this should be different from your account password.": "为确保最大的安全性，它应该与你的账号密码不同。",
     "That matches!": "匹配成功！",
@@ -1194,10 +987,7 @@
     "Starting backup...": "开始备份...",
     "Success!": "成功！",
     "Unable to create key backup": "无法创建密钥备份",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "如果您登出账号而没有设置安全消息恢复，您将失去您的安全消息历史记录。",
-    "If you don't want to set this up now, you can later in Settings.": "如果您现在不想设置，您可以稍后在设置中操作。",
     "New Recovery Method": "新恢复方式",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "检测到安全消息的一个新恢复密码和密钥。",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果你没有设置新恢复方式，可能有攻击者正试图侵入你的账号。请立即更改你的账号密码并在设置中设定一个新恢复方式。",
     "Set up Secure Messages": "设置安全消息",
     "Recovery Method Removed": "恢复方式已移除",
@@ -1205,7 +995,7 @@
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "在纯文本消息开头添加 ¯\\_(ツ)_/¯",
     "User %(userId)s is already in the room": "用户 %(userId)s 已在聊天室中",
     "The user must be unbanned before they can be invited.": "用户必须先解封才能被邀请。",
-    "<a>Upgrade</a> to your own domain": "<a>升级</a> 到你自己的域名",
+    "<a>Upgrade</a> to your own domain": "<a>切换</a>至自有域名",
     "Accept all %(invitedRooms)s invites": "接受所有 %(invitedRooms)s 邀请",
     "Change room avatar": "更改聊天室头像",
     "Change room name": "更改聊天室名称",
@@ -1220,7 +1010,6 @@
     "Change settings": "更改设置",
     "Kick users": "移除用户",
     "Ban users": "封禁用户",
-    "Remove messages": "移除消息",
     "Notify everyone": "通知每个人",
     "Send %(eventType)s events": "发送 %(eventType)s 事件",
     "Select the roles required to change various parts of the room": "选择更改聊天室各个部分所需的角色",
@@ -1228,7 +1017,6 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "聊天室加密一经启用，便无法禁用。在加密聊天室中，发送的消息无法被服务器看到，只能被聊天室的参与者看到。启用加密可能会使许多机器人和桥接无法正常运作。 <a>详细了解加密。</a>",
     "Power level": "权限级别",
     "Want more than a community? <a>Get your own server</a>": "想要的不只是社群？ <a>架设你自己的服务器</a>",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "请安装 <chromeLink>Chrome</chromeLink>，<firefoxLink>Firefox</firefoxLink>，或 <safariLink>Safari</safariLink> 以获得最佳体验。",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：升级聊天室 <i>不会自动将聊天室成员转移到新版聊天室中。</i> 我们将会在旧版聊天室中发布一个新版聊天室的链接 - 聊天室成员必须点击此链接以加入新聊天室。",
     "Adds a custom widget by URL to the room": "通过链接为聊天室添加自定义挂件",
     "Please supply a https:// or http:// widget URL": "请提供一个 https:// 或 http:// 形式的插件",
@@ -1241,11 +1029,7 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "无法撤销邀请。此服务器可能出现了临时错误，或者你没有足够的权限来撤销邀请。",
     "Revoke invite": "撤销邀请",
     "Invited by %(sender)s": "被 %(sender)s 邀请",
-    "Maximize apps": "最大化应用程序",
-    "A widget would like to verify your identity": "小部件想要验证您的身份",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "位于 %(widgetUrl)s 的小部件想要验证您的身份。在您允许后，小部件就可以验证您的用户 ID，但不能代您执行操作。",
     "Remember my selection for this widget": "记住我对此挂件的选择",
-    "Deny": "拒绝",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s 无法从主服务器处获取协议列表。此主服务器上的软件可能过旧，不支持第三方网络。",
     "%(brand)s failed to get the public room list.": "%(brand)s 无法获取公开聊天室列表。",
     "The homeserver may be unavailable or overloaded.": "主服务器似乎不可用或过载。",
@@ -1253,7 +1037,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "你在此聊天室的先前版本中有 %(count)s 条未读通知。",
     "Add Email Address": "添加 Email 地址",
     "Add Phone Number": "添加电话号码",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "是否使用“面包屑”功能（最近访问的房间的图标在房间列表上方显示）",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "是否使用「面包屑」功能（显示在聊天室列表的头像）",
     "Call failed due to misconfigured server": "因为服务器配置错误通话失败",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "请联系你主服务器（<code>%(homeserverDomain)s</code>）的管理员设置 TURN 服务器来确保通话运作稳定。",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "你也可以尝试使用<code>turn.matrix.org</code>公共服务器，但通话质量稍差，并且其将会得知你的 IP。你可以在设置中更改此选项。",
@@ -1274,15 +1058,10 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "当前无法在回复中附加文件。你想要仅上传此文件而不回复吗？",
     "The file '%(fileName)s' failed to upload.": "上传文件 ‘%(fileName)s’ 失败。",
     "The server does not support the room version specified.": "服务器不支持指定的聊天室版本。",
-    "If you cancel now, you won't complete verifying the other user.": "如果现在取消，您将无法完成验证其他用户。",
-    "If you cancel now, you won't complete verifying your other session.": "如果现在取消，您将无法完成验证您的其他会话。",
-    "If you cancel now, you won't complete your operation.": "如果现在取消，您将无法完成您的操作。",
     "Cancel entering passphrase?": "取消输入密语？",
     "Setting up keys": "设置密钥",
     "Verify this session": "验证此会话",
     "Encryption upgrade available": "提供加密升级",
-    "Set up encryption": "设置加密",
-    "Review where you’re logged in": "查看您的登录位置",
     "New login. Was this you?": "现在登录。请问是你本人吗？",
     "Name or Matrix ID": "姓名或 Matrix ID",
     "Identity server has no terms of service": "身份服务器无服务条款",
@@ -1326,7 +1105,6 @@
     "Send a bug report with logs": "发送带日志的错误报告",
     "Opens chat with the given user": "与指定用户发起聊天",
     "Sends a message to the given user": "向指定用户发消息",
-    "%(senderName)s made no change.": "%(senderName)s 未做出更改。",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 将聊天室名称从 %(oldRoomName)s 改为 %(newRoomName)s。",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 为此聊天室添加备用地址 %(addresses)s。",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 为此聊天室添加了备用地址 %(addresses)s。",
@@ -1368,17 +1146,13 @@
     "Ensure you have a stable internet connection, or get in touch with the server admin": "确保你的网络连接稳定，或与服务器管理员联系",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "跟你的%(brand)s管理员确认<a>你的配置</a>不正确或重复的条目。",
     "Cannot reach identity server": "不可连接到身份服务器",
-    "Room name or address": "房间名称或地址",
-    "Joins room with given address": "使用给定地址加入房间",
+    "Room name or address": "聊天室名称或地址",
+    "Joins room with given address": "使用指定地址加入聊天室",
     "Verify this login": "验证此登录名",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "通过从其他会话之一验证此登录名并授予其访问加密信息的权限来确认您的身份。",
     "Which officially provided instance you are using, if any": "如果有的话，你正在使用官方所提供的哪个实例",
     "Every page you use in the app": "你在应用中使用的每个页面",
     "Are you sure you want to cancel entering passphrase?": "你确定要取消输入密语吗？",
     "Go Back": "后退",
-    "Use your account to sign in to the latest version": "使用您的帐户登录到最新版本",
-    "We’re excited to announce Riot is now Element": "我们很高兴地宣布Riot现在更名为Element",
-    "Learn More": "了解更多",
     "Unrecognised room address:": "无法识别的聊天室地址：",
     "Light": "浅色",
     "Dark": "深色",
@@ -1388,7 +1162,6 @@
     "No homeserver URL provided": "未输入主服务器链接",
     "Unexpected error resolving homeserver configuration": "解析主服务器配置时发生未知错误",
     "Unexpected error resolving identity server configuration": "解析身份服务器配置时发生未知错误",
-    "The message you are trying to send is too large.": "您正发送的信息过大。",
     "a few seconds ago": "数秒前",
     "about a minute ago": "约一分钟前",
     "%(num)s minutes ago": "%(num)s分钟前",
@@ -1408,42 +1181,23 @@
     "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>。",
-    "I want to help": "我乐意协助",
-    "Verify all your sessions to ensure your account & messages are safe": "验证您的所有会话，以确保账号和消息安全",
     "Review": "开始验证",
     "Later": "稍后再说",
     "Your homeserver has exceeded its user limit.": "你的主服务器已超过用户限制。",
     "Your homeserver has exceeded one of its resource limits.": "你的主服务器已超过某项资源限制。",
     "Contact your <a>server admin</a>.": "请联系你的<a>服务器管理员</a>。",
     "Ok": "确定",
-    "Set password": "设置密码",
-    "To return to your account in future you need to set a password": "要在之后取回您的帐户，您需要设置密码",
     "Upgrade": "升级加密",
     "Verify": "验证",
-    "Verify yourself & others to keep your chats safe": "验证您自己和他人身份，以确保您的聊天安全",
     "Other users may not trust it": "其他用户可能不信任它",
-    "Verify the new login accessing your account: %(name)s": "验证正访问您帐户的新登录：%(name)s",
-    "Restart": "重启应用",
-    "Upgrade your %(brand)s": "升级您的%(brand)s",
-    "A new version of %(brand)s is available!": "发现%(brand)s的新版本！",
     "You joined the call": "你加入通话",
     "%(senderName)s joined the call": "%(senderName)s加入通话",
     "Call in progress": "通话中",
-    "You left the call": "您离开了通话",
-    "%(senderName)s left the call": "%(senderName)s离开了通话",
     "Call ended": "通话结束",
     "You started a call": "你开始了通话",
     "%(senderName)s started a call": "%(senderName)s开始了通话",
     "Waiting for answer": "等待接听",
     "%(senderName)s is calling": "%(senderName)s正在通话",
-    "You created the room": "您创建了聊天室",
-    "%(senderName)s created the room": "%(senderName)s创建了聊天室",
-    "You made the chat encrypted": "您启用了聊天加密",
-    "%(senderName)s made the chat encrypted": "%(senderName)s启用了聊天加密",
-    "You made history visible to new members": "您设置了历史记录对新成员可见",
-    "%(senderName)s made history visible to new members": "%(senderName)s设置了历史记录对新成员可见",
-    "You made history visible to anyone": "您设置了历史记录对所有人可见",
-    "Riot is now Element!": "Riot现在是Element了！",
     "Support adding custom themes": "支持添加自定义主题",
     "Font size": "字体大小",
     "Use custom size": "使用自定义大小",
@@ -1451,12 +1205,12 @@
     "Use a system font": "使用系统字体",
     "System font name": "系统字体名称",
     "Never send encrypted messages to unverified sessions from this session": "永不从本会话向未验证的会话发送加密信息",
-    "Never send encrypted messages to unverified sessions in this room from this session": "永不从本会话在本房间中向未验证的会话发送加密信息",
-    "Order rooms by name": "按名称排列房间",
-    "Show rooms with unread notifications first": "优先显示有未读通知的房间",
+    "Never send encrypted messages to unverified sessions in this room from this session": "永不从此会话向此聊天室中未验证的会话发送加密信息",
+    "Order rooms by name": "按名称排列聊天室顺序",
+    "Show rooms with unread notifications first": "优先显示有未读通知的聊天室",
     "Show previews/thumbnails for images": "显示图片的预览图",
-    "Enable message search in encrypted rooms": "在加密房间中启用消息搜索",
-    "Enable experimental, compact IRC style layout": "启用实验性的、紧凑的IRC式布局",
+    "Enable message search in encrypted rooms": "在加密聊天室中启用消息搜索",
+    "Enable experimental, compact IRC style layout": "启用实验性、紧凑的 IRC 式布局",
     "Verify this session by completing one of the following:": "完成以下之一以验证这一会话：",
     "or": "或者",
     "Start": "开始",
@@ -1468,9 +1222,6 @@
     "My Ban List": "我的封禁列表",
     "This is your list of users/servers you have blocked - don't leave the room!": "这是你屏蔽的用户和服务器的列表——请不要离开此聊天室！",
     "Unknown caller": "未知来电人",
-    "Incoming voice call": "语音来电",
-    "Incoming video call": "视频来电",
-    "Incoming call": "来电",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "等待你的另一个会话 %(deviceName)s (%(deviceId)s) 进行验证…",
     "Waiting for your other session to verify…": "等待你的另一个会话进行验证…",
     "Waiting for %(displayName)s to verify…": "等待 %(displayName)s 进行验证…",
@@ -1480,7 +1231,6 @@
     "To be secure, do this in person or use a trusted way to communicate.": "为了安全，请当面完成或使用信任的方法交流。",
     "Lock": "锁",
     "Your server isn't responding to some <a>requests</a>.": "你的服务器没有响应一些<a>请求</a>。",
-    "From %(deviceName)s (%(deviceId)s)": "来自 %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "拒绝 (%(counter)s)",
     "Accept <policyLink /> to continue:": "接受 <policyLink /> 以继续：",
     "Upload": "上传",
@@ -1488,11 +1238,7 @@
     "Show more": "显示更多",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "修改密码会重置所有会话上的端对端加密的密钥，使加密聊天记录不可读，除非你先导出你的聊天室密钥，之后再重新导入。在未来会有所改进。",
     "Your homeserver does not support cross-signing.": "你的主服务器不支持交叉签名。",
-    "Cross-signing and secret storage are enabled.": "交叉签名和秘密存储已启用。",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "你的账号在秘密存储中有交叉签名身份，但并没有被此会话信任。",
-    "Cross-signing and secret storage are not yet set up.": "交叉签名和秘密存储尚未设置。",
-    "Reset cross-signing and secret storage": "重置交叉签名和秘密存储",
-    "Bootstrap cross-signing and secret storage": "自举交叉签名和秘密存储",
     "unexpected type": "未预期的类型",
     "Cross-signing public keys:": "交叉签名公钥：",
     "in memory": "在内存中",
@@ -1501,7 +1247,6 @@
     "in secret storage": "在秘密存储中",
     "cached locally": "本地缓存",
     "not found locally": "本地未找到",
-    "Session backup key:": "会话备份密钥：",
     "Secret storage public key:": "秘密存储公钥：",
     "in account data": "在账号数据中",
     "exists": "存在",
@@ -1535,16 +1280,10 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有一个<validity>无效的</validity>签名，它来自<verify>未验证的</verify>会话<device></device>",
     "Backup is not signed by any of your sessions": "备份没有被你的任何一个会话签名",
     "This backup is trusted because it has been restored on this session": "此备份是受信任的因为它被恢复到了此会话上",
-    "Backup key stored: ": "存储的备份密钥： ",
     "Your keys are <b>not being backed up from this session</b>.": "你的密钥<b>没有被此会话备份</b>。",
     "Clear notifications": "清除通知",
-    "There are advanced notifications which are not shown here.": "有高级通知没有显示在此处。",
-    "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 里无法修改它们，但它们仍然适用。",
     "Enable desktop notifications for this session": "为此会话启用桌面通知",
     "Enable audible notifications for this session": "为此会话启用声音通知",
-    "Identity Server URL must be HTTPS": "身份服务器连接必须是 HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "不是有效的身份服务器（状态码 %(code)s）",
-    "Could not connect to Identity Server": "无法连接到身份服务器",
     "Checking server": "检查服务器",
     "Change identity server": "更改身份服务器",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "从 <current /> 身份服务器断开连接并连接到 <new /> 吗？",
@@ -1560,13 +1299,11 @@
     "Disconnect anyway": "仍然断开连接",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "你仍然在<b>分享你的个人信息</b>在身份服务器上<idserver />。",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "我们推荐你在断开连接前从身份服务器上删除你的邮箱地址和电话号码。",
-    "Identity Server (%(server)s)": "身份服务器（%(server)s）",
     "not stored": "未存储",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "你正在使用 <server></server> 以发现你认识的现存联系人并被其发现。你可以在下方更改你的身份服务器。",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "如果你不想使用 <server /> 以发现你认识的现存联系人并被其发现，请在下方输入另一个身份服务器。",
-    "Identity Server": "身份服务器",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "你现在没有使用身份服务器。若想发现你认识的现存联系人并被其发现，请在下方添加一个身份服务器。",
-    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "从你的身份服务器断开连接意味着你将不可被别的用户发现，同时你也将不能用邮箱或电话邀请别人。",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "断开身份服务器连接意味着你将无法被其他用户发现，同时你也将无法使用电子邮件或电话邀请别人。",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "使用身份服务器是可选的。如果你选择不使用身份服务器，你将不能被别的用户发现，也不能用邮箱或电话邀请别人。",
     "Do not use an identity server": "不使用身份服务器",
     "Enter a new identity server": "输入一个新的身份服务器",
@@ -1579,7 +1316,6 @@
     "Custom theme URL": "自定义主题链接",
     "Add theme": "添加主题",
     "Message layout": "信息布局",
-    "Compact": "紧凑",
     "Modern": "现代",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "设置一个安装在你的系统上的字体名称，%(brand)s 会尝试使用它。",
     "Customise your appearance": "自定义你的外观",
@@ -1587,9 +1323,8 @@
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "你的密码已成功更改。在你重新登录别的会话之前，你将不会在那里收到推送通知",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "同意身份服务器（%(serverName)s）的服务协议以允许自己被通过邮件地址或电话号码发现。",
     "Discovery": "发现",
-    "Clear cache and reload": "清除缓存重新加载",
+    "Clear cache and reload": "清理缓存并重载",
     "Keyboard Shortcuts": "键盘快捷键",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "通过实验功能自定义您的体验。<a>了解更多</a>。",
     "Ignored/Blocked": "已忽略/已屏蔽",
     "Error adding ignored user/server": "添加已忽略的用户/服务器时出现错误",
     "Error subscribing to list": "订阅列表时出现错误",
@@ -1643,7 +1378,7 @@
     "To link to this room, please add an address.": "要链接至此聊天室，请添加一个地址。",
     "Unable to share email address": "无法共享邮件地址",
     "Your email address hasn't been verified yet": "你的邮件地址尚未被验证",
-    "Click the link in the email you received to verify and then click continue again.": "请点击你收到的邮件中的链接后再点击继续。",
+    "Click the link in the email you received to verify and then click continue again.": "点击你所收到的电子邮件中的链接进行验证，然后再次点击继续。",
     "Verify the link in your inbox": "验证你的收件箱中的链接",
     "Complete": "完成",
     "Share": "共享",
@@ -1661,17 +1396,13 @@
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "Multiple integration managers": "多个集成管理器",
     "Try out new ways to ignore people (experimental)": "尝试忽略别人的新方法（实验性）",
-    "Enable advanced debugging for the room list": "为此聊天室列表启用高级调试",
     "Show info about bridges in room settings": "在聊天室设置中显示桥接信息",
     "Use a more compact ‘Modern’ layout": "使用更紧凑的「现代」布局",
     "Show typing notifications": "显示正在输入通知",
     "Show shortcuts to recently viewed rooms above the room list": "在聊天室列表上方显示最近浏览过的聊天室的快捷方式",
     "Show hidden events in timeline": "显示时间线中的隐藏事件",
-    "Low bandwidth mode": "低带宽模式",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "当你的主服务器没有提供通话辅助服务器时使用备用的 turn.matrix.org 服务器（你的IP地址会在通话期间被共享）",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "为消息发送已读回执（需要兼容的主服务器方可禁用）",
     "Scan this unique code": "扫描此唯一代码",
     "Compare unique emoji": "比较唯一表情符号",
     "Compare a unique set of emoji if you don't have a camera on either device": "若你在两个设备上都没有相机，比较唯一一组表情符号",
@@ -1686,18 +1417,15 @@
     "Cannot connect to integration manager": "不能连接到集成管理器",
     "The integration manager is offline or it cannot reach your homeserver.": "此集成管理器为离线状态或者其不能访问你的主服务器。",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "检查你的浏览器是否安装有可能屏蔽身份服务器的插件（例如 Privacy Badger）",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "使用集成管理器 <b>（%(serverName)s）</b> 以管理机器人、挂件和贴图集。",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "使用集成管理器以管理机器人、挂件和贴图集。",
-    "Manage integrations": "管理集成",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "集成管理器接收配置数据，并可以以你的名义修改挂件、发送聊天室邀请及设置权限级别。",
+    "Manage integrations": "集成管理",
     "Use between %(min)s pt and %(max)s pt": "请使用介于 %(min)s pt 和 %(max)s pt 之间的大小",
     "Deactivate account": "停用账号",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "要报告 Matrix 相关的安全问题，请阅读 Matrix.org 的<a>安全公开策略</a>。",
     "Something went wrong. Please try again or view your console for hints.": "出现问题。请重试或查看你的终端以获得提示。",
     "Please try again or view your console for hints.": "请重试或查看你的终端以获得提示。",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "你的服务器管理员未在私人聊天室和私聊中默认启用端对端加密。",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "你的服务器管理员默认关闭了私人聊天室和私聊中的端对端加密。",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理会话名称，登出你的会话或<a>在你的用户资料中验证它们</a>。",
-    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室正将消息桥接到以下平台。<a>了解更多。</a>",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室的消息将桥接到其他平台，<a>了解更多。</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "此聊天室未将消息桥接到任何平台。<a>了解更多。</a>",
     "Bridges": "桥接",
     "Someone is using an unknown session": "有人在使用未知会话",
@@ -1725,7 +1453,6 @@
     "Room %(name)s": "聊天室 %(name)s",
     "No recently visited rooms": "没有最近访问过的聊天室",
     "People": "联系人",
-    "Create room": "创建聊天室",
     "Custom Tag": "自定义标签",
     "Joining room …": "正在加入聊天室…",
     "Loading …": "正在加载…",
@@ -1758,7 +1485,7 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s 不能被预览。你想加入吗？",
     "This room doesn't exist. Are you sure you're at the right place?": "此聊天室不存在。你确定你在正确的地方吗？",
     "Try again later, or ask a room admin to check if you have access.": "请稍后重试，或询问聊天室管理员以检查你是否有权限。",
-    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "尝试访问该房间是返回了 %(errcode)s。如果你认为你看到此消息是个错误，请<issueLink>提交一个错误报告</issueLink>。",
+    "%(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>。",
     "Appearance": "外观",
     "Show rooms with unread messages first": "优先显示有未读消息的聊天室",
     "Show previews of messages": "显示消息预览",
@@ -1772,7 +1499,7 @@
     "Show %(count)s more|other": "多显示 %(count)s 个",
     "Show %(count)s more|one": "多显示 %(count)s 个",
     "Use default": "使用默认",
-    "Mentions & Keywords": "提及和关键词",
+    "Mentions & Keywords": "提及&关键词",
     "Notification options": "通知选项",
     "Leave Room": "离开聊天室",
     "Forget Room": "忘记聊天室",
@@ -1801,13 +1528,11 @@
     "Error removing address": "删除地址时出现错误",
     "Local address": "本地地址",
     "Published Addresses": "发布的地址",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "发布的地址可以被任何服务器上的任何人用来加入你的聊天室。要发布一个地址，它必须先被设为一个本地地址。",
     "Other published addresses:": "其它发布的地址：",
     "No other published addresses yet, add one below": "还没有别的发布的地址，可在下方添加",
     "New published address (e.g. #alias:server)": "新的发布的地址（例如 #alias:server）",
     "Local Addresses": "本地地址",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "为此聊天室设置地址以便用户通过你的主服务器（%(localDomain)s）找到此聊天室",
-    "Waiting for you to accept on your other session…": "等待您在您别的会话上接受…",
     "Waiting for %(displayName)s to accept…": "等待 %(displayName)s 接受…",
     "Accepting…": "正在接受…",
     "Start Verification": "开始验证",
@@ -1831,7 +1556,6 @@
     "%(count)s sessions|other": "%(count)s 个会话",
     "%(count)s sessions|one": "%(count)s 个会话",
     "Hide sessions": "隐藏会话",
-    "Direct message": "私聊",
     "No recent messages by %(user)s found": "没有找到 %(user)s 最近发送的消息",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "请尝试在时间线中向上滚动以查看是否有更早的。",
     "Remove recent messages by %(user)s": "删除 %(user)s 最近发送的消息",
@@ -1841,7 +1565,6 @@
     "Remove %(count)s messages|other": "删除 %(count)s 条消息",
     "Remove %(count)s messages|one": "删除 1 条消息",
     "Remove recent messages": "删除最近消息",
-    "<strong>%(role)s</strong> in %(roomName)s": "%(roomName)s 中的 <strong>%(role)s</strong>",
     "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": "停用用户",
@@ -1871,7 +1594,6 @@
     "Verification cancelled": "验证已取消",
     "Compare emoji": "比较表情符号",
     "Encryption enabled": "已启用加密",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "此聊天室中的消息是端对端加密的。请在其用户资料中了解更多并验证此用户。",
     "Encryption not enabled": "未启用加密",
     "The encryption used by this room isn't supported.": "不支持此聊天室使用的加密方式。",
     "React": "回应",
@@ -1893,7 +1615,6 @@
     "You sent a verification request": "你发送了一个验证请求",
     "Show all": "显示全部",
     "Reactions": "回应",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> 回应了 %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>回应了 %(shortName)s</reactedWith>",
     "Message deleted": "消息已删除",
     "Message deleted by %(name)s": "消息被 %(name)s 删除",
@@ -1924,21 +1645,17 @@
     "%(brand)s URL": "%(brand)s 的链接",
     "Room ID": "聊天室 ID",
     "Widget ID": "挂件 ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "使用此挂件可能会和 %(widgetDomain)s 及你的集成管理器共享数据 <helpIcon />。",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "使用此挂件可能会和 %(widgetDomain)s 共享数据 <helpIcon />。",
     "Widgets do not use message encryption.": "挂件不适用消息加密。",
     "This widget may use cookies.": "此挂件可能使用 cookie。",
     "More options": "更多选项",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "请在 GitHub 上<newIssueLink>创建一个新 issue</newIssueLink> 以便我们调查此错误。",
     "Rotate Left": "向左旋转",
-    "Rotate counter-clockwise": "逆时针旋转",
     "Rotate Right": "向右旋转",
-    "Rotate clockwise": "顺时针旋转",
     "QR Code": "二维码",
     "Room address": "聊天室地址",
     "e.g. my-room": "例如 my-room",
     "Some characters not allowed": "不允许使用某些字符",
-    "Please provide a room address": "请提供聊天室地址",
     "This address is available to use": "此地址可用",
     "This address is already in use": "此地址已被使用",
     "Enter a server name": "请输入服务器名",
@@ -1962,7 +1679,7 @@
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "提醒：你的浏览器不被支持，所以你的体验可能不可预料。",
     "GitHub issue": "GitHub 上的 issue",
     "Notes": "提示",
-    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "如果有额外的上下文可以帮助我们分析问题，比如你当时在做什么、房间 ID、用户 ID 等等，请将其列于此处。",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "如果有额外的上下文可以帮助我们分析问题，比如你当时在做什么、聊天室 ID、用户 ID 等等，请将其列于此处。",
     "Removing…": "正在移除…",
     "Destroy cross-signing keys?": "销毁交叉签名密钥？",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "删除交叉签名密钥是永久的。所有你验证过的人都会看到安全警报。除非你丢失了所有可以交叉签名的设备，否则几乎可以确定你不想这么做。",
@@ -1971,17 +1688,13 @@
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "清除此会话中的所有数据是永久的。加密消息会丢失，除非其密钥已被备份。",
     "Clear all data": "清除所有数据",
     "Please enter a name for the room": "请输入聊天室名称",
-    "Set a room address to easily share your room with other people.": "设置一个聊天室地址以轻松地和别人共享您的聊天室。",
-    "This room is private, and can only be joined by invitation.": "此聊天室是私人的，只能通过邀请加入。",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "你之后不能禁用此项。桥接和大部分机器人还不能正常工作。",
     "Enable end-to-end encryption": "启用端对端加密",
     "Create a public room": "创建一个公共聊天室",
     "Create a private room": "创建一个私人聊天室",
     "Topic (optional)": "话题（可选）",
-    "Make this room public": "将此聊天室设为公共的",
     "Hide advanced": "隐藏高级",
     "Show advanced": "显示高级",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "阻止别的 matrix 主服务器上的用户加入此聊天室（此设置之后不能更改！）",
     "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.": "你曾在此会话中使用了一个更新版本的 %(brand)s。要再使用此版本并使用端对端加密，你需要登出再重新登录。",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "通过单点登录证明你的身份并确认停用你的账号。",
     "Are you sure you want to deactivate your account? This is irreversible.": "你确定要停用你的账号吗？此操作不可逆。",
@@ -1995,13 +1708,11 @@
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "验证此设备以将其标记为已信任。在收发端对端加密消息时，信任设备可让你与其他用户更加放心。",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "验证此设备会将其标记为已信任，与此同时，其他验证了你的用户也会信任此设备。",
     "Integrations are disabled": "集成已禁用",
-    "Enable 'Manage Integrations' in Settings to do this.": "在设置中启用「管理集成」以执行此操作。",
+    "Enable 'Manage Integrations' in Settings to do this.": "在设置中启用「管理管理」以执行此操作。",
     "Integrations not allowed": "集成未被允许",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "你的 %(brand)s 不允许你使用集成管理器来完成此操作。请联系管理员。",
     "To continue, use Single Sign On to prove your identity.": "要继续，请使用单点登录证明你的身份。",
     "Confirm to continue": "确认以继续",
     "Click the button below to confirm your identity.": "点击下方按钮确认你的身份。",
-    "Failed to invite the following users to chat: %(csvUsers)s": "邀请以下用户加入聊天失败：%(csvUsers)s",
     "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.": "我们不能邀请这些用户。请检查你想邀请的用户并重试。",
     "Failed to find the following users": "寻找以下用户失败",
@@ -2010,9 +1721,7 @@
     "Suggestions": "建议",
     "Recently Direct Messaged": "最近私聊",
     "Direct Messages": "私聊",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "使用名字，用户名（像是 <userId/>）或邮件地址和某人开始对话。",
     "Go": "前往",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用名字，用户名（像是 <userId/>）或邮件地址邀请某人，或者<a>分享此聊天室</a>。",
     "a new master key signature": "一个新的主密钥签名",
     "a new cross-signing key signature": "一个新的交叉签名密钥的签名",
     "a device cross-signing signature": "一个设备的交叉签名的签名",
@@ -2031,26 +1740,11 @@
     "Verify session": "验证会话",
     "Your homeserver doesn't seem to support this feature.": "你的主服务器似乎不支持此功能。",
     "Message edits": "消息编辑历史",
-    "Your account is not secure": "你的账号不安全",
-    "Your password": "你的密码",
-    "This session, or the other session": "此会话，或别的会话",
-    "The internet connection either session is using": "你会话使用的网络连接",
-    "We recommend you change your password and recovery key in Settings immediately": "我们推荐您立刻在设置中更改您的密码和恢复密钥",
-    "New session": "新会话",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "使用此会话以验证你的新会话，并允许其访问加密信息：",
-    "If you didn’t sign in to this session, your account may be compromised.": "如果你没有登录进此会话，你的账号可能已受损。",
-    "This wasn't me": "这不是我",
-    "Use your account to sign in to the latest version of the app at <a />": "使用您的账户在 <a /> 登录此应用的最新版",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "您已经登录且一切已就绪，但您也可以在 <a>element.io/get-started</a> 获取此应用在全平台上的最新版。",
-    "Go to Element": "前往 Element",
-    "We’re excited to announce Riot is now Element!": "我们很兴奋地宣布 Riot 现在是 Element 了！",
-    "Learn more at <a>element.io/previously-riot</a>": "访问 <a>element.io/previously-riot</a> 了解更多",
     "Please fill why you're reporting.": "请填写你为何做此报告。",
     "Report Content to Your Homeserver Administrator": "向你的主服务器管理员举报内容",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "举报此消息会将其唯一的「事件 ID」发送给你的主服务器的管理员。如果此聊天室中的消息被加密，你的主服务器管理员将不能阅读消息文本，也不能查看任何文件或图片。",
     "Send report": "发送报告",
     "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:": "更新此聊天室需要关闭此聊天室的当前实力并创建一个新的聊天室代替它。为了给聊天室成员最好的体验，我们会：",
-    "Automatically invite users": "自动邀请用户",
     "Upgrade private room": "更新私人聊天室",
     "Upgrade public room": "更新公共聊天室",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "更新聊天室是高级操作，通常建议在聊天室由于错误、缺失功能或安全漏洞而不稳定时使用。",
@@ -2068,16 +1762,14 @@
     "A connection error occurred while trying to contact the server.": "尝试联系服务器时出现连接错误。",
     "Recent changes that have not yet been received": "尚未被接受的最近更改",
     "Sign out and remove encryption keys?": "登出并删除加密密钥？",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "这允许您在登出后返回您的账户并在别的会话上登录。",
     "Command Help": "命令帮助",
     "To help us prevent this in future, please <a>send us logs</a>.": "要帮助我们防止其以后发生，请<a>给我们发送日志</a>。",
     "Missing session data": "缺失会话数据",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "一些会话数据，包括加密消息密钥，已缺失。要修复此问题，登出并重新登录，然后从备份恢复密钥。",
     "Your browser likely removed this data when running low on disk space.": "你的浏览器可能在磁盘空间不足时删除了此数据。",
-    "Integration Manager": "集成管理器",
     "Find others by phone or email": "通过电话或邮箱寻找别人",
     "Be found by phone or email": "通过电话或邮箱被寻找",
-    "Use bots, bridges, widgets and sticker packs": "使用机器人、桥接、挂件和贴图集",
+    "Use bots, bridges, widgets and sticker packs": "使用机器人、桥接、挂件和贴纸包",
     "Terms of Service": "服务协议",
     "To continue you need to accept the terms of this service.": "要继续，你需要接受此服务协议。",
     "Service": "服务",
@@ -2093,66 +1785,37 @@
     "Upload %(count)s other files|one": "上传 %(count)s 个别的文件",
     "Cancel All": "全部取消",
     "Upload Error": "上传错误",
-    "Verify other session": "验证别的会话",
     "Verification Request": "验证请求",
     "Wrong file type": "错误文件类型",
     "Looks good!": "看着不错！",
-    "Wrong Recovery Key": "错误的恢复密钥",
-    "Invalid Recovery Key": "无效的恢复密钥",
     "Security Phrase": "安全密码",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "无法访问秘密存储。请确认您输入了正确的恢复密码。",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "输入你的安全密码或<button>使用你的安全密钥</button>以继续。",
     "Security Key": "安全密钥",
     "Use your Security Key to continue.": "使用你的安全密钥以继续。",
     "Restoring keys from backup": "从备份恢复密钥",
     "Fetching keys from server...": "正在从服务器获取密钥...",
     "%(completed)s of %(total)s keys restored": "%(total)s 个密钥中之 %(completed)s 个已恢复",
-    "Recovery key mismatch": "恢复密钥不匹配",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "备份不能被此恢复密钥解密：请确认您输入了正确的恢复密钥。",
-    "Incorrect recovery passphrase": "不正确的恢复密码",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "备份不能被此恢复密码解密：请确认您输入了正确的恢复密码。",
     "Keys restored": "已恢复密钥",
     "Successfully restored %(sessionCount)s keys": "成功恢复了 %(sessionCount)s 个密钥",
-    "Enter recovery passphrase": "输入恢复密码",
-    "Enter recovery key": "输入恢复密钥",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>：你应此只从信任的计算机设置密钥备份。",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "如果您忘记了恢复密钥，您可以<button>设置新的恢复选项</button>",
-    "Address (optional)": "地址（可选）",
-    "Resend edit": "重新发送编辑",
     "Resend %(unsentCount)s reaction(s)": "重新发送 %(unsentCount)s 个回应",
-    "Resend removal": "重新发送删除",
     "Report Content": "举报内容",
     "Notification settings": "通知设置",
-    "Help": "帮助",
-    "Reload": "重新加载",
-    "Take picture": "拍照",
     "Remove for everyone": "为所有人删除",
-    "Remove for me": "为我删除",
     "User Status": "用户状态",
-    "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.": "您可以使用自定义服务器选项以使用不同的主服务器链接登录至别的 Matrix 服务器。这允许您通过不同的主服务器上的现存 Matrix 账户使用 %(brand)s。",
     "Confirm your identity by entering your account password below.": "在下方输入账号密码以确认你的身份。",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "在主服务器配置中缺少验证码公钥。请将此报告给你的主服务器管理员。",
-    "Unable to validate homeserver/identity server": "无法验证主服务器/身份服务器",
-    "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>.": "输入您的 Element Matrix Services 主服务器的地址。它可能使用您自己的域名，也可能是 <a>element.io</a> 的子域名。",
     "Enter password": "输入密码",
     "Nice, strong password!": "不错，是个强密码！",
     "Password is allowed, but unsafe": "密码允许但不安全",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "没有配置身份服务器因此您不能添加邮件地址以在将来重置您的密码。",
     "Use an email address to recover your account": "使用邮件地址恢复你的账号",
     "Enter email address (required on this homeserver)": "输入邮件地址（此主服务器上必须）",
     "Doesn't look like a valid email address": "看起来不像有效的邮件地址",
     "Passwords don't match": "密码不匹配",
     "Other users can invite you to rooms using your contact details": "别的用户可以使用你的联系人信息邀请你加入聊天室",
     "Enter phone number (required on this homeserver)": "输入电话号码（此主服务器上必须）",
-    "Doesn't look like a valid phone number": "看着不像一个有效的电话号码",
     "Use lowercase letters, numbers, dashes and underscores only": "仅使用小写字母，数字，横杠和下划线",
     "Enter username": "输入用户名",
-    "Create your Matrix account on <underlinedServerName />": "在 <underlinedServerName /> 上创建您的 Matrix 账户",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "设置邮箱以便恢复账户。您可以选择让现存联系人通过邮箱或电话发现您。",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "设置邮箱以便恢复账户。您可以选择让现存联系人通过邮箱发现您。",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "设置您自定义的主服务器链接<a>这是什么意思？</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "输入您自定义的身份服务器链接<a>这是什么意思？</a>",
-    "Sign in to your Matrix account on <underlinedServerName />": "登录到您在 <underlinedServerName /> 上的 Matrix 账户",
     "Sign in with SSO": "使用单点登录",
     "No files visible in this room": "此聊天室中没有可见文件",
     "Welcome to %(appName)s": "欢迎来到 %(appName)s",
@@ -2161,10 +1824,8 @@
     "Explore Public Rooms": "探索公共聊天室",
     "Create a Group Chat": "创建一个群聊",
     "Explore rooms": "探索聊天室",
-    "Self-verification request": "自验证请求",
     "%(creator)s created and configured the room.": "%(creator)s 创建并配置了此聊天室。",
     "You’re all caught up": "全数阅毕",
-    "You have no visible notifications in this room.": "您在此聊天室内没有可见通知。",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "删除聊天室地址 %(alias)s 并将 %(name)s 从目录中移除吗？",
     "delete the address.": "删除此地址。",
     "Preview": "预览",
@@ -2172,7 +1833,6 @@
     "Find a room…": "寻找聊天室…",
     "Find a room… (e.g. %(exampleRoom)s)": "寻找聊天室... （例如 %(exampleRoom)s）",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "如果你不能找到你所寻找的聊天室，请索要一个邀请或<a>创建新聊天室</a>。",
-    "Search rooms": "搜索聊天室",
     "Switch to light mode": "切换到浅色模式",
     "Switch to dark mode": "切换到深色模式",
     "Switch theme": "切换主题",
@@ -2181,8 +1841,6 @@
     "Feedback": "反馈",
     "User menu": "用户菜单",
     "Session verified": "会话已验证",
-    "Your Matrix account on <underlinedServerName />": "您在 <underlinedServerName /> 上的 Matrix 账户",
-    "No identity server is configured: add one in server settings to reset your password.": "没有配置身份服务器：在服务器设置中添加一个以重设您的密码。",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "你已经登出了所有会话，并将不会收到推送通知。要重新启用通知，请在每个设备上重新登录。",
     "Failed to get autodiscovery configuration from server": "从服务器获取自动发现配置时失败",
     "Invalid base_url for m.homeserver": "m.homeserver 的 base_url 无效",
@@ -2198,17 +1856,8 @@
     "<a>Log in</a> to your new account.": "<a>登录</a>到你的新账号。",
     "You can now close this window or <a>log in</a> to your new account.": "你现在可以关闭此窗口或<a>登录</a>到你的新账号。",
     "Registration Successful": "注册成功",
-    "Use Recovery Key or Passphrase": "使用恢复密钥或密码",
-    "Use Recovery Key": "使用恢复密钥",
-    "This requires the latest %(brand)s on your other devices:": "这需要您在别的设备上有最新版的 %(brand)s：",
-    "%(brand)s Web": "%(brand)s 网页版",
-    "%(brand)s Desktop": "%(brand)s 桌面版",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "%(brand)s X for Android",
-    "or another cross-signing capable Matrix client": "或者别的可以交叉签名的 Matrix 客户端",
     "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.": "你的新会话现已被验证。别的用户会视其为受信任的。",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "若不在此会话中完成安全验证，它便不能访问加密消息。",
     "Failed to re-authenticate due to a homeserver problem": "由于主服务器的问题，重新认证失败",
     "Failed to re-authenticate": "重新认证失败",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "重新获得访问你账号的权限，并恢复存储在此会话中的加密密钥。没有这些密钥，你将不能在任何会话中阅读你的所有安全消息。",
@@ -2221,7 +1870,6 @@
     "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.": "警告：你的个人信息（包括加密密钥）仍存储于此会话中。如果你不用再使用此会话或想登录进另一个账号，请清除它。",
     "Command Autocomplete": "命令自动补全",
     "Community Autocomplete": "社群自动补全",
-    "DuckDuckGo Results": "DuckDuckGo 结果",
     "Emoji Autocomplete": "表情符号自动补全",
     "Notification Autocomplete": "通知自动补全",
     "Room Autocomplete": "聊天室自动补全",
@@ -2239,37 +1887,21 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "你需要和服务器进行认证以确认更新。",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "更新此会话以允许其验证其他会话、允许其他会话访问加密消息，并将它们对别的用户标记为已信任。",
     "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.": "输入一个只有你知道的安全密码，它将被用来保护你的数据。为了安全，你不应该复用你的账号密码。",
-    "Enter a recovery passphrase": "输入一个恢复密码",
-    "Great! This recovery passphrase looks strong enough.": "棒！这个恢复密码看着够强。",
     "Use a different passphrase?": "使用不同的密语？",
-    "Enter your recovery passphrase a second time to confirm it.": "再次输入您的恢复密语以确认。",
-    "Confirm your recovery passphrase": "确认您的恢复密语",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "将你的安全密钥存储在安全的地方，像是密码管理器或保险箱里，它将被用来保护你的加密数据。",
     "Copy": "复制",
     "Unable to query secret storage status": "无法查询秘密存储状态",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "如果你现在取消，你可能会丢失加密的消息和数据，如果你丢失了登录信息的话。",
     "You can also set up Secure Backup & manage your keys in Settings.": "你也可以在设置中设置安全备份并管理你的密钥。",
-    "Set up Secure backup": "设置安全备份",
     "Upgrade your encryption": "更新你的加密方法",
     "Set a Security Phrase": "设置一个安全密码",
     "Confirm Security Phrase": "确认安全密码",
     "Save your Security Key": "保存你的安全密钥",
     "Unable to set up secret storage": "无法设置秘密存储",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "我们会在服务器上存储一份您的密钥的加密副本。用恢复密码来保护您的备份。",
-    "Set up with a recovery key": "用恢复密钥设置",
-    "Please enter your recovery passphrase a second time to confirm.": "请再输入您的恢复密码以确认。",
-    "Repeat your recovery passphrase...": "重输您的恢复密码...",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "您的恢复密钥是一张安全网——如果您忘记了恢复密码，则可以使用它来恢复您对加密消息的访问。",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "在安全的地方保存一份副本，像是密码管理器或者保险箱里。",
-    "Your recovery key": "您的恢复密钥",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "您的恢复密钥已被<b>复制到您的剪贴板</b>，将其粘贴至：",
-    "Your recovery key is in your <b>Downloads</b> folder.": "您的恢复密钥在您的<b>下载</b>文件夹里。",
     "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.": "若不设置安全消息恢复，你如果登出或使用另一个会话，则将不能恢复你的加密消息历史。",
-    "Secure your backup with a recovery passphrase": "用恢复密码保护您的备份",
-    "Make a copy of your recovery key": "制作一份您的恢复密钥的副本",
     "Create key backup": "创建密钥备份",
     "This session is encrypting history using the new recovery method.": "此会话正在使用新的恢复方法加密历史。",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此会话检测到您的恢复密码和安全消息的密钥已被移除。",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "如果你出于意外这样做了，你可以在此会话上设置安全消息，以使用新的加密方式重新加密此会话的消息历史。",
     "If disabled, messages from encrypted rooms won't appear in search results.": "如果被禁用，加密聊天室内的消息不会显示在搜索结果中。",
     "Disable": "禁用",
@@ -2311,26 +1943,20 @@
     "Space": "空格",
     "How fast should messages be downloaded.": "消息下载速度。",
     "IRC display name width": "IRC 显示名称宽度",
-    "When rooms are upgraded": "聊天室升级时间",
+    "When rooms are upgraded": "当聊天室升级时",
     "Unexpected server error trying to leave the room": "试图离开聊天室时发生意外服务器错误",
     "Error leaving room": "离开聊天室时出错",
-    "New spinner design": "新的下拉列表设计",
     "Show message previews for reactions in DMs": "显示私聊消息预览以回复",
     "Show message previews for reactions in all rooms": "显示所有聊天室的消息预览以回复",
     "Uploading logs": "正在上传日志",
     "Downloading logs": "正在下载日志",
     "This bridge was provisioned by <user />.": "桥接由 <user /> 准备。",
-    "Workspace: %(networkName)s": "工作区：%(networkName)s",
-    "Channel: %(channelName)s": "频道：%(channelName)s",
     "well formed": "格式正确",
     "Master private key:": "主私钥：",
     "Self signing private key:": "自签名私钥：",
     "User signing private key:": "用户签名私钥：",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "在本地安全缓存已加密消息以使其出现在搜索结果中，使用 ",
-    " to store messages from ": " 存储来自 ",
-    "rooms.": "聊天室的消息。",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "此会话<b>未备份你的密钥</b>，但如果你已有现存备份，你可以继续并从中恢复和向其添加。",
-    "Invalid theme schema.": "无效主题方案。",
+    "Invalid theme schema.": "主题方案无效。",
     "Read Marker lifetime (ms)": "已读标记生存期 (ms)",
     "Read Marker off-screen lifetime (ms)": "已读标记屏幕外生存期 (ms)",
     "Unable to revoke sharing for email address": "无法撤消电子邮件地址共享",
@@ -2350,12 +1976,10 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s 未做更改",
     "Preparing to download logs": "正在准备下载日志",
     "Download logs": "下载日志",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "我们无法创建您的私聊。请检查您想要邀请的用户并重试。",
     "%(brand)s encountered an error during upload of:": "%(brand)s 在上传此文件时出错：",
     "Country Dropdown": "国家下拉菜单",
     "Attach files from chat or just drag and drop them anywhere in a room.": "附加聊天中的文件，或将其拖放到聊天室的任何地方。",
     "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.": "更改密码将重置所有会话上的所有端到端加密密钥，从而使加密的聊天记录不可读。在重置密码之前，请设置密钥备份或从其他会话导出聊天室密钥。",
-    "%(brand)s Android": "%(brand)s Android",
     "Message downloading sleep time(ms)": "消息下载休眠时间 (ms)",
     "Toggle Bold": "切换粗体",
     "Toggle Italics": "切换斜体",
@@ -2372,13 +1996,7 @@
     "End": "End",
     "The server is not configured to indicate what the problem is (CORS).": "服务器没有配置为提示错误是什么（CORS）。",
     "Activate selected button": "激活选择的按钮",
-    "End Call": "结束通话",
-    "Remove the group call from the room?": "是否从聊天室中移除聊天室？",
-    "You don't have permission to remove the call from the room": "您没有权限从聊天室中移除此通话",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "在纯文本消息开头添加 ( ͡° ͜ʖ ͡°)",
-    "Group call modified by %(senderName)s": "群通话被 %(senderName)s 修改",
-    "Group call started by %(senderName)s": "%(senderName)s 发起的群通话",
-    "Group call ended by %(senderName)s": "%(senderName)s 结束了群通话",
     "Unknown App": "未知应用",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "社群 v2 原型。需要兼容的主服务器。高度实验性 - 谨慎使用。",
     "Cross-signing is ready for use.": "交叉签名已可用。",
@@ -2388,7 +2006,6 @@
     "Set up Secure Backup": "设置安全备份",
     "Safeguard against losing access to encrypted messages & data": "保护加密信息 & 数据的访问权",
     "not found in storage": "未在存储中找到",
-    "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.": "请备份加密密钥及帐户数据，以防无法访问您的会话。您的密钥将使用唯一的恢复密钥进行保护。",
     "Backup key stored:": "备份密钥已保存：",
     "Backup key cached:": "备份密钥已缓存：",
     "Secret storage:": "秘密存储：",
@@ -2402,15 +2019,10 @@
     "No other application is using the webcam": "没有其他应用程序正在使用摄像头",
     "Permission is granted to use the webcam": "授予使用网络摄像头的权限",
     "A microphone and webcam are plugged in and set up correctly": "麦克风和摄像头已插入并正确设置",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "通话失败，因为无法访问摄像头或麦克风。 检查：",
     "Unable to access webcam / microphone": "无法访问摄像头/麦克风",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "呼叫失败，因为无法访问任何麦克风。 检查是否已插入麦克风并正确设置。",
     "Unable to access microphone": "无法使用麦克风",
     "The call was answered on another device.": "在另一台设备上应答了此通话。",
     "The call could not be established": "无法建立通话",
-    "The other party declined the call.": "对方拒绝了通话。",
-    "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。",
@@ -2490,16 +2102,11 @@
     "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": "公共",
@@ -2518,8 +2125,6 @@
     "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": "默认展开代码块",
@@ -2547,9 +2152,6 @@
     "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": "在纯文本消息开头添加 ┬──┬ ノ( ゜-゜ノ)",
@@ -2568,12 +2170,6 @@
     "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?": "忘记密码？",
@@ -2582,7 +2178,6 @@
     "Wrong Security Key": "安全密钥错误",
     "Save Changes": "保存修改",
     "Saving...": "正在保存…",
-    "View dev tools": "查看开发者工具",
     "Leave Space": "离开空间",
     "Space settings": "空间设置",
     "Learn more": "了解更多",
@@ -2606,24 +2201,17 @@
     "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 创建了此聊天室。",
@@ -2639,8 +2227,6 @@
     "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": "收起空间面板",
@@ -2654,7 +2240,6 @@
     "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": "支持",
@@ -2742,15 +2327,11 @@
     "Croatia": "克罗地亚",
     "Costa Rica": "哥斯达黎加",
     "<inviter/> invites you": "<inviter/> 邀请了你",
-    "Search names and description": "搜索名称与描述",
     "No results found": "找不到结果",
     "Mark as suggested": "标记为建议",
     "Mark as not suggested": "标记为不建议",
     "Removing...": "正在移除…",
     "Failed to remove some rooms. Try again later": "无法移除某些聊天室。请稍后再试",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s 个聊天室和 %(numSpaces)s 个空间",
-    "%(count)s rooms and 1 space|other": "%(count)s 个聊天室和 1 个空间",
-    "%(count)s rooms and 1 space|one": "%(count)s 个聊天室和 1 个空间",
     "Suggested": "建议",
     "%(count)s rooms|one": "%(count)s 个聊天室",
     "%(count)s rooms|other": "%(count)s 个聊天室",
@@ -2796,8 +2377,6 @@
     "You can change these anytime.": "你随时可以更改它们。",
     "Add some details to help people recognise it.": "添加一些细节，以便人们辨识你的社群。",
     "Open space for anyone, best for communities": "适合每一个人的开放空间，社群的理想选择",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "空间是为房间和人员分组的新方法。要加入现有的空间，您需要被邀请。",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "来自 %(deviceName)s（%(deviceId)s）于 %(ip)s",
     "New version of %(brand)s is available": "%(brand)s 有新版本可用",
     "You have unverified logins": "你有未验证的登录",
     "You should know": "你应当知道",
@@ -2824,7 +2403,7 @@
     "Value in this room": "此聊天室中的值",
     "Settings Explorer": "设置浏览器",
     "with state key %(stateKey)s": "附带有状态键（state key）%(stateKey)s",
-    "Your server requires encryption to be enabled in private rooms.": "你的服务器要求私人房间启用加密。",
+    "Your server requires encryption to be enabled in private rooms.": "你的服务器要求私有聊天室得启用加密。",
     "An image will help people identify your community.": "图片可以让人们辨识你的社群。",
     "What's the name of your community or team?": "你的社群或者团队的名称是什么？",
     "You can change this later if needed.": "如果需要，你可以稍后更改。",
@@ -2835,10 +2414,6 @@
     "Send %(count)s invites|other": "发送 %(count)s 个邀请",
     "People you know on %(brand)s": "你在 %(brand)s 上认识的人",
     "Add another email": "添加其他邮箱",
-    "Failed to add rooms to space": "添加聊天室到空间失败",
-    "Don't want to add an existing room?": "不想添加现有的聊天室？",
-    "Filter your rooms and spaces": "筛选你的空间/聊天室",
-    "Add existing spaces/rooms": "添加现有的空间/聊天室",
     "Space selection": "空间选择",
     "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.": "通过自定义服务器选项，你可以自行指定并登录其他 Matrix 主服务器。这允许你使用其他主服务器上现有的 Matrix 账号。",
     "See when the avatar changes in this room": "查看此聊天室的头像何时被修改",
@@ -2872,7 +2447,6 @@
     "%(count)s people|other": "%(count)s 人",
     "Invite People": "邀请人们",
     "Suggested Rooms": "建议的聊天室",
-    "Explore space rooms": "探索空间聊天室",
     "Recently visited rooms": "最近访问的聊天室",
     "Channel: <channelLink/>": "频道：<channelLink/>",
     "Workspace: <networkLink/>": "工作空间：<networkLink/>",
@@ -2962,7 +2536,6 @@
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "此处的消息已被端对端加密。请点击对方头像，在其资料中验证 %(displayName)s。",
     "Secure your backup with a Security Phrase": "使用安全密语保护你的备份",
     "Confirm your Security Phrase": "确认你的安全密语",
-    "Verify with another session": "使用另一个会话验证",
     "Use Security Key or Phrase": "使用安全密钥或密语",
     "Continue with %(ssoButtons)s": "使用 %(ssoButtons)s 继续",
     "There was a problem communicating with the homeserver, please try again later.": "与主服务器通讯时出现问题，请稍后再试。",
@@ -2974,7 +2547,6 @@
     "Inviting...": "正在邀请…",
     "Welcome to <name/>": "欢迎来到 <name/>",
     "Share %(name)s": "分享 %(name)s",
-    "Open": "打开",
     "<a>Add a topic</a> to help people know what it is about.": "<a>添加话题</a>，让大家知道这里是讨论什么的。",
     "Topic: %(topic)s (<a>edit</a>)": "话题：%(topic)s（<a>编辑</a>）",
     "Topic: %(topic)s ": "话题：%(topic)s ",
@@ -3062,7 +2634,6 @@
     "It's just you at the moment, it will be even better with others.": "当前仅有你一人，与人同道而行会更好。",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "选择要添加的聊天室或对话。这是专属于你的空间，不会有人被通知。你稍后可以再增加更多。",
     "Select a room below first": "首先选择一个聊天室",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s 个聊天室和 %(numSpaces)s 个空间",
     "This room is suggested as a good one to join": "此聊天室很适合加入",
     "You can select all or individual messages to retry or delete": "你可以选择全部或单独的消息来重试或删除",
     "Sending": "正在发送",
@@ -3071,7 +2642,6 @@
     "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>已继续使用服务。",
     "Filter all spaces": "过滤所有空间",
     "You have no visible notifications.": "你没有可见的通知。",
-    "Communities are changing to Spaces": "社群正在转变为空间",
     "%(creator)s created this DM.": "%(creator)s 创建了此私聊。",
     "Verification requested": "已请求验证",
     "Security Key mismatch": "安全密钥不符",
@@ -3083,7 +2653,6 @@
     "Remember this": "记住",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "挂件将会验证你的用户 ID，但将无法为你执行动作：",
     "Verify other login": "验证其他登录",
-    "Make this space private": "将此空间设为私有",
     "Edit settings relating to your space.": "编辑关于你的空间的设置。",
     "Reset event store": "重置活动存储",
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "如果这样做，请注意你的信息并不会被删除，但在重新建立索引是，搜索体验可能会退步一些",
@@ -3095,7 +2664,6 @@
     "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)s 遇到问题，请回报错误。",
     "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>.": "请注意，如果你不添加电子邮箱并且忘记密码，你将<b>永远失去对你账号的访问权</b>。",
     "Continuing without email": "不使用电子邮箱并继续",
-    "We recommend you change your password and Security Key in Settings immediately": "我们建议你立即在设置中更改你的密码和安全密钥",
     "Data on this screen is shared with %(widgetDomain)s": "在此画面上的资料会与 %(widgetDomain)s 分享",
     "Consult first": "先询问",
     "Invited people will be able to read old messages.": "被邀请的人将能够阅读过去的消息。",
@@ -3115,26 +2683,18 @@
     "What do you want to organise?": "你想要组织什么？",
     "Skip for now": "暂时跳过",
     "Failed to create initial space rooms": "创建初始空间聊天室失败",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "加入 %(spaceName)s 前，请开启<a>空间测试版</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "查看 %(spaceName)s 前，请开启<a>空间测试版</a>",
     "Private space": "私有空间",
     "Public space": "公开空间",
-    "Spaces are a beta feature.": "空间为测试版功能。",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "如果你找不到正在寻找的聊天室，请请求邀请或<a>创建一个新的聊天室</a>。",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "私人聊天室仅能通过邀请找到与加入。公开聊天室则能够被所有人找到并加入。",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "私人聊天室仅能通过邀请找到与加入。公开聊天室则能够被所有在此社群的人找到并加入。",
     "Search names and descriptions": "搜索名称和描述",
     "You may want to try a different search or check for typos.": "你可能要尝试其他搜索或检查是否有错别字。",
     "You may contact me if you have any follow up questions": "如果你有任何后续问题，可以联系我",
-    "To leave the beta, visit your settings.": "要退出测试版，请访问你的设置。",
+    "To leave the beta, visit your settings.": "要退出测试，请访问你的设置。",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "我们将会记录你的平台及用户名，以帮助我们尽我们所能地使用你的反馈。",
-    "%(featureName)s beta feedback": "%(featureName)s 测试版反馈",
+    "%(featureName)s beta feedback": "%(featureName)s 测试反馈",
     "Thank you for your feedback, we really appreciate it.": "感谢你的反馈，我们衷心地感谢。",
-    "Beta feedback": "测试版反馈",
     "Want to add a new room instead?": "想要添加一个新的聊天室吗？",
     "Add existing rooms": "添加现有聊天室",
-    "You can add existing spaces to a space.": "你可以添加现有空间到另一空间中。",
-    "Feeling experimental?": "想要来点实验吗？",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "正在新增聊天室……",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "正在新增聊天室……（%(count)s 中的第 %(progress)s 个）",
     "Not all selected were added": "并非所有选中的都被添加",
@@ -3161,9 +2721,6 @@
     "Unpin a widget to view it in this panel": "取消固定挂件以在此面板中查看",
     "You can only pin up to %(count)s widgets|other": "你仅能固定 %(count)s 个挂件",
     "Accept on your other login…": "接受你的其他登录……",
-    "Delete recording": "删除录制",
-    "Stop the recording": "停止录制",
-    "Record a voice message": "录制语音消息",
     "We didn't find a microphone on your device. Please check your settings and try again.": "我们没能在你的设备上找到麦克风。请检查设置并重试。",
     "No microphone found": "无法发现麦克风",
     "We were unable to access your microphone. Please check your browser settings and try again.": "我们无法访问你的麦克风。 请检查浏览器设置并重试。",
@@ -3188,7 +2745,6 @@
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "使用 %(size)s 来存储来自 %(rooms)s 聊天室的消息。在本地安全地缓存已加密的消息以使其出现在搜索结果中。",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "使用 %(size)s 来存储来自 %(rooms)s 聊天室的消息。在本地安全地缓存已加密的消息以使其出现在搜索结果中。",
     "Manage & explore rooms": "管理并探索聊天室",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "空间是一种将聊天室和人们进行分组的新方法。你需要得到邀请方可加入现有空间。",
     "Please enter a name for the space": "请输入空间名称",
     "Play": "播放",
     "Pause": "暂停",
@@ -3197,14 +2753,7 @@
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "与 %(transferTarget)s 进行协商。<a>转让至 %(transferee)s</a>",
     "unknown person": "陌生人",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "允许在一对一通话中使用点对点通讯（如果你启用此功能，对方可能会看到你的 IP 地址）",
-    "Send and receive voice messages": "发送并接收语音消息",
     "Show options to enable 'Do not disturb' mode": "显示启用「请勿打扰」模式的选项",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "你的反馈将帮助空间变得更好。你能讲得越仔细越好。",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "测试版适用于网页端、桌面端以及安卓端。但在你的主服务器上有些特性可能不可用。",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "你随时可以在设置中退出测试版，或轻点如上所示的测试版徽章。",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s 将在空间启用时重载。社群和自定义标签将被隐藏。",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "测试版适用于网页端、桌面端以及安卓端。感谢你试用测试版。",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "如果你离开，%(brand)s 将会在空间禁用时重载。社群和自定义标记将再次可见。",
     "Spaces are a new way to group rooms and people.": "空间是一种将聊天室与人们进行分组的新方式。",
     "%(deviceId)s from %(ip)s": "来自 %(ip)s 的 %(deviceId)s",
     "Review to ensure your account is safe": "检查以确保你的账号是安全的",
@@ -3231,9 +2780,9 @@
     "Open the link in the email to continue registration.": "打开电子邮件中的链接以继续注册。",
     "A confirmation email has been sent to %(emailAddress)s": "确认电子邮件以发送至 %(emailAddress)s",
     "Avatar": "头像",
-    "Join the beta": "加入测试版",
-    "Leave the beta": "退出测试版",
-    "Beta": "测试版",
+    "Join the beta": "加入测试",
+    "Leave the beta": "退出测试",
+    "Beta": "测试",
     "Tap for more info": "点击以获取更多信息",
     "Spaces is a beta feature": "空间为测试功能",
     "Start audio stream": "开始音频流",
@@ -3273,6 +2822,347 @@
     "See when anyone posts a sticker to your active room": "查看何时有人发送贴纸到你所活跃的聊天室",
     "Send stickers to your active room as you": "发送贴纸到你所活跃的聊天室",
     "See when people join, leave, or are invited to your active room": "查看人们何时加入、离开或被邀请到你所活跃的聊天室",
-    "See when people join, leave, or are invited to this room": "查看人们何时加入、离开或被邀请到这个房间",
-    "Kick, ban, or invite people to this room, and make you leave": "移除、封禁或邀请用户到此聊天室，并让你离开"
+    "See when people join, leave, or are invited to this room": "查看人们加入、离开或被邀请到此聊天室的时间",
+    "Kick, ban, or invite people to this room, and make you leave": "移除、封禁或邀请用户到此聊天室，并让你离开",
+    "Currently joining %(count)s rooms|one": "目前正在加入 %(count)s 个聊天室",
+    "Currently joining %(count)s rooms|other": "目前正在加入 %(count)s 个聊天室",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "尝试不同的单词或检查拼写错误。某些结果可能不可见，因为它们属于私有的，你需要一个邀请才能加入。",
+    "No results for \"%(query)s\"": "「%(query)s」没有结果",
+    "The user you called is busy.": "你所拨打的用户正在忙碌中。",
+    "User Busy": "用户正在忙",
+    "Teammates might not be able to view or join any private rooms you make.": "队友可能无法查看或加入你所创建的任何一个私有聊天室。",
+    "Or send invite link": "或发送邀请链接",
+    "If you can't see who you’re looking for, send them your invite link below.": "如果你找不到你正在寻找的人，请在下方向他们发送你的邀请链接。",
+    "Some suggestions may be hidden for privacy.": "出于隐私考虑，部分建议可能会被隐藏。",
+    "Search for rooms or people": "搜索聊天室或用户",
+    "Message preview": "消息预览",
+    "Forward message": "转发消息",
+    "Open link": "打开链接",
+    "Sent": "已发送",
+    "You don't have permission to do this": "你无权执行此操作",
+    "Error - Mixed content": "错误 - 混合内容",
+    "Error loading Widget": "加载挂件时发生错误",
+    "Pinned messages": "已置顶的消息",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "如果你拥有权限，请打开任何消息的菜单并选择<b>置顶</b>将它们粘贴至此。",
+    "Nothing pinned, yet": "没有置顶",
+    "End-to-end encryption isn't enabled": "未启用端对端加密",
+    "[number]": "[number]",
+    "To view %(spaceName)s, you need an invite": "你需要得到邀请方可查看 %(spaceName)s",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "你可以随时在过滤器面板中点击头像来查看与该社群相关的聊天室和人员。",
+    "Move down": "向下移动",
+    "Move up": "向上移动",
+    "Report": "报告",
+    "Collapse reply thread": "折叠回复链",
+    "Show preview": "显示预览",
+    "View source": "查看源代码",
+    "Forward": "转发",
+    "Settings - %(spaceName)s": "设置 - %(spaceName)s",
+    "Report the entire room": "报告整个聊天室",
+    "Spam or propaganda": "垃圾信息或宣传",
+    "Illegal Content": "违法内容",
+    "Toxic Behaviour": "不良行为",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "此聊天室致力于违法或不良行为，或协管员无法节制违法或不良行为。\n这将报告给 %(homeserver)s 的管理员。管理员无法阅读此聊天室的加密内容。",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "此聊天室致力于违法或不良行为，或协管员无法节制违法或不良行为。\n这将报告给 %(homeserver)s 的管理员。",
+    "Disagree": "不同意",
+    "Please pick a nature and describe what makes this message abusive.": "请选择性质并描述为什么此消息是滥用。",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "任何其他原因。请描述问题。\n这将报告给聊天室协管员。",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "此用户正在聊天室中滥发广告、广告链接或宣传。\n这将报告给聊天室协管员。",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "此用户正在做出违法行为，如对他人施暴，或威胁使用暴力。\n这将报告给聊天室协管员，他们可能会将其报告给执法部门。",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "此用户正在做出不良行为，如在侮辱其他用户，或在全年龄向的聊天室中分享成人内容，亦或是其他违反聊天室规则的行为。\n这将报告给聊天室协管员。",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "此用户所写的是错误内容。\n这将会报告给聊天室协管员。",
+    "Please provide an address": "请提供地址",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s 已更改服务器访问控制列表",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s 已更改服务器访问控制列表 %(count)s 次",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s 已更改服务器访问控制列表",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s 已更改服务器的访问控制列表 %(count)s 此",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "消息搜索初始化失败，请检查<a>你的设置</a>以获取更多信息",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "设置此空间的地址，这样用户就能通过你的主服务器找到此空间（%(localDomain)s）",
+    "To publish an address, it needs to be set as a local address first.": "要公布地址，首先需要将其设为本地地址。",
+    "Published addresses can be used by anyone on any server to join your room.": "任何服务器上的人均可通过公布的地址加入你的聊天室。",
+    "Published addresses can be used by anyone on any server to join your space.": "任何服务器上的人均可通过公布的地址加入你的空间。",
+    "This space has no local addresses": "此空间没有本地地址",
+    "Space information": "空间信息",
+    "Collapse": "折叠",
+    "Expand": "展开",
+    "Recommended for public spaces.": "建议用于公开空间。",
+    "Allow people to preview your space before they join.": "允许在加入前预览你的空间。",
+    "Preview Space": "预览空间",
+    "Decide who can view and join %(spaceName)s.": "这决定了谁可以查看和加入 %(spaceName)s。",
+    "Visibility": "可见性",
+    "This may be useful for public spaces.": "这可能对公开空间有所帮助。",
+    "Guests can join a space without having an account.": "游客无需账号即可加入空间。",
+    "Enable guest access": "启用游客访问权限",
+    "Failed to update the history visibility of this space": "更新此空间的历史记录可见性失败",
+    "Failed to update the guest access of this space": "更新此空间的游客访问权限失败",
+    "Failed to update the visibility of this space": "更新此空间的可见性失败",
+    "Address": "地址",
+    "e.g. my-space": "例如：my-space",
+    "Silence call": "通话静音",
+    "Sound on": "开启声音",
+    "Show all rooms in Home": "在主页显示所有聊天室",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "向协管员报告的范例。在管理支持的聊天室中，你可以通过「报告」按钮向聊天室协管员报告滥用行为",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s 已更改此聊天室的<a>固定消息</a>。",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s 已移除 %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s 已移除 %(targetName)s：%(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s 已撤回向 %(targetName)s 的邀请",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s 已撤回向 %(targetName)s 的邀请：%(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s 已取消封禁 %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s 已离开聊天室",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s 已离开聊天室：%(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s 已拒绝邀请",
+    "%(targetName)s joined the room": "%(targetName)s 已加入聊天室",
+    "%(senderName)s made no change": "%(senderName)s 未发生更改",
+    "%(senderName)s set a profile picture": "%(senderName)s 已设置资料图片",
+    "%(senderName)s changed their profile picture": "%(senderName)s 已更改他们的资料图片",
+    "%(senderName)s removed their profile picture": "%(senderName)s 已移除他们的资料图片",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s 已将他们的昵称移除（%(oldDisplayName)s）",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s 已将他们的昵称设置为 %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s 已将他们的昵称更改为 %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s 已封禁 %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s 已封禁 %(targetName)s： %(reason)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s 已邀请 %(targetName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s 已接受邀请",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s 已接受 %(displayName)s 的邀请",
+    "Some invites couldn't be sent": "部分邀请无法送达",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "我们已向其他人发送邀请，除了以下无法邀请至 <RoomName/> 的人",
+    "Integration manager": "集成管理器",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "你的 %(brand)s 不允许你使用集成管理器来完成此操作，请联系管理员。",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "使用此挂件可能会和 %(widgetDomain)s 及您的集成管理器共享数据 <helpIcon />。",
+    "Identity server is": "身份服务器地址",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "集成管理器接收配置数据，并可以以你的名义修改挂件、发送聊天室邀请及设置权限级别。",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "使用集成管理器管理机器人、挂件和贴纸包。",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "使用集成管理器 <b>（%(serverName)s）</b> 管理机器人、挂件和贴纸包。",
+    "Identity server": "身份服务器",
+    "Identity server (%(server)s)": "身份服务器（%(server)s）",
+    "Could not connect to identity server": "无法连接到身份服务器",
+    "Not a valid identity server (status code %(code)s)": "身份服务器无效（状态码 %(code)s）",
+    "Identity server URL must be HTTPS": "必须以 HTTPS 协议连接身份服务器",
+    "Send pseudonymous analytics data": "发送匿名统计数据",
+    "User %(userId)s is already invited to the room": "%(userId)s 已经被邀请过",
+    "Only invited people can join.": "只有受邀的人才能加入。",
+    "Private (invite only)": "私有（仅邀请）",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "此升级将允许选定的空间成员无需邀请即可访问此聊天室。",
+    "Images, GIFs and videos": "图片、GIF 和视频",
+    "Code blocks": "代码块",
+    "Displaying time": "显示的时间戳",
+    "To view all keyboard shortcuts, click here.": "要查看所有键盘快捷键，请单击此处。",
+    "Keyboard shortcuts": "键盘快捷键",
+    "If a community isn't shown you may not have permission to convert it.": "如果社群未显示，你可能无权转换它。",
+    "Show my Communities": "显示我的社群",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "社区已存档以便为空间腾出位置，但你可以在下方将你的社群转换为空间。转换将确保你的对话获得最新功能。",
+    "Create Space": "创建空间",
+    "Open Space": "打开空间",
+    "Olm version:": "Olm 版本：",
+    "There was an error loading your notification settings.": "加载你的通知设置时出错。",
+    "Mentions & keywords": "提及&关键词",
+    "Global": "全局",
+    "New keyword": "新的关键词",
+    "Keyword": "关键词",
+    "Enable email notifications for %(email)s": "为 %(email)s 启用电子邮件通知",
+    "Enable for this account": "为此帐号启用",
+    "An error occurred whilst saving your notification preferences.": "保存你的通知首选项时出错。",
+    "Error saving notification preferences": "保存通知设置时出错",
+    "Messages containing keywords": "当消息包含关键词时",
+    "Message bubbles": "消息气泡",
+    "IRC": "IRC",
+    "Show all rooms": "显示所有聊天室",
+    "You can change this later.": "你可以稍后变更。",
+    "What kind of Space do you want to create?": "你想创建什么样的空间？",
+    "Give feedback.": "给出反馈。",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "感谢您试用空间。你的反馈将有助于下一个版本。",
+    "Spaces feedback": "空间反馈",
+    "Spaces are a new feature.": "空间是一个新特性。",
+    "Delete avatar": "删除头像",
+    "Mute the microphone": "静音麦克风",
+    "Unmute the microphone": "取消麦克风静音",
+    "Dialpad": "拨号盘",
+    "More": "更多",
+    "Show sidebar": "显示侧边栏",
+    "Hide sidebar": "隐藏侧边栏",
+    "Start sharing your screen": "开始分享你的屏幕",
+    "Stop sharing your screen": "停止分享你的屏幕",
+    "Stop the camera": "停用摄像头",
+    "Start the camera": "启动摄像头",
+    "Your camera is still enabled": "你的摄像头仍然处于启用状态",
+    "Your camera is turned off": "你的摄像头已关闭",
+    "All rooms you're in will appear in Home.": "你加入的所有聊天室都会显示在主页。",
+    "Use Ctrl + F to search timeline": "使用 Ctrl + F 搜索时间线",
+    "Use Command + F to search timeline": "使用 Command + F 搜索时间线",
+    "Don't send read receipts": "不要发送已读回执",
+    "New layout switcher (with message bubbles)": "新的布局切换器（带有消息气泡）",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "这使聊天室可以轻松地对空间保持私密，同时让空间中的人们找到并加入他们。空间中的所有新聊天室都将提供此选项。",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "要帮助空间成员找到并加入私人聊天室，请转到该聊天室的安全和隐私设置。",
+    "Help space members find private rooms": "帮助空间成员找到私人聊天室",
+    "Send voice message": "发送语音消息",
+    "Help people in spaces to find and join private rooms": "帮助空间中的人们找到并加入私人聊天室",
+    "New in the Spaces beta": "空间测试版的新功能",
+    "Transfer Failed": "转移失败",
+    "Unable to transfer call": "无法转移通话",
+    "Anyone can find and join.": "任何人都可以找到并加入。",
+    "We're working on this, but just want to let you know.": "我们正在为此努力，但只是想让你知道。",
+    "Search for rooms or spaces": "搜索聊天室或空间",
+    "Created from <Community />": "从 <Community /> 创建",
+    "Unable to copy a link to the room to the clipboard.": "无法将聊天室的链接复制到剪贴板。",
+    "Unable to copy room link": "无法复制聊天室链接",
+    "Communities won't receive further updates.": "社群不会收到进一步的更新。",
+    "Spaces are a new way to make a community, with new features coming.": "空间是一种建立社群的新方式，新功能即将到来。",
+    "Communities can now be made into Spaces": "社群现在可以变成空间了",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "请求该社群的<a>管理员</a>将其设为空间并留意邀请。",
+    "You can create a Space from this community <a>here</a>.": "你可以在<a>这里</a>从此社群创建一个空间。",
+    "Error downloading audio": "下载音频时出错",
+    "Unnamed audio": "未命名的音频",
+    "Add space": "添加空间",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>请注意升级将使聊天室焕然一新</b>。当前所有的消息都将保留在此存档聊天室中。",
+    "Automatically invite members from this room to the new one": "自动邀请该聊天室的成员加入新聊天室",
+    "These are likely ones other room admins are a part of.": "这些可能是其他聊天室管理员的一部分。",
+    "Other spaces or rooms you might not know": "你可能不知道的其他空间或聊天室",
+    "Spaces you know that contain this room": "你知道的包含此聊天室的空间",
+    "Search spaces": "搜索空间",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "决定哪些空间可以访问这个聊天室。如果一个空间被选中，它的成员可以找到并加入<RoomName/>。",
+    "Select spaces": "选择空间",
+    "You're removing all spaces. Access will default to invite only": "你正在移除所有空间。访问权限将预设为仅邀请",
+    "Leave %(spaceName)s": "离开 %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "你是某些要离开的聊天室或空间的唯一管理员。离开将使它们没有任何管理员。",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "你是此空间的唯一管理员。离开它将意味着没有人可以控制它。",
+    "You won't be able to rejoin unless you are re-invited.": "除非你被重新邀请，否则你将无法重新加入。",
+    "Search %(spaceName)s": "搜索 %(spaceName)s",
+    "User Directory": "用户目录",
+    "Adding...": "添加中...",
+    "Want to add an existing space instead?": "想要添加现有空间？",
+    "Add a space to a space you manage.": "向你管理的空间添加空间。",
+    "Only people invited will be able to find and join this space.": "只有受邀者才能找到并加入此空间。",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "任何人都可以找到并加入这个空间，而不仅仅是 <SpaceName/> 的成员。",
+    "Anyone in <SpaceName/> will be able to find and join.": "<SpaceName/> 中的任何人都可以找到并加入。",
+    "Private space (invite only)": "私有空间（仅邀请）",
+    "Space visibility": "空间可见度",
+    "This description will be shown to people when they view your space": "当人们查看你的空间时，将会向他们显示此描述",
+    "Flair won't be available in Spaces for the foreseeable future.": "在可预见的未来，Flair 将无法在空间中使用。",
+    "All rooms will be added and all community members will be invited.": "将添加所有聊天室并邀请所有社群成员。",
+    "A link to the Space will be put in your community description.": "空间链接将放入你的社群描述中。",
+    "Create Space from community": "从社群创建空间",
+    "Failed to migrate community": "迁移社群失败",
+    "To create a Space from another community, just pick the community in Preferences.": "要从另一个社群创建空间，只需在设置中选择社群。",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> 已经创建，并且社群中的每个人都已被邀请加入其中。",
+    "Space created": "已建立空间",
+    "To view Spaces, hide communities in <a>Preferences</a>": "要查看空间，请在<a>设置</a>中隐藏社群",
+    "This community has been upgraded into a Space": "此社群已升级为空间",
+    "Visible to space members": "对空间成员可见",
+    "Public room": "公共聊天室",
+    "Private room (invite only)": "私有聊天室（仅邀请）",
+    "Room visibility": "聊天室可见度",
+    "Create a room": "创建聊天室",
+    "Only people invited will be able to find and join this room.": "只有被邀请的人才能找到并加入这个聊天室。",
+    "Anyone will be able to find and join this room.": "任何人都可以找到并加入这个聊天室。",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "任何人都可以找到并加入这个聊天室，而不仅仅是 <SpaceName/> 的成员。",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "<SpaceName/> 中的每个人都可以找到并加入这个聊天室。",
+    "You can change this at any time from room settings.": "你可以随时从聊天室设置中更改此设置。",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "调试日志包含应用程序使用数据，包括你的用户名、你访问过的聊天室或群组的 ID 或别名、你上次与之交互的 UI 元素，以及其他用户的用户名。它们不包含消息。",
+    "Adding spaces has moved.": "新增空间已移动。",
+    "Search for rooms": "搜索聊天室",
+    "Search for spaces": "搜索空间",
+    "Create a new space": "创建新空间",
+    "Want to add a new space instead?": "想要添加一个新空间？",
+    "Add existing space": "增加现有的空间",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s 变更了聊天室的<a>置顶消息</a> %(count)s 次。",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s 变更了聊天室的<a>置顶消息</a> %(count)s 次。",
+    "Share content": "分享内容",
+    "Application window": "应用程序窗口",
+    "Share entire screen": "分享整个屏幕",
+    "Image": "图片",
+    "Sticker": "贴纸",
+    "Error processing audio message": "处理音频消息时出错",
+    "Decrypting": "解密中",
+    "The call is in an unknown state!": "通话处于未知状态！",
+    "Missed call": "未接来电",
+    "Unknown failure: %(reason)s": "未知错误：%(reason)s",
+    "An unknown error occurred": "出现未知错误",
+    "Their device couldn't start the camera or microphone": "他们的设备无法启动摄像头或麦克风",
+    "Connection failed": "连接失败",
+    "Could not connect media": "无法连接媒体",
+    "No answer": "无响应",
+    "Call back": "回拨",
+    "Call declined": "拒绝通话",
+    "Stop recording": "停止录制",
+    "Copy Room Link": "复制聊天室链接",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "你现在可以通过在通话期间按“屏幕共享”按钮来共享你的屏幕。如果双方都支持，你甚至可以在音频通话中使用此功能！",
+    "Screen sharing is here!": "屏幕共享来了！",
+    "Show %(count)s other previews|one": "显示 %(count)s 个其他预览",
+    "Show %(count)s other previews|other": "显示 %(count)s 个其他预览",
+    "Access": "访问",
+    "People with supported clients will be able to join the room without having a registered account.": "拥有受支持客户端的人无需注册帐号即可加入聊天室。",
+    "Decide who can join %(roomName)s.": "决定谁可以加入 %(roomName)s。",
+    "Space members": "空间成员",
+    "Anyone in a space can find and join. You can select multiple spaces.": "空间中的任何人都可以找到并加入。你可以选择多个空间。",
+    "Spaces with access": "可访问的空间",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "空间中的任何人都可以找到并加入。<a>在此处编辑哪些空间可以访问。</a>",
+    "Currently, %(count)s spaces have access|other": "目前，%(count)s 个空间可以访问",
+    "& %(count)s more|other": "以及另 %(count)s",
+    "Upgrade required": "需要升级",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "如果你通过 GitHub 提交了错误，调试日志可以帮助我们追踪问题。 调试日志包含应用程序使用数据、你的用户名、你访问过的聊天室或群组的 ID 或别名、你上次与之交互的 UI 元素，以及其他用户的用户名。 它们不包含消息。",
+    "%(sharerName)s is presenting": "%(sharerName)s 正在展示",
+    "You are presenting": "你正在展示",
+    "Surround selected text when typing special characters": "输入特殊字符时圈出选定的文本",
+    "Rooms and spaces": "聊天室与空间",
+    "Results": "结果",
+    "Enable encryption in settings.": "在设置中启用加密。",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "你的私人信息通常是加密的，但此聊天室不是。这通常是因为使用了不受支持的设备或方法，例如电子邮件邀请。",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "为避免这些问题，请为计划中的对话创建一个<a>新的加密聊天室</a>。",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建议公开加密聊天室。</b>这意味着任何人都可以找到并加入聊天室，因此任何人都可以阅读消息。你您将无法享受加密带来的任何好处。 在公共聊天室加密消息会导致接收和发送消息的速度变慢。",
+    "Are you sure you want to make this encrypted room public?": "你确定要公开此加密聊天室吗？",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "为避免这些问题，请为计划中的对话创建一个<a>新的加密聊天室</a>。",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建议为公开聊天室开启加密。</b>任何人都可以找到并加入公开聊天室，因此任何人都可以阅读其中的消息。 你将无法从中体验加密的任何好处，且以后也无法将其关闭。 在公开聊天室中加密消息会导致接收和发送消息的速度变慢。",
+    "Are you sure you want to add encryption to this public room?": "你确定要为此公开聊天室开启加密吗？",
+    "Cross-signing is ready but keys are not backed up.": "交叉签名已就绪，但尚未备份密钥。",
+    "Low bandwidth mode (requires compatible homeserver)": "低带宽模式（需要主服务器兼容）",
+    "Multiple integration managers (requires manual setup)": "多个集成管理器（需要手动设置）",
+    "Show threads": "显示主题帖",
+    "Thread": "主题帖",
+    "Threaded messaging": "按主题排列的消息",
+    "The above, but in <Room /> as well": "以上，但也包括 <Room />",
+    "The above, but in any room you are joined or invited to as well": "以上，但也包括您加入或被邀请加入的任何房间中",
+    "Autoplay videos": "自动播放视频",
+    "Autoplay GIFs": "自动播放 GIF",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s从此聊天室中取消固定了一条消息。查看所有固定消息。",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s 从此聊天室中取消固定了<a>一条消息</a>。查看所有<b>固定消息</b>。",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s将一条消息固定到此聊天室。查看所有固定信息。",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s 将<a>一条消息</a>固定到此聊天室。查看所有<b>固定消息</b>。",
+    "Currently, %(count)s spaces have access|one": "目前，一个空间有访问权限",
+    "& %(count)s more|one": "& 另外 %(count)s",
+    "Some encryption parameters have been changed.": "一些加密参数已更改。",
+    "Role in <RoomName/>": "<RoomName/> 中的角色",
+    "Explore %(spaceName)s": "探索 %(spaceName)s",
+    "Send a sticker": "发送贴纸",
+    "Reply to thread…": "回复主题帖…",
+    "Reply to encrypted thread…": "回复加密的主题帖…",
+    "Add emoji": "添加表情",
+    "Unknown failure": "未知失败",
+    "Failed to update the join rules": "未能更新加入列表",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "<spaceName/> 中的任何人都可以寻找和加入。你也可以选择其他空间。",
+    "Select the roles required to change various parts of the space": "选择改变空间各个部分所需的角色",
+    "Change description": "更改描述",
+    "Change main address for the space": "更改空间主地址",
+    "Change space name": "更改空间名称",
+    "Change space avatar": "更改空间头像",
+    "Message didn't send. Click for info.": "消息没有发送。点击查看信息。",
+    "Message": "消息",
+    "To join this Space, hide communities in your <a>preferences</a>": "要加入此空间，在你的<a>首选项</a>中隐藏社区",
+    "To view this Space, hide communities in your <a>preferences</a>": "要查看此空间，在你的<a>首选项</a>中隐藏社区",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "要加入 %(communityName)s，在<a>首选项</a>中滑动至社区",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "要查看 %(communityName)s，在<a>首选项</a>中滑动至社区",
+    "Private community": "私密社区",
+    "Public community": "公开社区",
+    "Upgrade anyway": "仍要升级",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "此聊天室位于某些不是由你管理的空间中。在这些空间中，旧聊天室仍将被展示，但人们将被提示加入新聊天室。",
+    "Before you upgrade": "在你升级前",
+    "To join a space you'll need an invite.": "要加入一个空间，你需要一个邀请。",
+    "You can also make Spaces from <a>communities</a>.": "你也可以从 <a>社区</a>创造空间。",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "在此会话中暂时展示社区而空间。此功能将在不久的将来被移除。这将重新加载 Element。",
+    "Display Communities instead of Spaces": "展示社区而非空间",
+    "Joining space …": "正在加入空间…",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s 人回应了 %(content)s",
+    "Would you like to leave the rooms in this space?": "你想俩开此空间内的聊天室吗？",
+    "You are about to leave <spaceName/>.": "你即将离开 <spaceName/>。",
+    "Leave some rooms": "离开一些聊天室",
+    "Leave all rooms": "离开所有聊天室",
+    "Don't leave any rooms": "不离开任何聊天室"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5c27fb3878..9d644d424b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,34 +1,24 @@
 {
     "A new password must be entered.": "一個新的密碼必須被輸入。",
     "An error has occurred.": "一個錯誤出現了。",
-    "Anyone who knows the room's link, apart from guests": "任何知道房間連結的人，但訪客除外",
-    "Anyone who knows the room's link, including guests": "任何知道房間連結的人，包括訪客",
     "Are you sure?": "你確定嗎？",
     "Are you sure you want to reject the invitation?": "您確認要謝絕邀請嗎？",
     "Attachment": "附件",
-    "Autoplay GIFs and videos": "自動播放 GIF 和影片",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封鎖了 %(targetName)s.",
     "Ban": "封鎖",
     "Banned users": "被封鎖的用戶",
-    "Call Timeout": "通話逾時",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "當瀏覽器網址列裡有 HTTPS URL 時，不能使用 HTTP 連線到家伺服器。請採用 HTTPS 或者<a>允許不安全的指令稿</a>。",
     "Change Password": "變更密碼",
-    "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。.",
     "Account": "帳號",
-    "Access Token:": "取用令牌：",
     "Admin": "管理者",
     "Advanced": "進階",
     "Always show message timestamps": "總是顯示訊息時間戳",
     "Authentication": "授權",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
-    "%(senderName)s answered the call.": "%(senderName)s 接了通話。.",
-    "Click here to fix": "點擊這里修復",
     "Confirm password": "確認密碼",
     "Continue": "繼續",
     "Create Room": "建立聊天室",
     "Cryptography": "加密",
     "Current password": "當前密碼",
-    "/ddg is not a command": "/ddg 不是一個命令",
     "Deactivate Account": "關閉帳號",
     "Decrypt %(text)s": "解密 %(text)s",
     "Default": "預設",
@@ -38,17 +28,14 @@
     "Email": "電子郵件",
     "Email address": "電子郵件地址",
     "Emoji": "顏文字",
-    "%(senderName)s ended the call.": "%(senderName)s 結束了通話。.",
     "Error": "錯誤",
     "Error decrypting attachment": "解密附件時出錯",
-    "Existing Call": "現有通話",
     "Export E2E room keys": "導出聊天室的端到端加密密鑰",
     "Failed to ban user": "封鎖用戶失敗",
     "Failed to change password. Is your password correct?": "變更密碼失敗。您的密碼正確嗎？",
     "Failed to forget room %(errCode)s": "無法忘記聊天室 %(errCode)s",
     "Failed to join room": "無法加入聊天室",
     "Failed to kick": "踢人失敗",
-    "Failed to leave room": "無法離開聊天室",
     "Failed to load timeline position": "無法加載時間軸位置",
     "Failed to mute user": "禁言用戶失敗",
     "Failed to reject invite": "拒絕邀請失敗",
@@ -61,35 +48,28 @@
     "Failure to create room": "建立聊天室失敗",
     "Favourite": "我的最愛",
     "Favourites": "收藏夾",
-    "Fill screen": "全螢幕顯示",
     "Filter room members": "過濾聊天室成員",
     "Forget room": "忘記聊天室",
     "For security, this session has been signed out. Please sign in again.": "因為安全因素，此工作階段已被登出。請重新登入。",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 從 %(fromPowerLevel)s 變為 %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主動邀請。.",
     "Hangup": "掛斷",
     "Historical": "歷史",
     "Homeserver is": "主伺服器是",
-    "Identity Server is": "身分認證伺服器是",
     "I have verified my email address": "我已經驗證了我的電子郵件地址",
     "Import E2E room keys": "導入聊天室端對端加密密鑰",
     "Incorrect verification code": "驗證碼錯誤",
     "Invalid Email Address": "無效的電子郵件地址",
     "Invalid file%(extra)s": "非法文件%(extra)s",
     "Join Room": "加入聊天室",
-    "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。.",
     "Jump to first unread message.": "跳到第一則未讀訊息。",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "離開聊天室",
     "Return to login screen": "返回到登入畫面",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s 未被允許向你推播通知 ── 請檢查您的瀏覽器設定",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s 未被允許向你推播通知 ── 請重試",
     "Room %(roomId)s not visible": "聊天室 %(roomId)s 已隱藏",
-    "Room Colour": "聊天室顏色",
     "Rooms": "聊天室",
     "Search": "搜尋",
     "Search failed": "搜索失敗",
-    "Searches DuckDuckGo for results": "搜尋 DuckDuckGo",
     "Send Reset Email": "發送密碼重設郵件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 傳了一張圖片。",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 傳送了加入聊天室的邀請。",
@@ -98,14 +78,11 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "伺服器可能不可用、超載，或者你遇到了一個漏洞.",
     "Server unavailable, overloaded, or something else went wrong.": "伺服器可能不可用、超載，或者其他東西出錯了.",
     "Session ID": "會話 ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s 設定了基本資料圖片。",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將他的暱稱改成 %(displayName)s。.",
     "Settings": "設定",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小時制顯示時間戳 （如：下午 2:30）",
     "Signed Out": "已退出登錄",
     "Sign in": "登入",
     "Sign out": "登出",
-    "%(count)s of your messages have not been sent.|other": "部分訊息未送出。",
     "Someone": "某人",
     "Submit": "提交",
     "Success": "成功",
@@ -113,9 +90,7 @@
     "This email address was not found": "未找到此電子郵件地址",
     "The email address linked to your account must be entered.": "必須輸入和你帳號關聯的電子郵件地址。",
     "Unable to add email address": "無法新增電郵地址",
-    "Unable to capture screen": "無法截取畫面",
     "Unable to enable Notifications": "無法啟用通知功能",
-    "You are already in a call.": "您正在通話中。",
     "You cannot place a call with yourself.": "你不能給自已打電話。",
     "You cannot place VoIP calls in this browser.": "在此瀏覽器中您無法撥打 VoIP 通話。",
     "Sun": "週日",
@@ -128,7 +103,6 @@
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室圖片。",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s　圖像",
     "Cancel": "取消",
-    "Custom Server Options": "自訂伺服器選項",
     "Dismiss": "關閉",
     "Mute": "靜音",
     "Notifications": "通知",
@@ -137,7 +111,6 @@
     "Remove": "移除",
     "unknown error code": "未知的錯誤代碼",
     "OK": "確定",
-    "Add a topic": "新增標題",
     "Default Device": "預設裝置",
     "Microphone": "麥克風",
     "Camera": "攝影機",
@@ -146,23 +119,16 @@
     "Commands": "指令",
     "Reason": "原因",
     "Register": "註冊",
-    "Error decrypting audio": "解密音檔出錯",
     "Error decrypting image": "解密圖片出錯",
     "Error decrypting video": "解密影片出錯",
     "Add an Integration": "新增整合器",
-    "Ongoing conference call%(supportedText)s.": "%(supportedText)s 正在進行會議通話。",
-    " (unsupported)": " (不支援)",
     "URL Previews": "網址預覽",
     "Drop file here to upload": "把文件放在這裡上傳",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "您即將被帶到第三方網站，以便您可以驗證您的帳戶以使用%(integrationsUrl)s。你想繼續嗎？",
     "Close": "關閉",
     "Create new room": "建立新聊天室",
-    "Room directory": "聊天室目錄",
     "Start chat": "開始聊天",
     "Accept": "接受",
-    "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀請。",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 已接受 %(displayName)s 的邀請。",
-    "Active call (%(roomName)s)": "活躍的通話（%(roomName)s）",
     "Add": "新增",
     "Admin Tools": "管理員工具",
     "No Microphones detected": "未偵測到麥克風",
@@ -172,40 +138,25 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "你確定你要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "阻擋指定 ID 的使用者",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查你的連線，確保你的<a>家伺服器的 SSL 憑證</a>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
-    "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他的基本資料圖片。",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 變更了 %(powerLevelDiffText)s 權限等級。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 將聊天室名稱變更為 %(roomName)s。",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了聊天室名稱。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 已經變更主題為「%(topic)s」。",
     "Changes your display nickname": "變更您的顯示暱稱",
-    "Click to mute audio": "點選以靜音",
-    "Click to mute video": "點選以讓視訊靜音",
-    "click to reveal": "點選以顯示",
-    "Click to unmute video": "點選以解除視訊靜音",
-    "Click to unmute audio": "點選以解除靜音",
-    "Custom": "自訂",
     "Custom level": "自訂等級",
     "Decline": "拒絕",
     "Deops user with given id": "取消指定 ID 使用者的管理員權限",
-    "Drop File Here": "在此放置檔案",
     "Enter passphrase": "輸入通關密語",
-    "Error: Problem communicating with the given homeserver.": "錯誤：與指定的家伺服器有通訊問題。",
     "Export": "匯出",
     "Failed to change power level": "變更權限等級失敗",
-    "Failed to fetch avatar URL": "擷取大頭貼 URL 失敗",
     "Failed to upload profile picture!": "上傳基本資料圖片失敗！",
     "Home": "家",
     "Import": "匯入",
-    "Incoming call from %(name)s": "從 %(name)s 而來的來電",
-    "Incoming video call from %(name)s": "從 %(name)s 而來的視訊來電",
-    "Incoming voice call from %(name)s": "從 %(name)s 而來的語音來電",
     "Incorrect username and/or password.": "不正確的使用者名稱和／或密碼。",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀請了 %(targetName)s。",
     "Invited": "已邀請",
     "Invites": "邀請",
     "Invites user with given id to current room": "邀請指定 ID 的使用者到目前的聊天室",
     "Sign in with": "登入使用",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "加入為<voiceText>語音</voiceText>或<videoText>視訊</videoText>。",
     "Kick": "踢出",
     "Kicks user with given id": "踢出指定 ID 的使用者",
     "Labs": "實驗室",
@@ -217,7 +168,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s 讓未來的聊天室歷史紀錄可見於所有聊天室成員。",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s 讓未來的聊天室歷史紀錄可見於任何人。",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 讓未來的聊天室歷史紀錄可見於未知 (%(visibility)s) 。",
-    "Manage Integrations": "管理整合",
     "Missing room_id in request": "在要求中遺失聊天室 ID",
     "Missing user_id in request": "在要求中遺失使用者 ID",
     "Moderator": "仲裁者",
@@ -225,13 +175,11 @@
     "New passwords don't match": "新密碼不相符",
     "New passwords must match each other.": "新密碼必須互相符合。",
     "not specified": "未指定",
-    "(not supported by this browser)": "（不被此瀏覽器支援）",
     "<not supported>": "<不支援>",
     "No display name": "沒有顯示名稱",
     "No more results": "沒有更多結果",
     "No results": "沒有結果",
     "No users have specific privileges in this room": "此房間中沒有使用者有指定的權限",
-    "olm version:": "olm 版本：",
     "Only people who have been invited": "僅有被邀請的夥伴",
     "Password": "密碼",
     "Passwords can't be empty": "密碼不能為空",
@@ -239,37 +187,25 @@
     "Phone": "電話",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "請檢查您的電子郵件並點選其中包含的連結。只要這個完成了，就點選選繼續。",
     "Power level must be positive integer.": "權限等級必需為正整數。",
-    "Private Chat": "私密聊天",
     "Privileged Users": "特別權限使用者",
     "Profile": "基本資料",
-    "Public Chat": "公開聊天",
-    "%(targetName)s rejected the invitation.": "%(targetName)s 拒絕了邀請。",
     "Reject invitation": "拒絕邀請",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。",
-    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
-    "Results from DuckDuckGo": "DuckDuckGo 的結果",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此時無法存取。",
     "Save": "儲存",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s 在 %(dateTime)s 時看過",
     "Start authentication": "開始認證",
-    "The phone number entered looks invalid": "輸入的電話號碼看起來無效",
-    "The remote side failed to pick up": "遠端未能接聽",
     "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 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。",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "嘗試載入此房間時間軸的特定時間點，但是問題是您沒有權限檢視相關的訊息。",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "嘗試載入此房間時間軸的特定時間點，但是找不到。",
     "Unable to remove contact information": "無法移除聯絡人資訊",
     "Unable to verify email address.": "無法驗證電子郵件。",
     "Unban": "解除禁止",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除阻擋 %(targetName)s。",
-    "unknown caller": "不明來電",
     "Unmute": "解除靜音",
     "Unnamed Room": "未命名的聊天室",
     "Uploading %(filename)s and %(count)s others|zero": "正在上傳 %(filename)s",
@@ -281,26 +217,17 @@
     "Upload new:": "上傳新的：",
     "Usage": "使用方法",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（權限等級 %(powerLevelNumber)s）",
-    "Username invalid: %(errMessage)s": "使用者名稱無效：%(errMessage)s",
     "Users": "使用者",
     "Verification Pending": "擱置的驗證",
     "Verified key": "已驗證的金鑰",
     "Video call": "視訊通話",
     "Voice call": "語音通話",
-    "VoIP conference finished.": "VoIP 會議已結束。",
-    "VoIP conference started.": "VoIP 會議已開始。",
     "VoIP is unsupported": "VoIP 不支援",
-    "(could not connect media)": "（無法連線媒體）",
-    "(no answer)": "（未回覆）",
-    "(unknown failure: %(reason)s)": "（未知的錯誤：%(reason)s）",
     "Warning!": "警告！",
-    "Who can access this room?": "誰可以存取此房間？",
     "Who can read history?": "誰可以讀取歷史紀錄？",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 撤回了 %(targetName)s 的邀請。",
     "You do not have permission to post to this room": "您沒有權限在此房間發言",
     "You have <a>disabled</a> URL previews by default.": "您已預設<a>停用</a> URL 預覽。",
     "You have <a>enabled</a> URL previews by default.": "您已預設<a>啟用</a> URL 預覽。",
-    "You have no visible notifications": "您沒有可見的通知",
     "You must <a>register</a> to use this functionality": "您必須<a>註冊</a>以使用此功能",
     "You need to be able to invite users to do that.": "您需要邀請使用者來做這件事。",
     "You need to be logged in.": "您需要登入。",
@@ -327,18 +254,12 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "設定顯示名稱：",
-    "Upload an avatar:": "上傳大頭貼：",
     "This server does not support authentication with a phone number.": "這個伺服器不支援以電話號碼認證。",
-    "An error occurred: %(error_string)s": "遇到錯誤：%(error_string)s",
-    "There are no visible files in this room": "此房間中沒有可見的檔案",
     "Room": "房間",
     "Connectivity to the server has been lost.": "至伺服器的連線已遺失。",
     "Sent messages will be stored until your connection has returned.": "傳送的訊息會在您的連線恢復前先儲存起來。",
     "(~%(count)s results)|one": "（~%(count)s 結果）",
     "(~%(count)s results)|other": "（~%(count)s 結果）",
-    "Active call": "活躍的通話",
-    "Please select the destination room for this message": "請選取此訊息的目標房間",
     "New Password": "新密碼",
     "Start automatically after system login": "在系統登入後自動開始",
     "Analytics": "分析",
@@ -357,7 +278,6 @@
     "You must join the room to see its files": "您必須加入房間來檢視它的檔案",
     "Reject all %(invitedRooms)s invites": "拒絕所有 %(invitedRooms)s 邀請",
     "Failed to invite": "邀請失敗",
-    "Failed to invite the following users to the %(roomName)s room:": "邀請下列使用者到 %(roomName)s 房間失敗：",
     "Confirm Removal": "確認移除",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "您確定您想要移除（刪除）此活動嗎？注意若您刪除房間名稱或主題變更，還是可以復原變更。",
     "Unknown error": "未知的錯誤",
@@ -365,29 +285,18 @@
     "Unable to restore session": "無法復原工作階段",
     "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.": "若您先前使用過較新版本的 %(brand)s，您的工作階段可能與此版本不相容。關閉此視窗並回到較新的版本。",
     "Unknown Address": "未知的地址",
-    "ex. @bob:example.com": "例如：@bob:example.com",
-    "Add User": "新增使用者",
-    "Please check your email to continue registration.": "請檢查您的電子郵件來繼續註冊。",
     "Token incorrect": "Token 不正確",
     "Please enter the code it contains:": "請輸入其包含的代碼：",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "若您不指定電子郵件，您將無法重設您的密碼。您確定嗎？",
     "Check for update": "檢查更新",
-    "Username available": "使用者名稱可用",
-    "Username not available": "使用者名稱不可用",
     "Something went wrong!": "出了點問題！",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "這將是您在家伺服器上的帳號名稱<span></span>，或是您可以挑選一個<a>不同的伺服器</a>。",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "若您已經有 Matrix 帳號，您可以<a>登入</a>。",
     "Your browser does not support the required cryptography extensions": "您的瀏覽器不支援需要的加密擴充",
     "Not a valid %(brand)s keyfile": "不是有效的 %(brand)s 金鑰檔案",
     "Authentication check failed: incorrect password?": "認證檢查失敗：不正確的密碼？",
     "Do you want to set an email address?": "您想要設定電子郵件地址嗎？",
     "This will allow you to reset your password and receive notifications.": "這讓您可以重設您的密碼與接收通知。",
     "Skip": "略過",
-    "Add a widget": "新增小工具",
-    "Allow": "允許",
     "and %(count)s others...|other": "與其他 %(count)s 個……",
     "and %(count)s others...|one": "與其他 1 個……",
-    "Cannot add any more widgets": "無法新增更多的小工具",
     "Delete widget": "刪除小工具",
     "Define the power level of a user": "定義使用者的權限等級",
     "Edit": "編輯",
@@ -395,8 +304,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "將這個聊天室公開到 %(domain)s 的聊天室目錄中？",
     "AM": "上午",
     "PM": "下午",
-    "The maximum permitted number of widgets have already been added to this room.": "這個聊天室已經有可加入的最大量的小工具了。",
-    "To get started, please pick a username!": "要開始，請先取一個使用者名稱！",
     "Unable to create widget.": "無法建立小工具。",
     "You are not in this room.": "您不在這個聊天室內。",
     "You do not have permission to do that in this room.": "您沒有在這個聊天室做這件事的權限。",
@@ -437,9 +344,6 @@
     "Enable inline URL previews by default": "預設啟用內嵌 URL 預覽",
     "Enable URL previews for this room (only affects you)": "對此聊天室啟用 URL 預覽（僅影響您）",
     "Enable URL previews by default for participants in this room": "對此聊天室中的參與者預設啟用 URL 預覽",
-    "%(senderName)s sent an image": "%(senderName)s 傳送了一張圖片",
-    "%(senderName)s sent a video": "%(senderName)s 傳送了一則視訊",
-    "%(senderName)s uploaded a file": "%(senderName)s 上傳了一個檔案",
     "Disinvite this user?": "取消邀請此使用者？",
     "Kick this user?": "踢除此使用者？",
     "Unban this user?": "取消阻擋此使用者？",
@@ -452,11 +356,7 @@
     "Invite": "邀請",
     "Send an encrypted reply…": "傳送加密的回覆……",
     "Send an encrypted message…": "傳送加密的訊息……",
-    "Unpin Message": "取消釘選訊息",
-    "Jump to message": "跳到訊息",
-    "No pinned messages.": "沒有已釘選的訊息。",
     "Loading...": "正在載入……",
-    "Pinned Messages": "已釘選的訊息",
     "%(duration)ss": "%(duration)s 秒",
     "%(duration)sm": "%(duration)s 分鐘",
     "%(duration)sh": "%(duration)s 小時",
@@ -471,7 +371,6 @@
     "Unnamed room": "未命名的聊天室",
     "World readable": "所有人可讀",
     "Guests can join": "訪客可加入",
-    "Community Invites": "社群邀請",
     "Banned by %(displayName)s": "被 %(displayName)s 阻擋",
     "Members only (since the point in time of selecting this option)": "僅成員（自選取此選項開始）",
     "Members only (since they were invited)": "僅成員（自他們被邀請開始）",
@@ -484,7 +383,6 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "新社群 ID（例子：+foo:%(localDomain)s）",
     "URL previews are enabled by default for participants in this room.": "此聊天室已預設對參與者啟用 URL 預覽。",
     "URL previews are disabled by default for participants in this room.": "此聊天室已預設對參與者停用 URL 預覽。",
-    "An email has been sent to %(emailAddress)s": "電子郵件已傳送給 %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "文字訊息已傳送給 %(msisdn)s",
     "Remove from community": "從社群中移除",
     "Disinvite this user from community?": "從社群取消邀請此使用者？",
@@ -506,7 +404,6 @@
     "You're not currently a member of any communities.": "您目前不是任何社群的成員。",
     "Delete Widget": "刪除小工具",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "刪除小工具會將它從此聊天室中所有使用者的收藏中移除。您確定您要刪除這個小工具嗎？",
-    "Minimize apps": "最小化應用程式",
     "Communities": "社群",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s 加入了 %(count)s 次",
@@ -573,7 +470,6 @@
     "Community Name": "社群名稱",
     "Community ID": "社群 ID",
     "example": "範例",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>您社群頁面的 HTML</h1>\n<p>\n    使用長描述來為社群的新成員簡介，或是散發\n    一些重要<a href=\"foo\">連結</a>\n</p>\n<p>\n    您甚至可以使用 'img' 標籤\n</p>\n",
     "Add rooms to the community summary": "新增聊天室到社群摘要中",
     "Which rooms would you like to add to this summary?": "您想要新增哪個聊天室到此摘要中？",
     "Add to summary": "新增到摘要",
@@ -609,11 +505,7 @@
     "Error whilst fetching joined communities": "擷取已加入的社群時發生錯誤",
     "Create a new community": "建立新社群",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "建立社群以將使用者與聊天室湊成一組！建立自訂的首頁以在 Matrix 宇宙中標出您的空間。",
-    "%(count)s of your messages have not been sent.|one": "您的訊息尚未傳送。",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在<resendText>重新傳送全部</resendText>或<cancelText>取消全部</cancelText>。您也可以選取單一訊息以重新傳送或取消。",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "現在<resendText>重新傳送訊息</resendText>或<cancelText>取消訊息</cancelText>。",
     "Warning": "警告",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "沒有其他人了！您想要<inviteText>邀請其他人</inviteText>或<nowarnText>停止關於空聊天室的警告嗎</nowarnText>？",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "隱私對我們來說至關重要，所以我們不會收集任何私人或可辨識的資料供我們的分析使用。",
     "Learn more about how we use analytics.": "得知更多關於我們如何使用分析資料的資訊。",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "電子郵件已傳送至 %(emailAddress)s。您必須跟隨其中包含了連結，點按下面的連結。",
@@ -635,16 +527,13 @@
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
     "Community IDs cannot be empty.": "社群 ID 不能為空。",
     "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
     "Failed to set direct chat tag": "設定直接聊天標籤失敗",
     "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
     "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",
     "Did you know: you can use communities to filter your %(brand)s experience!": "您知道嗎：您可以使用社群來強化您的 %(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.": "要設定過濾器，拖曳社群大頭貼到位於螢幕最左邊的過濾器面板。您可以在任何時候在過濾器面板中的大頭貼上點按以檢視與該社群關聯的聊天室與夥伴。",
     "Clear filter": "清除過濾器",
     "Key request sent.": "金鑰請求已傳送。",
     "Code": "代碼",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "如果您透過 GitHub 來回報錯誤，除錯訊息可以用來追蹤問題。除錯訊息包含應用程式的使用資料，包括您的使用者名稱、您所造訪的房間/群組的 ID 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
     "Submit debug logs": "傳送除錯訊息",
     "Opens the Developer Tools dialog": "開啟開發者工具對話視窗",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "被 %(displayName)s (%(userName)s) 於 %(dateTime)s 看過",
@@ -660,41 +549,24 @@
     "Who can join this community?": "誰可以加入此社群？",
     "Everyone": "每個人",
     "Fetching third party location failed": "抓取第三方位置失敗",
-    "I understand the risks and wish to continue": "我了解風險並希望繼續",
     "Send Account Data": "傳送帳號資料",
-    "Advanced notification settings": "進階通知設定",
-    "Uploading report": "上傳報告",
     "Sunday": "星期日",
     "Notification targets": "通知目標",
     "Today": "今天",
-    "You are not receiving desktop notifications": "你將不會收到桌面通知",
     "Friday": "星期五",
     "Update": "更新",
-    "Unable to fetch notification target list": "無法抓取通知的目標清單",
     "On": "開啟",
     "Changelog": "變更記錄",
     "Waiting for response from server": "正在等待來自伺服器的回應",
-    "Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上傳",
     "Send Custom Event": "傳送自訂事件",
-    "All notifications are currently disabled for all targets.": "目前所有的通知功能已停用。",
     "Failed to send logs: ": "無法傳送除錯訊息： ",
-    "Forget": "忘記",
-    "You cannot delete this image. (%(code)s)": "你不能刪除這個圖片。(%(code)s)",
-    "Cancel Sending": "取消傳送",
     "This Room": "這個聊天室",
     "Resend": "重新傳送",
     "Room not found": "找不到聊天室",
     "Messages containing my display name": "訊息中有包含我的顯示名稱",
     "Messages in one-to-one chats": "在一對一聊天中的訊息",
     "Unavailable": "無法取得",
-    "Error saving email notification preferences": "儲存電子郵件通知偏好設定時出錯",
-    "View Decrypted Source": "檢視解密的來源",
-    "Failed to update keywords": "無法更新關鍵字",
     "remove %(name)s from the directory.": "自目錄中移除 %(name)s。",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "以下關鍵字依照規則其通知將不會顯示在此：",
-    "Please set a password!": "請設定密碼！",
-    "You have successfully set a password!": "您已經成功設定密碼！",
-    "An error occurred whilst saving your email notification preferences.": "在儲存你的電子郵件通知偏好時發生錯誤。",
     "Explore Room State": "探索聊天室狀態",
     "Source URL": "來源網址",
     "Messages sent by bot": "由機器人送出的訊息",
@@ -702,35 +574,22 @@
     "Members": "成員",
     "No update available.": "沒有可用的更新。",
     "Noisy": "吵鬧",
-    "Files": "檔案",
     "Collecting app version information": "收集應用程式版本資訊",
-    "Enable notifications for this account": "本帳號啟用通知",
     "Invite to this community": "邀請至此社群",
-    "Messages containing <span>keywords</span>": "訊息包含 <span>關鍵字</span>",
     "When I'm invited to a room": "當我被邀請加入聊天室",
     "Tuesday": "星期二",
-    "Enter keywords separated by a comma:": "輸入以逗號隔開的關鍵字：",
-    "Forward Message": "轉寄訊息",
-    "You have successfully set a password and an email address!": "您已經成功設定密碼與電子郵件地址！",
     "Remove %(name)s from the directory?": "自目錄中移除 %(name)s？",
-    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s 使用了許多先進的瀏覽器功能，有些在你目前所用的瀏覽器上無法使用或僅為實驗中的功能。",
     "Developer Tools": "開發者工具",
     "Preparing to send logs": "準備傳送除錯訊息",
     "Explore Account Data": "探索帳號資料",
-    "All messages (noisy)": "所有訊息（吵鬧）",
     "Saturday": "星期六",
-    "Remember, you can always set an email address in user settings if you change your mind.": "記住，如果您改變心意了，您永遠可以在使用者設定中設定電子郵件地址。",
-    "Direct Chat": "私人聊天",
     "The server may be unavailable or overloaded": "伺服器可能無法使用或是超過負載",
     "Reject": "拒絕",
-    "Failed to set Direct Message status of room": "無法設定聊天室的私人訊息狀態",
     "Monday": "星期一",
     "Remove from Directory": "自目錄中移除",
-    "Enable them now": "現在啟用",
     "Toolbox": "工具箱",
     "Collecting logs": "收集記錄",
     "You must specify an event type!": "您必須指定事件類型！",
-    "(HTTP status %(httpStatus)s)": "(HTTP 狀態 %(httpStatus)s)",
     "All Rooms": "所有的聊天室",
     "What's New": "新鮮事",
     "Send logs": "傳送記錄",
@@ -740,11 +599,7 @@
     "State Key": "狀態金鑰",
     "Failed to send custom event.": "傳送自訂式件失敗。",
     "What's new?": "有何新變動？",
-    "Notify me for anything else": "所有消息都通知我",
     "View Source": "檢視原始碼",
-    "Keywords": "關鍵字",
-    "Can't update user notification settings": "無法更新使用者的通知設定",
-    "Notify for all other messages/rooms": "通知其他所有的訊息/聊天室",
     "Unable to look up room ID from server": "無法從伺服器找到聊天室 ID",
     "Couldn't find a matching Matrix room": "不能找到符合 Matrix 的聊天室",
     "Invite to this room": "邀請加入這個聊天室",
@@ -755,37 +610,25 @@
     "Back": "返回",
     "Reply": "回覆",
     "Show message in desktop notification": "在桌面通知中顯示訊息",
-    "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.": "除錯訊息包含應用程式的使用資料，包括您的使用者名稱、您所造訪的房間/群組的 ID 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
-    "Unhide Preview": "取消隱藏預覽",
     "Unable to join network": "無法加入網路",
-    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "可惜，您的瀏覽器 <b>無法</b> 執行 %(brand)s.",
     "Messages in group chats": "在群組聊天中的訊息",
     "Yesterday": "昨天",
     "Error encountered (%(errorDetail)s).": "遇到錯誤 (%(errorDetail)s)。",
     "Low Priority": "低優先度",
     "%(brand)s does not know how to join a room on this network": "%(brand)s 不知道如何在此網路中加入聊天室",
-    "Set Password": "設定密碼",
     "Off": "關閉",
-    "Mentions only": "僅提及",
     "Wednesday": "星期三",
-    "You can now return to your account after signing out, and sign in on other devices.": "您可以在登出後回到您的帳號，並在其他裝置上登入。",
-    "Enable email notifications": "啟用電子郵件通知",
     "Event Type": "事件類型",
-    "Download this file": "下載這個檔案",
-    "Pin Message": "釘選訊息",
-    "Failed to change settings": "變更設定失敗",
     "View Community": "檢視社群",
     "Event sent!": "事件已傳送！",
     "Event Content": "事件內容",
     "Thank you!": "感謝您！",
     "Quote": "引用",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "您目前的瀏覽器，其應用程式的外觀和感覺可能完全不正確，有些或全部功能可以無法使用。如果您仍想要繼續嘗試，可以繼續，但必須自行承擔後果！",
     "Checking for an update...": "正在檢查更新...",
     "Missing roomId.": "缺少聊天室ID。",
     "Every page you use in the app": "您在應用程式內使用的每一頁",
     "e.g. <CurrentPageURL>": "範例：<CurrentPageURL>",
     "Your device resolution": "您的裝置解析度",
-    "Always show encryption icons": "總是顯示加密圖示",
     "Popout widget": "彈出式小工具",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "無法載入要回覆的活動，它可能不存在或是您沒有權限檢視它。",
     "Send Logs": "傳送紀錄",
@@ -793,7 +636,6 @@
     "Refresh": "重新整理",
     "We encountered an error trying to restore your previous session.": "我們在嘗試復原您先前的工作階段時遇到了一點錯誤。",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "清除您瀏覽器的儲存的東西也許可以修復問題，但會將您登出並造成任何已加密的聊天都無法讀取。",
-    "Collapse Reply Thread": "摺疊回覆討論串",
     "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
     "Send analytics data": "傳送分析資料",
     "Muted Users": "已靜音的使用者",
@@ -818,24 +660,14 @@
     "Share Community": "分享社群",
     "Share Room Message": "分享聊天室訊息",
     "Link to selected message": "連結到選定的訊息",
-    "COPY": "複製",
-    "Share 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.": "在加密的聊天室中（這個就是），URL 預覽會預設停用以確保您的家伺服器（預覽生成的地方）無法在這個聊天室中收集關於您看到的連結的資訊。",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "當某人在他們的訊息中放置 URL 時，URL 預覽可以顯示如標題、描述與網頁上的圖片等等來給您更多關於該連結的資訊。",
-    "The email field must not be blank.": "電子郵件欄不能留空。",
-    "The phone number field must not be blank.": "電話號碼欄不能留空。",
-    "The password field must not be blank.": "密碼欄不能留空。",
-    "Call in Progress": "進行中的通話",
-    "A call is already in progress!": "已有一通電話進行中！",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "您在審閱並同意<consentLink>我們的條款與條件</consentLink>前無法傳送訊息。",
     "Demote yourself?": "將自己降級？",
     "Demote": "降級",
     "Permission Required": "需要權限",
     "You do not have permission to start a conference call in this room": "您沒有在此聊天室啟動會議通話的權限",
     "This event could not be displayed": "此活動無法顯示",
-    "A call is currently being placed!": "目前正在撥打電話！",
-    "Failed to remove widget": "移除小工具失敗",
-    "An error ocurred whilst trying to remove the widget from the room": "嘗試從聊天室移除小工具時發生錯誤",
     "System Alerts": "系統警告",
     "Only room administrators will see this warning": "僅聊天室管理員會看到此警告",
     "Please <a>contact your service administrator</a> to continue using the service.": "請<a>聯絡你的服務管理員</a>以繼續使用服務。",
@@ -877,8 +709,6 @@
     "Unable to load! Check your network connectivity and try again.": "無法載入！請檢查您的網路連線狀態並再試一次。",
     "Delete Backup": "刪除備份",
     "Unable to load key backup status": "無法載入金鑰備份狀態",
-    "Backup version: ": "備份版本： ",
-    "Algorithm: ": "演算法： ",
     "Please review and accept all of the homeserver's policies": "請審閱並接受家伺服器的所有政策",
     "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": "為了避免遺失您的聊天歷史，您必須在登出前匯出您的聊天室金鑰。您必須回到較新的 %(brand)s 才能執行此動作",
     "Incompatible Database": "不相容的資料庫",
@@ -898,11 +728,6 @@
     "Unable to restore backup": "無法復原備份",
     "No backup found!": "找不到備份！",
     "Failed to decrypt %(failedCount)s sessions!": "解密 %(failedCount)s 工作階段失敗！",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "存取您的安全訊息歷史並透過輸入您的復原密碼來設定安全訊息。",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "如果您忘記您的復原密碼，您可以<button1>使用您的復原金鑰</button1>或<button2>設定新的復原選項</button2>",
-    "This looks like a valid recovery key!": "看起來是有效的復原金鑰！",
-    "Not a valid recovery key": "不是有效的復原金鑰",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "存取您的安全訊息歷史並趟過輸入您的復原金鑰來設定安全傳訊。",
     "Failed to perform homeserver discovery": "執行家伺服器探索失敗",
     "Invalid homeserver discovery response": "無效的家伺服器探索回應",
     "Sign in with single sign-on": "以單一登入來登入",
@@ -937,18 +762,13 @@
     "User %(user_id)s does not exist": "使用者 %(user_id)s 不存在",
     "Unknown server error": "未知的伺服器錯誤",
     "Failed to load group members": "載入群組成員失敗",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "顯示在已加密的聊天室中啟用安全訊息復原的提醒",
     "Messages containing @room": "包含 @room 的訊息",
     "Encrypted messages in one-to-one chats": "在一對一的聊天中的加密訊息",
     "Encrypted messages in group chats": "在群組聊天中的已加密訊息",
-    "Don't ask again": "不要再次詢問",
     "Set up": "設定",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "在沒有設定安全訊息復原的情況下，您將會在登出時遺失您的安全訊息歷史。",
-    "If you don't want to set this up now, you can later in Settings.": "如果您不想立刻進行設定，您稍後可以在設定中進行。",
     "That doesn't look like a valid email address": "看起來不像有效的電子郵件地址",
     "Invalid identity server discovery response": "無效的身份伺服器探索回應",
     "General failure": "一般錯誤",
-    "Checking...": "正在檢查……",
     "New Recovery Method": "新復原方法",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果您沒有設定新的復原方法，攻擊者可能會嘗試存取您的帳號。在設定中立刻變更您的密碼並設定新的復原方法。",
     "Set up Secure Messages": "設定安全訊息",
@@ -997,7 +817,6 @@
     "Email Address": "電子郵件地址",
     "Backing up %(sessionsRemaining)s keys...": "正在備份 %(sessionsRemaining)s 金鑰……",
     "All keys backed up": "所有金鑰都已備份",
-    "Add an email address to configure email notifications": "新增電子郵件地址以設定電子郵件通知",
     "Unable to verify phone number.": "無法驗證電話號碼。",
     "Verification code": "驗證碼",
     "Phone Number": "電話號碼",
@@ -1037,7 +856,6 @@
     "Encrypted": "已加密",
     "Ignored users": "已忽略的使用者",
     "Bulk options": "大量選項",
-    "Key backup": "金鑰備份",
     "Missing media permissions, click the button below to request.": "遺失媒體權限，點選此按鈕以請求。",
     "Request media permissions": "請求媒體權限",
     "Voice & Video": "語音與視訊",
@@ -1049,37 +867,21 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "驗證此使用者以標記他們為受信任的。信任的使用者可以在使用端到端加密訊息時能更加放心。",
     "Waiting for partner to confirm...": "正在等待夥伴確認……",
     "Incoming Verification Request": "來到的驗證請求",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "要協助避免重覆的問題，請先<existingIssuesLink>檢視既有的議題</existingIssuesLink>（並新增 a+1）或是如果您找不到的話，就<newIssueLink>建立新議題</newIssueLink>。",
-    "Report bugs & give feedback": "回報臭蟲並給予回饋",
     "Go back": "返回",
     "Update status": "更新狀態",
     "Set status": "設定狀態",
-    "Your Modular server": "您的模組化伺服器",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "輸入您模組化伺服器的位置。它可能會使用您自己的域名或是 <a>modular.im</a> 的子網域。",
-    "Server Name": "伺服器名稱",
-    "The username field must not be blank.": "使用者欄位不能留空。",
     "Username": "使用者名稱",
-    "Not sure of your password? <a>Set a new one</a>": "不確定您的密碼？<a>設定新的</a>",
-    "Create your account": "建立您的帳號",
     "Email (optional)": "電子郵件（選擇性）",
     "Phone (optional)": "電話（選擇性）",
     "Confirm": "確認",
-    "Other servers": "其他伺服器",
-    "Homeserver URL": "家伺服器 URL",
-    "Identity Server URL": "識別伺服器 URL",
-    "Free": "免費",
     "Join millions for free on the largest public server": "在最大的公開伺服器上免費加入數百萬人",
-    "Premium": "專業",
-    "Premium hosting for organisations <a>Learn more</a>": "組織的專業主機託管 <a>得知更多</a>",
     "Other": "其他",
-    "Find other public servers or use a custom server": "尋找其他公開伺服器或使用自訂伺服器",
     "Guest": "訪客",
     "Sign in instead": "請登入",
     "Set a new password": "設定新密碼",
     "Create account": "建立帳號",
     "Keep going...": "繼續……",
     "Starting backup...": "正在開始備份……",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "偵測到安全訊息的新復原通關密語與金鑰。",
     "Recovery Method Removed": "已移除復原方法",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果您沒有移除復原方法，攻擊者可能會試圖存取您的帳號。請立刻在設定中變更您帳號的密碼並設定新的復原方式。",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "檔案 %(fileName)s 超過家伺服器的上傳限制",
@@ -1165,23 +967,16 @@
     "This homeserver does not support login using email address.": "此家伺服器不支援使用電子郵件地址登入。",
     "Registration has been disabled on this homeserver.": "註冊已在此家伺服器上停用。",
     "Unable to query for supported registration methods.": "無法查詢支援的註冊方法。",
-    "Allow Peer-to-Peer for 1:1 calls": "允許一對一通話時的點對點",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "您確定嗎？如果您的金鑰沒有正確備份的話，您將會遺失您的加密訊息。",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "加密訊息是使用端到端加密。只有您和接收者才有金鑰可以閱讀這些訊息。",
     "Restore from Backup": "從備份復原",
     "Back up your keys before signing out to avoid losing them.": "在登出前備份您的金鑰以避免遺失它們。",
     "Start using Key Backup": "開始使用金鑰備份",
     "Credits": "感謝",
-    "Never lose encrypted messages": "永不遺失加密訊息",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "此聊天室中的訊息已使用端到端加密。只有您和接收者有金鑰可以閱讀這些訊息。",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "安全地備份您的金鑰以避免遺失它們。<a>更多資訊。</a>",
-    "Not now": "不是現在",
-    "Don't ask me again": "不要再問我",
     "I don't want my encrypted messages": "我不想要我的加密訊息",
     "Manually export keys": "手動匯出金鑰",
     "You'll lose access to your encrypted messages": "您將會失去對您的加密訊息的存取權",
     "Are you sure you want to sign out?": "您想要登出嗎？",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "如果您遇到臭蟲或是想要與我們分享一些回饋，請讓我們在 GitHub 上知道。",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定金鑰備份。",
     "Hide": "隱藏",
     "For maximum security, this should be different from your account password.": "為了最強的安全性，這應該與您的帳號密碼不一樣。",
@@ -1198,12 +993,7 @@
     "Error updating flair": "更新鑑別能力時發生錯誤",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "更新此聊天室的鑑別能力時發生錯誤。可能是伺服器不允許或遇到暫時性的錯誤。",
     "Room Settings - %(roomName)s": "聊天室設定 - %(roomName)s",
-    "A username can only contain lower case letters, numbers and '=_-./'": "使用者名稱只能包含小寫字母、數字與 '=_-./'",
-    "Share Permalink": "分享永久連結",
-    "Sign in to your Matrix account on %(serverName)s": "登入到您在 %(serverName)s 上的 Matrix 帳號",
-    "Create your Matrix account on %(serverName)s": "在 %(serverName)s 上建立您的 Matrix 帳號",
     "Could not load user profile": "無法載入使用者簡介",
-    "Your Matrix account on %(serverName)s": "您在 %(serverName)s 上的 Matrix 帳號",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "將 ¯\\_(ツ)_/¯ 附加到純文字訊息中",
     "User %(userId)s is already in the room": "使用者 %(userId)s 已經在此聊天室了",
     "The user must be unbanned before they can be invited.": "使用者必須在被邀請前先解除阻擋。",
@@ -1222,7 +1012,6 @@
     "Change settings": "變更設定",
     "Kick users": "踢除使用者",
     "Ban users": "封鎖使用者",
-    "Remove messages": "移除訊息",
     "Notify everyone": "通知每個人",
     "Send %(eventType)s events": "傳送 %(eventType)s 活動",
     "Select the roles required to change various parts of the room": "選取更改聊天室各部份的所需的角色",
@@ -1230,7 +1019,6 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "一旦啟用，聊天室的加密就不能停用了。在已加密的聊天室裡傳送的訊息無法被伺服器看見，僅能被聊天室的參與者看到。啟用加密可能會讓許多機器人與橋接運作不正常。<a>取得更多關於加密的資訊。</a>",
     "Power level": "權力等級",
     "Want more than a community? <a>Get your own server</a>": "想要的不只是社群？<a>架設您自己的伺服器</a>",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "請安裝 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以取得最佳體驗。",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：升級聊天室<i>不會自動將聊天室成員遷移到新版的聊天室</i>。我們會在舊版聊天室中貼出到新聊天室的連結，聊天室成員必須點選此連結以加入新聊天室。",
     "Adds a custom widget by URL to the room": "透過 URL 新增自訂小工具到聊天室",
     "Please supply a https:// or http:// widget URL": "請提供 https:// 或 http:// 小工具 URL",
@@ -1243,11 +1031,7 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "無法撤銷邀請。伺服器可能暫時發生問題，或您沒有足夠的權限來撤銷邀請。",
     "Revoke invite": "撤銷邀請",
     "Invited by %(sender)s": "由 %(sender)s 邀請",
-    "Maximize apps": "最大化應用程式",
-    "A widget would like to verify your identity": "小工具想要驗證您的身份",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "位於 %(widgetUrl)s 的小工具想要驗證您的身份。在您允許後，小工具就可以驗證您的使用者 ID，但不能像您一樣執行動作。",
     "Remember my selection for this widget": "記住我對這個小工具的選擇",
-    "Deny": "拒絕",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s 從家伺服器取得協定清單失敗。家伺服器可能太舊了，所以不支援第三方網路。",
     "%(brand)s failed to get the public room list.": "%(brand)s 取得公開聊天室清單失敗。",
     "The homeserver may be unavailable or overloaded.": "家伺服器似乎不可用或超載。",
@@ -1257,8 +1041,6 @@
     "Replying With Files": "以檔案回覆",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "此時無法使用檔案回覆。您想要上傳此檔案而不回覆嗎？",
     "The file '%(fileName)s' failed to upload.": "檔案「%(fileName)s」上傳失敗。",
-    "Rotate counter-clockwise": "逆時針旋轉",
-    "Rotate clockwise": "順時針旋轉",
     "GitHub issue": "GitHub 議題",
     "Notes": "註記",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "如果有其他有助於釐清問題的情境，如您當時正在做什麼，聊天室 ID、使用者 ID 等等，請在這裡加入這些資訊。",
@@ -1321,8 +1103,6 @@
     "Rotate Right": "向右旋轉",
     "Edit message": "編輯訊息",
     "View Servers in Room": "在聊天室中檢視伺服器",
-    "Unable to validate homeserver/identity server": "無法驗證家伺服器／身份識別伺服器",
-    "Sign in to your Matrix account on <underlinedServerName />": "在 <underlinedServerName /> 上登入到您的 Matrix 帳號",
     "Use an email address to recover your account": "使用電子郵件地址來復原您的帳號",
     "Enter email address (required on this homeserver)": "輸入電子郵件地址（在此家伺服器上必填）",
     "Doesn't look like a valid email address": "不像是有效的電子郵件地址",
@@ -1332,19 +1112,14 @@
     "Passwords don't match": "密碼不符合",
     "Other users can invite you to rooms using your contact details": "其他使用者可以使用您的聯絡人資訊邀請您到聊天室中",
     "Enter phone number (required on this homeserver)": "輸入電話號碼（在此家伺服器上必填）",
-    "Doesn't look like a valid phone number": "不像是有效的電話號碼",
     "Enter username": "輸入使用者名稱",
     "Some characters not allowed": "不允許某些字元",
-    "Create your Matrix account on <underlinedServerName />": "在 <underlinedServerName /> 上建立您的 Matrix 帳號",
     "Add room": "新增聊天室",
-    "Your profile": "您的簡介",
-    "Your Matrix account on <underlinedServerName />": "您在 <underlinedServerName /> 上的 Matrix 帳號",
     "Failed to get autodiscovery configuration from server": "從伺服器取得自動探索設定失敗",
     "Invalid base_url for m.homeserver": "無效的 m.homeserver base_url",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "家伺服器 URL 似乎不是有效的 Matrix 家伺服器",
     "Invalid base_url for m.identity_server": "無效的 m.identity_server base_url",
     "Identity server URL does not appear to be a valid identity server": "身份識別伺服器 URL 似乎不是有效的身份識別伺服器",
-    "Low bandwidth mode": "低頻寬模式",
     "Uploaded sound": "已上傳的音效",
     "Sounds": "音效",
     "Notification sound": "通知音效",
@@ -1372,14 +1147,11 @@
     "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:": "升級這個聊天室需要將其關閉並重新建立一個新的。為了給予聊天室成員最佳的體驗，我們將會：",
     "Loading room preview": "正在載入聊天室預覽",
     "Show all": "顯示全部",
-    "%(senderName)s made no change.": "%(senderName)s 未做出變更。",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s 未做出變更 %(count)s 次",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s 未做出變更",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s 未做出變更 %(count)s 次",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s 未做出變更",
-    "Resend edit": "重新傳送編輯",
     "Resend %(unsentCount)s reaction(s)": "重新傳送 %(unsentCount)s 反應",
-    "Resend removal": "重新傳送移除",
     "Your homeserver doesn't seem to support this feature.": "您的家伺服器似乎並不支援此功能。",
     "Changes your avatar in all rooms": "在所有聊天室變更您的大頭貼",
     "You're signed out": "您已登出",
@@ -1393,7 +1165,6 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "請告訴我們發生了什麼錯誤，或更好的是，在 GitHub 上建立描述問題的議題。",
     "Sign in and regain access to your account.": "登入並取回對您帳號的控制權。",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "您無法登入到您的帳號。請聯絡您的家伺服器管理員以取得更多資訊。",
-    "Identity Server": "身份識別伺服器",
     "Find others by phone or email": "透過電話或電子郵件尋找其他人",
     "Be found by phone or email": "透過電話或電子郵件找到",
     "Use bots, bridges, widgets and sticker packs": "使用機器人、橋接、小工具與貼紙包",
@@ -1406,7 +1177,6 @@
     "Displays list of commands with usages and descriptions": "顯示包含用法與描述的指令清單",
     "Always show the window menu bar": "總是顯示視窗選單列",
     "Command Help": "指令說明",
-    "No identity server is configured: add one in server settings to reset your password.": "未設定身份識別伺服器：在伺服器設定中新增一個以重設您的密碼。",
     "Discovery": "探索",
     "Deactivate account": "停用帳號",
     "Unable to revoke sharing for email address": "無法撤回電子郵件的分享",
@@ -1419,17 +1189,12 @@
     "Please enter verification code sent via text.": "請輸入透過文字傳送的驗證碼。",
     "Discovery options will appear once you have added a phone number above.": "當您在上面加入電話號碼時將會出現探索選項。",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "文字訊息將會被傳送到 +%(msisdn)s。請輸入其中包含的驗證碼。",
-    "Identity Server URL must be HTTPS": "身份識別伺服器 URL 必須為 HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "不是有效的身份識別伺服器（狀態碼 %(code)s）",
-    "Could not connect to Identity Server": "無法連線至身份識別伺服器",
     "Checking server": "正在檢查伺服器",
     "Disconnect from the identity server <idserver />?": "從身份識別伺服器 <idserver /> 斷開連線？",
     "Disconnect": "斷開連線",
-    "Identity Server (%(server)s)": "身份識別伺服器 (%(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.": "您目前正在使用 <server></server> 來探索以及被您所知既有的聯絡人探索。您可以在下方變更身份識別伺服器。",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "您目前並未使用身份識別伺服器。要探索及被您所知既有的聯絡人探索，請在下方新增一個。",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "從您的身份識別伺服器斷開連線代表您不再能被其他使用者探索到，而且您也不能透過電子郵件或電話邀請其他人。",
-    "Integration Manager": "整合管理員",
     "Call failed due to misconfigured server": "因為伺服器設定錯誤，所以通話失敗",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "請詢問您家伺服器的管理員（<code>%(homeserverDomain)s</code>）以設定 TURN 伺服器讓通話可以正常運作。",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "或是您也可以試著使用公開伺服器 <code>turn.matrix.org</code>，但可能不夠可靠，而且會跟該伺服器分享您的 IP 位置。您也可以在設定中管理這個。",
@@ -1446,16 +1211,11 @@
     "Remove %(phone)s?": "移除 %(phone)s？",
     "Accept <policyLink /> to continue:": "接受 <policyLink /> 以繼續：",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "同意身份識別伺服器 (%(serverName)s) 服務條款以讓您可以被透過電子郵件地址或電話號碼探索。",
-    "Multiple integration managers": "多個整合管理員",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "如果您不想要使用 <server /> 來探索與被您已知的既有聯絡人探索，在下方輸入其他身份識別伺服器。",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "使用身份識別伺服器是選擇性的。如果您選擇不要使用身份識別伺服器，您將無法被其他使用者探索，您也不能透過電子郵件或電話邀請其他人。",
     "Do not use an identity server": "不要使用身份識別伺服器",
     "You do not have the required permissions to use this command.": "您沒有使用此指令的必要權限。",
     "Upgrade the room": "升級聊天室",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "設定電子郵件以供復原使用。使用電子郵件或電話以選擇性供其他聯絡人探索。",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "設定電子郵件以供復原使用。使用電子郵件以選擇性供其他聯絡人探索。",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "輸入您自訂的家伺服器 URL。<a>這代表什麼？</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "輸入您自訂的身份識別伺服器 URL。<a>這代表什麼？</a>",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "使用身份識別伺服器以透過電子郵件邀請。<default>使用預設值 (%(defaultIdentityServerName)s)</default>或在<settings>設定</settings>中管理。",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "使用身份識別伺服器以透過電子郵件邀請。在<settings>設定</settings>中管理。",
     "Use an identity server": "使用身份識別伺服器",
@@ -1466,7 +1226,6 @@
     "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": "停用使用者",
     "Sends a message as plain text, without interpreting it as markdown": "傳送純文字訊息，不將其直譯為 markdown",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "傳送訊息的已讀回條（需要相容的家伺服器以停用）",
     "Change identity server": "變更身份識別伺服器",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "取消連線到身份識別伺服器 <current /> 並連線到 <new />？",
     "Disconnect identity server": "取消連線身份識別伺服器",
@@ -1501,9 +1260,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.": "回報此訊息將會傳送其獨一無二的「活動 ID」給您家伺服器的管理員。如果此聊天室中的訊息已加密，您的家伺服器管理員將無法閱讀訊息文字或檢視任何檔案或圖片。",
     "Send report": "傳送回報",
     "Report Content": "回報內容",
-    "Explore": "探索",
     "Filter": "過濾器",
-    "Filter rooms…": "過濾聊天室……",
     "Preview": "預覽",
     "View": "檢視",
     "Find a room…": "尋找聊天室……",
@@ -1515,14 +1272,11 @@
     "Read Marker off-screen lifetime (ms)": "畫面外讀取標記的生命週期（毫秒）",
     "e.g. my-room": "例如：my-room",
     "Please enter a name for the room": "請輸入聊天室名稱",
-    "This room is private, and can only be joined by invitation.": "此聊天室是私人聊天室，僅能透過邀請加入。",
     "Create a public room": "建立公開聊天室",
     "Create a private room": "建立私人聊天室",
     "Topic (optional)": "主題（選擇性）",
-    "Make this room public": "讓聊天室公開",
     "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.": "要繼續，您必須同意本服務的條款。",
     "Document": "文件",
@@ -1535,7 +1289,6 @@
     "Clear cache and reload": "清除快取並重新載入",
     "%(count)s unread messages including mentions.|other": "包含提及有 %(count)s 則未讀訊息。",
     "%(count)s unread messages.|other": "%(count)s 則未讀訊息。",
-    "Unread mentions.": "未讀提及。",
     "Show image": "顯示圖片",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "請在 GitHub 上<newIssueLink>建立新議題</newIssueLink>，這樣我們才能調查這個臭蟲。",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "家伺服器設定中遺失驗證碼公開金鑰。請向您的家伺服器管理員回報。",
@@ -1552,7 +1305,6 @@
     "contact the administrators of identity server <idserver />": "聯絡身份識別伺服器 <idserver /> 的管理員",
     "wait and try again later": "稍候並再試一次",
     "Command Autocomplete": "指令自動完成",
-    "DuckDuckGo Results": "DuckDuckGo 結果",
     "Failed to deactivate user": "停用使用者失敗",
     "This client does not support end-to-end encryption.": "此客戶端不支援端到端加密。",
     "Messages in this room are not end-to-end encrypted.": "此聊天室中的訊息沒有端到端加密。",
@@ -1571,8 +1323,6 @@
     "Jump to first unread room.": "跳到第一個未讀的聊天室。",
     "Jump to first invite.": "跳到第一個邀請。",
     "Room %(name)s": "聊天室 %(name)s",
-    "Recent rooms": "最近的聊天室",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "未設定身份識別伺服器，所以您無法新增電子郵件以在未來重設您的密碼。",
     "%(count)s unread messages including mentions.|one": "1 則未讀的提及。",
     "%(count)s unread messages.|one": "1 則未讀的訊息。",
     "Unread messages.": "未讀的訊息。",
@@ -1625,8 +1375,6 @@
     "Custom (%(level)s)": "自訂 (%(level)s)",
     "Trusted": "已信任",
     "Not trusted": "不信任",
-    "Direct message": "直接訊息",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> 在 %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "在此聊天室中的訊息為端到端加密。",
     "Security": "安全",
     "Verify": "驗證",
@@ -1638,27 +1386,19 @@
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "聊天室 ID",
     "Widget ID": "小工具 ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "使用這個小工具可能會與 %(widgetDomain)s 以及您的整合管理員分享資料 <helpIcon />。",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "使用這個小工具可能會與 %(widgetDomain)s 分享資料 <helpIcon /> 。",
     "Widget added by": "小工具新增由",
     "This widget may use cookies.": "這個小工具可能會使用 cookies。",
     "Connecting to integration manager...": "正在連線到整合管理員……",
     "Cannot connect to integration manager": "無法連線到整合管理員",
     "The integration manager is offline or it cannot reach your homeserver.": "整合管理員已離線或無法存取您的家伺服器。",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "使用整合管理員 <b>(%(serverName)s)</b> 以管理機器人、小工具與貼紙包。",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "使用整合管理員以管理機器人、小工具與貼紙包。",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "整合管理員接收設定資料，並可以修改小工具、傳送聊天室邀請並設定權限等級。",
     "Failed to connect to integration manager": "連線到整合管理員失敗",
     "Widgets do not use message encryption.": "小工具不使用訊息加密。",
     "More options": "更多選項",
     "Integrations are disabled": "整合已停用",
     "Enable 'Manage Integrations' in Settings to do this.": "在設定中啟用「管理整合」以執行此動作。",
     "Integrations not allowed": "不允許整合",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "您的 %(brand)s 不允許您使用整合管理員來執行此動作。請聯絡管理員。",
-    "Reload": "重新載入",
-    "Take picture": "拍照",
     "Remove for everyone": "對所有人移除",
-    "Remove for me": "對我移除",
     "Decline (%(counter)s)": "拒絕 (%(counter)s)",
     "Manage integrations": "管理整合",
     "Verification Request": "驗證請求",
@@ -1668,12 +1408,10 @@
     "%(senderName)s placed a video call.": "%(senderName)s 撥打了視訊通話。",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s 撥打了視訊通話。（不被此瀏覽器支援）",
     "Clear notifications": "清除通知",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "使用實驗室功能來自訂您的體驗。<a>了解更多</a>。",
     "Error upgrading room": "升級聊天室時遇到錯誤",
     "Double check that your server supports the room version chosen and try again.": "仔細檢查您的伺服器是否支援選定的聊天室版本，然後再試一次。",
     "This message cannot be decrypted": "此訊息無法解密",
     "Unencrypted": "未加密",
-    "Automatically invite users": "自動邀請使用者",
     "Upgrade private room": "升級私密聊天室",
     "Upgrade public room": "升級公開聊天室",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "升級聊天室為進階動作，通常建議在聊天室因為臭蟲而不穩定、缺少功能或安全漏洞等才升級。",
@@ -1683,7 +1421,6 @@
     "Notification settings": "通知設定",
     "User Status": "使用者狀態",
     "Reactions": "反應",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> 反應了 %(content)s</reactedWith>",
     "<userName/> wants to chat": "<userName/> 想要聊天",
     "Start chatting": "開始聊天",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 使用者的規則",
@@ -1710,28 +1447,18 @@
     "Secret storage public key:": "秘密儲存空間公開金鑰：",
     "in account data": "在帳號資料中",
     "Cross-signing": "交叉簽章",
-    "Cross-signing and secret storage are enabled.": "已啟用交叉簽章與秘密儲存空間。",
-    "Cross-signing and secret storage are not yet set up.": "尚未設定交叉簽章與秘密儲存空間。",
-    "Bootstrap cross-signing and secret storage": "啟動交叉簽章與秘密儲存空間",
     "not stored": "未儲存",
     "Backup has a <validity>valid</validity> signature from this user": "備份有從此使用者而來的<validity>有效</validity>簽章",
     "Backup has a <validity>invalid</validity> signature from this user": "備份有從此使用者而來的<validity>無效</validity>簽章",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "備份有從<verify>未知的</verify>使用者而來，ID 為 %(deviceId)s 的簽章",
-    "Backup key stored: ": "備份金鑰已儲存： ",
     "Hide verified sessions": "隱藏已驗證的工作階段",
     "%(count)s verified sessions|other": "%(count)s 個已驗證的工作階段",
     "%(count)s verified sessions|one": "1 個已驗證的工作階段",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定金鑰備份。",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "如果您忘記您的復原金鑰，您可以<button>設定新的復原選項</button>",
-    "Set up with a recovery key": "設定復原金鑰",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "您的復原金鑰已被<b>複製到您的剪貼簿</b>，請將其貼到：",
-    "Your recovery key is in your <b>Downloads</b> folder.": "您的復原金鑰在您的<b>下載</b>資料夾中。",
     "Unable to set up secret storage": "無法設定秘密儲存空間",
     "Close preview": "關閉預覽",
     "Language Dropdown": "語言下拉式選單",
     "Country Dropdown": "國家下拉式選單",
-    "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。",
-    "Help": "說明",
     "Show more": "顯示更多",
     "Recent Conversations": "最近的對話",
     "Direct Messages": "直接訊息",
@@ -1757,8 +1484,6 @@
     "%(num)s hours from now": "從現在開始 %(num)s 小時",
     "about a day from now": "從現在開始大約一天",
     "%(num)s days from now": "從現在開始 %(num)s 天",
-    "Failed to invite the following users to chat: %(csvUsers)s": "邀請使用者加入聊天失敗：%(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "我們無法建立您的直接對話。請檢查您想要邀請的使用者並再試一次。",
     "Start": "開始",
     "Session verified": "工作階段已驗證",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "您的新工作階段已驗證。其對您的已加密訊息有存取權，其他使用者也將會看到其受信任。",
@@ -1779,14 +1504,12 @@
     "Send as message": "以訊息傳送",
     "This room is end-to-end encrypted": "此聊天室已端到端加密",
     "Everyone in this room is verified": "此聊天室中每個人都已驗證",
-    "Invite only": "僅邀請",
     "Send a reply…": "傳送回覆……",
     "Send a message…": "傳送訊息……",
     "Reject & Ignore user": "回絕並忽略使用者",
     "Enter your account password to confirm the upgrade:": "輸入您的帳號密碼以確認升級：",
     "You'll need to authenticate with the server to confirm the upgrade.": "您必須透過伺服器驗證以確認升級。",
     "Upgrade your encryption": "升級您的加密",
-    "Set up encryption": "設定加密",
     "Verify this session": "驗證此工作階段",
     "Encryption upgrade available": "已提供加密升級",
     "Verifies a user, session, and pubkey tuple": "驗證使用者、工作階段與公開金鑰組合",
@@ -1804,8 +1527,6 @@
     "To be secure, do this in person or use a trusted way to communicate.": "為了安全，請親自進行或使用可信的通訊方式。",
     "Review": "評論",
     "This bridge was provisioned by <user />.": "此橋接是由 <user /> 設定。",
-    "Workspace: %(networkName)s": "工作空間：%(networkName)s",
-    "Channel: %(channelName)s": "頻道：%(channelName)s",
     "Show less": "顯示較少",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "變更密碼將會重設所有工作階段上的所有端到端加密金鑰，讓已加密的聊天歷史無法讀取，除非您先匯出您的聊天室金鑰並在稍後重新匯入。未來會有所改善。",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "您的帳號在秘密儲存空間中有交叉簽章的身份，但尚未被此工作階段信任。",
@@ -1814,9 +1535,6 @@
     "Unable to load session list": "無法載入工作階段清單",
     "Delete %(count)s sessions|other": "刪除 %(count)s 個工作階段",
     "Delete %(count)s sessions|one": "刪除 %(count)s 個工作階段",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "將加密的訊息安全地在本機快取以出現在顯示結果中，使用 ",
-    " to store messages from ": " 以儲存訊息從 ",
-    "rooms.": "聊天室。",
     "Manage": "管理",
     "Securely cache encrypted messages locally for them to appear in search results.": "將加密的訊息安全地在本機快取以出現在顯示結果中。",
     "Enable": "啟用",
@@ -1877,13 +1595,7 @@
     "Session name": "工作階段名稱",
     "Session key": "工作階段金鑰",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "驗證此使用者將會把他們的工作階段標記為受信任，並同時為他們標記您的工作階段可受信任。",
-    "New session": "新工作階段",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "使用此工作階段以驗證您新的工作階段，並授予其對加密訊息的存取權限：",
-    "If you didn’t sign in to this session, your account may be compromised.": "如果您未登入此工作階段，您的帳號可能已被盜用。",
-    "This wasn't me": "這不是我",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "退出後，您可以回到您的帳號，並登入其他工作階段。",
     "Your new session is now verified. Other users will see it as trusted.": "您新的工作階段已驗證。其他使用者將會看到其已受信任。",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "如果在此工作階段中沒有完成安全性驗證，它將無法存取已加密的訊息。",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "變更您的密碼將會重設您所有的工作階段上任何端到端加密金鑰，讓已加密的聊天歷史無法讀取。設定金鑰備份或在重設您的密碼前從其他工作階段匯出您的聊天室金鑰。",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "您已登出所有工作階段，且將不會再收到推播通知。要重新啟用通知，請在每個裝置上重新登入。",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "重新取得對您的帳號的存取權限，並復原此工作階段中的復原金鑰。沒有它們，您就無法在任何工作階段中閱讀您所有的安全訊息。",
@@ -1892,10 +1604,8 @@
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，給予它們存取加密訊息的權限，並為其他使用者標記它們為受信任。",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "沒有設定安全訊息復原，如果您登出的或是用其他工作階段的話，您就無法復原您已加密的訊習歷史。",
     "This session is encrypting history using the new recovery method.": "此工作階段正在使用新的復原方法加密歷史。",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的復原通關密語與安全訊息金鑰已被移除。",
     "Mod": "模組",
     "Encryption enabled": "加密已啟用",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "此聊天室中的訊息已端到端加密。了解更多資訊並在使用者的個人檔案中驗證使用者。",
     "Encryption not enabled": "加密未啟用",
     "The encryption used by this room isn't supported.": "不支援此聊天室使用的加密。",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "驗證此裝置以標記其為受信任。",
@@ -1908,25 +1618,15 @@
     "Indexed messages:": "已索引的訊息：",
     "Setting up keys": "設定金鑰",
     "How fast should messages be downloaded.": "訊息應多快下載一次。",
-    "Verify yourself & others to keep your chats safe": "驗證您自己與其他以保證您的聊天安全",
     "You have not verified this user.": "您尚未驗證此使用者。",
-    "Recovery key mismatch": "復原金鑰不相符",
-    "Incorrect recovery passphrase": "錯誤的復原通關密語",
-    "Enter recovery passphrase": "輸入復原通關密語",
-    "Enter recovery key": "輸入復原金鑰",
     "Confirm your identity by entering your account password below.": "透過在下方輸入您的帳號密碼來確認身份。",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "將其副本保存在安全的地方，如密碼管理器或保險箱等。",
-    "Your recovery key": "您的復原金鑰",
     "Copy": "副本",
-    "Make a copy of your recovery key": "複製您的復原金鑰",
     "Create key backup": "建立金鑰備份",
     "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）",
     "Indexed rooms:": "已索引的聊天室：",
-    "If you cancel now, you won't complete verifying the other user.": "如果您現在取消，您將無法完成驗證其他使用者。",
-    "If you cancel now, you won't complete verifying your other session.": "如果您現在取消，您將無法完成驗證您其他的工作階段。",
     "Cancel entering passphrase?": "取消輸入通關密語？",
     "Show typing notifications": "顯示打字通知",
-    "Reset cross-signing and secret storage": "重設交叉簽章與秘密儲存空間",
     "Destroy cross-signing keys?": "摧毀交叉簽章金鑰？",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "永久刪除交叉簽章金鑰。任何您已驗證過的人都會看到安全性警告。除非您遺失了所有可以進行交叉簽章的裝置，否則您平常幾乎不會想要這樣做。",
     "Clear cross-signing keys": "清除交叉簽章金鑰",
@@ -1953,11 +1653,6 @@
     "Accepting…": "正在接受……",
     "Accepting …": "正在接受……",
     "Declining …": "正在拒絕……",
-    "Your account is not secure": "您的帳號不安全",
-    "Your password": "您的密碼",
-    "This session, or the other session": "此工作階段或其他工作階段",
-    "The internet connection either session is using": "任何一個工作階段正在使用的網際網路連線",
-    "We recommend you change your password and recovery key in Settings immediately": "我們建議您立刻在設定中變更您的密碼與復原金鑰",
     "Sign In or Create Account": "登入或建立帳號",
     "Use your account or create a new one to continue.": "使用您的帳號或建立新的以繼續。",
     "Create Account": "建立帳號",
@@ -1987,7 +1682,6 @@
     "Scroll to most recent messages": "捲動到最新訊息",
     "Local address": "本機位置",
     "Published Addresses": "發佈的位置",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "發佈的位置可以讓在任何伺服器上的任何人用來加入您的聊天室。要發佈位置，您必須先設定本機位置。",
     "Other published addresses:": "其他已發佈的位置：",
     "No other published addresses yet, add one below": "尚無其他已發佈的位置，在下方新增一個",
     "New published address (e.g. #alias:server)": "新的已發佈位置（例如：#alias:server）",
@@ -2008,7 +1702,6 @@
     "%(networkName)s rooms": "%(networkName)s 聊天室",
     "Matrix rooms": "Matrix 聊天室",
     "Keyboard Shortcuts": "鍵盤快捷鍵",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "使用他們的名字、使用者名稱（如 <userId/>）或電子郵件地址來與某人開始對話。",
     "a new master key signature": "新的主控金鑰簽章",
     "a new cross-signing key signature": "新的交叉簽署金鑰簽章",
     "a device cross-signing signature": "裝置交叉簽署簽章",
@@ -2075,7 +1768,6 @@
     "Verified": "已驗證",
     "Verification cancelled": "驗證已取消",
     "Compare emoji": "比較顏文字",
-    "Session backup key:": "工作階段備份金鑰：",
     "Sends a message as html, without interpreting it as markdown": "以 html 形式傳送訊息，不將其翻譯為 markdown",
     "Cancel replying to a message": "取消回覆訊息",
     "Sign in with SSO": "使用單一登入系統登入",
@@ -2094,8 +1786,6 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "確認以下的顏文字以相同的順序顯示在兩個工作階段中：",
     "Verify this session by confirming the following number appears on its screen.": "透過確認螢幕上顯示以下的數字來確認此工作階段。",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "正在等待您的其他工作階段，%(deviceName)s (%(deviceId)s)，進行驗證……",
-    "From %(deviceName)s (%(deviceId)s)": "從 %(deviceName)s (%(deviceId)s)",
-    "Waiting for you to accept on your other session…": "正在等待您接受其他工作階段……",
     "Almost there! Is your other session showing the same shield?": "差不多了！您的其他工作階段是否顯示相同的盾牌？",
     "Almost there! Is %(displayName)s showing the same shield?": "差不多了！%(displayName)s 是否顯示相同的盾牌？",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "您已成功驗證了 %(deviceName)s (%(deviceId)s)!",
@@ -2105,7 +1795,6 @@
     "You cancelled verification on your other session.": "您已在其他工作階段取消驗證。",
     "%(displayName)s cancelled verification.": "%(displayName)s 取消驗證。",
     "You cancelled verification.": "您取消了驗證。",
-    "Self-verification request": "自我驗證請求",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "透過使用單一登入系統來證明您的身份以確認刪除這些工作階段。",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "透過使用單一登入系統來證明您的身份以確認刪除此工作階段。",
     "Click the button below to confirm deleting these sessions.|other": "點擊下方按鈕以確認刪除這些工作階段。",
@@ -2134,20 +1823,6 @@
     "Syncing...": "正在同步……",
     "Signing In...": "正在登入……",
     "If you've joined lots of rooms, this might take a while": "如果您已加入很多聊天室，這可能需要一點時間",
-    "If you cancel now, you won't complete your operation.": "如果您現在取消，您將無法完成您的操作。",
-    "Verify other session": "驗證其他工作階段",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入正確的復原通關密語。",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "備份無法使用此復原金鑰解密：請驗證您是否輸入正確的復原金鑰。",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "備份無法使用此復原通關密語解密：請驗證您是否輸入正確的復原通關密語。",
-    "Great! This recovery passphrase looks strong enough.": "很好！這個復原通關密語看起來夠強。",
-    "Enter a recovery passphrase": "輸入復原通關密語",
-    "Enter your recovery passphrase a second time to confirm it.": "再次輸入您的復原通關密語以確認。",
-    "Confirm your recovery passphrase": "確認您的復原通關密語",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "您的復原金鑰是安全網 - 如果您忘記您的復原通關密語的話，您可以用它來恢復您對加密訊息的存取權。",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "我們將會在我們的伺服器上儲存一份您金鑰的加密副本。使用復原通關密語以保護您的備份。",
-    "Please enter your recovery passphrase a second time to confirm.": "請再次輸入您的復原通關密語以確認。",
-    "Repeat your recovery passphrase...": "再次輸入您的復原通關密語……",
-    "Secure your backup with a recovery passphrase": "使用復原通關密語保護您的備份",
     "Can't load this message": "無法載入此訊息",
     "Submit logs": "遞交紀錄檔",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "注意：您的瀏覽器不受支援，所以您的使用體驗可能無法預測。",
@@ -2157,15 +1832,9 @@
     "Please supply a widget URL or embed code": "請提供小工具 URL 或嵌入程式碼",
     "Unable to query secret storage status": "無法查詢秘密儲存空間狀態",
     "Verify this login": "驗證此登入",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "透過驗證這個從您的其他工作階段而來的登入來確認您的身份，並授予其對加密訊息的存取權限。",
-    "This requires the latest %(brand)s on your other devices:": "這需要在您的其他裝置上使用最新的 %(brand)s：",
-    "or another cross-signing capable Matrix client": "或另一個有交叉簽章功能的 Matrix 客戶端",
     "Where you’re logged in": "您登入的地方",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理您工作階段的名稱與登入或<a>在您的使用者檔案中驗證它們</a>。",
-    "Review where you’re logged in": "審閱您的登入位置",
     "New login. Was this you?": "新登入。這是您嗎？",
-    "Verify all your sessions to ensure your account & messages are safe": "驗證您所有的工作階段以確保您的帳號與訊息是安全的",
-    "Verify the new login accessing your account: %(name)s": "驗證正在存取您帳號的新登入：%(name)s",
     "Restoring keys from backup": "從備份還原金鑰",
     "Fetching keys from server...": "正在從伺服器擷取金鑰……",
     "%(completed)s of %(total)s keys restored": "%(total)s 中的 %(completed)s 金鑰已復原",
@@ -2173,7 +1842,6 @@
     "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰",
     "You signed in to a new session without verifying it:": "您已登入新的工作階段但未驗證：",
     "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）、電子郵件地址或<a>分享此聊天室</a>來邀請他們。",
     "Message deleted": "訊息已刪除",
     "Message deleted by %(name)s": "訊息已被 %(name)s 刪除",
     "Opens chat with the given user": "開啟與指定使用者的聊天",
@@ -2190,8 +1858,6 @@
     "Jump to oldest unread message": "跳至最舊的未讀訊息",
     "Upload a file": "上傳檔案",
     "IRC display name width": "IRC 顯示名稱寬度",
-    "Create room": "建立聊天室",
-    "Font scaling": "字型縮放",
     "Font size": "字型大小",
     "Size must be a number": "大小必須為數字",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "自訂字型大小僅能為 %(min)s 點至 %(max)s 點間",
@@ -2210,27 +1876,18 @@
     "Error removing address": "移除地址時發生錯誤",
     "Categories": "分類",
     "Room address": "聊天室地址",
-    "Please provide a room address": "請提供聊天室地址",
     "This address is available to use": "此地址可用",
     "This address is already in use": "此地址已被使用",
-    "Set a room address to easily share your room with other people.": "設定聊天室地址以輕鬆地與其他夥伴分享。",
     "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.": "您先前在此工作階段中使用了較新版本的 %(brand)s。要再次與此版本一同使用端到端加密，您必須先登出再登入。",
-    "Address (optional)": "地址（選擇性）",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "刪除聊天室地址 %(alias)s 並從目錄移除 %(name)s？",
     "delete the address.": "刪除地址。",
     "Use a different passphrase?": "使用不同的通關密語？",
     "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>。",
-    "I want to help": "我想要協助",
     "Your homeserver has exceeded its user limit.": "您的家伺服器已超過使用者限制。",
     "Your homeserver has exceeded one of its resource limits.": "您的家伺服器已超過其中一種資源限制。",
     "Contact your <a>server admin</a>.": "聯絡您的<a>伺服器管理員</a>。",
     "Ok": "確定",
-    "Set password": "設定密碼",
-    "To return to your account in future you need to set a password": "要在日後取回您的帳號，您必須設定密碼",
-    "Restart": "重新啟動",
-    "Upgrade your %(brand)s": "升級您的 %(brand)s",
-    "A new version of %(brand)s is available!": "已有新版的 %(brand)s！",
     "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>",
     "Emoji picker": "顏文字挑選器",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。",
@@ -2243,8 +1900,6 @@
     "Feedback": "回饋",
     "No recently visited rooms": "沒有最近造訪過的聊天室",
     "Sort by": "排序方式",
-    "Unread rooms": "未讀聊天室",
-    "Always show first": "一律先顯示",
     "Show": "顯示",
     "Message preview": "訊息預覽",
     "List options": "列表選項",
@@ -2259,13 +1914,9 @@
     "Customise your appearance": "自訂您的外觀",
     "Appearance Settings only affect this %(brand)s session.": "外觀設定僅會影響此 %(brand)s 工作階段。",
     "Looks good!": "看起來不錯！",
-    "Use Recovery Key or Passphrase": "使用復原金鑰或通關密語",
-    "Use Recovery Key": "使用復原金鑰",
-    "Use the improved room list (will refresh to apply changes)": "使用改進的聊天室清單（將會重新整理以套用變更）",
     "Use custom size": "使用自訂大小",
     "Hey you. You're the best!": "你是最棒的！",
     "Message layout": "訊息佈局",
-    "Compact": "簡潔",
     "Modern": "現代",
     "Use a system font": "使用系統字型",
     "System font name": "系統字型名稱",
@@ -2273,63 +1924,18 @@
     "You joined the call": "您加入了通話",
     "%(senderName)s joined the call": "%(senderName)s 加入了通話",
     "Call in progress": "通話進行中",
-    "You left the call": "您離開了通話",
-    "%(senderName)s left the call": "%(senderName)s 離開了通話",
     "Call ended": "通話結束",
     "You started a call": "您開始了通話",
     "%(senderName)s started a call": "%(senderName)s 開始了通話",
     "Waiting for answer": "正在等待回應",
     "%(senderName)s is calling": "%(senderName)s 正在通話",
-    "You created the room": "您建立了聊天室",
-    "%(senderName)s created the room": "%(senderName)s 建立了聊天室",
-    "You made the chat encrypted": "您讓聊天加密",
-    "%(senderName)s made the chat encrypted": "%(senderName)s 讓聊天加密",
-    "You made history visible to new members": "您讓歷史紀錄對新成員可見",
-    "%(senderName)s made history visible to new members": "%(senderName)s 讓歷史紀錄對新成員可見",
-    "You made history visible to anyone": "您讓歷史紀錄對所有人可見",
-    "%(senderName)s made history visible to anyone": "%(senderName)s 讓歷史紀錄對所有人可見",
-    "You made history visible to future members": "您讓歷史紀錄對未來成員可見",
-    "%(senderName)s made history visible to future members": "%(senderName)s 讓歷史紀錄對未來成員可見",
-    "You were invited": "您被邀請",
-    "%(targetName)s was invited": "%(targetName)s 被邀請",
-    "You left": "您離開",
-    "%(targetName)s left": "%(targetName)s 離開",
-    "You were kicked (%(reason)s)": "您被踢除（%(reason)s）",
-    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s 被踢除（%(reason)s）",
-    "You were kicked": "您被踢除",
-    "%(targetName)s was kicked": "%(targetName)s 被踢除",
-    "You rejected the invite": "您回絕了邀請",
-    "%(targetName)s rejected the invite": "%(targetName)s 回絕了邀請",
-    "You were uninvited": "您被取消邀請",
-    "%(targetName)s was uninvited": "%(targetName)s 被取消邀請",
-    "You were banned (%(reason)s)": "您被封鎖（%(reason)s）",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s 被封鎖（%(reason)s）",
-    "You were banned": "您被封鎖",
-    "%(targetName)s was banned": "%(targetName)s 被封鎖",
-    "You joined": "您加入",
-    "%(targetName)s joined": "%(targetName)s 加入",
-    "You changed your name": "您變更了您的名稱",
-    "%(targetName)s changed their name": "%(targetName)s 變更了他們的名稱",
-    "You changed your avatar": "您變更了您的大頭貼",
-    "%(targetName)s changed their avatar": "%(targetName)s 變更了他們的大頭貼",
-    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
-    "You changed the room name": "您變更了聊天室名稱",
-    "%(senderName)s changed the room name": "%(senderName)s 變更了聊天室名稱",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "You uninvited %(targetName)s": "您取消邀請了 %(targetName)s",
-    "%(senderName)s uninvited %(targetName)s": "%(senderName)s 取消邀請了 %(targetName)s",
-    "You invited %(targetName)s": "您邀請了 %(targetName)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s 邀請了 %(targetName)s",
-    "You changed the room topic": "您變更了聊天室主題",
-    "%(senderName)s changed the room topic": "%(senderName)s 變更了聊天室主題",
-    "New spinner design": "新的微調器設計",
     "Use a more compact ‘Modern’ layout": "使用更簡潔的「現代」佈局",
     "Message deleted on %(date)s": "訊息刪除於 %(date)s",
     "Wrong file type": "錯誤的檔案類型",
-    "Wrong Recovery Key": "錯誤的復原金鑰",
-    "Invalid Recovery Key": "無效的復原金鑰",
     "Security Phrase": "安全密語",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "輸入您的安全密語或<button>使用您的安全金鑰</button>以繼續。",
     "Security Key": "安全金鑰",
@@ -2343,28 +1949,15 @@
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "將您的安全金鑰存放在某個安全的地方，如密碼管理員或保險櫃，其用於保護您的加密資料。",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "如果您現在取消，在您失去對您的登入的存取權時可能會遺失已加密的訊息與資料。",
     "You can also set up Secure Backup & manage your keys in Settings.": "您也可以在設定中設定安全備份並管理您的金鑰。",
-    "Set up Secure backup": "設定安全備份",
     "Set a Security Phrase": "設定安全密語",
     "Confirm Security Phrase": "確認安全密語",
     "Save your Security Key": "儲存您的安全金鑰",
     "Are you sure you want to cancel entering passphrase?": "您確定您想要取消輸入通關密語嗎？",
-    "Use your account to sign in to the latest version": "使用您的帳號以登入到最新版本",
-    "We’re excited to announce Riot is now Element": "我們很高興地宣佈 Riot 現在變為 Element 了",
-    "Riot is now Element!": "Riot 現在變為 Element 了！",
-    "Learn More": "取得更多資訊",
-    "Enable advanced debugging for the room list": "啟用聊天室清單的進階除錯",
     "Enable experimental, compact IRC style layout": "啟用實驗性、簡潔的 IRC 風格佈局",
     "Unknown caller": "未知的來電者",
-    "Incoming voice call": "語音來電",
-    "Incoming video call": "視訊來電",
-    "Incoming call": "來電",
     "%(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 無法在網路瀏覽器中執行時安全地在本機快取加密訊息。使用 <desktopLink>%(brand)s 桌面版</desktopLink>以讓加密訊息出現在搜尋結果中。",
-    "There are advanced notifications which are not shown here.": "有些進階通知未在此處顯示。",
-    "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 調整，但仍然適用。",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "設定您系統上安裝的字型名稱，%(brand)s 將會嘗試使用它。",
     "%(brand)s version:": "%(brand)s 版本：",
-    "Make this room low priority": "將此聊天室設為較低優先程度",
-    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "低優先程度的聊天室會顯示在您聊天室清單底部的專用區域中",
     "Show rooms with unread messages first": "先顯示有未讀訊息的聊天室",
     "Show previews of messages": "顯示訊息預覽",
     "Use default": "使用預設值",
@@ -2377,19 +1970,7 @@
     "Edited at %(date)s": "編輯於 %(date)s",
     "Click to view edits": "點擊以檢視編輯",
     "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.": "如果其他版本的 %(brand)s 仍在其他分頁中開啟，請關閉它，因為在同一主機上使用同時啟用與停用惰性載入的 %(brand)s 可能會造成問題。",
-    "Use your account to sign in to the latest version of the app at <a />": "使用您的帳號以登入到最新版本的應用程式於 <a />",
-    "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "您已登入並可在此處進行存取，但您可以在 <a>element.io/get-started</a> 取得所有平臺的最新版本的應用程式。",
-    "Go to Element": "到 Element",
-    "We’re excited to announce Riot is now Element!": "我們很高興地宣佈 Riot 現在變為 Element 了！",
-    "Learn more at <a>element.io/previously-riot</a>": "在 <a>element.io/previously-riot</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.": "您可以透過指定不同的家伺服器 URL 來使用自訂伺服器選項以登入到其他 Matrix 伺服器。這讓您可以與既有的 Matrix 帳號在不同的家伺服器一起使用 %(brand)s。",
-    "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>.": "輸入您的 Element Matrix 服務家伺服器位置。它可能使用您的域名或 <a>element.io</a> 的子網域。",
-    "Search rooms": "搜尋聊天室",
     "User menu": "使用者選單",
-    "%(brand)s Web": "%(brand)s 網頁版",
-    "%(brand)s Desktop": "%(brand)s 桌面版",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s X for Android": "Android 的 %(brand)s X",
     "Custom Tag": "自訂標籤",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "The person who invited you already left the room.": "邀請您的人已離開聊天室。",
@@ -2411,8 +1992,6 @@
     "No files visible in this room": "在此聊天室中看不到檔案",
     "Attach files from chat or just drag and drop them anywhere in a room.": "從聊天中附加檔案，或將其拖放到聊天室的任何地方。",
     "You’re all caught up": "您都設定好了",
-    "You have no visible notifications in this room.": "您在此聊天室沒有可見的通知。",
-    "%(brand)s Android": "%(brand)s Android",
     "Master private key:": "主控私鑰：",
     "Show message previews for reactions in DMs": "在直接訊息中顯示反應的訊息預覽",
     "Show message previews for reactions in all rooms": "在所有聊天室中顯示反應的訊息預覽",
@@ -2446,9 +2025,6 @@
     "Create community": "建立社群",
     "Explore community rooms": "探索社群聊天室",
     "Create a room in %(communityName)s": "在 %(communityName)s 中建立聊天室",
-    "Cross-signing and secret storage are ready for use.": "交叉簽章與秘密儲存空間已可使用。",
-    "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "交叉簽章已準備好使用，但目前未使用秘密儲存空間備份您的金鑰。",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "私人聊天室僅能透過邀請找到與加入。公開聊天室則任何人都可以找到並加入。",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "私人聊天室僅能透過邀請找到與加入。公開聊天室則任何在此社群的人都可以找到並加入。",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "如果聊天室僅用於與在您的家伺服器上的內部團隊協作的話，可以啟用此功能。這無法在稍後變更。",
     "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.": "如果聊天室會用於與有自己的家伺服器的外部團隊協作的話，可以停用此功能。這無法在稍後變更。",
@@ -2456,7 +2032,6 @@
     "There was an error updating your community. The server is unable to process your request.": "更新您的社群時發生錯誤。伺服器無法處理您的請求。",
     "Update community": "更新社群",
     "May include members not in %(communityName)s": "可能包含不在 %(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>.": "使用某人的名稱、使用者名稱（如 <userId/>）或電子郵件地址開始與他們對話。這不會邀請他們加入 %(communityName)s。要邀請某人加入 %(communityName)s，請點擊<a>此處</a>。",
     "Failed to find the general chat for this community": "找不到此社群的一般聊天紀錄",
     "Community settings": "社群設定",
     "User settings": "使用者設定",
@@ -2466,10 +2041,6 @@
     "Unknown App": "未知的應用程式",
     "%(count)s results|one": "%(count)s 個結果",
     "Room Info": "聊天室資訊",
-    "Apps": "應用程式",
-    "Unpin app": "取消釘選應用程式",
-    "Edit apps, bridges & bots": "編輯應用程式、橋接與機器人",
-    "Add apps, bridges & bots": "新增應用程式、橋接與機器人",
     "Not encrypted": "未加密",
     "About": "關於",
     "%(count)s people|other": "%(count)s 個夥伴",
@@ -2477,26 +2048,17 @@
     "Show files": "顯示檔案",
     "Room settings": "聊天室設定",
     "Take a picture": "拍照",
-    "Pin to room": "釘選到聊天室",
-    "You can only pin 2 apps at a time": "您僅能同時釘選 2 個應用程式",
     "Unpin": "取消釘選",
-    "Group call modified by %(senderName)s": "由 %(senderName)s 修改的群組通話",
-    "Group call started by %(senderName)s": "由 %(senderName)s 開始的群組通話",
-    "Group call ended by %(senderName)s": "由 %(senderName)s 結束的群組通話",
     "Cross-signing is ready for use.": "交叉簽章已準備好使用。",
     "Cross-signing is not set up.": "交叉簽章尚未設定。",
     "Backup version:": "備份版本：",
     "Algorithm:": "演算法：",
-    "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.": "如果您無法存取您的工作階段，請使用您的帳號資料來備份加密金鑰。您的金鑰將會被獨一無二的金鑰保護。",
     "Backup key stored:": "備份金鑰已儲存：",
     "Backup key cached:": "備份金鑰已快取：",
     "Secret storage:": "秘密儲存空間：",
     "ready": "準備好",
     "not ready": "尚未準備好",
     "Secure Backup": "安全備份",
-    "End Call": "結束通話",
-    "Remove the group call from the room?": "從聊天室中移除群組通話？",
-    "You don't have permission to remove the call from the room": "您沒有從聊天室移除通話的權限",
     "Start a conversation with someone using their name or username (like <userId/>).": "使用某人的名字或使用者名稱（如 <userId/>）以與他們開始對話。",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "這不會邀請他們加入 %(communityName)s。要邀請某人加入 %(communityName)s，請點擊<a>這裡</a>",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）或<a>分享此聊天室</a>來邀請他們。",
@@ -2505,9 +2067,6 @@
     "Widgets": "小工具",
     "Edit widgets, bridges & bots": "編輯小工具、橋接與機器人",
     "Add widgets, bridges & bots": "新增小工具、橋接與機器人",
-    "You can only pin 2 widgets at a time": "您僅能同時釘選兩個小工具",
-    "Minimize widget": "最小化小工具",
-    "Maximize widget": "最大化小工具",
     "Your server requires encryption to be enabled in private rooms.": "您的伺服器需要在私人聊天室中啟用加密。",
     "Unable to set up keys": "無法設定金鑰",
     "Use the <a>Desktop app</a> to see all encrypted files": "使用<a>桌面應用程式</a>以檢視所有加密的檔案",
@@ -2528,20 +2087,10 @@
     "Failed to save your profile": "儲存您的設定檔失敗",
     "The operation could not be completed": "無法完成操作",
     "Remove messages sent by others": "移除其他人傳送的訊息",
-    "Calling...": "正在通話……",
-    "Call connecting...": "正在連線通話……",
-    "Starting camera...": "正在開啟攝影機……",
-    "Starting microphone...": "正在開啟麥克風……",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 所有伺服器都被禁止加入！ 這間聊天室無法使用。",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s 為此房間更改了伺服器的存取控制列表。",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s 為此房間設置了伺服器的存取控制列表。",
-    "%(senderName)s declined the call.": "%(senderName)s 拒絕了通話。",
-    "(an error occurred)": "（遇到錯誤）",
-    "(their device couldn't start the camera / microphone)": "（他們的裝置無法開啟攝影機／麥克風）",
-    "(connection failed)": "（連線失敗）",
     "The call could not be established": "無法建立通話",
-    "The other party declined the call.": "對方拒絕了電話。",
-    "Call Declined": "通話已拒絕",
     "Move right": "向右移動",
     "Move left": "向左移動",
     "Revoke permissions": "撤銷權限",
@@ -2839,12 +2388,8 @@
     "Topic: %(topic)s (<a>edit</a>)": "主題：%(topic)s（<a>編輯</a>）",
     "This is the beginning of your direct message history with <displayName/>.": "這是使用 <displayName/> 傳送的您的直接訊息歷史紀錄的開頭。",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "除非你們兩個其中一個邀請任何人加入，否則只會有你們兩個在此對話中。",
-    "Call Paused": "通話已暫停",
     "Takes the call in the current room off hold": "讓目前聊天室中的通話保持等候接聽的狀態",
     "Places the call in the current room on hold": "在目前的聊天室撥打通話並等候接聽",
-    "Role": "角色",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "使用 %(size)s 儲存來自 %(count)s 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "使用 %(size)s 儲存來自 %(count)s 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。",
     "Go to Home View": "轉到主視窗",
     "Filter rooms and people": "過濾聊天室與人們",
     "Open the link in the email to continue registration.": "開啟電子郵件中的連結以繼續註冊。",
@@ -2927,9 +2472,7 @@
     "No other application is using the webcam": "無其他應用程式正在使用網路攝影機",
     "Permission is granted to use the webcam": "授予使用網路攝影機的權限",
     "A microphone and webcam are plugged in and set up correctly": "麥克風與網路攝影機已插入並正確設定",
-    "Call failed because no webcam or microphone could not be accessed. Check that:": "因為無法存取網路攝影機或麥克風，所以通話失敗。請檢查：",
     "Unable to access webcam / microphone": "無法存取網路攝影機／麥克風",
-    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "因為無法存取麥克風，所以通話失敗。請檢查是否已插入麥克風並正確設定。",
     "Unable to access microphone": "無法存取麥克風",
     "Decide where your account is hosted": "決定託管帳號的位置",
     "Host account on": "帳號託管於",
@@ -2948,7 +2491,6 @@
     "Learn more": "取得更多資訊",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "如果您有的話，可以使用您偏好的 Matrix 家伺服器，或是自己架一個。",
     "Other homeserver": "其他家伺服器",
-    "We call the places you where you can host your account ‘homeservers’.": "我們將您可以託管您的帳號的地方稱為「家伺服器」。",
     "Sign into your homeserver": "登入您的家伺服器",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org 是世界上最大的公開伺服器，因此對許多人來說是個好地方。",
     "Specify a homeserver": "指定家伺服器",
@@ -2964,7 +2506,6 @@
     "Unable to validate homeserver": "無法驗證家伺服器",
     "sends confetti": "傳送五彩碎紙",
     "Sends the given message with confetti": "使用五彩碎紙傳送訊息",
-    "Show chat effects": "顯示聊天特效",
     "Effects": "影響",
     "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.": "通話失敗，因為無法存取麥克風。請檢查是否已插入麥克風並正確設定。",
@@ -2972,7 +2513,6 @@
     "Resume": "繼續",
     "%(peerName)s held the call": "%(peerName)s 保留通話",
     "You held the call <a>Resume</a>": "您已保留通話 <a>繼續</a>",
-    "%(name)s paused": "%(name)s 已暫停",
     "You've reached the maximum number of simultaneous calls.": "您已達到同時通話的最大數量。",
     "Too Many Calls": "太多通話",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "在純文字訊息前加入 ┬──┬ ノ( ゜-゜ノ)",
@@ -2990,7 +2530,6 @@
     "There was an error finding this widget.": "尋找此小工具時發生錯誤。",
     "Active Widgets": "作用中的小工具",
     "Open dial pad": "開啟撥號鍵盤",
-    "Start a Conversation": "開始對話",
     "Dial pad": "撥號鍵盤",
     "There was an error looking up the phone number": "尋找電話號碼時發生錯誤",
     "Unable to look up phone number": "無法查詢電話號碼",
@@ -3007,7 +2546,6 @@
     "Your Security Key": "您的安全金鑰",
     "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "您的安全金鑰是安全網，如果您忘了您的安全密語的話，您可以用它來恢復對您已加密訊息的存取權。",
     "Repeat your Security Phrase...": "重複您的安全密語……",
-    "Please enter your Security Phrase a second time to confirm.": "請再次輸入您的安全密語以進行確認。",
     "Set up with a Security Key": "使用安全金鑰設定",
     "Great! This Security Phrase looks strong enough.": "很好！此安全密語看起夠強。",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "我們會將您金鑰的加密副本存在我們的伺服氣上。使用安全密語保護您的備份。",
@@ -3028,7 +2566,6 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "無法存取祕密儲存空間。請確認您輸入了正確的安全密語。",
     "Invalid Security Key": "無效的安全金鑰",
     "Wrong Security Key": "錯誤的安全金鑰",
-    "We recommend you change your password and Security Key in Settings immediately": "我們建議您立刻在設定中變更您的密碼與安全金鑰",
     "Set my room layout for everyone": "為所有人設定我的聊天室佈局",
     "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.": "請使用您的帳號資料備份您的加密金鑰，避免您無法存取您的工作階段。您的金鑰將會以獨一無二的安全金鑰保護。",
     "%(senderName)s has updated the widget layout": "%(senderName)s 已更新小工具佈局",
@@ -3036,8 +2573,6 @@
     "Remember this": "記住這個",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "小工具將會驗證您的使用者 ID，但將無法為您執行動作：",
     "Allow this widget to verify your identity": "允許此小工具驗證您的身份",
-    "Use Ctrl + F to search": "使用 Ctrl + F 以進行搜尋",
-    "Use Command + F to search": "使用 Command + F 以進行搜尋",
     "Converts the DM to a room": "將直接訊息轉換為聊天室",
     "Converts the room to a DM": "將聊天室轉換為直接訊息",
     "Use app for a better experience": "使用應用程式以取得更好的體驗",
@@ -3050,13 +2585,9 @@
     "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": "我們無法讓您登入",
     "Show stickers button": "顯示貼圖案按鈕",
-    "Windows": "Windows",
-    "Screens": "畫面",
-    "Share your screen": "分享您的畫面",
     "Recently visited rooms": "最近造訪過的聊天室",
     "Show line numbers in code blocks": "在程式碼區塊中顯示行號",
     "Expand code blocks by default": "預設展開程式碼區塊",
-    "Upgrade to pro": "升級到專業版",
     "Minimize dialog": "最小化對話框",
     "Maximize dialog": "最大化對話框",
     "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s 設定",
@@ -3093,22 +2624,14 @@
     "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": "建立初始空間聊天室失敗",
@@ -3116,25 +2639,9 @@
     "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.": "此空間並非公開。在無邀請的情況下，您將無法重新加入。",
@@ -3143,9 +2650,7 @@
     "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.": "無法儲存空間設定。",
@@ -3153,19 +2658,12 @@
     "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": "您無權在此空間中建立新聊天室",
@@ -3176,40 +2674,28 @@
     "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": "已在通話中",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "驗證此登入已存取您的已加密訊息，並向其他人證明此登入真的視您。",
-    "Verify with another session": "使用另一個工作階段進行驗證",
     "We'll create rooms 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.": "讓我們為每個主題建立一個聊天室。稍後您還可以新增更多，包含既有的。",
     "Make sure the right people have access. You can invite more later.": "確保合適的人有權存取。稍後您可以邀請更多人。",
     "A private space to organise your rooms": "供整理您聊天室的私人空間",
     "Just me": "只有我",
@@ -3220,24 +2706,17 @@
     "Private space": "私人空間",
     "Public space": "公開空間",
     "<inviter/> invites you": "<inviter/> 邀請您",
-    "Search names and description": "搜尋名稱與描述",
     "You may want to try a different search or check for typos.": "您可能要嘗試其他搜尋或檢查是否有拼字錯誤。",
     "No results found": "找不到結果",
     "Mark as suggested": "標記為建議",
     "Mark as not suggested": "標記為不建議",
     "Removing...": "正在移除……",
     "Failed to remove some rooms. Try again later": "移除部份聊天室失敗。稍後再試",
-    "%(count)s rooms and 1 space|one": "%(count)s 個聊天室與 1 個空間",
-    "%(count)s rooms and 1 space|other": "%(count)s 個聊天室與 1 個空間",
-    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s 個聊天室與 %(numSpaces)s 個空間",
-    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s 個聊天室與 %(numSpaces)s 個空間",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "如果您找不到您在找的聊天室，請尋求邀請或<a>建立新聊天室</a>。",
     "Suggested": "建議",
     "This room is suggested as a good one to join": "建議加入這個相當不錯的聊天室",
     "%(count)s rooms|one": "%(count)s 個聊天室",
     "%(count)s rooms|other": "%(count)s 個聊天室",
     "You don't have permission": "您沒有權限",
-    "Open": "開啟",
     "%(count)s messages deleted.|one": "已刪除 %(count)s 則訊息。",
     "%(count)s messages deleted.|other": "已刪除 %(count)s 則訊息。",
     "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)s 遇到問題，請回報臭蟲。",
@@ -3247,29 +2726,19 @@
     "Invite with email or username": "使用電子郵件或使用者名稱邀請",
     "You can change these anytime.": "您隨時可以變更這些。",
     "Add some details to help people recognise it.": "新增一些詳細資訊來協助人們識別它。",
-    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "空間是將聊天室與人們分類的新方法。要加入既有的空間，您需要邀請。",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "從 %(deviceName)s (%(deviceId)s) 於 %(ip)s",
     "Check your devices": "檢查您的裝置",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "新登入正在存取您的帳號：%(name)s (%(deviceID)s) 於 %(ip)s",
     "You have unverified logins": "您有未驗證的登入",
     "unknown person": "不明身份的人",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "與 %(transferTarget)s 進行協商。<a>轉讓至 %(transferee)s</a>",
-    "Message search initilisation failed": "訊息搜尋初始化失敗",
     "Invite to just this room": "邀請到此聊天室",
-    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "如果這樣做，請注意，您的任何訊息都不會被刪除，但是在重新建立索引的同時，搜索體驗可能會降低片刻",
     "Let's create a room for each of them.": "讓我們為每個主題建立一個聊天室吧。",
     "Verify your identity to access encrypted messages and prove your identity to others.": "驗證您的身份來存取已加密的訊息並對其他人證明您的身份。",
     "Sends the given message as a spoiler": "將指定訊息以劇透傳送",
     "Review to ensure your account is safe": "請審閱以確保您的帳號安全",
     "%(deviceId)s from %(ip)s": "從 %(ip)s 而來的 %(deviceId)s",
-    "Send and receive voice messages (in development)": "傳送與接收語音訊息（開發中）",
-    "Share decryption keys for room history when inviting users": "邀請使用者時分享聊天室歷史紀錄的解密金鑰",
     "Manage & explore rooms": "管理與探索聊天室",
     "Warn before quitting": "離開前警告",
     "Quick actions": "快速動作",
-    "Invite messages are hidden by default. Click to show the message.": "邀請訊息預設隱藏。點擊以顯示訊息。",
-    "Record a voice message": "錄製語音訊息",
-    "Stop & send recording": "停止並傳送錄音",
     "Accept on your other login…": "接受您的其他登入……",
     "%(count)s people you know have already joined|other": "%(count)s 個您認識的人已加入",
     "%(count)s people you know have already joined|one": "%(count)s 個您認識的人已加入",
@@ -3316,18 +2785,13 @@
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "挑選要新增的聊天室或對話。這是專屬於您的空間，不會有人被通知。您稍後可以再新增更多。",
     "What do you want to organise?": "您想要整理什麼？",
     "Filter all spaces": "過濾所有空間",
-    "Delete recording": "刪除錄製",
-    "Stop the recording": "停止錄製",
     "%(count)s results in all spaces|one": "所有空間中有 %(count)s 個結果",
     "%(count)s results in all spaces|other": "所有空間中有 %(count)s 個結果",
     "You have no ignored users.": "您沒有忽略的使用者。",
     "Play": "播放",
     "Pause": "暫停",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>這是實驗性功能。</b>目前，收到邀請的新使用者必須在 <link/> 上開啟邀請才能真的加入。",
-    "To join %(spaceName)s, turn on the <a>Spaces beta</a>": "要加入 %(spaceName)s，請開啟<a>空間測試版</a>",
-    "To view %(spaceName)s, turn on the <a>Spaces beta</a>": "要檢視 %(spaceName)s，開啟<a>空間測試版</a>",
     "Select a room below first": "首先選取一個聊天室",
-    "Communities are changing to Spaces": "社群正在變更為空間",
     "Join the beta": "加入測試版",
     "Leave the beta": "離開測試版",
     "Beta": "測試",
@@ -3337,8 +2801,6 @@
     "Adding rooms... (%(progress)s out of %(count)s)|one": "正在新增聊天室……",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "正在新增聊天室……（%(count)s 中的第 %(progress)s 個）",
     "Not all selected were added": "並非所有選定的都被新增了",
-    "You can add existing spaces to a space.": "您可以新增既有的空間至空間中。",
-    "Feeling experimental?": "想要來點實驗嗎？",
     "You are not allowed to view this server's rooms list": "您不被允許檢視此伺服器的聊天室清單",
     "Error processing voice message": "處理語音訊息時發生錯誤",
     "We didn't find a microphone on your device. Please check your settings and try again.": "我們在您的裝置上找不到麥克風。請檢查您的設定並再試一次。",
@@ -3348,29 +2810,18 @@
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "想要來點實驗嗎？實驗室是儘早取得成果，測試新功能並在實際發佈前協助塑造它們的最佳方式。<a>取得更多資訊</a>。",
     "Your access token gives full access to your account. Do not share it with anyone.": "您的存取權杖可給您帳號完整的存取權限。不要將其與任何人分享。",
     "Access Token": "存取權杖",
-    "Spaces are a new way to group rooms and people. To join an existing space you'll need an invite.": "空間是將聊天室與人們分組的一種新方式。要加入既有的空間，您需要邀請。",
     "Please enter a name for the space": "請輸入空間名稱",
     "Connecting": "正在連線",
     "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "允許在 1:1 通話中使用點對點通訊（若您啟用此功能，對方就能看到您的 IP 位置）",
-    "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "供網頁、桌面與 Android 使用的測試版。部份功能可能在您的家伺服器上不可用。",
-    "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "您可以隨時從設定中退出測試版，或是點擊測試版徽章，例如上面那個。",
-    "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s 將在啟用空間的情況下重新載入。社群與自訂標籤將會隱藏。",
-    "Beta available for web, desktop and Android. Thank you for trying the beta.": "測試版可用於網路、桌面與 Android。感謝您試用測試版。",
-    "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s 將在停用空間的情況下重新載入。社群與自訂標籤將再次可見。",
     "Spaces are a new way to group rooms and people.": "空間是將聊天室與人們分組的一種新方式。",
     "Message search initialisation failed": "訊息搜尋初始化失敗",
-    "Spaces are a beta feature.": "空間為測試版功能。",
     "Search names and descriptions": "搜尋名稱與描述",
     "You may contact me if you have any follow up questions": "如果您還有任何後續問題，可以聯絡我",
     "To leave the beta, visit your settings.": "要離開測試版，請造訪您的設定。",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "我們將會記錄您的平台與使用者名稱，以協助我們盡可能使用您的回饋。",
     "%(featureName)s beta feedback": "%(featureName)s 測試版回饋",
     "Thank you for your feedback, we really appreciate it.": "感謝您的回饋，我們衷心感謝。",
-    "Beta feedback": "測試版回饋",
     "Add reaction": "新增反應",
-    "Send and receive voice messages": "傳送與接收語音訊息",
-    "Your feedback will help make spaces better. The more detail you can go into, the better.": "您的回饋意見將會讓空間變得更好。您可以輸入愈多細節愈好。",
-    "If you leave, %(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "若您離開，%(brand)s 將在停用空間的情況下重新載入。社群與自訂標籤將再次可見。",
     "Space Autocomplete": "空間自動完成",
     "Go to my space": "到我的空間",
     "sends space invaders": "傳送太空侵略者",
@@ -3378,5 +2829,336 @@
     "See when people join, leave, or are invited to your active room": "檢視人們何時加入、離開或被邀請至您活躍的聊天室",
     "Kick, ban, or invite people to your active room, and make you leave": "踢除、封鎖或邀請人們到您作用中的聊天室，然後讓您離開",
     "See when people join, leave, or are invited to this room": "檢視人們何時加入、離開或被邀請至此聊天室",
-    "Kick, ban, or invite people to this room, and make you leave": "踢除、封鎖或邀請人們到此聊天室，然後讓您離開"
+    "Kick, ban, or invite people to this room, and make you leave": "踢除、封鎖或邀請人們到此聊天室，然後讓您離開",
+    "Currently joining %(count)s rooms|one": "目前正在加入 %(count)s 個聊天室",
+    "Currently joining %(count)s rooms|other": "目前正在加入 %(count)s 個聊天室",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "嘗試不同的詞或是檢查拼字。某些結果可能不可見，因為其為私人的，您必須要有邀請才能加入。",
+    "No results for \"%(query)s\"": "「%(query)s」沒有結果",
+    "The user you called is busy.": "您想要通話的使用者目前忙碌中。",
+    "User Busy": "使用者忙碌",
+    "Teammates might not be able to view or join any private rooms you make.": "隊友可能無法檢視或加入您建立的任何私人聊天室。",
+    "Or send invite link": "或傳送邀請連結",
+    "If you can't see who you’re looking for, send them your invite link below.": "如果您看不到您要找的人，請在下方向他們傳送您的邀請連結。",
+    "Some suggestions may be hidden for privacy.": "出於隱私考量，可能會隱藏一些建議。",
+    "Search for rooms or people": "搜尋聊天室或夥伴",
+    "Forward message": "轉寄訊息",
+    "Open link": "開啟連結",
+    "Sent": "已傳送",
+    "You don't have permission to do this": "您無權執行此動作",
+    "Error - Mixed content": "錯誤 - 混合內容",
+    "Error loading Widget": "載入小工具時發生錯誤",
+    "Pinned messages": "已釘選的訊息",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "如果您有權限，請開啟任何訊息的選單，並選取<b>釘選</b>以將它們貼到這裡。",
+    "Nothing pinned, yet": "尚未釘選任何東西",
+    "End-to-end encryption isn't enabled": "端到端加密未啟用",
+    "[number]": "[number]",
+    "To view %(spaceName)s, you need an invite": "要檢視 %(spaceName)s，您需要邀請",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "您可以隨時在過濾器面板中點擊大頭照來僅檢視與該社群相關的聊天室與夥伴。",
+    "Move down": "向下移動",
+    "Move up": "向上移動",
+    "Report": "回報",
+    "Collapse reply thread": "折疊回覆討論串",
+    "Show preview": "顯示預覽",
+    "View source": "檢視來源",
+    "Forward": "轉寄",
+    "Settings - %(spaceName)s": "設定 - %(spaceName)s",
+    "Report the entire room": "回報整個聊天室",
+    "Spam or propaganda": "垃圾郵件或宣傳",
+    "Illegal Content": "違法內容",
+    "Toxic Behaviour": "有問題的行為",
+    "Disagree": "不同意",
+    "Please pick a nature and describe what makes this message abusive.": "請挑選性質並描述此訊息為什麼是濫用。",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "任何其他理由。請描述問題。\n將會回報給聊天室管理員。",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "此聊天室有違法或有問題的內容，或是管理員無法審核違法或有問題的內容。\n將會回報給 %(homeserver)s 的管理員。管理員無法閱讀此聊天室的加密內容。",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "此聊天室有違法或有問題的內容，或是管理員無法審核違法或有問題的內容。\n 將會回報給 %(homeserver)s 的管理員。",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "該使用者正在向聊天室傳送廣告、廣告連結或宣傳。\n將會回報給聊天室管理員。",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "該使用者正顯示違法行為，例如對他人施暴，或威脅使用暴力。\n將會回報給聊天室管理員，他們可能會將其回報給執法單位。",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "該使用者正顯示不良行為，例如侮辱其他使用者，或是在適合全年齡的聊天室中分享成人內容，又或是其他違反此聊天室規則的行為。\n將會回報給聊天室管理員。",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "該使用者所寫的內容是錯誤的。\n將會回報給聊天室管理員。",
+    "Please provide an address": "請提供地址",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s 變更了伺服器 ACL",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s 變更了伺服器 ACL %(count)s 次",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s 變更了伺服器 ACL",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s 變更了伺服器 ACL %(count)s 次",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "訊息搜尋初始化失敗，請檢查<a>您的設定</a>以取得更多資訊",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "設定此空間的地址，這樣使用者就能透過您的家伺服器找到此空間（%(localDomain)s）",
+    "To publish an address, it needs to be set as a local address first.": "要發佈地址，其必須先設定為本機地址。",
+    "Published addresses can be used by anyone on any server to join your room.": "任何伺服器上的人都可以使用已發佈的地址加入您的聊天室。",
+    "Published addresses can be used by anyone on any server to join your space.": "任何伺服器上的人都可以使用已發佈的地址加入您的空間。",
+    "This space has no local addresses": "此空間沒有本機地址",
+    "Space information": "空間資訊",
+    "Collapse": "折疊",
+    "Expand": "展開",
+    "Recommended for public spaces.": "推薦用於公開空間。",
+    "Allow people to preview your space before they join.": "允許人們在加入前預覽您的空間。",
+    "Preview Space": "預覽空間",
+    "Decide who can view and join %(spaceName)s.": "決定誰可以檢視並加入 %(spaceName)s。",
+    "Visibility": "能見度",
+    "This may be useful for public spaces.": "這可能對公開空間很有用。",
+    "Guests can join a space without having an account.": "訪客毋需帳號即可加入空間。",
+    "Enable guest access": "啟用訪客存取權",
+    "Failed to update the history visibility of this space": "未能更新此空間的歷史紀錄能見度",
+    "Failed to update the guest access of this space": "未能更新此空間的訪客存取權限",
+    "Failed to update the visibility of this space": "未能更新此空間的能見度",
+    "Address": "地址",
+    "e.g. my-space": "例如：my-space",
+    "Silence call": "通話靜音",
+    "Sound on": "開啟聲音",
+    "Show all rooms in Home": "在首頁顯示所有聊天室",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "向管理員回報的範本。在支援管理的聊天室中，「回報」按鈕讓您可以回報濫用行為給聊天室管理員",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s 變更了聊天室的<a>釘選訊息</a>。",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s 踢掉了 %(targetName)s",
+    "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s 踢掉了 %(targetName)s：%(reason)s",
+    "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s 撤回了 %(targetName)s 的邀請",
+    "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s 撤回了 %(targetName)s 的邀請：%(reason)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s 取消封鎖了 %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s 離開聊天室",
+    "%(targetName)s left the room: %(reason)s": "%(targetName)s 離開了聊天室：%(reason)s",
+    "%(targetName)s rejected the invitation": "%(targetName)s 回絕了邀請",
+    "%(targetName)s joined the room": "%(targetName)s 加入了聊天室",
+    "%(senderName)s made no change": "%(senderName)s 未變更",
+    "%(senderName)s set a profile picture": "%(senderName)s 設定了個人檔案照片",
+    "%(senderName)s changed their profile picture": "%(senderName)s 變更了他們的個人檔案照片",
+    "%(senderName)s removed their profile picture": "%(senderName)s 移除了他們的個人檔案照片",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s 移除了他們的顯示名稱（%(oldDisplayName)s）",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s 將他們的顯示名稱設定為 %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s 變更了他們的顯示名稱為 %(displayName)s",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s 封鎖了 %(targetName)s",
+    "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s 封鎖了 %(targetName)s：%(reason)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s 接受了邀請",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s 已接受 %(displayName)s 的邀請",
+    "Some invites couldn't be sent": "部份邀請無法傳送",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "我們已將邀請傳送給其他人，但以下的人無法邀請至 <RoomName/>",
+    "Unnamed audio": "未命名的音訊",
+    "Error processing audio message": "處理音訊訊息時出現問題",
+    "Show %(count)s other previews|one": "顯示 %(count)s 個其他預覽",
+    "Show %(count)s other previews|other": "顯示 %(count)s 個其他預覽",
+    "Images, GIFs and videos": "圖片、GIF 與影片",
+    "Code blocks": "程式碼區塊",
+    "Displaying time": "顯示時間",
+    "To view all keyboard shortcuts, click here.": "要檢視所有鍵盤快捷鍵，請點擊此處。",
+    "Keyboard shortcuts": "鍵盤快捷鍵",
+    "Use Ctrl + F to search timeline": "使用 Ctrl + F 來搜尋時間軸",
+    "Use Command + F to search timeline": "使用 Command + F 來搜尋時間軸",
+    "User %(userId)s is already invited to the room": "使用者 %(userId)s 已被邀請至聊天室",
+    "Integration manager": "整合管理員",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "您的 %(brand)s 不允許您使用整合管理員來執行此動作。請聯絡管理員。",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "使用這個小工具可能會與 %(widgetDomain)s 以及您的整合管理員分享資料 <helpIcon />。",
+    "Identity server is": "身分認證伺服器是",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "整合管理員接收設定資料，並可以代表您可以修改小工具、傳送聊天室邀請並設定權限等級。",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "使用整合管理員以管理機器人、小工具與貼紙包。",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "使用整合管理員 <b>(%(serverName)s)</b> 以管理機器人、小工具與貼紙包。",
+    "Identity server": "身份識別伺服器",
+    "Identity server (%(server)s)": "身份識別伺服器 (%(server)s)",
+    "Could not connect to identity server": "無法連線至身份識別伺服器",
+    "Not a valid identity server (status code %(code)s)": "不是有效的身份識別伺服器（狀態碼 %(code)s）",
+    "Identity server URL must be HTTPS": "身份識別伺服器 URL 必須為 HTTPS",
+    "Unable to copy a link to the room to the clipboard.": "無法複製聊天室連結至剪貼簿。",
+    "Unable to copy room link": "無法複製聊天室連結",
+    "User Directory": "使用者目錄",
+    "There was an error loading your notification settings.": "載入您的通知設定時發生錯誤。",
+    "Mentions & keywords": "提及與關鍵字",
+    "Global": "全域",
+    "New keyword": "新關鍵字",
+    "Keyword": "關鍵字",
+    "Enable email notifications for %(email)s": "為 %(email)s 啟用電子郵件通知",
+    "Enable for this account": "為此帳號啟用",
+    "An error occurred whilst saving your notification preferences.": "儲存您的通知偏好設定時遇到錯誤。",
+    "Error saving notification preferences": "儲存通知偏好設定時發生問題",
+    "Messages containing keywords": "包含關鍵字的訊息",
+    "Transfer Failed": "轉接失敗",
+    "Unable to transfer call": "無法轉接通話",
+    "Copy Room Link": "複製聊天室連結",
+    "The call is in an unknown state!": "通話處於未知狀態！",
+    "Call back": "回撥",
+    "No answer": "無回應",
+    "An unknown error occurred": "出現未知錯誤",
+    "Their device couldn't start the camera or microphone": "他們的裝置無法啟動攝影機或麥克風",
+    "Connection failed": "連線失敗",
+    "Could not connect media": "無法連結媒體",
+    "Message bubbles": "訊息泡泡",
+    "IRC": "IRC",
+    "New layout switcher (with message bubbles)": "新的佈局切換器（帶有訊息泡泡）",
+    "Image": "圖片",
+    "Sticker": "貼紙",
+    "Error downloading audio": "下載音訊時發生錯誤",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "任何在空間中的人都可以找到並加入。<a>編輯哪些空間可以存取這個地方。</a>",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>請注意，升級會讓聊天是變成全新的版本</b>。目前所有的訊息都只會留在被封存的聊天室。",
+    "Automatically invite members from this room to the new one": "自動將該聊天室的成員邀請至新的聊天室",
+    "These are likely ones other room admins are a part of.": "這些可能是其他聊天室管理員的一部分。",
+    "Other spaces or rooms you might not know": "您可能不知道的其他空間或聊天室",
+    "Spaces you know that contain this room": "您知道的包含此聊天是的空間",
+    "Search spaces": "搜尋空間",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "決定哪些空間可以存取此聊天室。若選取了空間，其成員就可以找到並加入 <RoomName/>。",
+    "Select spaces": "選取空間",
+    "You're removing all spaces. Access will default to invite only": "您正在移除所有空間。存取權限將會預設為僅邀請",
+    "Room visibility": "聊天室能見度",
+    "Visible to space members": "對空間成員可見",
+    "Public room": "公開聊天室",
+    "Private room (invite only)": "私人聊天室（僅邀請）",
+    "Create a room": "建立聊天室",
+    "Only people invited will be able to find and join this room.": "僅被邀請的夥伴才能找到並加入此聊天室。",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "任何人都將可以找到並加入此聊天室，而不只是 <SpaceName/> 的成員。",
+    "You can change this at any time from room settings.": "您隨時都可以從聊天室設定變更此設定。",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "每個在 <SpaceName/> 中的人都將可以找到並加入此聊天室。",
+    "Access": "存取",
+    "People with supported clients will be able to join the room without having a registered account.": "有受支援的客戶端的夥伴不需要註冊帳號就可以加入聊天室。",
+    "Decide who can join %(roomName)s.": "決定誰可以加入 %(roomName)s。",
+    "Space members": "空間成員",
+    "Anyone in a space can find and join. You can select multiple spaces.": "空間中的任何人都可以找到並加入。您可以選取多個空間。",
+    "Spaces with access": "可存取的空間",
+    "Currently, %(count)s spaces have access|other": "目前，%(count)s 個空間可存取",
+    "& %(count)s more|other": "以及 %(count)s 個",
+    "Upgrade required": "必須升級",
+    "Anyone can find and join.": "任何人都可以找到並加入。",
+    "Only invited people can join.": "僅被邀請的夥伴可以加入。",
+    "Private (invite only)": "私人（僅邀請）",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "此升級讓選定空間的成員不需要邀請就可以存取此聊天室。",
+    "This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.": "這同時可以讓聊天室對空間保持隱密，又讓空間中的夥伴可以找到並加入這些聊天室。空間中的所有新聊天室都有此選項。",
+    "To help space members find and join a private room, go to that room's Security & Privacy settings.": "要協助空間成員尋找並加入私人聊天室，請到該聊天室的「安全與隱私」設定。",
+    "Help space members find private rooms": "協助空間成員尋找私人聊天室",
+    "Help people in spaces to find and join private rooms": "協助空間中的夥伴尋找並加入私人聊天室",
+    "New in the Spaces beta": "Spaces 測試版的新功能",
+    "Share content": "分享內容",
+    "Application window": "應用程式視窗",
+    "Share entire screen": "分享整個螢幕",
+    "You can now share your screen by pressing the \"screen share\" button during a call. You can even do this in audio calls if both sides support it!": "您現在可以透過在通話中按下「畫面分享」按鈕來分享您的畫面了。如果雙方都支援，您甚至可以在音訊通話中使用此功能！",
+    "Screen sharing is here!": "畫面分享在此！",
+    "Your camera is still enabled": "您的攝影機仍為啟用狀態",
+    "Your camera is turned off": "您的攝影機已關閉",
+    "You are presenting": "您正在出席",
+    "%(sharerName)s is presenting": "%(sharerName)s 正在出席",
+    "Anyone will be able to find and join this room.": "任何人都可以找到並加入此聊天室。",
+    "We're working on this, but just want to let you know.": "我們正在為此努力，但只是想讓您知道。",
+    "Search for rooms or spaces": "搜尋聊天室或空間",
+    "Want to add an existing space instead?": "想要新增既有空間嗎？",
+    "Private space (invite only)": "私人空間（僅邀請）",
+    "Space visibility": "空間能見度",
+    "Add a space to a space you manage.": "新增空間到您管理的空間。",
+    "Only people invited will be able to find and join this space.": "僅有被邀請的人才能找到並加入此空間。",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "不只是 <SpaceName/> 的成員，任何人都可以找到並加入此空間。",
+    "Anyone in <SpaceName/> will be able to find and join.": "<SpaceName/> 中的任何人都可以找到並加入。",
+    "Adding spaces has moved.": "新增空間已移動。",
+    "Search for rooms": "搜尋聊天室",
+    "Search for spaces": "搜尋空間",
+    "Create a new space": "建立新空間",
+    "Want to add a new space instead?": "想要新增空間？",
+    "Add existing space": "新增既有的空間",
+    "Add space": "新增空間",
+    "Give feedback.": "給予回饋。",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "感謝您試用空間。您的回饋有助於在隨後的版本中改善此功能。",
+    "Spaces feedback": "空間回饋",
+    "Spaces are a new feature.": "空間為新功能。",
+    "Leave %(spaceName)s": "離開 %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "您是某些要離開的聊天室與空間的唯一管理員。離開會讓它們沒有任何管理員。",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "您是此空間唯一的管理員。離開將代表沒有人可以控制它。",
+    "You won't be able to rejoin unless you are re-invited.": "您將無法重新加入，除非您再次被邀請。",
+    "Search %(spaceName)s": "搜尋 %(spaceName)s",
+    "Decrypting": "正在解密",
+    "Show all rooms": "顯示所有聊天室",
+    "All rooms you're in will appear in Home.": "您所在的所有聊天室都會出現在「首頁」。",
+    "Send pseudonymous analytics data": "傳送匿名分析資料",
+    "Missed call": "未接來電",
+    "Call declined": "拒絕通話",
+    "Stop recording": "停止錄製",
+    "Send voice message": "傳送語音訊息",
+    "Mute the microphone": "麥克風靜音",
+    "Unmute the microphone": "取消麥克風靜音",
+    "Dialpad": "撥號鍵盤",
+    "More": "更多",
+    "Show sidebar": "顯示側邊欄",
+    "Hide sidebar": "隱藏側邊欄",
+    "Start sharing your screen": "開始分享您的畫面",
+    "Stop sharing your screen": "停止分享您的畫面",
+    "Stop the camera": "停止攝影機",
+    "Start the camera": "開啟攝影機",
+    "Surround selected text when typing special characters": "輸入特殊字元以環繞選取的文字",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次。",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次。",
+    "Olm version:": "Olm 版本：",
+    "Delete avatar": "刪除大頭照",
+    "Don't send read receipts": "不要傳送讀取回條",
+    "Created from <Community />": "從 <Community /> 建立",
+    "Communities won't receive further updates.": "社群不會收到進一步的更新。",
+    "Spaces are a new way to make a community, with new features coming.": "空間是一種建立社群的新方式，新功能即將到來。",
+    "Communities can now be made into Spaces": "社群現在可以變成空間了",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "請要求此社群的<a>管理員</a>設定為空間並留意邀請。",
+    "You can create a Space from this community <a>here</a>.": "您可以從此社群<a>這裡</a>建立一個空間。",
+    "This description will be shown to people when they view your space": "當人們檢視您的空間時，將會向他們顯示此描述",
+    "Flair won't be available in Spaces for the foreseeable future.": "在可預見的未來，Flair 將無法在空間中使用。",
+    "All rooms will be added and all community members will be invited.": "將新增所有聊天室並邀請所有社群成員。",
+    "A link to the Space will be put in your community description.": "空間連結將會放到您的社群描述中。",
+    "Create Space from community": "從社群建立空間",
+    "Failed to migrate community": "遷移社群失敗",
+    "To create a Space from another community, just pick the community in Preferences.": "要從另一個社群建立空間，僅需在「偏好設定」中挑選社群。",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "已建立 <SpaceName/>，且社群中的每個人都已被邀請加入。",
+    "Space created": "已建立空間",
+    "To view Spaces, hide communities in <a>Preferences</a>": "要檢視空間，在<a>偏好設定</a>中隱藏社群",
+    "This community has been upgraded into a Space": "此社群已被升級為空間",
+    "If a community isn't shown you may not have permission to convert it.": "若未顯示社群，代表您可能無權轉換它。",
+    "Show my Communities": "顯示我的社群",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "社群已封存，以便讓空間接棒，但您可以在下方將您的社群轉換為空間。轉換可確保您的對話取得最新功能。",
+    "Create Space": "建立空間",
+    "Open Space": "開啟空間",
+    "You can change this later.": "您可以在稍後變更此設定。",
+    "What kind of Space do you want to create?": "您想建立什麼樣的空間？",
+    "Unknown failure: %(reason)s": "未知錯誤：%(reason)s",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "除錯紀錄檔包含了使用資料，其中也包含了您的使用者名稱、ID 或您造訪過的聊天室別名、您上次與之互動的使用者介面元素，以及其他使用者的使用者名稱。但不包含訊息。",
+    "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, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "如果您透過 GitHub 遞交臭蟲，除錯紀錄檔可以協助我們追蹤問題。除錯紀錄檔包含了使用資料，其中也包含了您的使用者名稱、ID 或您造訪過的聊天室別名、您上次與之互動的使用者介面元素，以及其他使用者的使用者名稱。但不包含訊息。",
+    "Rooms and spaces": "聊天室與空間",
+    "Results": "結果",
+    "Enable encryption in settings.": "在設定中啟用加密。",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "您的私人訊息會正常加密，但聊天室不會。一般來說這是因為使用了不支援的裝置或方法，例如電子郵件邀請。",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "為了避免這些問題，請為您計畫中的對話建立<a>新的公開聊天室</a>。",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建議讓加密聊天室公開。</b>這代表了任何人都可以找到並加入聊天室，因此任何人都可以閱讀訊息。您無法取得任何加密的好處。在公開聊天室中加密訊息會讓接收與傳送訊息變慢。",
+    "Are you sure you want to make this encrypted room public?": "您確定您想要讓此加密聊天室公開？",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "為了避免這些問題，請為您計畫中的對話建立<a>新的加密聊天室</a>。",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建議加密公開聊天室。</b>任何人都可以尋找並加入公開聊天室，所以任何人都可以閱讀其中的訊息。您不會得到任何加密的好處，而您也無法在稍後關閉加密功能。在公開聊天室中加密訊息會讓接收與傳送訊息更慢。",
+    "Are you sure you want to add encryption to this public room?": "您確定您要在此公開聊天室新增加密？",
+    "Cross-signing is ready but keys are not backed up.": "已準備好交叉簽署但金鑰未備份。",
+    "Low bandwidth mode (requires compatible homeserver)": "低頻寬模式（需要相容的家伺服器）",
+    "Multiple integration managers (requires manual setup)": "多個整合管理程式（需要手動設定）",
+    "Thread": "討論串",
+    "Show threads": "顯示討論串",
+    "Threaded messaging": "討論串訊息",
+    "The above, but in <Room /> as well": "以上，但也在 <Room /> 中",
+    "The above, but in any room you are joined or invited to as well": "以上，但在任何您已加入或被邀請的聊天室中",
+    "Autoplay videos": "自動播放影片",
+    "Autoplay GIFs": "自動播放 GIF",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s 從此聊天室取消釘選了訊息。檢視所有釘選的訊息。",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s 從此聊天室取消釘選了<a>訊息</a>。檢視所有<b>釘選的訊息</b>。",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s 釘選了訊息到此聊天室。檢視所有已釘選的訊息。",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s 釘選了<a>訊息</a>到此聊天室。檢視所有<b>釘選的訊息</b>。",
+    "Currently, %(count)s spaces have access|one": "目前，1 個空間可存取",
+    "& %(count)s more|one": "與其他 %(count)s 個",
+    "Some encryption parameters have been changed.": "部份加密參數已變更。",
+    "Role in <RoomName/>": "<RoomName/> 中的角色",
+    "Explore %(spaceName)s": "探索 %(spaceName)s",
+    "Send a sticker": "傳送貼圖",
+    "Reply to thread…": "回覆討論串……",
+    "Reply to encrypted thread…": "回覆給已加密的討論串……",
+    "Add emoji": "新增表情符號",
+    "Unknown failure": "未知錯誤",
+    "Failed to update the join rules": "更新加入規則失敗",
+    "Select the roles required to change various parts of the space": "選取變更空間各個部份所需的角色",
+    "Change description": "變更描述",
+    "Change main address for the space": "變更空間的主要地址",
+    "Change space name": "變更空間名稱",
+    "Change space avatar": "變更空間大頭照",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "在 <spaceName/> 中的任何人都可以找到並加入。您也可以選取其他空間。",
+    "Message didn't send. Click for info.": "訊息未傳送。點擊以取得更多資訊。",
+    "To join this Space, hide communities in your <a>preferences</a>": "要加入此空間，請在您的<a>偏好設定</a>中隱藏社群",
+    "To view this Space, hide communities in your <a>preferences</a>": "要檢視此空間，請在您的<a>偏好設定</a>中隱藏社群",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "要加入 %(communityName)s，請在您的<a>偏好設定</a>中切換至社群",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "要檢視 %(communityName)s，請在您的<a>偏好設定</a>中切換至社群",
+    "Private community": "私人社群",
+    "Public community": "公開社群",
+    "Message": "訊息",
+    "Upgrade anyway": "無論如何都要升級",
+    "This room is in some spaces you’re not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "此聊天室位於您不是管理員的空間。在那些空間中，舊的聊天室仍會顯示，但系統會提示人們加入新聊天室。",
+    "Before you upgrade": "在您升級前",
+    "To join a space you'll need an invite.": "若要加入空間，您必須被邀請。",
+    "You can also make Spaces from <a>communities</a>.": "您也可以從<a>社群</a>建立空間。",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "為此工作階段暫時顯示社群而非空間。對此功能的支援將在不久的將來移除。這將會重新載入 Element。",
+    "Display Communities instead of Spaces": "顯示社群而非空間"
 }
diff --git a/src/index.js b/src/index.ts
similarity index 81%
rename from src/index.js
rename to src/index.ts
index e360c04f4f..2c88265438 100644
--- a/src/index.js
+++ b/src/index.ts
@@ -15,20 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Skinner from './Skinner';
+import Skinner, { ISkinObject } from './Skinner';
 
-export function loadSkin(skinObject) {
+export function loadSkin(skinObject: ISkinObject): void {
     Skinner.load(skinObject);
 }
 
-export function resetSkin() {
+export function resetSkin(): void {
     Skinner.reset();
 }
 
-export function getComponent(componentName) {
+export function getComponent(componentName: string): any {
     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";
+
diff --git a/src/indexing/BaseEventIndexManager.ts b/src/indexing/BaseEventIndexManager.ts
index 6349f31524..64576e4412 100644
--- a/src/indexing/BaseEventIndexManager.ts
+++ b/src/indexing/BaseEventIndexManager.ts
@@ -14,73 +14,44 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { IMatrixProfile, IEventWithRoomId as IMatrixEvent, IResultRoomEvents } from "matrix-js-sdk/src/@types/search";
+import { Direction } from "matrix-js-sdk/src";
+
 // The following interfaces take their names and member names from seshat and the spec
 /* eslint-disable camelcase */
-
-export interface MatrixEvent {
-    type: string;
-    sender: string;
-    content: {};
-    event_id: string;
-    origin_server_ts: number;
-    unsigned?: {};
-    roomId: string;
-}
-
-export interface MatrixProfile {
-    avatar_url: string;
-    displayname: string;
-}
-
-export interface CrawlerCheckpoint {
+export interface ICrawlerCheckpoint {
     roomId: string;
     token: string;
-    fullCrawl: boolean;
-    direction: string;
+    fullCrawl?: boolean;
+    direction: Direction;
 }
 
-export interface ResultContext {
-    events_before: [MatrixEvent];
-    events_after: [MatrixEvent];
-    profile_info: Map<string, MatrixProfile>;
-}
-
-export interface ResultsElement {
-    rank: number;
-    result: MatrixEvent;
-    context: ResultContext;
-}
-
-export interface SearchResult {
-    count: number;
-    results: [ResultsElement];
-    highlights: [string];
-}
-
-export interface SearchArgs {
+export interface ISearchArgs {
     search_term: string;
     before_limit: number;
     after_limit: number;
     order_by_recency: boolean;
     room_id?: string;
+    limit: number;
+    next_batch?: string;
 }
 
-export interface EventAndProfile {
-    event: MatrixEvent;
-    profile: MatrixProfile;
+export interface IEventAndProfile {
+    event: IMatrixEvent;
+    profile: IMatrixProfile;
 }
 
-export interface LoadArgs {
+export interface ILoadArgs {
     roomId: string;
     limit: number;
-    fromEvent: string;
-    direction: string;
+    fromEvent?: string;
+    direction?: string;
 }
 
-export interface IndexStats {
+export interface IIndexStats {
     size: number;
-    event_count: number;
-    room_count: number;
+    eventCount: number;
+    roomCount: number;
 }
 
 /**
@@ -119,13 +90,13 @@ export default abstract class BaseEventIndexManager {
      * Queue up an event to be added to the index.
      *
      * @param {MatrixEvent} ev The event that should be added to the index.
-     * @param {MatrixProfile} profile The profile of the event sender at the
+     * @param {IMatrixProfile} profile The profile of the event sender at the
      * time of the event receival.
      *
      * @return {Promise} A promise that will resolve when the was queued up for
      * addition.
      */
-    async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {
+    async addEventToIndex(ev: IMatrixEvent, profile: IMatrixProfile): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -160,14 +131,13 @@ export default abstract class BaseEventIndexManager {
     /**
      * Get statistical information of the index.
      *
-     * @return {Promise<IndexStats>} A promise that will resolve to the index
+     * @return {Promise<IIndexStats>} A promise that will resolve to the index
      * statistics.
      */
-    async getStats(): Promise<IndexStats> {
+    async getStats(): Promise<IIndexStats> {
         throw new Error("Unimplemented");
     }
 
-
     /**
      * Get the user version of the database.
      * @return {Promise<number>} A promise that will resolve to the user stored
@@ -203,13 +173,13 @@ export default abstract class BaseEventIndexManager {
     /**
      * Search the event index using the given term for matching events.
      *
-     * @param {SearchArgs} searchArgs The search configuration for the search,
+     * @param {ISearchArgs} searchArgs The search configuration for the search,
      * sets the search term and determines the search result contents.
      *
-     * @return {Promise<[SearchResult]>} A promise that will resolve to an array
+     * @return {Promise<IResultRoomEvents[]>} A promise that will resolve to an array
      * of search results once the search is done.
      */
-    async searchEventIndex(searchArgs: SearchArgs): Promise<SearchResult> {
+    async searchEventIndex(searchArgs: ISearchArgs): Promise<IResultRoomEvents> {
         throw new Error("Unimplemented");
     }
 
@@ -218,12 +188,12 @@ export default abstract class BaseEventIndexManager {
      *
      * This is used to add a batch of events to the index.
      *
-     * @param {[EventAndProfile]} events The list of events and profiles that
+     * @param {[IEventAndProfile]} events The list of events and profiles that
      * should be added to the event index.
-     * @param {[CrawlerCheckpoint]} checkpoint A new crawler checkpoint that
+     * @param {[ICrawlerCheckpoint]} checkpoint A new crawler checkpoint that
      * should be stored in the index which should be used to continue crawling
      * the room.
-     * @param {[CrawlerCheckpoint]} oldCheckpoint The checkpoint that was used
+     * @param {[ICrawlerCheckpoint]} oldCheckpoint The checkpoint that was used
      * to fetch the current batch of events. This checkpoint will be removed
      * from the index.
      *
@@ -231,9 +201,9 @@ export default abstract class BaseEventIndexManager {
      * were already added to the index, false otherwise.
      */
     async addHistoricEvents(
-        events: [EventAndProfile],
-        checkpoint: CrawlerCheckpoint | null,
-        oldCheckpoint: CrawlerCheckpoint | null,
+        events: IEventAndProfile[],
+        checkpoint: ICrawlerCheckpoint | null,
+        oldCheckpoint: ICrawlerCheckpoint | null,
     ): Promise<boolean> {
         throw new Error("Unimplemented");
     }
@@ -241,36 +211,36 @@ export default abstract class BaseEventIndexManager {
     /**
      * Add a new crawler checkpoint to the index.
      *
-     * @param {CrawlerCheckpoint} checkpoint The checkpoint that should be added
+     * @param {ICrawlerCheckpoint} checkpoint The checkpoint that should be added
      * to the index.
      *
      * @return {Promise} A promise that will resolve once the checkpoint has
      * been stored.
      */
-    async addCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<void> {
+    async addCrawlerCheckpoint(checkpoint: ICrawlerCheckpoint): Promise<void> {
         throw new Error("Unimplemented");
     }
 
     /**
      * Add a new crawler checkpoint to the index.
      *
-     * @param {CrawlerCheckpoint} checkpoint The checkpoint that should be
+     * @param {ICrawlerCheckpoint} checkpoint The checkpoint that should be
      * removed from the index.
      *
      * @return {Promise} A promise that will resolve once the checkpoint has
      * been removed.
      */
-    async removeCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<void> {
+    async removeCrawlerCheckpoint(checkpoint: ICrawlerCheckpoint): Promise<void> {
         throw new Error("Unimplemented");
     }
 
     /**
      * Load the stored checkpoints from the index.
      *
-     * @return {Promise<[CrawlerCheckpoint]>} A promise that will resolve to an
+     * @return {Promise<[ICrawlerCheckpoint]>} A promise that will resolve to an
      * array of crawler checkpoints once they have been loaded from the index.
      */
-    async loadCheckpoints(): Promise<[CrawlerCheckpoint]> {
+    async loadCheckpoints(): Promise<ICrawlerCheckpoint[]> {
         throw new Error("Unimplemented");
     }
 
@@ -286,11 +256,11 @@ export default abstract class BaseEventIndexManager {
      * @param  {string} args.direction The direction to which we should continue
      * loading events from. This is used only if fromEvent is used as well.
      *
-     * @return {Promise<[EventAndProfile]>} A promise that will resolve to an
+     * @return {Promise<[IEventAndProfile]>} A promise that will resolve to an
      * array of Matrix events that contain mxc URLs accompanied with the
      * historic profile of the sender.
      */
-    async loadFileEvents(args: LoadArgs): Promise<[EventAndProfile]> {
+    async loadFileEvents(args: ILoadArgs): Promise<IEventAndProfile[]> {
         throw new Error("Unimplemented");
     }
 
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.ts
similarity index 79%
rename from src/indexing/EventIndex.js
rename to src/indexing/EventIndex.ts
index 33f2d594ae..1c182cf912 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,37 +14,49 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { EventEmitter } from "events";
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import { Direction, EventTimeline } from 'matrix-js-sdk/src/models/event-timeline';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set';
+import { RoomState } from 'matrix-js-sdk/src/models/room-state';
+import { TimelineIndex, TimelineWindow } from 'matrix-js-sdk/src/timeline-window';
+import { sleep } from "matrix-js-sdk/src/utils";
+import { IResultRoomEvents } from "matrix-js-sdk/src/@types/search";
+
 import PlatformPeg from "../PlatformPeg";
-import {MatrixClientPeg} from "../MatrixClientPeg";
-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 { MatrixClientPeg } from "../MatrixClientPeg";
 import SettingsStore from "../settings/SettingsStore";
-import {EventEmitter} from "events";
-import {SettingLevel} from "../settings/SettingLevel";
+import { SettingLevel } from "../settings/SettingLevel";
+import { ICrawlerCheckpoint, ILoadArgs, ISearchArgs } from "./BaseEventIndexManager";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+// The time in ms that the crawler will wait loop iterations if there
+// have not been any checkpoints to consume in the last iteration.
+const CRAWLER_IDLE_TIME = 5000;
+
+// The maximum number of events our crawler should fetch in a single crawl.
+const EVENTS_PER_CRAWL = 100;
+
+interface ICrawler {
+    cancel(): void;
+}
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
  */
 export default class EventIndex extends EventEmitter {
-    constructor() {
-        super();
-        this.crawlerCheckpoints = [];
-        // The time in ms that the crawler will wait loop iterations if there
-        // have not been any checkpoints to consume in the last iteration.
-        this._crawlerIdleTime = 5000;
-        // The maximum number of events our crawler should fetch in a single
-        // crawl.
-        this._eventsPerCrawl = 100;
-        this._crawler = null;
-        this._currentCheckpoint = null;
-    }
+    private crawlerCheckpoints: ICrawlerCheckpoint[] = [];
+    private crawler: ICrawler = null;
+    private currentCheckpoint: ICrawlerCheckpoint = null;
 
-    async init() {
+    public async init() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         this.crawlerCheckpoints = await indexManager.loadCheckpoints();
-        console.log("EventIndex: Loaded checkpoints", this.crawlerCheckpoints);
+        logger.log("EventIndex: Loaded checkpoints", this.crawlerCheckpoints);
 
         this.registerListeners();
     }
@@ -52,12 +64,11 @@ export default class EventIndex extends EventEmitter {
     /**
      * Register event listeners that are necessary for the event index to work.
      */
-    registerListeners() {
+    public registerListeners() {
         const client = MatrixClientPeg.get();
 
         client.on('sync', this.onSync);
         client.on('Room.timeline', this.onRoomTimeline);
-        client.on('Event.decrypted', this.onEventDecrypted);
         client.on('Room.timelineReset', this.onTimelineReset);
         client.on('Room.redaction', this.onRedaction);
         client.on('RoomState.events', this.onRoomStateEvent);
@@ -66,13 +77,12 @@ export default class EventIndex extends EventEmitter {
     /**
      * Remove the event index specific event listeners.
      */
-    removeListeners() {
+    public removeListeners() {
         const client = MatrixClientPeg.get();
         if (client === null) return;
 
         client.removeListener('sync', this.onSync);
         client.removeListener('Room.timeline', this.onRoomTimeline);
-        client.removeListener('Event.decrypted', this.onEventDecrypted);
         client.removeListener('Room.timelineReset', this.onTimelineReset);
         client.removeListener('Room.redaction', this.onRedaction);
         client.removeListener('RoomState.events', this.onRoomStateEvent);
@@ -81,7 +91,7 @@ export default class EventIndex extends EventEmitter {
     /**
      * Get crawler checkpoints for the encrypted rooms and store them in the index.
      */
-    async addInitialCheckpoints() {
+    public async addInitialCheckpoints() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         const client = MatrixClientPeg.get();
         const rooms = client.getRooms();
@@ -94,25 +104,25 @@ export default class EventIndex extends EventEmitter {
         // rooms can use the search provided by the homeserver.
         const encryptedRooms = rooms.filter(isRoomEncrypted);
 
-        console.log("EventIndex: Adding initial crawler checkpoints");
+        logger.log("EventIndex: Adding initial crawler checkpoints");
 
         // Gather the prev_batch tokens and create checkpoints for
         // our message crawler.
         await Promise.all(encryptedRooms.map(async (room) => {
             const timeline = room.getLiveTimeline();
-            const token = timeline.getPaginationToken("b");
+            const token = timeline.getPaginationToken(Direction.Backward);
 
-            const backCheckpoint = {
+            const backCheckpoint: ICrawlerCheckpoint = {
                 roomId: room.roomId,
                 token: token,
-                direction: "b",
+                direction: Direction.Backward,
                 fullCrawl: true,
             };
 
-            const forwardCheckpoint = {
+            const forwardCheckpoint: ICrawlerCheckpoint = {
                 roomId: room.roomId,
                 token: token,
-                direction: "f",
+                direction: Direction.Forward,
             };
 
             try {
@@ -126,7 +136,7 @@ export default class EventIndex extends EventEmitter {
                     this.crawlerCheckpoints.push(forwardCheckpoint);
                 }
             } catch (e) {
-                console.log(
+                logger.log(
                     "EventIndex: Error adding initial checkpoints for room",
                     room.roomId,
                     backCheckpoint,
@@ -146,7 +156,7 @@ export default class EventIndex extends EventEmitter {
      *     - Every other sync, tell the event index to commit all the queued up
      *         live events
      */
-    onSync = async (state, prevState, data) => {
+    private onSync = async (state: string, prevState: string, data: object) => {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         if (prevState === "PREPARED" && state === "SYNCING") {
@@ -166,7 +176,7 @@ export default class EventIndex extends EventEmitter {
             await indexManager.commitLiveEvents();
             return;
         }
-    }
+    };
 
     /*
      * The Room.timeline listener.
@@ -176,7 +186,15 @@ export default class EventIndex extends EventEmitter {
      * otherwise we save their event id and wait for them in the Event.decrypted
      * listener.
      */
-    onRoomTimeline = async (ev, room, toStartOfTimeline, removed, data) => {
+    private onRoomTimeline = async (
+        ev: MatrixEvent,
+        room: Room,
+        toStartOfTimeline: boolean,
+        removed: boolean,
+        data: {
+            liveEvent: boolean;
+        },
+    ) => {
         const client = MatrixClientPeg.get();
 
         // We only index encrypted rooms locally.
@@ -192,35 +210,23 @@ export default class EventIndex extends EventEmitter {
         await client.decryptEventIfNeeded(ev);
 
         await this.addLiveEventToIndex(ev);
-    }
+    };
 
-    onRoomStateEvent = async (ev, state) => {
+    private onRoomStateEvent = async (ev: MatrixEvent, state: RoomState) => {
         if (!MatrixClientPeg.get().isRoomEncrypted(state.roomId)) return;
 
-        if (ev.getType() === "m.room.encryption" && !await this.isRoomIndexed(state.roomId)) {
-            console.log("EventIndex: Adding a checkpoint for a newly encrypted room", state.roomId);
+        if (ev.getType() === "m.room.encryption" && !(await this.isRoomIndexed(state.roomId))) {
+            logger.log("EventIndex: Adding a checkpoint for a newly encrypted room", state.roomId);
             this.addRoomCheckpoint(state.roomId, true);
         }
-    }
-
-    /*
-     * The Event.decrypted listener.
-     *
-     * Checks if the event was marked for addition in the Room.timeline
-     * listener, if so queues it up to be added to the index.
-     */
-    onEventDecrypted = async (ev, err) => {
-        // If the event isn't in our live event set, ignore it.
-        if (err) return;
-        await this.addLiveEventToIndex(ev);
-    }
+    };
 
     /*
      * The Room.redaction listener.
      *
      * Removes a redacted event from our event index.
      */
-    onRedaction = async (ev, room) => {
+    private onRedaction = async (ev: MatrixEvent, room: Room) => {
         // We only index encrypted rooms locally.
         if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
         const indexManager = PlatformPeg.get().getEventIndexingManager();
@@ -228,9 +234,9 @@ export default class EventIndex extends EventEmitter {
         try {
             await indexManager.deleteEvent(ev.getAssociatedId());
         } catch (e) {
-            console.log("EventIndex: Error deleting event from index", e);
+            logger.log("EventIndex: Error deleting event from index", e);
         }
-    }
+    };
 
     /*
      * The Room.timelineReset listener.
@@ -238,15 +244,15 @@ export default class EventIndex extends EventEmitter {
      * Listens for timeline resets that are caused by a limited timeline to
      * re-add checkpoints for rooms that need to be crawled again.
      */
-    onTimelineReset = async (room, timelineSet, resetAllTimelines) => {
+    private onTimelineReset = async (room: Room, timelineSet: EventTimelineSet, resetAllTimelines: boolean) => {
         if (room === null) return;
         if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
 
-        console.log("EventIndex: Adding a checkpoint because of a limited timeline",
+        logger.log("EventIndex: Adding a checkpoint because of a limited timeline",
             room.roomId);
 
         this.addRoomCheckpoint(room.roomId, false);
-    }
+    };
 
     /**
      * Check if an event should be added to the event index.
@@ -258,7 +264,7 @@ export default class EventIndex extends EventEmitter {
      * @returns {bool} Returns true if the event can be indexed, false
      * otherwise.
      */
-    isValidEvent(ev) {
+    private isValidEvent(ev: MatrixEvent) {
         const isUsefulType = ["m.room.message", "m.room.name", "m.room.topic"].includes(ev.getType());
         const validEventType = isUsefulType && !ev.isRedacted() && !ev.isDecryptionFailure();
 
@@ -282,8 +288,8 @@ export default class EventIndex extends EventEmitter {
         return validEventType && validMsgType && hasContentValue;
     }
 
-    eventToJson(ev) {
-        const jsonEvent = ev.toJSON();
+    private eventToJson(ev: MatrixEvent) {
+        const jsonEvent: any = ev.toJSON();
         const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
 
         if (ev.isEncrypted()) {
@@ -314,7 +320,7 @@ export default class EventIndex extends EventEmitter {
      *
      * @param {MatrixEvent} ev The event that should be added to the index.
      */
-    async addLiveEventToIndex(ev) {
+    private async addLiveEventToIndex(ev: MatrixEvent) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         if (!this.isValidEvent(ev)) return;
@@ -333,11 +339,11 @@ export default class EventIndex extends EventEmitter {
      * Emmit that the crawler has changed the checkpoint that it's currently
      * handling.
      */
-    emitNewCheckpoint() {
+    private emitNewCheckpoint() {
         this.emit("changedCheckpoint", this.currentRoom());
     }
 
-    async addEventsFromLiveTimeline(timeline) {
+    private async addEventsFromLiveTimeline(timeline: EventTimeline) {
         const events = timeline.getEvents();
 
         for (let i = 0; i < events.length; i++) {
@@ -346,7 +352,7 @@ export default class EventIndex extends EventEmitter {
         }
     }
 
-    async addRoomCheckpoint(roomId, fullCrawl = false) {
+    private async addRoomCheckpoint(roomId: string, fullCrawl = false) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         const client = MatrixClientPeg.get();
         const room = client.getRoom(roomId);
@@ -354,7 +360,7 @@ export default class EventIndex extends EventEmitter {
         if (!room) return;
 
         const timeline = room.getLiveTimeline();
-        const token = timeline.getPaginationToken("b");
+        const token = timeline.getPaginationToken(Direction.Backward);
 
         if (!token) {
             // The room doesn't contain any tokens, meaning the live timeline
@@ -367,15 +373,15 @@ export default class EventIndex extends EventEmitter {
             roomId: room.roomId,
             token: token,
             fullCrawl: fullCrawl,
-            direction: "b",
+            direction: Direction.Backward,
         };
 
-        console.log("EventIndex: Adding checkpoint", checkpoint);
+        logger.log("EventIndex: Adding checkpoint", checkpoint);
 
         try {
             await indexManager.addCrawlerCheckpoint(checkpoint);
         } catch (e) {
-            console.log(
+            logger.log(
                 "EventIndex: Error adding new checkpoint for room",
                 room.roomId,
                 checkpoint,
@@ -396,16 +402,16 @@ export default class EventIndex extends EventEmitter {
      * crawl, otherwise create a new checkpoint and push it to the
      * crawlerCheckpoints queue so we go through them in a round-robin way.
      */
-    async crawlerFunc() {
+    private async crawlerFunc() {
         let cancelled = false;
 
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
-        this._crawler = {};
-
-        this._crawler.cancel = () => {
-            cancelled = true;
+        this.crawler = {
+            cancel: () => {
+                cancelled = true;
+            },
         };
 
         let idle = false;
@@ -417,11 +423,11 @@ export default class EventIndex extends EventEmitter {
             sleepTime = Math.max(sleepTime, 100);
 
             if (idle) {
-                sleepTime = this._crawlerIdleTime;
+                sleepTime = CRAWLER_IDLE_TIME;
             }
 
-            if (this._currentCheckpoint !== null) {
-                this._currentCheckpoint = null;
+            if (this.currentCheckpoint !== null) {
+                this.currentCheckpoint = null;
                 this.emitNewCheckpoint();
             }
 
@@ -440,30 +446,33 @@ export default class EventIndex extends EventEmitter {
                 continue;
             }
 
-            this._currentCheckpoint = checkpoint;
+            this.currentCheckpoint = checkpoint;
             this.emitNewCheckpoint();
 
             idle = false;
 
             // We have a checkpoint, let us fetch some messages, again, very
             // conservatively to not bother our homeserver too much.
-            const eventMapper = client.getEventMapper({preventReEmit: true});
+            const eventMapper = client.getEventMapper({ preventReEmit: true });
             // TODO we need to ensure to use member lazy loading with this
             // request so we get the correct profiles.
             let res;
 
             try {
                 res = await client.createMessagesRequest(
-                    checkpoint.roomId, checkpoint.token, this._eventsPerCrawl,
-                    checkpoint.direction);
+                    checkpoint.roomId,
+                    checkpoint.token,
+                    EVENTS_PER_CRAWL,
+                    checkpoint.direction,
+                );
             } catch (e) {
                 if (e.httpStatus === 403) {
-                    console.log("EventIndex: Removing checkpoint as we don't have ",
+                    logger.log("EventIndex: Removing checkpoint as we don't have ",
                         "permissions to fetch messages from this room.", checkpoint);
                     try {
                         await indexManager.removeCrawlerCheckpoint(checkpoint);
                     } catch (e) {
-                        console.log("EventIndex: Error removing checkpoint", checkpoint, e);
+                        logger.log("EventIndex: Error removing checkpoint", checkpoint, e);
                         // We don't push the checkpoint here back, it will
                         // hopefully be removed after a restart. But let us
                         // ignore it for now as we don't want to hammer the
@@ -472,7 +481,7 @@ export default class EventIndex extends EventEmitter {
                     continue;
                 }
 
-                console.log("EventIndex: Error crawling using checkpoint:", checkpoint, ",", e);
+                logger.log("EventIndex: Error crawling using checkpoint:", checkpoint, ",", e);
                 this.crawlerCheckpoints.push(checkpoint);
                 continue;
             }
@@ -483,13 +492,13 @@ export default class EventIndex extends EventEmitter {
             }
 
             if (res.chunk.length === 0) {
-                console.log("EventIndex: Done with the checkpoint", checkpoint);
+                logger.log("EventIndex: Done with the checkpoint", checkpoint);
                 // We got to the start/end of our timeline, lets just
                 // delete our checkpoint and go back to sleep.
                 try {
                     await indexManager.removeCrawlerCheckpoint(checkpoint);
                 } catch (e) {
-                    console.log("EventIndex: Error removing checkpoint", checkpoint, e);
+                    logger.log("EventIndex: Error removing checkpoint", checkpoint, e);
                 }
                 continue;
             }
@@ -584,7 +593,7 @@ export default class EventIndex extends EventEmitter {
                 // We didn't get a valid new checkpoint from the server, nothing
                 // to do here anymore.
                 if (!newCheckpoint) {
-                    console.log("EventIndex: The server didn't return a valid ",
+                    logger.log("EventIndex: The server didn't return a valid ",
                         "new checkpoint, not continuing the crawl.", checkpoint);
                     continue;
                 }
@@ -594,41 +603,41 @@ export default class EventIndex extends EventEmitter {
                 // Let us delete the checkpoint in that case, otherwise push
                 // the new checkpoint to be used by the crawler.
                 if (eventsAlreadyAdded === true && newCheckpoint.fullCrawl !== true) {
-                    console.log("EventIndex: Checkpoint had already all events",
+                    logger.log("EventIndex: Checkpoint had already all events",
                         "added, stopping the crawl", checkpoint);
                     await indexManager.removeCrawlerCheckpoint(newCheckpoint);
                 } else {
                     if (eventsAlreadyAdded === true) {
-                        console.log("EventIndex: Checkpoint had already all events",
+                        logger.log("EventIndex: Checkpoint had already all events",
                             "added, but continuing due to a full crawl", checkpoint);
                     }
                     this.crawlerCheckpoints.push(newCheckpoint);
                 }
             } catch (e) {
-                console.log("EventIndex: Error durring a crawl", e);
+                logger.log("EventIndex: Error durring a crawl", e);
                 // An error occurred, put the checkpoint back so we
                 // can retry.
                 this.crawlerCheckpoints.push(checkpoint);
             }
         }
 
-        this._crawler = null;
+        this.crawler = null;
     }
 
     /**
      * Start the crawler background task.
      */
-    startCrawler() {
-        if (this._crawler !== null) return;
+    public startCrawler() {
+        if (this.crawler !== null) return;
         this.crawlerFunc();
     }
 
     /**
      * Stop the crawler background task.
      */
-    stopCrawler() {
-        if (this._crawler === null) return;
-        this._crawler.cancel();
+    public stopCrawler() {
+        if (this.crawler === null) return;
+        this.crawler.cancel();
     }
 
     /**
@@ -637,7 +646,7 @@ export default class EventIndex extends EventEmitter {
      * This removes all the MatrixClient event listeners, stops the crawler
      * task, and closes the index.
      */
-    async close() {
+    public async close() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         this.removeListeners();
         this.stopCrawler();
@@ -648,13 +657,13 @@ export default class EventIndex extends EventEmitter {
     /**
      * Search the event index using the given term for matching events.
      *
-     * @param {SearchArgs} searchArgs The search configuration for the search,
+     * @param {ISearchArgs} searchArgs The search configuration for the search,
      * sets the search term and determines the search result contents.
      *
-     * @return {Promise<[SearchResult]>} A promise that will resolve to an array
+     * @return {Promise<IResultRoomEvents[]>} A promise that will resolve to an array
      * of search results once the search is done.
      */
-    async search(searchArgs) {
+    public async search(searchArgs: ISearchArgs): Promise<IResultRoomEvents> {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.searchEventIndex(searchArgs);
     }
@@ -680,11 +689,16 @@ export default class EventIndex extends EventEmitter {
      * @returns {Promise<MatrixEvent[]>} Resolves to an array of events that
      * contain URLs.
      */
-    async loadFileEvents(room, limit = 10, fromEvent = null, direction = EventTimeline.BACKWARDS) {
+    public async loadFileEvents(
+        room: Room,
+        limit = 10,
+        fromEvent: string = null,
+        direction: string = EventTimeline.BACKWARDS,
+    ) {
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
-        const loadArgs = {
+        const loadArgs: ILoadArgs = {
             roomId: room.roomId,
             limit: limit,
         };
@@ -700,7 +714,7 @@ export default class EventIndex extends EventEmitter {
         try {
             events = await indexManager.loadFileEvents(loadArgs);
         } catch (e) {
-            console.log("EventIndex: Error getting file events", e);
+            logger.log("EventIndex: Error getting file events", e);
             return [];
         }
 
@@ -772,13 +786,13 @@ export default class EventIndex extends EventEmitter {
      * @returns {Promise<boolean>} Resolves to true if events were added to the
      * timeline, false otherwise.
      */
-    async populateFileTimeline(
-        timelineSet,
-        timeline,
-        room,
+    public async populateFileTimeline(
+        timelineSet: EventTimelineSet,
+        timeline: EventTimeline,
+        room: Room,
         limit = 10,
-        fromEvent = null,
-        direction = EventTimeline.BACKWARDS,
+        fromEvent: string = null,
+        direction: string = EventTimeline.BACKWARDS,
     ) {
         const matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
 
@@ -808,7 +822,7 @@ export default class EventIndex extends EventEmitter {
             ret = true;
         }
 
-        console.log("EventIndex: Populating file panel with", matrixEvents.length,
+        logger.log("EventIndex: Populating file panel with", matrixEvents.length,
             "events and setting the pagination token to", paginationToken);
 
         timeline.setPaginationToken(paginationToken, EventTimeline.BACKWARDS);
@@ -837,7 +851,7 @@ export default class EventIndex extends EventEmitter {
      * @returns {Promise<boolean>} Resolves to a boolean which is true if more
      * events were successfully retrieved.
      */
-    paginateTimelineWindow(room, timelineWindow, direction, limit) {
+    public paginateTimelineWindow(room: Room, timelineWindow: TimelineWindow, direction: Direction, limit: number) {
         const tl = timelineWindow.getTimelineIndex(direction);
 
         if (!tl) return Promise.resolve(false);
@@ -847,13 +861,27 @@ export default class EventIndex extends EventEmitter {
             return Promise.resolve(true);
         }
 
-        const paginationMethod = async (timelineWindow, timeline, room, direction, limit) => {
-            const timelineSet = timelineWindow._timelineSet;
-            const token = timeline.timeline.getPaginationToken(direction);
+        const paginationMethod = async (
+            timelineWindow: TimelineWindow,
+            timelineIndex: TimelineIndex,
+            room: Room,
+            direction: Direction,
+            limit: number,
+        ) => {
+            const timeline = timelineIndex.timeline;
+            const timelineSet = timeline.getTimelineSet();
+            const token = timeline.getPaginationToken(direction);
 
-            const ret = await this.populateFileTimeline(timelineSet, timeline.timeline, room, limit, token, direction);
+            const ret = await this.populateFileTimeline(
+                timelineSet,
+                timeline,
+                room,
+                limit,
+                token,
+                direction,
+            );
 
-            timeline.pendingPaginate = null;
+            timelineIndex.pendingPaginate = null;
             timelineWindow.extend(direction, limit);
 
             return ret;
@@ -871,7 +899,7 @@ export default class EventIndex extends EventEmitter {
      * @return {Promise<IndexStats>} A promise that will resolve to the index
      * statistics.
      */
-    async getStats() {
+    public async getStats() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.getStats();
     }
@@ -885,7 +913,7 @@ export default class EventIndex extends EventEmitter {
      * @return {Promise<boolean>} Returns true if the index contains events for
      * the given room, false otherwise.
      */
-    async isRoomIndexed(roomId) {
+    public async isRoomIndexed(roomId) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.isRoomIndexed(roomId);
     }
@@ -896,21 +924,21 @@ export default class EventIndex extends EventEmitter {
      * @returns {Room} A MatrixRoom that is being currently crawled, null
      * if no room is currently being crawled.
      */
-    currentRoom() {
-        if (this._currentCheckpoint === null && this.crawlerCheckpoints.length === 0) {
+    public currentRoom() {
+        if (this.currentCheckpoint === null && this.crawlerCheckpoints.length === 0) {
             return null;
         }
 
         const client = MatrixClientPeg.get();
 
-        if (this._currentCheckpoint !== null) {
-            return client.getRoom(this._currentCheckpoint.roomId);
+        if (this.currentCheckpoint !== null) {
+            return client.getRoom(this.currentCheckpoint.roomId);
         } else {
             return client.getRoom(this.crawlerCheckpoints[0].roomId);
         }
     }
 
-    crawlingRooms() {
+    public crawlingRooms() {
         const totalRooms = new Set();
         const crawlingRooms = new Set();
 
@@ -918,14 +946,14 @@ export default class EventIndex extends EventEmitter {
             crawlingRooms.add(checkpoint.roomId);
         });
 
-        if (this._currentCheckpoint !== null) {
-            crawlingRooms.add(this._currentCheckpoint.roomId);
+        if (this.currentCheckpoint !== null) {
+            crawlingRooms.add(this.currentCheckpoint.roomId);
         }
 
         const client = MatrixClientPeg.get();
         const rooms = client.getRooms();
 
-        const isRoomEncrypted = (room) => {
+        const isRoomEncrypted = (room: Room) => {
             return client.isRoomEncrypted(room.roomId);
         };
 
@@ -934,6 +962,6 @@ export default class EventIndex extends EventEmitter {
             totalRooms.add(room.roomId);
         });
 
-        return {crawlingRooms, totalRooms};
+        return { crawlingRooms, totalRooms };
     }
 }
diff --git a/src/indexing/EventIndexPeg.ts b/src/indexing/EventIndexPeg.ts
index 4356d882d5..acfdc6525f 100644
--- a/src/indexing/EventIndexPeg.ts
+++ b/src/indexing/EventIndexPeg.ts
@@ -21,9 +21,11 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import EventIndex from "../indexing/EventIndex";
-import {MatrixClientPeg} from "../MatrixClientPeg";
+import { MatrixClientPeg } from "../MatrixClientPeg";
 import SettingsStore from '../settings/SettingsStore';
-import {SettingLevel} from "../settings/SettingLevel";
+import { SettingLevel } from "../settings/SettingLevel";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const INDEX_VERSION = 1;
 
@@ -43,19 +45,19 @@ export class EventIndexPeg {
     async init() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         if (!indexManager) {
-            console.log("EventIndex: Platform doesn't support event indexing, not initializing.");
+            logger.log("EventIndex: Platform doesn't support event indexing, not initializing.");
             return false;
         }
 
         this._supportIsInstalled = await indexManager.supportsEventIndexing();
 
         if (!this.supportIsInstalled()) {
-            console.log("EventIndex: Event indexing isn't installed for the platform, not initializing.");
+            logger.log("EventIndex: Event indexing isn't installed for the platform, not initializing.");
             return false;
         }
 
         if (!SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing')) {
-            console.log("EventIndex: Event indexing is disabled, not initializing");
+            logger.log("EventIndex: Event indexing is disabled, not initializing");
             return false;
         }
 
@@ -92,10 +94,10 @@ export class EventIndexPeg {
                 await indexManager.setUserVersion(INDEX_VERSION);
             }
 
-            console.log("EventIndex: Successfully initialized the event index");
+            logger.log("EventIndex: Successfully initialized the event index");
             await index.init();
         } catch (e) {
-            console.log("EventIndex: Error initializing the event index", e);
+            logger.log("EventIndex: Error initializing the event index", e);
             this.error = e;
             return false;
         }
@@ -174,7 +176,7 @@ export class EventIndexPeg {
 
         if (indexManager !== null) {
             await this.unset();
-            console.log("EventIndex: Deleting event index.");
+            logger.log("EventIndex: Deleting event index.");
             await indexManager.deleteEventIndex();
         }
     }
diff --git a/src/integrations/IntegrationManagerInstance.ts b/src/integrations/IntegrationManagerInstance.ts
index 85748db3c2..c3dcd41ee8 100644
--- a/src/integrations/IntegrationManagerInstance.ts
+++ b/src/integrations/IntegrationManagerInstance.ts
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import type {Room} from "matrix-js-sdk/src/models/room";
+import type { Room } from "matrix-js-sdk/src/models/room";
 
 import ScalarAuthClient from "../ScalarAuthClient";
-import {dialogTermsInteractionCallback, TermsNotSignedError} from "../Terms";
+import { dialogTermsInteractionCallback, TermsNotSignedError } from "../Terms";
 import Modal from '../Modal';
 import url from 'url';
 import SettingsStore from "../settings/SettingsStore";
 import IntegrationManager from "../components/views/settings/IntegrationManager";
-import {IntegrationManagers} from "./IntegrationManagers";
+import { IntegrationManagers } from "./IntegrationManagers";
 
 export enum Kind {
     Account = "account",
@@ -67,7 +67,7 @@ export class IntegrationManagerInstance {
 
         const dialog = Modal.createTrackedDialog(
             'Integration Manager', '', IntegrationManager,
-            {loading: true}, 'mx_IntegrationManager',
+            { loading: true }, 'mx_IntegrationManager',
         );
 
         const client = this.getScalarClient();
diff --git a/src/integrations/IntegrationManagers.ts b/src/integrations/IntegrationManagers.ts
index 780f6d4660..a16792b193 100644
--- a/src/integrations/IntegrationManagers.ts
+++ b/src/integrations/IntegrationManagers.ts
@@ -14,22 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import type {MatrixClient} from "matrix-js-sdk/src/client";
-import type {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import type {Room} from "matrix-js-sdk/src/models/room";
+import type { MatrixClient } from "matrix-js-sdk/src/client";
+import type { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import type { Room } from "matrix-js-sdk/src/models/room";
 
 import SdkConfig from '../SdkConfig';
 import Modal from '../Modal';
-import {IntegrationManagerInstance, Kind} from "./IntegrationManagerInstance";
+import { IntegrationManagerInstance, Kind } from "./IntegrationManagerInstance";
 import IntegrationsImpossibleDialog from "../components/views/dialogs/IntegrationsImpossibleDialog";
 import TabbedIntegrationManagerDialog from "../components/views/dialogs/TabbedIntegrationManagerDialog";
 import IntegrationsDisabledDialog from "../components/views/dialogs/IntegrationsDisabledDialog";
 import WidgetUtils from "../utils/WidgetUtils";
-import {MatrixClientPeg} from "../MatrixClientPeg";
+import { MatrixClientPeg } from "../MatrixClientPeg";
 import SettingsStore from "../settings/SettingsStore";
 import url from 'url';
 import { compare } from "../utils/strings";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const KIND_PREFERENCE = [
     // Ordered: first is most preferred, last is least preferred.
     Kind.Account,
@@ -86,12 +88,12 @@ export class IntegrationManagers {
     }
 
     private setupHomeserverManagers = async (discoveryResponse) => {
-        console.log("Updating homeserver-configured integration managers...");
+        logger.log("Updating homeserver-configured integration managers...");
         if (discoveryResponse && discoveryResponse['m.integrations']) {
             let managers = discoveryResponse['m.integrations']['managers'];
             if (!Array.isArray(managers)) managers = []; // make it an array so we can wipe the HS managers
 
-            console.log(`Homeserver has ${managers.length} integration managers`);
+            logger.log(`Homeserver has ${managers.length} integration managers`);
 
             // Clear out any known managers for the homeserver
             // TODO: Log out of the scalar clients
@@ -109,7 +111,7 @@ export class IntegrationManagers {
 
             this.primaryManager = null; // reset primary
         } else {
-            console.log("Homeserver has no integration managers");
+            logger.log("Homeserver has no integration managers");
         }
     };
 
@@ -187,7 +189,7 @@ export class IntegrationManagers {
 
         Modal.createTrackedDialog(
             'Tabbed Integration Manager', '', TabbedIntegrationManagerDialog,
-            {room, screen, integrationId}, 'mx_TabbedIntegrationManagerDialog',
+            { room, screen, integrationId }, 'mx_TabbedIntegrationManagerDialog',
         );
     }
 
@@ -211,7 +213,7 @@ export class IntegrationManagers {
      * or null if none was found.
      */
     async tryDiscoverManager(domainName: string): Promise<IntegrationManagerInstance> {
-        console.log("Looking up integration manager via .well-known");
+        logger.log("Looking up integration manager via .well-known");
         if (domainName.startsWith("http:") || domainName.startsWith("https:")) {
             // trim off the scheme and just use the domain
             domainName = url.parse(domainName).host;
@@ -240,7 +242,7 @@ export class IntegrationManagers {
 
         // All discovered managers are per-user managers
         const manager = new IntegrationManagerInstance(Kind.Account, widget["data"]["api_url"], widget["url"]);
-        console.log("Got an integration manager (untested)");
+        logger.log("Got an integration manager (untested)");
 
         // We don't test the manager because the caller may need to do extra
         // checks or similar with it. For instance, they may need to deal with
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 16950dc008..ad3e34c3f0 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -27,7 +27,9 @@ import PlatformPeg from "./PlatformPeg";
 // @ts-ignore - $webapp is a webpack resolve alias pointing to the output directory, see webpack config
 import webpackLangJsonUrl from "$webapp/i18n/languages.json";
 import { SettingLevel } from "./settings/SettingLevel";
-import {retry} from "./utils/promise";
+import { retry } from "./utils/promise";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const i18nFolder = 'i18n/';
 
@@ -67,7 +69,7 @@ export function getUserLanguage(): string {
 
 // Function which only purpose is to mark that a string is translatable
 // Does not actually do anything. It's helpful for automatic extraction of translatable strings
-export function _td(s: string): string {
+export function _td(s: string): string { // eslint-disable-line @typescript-eslint/naming-convention
     return s;
 }
 
@@ -100,7 +102,7 @@ function safeCounterpartTranslate(text: string, options?: object) {
     if (translated === undefined && count !== undefined) {
         // counterpart does not do fallback if no pluralisation exists
         // in the preferred language, so do it here
-        translated = counterpart.translate(text, Object.assign({}, options, {locale: 'en'}));
+        translated = counterpart.translate(text, Object.assign({}, options, { locale: 'en' }));
     }
     return translated;
 }
@@ -112,7 +114,7 @@ export interface IVariables {
     [key: string]: SubstitutionValue;
 }
 
-type Tags = Record<string, SubstitutionValue>;
+export type Tags = Record<string, SubstitutionValue>;
 
 export type TranslatedString = string | React.ReactNode;
 
@@ -132,6 +134,8 @@ export type TranslatedString = string | React.ReactNode;
  *
  * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
  */
+// eslint-next-line @typescript-eslint/naming-convention
+// eslint-nexline @typescript-eslint/naming-convention
 export function _t(text: string, variables?: IVariables): string;
 export function _t(text: string, variables: IVariables, tags: Tags): React.ReactNode;
 export function _t(text: string, variables?: IVariables, tags?: Tags): TranslatedString {
@@ -151,13 +155,24 @@ export function _t(text: string, variables?: IVariables, tags?: Tags): Translate
         if (typeof substituted === 'string') {
             return `@@${text}##${substituted}@@`;
         } else {
-            return <span className='translated-string' data-orig-string={text}>{substituted}</span>;
+            return <span className='translated-string' data-orig-string={text}>{ substituted }</span>;
         }
     } else {
         return substituted;
     }
 }
 
+/**
+ * Sanitizes unsafe text for the sanitizer, ensuring references to variables will not be considered
+ * replaceable by the translation functions.
+ * @param {string} text The text to sanitize.
+ * @returns {string} The sanitized text.
+ */
+export function sanitizeForTranslation(text: string): string {
+    // Add a non-breaking space so the regex doesn't trigger when translating.
+    return text.replace(/%\(([^)]*)\)/g, '%\xa0($1)');
+}
+
 /*
  * Similar to _t(), except only does substitutions, and no translation
  * @param {string} text The text, e.g "click <a>here</a> now to %(foo)s".
@@ -295,7 +310,7 @@ export function replaceByRegexes(text: string, mapping: IVariables | Tags): stri
             // However, not showing count is so common that it's not worth logging. And other commonly unused variables
             // here, if there are any.
             if (regexpString !== '%\\(count\\)s') {
-                console.log(`Could not find ${regexp} in ${text}`);
+                logger.log(`Could not find ${regexp} in ${text}`);
             }
         }
     }
@@ -348,7 +363,7 @@ export function setLanguage(preferredLangs: string | string[]) {
         SettingsStore.setValue("language", null, SettingLevel.DEVICE, langToUse);
         // Adds a lot of noise to test runs, so disable logging there.
         if (process.env.NODE_ENV !== "test") {
-            console.log("set language to " + langToUse);
+            logger.log("set language to " + langToUse);
         }
 
         // Set 'en' as fallback language:
@@ -505,7 +520,7 @@ function weblateToCounterpart(inTrs: object): object {
 
 async function getLanguageRetry(langPath: string, num = 3): Promise<object> {
     return retry(() => getLanguage(langPath), num, e => {
-        console.log("Failed to load i18n", langPath);
+        logger.log("Failed to load i18n", langPath);
         console.error(e);
         return true; // always retry
     });
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.ts
similarity index 87%
rename from src/linkify-matrix.js
rename to src/linkify-matrix.ts
index feda257d8b..20f1b1e213 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.ts
@@ -15,14 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {baseUrl} from "./utils/permalinks/SpecPermalinkConstructor";
+import { baseUrl } from "./utils/permalinks/SpecPermalinkConstructor";
 import {
     parsePermalink,
     tryTransformEntityToPermalink,
     tryTransformPermalinkToLocalHref,
 } from "./utils/permalinks/Permalinks";
 
-function matrixLinkify(linkify) {
+enum Type {
+    URL = "url",
+    UserId = "userid",
+    RoomAlias = "roomalias",
+    GroupId = "groupid"
+}
+
+function matrixLinkify(linkify): void {
     // Text tokens
     const TT = linkify.scanner.TOKENS;
     // Multi tokens
@@ -81,7 +88,6 @@ function matrixLinkify(linkify) {
     S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:`
     S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS_COLON_NUM); // but do accept :NUM (port specifier)
 
-
     const USERID = function(value) {
         MultiToken.call(this, value);
         this.type = 'userid';
@@ -127,7 +133,6 @@ function matrixLinkify(linkify) {
     S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:`
     S_USERID_COLON.on(TT.NUM, S_USERID_COLON_NUM); // but do accept :NUM (port specifier)
 
-
     const GROUPID = function(value) {
         MultiToken.call(this, value);
         this.type = 'groupid';
@@ -175,11 +180,11 @@ function matrixLinkify(linkify) {
 }
 
 // stubs, overwritten in MatrixChat's componentDidMount
-matrixLinkify.onUserClick = function(e, userId) { e.preventDefault(); };
-matrixLinkify.onAliasClick = function(e, roomAlias) { e.preventDefault(); };
-matrixLinkify.onGroupClick = function(e, groupId) { e.preventDefault(); };
+matrixLinkify.onUserClick = function(e: MouseEvent, userId: string) { e.preventDefault(); };
+matrixLinkify.onAliasClick = function(e: MouseEvent, roomAlias: string) { e.preventDefault(); };
+matrixLinkify.onGroupClick = function(e: MouseEvent, groupId: string) { e.preventDefault(); };
 
-const escapeRegExp = function(string) {
+const escapeRegExp = function(string): string {
     return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
 
@@ -198,14 +203,15 @@ matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
 matrixLinkify.MATRIXTO_BASE_URL= baseUrl;
 
 matrixLinkify.options = {
-    events: function(href, type) {
+    events: function(href: string, type: Type | string): Partial<GlobalEventHandlers> {
         switch (type) {
-            case "url": {
+            case Type.URL: {
                 // intercept local permalinks to users and show them like userids (in userinfo of current room)
                 try {
                     const permalink = parsePermalink(href);
                     if (permalink && permalink.userId) {
                         return {
+                            // @ts-ignore see https://linkify.js.org/docs/options.html
                             click: function(e) {
                                 matrixLinkify.onUserClick(e, permalink.userId);
                             },
@@ -216,20 +222,23 @@ matrixLinkify.options = {
                 }
                 break;
             }
-            case "userid":
+            case Type.UserId:
                 return {
+                    // @ts-ignore see https://linkify.js.org/docs/options.html
                     click: function(e) {
                         matrixLinkify.onUserClick(e, href);
                     },
                 };
-            case "roomalias":
+            case Type.RoomAlias:
                 return {
+                    // @ts-ignore see https://linkify.js.org/docs/options.html
                     click: function(e) {
                         matrixLinkify.onAliasClick(e, href);
                     },
                 };
-            case "groupid":
+            case Type.GroupId:
                 return {
+                    // @ts-ignore see https://linkify.js.org/docs/options.html
                     click: function(e) {
                         matrixLinkify.onGroupClick(e, href);
                     },
@@ -237,11 +246,11 @@ matrixLinkify.options = {
         }
     },
 
-    formatHref: function(href, type) {
+    formatHref: function(href: string, type: Type | string): string {
         switch (type) {
-            case 'roomalias':
-            case 'userid':
-            case 'groupid':
+            case Type.RoomAlias:
+            case Type.UserId:
+            case Type.GroupId:
             default: {
                 return tryTransformEntityToPermalink(href);
             }
@@ -252,8 +261,8 @@ matrixLinkify.options = {
         rel: 'noreferrer noopener',
     },
 
-    target: function(href, type) {
-        if (type === 'url') {
+    target: function(href: string, type: Type | string): string {
+        if (type === Type.URL) {
             try {
                 const transformed = tryTransformPermalinkToLocalHref(href);
                 if (transformed !== href || decodeURIComponent(href).match(matrixLinkify.ELEMENT_URL_PATTERN)) {
diff --git a/src/mjolnir/BanList.ts b/src/mjolnir/BanList.ts
index 21cd5d4cf7..8b466c8a06 100644
--- a/src/mjolnir/BanList.ts
+++ b/src/mjolnir/BanList.ts
@@ -16,8 +16,8 @@ limitations under the License.
 
 // Inspiration largely taken from Mjolnir itself
 
-import {ListRule, RECOMMENDATION_BAN, recommendationToStable} from "./ListRule";
-import {MatrixClientPeg} from "../MatrixClientPeg";
+import { ListRule, RECOMMENDATION_BAN, recommendationToStable } from "./ListRule";
+import { MatrixClientPeg } from "../MatrixClientPeg";
 
 export const RULE_USER = "m.room.rule.user";
 export const RULE_ROOM = "m.room.rule.room";
@@ -92,7 +92,7 @@ export class BanList {
         if (!room) return;
 
         for (const eventType of ALL_RULE_TYPES) {
-            const events = room.currentState.getStateEvents(eventType, undefined);
+            const events = room.currentState.getStateEvents(eventType);
             for (const ev of events) {
                 if (!ev.getStateKey()) continue;
 
diff --git a/src/mjolnir/ListRule.ts b/src/mjolnir/ListRule.ts
index 1d472e06d6..b585b2701f 100644
--- a/src/mjolnir/ListRule.ts
+++ b/src/mjolnir/ListRule.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixGlob} from "../utils/MatrixGlob";
+import { MatrixGlob } from "../utils/MatrixGlob";
 
 // Inspiration largely taken from Mjolnir itself
 
diff --git a/src/mjolnir/Mjolnir.ts b/src/mjolnir/Mjolnir.ts
index 891438bbb9..c1f17e1a4f 100644
--- a/src/mjolnir/Mjolnir.ts
+++ b/src/mjolnir/Mjolnir.ts
@@ -14,25 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from "../MatrixClientPeg";
-import {ALL_RULE_TYPES, BanList} from "./BanList";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { ALL_RULE_TYPES, BanList } from "./BanList";
 import SettingsStore from "../settings/SettingsStore";
-import {_t} from "../languageHandler";
+import { _t } from "../languageHandler";
 import dis from "../dispatcher/dispatcher";
-import {SettingLevel} from "../settings/SettingLevel";
+import { SettingLevel } from "../settings/SettingLevel";
+import { Preset } from "matrix-js-sdk/src/@types/partials";
+import { ActionPayload } from "../dispatcher/payloads";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // TODO: Move this and related files to the js-sdk or something once finalized.
 
 export class Mjolnir {
-    static _instance: Mjolnir = null;
+    private static instance: Mjolnir = null;
 
-    _lists: BanList[] = [];
-    _roomIds: string[] = [];
-    _mjolnirWatchRef = null;
-    _dispatcherRef = null;
-
-    constructor() {
-    }
+    private _lists: BanList[] = []; // eslint-disable-line @typescript-eslint/naming-convention
+    private _roomIds: string[] = []; // eslint-disable-line @typescript-eslint/naming-convention
+    private mjolnirWatchRef: string = null;
+    private dispatcherRef: string = null;
 
     get roomIds(): string[] {
         return this._roomIds;
@@ -43,41 +45,41 @@ export class Mjolnir {
     }
 
     start() {
-        this._mjolnirWatchRef = SettingsStore.watchSetting("mjolnirRooms", null, this._onListsChanged.bind(this));
+        this.mjolnirWatchRef = SettingsStore.watchSetting("mjolnirRooms", null, this.onListsChanged.bind(this));
 
-        this._dispatcherRef = dis.register(this._onAction);
+        this.dispatcherRef = dis.register(this.onAction);
         dis.dispatch({
             action: 'do_after_sync_prepared',
-            deferred_action: {action: 'setup_mjolnir'},
+            deferred_action: { action: 'setup_mjolnir' },
         });
     }
 
-    _onAction = (payload) => {
+    private onAction = (payload: ActionPayload) => {
         if (payload['action'] === 'setup_mjolnir') {
-            console.log("Setting up Mjolnir: after sync");
+            logger.log("Setting up Mjolnir: after sync");
             this.setup();
         }
     };
 
     setup() {
         if (!MatrixClientPeg.get()) return;
-        this._updateLists(SettingsStore.getValue("mjolnirRooms"));
-        MatrixClientPeg.get().on("RoomState.events", this._onEvent);
+        this.updateLists(SettingsStore.getValue("mjolnirRooms"));
+        MatrixClientPeg.get().on("RoomState.events", this.onEvent);
     }
 
     stop() {
-        if (this._mjolnirWatchRef) {
-            SettingsStore.unwatchSetting(this._mjolnirWatchRef);
-            this._mjolnirWatchRef = null;
+        if (this.mjolnirWatchRef) {
+            SettingsStore.unwatchSetting(this.mjolnirWatchRef);
+            this.mjolnirWatchRef = null;
         }
 
-        if (this._dispatcherRef) {
-            dis.unregister(this._dispatcherRef);
-            this._dispatcherRef = null;
+        if (this.dispatcherRef) {
+            dis.unregister(this.dispatcherRef);
+            this.dispatcherRef = null;
         }
 
         if (!MatrixClientPeg.get()) return;
-        MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent);
+        MatrixClientPeg.get().removeListener("RoomState.events", this.onEvent);
     }
 
     async getOrCreatePersonalList(): Promise<BanList> {
@@ -86,7 +88,7 @@ export class Mjolnir {
             const resp = await MatrixClientPeg.get().createRoom({
                 name: _t("My Ban List"),
                 topic: _t("This is your list of users/servers you have blocked - don't leave the room!"),
-                preset: "private_chat",
+                preset: Preset.PrivateChat,
             });
             personalRoomId = resp['room_id'];
             await SettingsStore.setValue(
@@ -131,23 +133,23 @@ export class Mjolnir {
         this._lists = this._lists.filter(b => b.roomId !== roomId);
     }
 
-    _onEvent = (event) => {
+    private onEvent = (event: MatrixEvent) => {
         if (!MatrixClientPeg.get()) return;
         if (!this._roomIds.includes(event.getRoomId())) return;
         if (!ALL_RULE_TYPES.includes(event.getType())) return;
 
-        this._updateLists(this._roomIds);
+        this.updateLists(this._roomIds);
     };
 
-    _onListsChanged(settingName, roomId, atLevel, newValue) {
+    private onListsChanged(settingName: string, roomId: string, atLevel: SettingLevel, newValue: string[]) {
         // We know that ban lists are only recorded at one level so we don't need to re-eval them
-        this._updateLists(newValue);
+        this.updateLists(newValue);
     }
 
-    _updateLists(listRoomIds: string[]) {
+    private updateLists(listRoomIds: string[]) {
         if (!MatrixClientPeg.get()) return;
 
-        console.log("Updating Mjolnir ban lists to: " + listRoomIds);
+        logger.log("Updating Mjolnir ban lists to: " + listRoomIds);
         this._lists = [];
         this._roomIds = listRoomIds || [];
         if (!listRoomIds) return;
@@ -181,10 +183,10 @@ export class Mjolnir {
     }
 
     static sharedInstance(): Mjolnir {
-        if (!Mjolnir._instance) {
-            Mjolnir._instance = new Mjolnir();
+        if (!Mjolnir.instance) {
+            Mjolnir.instance = new Mjolnir();
         }
-        return Mjolnir._instance;
+        return Mjolnir.instance;
     }
 }
 
diff --git a/src/models/IUpload.ts b/src/models/IUpload.ts
index 5b376e9330..1b5a13e394 100644
--- a/src/models/IUpload.ts
+++ b/src/models/IUpload.ts
@@ -14,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { IAbortablePromise } from "matrix-js-sdk/src/@types/partials";
+
 export interface IUpload {
     fileName: string;
     roomId: string;
     total: number;
     loaded: number;
-    promise: Promise<any>;
+    promise: IAbortablePromise<any>;
     canceled?: boolean;
 }
diff --git a/src/notifications/ContentRules.ts b/src/notifications/ContentRules.ts
index cd574e12b6..2b45065568 100644
--- a/src/notifications/ContentRules.ts
+++ b/src/notifications/ContentRules.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 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,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {PushRuleVectorState, State} from "./PushRuleVectorState";
-import {IExtendedPushRule, IRuleSets} from "./types";
+import { PushRuleVectorState, VectorState } from "./PushRuleVectorState";
+import { IAnnotatedPushRule, IPushRules, PushRuleKind } from "matrix-js-sdk/src/@types/PushRules";
 
 export interface IContentRules {
-    vectorState: State;
-    rules: IExtendedPushRule[];
-    externalRules: IExtendedPushRule[];
+    vectorState: VectorState;
+    rules: IAnnotatedPushRule[];
+    externalRules: IAnnotatedPushRule[];
 }
 
 export const SCOPE = "global";
@@ -39,9 +38,9 @@ export class ContentRules {
      *   externalRules: a list of other keyword rules, with states other than
      *      vectorState
      */
-    static parseContentRules(rulesets: IRuleSets): IContentRules {
+    public static parseContentRules(rulesets: IPushRules): IContentRules {
         // first categorise the keyword rules in terms of their actions
-        const contentRules = this._categoriseContentRules(rulesets);
+        const contentRules = ContentRules.categoriseContentRules(rulesets);
 
         // Decide which content rules to display in Vector UI.
         // Vector displays a single global rule for a list of keywords
@@ -59,7 +58,7 @@ export class ContentRules {
 
         if (contentRules.loud.length) {
             return {
-                vectorState: State.Loud,
+                vectorState: VectorState.Loud,
                 rules: contentRules.loud,
                 externalRules: [
                     ...contentRules.loud_but_disabled,
@@ -70,33 +69,33 @@ export class ContentRules {
             };
         } else if (contentRules.loud_but_disabled.length) {
             return {
-                vectorState: State.Off,
+                vectorState: VectorState.Off,
                 rules: contentRules.loud_but_disabled,
                 externalRules: [...contentRules.on, ...contentRules.on_but_disabled, ...contentRules.other],
             };
         } else if (contentRules.on.length) {
             return {
-                vectorState: State.On,
+                vectorState: VectorState.On,
                 rules: contentRules.on,
                 externalRules: [...contentRules.on_but_disabled, ...contentRules.other],
             };
         } else if (contentRules.on_but_disabled.length) {
             return {
-                vectorState: State.Off,
+                vectorState: VectorState.Off,
                 rules: contentRules.on_but_disabled,
                 externalRules: contentRules.other,
             };
         } else {
             return {
-                vectorState: State.On,
+                vectorState: VectorState.On,
                 rules: [],
                 externalRules: contentRules.other,
             };
         }
     }
 
-    static _categoriseContentRules(rulesets: IRuleSets) {
-        const contentRules: Record<"on"|"on_but_disabled"|"loud"|"loud_but_disabled"|"other", IExtendedPushRule[]> = {
+    private static categoriseContentRules(rulesets: IPushRules) {
+        const contentRules: Record<"on"|"on_but_disabled"|"loud"|"loud_but_disabled"|"other", IAnnotatedPushRule[]> = {
             on: [],
             on_but_disabled: [],
             loud: [],
@@ -109,7 +108,7 @@ export class ContentRules {
                 const r = rulesets.global[kind][i];
 
                 // check it's not a default rule
-                if (r.rule_id[0] === '.' || kind !== "content") {
+                if (r.rule_id[0] === '.' || kind !== PushRuleKind.ContentSpecific) {
                     continue;
                 }
 
@@ -117,14 +116,14 @@ export class ContentRules {
                 r.kind = kind;
 
                 switch (PushRuleVectorState.contentRuleVectorStateKind(r)) {
-                    case State.On:
+                    case VectorState.On:
                         if (r.enabled) {
                             contentRules.on.push(r);
                         } else {
                             contentRules.on_but_disabled.push(r);
                         }
                         break;
-                    case State.Loud:
+                    case VectorState.Loud:
                         if (r.enabled) {
                             contentRules.loud.push(r);
                         } else {
diff --git a/src/notifications/NotificationUtils.ts b/src/notifications/NotificationUtils.ts
index e3b7f66447..3f07c56972 100644
--- a/src/notifications/NotificationUtils.ts
+++ b/src/notifications/NotificationUtils.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 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,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Action, Actions} from "./types";
+import { PushRuleAction, PushRuleActionName, TweakHighlight, TweakSound } from "matrix-js-sdk/src/@types/PushRules";
 
 interface IEncodedActions {
     notify: boolean;
@@ -30,23 +29,23 @@ export class NotificationUtils {
     //   "highlight: true/false,
     // }
     // to a list of push actions.
-    static encodeActions(action: IEncodedActions) {
+    static encodeActions(action: IEncodedActions): PushRuleAction[] {
         const notify = action.notify;
         const sound = action.sound;
         const highlight = action.highlight;
         if (notify) {
-            const actions: Action[] = [Actions.Notify];
+            const actions: PushRuleAction[] = [PushRuleActionName.Notify];
             if (sound) {
-                actions.push({"set_tweak": "sound", "value": sound});
+                actions.push({ "set_tweak": "sound", "value": sound } as TweakSound);
             }
             if (highlight) {
-                actions.push({"set_tweak": "highlight"});
+                actions.push({ "set_tweak": "highlight" } as TweakHighlight);
             } else {
-                actions.push({"set_tweak": "highlight", "value": false});
+                actions.push({ "set_tweak": "highlight", "value": false } as TweakHighlight);
             }
             return actions;
         } else {
-            return [Actions.DontNotify];
+            return [PushRuleActionName.DontNotify];
         }
     }
 
@@ -56,16 +55,16 @@ export class NotificationUtils {
     //   "highlight: true/false,
     // }
     // If the actions couldn't be decoded then returns null.
-    static decodeActions(actions: Action[]): IEncodedActions {
+    static decodeActions(actions: PushRuleAction[]): IEncodedActions {
         let notify = false;
         let sound = null;
         let highlight = false;
 
         for (let i = 0; i < actions.length; ++i) {
             const action = actions[i];
-            if (action === Actions.Notify) {
+            if (action === PushRuleActionName.Notify) {
                 notify = true;
-            } else if (action === Actions.DontNotify) {
+            } else if (action === PushRuleActionName.DontNotify) {
                 notify = false;
             } else if (typeof action === "object") {
                 if (action.set_tweak === "sound") {
diff --git a/src/notifications/PushRuleVectorState.ts b/src/notifications/PushRuleVectorState.ts
index d33426cfc4..34f7dcf786 100644
--- a/src/notifications/PushRuleVectorState.ts
+++ b/src/notifications/PushRuleVectorState.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 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,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {StandardActions} from "./StandardActions";
-import {NotificationUtils} from "./NotificationUtils";
-import {IPushRule} from "./types";
+import { StandardActions } from "./StandardActions";
+import { NotificationUtils } from "./NotificationUtils";
+import { IPushRule } from "matrix-js-sdk/src/@types/PushRules";
 
-export enum State {
+export enum VectorState {
     /** The push rule is disabled */
     Off = "off",
     /** The user will receive push notification for this rule */
@@ -31,26 +30,26 @@ export enum State {
 
 export class PushRuleVectorState {
     // Backwards compatibility (things should probably be using the enum above instead)
-    static OFF = State.Off;
-    static ON = State.On;
-    static LOUD = State.Loud;
+    static OFF = VectorState.Off;
+    static ON = VectorState.On;
+    static LOUD = VectorState.Loud;
 
     /**
      * Enum for state of a push rule as defined by the Vector UI.
      * @readonly
      * @enum {string}
      */
-    static states = State;
+    static states = VectorState;
 
     /**
      * Convert a PushRuleVectorState to a list of actions
      *
      * @return [object] list of push-rule actions
      */
-    static actionsFor(pushRuleVectorState: State) {
-        if (pushRuleVectorState === State.On) {
+    static actionsFor(pushRuleVectorState: VectorState) {
+        if (pushRuleVectorState === VectorState.On) {
             return StandardActions.ACTION_NOTIFY;
-        } else if (pushRuleVectorState === State.Loud) {
+        } else if (pushRuleVectorState === VectorState.Loud) {
             return StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND;
         }
     }
@@ -62,7 +61,7 @@ export class PushRuleVectorState {
      * category or in PushRuleVectorState.LOUD, regardless of its enabled
      * state. Returns null if it does not match these categories.
      */
-    static contentRuleVectorStateKind(rule: IPushRule): State {
+    static contentRuleVectorStateKind(rule: IPushRule): VectorState {
         const decoded = NotificationUtils.decodeActions(rule.actions);
 
         if (!decoded) {
@@ -80,10 +79,10 @@ export class PushRuleVectorState {
         let stateKind = null;
         switch (tweaks) {
             case 0:
-                stateKind = State.On;
+                stateKind = VectorState.On;
                 break;
             case 2:
-                stateKind = State.Loud;
+                stateKind = VectorState.Loud;
                 break;
         }
         return stateKind;
diff --git a/src/notifications/StandardActions.ts b/src/notifications/StandardActions.ts
index c17010af9a..9447f1077c 100644
--- a/src/notifications/StandardActions.ts
+++ b/src/notifications/StandardActions.ts
@@ -15,16 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {NotificationUtils} from "./NotificationUtils";
+import { NotificationUtils } from "./NotificationUtils";
 
 const encodeActions = NotificationUtils.encodeActions;
 
 export class StandardActions {
-    static ACTION_NOTIFY = encodeActions({notify: true});
-    static ACTION_NOTIFY_DEFAULT_SOUND = encodeActions({notify: true, sound: "default"});
-    static ACTION_NOTIFY_RING_SOUND = encodeActions({notify: true, sound: "ring"});
-    static ACTION_HIGHLIGHT = encodeActions({notify: true, highlight: true});
-    static ACTION_HIGHLIGHT_DEFAULT_SOUND = encodeActions({notify: true, sound: "default", highlight: true});
-    static ACTION_DONT_NOTIFY = encodeActions({notify: false});
+    static ACTION_NOTIFY = encodeActions({ notify: true });
+    static ACTION_NOTIFY_DEFAULT_SOUND = encodeActions({ notify: true, sound: "default" });
+    static ACTION_NOTIFY_RING_SOUND = encodeActions({ notify: true, sound: "ring" });
+    static ACTION_HIGHLIGHT = encodeActions({ notify: true, highlight: true });
+    static ACTION_HIGHLIGHT_DEFAULT_SOUND = encodeActions({ notify: true, sound: "default", highlight: true });
+    static ACTION_DONT_NOTIFY = encodeActions({ notify: false });
     static ACTION_DISABLED = null;
 }
diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.ts
similarity index 65%
rename from src/notifications/VectorPushRulesDefinitions.js
rename to src/notifications/VectorPushRulesDefinitions.ts
index c049a81c15..a8c617e786 100644
--- a/src/notifications/VectorPushRulesDefinitions.js
+++ b/src/notifications/VectorPushRulesDefinitions.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 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,19 +15,34 @@ limitations under the License.
 */
 
 import { _td } from '../languageHandler';
-import {StandardActions} from "./StandardActions";
-import {PushRuleVectorState} from "./PushRuleVectorState";
-import {NotificationUtils} from "./NotificationUtils";
+import { StandardActions } from "./StandardActions";
+import { PushRuleVectorState, VectorState } from "./PushRuleVectorState";
+import { NotificationUtils } from "./NotificationUtils";
+import { PushRuleAction, PushRuleKind } from "matrix-js-sdk/src/@types/PushRules";
+
+type StateToActionsMap = {
+    [state in VectorState]?: PushRuleAction[];
+};
+
+interface IProps {
+    kind: PushRuleKind;
+    description: string;
+    vectorStateToActions: StateToActionsMap;
+}
 
 class VectorPushRuleDefinition {
-    constructor(opts) {
+    private kind: PushRuleKind;
+    private description: string;
+    public readonly vectorStateToActions: StateToActionsMap;
+
+    constructor(opts: IProps) {
         this.kind = opts.kind;
         this.description = opts.description;
         this.vectorStateToActions = opts.vectorStateToActions;
     }
 
     // Translate the rule actions and its enabled value into vector state
-    ruleToVectorState(rule) {
+    public ruleToVectorState(rule): VectorPushRuleDefinition {
         let enabled = false;
         if (rule) {
             enabled = rule.enabled;
@@ -69,56 +83,56 @@ class VectorPushRuleDefinition {
 export const VectorPushRulesDefinitions = {
     // Messages containing user's display name
     ".m.rule.contains_display_name": new VectorPushRuleDefinition({
-        kind: "override",
+        kind: PushRuleKind.Override,
         description: _td("Messages containing my display name"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DISABLED,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DISABLED,
         },
     }),
 
     // Messages containing user's username (localpart/MXID)
     ".m.rule.contains_user_name": new VectorPushRuleDefinition({
-        kind: "override",
+        kind: PushRuleKind.Override,
         description: _td("Messages containing my username"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DISABLED,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DISABLED,
         },
     }),
 
     // Messages containing @room
     ".m.rule.roomnotif": new VectorPushRuleDefinition({
-        kind: "override",
+        kind: PushRuleKind.Override,
         description: _td("Messages containing @room"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_HIGHLIGHT,
-            off: StandardActions.ACTION_DISABLED,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_HIGHLIGHT,
+            [VectorState.Off]: StandardActions.ACTION_DISABLED,
         },
     }),
 
     // Messages just sent to the user in a 1:1 room
     ".m.rule.room_one_to_one": new VectorPushRuleDefinition({
-        kind: "underride",
+        kind: PushRuleKind.Underride,
         description: _td("Messages in one-to-one chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DONT_NOTIFY,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DONT_NOTIFY,
         },
     }),
 
     // Encrypted messages just sent to the user in a 1:1 room
     ".m.rule.encrypted_room_one_to_one": new VectorPushRuleDefinition({
-        kind: "underride",
+        kind: PushRuleKind.Underride,
         description: _td("Encrypted messages in one-to-one chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DONT_NOTIFY,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DONT_NOTIFY,
         },
     }),
 
@@ -126,12 +140,12 @@ export const VectorPushRulesDefinitions = {
     // 1:1 room messages are catched by the .m.rule.room_one_to_one rule if any defined
     // By opposition, all other room messages are from group chat rooms.
     ".m.rule.message": new VectorPushRuleDefinition({
-        kind: "underride",
+        kind: PushRuleKind.Underride,
         description: _td("Messages in group chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DONT_NOTIFY,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DONT_NOTIFY,
         },
     }),
 
@@ -139,57 +153,57 @@ export const VectorPushRulesDefinitions = {
     // Encrypted 1:1 room messages are catched by the .m.rule.encrypted_room_one_to_one rule if any defined
     // By opposition, all other room messages are from group chat rooms.
     ".m.rule.encrypted": new VectorPushRuleDefinition({
-        kind: "underride",
+        kind: PushRuleKind.Underride,
         description: _td("Encrypted messages in group chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DONT_NOTIFY,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DONT_NOTIFY,
         },
     }),
 
     // Invitation for the user
     ".m.rule.invite_for_me": new VectorPushRuleDefinition({
-        kind: "underride",
+        kind: PushRuleKind.Underride,
         description: _td("When I'm invited to a room"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DISABLED,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DISABLED,
         },
     }),
 
     // Incoming call
     ".m.rule.call": new VectorPushRuleDefinition({
-        kind: "underride",
+        kind: PushRuleKind.Underride,
         description: _td("Call invitation"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_NOTIFY_RING_SOUND,
-            off: StandardActions.ACTION_DISABLED,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_RING_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DISABLED,
         },
     }),
 
     // Notifications from bots
     ".m.rule.suppress_notices": new VectorPushRuleDefinition({
-        kind: "override",
+        kind: PushRuleKind.Override,
         description: _td("Messages sent by bot"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             // .m.rule.suppress_notices is a "negative" rule, we have to invert its enabled value for vector UI
-            on: StandardActions.ACTION_DISABLED,
-            loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DONT_NOTIFY,
+            [VectorState.On]: StandardActions.ACTION_DISABLED,
+            [VectorState.Loud]: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
+            [VectorState.Off]: StandardActions.ACTION_DONT_NOTIFY,
         },
     }),
 
     // Room upgrades (tombstones)
     ".m.rule.tombstone": new VectorPushRuleDefinition({
-        kind: "override",
+        kind: PushRuleKind.Override,
         description: _td("When rooms are upgraded"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_HIGHLIGHT,
-            off: StandardActions.ACTION_DISABLED,
+            [VectorState.On]: StandardActions.ACTION_NOTIFY,
+            [VectorState.Loud]: StandardActions.ACTION_HIGHLIGHT,
+            [VectorState.Off]: StandardActions.ACTION_DISABLED,
         },
     }),
 };
diff --git a/src/notifications/index.js b/src/notifications/index.ts
similarity index 100%
rename from src/notifications/index.js
rename to src/notifications/index.ts
diff --git a/src/notifications/types.ts b/src/notifications/types.ts
deleted file mode 100644
index ea46552947..0000000000
--- a/src/notifications/types.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-export enum NotificationSetting {
-    AllMessages = "all_messages", // .m.rule.message = notify
-    DirectMessagesMentionsKeywords = "dm_mentions_keywords", // .m.rule.message = mark_unread. This is the new default.
-    MentionsKeywordsOnly = "mentions_keywords", // .m.rule.message = mark_unread; .m.rule.room_one_to_one = mark_unread
-    Never = "never", // .m.rule.master = enabled (dont_notify)
-}
-
-export interface ISoundTweak {
-    // eslint-disable-next-line camelcase
-    set_tweak: "sound";
-    value: string;
-}
-export interface IHighlightTweak {
-    // eslint-disable-next-line camelcase
-    set_tweak: "highlight";
-    value?: boolean;
-}
-
-export type Tweak = ISoundTweak | IHighlightTweak;
-
-export enum Actions {
-    Notify = "notify",
-    DontNotify = "dont_notify", // no-op
-    Coalesce = "coalesce", // unused
-    MarkUnread = "mark_unread", // new
-}
-
-export type Action = Actions | Tweak;
-
-// Push rule kinds in descending priority order
-export enum Kind {
-    Override = "override",
-    ContentSpecific = "content",
-    RoomSpecific = "room",
-    SenderSpecific = "sender",
-    Underride = "underride",
-}
-
-export interface IEventMatchCondition {
-    kind: "event_match";
-    key: string;
-    pattern: string;
-}
-
-export interface IContainsDisplayNameCondition {
-    kind: "contains_display_name";
-}
-
-export interface IRoomMemberCountCondition {
-    kind: "room_member_count";
-    is: string;
-}
-
-export interface ISenderNotificationPermissionCondition {
-    kind: "sender_notification_permission";
-    key: string;
-}
-
-export type Condition =
-    IEventMatchCondition |
-    IContainsDisplayNameCondition |
-    IRoomMemberCountCondition |
-    ISenderNotificationPermissionCondition;
-
-export enum RuleIds {
-    MasterRule = ".m.rule.master", // The master rule (all notifications disabling)
-    MessageRule = ".m.rule.message",
-    EncryptedMessageRule = ".m.rule.encrypted",
-    RoomOneToOneRule = ".m.rule.room_one_to_one",
-    EncryptedRoomOneToOneRule = ".m.rule.room_one_to_one",
-}
-
-export interface IPushRule {
-    enabled: boolean;
-    // eslint-disable-next-line camelcase
-    rule_id: RuleIds | string;
-    actions: Action[];
-    default: boolean;
-    conditions?: Condition[]; // only applicable to `underride` and `override` rules
-    pattern?: string; // only applicable to `content` rules
-}
-
-// push rule extended with kind, used by ContentRules and js-sdk's pushprocessor
-export interface IExtendedPushRule extends IPushRule {
-    kind: Kind;
-}
-
-export interface IPushRuleSet {
-    override: IPushRule[];
-    content: IPushRule[];
-    room: IPushRule[];
-    sender: IPushRule[];
-    underride: IPushRule[];
-}
-
-export interface IRuleSets {
-    global: IPushRuleSet;
-}
diff --git a/src/performance/entry-names.ts b/src/performance/entry-names.ts
index effd9506f6..6cb193b1b1 100644
--- a/src/performance/entry-names.ts
+++ b/src/performance/entry-names.ts
@@ -37,17 +37,17 @@ export enum PerformanceEntryNames {
 
     SWITCH_ROOM = "mx_SwithRoom",
     JUMP_TO_ROOM = "mx_JumpToRoom",
-    JOIN_ROOM = "mx_JoinRoom",
-    CREATE_DM = "mx_CreateDM",
+    JOIN_ROOM = "mx_JoinRoom", // ✅
+    CREATE_DM = "mx_CreateDM", // ✅
     PEEK_ROOM = "mx_PeekRoom",
 
     /**
      * User
      */
 
-    VERIFY_E2EE_USER = "mx_VerifyE2EEUser",
-    LOGIN = "mx_Login",
-    REGISTER = "mx_Register",
+    VERIFY_E2EE_USER = "mx_VerifyE2EEUser", // ✅
+    LOGIN = "mx_Login", // ✅
+    REGISTER = "mx_Register", // ✅
 
     /**
      * VoIP
diff --git a/src/performance/index.ts b/src/performance/index.ts
index bfb5b4a9c7..cb808f9173 100644
--- a/src/performance/index.ts
+++ b/src/performance/index.ts
@@ -17,25 +17,25 @@ limitations under the License.
 import { PerformanceEntryNames } from "./entry-names";
 
 interface GetEntriesOptions {
-    name?: string,
-    type?: string,
+    name?: string;
+    type?: string;
 }
 
 type PerformanceCallbackFunction = (entry: PerformanceEntry[]) => void;
 
 interface PerformanceDataListener {
-    entryNames?: string[],
-    callback: PerformanceCallbackFunction
+    entryNames?: string[];
+    callback: PerformanceCallbackFunction;
 }
 
 export default class PerformanceMonitor {
     static _instance: PerformanceMonitor;
 
-    private START_PREFIX = "start:"
-    private STOP_PREFIX = "stop:"
+    private START_PREFIX = "start:";
+    private STOP_PREFIX = "stop:";
 
-    private listeners: PerformanceDataListener[] = []
-    private entries: PerformanceEntry[] = []
+    private listeners: PerformanceDataListener[] = [];
+    private entries: PerformanceEntry[] = [];
 
     public static get instance(): PerformanceMonitor {
         if (!PerformanceMonitor._instance) {
@@ -99,7 +99,7 @@ export default class PerformanceMonitor {
 
         this.listeners.forEach(listener => {
             if (this.shouldEmit(listener, measurement)) {
-                listener.callback([measurement])
+                listener.callback([measurement]);
             }
         });
 
@@ -167,11 +167,10 @@ export default class PerformanceMonitor {
     }
 }
 
-
 // Convenience exports
 export {
     PerformanceEntryNames,
-}
+};
 
 // Exposing those to the window object to bridge them from tests
 window.mxPerformanceMonitor = PerformanceMonitor.instance;
diff --git a/src/phonenumber.ts b/src/phonenumber.ts
index ea008cf2f0..51d12babed 100644
--- a/src/phonenumber.ts
+++ b/src/phonenumber.ts
@@ -42,7 +42,13 @@ export const getEmojiFlag = (countryCode: string) => {
     return String.fromCodePoint(...countryCode.split('').map(l => UNICODE_BASE + l.charCodeAt(0)));
 };
 
-export const COUNTRIES = [
+export interface PhoneNumberCountryDefinition {
+    iso2: string;
+    name: string;
+    prefix: string;
+}
+
+export const COUNTRIES: PhoneNumberCountryDefinition[] = [
     {
         "iso2": "GB",
         "name": _td("United Kingdom"),
diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.ts
similarity index 89%
rename from src/rageshake/rageshake.js
rename to src/rageshake/rageshake.ts
index 9512f62e42..acf77c31c0 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.ts
@@ -38,18 +38,18 @@ limitations under the License.
 //    purge on startup to prevent logs from accumulating.
 
 // the frequency with which we flush to indexeddb
+import { logger } from "matrix-js-sdk/src/logger";
+
 const FLUSH_RATE_MS = 30 * 1000;
 
 // the length of log data we keep in indexeddb (and include in the reports)
 const MAX_LOG_SIZE = 1024 * 1024 * 5; // 5 MB
 
 // A class which monkey-patches the global console and stores log lines.
-class ConsoleLogger {
-    constructor() {
-        this.logs = "";
-    }
+export class ConsoleLogger {
+    private logs = "";
 
-    monkeyPatch(consoleObj) {
+    public monkeyPatch(consoleObj: Console): void {
         // Monkey-patch console logging
         const consoleFunctionsToLevels = {
             log: "I",
@@ -67,14 +67,14 @@ class ConsoleLogger {
         });
     }
 
-    log(level, ...args) {
+    private log(level: string, ...args: (Error | DOMException | object | string)[]): void {
         // We don't know what locale the user may be running so use ISO strings
         const ts = new Date().toISOString();
 
         // Convert objects and errors to helpful things
         args = args.map((arg) => {
             if (arg instanceof DOMException) {
-                return arg.message + ` (${arg.name} | ${arg.code}) ` + (arg.stack ? `\n${arg.stack}` : '');
+                return arg.message + ` (${arg.name} | ${arg.code})`;
             } else if (arg instanceof Error) {
                 return arg.message + (arg.stack ? `\n${arg.stack}` : '');
             } else if (typeof (arg) === 'object') {
@@ -116,7 +116,7 @@ class ConsoleLogger {
      * @param {boolean} keepLogs True to not delete logs after flushing.
      * @return {string} \n delimited log lines to flush.
      */
-    flush(keepLogs) {
+    public flush(keepLogs?: boolean): string {
         // The ConsoleLogger doesn't care how these end up on disk, it just
         // flushes them to the caller.
         if (keepLogs) {
@@ -129,27 +129,28 @@ class ConsoleLogger {
 }
 
 // A class which stores log lines in an IndexedDB instance.
-class IndexedDBLogStore {
-    constructor(indexedDB, logger) {
-        this.indexedDB = indexedDB;
-        this.logger = logger;
-        this.id = "instance-" + Math.random() + Date.now();
-        this.index = 0;
-        this.db = null;
+export class IndexedDBLogStore {
+    private id: string;
+    private index = 0;
+    private db = null;
+    private flushPromise = null;
+    private flushAgainPromise = null;
 
-        // these promises are cleared as soon as fulfilled
-        this.flushPromise = null;
-        // set if flush() is called whilst one is ongoing
-        this.flushAgainPromise = null;
+    constructor(
+        private indexedDB: IDBFactory,
+        private logger: ConsoleLogger,
+    ) {
+        this.id = "instance-" + Math.random() + Date.now();
     }
 
     /**
      * @return {Promise} Resolves when the store is ready.
      */
-    connect() {
+    public connect(): Promise<void> {
         const req = this.indexedDB.open("logs");
         return new Promise((resolve, reject) => {
-            req.onsuccess = (event) => {
+            req.onsuccess = (event: Event) => {
+                // @ts-ignore
                 this.db = event.target.result;
                 // Periodically flush logs to local storage / indexeddb
                 setInterval(this.flush.bind(this), FLUSH_RATE_MS);
@@ -158,6 +159,7 @@ class IndexedDBLogStore {
 
             req.onerror = (event) => {
                 const err = (
+                    // @ts-ignore
                     "Failed to open log database: " + event.target.error.name
                 );
                 console.error(err);
@@ -166,6 +168,7 @@ class IndexedDBLogStore {
 
             // First time: Setup the object store
             req.onupgradeneeded = (event) => {
+                // @ts-ignore
                 const db = event.target.result;
                 const logObjStore = db.createObjectStore("logs", {
                     keyPath: ["id", "index"],
@@ -176,7 +179,7 @@ class IndexedDBLogStore {
                 logObjStore.createIndex("id", "id", { unique: false });
 
                 logObjStore.add(
-                    this._generateLogEntry(
+                    this.generateLogEntry(
                         new Date() + " ::: Log database was created.",
                     ),
                 );
@@ -184,7 +187,7 @@ class IndexedDBLogStore {
                 const lastModifiedStore = db.createObjectStore("logslastmod", {
                     keyPath: "id",
                 });
-                lastModifiedStore.add(this._generateLastModifiedTime());
+                lastModifiedStore.add(this.generateLastModifiedTime());
             };
         });
     }
@@ -208,7 +211,7 @@ class IndexedDBLogStore {
      *
      * @return {Promise} Resolved when the logs have been flushed.
      */
-    flush() {
+    public flush(): Promise<void> {
         // check if a flush() operation is ongoing
         if (this.flushPromise) {
             if (this.flushAgainPromise) {
@@ -225,7 +228,7 @@ class IndexedDBLogStore {
         }
         // there is no flush promise or there was but it has finished, so do
         // a brand new one, destroying the chain which may have been built up.
-        this.flushPromise = new Promise((resolve, reject) => {
+        this.flushPromise = new Promise<void>((resolve, reject) => {
             if (!this.db) {
                 // not connected yet or user rejected access for us to r/w to the db.
                 reject(new Error("No connected database"));
@@ -249,9 +252,9 @@ class IndexedDBLogStore {
                     new Error("Failed to write logs: " + event.target.errorCode),
                 );
             };
-            objStore.add(this._generateLogEntry(lines));
+            objStore.add(this.generateLogEntry(lines));
             const lastModStore = txn.objectStore("logslastmod");
-            lastModStore.put(this._generateLastModifiedTime());
+            lastModStore.put(this.generateLastModifiedTime());
         }).then(() => {
             this.flushPromise = null;
         });
@@ -268,12 +271,12 @@ class IndexedDBLogStore {
      * log ID). The objects have said log ID in an "id" field and "lines" which
      * is a big string with all the new-line delimited logs.
      */
-    async consume() {
+    public async consume(): Promise<{lines: string, id: string}[]> {
         const db = this.db;
 
         // Returns: a string representing the concatenated logs for this ID.
         // Stops adding log fragments when the size exceeds maxSize
-        function fetchLogs(id, maxSize) {
+        function fetchLogs(id: string, maxSize: number): Promise<string> {
             const objectStore = db.transaction("logs", "readonly").objectStore("logs");
 
             return new Promise((resolve, reject) => {
@@ -299,7 +302,7 @@ class IndexedDBLogStore {
         }
 
         // Returns: A sorted array of log IDs. (newest first)
-        function fetchLogIds() {
+        function fetchLogIds(): Promise<string[]> {
             // To gather all the log IDs, query for all records in logslastmod.
             const o = db.transaction("logslastmod", "readonly").objectStore(
                 "logslastmod",
@@ -317,8 +320,8 @@ class IndexedDBLogStore {
             });
         }
 
-        function deleteLogs(id) {
-            return new Promise((resolve, reject) => {
+        function deleteLogs(id: number): Promise<void> {
+            return new Promise<void>((resolve, reject) => {
                 const txn = db.transaction(
                     ["logs", "logslastmod"], "readwrite",
                 );
@@ -375,11 +378,11 @@ class IndexedDBLogStore {
             }
         }
         if (removeLogIds.length > 0) {
-            console.log("Removing logs: ", removeLogIds);
+            logger.log("Removing logs: ", removeLogIds);
             // Don't await this because it's non-fatal if we can't clean up
             // logs.
             Promise.all(removeLogIds.map((id) => deleteLogs(id))).then(() => {
-                console.log(`Removed ${removeLogIds.length} old logs.`);
+                logger.log(`Removed ${removeLogIds.length} old logs.`);
             }, (err) => {
                 console.error(err);
             });
@@ -387,7 +390,7 @@ class IndexedDBLogStore {
         return logs;
     }
 
-    _generateLogEntry(lines) {
+    private generateLogEntry(lines: string): {id: string, lines: string, index: number} {
         return {
             id: this.id,
             lines: lines,
@@ -395,7 +398,7 @@ class IndexedDBLogStore {
         };
     }
 
-    _generateLastModifiedTime() {
+    private generateLastModifiedTime(): {id: string, ts: number} {
         return {
             id: this.id,
             ts: Date.now(),
@@ -413,15 +416,19 @@ class IndexedDBLogStore {
  * @return {Promise<T[]>} Resolves to an array of whatever you returned from
  * resultMapper.
  */
-function selectQuery(store, keyRange, resultMapper) {
+function selectQuery<T>(
+    store: IDBIndex, keyRange: IDBKeyRange, resultMapper: (cursor: IDBCursorWithValue) => T,
+): Promise<T[]> {
     const query = store.openCursor(keyRange);
     return new Promise((resolve, reject) => {
         const results = [];
         query.onerror = (event) => {
+            // @ts-ignore
             reject(new Error("Query failed: " + event.target.errorCode));
         };
         // collect results
         query.onsuccess = (event) => {
+            // @ts-ignore
             const cursor = event.target.result;
             if (!cursor) {
                 resolve(results);
@@ -440,7 +447,7 @@ function selectQuery(store, keyRange, resultMapper) {
  * be set up immediately for the logs.
  * @return {Promise} Resolves when set up.
  */
-export function init(setUpPersistence = true) {
+export function init(setUpPersistence = true): Promise<void> {
     if (global.mx_rage_initPromise) {
         return global.mx_rage_initPromise;
     }
@@ -460,12 +467,12 @@ export function init(setUpPersistence = true) {
  * then this no-ops.
  * @return {Promise} Resolves when complete.
  */
-export function tryInitStorage() {
+export function tryInitStorage(): Promise<void> {
     if (global.mx_rage_initStoragePromise) {
         return global.mx_rage_initStoragePromise;
     }
 
-    console.log("Configuring rageshake persistence...");
+    logger.log("Configuring rageshake persistence...");
 
     // just *accessing* indexedDB throws an exception in firefox with
     // indexeddb disabled.
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index b2ad9fe6f6..11f19a1ad2 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -18,21 +18,17 @@ limitations under the License.
 
 import pako from 'pako';
 
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import PlatformPeg from '../PlatformPeg';
 import { _t } from '../languageHandler';
 import Tar from "tar-js";
 
 import * as rageshake from './rageshake';
 
-// polyfill textencoder if necessary
-import * as TextEncodingUtf8 from 'text-encoding-utf-8';
 import SettingsStore from "../settings/SettingsStore";
 import SdkConfig from "../SdkConfig";
-let TextEncoder = window.TextEncoder;
-if (!TextEncoder) {
-    TextEncoder = TextEncodingUtf8.TextEncoder;
-}
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IOpts {
     label?: string;
@@ -69,7 +65,7 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true) {
 
     const client = MatrixClientPeg.get();
 
-    console.log("Sending bug report.");
+    logger.log("Sending bug report.");
 
     const body = new FormData();
     body.append('text', opts.userText || "User did not supply any additional text.");
@@ -92,23 +88,23 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true) {
             body.append('cross_signing_key', client.getCrossSigningId());
 
             // add cross-signing status information
-            const crossSigning = client.crypto._crossSigningInfo;
-            const secretStorage = client.crypto._secretStorage;
+            const crossSigning = client.crypto.crossSigningInfo;
+            const secretStorage = client.crypto.secretStorage;
 
             body.append("cross_signing_ready", String(await client.isCrossSigningReady()));
             body.append("cross_signing_supported_by_hs",
                 String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")));
             body.append("cross_signing_key", crossSigning.getId());
-            body.append("cross_signing_pk_in_secret_storage",
+            body.append("cross_signing_privkey_in_secret_storage",
                 String(!!(await crossSigning.isStoredInSecretStorage(secretStorage))));
 
             const pkCache = client.getCrossSigningCacheCallbacks();
-            body.append("cross_signing_master_pk_cached",
-                String(!!(pkCache && await pkCache.getCrossSigningKeyCache("master"))));
-            body.append("cross_signing_self_signing_pk_cached",
-                String(!!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"))));
-            body.append("cross_signing_user_signing_pk_cached",
-                String(!!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"))));
+            body.append("cross_signing_master_privkey_cached",
+                String(!!(pkCache && (await pkCache.getCrossSigningKeyCache("master")))));
+            body.append("cross_signing_self_signing_privkey_cached",
+                String(!!(pkCache && (await pkCache.getCrossSigningKeyCache("self_signing")))));
+            body.append("cross_signing_user_signing_privkey_cached",
+                String(!!(pkCache && (await pkCache.getCrossSigningKeyCache("user_signing")))));
 
             body.append("secret_storage_ready", String(await client.isSecretStorageReady()));
             body.append("secret_storage_key_in_account", String(!!(await secretStorage.hasKey())));
@@ -209,7 +205,7 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
     const body = await collectBugReport(opts);
 
     progressCallback(_t("Uploading logs"));
-    await _submitReport(bugReportEndpoint, body, progressCallback);
+    await submitReport(bugReportEndpoint, body, progressCallback);
 }
 
 /**
@@ -269,7 +265,13 @@ function uint8ToString(buf: Buffer) {
     return out;
 }
 
-export async function submitFeedback(endpoint: string, label: string, comment: string, canContact = false) {
+export async function submitFeedback(
+    endpoint: string,
+    label: string,
+    comment: string,
+    canContact = false,
+    extraData: Record<string, string> = {},
+) {
     let version = "UNKNOWN";
     try {
         version = await PlatformPeg.get().getAppVersion();
@@ -285,10 +287,14 @@ export async function submitFeedback(endpoint: string, label: string, comment: s
     body.append("platform", PlatformPeg.get().getHumanReadableName());
     body.append("user_id", MatrixClientPeg.get()?.getUserId());
 
-    await _submitReport(SdkConfig.get().bug_report_endpoint_url, body, () => {});
+    for (const k in extraData) {
+        body.append(k, extraData[k]);
+    }
+
+    await submitReport(SdkConfig.get().bug_report_endpoint_url, body, () => {});
 }
 
-function _submitReport(endpoint: string, body: FormData, progressCallback: (string) => void) {
+function submitReport(endpoint: string, body: FormData, progressCallback: (str: string) => void) {
     return new Promise<void>((resolve, reject) => {
         const req = new XMLHttpRequest();
         req.open("POST", endpoint);
diff --git a/src/ratelimitedfunc.js b/src/ratelimitedfunc.js
deleted file mode 100644
index 3df3db615e..0000000000
--- a/src/ratelimitedfunc.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/**
- * 'debounces' a function to only execute every n milliseconds.
- * Useful when react-sdk gets many, many events but only wants
- * to update the interface once for all of them.
- *
- * Note that the function must not take arguments, since the args
- * could be different for each invocation of the function.
- *
- * The returned function has a 'cancelPendingCall' property which can be called
- * on unmount or similar to cancel any pending update.
- */
-
-import {throttle} from "lodash";
-
-export default function ratelimitedfunc(fn, time) {
-    const throttledFn = throttle(fn, time, {
-        leading: true,
-        trailing: true,
-    });
-    const _bind = throttledFn.bind;
-    throttledFn.bind = function() {
-        const boundFn = _bind.apply(throttledFn, arguments);
-        boundFn.cancelPendingCall = throttledFn.cancelPendingCall;
-        return boundFn;
-    };
-
-    throttledFn.cancelPendingCall = function() {
-        throttledFn.cancel();
-    };
-    return throttledFn;
-}
diff --git a/src/resizer/distributors/collapse.ts b/src/resizer/distributors/collapse.ts
index f8db0be52c..1cef94976d 100644
--- a/src/resizer/distributors/collapse.ts
+++ b/src/resizer/distributors/collapse.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import FixedDistributor from "./fixed";
 import ResizeItem from "../item";
-import Resizer, {IConfig} from "../resizer";
+import Resizer, { IConfig } from "../resizer";
 import Sizer from "../sizer";
 
 export interface ICollapseConfig extends IConfig {
@@ -40,8 +40,13 @@ class CollapseItem extends ResizeItem<ICollapseConfig> {
 }
 
 export default class CollapseDistributor extends FixedDistributor<ICollapseConfig, CollapseItem> {
-    static createItem(resizeHandle: HTMLDivElement, resizer: Resizer<ICollapseConfig>, sizer: Sizer) {
-        return new CollapseItem(resizeHandle, resizer, sizer);
+    static createItem(
+        resizeHandle: HTMLDivElement,
+        resizer: Resizer<ICollapseConfig>,
+        sizer: Sizer,
+        container?: HTMLElement,
+    ): CollapseItem {
+        return new CollapseItem(resizeHandle, resizer, sizer, container);
     }
 
     private readonly toggleSize: number;
@@ -55,12 +60,9 @@ export default class CollapseDistributor extends FixedDistributor<ICollapseConfi
 
     public resize(newSize: number) {
         const isCollapsedSize = newSize < this.toggleSize;
-        if (isCollapsedSize && !this.isCollapsed) {
-            this.isCollapsed = true;
-            this.item.notifyCollapsed(true);
-        } else if (!isCollapsedSize && this.isCollapsed) {
-            this.item.notifyCollapsed(false);
-            this.isCollapsed = false;
+        if (isCollapsedSize !== this.isCollapsed) {
+            this.isCollapsed = isCollapsedSize;
+            this.item.notifyCollapsed(isCollapsedSize);
         }
         if (!isCollapsedSize) {
             super.resize(newSize);
diff --git a/src/resizer/distributors/fixed.ts b/src/resizer/distributors/fixed.ts
index 64f1c5015b..bc2d876300 100644
--- a/src/resizer/distributors/fixed.ts
+++ b/src/resizer/distributors/fixed.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import ResizeItem from "../item";
 import Sizer from "../sizer";
-import Resizer, {IConfig} from "../resizer";
+import Resizer, { IConfig } from "../resizer";
 
 /**
 distributors translate a moving cursor into
diff --git a/src/resizer/distributors/percentage.ts b/src/resizer/distributors/percentage.ts
index e9b1425414..be3f759ec8 100644
--- a/src/resizer/distributors/percentage.ts
+++ b/src/resizer/distributors/percentage.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import Sizer from "../sizer";
 import FixedDistributor from "./fixed";
-import {IConfig} from "../resizer";
+import { IConfig } from "../resizer";
 
 class PercentageSizer extends Sizer {
     public start(item: HTMLElement) {
diff --git a/src/resizer/index.ts b/src/resizer/index.ts
index 9199fc2657..313579542f 100644
--- a/src/resizer/index.ts
+++ b/src/resizer/index.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export {default as FixedDistributor} from "./distributors/fixed";
-export {default as PercentageDistributor} from "./distributors/percentage";
-export {default as CollapseDistributor} from "./distributors/collapse";
-export {default as Resizer} from "./resizer";
+export { default as FixedDistributor } from "./distributors/fixed";
+export { default as PercentageDistributor } from "./distributors/percentage";
+export { default as CollapseDistributor } from "./distributors/collapse";
+export { default as Resizer } from "./resizer";
diff --git a/src/resizer/item.ts b/src/resizer/item.ts
index 3be290f15e..868cd8230f 100644
--- a/src/resizer/item.ts
+++ b/src/resizer/item.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Resizer, {IConfig} from "./resizer";
+import Resizer, { IConfig } from "./resizer";
 import Sizer from "./sizer";
 
 export default class ResizeItem<C extends IConfig = IConfig> {
@@ -26,15 +26,20 @@ export default class ResizeItem<C extends IConfig = IConfig> {
         handle: HTMLElement,
         public readonly resizer: Resizer<C>,
         public readonly sizer: Sizer,
+        public readonly container?: HTMLElement,
     ) {
         this.reverse = resizer.isReverseResizeHandle(handle);
-        this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
+        if (container) {
+            this.domNode = <HTMLElement>(container);
+        } else {
+            this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
+        }
         this.id = handle.getAttribute("data-id");
     }
 
-    private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer) {
+    private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer, container?: HTMLElement) {
         const Ctor = this.constructor as typeof ResizeItem;
-        return new Ctor(handle, resizer, sizer);
+        return new Ctor(handle, resizer, sizer, container);
     }
 
     private advance(forwards: boolean) {
diff --git a/src/resizer/resizer.ts b/src/resizer/resizer.ts
index c7c7edcd11..b090214312 100644
--- a/src/resizer/resizer.ts
+++ b/src/resizer/resizer.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {throttle} from "lodash";
+import { throttle } from "lodash";
 
 import FixedDistributor from "./distributors/fixed";
 import ResizeItem from "./item";
@@ -35,6 +35,7 @@ export interface IConfig {
     onResizeStart?(): void;
     onResizeStop?(): void;
     onResized?(size: number, id: string, element: HTMLElement): void;
+    handler?: HTMLDivElement;
 }
 
 export default class Resizer<C extends IConfig = IConfig> {
@@ -46,15 +47,20 @@ export default class Resizer<C extends IConfig = IConfig> {
         public container: HTMLElement,
         private readonly distributorCtor: {
             new(item: ResizeItem): FixedDistributor<C, any>;
-            createItem(resizeHandle: HTMLDivElement, resizer: Resizer, sizer: Sizer): ResizeItem;
-            createSizer(containerElement: HTMLElement, vertical: boolean, reverse: boolean): Sizer;
+            createItem(
+                resizeHandle: HTMLDivElement,
+                resizer: Resizer,
+                sizer: Sizer,
+                container: HTMLElement
+            ): ResizeItem;
+            createSizer(
+                containerElement: HTMLElement,
+                vertical: boolean,
+                reverse: boolean
+            ): Sizer;
         },
         public readonly config?: C,
     ) {
-        if (!container) {
-            throw new Error("Resizer requires a non-null `container` arg");
-        }
-
         this.classNames = {
             handle: "resizer-handle",
             reverse: "resizer-reverse",
@@ -68,12 +74,14 @@ export default class Resizer<C extends IConfig = IConfig> {
     }
 
     public attach() {
-        this.container.addEventListener("mousedown", this.onMouseDown, false);
+        const attachment = this?.config?.handler?.parentElement ?? this.container;
+        attachment.addEventListener("mousedown", this.onMouseDown, false);
         window.addEventListener("resize", this.onResize);
     }
 
     public detach() {
-        this.container.removeEventListener("mousedown", this.onMouseDown, false);
+        const attachment = this?.config?.handler?.parentElement ?? this.container;
+        attachment.removeEventListener("mousedown", this.onMouseDown, false);
         window.removeEventListener("resize", this.onResize);
     }
 
@@ -87,7 +95,7 @@ export default class Resizer<C extends IConfig = IConfig> {
         const handles = this.getResizeHandles();
         const handle = handles[handleIndex];
         if (handle) {
-            const {distributor} = this.createSizerAndDistributor(<HTMLDivElement>handle);
+            const { distributor } = this.createSizerAndDistributor(<HTMLDivElement>handle);
             return distributor;
         }
     }
@@ -96,7 +104,7 @@ export default class Resizer<C extends IConfig = IConfig> {
         const handles = this.getResizeHandles();
         const handle = handles.find((h) => h.getAttribute("data-id") === id);
         if (handle) {
-            const {distributor} = this.createSizerAndDistributor(<HTMLDivElement>handle);
+            const { distributor } = this.createSizerAndDistributor(<HTMLDivElement>handle);
             return distributor;
         }
     }
@@ -113,7 +121,8 @@ export default class Resizer<C extends IConfig = IConfig> {
         // use closest in case the resize handle contains
         // child dom nodes that can be the target
         const resizeHandle = event.target && (<HTMLDivElement>event.target).closest(`.${this.classNames.handle}`);
-        if (!resizeHandle || resizeHandle.parentElement !== this.container) {
+        const hasHandler = this?.config?.handler;
+        if (!resizeHandle || (!hasHandler && resizeHandle.parentElement !== this.container)) {
             return;
         }
         // prevent starting a drag operation
@@ -121,13 +130,13 @@ export default class Resizer<C extends IConfig = IConfig> {
 
         // mark as currently resizing
         if (this.classNames.resizing) {
-            this.container.classList.add(this.classNames.resizing);
+            this.container?.classList?.add(this.classNames.resizing);
         }
         if (this.config.onResizeStart) {
             this.config.onResizeStart();
         }
 
-        const {sizer, distributor} = this.createSizerAndDistributor(<HTMLDivElement>resizeHandle);
+        const { sizer, distributor } = this.createSizerAndDistributor(<HTMLDivElement>resizeHandle);
         distributor.start();
 
         const onMouseMove = (event) => {
@@ -138,7 +147,7 @@ export default class Resizer<C extends IConfig = IConfig> {
         const body = document.body;
         const finishResize = () => {
             if (this.classNames.resizing) {
-                this.container.classList.remove(this.classNames.resizing);
+                this.container?.classList?.remove(this.classNames.resizing);
             }
             distributor.finish();
             if (this.config.onResizeStop) {
@@ -159,11 +168,11 @@ export default class Resizer<C extends IConfig = IConfig> {
         // relax all items if they had any overconstrained flexboxes
         distributors.forEach(d => d.start());
         distributors.forEach(d => d.finish());
-    }, 100, {trailing: true, leading: true});
+    }, 100, { trailing: true, leading: true });
 
     public getDistributors = () => {
         return this.getResizeHandles().map(handle => {
-            const {distributor} = this.createSizerAndDistributor(<HTMLDivElement>handle);
+            const { distributor } = this.createSizerAndDistributor(<HTMLDivElement>handle);
             return distributor;
         });
     };
@@ -174,16 +183,18 @@ export default class Resizer<C extends IConfig = IConfig> {
         const vertical = resizeHandle.classList.contains(this.classNames.vertical);
         const reverse = this.isReverseResizeHandle(resizeHandle);
         const Distributor = this.distributorCtor;
+        const useItemContainer = this.config && this.config.handler ? this.container : undefined;
         const sizer = Distributor.createSizer(this.container, vertical, reverse);
-        const item = Distributor.createItem(resizeHandle, this, sizer);
+        const item = Distributor.createItem(resizeHandle, this, sizer, useItemContainer);
         const distributor = new Distributor(item);
-        return {sizer, distributor};
+        return { sizer, distributor };
     }
 
     private getResizeHandles() {
-        if (!this.container.children) return [];
-        return Array.from(this.container.children).filter(el => {
-            return this.isResizeHandle(<HTMLElement>el);
-        }) as HTMLElement[];
+        if (this?.config?.handler) {
+            return [this.config.handler];
+        }
+        if (!this.container?.children) return [];
+        return Array.from(this.container.querySelectorAll(`.${this.classNames.handle}`)) as HTMLElement[];
     }
 }
diff --git a/src/sendTimePerformanceMetrics.ts b/src/sendTimePerformanceMetrics.ts
new file mode 100644
index 0000000000..ee5caa05a9
--- /dev/null
+++ b/src/sendTimePerformanceMetrics.ts
@@ -0,0 +1,46 @@
+/*
+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 { MatrixClient } from "matrix-js-sdk/src";
+
+/**
+ * Decorates the given event content object with the "send start time". The
+ * object will be modified in-place.
+ * @param {object} content The event content.
+ */
+export function decorateStartSendingTime(content: object) {
+    content['io.element.performance_metrics'] = {
+        sendStartTs: Date.now(),
+    };
+}
+
+/**
+ * Called when an event decorated with `decorateStartSendingTime()` has been sent
+ * by the server (the client now knows the event ID).
+ * @param {MatrixClient} client The client to send as.
+ * @param {string} inRoomId The room ID where the original event was sent.
+ * @param {string} forEventId The event ID for the decorated event.
+ */
+export function sendRoundTripMetric(client: MatrixClient, inRoomId: string, forEventId: string) {
+    // noinspection JSIgnoredPromiseFromCall
+    client.sendEvent(inRoomId, 'io.element.performance_metric', {
+        "io.element.performance_metrics": {
+            forEventId: forEventId,
+            responseTs: Date.now(),
+            kind: 'send_time',
+        },
+    });
+}
diff --git a/src/sentry.ts b/src/sentry.ts
new file mode 100644
index 0000000000..2a68442e5d
--- /dev/null
+++ b/src/sentry.ts
@@ -0,0 +1,229 @@
+/*
+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 Sentry from "@sentry/browser";
+import PlatformPeg from "./PlatformPeg";
+import SdkConfig from "./SdkConfig";
+import { MatrixClientPeg } from "./MatrixClientPeg";
+import SettingsStore from "./settings/SettingsStore";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+/* eslint-disable camelcase */
+
+type StorageContext = {
+    storageManager_persisted?: string;
+    storageManager_quota?: string;
+    storageManager_usage?: string;
+    storageManager_usageDetails?: string;
+};
+
+type UserContext = {
+    username: string;
+    enabled_labs: string;
+    low_bandwidth: string;
+};
+
+type CryptoContext = {
+    device_keys?: string;
+    cross_signing_ready?: string;
+    cross_signing_supported_by_hs?: string;
+    cross_signing_key?: string;
+    cross_signing_privkey_in_secret_storage?: string;
+    cross_signing_master_privkey_cached?: string;
+    cross_signing_user_signing_privkey_cached?: string;
+    secret_storage_ready?: string;
+    secret_storage_key_in_account?: string;
+    session_backup_key_in_secret_storage?: string;
+    session_backup_key_cached?: string;
+    session_backup_key_well_formed?: string;
+};
+
+type DeviceContext = {
+    device_id: string;
+    mx_local_settings: string;
+    modernizr_missing_features?: string;
+};
+
+type Contexts = {
+    user: UserContext;
+    crypto: CryptoContext;
+    device: DeviceContext;
+    storage: StorageContext;
+};
+
+/* eslint-enable camelcase */
+
+async function getStorageContext(): Promise<StorageContext> {
+    const result = {};
+
+    // add storage persistence/quota information
+    if (navigator.storage && navigator.storage.persisted) {
+        try {
+            result["storageManager_persisted"] = String(await navigator.storage.persisted());
+        } catch (e) {}
+    } else if (document.hasStorageAccess) { // Safari
+        try {
+            result["storageManager_persisted"] = String(await document.hasStorageAccess());
+        } catch (e) {}
+    }
+    if (navigator.storage && navigator.storage.estimate) {
+        try {
+            const estimate = await navigator.storage.estimate();
+            result["storageManager_quota"] = String(estimate.quota);
+            result["storageManager_usage"] = String(estimate.usage);
+            if (estimate.usageDetails) {
+                const usageDetails = [];
+                Object.keys(estimate.usageDetails).forEach(k => {
+                    usageDetails.push(`${k}: ${String(estimate.usageDetails[k])}`);
+                });
+                result[`storageManager_usage`] = usageDetails.join(", ");
+            }
+        } catch (e) {}
+    }
+
+    return result;
+}
+
+function getUserContext(client: MatrixClient): UserContext {
+    return {
+        "username": client.credentials.userId,
+        "enabled_labs": getEnabledLabs(),
+        "low_bandwidth": SettingsStore.getValue("lowBandwidth") ? "enabled" : "disabled",
+    };
+}
+
+function getEnabledLabs(): string {
+    const enabledLabs = SettingsStore.getFeatureSettingNames().filter(f => SettingsStore.getValue(f));
+    if (enabledLabs.length) {
+        return enabledLabs.join(", ");
+    }
+    return "";
+}
+
+async function getCryptoContext(client: MatrixClient): Promise<CryptoContext> {
+    if (!client.isCryptoEnabled()) {
+        return {};
+    }
+    const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
+    if (client.getDeviceCurve25519Key) {
+        keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+    }
+    const crossSigning = client.crypto.crossSigningInfo;
+    const secretStorage = client.crypto.secretStorage;
+    const pkCache = client.getCrossSigningCacheCallbacks();
+    const sessionBackupKeyFromCache = await client.crypto.getSessionBackupPrivateKey();
+
+    return {
+        "device_keys": keys.join(', '),
+        "cross_signing_ready": String(await client.isCrossSigningReady()),
+        "cross_signing_supported_by_hs":
+            String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")),
+        "cross_signing_key": crossSigning.getId(),
+        "cross_signing_privkey_in_secret_storage": String(
+            !!(await crossSigning.isStoredInSecretStorage(secretStorage))),
+        "cross_signing_master_privkey_cached": String(
+            !!(pkCache && (await pkCache.getCrossSigningKeyCache("master")))),
+        "cross_signing_user_signing_privkey_cached": String(
+            !!(pkCache && (await pkCache.getCrossSigningKeyCache("user_signing")))),
+        "secret_storage_ready": String(await client.isSecretStorageReady()),
+        "secret_storage_key_in_account": String(!!(await secretStorage.hasKey())),
+        "session_backup_key_in_secret_storage": String(!!(await client.isKeyBackupKeyStored())),
+        "session_backup_key_cached": String(!!sessionBackupKeyFromCache),
+        "session_backup_key_well_formed": String(sessionBackupKeyFromCache instanceof Uint8Array),
+    };
+}
+
+function getDeviceContext(client: MatrixClient): DeviceContext {
+    const result = {
+        "device_id": client?.deviceId,
+        "mx_local_settings": localStorage.getItem('mx_local_settings'),
+    };
+
+    if (window.Modernizr) {
+        const missingFeatures = Object.keys(window.Modernizr).filter(key => window.Modernizr[key] === false);
+        if (missingFeatures.length > 0) {
+            result["modernizr_missing_features"] = missingFeatures.join(", ");
+        }
+    }
+
+    return result;
+}
+
+async function getContexts(): Promise<Contexts> {
+    const client = MatrixClientPeg.get();
+    return {
+        "user": getUserContext(client),
+        "crypto": await getCryptoContext(client),
+        "device": getDeviceContext(client),
+        "storage": await getStorageContext(),
+    };
+}
+
+export async function sendSentryReport(userText: string, issueUrl: string, error: Error): Promise<void> {
+    const sentryConfig = SdkConfig.get()["sentry"];
+    if (!sentryConfig) return;
+
+    const captureContext = {
+        "contexts": await getContexts(),
+        "extra": {
+            "user_text": userText,
+            "issue_url": issueUrl,
+        },
+    };
+
+    // If there's no error and no issueUrl, the report will just produce non-grouped noise in Sentry, so don't
+    // upload it
+    if (error) {
+        Sentry.captureException(error, captureContext);
+    } else if (issueUrl) {
+        Sentry.captureMessage(`Issue: ${issueUrl}`, captureContext);
+    }
+}
+
+interface ISentryConfig {
+    dsn: string;
+    environment?: string;
+}
+
+export async function initSentry(sentryConfig: ISentryConfig): Promise<void> {
+    if (!sentryConfig) return;
+    const platform = PlatformPeg.get();
+    let appVersion = "unknown";
+    try {
+        appVersion = await platform.getAppVersion();
+    } catch (e) {}
+
+    Sentry.init({
+        dsn: sentryConfig.dsn,
+        release: `${platform.getHumanReadableName()}@${appVersion}`,
+        environment: sentryConfig.environment,
+        defaultIntegrations: false,
+        autoSessionTracking: false,
+        debug: true,
+        integrations: [
+            // specifically disable Integrations.GlobalHandlers, which hooks uncaught exceptions - we don't
+            // want to capture those at this stage, just explicit rageshakes
+            new Sentry.Integrations.InboundFilters(),
+            new Sentry.Integrations.FunctionToString(),
+            new Sentry.Integrations.Breadcrumbs(),
+            new Sentry.Integrations.UserAgent(),
+            new Sentry.Integrations.Dedupe(),
+        ],
+        // Set to 1.0 which is reasonable if we're only submitting Rageshakes; will need to be set < 1.0
+        // if we collect more frequently.
+        tracesSampleRate: 1.0,
+    });
+}
diff --git a/src/settings/Layout.ts b/src/settings/Layout.ts
index 3a42b2b510..d4e1f06c0a 100644
--- a/src/settings/Layout.ts
+++ b/src/settings/Layout.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+Copyright 2021 Quirin Götz <codeworks@supercable.onl>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,8 @@ import PropTypes from 'prop-types';
 /* TODO: This should be later reworked into something more generic */
 export enum Layout {
     IRC = "irc",
-    Group = "group"
+    Group = "group",
+    Bubble = "bubble",
 }
 
 /* We need this because multiple components are still using JavaScript */
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 155d039572..9fba69a63b 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-Copyright 2018, 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 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.
@@ -16,9 +16,9 @@ limitations under the License.
 */
 
 import { MatrixClient } from 'matrix-js-sdk/src/client';
-import React, { ReactNode } from "react";
+import { ReactNode } from "react";
 
-import { _t, _td } from '../languageHandler';
+import { _td } from '../languageHandler';
 import {
     NotificationBodyEnabledController,
     NotificationsEnabledController,
@@ -40,7 +40,8 @@ import { OrderedMultiController } from "./controllers/OrderedMultiController";
 import { Layout } from "./Layout";
 import ReducedMotionController from './controllers/ReducedMotionController';
 import IncompatibleController from "./controllers/IncompatibleController";
-import SdkConfig from "../SdkConfig";
+import PseudonymousAnalyticsController from './controllers/PseudonymousAnalyticsController';
+import NewLayoutSwitcherController from './controllers/NewLayoutSwitcherController';
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = [
@@ -94,6 +95,9 @@ export interface ISetting {
         [level: SettingLevel]: string;
     };
 
+    // Optional description which will be shown as microCopy under SettingsFlags
+    description?: string;
+
     // The supported levels are required. Preferably, use the preset arrays
     // at the top of this file to define this rather than a custom array.
     supportedLevels?: SettingLevel[];
@@ -120,6 +124,7 @@ export interface ISetting {
     // not use this for new settings.
     invertedSettingName?: string;
 
+    // XXX: Keep this around for re-use in future Betas
     betaInfo?: {
         title: string; // _td
         caption: string; // _td
@@ -127,47 +132,17 @@ export interface ISetting {
         image: string; // require(...)
         feedbackSubheading?: string;
         feedbackLabel?: string;
+        extraSettings?: string[];
     };
 }
 
 export const SETTINGS: {[setting: string]: ISetting} = {
-    "feature_spaces": {
+    "feature_report_to_moderators": {
         isFeature: true,
-        displayName: _td("Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. " +
-            "Requires compatible homeserver for some features."),
+        displayName: _td("Report to moderators prototype. " +
+            "In rooms that support moderation, the `report` button will let you report abuse to room moderators"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
-        controller: new ReloadOnChangeController(),
-        betaInfo: {
-            title: _td("Spaces"),
-            caption: _td("Spaces are a new way to group rooms and people."),
-            disclaimer: (enabled) => {
-                if (enabled) {
-                    return <>
-                        <p>{ _t("If you leave, %(brand)s will reload with Spaces disabled. " +
-                            "Communities and custom tags will be visible again.", {
-                            brand: SdkConfig.get().brand,
-                        }) }</p>
-                        <p>{ _t("Beta available for web, desktop and Android. Thank you for trying the beta.") }</p>
-                    </>;
-                }
-
-                return <>
-                    <p>{ _t("%(brand)s will reload with Spaces enabled. " +
-                        "Communities and custom tags will be hidden.", {
-                        brand: SdkConfig.get().brand,
-                    }) }</p>
-                    <b>{ _t("You can leave the beta any time from settings or tapping on a beta badge, " +
-                        "like the one above.") }</b>
-                    <p>{ _t("Beta available for web, desktop and Android. " +
-                        "Some features may be unavailable on your homeserver.") }</p>
-                </>;
-            },
-            image: require("../../res/img/betas/spaces.png"),
-            feedbackSubheading: _td("Your feedback will help make spaces better. " +
-                "The more detail you can go into, the better."),
-            feedbackLabel: "spaces-feedback",
-        },
     },
     "feature_dnd": {
         isFeature: true,
@@ -175,12 +150,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "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"),
@@ -195,7 +164,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         ),
         supportedLevels: LEVELS_FEATURE,
         default: false,
-        controller: new IncompatibleController("feature_spaces"),
+        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", false, false),
     },
     "feature_pinning": {
         isFeature: true,
@@ -203,6 +172,15 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_thread": {
+        isFeature: true,
+        // Requires a reload as we change an option flag on the `js-sdk`
+        // And the entire sync history needs to be parsed again
+        controller: new ReloadOnChangeController(),
+        displayName: _td("Threaded messaging"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_custom_status": {
         isFeature: true,
         displayName: _td("Custom user status messages"),
@@ -215,7 +193,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Group & filter rooms by custom tags (refresh to apply changes)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
-        controller: new IncompatibleController("feature_spaces"),
+        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", false, false),
     },
     "feature_state_counters": {
         isFeature: true,
@@ -225,7 +203,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "feature_many_integration_managers": {
         isFeature: true,
-        displayName: _td("Multiple integration managers"),
+        displayName: _td("Multiple integration managers (requires manual setup)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
@@ -261,11 +239,12 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "advancedRoomListLogging": {
-        // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
-        displayName: _td("Enable advanced debugging for the room list"),
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+    "feature_pseudonymous_analytics_opt_in": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td('Send pseudonymous analytics data'),
         default: false,
+        controller: new PseudonymousAnalyticsController(),
     },
     "doNotDisturb": {
         supportedLevels: [SettingLevel.DEVICE],
@@ -285,10 +264,24 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
+    "feature_new_layout_switcher": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("New layout switcher (with message bubbles)"),
+        default: false,
+        controller: new NewLayoutSwitcherController(),
+    },
     "RoomList.backgroundImage": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: null,
     },
+    "feature_hidden_read_receipts": {
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td(
+            "Don't send read receipts",
+        ),
+        default: false,
+    },
     "baseFontSize": {
         displayName: _td("Font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -361,9 +354,14 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td('Always show message timestamps'),
         default: false,
     },
-    "autoplayGifsAndVideos": {
+    "autoplayGifs": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Autoplay GIFs and videos'),
+        displayName: _td('Autoplay GIFs'),
+        default: false,
+    },
+    "autoplayVideo": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Autoplay videos'),
         default: false,
     },
     "enableSyntaxHighlightLanguageDetection": {
@@ -419,7 +417,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "ctrlFForSearch": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: isMac ? _td("Use Command + F to search") : _td("Use Ctrl + F to search"),
+        displayName: isMac ? _td("Use Command + F to search timeline") : _td("Use Ctrl + F to search timeline"),
         default: false,
     },
     "MessageComposerInput.ctrlEnterToSend": {
@@ -427,6 +425,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: isMac ? _td("Use Command + Enter to send a message") : _td("Use Ctrl + Enter to send a message"),
         default: false,
     },
+    "MessageComposerInput.surroundWith": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Surround selected text when typing special characters"),
+        default: false,
+    },
     "MessageComposerInput.autoReplaceEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Automatically replace plain text Emoji'),
@@ -570,14 +573,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: false,
         controller: new UIFeatureController(UIFeature.URLPreviews),
     },
-    "roomColor": {
-        supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
-        displayName: _td("Room Colour"),
-        default: {
-            primary_color: null, // Hex string, eg: #000000
-            secondary_color: null, // Hex string, eg: #000000
-        },
-    },
     "notificationsEnabled": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: false,
@@ -642,7 +637,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "lowBandwidth": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        displayName: _td('Low bandwidth mode'),
+        displayName: _td('Low bandwidth mode (requires compatible homeserver)'),
         default: false,
         controller: new ReloadOnChangeController(),
     },
@@ -725,6 +720,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: true,
         controller: new ReducedMotionController(),
     },
+    "Performance.addSendMessageTimingMetadata": {
+        supportedLevels: [SettingLevel.CONFIG],
+        default: false,
+    },
     "Widgets.pinned": { // deprecated
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
         default: {},
@@ -737,6 +736,21 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: null,
     },
+    "Spaces.allRoomsInHome": {
+        displayName: _td("Show all rooms in Home"),
+        description: _td("All rooms you're in will appear in Home."),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: false,
+        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", null),
+    },
+    "showCommunitiesInsteadOfSpaces": {
+        displayName: _td("Display Communities instead of Spaces"),
+        description: _td("Temporarily show communities instead of Spaces for this session. " +
+            "Support for this will be removed in the near future. This will reload Element."),
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
+        default: false,
+        controller: new ReloadOnChangeController(),
+    },
     [UIFeature.RoomHistorySettings]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
@@ -784,7 +798,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     [UIFeature.IdentityServer]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
-        // Identity Server (Discovery) Settings make no sense if 3PIDs in general are hidden
+        // Identity server (discovery) settings make no sense if 3PIDs in general are hidden
         controller: new UIFeatureController(UIFeature.ThirdPartyID),
     },
     [UIFeature.ThirdPartyID]: {
@@ -800,7 +814,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     [UIFeature.Communities]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
-        controller: new IncompatibleController("feature_spaces"),
+        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", false, false),
     },
     [UIFeature.AdvancedSettings]: {
         supportedLevels: LEVELS_UI_FEATURE,
diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts
index e1e300e185..af858d2379 100644
--- a/src/settings/SettingsStore.ts
+++ b/src/settings/SettingsStore.ts
@@ -29,6 +29,10 @@ import LocalEchoWrapper from "./handlers/LocalEchoWrapper";
 import { WatchManager, CallbackFn as WatchCallbackFn } from "./WatchManager";
 import { SettingLevel } from "./SettingLevel";
 import SettingsHandler from "./handlers/SettingsHandler";
+import { SettingUpdatedPayload } from "../dispatcher/payloads/SettingUpdatedPayload";
+import { Action } from "../dispatcher/actions";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const defaultWatchManager = new WatchManager();
 
@@ -147,7 +151,7 @@ export default class SettingsStore {
      * if the change in value is worthwhile enough to react upon.
      * @returns {string} A reference to the watcher that was employed.
      */
-    public static watchSetting(settingName: string, roomId: string, callbackFn: CallbackFn): string {
+    public static watchSetting(settingName: string, roomId: string | null, callbackFn: CallbackFn): string {
         const setting = SETTINGS[settingName];
         const originalSettingName = settingName;
         if (!setting) throw new Error(`${settingName} is not a setting`);
@@ -193,7 +197,7 @@ export default class SettingsStore {
      * @param {string} settingName The setting name to monitor.
      * @param {String} roomId The room ID to monitor for changes in. Use null for all rooms.
      */
-    public static monitorSetting(settingName: string, roomId: string) {
+    public static monitorSetting(settingName: string, roomId: string | null) {
         roomId = roomId || null; // the thing wants null specifically to work, so appease it.
 
         if (!this.monitors.has(settingName)) this.monitors.set(settingName, new Map());
@@ -201,8 +205,8 @@ export default class SettingsStore {
         const registerWatcher = () => {
             this.monitors.get(settingName).set(roomId, SettingsStore.watchSetting(
                 settingName, roomId, (settingName, inRoomId, level, newValueAtLevel, newValue) => {
-                    dis.dispatch({
-                        action: 'setting_updated',
+                    dis.dispatch<SettingUpdatedPayload>({
+                        action: Action.SettingUpdated,
                         settingName,
                         roomId: inRoomId,
                         level,
@@ -248,6 +252,16 @@ export default class SettingsStore {
         return _t(displayName as string);
     }
 
+    /**
+     * Gets the translated description for a given setting
+     * @param {string} settingName The setting to look up.
+     * @return {String} The description for the setting, or null if not found.
+     */
+    public static getDescription(settingName: string) {
+        if (!SETTINGS[settingName]?.description) return null;
+        return _t(SETTINGS[settingName].description);
+    }
+
     /**
      * Determines if a setting is also a feature.
      * @param {string} settingName The setting to look up.
@@ -455,6 +469,10 @@ export default class SettingsStore {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
         }
 
+        if (!SettingsStore.isEnabled(settingName)) {
+            return false;
+        }
+
         // When non-beta features are specified in the config.json, we force them as enabled or disabled.
         if (SettingsStore.isFeature(settingName) && !SETTINGS[settingName]?.betaInfo) {
             const configVal = SettingsStore.getValueAt(SettingLevel.CONFIG, settingName, roomId, true, true);
@@ -511,16 +529,16 @@ export default class SettingsStore {
      * @param {string} roomId Optional room ID to test the setting in.
      */
     public static debugSetting(realSettingName: string, roomId: string) {
-        console.log(`--- DEBUG ${realSettingName}`);
+        logger.log(`--- DEBUG ${realSettingName}`);
 
         // Note: we intentionally use JSON.stringify here to avoid the console masking the
         // problem if there's a type representation issue. Also, this way it is guaranteed
         // to show up in a rageshake if required.
 
         const def = SETTINGS[realSettingName];
-        console.log(`--- definition: ${def ? JSON.stringify(def) : '<NOT_FOUND>'}`);
-        console.log(`--- default level order: ${JSON.stringify(LEVEL_ORDER)}`);
-        console.log(`--- registered handlers: ${JSON.stringify(Object.keys(LEVEL_HANDLERS))}`);
+        logger.log(`--- definition: ${def ? JSON.stringify(def) : '<NOT_FOUND>'}`);
+        logger.log(`--- default level order: ${JSON.stringify(LEVEL_ORDER)}`);
+        logger.log(`--- registered handlers: ${JSON.stringify(Object.keys(LEVEL_HANDLERS))}`);
 
         const doChecks = (settingName) => {
             for (const handlerName of Object.keys(LEVEL_HANDLERS)) {
@@ -528,40 +546,40 @@ export default class SettingsStore {
 
                 try {
                     const value = handler.getValue(settingName, roomId);
-                    console.log(`---     ${handlerName}@${roomId || '<no_room>'} = ${JSON.stringify(value)}`);
+                    logger.log(`---     ${handlerName}@${roomId || '<no_room>'} = ${JSON.stringify(value)}`);
                 } catch (e) {
-                    console.log(`---     ${handler}@${roomId || '<no_room>'} THREW ERROR: ${e.message}`);
+                    logger.log(`---     ${handler}@${roomId || '<no_room>'} THREW ERROR: ${e.message}`);
                     console.error(e);
                 }
 
                 if (roomId) {
                     try {
                         const value = handler.getValue(settingName, null);
-                        console.log(`---     ${handlerName}@<no_room> = ${JSON.stringify(value)}`);
+                        logger.log(`---     ${handlerName}@<no_room> = ${JSON.stringify(value)}`);
                     } catch (e) {
-                        console.log(`---     ${handler}@<no_room> THREW ERROR: ${e.message}`);
+                        logger.log(`---     ${handler}@<no_room> THREW ERROR: ${e.message}`);
                         console.error(e);
                     }
                 }
             }
 
-            console.log(`--- calculating as returned by SettingsStore`);
-            console.log(`--- these might not match if the setting uses a controller - be warned!`);
+            logger.log(`--- calculating as returned by SettingsStore`);
+            logger.log(`--- these might not match if the setting uses a controller - be warned!`);
 
             try {
                 const value = SettingsStore.getValue(settingName, roomId);
-                console.log(`---     SettingsStore#generic@${roomId || '<no_room>'}  = ${JSON.stringify(value)}`);
+                logger.log(`---     SettingsStore#generic@${roomId || '<no_room>'}  = ${JSON.stringify(value)}`);
             } catch (e) {
-                console.log(`---     SettingsStore#generic@${roomId || '<no_room>'} THREW ERROR: ${e.message}`);
+                logger.log(`---     SettingsStore#generic@${roomId || '<no_room>'} THREW ERROR: ${e.message}`);
                 console.error(e);
             }
 
             if (roomId) {
                 try {
                     const value = SettingsStore.getValue(settingName, null);
-                    console.log(`---     SettingsStore#generic@<no_room>  = ${JSON.stringify(value)}`);
+                    logger.log(`---     SettingsStore#generic@<no_room>  = ${JSON.stringify(value)}`);
                 } catch (e) {
-                    console.log(`---     SettingsStore#generic@$<no_room> THREW ERROR: ${e.message}`);
+                    logger.log(`---     SettingsStore#generic@$<no_room> THREW ERROR: ${e.message}`);
                     console.error(e);
                 }
             }
@@ -569,18 +587,18 @@ export default class SettingsStore {
             for (const level of LEVEL_ORDER) {
                 try {
                     const value = SettingsStore.getValueAt(level, settingName, roomId);
-                    console.log(`---     SettingsStore#${level}@${roomId || '<no_room>'} = ${JSON.stringify(value)}`);
+                    logger.log(`---     SettingsStore#${level}@${roomId || '<no_room>'} = ${JSON.stringify(value)}`);
                 } catch (e) {
-                    console.log(`---     SettingsStore#${level}@${roomId || '<no_room>'} THREW ERROR: ${e.message}`);
+                    logger.log(`---     SettingsStore#${level}@${roomId || '<no_room>'} THREW ERROR: ${e.message}`);
                     console.error(e);
                 }
 
                 if (roomId) {
                     try {
                         const value = SettingsStore.getValueAt(level, settingName, null);
-                        console.log(`---     SettingsStore#${level}@<no_room> = ${JSON.stringify(value)}`);
+                        logger.log(`---     SettingsStore#${level}@<no_room> = ${JSON.stringify(value)}`);
                     } catch (e) {
-                        console.log(`---     SettingsStore#${level}@$<no_room> THREW ERROR: ${e.message}`);
+                        logger.log(`---     SettingsStore#${level}@$<no_room> THREW ERROR: ${e.message}`);
                         console.error(e);
                     }
                 }
@@ -590,12 +608,12 @@ export default class SettingsStore {
         doChecks(realSettingName);
 
         if (def.invertedSettingName) {
-            console.log(`--- TESTING INVERTED SETTING NAME`);
-            console.log(`--- inverted: ${def.invertedSettingName}`);
+            logger.log(`--- TESTING INVERTED SETTING NAME`);
+            logger.log(`--- inverted: ${def.invertedSettingName}`);
             doChecks(def.invertedSettingName);
         }
 
-        console.log(`--- END DEBUG`);
+        logger.log(`--- END DEBUG`);
     }
 
     private static getHandler(settingName: string, level: SettingLevel): SettingsHandler {
diff --git a/src/settings/WatchManager.ts b/src/settings/WatchManager.ts
index 56f911f180..744d75b136 100644
--- a/src/settings/WatchManager.ts
+++ b/src/settings/WatchManager.ts
@@ -63,8 +63,7 @@ export class WatchManager {
 
         if (!inRoomId) {
             // Fire updates to all the individual room watchers too, as they probably care about the change higher up.
-            const callbacks = Array.from(roomWatchers.values()).flat(1);
-            callbacks.push(...callbacks);
+            callbacks.push(...Array.from(roomWatchers.values()).flat(1));
         } else if (roomWatchers.has(IRRELEVANT_ROOM)) {
             callbacks.push(...roomWatchers.get(IRRELEVANT_ROOM));
         }
diff --git a/src/settings/controllers/IncompatibleController.ts b/src/settings/controllers/IncompatibleController.ts
index c48ce0a60b..aa064219f9 100644
--- a/src/settings/controllers/IncompatibleController.ts
+++ b/src/settings/controllers/IncompatibleController.ts
@@ -24,7 +24,11 @@ import SettingsStore from "../SettingsStore";
  * labs flags.
  */
 export default class IncompatibleController extends SettingController {
-    public constructor(private settingName: string, private forcedValue = false) {
+    public constructor(
+        private settingName: string,
+        private forcedValue: any = false,
+        private incompatibleValue: any = true,
+    ) {
         super();
     }
 
@@ -34,13 +38,17 @@ export default class IncompatibleController extends SettingController {
         calculatedValue: any,
         calculatedAtLevel: SettingLevel,
     ): any {
-        if (this.incompatibleSettingEnabled) {
+        if (this.incompatibleSetting) {
             return this.forcedValue;
         }
         return null; // no override
     }
 
-    public get incompatibleSettingEnabled(): boolean {
-        return SettingsStore.getValue(this.settingName);
+    public get settingDisabled(): boolean {
+        return this.incompatibleSetting;
+    }
+
+    public get incompatibleSetting(): boolean {
+        return SettingsStore.getValue(this.settingName) === this.incompatibleValue;
     }
 }
diff --git a/src/settings/controllers/NewLayoutSwitcherController.ts b/src/settings/controllers/NewLayoutSwitcherController.ts
new file mode 100644
index 0000000000..b1d6cac55e
--- /dev/null
+++ b/src/settings/controllers/NewLayoutSwitcherController.ts
@@ -0,0 +1,26 @@
+/*
+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 SettingController from "./SettingController";
+import { SettingLevel } from "../SettingLevel";
+import SettingsStore from "../SettingsStore";
+import { Layout } from "../Layout";
+
+export default class NewLayoutSwitcherController extends SettingController {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
+        // On disabling switch back to Layout.Group if Layout.Bubble
+        if (!newValue && SettingsStore.getValue("layout") == Layout.Bubble) {
+            SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.Group);
+        }
+    }
+}
diff --git a/src/settings/controllers/NotificationControllers.ts b/src/settings/controllers/NotificationControllers.ts
index 323c64e9c3..09e4e1dd1a 100644
--- a/src/settings/controllers/NotificationControllers.ts
+++ b/src/settings/controllers/NotificationControllers.ts
@@ -16,11 +16,12 @@ limitations under the License.
 */
 
 import SettingController from "./SettingController";
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import { SettingLevel } from "../SettingLevel";
 
 // XXX: This feels wrong.
-import {PushProcessor} from "matrix-js-sdk/src/pushprocessor";
+import { PushProcessor } from "matrix-js-sdk/src/pushprocessor";
+import { PushRuleActionName } from "matrix-js-sdk/src/@types/PushRules";
 
 // .m.rule.master being enabled means all events match that push rule
 // default action on this rule is dont_notify, but it could be something else
@@ -35,7 +36,7 @@ export function isPushNotifyDisabled(): boolean {
     }
 
     // If the rule is enabled then check it does not notify on everything
-    return masterRule.enabled && !masterRule.actions.includes("notify");
+    return masterRule.enabled && !masterRule.actions.includes(PushRuleActionName.Notify);
 }
 
 function getNotifier(): any { // TODO: [TS] Formal type that doesn't cause a cyclical reference.
diff --git a/src/settings/controllers/PseudonymousAnalyticsController.ts b/src/settings/controllers/PseudonymousAnalyticsController.ts
new file mode 100644
index 0000000000..a82b9685ef
--- /dev/null
+++ b/src/settings/controllers/PseudonymousAnalyticsController.ts
@@ -0,0 +1,26 @@
+/*
+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 SettingController from "./SettingController";
+import { SettingLevel } from "../SettingLevel";
+import { PosthogAnalytics } from "../../PosthogAnalytics";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+
+export default class PseudonymousAnalyticsController extends SettingController {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
+        PosthogAnalytics.instance.updateAnonymityFromSettings(MatrixClientPeg.get().getUserId());
+    }
+}
diff --git a/src/settings/controllers/ThemeController.ts b/src/settings/controllers/ThemeController.ts
index 15dd64c901..f564f56f54 100644
--- a/src/settings/controllers/ThemeController.ts
+++ b/src/settings/controllers/ThemeController.ts
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import SettingController from "./SettingController";
-import {DEFAULT_THEME, enumerateThemes} from "../../theme";
+import { DEFAULT_THEME, enumerateThemes } from "../../theme";
 import { SettingLevel } from "../SettingLevel";
 
 export default class ThemeController extends SettingController {
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
index e75faa49c1..5afe50e4e9 100644
--- a/src/settings/handlers/AccountSettingsHandler.ts
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {objectClone, objectKeyChanges} from "../../utils/objects";
-import {SettingLevel} from "../SettingLevel";
+import { objectClone, objectKeyChanges } from "../../utils/objects";
+import { SettingLevel } from "../SettingLevel";
 import { WatchManager } from "../WatchManager";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
@@ -73,7 +73,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             const val = event.getContent()['enabled'];
             this.watchers.notifyUpdate("recent_emoji", null, SettingLevel.ACCOUNT, val);
         }
-    }
+    };
 
     public getValue(settingName: string, roomId: string): any {
         // Special case URL previews
@@ -110,6 +110,21 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             return content ? content['enabled'] : null;
         }
 
+        // Special case for autoplaying videos and GIFs
+        if (["autoplayGifs", "autoplayVideo"].includes(settingName)) {
+            const settings = this.getSettings() || {};
+            const value = settings[settingName];
+            // Fallback to old combined setting
+            if (value === null || value === undefined) {
+                const oldCombinedValue = settings["autoplayGifsAndVideos"];
+                // Write, so that we can remove this in the future
+                this.setValue("autoplayGifs", roomId, oldCombinedValue);
+                this.setValue("autoplayVideo", roomId, oldCombinedValue);
+                return oldCombinedValue;
+            }
+            return value;
+        }
+
         const settings = this.getSettings() || {};
         let preferredValue = settings[settingName];
 
@@ -123,12 +138,13 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         return preferredValue;
     }
 
-    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
             const content = this.getSettings("org.matrix.preview_urls") || {};
             content['disable'] = !newValue;
-            return MatrixClientPeg.get().setAccountData("org.matrix.preview_urls", content);
+            await MatrixClientPeg.get().setAccountData("org.matrix.preview_urls", content);
+            return;
         }
 
         // Special case for breadcrumbs
@@ -141,26 +157,29 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             if (!content) content = {}; // If we still don't have content, make some
 
             content['recent_rooms'] = newValue;
-            return MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content);
+            await MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content);
+            return;
         }
 
         // Special case recent emoji
         if (settingName === "recent_emoji") {
             const content = this.getSettings(RECENT_EMOJI_EVENT_TYPE) || {};
             content["recent_emoji"] = newValue;
-            return MatrixClientPeg.get().setAccountData(RECENT_EMOJI_EVENT_TYPE, content);
+            await MatrixClientPeg.get().setAccountData(RECENT_EMOJI_EVENT_TYPE, content);
+            return;
         }
 
         // Special case integration manager provisioning
         if (settingName === "integrationProvisioning") {
             const content = this.getSettings(INTEG_PROVISIONING_EVENT_TYPE) || {};
             content['enabled'] = newValue;
-            return MatrixClientPeg.get().setAccountData(INTEG_PROVISIONING_EVENT_TYPE, content);
+            await MatrixClientPeg.get().setAccountData(INTEG_PROVISIONING_EVENT_TYPE, content);
+            return;
         }
 
         const content = this.getSettings() || {};
         content[settingName] = newValue;
-        return MatrixClientPeg.get().setAccountData("im.vector.web.settings", content);
+        await MatrixClientPeg.get().setAccountData("im.vector.web.settings", content);
     }
 
     public canSetValue(settingName: string, roomId: string): boolean {
diff --git a/src/settings/handlers/ConfigSettingsHandler.ts b/src/settings/handlers/ConfigSettingsHandler.ts
index 791c655a0d..ceed3e856a 100644
--- a/src/settings/handlers/ConfigSettingsHandler.ts
+++ b/src/settings/handlers/ConfigSettingsHandler.ts
@@ -17,7 +17,7 @@ limitations under the License.
 
 import SettingsHandler from "./SettingsHandler";
 import SdkConfig from "../../SdkConfig";
-import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 
 /**
  * Gets and sets settings at the "config" level. This handler does not make use of the
diff --git a/src/settings/handlers/DeviceSettingsHandler.ts b/src/settings/handlers/DeviceSettingsHandler.ts
index 208a265e04..e57862a824 100644
--- a/src/settings/handlers/DeviceSettingsHandler.ts
+++ b/src/settings/handlers/DeviceSettingsHandler.ts
@@ -17,8 +17,8 @@ limitations under the License.
 */
 
 import SettingsHandler from "./SettingsHandler";
-import {MatrixClientPeg} from "../../MatrixClientPeg";
-import {SettingLevel} from "../SettingLevel";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import { SettingLevel } from "../SettingLevel";
 import { CallbackFn, WatchManager } from "../WatchManager";
 import { Layout } from "../Layout";
 
@@ -71,7 +71,13 @@ export default class DeviceSettingsHandler extends SettingsHandler {
         // Special case for old useIRCLayout setting
         if (settingName === "layout") {
             const settings = this.getSettings() || {};
-            if (settings["useIRCLayout"]) return Layout.IRC;
+            if (settings["useIRCLayout"]) {
+                // Set the new layout setting and delete the old one so that we
+                // can delete this block of code after some time
+                settings["layout"] = Layout.IRC;
+                delete settings["useIRCLayout"];
+                localStorage.setItem("mx_local_settings", JSON.stringify(settings));
+            }
             return settings[settingName];
         }
 
@@ -109,7 +115,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             "lastRightPanelPhaseForRoom",
             "lastRightPanelPhaseForGroup",
         ].includes(settingName)) {
-            localStorage.setItem(`mx_${settingName}`, JSON.stringify({value: newValue}));
+            localStorage.setItem(`mx_${settingName}`, JSON.stringify({ value: newValue }));
             this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         }
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.ts b/src/settings/handlers/RoomAccountSettingsHandler.ts
index 416bdddb90..a5ebfae621 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.ts
+++ b/src/settings/handlers/RoomAccountSettingsHandler.ts
@@ -54,8 +54,6 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             }
 
             this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM_ACCOUNT, val);
-        } else if (event.getType() === "org.matrix.room.color_scheme") {
-            this.watchers.notifyUpdate("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
         } else if (event.getType() === "im.vector.web.settings") {
             // Figure out what changed and fire those updates
             const prevContent = prevEvent ? prevEvent.getContent() : {};
@@ -79,14 +77,6 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             return !content['disable'];
         }
 
-        // Special case room color
-        if (settingName === "roomColor") {
-            // The event content should already be in an appropriate format, we just need
-            // to get the right value.
-            // don't fallback to {} because thats truthy and would imply there is an event specifying tint
-            return this.getSettings(roomId, "org.matrix.room.color_scheme");
-        }
-
         // Special case allowed widgets
         if (settingName === "allowedWidgets") {
             return this.getSettings(roomId, ALLOWED_WIDGETS_EVENT_TYPE);
@@ -96,28 +86,24 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
         return settings[settingName];
     }
 
-    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
             const content = this.getSettings(roomId, "org.matrix.room.preview_urls") || {};
             content['disable'] = !newValue;
-            return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.preview_urls", content);
-        }
-
-        // Special case room color
-        if (settingName === "roomColor") {
-            // The new value should match our requirements, we just need to store it in the right place.
-            return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.color_scheme", newValue);
+            await MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.preview_urls", content);
+            return;
         }
 
         // Special case allowed widgets
         if (settingName === "allowedWidgets") {
-            return MatrixClientPeg.get().setRoomAccountData(roomId, ALLOWED_WIDGETS_EVENT_TYPE, newValue);
+            await MatrixClientPeg.get().setRoomAccountData(roomId, ALLOWED_WIDGETS_EVENT_TYPE, newValue);
+            return;
         }
 
         const content = this.getSettings(roomId) || {};
         content[settingName] = newValue;
-        return MatrixClientPeg.get().setRoomAccountData(roomId, "im.vector.web.settings", content);
+        await MatrixClientPeg.get().setRoomAccountData(roomId, "im.vector.web.settings", content);
     }
 
     public canSetValue(settingName: string, roomId: string): boolean {
diff --git a/src/settings/handlers/RoomDeviceSettingsHandler.ts b/src/settings/handlers/RoomDeviceSettingsHandler.ts
index 2fcd58c27c..2a068eb060 100644
--- a/src/settings/handlers/RoomDeviceSettingsHandler.ts
+++ b/src/settings/handlers/RoomDeviceSettingsHandler.ts
@@ -57,7 +57,7 @@ export default class RoomDeviceSettingsHandler extends SettingsHandler {
         if (newValue === null) {
             localStorage.removeItem(this.getKey(settingName, roomId));
         } else {
-            newValue = JSON.stringify({value: newValue});
+            newValue = JSON.stringify({ value: newValue });
             localStorage.setItem(this.getKey(settingName, roomId), newValue);
         }
 
diff --git a/src/settings/handlers/RoomSettingsHandler.ts b/src/settings/handlers/RoomSettingsHandler.ts
index 3315e40a65..974f94062c 100644
--- a/src/settings/handlers/RoomSettingsHandler.ts
+++ b/src/settings/handlers/RoomSettingsHandler.ts
@@ -87,17 +87,18 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
         return settings[settingName];
     }
 
-    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
             const content = this.getSettings(roomId, "org.matrix.room.preview_urls") || {};
             content['disable'] = !newValue;
-            return MatrixClientPeg.get().sendStateEvent(roomId, "org.matrix.room.preview_urls", content);
+            await MatrixClientPeg.get().sendStateEvent(roomId, "org.matrix.room.preview_urls", content);
+            return;
         }
 
         const content = this.getSettings(roomId) || {};
         content[settingName] = newValue;
-        return MatrixClientPeg.get().sendStateEvent(roomId, "im.vector.web.settings", content, "");
+        await MatrixClientPeg.get().sendStateEvent(roomId, "im.vector.web.settings", content, "");
     }
 
     public canSetValue(settingName: string, roomId: string): boolean {
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index 6a17bf2aa3..952a2eb9f3 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -63,7 +63,7 @@ export class FontWatcher implements IWatcher {
         (<HTMLElement>document.querySelector(":root")).style.fontSize = toPx(fontSize);
     };
 
-    private setSystemFont = ({useSystemFont, font}) => {
+    private setSystemFont = ({ useSystemFont, font }) => {
         document.body.style.fontFamily = useSystemFont ? font : "";
     };
 }
diff --git a/src/settings/watchers/ThemeWatcher.ts b/src/settings/watchers/ThemeWatcher.ts
index 53d72c7849..e555267706 100644
--- a/src/settings/watchers/ThemeWatcher.ts
+++ b/src/settings/watchers/ThemeWatcher.ts
@@ -23,6 +23,8 @@ import { setTheme } from "../../theme";
 import { ActionPayload } from '../../dispatcher/payloads';
 import { SettingLevel } from "../SettingLevel";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export default class ThemeWatcher {
     private themeWatchRef: string;
     private systemThemeWatchRef: string;
@@ -105,7 +107,7 @@ export default class ThemeWatcher {
         const systemThemeExplicit = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "use_system_theme", null, false, true);
         if (systemThemeExplicit) {
-            console.log("returning explicit system theme");
+            logger.log("returning explicit system theme");
             if (this.preferDark.matches) return 'dark';
             if (this.preferLight.matches) return 'light';
         }
@@ -116,7 +118,7 @@ export default class ThemeWatcher {
         const themeExplicit = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "theme", null, false, true);
         if (themeExplicit) {
-            console.log("returning explicit theme: " + themeExplicit);
+            logger.log("returning explicit theme: " + themeExplicit);
             return themeExplicit;
         }
 
@@ -126,7 +128,7 @@ export default class ThemeWatcher {
             if (this.preferDark.matches) return 'dark';
             if (this.preferLight.matches) return 'light';
         }
-        console.log("returning theme value");
+        logger.log("returning theme value");
         return SettingsStore.getValue('theme');
     }
 
diff --git a/src/shouldHideEvent.ts b/src/shouldHideEvent.ts
index 2a47b9c417..c31da5bd4f 100644
--- a/src/shouldHideEvent.ts
+++ b/src/shouldHideEvent.ts
@@ -14,9 +14,10 @@
  limitations under the License.
  */
 
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import SettingsStore from "./settings/SettingsStore";
+import { IRoomState } from "./components/structures/RoomView";
 
 interface IDiff {
     isMemberEvent: boolean;
@@ -47,11 +48,18 @@ function memberEventDiff(ev: MatrixEvent): IDiff {
     return diff;
 }
 
-export default function shouldHideEvent(ev: MatrixEvent): boolean {
-    // Wrap getValue() for readability. Calling the SettingsStore can be
-    // fairly resource heavy, so the checks below should avoid hitting it
-    // where possible.
-    const isEnabled = (name) => SettingsStore.getValue(name, ev.getRoomId());
+/**
+ * Determines whether the given event should be hidden from timelines.
+ * @param ev The event
+ * @param ctx An optional RoomContext to pull cached settings values from to avoid
+ *     hitting the settings store
+ */
+export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState): boolean {
+    // Accessing the settings store directly can be expensive if done frequently,
+    // so we should prefer using cached values if a RoomContext is available
+    const isEnabled = ctx ?
+        name => ctx[name] :
+        name => SettingsStore.getValue(name, ev.getRoomId());
 
     // Hide redacted events
     if (ev.isRedacted() && !isEnabled('showRedactions')) return true;
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
deleted file mode 100644
index 4ae8dfeddb..0000000000
--- a/src/stores/ActiveWidgetStore.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import EventEmitter from 'events';
-
-import {MatrixClientPeg} from '../MatrixClientPeg';
-import {WidgetMessagingStore} from "./widgets/WidgetMessagingStore";
-
-/**
- * Stores information about the widgets active in the app right now:
- *  * What widget is set to remain always-on-screen, if any
- *    Only one widget may be 'always on screen' at any one time.
- *  * Negotiated capabilities for active apps
- */
-class ActiveWidgetStore extends EventEmitter {
-    constructor() {
-        super();
-        this._persistentWidgetId = null;
-
-        // What room ID each widget is associated with (if it's a room widget)
-        this._roomIdByWidgetId = {};
-
-        this.onRoomStateEvents = this.onRoomStateEvents.bind(this);
-
-        this.dispatcherRef = null;
-    }
-
-    start() {
-        MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
-    }
-
-    stop() {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
-        }
-        this._roomIdByWidgetId = {};
-    }
-
-    onRoomStateEvents(ev, state) {
-        // XXX: This listens for state events in order to remove the active widget.
-        // Everything else relies on views listening for events and calling setters
-        // on this class which is terrible. This store should just listen for events
-        // and keep itself up to date.
-        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-        if (ev.getType() !== 'im.vector.modular.widgets') return;
-
-        if (ev.getStateKey() === this._persistentWidgetId) {
-            this.destroyPersistentWidget(this._persistentWidgetId);
-        }
-    }
-
-    destroyPersistentWidget(id) {
-        if (id !== this._persistentWidgetId) return;
-        const toDeleteId = this._persistentWidgetId;
-
-        WidgetMessagingStore.instance.stopMessagingById(id);
-
-        this.setWidgetPersistence(toDeleteId, false);
-        this.delRoomId(toDeleteId);
-    }
-
-    setWidgetPersistence(widgetId, val) {
-        if (this._persistentWidgetId === widgetId && !val) {
-            this._persistentWidgetId = null;
-        } else if (this._persistentWidgetId !== widgetId && val) {
-            this._persistentWidgetId = widgetId;
-        }
-        this.emit('update');
-    }
-
-    getWidgetPersistence(widgetId) {
-        return this._persistentWidgetId === widgetId;
-    }
-
-    getPersistentWidgetId() {
-        return this._persistentWidgetId;
-    }
-
-    getRoomId(widgetId) {
-        return this._roomIdByWidgetId[widgetId];
-    }
-
-    setRoomId(widgetId, roomId) {
-        this._roomIdByWidgetId[widgetId] = roomId;
-        this.emit('update');
-    }
-
-    delRoomId(widgetId) {
-        delete this._roomIdByWidgetId[widgetId];
-        this.emit('update');
-    }
-}
-
-if (global.singletonActiveWidgetStore === undefined) {
-    global.singletonActiveWidgetStore = new ActiveWidgetStore();
-}
-export default global.singletonActiveWidgetStore;
diff --git a/src/stores/ActiveWidgetStore.ts b/src/stores/ActiveWidgetStore.ts
new file mode 100644
index 0000000000..ca50689188
--- /dev/null
+++ b/src/stores/ActiveWidgetStore.ts
@@ -0,0 +1,112 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from 'events';
+import { MatrixEvent } from "matrix-js-sdk";
+
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import { WidgetMessagingStore } from "./widgets/WidgetMessagingStore";
+
+export enum ActiveWidgetStoreEvent {
+    Update = "update",
+}
+
+/**
+ * Stores information about the widgets active in the app right now:
+ *  * What widget is set to remain always-on-screen, if any
+ *    Only one widget may be 'always on screen' at any one time.
+ *  * Negotiated capabilities for active apps
+ */
+export default class ActiveWidgetStore extends EventEmitter {
+    private static internalInstance: ActiveWidgetStore;
+    private persistentWidgetId: string;
+    // What room ID each widget is associated with (if it's a room widget)
+    private roomIdByWidgetId = new Map<string, string>();
+
+    public static get instance(): ActiveWidgetStore {
+        if (!ActiveWidgetStore.internalInstance) {
+            ActiveWidgetStore.internalInstance = new ActiveWidgetStore();
+        }
+        return ActiveWidgetStore.internalInstance;
+    }
+
+    public start(): void {
+        MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
+    }
+
+    public stop(): void {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
+        }
+        this.roomIdByWidgetId.clear();
+    }
+
+    private onRoomStateEvents = (ev: MatrixEvent): void => {
+        // XXX: This listens for state events in order to remove the active widget.
+        // Everything else relies on views listening for events and calling setters
+        // on this class which is terrible. This store should just listen for events
+        // and keep itself up to date.
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+        if (ev.getType() !== 'im.vector.modular.widgets') return;
+
+        if (ev.getStateKey() === this.persistentWidgetId) {
+            this.destroyPersistentWidget(this.persistentWidgetId);
+        }
+    };
+
+    public destroyPersistentWidget(id: string): void {
+        if (id !== this.persistentWidgetId) return;
+        const toDeleteId = this.persistentWidgetId;
+
+        WidgetMessagingStore.instance.stopMessagingById(id);
+
+        this.setWidgetPersistence(toDeleteId, false);
+        this.delRoomId(toDeleteId);
+    }
+
+    public setWidgetPersistence(widgetId: string, val: boolean): void {
+        if (this.persistentWidgetId === widgetId && !val) {
+            this.persistentWidgetId = null;
+        } else if (this.persistentWidgetId !== widgetId && val) {
+            this.persistentWidgetId = widgetId;
+        }
+        this.emit(ActiveWidgetStoreEvent.Update);
+    }
+
+    public getWidgetPersistence(widgetId: string): boolean {
+        return this.persistentWidgetId === widgetId;
+    }
+
+    public getPersistentWidgetId(): string {
+        return this.persistentWidgetId;
+    }
+
+    public getRoomId(widgetId: string): string {
+        return this.roomIdByWidgetId.get(widgetId);
+    }
+
+    public setRoomId(widgetId: string, roomId: string): void {
+        this.roomIdByWidgetId.set(widgetId, roomId);
+        this.emit(ActiveWidgetStoreEvent.Update);
+    }
+
+    public delRoomId(widgetId: string): void {
+        this.roomIdByWidgetId.delete(widgetId);
+        this.emit(ActiveWidgetStoreEvent.Update);
+    }
+}
+
+window.mxActiveWidgetStore = ActiveWidgetStore.instance;
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index 1a78a1b485..8a85ca354f 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -22,6 +22,9 @@ import defaultDispatcher from "../dispatcher/dispatcher";
 import { arrayHasDiff } from "../utils/arrays";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { SettingLevel } from "../settings/SettingLevel";
+import SpaceStore from "./SpaceStore";
+import { Action } from "../dispatcher/actions";
+import { SettingUpdatedPayload } from "../dispatcher/payloads/SettingUpdatedPayload";
 
 const MAX_ROOMS = 20; // arbitrary
 const AUTOJOIN_WAIT_THRESHOLD_MS = 90000; // 90s, the time we wait for an autojoined room to show up
@@ -62,17 +65,18 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
     protected async onAction(payload: ActionPayload) {
         if (!this.matrixClient) return;
 
-        if (payload.action === 'setting_updated') {
-            if (payload.settingName === 'breadcrumb_rooms') {
+        if (payload.action === Action.SettingUpdated) {
+            const settingUpdatedPayload = payload as SettingUpdatedPayload;
+            if (settingUpdatedPayload.settingName === 'breadcrumb_rooms') {
                 await this.updateRooms();
-            } else if (payload.settingName === 'breadcrumbs') {
-                await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+            } else if (settingUpdatedPayload.settingName === 'breadcrumbs') {
+                await this.updateState({ enabled: SettingsStore.getValue("breadcrumbs", null) });
             }
         } else if (payload.action === 'view_room') {
             if (payload.auto_join && !this.matrixClient.getRoom(payload.room_id)) {
                 // Queue the room instead of pushing it immediately. We're probably just
                 // waiting for a room join to complete.
-                this.waitingRooms.push({roomId: payload.room_id, addedTs: Date.now()});
+                this.waitingRooms.push({ roomId: payload.room_id, addedTs: Date.now() });
             } else {
                 // The tests might not result in a valid room object.
                 const room = this.matrixClient.getRoom(payload.room_id);
@@ -83,7 +87,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
 
     protected async onReady() {
         await this.updateRooms();
-        await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+        await this.updateState({ enabled: SettingsStore.getValue("breadcrumbs", null) });
 
         this.matrixClient.on("Room.myMembership", this.onMyMembership);
         this.matrixClient.on("Room", this.onRoom);
@@ -118,11 +122,11 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
         const rooms = roomIds.map(r => this.matrixClient.getRoom(r)).filter(r => !!r);
         const currentRooms = this.state.rooms || [];
         if (!arrayHasDiff(rooms, currentRooms)) return; // no change (probably echo)
-        await this.updateState({rooms});
+        await this.updateState({ rooms });
     }
 
     private async appendRoom(room: Room) {
-        if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) return; // hide space rooms
+        if (SpaceStore.spacesEnabled && room.isSpaceRoom()) return; // hide space rooms
         let updated = false;
         const rooms = (this.state.rooms || []).slice(); // cheap clone
 
@@ -163,10 +167,9 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
             updated = true;
         }
 
-
         if (updated) {
             // Update the breadcrumbs
-            await this.updateState({rooms});
+            await this.updateState({ rooms });
             const roomIds = rooms.map(r => r.roomId);
             if (roomIds.length > 0) {
                 await SettingsStore.setValue("breadcrumb_rooms", null, SettingLevel.ACCOUNT, roomIds);
diff --git a/src/stores/CommunityPrototypeStore.ts b/src/stores/CommunityPrototypeStore.ts
index 023845c9ee..0c364430ea 100644
--- a/src/stores/CommunityPrototypeStore.ts
+++ b/src/stores/CommunityPrototypeStore.ts
@@ -107,8 +107,9 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
 
         const pl = generalChat.currentState.getStateEvents("m.room.power_levels", "");
         if (!pl) return this.isAdminOf(communityId);
+        const plContent = pl.getContent();
 
-        const invitePl = isNullOrUndefined(pl.invite) ? 50 : Number(pl.invite);
+        const invitePl = isNullOrUndefined(plContent.invite) ? 50 : Number(plContent.invite);
         return invitePl <= myMember.powerLevel;
     }
 
@@ -125,11 +126,11 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
 
             if (membership === EffectiveMembership.Invite) {
                 try {
-                    const path = utils.encodeUri("/rooms/$roomId/group_info", {$roomId: room.roomId});
+                    const path = utils.encodeUri("/rooms/$roomId/group_info", { $roomId: room.roomId });
                     const profile = await this.matrixClient.http.authedRequest(
                         undefined, "GET", path,
                         undefined, undefined,
-                        {prefix: "/_matrix/client/unstable/im.vector.custom"});
+                        { prefix: "/_matrix/client/unstable/im.vector.custom" });
                     // we use global account data because per-room account data on invites is unreliable
                     await this.matrixClient.setAccountData("im.vector.group_info." + room.roomId, profile);
                 } catch (e) {
@@ -154,15 +155,21 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
     }
 
     public getInviteProfile(roomId: string): IRoomProfile {
-        if (!this.matrixClient) return {displayName: null, avatarMxc: null};
+        if (!this.matrixClient) return { displayName: null, avatarMxc: null };
         const room = this.matrixClient.getRoom(roomId);
         if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
             const data = this.matrixClient.getAccountData("im.vector.group_info." + roomId);
             if (data && data.getContent()) {
-                return {displayName: data.getContent().name, avatarMxc: data.getContent().avatar_url};
+                return {
+                    displayName: data.getContent().name,
+                    avatarMxc: data.getContent().avatar_url,
+                };
             }
         }
-        return {displayName: room.name, avatarMxc: room.avatar_url};
+        return {
+            displayName: room.name,
+            avatarMxc: room.getMxcAvatarUrl(),
+        };
     }
 
     protected async onReady(): Promise<any> {
diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
index 55c9699f7a..899018cf24 100644
--- a/src/stores/CustomRoomTagStore.js
+++ b/src/stores/CustomRoomTagStore.js
@@ -17,12 +17,12 @@ limitations under the License.
 
 import dis from '../dispatcher/dispatcher';
 import EventEmitter from 'events';
-import {throttle} from "lodash";
+import { throttle } from "lodash";
 import SettingsStore from "../settings/SettingsStore";
-import RoomListStore, {LISTS_UPDATE_EVENT} from "./room-list/RoomListStore";
-import {RoomNotificationStateStore} from "./notifications/RoomNotificationStateStore";
-import {isCustomTag} from "./room-list/models";
-import {objectHasDiff} from "../utils/objects";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "./room-list/RoomListStore";
+import { RoomNotificationStateStore } from "./notifications/RoomNotificationStateStore";
+import { isCustomTag } from "./room-list/models";
+import { objectHasDiff } from "../utils/objects";
 
 function commonPrefix(a, b) {
     const len = Math.min(a.length, b.length);
@@ -52,7 +52,7 @@ class CustomRoomTagStore extends EventEmitter {
     constructor() {
         super();
         // Initialise state
-        this._state = {tags: {}};
+        this._state = { tags: {} };
 
         // as RoomListStore gets updated by every timeline event
         // throttle this to only run every 500ms
@@ -103,14 +103,14 @@ class CustomRoomTagStore extends EventEmitter {
             }
             const avatarLetter = name.substr(prefixes[i].length, 1);
             const selected = this._state.tags[name];
-            return {name, avatarLetter, badgeNotifState, selected};
+            return { name, avatarLetter, badgeNotifState, selected };
         });
     }
 
     _onListsUpdated = () => {
         const newTags = this._getUpdatedTags();
         if (!this._state.tags || objectHasDiff(this._state.tags, newTags)) {
-            this._setState({tags: newTags});
+            this._setState({ tags: newTags });
         }
     };
 
@@ -122,14 +122,14 @@ class CustomRoomTagStore extends EventEmitter {
                     const tag = {};
                     tag[payload.tag] = !oldTags[payload.tag];
                     const tags = Object.assign({}, oldTags, tag);
-                    this._setState({tags});
+                    this._setState({ tags });
                 }
                 break;
             }
             case 'on_client_not_viable':
             case 'on_logged_out': {
                 // we assume to always have a tags object in the state
-                this._state = {tags: {}};
+                this._state = { tags: {} };
                 RoomListStore.instance.off(LISTS_UPDATE_EVENT, this._onListsUpdated);
                 break;
             }
diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 23254b98ab..155d9beaf4 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 import EventEmitter from 'events';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const BULK_REQUEST_DEBOUNCE_MS = 200;
 
 // Does the server support groups? Assume yes until we receive M_UNRECOGNIZED.
@@ -186,14 +188,14 @@ class FlairStore extends EventEmitter {
         }
 
         // No request yet, start one
-        console.log('FlairStore: Request group profile of ' + groupId);
+        logger.log('FlairStore: Request group profile of ' + groupId);
         this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId);
 
         let profile;
         try {
             profile = await this._groupProfilesPromise[groupId];
         } catch (e) {
-            console.log('FlairStore: Failed to get group profile for ' + groupId, e);
+            logger.log('FlairStore: Failed to get group profile for ' + groupId, e);
             // Don't retry, but allow a retry when the profile is next requested
             delete this._groupProfilesPromise[groupId];
             return null;
@@ -209,7 +211,7 @@ class FlairStore extends EventEmitter {
 
         /// XXX: This is verging on recreating a third "Flux"-looking Store. We really
         /// should replace FlairStore with a Flux store and some async actions.
-        console.log('FlairStore: Emit updateGroupProfile for ' + groupId);
+        logger.log('FlairStore: Emit updateGroupProfile for ' + groupId);
         this.emit('updateGroupProfile');
 
         setTimeout(() => {
diff --git a/src/stores/GroupFilterOrderStore.js b/src/stores/GroupFilterOrderStore.js
index b18abaa001..821fbefc4f 100644
--- a/src/stores/GroupFilterOrderStore.js
+++ b/src/stores/GroupFilterOrderStore.js
@@ -13,13 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import {Store} from 'flux/utils';
+import { Store } from 'flux/utils';
+import { EventType } from "matrix-js-sdk/src/@types/event";
 import dis from '../dispatcher/dispatcher';
 import GroupStore from './GroupStore';
 import Analytics from '../Analytics';
 import * as RoomNotifs from "../RoomNotifs";
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
+import { CreateEventField } from "../components/views/dialogs/CreateSpaceFromCommunityDialog";
 
 const INITIAL_STATE = {
     orderedTags: null,
@@ -49,7 +51,7 @@ class GroupFilterOrderStore extends Store {
         this.__emitChange();
     }
 
-    __onDispatch(payload) {
+    __onDispatch(payload) { // eslint-disable-line @typescript-eslint/naming-convention
         switch (payload.action) {
             // Initialise state after initial sync
             case 'view_room': {
@@ -213,7 +215,7 @@ class GroupFilterOrderStore extends Store {
                 changedBadges[groupId] = (badge && badge.count !== 0) ? badge : undefined;
             });
             const newBadges = Object.assign({}, this._state.badges, changedBadges);
-            this._setState({badges: newBadges});
+            this._setState({ badges: newBadges });
         }
     }
 
@@ -231,13 +233,16 @@ class GroupFilterOrderStore extends Store {
         const tags = this._state.orderedTagsAccountData || [];
         const removedTags = new Set(this._state.removedTagsAccountData || []);
 
-
         const tagsToKeep = tags.filter(
             (t) => (t[0] !== '+' || groupIds.includes(t)) && !removedTags.has(t),
         );
 
+        const cli = MatrixClientPeg.get();
+        const migratedCommunities = new Set(cli.getRooms().map(r => {
+            return r.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent()[CreateEventField];
+        }).filter(Boolean));
         const groupIdsToAdd = groupIds.filter(
-            (groupId) => !tags.includes(groupId) && !removedTags.has(groupId),
+            (groupId) => !tags.includes(groupId) && !removedTags.has(groupId) && !migratedCommunities.has(groupId),
         );
 
         return tagsToKeep.concat(groupIdsToAdd);
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index d4097184a1..63972b31fb 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -17,14 +17,14 @@ limitations under the License.
 import EventEmitter from 'events';
 import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
 import FlairStore from './FlairStore';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import dis from '../dispatcher/dispatcher';
 
-function parseMembersResponse(response) {
+export function parseMembersResponse(response) {
     return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
 }
 
-function parseRoomsResponse(response) {
+export function parseRoomsResponse(response) {
     return response.chunk.map((apiRoom) => groupRoomFromApiObject(apiRoom));
 }
 
diff --git a/src/stores/HostSignupStore.ts b/src/stores/HostSignupStore.ts
index d50a7f6b43..382e21c1be 100644
--- a/src/stores/HostSignupStore.ts
+++ b/src/stores/HostSignupStore.ts
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import defaultDispatcher from "../dispatcher/dispatcher";
-import {AsyncStore} from "./AsyncStore";
-import {ActionPayload} from "../dispatcher/payloads";
+import { AsyncStore } from "./AsyncStore";
+import { ActionPayload } from "../dispatcher/payloads";
 
 interface IState {
     hostSignupActive?: boolean;
@@ -26,7 +26,7 @@ export class HostSignupStore extends AsyncStore<IState> {
     private static internalInstance = new HostSignupStore();
 
     private constructor() {
-        super(defaultDispatcher, {hostSignupActive: false});
+        super(defaultDispatcher, { hostSignupActive: false });
     }
 
     public static get instance(): HostSignupStore {
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.ts
similarity index 62%
rename from src/stores/LifecycleStore.js
rename to src/stores/LifecycleStore.ts
index a12bac7dd6..97d3734a52 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.ts
@@ -1,7 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -15,11 +13,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
+import { Store } from 'flux/utils';
+
 import dis from '../dispatcher/dispatcher';
-import {Store} from 'flux/utils';
+import { ActionPayload } from "../dispatcher/payloads";
+
+interface IState {
+    deferredAction: any;
+}
 
 const INITIAL_STATE = {
-    deferred_action: null,
+    deferredAction: null,
 };
 
 /**
@@ -27,39 +32,38 @@ const INITIAL_STATE = {
  * store that listens for actions and updates its state accordingly, informing any
  * listeners (views) of state changes.
  */
-class LifecycleStore extends Store {
+class LifecycleStore extends Store<ActionPayload> {
+    private state: IState = INITIAL_STATE;
+
     constructor() {
         super(dis);
-
-        // Initialise state
-        this._state = INITIAL_STATE;
     }
 
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
+    private setState(newState: Partial<IState>) {
+        this.state = Object.assign(this.state, newState);
         this.__emitChange();
     }
 
-    __onDispatch(payload) {
+    protected __onDispatch(payload: ActionPayload) { // eslint-disable-line @typescript-eslint/naming-convention
         switch (payload.action) {
             case 'do_after_sync_prepared':
-                this._setState({
-                    deferred_action: payload.deferred_action,
+                this.setState({
+                    deferredAction: payload.deferred_action,
                 });
                 break;
             case 'cancel_after_sync_prepared':
-                this._setState({
-                    deferred_action: null,
+                this.setState({
+                    deferredAction: null,
                 });
                 break;
             case 'sync_state': {
                 if (payload.state !== 'PREPARED') {
                     break;
                 }
-                if (!this._state.deferred_action) break;
-                const deferredAction = Object.assign({}, this._state.deferred_action);
-                this._setState({
-                    deferred_action: null,
+                if (!this.state.deferredAction) break;
+                const deferredAction = Object.assign({}, this.state.deferredAction);
+                this.setState({
+                    deferredAction: null,
                 });
                 dis.dispatch(deferredAction);
                 break;
@@ -71,8 +75,8 @@ class LifecycleStore extends Store {
         }
     }
 
-    reset() {
-        this._state = Object.assign({}, INITIAL_STATE);
+    private reset() {
+        this.state = Object.assign({}, INITIAL_STATE);
     }
 }
 
diff --git a/src/stores/ModalWidgetStore.ts b/src/stores/ModalWidgetStore.ts
index 9c0da49c8c..851cff3549 100644
--- a/src/stores/ModalWidgetStore.ts
+++ b/src/stores/ModalWidgetStore.ts
@@ -17,10 +17,10 @@ limitations under the License.
 import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
 import defaultDispatcher from "../dispatcher/dispatcher";
 import { ActionPayload } from "../dispatcher/payloads";
-import Modal, {IHandle, IModal} from "../Modal";
+import Modal, { IHandle, IModal } from "../Modal";
 import ModalWidgetDialog from "../components/views/dialogs/ModalWidgetDialog";
-import {WidgetMessagingStore} from "./widgets/WidgetMessagingStore";
-import {IModalWidgetOpenRequestData, IModalWidgetReturnData, Widget} from "matrix-widget-api";
+import { WidgetMessagingStore } from "./widgets/WidgetMessagingStore";
+import { IModalWidgetOpenRequestData, IModalWidgetReturnData, Widget } from "matrix-widget-api";
 
 interface IState {
     modal?: IModal<any>;
@@ -56,7 +56,7 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
         if (this.modalInstance) return;
         this.openSourceWidgetId = sourceWidget.id;
         this.modalInstance = Modal.createTrackedDialog('Modal Widget', '', ModalWidgetDialog, {
-            widgetDefinition: {...requestData},
+            widgetDefinition: { ...requestData },
             widgetRoomId,
             sourceWidgetId: sourceWidget.id,
             onFinished: (success: boolean, data?: IModalWidgetReturnData) => {
diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
index bb45456f1e..fb2dd527cb 100644
--- a/src/stores/OwnProfileStore.ts
+++ b/src/stores/OwnProfileStore.ts
@@ -22,7 +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";
+import { mediaFromMxc } from "../customisations/Media";
 
 interface IState {
     displayName?: string;
@@ -134,7 +134,7 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
         } else {
             window.localStorage.removeItem(KEY_AVATAR_URL);
         }
-        await this.updateState({displayName: profileInfo.displayname, avatarUrl: profileInfo.avatar_url});
+        await this.updateState({ displayName: profileInfo.displayname, avatarUrl: profileInfo.avatar_url });
     };
 
     private onStateEvents = throttle(async (ev: MatrixEvent) => {
@@ -142,5 +142,5 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
         if (ev.getType() === 'm.room.member' && ev.getSender() === myUserId && ev.getStateKey() === myUserId) {
             await this.onProfileUpdate();
         }
-    }, 200, {trailing: true, leading: true});
+    }, 200, { trailing: true, leading: true });
 }
diff --git a/src/stores/RightPanelStore.ts b/src/stores/RightPanelStore.ts
index c539fcdb40..b6f91bf835 100644
--- a/src/stores/RightPanelStore.ts
+++ b/src/stores/RightPanelStore.ts
@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import dis from '../dispatcher/dispatcher';
-import {pendingVerificationRequestForUser} from '../verification';
-import {Store} from 'flux/utils';
+import { pendingVerificationRequestForUser } from '../verification';
+import { Store } from 'flux/utils';
 import SettingsStore from "../settings/SettingsStore";
-import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "./RightPanelStorePhases";
-import {ActionPayload} from "../dispatcher/payloads";
-import {Action} from '../dispatcher/actions';
+import { RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS } from "./RightPanelStorePhases";
+import { ActionPayload } from "../dispatcher/payloads";
+import { Action } from '../dispatcher/actions';
 import { SettingLevel } from "../settings/SettingLevel";
 
 interface RightPanelStoreState {
@@ -67,6 +67,7 @@ const MEMBER_INFO_PHASES = [
 export default class RightPanelStore extends Store<ActionPayload> {
     private static instance: RightPanelStore;
     private state: RightPanelStoreState;
+    private lastRoomId: string;
 
     constructor() {
         super(dis);
@@ -143,27 +144,32 @@ export default class RightPanelStore extends Store<ActionPayload> {
         this.__emitChange();
     }
 
-    __onDispatch(payload: ActionPayload) {
+    __onDispatch(payload: ActionPayload) { // eslint-disable-line @typescript-eslint/naming-convention
         switch (payload.action) {
             case 'view_room':
+                if (payload.room_id === this.lastRoomId) break; // skip this transition, probably a permalink
+                // fallthrough
             case 'view_group':
+                this.lastRoomId = payload.room_id;
+
                 // Reset to the member list if we're viewing member info
                 if (MEMBER_INFO_PHASES.includes(this.state.lastRoomPhase)) {
-                    this.setState({lastRoomPhase: RightPanelPhases.RoomMemberList, lastRoomPhaseParams: {}});
+                    this.setState({ lastRoomPhase: RightPanelPhases.RoomMemberList, lastRoomPhaseParams: {} });
                 }
 
                 // Do the same for groups
                 if (this.state.lastGroupPhase === RightPanelPhases.GroupMemberInfo) {
-                    this.setState({lastGroupPhase: RightPanelPhases.GroupMemberList});
+                    this.setState({ lastGroupPhase: RightPanelPhases.GroupMemberList });
                 }
                 break;
 
             case Action.SetRightPanelPhase: {
                 let targetPhase = payload.phase;
                 let refireParams = payload.refireParams;
+                const allowClose = payload.allowClose ?? true;
                 // redirect to EncryptionPanel if there is an ongoing verification request
                 if (targetPhase === RightPanelPhases.RoomMemberInfo && payload.refireParams) {
-                    const {member} = payload.refireParams;
+                    const { member } = payload.refireParams;
                     const pendingRequest = pendingVerificationRequestForUser(member);
                     if (pendingRequest) {
                         targetPhase = RightPanelPhases.EncryptionPanel;
@@ -192,7 +198,7 @@ export default class RightPanelStore extends Store<ActionPayload> {
                         });
                     }
                 } else {
-                    if (targetPhase === this.state.lastRoomPhase && !refireParams) {
+                    if (targetPhase === this.state.lastRoomPhase && !refireParams && allowClose) {
                         this.setState({
                             showRoomPanel: !this.state.showRoomPanel,
                             previousPhase: null,
diff --git a/src/stores/RightPanelStorePhases.ts b/src/stores/RightPanelStorePhases.ts
index d62f6c6110..96a585b676 100644
--- a/src/stores/RightPanelStorePhases.ts
+++ b/src/stores/RightPanelStorePhases.ts
@@ -37,6 +37,10 @@ export enum RightPanelPhases {
     SpaceMemberList = "SpaceMemberList",
     SpaceMemberInfo = "SpaceMemberInfo",
     Space3pidMemberInfo = "Space3pidMemberInfo",
+
+    // Thread stuff
+    ThreadView = "ThreadView",
+    ThreadPanel = "ThreadPanel",
 }
 
 // These are the phases that are safe to persist (the ones that don't require additional
diff --git a/src/stores/RoomScrollStateStore.js b/src/stores/RoomScrollStateStore.js
deleted file mode 100644
index 07848283d1..0000000000
--- a/src/stores/RoomScrollStateStore.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/**
- * Stores where the user has scrolled to in each room
- */
-class RoomScrollStateStore {
-    constructor() {
-        // A map from room id to scroll state.
-        //
-        // If there is no special scroll state (ie, we are following the live
-        // timeline), the scroll state is null. Otherwise, it is an object with
-        // the following properties:
-        //
-        //    focussedEvent: the ID of the 'focussed' event. Typically this is
-        //        the last event fully visible in the viewport, though if we
-        //        have done an explicit scroll to an explicit event, it will be
-        //        that event.
-        //
-        //    pixelOffset: the number of pixels the window is scrolled down
-        //        from the focussedEvent.
-        this._scrollStateMap = {};
-    }
-
-    getScrollState(roomId) {
-        return this._scrollStateMap[roomId];
-    }
-
-    setScrollState(roomId, scrollState) {
-        this._scrollStateMap[roomId] = scrollState;
-    }
-}
-
-if (global.mx_RoomScrollStateStore === undefined) {
-    global.mx_RoomScrollStateStore = new RoomScrollStateStore();
-}
-export default global.mx_RoomScrollStateStore;
diff --git a/src/stores/RoomScrollStateStore.ts b/src/stores/RoomScrollStateStore.ts
new file mode 100644
index 0000000000..1d8d4eb8fd
--- /dev/null
+++ b/src/stores/RoomScrollStateStore.ts
@@ -0,0 +1,53 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export interface ScrollState {
+    focussedEvent: string;
+    pixelOffset: number;
+}
+
+/**
+ * Stores where the user has scrolled to in each room
+ */
+export class RoomScrollStateStore {
+    // A map from room id to scroll state.
+    //
+    // If there is no special scroll state (ie, we are following the live
+    // timeline), the scroll state is null. Otherwise, it is an object with
+    // the following properties:
+    //
+    //    focussedEvent: the ID of the 'focussed' event. Typically this is
+    //        the last event fully visible in the viewport, though if we
+    //        have done an explicit scroll to an explicit event, it will be
+    //        that event.
+    //
+    //    pixelOffset: the number of pixels the window is scrolled down
+    //        from the focussedEvent.
+    private scrollStateMap = new Map<string, ScrollState>();
+
+    public getScrollState(roomId: string): ScrollState {
+        return this.scrollStateMap.get(roomId);
+    }
+
+    setScrollState(roomId: string, scrollState: ScrollState): void {
+        this.scrollStateMap.set(roomId, scrollState);
+    }
+}
+
+if (window.mxRoomScrollStateStore === undefined) {
+    window.mxRoomScrollStateStore = new RoomScrollStateStore();
+}
+export default window.mxRoomScrollStateStore;
diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index 4ce1c789a5..0415044d3a 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -31,6 +31,8 @@ import { Action } from "../dispatcher/actions";
 import { retry } from "../utils/promise";
 import CountlyAnalytics from "../CountlyAnalytics";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const NUM_JOIN_RETRY = 5;
 
 const INITIAL_STATE = {
@@ -54,8 +56,6 @@ const INITIAL_STATE = {
     // Any error that has occurred during loading
     roomLoadError: null,
 
-    forwardingEvent: null,
-
     quotingEvent: null,
 
     replyingToEvent: null,
@@ -98,7 +98,7 @@ class RoomViewStore extends Store<ActionPayload> {
         this.__emitChange();
     }
 
-    __onDispatch(payload) {
+    __onDispatch(payload) { // eslint-disable-line @typescript-eslint/naming-convention
         switch (payload.action) {
             // view_room:
             //      - room_alias:   '#somealias:matrix.org'
@@ -150,11 +150,6 @@ class RoomViewStore extends Store<ActionPayload> {
             case 'on_logged_out':
                 this.reset();
                 break;
-            case 'forward_event':
-                this.setState({
-                    forwardingEvent: payload.event,
-                });
-                break;
             case 'reply_to_event':
                 // If currently viewed room does not match the room in which we wish to reply then change rooms
                 // this can happen when performing a search across all rooms
@@ -171,9 +166,11 @@ class RoomViewStore extends Store<ActionPayload> {
                 }
                 break;
             case 'open_room_settings': {
+                // FIXME: Using an import will result in test failures
                 const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
                 Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
                     roomId: payload.room_id || this.state.roomId,
+                    initialTabId: payload.initial_tab_id,
                 }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
                 break;
             }
@@ -187,7 +184,6 @@ class RoomViewStore extends Store<ActionPayload> {
                 roomAlias: payload.room_alias,
                 initialEventId: payload.event_id,
                 isInitialEventHighlighted: payload.highlighted,
-                forwardingEvent: null,
                 roomLoading: false,
                 roomLoadError: null,
                 // should peek by default
@@ -207,14 +203,6 @@ class RoomViewStore extends Store<ActionPayload> {
                 newState.replyingToEvent = payload.replyingToEvent;
             }
 
-            if (this.state.forwardingEvent) {
-                dis.dispatch({
-                    action: 'send_event',
-                    room_id: newState.roomId,
-                    event: this.state.forwardingEvent,
-                });
-            }
-
             this.setState(newState);
 
             if (payload.auto_join) {
@@ -291,7 +279,7 @@ class RoomViewStore extends Store<ActionPayload> {
         const address = this.state.roomAlias || this.state.roomId;
         const viaServers = this.state.viaServers || [];
         try {
-            await retry<void, MatrixError>(() => cli.joinRoom(address, {
+            await retry<any, MatrixError>(() => cli.joinRoom(address, {
                 viaServers,
                 ...payload.opts,
             }), NUM_JOIN_RETRY, (err) => {
@@ -333,14 +321,14 @@ class RoomViewStore extends Store<ActionPayload> {
         });
         const err = payload.err;
         let msg = err.message ? err.message : JSON.stringify(err);
-        console.log("Failed to join room:", msg);
+        logger.log("Failed to join room:", msg);
 
         if (err.name === "ConnectionError") {
             msg = _t("There was an error joining the room");
         } else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
             msg = <div>
-                {_t("Sorry, your homeserver is too old to participate in this room.")}<br />
-                {_t("Please contact your homeserver administrator.")}
+                { _t("Sorry, your homeserver is too old to participate in this room.") }<br />
+                { _t("Please contact your homeserver administrator.") }
             </div>;
         } else if (err.httpStatus === 404) {
             const invitingUserId = this.getInvitingUserId(this.state.roomId);
@@ -355,6 +343,7 @@ class RoomViewStore extends Store<ActionPayload> {
             }
         }
 
+        // FIXME: Using an import will result in test failures
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {
             title: _t("Failed to join room"),
@@ -428,11 +417,6 @@ class RoomViewStore extends Store<ActionPayload> {
         return this.state.joinError;
     }
 
-    // The mxEvent if one is about to be forwarded
-    public getForwardingEvent() {
-        return this.state.forwardingEvent;
-    }
-
     // The mxEvent if one is currently being replied to/quoted
     public getQuotingEvent() {
         return this.state.replyingToEvent;
@@ -447,7 +431,7 @@ class RoomViewStore extends Store<ActionPayload> {
     }
 }
 
-let singletonRoomViewStore = null;
+let singletonRoomViewStore: RoomViewStore = null;
 if (!singletonRoomViewStore) {
     singletonRoomViewStore = new RoomViewStore();
 }
diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.ts
similarity index 72%
rename from src/stores/SetupEncryptionStore.js
rename to src/stores/SetupEncryptionStore.ts
index b768ae69df..14119af576 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.ts
@@ -15,29 +15,45 @@ limitations under the License.
 */
 
 import EventEmitter from 'events';
-import { MatrixClientPeg } from '../MatrixClientPeg';
-import { accessSecretStorage, AccessCancelledError } from '../SecurityManager';
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
+import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
 import { PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
-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
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import { accessSecretStorage, AccessCancelledError } from '../SecurityManager';
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+export enum Phase {
+    Loading = 0,
+    Intro = 1,
+    Busy = 2,
+    Done = 3, // final done stage, but still showing UX
+    ConfirmSkip = 4,
+    Finished = 5, // UX can be closed
+}
 
 export class SetupEncryptionStore extends EventEmitter {
-    static sharedInstance() {
-        if (!global.mx_SetupEncryptionStore) global.mx_SetupEncryptionStore = new SetupEncryptionStore();
-        return global.mx_SetupEncryptionStore;
+    private started: boolean;
+    public phase: Phase;
+    public verificationRequest: VerificationRequest;
+    public backupInfo: IKeyBackupInfo;
+    public keyId: string;
+    public keyInfo: ISecretStorageKeyInfo;
+    public hasDevicesToVerifyAgainst: boolean;
+
+    public static sharedInstance() {
+        if (!window.mxSetupEncryptionStore) window.mxSetupEncryptionStore = new SetupEncryptionStore();
+        return window.mxSetupEncryptionStore;
     }
 
-    start() {
-        if (this._started) {
+    public start(): void {
+        if (this.started) {
             return;
         }
-        this._started = true;
-        this.phase = PHASE_LOADING;
+        this.started = true;
+        this.phase = Phase.Loading;
         this.verificationRequest = null;
         this.backupInfo = null;
 
@@ -48,34 +64,34 @@ export class SetupEncryptionStore extends EventEmitter {
 
         const cli = MatrixClientPeg.get();
         cli.on("crypto.verification.request", this.onVerificationRequest);
-        cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+        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
             // another device after this screen has been shown, we'll switch to the new one, so this
             // generally doesn't support multiple requests.
-            this._setActiveVerificationRequest(requestsInProgress[requestsInProgress.length - 1]);
+            this.setActiveVerificationRequest(requestsInProgress[requestsInProgress.length - 1]);
         }
 
         this.fetchKeyInfo();
     }
 
-    stop() {
-        if (!this._started) {
+    public stop(): void {
+        if (!this.started) {
             return;
         }
-        this._started = false;
+        this.started = false;
         if (this.verificationRequest) {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
         }
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
-            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this.onUserTrustStatusChanged);
         }
     }
 
-    async fetchKeyInfo() {
+    public async fetchKeyInfo(): Promise<void> {
         const cli = MatrixClientPeg.get();
         const keys = await cli.isSecretStored('m.cross_signing.master', false);
         if (keys === null || Object.keys(keys).length === 0) {
@@ -97,15 +113,15 @@ export class SetupEncryptionStore extends EventEmitter {
 
         if (!this.hasDevicesToVerifyAgainst && !this.keyInfo) {
             // skip before we can even render anything.
-            this.phase = PHASE_FINISHED;
+            this.phase = Phase.Finished;
         } else {
-            this.phase = PHASE_INTRO;
+            this.phase = Phase.Intro;
         }
         this.emit("update");
     }
 
-    async usePassPhrase() {
-        this.phase = PHASE_BUSY;
+    public async usePassPhrase(): Promise<void> {
+        this.phase = Phase.Busy;
         this.emit("update");
         const cli = MatrixClientPeg.get();
         try {
@@ -120,7 +136,7 @@ export class SetupEncryptionStore extends EventEmitter {
             // passphase cached for that work. This dialog itself will only wait
             // on the first trust check, and the key backup restore will happen
             // in the background.
-            await new Promise((resolve, reject) => {
+            await new Promise((resolve: (value?: unknown) => void, reject: (reason?: any) => void) => {
                 accessSecretStorage(async () => {
                     await cli.checkOwnCrossSigningTrust();
                     resolve();
@@ -134,33 +150,33 @@ export class SetupEncryptionStore extends EventEmitter {
             });
 
             if (cli.getCrossSigningId()) {
-                this.phase = PHASE_DONE;
+                this.phase = Phase.Done;
                 this.emit("update");
             }
         } catch (e) {
             if (!(e instanceof AccessCancelledError)) {
-                console.log(e);
+                logger.log(e);
             }
             // this will throw if the user hits cancel, so ignore
-            this.phase = PHASE_INTRO;
+            this.phase = Phase.Intro;
             this.emit("update");
         }
     }
 
-    _onUserTrustStatusChanged = (userId) => {
+    private onUserTrustStatusChanged = (userId: string) => {
         if (userId !== MatrixClientPeg.get().getUserId()) return;
         const publicKeysTrusted = MatrixClientPeg.get().getCrossSigningId();
         if (publicKeysTrusted) {
-            this.phase = PHASE_DONE;
+            this.phase = Phase.Done;
             this.emit("update");
         }
-    }
+    };
 
-    onVerificationRequest = (request) => {
-        this._setActiveVerificationRequest(request);
-    }
+    public onVerificationRequest = (request: VerificationRequest): void => {
+        this.setActiveVerificationRequest(request);
+    };
 
-    onVerificationRequestChange = () => {
+    public onVerificationRequestChange = (): void => {
         if (this.verificationRequest.cancelled) {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
             this.verificationRequest = null;
@@ -172,34 +188,34 @@ export class SetupEncryptionStore extends EventEmitter {
             // cross signing to be ready to use, so wait for the user trust status to
             // change (or change to DONE if it's already ready).
             const publicKeysTrusted = MatrixClientPeg.get().getCrossSigningId();
-            this.phase = publicKeysTrusted ? PHASE_DONE : PHASE_BUSY;
+            this.phase = publicKeysTrusted ? Phase.Done : Phase.Busy;
             this.emit("update");
         }
-    }
+    };
 
-    skip() {
-        this.phase = PHASE_CONFIRM_SKIP;
+    public skip(): void {
+        this.phase = Phase.ConfirmSkip;
         this.emit("update");
     }
 
-    skipConfirm() {
-        this.phase = PHASE_FINISHED;
+    public skipConfirm(): void {
+        this.phase = Phase.Finished;
         this.emit("update");
     }
 
-    returnAfterSkip() {
-        this.phase = PHASE_INTRO;
+    public returnAfterSkip(): void {
+        this.phase = Phase.Intro;
         this.emit("update");
     }
 
-    done() {
-        this.phase = PHASE_FINISHED;
+    public done(): void {
+        this.phase = Phase.Finished;
         this.emit("update");
         // async - ask other clients for keys, if necessary
         MatrixClientPeg.get().crypto.cancelAndResendAllOutgoingKeyRequests();
     }
 
-    async _setActiveVerificationRequest(request) {
+    private async setActiveVerificationRequest(request: VerificationRequest): Promise<void> {
         if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
 
         if (this.verificationRequest) {
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.ts
similarity index 54%
rename from src/stores/SpaceStore.tsx
rename to src/stores/SpaceStore.ts
index 40997d30a8..bb22aa4dbb 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.ts
@@ -14,44 +14,58 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ListIteratee, Many, 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";
+import { ListIteratee, Many, 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";
+import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
+import { IRoomCapability } from "matrix-js-sdk/src/client";
 
-import {AsyncStoreWithClient} from "./AsyncStoreWithClient";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
 import defaultDispatcher from "../dispatcher/dispatcher";
-import {ActionPayload} from "../dispatcher/payloads";
+import { ActionPayload } from "../dispatcher/payloads";
 import RoomListStore from "./room-list/RoomListStore";
 import SettingsStore from "../settings/SettingsStore";
 import DMRoomMap from "../utils/DMRoomMap";
-import {FetchRoomFn} from "./notifications/ListNotificationState";
-import {SpaceNotificationState} from "./notifications/SpaceNotificationState";
-import {RoomNotificationStateStore} from "./notifications/RoomNotificationStateStore";
-import {DefaultTagID} from "./room-list/models";
-import {EnhancedMap, mapDiff} from "../utils/maps";
-import {setHasDiff} from "../utils/sets";
-import {ISpaceSummaryEvent, ISpaceSummaryRoom} from "../components/structures/SpaceRoomDirectory";
+import { FetchRoomFn } from "./notifications/ListNotificationState";
+import { SpaceNotificationState } from "./notifications/SpaceNotificationState";
+import { RoomNotificationStateStore } from "./notifications/RoomNotificationStateStore";
+import { DefaultTagID } from "./room-list/models";
+import { EnhancedMap, mapDiff } from "../utils/maps";
+import { setHasDiff } from "../utils/sets";
 import RoomViewStore from "./RoomViewStore";
+import { Action } from "../dispatcher/actions";
+import { arrayHasDiff, arrayHasOrderChange } from "../utils/arrays";
+import { objectDiff } from "../utils/objects";
+import { reorderLexicographically } from "../utils/stringOrderField";
+import { TAG_ORDER } from "../components/views/rooms/RoomList";
+import { SettingUpdatedPayload } from "../dispatcher/payloads/SettingUpdatedPayload";
+
+type SpaceKey = string | symbol;
 
 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_INVITED_SPACES = Symbol("invited-spaces");
 export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
-// Space Room ID will be emitted when a Space's children change
+export const UPDATE_HOME_BEHAVIOUR = Symbol("home-behaviour");
+// Space Room ID/HOME_SPACE will be emitted when a Space's children change
 
-export interface ISuggestedRoom extends ISpaceSummaryRoom {
+export interface ISuggestedRoom extends IHierarchyRoom {
     viaServers: string[];
 }
 
 const MAX_SUGGESTED_ROOMS = 20;
 
-const getSpaceContextKey = (space?: Room) => `mx_space_context_${space?.roomId || "ALL_ROOMS"}`;
+// This setting causes the page to reload and can be costly if read frequently, so read it here only
+const spacesEnabled = !SettingsStore.getValue("showCommunitiesInsteadOfSpaces");
+
+const getSpaceContextKey = (space?: Room) => `mx_space_context_${space?.roomId || "HOME_SPACE"}`;
 
 const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
     return arr.reduce((result, room: Room) => {
@@ -60,41 +74,48 @@ const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces,
     }, [[], []]);
 };
 
-// For sorting space children using a validated `order`, `m.room.create`'s `origin_server_ts`, `room_id`
-export const getOrder = (order: string, creationTs: number, roomId: string): Array<Many<ListIteratee<any>>> => {
-    let validatedOrder: string = null;
-
-    if (typeof order === "string" && Array.from(order).every((c: string) => {
+const validOrder = (order: string): string | undefined => {
+    if (typeof order === "string" && order.length <= 50 && Array.from(order).every((c: string) => {
         const charCode = c.charCodeAt(0);
         return charCode >= 0x20 && charCode <= 0x7E;
     })) {
-        validatedOrder = order;
+        return order;
     }
+};
 
-    return [validatedOrder, creationTs, roomId];
-}
+// For sorting space children using a validated `order`, `m.room.create`'s `origin_server_ts`, `room_id`
+export const getChildOrder = (order: string, creationTs: number, roomId: string): Array<Many<ListIteratee<any>>> => {
+    return [validOrder(order) ?? NaN, creationTs, roomId]; // NaN has lodash sort it at the end in asc
+};
 
 const getRoomFn: FetchRoomFn = (room: Room) => {
     return RoomNotificationStateStore.instance.getRoomState(room);
 };
 
 export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
-    constructor() {
-        super(defaultDispatcher, {});
-    }
-
     // The spaces representing the roots of the various tree-like hierarchies
     private rootSpaces: Room[] = [];
+    // The list of rooms not present in any currently joined spaces
+    private orphanedRooms = new Set<string>();
     // Map from room ID to set of spaces which list it as a child
     private parentMap = new EnhancedMap<string, Set<string>>();
-    // Map from spaceId to SpaceNotificationState instance representing that space
-    private notificationStateMap = new Map<string, SpaceNotificationState>();
+    // Map from SpaceKey to SpaceNotificationState instance representing that space
+    private notificationStateMap = new Map<SpaceKey, SpaceNotificationState>();
     // Map from space key to Set of room IDs that should be shown as part of that space's filter
-    private spaceFilteredRooms = new Map<string, Set<string>>();
-    // The space currently selected in the Space Panel - if null then All Rooms is selected
+    private spaceFilteredRooms = new Map<SpaceKey, Set<string>>();
+    // The space currently selected in the Space Panel - if null then Home is selected
     private _activeSpace?: Room = null;
     private _suggestedRooms: ISuggestedRoom[] = [];
     private _invitedSpaces = new Set<Room>();
+    private spaceOrderLocalEchoMap = new Map<string, string>();
+    private _restrictedJoinRuleSupport?: IRoomCapability;
+    private _allRoomsInHome: boolean = SettingsStore.getValue("Spaces.allRoomsInHome");
+
+    constructor() {
+        super(defaultDispatcher, {});
+
+        SettingsStore.monitorSetting("Spaces.allRoomsInHome", null);
+    }
 
     public get invitedSpaces(): Room[] {
         return Array.from(this._invitedSpaces);
@@ -112,6 +133,48 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         return this._suggestedRooms;
     }
 
+    public get allRoomsInHome(): boolean {
+        return this._allRoomsInHome;
+    }
+
+    public setActiveRoomInSpace(space: Room | null): void {
+        if (space && !space.isSpaceRoom()) return;
+        if (space !== this.activeSpace) this.setActiveSpace(space);
+
+        if (space) {
+            const roomId = this.getNotificationState(space.roomId).getFirstRoomWithNotifications();
+            defaultDispatcher.dispatch({
+                action: "view_room",
+                room_id: roomId,
+                context_switch: true,
+            });
+        } else {
+            const lists = RoomListStore.instance.unfilteredLists;
+            for (let i = 0; i < TAG_ORDER.length; i++) {
+                const t = TAG_ORDER[i];
+                const listRooms = lists[t];
+                const unreadRoom = listRooms.find((r: Room) => {
+                    if (this.showInHomeSpace(r)) {
+                        const state = RoomNotificationStateStore.instance.getRoomState(r);
+                        return state.isUnread;
+                    }
+                });
+                if (unreadRoom) {
+                    defaultDispatcher.dispatch({
+                        action: "view_room",
+                        room_id: unreadRoom.roomId,
+                        context_switch: true,
+                    });
+                    break;
+                }
+            }
+        }
+    }
+
+    public get restrictedJoinRuleSupport(): IRoomCapability {
+        return this._restrictedJoinRuleSupport;
+    }
+
     /**
      * Sets the active space, updates room list filters,
      * optionally switches the user's room back to where they were when they last viewed that space.
@@ -119,8 +182,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
      * @param contextSwitch whether to switch the user's context,
      * should not be done when the space switch is done implicitly due to another event like switching room.
      */
-    public async setActiveSpace(space: Room | null, contextSwitch = true) {
-        if (space === this.activeSpace || (space && !space?.isSpaceRoom())) return;
+    public setActiveSpace(space: Room | null, contextSwitch = true) {
+        if (!this.matrixClient || space === this.activeSpace || (space && !space.isSpaceRoom())) return;
 
         this._activeSpace = space;
         this.emit(UPDATE_SELECTED_SPACE, this.activeSpace);
@@ -133,8 +196,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             // if the space being selected is an invite then always view that invite
             // else if the last viewed room in this space is joined then view that
             // else view space home or home depending on what is being clicked on
-            if (space?.getMyMembership !== "invite" &&
-                this.matrixClient?.getRoom(roomId)?.getMyMembership() === "join"
+            if (space?.getMyMembership() !== "invite" &&
+                this.matrixClient.getRoom(roomId)?.getMyMembership() === "join" &&
+                this.getSpaceFilteredRoomIds(space).has(roomId)
             ) {
                 defaultDispatcher.dispatch({
                     action: "view_room",
@@ -162,31 +226,34 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         }
 
         if (space) {
-            const suggestedRooms = await this.fetchSuggestedRooms(space);
-            if (this._activeSpace === space) {
-                this._suggestedRooms = suggestedRooms;
-                this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
-            }
+            this.loadSuggestedRooms(space);
+        }
+    }
+
+    private async loadSuggestedRooms(space: Room): Promise<void> {
+        const suggestedRooms = await this.fetchSuggestedRooms(space);
+        if (this._activeSpace === space) {
+            this._suggestedRooms = suggestedRooms;
+            this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
         }
     }
 
     public fetchSuggestedRooms = async (space: Room, limit = MAX_SUGGESTED_ROOMS): Promise<ISuggestedRoom[]> => {
         try {
-            const data: {
-                rooms: ISpaceSummaryRoom[];
-                events: ISpaceSummaryEvent[];
-            } = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, limit);
+            const { rooms } = await this.matrixClient.getRoomHierarchy(space.roomId, limit, 1, true);
 
             const viaMap = new EnhancedMap<string, Set<string>>();
-            data.events.forEach(ev => {
-                if (ev.type === EventType.SpaceChild && ev.content.via?.length) {
-                    ev.content.via.forEach(via => {
-                        viaMap.getOrCreate(ev.state_key, new Set()).add(via);
-                    });
-                }
+            rooms.forEach(room => {
+                room.children_state.forEach(ev => {
+                    if (ev.type === EventType.SpaceChild && ev.content.via?.length) {
+                        ev.content.via.forEach(via => {
+                            viaMap.getOrCreate(ev.state_key, new Set()).add(via);
+                        });
+                    }
+                });
             });
 
-            return data.rooms.filter(roomInfo => {
+            return rooms.filter(roomInfo => {
                 return roomInfo.room_type !== RoomType.Space
                     && this.matrixClient.getRoom(roomInfo.room_id)?.getMyMembership() !== "join";
             }).map(roomInfo => ({
@@ -207,14 +274,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         }, roomId);
     }
 
-    private getChildren(spaceId: string): Room[] {
+    public getChildren(spaceId: string): Room[] {
         const room = this.matrixClient?.getRoom(spaceId);
         const childEvents = room?.currentState.getStateEvents(EventType.SpaceChild).filter(ev => ev.getContent()?.via);
         return sortBy(childEvents, ev => {
             const roomId = ev.getStateKey();
             const childRoom = this.matrixClient?.getRoom(roomId);
             const createTs = childRoom?.currentState.getStateEvents(EventType.RoomCreate, "")?.getTs();
-            return getOrder(ev.getContent().order, createTs, roomId);
+            return getChildOrder(ev.getContent().order, createTs, roomId);
         }).map(ev => {
             return this.matrixClient.getRoom(ev.getStateKey());
         }).filter(room => {
@@ -232,16 +299,22 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     public getParents(roomId: string, canonicalOnly = false): Room[] {
+        const userId = this.matrixClient?.getUserId();
         const room = this.matrixClient?.getRoom(roomId);
         return room?.currentState.getStateEvents(EventType.SpaceParent)
-            .filter(ev => {
+            .map(ev => {
                 const content = ev.getContent();
-                if (!content?.via?.length) return false;
-                // TODO apply permissions check to verify that the parent mapping is valid
-                if (canonicalOnly && !content?.canonical) return false;
-                return true;
+                if (Array.isArray(content?.via) && (!canonicalOnly || content?.canonical)) {
+                    const parent = this.matrixClient.getRoom(ev.getStateKey());
+                    // only respect the relationship if the sender has sufficient permissions in the parent to set
+                    // child relations, as per MSC1772.
+                    // https://github.com/matrix-org/matrix-doc/blob/main/proposals/1772-groups-as-rooms.md#relationship-between-rooms-and-spaces
+                    if (parent?.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+                        return parent;
+                    }
+                }
+                // else implicit undefined which causes this element to be filtered out
             })
-            .map(ev => this.matrixClient.getRoom(ev.getStateKey()))
             .filter(Boolean) || [];
     }
 
@@ -250,14 +323,20 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         return sortBy(parents, r => r.roomId)?.[0] || null;
     }
 
+    public getKnownParents(roomId: string): Set<string> {
+        return this.parentMap.get(roomId) || new Set();
+    }
+
     public getSpaceFilteredRoomIds = (space: Room | null): Set<string> => {
-        if (!space) {
+        if (!space && this.allRoomsInHome) {
             return new Set(this.matrixClient.getVisibleRooms().map(r => r.roomId));
         }
-        return this.spaceFilteredRooms.get(space.roomId) || new Set();
+        return this.spaceFilteredRooms.get(space?.roomId || HOME_SPACE) || new Set();
     };
 
     private rebuild = throttle(() => {
+        if (!this.matrixClient) return;
+
         const [visibleSpaces, visibleRooms] = partitionSpacesAndRooms(this.matrixClient.getVisibleRooms());
         const [joinedSpaces, invitedSpaces] = visibleSpaces.reduce((arr, s) => {
             if (s.getMyMembership() === "join") {
@@ -285,7 +364,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             });
         });
 
-        const [rootSpaces] = partitionSpacesAndRooms(Array.from(unseenChildren));
+        const [rootSpaces, orphanedRooms] = partitionSpacesAndRooms(Array.from(unseenChildren));
 
         // somewhat algorithm to handle full-cycles
         const detachedNodes = new Set<Room>(spaces);
@@ -326,7 +405,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         //     rootSpaces.push(space);
         // });
 
-        this.rootSpaces = rootSpaces;
+        this.orphanedRooms = new Set(orphanedRooms.map(r => r.roomId));
+        this.rootSpaces = this.sortRootSpaces(rootSpaces);
         this.parentMap = backrefs;
 
         // if the currently selected space no longer exists, remove its selection
@@ -338,13 +418,33 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         this.emit(UPDATE_TOP_LEVEL_SPACES, this.spacePanelSpaces);
 
         // build initial state of invited spaces as we would have missed the emitted events about the room at launch
-        this._invitedSpaces = new Set(invitedSpaces);
+        this._invitedSpaces = new Set(this.sortRootSpaces(invitedSpaces));
         this.emit(UPDATE_INVITED_SPACES, this.invitedSpaces);
-    }, 100, {trailing: true, leading: true});
+    }, 100, { trailing: true, leading: true });
 
-    onSpaceUpdate = () => {
+    private onSpaceUpdate = () => {
         this.rebuild();
-    }
+    };
+
+    private showInHomeSpace = (room: Room) => {
+        if (this.allRoomsInHome) return true;
+        if (room.isSpaceRoom()) return false;
+        return !this.parentMap.get(room.roomId)?.size // put all orphaned rooms in the Home Space
+            || DMRoomMap.shared().getUserIdForRoomId(room.roomId) // put all DMs in the Home Space
+            || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite); // show all favourites
+    };
+
+    // Update a given room due to its tag changing (e.g DM-ness or Fav-ness)
+    // This can only change whether it shows up in the HOME_SPACE or not
+    private onRoomUpdate = (room: Room) => {
+        if (this.showInHomeSpace(room)) {
+            this.spaceFilteredRooms.get(HOME_SPACE)?.add(room.roomId);
+            this.emit(HOME_SPACE);
+        } else if (!this.orphanedRooms.has(room.roomId)) {
+            this.spaceFilteredRooms.get(HOME_SPACE)?.delete(room.roomId);
+            this.emit(HOME_SPACE);
+        }
+    };
 
     private onSpaceMembersChange = (ev: MatrixEvent) => {
         // skip this update if we do not have a DM with this user
@@ -359,6 +459,26 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         const oldFilteredRooms = this.spaceFilteredRooms;
         this.spaceFilteredRooms = new Map();
 
+        if (!this.allRoomsInHome) {
+            // put all room invites in the Home Space
+            const invites = visibleRooms.filter(r => !r.isSpaceRoom() && r.getMyMembership() === "invite");
+            this.spaceFilteredRooms.set(HOME_SPACE, new Set<string>(invites.map(room => room.roomId)));
+
+            visibleRooms.forEach(room => {
+                if (this.showInHomeSpace(room)) {
+                    this.spaceFilteredRooms.get(HOME_SPACE).add(room.roomId);
+                }
+            });
+        }
+
+        const hiddenChildren = new EnhancedMap<string, Set<string>>();
+        visibleRooms.forEach(room => {
+            if (room.getMyMembership() !== "join") return;
+            this.getParents(room.roomId).forEach(parent => {
+                hiddenChildren.getOrCreate(parent.roomId, new Set()).add(room.roomId);
+            });
+        });
+
         this.rootSpaces.forEach(s => {
             // traverse each space tree in DFS to build up the supersets as you go up,
             // reusing results from like subtrees.
@@ -388,6 +508,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                         roomIds.add(roomId);
                     });
                 });
+                hiddenChildren.get(spaceId)?.forEach(roomId => {
+                    roomIds.add(roomId);
+                });
                 this.spaceFilteredRooms.set(spaceId, roomIds);
                 return roomIds;
             };
@@ -403,17 +526,20 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         });
 
         this.spaceFilteredRooms.forEach((roomIds, s) => {
+            if (this.allRoomsInHome && s === HOME_SPACE) return; // we'll be using the global notification state, skip
+
             // Update NotificationStates
-            this.getNotificationState(s)?.setRooms(visibleRooms.filter(room => {
-                if (roomIds.has(room.roomId)) {
-                    return !DMRoomMap.shared().getUserIdForRoomId(room.roomId)
-                        || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite);
+            this.getNotificationState(s).setRooms(visibleRooms.filter(room => {
+                if (!roomIds.has(room.roomId) || room.isSpaceRoom()) return false;
+
+                if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+                    return s === HOME_SPACE;
                 }
 
-                return false;
+                return true;
             }));
         });
-    }, 100, {trailing: true, leading: true});
+    }, 100, { trailing: true, leading: true });
 
     private switchToRelatedSpace = (roomId: string) => {
         if (this.suggestedRooms.find(r => r.room_id === roomId)) return;
@@ -423,8 +549,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(roomId));
         }
         if (!parent) {
-            const parents = Array.from(this.parentMap.get(roomId) || []);
-            parent = parents.find(p => this.matrixClient.getRoom(p));
+            const parentIds = Array.from(this.parentMap.get(roomId) || []);
+            for (const parentId of parentIds) {
+                const room = this.matrixClient.getRoom(parentId);
+                if (room) {
+                    parent = room;
+                    break;
+                }
+            }
         }
 
         // don't trigger a context switch when we are switching a space to match the chosen room
@@ -432,11 +564,18 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     };
 
     private onRoom = (room: Room, newMembership?: string, oldMembership?: string) => {
-        const membership = newMembership || room.getMyMembership();
+        const roomMembership = room.getMyMembership();
+        if (!roomMembership) {
+            // room is still being baked in the js-sdk, we'll process it at Room.myMembership instead
+            return;
+        }
+        const membership = newMembership || roomMembership;
 
         if (!room.isSpaceRoom()) {
             // this.onRoomUpdate(room);
-            this.onRoomsUpdate();
+            // this.onRoomsUpdate();
+            // ideally we only need onRoomsUpdate here but it doesn't rebuild parentMap so always adds new rooms to Home
+            this.rebuild();
 
             if (membership === "join") {
                 // the user just joined a room, remove it from the suggested list if it was there
@@ -469,9 +608,20 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         if (membership === "join" && room.roomId === RoomViewStore.getRoomId()) {
             // if the user was looking at the space and then joined: select that space
             this.setActiveSpace(room, false);
+        } else if (membership === "leave" && room.roomId === this.activeSpace?.roomId) {
+            // user's active space has gone away, go back to home
+            this.setActiveSpace(null, true);
         }
     };
 
+    private notifyIfOrderChanged(): void {
+        const rootSpaces = this.sortRootSpaces(this.rootSpaces);
+        if (arrayHasOrderChange(this.rootSpaces, rootSpaces)) {
+            this.rootSpaces = rootSpaces;
+            this.emit(UPDATE_TOP_LEVEL_SPACES, this.spacePanelSpaces);
+        }
+    }
+
     private onRoomState = (ev: MatrixEvent) => {
         const room = this.matrixClient.getRoom(ev.getRoomId());
         if (!room) return;
@@ -482,6 +632,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                     this.onSpaceUpdate();
                     this.emit(room.roomId);
                 }
+
+                if (room === this.activeSpace && // current space
+                    this.matrixClient.getRoom(ev.getStateKey())?.getMyMembership() !== "join" && // target not joined
+                    ev.getPrevContent().suggested !== ev.getContent().suggested // suggested flag changed
+                ) {
+                    this.loadSuggestedRooms(room);
+                }
+
                 break;
 
             case EventType.SpaceParent:
@@ -489,20 +647,69 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                 // TODO confirm this after implementing parenting behaviour
                 if (room.isSpaceRoom()) {
                     this.onSpaceUpdate();
+                } else if (!this.allRoomsInHome) {
+                    this.onRoomUpdate(room);
                 }
                 this.emit(room.roomId);
                 break;
 
-            case EventType.RoomMember:
+            case EventType.RoomPowerLevels:
                 if (room.isSpaceRoom()) {
-                    this.onSpaceMembersChange(ev);
+                    this.onRoomsUpdate();
                 }
                 break;
         }
     };
 
+    // listening for m.room.member events in onRoomState above doesn't work as the Member object isn't updated by then
+    private onRoomStateMembers = (ev: MatrixEvent) => {
+        const room = this.matrixClient.getRoom(ev.getRoomId());
+        if (room?.isSpaceRoom()) {
+            this.onSpaceMembersChange(ev);
+        }
+    };
+
+    private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEv?: MatrixEvent) => {
+        if (!room.isSpaceRoom()) return;
+
+        if (ev.getType() === EventType.SpaceOrder) {
+            this.spaceOrderLocalEchoMap.delete(room.roomId); // clear any local echo
+            const order = ev.getContent()?.order;
+            const lastOrder = lastEv?.getContent()?.order;
+            if (order !== lastOrder) {
+                this.notifyIfOrderChanged();
+            }
+        } else if (ev.getType() === EventType.Tag && !this.allRoomsInHome) {
+            // If the room was in favourites and now isn't or the opposite then update its position in the trees
+            const oldTags = lastEv?.getContent()?.tags || {};
+            const newTags = ev.getContent()?.tags || {};
+            if (!!oldTags[DefaultTagID.Favourite] !== !!newTags[DefaultTagID.Favourite]) {
+                this.onRoomUpdate(room);
+            }
+        }
+    };
+
+    private onAccountData = (ev: MatrixEvent, lastEvent: MatrixEvent) => {
+        if (!this.allRoomsInHome && ev.getType() === EventType.Direct) {
+            const lastContent = lastEvent.getContent();
+            const content = ev.getContent();
+
+            const diff = objectDiff<Record<string, string[]>>(lastContent, content);
+            // filter out keys which changed by reference only by checking whether the sets differ
+            const changed = diff.changed.filter(k => arrayHasDiff(lastContent[k], content[k]));
+            // DM tag changes, refresh relevant rooms
+            new Set([...diff.added, ...diff.removed, ...changed]).forEach(roomId => {
+                const room = this.matrixClient?.getRoom(roomId);
+                if (room) {
+                    this.onRoomUpdate(room);
+                }
+            });
+        }
+    };
+
     protected async reset() {
         this.rootSpaces = [];
+        this.orphanedRooms = new Set();
         this.parentMap = new EnhancedMap();
         this.notificationStateMap = new Map();
         this.spaceFilteredRooms = new Map();
@@ -512,32 +719,44 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     protected async onNotReady() {
-        if (!SettingsStore.getValue("feature_spaces")) return;
+        if (!SpaceStore.spacesEnabled) return;
         if (this.matrixClient) {
             this.matrixClient.removeListener("Room", this.onRoom);
             this.matrixClient.removeListener("Room.myMembership", this.onRoom);
+            this.matrixClient.removeListener("Room.accountData", this.onRoomAccountData);
             this.matrixClient.removeListener("RoomState.events", this.onRoomState);
+            this.matrixClient.removeListener("RoomState.members", this.onRoomStateMembers);
+            this.matrixClient.removeListener("accountData", this.onAccountData);
         }
         await this.reset();
     }
 
     protected async onReady() {
-        if (!SettingsStore.getValue("feature_spaces")) return;
+        if (!spacesEnabled) return;
         this.matrixClient.on("Room", this.onRoom);
         this.matrixClient.on("Room.myMembership", this.onRoom);
+        this.matrixClient.on("Room.accountData", this.onRoomAccountData);
         this.matrixClient.on("RoomState.events", this.onRoomState);
+        this.matrixClient.on("RoomState.members", this.onRoomStateMembers);
+        this.matrixClient.on("accountData", this.onAccountData);
+
+        this.matrixClient.getCapabilities().then(capabilities => {
+            this._restrictedJoinRuleSupport = capabilities
+                ?.["m.room_versions"]?.["org.matrix.msc3244.room_capabilities"]?.["restricted"];
+        });
 
         await this.onSpaceUpdate(); // trigger an initial update
 
         // restore selected state from last session if any and still valid
         const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY);
         if (lastSpaceId) {
-            this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId));
+            // don't context switch here as it may break permalinks
+            this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId), false);
         }
     }
 
     protected async onAction(payload: ActionPayload) {
-        if (!SettingsStore.getValue("feature_spaces")) return;
+        if (!spacesEnabled) return;
         switch (payload.action) {
             case "view_room": {
                 // Don't auto-switch rooms when reacting to a context-switch
@@ -550,7 +769,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                     // Don't context switch when navigating to the space room
                     // as it will cause you to end up in the wrong room
                     this.setActiveSpace(room, false);
-                } else if (this.activeSpace && !this.getSpaceFilteredRoomIds(this.activeSpace).has(roomId)) {
+                } else if (
+                    (!this.allRoomsInHome || this.activeSpace) &&
+                    !this.getSpaceFilteredRoomIds(this.activeSpace).has(roomId)
+                ) {
                     this.switchToRelatedSpace(roomId);
                 }
 
@@ -560,15 +782,38 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                 window.localStorage.setItem(getSpaceContextKey(this.activeSpace), payload.room_id);
                 break;
             }
+
             case "after_leave_room":
                 if (this._activeSpace && payload.room_id === this._activeSpace.roomId) {
                     this.setActiveSpace(null, false);
                 }
                 break;
+
+            case Action.SwitchSpace:
+                // 1 is Home, 2-9 are the spaces after Home
+                if (payload.num === 1) {
+                    this.setActiveSpace(null);
+                } else if (this.spacePanelSpaces.length >= payload.num) {
+                    this.setActiveSpace(this.spacePanelSpaces[payload.num - 2]);
+                }
+                break;
+
+            case Action.SettingUpdated: {
+                const settingUpdatedPayload = payload as SettingUpdatedPayload;
+                if (settingUpdatedPayload.settingName === "Spaces.allRoomsInHome") {
+                    const newValue = SettingsStore.getValue("Spaces.allRoomsInHome");
+                    if (this.allRoomsInHome !== newValue) {
+                        this._allRoomsInHome = newValue;
+                        this.emit(UPDATE_HOME_BEHAVIOUR, this.allRoomsInHome);
+                        this.rebuild(); // rebuild everything
+                    }
+                }
+                break;
+            }
         }
     }
 
-    public getNotificationState(key: string): SpaceNotificationState {
+    public getNotificationState(key: SpaceKey): SpaceNotificationState {
         if (this.notificationStateMap.has(key)) {
             return this.notificationStateMap.get(key);
         }
@@ -599,9 +844,43 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         }
         childSpaces.forEach(s => this.traverseSpace(s.roomId, fn, includeRooms, newPath));
     }
+
+    private getSpaceTagOrdering = (space: Room): string | undefined => {
+        if (this.spaceOrderLocalEchoMap.has(space.roomId)) return this.spaceOrderLocalEchoMap.get(space.roomId);
+        return validOrder(space.getAccountData(EventType.SpaceOrder)?.getContent()?.order);
+    };
+
+    private sortRootSpaces(spaces: Room[]): Room[] {
+        return sortBy(spaces, [this.getSpaceTagOrdering, "roomId"]);
+    }
+
+    private async setRootSpaceOrder(space: Room, order: string): Promise<void> {
+        this.spaceOrderLocalEchoMap.set(space.roomId, order);
+        try {
+            await this.matrixClient.setRoomAccountData(space.roomId, EventType.SpaceOrder, { order });
+        } catch (e) {
+            console.warn("Failed to set root space order", e);
+            if (this.spaceOrderLocalEchoMap.get(space.roomId) === order) {
+                this.spaceOrderLocalEchoMap.delete(space.roomId);
+            }
+        }
+    }
+
+    public moveRootSpace(fromIndex: number, toIndex: number): void {
+        const currentOrders = this.rootSpaces.map(this.getSpaceTagOrdering);
+        const changes = reorderLexicographically(currentOrders, fromIndex, toIndex);
+
+        changes.forEach(({ index, order }) => {
+            this.setRootSpaceOrder(this.rootSpaces[index], order);
+        });
+
+        this.notifyIfOrderChanged();
+    }
 }
 
 export default class SpaceStore {
+    public static spacesEnabled = spacesEnabled;
+
     private static internalInstance = new SpaceStoreClass();
 
     public static get instance(): SpaceStoreClass {
diff --git a/src/stores/ThreepidInviteStore.ts b/src/stores/ThreepidInviteStore.ts
index 06cfad2c6b..9b597ba877 100644
--- a/src/stores/ThreepidInviteStore.ts
+++ b/src/stores/ThreepidInviteStore.ts
@@ -16,6 +16,7 @@ limitations under the License.
 
 import EventEmitter from "events";
 import { base32 } from "rfc4648";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
 
 // Dev note: the interface is split in two so we don't have to disable the
 // linter across the whole project.
@@ -45,6 +46,19 @@ export interface IThreepidInvite {
     inviterName: string;
 }
 
+// Any data about the room that would normally come from the homeserver
+// but has been passed out-of-band, eg. the room name and avatar URL
+// from an email invite (a workaround for the fact that we can't
+// get this information from the HS using an email invite).
+export interface IOOBData {
+    name?: string; // The room's name
+    avatarUrl?: string; // The mxc:// avatar URL for the room
+    inviterName?: string; // The display name of the person who invited us to the room
+    // eslint-disable-next-line camelcase
+    room_name?: string; // The name of the room, to be used until we are told better by the server
+    roomType?: RoomType; // The type of the room, to be used until we are told better by the server
+}
+
 const STORAGE_PREFIX = "mx_threepid_invite_";
 
 export default class ThreepidInviteStore extends EventEmitter {
@@ -58,7 +72,7 @@ export default class ThreepidInviteStore extends EventEmitter {
     }
 
     public storeInvite(roomId: string, wireInvite: IThreepidInviteWireFormat): IThreepidInvite {
-        const invite = <IPersistedThreepidInvite>{roomId, ...wireInvite};
+        const invite = <IPersistedThreepidInvite>{ roomId, ...wireInvite };
         const id = this.generateIdOf(invite);
         localStorage.setItem(`${STORAGE_PREFIX}${id}`, JSON.stringify(invite));
         return this.translateInvite(invite);
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 850c3cb026..5e51de3e26 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -22,10 +22,11 @@ export interface IToast<C extends ComponentClass> {
     key: string;
     // higher priority number will be shown on top of lower priority
     priority: number;
-    title: string;
+    title?: string;
     icon?: string;
     component: C;
     className?: string;
+    bodyClassName?: string;
     props?: Omit<React.ComponentProps<C>, "toastKey">; // toastKey is injected by ToastContainer
 }
 
diff --git a/src/stores/TypingStore.ts b/src/stores/TypingStore.ts
index d5177a33a0..9781c93eb4 100644
--- a/src/stores/TypingStore.ts
+++ b/src/stores/TypingStore.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from "../MatrixClientPeg";
+import { MatrixClientPeg } from "../MatrixClientPeg";
 import SettingsStore from "../settings/SettingsStore";
 import Timer from "../utils/Timer";
 
@@ -27,10 +27,10 @@ const TYPING_SERVER_TIMEOUT = 30000;
 export default class TypingStore {
     private typingStates: {
         [roomId: string]: {
-            isTyping: boolean,
-            userTimer: Timer,
-            serverTimer: Timer,
-        },
+            isTyping: boolean;
+            userTimer: Timer;
+            serverTimer: Timer;
+        };
     };
 
     constructor() {
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index 7511527eb0..b89af2f7c0 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -15,7 +15,11 @@ limitations under the License.
 */
 
 import EventEmitter from "events";
-import ResizeObserver from 'resize-observer-polyfill';
+// XXX: resize-observer-polyfill has types that now conflict with typescript's
+// own DOM types: https://github.com/que-etc/resize-observer-polyfill/issues/80
+// Using require here rather than import is a horrenous workaround. We should
+// be able to remove the polyfill once Safari 14 is released.
+const ResizeObserverPolyfill = require('resize-observer-polyfill'); // eslint-disable-line @typescript-eslint/no-var-requires
 import ResizeObserverEntry from 'resize-observer-polyfill/src/ResizeObserverEntry';
 
 export enum UI_EVENTS {
@@ -43,7 +47,7 @@ export default class UIStore extends EventEmitter {
         // eslint-disable-next-line no-restricted-properties
         this.windowHeight = window.innerHeight;
 
-        this.resizeObserver = new ResizeObserver(this.resizeObserverCallback);
+        this.resizeObserver = new ResizeObserverPolyfill(this.resizeObserverCallback);
         this.resizeObserver.observe(document.body);
     }
 
@@ -106,7 +110,7 @@ export default class UIStore extends EventEmitter {
         });
 
         this.emit(UI_EVENTS.Resize, entries);
-    }
+    };
 }
 
 window.mxUIStore = UIStore.instance;
diff --git a/src/stores/VoiceRecordingStore.ts b/src/stores/VoiceRecordingStore.ts
index 8ee44359fb..df837fec88 100644
--- a/src/stores/VoiceRecordingStore.ts
+++ b/src/stores/VoiceRecordingStore.ts
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AsyncStoreWithClient} from "./AsyncStoreWithClient";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
 import defaultDispatcher from "../dispatcher/dispatcher";
-import {ActionPayload} from "../dispatcher/payloads";
-import {VoiceRecording} from "../voice/VoiceRecording";
+import { ActionPayload } from "../dispatcher/payloads";
+import { VoiceRecording } from "../audio/VoiceRecording";
 
 interface IState {
     recording?: VoiceRecording;
@@ -62,7 +62,7 @@ export class VoiceRecordingStore extends AsyncStoreWithClient<IState> {
         const recording = new VoiceRecording(this.matrixClient);
 
         // noinspection JSIgnoredPromiseFromCall - we can safely run this async
-        this.updateState({recording});
+        this.updateState({ recording });
 
         return recording;
     }
@@ -75,7 +75,7 @@ export class VoiceRecordingStore extends AsyncStoreWithClient<IState> {
         if (this.state.recording) {
             this.state.recording.destroy(); // stops internally
         }
-        return this.updateState({recording: null});
+        return this.updateState({ recording: null });
     }
 }
 
diff --git a/src/stores/WidgetEchoStore.ts b/src/stores/WidgetEchoStore.ts
index 09120d6108..d3ef9df023 100644
--- a/src/stores/WidgetEchoStore.ts
+++ b/src/stores/WidgetEchoStore.ts
@@ -16,8 +16,8 @@ limitations under the License.
 
 import EventEmitter from 'events';
 import { IWidget } from 'matrix-widget-api';
-import MatrixEvent from "matrix-js-sdk/src/models/event";
-import {WidgetType} from "../widgets/WidgetType";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { WidgetType } from "../widgets/WidgetType";
 
 /**
  * Acts as a place to get & set widget state, storing local echo state and
@@ -26,8 +26,8 @@ import {WidgetType} from "../widgets/WidgetType";
 class WidgetEchoStore extends EventEmitter {
     private roomWidgetEcho: {
         [roomId: string]: {
-            [widgetId: string]: IWidget,
-        },
+            [widgetId: string]: IWidget;
+        };
     };
 
     constructor() {
diff --git a/src/stores/WidgetStore.ts b/src/stores/WidgetStore.ts
index 8961581964..44c8327c04 100644
--- a/src/stores/WidgetStore.ts
+++ b/src/stores/WidgetStore.ts
@@ -24,10 +24,12 @@ import defaultDispatcher from "../dispatcher/dispatcher";
 import WidgetEchoStore from "../stores/WidgetEchoStore";
 import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import WidgetUtils from "../utils/WidgetUtils";
-import {WidgetType} from "../widgets/WidgetType";
-import {UPDATE_EVENT} from "./AsyncStore";
+import { WidgetType } from "../widgets/WidgetType";
+import { UPDATE_EVENT } from "./AsyncStore";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 interface IState {}
 
 export interface IApp extends IWidget {
@@ -137,6 +139,20 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
         if (edited && !this.roomMap.has(room.roomId)) {
             this.roomMap.set(room.roomId, roomInfo);
         }
+
+        // If a persistent widget is active, check to see if it's just been removed.
+        // If it has, it needs to destroyed otherwise unmounting the node won't kill it
+        const persistentWidgetId = ActiveWidgetStore.instance.getPersistentWidgetId();
+        if (persistentWidgetId) {
+            if (
+                ActiveWidgetStore.instance.getRoomId(persistentWidgetId) === room.roomId &&
+                !roomInfo.widgets.some(w => w.id === persistentWidgetId)
+            ) {
+                logger.log(`Persistent widget ${persistentWidgetId} removed from room ${room.roomId}: destroying.`);
+                ActiveWidgetStore.instance.destroyPersistentWidget(persistentWidgetId);
+            }
+        }
+
         this.emit(room.roomId);
     }
 
@@ -179,7 +195,7 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
 
         // A persistent conference widget indicates that we're participating
         const widgets = roomInfo.widgets.filter(w => WidgetType.JITSI.matches(w.type));
-        return widgets.some(w => ActiveWidgetStore.getWidgetPersistence(w.id));
+        return widgets.some(w => ActiveWidgetStore.instance.getWidgetPersistence(w.id));
     }
 }
 
diff --git a/src/stores/local-echo/EchoStore.ts b/src/stores/local-echo/EchoStore.ts
index 76e90be45e..9c038c5a4f 100644
--- a/src/stores/local-echo/EchoStore.ts
+++ b/src/stores/local-echo/EchoStore.ts
@@ -77,10 +77,10 @@ export class EchoStore extends AsyncStoreWithClient<IState> {
 
         if (hasOrHadError && !this.state.toastRef) {
             const ref = NonUrgentToastStore.instance.addToast(NonUrgentEchoFailureToast);
-            await this.updateState({toastRef: ref});
+            await this.updateState({ toastRef: ref });
         } else if (!hasOrHadError && this.state.toastRef) {
             NonUrgentToastStore.instance.removeToast(this.state.toastRef);
-            await this.updateState({toastRef: null});
+            await this.updateState({ toastRef: null });
         }
     }
 
diff --git a/src/stores/local-echo/GenericEchoChamber.ts b/src/stores/local-echo/GenericEchoChamber.ts
index 7a2173f702..6148098fbe 100644
--- a/src/stores/local-echo/GenericEchoChamber.ts
+++ b/src/stores/local-echo/GenericEchoChamber.ts
@@ -53,7 +53,7 @@ export abstract class GenericEchoChamber<C extends EchoContext, K, V> extends Ev
     }
 
     private cacheVal(key: K, val: V, txn: EchoTransaction) {
-        this.cache.set(key, {txn, val});
+        this.cache.set(key, { txn, val });
         this.emit(PROPERTY_UPDATED, key);
     }
 
diff --git a/src/stores/local-echo/RoomEchoChamber.ts b/src/stores/local-echo/RoomEchoChamber.ts
index e113f68c32..fb40e23a85 100644
--- a/src/stores/local-echo/RoomEchoChamber.ts
+++ b/src/stores/local-echo/RoomEchoChamber.ts
@@ -15,20 +15,17 @@ limitations under the License.
 */
 
 import { GenericEchoChamber, implicitlyReverted, PROPERTY_UPDATED } from "./GenericEchoChamber";
-import { getRoomNotifsState, setRoomNotifsState } from "../../RoomNotifs";
+import { getRoomNotifsState, RoomNotifState, setRoomNotifsState } from "../../RoomNotifs";
 import { RoomEchoContext } from "./RoomEchoContext";
 import { _t } from "../../languageHandler";
-import { Volume } from "../../RoomNotifsTypes";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
-export type CachedRoomValues = Volume;
-
 export enum CachedRoomKey {
     NotificationVolume,
 }
 
-export class RoomEchoChamber extends GenericEchoChamber<RoomEchoContext, CachedRoomKey, CachedRoomValues> {
-    private properties = new Map<CachedRoomKey, CachedRoomValues>();
+export class RoomEchoChamber extends GenericEchoChamber<RoomEchoContext, CachedRoomKey, RoomNotifState> {
+    private properties = new Map<CachedRoomKey, RoomNotifState>();
 
     public constructor(context: RoomEchoContext) {
         super(context, (k) => this.properties.get(k));
@@ -50,8 +47,8 @@ export class RoomEchoChamber extends GenericEchoChamber<RoomEchoContext, CachedR
 
     private onAccountData = (event: MatrixEvent) => {
         if (event.getType() === "m.push_rules") {
-            const currentVolume = this.properties.get(CachedRoomKey.NotificationVolume) as Volume;
-            const newVolume = getRoomNotifsState(this.context.room.roomId) as Volume;
+            const currentVolume = this.properties.get(CachedRoomKey.NotificationVolume) as RoomNotifState;
+            const newVolume = getRoomNotifsState(this.context.room.roomId) as RoomNotifState;
             if (currentVolume !== newVolume) {
                 this.updateNotificationVolume();
             }
@@ -66,11 +63,11 @@ export class RoomEchoChamber extends GenericEchoChamber<RoomEchoContext, CachedR
 
     // ---- helpers below here ----
 
-    public get notificationVolume(): Volume {
+    public get notificationVolume(): RoomNotifState {
         return this.getValue(CachedRoomKey.NotificationVolume);
     }
 
-    public set notificationVolume(v: Volume) {
+    public set notificationVolume(v: RoomNotifState) {
         this.setValue(_t("Change notification settings"), CachedRoomKey.NotificationVolume, v, async () => {
             return setRoomNotifsState(this.context.room.roomId, v);
         }, implicitlyReverted);
diff --git a/src/stores/notifications/ListNotificationState.ts b/src/stores/notifications/ListNotificationState.ts
index 6c67dbdd08..97ba2bd80b 100644
--- a/src/stores/notifications/ListNotificationState.ts
+++ b/src/stores/notifications/ListNotificationState.ts
@@ -32,7 +32,7 @@ export class ListNotificationState extends NotificationState {
     }
 
     public get symbol(): string {
-        return null; // This notification state doesn't support symbols
+        return this._color === NotificationColor.Unsent ? "!" : null;
     }
 
     public setRooms(rooms: Room[]) {
diff --git a/src/stores/notifications/NotificationColor.ts b/src/stores/notifications/NotificationColor.ts
index b12f2b7c00..fadd5ac67e 100644
--- a/src/stores/notifications/NotificationColor.ts
+++ b/src/stores/notifications/NotificationColor.ts
@@ -21,4 +21,5 @@ export enum NotificationColor {
     Bold, // no badge, show as unread
     Grey, // unread notified messages
     Red,  // unread pings
+    Unsent, // some messages failed to send
 }
diff --git a/src/stores/notifications/NotificationState.ts b/src/stores/notifications/NotificationState.ts
index c8ef0ba859..00dbb7856f 100644
--- a/src/stores/notifications/NotificationState.ts
+++ b/src/stores/notifications/NotificationState.ts
@@ -80,8 +80,8 @@ export class NotificationStateSnapshot {
     }
 
     public isDifferentFrom(other: NotificationState): boolean {
-        const before = {count: this.count, symbol: this.symbol, color: this.color};
-        const after = {count: other.count, symbol: other.symbol, color: other.color};
+        const before = { count: this.count, symbol: this.symbol, color: this.color };
+        const after = { count: other.count, symbol: other.symbol, color: other.color };
         return JSON.stringify(before) !== JSON.stringify(after);
     }
 }
diff --git a/src/stores/notifications/RoomNotificationState.ts b/src/stores/notifications/RoomNotificationState.ts
index 3fadbe7d7a..3ad0080183 100644
--- a/src/stores/notifications/RoomNotificationState.ts
+++ b/src/stores/notifications/RoomNotificationState.ts
@@ -20,10 +20,11 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { Room } from "matrix-js-sdk/src/models/room";
+import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room";
 import * as RoomNotifs from '../../RoomNotifs';
 import * as Unread from '../../Unread';
 import { NotificationState } from "./NotificationState";
+import { getUnsentMessages } from "../../components/structures/RoomStatusBar";
 
 export class RoomNotificationState extends NotificationState implements IDestroyable {
     constructor(public readonly room: Room) {
@@ -32,6 +33,7 @@ export class RoomNotificationState extends NotificationState implements IDestroy
         this.room.on("Room.timeline", this.handleRoomEventUpdate);
         this.room.on("Room.redaction", this.handleRoomEventUpdate);
         this.room.on("Room.myMembership", this.handleMembershipUpdate);
+        this.room.on("Room.localEchoUpdated", this.handleLocalEchoUpdated);
         MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
         MatrixClientPeg.get().on("accountData", this.handleAccountDataUpdate);
         this.updateNotificationState();
@@ -47,12 +49,17 @@ export class RoomNotificationState extends NotificationState implements IDestroy
         this.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
         this.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
         this.room.removeListener("Room.myMembership", this.handleMembershipUpdate);
+        this.room.removeListener("Room.localEchoUpdated", this.handleLocalEchoUpdated);
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
             MatrixClientPeg.get().removeListener("accountData", this.handleAccountDataUpdate);
         }
     }
 
+    private handleLocalEchoUpdated = () => {
+        this.updateNotificationState();
+    };
+
     private handleReadReceipt = (event: MatrixEvent, room: Room) => {
         if (!readReceiptChangeIsFor(event, MatrixClientPeg.get())) return; // not our own - ignore
         if (room.roomId !== this.room.roomId) return; // not for us - ignore
@@ -79,7 +86,12 @@ export class RoomNotificationState extends NotificationState implements IDestroy
     private updateNotificationState() {
         const snapshot = this.snapshot();
 
-        if (RoomNotifs.getRoomNotifsState(this.room.roomId) === RoomNotifs.MUTE) {
+        if (getUnsentMessages(this.room).length > 0) {
+            // When there are unsent messages we show a red `!`
+            this._color = NotificationColor.Unsent;
+            this._symbol = "!";
+            this._count = 1; // not used, technically
+        } else if (RoomNotifs.getRoomNotifsState(this.room.roomId) === RoomNotifs.RoomNotifState.Mute) {
             // When muted we suppress all notification states, even if we have context on them.
             this._color = NotificationColor.None;
             this._symbol = null;
@@ -89,8 +101,8 @@ export class RoomNotificationState extends NotificationState implements IDestroy
             this._symbol = "!";
             this._count = 1; // not used, technically
         } else {
-            const redNotifs = RoomNotifs.getUnreadNotificationCount(this.room, 'highlight');
-            const greyNotifs = RoomNotifs.getUnreadNotificationCount(this.room, 'total');
+            const redNotifs = RoomNotifs.getUnreadNotificationCount(this.room, NotificationCountType.Highlight);
+            const greyNotifs = RoomNotifs.getUnreadNotificationCount(this.room, NotificationCountType.Total);
 
             // For a 'true count' we pick the grey notifications first because they include the
             // red notifications. If we don't have a grey count for some reason we use the red
diff --git a/src/stores/notifications/SpaceNotificationState.ts b/src/stores/notifications/SpaceNotificationState.ts
index 61a9701a07..137b2ca0f2 100644
--- a/src/stores/notifications/SpaceNotificationState.ts
+++ b/src/stores/notifications/SpaceNotificationState.ts
@@ -23,7 +23,7 @@ import { NOTIFICATION_STATE_UPDATE, NotificationState } from "./NotificationStat
 import { FetchRoomFn } from "./ListNotificationState";
 
 export class SpaceNotificationState extends NotificationState {
-    private rooms: Room[] = [];
+    public rooms: Room[] = []; // exposed only for tests
     private states: { [spaceId: string]: RoomNotificationState } = {};
 
     constructor(private spaceId: string | symbol, private getRoomFn: FetchRoomFn) {
@@ -31,7 +31,7 @@ export class SpaceNotificationState extends NotificationState {
     }
 
     public get symbol(): string {
-        return null; // This notification state doesn't support symbols
+        return this._color === NotificationColor.Unsent ? "!" : null;
     }
 
     public setRooms(rooms: Room[]) {
@@ -53,6 +53,10 @@ export class SpaceNotificationState extends NotificationState {
         this.calculateTotalState();
     }
 
+    public getFirstRoomWithNotifications() {
+        return Object.values(this.states).find(state => state.color >= this.color)?.room.roomId;
+    }
+
     public destroy() {
         super.destroy();
         for (const state of Object.values(this.states)) {
@@ -79,4 +83,3 @@ export class SpaceNotificationState extends NotificationState {
         this.emitIfUpdated(snapshot);
     }
 }
-
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
index f5b9d9bc6a..44ec173e08 100644
--- a/src/stores/room-list/MessagePreviewStore.ts
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -63,7 +63,7 @@ const PREVIEWS = {
 const MAX_EVENTS_BACKWARDS = 50;
 
 // type merging ftw
-type TAG_ANY = "im.vector.any";
+type TAG_ANY = "im.vector.any"; // eslint-disable-line @typescript-eslint/naming-convention
 const TAG_ANY: TAG_ANY = "im.vector.any";
 
 interface IState {
@@ -176,7 +176,7 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
 
         if (payload.action === 'MatrixActions.Room.timeline' || payload.action === 'MatrixActions.Event.decrypted') {
             const event = payload.event; // TODO: Type out the dispatcher
-            const isHistoricalEvent = payload.hasOwnProperty("isLiveEvent") && !payload.isLiveEvent
+            const isHistoricalEvent = payload.hasOwnProperty("isLiveEvent") && !payload.isLiveEvent;
             if (!this.previews.has(event.getRoomId()) || isHistoricalEvent) return; // not important
             await this.generatePreview(this.matrixClient.getRoom(event.getRoomId()), TAG_ANY);
         }
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index b5961f1ac3..ff90cb8caa 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -14,27 +14,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from "matrix-js-sdk/src/client";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 import SettingsStore from "../../settings/SettingsStore";
-import {DefaultTagID, isCustomTag, OrderedDefaultTagIDs, RoomUpdateCause, TagID} from "./models";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {IListOrderingMap, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm} from "./algorithms/models";
-import {ActionPayload} from "../../dispatcher/payloads";
+import { DefaultTagID, isCustomTag, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { IListOrderingMap, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
+import { ActionPayload } from "../../dispatcher/payloads";
 import defaultDispatcher from "../../dispatcher/dispatcher";
-import {readReceiptChangeIsFor} from "../../utils/read-receipts";
-import {FILTER_CHANGED, FilterKind, IFilterCondition} from "./filters/IFilterCondition";
-import {TagWatcher} from "./TagWatcher";
+import { readReceiptChangeIsFor } from "../../utils/read-receipts";
+import { FILTER_CHANGED, FilterKind, IFilterCondition } from "./filters/IFilterCondition";
+import { TagWatcher } from "./TagWatcher";
 import RoomViewStore from "../RoomViewStore";
-import {Algorithm, LIST_UPDATED_EVENT} from "./algorithms/Algorithm";
-import {EffectiveMembership, getEffectiveMembership} from "../../utils/membership";
-import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
+import { Algorithm, LIST_UPDATED_EVENT } from "./algorithms/Algorithm";
+import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import RoomListLayoutStore from "./RoomListLayoutStore";
-import {MarkedExecution} from "../../utils/MarkedExecution";
-import {AsyncStoreWithClient} from "../AsyncStoreWithClient";
-import {NameFilterCondition} from "./filters/NameFilterCondition";
-import {RoomNotificationStateStore} from "../notifications/RoomNotificationStateStore";
-import {VisibilityProvider} from "./filters/VisibilityProvider";
-import {SpaceWatcher} from "./SpaceWatcher";
+import { MarkedExecution } from "../../utils/MarkedExecution";
+import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
+import { NameFilterCondition } from "./filters/NameFilterCondition";
+import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
+import { VisibilityProvider } from "./filters/VisibilityProvider";
+import { SpaceWatcher } from "./SpaceWatcher";
+import SpaceStore from "../SpaceStore";
+import { Action } from "../../dispatcher/actions";
+import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -68,22 +73,15 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
     private readonly watchedSettings = [
         'feature_custom_tags',
-        'advancedRoomListLogging', // TODO: Remove watch: https://github.com/vector-im/element-web/issues/14602
     ];
 
     constructor() {
         super(defaultDispatcher);
-
-        this.checkLoggingEnabled();
-        for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
-        RoomViewStore.addListener(() => this.handleRVSUpdate({}));
-        this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
-        this.algorithm.on(FILTER_CHANGED, this.onAlgorithmFilterUpdated);
-        this.setupWatchers();
+        this.setMaxListeners(20); // CustomRoomTagStore + RoomList + LeftPanel + 8xRoomSubList + spares
     }
 
     private setupWatchers() {
-        if (SettingsStore.getValue("feature_spaces")) {
+        if (SpaceStore.spacesEnabled) {
             this.spaceWatcher = new SpaceWatcher(this);
         } else {
             this.tagWatcher = new TagWatcher(this);
@@ -125,31 +123,29 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             this.readyStore.useUnitTestClient(forcedClient);
         }
 
-        this.checkLoggingEnabled();
+        for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
+        RoomViewStore.addListener(() => this.handleRVSUpdate({}));
+        this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
+        this.algorithm.on(FILTER_CHANGED, this.onAlgorithmFilterUpdated);
+        this.setupWatchers();
 
         // Update any settings here, as some may have happened before we were logically ready.
         // Update any settings here, as some may have happened before we were logically ready.
-        console.log("Regenerating room lists: Startup");
+        logger.log("Regenerating room lists: Startup");
         await this.readAndCacheSettingsFromStore();
-        await this.regenerateAllLists({trigger: false});
-        await this.handleRVSUpdate({trigger: false}); // fake an RVS update to adjust sticky room, if needed
+        this.regenerateAllLists({ trigger: false });
+        this.handleRVSUpdate({ trigger: false }); // fake an RVS update to adjust sticky room, if needed
 
         this.updateFn.mark(); // we almost certainly want to trigger an update.
         this.updateFn.trigger();
     }
 
-    private checkLoggingEnabled() {
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            console.warn("Advanced room list logging is enabled");
-        }
-    }
-
     private async readAndCacheSettingsFromStore() {
         const tagsEnabled = SettingsStore.getValue("feature_custom_tags");
         await this.updateState({
             tagsEnabled,
         });
-        await this.updateAlgorithmInstances();
+        this.updateAlgorithmInstances();
     }
 
     /**
@@ -157,23 +153,19 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
      * @param trigger Set to false to prevent a list update from being sent. Should only
      * be used if the calling code will manually trigger the update.
      */
-    private async handleRVSUpdate({trigger = true}) {
+    private handleRVSUpdate({ trigger = true }) {
         if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
 
         const activeRoomId = RoomViewStore.getRoomId();
         if (!activeRoomId && this.algorithm.stickyRoom) {
-            await this.algorithm.setStickyRoom(null);
+            this.algorithm.setStickyRoom(null);
         } else if (activeRoomId) {
             const activeRoom = this.matrixClient.getRoom(activeRoomId);
             if (!activeRoom) {
                 console.warn(`${activeRoomId} is current in RVS but missing from client - clearing sticky room`);
-                await this.algorithm.setStickyRoom(null);
+                this.algorithm.setStickyRoom(null);
             } else if (activeRoom !== this.algorithm.stickyRoom) {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`Changing sticky room to ${activeRoomId}`);
-                }
-                await this.algorithm.setStickyRoom(activeRoom);
+                this.algorithm.setStickyRoom(activeRoom);
             }
         }
 
@@ -212,20 +204,13 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         const logicallyReady = this.matrixClient && this.initialListsGenerated;
         if (!logicallyReady) return;
 
-        if (payload.action === 'setting_updated') {
-            if (this.watchedSettings.includes(payload.settingName)) {
-                // TODO: Remove with https://github.com/vector-im/element-web/issues/14602
-                if (payload.settingName === "advancedRoomListLogging") {
-                    // Log when the setting changes so we know when it was turned on in the rageshake
-                    const enabled = SettingsStore.getValue("advancedRoomListLogging");
-                    console.warn("Advanced room list logging is enabled? " + enabled);
-                    return;
-                }
-
-                console.log("Regenerating room lists: Settings changed");
+        if (payload.action === Action.SettingUpdated) {
+            const settingUpdatedPayload = payload as SettingUpdatedPayload;
+            if (this.watchedSettings.includes(settingUpdatedPayload.settingName)) {
+                logger.log("Regenerating room lists: Settings changed");
                 await this.readAndCacheSettingsFromStore();
 
-                await this.regenerateAllLists({trigger: false}); // regenerate the lists now
+                this.regenerateAllLists({ trigger: false }); // regenerate the lists now
                 this.updateFn.trigger();
             }
         }
@@ -244,20 +229,12 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
                     console.warn(`Own read receipt was in unknown room ${room.roomId}`);
                     return;
                 }
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`[RoomListDebug] Got own read receipt in ${room.roomId}`);
-                }
                 await this.handleRoomUpdate(room, RoomUpdateCause.ReadReceipt);
                 this.updateFn.trigger();
                 return;
             }
         } else if (payload.action === 'MatrixActions.Room.tags') {
             const roomPayload = (<any>payload); // TODO: Type out the dispatcher types
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[RoomListDebug] Got tag change in ${roomPayload.room.roomId}`);
-            }
             await this.handleRoomUpdate(roomPayload.room, RoomUpdateCause.PossibleTagChange);
             this.updateFn.trigger();
         } else if (payload.action === 'MatrixActions.Room.timeline') {
@@ -269,16 +246,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             const roomId = eventPayload.event.getRoomId();
             const room = this.matrixClient.getRoom(roomId);
             const tryUpdate = async (updatedRoom: Room) => {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`[RoomListDebug] Live timeline event ${eventPayload.event.getId()}` +
-                        ` in ${updatedRoom.roomId}`);
-                }
                 if (eventPayload.event.getType() === 'm.room.tombstone' && eventPayload.event.getStateKey() === '') {
-                    if (SettingsStore.getValue("advancedRoomListLogging")) {
-                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                        console.log(`[RoomListDebug] Got tombstone event - trying to remove now-dead room`);
-                    }
                     const newRoom = this.matrixClient.getRoom(eventPayload.event.getContent()['replacement_room']);
                     if (newRoom) {
                         // If we have the new room, then the new room check will have seen the predecessor
@@ -311,18 +279,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
                 console.warn(`Event ${eventPayload.event.getId()} was decrypted in an unknown room ${roomId}`);
                 return;
             }
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[RoomListDebug] Decrypted timeline event ${eventPayload.event.getId()} in ${roomId}`);
-            }
             await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
             this.updateFn.trigger();
         } else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
             const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[RoomListDebug] Received updated DM map`);
-            }
             const dmMap = eventPayload.event.getContent();
             for (const userId of Object.keys(dmMap)) {
                 const roomIds = dmMap[userId];
@@ -346,54 +306,29 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             const oldMembership = getEffectiveMembership(membershipPayload.oldMembership);
             const newMembership = getEffectiveMembership(membershipPayload.membership);
             if (oldMembership !== EffectiveMembership.Join && newMembership === EffectiveMembership.Join) {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`[RoomListDebug] Handling new room ${membershipPayload.room.roomId}`);
-                }
-
                 // If we're joining an upgraded room, we'll want to make sure we don't proliferate
                 // the dead room in the list.
                 const createEvent = membershipPayload.room.currentState.getStateEvents("m.room.create", "");
                 if (createEvent && createEvent.getContent()['predecessor']) {
-                    if (SettingsStore.getValue("advancedRoomListLogging")) {
-                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                        console.log(`[RoomListDebug] Room has a predecessor`);
-                    }
                     const prevRoom = this.matrixClient.getRoom(createEvent.getContent()['predecessor']['room_id']);
                     if (prevRoom) {
                         const isSticky = this.algorithm.stickyRoom === prevRoom;
                         if (isSticky) {
-                            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                                console.log(`[RoomListDebug] Clearing sticky room due to room upgrade`);
-                            }
-                            await this.algorithm.setStickyRoom(null);
+                            this.algorithm.setStickyRoom(null);
                         }
 
                         // Note: we hit the algorithm instead of our handleRoomUpdate() function to
                         // avoid redundant updates.
-                        if (SettingsStore.getValue("advancedRoomListLogging")) {
-                            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                            console.log(`[RoomListDebug] Removing previous room from room list`);
-                        }
-                        await this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
+                        this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
                     }
                 }
 
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`[RoomListDebug] Adding new room to room list`);
-                }
                 await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
                 this.updateFn.trigger();
                 return;
             }
 
             if (oldMembership !== EffectiveMembership.Invite && newMembership === EffectiveMembership.Invite) {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`[RoomListDebug] Handling invite to ${membershipPayload.room.roomId}`);
-                }
                 await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
                 this.updateFn.trigger();
                 return;
@@ -401,10 +336,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
             // If it's not a join, it's transitioning into a different list (possibly historical)
             if (oldMembership !== newMembership) {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`[RoomListDebug] Handling membership change in ${membershipPayload.room.roomId}`);
-                }
                 await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.PossibleTagChange);
                 this.updateFn.trigger();
                 return;
@@ -432,12 +363,8 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             return; // don't do anything on new/moved rooms which ought not to be shown
         }
 
-        const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
+        const shouldUpdate = this.algorithm.handleRoomUpdate(room, cause);
         if (shouldUpdate) {
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[DEBUG] Room "${room.name}" (${room.roomId}) triggered by ${cause} requires list update`);
-            }
             this.updateFn.mark();
         }
     }
@@ -446,11 +373,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         if (!this.algorithm) return;
         if (!this.algorithm.hasTagSortingMap) return; // we're still loading
 
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log("Calculating new prefiltered room list");
-        }
-
         // Inhibit updates because we're about to lie heavily to the algorithm
         this.algorithm.updatesInhibited = true;
 
@@ -461,13 +383,13 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
         // Reset the sticky room before resetting the known rooms so the algorithm
         // doesn't freak out.
-        await this.algorithm.setStickyRoom(null);
-        await this.algorithm.setKnownRooms(rooms);
+        this.algorithm.setStickyRoom(null);
+        this.algorithm.setKnownRooms(rooms);
 
         // Set the sticky room back, if needed, now that we have updated the store.
         // This will use relative stickyness to the new room set.
         if (stickyIsStillPresent) {
-            await this.algorithm.setStickyRoom(currentSticky);
+            this.algorithm.setStickyRoom(currentSticky);
         }
 
         // Finally, mark an update and resume updates from the algorithm
@@ -476,12 +398,12 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
-        await this.setAndPersistTagSorting(tagId, sort);
+        this.setAndPersistTagSorting(tagId, sort);
         this.updateFn.trigger();
     }
 
-    private async setAndPersistTagSorting(tagId: TagID, sort: SortAlgorithm) {
-        await this.algorithm.setTagSorting(tagId, sort);
+    private setAndPersistTagSorting(tagId: TagID, sort: SortAlgorithm) {
+        this.algorithm.setTagSorting(tagId, sort);
         // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
         localStorage.setItem(`mx_tagSort_${tagId}`, sort);
     }
@@ -519,13 +441,13 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         return tagSort;
     }
 
-    public async setListOrder(tagId: TagID, order: ListAlgorithm) {
-        await this.setAndPersistListOrder(tagId, order);
+    public setListOrder(tagId: TagID, order: ListAlgorithm) {
+        this.setAndPersistListOrder(tagId, order);
         this.updateFn.trigger();
     }
 
-    private async setAndPersistListOrder(tagId: TagID, order: ListAlgorithm) {
-        await this.algorithm.setListOrdering(tagId, order);
+    private setAndPersistListOrder(tagId: TagID, order: ListAlgorithm) {
+        this.algorithm.setListOrdering(tagId, order);
         // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
         localStorage.setItem(`mx_listOrder_${tagId}`, order);
     }
@@ -562,7 +484,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         return listOrder;
     }
 
-    private async updateAlgorithmInstances() {
+    private updateAlgorithmInstances() {
         // We'll require an update, so mark for one. Marking now also prevents the calls
         // to setTagSorting and setListOrder from causing triggers.
         this.updateFn.mark();
@@ -575,19 +497,15 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             const listOrder = this.calculateListOrder(tag);
 
             if (tagSort !== definedSort) {
-                await this.setAndPersistTagSorting(tag, tagSort);
+                this.setAndPersistTagSorting(tag, tagSort);
             }
             if (listOrder !== definedOrder) {
-                await this.setAndPersistListOrder(tag, listOrder);
+                this.setAndPersistListOrder(tag, listOrder);
             }
         }
     }
 
     private onAlgorithmListUpdated = () => {
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log("Underlying algorithm has triggered a list update - marking");
-        }
         this.updateFn.mark();
     };
 
@@ -609,9 +527,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
         // if spaces are enabled only consider the prefilter conditions when there are no runtime conditions
         // for the search all spaces feature
-        if (this.prefilterConditions.length > 0
-            && (!SettingsStore.getValue("feature_spaces") || !this.filterConditions.length)
-        ) {
+        if (this.prefilterConditions.length > 0 && (!SpaceStore.spacesEnabled || !this.filterConditions.length)) {
             rooms = rooms.filter(r => {
                 for (const filter of this.prefilterConditions) {
                     if (!filter.isVisible(r)) {
@@ -633,7 +549,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
      * @param trigger Set to false to prevent a list update from being sent. Should only
      * be used if the calling code will manually trigger the update.
      */
-    public async regenerateAllLists({trigger = true}) {
+    public regenerateAllLists({ trigger = true }) {
         console.warn("Regenerating all room lists");
 
         const rooms = this.getPlausibleRooms();
@@ -657,8 +573,8 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             RoomListLayoutStore.instance.ensureLayoutExists(tagId);
         }
 
-        await this.algorithm.populateTags(sorts, orders);
-        await this.algorithm.setKnownRooms(rooms);
+        this.algorithm.populateTags(sorts, orders);
+        this.algorithm.setKnownRooms(rooms);
 
         this.initialListsGenerated = true;
 
@@ -671,10 +587,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
      * @param {IFilterCondition} filter The filter condition to add.
      */
     public async addFilter(filter: IFilterCondition): Promise<void> {
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log("Adding filter condition:", filter);
-        }
         let promise = Promise.resolve();
         if (filter.kind === FilterKind.Prefilter) {
             filter.on(FILTER_CHANGED, this.onPrefilterUpdated);
@@ -683,7 +595,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         } else {
             this.filterConditions.push(filter);
             // Runtime filters with spaces disable prefiltering for the search all spaces feature
-            if (SettingsStore.getValue("feature_spaces")) {
+            if (SpaceStore.spacesEnabled) {
                 // this has to be awaited so that `setKnownRooms` is called in time for the `addFilterCondition` below
                 // this way the runtime filters are only evaluated on one dataset and not both.
                 await this.recalculatePrefiltering();
@@ -703,12 +615,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
      * @param {IFilterCondition} filter The filter condition to remove.
      */
     public removeFilter(filter: IFilterCondition): void {
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log("Removing filter condition:", filter);
-        }
         let promise = Promise.resolve();
         let idx = this.filterConditions.indexOf(filter);
+        let removed = false;
         if (idx >= 0) {
             this.filterConditions.splice(idx, 1);
 
@@ -716,17 +625,23 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
                 this.algorithm.removeFilterCondition(filter);
             }
             // Runtime filters with spaces disable prefiltering for the search all spaces feature
-            if (SettingsStore.getValue("feature_spaces")) {
+            if (SpaceStore.spacesEnabled) {
                 promise = this.recalculatePrefiltering();
             }
+            removed = true;
         }
+
         idx = this.prefilterConditions.indexOf(filter);
         if (idx >= 0) {
             filter.off(FILTER_CHANGED, this.onPrefilterUpdated);
             this.prefilterConditions.splice(idx, 1);
             promise = this.recalculatePrefiltering();
+            removed = true;
+        }
+
+        if (removed) {
+            promise.then(() => this.updateFn.trigger());
         }
-        promise.then(() => this.updateFn.trigger());
     }
 
     /**
diff --git a/src/stores/room-list/SpaceWatcher.ts b/src/stores/room-list/SpaceWatcher.ts
index 0b1b78bc75..fe2eb1e881 100644
--- a/src/stores/room-list/SpaceWatcher.ts
+++ b/src/stores/room-list/SpaceWatcher.ts
@@ -18,40 +18,55 @@ import { Room } from "matrix-js-sdk/src/models/room";
 
 import { RoomListStoreClass } from "./RoomListStore";
 import { SpaceFilterCondition } from "./filters/SpaceFilterCondition";
-import SpaceStore, { UPDATE_SELECTED_SPACE } from "../SpaceStore";
+import SpaceStore, { UPDATE_HOME_BEHAVIOUR, UPDATE_SELECTED_SPACE } from "../SpaceStore";
 
 /**
  * Watches for changes in spaces to manage the filter on the provided RoomListStore
  */
 export class SpaceWatcher {
-    private filter: SpaceFilterCondition;
+    private readonly filter = new SpaceFilterCondition();
+    // we track these separately to the SpaceStore as we need to observe transitions
     private activeSpace: Room = SpaceStore.instance.activeSpace;
+    private allRoomsInHome: boolean = SpaceStore.instance.allRoomsInHome;
 
     constructor(private store: RoomListStoreClass) {
+        if (!this.allRoomsInHome || this.activeSpace) {
+            this.updateFilter();
+            store.addFilter(this.filter);
+        }
         SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdated);
+        SpaceStore.instance.on(UPDATE_HOME_BEHAVIOUR, this.onHomeBehaviourUpdated);
     }
 
-    private onSelectedSpaceUpdated = (activeSpace?: Room) => {
-        this.activeSpace = activeSpace;
+    private onSelectedSpaceUpdated = (activeSpace?: Room, allRoomsInHome = this.allRoomsInHome) => {
+        if (activeSpace === this.activeSpace && allRoomsInHome === this.allRoomsInHome) return; // nop
 
-        if (this.filter) {
-            if (activeSpace) {
-                this.updateFilter();
-            } else {
-                this.store.removeFilter(this.filter);
-                this.filter = null;
-            }
-        } else if (activeSpace) {
-            this.filter = new SpaceFilterCondition();
+        const oldActiveSpace = this.activeSpace;
+        const oldAllRoomsInHome = this.allRoomsInHome;
+        this.activeSpace = activeSpace;
+        this.allRoomsInHome = allRoomsInHome;
+
+        if (activeSpace || !allRoomsInHome) {
             this.updateFilter();
+        }
+
+        if (oldAllRoomsInHome && !oldActiveSpace) {
             this.store.addFilter(this.filter);
+        } else if (allRoomsInHome && !activeSpace) {
+            this.store.removeFilter(this.filter);
         }
     };
 
+    private onHomeBehaviourUpdated = (allRoomsInHome: boolean) => {
+        this.onSelectedSpaceUpdated(this.activeSpace, allRoomsInHome);
+    };
+
     private updateFilter = () => {
-        SpaceStore.instance.traverseSpace(this.activeSpace.roomId, roomId => {
-            this.store.matrixClient?.getRoom(roomId)?.loadMembersIfNeeded();
-        });
+        if (this.activeSpace) {
+            SpaceStore.instance.traverseSpace(this.activeSpace.roomId, roomId => {
+                this.store.matrixClient?.getRoom(roomId)?.loadMembersIfNeeded();
+            });
+        }
         this.filter.updateSpace(this.activeSpace);
     };
 }
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 024c484c41..1e2606686d 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -16,8 +16,9 @@ limitations under the License.
 
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
-import DMRoomMap from "../../../utils/DMRoomMap";
 import { EventEmitter } from "events";
+
+import DMRoomMap from "../../../utils/DMRoomMap";
 import { arrayDiff, arrayHasDiff } from "../../../utils/arrays";
 import { DefaultTagID, RoomUpdateCause, TagID } from "../models";
 import {
@@ -32,8 +33,8 @@ import { FILTER_CHANGED, IFilterCondition } from "../filters/IFilterCondition";
 import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } from "../../../utils/membership";
 import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
 import { getListAlgorithmInstance } from "./list-ordering";
-import SettingsStore from "../../../settings/SettingsStore";
 import { VisibilityProvider } from "../filters/VisibilityProvider";
+import SpaceStore from "../../SpaceStore";
 
 /**
  * Fired when the Algorithm has determined a list has been updated.
@@ -121,8 +122,12 @@ export class Algorithm extends EventEmitter {
      * Awaitable version of the sticky room setter.
      * @param val The new room to sticky.
      */
-    public async setStickyRoom(val: Room) {
-        await this.updateStickyRoom(val);
+    public setStickyRoom(val: Room) {
+        try {
+            this.updateStickyRoom(val);
+        } catch (e) {
+            console.warn("Failed to update sticky room", e);
+        }
     }
 
     public getTagSorting(tagId: TagID): SortAlgorithm {
@@ -130,13 +135,13 @@ export class Algorithm extends EventEmitter {
         return this.sortAlgorithms[tagId];
     }
 
-    public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
+    public setTagSorting(tagId: TagID, sort: SortAlgorithm) {
         if (!tagId) throw new Error("Tag ID must be defined");
         if (!sort) throw new Error("Algorithm must be defined");
         this.sortAlgorithms[tagId] = sort;
 
         const algorithm: OrderingAlgorithm = this.algorithms[tagId];
-        await algorithm.setSortAlgorithm(sort);
+        algorithm.setSortAlgorithm(sort);
         this._cachedRooms[tagId] = algorithm.orderedRooms;
         this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
         this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
@@ -147,7 +152,7 @@ export class Algorithm extends EventEmitter {
         return this.listAlgorithms[tagId];
     }
 
-    public async setListOrdering(tagId: TagID, order: ListAlgorithm) {
+    public setListOrdering(tagId: TagID, order: ListAlgorithm) {
         if (!tagId) throw new Error("Tag ID must be defined");
         if (!order) throw new Error("Algorithm must be defined");
         this.listAlgorithms[tagId] = order;
@@ -155,7 +160,7 @@ export class Algorithm extends EventEmitter {
         const algorithm = getListAlgorithmInstance(order, tagId, this.sortAlgorithms[tagId]);
         this.algorithms[tagId] = algorithm;
 
-        await algorithm.setRooms(this._cachedRooms[tagId]);
+        algorithm.setRooms(this._cachedRooms[tagId]);
         this._cachedRooms[tagId] = algorithm.orderedRooms;
         this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
         this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
@@ -182,31 +187,25 @@ export class Algorithm extends EventEmitter {
         }
     }
 
-    private async handleFilterChange() {
-        await this.recalculateFilteredRooms();
+    private handleFilterChange() {
+        this.recalculateFilteredRooms();
 
         // re-emit the update so the list store can fire an off-cycle update if needed
         if (this.updatesInhibited) return;
         this.emit(FILTER_CHANGED);
     }
 
-    private async updateStickyRoom(val: Room) {
-        try {
-            return await this.doUpdateStickyRoom(val);
-        } finally {
-            this._lastStickyRoom = null; // clear to indicate we're done changing
-        }
+    private updateStickyRoom(val: Room) {
+        this.doUpdateStickyRoom(val);
+        this._lastStickyRoom = null; // clear to indicate we're done changing
     }
 
-    private async doUpdateStickyRoom(val: Room) {
-        if (SettingsStore.getValue("feature_spaces") && val?.isSpaceRoom() && val.getMyMembership() !== "invite") {
+    private doUpdateStickyRoom(val: Room) {
+        if (SpaceStore.spacesEnabled && val?.isSpaceRoom() && val.getMyMembership() !== "invite") {
             // no-op sticky rooms for spaces - they're effectively virtual rooms
             val = null;
         }
 
-        // Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
-        // otherwise we risk duplicating rooms.
-
         if (val && !VisibilityProvider.instance.isRoomVisible(val)) {
             val = null; // the room isn't visible - lie to the rest of this function
         }
@@ -222,7 +221,7 @@ export class Algorithm extends EventEmitter {
                 this._stickyRoom = null; // clear before we go to update the algorithm
 
                 // Lie to the algorithm and re-add the room to the algorithm
-                await this.handleRoomUpdate(stickyRoom, RoomUpdateCause.NewRoom);
+                this.handleRoomUpdate(stickyRoom, RoomUpdateCause.NewRoom);
                 return;
             }
             return;
@@ -268,10 +267,10 @@ export class Algorithm extends EventEmitter {
         // referential checks as the references can differ through the lifecycle.
         if (lastStickyRoom && lastStickyRoom.room && lastStickyRoom.room.roomId !== val.roomId) {
             // Lie to the algorithm and re-add the room to the algorithm
-            await this.handleRoomUpdate(lastStickyRoom.room, RoomUpdateCause.NewRoom);
+            this.handleRoomUpdate(lastStickyRoom.room, RoomUpdateCause.NewRoom);
         }
         // Lie to the algorithm and remove the room from it's field of view
-        await this.handleRoomUpdate(val, RoomUpdateCause.RoomRemoved);
+        this.handleRoomUpdate(val, RoomUpdateCause.RoomRemoved);
 
         // Check for tag & position changes while we're here. We also check the room to ensure
         // it is still the same room.
@@ -343,11 +342,6 @@ export class Algorithm extends EventEmitter {
                 }
             }
             newMap[tagId] = allowedRoomsInThisTag;
-
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[DEBUG] ${newMap[tagId].length}/${rooms.length} rooms filtered into ${tagId}`);
-            }
         }
 
         const allowedRooms = Object.values(newMap).reduce((rv, v) => { rv.push(...v); return rv; }, <Room[]>[]);
@@ -360,10 +354,6 @@ export class Algorithm extends EventEmitter {
     protected recalculateFilteredRoomsForTag(tagId: TagID): void {
         if (!this.hasFilters) return; // don't bother doing work if there's nothing to do
 
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log(`Recalculating filtered rooms for ${tagId}`);
-        }
         delete this.filteredRooms[tagId];
         const rooms = this.cachedRooms[tagId].map(r => r); // cheap clone
         this.tryInsertStickyRoomToFilterSet(rooms, tagId);
@@ -371,11 +361,6 @@ export class Algorithm extends EventEmitter {
         if (filteredRooms.length > 0) {
             this.filteredRooms[tagId] = filteredRooms;
         }
-
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log(`[DEBUG] ${filteredRooms.length}/${rooms.length} rooms filtered into ${tagId}`);
-        }
     }
 
     protected tryInsertStickyRoomToFilterSet(rooms: Room[], tagId: TagID) {
@@ -415,10 +400,6 @@ export class Algorithm extends EventEmitter {
         }
 
         if (!this._cachedStickyRooms || !updatedTag) {
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`Generating clone of cached rooms for sticky room handling`);
-            }
             const stickiedTagMap: ITagMap = {};
             for (const tagId of Object.keys(this.cachedRooms)) {
                 stickiedTagMap[tagId] = this.cachedRooms[tagId].map(r => r); // shallow clone
@@ -429,10 +410,6 @@ export class Algorithm extends EventEmitter {
         if (updatedTag) {
             // Update the tag indicated by the caller, if possible. This is mostly to ensure
             // our cache is up to date.
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`Replacing cached sticky rooms for ${updatedTag}`);
-            }
             this._cachedStickyRooms[updatedTag] = this.cachedRooms[updatedTag].map(r => r); // shallow clone
         }
 
@@ -441,12 +418,6 @@ export class Algorithm extends EventEmitter {
         // we might have updated from the cache is also our sticky room.
         const sticky = this._stickyRoom;
         if (!updatedTag || updatedTag === sticky.tag) {
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(
-                    `Inserting sticky room ${sticky.room.roomId} at position ${sticky.position} in ${sticky.tag}`,
-                );
-            }
             this._cachedStickyRooms[sticky.tag].splice(sticky.position, 0, sticky.room);
         }
 
@@ -461,9 +432,8 @@ export class Algorithm extends EventEmitter {
      * them.
      * @param {ITagSortingMap} tagSortingMap The tags to generate.
      * @param {IListOrderingMap} listOrderingMap The ordering of those tags.
-     * @returns {Promise<*>} A promise which resolves when complete.
      */
-    public async populateTags(tagSortingMap: ITagSortingMap, listOrderingMap: IListOrderingMap): Promise<any> {
+    public populateTags(tagSortingMap: ITagSortingMap, listOrderingMap: IListOrderingMap): void {
         if (!tagSortingMap) throw new Error(`Sorting map cannot be null or empty`);
         if (!listOrderingMap) throw new Error(`Ordering ma cannot be null or empty`);
         if (arrayHasDiff(Object.keys(tagSortingMap), Object.keys(listOrderingMap))) {
@@ -512,9 +482,8 @@ export class Algorithm extends EventEmitter {
      * Seeds the Algorithm with a set of rooms. The algorithm will discard all
      * previously known information and instead use these rooms instead.
      * @param {Room[]} rooms The rooms to force the algorithm to use.
-     * @returns {Promise<*>} A promise which resolves when complete.
      */
-    public async setKnownRooms(rooms: Room[]): Promise<any> {
+    public setKnownRooms(rooms: Room[]): void {
         if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
         if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
 
@@ -528,7 +497,7 @@ export class Algorithm extends EventEmitter {
         // Before we go any further we need to clear (but remember) the sticky room to
         // avoid accidentally duplicating it in the list.
         const oldStickyRoom = this._stickyRoom;
-        await this.updateStickyRoom(null);
+        if (oldStickyRoom) this.updateStickyRoom(null);
 
         this.rooms = rooms;
 
@@ -540,7 +509,7 @@ export class Algorithm extends EventEmitter {
 
         // If we can avoid doing work, do so.
         if (!rooms.length) {
-            await this.generateFreshTags(newTags); // just in case it wants to do something
+            this.generateFreshTags(newTags); // just in case it wants to do something
             this.cachedRooms = newTags;
             return;
         }
@@ -577,7 +546,7 @@ export class Algorithm extends EventEmitter {
             }
         }
 
-        await this.generateFreshTags(newTags);
+        this.generateFreshTags(newTags);
 
         this.cachedRooms = newTags; // this recalculates the filtered rooms for us
         this.updateTagsFromCache();
@@ -586,7 +555,7 @@ export class Algorithm extends EventEmitter {
         // it was. It's entirely possible that it changed lists though, so if it did then
         // we also have to update the position of it.
         if (oldStickyRoom && oldStickyRoom.room) {
-            await this.updateStickyRoom(oldStickyRoom.room);
+            this.updateStickyRoom(oldStickyRoom.room);
             if (this._stickyRoom && this._stickyRoom.room) { // just in case the update doesn't go according to plan
                 if (this._stickyRoom.tag !== oldStickyRoom.tag) {
                     // We put the sticky room at the top of the list to treat it as an obvious tag change.
@@ -651,16 +620,15 @@ export class Algorithm extends EventEmitter {
      * @param {ITagMap} updatedTagMap The tag map which needs populating. Each tag
      * will already have the rooms which belong to it - they just need ordering. Must
      * be mutated in place.
-     * @returns {Promise<*>} A promise which resolves when complete.
      */
-    private async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
+    private generateFreshTags(updatedTagMap: ITagMap): void {
         if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
 
         for (const tag of Object.keys(updatedTagMap)) {
             const algorithm: OrderingAlgorithm = this.algorithms[tag];
             if (!algorithm) throw new Error(`No algorithm for ${tag}`);
 
-            await algorithm.setRooms(updatedTagMap[tag]);
+            algorithm.setRooms(updatedTagMap[tag]);
             updatedTagMap[tag] = algorithm.orderedRooms;
         }
     }
@@ -672,21 +640,16 @@ export class Algorithm extends EventEmitter {
      * may no-op this request if no changes are required.
      * @param {Room} room The room which might have affected sorting.
      * @param {RoomUpdateCause} cause The reason for the update being triggered.
-     * @returns {Promise<boolean>} A promise which resolve to true or false
-     * depending on whether or not getOrderedRooms() should be called after
-     * processing.
+     * @returns {Promise<boolean>} A boolean of whether or not getOrderedRooms()
+     * should be called after processing.
      */
-    public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log(`Handle room update for ${room.roomId} called with cause ${cause}`);
-        }
+    public handleRoomUpdate(room: Room, cause: RoomUpdateCause): boolean {
         if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
 
         // Note: check the isSticky against the room ID just in case the reference is wrong
-        const isSticky = this._stickyRoom && this._stickyRoom.room && this._stickyRoom.room.roomId === room.roomId;
+        const isSticky = this._stickyRoom?.room?.roomId === room.roomId;
         if (cause === RoomUpdateCause.NewRoom) {
-            const isForLastSticky = this._lastStickyRoom && this._lastStickyRoom.room === room;
+            const isForLastSticky = this._lastStickyRoom?.room === room;
             const roomTags = this.roomIdsToTags[room.roomId];
             const hasTags = roomTags && roomTags.length > 0;
 
@@ -737,42 +700,26 @@ export class Algorithm extends EventEmitter {
             const diff = arrayDiff(oldTags, newTags);
             if (diff.removed.length > 0 || diff.added.length > 0) {
                 for (const rmTag of diff.removed) {
-                    if (SettingsStore.getValue("advancedRoomListLogging")) {
-                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                        console.log(`Removing ${room.roomId} from ${rmTag}`);
-                    }
                     const algorithm: OrderingAlgorithm = this.algorithms[rmTag];
                     if (!algorithm) throw new Error(`No algorithm for ${rmTag}`);
-                    await algorithm.handleRoomUpdate(room, RoomUpdateCause.RoomRemoved);
+                    algorithm.handleRoomUpdate(room, RoomUpdateCause.RoomRemoved);
                     this._cachedRooms[rmTag] = algorithm.orderedRooms;
                     this.recalculateFilteredRoomsForTag(rmTag); // update filter to re-sort the list
                     this.recalculateStickyRoom(rmTag); // update sticky room to make sure it moves if needed
                 }
                 for (const addTag of diff.added) {
-                    if (SettingsStore.getValue("advancedRoomListLogging")) {
-                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                        console.log(`Adding ${room.roomId} to ${addTag}`);
-                    }
                     const algorithm: OrderingAlgorithm = this.algorithms[addTag];
                     if (!algorithm) throw new Error(`No algorithm for ${addTag}`);
-                    await algorithm.handleRoomUpdate(room, RoomUpdateCause.NewRoom);
+                    algorithm.handleRoomUpdate(room, RoomUpdateCause.NewRoom);
                     this._cachedRooms[addTag] = algorithm.orderedRooms;
                 }
 
                 // Update the tag map so we don't regen it in a moment
                 this.roomIdsToTags[room.roomId] = newTags;
 
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`Changing update cause for ${room.roomId} to Timeline to sort rooms`);
-                }
                 cause = RoomUpdateCause.Timeline;
                 didTagChange = true;
             } else {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.log(`Received no-op update for ${room.roomId} - changing to Timeline update`);
-                }
                 cause = RoomUpdateCause.Timeline;
             }
 
@@ -788,7 +735,7 @@ export class Algorithm extends EventEmitter {
                     };
                 } else {
                     // We have to clear the lock as the sticky room change will trigger updates.
-                    await this.setStickyRoom(room);
+                    this.setStickyRoom(room);
                 }
             }
         }
@@ -798,28 +745,15 @@ export class Algorithm extends EventEmitter {
         // as the sticky room relies on this.
         if (cause !== RoomUpdateCause.NewRoom && cause !== RoomUpdateCause.RoomRemoved) {
             if (this.stickyRoom === room) {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.warn(`[RoomListDebug] Received ${cause} update for sticky room ${room.roomId} - ignoring`);
-                }
                 return false;
             }
         }
 
         if (!this.roomIdsToTags[room.roomId]) {
             if (CAUSES_REQUIRING_ROOM.includes(cause)) {
-                if (SettingsStore.getValue("advancedRoomListLogging")) {
-                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                    console.warn(`Skipping tag update for ${room.roomId} because we don't know about the room`);
-                }
                 return false;
             }
 
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[RoomListDebug] Updating tags for room ${room.roomId} (${room.name})`);
-            }
-
             // Get the tags for the room and populate the cache
             const roomTags = this.getTagsForRoom(room).filter(t => !isNullOrUndefined(this.cachedRooms[t]));
 
@@ -828,16 +762,6 @@ export class Algorithm extends EventEmitter {
             if (!roomTags.length) throw new Error(`Tags cannot be determined for ${room.roomId}`);
 
             this.roomIdsToTags[room.roomId] = roomTags;
-
-            if (SettingsStore.getValue("advancedRoomListLogging")) {
-                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(`[RoomListDebug] Updated tags for ${room.roomId}:`, roomTags);
-            }
-        }
-
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log(`[RoomListDebug] Reached algorithmic handling for ${room.roomId} and cause ${cause}`);
         }
 
         const tags = this.roomIdsToTags[room.roomId];
@@ -851,7 +775,7 @@ export class Algorithm extends EventEmitter {
             const algorithm: OrderingAlgorithm = this.algorithms[tag];
             if (!algorithm) throw new Error(`No algorithm for ${tag}`);
 
-            await algorithm.handleRoomUpdate(room, cause);
+            algorithm.handleRoomUpdate(room, cause);
             this._cachedRooms[tag] = algorithm.orderedRooms;
 
             // Flag that we've done something
@@ -860,10 +784,6 @@ export class Algorithm extends EventEmitter {
             changed = true;
         }
 
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log(`[RoomListDebug] Finished handling ${room.roomId} with cause ${cause} (changed=${changed})`);
-        }
         return changed;
     }
 }
diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index 80bdf74afb..1d35df331d 100644
--- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -94,15 +94,15 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
         return state.color;
     }
 
-    public async setRooms(rooms: Room[]): Promise<any> {
+    public setRooms(rooms: Room[]): void {
         if (this.sortingAlgorithm === SortAlgorithm.Manual) {
-            this.cachedOrderedRooms = await sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
+            this.cachedOrderedRooms = sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
         } else {
             // Every other sorting type affects the categories, not the whole tag.
             const categorized = this.categorizeRooms(rooms);
             for (const category of Object.keys(categorized)) {
                 const roomsToOrder = categorized[category];
-                categorized[category] = await sortRoomsWithAlgorithm(roomsToOrder, this.tagId, this.sortingAlgorithm);
+                categorized[category] = sortRoomsWithAlgorithm(roomsToOrder, this.tagId, this.sortingAlgorithm);
             }
 
             const newlyOrganized: Room[] = [];
@@ -118,12 +118,12 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
         }
     }
 
-    private async handleSplice(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+    private handleSplice(room: Room, cause: RoomUpdateCause): boolean {
         if (cause === RoomUpdateCause.NewRoom) {
             const category = this.getRoomCategory(room);
             this.alterCategoryPositionBy(category, 1, this.indices);
             this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
-            await this.sortCategory(category);
+            this.sortCategory(category);
         } else if (cause === RoomUpdateCause.RoomRemoved) {
             const roomIdx = this.getRoomIndex(room);
             if (roomIdx === -1) {
@@ -141,55 +141,49 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
         return true;
     }
 
-    public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
-        try {
-            await this.updateLock.acquireAsync();
-
-            if (cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved) {
-                return this.handleSplice(room, cause);
-            }
-
-            if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
-                throw new Error(`Unsupported update cause: ${cause}`);
-            }
-
-            const category = this.getRoomCategory(room);
-            if (this.sortingAlgorithm === SortAlgorithm.Manual) {
-                return; // Nothing to do here.
-            }
-
-            const roomIdx = this.getRoomIndex(room);
-            if (roomIdx === -1) {
-                throw new Error(`Room ${room.roomId} has no index in ${this.tagId}`);
-            }
-
-            // Try to avoid doing array operations if we don't have to: only move rooms within
-            // the categories if we're jumping categories
-            const oldCategory = this.getCategoryFromIndices(roomIdx, this.indices);
-            if (oldCategory !== category) {
-                // Move the room and update the indices
-                this.moveRoomIndexes(1, oldCategory, category, this.indices);
-                this.cachedOrderedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
-                this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
-                // Note: if moveRoomIndexes() is called after the splice then the insert operation
-                // will happen in the wrong place. Because we would have already adjusted the index
-                // for the category, we don't need to determine how the room is moving in the list.
-                // If we instead tried to insert before updating the indices, we'd have to determine
-                // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
-                // current position, as it'll affect the category's start index after we remove the
-                // room from the array.
-            }
-
-            // Sort the category now that we've dumped the room in
-            await this.sortCategory(category);
-
-            return true; // change made
-        } finally {
-            await this.updateLock.release();
+    public handleRoomUpdate(room: Room, cause: RoomUpdateCause): boolean {
+        if (cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved) {
+            return this.handleSplice(room, cause);
         }
+
+        if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
+            throw new Error(`Unsupported update cause: ${cause}`);
+        }
+
+        const category = this.getRoomCategory(room);
+        if (this.sortingAlgorithm === SortAlgorithm.Manual) {
+            return; // Nothing to do here.
+        }
+
+        const roomIdx = this.getRoomIndex(room);
+        if (roomIdx === -1) {
+            throw new Error(`Room ${room.roomId} has no index in ${this.tagId}`);
+        }
+
+        // Try to avoid doing array operations if we don't have to: only move rooms within
+        // the categories if we're jumping categories
+        const oldCategory = this.getCategoryFromIndices(roomIdx, this.indices);
+        if (oldCategory !== category) {
+            // Move the room and update the indices
+            this.moveRoomIndexes(1, oldCategory, category, this.indices);
+            this.cachedOrderedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
+            this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
+            // Note: if moveRoomIndexes() is called after the splice then the insert operation
+            // will happen in the wrong place. Because we would have already adjusted the index
+            // for the category, we don't need to determine how the room is moving in the list.
+            // If we instead tried to insert before updating the indices, we'd have to determine
+            // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
+            // current position, as it'll affect the category's start index after we remove the
+            // room from the array.
+        }
+
+        // Sort the category now that we've dumped the room in
+        this.sortCategory(category);
+
+        return true; // change made
     }
 
-    private async sortCategory(category: NotificationColor) {
+    private sortCategory(category: NotificationColor) {
         // This should be relatively quick because the room is usually inserted at the top of the
         // category, and most popular sorting algorithms will deal with trying to keep the active
         // room at the top/start of the category. For the few algorithms that will have to move the
@@ -201,7 +195,7 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
         const startIdx = this.indices[category];
         const numSort = nextCategoryStartIdx - startIdx; // splice() returns up to the max, so MAX_SAFE_INT is fine
         const unsortedSlice = this.cachedOrderedRooms.splice(startIdx, numSort);
-        const sorted = await sortRoomsWithAlgorithm(unsortedSlice, this.tagId, this.sortingAlgorithm);
+        const sorted = sortRoomsWithAlgorithm(unsortedSlice, this.tagId, this.sortingAlgorithm);
         this.cachedOrderedRooms.splice(startIdx, 0, ...sorted);
     }
 
diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
index cc2a28d892..91182dee16 100644
--- a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -29,42 +29,32 @@ export class NaturalAlgorithm extends OrderingAlgorithm {
         super(tagId, initialSortingAlgorithm);
     }
 
-    public async setRooms(rooms: Room[]): Promise<any> {
-        this.cachedOrderedRooms = await sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
+    public setRooms(rooms: Room[]): void {
+        this.cachedOrderedRooms = sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
     }
 
-    public async handleRoomUpdate(room, cause): Promise<boolean> {
-        try {
-            await this.updateLock.acquireAsync();
-
-            const isSplice = cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved;
-            const isInPlace = cause === RoomUpdateCause.Timeline || cause === RoomUpdateCause.ReadReceipt;
-            if (!isSplice && !isInPlace) {
-                throw new Error(`Unsupported update cause: ${cause}`);
-            }
-
-            if (cause === RoomUpdateCause.NewRoom) {
-                this.cachedOrderedRooms.push(room);
-            } else if (cause === RoomUpdateCause.RoomRemoved) {
-                const idx = this.getRoomIndex(room);
-                if (idx >= 0) {
-                    this.cachedOrderedRooms.splice(idx, 1);
-                } else {
-                    console.warn(`Tried to remove unknown room from ${this.tagId}: ${room.roomId}`);
-                }
-            }
-
-            // TODO: Optimize this to avoid useless operations: https://github.com/vector-im/element-web/issues/14457
-            // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
-            this.cachedOrderedRooms = await sortRoomsWithAlgorithm(
-                this.cachedOrderedRooms,
-                this.tagId,
-                this.sortingAlgorithm,
-            );
-
-            return true;
-        } finally {
-            await this.updateLock.release();
+    public handleRoomUpdate(room, cause): boolean {
+        const isSplice = cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved;
+        const isInPlace = cause === RoomUpdateCause.Timeline || cause === RoomUpdateCause.ReadReceipt;
+        if (!isSplice && !isInPlace) {
+            throw new Error(`Unsupported update cause: ${cause}`);
         }
+
+        if (cause === RoomUpdateCause.NewRoom) {
+            this.cachedOrderedRooms.push(room);
+        } else if (cause === RoomUpdateCause.RoomRemoved) {
+            const idx = this.getRoomIndex(room);
+            if (idx >= 0) {
+                this.cachedOrderedRooms.splice(idx, 1);
+            } else {
+                console.warn(`Tried to remove unknown room from ${this.tagId}: ${room.roomId}`);
+            }
+        }
+
+        // TODO: Optimize this to avoid useless operations: https://github.com/vector-im/element-web/issues/14457
+        // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
+        this.cachedOrderedRooms = sortRoomsWithAlgorithm(this.cachedOrderedRooms, this.tagId, this.sortingAlgorithm);
+
+        return true;
     }
 }
diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
index c47a35523c..9d7b5f9ddb 100644
--- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
@@ -17,7 +17,6 @@ limitations under the License.
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomUpdateCause, TagID } from "../../models";
 import { SortAlgorithm } from "../models";
-import AwaitLock from "await-lock";
 
 /**
  * Represents a list ordering algorithm. Subclasses should populate the
@@ -26,7 +25,6 @@ import AwaitLock from "await-lock";
 export abstract class OrderingAlgorithm {
     protected cachedOrderedRooms: Room[];
     protected sortingAlgorithm: SortAlgorithm;
-    protected readonly updateLock = new AwaitLock();
 
     protected constructor(protected tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
         // noinspection JSIgnoredPromiseFromCall
@@ -45,21 +43,20 @@ export abstract class OrderingAlgorithm {
      * @param newAlgorithm The new algorithm. Must be defined.
      * @returns Resolves when complete.
      */
-    public async setSortAlgorithm(newAlgorithm: SortAlgorithm) {
+    public setSortAlgorithm(newAlgorithm: SortAlgorithm) {
         if (!newAlgorithm) throw new Error("A sorting algorithm must be defined");
         this.sortingAlgorithm = newAlgorithm;
 
         // Force regeneration of the rooms
-        await this.setRooms(this.orderedRooms);
+        this.setRooms(this.orderedRooms);
     }
 
     /**
      * Sets the rooms the algorithm should be handling, implying a reconstruction
      * of the ordering.
      * @param rooms The rooms to use going forward.
-     * @returns Resolves when complete.
      */
-    public abstract setRooms(rooms: Room[]): Promise<any>;
+    public abstract setRooms(rooms: Room[]): void;
 
     /**
      * Handle a room update. The Algorithm will only call this for causes which
@@ -69,7 +66,7 @@ export abstract class OrderingAlgorithm {
      * @param cause The cause of the update.
      * @returns True if the update requires the Algorithm to update the presentation layers.
      */
-    public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean>;
+    public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): boolean;
 
     protected getRoomIndex(room: Room): number {
         let roomIdx = this.cachedOrderedRooms.indexOf(room);
diff --git a/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts
index b016a4256c..45f6eaf843 100644
--- a/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts
@@ -23,7 +23,7 @@ import { compare } from "../../../../utils/strings";
  * Sorts rooms according to the browser's determination of alphabetic.
  */
 export class AlphabeticAlgorithm implements IAlgorithm {
-    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+    public sortRooms(rooms: Room[], tagId: TagID): Room[] {
         return rooms.sort((a, b) => {
             return compare(a.name, b.name);
         });
diff --git a/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
index 6c22ee0c9c..588bbbffc9 100644
--- a/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
@@ -25,7 +25,7 @@ export interface IAlgorithm {
      * Sorts the given rooms according to the sorting rules of the algorithm.
      * @param {Room[]} rooms The rooms to sort.
      * @param {TagID} tagId The tag ID in which the rooms are being sorted.
-     * @returns {Promise<Room[]>} Resolves to the sorted rooms.
+     * @returns {Room[]} Returns the sorted rooms.
      */
-    sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]>;
+    sortRooms(rooms: Room[], tagId: TagID): Room[];
 }
diff --git a/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
index b8c0357633..9be8ba5262 100644
--- a/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
@@ -22,7 +22,7 @@ import { IAlgorithm } from "./IAlgorithm";
  * Sorts rooms according to the tag's `order` property on the room.
  */
 export class ManualAlgorithm implements IAlgorithm {
-    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+    public sortRooms(rooms: Room[], tagId: TagID): Room[] {
         const getOrderProp = (r: Room) => r.tags[tagId].order || 0;
         return rooms.sort((a, b) => {
             return getOrderProp(a) - getOrderProp(b);
diff --git a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
index 49cfd9e520..0da2c69eb8 100644
--- a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
@@ -20,6 +20,27 @@ import { IAlgorithm } from "./IAlgorithm";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import * as Unread from "../../../../Unread";
 import { EffectiveMembership, getEffectiveMembership } from "../../../../utils/membership";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+export function shouldCauseReorder(event: MatrixEvent): boolean {
+    const type = event.getType();
+    const content = event.getContent();
+    const prevContent = event.getPrevContent();
+
+    // Never ignore membership changes
+    if (type === EventType.RoomMember && prevContent.membership !== content.membership) return true;
+
+    // Ignore status changes
+    // XXX: This should be an enum
+    if (type === "im.vector.user_status") return false;
+    // Ignore display name changes
+    if (type === EventType.RoomMember && prevContent.displayname !== content.displayname) return false;
+    // Ignore avatar changes
+    if (type === EventType.RoomMember && prevContent.avatar_url !== content.avatar_url) return false;
+
+    return true;
+}
 
 export const sortRooms = (rooms: Room[]): Room[] => {
     // We cache the timestamp lookup to avoid iterating forever on the timeline
@@ -68,7 +89,10 @@ export const sortRooms = (rooms: Room[]): Room[] => {
                 const ev = r.timeline[i];
                 if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
 
-                if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) {
+                if (
+                    (ev.getSender() === myUserId && shouldCauseReorder(ev)) ||
+                    Unread.eventTriggersUnreadCount(ev)
+                ) {
                     return ev.getTs();
                 }
             }
@@ -97,7 +121,7 @@ export const sortRooms = (rooms: Room[]): Room[] => {
  * useful to the user.
  */
 export class RecentAlgorithm implements IAlgorithm {
-    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+    public sortRooms(rooms: Room[], tagId: TagID): Room[] {
         return sortRooms(rooms);
     }
 }
diff --git a/src/stores/room-list/algorithms/tag-sorting/index.ts b/src/stores/room-list/algorithms/tag-sorting/index.ts
index c22865f5ba..368c76f111 100644
--- a/src/stores/room-list/algorithms/tag-sorting/index.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/index.ts
@@ -46,8 +46,8 @@ export function getSortingAlgorithmInstance(algorithm: SortAlgorithm): IAlgorith
  * @param {Room[]} rooms The rooms to sort.
  * @param {TagID} tagId The tag in which the sorting is occurring.
  * @param {SortAlgorithm} algorithm The algorithm to use for sorting.
- * @returns {Promise<Room[]>} Resolves to the sorted rooms.
+ * @returns {Room[]} Returns the sorted rooms.
  */
-export function sortRoomsWithAlgorithm(rooms: Room[], tagId: TagID, algorithm: SortAlgorithm): Promise<Room[]> {
+export function sortRoomsWithAlgorithm(rooms: Room[], tagId: TagID, algorithm: SortAlgorithm): Room[] {
     return getSortingAlgorithmInstance(algorithm).sortRooms(rooms, tagId);
 }
diff --git a/src/stores/room-list/filters/NameFilterCondition.ts b/src/stores/room-list/filters/NameFilterCondition.ts
index 7ec91a3249..e21d5ab718 100644
--- a/src/stores/room-list/filters/NameFilterCondition.ts
+++ b/src/stores/room-list/filters/NameFilterCondition.ts
@@ -46,7 +46,7 @@ export class NameFilterCondition extends EventEmitter implements IFilterConditio
 
     private callUpdate = throttle(() => {
         this.emit(FILTER_CHANGED);
-    }, 200, {trailing: true, leading: true});
+    }, 200, { trailing: true, leading: true });
 
     public isVisible(room: Room): boolean {
         const lcFilter = this.search.toLowerCase();
diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts
index 6a06bee0d8..0e6965d843 100644
--- a/src/stores/room-list/filters/SpaceFilterCondition.ts
+++ b/src/stores/room-list/filters/SpaceFilterCondition.ts
@@ -19,7 +19,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
 
 import { FILTER_CHANGED, FilterKind, IFilterCondition } from "./IFilterCondition";
 import { IDestroyable } from "../../../utils/IDestroyable";
-import SpaceStore from "../../SpaceStore";
+import SpaceStore, { HOME_SPACE } from "../../SpaceStore";
 import { setHasDiff } from "../../../utils/sets";
 
 /**
@@ -29,7 +29,7 @@ import { setHasDiff } from "../../../utils/sets";
  *  + All DMs
  */
 export class SpaceFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable {
-    private roomIds = new Set<Room>();
+    private roomIds = new Set<string>();
     private space: Room = null;
 
     public get kind(): FilterKind {
@@ -55,12 +55,10 @@ export class SpaceFilterCondition extends EventEmitter implements IFilterConditi
         }
     };
 
-    private getSpaceEventKey = (space: Room) => space.roomId;
+    private getSpaceEventKey = (space: Room | null) => space ? space.roomId : HOME_SPACE;
 
     public updateSpace(space: Room) {
-        if (this.space) {
-            SpaceStore.instance.off(this.getSpaceEventKey(this.space), this.onStoreUpdate);
-        }
+        SpaceStore.instance.off(this.getSpaceEventKey(this.space), this.onStoreUpdate);
         SpaceStore.instance.on(this.getSpaceEventKey(this.space = space), this.onStoreUpdate);
         this.onStoreUpdate(); // initial update from the change to the space
     }
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
index c07c2b0b26..f63b622053 100644
--- a/src/stores/room-list/filters/VisibilityProvider.ts
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import {Room} from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
 import CallHandler from "../../../CallHandler";
 import { RoomListCustomisations } from "../../../customisations/RoomList";
 import VoipUserMapper from "../../../VoipUserMapper";
-import SettingsStore from "../../../settings/SettingsStore";
+import SpaceStore from "../../SpaceStore";
 
 export class VisibilityProvider {
     private static internalInstance: VisibilityProvider;
@@ -50,7 +50,7 @@ export class VisibilityProvider {
         }
 
         // hide space rooms as they'll be shown in the SpacePanel
-        if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) {
+        if (SpaceStore.spacesEnabled && room.isSpaceRoom()) {
             return false;
         }
 
diff --git a/src/stores/room-list/previews/CallAnswerEventPreview.ts b/src/stores/room-list/previews/CallAnswerEventPreview.ts
index b7207307e2..7193154890 100644
--- a/src/stores/room-list/previews/CallAnswerEventPreview.ts
+++ b/src/stores/room-list/previews/CallAnswerEventPreview.ts
@@ -26,7 +26,7 @@ export class CallAnswerEventPreview implements IPreview {
             if (isSelf(event)) {
                 return _t("You joined the call");
             } else {
-                return _t("%(senderName)s joined the call", {senderName: getSenderName(event)});
+                return _t("%(senderName)s joined the call", { senderName: getSenderName(event) });
             }
         } else {
             return _t("Call in progress");
diff --git a/src/stores/room-list/previews/CallHangupEvent.ts b/src/stores/room-list/previews/CallHangupEvent.ts
index fdab8a9de5..54d4d70fb0 100644
--- a/src/stores/room-list/previews/CallHangupEvent.ts
+++ b/src/stores/room-list/previews/CallHangupEvent.ts
@@ -26,7 +26,7 @@ export class CallHangupEvent implements IPreview {
             if (isSelf(event)) {
                 return _t("You ended the call");
             } else {
-                return _t("%(senderName)s ended the call", {senderName: getSenderName(event)});
+                return _t("%(senderName)s ended the call", { senderName: getSenderName(event) });
             }
         } else {
             return _t("Call ended");
diff --git a/src/stores/room-list/previews/CallInviteEventPreview.ts b/src/stores/room-list/previews/CallInviteEventPreview.ts
index 47486e3701..3e6a89aa6d 100644
--- a/src/stores/room-list/previews/CallInviteEventPreview.ts
+++ b/src/stores/room-list/previews/CallInviteEventPreview.ts
@@ -26,13 +26,13 @@ export class CallInviteEventPreview implements IPreview {
             if (isSelf(event)) {
                 return _t("You started a call");
             } else {
-                return _t("%(senderName)s started a call", {senderName: getSenderName(event)});
+                return _t("%(senderName)s started a call", { senderName: getSenderName(event) });
             }
         } else {
             if (isSelf(event)) {
                 return _t("Waiting for answer");
             } else {
-                return _t("%(senderName)s is calling", {senderName: getSenderName(event)});
+                return _t("%(senderName)s is calling", { senderName: getSenderName(event) });
             }
         }
     }
diff --git a/src/stores/room-list/previews/MessageEventPreview.ts b/src/stores/room-list/previews/MessageEventPreview.ts
index b900afc13f..961f27fda1 100644
--- a/src/stores/room-list/previews/MessageEventPreview.ts
+++ b/src/stores/room-list/previews/MessageEventPreview.ts
@@ -17,7 +17,7 @@ limitations under the License.
 import { IPreview } from "./IPreview";
 import { TagID } from "../models";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { _t } from "../../../languageHandler";
+import { _t, sanitizeForTranslation } from "../../../languageHandler";
 import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
 import ReplyThread from "../../../components/views/elements/ReplyThread";
 import { getHtmlText } from "../../../HtmlUtils";
@@ -58,14 +58,16 @@ export class MessageEventPreview implements IPreview {
             body = getHtmlText(body);
         }
 
+        body = sanitizeForTranslation(body);
+
         if (msgtype === 'm.emote') {
-            return _t("* %(senderName)s %(emote)s", {senderName: getSenderName(event), emote: body});
+            return _t("* %(senderName)s %(emote)s", { senderName: getSenderName(event), emote: body });
         }
 
         if (isSelf(event) || !shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
             return body;
         } else {
-            return _t("%(senderName)s: %(message)s", {senderName: getSenderName(event), message: body});
+            return _t("%(senderName)s: %(message)s", { senderName: getSenderName(event), message: body });
         }
     }
 }
diff --git a/src/stores/room-list/previews/ReactionEventPreview.ts b/src/stores/room-list/previews/ReactionEventPreview.ts
index 0012cf2f75..25f8e0b61a 100644
--- a/src/stores/room-list/previews/ReactionEventPreview.ts
+++ b/src/stores/room-list/previews/ReactionEventPreview.ts
@@ -44,7 +44,7 @@ export class ReactionEventPreview implements IPreview {
         if (isSelf(event) || !shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
             return reaction;
         } else {
-            return _t("%(senderName)s: %(reaction)s", {senderName: getSenderName(event), reaction});
+            return _t("%(senderName)s: %(reaction)s", { senderName: getSenderName(event), reaction });
         }
     }
 }
diff --git a/src/stores/room-list/previews/StickerEventPreview.ts b/src/stores/room-list/previews/StickerEventPreview.ts
index f8263a4a45..56746568af 100644
--- a/src/stores/room-list/previews/StickerEventPreview.ts
+++ b/src/stores/room-list/previews/StickerEventPreview.ts
@@ -28,7 +28,7 @@ export class StickerEventPreview implements IPreview {
         if (isSelf(event) || !shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
             return stickerName;
         } else {
-            return _t("%(senderName)s: %(stickerName)s", {senderName: getSenderName(event), stickerName});
+            return _t("%(senderName)s: %(stickerName)s", { senderName: getSenderName(event), stickerName });
         }
     }
 }
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 397d637125..e00c4c6c0b 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020, 2021 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.
@@ -46,14 +46,18 @@ import ActiveWidgetStore from "../ActiveWidgetStore";
 import { objectShallowClone } from "../../utils/objects";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { ElementWidgetActions, IViewRoomApiRequest } from "./ElementWidgetActions";
-import {ModalWidgetStore} from "../ModalWidgetStore";
+import { ModalWidgetStore } from "../ModalWidgetStore";
 import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
-import {getCustomTheme} from "../../theme";
+import { getCustomTheme } from "../../theme";
 import CountlyAnalytics from "../../CountlyAnalytics";
 import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { ELEMENT_CLIENT_ID } from "../../identifiers";
 import { getUserLanguage } from "../../languageHandler";
+import { WidgetVariableCustomisations } from "../../customisations/WidgetVariables";
+import { arrayFastClone } from "../../utils/arrays";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 // TODO: Destroy all of this code
 
@@ -65,7 +69,7 @@ interface IAppTileProps {
     userId: string;
     creatorUserId: string;
     waitForIframeLoad: boolean;
-    whitelistCapabilities: string[];
+    whitelistCapabilities?: string[];
     userWidget: boolean;
 }
 
@@ -145,6 +149,7 @@ export class StopGapWidget extends EventEmitter {
     private scalarToken: string;
     private roomId?: string;
     private kind: WidgetKind;
+    private readUpToMap: {[roomId: string]: string} = {}; // room ID to event ID
 
     constructor(private appTileProps: IAppTileProps) {
         super();
@@ -180,18 +185,19 @@ export class StopGapWidget extends EventEmitter {
      * The URL to use in the iframe
      */
     public get embedUrl(): string {
-        return this.runUrlTemplate({asPopout: false});
+        return this.runUrlTemplate({ asPopout: false });
     }
 
     /**
      * The URL to use in the popout
      */
     public get popoutUrl(): string {
-        return this.runUrlTemplate({asPopout: true});
+        return this.runUrlTemplate({ asPopout: true });
     }
 
-    private runUrlTemplate(opts = {asPopout: false}): string {
-        const templated = this.mockWidget.getCompleteUrl({
+    private runUrlTemplate(opts = { asPopout: false }): string {
+        const fromCustomisation = WidgetVariableCustomisations?.provideVariables?.() ?? {};
+        const defaults: ITemplateParams = {
             widgetRoomId: this.roomId,
             currentUserId: MatrixClientPeg.get().getUserId(),
             userDisplayName: OwnProfileStore.instance.displayName,
@@ -199,7 +205,8 @@ export class StopGapWidget extends EventEmitter {
             clientId: ELEMENT_CLIENT_ID,
             clientTheme: SettingsStore.getValue("theme"),
             clientLanguage: getUserLanguage(),
-        }, opts?.asPopout);
+        };
+        const templated = this.mockWidget.getCompleteUrl(Object.assign(defaults, fromCustomisation), opts?.asPopout);
 
         const parsed = new URL(templated);
 
@@ -244,7 +251,7 @@ export class StopGapWidget extends EventEmitter {
                 error: {
                     message: "Unable to open modal at this time",
                 },
-            })
+            });
         }
     };
 
@@ -259,7 +266,7 @@ export class StopGapWidget extends EventEmitter {
         WidgetMessagingStore.instance.storeMessaging(this.mockWidget, this.messaging);
 
         if (!this.appTileProps.userWidget && this.appTileProps.room) {
-            ActiveWidgetStore.setRoomId(this.mockWidget.id, this.appTileProps.room.roomId);
+            ActiveWidgetStore.instance.setRoomId(this.mockWidget.id, this.appTileProps.room.roomId);
         }
 
         // Always attach a handler for ViewRoom, but permission check it internally
@@ -270,14 +277,14 @@ export class StopGapWidget extends EventEmitter {
             const targetRoomId = (ev.detail.data || {}).room_id;
             if (!targetRoomId) {
                 return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
-                    error: {message: "Room ID not supplied."},
+                    error: { message: "Room ID not supplied." },
                 });
             }
 
             // Check the widget's permission
             if (!this.messaging.hasCapability(ElementWidgetCapabilities.CanChangeViewedRoom)) {
                 return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
-                    error: {message: "This widget does not have permission for this action (denied)."},
+                    error: { message: "This widget does not have permission for this action (denied)." },
                 });
             }
 
@@ -291,6 +298,17 @@ export class StopGapWidget extends EventEmitter {
             this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
         });
 
+        // Populate the map of "read up to" events for this widget with the current event in every room.
+        // This is a bit inefficient, but should be okay. We do this for all rooms in case the widget
+        // requests timeline capabilities in other rooms down the road. It's just easier to manage here.
+        for (const room of MatrixClientPeg.get().getRooms()) {
+            // Timelines are most recent last
+            const events = room.getLiveTimeline()?.getEvents() || [];
+            const roomEvent = events[events.length - 1];
+            if (!roomEvent) continue; // force later code to think the room is fresh
+            this.readUpToMap[room.roomId] = roomEvent.getId();
+        }
+
         // Attach listeners for feeding events - the underlying widget classes handle permissions for us
         MatrixClientPeg.get().on('event', this.onEvent);
         MatrixClientPeg.get().on('Event.decrypted', this.onEventDecrypted);
@@ -301,7 +319,7 @@ export class StopGapWidget extends EventEmitter {
                     if (WidgetType.JITSI.matches(this.mockWidget.type)) {
                         CountlyAnalytics.instance.trackJoinCall(this.appTileProps.room.roomId, true, true);
                     }
-                    ActiveWidgetStore.setWidgetPersistence(this.mockWidget.id, ev.detail.data.value);
+                    ActiveWidgetStore.instance.setWidgetPersistence(this.mockWidget.id, ev.detail.data.value);
                     ev.preventDefault();
                     this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{}); // ack
                 }
@@ -335,12 +353,12 @@ export class StopGapWidget extends EventEmitter {
                     this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
 
                     // First close the stickerpicker
-                    defaultDispatcher.dispatch({action: "stickerpicker_close"});
+                    defaultDispatcher.dispatch({ action: "stickerpicker_close" });
 
                     // Now open the integration manager
                     // TODO: Spec this interaction.
                     const data = ev.detail.data;
-                    const integType = data?.integType
+                    const integType = data?.integType;
                     const integId = <string>data?.integId;
 
                     // TODO: Open the right integration manager for the widget
@@ -363,6 +381,9 @@ export class StopGapWidget extends EventEmitter {
     }
 
     public async prepare(): Promise<void> {
+        // Ensure the variables are ready for us to be rendered before continuing
+        await (WidgetVariableCustomisations?.isReady?.() ?? Promise.resolve());
+
         if (this.scalarToken) return;
         const existingMessaging = WidgetMessagingStore.instance.getMessaging(this.mockWidget);
         if (existingMessaging) this.messaging = existingMessaging;
@@ -384,14 +405,14 @@ export class StopGapWidget extends EventEmitter {
         }
     }
 
-    public stop(opts = {forceDestroy: false}) {
-        if (!opts?.forceDestroy && ActiveWidgetStore.getPersistentWidgetId() === this.mockWidget.id) {
-            console.log("Skipping destroy - persistent widget");
+    public stop(opts = { forceDestroy: false }) {
+        if (!opts?.forceDestroy && ActiveWidgetStore.instance.getPersistentWidgetId() === this.mockWidget.id) {
+            logger.log("Skipping destroy - persistent widget");
             return;
         }
         if (!this.started) return;
         WidgetMessagingStore.instance.stopMessaging(this.mockWidget);
-        ActiveWidgetStore.delRoomId(this.mockWidget.id);
+        ActiveWidgetStore.instance.delRoomId(this.mockWidget.id);
 
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().off('event', this.onEvent);
@@ -402,21 +423,56 @@ export class StopGapWidget extends EventEmitter {
     private onEvent = (ev: MatrixEvent) => {
         MatrixClientPeg.get().decryptEventIfNeeded(ev);
         if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
-        if (ev.getRoomId() !== this.eventListenerRoomId) return;
         this.feedEvent(ev);
     };
 
     private onEventDecrypted = (ev: MatrixEvent) => {
         if (ev.isDecryptionFailure()) return;
-        if (ev.getRoomId() !== this.eventListenerRoomId) return;
         this.feedEvent(ev);
     };
 
     private feedEvent(ev: MatrixEvent) {
         if (!this.messaging) return;
 
-        const raw = ev.event;
-        this.messaging.feedEvent(raw).catch(e => {
+        // Check to see if this event would be before or after our "read up to" marker. If it's
+        // before, or we can't decide, then we assume the widget will have already seen the event.
+        // If the event is after, or we don't have a marker for the room, then we'll send it through.
+        //
+        // This approach of "read up to" prevents widgets receiving decryption spam from startup or
+        // receiving out-of-order events from backfill and such.
+        const upToEventId = this.readUpToMap[ev.getRoomId()];
+        if (upToEventId) {
+            // Small optimization for exact match (prevent search)
+            if (upToEventId === ev.getId()) {
+                return;
+            }
+
+            let isBeforeMark = true;
+
+            // Timelines are most recent last, so reverse the order and limit ourselves to 100 events
+            // to avoid overusing the CPU.
+            const timeline = MatrixClientPeg.get().getRoom(ev.getRoomId()).getLiveTimeline();
+            const events = arrayFastClone(timeline.getEvents()).reverse().slice(0, 100);
+
+            for (const timelineEvent of events) {
+                if (timelineEvent.getId() === upToEventId) {
+                    break;
+                } else if (timelineEvent.getId() === ev.getId()) {
+                    isBeforeMark = false;
+                    break;
+                }
+            }
+
+            if (isBeforeMark) {
+                // Ignore the event: it is before our interest.
+                return;
+            }
+        }
+
+        this.readUpToMap[ev.getRoomId()] = ev.getId();
+
+        const raw = ev.getEffectiveEvent();
+        this.messaging.feedEvent(raw, this.eventListenerRoomId).catch(e => {
             console.error("Error sending event to widget: ", e);
         });
     }
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index 25e81c47a2..058a605380 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -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.
@@ -23,6 +23,7 @@ import {
     MatrixCapabilities,
     OpenIDRequestState,
     SimpleObservable,
+    Symbols,
     Widget,
     WidgetDriver,
     WidgetEventCapability,
@@ -33,9 +34,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import ActiveRoomObserver from "../../ActiveRoomObserver";
 import Modal from "../../Modal";
 import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog";
-import WidgetCapabilitiesPromptDialog, {
-    getRememberedCapabilitiesForWidget,
-} from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
+import WidgetCapabilitiesPromptDialog from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
 import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions";
 import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
 import { WidgetType } from "../../widgets/WidgetType";
@@ -43,11 +42,20 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 import { CHAT_EFFECTS } from "../../effects";
 import { containsEmoji } from "../../effects/utils";
 import dis from "../../dispatcher/dispatcher";
-import {tryTransformPermalinkToLocalHref} from "../../utils/permalinks/Permalinks";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permalinks";
+import { IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 // TODO: Purge this from the universe
 
+function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
+    return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
+}
+
+function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
+    localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
+}
+
 export class StopGapWidgetDriver extends WidgetDriver {
     private allowedCapabilities: Set<Capability>;
 
@@ -100,6 +108,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
             }
         }
         // TODO: Do something when the widget requests new capabilities not yet asked for
+        let rememberApproved = false;
         if (missing.size > 0) {
             try {
                 const [result] = await Modal.createTrackedDialog(
@@ -111,17 +120,29 @@ export class StopGapWidgetDriver extends WidgetDriver {
                         widgetKind: this.forWidgetKind,
                     }).finished;
                 (result.approved || []).forEach(cap => allowedSoFar.add(cap));
+                rememberApproved = result.remember;
             } catch (e) {
                 console.error("Non-fatal error getting capabilities: ", e);
             }
         }
 
-        return new Set(iterableUnion(allowedSoFar, requested));
+        const allAllowed = new Set(iterableUnion(allowedSoFar, requested));
+
+        if (rememberApproved) {
+            setRememberedCapabilitiesForWidget(this.forWidget, Array.from(allAllowed));
+        }
+
+        return allAllowed;
     }
 
-    public async sendEvent(eventType: string, content: any, stateKey: string = null): Promise<ISendEventDetails> {
+    public async sendEvent(
+        eventType: string,
+        content: any,
+        stateKey: string = null,
+        targetRoomId: string = null,
+    ): Promise<ISendEventDetails> {
         const client = MatrixClientPeg.get();
-        const roomId = ActiveRoomObserver.activeRoomId;
+        const roomId = targetRoomId || ActiveRoomObserver.activeRoomId;
 
         if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
 
@@ -129,6 +150,9 @@ export class StopGapWidgetDriver extends WidgetDriver {
         if (stateKey !== null) {
             // state event
             r = await client.sendStateEvent(roomId, eventType, content, stateKey);
+        } else if (eventType === EventType.RoomRedaction) {
+            // special case: extract the `redacts` property and call redact
+            r = await client.redactEvent(roomId, content['redacts']);
         } else {
             // message event
             r = await client.sendEvent(roomId, eventType, content);
@@ -136,59 +160,77 @@ export class StopGapWidgetDriver extends WidgetDriver {
             if (eventType === EventType.RoomMessage) {
                 CHAT_EFFECTS.forEach((effect) => {
                     if (containsEmoji(content, effect.emojis)) {
-                        dis.dispatch({action: `effects.${effect.command}`});
+                        dis.dispatch({ action: `effects.${effect.command}` });
                     }
                 });
             }
         }
 
-        return {roomId, eventId: r.event_id};
+        return { roomId, eventId: r.event_id };
     }
 
-    public async readRoomEvents(eventType: string, msgtype: string | undefined, limit: number): Promise<MatrixEvent[]> {
-        limit = limit > 0 ? Math.min(limit, 25) : 25; // arbitrary choice
-
+    private pickRooms(roomIds: (string | Symbols.AnyRoom)[] = null): Room[] {
         const client = MatrixClientPeg.get();
-        const roomId = ActiveRoomObserver.activeRoomId;
-        const room = client.getRoom(roomId);
-        if (!client || !roomId || !room) throw new Error("Not in a room or not attached to a client");
+        if (!client) throw new Error("Not attached to a client");
 
-        const results: MatrixEvent[] = [];
-        const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
-        for (let i = events.length - 1; i > 0; i--) {
-            if (results.length >= limit) break;
+        const targetRooms = roomIds
+            ? (roomIds.includes(Symbols.AnyRoom) ? client.getVisibleRooms() : roomIds.map(r => client.getRoom(r)))
+            : [client.getRoom(ActiveRoomObserver.activeRoomId)];
+        return targetRooms.filter(r => !!r);
+    }
 
-            const ev = events[i];
-            if (ev.getType() !== eventType) continue;
-            if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
-            results.push(ev);
+    public async readRoomEvents(
+        eventType: string,
+        msgtype: string | undefined,
+        limitPerRoom: number,
+        roomIds: (string | Symbols.AnyRoom)[] = null,
+    ): Promise<object[]> {
+        limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
+
+        const rooms = this.pickRooms(roomIds);
+        const allResults: IEvent[] = [];
+        for (const room of rooms) {
+            const results: MatrixEvent[] = [];
+            const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
+            for (let i = events.length - 1; i > 0; i--) {
+                if (results.length >= limitPerRoom) break;
+
+                const ev = events[i];
+                if (ev.getType() !== eventType || ev.isState()) continue;
+                if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
+                results.push(ev);
+            }
+
+            results.forEach(e => allResults.push(e.getEffectiveEvent()));
         }
-
-        return results.map(e => e.event);
+        return allResults;
     }
 
     public async readStateEvents(
-        eventType: string, stateKey: string | undefined, limit: number,
-    ): Promise<MatrixEvent[]> {
-        limit = limit > 0 ? Math.min(limit, 100) : 100; // arbitrary choice
+        eventType: string,
+        stateKey: string | undefined,
+        limitPerRoom: number,
+        roomIds: (string | Symbols.AnyRoom)[] = null,
+    ): Promise<object[]> {
+        limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
 
-        const client = MatrixClientPeg.get();
-        const roomId = ActiveRoomObserver.activeRoomId;
-        const room = client.getRoom(roomId);
-        if (!client || !roomId || !room) throw new Error("Not in a room or not attached to a client");
-
-        const results: MatrixEvent[] = [];
-        const state = room.currentState.events.get(eventType);
-        if (state) {
-            if (stateKey === "" || !!stateKey) {
-                const forKey = state.get(stateKey);
-                if (forKey) results.push(forKey);
-            } else {
-                results.push(...Array.from(state.values()));
+        const rooms = this.pickRooms(roomIds);
+        const allResults: IEvent[] = [];
+        for (const room of rooms) {
+            const results: MatrixEvent[] = [];
+            const state: Map<string, MatrixEvent> = room.currentState.events.get(eventType);
+            if (state) {
+                if (stateKey === "" || !!stateKey) {
+                    const forKey = state.get(stateKey);
+                    if (forKey) results.push(forKey);
+                } else {
+                    results.push(...Array.from(state.values()));
+                }
             }
-        }
 
-        return results.slice(0, limit).map(e => e.event);
+            results.slice(0, limitPerRoom).forEach(e => allResults.push(e.getEffectiveEvent()));
+        }
+        return allResults;
     }
 
     public async askOpenID(observer: SimpleObservable<IOpenIDUpdate>) {
@@ -201,13 +243,13 @@ export class StopGapWidgetDriver extends WidgetDriver {
         };
 
         if (oidcState === OIDCState.Denied) {
-            return observer.update({state: OpenIDRequestState.Blocked});
+            return observer.update({ state: OpenIDRequestState.Blocked });
         }
         if (oidcState === OIDCState.Allowed) {
-            return observer.update({state: OpenIDRequestState.Allowed, token: await getToken()});
+            return observer.update({ state: OpenIDRequestState.Allowed, token: await getToken() });
         }
 
-        observer.update({state: OpenIDRequestState.PendingUserConfirmation});
+        observer.update({ state: OpenIDRequestState.PendingUserConfirmation });
 
         Modal.createTrackedDialog("OpenID widget permissions", '', WidgetOpenIDPermissionsDialog, {
             widget: this.forWidget,
@@ -216,10 +258,10 @@ export class StopGapWidgetDriver extends WidgetDriver {
 
             onFinished: async (confirm) => {
                 if (!confirm) {
-                    return observer.update({state: OpenIDRequestState.Blocked});
+                    return observer.update({ state: OpenIDRequestState.Blocked });
                 }
 
-                return observer.update({state: OpenIDRequestState.Allowed, token: await getToken()});
+                return observer.update({ state: OpenIDRequestState.Allowed, token: await getToken() });
             },
         });
     }
diff --git a/src/stores/widgets/WidgetLayoutStore.ts b/src/stores/widgets/WidgetLayoutStore.ts
index f5734d74c5..5d427a0f1a 100644
--- a/src/stores/widgets/WidgetLayoutStore.ts
+++ b/src/stores/widgets/WidgetLayoutStore.ts
@@ -332,7 +332,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
     }
 
     public getContainerWidgets(room: Room, container: Container): IApp[] {
-        return this.byRoom[room.roomId]?.[container]?.ordered || [];
+        return this.byRoom[room?.roomId]?.[container]?.ordered || [];
     }
 
     public isInContainer(room: Room, widget: IApp, container: Container): boolean {
@@ -425,7 +425,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
         const allWidgets = this.getAllWidgets(room);
         if (!allWidgets.some(([w])=> w.id === widget.id)) return; // invalid
         this.updateUserLayout(room, {
-            [widget.id]: {container: toContainer},
+            [widget.id]: { container: toContainer },
         });
     }
 
@@ -436,9 +436,9 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
 
     public copyLayoutToRoom(room: Room) {
         const allWidgets = this.getAllWidgets(room);
-        const evContent: ILayoutStateEvent = {widgets: {}};
+        const evContent: ILayoutStateEvent = { widgets: {} };
         for (const [widget, container] of allWidgets) {
-            evContent.widgets[widget.id] = {container};
+            evContent.widgets[widget.id] = { container };
             if (container === Container.Top) {
                 const containerWidgets = this.getContainerWidgets(room, container);
                 const idx = containerWidgets.findIndex(w => w.id === widget.id);
diff --git a/src/theme.js b/src/theme.ts
similarity index 85%
rename from src/theme.js
rename to src/theme.ts
index 40fa291cfc..8f95f8c784 100644
--- a/src/theme.js
+++ b/src/theme.ts
@@ -15,27 +15,47 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {_t} from "./languageHandler";
+import { _t } from "./languageHandler";
 
-export const DEFAULT_THEME = "light";
-import Tinter from "./Tinter";
 import SettingsStore from "./settings/SettingsStore";
 import ThemeWatcher from "./settings/watchers/ThemeWatcher";
 
-export function enumerateThemes() {
+export const DEFAULT_THEME = "light";
+
+interface IFontFaces {
+    src: {
+        format: string;
+        url: string;
+        local: string;
+    }[];
+}
+
+interface ICustomTheme {
+    colors: {
+        [key: string]: string;
+    };
+    fonts: {
+        faces: IFontFaces[];
+        general: string;
+        monospace: string;
+    };
+    is_dark?: boolean; // eslint-disable-line camelcase
+}
+
+export function enumerateThemes(): {[key: string]: string} {
     const BUILTIN_THEMES = {
         "light": _t("Light"),
         "dark": _t("Dark"),
     };
     const customThemes = SettingsStore.getValue("custom_themes");
     const customThemeNames = {};
-    for (const {name} of customThemes) {
+    for (const { name } of customThemes) {
         customThemeNames[`custom-${name}`] = name;
     }
     return Object.assign({}, customThemeNames, BUILTIN_THEMES);
 }
 
-function clearCustomTheme() {
+function clearCustomTheme(): void {
     // remove all css variables, we assume these are there because of the custom theme
     const inlineStyleProps = Object.values(document.body.style);
     for (const prop of inlineStyleProps) {
@@ -62,7 +82,7 @@ const allowedFontFaceProps = [
     "unicode-range",
 ];
 
-function generateCustomFontFaceCSS(faces) {
+function generateCustomFontFaceCSS(faces: IFontFaces[]): string {
     return faces.map(face => {
         const src = face.src && face.src.map(srcElement => {
             let format;
@@ -92,8 +112,8 @@ function generateCustomFontFaceCSS(faces) {
     }).join("\n");
 }
 
-function setCustomThemeVars(customTheme) {
-    const {style} = document.body;
+function setCustomThemeVars(customTheme: ICustomTheme): void {
+    const { style } = document.body;
 
     function setCSSColorVariable(name, hexColor, doPct = true) {
         style.setProperty(`--${name}`, hexColor);
@@ -117,7 +137,7 @@ function setCustomThemeVars(customTheme) {
         }
     }
     if (customTheme.fonts) {
-        const {fonts} = customTheme;
+        const { fonts } = customTheme;
         if (fonts.faces) {
             const css = generateCustomFontFaceCSS(fonts.faces);
             const style = document.createElement("style");
@@ -135,7 +155,7 @@ function setCustomThemeVars(customTheme) {
     }
 }
 
-export function getCustomTheme(themeName) {
+export function getCustomTheme(themeName: string): ICustomTheme {
     // set css variables
     const customThemes = SettingsStore.getValue("custom_themes");
     if (!customThemes) {
@@ -156,7 +176,7 @@ export function getCustomTheme(themeName) {
  *
  * @param {string} theme new theme
  */
-export async function setTheme(theme) {
+export async function setTheme(theme: string): Promise<void> {
     if (!theme) {
         const themeWatcher = new ThemeWatcher();
         theme = themeWatcher.getEffectiveTheme();
@@ -172,15 +192,10 @@ export async function setTheme(theme) {
     // look for the stylesheet elements.
     // styleElements is a map from style name to HTMLLinkElement.
     const styleElements = Object.create(null);
-    let a;
-    for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
-        const href = a.getAttribute("href");
-        // shouldn't we be using the 'title' tag rather than the href?
-        const match = href && href.match(/^bundles\/.*\/theme-(.*)\.css$/);
-        if (match) {
-            styleElements[match[1]] = a;
-        }
-    }
+    const themes = Array.from(document.querySelectorAll('[data-mx-theme]'));
+    themes.forEach(theme => {
+        styleElements[theme.attributes['data-mx-theme'].value.toLowerCase()] = theme;
+    });
 
     if (!(stylesheetName in styleElements)) {
         throw new Error("Unknown theme " + stylesheetName);
@@ -206,15 +221,15 @@ export async function setTheme(theme) {
             // We could alternatively lock or similar to stop the race, but
             // this is probably good enough for now.
             styleElements[stylesheetName].disabled = false;
-            Object.values(styleElements).forEach((a) => {
+            Object.values(styleElements).forEach((a: HTMLStyleElement) => {
                 if (a == styleElements[stylesheetName]) return;
                 a.disabled = true;
             });
             const bodyStyles = global.getComputedStyle(document.body);
             if (bodyStyles.backgroundColor) {
-                document.querySelector('meta[name="theme-color"]').content = bodyStyles.backgroundColor;
+                const metaElement: HTMLMetaElement = document.querySelector('meta[name="theme-color"]');
+                metaElement.content = bodyStyles.backgroundColor;
             }
-            Tinter.setTheme(theme);
             resolve();
         };
 
diff --git a/src/toasts/IncomingCallToast.tsx b/src/toasts/IncomingCallToast.tsx
new file mode 100644
index 0000000000..fbe4e66d50
--- /dev/null
+++ b/src/toasts/IncomingCallToast.tsx
@@ -0,0 +1,140 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
+Copyright 2019, 2020 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { CallType, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import classNames from 'classnames';
+import { replaceableComponent } from '../utils/replaceableComponent';
+import CallHandler, { CallHandlerEvent } from '../CallHandler';
+import dis from '../dispatcher/dispatcher';
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import { _t } from '../languageHandler';
+import RoomAvatar from '../components/views/avatars/RoomAvatar';
+import AccessibleTooltipButton from '../components/views/elements/AccessibleTooltipButton';
+import AccessibleButton from '../components/views/elements/AccessibleButton';
+
+export const getIncomingCallToastKey = (callId: string) => `call_${callId}`;
+
+interface IProps {
+    call: MatrixCall;
+}
+
+interface IState {
+    silenced: boolean;
+}
+
+@replaceableComponent("views.voip.IncomingCallToast")
+export default class IncomingCallToast extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            silenced: CallHandler.sharedInstance().isCallSilenced(this.props.call.callId),
+        };
+    }
+
+    public componentDidMount = (): void => {
+        CallHandler.sharedInstance().addListener(CallHandlerEvent.SilencedCallsChanged, this.onSilencedCallsChanged);
+    };
+
+    public componentWillUnmount(): void {
+        CallHandler.sharedInstance().removeListener(CallHandlerEvent.SilencedCallsChanged, this.onSilencedCallsChanged);
+    }
+
+    private onSilencedCallsChanged = (): void => {
+        this.setState({ silenced: CallHandler.sharedInstance().isCallSilenced(this.props.call.callId) });
+    };
+
+    private onAnswerClick = (e: React.MouseEvent): void => {
+        e.stopPropagation();
+        dis.dispatch({
+            action: 'answer',
+            room_id: CallHandler.sharedInstance().roomIdForCall(this.props.call),
+        });
+    };
+
+    private onRejectClick= (e: React.MouseEvent): void => {
+        e.stopPropagation();
+        dis.dispatch({
+            action: 'reject',
+            room_id: CallHandler.sharedInstance().roomIdForCall(this.props.call),
+        });
+    };
+
+    private onSilenceClick = (e: React.MouseEvent): void => {
+        e.stopPropagation();
+        const callId = this.props.call.callId;
+        this.state.silenced ?
+            CallHandler.sharedInstance().unSilenceCall(callId) :
+            CallHandler.sharedInstance().silenceCall(callId);
+    };
+
+    public render() {
+        const call = this.props.call;
+        const room = MatrixClientPeg.get().getRoom(CallHandler.sharedInstance().roomIdForCall(call));
+        const isVoice = call.type === CallType.Voice;
+
+        const contentClass = classNames("mx_IncomingCallToast_content", {
+            "mx_IncomingCallToast_content_voice": isVoice,
+            "mx_IncomingCallToast_content_video": !isVoice,
+        });
+        const silenceClass = classNames("mx_IncomingCallToast_iconButton", {
+            "mx_IncomingCallToast_unSilence": this.state.silenced,
+            "mx_IncomingCallToast_silence": !this.state.silenced,
+        });
+
+        return <React.Fragment>
+            <RoomAvatar
+                room={room}
+                height={32}
+                width={32}
+            />
+            <div className={contentClass}>
+                <span className="mx_CallEvent_caller">
+                    { room ? room.name : _t("Unknown caller") }
+                </span>
+                <div className="mx_CallEvent_type">
+                    <div className="mx_CallEvent_type_icon" />
+                    { isVoice ? _t("Voice call") : _t("Video call") }
+                </div>
+                <div className="mx_IncomingCallToast_buttons">
+                    <AccessibleButton
+                        className="mx_IncomingCallToast_button mx_IncomingCallToast_button_decline"
+                        onClick={this.onRejectClick}
+                        kind="danger"
+                    >
+                        <span> { _t("Decline") } </span>
+                    </AccessibleButton>
+                    <AccessibleButton
+                        className="mx_IncomingCallToast_button mx_IncomingCallToast_button_accept"
+                        onClick={this.onAnswerClick}
+                        kind="primary"
+                    >
+                        <span> { _t("Accept") } </span>
+                    </AccessibleButton>
+                </div>
+            </div>
+            <AccessibleTooltipButton
+                className={silenceClass}
+                onClick={this.onSilenceClick}
+                title={this.state.silenced ? _t("Sound on") : _t("Silence call")}
+            />
+        </React.Fragment>;
+    }
+}
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
index 36de6f04e0..9a104f552e 100644
--- a/src/toasts/ServerLimitToast.tsx
+++ b/src/toasts/ServerLimitToast.tsx
@@ -19,7 +19,7 @@ import React from "react";
 import { _t, _td } from "../languageHandler";
 import GenericToast from "../components/views/toasts/GenericToast";
 import ToastStore from "../stores/ToastStore";
-import {messageForResourceLimitError} from "../utils/ErrorUtils";
+import { messageForResourceLimitError } from "../utils/ErrorUtils";
 
 const TOAST_KEY = "serverlimit";
 
@@ -37,10 +37,10 @@ export const showToast = (limitType: string, onHideToast: () => void, adminConta
         key: TOAST_KEY,
         title: _t("Warning"),
         props: {
-            description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
+            description: <React.Fragment>{ errorText } { contactText }</React.Fragment>,
             acceptLabel: _t("Ok"),
             onAccept: () => {
-                hideToast()
+                hideToast();
                 if (onHideToast) onHideToast();
             },
         },
diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts
index ade7dfe3f0..bdaeb5142f 100644
--- a/src/toasts/SetupEncryptionToast.ts
+++ b/src/toasts/SetupEncryptionToast.ts
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import Modal from "../Modal";
-import * as sdk from "../index";
 import { _t } from "../languageHandler";
 import DeviceListener from "../DeviceListener";
 import SetupEncryptionDialog from "../components/views/dialogs/security/SetupEncryptionDialog";
@@ -23,6 +22,7 @@ import { accessSecretStorage } from "../SecurityManager";
 import ToastStore from "../stores/ToastStore";
 import GenericToast from "../components/views/toasts/GenericToast";
 import SecurityCustomisations from "../customisations/Security";
+import Spinner from "../components/views/elements/Spinner";
 
 const TOAST_KEY = "setupencryption";
 
@@ -88,7 +88,6 @@ export const showToast = (kind: Kind) => {
             Modal.createTrackedDialog("Verify session", "Verify session", SetupEncryptionDialog,
                 {}, null, /* priority = */ false, /* static = */ true);
         } else {
-            const Spinner = sdk.getComponent("elements.Spinner");
             const modal = Modal.createDialog(
                 Spinner, null, "mx_Dialog_spinner", /* priority */ false, /* static */ true,
             );
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
index c856d39d1f..05425b93c0 100644
--- a/src/toasts/UnverifiedSessionToast.ts
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -21,7 +21,7 @@ import DeviceListener from '../DeviceListener';
 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";
+import { UserTab } from "../components/views/dialogs/UserSettingsDialog";
 
 function toastKey(deviceId: string) {
     return "unverified_session_" + deviceId;
@@ -34,7 +34,7 @@ export const showToast = async (deviceId: string) => {
         DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
         dis.dispatch({
             action: Action.ViewUserSettings,
-            initialTabId: USER_SECURITY_TAB,
+            initialTabId: UserTab.Security,
         });
     };
 
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index eb35c41512..cb072705ce 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -51,7 +51,7 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
         onAccept = () => {
             Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
                 title: _t("What's New"),
-                description: <pre>{releaseNotes}</pre>,
+                description: <pre>{ releaseNotes }</pre>,
                 button: _t("Update"),
                 onFinished: (update) => {
                     if (update && PlatformPeg.get()) {
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
deleted file mode 100644
index 13f38cc31a..0000000000
--- a/src/usercontent/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function remoteRender(event) {
-    const data = event.data;
-
-    const img = document.createElement("span"); // we'll mask it as an image
-    img.id = "img";
-
-    const a = document.createElement("a");
-    a.id = "a";
-    a.rel = "noreferrer noopener";
-    a.download = data.download;
-    a.style = data.style;
-    a.style.fontFamily = "Arial, Helvetica, Sans-Serif";
-    a.href = window.URL.createObjectURL(data.blob);
-    a.appendChild(img);
-    a.appendChild(document.createTextNode(data.textContent));
-
-    // 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 = (data.imgStyle || "" +
-        "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;" +
-        "display: inline-block;") + "" +
-
-        // Always add these styles
-        `-webkit-mask-image: url('${data.imgSrc}');` +
-        `mask-image: url('${data.imgSrc}');` +
-        `background-color: ${a.style.color};`;
-
-    const body = document.body;
-    // Don't display scrollbars if the link takes more than one line to display.
-    body.style = "margin: 0px; overflow: hidden";
-    body.appendChild(a);
-
-    if (event.data.auto) {
-        a.click(); // try to trigger download automatically
-    }
-}
-
-window.onmessage = function(e) {
-    if (e.origin === window.location.origin) {
-        if (e.data.blob) remoteRender(e);
-    }
-};
diff --git a/src/usercontent/index.ts b/src/usercontent/index.ts
new file mode 100644
index 0000000000..df551e88e6
--- /dev/null
+++ b/src/usercontent/index.ts
@@ -0,0 +1,56 @@
+let hasCalled = false;
+function remoteRender(event: MessageEvent): void {
+    const data = event.data;
+
+    // If we're handling secondary calls, start from scratch
+    if (hasCalled) {
+        document.body.replaceWith(document.createElement("BODY"));
+    }
+    hasCalled = true;
+
+    const img: HTMLSpanElement = document.createElement("span"); // we'll mask it as an image
+    img.id = "img";
+
+    const a: HTMLAnchorElement = document.createElement("a");
+    a.id = "a";
+    a.rel = "noreferrer noopener";
+    a.download = data.download;
+    // @ts-ignore
+    a.style = data.style;
+    a.style.fontFamily = "Arial, Helvetica, Sans-Serif";
+    a.href = window.URL.createObjectURL(data.blob);
+    a.appendChild(img);
+    a.appendChild(document.createTextNode(data.textContent));
+
+    // Apply image style after so we can steal the anchor's colour.
+    // Style copied from a rendered version of mx_MFileBody_download_icon
+    if (data.imgStyle) {
+        // @ts-ignore
+        img.style = data.imgStyle;
+    } else {
+        img.style.width = "12px";
+        img.style.height = "12px";
+        img.style.webkitMaskSize = "12px";
+        img.style.webkitMaskPosition = "center";
+        img.style.webkitMaskRepeat = "no-repeat";
+        img.style.display = "inline-block";
+        img.style.webkitMaskImage = `url('${data.imgSrc}')`;
+        img.style.backgroundColor = `${a.style.color}`;
+    }
+
+    const body = document.body;
+    // Don't display scrollbars if the link takes more than one line to display.
+    body.style .margin = "0px";
+    body.style.overflow = "hidden";
+    body.appendChild(a);
+
+    if (event.data.auto) {
+        a.click(); // try to trigger download automatically
+    }
+}
+
+window.onmessage = function(e: MessageEvent): void {
+    if (e.origin === window.location.origin) {
+        if (e.data.blob) remoteRender(e);
+    }
+};
diff --git a/src/utils/Accessibility.js b/src/utils/Accessibility.js
deleted file mode 100644
index f4909f971b..0000000000
--- a/src/utils/Accessibility.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-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.
-*/
-
-/**
- * Automatically focuses the captured reference when receiving a non-null
- * object. Useful in scenarios where componentDidMount does not have a
- * useful reference to an element, but one needs to focus the element on
- * first render. Example usage: ref={focusCapturedRef}
- * @param {function} ref The React reference to focus on, if not null
- */
-export function focusCapturedRef(ref) {
-    if (ref) {
-        ref.focus();
-    }
-}
diff --git a/src/utils/AnimationUtils.ts b/src/utils/AnimationUtils.ts
new file mode 100644
index 0000000000..61df52826d
--- /dev/null
+++ b/src/utils/AnimationUtils.ts
@@ -0,0 +1,32 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { clamp } from "lodash";
+
+/**
+ * This method linearly interpolates between two points (start, end). This is
+ * most commonly used to find a point some fraction of the way along a line
+ * between two endpoints (e.g. to move an object gradually between those
+ * points).
+ * @param {number} start the starting point
+ * @param {number} end the ending point
+ * @param {number} amt the interpolant
+ * @returns
+ */
+export function lerp(start: number, end: number, amt: number) {
+    amt = clamp(amt, 0, 1);
+    return (1 - amt) * start + amt * end;
+}
diff --git a/src/utils/AutoDiscoveryUtils.tsx b/src/utils/AutoDiscoveryUtils.tsx
index e3a7fd2d0b..bad87db2b9 100644
--- a/src/utils/AutoDiscoveryUtils.tsx
+++ b/src/utils/AutoDiscoveryUtils.tsx
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 import React, { ReactNode } from 'react';
-import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
-import {_t, _td, newTranslatableError} from "../languageHandler";
-import {makeType} from "./TypeUtils";
+import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
+import { _t, _td, newTranslatableError } from "../languageHandler";
+import { makeType } from "./TypeUtils";
 import SdkConfig from '../SdkConfig';
 
 const LIVELINESS_DISCOVERY_ERRORS: string[] = [
@@ -90,7 +90,7 @@ export default class AutoDiscoveryUtils {
                             href="https://github.com/vector-im/element-web/blob/master/docs/config.md"
                             target="_blank"
                             rel="noreferrer noopener"
-                        >{sub}</a>;
+                        >{ sub }</a>;
                     },
                 },
             );
@@ -130,8 +130,8 @@ export default class AutoDiscoveryUtils {
             serverErrorIsFatal: isFatalError,
             serverDeadError: (
                 <div>
-                    <strong>{title}</strong>
-                    <div>{body}</div>
+                    <strong>{ title }</strong>
+                    <div>{ body }</div>
                 </div>
             ),
         };
diff --git a/src/utils/DMRoomMap.ts b/src/utils/DMRoomMap.ts
index b166674043..50f849b2ba 100644
--- a/src/utils/DMRoomMap.ts
+++ b/src/utils/DMRoomMap.ts
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from '../MatrixClientPeg';
-import {uniq} from "lodash";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {Event} from "matrix-js-sdk/src/models/event";
-import {MatrixClient} from "matrix-js-sdk/src/client";
+import { uniq } from "lodash";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+import { MatrixClientPeg } from '../MatrixClientPeg';
 
 /**
  * Class that takes a Matrix Client and flips the m.direct map
@@ -30,15 +30,13 @@ import {MatrixClient} from "matrix-js-sdk/src/client";
 export default class DMRoomMap {
     private static sharedInstance: DMRoomMap;
 
-    private matrixClient: MatrixClient;
     // TODO: convert these to maps
     private roomToUser: {[key: string]: string} = null;
     private userToRooms: {[key: string]: string[]} = null;
     private hasSentOutPatchDirectAccountDataPatch: boolean;
-    private mDirectEvent: Event;
+    private mDirectEvent: object;
 
-    constructor(matrixClient) {
-        this.matrixClient = matrixClient;
+    constructor(private readonly matrixClient: MatrixClient) {
         // see onAccountData
         this.hasSentOutPatchDirectAccountDataPatch = false;
 
@@ -88,7 +86,7 @@ export default class DMRoomMap {
             this.userToRooms = null;
             this.roomToUser = null;
         }
-    }
+    };
 
     /**
      * some client bug somewhere is causing some DMs to be marked
@@ -105,7 +103,7 @@ export default class DMRoomMap {
                 if (room) {
                     const userId = room.guessDMUserId();
                     if (userId && userId !== myUserId) {
-                        return {userId, roomId};
+                        return { userId, roomId };
                     }
                 }
             }).filter((ids) => !!ids); //filter out
@@ -118,7 +116,7 @@ export default class DMRoomMap {
                 return !guessedUserIdsThatChanged
                     .some((ids) => ids.roomId === roomId);
             });
-            guessedUserIdsThatChanged.forEach(({userId, roomId}) => {
+            guessedUserIdsThatChanged.forEach(({ userId, roomId }) => {
                 const roomIds = userToRooms[userId];
                 if (!roomIds) {
                     userToRooms[userId] = [roomId];
@@ -183,7 +181,7 @@ export default class DMRoomMap {
     public getUniqueRoomsWithIndividuals(): {[userId: string]: Room} {
         if (!this.roomToUser) return {}; // No rooms means no map.
         return Object.keys(this.roomToUser)
-            .map(r => ({userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r)}))
+            .map(r => ({ userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r) }))
             .filter(r => r.userId && r.room && r.room.getInvitedAndJoinedMemberCount() === 2)
             .reduce((obj, r) => (obj[r.userId] = r.room) && obj, {});
     }
diff --git a/src/utils/DecryptFile.ts b/src/utils/DecryptFile.ts
index d073393170..891439ffe1 100644
--- a/src/utils/DecryptFile.ts
+++ b/src/utils/DecryptFile.ts
@@ -16,20 +16,24 @@ limitations under the License.
 
 // Pull in the encryption lib so that we can decrypt attachments.
 import encrypt from 'browser-encrypt-attachment';
-import {mediaFromContent} from "../customisations/Media";
-import { IEncryptedFile } from "../customisations/models/IMediaEventContent";
+import { mediaFromContent } from "../customisations/Media";
+import { IEncryptedFile, IMediaEventInfo } from "../customisations/models/IMediaEventContent";
 import { getBlobSafeMimeType } from "./blobs";
 
 /**
  * Decrypt a file attached to a matrix event.
- * @param {IEncryptedFile} file The json taken from the matrix event.
+ * @param {IEncryptedFile} file The encrypted file information 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 {IMediaEventInfo} info The info parameter taken from the matrix event.
  * @returns {Promise<Blob>} Resolves to a Blob of the file.
  */
-export function decryptFile(file: IEncryptedFile): Promise<Blob> {
-    const media = mediaFromContent({file});
+export function decryptFile(
+    file: IEncryptedFile,
+    info?: IMediaEventInfo,
+): Promise<Blob> {
+    const media = mediaFromContent({ file });
     // Download the encrypted file as an array buffer.
     return media.downloadSource().then((response) => {
         return response.arrayBuffer();
@@ -44,9 +48,9 @@ export function decryptFile(file: IEncryptedFile): Promise<Blob> {
         // they introduce XSS attacks if the Blob URI is viewed directly in the
         // 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() : '';
+        let mimetype = info?.mimetype ? info.mimetype.split(";")[0].trim() : '';
         mimetype = getBlobSafeMimeType(mimetype);
 
-        return new Blob([dataArray], {type: mimetype});
+        return new Blob([dataArray], { type: mimetype });
     });
 }
diff --git a/src/utils/DirectoryUtils.js b/src/utils/DirectoryUtils.ts
similarity index 81%
rename from src/utils/DirectoryUtils.js
rename to src/utils/DirectoryUtils.ts
index 577a6441f8..255ae0e3fd 100644
--- a/src/utils/DirectoryUtils.js
+++ b/src/utils/DirectoryUtils.ts
@@ -14,9 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { IInstance } from "matrix-js-sdk/src/client";
+import { Protocols } from "../components/views/directory/NetworkDropdown";
+
 // Find a protocol 'instance' with a given instance_id
 // in the supplied protocols dict
-export function instanceForInstanceId(protocols, instanceId) {
+export function instanceForInstanceId(protocols: Protocols, instanceId: string): IInstance {
     if (!instanceId) return null;
     for (const proto of Object.keys(protocols)) {
         if (!protocols[proto].instances && protocols[proto].instances instanceof Array) continue;
@@ -28,7 +31,7 @@ export function instanceForInstanceId(protocols, instanceId) {
 
 // given an instance_id, return the name of the protocol for
 // that instance ID in the supplied protocols dict
-export function protocolNameForInstanceId(protocols, instanceId) {
+export function protocolNameForInstanceId(protocols: Protocols, instanceId: string): string {
     if (!instanceId) return null;
     for (const proto of Object.keys(protocols)) {
         if (!protocols[proto].instances && protocols[proto].instances instanceof Array) continue;
diff --git a/src/utils/EditorStateTransfer.js b/src/utils/EditorStateTransfer.js
deleted file mode 100644
index c7782a9ea8..0000000000
--- a/src/utils/EditorStateTransfer.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-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.
-*/
-
-/**
- * Used while editing, to pass the event, and to preserve editor state
- * from one editor instance to another when remounting the editor
- * upon receiving the remote echo for an unsent event.
- */
-export default class EditorStateTransfer {
-    constructor(event) {
-        this._event = event;
-        this._serializedParts = null;
-        this.caret = null;
-    }
-
-    setEditorState(caret, serializedParts) {
-        this._caret = caret;
-        this._serializedParts = serializedParts;
-    }
-
-    hasEditorState() {
-        return !!this._serializedParts;
-    }
-
-    getSerializedParts() {
-        return this._serializedParts;
-    }
-
-    getCaret() {
-        return this._caret;
-    }
-
-    getEvent() {
-        return this._event;
-    }
-}
diff --git a/src/utils/EditorStateTransfer.ts b/src/utils/EditorStateTransfer.ts
new file mode 100644
index 0000000000..d2ce58f7dc
--- /dev/null
+++ b/src/utils/EditorStateTransfer.ts
@@ -0,0 +1,53 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { SerializedPart } from "../editor/parts";
+import DocumentOffset from "../editor/offset";
+
+/**
+ * Used while editing, to pass the event, and to preserve editor state
+ * from one editor instance to another when remounting the editor
+ * upon receiving the remote echo for an unsent event.
+ */
+export default class EditorStateTransfer {
+    private serializedParts: SerializedPart[] = null;
+    private caret: DocumentOffset = null;
+
+    constructor(private readonly event: MatrixEvent) {}
+
+    public setEditorState(caret: DocumentOffset, serializedParts: SerializedPart[]) {
+        this.caret = caret;
+        this.serializedParts = serializedParts;
+    }
+
+    public hasEditorState(): boolean {
+        return !!this.serializedParts;
+    }
+
+    public getSerializedParts(): SerializedPart[] {
+        return this.serializedParts;
+    }
+
+    public getCaret(): DocumentOffset {
+        return this.caret;
+    }
+
+    public getEvent(): MatrixEvent {
+        return this.event;
+    }
+}
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.tsx
similarity index 79%
rename from src/utils/ErrorUtils.js
rename to src/utils/ErrorUtils.tsx
index b5bd5b0af0..4253564ffd 100644
--- a/src/utils/ErrorUtils.js
+++ b/src/utils/ErrorUtils.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
+Copyright 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.
@@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { _t, _td } from '../languageHandler';
+import React, { ReactNode } from "react";
+import { MatrixError } from "matrix-js-sdk/src/http-api";
+
+import { _t, _td, Tags, TranslatedString } from '../languageHandler';
 
 /**
  * Produce a translated error message for a
@@ -30,13 +33,18 @@ import { _t, _td } from '../languageHandler';
  *     for any tags in the strings apart from 'a'
  * @returns {*} Translated string or react component
  */
-export function messageForResourceLimitError(limitType, adminContact, strings, extraTranslations) {
+export function messageForResourceLimitError(
+    limitType: string,
+    adminContact: string,
+    strings: Record<string, string>,
+    extraTranslations?: Tags,
+): TranslatedString {
     let errString = strings[limitType];
     if (errString === undefined) errString = strings[''];
 
     const linkSub = sub => {
         if (adminContact) {
-            return <a href={adminContact} target="_blank" rel="noreferrer noopener">{sub}</a>;
+            return <a href={adminContact} target="_blank" rel="noreferrer noopener">{ sub }</a>;
         } else {
             return sub;
         }
@@ -49,7 +57,7 @@ export function messageForResourceLimitError(limitType, adminContact, strings, e
     }
 }
 
-export function messageForSyncError(err) {
+export function messageForSyncError(err: MatrixError | Error): ReactNode {
     if (err.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
         const limitError = messageForResourceLimitError(
             err.data.limit_type,
@@ -68,12 +76,12 @@ export function messageForSyncError(err) {
             },
         );
         return <div>
-            <div>{limitError}</div>
-            <div>{adminContact}</div>
+            <div>{ limitError }</div>
+            <div>{ adminContact }</div>
         </div>;
     } else {
         return <div>
-            {_t("Unable to connect to Homeserver. Retrying...")}
+            { _t("Unable to connect to Homeserver. Retrying...") }
         </div>;
     }
 }
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.ts
similarity index 52%
rename from src/utils/EventUtils.js
rename to src/utils/EventUtils.ts
index be21896417..e16e58e0d2 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.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,9 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { EventStatus } from 'matrix-js-sdk/src/models/event';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixEvent, EventStatus } from 'matrix-js-sdk/src/models/event';
+
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import shouldHideEvent from "../shouldHideEvent";
+import { getHandlerTile, haveTileForEvent } from "../components/views/rooms/EventTile";
+import SettingsStore from "../settings/SettingsStore";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
 /**
  * Returns whether an event should allow actions like reply, reactions, edit, etc.
  * which effectively checks whether it's a regular message that has been sent and that we
@@ -25,7 +30,7 @@ import shouldHideEvent from "../shouldHideEvent";
  * @param {MatrixEvent} mxEvent The event to check
  * @returns {boolean} true if actionable
  */
-export function isContentActionable(mxEvent) {
+export function isContentActionable(mxEvent: MatrixEvent): boolean {
     const { status: eventStatus } = mxEvent;
 
     // status is SENT before remote-echo, null after
@@ -45,18 +50,18 @@ export function isContentActionable(mxEvent) {
     return false;
 }
 
-export function canEditContent(mxEvent) {
+export function canEditContent(mxEvent: MatrixEvent): boolean {
     if (mxEvent.status === EventStatus.CANCELLED || mxEvent.getType() !== "m.room.message" || mxEvent.isRedacted()) {
         return false;
     }
     const content = mxEvent.getOriginalContent();
-    const {msgtype} = content;
+    const { msgtype } = content;
     return (msgtype === "m.text" || msgtype === "m.emote") &&
         content.body && typeof content.body === 'string' &&
         mxEvent.getSender() === MatrixClientPeg.get().getUserId();
 }
 
-export function canEditOwnEvent(mxEvent) {
+export function canEditOwnEvent(mxEvent: MatrixEvent): boolean {
     // for now we only allow editing
     // your own events. So this just call through
     // In the future though, moderators will be able to
@@ -67,9 +72,15 @@ export function canEditOwnEvent(mxEvent) {
 }
 
 const MAX_JUMP_DISTANCE = 100;
-export function findEditableEvent(room, isForward, fromEventId = undefined) {
-    const liveTimeline = room.getLiveTimeline();
-    const events = liveTimeline.getEvents().concat(room.getPendingEvents());
+export function findEditableEvent({
+    events,
+    isForward,
+    fromEventId,
+}: {
+    events: MatrixEvent[];
+    isForward: boolean;
+    fromEventId?: string;
+}): MatrixEvent {
     const maxIdx = events.length - 1;
     const inc = isForward ? 1 : -1;
     const beginIdx = isForward ? 0 : maxIdx;
@@ -93,3 +104,57 @@ export function findEditableEvent(room, isForward, fromEventId = undefined) {
     }
 }
 
+export function getEventDisplayInfo(mxEvent: MatrixEvent): {
+    isInfoMessage: boolean;
+    tileHandler: string;
+    isBubbleMessage: boolean;
+    isLeftAlignedBubbleMessage: boolean;
+} {
+    const content = mxEvent.getContent();
+    const msgtype = content.msgtype;
+    const eventType = mxEvent.getType();
+
+    let tileHandler = getHandlerTile(mxEvent);
+
+    // Info messages are basically information about commands processed on a room
+    let isBubbleMessage = (
+        eventType.startsWith("m.key.verification") ||
+        (eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
+        (eventType === EventType.RoomCreate) ||
+        (eventType === EventType.RoomEncryption) ||
+        (tileHandler === "messages.MJitsiWidgetEvent")
+    );
+    const isLeftAlignedBubbleMessage = (
+        !isBubbleMessage &&
+        eventType === EventType.CallInvite
+    );
+    let isInfoMessage = (
+        !isBubbleMessage &&
+        !isLeftAlignedBubbleMessage &&
+        eventType !== EventType.RoomMessage &&
+        eventType !== EventType.Sticker &&
+        eventType !== EventType.RoomCreate
+    );
+
+    // If we're showing hidden events in the timeline, we should use the
+    // source tile when there's no regular tile for an event and also for
+    // replace relations (which otherwise would display as a confusing
+    // duplicate of the thing they are replacing).
+    if (SettingsStore.getValue("showHiddenEventsInTimeline") && !haveTileForEvent(mxEvent)) {
+        tileHandler = "messages.ViewSourceEvent";
+        isBubbleMessage = false;
+        // Reuse info message avatar and sender profile styling
+        isInfoMessage = true;
+    }
+
+    return { tileHandler, isInfoMessage, isBubbleMessage, isLeftAlignedBubbleMessage };
+}
+
+export function isVoiceMessage(mxEvent: MatrixEvent): boolean {
+    const content = mxEvent.getContent();
+    // MSC2516 is a legacy identifier. See https://github.com/matrix-org/matrix-doc/pull/3245
+    return (
+        !!content['org.matrix.msc2516.voice'] ||
+        !!content['org.matrix.msc3245.voice']
+    );
+}
diff --git a/src/utils/FileDownloader.ts b/src/utils/FileDownloader.ts
new file mode 100644
index 0000000000..5ec91d71cc
--- /dev/null
+++ b/src/utils/FileDownloader.ts
@@ -0,0 +1,102 @@
+/*
+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 getIframeFn = () => HTMLIFrameElement; // eslint-disable-line @typescript-eslint/naming-convention
+
+export const DEFAULT_STYLES = {
+    imgSrc: "",
+    imgStyle: null, // css props
+    style: "",
+    textContent: "",
+};
+
+type DownloadOptions = {
+    blob: Blob;
+    name: string;
+    autoDownload?: boolean;
+    opts?: typeof DEFAULT_STYLES;
+};
+
+// set up the iframe as a singleton so we don't have to figure out destruction of it down the line.
+let managedIframe: HTMLIFrameElement;
+let onLoadPromise: Promise<void>;
+function getManagedIframe(): { iframe: HTMLIFrameElement, onLoadPromise: Promise<void> } {
+    if (managedIframe) return { iframe: managedIframe, onLoadPromise };
+
+    managedIframe = document.createElement("iframe");
+
+    // Need to append the iframe in order for the browser to load it.
+    document.body.appendChild(managedIframe);
+
+    // Dev note: the reassignment warnings are entirely incorrect here.
+
+    managedIframe.style.display = "none";
+
+    // @ts-ignore
+    // noinspection JSConstantReassignment
+    managedIframe.sandbox = "allow-scripts allow-downloads allow-downloads-without-user-activation";
+
+    onLoadPromise = new Promise(resolve => {
+        managedIframe.onload = () => {
+            resolve();
+        };
+        managedIframe.src = "usercontent/"; // XXX: Should come from the skin
+    });
+
+    return { iframe: managedIframe, onLoadPromise };
+}
+
+// TODO: If we decide to keep the download link behaviour, we should bring the style management into here.
+
+/**
+ * Helper to handle safe file downloads. This operates off an iframe for reasons described
+ * by the blob helpers. By default, this will use a hidden iframe to manage the download
+ * through a user content wrapper, but can be given an iframe reference if the caller needs
+ * additional control over the styling/position of the iframe itself.
+ */
+export class FileDownloader {
+    private onLoadPromise: Promise<void>;
+
+    /**
+     * Creates a new file downloader
+     * @param iframeFn Function to get a pre-configured iframe. Set to null to have the downloader
+     * use a generic, hidden, iframe.
+     */
+    constructor(private iframeFn: getIframeFn = null) {
+    }
+
+    private get iframe(): HTMLIFrameElement {
+        const iframe = this.iframeFn?.();
+        if (!iframe) {
+            const managed = getManagedIframe();
+            this.onLoadPromise = managed.onLoadPromise;
+            return managed.iframe;
+        }
+        this.onLoadPromise = null;
+        return iframe;
+    }
+
+    public async download({ blob, name, autoDownload = true, opts = DEFAULT_STYLES }: DownloadOptions) {
+        const iframe = this.iframe; // get the iframe first just in case we need to await onload
+        if (this.onLoadPromise) await this.onLoadPromise;
+        iframe.contentWindow.postMessage({
+            ...opts,
+            blob: blob,
+            download: name,
+            auto: autoDownload,
+        }, '*');
+    }
+}
diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts
new file mode 100644
index 0000000000..c83f2ed417
--- /dev/null
+++ b/src/utils/FileUtils.ts
@@ -0,0 +1,71 @@
+/*
+Copyright 2015 - 2021 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 filesize from 'filesize';
+import { IMediaEventContent } from '../customisations/models/IMediaEventContent';
+import { _t } from '../languageHandler';
+
+/**
+ * Extracts a human readable label for the file attachment to use as
+ * link text.
+ *
+ * @param {IMediaEventContent} content The "content" key of the matrix event.
+ * @param {string} fallbackText The fallback text
+ * @param {boolean} withSize Whether to include size information. Default true.
+ * @param {boolean} shortened Ensure the extension of the file name is visible. Default false.
+ * @return {string} the human readable link text for the attachment.
+ */
+export function presentableTextForFile(
+    content: IMediaEventContent,
+    fallbackText = _t("Attachment"),
+    withSize = true,
+    shortened = false,
+): string {
+    let text = fallbackText;
+    if (content.body && content.body.length > 0) {
+        // The content body should be the name of the file including a
+        // file extension.
+        text = content.body;
+    }
+
+    // We shorten to 15 characters somewhat arbitrarily, and assume most files
+    // will have a 3 character (plus full stop) extension. The goal is to knock
+    // the label down to 15-25 characters, not perfect accuracy.
+    if (shortened && text.length > 19) {
+        const parts = text.split('.');
+        let fileName = parts.slice(0, parts.length - 1).join('.').substring(0, 15);
+        const extension = parts[parts.length - 1];
+
+        // Trim off any full stops from the file name to avoid a case where we
+        // add an ellipsis that looks really funky.
+        fileName = fileName.replace(/\.*$/g, '');
+
+        text = `${fileName}...${extension}`;
+    }
+
+    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.
+        // The content.info also contains a MIME-type but we don't display
+        // it since it is "ugly", users generally aren't aware what it
+        // means and the type of the attachment can usually be inferrered
+        // from the file extension.
+        text += ' (' + filesize(content.info.size) + ')';
+    }
+    return text;
+}
diff --git a/src/utils/FixedRollingArray.ts b/src/utils/FixedRollingArray.ts
new file mode 100644
index 0000000000..0de532648e
--- /dev/null
+++ b/src/utils/FixedRollingArray.ts
@@ -0,0 +1,54 @@
+/*
+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 { arrayFastClone, arraySeed } from "./arrays";
+
+/**
+ * An array which is of fixed length and accepts rolling values. Values will
+ * be inserted on the left, falling off the right.
+ */
+export class FixedRollingArray<T> {
+    private samples: T[] = [];
+
+    /**
+     * Creates a new fixed rolling array.
+     * @param width The width of the array.
+     * @param padValue The value to seed the array with.
+     */
+    constructor(private width: number, padValue: T) {
+        this.samples = arraySeed(padValue, this.width);
+    }
+
+    /**
+     * The array, as a fixed length.
+     */
+    public get value(): T[] {
+        return this.samples;
+    }
+
+    /**
+     * Pushes a value to the array.
+     * @param value The value to push.
+     */
+    public pushValue(value: T) {
+        let swap = arrayFastClone(this.samples);
+        swap.splice(0, 0, value);
+        if (swap.length > this.width) {
+            swap = swap.slice(0, this.width);
+        }
+        this.samples = swap;
+    }
+}
diff --git a/src/utils/FontManager.js b/src/utils/FontManager.ts
similarity index 86%
rename from src/utils/FontManager.js
rename to src/utils/FontManager.ts
index df11b76ae4..b0a017be97 100644
--- a/src/utils/FontManager.js
+++ b/src/utils/FontManager.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -20,9 +20,10 @@ limitations under the License.
  * author Roel Nieskens, https://pixelambacht.nl
  * MIT license
  */
+import { logger } from "matrix-js-sdk/src/logger";
 
-function safariVersionCheck(ua) {
-    console.log("Browser is Safari - checking version for COLR support");
+function safariVersionCheck(ua: string): boolean {
+    logger.log("Browser is Safari - checking version for COLR support");
     try {
         const safariVersionMatch = ua.match(/Mac OS X ([\d|_]+).*Version\/([\d|.]+).*Safari/);
         if (safariVersionMatch) {
@@ -32,7 +33,7 @@ function safariVersionCheck(ua) {
             const safariVersion = safariVersionStr.split(".").map(n => parseInt(n, 10));
             const colrFontSupported = macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12;
             // https://www.colorfonts.wtf/ states safari supports COLR fonts from this version on
-            console.log(`COLR support on Safari requires macOS 10.14 and Safari 12, ` +
+            logger.log(`COLR support on Safari requires macOS 10.14 and Safari 12, ` +
                 `detected Safari ${safariVersionStr} on macOS ${macOSVersionStr}, ` +
                 `COLR supported: ${colrFontSupported}`);
             return colrFontSupported;
@@ -44,16 +45,16 @@ function safariVersionCheck(ua) {
     return false;
 }
 
-async function isColrFontSupported() {
-    console.log("Checking for COLR support");
+async function isColrFontSupported(): Promise<boolean> {
+    logger.log("Checking for COLR support");
 
-    const {userAgent} = navigator;
+    const { userAgent } = navigator;
     // Firefox has supported COLR fonts since version 26
     // but doesn't support the check below without
     // "Extract canvas data" permissions
     // when content blocking is enabled.
     if (userAgent.includes("Firefox")) {
-        console.log("Browser is Firefox - assuming COLR is supported");
+        logger.log("Browser is Firefox - assuming COLR is supported");
         return true;
     }
     // Safari doesn't wait for the font to load (if it doesn't have it in cache)
@@ -87,12 +88,12 @@ async function isColrFontSupported() {
 
         img.src = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svg);
 
-        console.log("Waiting for COLR SVG to load");
+        logger.log("Waiting for COLR SVG to load");
         await new Promise(resolve => img.onload = resolve);
-        console.log("Drawing canvas to detect COLR support");
+        logger.log("Drawing canvas to detect COLR support");
         context.drawImage(img, 0, 0);
         const colrFontSupported = (context.getImageData(10, 10, 1, 1).data[0] === 200);
-        console.log("Canvas check revealed COLR is supported? " + colrFontSupported);
+        logger.log("Canvas check revealed COLR is supported? " + colrFontSupported);
         return colrFontSupported;
     } catch (e) {
         console.error("Couldn't load COLR font", e);
@@ -101,7 +102,7 @@ async function isColrFontSupported() {
 }
 
 let colrFontCheckStarted = false;
-export async function fixupColorFonts() {
+export async function fixupColorFonts(): Promise<void> {
     if (colrFontCheckStarted) {
         return;
     }
@@ -112,14 +113,14 @@ export async function fixupColorFonts() {
         document.fonts.add(new FontFace("Twemoji", path, {}));
         // For at least Chrome on Windows 10, we have to explictly add extra
         // weights for the emoji to appear in bold messages, etc.
-        document.fonts.add(new FontFace("Twemoji", path, { weight: 600 }));
-        document.fonts.add(new FontFace("Twemoji", path, { weight: 700 }));
+        document.fonts.add(new FontFace("Twemoji", path, { weight: "600" }));
+        document.fonts.add(new FontFace("Twemoji", path, { weight: "700" }));
     } else {
         // fall back to SBIX, generated via https://github.com/matrix-org/twemoji-colr/tree/matthew/sbix
         const path = `url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2")}')`;
         document.fonts.add(new FontFace("Twemoji", path, {}));
-        document.fonts.add(new FontFace("Twemoji", path, { weight: 600 }));
-        document.fonts.add(new FontFace("Twemoji", path, { weight: 700 }));
+        document.fonts.add(new FontFace("Twemoji", path, { weight: "600" }));
+        document.fonts.add(new FontFace("Twemoji", path, { weight: "700" }));
     }
     // ...and if SBIX is not supported, the browser will fall back to one of the native fonts specified.
 }
diff --git a/src/utils/FormattingUtils.ts b/src/utils/FormattingUtils.ts
index 1fe3669f26..265deaed38 100644
--- a/src/utils/FormattingUtils.ts
+++ b/src/utils/FormattingUtils.ts
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import { _t } from '../languageHandler';
+import { jsxJoin } from './ReactUtils';
 
 /**
  * formats numbers to fit into ~3 characters, suitable for badge counts
@@ -103,7 +104,10 @@ export function getUserNameColorClass(userId: string): string {
  * @returns {string} a string constructed by joining `items` with a comma
  * between each item, but with the last item appended as " and [lastItem]".
  */
-export function formatCommaSeparatedList(items: string[], itemLimit?: number): string {
+export function formatCommaSeparatedList(items: string[], itemLimit?: number): string;
+export function formatCommaSeparatedList(items: JSX.Element[], itemLimit?: number): JSX.Element;
+export function formatCommaSeparatedList(items: Array<JSX.Element | string>, itemLimit?: number): JSX.Element | string;
+export function formatCommaSeparatedList(items: Array<JSX.Element | string>, itemLimit?: number): JSX.Element | string {
     const remaining = itemLimit === undefined ? 0 : Math.max(
         items.length - itemLimit, 0,
     );
@@ -111,11 +115,25 @@ export function formatCommaSeparatedList(items: string[], itemLimit?: number): s
         return "";
     } else if (items.length === 1) {
         return items[0];
-    } else if (remaining > 0) {
-        items = items.slice(0, itemLimit);
-        return _t("%(items)s and %(count)s others", { items: items.join(', '), count: remaining } );
     } else {
-        const lastItem = items.pop();
-        return _t("%(items)s and %(lastItem)s", { items: items.join(', '), lastItem: lastItem });
+        let lastItem;
+        if (remaining > 0) {
+            items = items.slice(0, itemLimit);
+        } else {
+            lastItem = items.pop();
+        }
+
+        let joinedItems;
+        if (items.every(e => typeof e === "string")) {
+            joinedItems = items.join(", ");
+        } else {
+            joinedItems = jsxJoin(items, ", ");
+        }
+
+        if (remaining > 0) {
+            return _t("%(items)s and %(count)s others", { items: joinedItems, count: remaining } );
+        } else {
+            return _t("%(items)s and %(lastItem)s", { items: joinedItems, lastItem });
+        }
     }
 }
diff --git a/src/utils/HostingLink.js b/src/utils/HostingLink.ts
similarity index 69%
rename from src/utils/HostingLink.js
rename to src/utils/HostingLink.ts
index 580ed00de5..f8c0f12c3f 100644
--- a/src/utils/HostingLink.js
+++ b/src/utils/HostingLink.ts
@@ -14,13 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import url from 'url';
-import qs from 'qs';
-
 import SdkConfig from '../SdkConfig';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 
-export function getHostingLink(campaign) {
+export function getHostingLink(campaign: string): string {
     const hostingLink = SdkConfig.get().hosting_signup_link;
     if (!hostingLink) return null;
     if (!campaign) return hostingLink;
@@ -28,12 +25,9 @@ export function getHostingLink(campaign) {
     if (MatrixClientPeg.get().getDomain() !== 'matrix.org') return null;
 
     try {
-        const hostingUrl = url.parse(hostingLink);
-        const params = qs.parse(hostingUrl.query);
-        params.utm_campaign = campaign;
-        hostingUrl.search = undefined;
-        hostingUrl.query = params;
-        return hostingUrl.format();
+        const hostingUrl = new URL(hostingLink);
+        hostingUrl.searchParams.set("utm_campaign", campaign);
+        return hostingUrl.toString();
     } catch (e) {
         return hostingLink;
     }
diff --git a/src/utils/IdentityServerUtils.js b/src/utils/IdentityServerUtils.ts
similarity index 79%
rename from src/utils/IdentityServerUtils.js
rename to src/utils/IdentityServerUtils.ts
index 5ece308954..47226a1727 100644
--- a/src/utils/IdentityServerUtils.js
+++ b/src/utils/IdentityServerUtils.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -15,14 +15,15 @@ limitations under the License.
 */
 
 import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
-import SdkConfig from '../SdkConfig';
-import {MatrixClientPeg} from '../MatrixClientPeg';
 
-export function getDefaultIdentityServerUrl() {
+import SdkConfig from '../SdkConfig';
+import { MatrixClientPeg } from '../MatrixClientPeg';
+
+export function getDefaultIdentityServerUrl(): string {
     return SdkConfig.get()['validated_server_config']['isUrl'];
 }
 
-export function useDefaultIdentityServer() {
+export function useDefaultIdentityServer(): void {
     const url = getDefaultIdentityServerUrl();
     // Account data change will update localstorage, client, etc through dispatcher
     MatrixClientPeg.get().setAccountData("m.identity_server", {
@@ -30,7 +31,7 @@ export function useDefaultIdentityServer() {
     });
 }
 
-export async function doesIdentityServerHaveTerms(fullUrl) {
+export async function doesIdentityServerHaveTerms(fullUrl: string): Promise<boolean> {
     let terms;
     try {
         terms = await MatrixClientPeg.get().getTerms(SERVICE_TYPES.IS, fullUrl);
@@ -46,7 +47,7 @@ export async function doesIdentityServerHaveTerms(fullUrl) {
     return terms && terms["policies"] && (Object.keys(terms["policies"]).length > 0);
 }
 
-export function doesAccountDataHaveIdentityServer() {
+export function doesAccountDataHaveIdentityServer(): boolean {
     const event = MatrixClientPeg.get().getAccountData("m.identity_server");
     return event && event.getContent() && event.getContent()['base_url'];
 }
diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.ts
similarity index 77%
rename from src/utils/KeyVerificationStateObserver.js
rename to src/utils/KeyVerificationStateObserver.ts
index a29d2ea1aa..e4fae3f3c8 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.ts
@@ -14,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import { _t } from '../languageHandler';
 
-export function getNameForEventRoom(userId, roomId) {
+export function getNameForEventRoom(userId: string, roomId: string): string {
     const client = MatrixClientPeg.get();
     const room = client.getRoom(roomId);
     const member = room && room.getMember(userId);
     return member ? member.name : userId;
 }
 
-export function userLabelForEventRoom(userId, roomId) {
+export function userLabelForEventRoom(userId: string, roomId: string): string {
     const name = getNameForEventRoom(userId, roomId);
     if (name !== userId) {
-        return _t("%(name)s (%(userId)s)", {name, userId});
+        return _t("%(name)s (%(userId)s)", { name, userId });
     } else {
         return userId;
     }
diff --git a/src/utils/LazyValue.ts b/src/utils/LazyValue.ts
new file mode 100644
index 0000000000..9cdcda489a
--- /dev/null
+++ b/src/utils/LazyValue.ts
@@ -0,0 +1,59 @@
+/*
+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.
+*/
+
+/**
+ * Utility class for lazily getting a variable.
+ */
+export class LazyValue<T> {
+    private val: T;
+    private prom: Promise<T>;
+    private done = false;
+
+    public constructor(private getFn: () => Promise<T>) {
+    }
+
+    /**
+     * Whether or not a cached value is present.
+     */
+    public get present(): boolean {
+        // we use a tracking variable just in case the final value is falsey
+        return this.done;
+    }
+
+    /**
+     * Gets the value without invoking a get. May be undefined until the
+     * value is fetched properly.
+     */
+    public get cachedValue(): T {
+        return this.val;
+    }
+
+    /**
+     * Gets a promise which resolves to the value, eventually.
+     */
+    public get value(): Promise<T> {
+        if (this.prom) return this.prom;
+        this.prom = this.getFn();
+
+        // Fork the promise chain to avoid accidentally making it return undefined always.
+        this.prom.then(v => {
+            this.val = v;
+            this.done = true;
+        });
+
+        return this.prom;
+    }
+}
diff --git a/src/utils/MarkedExecution.ts b/src/utils/MarkedExecution.ts
index b0b8fdf63d..01cc91adce 100644
--- a/src/utils/MarkedExecution.ts
+++ b/src/utils/MarkedExecution.ts
@@ -26,9 +26,11 @@ export class MarkedExecution {
 
     /**
      * Creates a MarkedExecution for the provided function.
-     * @param fn The function to be called upon trigger if marked.
+     * @param {Function} fn The function to be called upon trigger if marked.
+     * @param {Function} onMarkCallback A function that is called when a new mark is made. Not
+     * called if a mark is already flagged.
      */
-    constructor(private fn: () => void) {
+    constructor(private fn: () => void, private onMarkCallback?: () => void) {
     }
 
     /**
@@ -42,6 +44,7 @@ export class MarkedExecution {
      * Marks the function to be called upon trigger().
      */
     public mark() {
+        if (!this.marked) this.onMarkCallback?.();
         this.marked = true;
     }
 
diff --git a/src/utils/MediaEventHelper.ts b/src/utils/MediaEventHelper.ts
new file mode 100644
index 0000000000..f68da309bc
--- /dev/null
+++ b/src/utils/MediaEventHelper.ts
@@ -0,0 +1,121 @@
+/*
+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 { MatrixEvent } from "matrix-js-sdk/src";
+import { LazyValue } from "./LazyValue";
+import { Media, mediaFromContent } from "../customisations/Media";
+import { decryptFile } from "./DecryptFile";
+import { IMediaEventContent } from "../customisations/models/IMediaEventContent";
+import { IDestroyable } from "./IDestroyable";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+
+// TODO: We should consider caching the blobs. https://github.com/vector-im/element-web/issues/17192
+
+export class MediaEventHelper implements IDestroyable {
+    // Either an HTTP or Object URL (when encrypted) to the media.
+    public readonly sourceUrl: LazyValue<string>;
+    public readonly thumbnailUrl: LazyValue<string>;
+
+    // Either the raw or decrypted (when encrypted) contents of the file.
+    public readonly sourceBlob: LazyValue<Blob>;
+    public readonly thumbnailBlob: LazyValue<Blob>;
+
+    public readonly media: Media;
+
+    public constructor(private event: MatrixEvent) {
+        this.sourceUrl = new LazyValue(this.prepareSourceUrl);
+        this.thumbnailUrl = new LazyValue(this.prepareThumbnailUrl);
+        this.sourceBlob = new LazyValue(this.fetchSource);
+        this.thumbnailBlob = new LazyValue(this.fetchThumbnail);
+
+        this.media = mediaFromContent(this.event.getContent());
+    }
+
+    public get fileName(): string {
+        return this.event.getContent<IMediaEventContent>().body || "download";
+    }
+
+    public destroy() {
+        if (this.media.isEncrypted) {
+            if (this.sourceUrl.present) URL.revokeObjectURL(this.sourceUrl.cachedValue);
+            if (this.thumbnailUrl.present) URL.revokeObjectURL(this.thumbnailUrl.cachedValue);
+        }
+    }
+
+    private prepareSourceUrl = async () => {
+        if (this.media.isEncrypted) {
+            const blob = await this.sourceBlob.value;
+            return URL.createObjectURL(blob);
+        } else {
+            return this.media.srcHttp;
+        }
+    };
+
+    private prepareThumbnailUrl = async () => {
+        if (this.media.isEncrypted) {
+            const blob = await this.thumbnailBlob.value;
+            if (blob === null) return null;
+            return URL.createObjectURL(blob);
+        } else {
+            return this.media.thumbnailHttp;
+        }
+    };
+
+    private fetchSource = () => {
+        if (this.media.isEncrypted) {
+            const content = this.event.getContent<IMediaEventContent>();
+            return decryptFile(content.file, content.info);
+        }
+        return this.media.downloadSource().then(r => r.blob());
+    };
+
+    private fetchThumbnail = () => {
+        if (!this.media.hasThumbnail) return Promise.resolve(null);
+
+        if (this.media.isEncrypted) {
+            const content = this.event.getContent<IMediaEventContent>();
+            if (content.info?.thumbnail_file) {
+                return decryptFile(content.info.thumbnail_file, content.info.thumbnail_info);
+            } else {
+                // "Should never happen"
+                console.warn("Media claims to have thumbnail and is encrypted, but no thumbnail_file found");
+                return Promise.resolve(null);
+            }
+        }
+
+        return fetch(this.media.thumbnailHttp).then(r => r.blob());
+    };
+
+    public static isEligible(event: MatrixEvent): boolean {
+        if (!event) return false;
+        if (event.isRedacted()) return false;
+        if (event.getType() === EventType.Sticker) return true;
+        if (event.getType() !== EventType.RoomMessage) return false;
+
+        const content = event.getContent();
+        const mediaMsgTypes: string[] = [
+            MsgType.Video,
+            MsgType.Audio,
+            MsgType.Image,
+            MsgType.File,
+        ];
+        if (mediaMsgTypes.includes(content.msgtype)) return true;
+        if (typeof(content.url) === 'string') return true;
+
+        // Finally, it's probably not media
+        return false;
+    }
+}
diff --git a/src/utils/MegolmExportEncryption.js b/src/utils/MegolmExportEncryption.ts
similarity index 88%
rename from src/utils/MegolmExportEncryption.js
rename to src/utils/MegolmExportEncryption.ts
index 6f5c7104b1..47c395bfb7 100644
--- a/src/utils/MegolmExportEncryption.js
+++ b/src/utils/MegolmExportEncryption.ts
@@ -15,37 +15,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// polyfill textencoder if necessary
-import * as TextEncodingUtf8 from 'text-encoding-utf-8';
-let TextEncoder = window.TextEncoder;
-if (!TextEncoder) {
-    TextEncoder = TextEncodingUtf8.TextEncoder;
-}
-let TextDecoder = window.TextDecoder;
-if (!TextDecoder) {
-    TextDecoder = TextEncodingUtf8.TextDecoder;
-}
-
 import { _t } from '../languageHandler';
 import SdkConfig from '../SdkConfig';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const subtleCrypto = window.crypto.subtle || window.crypto.webkitSubtle;
 
 /**
  * Make an Error object which has a friendlyText property which is already
  * translated and suitable for showing to the user.
  *
- * @param {string} msg   message for the exception
+ * @param {string} message message for the exception
  * @param {string} friendlyText
- * @returns {Error}
+ * @returns {{message: string, friendlyText: string}}
  */
-function friendlyError(msg, friendlyText) {
-    const e = new Error(msg);
-    e.friendlyText = friendlyText;
-    return e;
+function friendlyError(
+    message: string, friendlyText: string,
+): { message: string, friendlyText: string } {
+    return { message, friendlyText };
 }
 
-function cryptoFailMsg() {
+function cryptoFailMsg(): string {
     return _t('Your browser does not support the required cryptography extensions');
 }
 
@@ -58,7 +49,7 @@ function cryptoFailMsg() {
  *
  *
  */
-export async function decryptMegolmKeyFile(data, password) {
+export async function decryptMegolmKeyFile(data: ArrayBuffer, password: string): Promise<string> {
     const body = unpackMegolmKeyFile(data);
     const brand = SdkConfig.get().brand;
 
@@ -92,7 +83,7 @@ export async function decryptMegolmKeyFile(data, password) {
     let isValid;
     try {
         isValid = await subtleCrypto.verify(
-            {name: 'HMAC'},
+            { name: 'HMAC' },
             hmacKey,
             hmac,
             toVerify,
@@ -123,7 +114,6 @@ export async function decryptMegolmKeyFile(data, password) {
     return new TextDecoder().decode(new Uint8Array(plaintext));
 }
 
-
 /**
  * Encrypt a megolm key file
  *
@@ -134,7 +124,11 @@ export async function decryptMegolmKeyFile(data, password) {
  *    key-derivation function.
  * @return {Promise<ArrayBuffer>} promise for encrypted output
  */
-export async function encryptMegolmKeyFile(data, password, options) {
+export async function encryptMegolmKeyFile(
+    data: string,
+    password: string,
+    options?: { kdf_rounds?: number }, // eslint-disable-line camelcase
+): Promise<ArrayBuffer> {
     options = options || {};
     const kdfRounds = options.kdf_rounds || 500000;
 
@@ -185,7 +179,7 @@ export async function encryptMegolmKeyFile(data, password, options) {
     let hmac;
     try {
         hmac = await subtleCrypto.sign(
-            {name: 'HMAC'},
+            { name: 'HMAC' },
             hmacKey,
             toSign,
         );
@@ -193,7 +187,6 @@ export async function encryptMegolmKeyFile(data, password, options) {
         throw friendlyError('subtleCrypto.sign failed: ' + e, cryptoFailMsg());
     }
 
-
     const hmacArray = new Uint8Array(hmac);
     resultBuffer.set(hmacArray, idx);
     return packMegolmKeyFile(resultBuffer);
@@ -207,7 +200,7 @@ export async function encryptMegolmKeyFile(data, password, options) {
  * @param {String} password  password
  * @return {Promise<[CryptoKey, CryptoKey]>} promise for [aes key, hmac key]
  */
-async function deriveKeys(salt, iterations, password) {
+async function deriveKeys(salt: Uint8Array, iterations: number, password: string): Promise<[CryptoKey, CryptoKey]> {
     const start = new Date();
 
     let key;
@@ -215,7 +208,7 @@ async function deriveKeys(salt, iterations, password) {
         key = await subtleCrypto.importKey(
             'raw',
             new TextEncoder().encode(password),
-            {name: 'PBKDF2'},
+            { name: 'PBKDF2' },
             false,
             ['deriveBits'],
         );
@@ -240,7 +233,7 @@ async function deriveKeys(salt, iterations, password) {
     }
 
     const now = new Date();
-    console.log("E2e import/export: deriveKeys took " + (now - start) + "ms");
+    logger.log("E2e import/export: deriveKeys took " + (now.getTime() - start.getTime()) + "ms");
 
     const aesKey = keybits.slice(0, 32);
     const hmacKey = keybits.slice(32);
@@ -248,7 +241,7 @@ async function deriveKeys(salt, iterations, password) {
     const aesProm = subtleCrypto.importKey(
         'raw',
         aesKey,
-        {name: 'AES-CTR'},
+        { name: 'AES-CTR' },
         false,
         ['encrypt', 'decrypt'],
     ).catch((e) => {
@@ -260,7 +253,7 @@ async function deriveKeys(salt, iterations, password) {
         hmacKey,
         {
             name: 'HMAC',
-            hash: {name: 'SHA-256'},
+            hash: { name: 'SHA-256' },
         },
         false,
         ['sign', 'verify'],
@@ -282,7 +275,7 @@ const TRAILER_LINE = '-----END MEGOLM SESSION DATA-----';
  * @param {ArrayBuffer} data  input file
  * @return {Uint8Array} unbase64ed content
  */
-function unpackMegolmKeyFile(data) {
+function unpackMegolmKeyFile(data: ArrayBuffer): Uint8Array {
     // parse the file as a great big String. This should be safe, because there
     // should be no non-ASCII characters, and it means that we can do string
     // comparisons to find the header and footer, and feed it into window.atob.
@@ -290,6 +283,7 @@ function unpackMegolmKeyFile(data) {
 
     // look for the start line
     let lineStart = 0;
+    // eslint-disable-next-line no-constant-condition
     while (1) {
         const lineEnd = fileStr.indexOf('\n', lineStart);
         if (lineEnd < 0) {
@@ -308,6 +302,7 @@ function unpackMegolmKeyFile(data) {
     const dataStart = lineStart;
 
     // look for the end line
+    // eslint-disable-next-line no-constant-condition
     while (1) {
         const lineEnd = fileStr.indexOf('\n', lineStart);
         const line = fileStr.slice(lineStart, lineEnd < 0 ? undefined : lineEnd).trim();
@@ -335,7 +330,7 @@ function unpackMegolmKeyFile(data) {
  * @param {Uint8Array} data  raw data
  * @return {ArrayBuffer} formatted file
  */
-function packMegolmKeyFile(data) {
+function packMegolmKeyFile(data: Uint8Array): ArrayBuffer {
     // we split into lines before base64ing, because encodeBase64 doesn't deal
     // terribly well with large arrays.
     const LINE_LENGTH = (72 * 4 / 3);
@@ -358,7 +353,7 @@ function packMegolmKeyFile(data) {
  * @param {Uint8Array} uint8Array The data to encode.
  * @return {string} The base64.
  */
-function encodeBase64(uint8Array) {
+function encodeBase64(uint8Array: Uint8Array): string {
     // Misinterpt the Uint8Array as Latin-1.
     // window.btoa expects a unicode string with codepoints in the range 0-255.
     const latin1String = String.fromCharCode.apply(null, uint8Array);
@@ -371,7 +366,7 @@ function encodeBase64(uint8Array) {
  * @param {string} base64 The base64 to decode.
  * @return {Uint8Array} The decoded data.
  */
-function decodeBase64(base64) {
+function decodeBase64(base64: string): Uint8Array {
     // window.atob returns a unicode string with codepoints in the range 0-255.
     const latin1String = window.atob(base64);
     // Encode the string as a Uint8Array
diff --git a/src/utils/MessageDiffUtils.js b/src/utils/MessageDiffUtils.tsx
similarity index 86%
rename from src/utils/MessageDiffUtils.js
rename to src/utils/MessageDiffUtils.tsx
index 7398173fdd..020a7763cf 100644
--- a/src/utils/MessageDiffUtils.js
+++ b/src/utils/MessageDiffUtils.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,31 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, { ReactNode } from 'react';
 import classNames from 'classnames';
-import DiffMatchPatch from 'diff-match-patch';
-import {DiffDOM} from "diff-dom";
-import { checkBlockNode, bodyToHtml } from "../HtmlUtils";
+import { diff_match_patch as DiffMatchPatch } from 'diff-match-patch';
+import { DiffDOM, IDiff } from "diff-dom";
+import { IContent } from "matrix-js-sdk/src/models/event";
+
+import { bodyToHtml, checkBlockNode, IOptsReturnString } from "../HtmlUtils";
 
 const decodeEntities = (function() {
     let textarea = null;
-    return function(string) {
+    return function(str: string): string {
         if (!textarea) {
             textarea = document.createElement("textarea");
         }
-        textarea.innerHTML = string;
+        textarea.innerHTML = str;
         return textarea.value;
     };
 })();
 
-function textToHtml(text) {
+function textToHtml(text: string): string {
     const container = document.createElement("div");
     container.textContent = text;
     return container.innerHTML;
 }
 
-function getSanitizedHtmlBody(content) {
-    const opts = {
+function getSanitizedHtmlBody(content: IContent): string {
+    const opts: IOptsReturnString = {
         stripReplyFallback: true,
         returnString: true,
     };
@@ -57,21 +59,21 @@ function getSanitizedHtmlBody(content) {
     }
 }
 
-function wrapInsertion(child) {
+function wrapInsertion(child: Node): HTMLElement {
     const wrapper = document.createElement(checkBlockNode(child) ? "div" : "span");
     wrapper.className = "mx_EditHistoryMessage_insertion";
     wrapper.appendChild(child);
     return wrapper;
 }
 
-function wrapDeletion(child) {
+function wrapDeletion(child: Node): HTMLElement {
     const wrapper = document.createElement(checkBlockNode(child) ? "div" : "span");
     wrapper.className = "mx_EditHistoryMessage_deletion";
     wrapper.appendChild(child);
     return wrapper;
 }
 
-function findRefNodes(root, route, isAddition) {
+function findRefNodes(root: Node, route: number[], isAddition = false) {
     let refNode = root;
     let refParentNode;
     const end = isAddition ? route.length - 1 : route.length;
@@ -79,7 +81,7 @@ function findRefNodes(root, route, isAddition) {
         refParentNode = refNode;
         refNode = refNode.childNodes[route[i]];
     }
-    return {refNode, refParentNode};
+    return { refNode, refParentNode };
 }
 
 function diffTreeToDOM(desc) {
@@ -101,7 +103,7 @@ function diffTreeToDOM(desc) {
     }
 }
 
-function insertBefore(parent, nextSibling, child) {
+function insertBefore(parent: Node, nextSibling: Node | null, child: Node): void {
     if (nextSibling) {
         parent.insertBefore(child, nextSibling);
     } else {
@@ -109,7 +111,7 @@ function insertBefore(parent, nextSibling, child) {
     }
 }
 
-function isRouteOfNextSibling(route1, route2) {
+function isRouteOfNextSibling(route1: number[], route2: number[]): boolean {
     // routes are arrays with indices,
     // to be interpreted as a path in the dom tree
 
@@ -127,7 +129,7 @@ function isRouteOfNextSibling(route1, route2) {
     return route2[lastD1Idx] >= route1[lastD1Idx];
 }
 
-function adjustRoutes(diff, remainingDiffs) {
+function adjustRoutes(diff: IDiff, remainingDiffs: IDiff[]): void {
     if (diff.action === "removeTextElement" || diff.action === "removeElement") {
         // as removed text is not removed from the html, but marked as deleted,
         // we need to readjust indices that assume the current node has been removed.
@@ -140,12 +142,12 @@ function adjustRoutes(diff, remainingDiffs) {
     }
 }
 
-function stringAsTextNode(string) {
+function stringAsTextNode(string: string): Text {
     return document.createTextNode(decodeEntities(string));
 }
 
-function renderDifferenceInDOM(originalRootNode, diff, diffMathPatch) {
-    const {refNode, refParentNode} = findRefNodes(originalRootNode, diff.route);
+function renderDifferenceInDOM(originalRootNode: Node, diff: IDiff, diffMathPatch: DiffMatchPatch): void {
+    const { refNode, refParentNode } = findRefNodes(originalRootNode, diff.route);
     switch (diff.action) {
         case "replaceElement": {
             const container = document.createElement("span");
@@ -171,7 +173,7 @@ function renderDifferenceInDOM(originalRootNode, diff, diffMathPatch) {
             diffMathPatch.diff_cleanupSemantic(textDiffs);
             const container = document.createElement("span");
             for (const [modifier, text] of textDiffs) {
-                let textDiffNode = stringAsTextNode(text);
+                let textDiffNode: Node = stringAsTextNode(text);
                 if (modifier < 0) {
                     textDiffNode = wrapDeletion(textDiffNode);
                 } else if (modifier > 0) {
@@ -201,7 +203,7 @@ function renderDifferenceInDOM(originalRootNode, diff, diffMathPatch) {
         case "addAttribute":
         case "modifyAttribute": {
             const delNode = wrapDeletion(refNode.cloneNode(true));
-            const updatedNode = refNode.cloneNode(true);
+            const updatedNode = refNode.cloneNode(true) as HTMLElement;
             if (diff.action === "addAttribute" || diff.action === "modifyAttribute") {
                 updatedNode.setAttribute(diff.name, diff.newValue);
             } else {
@@ -220,12 +222,12 @@ function renderDifferenceInDOM(originalRootNode, diff, diffMathPatch) {
     }
 }
 
-function routeIsEqual(r1, r2) {
+function routeIsEqual(r1: number[], r2: number[]): boolean {
     return r1.length === r2.length && !r1.some((e, i) => e !== r2[i]);
 }
 
 // workaround for https://github.com/fiduswriter/diffDOM/issues/90
-function filterCancelingOutDiffs(originalDiffActions) {
+function filterCancelingOutDiffs(originalDiffActions: IDiff[]): IDiff[] {
     const diffActions = originalDiffActions.slice();
 
     for (let i = 0; i < diffActions.length; ++i) {
@@ -252,7 +254,7 @@ function filterCancelingOutDiffs(originalDiffActions) {
  * @param {object} editContent the content for the edit message
  * @return {object} a react element similar to what `bodyToHtml` returns
  */
-export function editBodyDiffToHtml(originalContent, editContent) {
+export function editBodyDiffToHtml(originalContent: IContent, editContent: IContent): ReactNode {
     // wrap the body in a div, DiffDOM needs a root element
     const originalBody = `<div>${getSanitizedHtmlBody(originalContent)}</div>`;
     const editBody = `<div>${getSanitizedHtmlBody(editContent)}</div>`;
diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
deleted file mode 100644
index 78f956b91b..0000000000
--- a/src/utils/MultiInviter.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017, 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import {MatrixClientPeg} from '../MatrixClientPeg';
-import {getAddressType} from '../UserAddress';
-import GroupStore from '../stores/GroupStore';
-import {_t} from "../languageHandler";
-import * as sdk from "../index";
-import Modal from "../Modal";
-import SettingsStore from "../settings/SettingsStore";
-import {defer} from "./promise";
-
-/**
- * Invites multiple addresses to a room or group, handling rate limiting from the server
- */
-export default class MultiInviter {
-    /**
-     * @param {string} targetId The ID of the room or group to invite to
-     */
-    constructor(targetId) {
-        if (targetId[0] === '+') {
-            this.roomId = null;
-            this.groupId = targetId;
-        } else {
-            this.roomId = targetId;
-            this.groupId = null;
-        }
-
-        this.canceled = false;
-        this.addrs = [];
-        this.busy = false;
-        this.completionStates = {}; // State of each address (invited or error)
-        this.errors = {}; // { address: {errorText, errcode} }
-        this.deferred = null;
-    }
-
-    /**
-     * Invite users to this room. This may only be called once per
-     * 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, 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) {
-                this.completionStates[addr] = 'error';
-                this.errors[addr] = {
-                    errcode: 'M_INVALID',
-                    errorText: _t('Unrecognised address'),
-                };
-            }
-        }
-        this.deferred = defer();
-        this._inviteMore(0);
-
-        return this.deferred.promise;
-    }
-
-    /**
-     * Stops inviting. Causes promises returned by invite() to be rejected.
-     */
-    cancel() {
-        if (!this.busy) return;
-
-        this._canceled = true;
-        this.deferred.reject(new Error('canceled'));
-    }
-
-    getCompletionState(addr) {
-        return this.completionStates[addr];
-    }
-
-    getErrorText(addr) {
-        return this.errors[addr] ? this.errors[addr].errorText : null;
-    }
-
-    async _inviteToRoom(roomId, addr, ignoreProfile) {
-        const addrType = getAddressType(addr);
-
-        if (addrType === 'email') {
-            return MatrixClientPeg.get().inviteByEmail(roomId, addr);
-        } else if (addrType === 'mx-user-id') {
-            const room = MatrixClientPeg.get().getRoom(roomId);
-            if (!room) throw new Error("Room not found");
-
-            const member = room.getMember(addr);
-            if (member && ['join', 'invite'].includes(member.membership)) {
-                throw {errcode: "RIOT.ALREADY_IN_ROOM", error: "Member already invited"};
-            }
-
-            if (!ignoreProfile && SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
-                const profile = await MatrixClientPeg.get().getProfileInfo(addr);
-                if (!profile) {
-                    // noinspection ExceptionCaughtLocallyJS
-                    throw new Error("User has no profile");
-                }
-            }
-
-            return MatrixClientPeg.get().invite(roomId, addr, undefined, this.reason);
-        } else {
-            throw new Error('Unsupported address');
-        }
-    }
-
-    _doInvite(address, ignoreProfile) {
-        return new Promise((resolve, reject) => {
-            console.log(`Inviting ${address}`);
-
-            let doInvite;
-            if (this.groupId !== null) {
-                doInvite = GroupStore.inviteUserToGroup(this.groupId, address);
-            } else {
-                doInvite = this._inviteToRoom(this.roomId, address, ignoreProfile);
-            }
-
-            doInvite.then(() => {
-                if (this._canceled) {
-                    return;
-                }
-
-                this.completionStates[address] = 'invited';
-                delete this.errors[address];
-
-                resolve();
-            }).catch((err) => {
-                if (this._canceled) {
-                    return;
-                }
-
-                console.error(err);
-
-                let errorText;
-                let fatal = false;
-                if (err.errcode === 'M_FORBIDDEN') {
-                    fatal = true;
-                    errorText = _t('You do not have permission to invite people to this room.');
-                } else if (err.errcode === "RIOT.ALREADY_IN_ROOM") {
-                    errorText = _t("User %(userId)s is already in the room", {userId: address});
-                } else if (err.errcode === 'M_LIMIT_EXCEEDED') {
-                    // we're being throttled so wait a bit & try again
-                    setTimeout(() => {
-                        this._doInvite(address, ignoreProfile).then(resolve, reject);
-                    }, 5000);
-                    return;
-                } 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});
-                } else if (err.errcode === 'M_PROFILE_NOT_FOUND' && !ignoreProfile) {
-                    // Invite without the profile check
-                    console.warn(`User ${address} does not have a profile - inviting anyways automatically`);
-                    this._doInvite(address, true).then(resolve, reject);
-                } else if (err.errcode === "M_BAD_STATE") {
-                    errorText = _t("The user must be unbanned before they can be invited.");
-                } else if (err.errcode === "M_UNSUPPORTED_ROOM_VERSION") {
-                    errorText = _t("The user's homeserver does not support the version of the room.");
-                } else {
-                    errorText = _t('Unknown server error');
-                }
-
-                this.completionStates[address] = 'error';
-                this.errors[address] = {errorText, errcode: err.errcode};
-
-                this.busy = !fatal;
-                this.fatal = fatal;
-
-                if (fatal) {
-                    reject();
-                } else {
-                    resolve();
-                }
-            });
-        });
-    }
-
-    _inviteMore(nextIndex, ignoreProfile) {
-        if (this._canceled) {
-            return;
-        }
-
-        if (nextIndex === this.addrs.length) {
-            this.busy = false;
-            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'];
-                const unknownProfileUsers = Object.keys(this.errors).filter(a => unknownProfileErrors.includes(this.errors[a].errcode));
-
-                if (unknownProfileUsers.length > 0) {
-                    const inviteUnknowns = () => {
-                        const promises = unknownProfileUsers.map(u => this._doInvite(u, true));
-                        Promise.all(promises).then(() => this.deferred.resolve(this.completionStates));
-                    };
-
-                    if (!SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
-                        inviteUnknowns();
-                        return;
-                    }
-
-                    const AskInviteAnywayDialog = sdk.getComponent("dialogs.AskInviteAnywayDialog");
-                    console.log("Showing failed to invite dialog...");
-                    Modal.createTrackedDialog('Failed to invite', '', AskInviteAnywayDialog, {
-                        unknownProfileUsers: unknownProfileUsers.map(u => {return {userId: u, errorText: this.errors[u].errorText};}),
-                        onInviteAnyways: () => inviteUnknowns(),
-                        onGiveUp: () => {
-                            // Fake all the completion states because we already warned the user
-                            for (const addr of unknownProfileUsers) {
-                                this.completionStates[addr] = 'invited';
-                            }
-                            this.deferred.resolve(this.completionStates);
-                        },
-                    });
-                    return;
-                }
-            }
-            this.deferred.resolve(this.completionStates);
-            return;
-        }
-
-        const addr = this.addrs[nextIndex];
-
-        // don't try to invite it if it's an invalid address
-        // (it will already be marked as an error though,
-        // so no need to do so again)
-        if (getAddressType(addr) === null) {
-            this._inviteMore(nextIndex + 1);
-            return;
-        }
-
-        // don't re-invite (there's no way in the UI to do this, but
-        // for sanity's sake)
-        if (this.completionStates[addr] === 'invited') {
-            this._inviteMore(nextIndex + 1);
-            return;
-        }
-
-        this._doInvite(addr, ignoreProfile).then(() => {
-            this._inviteMore(nextIndex + 1, ignoreProfile);
-        }).catch(() => this.deferred.resolve(this.completionStates));
-    }
-}
diff --git a/src/utils/MultiInviter.ts b/src/utils/MultiInviter.ts
new file mode 100644
index 0000000000..5b79a2ff93
--- /dev/null
+++ b/src/utils/MultiInviter.ts
@@ -0,0 +1,319 @@
+/*
+Copyright 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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { MatrixError } from "matrix-js-sdk/src/http-api";
+import { defer, IDeferred } from "matrix-js-sdk/src/utils";
+
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import { AddressType, getAddressType } from '../UserAddress';
+import GroupStore from '../stores/GroupStore';
+import { _t } from "../languageHandler";
+import Modal from "../Modal";
+import SettingsStore from "../settings/SettingsStore";
+import AskInviteAnywayDialog from "../components/views/dialogs/AskInviteAnywayDialog";
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+export enum InviteState {
+    Invited = "invited",
+    Error = "error",
+}
+
+interface IError {
+    errorText: string;
+    errcode: string;
+}
+
+const UNKNOWN_PROFILE_ERRORS = ['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'M_PROFILE_UNDISCLOSED', 'M_PROFILE_NOT_FOUND'];
+
+export type CompletionStates = Record<string, InviteState>;
+
+const USER_ALREADY_JOINED = "IO.ELEMENT.ALREADY_JOINED";
+const USER_ALREADY_INVITED = "IO.ELEMENT.ALREADY_INVITED";
+
+/**
+ * Invites multiple addresses to a room or group, handling rate limiting from the server
+ */
+export default class MultiInviter {
+    private readonly roomId?: string;
+    private readonly groupId?: string;
+
+    private canceled = false;
+    private addresses: string[] = [];
+    private busy = false;
+    private _fatal = false;
+    private completionStates: CompletionStates = {}; // State of each address (invited or error)
+    private errors: Record<string, IError> = {}; // { address: {errorText, errcode} }
+    private deferred: IDeferred<CompletionStates> = null;
+    private reason: string = null;
+
+    /**
+     * @param {string} targetId The ID of the room or group to invite to
+     */
+    constructor(targetId: string) {
+        if (targetId[0] === '+') {
+            this.roomId = null;
+            this.groupId = targetId;
+        } else {
+            this.roomId = targetId;
+            this.groupId = null;
+        }
+    }
+
+    public get fatal() {
+        return this._fatal;
+    }
+
+    /**
+     * Invite users to this room. This may only be called once per
+     * instance of the class.
+     *
+     * @param {array} addresses Array of addresses to invite
+     * @param {string} reason Reason for inviting (optional)
+     * @returns {Promise} Resolved when all invitations in the queue are complete
+     */
+    public invite(addresses, reason?: string): Promise<CompletionStates> {
+        if (this.addresses.length > 0) {
+            throw new Error("Already inviting/invited");
+        }
+        this.addresses.push(...addresses);
+        this.reason = reason;
+
+        for (const addr of this.addresses) {
+            if (getAddressType(addr) === null) {
+                this.completionStates[addr] = InviteState.Error;
+                this.errors[addr] = {
+                    errcode: 'M_INVALID',
+                    errorText: _t('Unrecognised address'),
+                };
+            }
+        }
+        this.deferred = defer<CompletionStates>();
+        this.inviteMore(0);
+
+        return this.deferred.promise;
+    }
+
+    /**
+     * Stops inviting. Causes promises returned by invite() to be rejected.
+     */
+    public cancel(): void {
+        if (!this.busy) return;
+
+        this.canceled = true;
+        this.deferred.reject(new Error('canceled'));
+    }
+
+    public getCompletionState(addr: string): InviteState {
+        return this.completionStates[addr];
+    }
+
+    public getErrorText(addr: string): string {
+        return this.errors[addr] ? this.errors[addr].errorText : null;
+    }
+
+    private async inviteToRoom(roomId: string, addr: string, ignoreProfile = false): Promise<{}> {
+        const addrType = getAddressType(addr);
+
+        if (addrType === AddressType.Email) {
+            return MatrixClientPeg.get().inviteByEmail(roomId, addr);
+        } else if (addrType === AddressType.MatrixUserId) {
+            const room = MatrixClientPeg.get().getRoom(roomId);
+            if (!room) throw new Error("Room not found");
+
+            const member = room.getMember(addr);
+            if (member?.membership === "join") {
+                throw new MatrixError({
+                    errcode: USER_ALREADY_JOINED,
+                    error: "Member already joined",
+                });
+            } else if (member?.membership === "invite") {
+                throw new MatrixError({
+                    errcode: USER_ALREADY_INVITED,
+                    error: "Member already invited",
+                });
+            }
+
+            if (!ignoreProfile && SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
+                const profile = await MatrixClientPeg.get().getProfileInfo(addr);
+                if (!profile) {
+                    // noinspection ExceptionCaughtLocallyJS
+                    throw new Error("User has no profile");
+                }
+            }
+
+            return MatrixClientPeg.get().invite(roomId, addr, undefined, this.reason);
+        } else {
+            throw new Error('Unsupported address');
+        }
+    }
+
+    private doInvite(address: string, ignoreProfile = false): Promise<void> {
+        return new Promise<void>((resolve, reject) => {
+            logger.log(`Inviting ${address}`);
+
+            let doInvite;
+            if (this.groupId !== null) {
+                doInvite = GroupStore.inviteUserToGroup(this.groupId, address);
+            } else {
+                doInvite = this.inviteToRoom(this.roomId, address, ignoreProfile);
+            }
+
+            doInvite.then(() => {
+                if (this.canceled) {
+                    return;
+                }
+
+                this.completionStates[address] = InviteState.Invited;
+                delete this.errors[address];
+
+                resolve();
+            }).catch((err) => {
+                if (this.canceled) {
+                    return;
+                }
+
+                console.error(err);
+
+                let errorText;
+                let fatal = false;
+                switch (err.errcode) {
+                    case "M_FORBIDDEN":
+                        errorText = _t('You do not have permission to invite people to this room.');
+                        fatal = true;
+                        break;
+                    case USER_ALREADY_INVITED:
+                        errorText = _t("User %(userId)s is already invited to the room", { userId: address });
+                        break;
+                    case USER_ALREADY_JOINED:
+                        errorText = _t("User %(userId)s is already in the room", { userId: address });
+                        break;
+                    case "M_LIMIT_EXCEEDED":
+                        // we're being throttled so wait a bit & try again
+                        setTimeout(() => {
+                            this.doInvite(address, ignoreProfile).then(resolve, reject);
+                        }, 5000);
+                        return;
+                    case "M_NOT_FOUND":
+                    case "M_USER_NOT_FOUND":
+                        errorText = _t("User %(user_id)s does not exist", { user_id: address });
+                        break;
+                    case "M_PROFILE_UNDISCLOSED":
+                        errorText = _t("User %(user_id)s may or may not exist", { user_id: address });
+                        break;
+                    case "M_PROFILE_NOT_FOUND":
+                        if (!ignoreProfile) {
+                            // Invite without the profile check
+                            console.warn(`User ${address} does not have a profile - inviting anyways automatically`);
+                            this.doInvite(address, true).then(resolve, reject);
+                            return;
+                        }
+                        break;
+                    case "M_BAD_STATE":
+                        errorText = _t("The user must be unbanned before they can be invited.");
+                        break;
+                    case "M_UNSUPPORTED_ROOM_VERSION":
+                        errorText = _t("The user's homeserver does not support the version of the room.");
+                        break;
+                }
+
+                if (!errorText) {
+                    errorText = _t('Unknown server error');
+                }
+
+                this.completionStates[address] = InviteState.Error;
+                this.errors[address] = { errorText, errcode: err.errcode };
+
+                this.busy = !fatal;
+                this._fatal = fatal;
+
+                if (fatal) {
+                    reject(err);
+                } else {
+                    resolve();
+                }
+            });
+        });
+    }
+
+    private inviteMore(nextIndex: number, ignoreProfile = false): void {
+        if (this.canceled) {
+            return;
+        }
+
+        if (nextIndex === this.addresses.length) {
+            this.busy = false;
+            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 unknownProfileUsers = Object.keys(this.errors)
+                    .filter(a => UNKNOWN_PROFILE_ERRORS.includes(this.errors[a].errcode));
+
+                if (unknownProfileUsers.length > 0) {
+                    const inviteUnknowns = () => {
+                        const promises = unknownProfileUsers.map(u => this.doInvite(u, true));
+                        Promise.all(promises).then(() => this.deferred.resolve(this.completionStates));
+                    };
+
+                    if (!SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
+                        inviteUnknowns();
+                        return;
+                    }
+
+                    logger.log("Showing failed to invite dialog...");
+                    Modal.createTrackedDialog('Failed to invite', '', AskInviteAnywayDialog, {
+                        unknownProfileUsers: unknownProfileUsers.map(u => ({
+                            userId: u,
+                            errorText: this.errors[u].errorText,
+                        })),
+                        onInviteAnyways: () => inviteUnknowns(),
+                        onGiveUp: () => {
+                            // Fake all the completion states because we already warned the user
+                            for (const addr of unknownProfileUsers) {
+                                this.completionStates[addr] = InviteState.Invited;
+                            }
+                            this.deferred.resolve(this.completionStates);
+                        },
+                    });
+                    return;
+                }
+            }
+            this.deferred.resolve(this.completionStates);
+            return;
+        }
+
+        const addr = this.addresses[nextIndex];
+
+        // don't try to invite it if it's an invalid address
+        // (it will already be marked as an error though,
+        // so no need to do so again)
+        if (getAddressType(addr) === null) {
+            this.inviteMore(nextIndex + 1);
+            return;
+        }
+
+        // don't re-invite (there's no way in the UI to do this, but
+        // for sanity's sake)
+        if (this.completionStates[addr] === InviteState.Invited) {
+            this.inviteMore(nextIndex + 1);
+            return;
+        }
+
+        this.doInvite(addr, ignoreProfile).then(() => {
+            this.inviteMore(nextIndex + 1, ignoreProfile);
+        }).catch(() => this.deferred.resolve(this.completionStates));
+    }
+}
diff --git a/src/utils/PasswordScorer.ts b/src/utils/PasswordScorer.ts
index d8f3b0fb96..9aae4039bd 100644
--- a/src/utils/PasswordScorer.ts
+++ b/src/utils/PasswordScorer.ts
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import zxcvbn from 'zxcvbn';
+import zxcvbn, { ZXCVBNFeedbackWarning } from 'zxcvbn';
 
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import { _t, _td } from '../languageHandler';
 
 const ZXCVBN_USER_INPUTS = [
@@ -84,7 +84,7 @@ export function scorePassword(password: string) {
     }
     // and warning, if any
     if (zxcvbnResult.feedback.warning) {
-        zxcvbnResult.feedback.warning = _t(zxcvbnResult.feedback.warning);
+        zxcvbnResult.feedback.warning = _t(zxcvbnResult.feedback.warning) as ZXCVBNFeedbackWarning;
     }
 
     return zxcvbnResult;
diff --git a/src/utils/PinningUtils.js b/src/utils/PinningUtils.ts
similarity index 89%
rename from src/utils/PinningUtils.js
rename to src/utils/PinningUtils.ts
index 90d26cc988..ec1eeccf1f 100644
--- a/src/utils/PinningUtils.js
+++ b/src/utils/PinningUtils.ts
@@ -14,13 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 export default class PinningUtils {
     /**
      * Determines if the given event may be pinned.
      * @param {MatrixEvent} event The event to check.
      * @return {boolean} True if the event may be pinned, false otherwise.
      */
-    static isPinnable(event) {
+    static isPinnable(event: MatrixEvent): boolean {
         if (!event) return false;
         if (event.getType() !== "m.room.message") return false;
         if (event.isRedacted()) return false;
diff --git a/src/utils/ReactUtils.tsx b/src/utils/ReactUtils.tsx
new file mode 100644
index 0000000000..4cd2d750f3
--- /dev/null
+++ b/src/utils/ReactUtils.tsx
@@ -0,0 +1,33 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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";
+
+/**
+ * Joins an array into one value with a joiner. E.g. join(["hello", "world"], " ") -> <span>hello world</span>
+ * @param array the array of element to join
+ * @param joiner the string/JSX.Element to join with
+ * @returns the joined array
+ */
+export function jsxJoin(array: Array<string | JSX.Element>, joiner?: string | JSX.Element): JSX.Element {
+    const newArray = [];
+    array.forEach((element, index) => {
+        newArray.push(element, (index === array.length - 1) ? null : joiner);
+    });
+    return (
+        <span>{ newArray }</span>
+    );
+}
diff --git a/src/utils/Receipt.js b/src/utils/Receipt.ts
similarity index 83%
rename from src/utils/Receipt.js
rename to src/utils/Receipt.ts
index d88c67fb18..2a626decc4 100644
--- a/src/utils/Receipt.js
+++ b/src/utils/Receipt.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
+Copyright 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.
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 /**
  * Given MatrixEvent containing receipts, return the first
  * read receipt from the given user ID, or null if no such
@@ -23,7 +25,7 @@ limitations under the License.
  * @param {string} userId A user ID
  * @returns {Object} Read receipt
  */
-export function findReadReceiptFromUserId(receiptEvent, userId) {
+export function findReadReceiptFromUserId(receiptEvent: MatrixEvent, userId: string): object | null {
     const receiptKeys = Object.keys(receiptEvent.getContent());
     for (let i = 0; i < receiptKeys.length; ++i) {
         const rcpt = receiptEvent.getContent()[receiptKeys[i]];
diff --git a/src/utils/ResizeNotifier.js b/src/utils/ResizeNotifier.ts
similarity index 62%
rename from src/utils/ResizeNotifier.js
rename to src/utils/ResizeNotifier.ts
index 4d46d10f6c..8bb7f52e57 100644
--- a/src/utils/ResizeNotifier.js
+++ b/src/utils/ResizeNotifier.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.
@@ -22,59 +22,58 @@ limitations under the License.
  * Fires when the middle panel has been resized by a pixel.
  * @event module:utils~ResizeNotifier#"middlePanelResizedNoisy"
  */
+
 import { EventEmitter } from "events";
 import { throttle } from "lodash";
 
 export default class ResizeNotifier extends EventEmitter {
-    constructor() {
-        super();
-        // with default options, will call fn once at first call, and then every x ms
-        // if there was another call in that timespan
-        this._throttledMiddlePanel = throttle(() => this.emit("middlePanelResized"), 200);
-        this._isResizing = false;
-    }
+    private _isResizing = false;
 
-    get isResizing() {
+    // with default options, will call fn once at first call, and then every x ms
+    // if there was another call in that timespan
+    private throttledMiddlePanel = throttle(() => this.emit("middlePanelResized"), 200);
+
+    public get isResizing() {
         return this._isResizing;
     }
 
-    startResizing() {
+    public startResizing() {
         this._isResizing = true;
         this.emit("isResizing", true);
     }
 
-    stopResizing() {
+    public stopResizing() {
         this._isResizing = false;
         this.emit("isResizing", false);
     }
 
-    _noisyMiddlePanel() {
+    private noisyMiddlePanel() {
         this.emit("middlePanelResizedNoisy");
     }
 
-    _updateMiddlePanel() {
-        this._throttledMiddlePanel();
-        this._noisyMiddlePanel();
+    private updateMiddlePanel() {
+        this.throttledMiddlePanel();
+        this.noisyMiddlePanel();
     }
 
     // can be called in quick succession
-    notifyLeftHandleResized() {
+    public notifyLeftHandleResized() {
         // don't emit event for own region
-        this._updateMiddlePanel();
+        this.updateMiddlePanel();
     }
 
     // can be called in quick succession
-    notifyRightHandleResized() {
-        this._updateMiddlePanel();
+    public notifyRightHandleResized() {
+        this.updateMiddlePanel();
     }
 
-    notifyTimelineHeightChanged() {
-        this._updateMiddlePanel();
+    public notifyTimelineHeightChanged() {
+        this.updateMiddlePanel();
     }
 
     // can be called in quick succession
-    notifyWindowResized() {
-        this._updateMiddlePanel();
+    public notifyWindowResized() {
+        this.updateMiddlePanel();
     }
 }
 
diff --git a/src/utils/RoomUpgrade.ts b/src/utils/RoomUpgrade.ts
new file mode 100644
index 0000000000..366f49d892
--- /dev/null
+++ b/src/utils/RoomUpgrade.ts
@@ -0,0 +1,106 @@
+/*
+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 { EventType } from "matrix-js-sdk/src/@types/event";
+
+import { inviteUsersToRoom } from "../RoomInvite";
+import Modal from "../Modal";
+import { _t } from "../languageHandler";
+import ErrorDialog from "../components/views/dialogs/ErrorDialog";
+import SpaceStore from "../stores/SpaceStore";
+import Spinner from "../components/views/elements/Spinner";
+
+export async function upgradeRoom(
+    room: Room,
+    targetVersion: string,
+    inviteUsers = false,
+    handleError = true,
+    updateSpaces = true,
+    awaitRoom = false,
+): Promise<string> {
+    const cli = room.client;
+    const spinnerModal = Modal.createDialog(Spinner, null, "mx_Dialog_spinner");
+
+    let newRoomId: string;
+    try {
+        ({ replacement_room: newRoomId } = await cli.upgradeRoom(room.roomId, targetVersion));
+    } catch (e) {
+        if (!handleError) throw e;
+        console.error(e);
+
+        Modal.createTrackedDialog("Room Upgrade Error", "", ErrorDialog, {
+            title: _t('Error upgrading room'),
+            description: _t('Double check that your server supports the room version chosen and try again.'),
+        });
+        throw e;
+    }
+
+    if (awaitRoom || inviteUsers) {
+        await new Promise<void>(resolve => {
+            // already have the room
+            if (room.client.getRoom(newRoomId)) {
+                resolve();
+                return;
+            }
+
+            // We have to wait for the js-sdk to give us the room back so
+            // we can more effectively abuse the MultiInviter behaviour
+            // which heavily relies on the Room object being available.
+            const checkForRoomFn = (newRoom: Room) => {
+                if (newRoom.roomId !== newRoomId) return;
+                resolve();
+                cli.off("Room", checkForRoomFn);
+            };
+            cli.on("Room", checkForRoomFn);
+        });
+    }
+
+    if (inviteUsers) {
+        const toInvite = [
+            ...room.getMembersWithMembership("join"),
+            ...room.getMembersWithMembership("invite"),
+        ].map(m => m.userId).filter(m => m !== cli.getUserId());
+
+        if (toInvite.length > 0) {
+            // Errors are handled internally to this function
+            await inviteUsersToRoom(newRoomId, toInvite);
+        }
+    }
+
+    if (updateSpaces) {
+        const parents = SpaceStore.instance.getKnownParents(room.roomId);
+        try {
+            for (const parentId of parents) {
+                const parent = cli.getRoom(parentId);
+                if (!parent?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId())) continue;
+
+                const currentEv = parent.currentState.getStateEvents(EventType.SpaceChild, room.roomId);
+                await cli.sendStateEvent(parentId, EventType.SpaceChild, {
+                    ...(currentEv?.getContent() || {}), // copy existing attributes like suggested
+                    via: [cli.getDomain()],
+                }, newRoomId);
+                await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, room.roomId);
+            }
+        } catch (e) {
+            // These errors are not critical to the room upgrade itself
+            console.warn("Failed to update parent spaces during room upgrade", e);
+        }
+    }
+
+    spinnerModal.close();
+    return newRoomId;
+}
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 5fe653fed0..296c68fa09 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -1,31 +1,32 @@
+/*
+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 { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+
 import DMRoomMap from './DMRoomMap';
 
-/* For now, a cut-down type spec for the client */
-interface Client {
-    getUserId: () => string;
-    checkUserTrust: (userId: string) => {
-        isCrossSigningVerified: () => boolean
-        wasCrossSigningVerified: () => boolean
-    };
-    getStoredDevicesForUser: (userId: string) => [{ deviceId: string }];
-    checkDeviceTrust: (userId: string, deviceId: string) => {
-        isVerified: () => boolean
-    };
-}
-
-interface Room {
-    getEncryptionTargetMembers: () => Promise<[{userId: string}]>;
-    roomId: string;
-}
-
 export enum E2EStatus {
     Warning = "warning",
     Verified = "verified",
     Normal = "normal"
 }
 
-export async function shieldStatusForRoom(client: Client, room: Room): Promise<E2EStatus> {
-    const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
+export async function shieldStatusForRoom(client: MatrixClient, room: Room): Promise<E2EStatus> {
+    const members = (await room.getEncryptionTargetMembers()).map(({ userId }) => userId);
     const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
 
     const verified: string[] = [];
@@ -52,7 +53,7 @@ export async function shieldStatusForRoom(client: Client, room: Room): Promise<E
     const targets = includeUser ? [...verified, client.getUserId()] : verified;
     for (const userId of targets) {
         const devices = client.getStoredDevicesForUser(userId);
-        const anyDeviceNotVerified = devices.some(({deviceId}) => {
+        const anyDeviceNotVerified = devices.some(({ deviceId }) => {
             return !client.checkDeviceTrust(userId, deviceId).isVerified();
         });
         if (anyDeviceNotVerified) {
diff --git a/src/utils/Singleflight.ts b/src/utils/Singleflight.ts
index c2a564ea3e..07d82efa3e 100644
--- a/src/utils/Singleflight.ts
+++ b/src/utils/Singleflight.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {EnhancedMap} from "./maps";
+import { EnhancedMap } from "./maps";
 
 // Inspired by https://pkg.go.dev/golang.org/x/sync/singleflight
 
diff --git a/src/utils/StorageManager.ts b/src/utils/StorageManager.ts
index 883c032771..5a127a1fd2 100644
--- a/src/utils/StorageManager.ts
+++ b/src/utils/StorageManager.ts
@@ -14,10 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {LocalStorageCryptoStore} from 'matrix-js-sdk/src/crypto/store/localStorage-crypto-store';
+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";
+import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb";
+import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const localStorage = window.localStorage;
 
@@ -33,7 +35,7 @@ const SYNC_STORE_NAME = "riot-web-sync";
 const CRYPTO_STORE_NAME = "matrix-js-sdk:crypto";
 
 function log(msg: string) {
-    console.log(`StorageManager: ${msg}`);
+    logger.log(`StorageManager: ${msg}`);
 }
 
 function error(msg: string, ...args: string[]) {
@@ -47,15 +49,15 @@ function track(action: string) {
 export function tryPersistStorage() {
     if (navigator.storage && navigator.storage.persist) {
         navigator.storage.persist().then(persistent => {
-            console.log("StorageManager: Persistent?", persistent);
+            logger.log("StorageManager: Persistent?", persistent);
         });
     } else if (document.requestStorageAccess) { // Safari
         document.requestStorageAccess().then(
-            () => console.log("StorageManager: Persistent?", true),
-            () => console.log("StorageManager: Persistent?", false),
+            () => logger.log("StorageManager: Persistent?", true),
+            () => logger.log("StorageManager: Persistent?", false),
         );
     } else {
-        console.log("StorageManager: Persistence unsupported");
+        logger.log("StorageManager: Persistence unsupported");
     }
 }
 
diff --git a/src/utils/Timer.ts b/src/utils/Timer.ts
index 9760631d09..38703c1299 100644
--- a/src/utils/Timer.ts
+++ b/src/utils/Timer.ts
@@ -26,7 +26,7 @@ Once a timer is finished or aborted, it can't be started again
 a new one through `clone()` or `cloneIfRun()`.
 */
 export default class Timer {
-    private timerHandle: NodeJS.Timeout;
+    private timerHandle: number;
     private startTs: number;
     private promise: Promise<void>;
     private resolve: () => void;
@@ -57,7 +57,7 @@ export default class Timer {
             const delta = this.timeout - elapsed;
             this.timerHandle = setTimeout(this.onTimeout, delta);
         }
-    }
+    };
 
     changeTimeout(timeout: number) {
         if (timeout === this.timeout) {
diff --git a/src/utils/UrlUtils.js b/src/utils/UrlUtils.ts
similarity index 88%
rename from src/utils/UrlUtils.js
rename to src/utils/UrlUtils.ts
index 7b207c128e..6f441ff98e 100644
--- a/src/utils/UrlUtils.js
+++ b/src/utils/UrlUtils.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -22,7 +22,7 @@ import url from "url";
  * @param {string} u The url to be abbreviated
  * @returns {string} The abbreviated url
  */
-export function abbreviateUrl(u) {
+export function abbreviateUrl(u: string): string {
     if (!u) return '';
 
     const parsedUrl = url.parse(u);
@@ -37,7 +37,7 @@ export function abbreviateUrl(u) {
     return u;
 }
 
-export function unabbreviateUrl(u) {
+export function unabbreviateUrl(u: string): string {
     if (!u) return '';
 
     let longUrl = u;
diff --git a/src/utils/WellKnownUtils.ts b/src/utils/WellKnownUtils.ts
index 30759cafc1..59307d642e 100644
--- a/src/utils/WellKnownUtils.ts
+++ b/src/utils/WellKnownUtils.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 
 const CALL_BEHAVIOUR_WK_KEY = "io.element.call_behaviour";
 const E2EE_WK_KEY = "io.element.e2ee";
@@ -43,7 +43,7 @@ export function getE2EEWellKnown(): IE2EEWellKnown {
         return clientWellKnown[E2EE_WK_KEY];
     }
     if (clientWellKnown && clientWellKnown[E2EE_WK_KEY_DEPRECATED]) {
-        return clientWellKnown[E2EE_WK_KEY_DEPRECATED]
+        return clientWellKnown[E2EE_WK_KEY_DEPRECATED];
     }
     return null;
 }
diff --git a/src/utils/Whenable.ts b/src/utils/Whenable.ts
index 49f2571965..a83d7ca00c 100644
--- a/src/utils/Whenable.ts
+++ b/src/utils/Whenable.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 import { IDestroyable } from "./IDestroyable";
 import { arrayFastClone } from "./arrays";
 
@@ -36,7 +35,7 @@ export abstract class Whenable<T> implements IDestroyable {
      * @returns This.
      */
     public when(condition: T, fn: WhenFn<T>): Whenable<T> {
-        this.listeners.push({condition, fn});
+        this.listeners.push({ condition, fn });
         return this;
     }
 
@@ -59,7 +58,7 @@ export abstract class Whenable<T> implements IDestroyable {
      * @returns This.
      */
     public whenAnything(fn: WhenFn<T>): Whenable<T> {
-        this.listeners.push({condition: null, fn});
+        this.listeners.push({ condition: null, fn });
         return this;
     }
 
diff --git a/src/utils/WidgetUtils.ts b/src/utils/WidgetUtils.ts
index c67f3bad13..ea56f2a563 100644
--- a/src/utils/WidgetUtils.ts
+++ b/src/utils/WidgetUtils.ts
@@ -16,19 +16,20 @@ limitations under the License.
 */
 
 import * as url from "url";
+import { Capability, IWidget, IWidgetData, MatrixCapabilities } from "matrix-widget-api";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
 import dis from '../dispatcher/dispatcher';
 import WidgetEchoStore from '../stores/WidgetEchoStore';
 import SettingsStore from "../settings/SettingsStore";
-import {IntegrationManagers} from "../integrations/IntegrationManagers";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {WidgetType} from "../widgets/WidgetType";
-import {objectClone} from "./objects";
-import {_t} from "../languageHandler";
-import {Capability, IWidget, IWidgetData, MatrixCapabilities} from "matrix-widget-api";
-import {IApp} from "../stores/WidgetStore";
+import { IntegrationManagers } from "../integrations/IntegrationManagers";
+import { WidgetType } from "../widgets/WidgetType";
+import { objectClone } from "./objects";
+import { _t } from "../languageHandler";
+import { IApp } from "../stores/WidgetStore";
 
 // How long we wait for the state event echo to come back from the server
 // before waitFor[Room/User]Widget rejects its promise
@@ -377,28 +378,28 @@ export default class WidgetUtils {
         return widgets.filter(w => w.content && w.content.type === "m.integration_manager");
     }
 
-    static getRoomWidgetsOfType(room: Room, type: WidgetType): IWidgetEvent[] {
-        const widgets = WidgetUtils.getRoomWidgets(room);
-        return (widgets || []).filter(w => {
+    static getRoomWidgetsOfType(room: Room, type: WidgetType): MatrixEvent[] {
+        const widgets = WidgetUtils.getRoomWidgets(room) || [];
+        return widgets.filter(w => {
             const content = w.getContent();
             return content.url && type.matches(content.type);
         });
     }
 
-    static removeIntegrationManagerWidgets(): Promise<void> {
+    static async removeIntegrationManagerWidgets(): Promise<void> {
         const client = MatrixClientPeg.get();
         if (!client) {
             throw new Error('User not logged in');
         }
         const widgets = client.getAccountData('m.widgets');
         if (!widgets) return;
-        const userWidgets: IWidgetEvent[] = widgets.getContent() || {};
+        const userWidgets: Record<string, IWidgetEvent> = widgets.getContent() || {};
         Object.entries(userWidgets).forEach(([key, widget]) => {
             if (widget.content && widget.content.type === "m.integration_manager") {
                 delete userWidgets[key];
             }
         });
-        return client.setAccountData('m.widgets', userWidgets);
+        await client.setAccountData('m.widgets', userWidgets);
     }
 
     static addIntegrationManagerWidget(name: string, uiUrl: string, apiUrl: string): Promise<void> {
@@ -406,8 +407,8 @@ export default class WidgetUtils {
             "integration_manager_" + (new Date().getTime()),
             WidgetType.INTEGRATION_MANAGER,
             uiUrl,
-            "Integration Manager: " + name,
-            {"api_url": apiUrl},
+            "Integration manager: " + name,
+            { "api_url": apiUrl },
         );
     }
 
@@ -415,7 +416,7 @@ export default class WidgetUtils {
      * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
      * @return {Promise} Resolves on account data updated
      */
-    static removeStickerpickerWidgets(): Promise<void> {
+    static async removeStickerpickerWidgets(): Promise<void> {
         const client = MatrixClientPeg.get();
         if (!client) {
             throw new Error('User not logged in');
@@ -428,7 +429,7 @@ export default class WidgetUtils {
                 delete userWidgets[key];
             }
         });
-        return client.setAccountData('m.widgets', userWidgets);
+        await client.setAccountData('m.widgets', userWidgets);
     }
 
     static makeAppConfig(
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index e527f43c29..3f9dcbc34b 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {percentageOf, percentageWithin} from "./numbers";
+import { percentageOf, percentageWithin } from "./numbers";
 
 /**
  * Quickly resample an array to have less/more data points. If an input which is larger
@@ -112,11 +112,9 @@ export function arrayRescale(input: number[], newMin: number, newMax: number): n
  * @returns {T[]} The array.
  */
 export function arraySeed<T>(val: T, length: number): T[] {
-    const a: T[] = [];
-    for (let i = 0; i < length; i++) {
-        a.push(val);
-    }
-    return a;
+    // Size the array up front for performance, and use `fill` to let the browser
+    // optimize the operation better than we can with a `for` loop, if it wants.
+    return new Array<T>(length).fill(val);
 }
 
 /**
@@ -223,6 +221,21 @@ export function arrayMerge<T>(...a: T[][]): T[] {
     }, new Set<T>()));
 }
 
+/**
+ * Moves a single element from fromIndex to toIndex.
+ * @param {array} list the list from which to construct the new list.
+ * @param {number} fromIndex the index of the element to move.
+ * @param {number} toIndex the index of where to put the element.
+ * @returns {array} A new array with the requested value moved.
+ */
+export function moveElement<T>(list: T[], fromIndex: number, toIndex: number): T[] {
+    const result = Array.from(list);
+    const [removed] = result.splice(fromIndex, 1);
+    result.splice(toIndex, 0, removed);
+
+    return result;
+}
+
 /**
  * Helper functions to perform LINQ-like queries on arrays.
  */
diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.ts
similarity index 66%
rename from src/utils/createMatrixClient.js
rename to src/utils/createMatrixClient.ts
index f5e196d846..0cce729e65 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.ts
@@ -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.
@@ -14,10 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-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";
+// @ts-ignore - `.ts` is needed here to make TS happy
+import IndexedDBWorker from "../workers/indexeddb.worker.ts";
+import { createClient, ICreateClientOpts } 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;
 
@@ -35,14 +37,10 @@ try {
  * @param {Object} opts  options to pass to Matrix.createClient. This will be
  *    extended with `sessionStore` and `store` members.
  *
- * @property {string} indexedDbWorkerScript  Optional URL for a web worker script
- *    for IndexedDB store operations. By default, indexeddb ops are done on
- *    the main thread.
- *
  * @returns {MatrixClient} the newly-created MatrixClient
  */
-export default function createMatrixClient(opts) {
-    const storeOpts = {
+export default function createMatrixClient(opts: ICreateClientOpts) {
+    const storeOpts: Partial<ICreateClientOpts> = {
         useAuthorizationHeader: true,
     };
 
@@ -51,7 +49,7 @@ export default function createMatrixClient(opts) {
             indexedDB: indexedDB,
             dbName: "riot-web-sync",
             localStorage: localStorage,
-            workerScript: createMatrixClient.indexedDbWorkerScript,
+            workerFactory: () => new IndexedDBWorker(),
         });
     }
 
@@ -65,9 +63,8 @@ export default function createMatrixClient(opts) {
         );
     }
 
-    opts = Object.assign(storeOpts, opts);
-
-    return createClient(opts);
+    return createClient({
+        ...storeOpts,
+        ...opts,
+    });
 }
-
-createMatrixClient.indexedDbWorkerScript = null;
diff --git a/src/utils/drawable.ts b/src/utils/drawable.ts
new file mode 100644
index 0000000000..31f7bc8cec
--- /dev/null
+++ b/src/utils/drawable.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 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.
+*/
+
+/**
+ * Fetch an image using the best available method based on browser compatibility
+ * @param url the URL of the image to fetch
+ * @returns a canvas drawable object
+ */
+export async function getDrawable(url: string): Promise<CanvasImageSource> {
+    if ('createImageBitmap' in window) {
+        const response = await fetch(url);
+        const blob = await response.blob();
+        return await createImageBitmap(blob);
+    } else {
+        return new Promise<HTMLImageElement>((resolve, reject) => {
+            const img = document.createElement("img");
+            img.crossOrigin = "anonymous";
+            img.onload = () => resolve(img);
+            img.onerror = (e) => reject(e);
+            img.src = url;
+        });
+    }
+}
diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts
new file mode 100644
index 0000000000..db28508c68
--- /dev/null
+++ b/src/utils/exportUtils/Exporter.ts
@@ -0,0 +1,267 @@
+/*
+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 { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import { IExportOptions, ExportType } from "./exportUtils";
+import { decryptFile } from "../DecryptFile";
+import { mediaFromContent } from "../../customisations/Media";
+import { formatFullDateNoDay } from "../../DateUtils";
+import { isVoiceMessage } from "../EventUtils";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Direction } from "matrix-js-sdk/src/models/event-timeline";
+import { IMediaEventContent } from "../../customisations/models/IMediaEventContent";
+import { saveAs } from "file-saver";
+import { _t } from "../../languageHandler";
+import SdkConfig from "../../SdkConfig";
+
+type BlobFile = {
+    name: string;
+    blob: Blob;
+};
+
+export default abstract class Exporter {
+    protected files: BlobFile[] = [];
+    protected client: MatrixClient;
+    protected cancelled = false;
+
+    protected constructor(
+        protected room: Room,
+        protected exportType: ExportType,
+        protected exportOptions: IExportOptions,
+        protected setProgressText: React.Dispatch<React.SetStateAction<string>>,
+    ) {
+        if (exportOptions.maxSize < 1 * 1024 * 1024|| // Less than 1 MB
+            exportOptions.maxSize > 2000 * 1024 * 1024|| // More than ~ 2 GB
+            exportOptions.numberOfMessages > 10**8
+        ) {
+            throw new Error("Invalid export options");
+        }
+        this.client = MatrixClientPeg.get();
+        window.addEventListener("beforeunload", this.onBeforeUnload);
+    }
+
+    protected onBeforeUnload(e: BeforeUnloadEvent): string {
+        e.preventDefault();
+        return e.returnValue = _t("Are you sure you want to exit during this export?");
+    }
+
+    protected updateProgress(progress: string, log = true, show = true): void {
+        if (log) console.log(progress);
+        if (show) this.setProgressText(progress);
+    }
+
+    protected addFile(filePath: string, blob: Blob): void {
+        const file = {
+            name: filePath,
+            blob,
+        };
+        this.files.push(file);
+    }
+
+    protected async downloadZIP(): Promise<string | void> {
+        const brand = SdkConfig.get().brand;
+        const filename = `${brand} - Chat Export - ${formatFullDateNoDay(new Date())}.zip`;
+        const { default: JSZip } = await import('jszip');
+
+        const zip = new JSZip();
+        // Create a writable stream to the directory
+        if (!this.cancelled) this.updateProgress("Generating a ZIP");
+        else return this.cleanUp();
+
+        for (const file of this.files) zip.file(file.name, file.blob);
+
+        const content = await zip.generateAsync({ type: "blob" });
+
+        saveAs(content, filename);
+    }
+
+    protected cleanUp(): string {
+        console.log("Cleaning up...");
+        window.removeEventListener("beforeunload", this.onBeforeUnload);
+        return "";
+    }
+
+    public async cancelExport(): Promise<void> {
+        console.log("Cancelling export...");
+        this.cancelled = true;
+    }
+
+    protected downloadPlainText(fileName: string, text: string) {
+        const content = new Blob([text], { type: "text" });
+        saveAs(content, fileName);
+    }
+
+    protected setEventMetadata(event: MatrixEvent): MatrixEvent {
+        const roomState = this.client.getRoom(this.room.roomId).currentState;
+        event.sender = roomState.getSentinelMember(
+            event.getSender(),
+        );
+        if (event.getType() === "m.room.member") {
+            event.target = roomState.getSentinelMember(
+                event.getStateKey(),
+            );
+        }
+        return event;
+    }
+
+    public getLimit(): number {
+        let limit: number;
+        switch (this.exportType) {
+            case ExportType.LastNMessages:
+                limit = this.exportOptions.numberOfMessages;
+                break;
+            case ExportType.Timeline:
+                limit = 40;
+                break;
+            default:
+                limit = 10**8;
+        }
+        return limit;
+    }
+
+    protected async getRequiredEvents(): Promise<MatrixEvent[]> {
+        const eventMapper = this.client.getEventMapper();
+
+        let prevToken: string|null = null;
+        let limit = this.getLimit();
+        const events: MatrixEvent[] = [];
+
+        while (limit) {
+            const eventsPerCrawl = Math.min(limit, 1000);
+            const res = await this.client.createMessagesRequest(
+                this.room.roomId,
+                prevToken,
+                eventsPerCrawl,
+                Direction.Backward,
+            );
+
+            if (this.cancelled) {
+                this.cleanUp();
+                return [];
+            }
+
+            if (res.chunk.length === 0) break;
+
+            limit -= res.chunk.length;
+
+            const matrixEvents: MatrixEvent[] = res.chunk.map(eventMapper);
+
+            for (const mxEv of matrixEvents) {
+                // if (this.exportOptions.startDate && mxEv.getTs() < this.exportOptions.startDate) {
+                //     // Once the last message received is older than the start date, we break out of both the loops
+                //     limit = 0;
+                //     break;
+                // }
+                events.push(mxEv);
+            }
+            this.updateProgress(
+                ("Fetched " + events.length + " events ") + (this.exportType === ExportType.LastNMessages
+                    ? `out of ${this.exportOptions.numberOfMessages}`
+                    : "so far"),
+            );
+            prevToken = res.end;
+        }
+        // Reverse the events so that we preserve the order
+        for (let i = 0; i < Math.floor(events.length/2); i++) {
+            [events[i], events[events.length - i - 1]] = [events[events.length - i - 1], events[i]];
+        }
+
+        const decryptionPromises = events
+            .filter(event => event.isEncrypted())
+            .map(event => {
+                return this.client.decryptEventIfNeeded(event, {
+                    isRetry: true,
+                    emit: false,
+                });
+            });
+
+        // Wait for all the events to get decrypted.
+        await Promise.all(decryptionPromises);
+
+        for (let i = 0; i < events.length; i++) this.setEventMetadata(events[i]);
+
+        return events;
+    }
+
+    protected async getMediaBlob(event: MatrixEvent): Promise<Blob> {
+        let blob: Blob;
+        try {
+            const isEncrypted = event.isEncrypted();
+            const content: IMediaEventContent = event.getContent();
+            const shouldDecrypt = isEncrypted && content.hasOwnProperty("file") && event.getType() !== "m.sticker";
+            if (shouldDecrypt) {
+                blob = await decryptFile(content.file);
+            } else {
+                const media = mediaFromContent(content);
+                const image = await fetch(media.srcHttp);
+                blob = await image.blob();
+            }
+        } catch (err) {
+            console.log("Error decrypting media");
+        }
+        return blob;
+    }
+
+    public splitFileName(file: string): string[] {
+        const lastDot = file.lastIndexOf('.');
+        if (lastDot === -1) return [file, ""];
+        const fileName = file.slice(0, lastDot);
+        const ext = file.slice(lastDot + 1);
+        return [fileName, '.' + ext];
+    }
+
+    public getFilePath(event: MatrixEvent): string {
+        const mediaType = event.getContent().msgtype;
+        let fileDirectory: string;
+        switch (mediaType) {
+            case "m.image":
+                fileDirectory = "images";
+                break;
+            case "m.video":
+                fileDirectory = "videos";
+                break;
+            case "m.audio":
+                fileDirectory = "audio";
+                break;
+            default:
+                fileDirectory = event.getType() === "m.sticker" ? "stickers" : "files";
+        }
+        const fileDate = formatFullDateNoDay(new Date(event.getTs()));
+        let [fileName, fileExt] = this.splitFileName(event.getContent().body);
+
+        if (event.getType() === "m.sticker") fileExt = ".png";
+        if (isVoiceMessage(event)) fileExt = ".ogg";
+
+        return fileDirectory + "/" + fileName + '-' + fileDate + fileExt;
+    }
+
+    protected isReply(event: MatrixEvent): boolean {
+        const isEncrypted = event.isEncrypted();
+        // If encrypted, in_reply_to lies in event.event.content
+        const content = isEncrypted ? event.event.content : event.getContent();
+        const relatesTo = content["m.relates_to"];
+        return !!(relatesTo && relatesTo["m.in_reply_to"]);
+    }
+
+    protected isAttachment(mxEv: MatrixEvent): boolean {
+        const attachmentTypes = ["m.sticker", "m.image", "m.file", "m.video", "m.audio"];
+        return mxEv.getType() === attachmentTypes[0] || attachmentTypes.includes(mxEv.getContent().msgtype);
+    }
+
+    abstract export(): Promise<void>;
+}
diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx
new file mode 100644
index 0000000000..5f8413fad8
--- /dev/null
+++ b/src/utils/exportUtils/HtmlExport.tsx
@@ -0,0 +1,442 @@
+/*
+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 from "react";
+import ReactDOM from "react-dom";
+import Exporter from "./Exporter";
+import { mediaFromMxc } from "../../customisations/Media";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { renderToStaticMarkup } from "react-dom/server";
+import { Layout } from "../../settings/Layout";
+import { shouldFormContinuation } from "../../components/structures/MessagePanel";
+import { formatFullDateNoDayNoTime, wantsDateSeparator } from "../../DateUtils";
+import { RoomPermalinkCreator } from "../permalinks/Permalinks";
+import { _t } from "../../languageHandler";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import * as Avatar from "../../Avatar";
+import EventTile, { haveTileForEvent } from "../../components/views/rooms/EventTile";
+import DateSeparator from "../../components/views/messages/DateSeparator";
+import BaseAvatar from "../../components/views/avatars/BaseAvatar";
+import exportJS from "!!raw-loader!./exportJS";
+import { ExportType } from "./exportUtils";
+import { IExportOptions } from "./exportUtils";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import getExportCSS from "./exportCSS";
+import { textForEvent } from "../../TextForEvent";
+
+export default class HTMLExporter extends Exporter {
+    protected avatars: Map<string, boolean>;
+    protected permalinkCreator: RoomPermalinkCreator;
+    protected totalSize: number;
+    protected mediaOmitText: string;
+
+    constructor(
+        room: Room,
+        exportType: ExportType,
+        exportOptions: IExportOptions,
+        setProgressText: React.Dispatch<React.SetStateAction<string>>,
+    ) {
+        super(room, exportType, exportOptions, setProgressText);
+        this.avatars = new Map<string, boolean>();
+        this.permalinkCreator = new RoomPermalinkCreator(this.room);
+        this.totalSize = 0;
+        this.mediaOmitText = !this.exportOptions.attachmentsIncluded
+            ? _t("Media omitted")
+            : _t("Media omitted - file size limit exceeded");
+    }
+
+    protected async getRoomAvatar() {
+        let blob: Blob;
+        const avatarUrl = Avatar.avatarUrlForRoom(this.room, 32, 32, "crop");
+        const avatarPath = "room.png";
+        if (avatarUrl) {
+            try {
+                const image = await fetch(avatarUrl);
+                blob = await image.blob();
+                this.totalSize += blob.size;
+                this.addFile(avatarPath, blob);
+            } catch (err) {
+                console.log("Failed to fetch room's avatar" + err);
+            }
+        }
+        const avatar = (
+            <BaseAvatar
+                width={32}
+                height={32}
+                name={this.room.name}
+                title={this.room.name}
+                url={blob ? avatarPath : null}
+                resizeMethod="crop"
+            />
+        );
+        return renderToStaticMarkup(avatar);
+    }
+
+    protected async wrapHTML(content: string) {
+        const roomAvatar = await this.getRoomAvatar();
+        const exportDate = formatFullDateNoDayNoTime(new Date());
+        const creator = this.room.currentState.getStateEvents(EventType.RoomCreate, "")?.getSender();
+        const creatorName = this.room?.getMember(creator)?.rawDisplayName || creator;
+        const exporter = this.client.getUserId();
+        const exporterName = this.room?.getMember(exporter)?.rawDisplayName;
+        const topic = this.room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic || "";
+        const createdText = _t("%(creatorName)s created this room.", {
+            creatorName,
+        });
+
+        const exportedText = renderToStaticMarkup(
+            <p>
+                { _t(
+                    "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.",
+                    {
+                        exportDate,
+                    },
+                    {
+                        roomName: () => <b>{ this.room.name }</b>,
+                        exporterDetails: () => (
+                            <a
+                                href={`https://matrix.to/#/${exporter}`}
+                                target="_blank"
+                                rel="noopener noreferrer"
+                            >
+                                { exporterName ? (
+                                    <>
+                                        <b>{ exporterName }</b>
+                                        { " (" + exporter + ")" }
+                                    </>
+                                ) : (
+                                    <b>{ exporter }</b>
+                                ) }
+                            </a>
+                        ),
+                    },
+                ) }
+            </p>,
+        );
+
+        const topicText = topic ? _t("Topic: %(topic)s", { topic }) : "";
+
+        return `
+          <!DOCTYPE html>
+            <html lang="en">
+            <head>
+                <meta charset="UTF-8" />
+                <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <link href="css/style.css" rel="stylesheet" />
+                <script src="js/script.js"></script>
+                <title>Exported Data</title>
+            </head>
+            <body style="height: 100vh;">
+                <section
+                id="matrixchat"
+                style="height: 100%; overflow: auto"
+                class="notranslate"
+                >
+                <div class="mx_MatrixChat_wrapper" aria-hidden="false">
+                    <div class="mx_MatrixChat">
+                    <main class="mx_RoomView">
+                        <div class="mx_RoomHeader light-panel">
+                        <div class="mx_RoomHeader_wrapper" aria-owns="mx_RightPanel">
+                            <div class="mx_RoomHeader_avatar">
+                            <div class="mx_DecoratedRoomAvatar">
+                               ${roomAvatar}
+                            </div>
+                            </div>
+                            <div class="mx_RoomHeader_name">
+                            <div
+                                dir="auto"
+                                class="mx_RoomHeader_nametext"
+                                title="${this.room.name}"
+                            >
+                                ${this.room.name}
+                            </div>
+                            </div>
+                            <div class="mx_RoomHeader_topic" dir="auto"> ${topic} </div>
+                        </div>
+                        </div>
+                        <div class="mx_MainSplit">
+                        <div class="mx_RoomView_body">
+                            <div
+                            class="mx_RoomView_timeline mx_RoomView_timeline_rr_enabled"
+                            >
+                            <div
+                                class="
+                                mx_AutoHideScrollbar
+                                mx_ScrollPanel
+                                mx_RoomView_messagePanel
+                                mx_GroupLayout
+                                "
+                            >
+                                <div class="mx_RoomView_messageListWrapper">
+                                <ol
+                                    class="mx_RoomView_MessageList"
+                                    aria-live="polite"
+                                    role="list"
+                                >
+                                <div class="mx_NewRoomIntro">
+                                    ${roomAvatar}
+                                    <h2> ${this.room.name} </h2>
+                                    <p> ${createdText} <br/><br/> ${exportedText} </p>
+                                    <br/>
+                                    <p> ${topicText} </p>
+                                </div>
+                                ${content}
+                                </ol>
+                                </div>
+                            </div>
+                            </div>
+                            <div class="mx_RoomView_statusArea">
+                            <div class="mx_RoomView_statusAreaBox">
+                                <div class="mx_RoomView_statusAreaBox_line"></div>
+                            </div>
+                            </div>
+                        </div>
+                        </div>
+                    </main>
+                    </div>
+                </div>
+                </section>
+                <div id="snackbar"/>
+            </body>
+        </html>`;
+    }
+
+    protected getAvatarURL(event: MatrixEvent): string {
+        const member = event.sender;
+        return (
+            member.getMxcAvatarUrl() &&
+            mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
+                30,
+                30,
+                "crop",
+            )
+        );
+    }
+
+    protected async saveAvatarIfNeeded(event: MatrixEvent) {
+        const member = event.sender;
+        if (!this.avatars.has(member.userId)) {
+            try {
+                const avatarUrl = this.getAvatarURL(event);
+                this.avatars.set(member.userId, true);
+                const image = await fetch(avatarUrl);
+                const blob = await image.blob();
+                this.addFile(`users/${member.userId.replace(/:/g, '-')}.png`, blob);
+            } catch (err) {
+                console.log("Failed to fetch user's avatar" + err);
+            }
+        }
+    }
+
+    protected getDateSeparator(event: MatrixEvent) {
+        const ts = event.getTs();
+        const dateSeparator = <li key={ts}><DateSeparator forExport={true} key={ts} ts={ts} /></li>;
+        return renderToStaticMarkup(dateSeparator);
+    }
+
+    protected needsDateSeparator(event: MatrixEvent, prevEvent: MatrixEvent) {
+        if (prevEvent == null) return true;
+        return wantsDateSeparator(prevEvent.getDate(), event.getDate());
+    }
+
+    public getEventTile(mxEv: MatrixEvent, continuation: boolean) {
+        return <div className="mx_Export_EventWrapper" id={mxEv.getId()}>
+            <MatrixClientContext.Provider value={this.client}>
+                <EventTile
+                    mxEvent={mxEv}
+                    continuation={continuation}
+                    isRedacted={mxEv.isRedacted()}
+                    replacingEventId={mxEv.replacingEventId()}
+                    forExport={true}
+                    readReceipts={null}
+                    alwaysShowTimestamps={true}
+                    readReceiptMap={null}
+                    showUrlPreview={false}
+                    checkUnmounting={() => false}
+                    isTwelveHour={false}
+                    last={false}
+                    lastInSection={false}
+                    permalinkCreator={this.permalinkCreator}
+                    lastSuccessful={false}
+                    isSelectedEvent={false}
+                    getRelationsForEvent={null}
+                    showReactions={false}
+                    layout={Layout.Group}
+                    enableFlair={false}
+                    showReadReceipts={false}
+                />
+            </MatrixClientContext.Provider>
+        </div>;
+    }
+
+    protected async getEventTileMarkup(mxEv: MatrixEvent, continuation: boolean, filePath?: string) {
+        const hasAvatar = !!this.getAvatarURL(mxEv);
+        if (hasAvatar) await this.saveAvatarIfNeeded(mxEv);
+        const EventTile = this.getEventTile(mxEv, continuation);
+        let eventTileMarkup: string;
+
+        if (
+            mxEv.getContent().msgtype == MsgType.Emote ||
+            mxEv.getContent().msgtype == MsgType.Notice ||
+            mxEv.getContent().msgtype === MsgType.Text
+        ) {
+            // to linkify textual events, we'll need lifecycle methods which won't be invoked in renderToString
+            // So, we'll have to render the component into a temporary root element
+            const tempRoot = document.createElement('div');
+            ReactDOM.render(
+                EventTile,
+                tempRoot,
+            );
+            eventTileMarkup = tempRoot.innerHTML;
+        } else {
+            eventTileMarkup = renderToStaticMarkup(EventTile);
+        }
+
+        if (filePath) {
+            const mxc = mxEv.getContent().url || mxEv.getContent().file?.url;
+            eventTileMarkup = eventTileMarkup.split(mxc).join(filePath);
+        }
+        eventTileMarkup = eventTileMarkup.replace(/<span class="mx_MFileBody_info_icon".*?>.*?<\/span>/, '');
+        if (hasAvatar) {
+            eventTileMarkup = eventTileMarkup.replace(
+                encodeURI(this.getAvatarURL(mxEv)).replace(/&/g, '&amp;'),
+                `users/${mxEv.sender.userId.replace(/:/g, "-")}.png`,
+            );
+        }
+        return eventTileMarkup;
+    }
+
+    protected createModifiedEvent(text: string, mxEv: MatrixEvent, italic=true) {
+        const modifiedContent = {
+            msgtype: "m.text",
+            body: `${text}`,
+            format: "org.matrix.custom.html",
+            formatted_body: `${text}`,
+        };
+        if (italic) {
+            modifiedContent.formatted_body = '<em>' + modifiedContent.formatted_body + '</em>';
+            modifiedContent.body = '*' + modifiedContent.body + '*';
+        }
+        const modifiedEvent = new MatrixEvent();
+        modifiedEvent.event = mxEv.event;
+        modifiedEvent.sender = mxEv.sender;
+        modifiedEvent.event.type = "m.room.message";
+        modifiedEvent.event.content = modifiedContent;
+        return modifiedEvent;
+    }
+
+    protected async createMessageBody(mxEv: MatrixEvent, joined = false) {
+        let eventTile: string;
+        try {
+            if (this.isAttachment(mxEv)) {
+                if (this.exportOptions.attachmentsIncluded) {
+                    try {
+                        const blob = await this.getMediaBlob(mxEv);
+                        if (this.totalSize + blob.size > this.exportOptions.maxSize) {
+                            eventTile = await this.getEventTileMarkup(
+                                this.createModifiedEvent(this.mediaOmitText, mxEv),
+                                joined,
+                            );
+                        } else {
+                            this.totalSize += blob.size;
+                            const filePath = this.getFilePath(mxEv);
+                            eventTile = await this.getEventTileMarkup(mxEv, joined, filePath);
+                            if (this.totalSize == this.exportOptions.maxSize) {
+                                this.exportOptions.attachmentsIncluded = false;
+                            }
+                            this.addFile(filePath, blob);
+                        }
+                    } catch (e) {
+                        console.log("Error while fetching file" + e);
+                        eventTile = await this.getEventTileMarkup(
+                            this.createModifiedEvent(_t("Error fetching file"), mxEv),
+                            joined,
+                        );
+                    }
+                } else {
+                    eventTile = await this.getEventTileMarkup(
+                        this.createModifiedEvent(this.mediaOmitText, mxEv),
+                        joined,
+                    );
+                }
+            } else eventTile = await this.getEventTileMarkup(mxEv, joined);
+        } catch (e) {
+            // TODO: Handle callEvent errors
+            console.error(e);
+            eventTile = await this.getEventTileMarkup(
+                this.createModifiedEvent(textForEvent(mxEv), mxEv, false),
+                joined,
+            );
+        }
+
+        return eventTile;
+    }
+
+    protected async createHTML(events: MatrixEvent[], start: number) {
+        let content = "";
+        let prevEvent = null;
+        for (let i = start; i < Math.min(start + 1000, events.length); i++) {
+            const event = events[i];
+            this.updateProgress(`Processing event ${i + 1} out of ${events.length}`, false, true);
+            if (this.cancelled) return this.cleanUp();
+            if (!haveTileForEvent(event)) continue;
+
+            content += this.needsDateSeparator(event, prevEvent) ? this.getDateSeparator(event) : "";
+            const shouldBeJoined = !this.needsDateSeparator(event, prevEvent)
+                                       && shouldFormContinuation(prevEvent, event, false);
+            const body = await this.createMessageBody(event, shouldBeJoined);
+            this.totalSize += Buffer.byteLength(body);
+            content += body;
+            prevEvent = event;
+        }
+        return await this.wrapHTML(content);
+    }
+
+    public async export() {
+        this.updateProgress("Starting export...");
+
+        const fetchStart = performance.now();
+        const res = await this.getRequiredEvents();
+        const fetchEnd = performance.now();
+
+        this.updateProgress(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`, true, false);
+
+        this.updateProgress("Creating HTML...");
+        for (let page = 0; page < res.length / 1000; page++) {
+            const html = await this.createHTML(res, page * 1000);
+            this.addFile(`messages${page ? page + 1 : ""}.html`, new Blob([html]));
+        }
+        const exportCSS = await getExportCSS();
+        this.addFile("css/style.css", new Blob([exportCSS]));
+        this.addFile("js/script.js", new Blob([exportJS]));
+
+        await this.downloadZIP();
+
+        const exportEnd = performance.now();
+
+        if (this.cancelled) {
+            console.info("Export cancelled successfully");
+        } else {
+            this.updateProgress("Export successful!");
+            this.updateProgress(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`);
+        }
+
+        this.cleanUp();
+    }
+}
+
diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts
new file mode 100644
index 0000000000..4d862e69e3
--- /dev/null
+++ b/src/utils/exportUtils/JSONExport.ts
@@ -0,0 +1,122 @@
+/*
+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 Exporter from "./Exporter";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { formatFullDateNoDay, formatFullDateNoDayNoTime } from "../../DateUtils";
+import { haveTileForEvent } from "../../components/views/rooms/EventTile";
+import { ExportType } from "./exportUtils";
+import { IExportOptions } from "./exportUtils";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+export default class JSONExporter extends Exporter {
+    protected totalSize = 0;
+    protected messages: Record<string, any>[] = [];
+
+    constructor(
+        room: Room,
+        exportType: ExportType,
+        exportOptions: IExportOptions,
+        setProgressText: React.Dispatch<React.SetStateAction<string>>,
+    ) {
+        super(room, exportType, exportOptions, setProgressText);
+    }
+
+    protected createJSONString(): string {
+        const exportDate = formatFullDateNoDayNoTime(new Date());
+        const creator = this.room.currentState.getStateEvents(EventType.RoomCreate, "")?.getSender();
+        const creatorName = this.room?.getMember(creator)?.rawDisplayName || creator;
+        const topic = this.room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic || "";
+        const exporter = this.client.getUserId();
+        const exporterName = this.room?.getMember(exporter)?.rawDisplayName || exporter;
+        const jsonObject = {
+            room_name: this.room.name,
+            room_creator: creatorName,
+            topic,
+            export_date: exportDate,
+            exported_by: exporterName,
+            messages: this.messages,
+        };
+        return JSON.stringify(jsonObject, null, 2);
+    }
+
+    protected async getJSONString(mxEv: MatrixEvent) {
+        if (this.exportOptions.attachmentsIncluded && this.isAttachment(mxEv)) {
+            try {
+                const blob = await this.getMediaBlob(mxEv);
+                if (this.totalSize + blob.size < this.exportOptions.maxSize) {
+                    this.totalSize += blob.size;
+                    const filePath = this.getFilePath(mxEv);
+                    if (this.totalSize == this.exportOptions.maxSize) {
+                        this.exportOptions.attachmentsIncluded = false;
+                    }
+                    this.addFile(filePath, blob);
+                }
+            } catch (err) {
+                console.log("Error fetching file: " + err);
+            }
+        }
+        const jsonEvent: any = mxEv.toJSON();
+        const clearEvent = mxEv.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+        return clearEvent;
+    }
+
+    protected async createOutput(events: MatrixEvent[]) {
+        for (let i = 0; i < events.length; i++) {
+            const event = events[i];
+            this.updateProgress(`Processing event ${i + 1} out of ${events.length}`, false, true);
+            if (this.cancelled) return this.cleanUp();
+            if (!haveTileForEvent(event)) continue;
+            this.messages.push(await this.getJSONString(event));
+        }
+        return this.createJSONString();
+    }
+
+    public async export() {
+        console.info("Starting export process...");
+        console.info("Fetching events...");
+
+        const fetchStart = performance.now();
+        const res = await this.getRequiredEvents();
+        const fetchEnd = performance.now();
+
+        console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`);
+
+        console.info("Creating output...");
+        const text = await this.createOutput(res);
+
+        if (this.files.length) {
+            this.addFile("export.json", new Blob([text]));
+            await this.downloadZIP();
+        } else {
+            const fileName = `matrix-export-${formatFullDateNoDay(new Date())}.json`;
+            this.downloadPlainText(fileName, text);
+        }
+
+        const exportEnd = performance.now();
+
+        if (this.cancelled) {
+            console.info("Export cancelled successfully");
+        } else {
+            console.info("Export successful!");
+            console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`);
+        }
+
+        this.cleanUp();
+    }
+}
+
diff --git a/src/utils/exportUtils/PlainTextExport.ts b/src/utils/exportUtils/PlainTextExport.ts
new file mode 100644
index 0000000000..8e3ba81c4e
--- /dev/null
+++ b/src/utils/exportUtils/PlainTextExport.ts
@@ -0,0 +1,151 @@
+/*
+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 Exporter from "./Exporter";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { formatFullDateNoDay } from "../../DateUtils";
+import { _t } from "../../languageHandler";
+import { haveTileForEvent } from "../../components/views/rooms/EventTile";
+import { ExportType } from "./exportUtils";
+import { IExportOptions } from "./exportUtils";
+import { textForEvent } from "../../TextForEvent";
+
+export default class PlainTextExporter extends Exporter {
+    protected totalSize: number;
+    protected mediaOmitText: string;
+
+    constructor(
+        room: Room,
+        exportType: ExportType,
+        exportOptions: IExportOptions,
+        setProgressText: React.Dispatch<React.SetStateAction<string>>,
+    ) {
+        super(room, exportType, exportOptions, setProgressText);
+        this.totalSize = 0;
+        this.mediaOmitText = !this.exportOptions.attachmentsIncluded
+            ? _t("Media omitted")
+            : _t("Media omitted - file size limit exceeded");
+    }
+
+    public textForReplyEvent = (content: IContent) => {
+        const REPLY_REGEX = /> <(.*?)>(.*?)\n\n(.*)/s;
+        const REPLY_SOURCE_MAX_LENGTH = 32;
+
+        const match = REPLY_REGEX.exec(content.body);
+
+        // if the reply format is invalid, then return the body
+        if (!match) return content.body;
+
+        let rplSource: string;
+        const rplName = match[1];
+        const rplText = match[3];
+
+        rplSource = match[2].substring(1);
+        // Get the first non-blank line from the source.
+        const lines = rplSource.split('\n').filter((line) => !/^\s*$/.test(line));
+        if (lines.length > 0) {
+            // Cut to a maximum length.
+            rplSource = lines[0].substring(0, REPLY_SOURCE_MAX_LENGTH);
+            // Ellipsis if needed.
+            if (lines[0].length > REPLY_SOURCE_MAX_LENGTH) {
+                rplSource = rplSource + "...";
+            }
+            // Wrap in formatting
+            rplSource = ` "${rplSource}"`;
+        } else {
+            // Don't show a source because we couldn't format one.
+            rplSource = "";
+        }
+
+        return `<${rplName}${rplSource}> ${rplText}`;
+    };
+
+    protected plainTextForEvent = async (mxEv: MatrixEvent) => {
+        const senderDisplayName = mxEv.sender && mxEv.sender.name ? mxEv.sender.name : mxEv.getSender();
+        let mediaText = "";
+        if (this.isAttachment(mxEv)) {
+            if (this.exportOptions.attachmentsIncluded) {
+                try {
+                    const blob = await this.getMediaBlob(mxEv);
+                    if (this.totalSize + blob.size > this.exportOptions.maxSize) {
+                        mediaText = ` (${this.mediaOmitText})`;
+                    } else {
+                        this.totalSize += blob.size;
+                        const filePath = this.getFilePath(mxEv);
+                        mediaText = " (" + _t("File Attached") + ")";
+                        this.addFile(filePath, blob);
+                        if (this.totalSize == this.exportOptions.maxSize) {
+                            this.exportOptions.attachmentsIncluded = false;
+                        }
+                    }
+                } catch (error) {
+                    mediaText = " (" + _t("Error fetching file") + ")";
+                    console.log("Error fetching file " + error);
+                }
+            } else mediaText = ` (${this.mediaOmitText})`;
+        }
+        if (this.isReply(mxEv)) return senderDisplayName + ": " + this.textForReplyEvent(mxEv.getContent()) + mediaText;
+        else return textForEvent(mxEv) + mediaText;
+    };
+
+    protected async createOutput(events: MatrixEvent[]) {
+        let content = "";
+        for (let i = 0; i < events.length; i++) {
+            const event = events[i];
+            this.updateProgress(`Processing event ${i + 1} out of ${events.length}`, false, true);
+            if (this.cancelled) return this.cleanUp();
+            if (!haveTileForEvent(event)) continue;
+            const textForEvent = await this.plainTextForEvent(event);
+            content += textForEvent && `${new Date(event.getTs()).toLocaleString()} - ${textForEvent}\n`;
+        }
+        return content;
+    }
+
+    public async export() {
+        this.updateProgress("Starting export process...");
+        this.updateProgress("Fetching events...");
+
+        const fetchStart = performance.now();
+        const res = await this.getRequiredEvents();
+        const fetchEnd = performance.now();
+
+        console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`);
+
+        this.updateProgress("Creating output...");
+        const text = await this.createOutput(res);
+
+        if (this.files.length) {
+            this.addFile("export.txt", new Blob([text]));
+            await this.downloadZIP();
+        } else {
+            const fileName = `matrix-export-${formatFullDateNoDay(new Date())}.txt`;
+            this.downloadPlainText(fileName, text);
+        }
+
+        const exportEnd = performance.now();
+
+        if (this.cancelled) {
+            console.info("Export cancelled successfully");
+        } else {
+            console.info("Export successful!");
+            console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`);
+        }
+
+        this.cleanUp();
+    }
+}
+
diff --git a/src/utils/exportUtils/exportCSS.ts b/src/utils/exportUtils/exportCSS.ts
new file mode 100644
index 0000000000..f7f471fda3
--- /dev/null
+++ b/src/utils/exportUtils/exportCSS.ts
@@ -0,0 +1,50 @@
+/*
+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.
+*/
+
+/* eslint-disable max-len, camelcase */
+
+import customCSS from "!!raw-loader!./exportCustomCSS.css";
+
+const getExportCSS = async (): Promise<string> => {
+    const stylesheets: string[] = [];
+    document.querySelectorAll('link[rel="stylesheet"]').forEach((e: any) => {
+        if (e.href.endsWith("bundle.css") || e.href.endsWith("theme-light.css")) {
+            stylesheets.push(e.href);
+        }
+    });
+    let CSS = "";
+    for (const stylesheet of stylesheets) {
+        const res = await fetch(stylesheet);
+        const innerText = await res.text();
+        CSS += innerText;
+    }
+    const fontFaceRegex = /@font-face {.*?}/sg;
+
+    CSS = CSS.replace(fontFaceRegex, '');
+    CSS = CSS.replace(
+        /font-family: (Inter|'Inter')/g,
+        `font-family: -apple-system, BlinkMacSystemFont, avenir next, 
+        avenir, segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial, sans-serif`,
+    );
+    CSS = CSS.replace(
+        /font-family: Inconsolata/g,
+        "font-family: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace",
+    );
+
+    return CSS + customCSS;
+};
+
+export default getExportCSS;
diff --git a/src/utils/exportUtils/exportCustomCSS.css b/src/utils/exportUtils/exportCustomCSS.css
new file mode 100644
index 0000000000..284f54ac08
--- /dev/null
+++ b/src/utils/exportUtils/exportCustomCSS.css
@@ -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.
+*/
+
+/*
+    This file is raw-imported (imported as plain text) for the export bundle, which is the reason for the .css format and the colours being hard-coded hard-coded.
+*/
+
+#snackbar {
+    display: flex;
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    position: fixed;
+    z-index: 1;
+    left: 50%;
+    bottom: 30px;
+    font-size: 17px;
+    padding: 6px 16px;
+    font-family: -apple-system, BlinkMacSystemFont, avenir next, avenir,
+        segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial,
+        sans-serif;
+    font-weight: 400;
+    line-height: 1.43;
+    border-radius: 4px;
+    letter-spacing: 0.01071em;
+}
+
+#snackbar.mx_show {
+    visibility: visible;
+    -webkit-animation: mx_snackbar_fadein 0.5s, mx_snackbar_fadeout 0.5s 2.5s;
+    animation: mx_snackbar_fadein 0.5s, mx_snackbar_fadeout 0.5s 2.5s;
+}
+
+a.mx_reply_anchor {
+    cursor: pointer;
+    color: #238cf5;
+}
+
+a.mx_reply_anchor:hover {
+    text-decoration: underline;
+}
+
+@-webkit-keyframes mx_snackbar_fadein {
+    from {
+        bottom: 0;
+        opacity: 0;
+    }
+    to {
+        bottom: 30px;
+        opacity: 1;
+    }
+}
+
+@keyframes mx_snackbar_fadein {
+    from {
+        bottom: 0;
+        opacity: 0;
+    }
+    to {
+        bottom: 30px;
+        opacity: 1;
+    }
+}
+
+@-webkit-keyframes mx_snackbar_fadeout {
+    from {
+        bottom: 30px;
+        opacity: 1;
+    }
+    to {
+        bottom: 0;
+        opacity: 0;
+    }
+}
+
+@keyframes mx_snackbar_fadeout {
+    from {
+        bottom: 30px;
+        opacity: 1;
+    }
+    to {
+        bottom: 0;
+        opacity: 0;
+    }
+}
+
+* {
+    scroll-behavior: smooth !important;
+}
+
+.mx_Export_EventWrapper:target {
+    background: white;
+    animation: mx_event_highlight_animation 2s linear;
+}
+
+@keyframes mx_event_highlight_animation {
+    0%,
+    100% {
+        background: white;
+    }
+    50% {
+        background: #e3e2df;
+    }
+}
+
+.mx_ReplyThread_Export {
+    margin-top: 0px;
+    margin-bottom: 5px;
+}
+
+.mx_RedactedBody {
+    padding-left: unset;
+}
+
+img {
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.mx_MatrixChat {
+    max-width: 100%;
+}
diff --git a/src/utils/exportUtils/exportJS.js b/src/utils/exportUtils/exportJS.js
new file mode 100644
index 0000000000..e082f88d98
--- /dev/null
+++ b/src/utils/exportUtils/exportJS.js
@@ -0,0 +1,42 @@
+/*
+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.
+*/
+
+// This file is raw-imported (imported as plain text) for the export bundle, which is why this is in JS
+function showToastIfNeeded(replyId) {
+    const el = document.getElementById(replyId);
+    if (!el) {
+        showToast("The message you're looking for wasn't exported");
+        return;
+    }
+}
+
+function showToast(text) {
+    const el = document.getElementById("snackbar");
+    el.innerHTML = text;
+    el.className = "mx_show";
+    setTimeout(() => {
+        el.className = el.className.replace("mx_show", "");
+    }, 2000);
+}
+
+window.onload = () => {
+    document.querySelectorAll('.mx_reply_anchor').forEach(element => {
+        element.addEventListener('click', event => {
+            showToastIfNeeded(event.target.getAttribute("scroll-to"));
+        });
+    });
+};
+
diff --git a/src/utils/exportUtils/exportUtils.ts b/src/utils/exportUtils/exportUtils.ts
new file mode 100644
index 0000000000..139e3a3740
--- /dev/null
+++ b/src/utils/exportUtils/exportUtils.ts
@@ -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 { _t } from "../../languageHandler";
+
+export enum ExportFormat {
+    Html = "Html",
+    PlainText = "PlainText",
+    Json = "Json",
+}
+
+export enum ExportType {
+    Timeline = "Timeline",
+    Beginning = "Beginning",
+    LastNMessages = "LastNMessages",
+    // START_DATE = "START_DATE",
+}
+
+export const textForFormat = (format: ExportFormat): string => {
+    switch (format) {
+        case ExportFormat.Html:
+            return _t("HTML");
+        case ExportFormat.Json:
+            return _t("JSON");
+        case ExportFormat.PlainText:
+            return _t("Plain Text");
+        default:
+            throw new Error("Unknown format");
+    }
+};
+
+export const textForType = (type: ExportType): string => {
+    switch (type) {
+        case ExportType.Beginning:
+            return _t("From the beginning");
+        case ExportType.LastNMessages:
+            return _t("Specify a number of messages");
+        case ExportType.Timeline:
+            return _t("Current Timeline");
+        default:
+            throw new Error("Unknown type: " + type);
+        // case exportTypes.START_DATE:
+        //     return _t("From a specific date");
+    }
+};
+
+export interface IExportOptions {
+    // startDate?: number;
+    numberOfMessages?: number;
+    attachmentsIncluded: boolean;
+    maxSize: number;
+}
diff --git a/src/utils/humanize.js b/src/utils/humanize.ts
similarity index 74%
rename from src/utils/humanize.js
rename to src/utils/humanize.ts
index 6e6f17f8f4..978d17424b 100644
--- a/src/utils/humanize.js
+++ b/src/utils/humanize.ts
@@ -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.
@@ -14,22 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {_t} from "../languageHandler";
+import { _t } from "../languageHandler";
+
+// These are the constants we use for when to break the text
+const MILLISECONDS_RECENT = 15000;
+const MILLISECONDS_1_MIN = 75000;
+const MINUTES_UNDER_1_HOUR = 45;
+const MINUTES_1_HOUR = 75;
+const HOURS_UNDER_1_DAY = 23;
+const HOURS_1_DAY = 26;
 
 /**
  * Converts a timestamp into human-readable, translated, text.
  * @param {number} timeMillis The time in millis to compare against.
  * @returns {string} The humanized time.
  */
-export function humanizeTime(timeMillis) {
-    // These are the constants we use for when to break the text
-    const MILLISECONDS_RECENT = 15000;
-    const MILLISECONDS_1_MIN = 75000;
-    const MINUTES_UNDER_1_HOUR = 45;
-    const MINUTES_1_HOUR = 75;
-    const HOURS_UNDER_1_DAY = 23;
-    const HOURS_1_DAY = 26;
-
+export function humanizeTime(timeMillis: number): string {
     const now = (new Date()).getTime();
     let msAgo = now - timeMillis;
     const minutes = Math.abs(Math.ceil(msAgo / 60000));
@@ -39,19 +39,19 @@ export function humanizeTime(timeMillis) {
     if (msAgo >= 0) { // Past
         if (msAgo <= MILLISECONDS_RECENT) return _t("a few seconds ago");
         if (msAgo <= MILLISECONDS_1_MIN) return _t("about a minute ago");
-        if (minutes <= MINUTES_UNDER_1_HOUR) return _t("%(num)s minutes ago", {num: minutes});
+        if (minutes <= MINUTES_UNDER_1_HOUR) return _t("%(num)s minutes ago", { num: minutes });
         if (minutes <= MINUTES_1_HOUR) return _t("about an hour ago");
-        if (hours <= HOURS_UNDER_1_DAY) return _t("%(num)s hours ago", {num: hours});
+        if (hours <= HOURS_UNDER_1_DAY) return _t("%(num)s hours ago", { num: hours });
         if (hours <= HOURS_1_DAY) return _t("about a day ago");
-        return _t("%(num)s days ago", {num: days});
+        return _t("%(num)s days ago", { num: days });
     } else { // Future
         msAgo = Math.abs(msAgo);
         if (msAgo <= MILLISECONDS_RECENT) return _t("a few seconds from now");
         if (msAgo <= MILLISECONDS_1_MIN) return _t("about a minute from now");
-        if (minutes <= MINUTES_UNDER_1_HOUR) return _t("%(num)s minutes from now", {num: minutes});
+        if (minutes <= MINUTES_UNDER_1_HOUR) return _t("%(num)s minutes from now", { num: minutes });
         if (minutes <= MINUTES_1_HOUR) return _t("about an hour from now");
-        if (hours <= HOURS_UNDER_1_DAY) return _t("%(num)s hours from now", {num: hours});
+        if (hours <= HOURS_UNDER_1_DAY) return _t("%(num)s hours from now", { num: hours });
         if (hours <= HOURS_1_DAY) return _t("about a day from now");
-        return _t("%(num)s days from now", {num: days});
+        return _t("%(num)s days from now", { num: days });
     }
 }
diff --git a/src/utils/maps.ts b/src/utils/maps.ts
index 57d84bd33f..542e99a64d 100644
--- a/src/utils/maps.ts
+++ b/src/utils/maps.ts
@@ -30,7 +30,7 @@ export function mapDiff<K, V>(a: Map<K, V>, b: Map<K, V>): { changed: K[], added
     const possibleChanges = arrayUnion(aKeys, bKeys);
     const changes = possibleChanges.filter(k => a.get(k) !== b.get(k));
 
-    return {changed: changes, added: keyDiff.added, removed: keyDiff.removed};
+    return { changed: changes, added: keyDiff.added, removed: keyDiff.removed };
 }
 
 /**
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index 80f04dfe76..1a120e08b3 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import { Room } from "matrix-js-sdk/src/models/room";
+import { sleep } from "matrix-js-sdk/src/utils";
+
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import { _t } from "../languageHandler";
 import Modal from "../Modal";
@@ -83,9 +85,10 @@ export function isJoinedOrNearlyJoined(membership: string): boolean {
     return effective === EffectiveMembership.Join || effective === EffectiveMembership.Invite;
 }
 
-export async function leaveRoomBehaviour(roomId: string) {
+export async function leaveRoomBehaviour(roomId: string, retry = true) {
+    const cli = MatrixClientPeg.get();
     let leavingAllVersions = true;
-    const history = await MatrixClientPeg.get().getRoomUpgradeHistory(roomId);
+    const history = cli.getRoomUpgradeHistory(roomId);
     if (history && history.length > 0) {
         const currentRoom = history[history.length - 1];
         if (currentRoom.roomId !== roomId) {
@@ -95,20 +98,28 @@ export async function leaveRoomBehaviour(roomId: string) {
         }
     }
 
-    let results: { [roomId: string]: Error & { errcode: string, message: string } } = {};
+    let results: { [roomId: string]: Error & { errcode?: string, message: string, data?: Record<string, any> } } = {};
     if (!leavingAllVersions) {
         try {
-            await MatrixClientPeg.get().leave(roomId);
+            await cli.leave(roomId);
         } catch (e) {
-            if (e && e.data && e.data.errcode) {
+            if (e?.data?.errcode) {
                 const message = e.data.error || _t("Unexpected server error trying to leave the room");
-                results[roomId] = Object.assign(new Error(message), {errcode: e.data.errcode});
+                results[roomId] = Object.assign(new Error(message), { errcode: e.data.errcode, data: e.data });
             } else {
                 results[roomId] = e || new Error("Failed to leave room for unknown causes");
             }
         }
     } else {
-        results = await MatrixClientPeg.get().leaveRoomChain(roomId);
+        results = await cli.leaveRoomChain(roomId, retry);
+    }
+
+    if (retry) {
+        const limitExceededError = Object.values(results).find(e => e?.errcode === "M_LIMIT_EXCEEDED");
+        if (limitExceededError) {
+            await sleep(limitExceededError.data.retry_after_ms ?? 100);
+            return leaveRoomBehaviour(roomId, false);
+        }
     }
 
     const errors = Object.entries(results).filter(r => !!r[1]);
@@ -140,6 +151,6 @@ export async function leaveRoomBehaviour(roomId: string) {
     }
 
     if (RoomViewStore.getRoomId() === roomId) {
-        dis.dispatch({action: 'view_home_page'});
+        dis.dispatch({ action: 'view_home_page' });
     }
 }
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
index 2c9361beba..e3b7b6cf59 100644
--- a/src/utils/objects.ts
+++ b/src/utils/objects.ts
@@ -114,7 +114,7 @@ export function objectDiff<O extends {}>(a: O, b: O): Diff<keyof O> {
     const possibleChanges = arrayUnion(aKeys, bKeys);
     const changes = possibleChanges.filter(k => a[k] !== b[k]);
 
-    return {changed: changes, added: keyDiff.added, removed: keyDiff.removed};
+    return { changed: changes, added: keyDiff.added, removed: keyDiff.removed };
 }
 
 /**
@@ -141,21 +141,3 @@ export function objectKeyChanges<O extends {}>(a: O, b: O): (keyof O)[] {
 export function objectClone<O extends {}>(obj: O): O {
     return JSON.parse(JSON.stringify(obj));
 }
-
-/**
- * Converts a series of entries to an object.
- * @param entries The entries to convert.
- * @returns The converted object.
- */
-// NOTE: Deprecated once we have Object.fromEntries() support.
-// @ts-ignore - return type is complaining about non-string keys, but we know better
-export function objectFromEntries<K, V>(entries: Iterable<[K, V]>): {[k: K]: V} {
-    const obj: {
-        // @ts-ignore - same as return type
-        [k: K]: V} = {};
-    for (const e of entries) {
-        // @ts-ignore - same as return type
-        obj[e[0]] = e[1];
-    }
-    return obj;
-}
diff --git a/src/utils/permalinks/ElementPermalinkConstructor.ts b/src/utils/permalinks/ElementPermalinkConstructor.ts
index cd7f2b9d2c..2068a905c3 100644
--- a/src/utils/permalinks/ElementPermalinkConstructor.ts
+++ b/src/utils/permalinks/ElementPermalinkConstructor.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
+import PermalinkConstructor, { PermalinkParts } from "./PermalinkConstructor";
 
 /**
  * Generates permalinks that self-reference the running webapp
diff --git a/src/utils/permalinks/PermalinkConstructor.ts b/src/utils/permalinks/PermalinkConstructor.ts
index 25855eb024..986d20d4d1 100644
--- a/src/utils/permalinks/PermalinkConstructor.ts
+++ b/src/utils/permalinks/PermalinkConstructor.ts
@@ -19,11 +19,11 @@ limitations under the License.
  * TODO: Convert this to a real TypeScript interface
  */
 export default class PermalinkConstructor {
-    forEvent(roomId: string, eventId: string, serverCandidates: string[]): string {
+    forEvent(roomId: string, eventId: string, serverCandidates: string[] = []): string {
         throw new Error("Not implemented");
     }
 
-    forRoom(roomIdOrAlias: string, serverCandidates: string[]): string {
+    forRoom(roomIdOrAlias: string, serverCandidates: string[] = []): string {
         throw new Error("Not implemented");
     }
 
@@ -73,12 +73,12 @@ export class PermalinkParts {
         return new PermalinkParts(null, null, null, groupId, null);
     }
 
-    static forRoom(roomIdOrAlias: string, viaServers: string[]): PermalinkParts {
-        return new PermalinkParts(roomIdOrAlias, null, null, null, viaServers || []);
+    static forRoom(roomIdOrAlias: string, viaServers: string[] = []): PermalinkParts {
+        return new PermalinkParts(roomIdOrAlias, null, null, null, viaServers);
     }
 
-    static forEvent(roomId: string, eventId: string, viaServers: string[]): PermalinkParts {
-        return new PermalinkParts(roomId, eventId, null, null, viaServers || []);
+    static forEvent(roomId: string, eventId: string, viaServers: string[] = []): PermalinkParts {
+        return new PermalinkParts(roomId, eventId, null, null, viaServers);
     }
 
     get primaryEntityId(): string {
diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts
index d87c826cc2..cff7ebc08b 100644
--- a/src/utils/permalinks/Permalinks.ts
+++ b/src/utils/permalinks/Permalinks.ts
@@ -16,14 +16,14 @@ limitations under the License.
 
 import isIp from "is-ip";
 import * as utils from "matrix-js-sdk/src/utils";
-import {Room} from "matrix-js-sdk/src/models/room";
-import {EventType} from "matrix-js-sdk/src/@types/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
-import {MatrixClientPeg} from "../../MatrixClientPeg";
-import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
-import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import SpecPermalinkConstructor, { baseUrl as matrixtoBaseUrl } from "./SpecPermalinkConstructor";
+import PermalinkConstructor, { PermalinkParts } from "./PermalinkConstructor";
 import ElementPermalinkConstructor from "./ElementPermalinkConstructor";
 import matrixLinkify from "../../linkify-matrix";
 import SdkConfig from "../../SdkConfig";
@@ -32,7 +32,6 @@ import SdkConfig from "../../SdkConfig";
 // to add to permalinks. The servers are appended as ?via=example.org
 const MAX_SERVER_CANDIDATES = 3;
 
-
 // Permalinks can have servers appended to them so that the user
 // receiving them can have a fighting chance at joining the room.
 // These servers are called "candidates" at this point because
@@ -149,7 +148,7 @@ export class RoomPermalinkCreator {
             // Prefer to use canonical alias for permalink if possible
             const alias = this.room.getCanonicalAlias();
             if (alias) {
-                return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
+                return getPermalinkConstructor().forRoom(alias);
             }
         }
         return getPermalinkConstructor().forRoom(this.roomId, this._serverCandidates);
@@ -172,7 +171,7 @@ export class RoomPermalinkCreator {
                 this.updateServerCandidates();
                 return;
         }
-    }
+    };
 
     private onMembership = (evt: MatrixEvent, member: RoomMember, oldMembership: string) => {
         const userId = member.userId;
@@ -189,7 +188,7 @@ export class RoomPermalinkCreator {
 
         this.updateHighestPlUser();
         this.updateServerCandidates();
-    }
+    };
 
     private updateHighestPlUser() {
         const plEvent = this.room.currentState.getStateEvents("m.room.power_levels", "");
@@ -302,7 +301,7 @@ export function makeRoomPermalink(roomId: string): string {
     }
     const permalinkCreator = new RoomPermalinkCreator(room);
     permalinkCreator.load();
-    return permalinkCreator.forRoom();
+    return permalinkCreator.forShareableRoom();
 }
 
 export function makeGroupPermalink(groupId: string): string {
diff --git a/src/utils/permalinks/SpecPermalinkConstructor.ts b/src/utils/permalinks/SpecPermalinkConstructor.ts
index d8b3633bb3..a24df40f16 100644
--- a/src/utils/permalinks/SpecPermalinkConstructor.ts
+++ b/src/utils/permalinks/SpecPermalinkConstructor.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
+import PermalinkConstructor, { PermalinkParts } from "./PermalinkConstructor";
 
 export const host = "matrix.to";
 export const baseUrl = `https://${host}`;
diff --git a/src/utils/pillify.js b/src/utils/pillify.tsx
similarity index 89%
rename from src/utils/pillify.js
rename to src/utils/pillify.tsx
index 72e0e5a4db..22240fcda5 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.tsx
@@ -16,9 +16,11 @@ limitations under the License.
 
 import React from "react";
 import ReactDOM from 'react-dom';
-import {MatrixClientPeg} from '../MatrixClientPeg';
+import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { MatrixClientPeg } from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
-import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
 import Pill from "../components/views/elements/Pill";
 import { parseAppLocalLink } from "./permalinks/Permalinks";
 
@@ -27,15 +29,15 @@ import { parseAppLocalLink } from "./permalinks/Permalinks";
  * into pills based on the context of a given room.  Returns a list of
  * the resulting React nodes so they can be unmounted rather than leaking.
  *
- * @param {Node[]} nodes - a list of sibling DOM nodes to traverse to try
+ * @param {Element[]} nodes - a list of sibling DOM nodes to traverse to try
  *   to turn into pills.
  * @param {MatrixEvent} mxEvent - the matrix event which the DOM nodes are
  *   part of representing.
- * @param {Node[]} pills: an accumulator of the DOM nodes which contain
+ * @param {Element[]} pills: an accumulator of the DOM nodes which contain
  *   React components which have been mounted as part of this.
  *   The initial caller should pass in an empty array to seed the accumulator.
  */
-export function pillifyLinks(nodes, mxEvent, pills) {
+export function pillifyLinks(nodes: ArrayLike<Element>, mxEvent: MatrixEvent, pills: Element[]) {
     const room = MatrixClientPeg.get().getRoom(mxEvent.getRoomId());
     const shouldShowPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
     let node = nodes[0];
@@ -73,7 +75,7 @@ export function pillifyLinks(nodes, mxEvent, pills) {
             // to clear the pills from the last run of pillifyLinks
             !node.parentElement.classList.contains("mx_AtRoomPill")
         ) {
-            let currentTextNode = node;
+            let currentTextNode = node as Node as Text;
             const roomNotifTextNodes = [];
 
             // Take a textNode and break it up to make all the instances of @room their
@@ -125,10 +127,10 @@ export function pillifyLinks(nodes, mxEvent, pills) {
         }
 
         if (node.childNodes && node.childNodes.length && !pillified) {
-            pillifyLinks(node.childNodes, mxEvent, pills);
+            pillifyLinks(node.childNodes as NodeListOf<Element>, mxEvent, pills);
         }
 
-        node = node.nextSibling;
+        node = node.nextSibling as Element;
     }
 }
 
@@ -140,10 +142,10 @@ export function pillifyLinks(nodes, mxEvent, pills) {
  * emitter on BaseAvatar as per
  * https://github.com/vector-im/element-web/issues/12417
  *
- * @param {Node[]} pills - array of pill containers whose React
+ * @param {Element[]} pills - array of pill containers whose React
  *   components should be unmounted.
  */
-export function unmountPills(pills) {
+export function unmountPills(pills: Element[]) {
     for (const pillContainer of pills) {
         ReactDOM.unmountComponentAtNode(pillContainer);
     }
diff --git a/src/utils/promise.ts b/src/utils/promise.ts
index 4ebbb27141..abcfc49a08 100644
--- a/src/utils/promise.ts
+++ b/src/utils/promise.ts
@@ -14,15 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Returns a promise which resolves with a given value after the given number of ms
-export function sleep<T>(ms: number, value?: T): Promise<T> {
-    return new Promise((resolve => { setTimeout(resolve, ms, value); }));
-}
-
 // Returns a promise which resolves when the input promise resolves with its value
 // or when the timeout of ms is reached with the value of given timeoutValue
-export async function timeout<T>(promise: Promise<T>, timeoutValue: T, ms: number): Promise<T> {
-    const timeoutPromise = new Promise<T>((resolve) => {
+export async function timeout<T, Y>(promise: Promise<T>, timeoutValue: Y, ms: number): Promise<T | Y> {
+    const timeoutPromise = new Promise<T | Y>((resolve) => {
         const timeoutId = setTimeout(resolve, ms, timeoutValue);
         promise.then(() => {
             clearTimeout(timeoutId);
@@ -32,25 +27,6 @@ export async function timeout<T>(promise: Promise<T>, timeoutValue: T, ms: numbe
     return Promise.race([promise, timeoutPromise]);
 }
 
-export interface IDeferred<T> {
-    resolve: (value: T) => void;
-    reject: (any) => void;
-    promise: Promise<T>;
-}
-
-// Returns a Deferred
-export function defer<T>(): IDeferred<T> {
-    let resolve;
-    let reject;
-
-    const promise = new Promise<T>((_resolve, _reject) => {
-        resolve = _resolve;
-        reject = _reject;
-    });
-
-    return {resolve, reject, promise};
-}
-
 // Helper method to retry a Promise a given number of times or until a predicate fails
 export async function retry<T, E extends Error>(fn: () => Promise<T>, num: number, predicate?: (e: E) => boolean) {
     let lastErr: E;
diff --git a/src/utils/space.tsx b/src/utils/space.tsx
index c14dc988d2..5bbae369e7 100644
--- a/src/utils/space.tsx
+++ b/src/utils/space.tsx
@@ -15,23 +15,33 @@ limitations under the License.
 */
 
 import React 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 { Room } from "matrix-js-sdk/src/models/room";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
-import {calculateRoomVia} from "../utils/permalinks/Permalinks";
+import { calculateRoomVia } from "./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";
-import {_t} from "../languageHandler";
+import createRoom, { IOpts } from "../createRoom";
+import { _t } from "../languageHandler";
 import SpacePublicShare from "../components/views/spaces/SpacePublicShare";
 import InfoDialog from "../components/views/dialogs/InfoDialog";
 import { showRoomInviteDialog } from "../RoomInvite";
+import CreateSubspaceDialog from "../components/views/dialogs/CreateSubspaceDialog";
+import AddExistingSubspaceDialog from "../components/views/dialogs/AddExistingSubspaceDialog";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import RoomViewStore from "../stores/RoomViewStore";
+import { Action } from "../dispatcher/actions";
+import { leaveRoomBehaviour } from "./membership";
+import Spinner from "../components/views/elements/Spinner";
+import dis from "../dispatcher/dispatcher";
+import LeaveSpaceDialog from "../components/views/dialogs/LeaveSpaceDialog";
+import CreateSpaceFromCommunityDialog from "../components/views/dialogs/CreateSpaceFromCommunityDialog";
 
-export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
-    const userId = cli.getUserId();
+export const shouldShowSpaceSettings = (space: Room) => {
+    const userId = space.client.getUserId();
     return space.getMyMembership() === "join"
         && (space.currentState.maySendStateEvent(EventType.RoomAvatar, userId)
             || space.currentState.maySendStateEvent(EventType.RoomName, userId)
@@ -48,28 +58,33 @@ export const makeSpaceParentEvent = (room: Room, canonical = false) => ({
     state_key: room.roomId,
 });
 
-export const showSpaceSettings = (cli: MatrixClient, space: Room) => {
+export const showSpaceSettings = (space: Room) => {
     Modal.createTrackedDialog("Space Settings", "", SpaceSettingsDialog, {
-        matrixClient: cli,
+        matrixClient: space.client,
         space,
     }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
 };
 
-export const showAddExistingRooms = async (cli: MatrixClient, space: Room) => {
-    return Modal.createTrackedDialog(
+export const showAddExistingRooms = (space: Room): void => {
+    Modal.createTrackedDialog(
         "Space Landing",
         "Add Existing",
         AddExistingToSpaceDialog,
         {
-            matrixClient: cli,
-            onCreateRoomClick: showCreateNewRoom,
+            onCreateRoomClick: () => showCreateNewRoom(space),
+            onAddSubspaceClick: () => showAddExistingSubspace(space),
             space,
+            onFinished: (added: boolean) => {
+                if (added && RoomViewStore.getRoomId() === space.roomId) {
+                    defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                }
+            },
         },
         "mx_AddExistingToSpaceDialog_wrapper",
-    ).finished;
+    );
 };
 
-export const showCreateNewRoom = async (cli: MatrixClient, space: Room) => {
+export const showCreateNewRoom = async (space: Room): Promise<boolean> => {
     const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
         "Space Landing",
         "Create Room",
@@ -86,7 +101,7 @@ export const showCreateNewRoom = async (cli: MatrixClient, space: Room) => {
     return shouldCreate;
 };
 
-export const showSpaceInvite = (space: Room, initialText = "") => {
+export const showSpaceInvite = (space: Room, initialText = ""): void => {
     if (space.getJoinRule() === "public") {
         const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
             title: _t("Invite to %(spaceName)s", { spaceName: space.name }),
@@ -103,3 +118,69 @@ export const showSpaceInvite = (space: Room, initialText = "") => {
         showRoomInviteDialog(space.roomId, initialText);
     }
 };
+
+export const showAddExistingSubspace = (space: Room): void => {
+    Modal.createTrackedDialog(
+        "Space Landing",
+        "Create Subspace",
+        AddExistingSubspaceDialog,
+        {
+            space,
+            onCreateSubspaceClick: () => showCreateNewSubspace(space),
+            onFinished: (added: boolean) => {
+                if (added && RoomViewStore.getRoomId() === space.roomId) {
+                    defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                }
+            },
+        },
+        "mx_AddExistingToSpaceDialog_wrapper",
+    );
+};
+
+export const showCreateNewSubspace = (space: Room): void => {
+    Modal.createTrackedDialog(
+        "Space Landing",
+        "Create Subspace",
+        CreateSubspaceDialog,
+        {
+            space,
+            onAddExistingSpaceClick: () => showAddExistingSubspace(space),
+            onFinished: (added: boolean) => {
+                if (added && RoomViewStore.getRoomId() === space.roomId) {
+                    defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                }
+            },
+        },
+        "mx_CreateSubspaceDialog_wrapper",
+    );
+};
+
+export const leaveSpace = (space: Room) => {
+    Modal.createTrackedDialog("Leave Space", "", LeaveSpaceDialog, {
+        space,
+        onFinished: async (leave: boolean, rooms: Room[]) => {
+            if (!leave) return;
+            const modal = Modal.createDialog(Spinner, null, "mx_Dialog_spinner");
+            try {
+                for (const room of rooms) {
+                    await leaveRoomBehaviour(room.roomId);
+                }
+                await leaveRoomBehaviour(space.roomId);
+            } finally {
+                modal.close();
+            }
+
+            dis.dispatch({
+                action: "after_leave_room",
+                room_id: space.roomId,
+            });
+        },
+    }, "mx_LeaveSpaceDialog_wrapper");
+};
+
+export const createSpaceFromCommunity = (cli: MatrixClient, groupId: string): Promise<[string?]> => {
+    return Modal.createTrackedDialog('Create Space', 'from community', CreateSpaceFromCommunityDialog, {
+        matrixClient: cli,
+        groupId,
+    }, "mx_CreateSpaceFromCommunityDialog_wrapper").finished as Promise<[string?]>;
+};
diff --git a/src/utils/stringOrderField.ts b/src/utils/stringOrderField.ts
new file mode 100644
index 0000000000..da840792ee
--- /dev/null
+++ b/src/utils/stringOrderField.ts
@@ -0,0 +1,148 @@
+/*
+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 { alphabetPad, baseToString, stringToBase, DEFAULT_ALPHABET } from "matrix-js-sdk/src/utils";
+
+import { moveElement } from "./arrays";
+
+export function midPointsBetweenStrings(
+    a: string,
+    b: string,
+    count: number,
+    maxLen: number,
+    alphabet = DEFAULT_ALPHABET,
+): string[] {
+    const padN = Math.min(Math.max(a.length, b.length), maxLen);
+    const padA = alphabetPad(a, padN, alphabet);
+    const padB = alphabetPad(b, padN, alphabet);
+    const baseA = stringToBase(padA, alphabet);
+    const baseB = stringToBase(padB, alphabet);
+
+    if (baseB - baseA - BigInt(1) < count) {
+        if (padN < maxLen) {
+            // this recurses once at most due to the new limit of n+1
+            return midPointsBetweenStrings(
+                alphabetPad(padA, padN + 1, alphabet),
+                alphabetPad(padB, padN + 1, alphabet),
+                count,
+                padN + 1,
+                alphabet,
+            );
+        }
+        return [];
+    }
+
+    const step = (baseB - baseA) / BigInt(count + 1);
+    const start = BigInt(baseA + step);
+    return Array(count).fill(undefined).map((_, i) => baseToString(start + (BigInt(i) * step), alphabet));
+}
+
+interface IEntry {
+    index: number;
+    order: string;
+}
+
+export const reorderLexicographically = (
+    orders: Array<string | undefined>,
+    fromIndex: number,
+    toIndex: number,
+    maxLen = 50,
+): IEntry[] => {
+    // sanity check inputs
+    if (
+        fromIndex < 0 || toIndex < 0 ||
+        fromIndex > orders.length || toIndex > orders.length ||
+        fromIndex === toIndex
+    ) {
+        return [];
+    }
+
+    // zip orders with their indices to simplify later index wrangling
+    const ordersWithIndices: IEntry[] = orders.map((order, index) => ({ index, order }));
+    // apply the fundamental order update to the zipped array
+    const newOrder = moveElement(ordersWithIndices, fromIndex, toIndex);
+
+    // check if we have to fill undefined orders to complete placement
+    const orderToLeftUndefined = newOrder[toIndex - 1]?.order === undefined;
+
+    let leftBoundIdx = toIndex;
+    let rightBoundIdx = toIndex;
+
+    let canMoveLeft = true;
+    const nextBase = newOrder[toIndex + 1]?.order !== undefined
+        ? stringToBase(newOrder[toIndex + 1].order)
+        : BigInt(Number.MAX_VALUE);
+
+    // check how far left we would have to mutate to fit in that direction
+    for (let i = toIndex - 1, j = 1; i >= 0; i--, j++) {
+        if (newOrder[i]?.order !== undefined && nextBase - stringToBase(newOrder[i].order) > j) break;
+        leftBoundIdx = i;
+    }
+
+    // verify the left move would be sufficient
+    const firstOrderBase = newOrder[0].order === undefined ? undefined : stringToBase(newOrder[0].order);
+    const bigToIndex = BigInt(toIndex);
+    if (leftBoundIdx === 0 &&
+        firstOrderBase !== undefined &&
+        nextBase - firstOrderBase <= bigToIndex &&
+        firstOrderBase <= bigToIndex
+    ) {
+        canMoveLeft = false;
+    }
+
+    const canDisplaceRight = !orderToLeftUndefined;
+    let canMoveRight = canDisplaceRight;
+    if (canDisplaceRight) {
+        const prevBase = newOrder[toIndex - 1]?.order !== undefined
+            ? stringToBase(newOrder[toIndex - 1]?.order)
+            : BigInt(Number.MIN_VALUE);
+
+        // check how far right we would have to mutate to fit in that direction
+        for (let i = toIndex + 1, j = 1; i < newOrder.length; i++, j++) {
+            if (newOrder[i]?.order === undefined || stringToBase(newOrder[i].order) - prevBase > j) break;
+            rightBoundIdx = i;
+        }
+
+        // verify the right move would be sufficient
+        if (rightBoundIdx === newOrder.length - 1 &&
+            (newOrder[rightBoundIdx]
+                ? stringToBase(newOrder[rightBoundIdx].order)
+                : BigInt(Number.MAX_VALUE)) - prevBase <= (rightBoundIdx - toIndex)
+        ) {
+            canMoveRight = false;
+        }
+    }
+
+    // pick the cheaper direction
+    const leftDiff = canMoveLeft ? toIndex - leftBoundIdx : Number.MAX_SAFE_INTEGER;
+    const rightDiff = canMoveRight ? rightBoundIdx - toIndex : Number.MAX_SAFE_INTEGER;
+    if (orderToLeftUndefined || leftDiff < rightDiff) {
+        rightBoundIdx = toIndex;
+    } else {
+        leftBoundIdx = toIndex;
+    }
+
+    const prevOrder = newOrder[leftBoundIdx - 1]?.order ?? "";
+    const nextOrder = newOrder[rightBoundIdx + 1]?.order
+        ?? DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 1).repeat(prevOrder.length || 1);
+
+    const changes = midPointsBetweenStrings(prevOrder, nextOrder, 1 + rightBoundIdx - leftBoundIdx, maxLen);
+
+    return changes.map((order, i) => ({
+        index: newOrder[leftBoundIdx + i].index,
+        order,
+    }));
+};
diff --git a/src/utils/strings.ts b/src/utils/strings.ts
index beb9f31ddd..6d12c88940 100644
--- a/src/utils/strings.ts
+++ b/src/utils/strings.ts
@@ -74,7 +74,6 @@ export function copyNode(ref: Element): boolean {
     return document.execCommand('copy');
 }
 
-
 const collator = new Intl.Collator();
 /**
  * Performant language-sensitive string comparison
diff --git a/src/verification.ts b/src/verification.ts
index acd9f6d2b2..dfee6608ea 100644
--- a/src/verification.ts
+++ b/src/verification.ts
@@ -19,14 +19,14 @@ import { User } from "matrix-js-sdk/src/models/user";
 import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from "./dispatcher/dispatcher";
 import Modal from './Modal';
-import * as sdk from './index';
 import { RightPanelPhases } from "./stores/RightPanelStorePhases";
 import { findDMForUser } from './createRoom';
 import { accessSecretStorage } from './SecurityManager';
-import { verificationMethods } from 'matrix-js-sdk/src/crypto';
+import { verificationMethods as VerificationMethods } from 'matrix-js-sdk/src/crypto';
 import { Action } from './dispatcher/actions';
 import UntrustedDeviceDialog from "./components/views/dialogs/UntrustedDeviceDialog";
-import {IDevice} from "./components/views/right_panel/UserInfo";
+import { IDevice } from "./components/views/right_panel/UserInfo";
+import ManualDeviceKeyVerificationDialog from "./components/views/dialogs/ManualDeviceKeyVerificationDialog";
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
@@ -45,12 +45,12 @@ async function enable4SIfNeeded() {
 export async function verifyDevice(user: User, device: IDevice) {
     const cli = MatrixClientPeg.get();
     if (cli.isGuest()) {
-        dis.dispatch({action: 'require_registration'});
+        dis.dispatch({ action: 'require_registration' });
         return;
     }
     // if cross-signing is not explicitly disabled, check if it should be enabled first.
     if (cli.getCryptoTrustCrossSignedDevices()) {
-        if (!await enable4SIfNeeded()) {
+        if (!(await enable4SIfNeeded())) {
             return;
         }
     }
@@ -63,16 +63,14 @@ export async function verifyDevice(user: User, device: IDevice) {
                 const verificationRequestPromise = cli.legacyDeviceVerification(
                     user.userId,
                     device.deviceId,
-                    verificationMethods.SAS,
+                    VerificationMethods.SAS,
                 );
                 dis.dispatch({
                     action: Action.SetRightPanelPhase,
                     phase: RightPanelPhases.EncryptionPanel,
-                    refireParams: {member: user, verificationRequestPromise},
+                    refireParams: { member: user, verificationRequestPromise },
                 });
             } else if (action === "legacy") {
-                const ManualDeviceKeyVerificationDialog =
-                    sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
                 Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
                     ManualDeviceKeyVerificationDialog,
                     {
@@ -88,12 +86,12 @@ export async function verifyDevice(user: User, device: IDevice) {
 export async function legacyVerifyUser(user: User) {
     const cli = MatrixClientPeg.get();
     if (cli.isGuest()) {
-        dis.dispatch({action: 'require_registration'});
+        dis.dispatch({ action: 'require_registration' });
         return;
     }
     // if cross-signing is not explicitly disabled, check if it should be enabled first.
     if (cli.getCryptoTrustCrossSignedDevices()) {
-        if (!await enable4SIfNeeded()) {
+        if (!(await enable4SIfNeeded())) {
             return;
         }
     }
@@ -101,17 +99,17 @@ export async function legacyVerifyUser(user: User) {
     dis.dispatch({
         action: Action.SetRightPanelPhase,
         phase: RightPanelPhases.EncryptionPanel,
-        refireParams: {member: user, verificationRequestPromise},
+        refireParams: { member: user, verificationRequestPromise },
     });
 }
 
 export async function verifyUser(user: User) {
     const cli = MatrixClientPeg.get();
     if (cli.isGuest()) {
-        dis.dispatch({action: 'require_registration'});
+        dis.dispatch({ action: 'require_registration' });
         return;
     }
-    if (!await enable4SIfNeeded()) {
+    if (!(await enable4SIfNeeded())) {
         return;
     }
     const existingRequest = pendingVerificationRequestForUser(user);
diff --git a/src/voice/Playback.ts b/src/voice/Playback.ts
deleted file mode 100644
index 61da435151..0000000000
--- a/src/voice/Playback.ts
+++ /dev/null
@@ -1,186 +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.
-*/
-
-import EventEmitter from "events";
-import { UPDATE_EVENT } from "../stores/AsyncStore";
-import { arrayFastResample, arrayRescale, arraySeed, arraySmoothingResample } from "../utils/arrays";
-import { SimpleObservable } from "matrix-widget-api";
-import { IDestroyable } from "../utils/IDestroyable";
-import { PlaybackClock } from "./PlaybackClock";
-import { createAudioContext, decodeOgg } from "./compat";
-import { clamp } from "../utils/numbers";
-
-export enum PlaybackState {
-    Decoding = "decoding",
-    Stopped = "stopped", // no progress on timeline
-    Paused = "paused", // some progress on timeline
-    Playing = "playing", // active progress through timeline
-}
-
-export const PLAYBACK_WAVEFORM_SAMPLES = 39;
-const DEFAULT_WAVEFORM = arraySeed(0, PLAYBACK_WAVEFORM_SAMPLES);
-
-function makePlaybackWaveform(input: number[]): number[] {
-    // First, convert negative amplitudes to positive so we don't detect zero as "noisy".
-    const noiseWaveform = input.map(v => Math.abs(v));
-
-    // Next, we'll resample the waveform using a smoothing approach so we can keep the same rough shape.
-    // We also rescale the waveform to be 0-1 for the remaining function logic.
-    const resampled = arrayRescale(arraySmoothingResample(noiseWaveform, PLAYBACK_WAVEFORM_SAMPLES), 0, 1);
-
-    // Then, we'll do a high and low pass filter to isolate actual speaking volumes within the rescaled
-    // waveform. Most speech happens below the 0.5 mark.
-    const filtered = resampled.map(v => clamp(v, 0.1, 0.5));
-
-    // Finally, we'll rescale the filtered waveform (0.1-0.5 becomes 0-1 again) so the user sees something
-    // sensible. This is what we return to keep our contract of "values between zero and one".
-    return arrayRescale(filtered, 0, 1);
-}
-
-export class Playback extends EventEmitter implements IDestroyable {
-    private readonly context: AudioContext;
-    private source: AudioBufferSourceNode;
-    private state = PlaybackState.Decoding;
-    private audioBuf: AudioBuffer;
-    private resampledWaveform: number[];
-    private waveformObservable = new SimpleObservable<number[]>();
-    private readonly clock: PlaybackClock;
-
-    /**
-     * Creates a new playback instance from a buffer.
-     * @param {ArrayBuffer} buf The buffer containing the sound sample.
-     * @param {number[]} seedWaveform Optional seed waveform to present until the proper waveform
-     * can be calculated. Contains values between zero and one, inclusive.
-     */
-    constructor(private buf: ArrayBuffer, seedWaveform = DEFAULT_WAVEFORM) {
-        super();
-        this.context = createAudioContext();
-        this.resampledWaveform = arrayFastResample(seedWaveform ?? DEFAULT_WAVEFORM, PLAYBACK_WAVEFORM_SAMPLES);
-        this.waveformObservable.update(this.resampledWaveform);
-        this.clock = new PlaybackClock(this.context);
-    }
-
-    /**
-     * Stable waveform for the playback. Values are guaranteed to be between
-     * zero and one, inclusive.
-     */
-    public get waveform(): number[] {
-        return this.resampledWaveform;
-    }
-
-    public get waveformData(): SimpleObservable<number[]> {
-        return this.waveformObservable;
-    }
-
-    public get clockInfo(): PlaybackClock {
-        return this.clock;
-    }
-
-    public get currentState(): PlaybackState {
-        return this.state;
-    }
-
-    public get isPlaying(): boolean {
-        return this.currentState === PlaybackState.Playing;
-    }
-
-    public emit(event: PlaybackState, ...args: any[]): boolean {
-        this.state = event;
-        super.emit(event, ...args);
-        super.emit(UPDATE_EVENT, event, ...args);
-        return true; // we don't ever care if the event had listeners, so just return "yes"
-    }
-
-    public destroy() {
-        // noinspection JSIgnoredPromiseFromCall - not concerned about being called async here
-        this.stop();
-        this.removeAllListeners();
-        this.clock.destroy();
-        this.waveformObservable.close();
-    }
-
-    public async prepare() {
-        // Safari compat: promise API not supported on this function
-        this.audioBuf = await new Promise((resolve, reject) => {
-            this.context.decodeAudioData(this.buf, b => resolve(b), async e => {
-                // This error handler is largely for Safari as well, which doesn't support Opus/Ogg
-                // very well.
-                console.error("Error decoding recording: ", e);
-                console.warn("Trying to re-encode to WAV instead...");
-
-                const wav = await decodeOgg(this.buf);
-
-                // noinspection ES6MissingAwait - not needed when using callbacks
-                this.context.decodeAudioData(wav, b => resolve(b), e => {
-                    console.error("Still failed to decode recording: ", e);
-                    reject(e);
-                });
-            });
-        });
-
-        // Update the waveform to the real waveform once we have channel data to use. We don't
-        // exactly trust the user-provided waveform to be accurate...
-        const waveform = Array.from(this.audioBuf.getChannelData(0));
-        this.resampledWaveform = makePlaybackWaveform(waveform);
-        this.waveformObservable.update(this.resampledWaveform);
-
-        this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
-        this.clock.flagLoadTime(); // must happen first because setting the duration fires a clock update
-        this.clock.durationSeconds = this.audioBuf.duration;
-    }
-
-    private onPlaybackEnd = async () => {
-        await this.context.suspend();
-        this.emit(PlaybackState.Stopped);
-    };
-
-    public async play() {
-        // We can't restart a buffer source, so we need to create a new one if we hit the end
-        if (this.state === PlaybackState.Stopped) {
-            if (this.source) {
-                this.source.disconnect();
-                this.source.removeEventListener("ended", this.onPlaybackEnd);
-            }
-
-            this.source = this.context.createBufferSource();
-            this.source.connect(this.context.destination);
-            this.source.buffer = this.audioBuf;
-            this.source.start(); // start immediately
-            this.source.addEventListener("ended", this.onPlaybackEnd);
-        }
-
-        // We use the context suspend/resume functions because it allows us to pause a source
-        // node, but that still doesn't help us when the source node runs out (see above).
-        await this.context.resume();
-        this.clock.flagStart();
-        this.emit(PlaybackState.Playing);
-    }
-
-    public async pause() {
-        await this.context.suspend();
-        this.emit(PlaybackState.Paused);
-    }
-
-    public async stop() {
-        await this.onPlaybackEnd();
-        this.clock.flagStop();
-    }
-
-    public async toggle() {
-        if (this.isPlaying) await this.pause();
-        else await this.play();
-    }
-}
diff --git a/src/voice/PlaybackClock.ts b/src/voice/PlaybackClock.ts
deleted file mode 100644
index d6d36e861f..0000000000
--- a/src/voice/PlaybackClock.ts
+++ /dev/null
@@ -1,87 +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.
-*/
-
-import {SimpleObservable} from "matrix-widget-api";
-import {IDestroyable} from "../utils/IDestroyable";
-
-// Because keeping track of time is sufficiently complicated...
-export class PlaybackClock implements IDestroyable {
-    private clipStart = 0;
-    private stopped = true;
-    private lastCheck = 0;
-    private observable = new SimpleObservable<number[]>();
-    private timerId: number;
-    private clipDuration = 0;
-
-    public constructor(private context: AudioContext) {
-    }
-
-    public get durationSeconds(): number {
-        return this.clipDuration;
-    }
-
-    public set durationSeconds(val: number) {
-        this.clipDuration = val;
-        this.observable.update([this.timeSeconds, this.clipDuration]);
-    }
-
-    public get timeSeconds(): number {
-        return (this.context.currentTime - this.clipStart) % this.clipDuration;
-    }
-
-    public get liveData(): SimpleObservable<number[]> {
-        return this.observable;
-    }
-
-    private checkTime = () => {
-        const now = this.timeSeconds;
-        if (this.lastCheck !== now) {
-            this.observable.update([now, this.durationSeconds]);
-            this.lastCheck = now;
-        }
-    };
-
-    /**
-     * Mark the time in the audio context where the clip starts/has been loaded.
-     * This is to ensure the clock isn't skewed into thinking it is ~0.5s into
-     * a clip when the duration is set.
-     */
-    public flagLoadTime() {
-        this.clipStart = this.context.currentTime;
-    }
-
-    public flagStart() {
-        if (this.stopped) {
-            this.clipStart = this.context.currentTime;
-            this.stopped = false;
-        }
-
-        if (!this.timerId) {
-            // case to number because the types are wrong
-            // 100ms interval to make sure the time is as accurate as possible
-            this.timerId = <number><any>setInterval(this.checkTime, 100);
-        }
-    }
-
-    public flagStop() {
-        this.stopped = true;
-    }
-
-    public destroy() {
-        this.observable.close();
-        if (this.timerId) clearInterval(this.timerId);
-    }
-}
diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx
index 05e6c59083..8c13a4b2fc 100644
--- a/src/widgets/CapabilityText.tsx
+++ b/src/widgets/CapabilityText.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.
@@ -14,13 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Capability, EventDirection, MatrixCapabilities, WidgetEventCapability, WidgetKind } from "matrix-widget-api";
+import {
+    Capability,
+    EventDirection,
+    getTimelineRoomIDFromCapability,
+    isTimelineCapability,
+    isTimelineCapabilityFor,
+    MatrixCapabilities, Symbols,
+    WidgetEventCapability,
+    WidgetKind,
+} from "matrix-widget-api";
 import { _t, _td, TranslatedString } from "../languageHandler";
 import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
 import { ElementWidgetCapabilities } from "../stores/widgets/ElementWidgetCapabilities";
 import React from "react";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import TextWithTooltip from "../components/views/elements/TextWithTooltip";
 
-type GENERIC_WIDGET_KIND = "generic";
+type GENERIC_WIDGET_KIND = "generic"; // eslint-disable-line @typescript-eslint/naming-convention
 const GENERIC_WIDGET_KIND: GENERIC_WIDGET_KIND = "generic";
 
 interface ISendRecvStaticCapText {
@@ -125,7 +136,7 @@ export class CapabilityText {
         if (eventCap.isState) {
             return !eventCap.keyStr
                 ? _t("with an empty state key")
-                : _t("with state key %(stateKey)s", {stateKey: eventCap.keyStr});
+                : _t("with state key %(stateKey)s", { stateKey: eventCap.keyStr });
         }
         return null; // room messages are handled specially
     }
@@ -134,12 +145,35 @@ export class CapabilityText {
         // First see if we have a super simple line of text to provide back
         if (CapabilityText.simpleCaps[capability]) {
             const textForKind = CapabilityText.simpleCaps[capability];
-            if (textForKind[kind]) return {primary: _t(textForKind[kind])};
-            if (textForKind[GENERIC_WIDGET_KIND]) return {primary: _t(textForKind[GENERIC_WIDGET_KIND])};
+            if (textForKind[kind]) return { primary: _t(textForKind[kind]) };
+            if (textForKind[GENERIC_WIDGET_KIND]) return { primary: _t(textForKind[GENERIC_WIDGET_KIND]) };
 
             // ... we'll fall through to the generic capability processing at the end of this
-            // function if we fail to locate a simple string and the capability isn't for an
-            // event.
+            // function if we fail to generate a string for the capability.
+        }
+
+        // Try to handle timeline capabilities. The text here implies that the caller has sorted
+        // the timeline caps to the end for UI purposes.
+        if (isTimelineCapability(capability)) {
+            if (isTimelineCapabilityFor(capability, Symbols.AnyRoom)) {
+                return { primary: _t("The above, but in any room you are joined or invited to as well") };
+            } else {
+                const roomId = getTimelineRoomIDFromCapability(capability);
+                const room = MatrixClientPeg.get().getRoom(roomId);
+                return {
+                    primary: _t("The above, but in <Room /> as well", {}, {
+                        Room: () => {
+                            if (room) {
+                                return <TextWithTooltip tooltip={room.getCanonicalAlias() ?? roomId}>
+                                    <b>{ room.name }</b>
+                                </TextWithTooltip>;
+                            } else {
+                                return <b><code>{ roomId }</code></b>;
+                            }
+                        },
+                    }),
+                };
+            }
         }
 
         // We didn't have a super simple line of text, so try processing the capability as the
@@ -176,7 +210,7 @@ export class CapabilityText {
                         primary: _t("Send <b>%(eventType)s</b> events as you in this room", {
                             eventType: eventCap.eventType,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         }),
                         byline: CapabilityText.bylineFor(eventCap),
                     };
@@ -185,7 +219,7 @@ export class CapabilityText {
                         primary: _t("See <b>%(eventType)s</b> events posted to this room", {
                             eventType: eventCap.eventType,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         }),
                         byline: CapabilityText.bylineFor(eventCap),
                     };
@@ -196,7 +230,7 @@ export class CapabilityText {
                         primary: _t("Send <b>%(eventType)s</b> events as you in your active room", {
                             eventType: eventCap.eventType,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         }),
                         byline: CapabilityText.bylineFor(eventCap),
                     };
@@ -205,7 +239,7 @@ export class CapabilityText {
                         primary: _t("See <b>%(eventType)s</b> events posted to your active room", {
                             eventType: eventCap.eventType,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         }),
                         byline: CapabilityText.bylineFor(eventCap),
                     };
@@ -215,8 +249,8 @@ export class CapabilityText {
 
         // We don't have enough context to render this capability specially, so we'll present it as-is
         return {
-            primary: _t("The <b>%(capability)s</b> capability", {capability}, {
-                b: sub => <b>{sub}</b>,
+            primary: _t("The <b>%(capability)s</b> capability", { capability }, {
+                b: sub => <b>{ sub }</b>,
             }),
         };
     }
@@ -324,13 +358,13 @@ export class CapabilityText {
                         primary = _t("Send <b>%(msgtype)s</b> messages as you in this room", {
                             msgtype: eventCap.keyStr,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         });
                     } else {
                         primary = _t("Send <b>%(msgtype)s</b> messages as you in your active room", {
                             msgtype: eventCap.keyStr,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         });
                     }
                 } else {
@@ -338,17 +372,17 @@ export class CapabilityText {
                         primary = _t("See <b>%(msgtype)s</b> messages posted to this room", {
                             msgtype: eventCap.keyStr,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         });
                     } else {
                         primary = _t("See <b>%(msgtype)s</b> messages posted to your active room", {
                             msgtype: eventCap.keyStr,
                         }, {
-                            b: sub => <b>{sub}</b>,
+                            b: sub => <b>{ sub }</b>,
                         });
                     }
                 }
-                return {primary};
+                return { primary };
             }
         }
     }
diff --git a/src/widgets/Jitsi.ts b/src/widgets/Jitsi.ts
index ca8de4468a..cd31e57d7c 100644
--- a/src/widgets/Jitsi.ts
+++ b/src/widgets/Jitsi.ts
@@ -15,7 +15,9 @@ limitations under the License.
 */
 
 import SdkConfig from "../SdkConfig";
-import {MatrixClientPeg} from "../MatrixClientPeg";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+
+import { logger } from "matrix-js-sdk/src/logger";
 
 const JITSI_WK_PROPERTY = "im.vector.riot.jitsi";
 
@@ -69,7 +71,7 @@ export class Jitsi {
         // Start with a default of the config's domain
         let domain = (SdkConfig.get()['jitsi'] || {})['preferredDomain'] || 'jitsi.riot.im';
 
-        console.log("Attempting to get Jitsi conference information from homeserver");
+        logger.log("Attempting to get Jitsi conference information from homeserver");
         if (discoveryResponse && discoveryResponse[JITSI_WK_PROPERTY]) {
             const wkPreferredDomain = discoveryResponse[JITSI_WK_PROPERTY]['preferredDomain'];
             if (wkPreferredDomain) domain = wkPreferredDomain;
@@ -77,7 +79,7 @@ export class Jitsi {
 
         // Put the result into memory for us to use later
         this.domain = domain;
-        console.log("Jitsi conference domain:", this.preferredDomain);
+        logger.log("Jitsi conference domain:", this.preferredDomain);
     };
 
     /**
diff --git a/src/widgets/ManagedHybrid.ts b/src/widgets/ManagedHybrid.ts
index f05df0a6ce..2adb11da62 100644
--- a/src/widgets/ManagedHybrid.ts
+++ b/src/widgets/ManagedHybrid.ts
@@ -36,7 +36,7 @@ function getWidgetBuildUrl(): string {
         return SdkConfig.get().widget_build_url;
     }
     /* eslint-disable-next-line camelcase */
-    return getCallBehaviourWellKnown()?.widget_build_url
+    return getCallBehaviourWellKnown()?.widget_build_url;
 }
 
 export function isManagedHybridWidgetEnabled(): boolean {
diff --git a/src/workers/blurhash.worker.ts b/src/workers/blurhash.worker.ts
new file mode 100644
index 0000000000..031cc67c90
--- /dev/null
+++ b/src/workers/blurhash.worker.ts
@@ -0,0 +1,38 @@
+/*
+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 { encode } from "blurhash";
+
+const ctx: Worker = self as any;
+
+interface IBlurhashWorkerRequest {
+    seq: number;
+    imageData: ImageData;
+}
+
+ctx.addEventListener("message", (event: MessageEvent<IBlurhashWorkerRequest>): void => {
+    const { seq, imageData } = event.data;
+    const blurhash = encode(
+        imageData.data,
+        imageData.width,
+        imageData.height,
+        // use 4 components on the longer dimension, if square then both
+        imageData.width >= imageData.height ? 4 : 3,
+        imageData.height >= imageData.width ? 4 : 3,
+    );
+
+    ctx.postMessage({ seq, blurhash });
+});
diff --git a/src/workers/indexeddb.worker.ts b/src/workers/indexeddb.worker.ts
new file mode 100644
index 0000000000..a05add1c7d
--- /dev/null
+++ b/src/workers/indexeddb.worker.ts
@@ -0,0 +1,23 @@
+/*
+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 { IndexedDBStoreWorker } from "matrix-js-sdk/src/indexeddb-worker";
+
+const ctx: Worker = self as any;
+
+const remoteWorker = new IndexedDBStoreWorker(ctx.postMessage);
+
+ctx.onmessage = remoteWorker.onMessage;
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index 537f989b62..c46b24aa57 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -5,6 +5,6 @@ module.exports = {
 
     // mocha defines a 'this'
     rules: {
-        "babel/no-invalid-this": "off",
+        "@babel/no-invalid-this": "off",
     },
 };
diff --git a/test/CallHandler-test.ts b/test/CallHandler-test.ts
index 12316ac01c..1a4560ad4a 100644
--- a/test/CallHandler-test.ts
+++ b/test/CallHandler-test.ts
@@ -25,7 +25,6 @@ import DMRoomMap from '../src/utils/DMRoomMap';
 import EventEmitter from 'events';
 import SdkConfig from '../src/SdkConfig';
 import { ActionPayload } from '../src/dispatcher/payloads';
-import { Actions } from '../src/notifications/types';
 import { Action } from '../src/dispatcher/actions';
 
 const REAL_ROOM_ID = '$room1:example.org';
@@ -157,13 +156,14 @@ describe('CallHandler', () => {
         DMRoomMap.setShared(null);
         // @ts-ignore
         window.mxCallHandler = null;
+        fakeCall = null;
         MatrixClientPeg.unset();
 
         document.body.removeChild(audioElement);
         SdkConfig.unset();
     });
 
-    it('should look up the correct user and open the room when a phone number is dialled', async () => {
+    it('should look up the correct user and start a call in the room when a phone number is dialled', async () => {
         MatrixClientPeg.get().getThirdpartyUser = jest.fn().mockResolvedValue([{
             userid: '@user2:example.org',
             protocol: "im.vector.protocol.sip_native",
@@ -180,6 +180,9 @@ describe('CallHandler', () => {
 
         const viewRoomPayload = await untilDispatch('view_room');
         expect(viewRoomPayload.room_id).toEqual(MAPPED_ROOM_ID);
+
+        // Check that a call was started
+        expect(fakeCall.roomId).toEqual(MAPPED_ROOM_ID);
     });
 
     it('should move calls between rooms when remote asserted identity changes', async () => {
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 7a6a42ef55..bc751ba44e 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -30,9 +30,7 @@ function createFailedDecryptionEvent() {
     const event = new MatrixEvent({
         event_id: "event-id-" + Math.random().toString(16).slice(2),
     });
-    event._setClearData(
-        event._badEncryptedMessage(":("),
-    );
+    event.setClearData(event.badEncryptedMessage(":("));
     return event;
 }
 
@@ -67,7 +65,7 @@ describe('DecryptionFailureTracker', function() {
         tracker.eventDecrypted(decryptedEvent, err);
 
         // Indicate successful decryption: clear data can be anything where the msgtype is not m.bad.encrypted
-        decryptedEvent._setClearData({});
+        decryptedEvent.setClearData({});
         tracker.eventDecrypted(decryptedEvent, null);
 
         // Pretend "now" is Infinity
diff --git a/test/KeyBindingsManager-test.ts b/test/KeyBindingsManager-test.ts
index 41614b61fa..eab1bea2b0 100644
--- a/test/KeyBindingsManager-test.ts
+++ b/test/KeyBindingsManager-test.ts
@@ -15,20 +15,19 @@ limitations under the License.
 */
 
 import { isKeyComboMatch, KeyCombo } from '../src/KeyBindingsManager';
-const assert = require('assert');
 
 function mockKeyEvent(key: string, modifiers?: {
-    ctrlKey?: boolean,
-    altKey?: boolean,
-    shiftKey?: boolean,
-    metaKey?: boolean
+    ctrlKey?: boolean;
+    altKey?: boolean;
+    shiftKey?: boolean;
+    metaKey?: boolean;
 }): KeyboardEvent {
     return {
         key,
         ctrlKey: modifiers?.ctrlKey ?? false,
         altKey: modifiers?.altKey ?? false,
         shiftKey: modifiers?.shiftKey ?? false,
-        metaKey: modifiers?.metaKey ?? false
+        metaKey: modifiers?.metaKey ?? false,
     } as KeyboardEvent;
 }
 
@@ -37,9 +36,8 @@ describe('KeyBindingsManager', () => {
         const combo1: KeyCombo = {
             key: 'k',
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo1, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n'), combo1, false), false);
-
+        expect(isKeyComboMatch(mockKeyEvent('k'), combo1, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n'), combo1, false)).toBe(false);
     });
 
     it('should match key + modifier key combo', () => {
@@ -47,38 +45,38 @@ describe('KeyBindingsManager', () => {
             key: 'k',
             ctrlKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, metaKey: true }), combo, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k'), combo, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, metaKey: true }), combo, false)).toBe(false);
 
         const combo2: KeyCombo = {
             key: 'k',
             metaKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo2, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { metaKey: true }), combo2, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo2, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { altKey: true, metaKey: true }), combo2, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo2, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n', { metaKey: true }), combo2, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k'), combo2, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { altKey: true, metaKey: true }), combo2, false)).toBe(false);
 
         const combo3: KeyCombo = {
             key: 'k',
             altKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { altKey: true }), combo3, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { altKey: true }), combo3, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo3, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo3, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { altKey: true }), combo3, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n', { altKey: true }), combo3, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k'), combo3, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo3, false)).toBe(false);
 
         const combo4: KeyCombo = {
             key: 'k',
             shiftKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo4, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { shiftKey: true }), combo4, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo4, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, ctrlKey: true }), combo4, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo4, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n', { shiftKey: true }), combo4, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k'), combo4, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, ctrlKey: true }), combo4, false)).toBe(false);
     });
 
     it('should match key + multiple modifiers key combo', () => {
@@ -87,11 +85,11 @@ describe('KeyBindingsManager', () => {
             ctrlKey: true,
             altKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true, altKey: true }), combo, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true, shiftKey: true }), combo,
-            false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true, altKey: true }), combo, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true, shiftKey: true }), combo,
+            false)).toBe(false);
 
         const combo2: KeyCombo = {
             key: 'k',
@@ -99,13 +97,13 @@ describe('KeyBindingsManager', () => {
             shiftKey: true,
             altKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, shiftKey: true, altKey: true }), combo2,
-            false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true, shiftKey: true, altKey: true }), combo2,
-            false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo2, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k',
-            { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo2, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, shiftKey: true, altKey: true }), combo2,
+            false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true, shiftKey: true, altKey: true }), combo2,
+            false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo2, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k',
+            { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo2, false)).toBe(false);
 
         const combo3: KeyCombo = {
             key: 'k',
@@ -114,12 +112,12 @@ describe('KeyBindingsManager', () => {
             altKey: true,
             metaKey: true,
         };
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k',
-            { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo3, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n',
-            { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo3, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k',
-            { ctrlKey: true, shiftKey: true, altKey: true }), combo3, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k',
+            { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo3, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('n',
+            { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo3, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('k',
+            { ctrlKey: true, shiftKey: true, altKey: true }), combo3, false)).toBe(false);
     });
 
     it('should match ctrlOrMeta key combo', () => {
@@ -128,13 +126,13 @@ describe('KeyBindingsManager', () => {
             ctrlOrCmd: true,
         };
         // PC:
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo, false), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo, false)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, false)).toBe(false);
         // MAC:
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo, true), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, true), false);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, true), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo, true)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, true)).toBe(false);
+        expect(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, true)).toBe(false);
     });
 
     it('should match advanced ctrlOrMeta key combo', () => {
@@ -144,10 +142,10 @@ describe('KeyBindingsManager', () => {
             altKey: true,
         };
         // PC:
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, false), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true, altKey: true }), combo, false), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, false)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('k', { metaKey: true, altKey: true }), combo, false)).toBe(false);
         // MAC:
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true, altKey: true }), combo, true), true);
-        assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, true), false);
+        expect(isKeyComboMatch(mockKeyEvent('k', { metaKey: true, altKey: true }), combo, true)).toBe(true);
+        expect(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, true)).toBe(false);
     });
 });
diff --git a/test/PosthogAnalytics-test.ts b/test/PosthogAnalytics-test.ts
new file mode 100644
index 0000000000..65af8b51f3
--- /dev/null
+++ b/test/PosthogAnalytics-test.ts
@@ -0,0 +1,224 @@
+/*
+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 {
+    Anonymity,
+    getRedactedCurrentLocation,
+    IAnonymousEvent,
+    IPseudonymousEvent,
+    IRoomEvent,
+    PosthogAnalytics,
+} from '../src/PosthogAnalytics';
+
+import SdkConfig from '../src/SdkConfig';
+
+class FakePosthog {
+    public capture;
+    public init;
+    public identify;
+    public reset;
+    public register;
+
+    constructor() {
+        this.capture = jest.fn();
+        this.init = jest.fn();
+        this.identify = jest.fn();
+        this.reset = jest.fn();
+        this.register = jest.fn();
+    }
+}
+
+export interface ITestEvent extends IAnonymousEvent {
+    key: "jest_test_event";
+    properties: {
+        foo: string;
+    };
+}
+
+export interface ITestPseudonymousEvent extends IPseudonymousEvent {
+    key: "jest_test_pseudo_event";
+    properties: {
+        foo: string;
+    };
+}
+
+export interface ITestRoomEvent extends IRoomEvent {
+    key: "jest_test_room_event";
+    properties: {
+        foo: string;
+    };
+}
+
+describe("PosthogAnalytics", () => {
+    let fakePosthog: FakePosthog;
+    const shaHashes = {
+        "42": "73475cb40a568e8da8a045ced110137e159f890ac4da883b6b17dc651b3a8049",
+        "some": "a6b46dd0d1ae5e86cbc8f37e75ceeb6760230c1ca4ffbcb0c97b96dd7d9c464b",
+        "pii": "bd75b3e080945674c0351f75e0db33d1e90986fa07b318ea7edf776f5eef38d4",
+        "foo": "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae",
+    };
+
+    beforeEach(() => {
+        fakePosthog = new FakePosthog();
+
+        window.crypto = {
+            subtle: {
+                digest: async (_, encodedMessage) => {
+                    const message = new TextDecoder().decode(encodedMessage);
+                    const hexHash = shaHashes[message];
+                    const bytes = [];
+                    for (let c = 0; c < hexHash.length; c += 2) {
+                        bytes.push(parseInt(hexHash.substr(c, 2), 16));
+                    }
+                    return bytes;
+                },
+            },
+        };
+    });
+
+    afterEach(() => {
+        window.crypto = null;
+    });
+
+    describe("Initialisation", () => {
+        it("Should not be enabled without config being set", () => {
+            jest.spyOn(SdkConfig, "get").mockReturnValue({});
+            const analytics = new PosthogAnalytics(fakePosthog);
+            expect(analytics.isEnabled()).toBe(false);
+        });
+
+        it("Should be enabled if config is set", () => {
+            jest.spyOn(SdkConfig, "get").mockReturnValue({
+                posthog: {
+                    projectApiKey: "foo",
+                    apiHost: "bar",
+                },
+            });
+            const analytics = new PosthogAnalytics(fakePosthog);
+            analytics.setAnonymity(Anonymity.Pseudonymous);
+            expect(analytics.isEnabled()).toBe(true);
+        });
+    });
+
+    describe("Tracking", () => {
+        let analytics: PosthogAnalytics;
+
+        beforeEach(() => {
+            jest.spyOn(SdkConfig, "get").mockReturnValue({
+                posthog: {
+                    projectApiKey: "foo",
+                    apiHost: "bar",
+                },
+            });
+
+            analytics = new PosthogAnalytics(fakePosthog);
+        });
+
+        it("Should pass trackAnonymousEvent() to posthog", async () => {
+            analytics.setAnonymity(Anonymity.Pseudonymous);
+            await analytics.trackAnonymousEvent<ITestEvent>("jest_test_event", {
+                foo: "bar",
+            });
+            expect(fakePosthog.capture.mock.calls[0][0]).toBe("jest_test_event");
+            expect(fakePosthog.capture.mock.calls[0][1]["foo"]).toEqual("bar");
+        });
+
+        it("Should pass trackPseudonymousEvent() to posthog", async () => {
+            analytics.setAnonymity(Anonymity.Pseudonymous);
+            await analytics.trackPseudonymousEvent<ITestEvent>("jest_test_pseudo_event", {
+                foo: "bar",
+            });
+            expect(fakePosthog.capture.mock.calls[0][0]).toBe("jest_test_pseudo_event");
+            expect(fakePosthog.capture.mock.calls[0][1]["foo"]).toEqual("bar");
+        });
+
+        it("Should not track pseudonymous messages if anonymous", async () => {
+            analytics.setAnonymity(Anonymity.Anonymous);
+            await analytics.trackPseudonymousEvent<ITestEvent>("jest_test_event", {
+                foo: "bar",
+            });
+            expect(fakePosthog.capture.mock.calls.length).toBe(0);
+        });
+
+        it("Should not track any events if disabled", async () => {
+            analytics.setAnonymity(Anonymity.Disabled);
+            await analytics.trackPseudonymousEvent<ITestEvent>("jest_test_event", {
+                foo: "bar",
+            });
+            await analytics.trackAnonymousEvent<ITestEvent>("jest_test_event", {
+                foo: "bar",
+            });
+            await analytics.trackPageView(200);
+            expect(fakePosthog.capture.mock.calls.length).toBe(0);
+        });
+
+        it("Should pseudonymise a location of a known screen", async () => {
+            const location = await getRedactedCurrentLocation(
+                "https://foo.bar", "#/register/some/pii", "/", Anonymity.Pseudonymous);
+            expect(location).toBe("https://foo.bar/#/register/<redacted>");
+        });
+
+        it("Should anonymise a location of a known screen", async () => {
+            const location = await getRedactedCurrentLocation(
+                "https://foo.bar", "#/register/some/pii", "/", Anonymity.Anonymous);
+            expect(location).toBe("https://foo.bar/#/register/<redacted>");
+        });
+
+        it("Should pseudonymise a location of an unknown screen", async () => {
+            const location = await getRedactedCurrentLocation(
+                "https://foo.bar", "#/not_a_screen_name/some/pii", "/", Anonymity.Pseudonymous);
+            expect(location).toBe("https://foo.bar/#/<redacted_screen_name>/<redacted>");
+        });
+
+        it("Should anonymise a location of an unknown screen", async () => {
+            const location = await getRedactedCurrentLocation(
+                "https://foo.bar", "#/not_a_screen_name/some/pii", "/", Anonymity.Anonymous);
+            expect(location).toBe("https://foo.bar/#/<redacted_screen_name>/<redacted>");
+        });
+
+        it("Should handle an empty hash", async () => {
+            const location = await getRedactedCurrentLocation(
+                "https://foo.bar", "", "/", Anonymity.Anonymous);
+            expect(location).toBe("https://foo.bar/");
+        });
+
+        it("Should identify the user to posthog if pseudonymous", async () => {
+            analytics.setAnonymity(Anonymity.Pseudonymous);
+            class FakeClient {
+                getAccountDataFromServer = jest.fn().mockResolvedValue(null);
+                setAccountData = jest.fn().mockResolvedValue({});
+            }
+            await analytics.identifyUser(new FakeClient(), () => "analytics_id" );
+            expect(fakePosthog.identify.mock.calls[0][0]).toBe("analytics_id");
+        });
+
+        it("Should not identify the user to posthog if anonymous", async () => {
+            analytics.setAnonymity(Anonymity.Anonymous);
+            await analytics.identifyUser(null);
+            expect(fakePosthog.identify.mock.calls.length).toBe(0);
+        });
+
+        it("Should identify using the server's analytics id if present", async () => {
+            analytics.setAnonymity(Anonymity.Pseudonymous);
+            class FakeClient {
+                getAccountDataFromServer = jest.fn().mockResolvedValue({ id: "existing_analytics_id" });
+                setAccountData = jest.fn().mockResolvedValue({});
+            }
+            await analytics.identifyUser(new FakeClient(), () => "new_analytics_id" );
+            expect(fakePosthog.identify.mock.calls[0][0]).toBe("existing_analytics_id");
+        });
+    });
+});
diff --git a/test/ScalarAuthClient-test.js b/test/ScalarAuthClient-test.js
index 3435f70932..a597c2cb2e 100644
--- a/test/ScalarAuthClient-test.js
+++ b/test/ScalarAuthClient-test.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import ScalarAuthClient from '../src/ScalarAuthClient';
-import {MatrixClientPeg} from '../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../src/MatrixClientPeg';
 import { stubClient } from './test-utils';
 
 describe('ScalarAuthClient', function() {
diff --git a/test/Terms-test.js b/test/Terms-test.js
index 3835af3ede..58ba688395 100644
--- a/test/Terms-test.js
+++ b/test/Terms-test.js
@@ -18,7 +18,7 @@ import * as Matrix from 'matrix-js-sdk';
 
 import { startTermsFlow, Service } from '../src/Terms';
 import { stubClient } from './test-utils';
-import {MatrixClientPeg} from '../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../src/MatrixClientPeg';
 
 const POLICY_ONE = {
     version: "six",
diff --git a/test/TextForEvent-test.ts b/test/TextForEvent-test.ts
new file mode 100644
index 0000000000..b8a459af67
--- /dev/null
+++ b/test/TextForEvent-test.ts
@@ -0,0 +1,129 @@
+import './skinned-sdk';
+
+import { textForEvent } from "../src/TextForEvent";
+import { MatrixEvent } from "matrix-js-sdk";
+import SettingsStore from "../src/settings/SettingsStore";
+import { SettingLevel } from "../src/settings/SettingLevel";
+import renderer from 'react-test-renderer';
+
+function mockPinnedEvent(
+    pinnedMessageIds?: string[],
+    prevPinnedMessageIds?: string[],
+): MatrixEvent {
+    return new MatrixEvent({
+        type: "m.room.pinned_events",
+        state_key: "",
+        sender: "@foo:example.com",
+        content: {
+            pinned: pinnedMessageIds,
+        },
+        prev_content: {
+            pinned: prevPinnedMessageIds,
+        },
+    });
+}
+
+// Helper function that renders a component to a plain text string.
+// Once snapshots are introduced in tests, this function will no longer be necessary,
+// and should be replaced with snapshots.
+function renderComponent(component): string {
+    const serializeObject = (object): string => {
+        if (typeof object === 'string') {
+            return object === ' ' ? '' : object;
+        }
+
+        if (Array.isArray(object) && object.length === 1 && typeof object[0] === 'string') {
+            return object[0];
+        }
+
+        if (object['type'] !== undefined && typeof object['children'] !== undefined) {
+            return serializeObject(object.children);
+        }
+
+        if (!Array.isArray(object)) {
+            return '';
+        }
+
+        return object.map(child => {
+            return serializeObject(child);
+        }).join('');
+    };
+
+    return serializeObject(component.toJSON());
+}
+
+describe('TextForEvent', () => {
+    describe("TextForPinnedEvent", () => {
+        SettingsStore.setValue("feature_pinning", null, SettingLevel.DEVICE, true);
+
+        it("mentions message when a single message was pinned, with no previously pinned messages", () => {
+            const event = mockPinnedEvent(['message-1']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com pinned a message to this room. See all pinned messages.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+
+        it("mentions message when a single message was pinned, with multiple previously pinned messages", () => {
+            const event = mockPinnedEvent(['message-1', 'message-2', 'message-3'], ['message-1', 'message-2']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com pinned a message to this room. See all pinned messages.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+
+        it("mentions message when a single message was unpinned, with a single message previously pinned", () => {
+            const event = mockPinnedEvent([], ['message-1']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com unpinned a message from this room. See all pinned messages.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+
+        it("mentions message when a single message was unpinned, with multiple previously pinned messages", () => {
+            const event = mockPinnedEvent(['message-2'], ['message-1', 'message-2']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com unpinned a message from this room. See all pinned messages.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+
+        it("shows generic text when multiple messages were pinned", () => {
+            const event = mockPinnedEvent(['message-1', 'message-2', 'message-3'], ['message-1']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com changed the pinned messages for the room.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+
+        it("shows generic text when multiple messages were unpinned", () => {
+            const event = mockPinnedEvent(['message-3'], ['message-1', 'message-2', 'message-3']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com changed the pinned messages for the room.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+
+        it("shows generic text when one message was pinned, and another unpinned", () => {
+            const event = mockPinnedEvent(['message-2'], ['message-1']);
+            const plainText = textForEvent(event);
+            const component = renderer.create(textForEvent(event, true));
+
+            const expectedText = "@foo:example.com changed the pinned messages for the room.";
+            expect(plainText).toBe(expectedText);
+            expect(renderComponent(component)).toBe(expectedText);
+        });
+    });
+});
diff --git a/test/accessibility/RovingTabIndex-test.js b/test/accessibility/RovingTabIndex-test.js
index 5aa93f99f3..72d4253710 100644
--- a/test/accessibility/RovingTabIndex-test.js
+++ b/test/accessibility/RovingTabIndex-test.js
@@ -16,7 +16,7 @@ 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 Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure, mount } from "enzyme";
 
 import {
@@ -48,7 +48,7 @@ const button4 = <Button key={4}>d</Button>;
 describe("RovingTabIndex", () => {
     it("RovingTabIndexProvider renders children as expected", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            {() => <div><span>Test</span></div>}
+            { () => <div><span>Test</span></div> }
         </RovingTabIndexProvider>);
         expect(wrapper.text()).toBe("Test");
         expect(wrapper.html()).toBe('<div><span>Test</span></div>');
@@ -56,11 +56,11 @@ describe("RovingTabIndex", () => {
 
     it("RovingTabIndexProvider works as expected with useRovingTabIndex", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            {() => <React.Fragment>
+            { () => <React.Fragment>
                 { button1 }
                 { button2 }
                 { button3 }
-            </React.Fragment>}
+            </React.Fragment> }
         </RovingTabIndexProvider>);
 
         // should begin with 0th being active
@@ -98,15 +98,15 @@ describe("RovingTabIndex", () => {
 
     it("RovingTabIndexProvider works as expected with RovingTabIndexWrapper", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            {() => <React.Fragment>
+            { () => <React.Fragment>
                 { button1 }
                 { button2 }
                 <RovingTabIndexWrapper>
-                    {({onFocus, isActive, ref}) =>
+                    { ({ onFocus, isActive, ref }) =>
                         <button onFocus={onFocus} tabIndex={isActive ? 0 : -1} ref={ref}>.</button>
                     }
                 </RovingTabIndexWrapper>
-            </React.Fragment>}
+            </React.Fragment> }
         </RovingTabIndexProvider>);
 
         // should begin with 0th being active
@@ -119,4 +119,3 @@ describe("RovingTabIndex", () => {
     });
 });
 
-
diff --git a/test/autocomplete/QueryMatcher-test.js b/test/autocomplete/QueryMatcher-test.js
index cae71841d4..72f894c678 100644
--- a/test/autocomplete/QueryMatcher-test.js
+++ b/test/autocomplete/QueryMatcher-test.js
@@ -31,7 +31,7 @@ const NONWORDOBJECTS = [
 
 describe('QueryMatcher', function() {
     it('Returns results by key', function() {
-        const qm = new QueryMatcher(OBJECTS, {keys: ["name"]});
+        const qm = new QueryMatcher(OBJECTS, { keys: ["name"] });
         const results = qm.match('Geri');
 
         expect(results.length).toBe(1);
@@ -39,7 +39,7 @@ describe('QueryMatcher', function() {
     });
 
     it('Returns results by prefix', function() {
-        const qm = new QueryMatcher(OBJECTS, {keys: ["name"]});
+        const qm = new QueryMatcher(OBJECTS, { keys: ["name"] });
         const results = qm.match('Ge');
 
         expect(results.length).toBe(1);
@@ -47,7 +47,7 @@ describe('QueryMatcher', function() {
     });
 
     it('Matches case-insensitive', function() {
-        const qm = new QueryMatcher(OBJECTS, {keys: ["name"]});
+        const qm = new QueryMatcher(OBJECTS, { keys: ["name"] });
         const results = qm.match('geri');
 
         expect(results.length).toBe(1);
@@ -55,7 +55,7 @@ describe('QueryMatcher', function() {
     });
 
     it('Matches ignoring accents', function() {
-        const qm = new QueryMatcher([{name: "Gëri", foo: 46}], {keys: ["name"]});
+        const qm = new QueryMatcher([{ name: "Gëri", foo: 46 }], { keys: ["name"] });
         const results = qm.match('geri');
 
         expect(results.length).toBe(1);
@@ -63,14 +63,13 @@ describe('QueryMatcher', function() {
     });
 
     it('Returns multiple results in order of search string appearance', function() {
-        const qm = new QueryMatcher(OBJECTS, {keys: ["name", "nick"]});
+        const qm = new QueryMatcher(OBJECTS, { keys: ["name", "nick"] });
         const results = qm.match('or');
 
         expect(results.length).toBe(2);
         expect(results[0].name).toBe('Mel C');
         expect(results[1].name).toBe('Victoria');
 
-
         qm.setObjects(OBJECTS.slice().reverse());
         const reverseResults = qm.match('or');
 
@@ -87,7 +86,7 @@ describe('QueryMatcher', function() {
             { name: "b", first: "miss", second: "hit", third: "miss" },
             { name: "c", first: "miss", second: "miss", third: "hit" },
         ];
-        const qm = new QueryMatcher(objects, {keys: ["second", "first", "third"]});
+        const qm = new QueryMatcher(objects, { keys: ["second", "first", "third"] });
         const results = qm.match('hit');
 
         expect(results.length).toBe(3);
@@ -95,7 +94,6 @@ describe('QueryMatcher', function() {
         expect(results[1].name).toBe('a');
         expect(results[2].name).toBe('c');
 
-
         qm.setObjects(objects.slice().reverse());
 
         const reverseResults = qm.match('hit');
@@ -109,14 +107,13 @@ describe('QueryMatcher', function() {
     });
 
     it('Returns results with search string in same place and key in same place in insertion order', function() {
-        const qm = new QueryMatcher(OBJECTS, {keys: ["name"]});
+        const qm = new QueryMatcher(OBJECTS, { keys: ["name"] });
         const results = qm.match('Mel');
 
         expect(results.length).toBe(2);
         expect(results[0].name).toBe('Mel B');
         expect(results[1].name).toBe('Mel C');
 
-
         qm.setObjects(OBJECTS.slice().reverse());
 
         const reverseResults = qm.match('Mel');
@@ -129,9 +126,9 @@ describe('QueryMatcher', function() {
     it('Returns numeric results in correct order (input pos)', function() {
         // regression test for depending on object iteration order
         const qm = new QueryMatcher([
-            {name: "123456badger"},
-            {name: "123456"},
-        ], {keys: ["name"]});
+            { name: "123456badger" },
+            { name: "123456" },
+        ], { keys: ["name"] });
         const results = qm.match('123456');
 
         expect(results.length).toBe(2);
@@ -141,9 +138,9 @@ describe('QueryMatcher', function() {
 
     it('Returns numeric results in correct order (query pos)', function() {
         const qm = new QueryMatcher([
-            {name: "999999123456"},
-            {name: "123456badger"},
-        ], {keys: ["name"]});
+            { name: "999999123456" },
+            { name: "123456badger" },
+        ], { keys: ["name"] });
         const results = qm.match('123456');
 
         expect(results.length).toBe(2);
diff --git a/test/components/structures/CallEventGrouper-test.ts b/test/components/structures/CallEventGrouper-test.ts
new file mode 100644
index 0000000000..5719d92902
--- /dev/null
+++ b/test/components/structures/CallEventGrouper-test.ts
@@ -0,0 +1,140 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 "../../skinned-sdk";
+import { stubClient } from '../../test-utils';
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
+import { MatrixClient } from 'matrix-js-sdk';
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import CallEventGrouper, { CustomCallState } from "../../../src/components/structures/CallEventGrouper";
+import { CallState } from "matrix-js-sdk/src/webrtc/call";
+
+const MY_USER_ID = "@me:here";
+const THEIR_USER_ID = "@they:here";
+
+let client: MatrixClient;
+
+describe('CallEventGrouper', () => {
+    beforeEach(() => {
+        stubClient();
+        client = MatrixClientPeg.get();
+        client.getUserId = () => {
+            return MY_USER_ID;
+        };
+    });
+
+    it("detects a missed call", () => {
+        const grouper = new CallEventGrouper();
+
+        grouper.add({
+            getContent: () => {
+                return {
+                    call_id: "callId",
+                };
+            },
+            getType: () => {
+                return EventType.CallInvite;
+            },
+            sender: {
+                userId: THEIR_USER_ID,
+            },
+        });
+
+        expect(grouper.state).toBe(CustomCallState.Missed);
+    });
+
+    it("detects an ended call", () => {
+        const grouperHangup = new CallEventGrouper();
+        const grouperReject = new CallEventGrouper();
+
+        grouperHangup.add({
+            getContent: () => {
+                return {
+                    call_id: "callId",
+                };
+            },
+            getType: () => {
+                return EventType.CallInvite;
+            },
+            sender: {
+                userId: MY_USER_ID,
+            },
+        });
+        grouperHangup.add({
+            getContent: () => {
+                return {
+                    call_id: "callId",
+                };
+            },
+            getType: () => {
+                return EventType.CallHangup;
+            },
+            sender: {
+                userId: THEIR_USER_ID,
+            },
+        });
+
+        grouperReject.add({
+            getContent: () => {
+                return {
+                    call_id: "callId",
+                };
+            },
+            getType: () => {
+                return EventType.CallInvite;
+            },
+            sender: {
+                userId: MY_USER_ID,
+            },
+        });
+        grouperReject.add({
+            getContent: () => {
+                return {
+                    call_id: "callId",
+                };
+            },
+            getType: () => {
+                return EventType.CallReject;
+            },
+            sender: {
+                userId: THEIR_USER_ID,
+            },
+        });
+
+        expect(grouperHangup.state).toBe(CallState.Ended);
+        expect(grouperReject.state).toBe(CallState.Ended);
+    });
+
+    it("detects call type", () => {
+        const grouper = new CallEventGrouper();
+
+        grouper.add({
+            getContent: () => {
+                return {
+                    call_id: "callId",
+                    offer: {
+                        sdp: "this is definitely an SDP m=video",
+                    },
+                };
+            },
+            getType: () => {
+                return EventType.CallInvite;
+            },
+        });
+
+        expect(grouper.isVoice).toBe(false);
+    });
+});
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index ee5d1b6912..2ff1257d32 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -19,7 +19,7 @@ import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 
 import MockHttpBackend from 'matrix-mock-request';
-import {MatrixClientPeg} from '../../../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
 import sdk from '../../skinned-sdk';
 import Matrix from 'matrix-js-sdk';
 
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 5b466b4bb0..dea5bcefb7 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -26,13 +26,13 @@ import { EventEmitter } from "events";
 import sdk from '../../skinned-sdk';
 
 const MessagePanel = sdk.getComponent('structures.MessagePanel');
-import {MatrixClientPeg} from '../../../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
 import Matrix from 'matrix-js-sdk';
 
-const test_utils = require('../../test-utils');
-const mockclock = require('../../mock-clock');
+const TestUtilsMatrix = require('../../test-utils');
+import FakeTimers from '@sinonjs/fake-timers';
 
-import Adapter from "enzyme-adapter-react-16";
+import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure, mount } from "enzyme";
 
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
@@ -42,7 +42,7 @@ import DMRoomMap from "../../../src/utils/DMRoomMap";
 configure({ adapter: new Adapter() });
 
 let client;
-const room = new Matrix.Room();
+const room = new Matrix.Room("!roomId:server_name");
 
 // wrap MessagePanel with a component which provides the MatrixClient in the context.
 class WrappedMessagePanel extends React.Component {
@@ -51,8 +51,20 @@ class WrappedMessagePanel extends React.Component {
     };
 
     render() {
+        const roomContext = {
+            room,
+            roomId: room.roomId,
+            canReact: true,
+            canReply: true,
+            showReadReceipts: true,
+            showRedactions: false,
+            showJoinLeaves: false,
+            showAvatarChanges: false,
+            showDisplaynameChanges: true,
+        };
+
         return <MatrixClientContext.Provider value={client}>
-            <RoomContext.Provider value={{ canReact: true, canReply: true, room, roomId: room.roomId }}>
+            <RoomContext.Provider value={roomContext}>
                 <MessagePanel room={room} {...this.props} resizeNotifier={this.state.resizeNotifier} />
             </RoomContext.Provider>
         </MatrixClientContext.Provider>;
@@ -60,14 +72,14 @@ class WrappedMessagePanel extends React.Component {
 }
 
 describe('MessagePanel', function() {
-    const clock = mockclock.clock();
+    let clock = null;
     const realSetTimeout = window.setTimeout;
     const events = mkEvents();
 
     beforeEach(function() {
-        test_utils.stubClient();
+        TestUtilsMatrix.stubClient();
         client = MatrixClientPeg.get();
-        client.credentials = {userId: '@me:here'};
+        client.credentials = { userId: '@me:here' };
 
         // HACK: We assume all settings want to be disabled
         SettingsStore.getValue = jest.fn((arg) => {
@@ -77,15 +89,18 @@ describe('MessagePanel', function() {
         DMRoomMap.makeShared();
     });
 
-    afterEach(function () {
-        clock.uninstall();
+    afterEach(function() {
+        if (clock) {
+            clock.uninstall();
+            clock = null;
+        }
     });
 
     function mkEvents() {
         const events = [];
         const ts0 = Date.now();
         for (let i = 0; i < 10; i++) {
-            events.push(test_utils.mkMessage(
+            events.push(TestUtilsMatrix.mkMessage(
                 {
                     event: true, room: "!room:id", user: "@user:id",
                     ts: ts0 + i * 1000,
@@ -99,7 +114,7 @@ describe('MessagePanel', function() {
         const events = [];
         const ts0 = Date.parse('09 May 2004 00:12:00 GMT');
         for (let i = 0; i < 10; i++) {
-            events.push(test_utils.mkMessage(
+            events.push(TestUtilsMatrix.mkMessage(
                 {
                     event: true, room: "!room:id", user: "@user:id",
                     ts: ts0 + i * 1000,
@@ -108,7 +123,6 @@ describe('MessagePanel', function() {
         return events;
     }
 
-
     // make a collection of events with some member events that should be collapsed
     // with a MemberEventListSummary
     function mkMelsEvents() {
@@ -116,13 +130,13 @@ describe('MessagePanel', function() {
         const ts0 = Date.now();
 
         let i = 0;
-        events.push(test_utils.mkMessage({
+        events.push(TestUtilsMatrix.mkMessage({
             event: true, room: "!room:id", user: "@user:id",
             ts: ts0 + ++i * 1000,
         }));
 
         for (i = 0; i < 10; i++) {
-            events.push(test_utils.mkMembership({
+            events.push(TestUtilsMatrix.mkMembership({
                 event: true, room: "!room:id", user: "@user:id",
                 target: {
                     userId: "@user:id",
@@ -139,7 +153,7 @@ describe('MessagePanel', function() {
             }));
         }
 
-        events.push(test_utils.mkMessage({
+        events.push(TestUtilsMatrix.mkMessage({
             event: true, room: "!room:id", user: "@user:id",
             ts: ts0 + ++i*1000,
         }));
@@ -155,7 +169,7 @@ describe('MessagePanel', function() {
         let i = 0;
 
         for (i = 0; i < 10; i++) {
-            events.push(test_utils.mkMembership({
+            events.push(TestUtilsMatrix.mkMembership({
                 event: true, room: "!room:id", user: "@user:id",
                 target: {
                     userId: "@user:id",
@@ -177,8 +191,8 @@ describe('MessagePanel', function() {
 
     // A list of room creation, encryption, and invite events.
     function mkCreationEvents() {
-        const mkEvent = test_utils.mkEvent;
-        const mkMembership = test_utils.mkMembership;
+        const mkEvent = TestUtilsMatrix.mkEvent;
+        const mkMembership = TestUtilsMatrix.mkMembership;
         const roomId = "!someroom";
         const alice = "@alice:example.org";
         const ts0 = Date.now();
@@ -270,7 +284,7 @@ describe('MessagePanel', function() {
 
     it('should show the events', function() {
         const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={events} />,
+            <WrappedMessagePanel className="cls" events={events} />,
         );
 
         // just check we have the right number of tiles for now
@@ -298,8 +312,12 @@ describe('MessagePanel', function() {
 
     it('should insert the read-marker in the right place', function() {
         const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
-                    readMarkerVisible={true} />,
+            <WrappedMessagePanel
+                className="cls"
+                events={events}
+                readMarkerEventId={events[4].getId()}
+                readMarkerVisible={true}
+            />,
         );
 
         const tiles = TestUtils.scryRenderedComponentsWithType(
@@ -316,8 +334,12 @@ describe('MessagePanel', function() {
     it('should show the read-marker that fall in summarised events after the summary', function() {
         const melsEvents = mkMelsEvents();
         const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={melsEvents} readMarkerEventId={melsEvents[4].getId()}
-                    readMarkerVisible={true} />,
+            <WrappedMessagePanel
+                className="cls"
+                events={melsEvents}
+                readMarkerEventId={melsEvents[4].getId()}
+                readMarkerVisible={true}
+            />,
         );
 
         const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
@@ -334,8 +356,12 @@ describe('MessagePanel', function() {
     it('should hide the read-marker at the end of summarised events', function() {
         const melsEvents = mkMelsEventsOnly();
         const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={melsEvents} readMarkerEventId={melsEvents[9].getId()}
-                    readMarkerVisible={true} />,
+            <WrappedMessagePanel
+                className="cls"
+                events={melsEvents}
+                readMarkerEventId={melsEvents[9].getId()}
+                readMarkerVisible={true}
+            />,
         );
 
         const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
@@ -351,16 +377,18 @@ describe('MessagePanel', function() {
 
     it('shows a ghost read-marker when the read-marker moves', function(done) {
         // fake the clock so that we can test the velocity animation.
-        clock.install();
-        clock.mockDate();
+        clock = FakeTimers.install();
 
         const parentDiv = document.createElement('div');
 
         // first render with the RM in one place
         let mp = ReactDOM.render(
-                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
-                    readMarkerVisible={true}
-                />, parentDiv);
+            <WrappedMessagePanel
+                className="cls"
+                events={events}
+                readMarkerEventId={events[4].getId()}
+                readMarkerVisible={true}
+            />, parentDiv);
 
         const tiles = TestUtils.scryRenderedComponentsWithType(
             mp, sdk.getComponent('rooms.EventTile'));
@@ -374,9 +402,12 @@ describe('MessagePanel', function() {
 
         // now move the RM
         mp = ReactDOM.render(
-                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[6].getId()}
-                    readMarkerVisible={true}
-                />, parentDiv);
+            <WrappedMessagePanel
+                className="cls"
+                events={events}
+                readMarkerEventId={events[6].getId()}
+                readMarkerVisible={true}
+            />, parentDiv);
 
         // now there should be two RM containers
         const found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
@@ -451,7 +482,7 @@ describe('MessagePanel', function() {
         expect(isReadMarkerVisible(rm)).toBeFalsy();
     });
 
-    it('should render Date separators for the events', function () {
+    it('should render Date separators for the events', function() {
         const events = mkOneDayEvents();
         const res = mount(
             <WrappedMessagePanel
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index f39802464f..9def0c8d95 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -19,7 +19,7 @@ import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
-import {mkServerConfig} from "../../../test-utils";
+import { mkServerConfig } from "../../../test-utils";
 
 const Login = sdk.getComponent(
     'structures.auth.Login',
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index 3e8e887329..e09304962f 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -19,7 +19,7 @@ import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
-import {mkServerConfig} from "../../../test-utils";
+import { mkServerConfig } from "../../../test-utils";
 
 const Registration = sdk.getComponent(
     'structures.auth.Registration',
diff --git a/test/components/stub-component.js b/test/components/stub-component.js
index e242c06707..f98959a573 100644
--- a/test/components/stub-component.js
+++ b/test/components/stub-component.js
@@ -3,7 +3,7 @@
 
 import React from 'react';
 
-export default function({displayName = "StubComponent", render} = {}) {
+export default function({ displayName = "StubComponent", render } = {}) {
     if (!render) {
         render = function() {
             return <div>{ displayName }</div>;
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index d9e07a2d74..8c16e7f104 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import sdk from '../../../skinned-sdk';
-import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { stubClient } from '../../../test-utils';
 
 const AccessSecretStorageDialog = sdk.getComponent("dialogs.security.AccessSecretStorageDialog");
diff --git a/test/components/views/dialogs/ForwardDialog-test.js b/test/components/views/dialogs/ForwardDialog-test.js
new file mode 100644
index 0000000000..c5ce330fec
--- /dev/null
+++ b/test/components/views/dialogs/ForwardDialog-test.js
@@ -0,0 +1,163 @@
+/*
+Copyright 2021 Robin Townsend <robin@robin.town>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 "../../../skinned-sdk";
+
+import React from "react";
+import { configure, mount } from "enzyme";
+import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
+import { act } from "react-dom/test-utils";
+
+import * as TestUtils from "../../../test-utils";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import DMRoomMap from "../../../../src/utils/DMRoomMap";
+import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
+import ForwardDialog from "../../../../src/components/views/dialogs/ForwardDialog";
+
+configure({ adapter: new Adapter() });
+
+describe("ForwardDialog", () => {
+    const sourceRoom = "!111111111111111111:example.org";
+    const defaultMessage = TestUtils.mkMessage({
+        room: sourceRoom,
+        user: "@alice:example.org",
+        msg: "Hello world!",
+        event: true,
+    });
+    const defaultRooms = ["a", "A", "b"].map(name => TestUtils.mkStubRoom(name, name));
+
+    const mountForwardDialog = async (message = defaultMessage, rooms = defaultRooms) => {
+        const client = MatrixClientPeg.get();
+        client.getVisibleRooms = jest.fn().mockReturnValue(rooms);
+
+        let wrapper;
+        await act(async () => {
+            wrapper = mount(
+                <ForwardDialog
+                    matrixClient={client}
+                    event={message}
+                    permalinkCreator={new RoomPermalinkCreator(undefined, sourceRoom)}
+                    onFinished={jest.fn()}
+                />,
+            );
+            // Wait one tick for our profile data to load so the state update happens within act
+            await new Promise(resolve => setImmediate(resolve));
+        });
+
+        return wrapper;
+    };
+
+    beforeEach(() => {
+        TestUtils.stubClient();
+        DMRoomMap.makeShared();
+        MatrixClientPeg.get().getUserId = jest.fn().mockReturnValue("@bob:example.org");
+    });
+
+    it("shows a preview with us as the sender", async () => {
+        const wrapper = await mountForwardDialog();
+
+        const previewBody = wrapper.find(".mx_EventTile_body");
+        expect(previewBody.text()).toBe("Hello world!");
+
+        // We would just test SenderProfile for the user ID, but it's stubbed
+        const previewAvatar = wrapper.find(".mx_EventTile_avatar .mx_BaseAvatar_image");
+        expect(previewAvatar.prop("title")).toBe("@bob:example.org");
+    });
+
+    it("filters the rooms", async () => {
+        const wrapper = await mountForwardDialog();
+
+        expect(wrapper.find("Entry")).toHaveLength(3);
+
+        const searchInput = wrapper.find("SearchBox input");
+        searchInput.instance().value = "a";
+        searchInput.simulate("change");
+
+        expect(wrapper.find("Entry")).toHaveLength(2);
+    });
+
+    it("tracks message sending progress across multiple rooms", async () => {
+        const wrapper = await mountForwardDialog();
+
+        // Make sendEvent require manual resolution so we can see the sending state
+        let finishSend;
+        let cancelSend;
+        MatrixClientPeg.get().sendEvent = jest.fn(() => new Promise((resolve, reject) => {
+            finishSend = resolve;
+            cancelSend = reject;
+        }));
+
+        const firstButton = wrapper.find("AccessibleButton.mx_ForwardList_sendButton").first();
+        expect(firstButton.render().is(".mx_ForwardList_canSend")).toBe(true);
+
+        act(() => { firstButton.simulate("click"); });
+        expect(firstButton.render().is(".mx_ForwardList_sending")).toBe(true);
+
+        await act(async () => {
+            cancelSend();
+            // Wait one tick for the button to realize the send failed
+            await new Promise(resolve => setImmediate(resolve));
+        });
+        expect(firstButton.render().is(".mx_ForwardList_sendFailed")).toBe(true);
+
+        const secondButton = wrapper.find("AccessibleButton.mx_ForwardList_sendButton").at(1);
+        expect(secondButton.render().is(".mx_ForwardList_canSend")).toBe(true);
+
+        act(() => { secondButton.simulate("click"); });
+        expect(secondButton.render().is(".mx_ForwardList_sending")).toBe(true);
+
+        await act(async () => {
+            finishSend();
+            // Wait one tick for the button to realize the send succeeded
+            await new Promise(resolve => setImmediate(resolve));
+        });
+        expect(secondButton.render().is(".mx_ForwardList_sent")).toBe(true);
+    });
+
+    it("can render replies", async () => {
+        const replyMessage = TestUtils.mkEvent({
+            type: "m.room.message",
+            room: "!111111111111111111:example.org",
+            user: "@alice:example.org",
+            content: {
+                "msgtype": "m.text",
+                "body": "> <@bob:example.org> Hi Alice!\n\nHi Bob!",
+                "m.relates_to": {
+                    "m.in_reply_to": {
+                        event_id: "$2222222222222222222222222222222222222222222",
+                    },
+                },
+            },
+            event: true,
+        });
+
+        const wrapper = await mountForwardDialog(replyMessage);
+        expect(wrapper.find("ReplyThread")).toBeTruthy();
+    });
+
+    it("disables buttons for rooms without send permissions", async () => {
+        const readOnlyRoom = TestUtils.mkStubRoom("a", "a");
+        readOnlyRoom.maySendMessage = jest.fn().mockReturnValue(false);
+        const rooms = [readOnlyRoom, TestUtils.mkStubRoom("b", "b")];
+
+        const wrapper = await mountForwardDialog(undefined, rooms);
+
+        const firstButton = wrapper.find("AccessibleButton.mx_ForwardList_sendButton").first();
+        expect(firstButton.prop("disabled")).toBe(true);
+        const secondButton = wrapper.find("AccessibleButton.mx_ForwardList_sendButton").last();
+        expect(secondButton.prop("disabled")).toBe(false);
+    });
+});
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index fa44fc8d92..dcf89afb4d 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -18,12 +18,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
+import { sleep } from "matrix-js-sdk/src/utils";
 
 import sdk from '../../../skinned-sdk';
-import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 
-import * as test_utils from '../../../test-utils';
-import {sleep} from "../../../../src/utils/promise";
+import * as TestUtilsMatrix from '../../../test-utils';
 
 const InteractiveAuthDialog = sdk.getComponent(
     'views.dialogs.InteractiveAuthDialog',
@@ -33,7 +33,7 @@ describe('InteractiveAuthDialog', function() {
     let parentDiv;
 
     beforeEach(function() {
-        test_utils.stubClient();
+        TestUtilsMatrix.stubClient();
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
     });
@@ -45,11 +45,11 @@ describe('InteractiveAuthDialog', function() {
 
     it('Should successfully complete a password flow', function() {
         const onFinished = jest.fn();
-        const doRequest = jest.fn().mockResolvedValue({a: 1});
+        const doRequest = jest.fn().mockResolvedValue({ a: 1 });
 
         // tell the stub matrixclient to return a real userid
         const client = MatrixClientPeg.get();
-        client.credentials = {userId: "@user:id"};
+        client.credentials = { userId: "@user:id" };
 
         const dlg = ReactDOM.render(
             <InteractiveAuthDialog
@@ -57,7 +57,7 @@ describe('InteractiveAuthDialog', function() {
                 authData={{
                     session: "sess",
                     flows: [
-                        {"stages": ["m.login.password"]},
+                        { "stages": ["m.login.password"] },
                     ],
                 }}
                 makeRequest={doRequest}
@@ -105,7 +105,7 @@ describe('InteractiveAuthDialog', function() {
             return sleep(1);
         }).then(sleep(1)).then(() => {
             expect(onFinished).toBeCalledTimes(1);
-            expect(onFinished).toBeCalledWith(true, {a: 1});
+            expect(onFinished).toBeCalledWith(true, { a: 1 });
         });
     });
 });
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index 95bf206d02..dcb895f09e 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -90,7 +90,7 @@ describe('MemberEventListSummary', function() {
 
     it('renders expanded events if there are less than props.threshold', function() {
         const events = generateEvents([
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
         ]);
         const props = {
             events: events,
@@ -106,14 +106,14 @@ describe('MemberEventListSummary', function() {
         const result = wrapper.props.children;
 
         expect(result.props.children).toEqual([
-          <div className="event_tile" key="event0">Expanded membership</div>,
+            <div className="event_tile" key="event0">Expanded membership</div>,
         ]);
     });
 
     it('renders expanded events if there are less than props.threshold', function() {
         const events = generateEvents([
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
         ]);
         const props = {
             events: events,
@@ -129,16 +129,16 @@ describe('MemberEventListSummary', function() {
         const result = wrapper.props.children;
 
         expect(result.props.children).toEqual([
-          <div className="event_tile" key="event0">Expanded membership</div>,
-          <div className="event_tile" key="event1">Expanded membership</div>,
+            <div className="event_tile" key="event0">Expanded membership</div>,
+            <div className="event_tile" key="event1">Expanded membership</div>,
         ]);
     });
 
     it('renders collapsed events if events.length = props.threshold', function() {
         const events = generateEvents([
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
         ]);
         const props = {
             events: events,
@@ -161,20 +161,20 @@ describe('MemberEventListSummary', function() {
 
     it('truncates long join,leave repetitions', function() {
         const events = generateEvents([
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
         ]);
         const props = {
             events: events,
@@ -203,20 +203,20 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
             {
                 userId: "@user_1:some.domain",
                 prevMembership: "leave",
@@ -253,22 +253,22 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
             {
                 userId: "@user_1:some.domain",
                 prevMembership: "leave",
                 membership: "ban",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_1:some.domain", prevMembership: "ban", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "ban", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
             {
                 userId: "@user_1:some.domain",
                 prevMembership: "leave",
@@ -307,10 +307,10 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
             {
                 userId: "@user_1:some.domain",
                 prevMembership: "leave",
@@ -324,10 +324,10 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_2:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_2:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_2:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_2:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
             {
                 userId: "@user_2:some.domain",
                 prevMembership: "leave",
@@ -363,10 +363,10 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
                 senderId: "@some_other_user:some.domain",
             },
-            {prevMembership: "leave", membership: "join"},
-            {prevMembership: "join", membership: "leave"},
-            {prevMembership: "leave", membership: "join"},
-            {prevMembership: "join", membership: "leave"},
+            { prevMembership: "leave", membership: "join" },
+            { prevMembership: "join", membership: "leave" },
+            { prevMembership: "leave", membership: "join" },
+            { prevMembership: "join", membership: "leave" },
             {
                 prevMembership: "leave",
                 membership: "ban",
@@ -408,20 +408,20 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
             {
                 userId: "@user_1:some.domain",
                 prevMembership: "leave",
                 membership: "ban",
                 senderId: "@some_other_user:some.domain",
             },
-            {userId: "@user_2:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_2:some.domain", prevMembership: "join", membership: "leave"},
-            {userId: "@user_2:some.domain", prevMembership: "leave", membership: "join"},
-            {userId: "@user_2:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
+            { userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
+            { userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
         ]);
         const props = {
             events: events,
@@ -448,11 +448,11 @@ describe('MemberEventListSummary', function() {
     it('correctly identifies transitions', function() {
         const events = generateEvents([
             // invited
-            {userId: "@user_1:some.domain", membership: "invite"},
+            { userId: "@user_1:some.domain", membership: "invite" },
             // banned
-            {userId: "@user_1:some.domain", membership: "ban"},
+            { userId: "@user_1:some.domain", membership: "ban" },
             // joined
-            {userId: "@user_1:some.domain", membership: "join"},
+            { userId: "@user_1:some.domain", membership: "join" },
             // invite_reject
             {
                 userId: "@user_1:some.domain",
@@ -460,7 +460,7 @@ describe('MemberEventListSummary', function() {
                 membership: "leave",
             },
             // left
-            {userId: "@user_1:some.domain", prevMembership: "join", membership: "leave"},
+            { userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
             // invite_withdrawal
             {
                 userId: "@user_1:some.domain",
@@ -602,10 +602,10 @@ describe('MemberEventListSummary', function() {
 
     it('handles a summary length = 2, with no "others"', function() {
         const events = generateEvents([
-            {userId: "@user_1:some.domain", membership: "join"},
-            {userId: "@user_1:some.domain", membership: "join"},
-            {userId: "@user_2:some.domain", membership: "join"},
-            {userId: "@user_2:some.domain", membership: "join"},
+            { userId: "@user_1:some.domain", membership: "join" },
+            { userId: "@user_1:some.domain", membership: "join" },
+            { userId: "@user_2:some.domain", membership: "join" },
+            { userId: "@user_2:some.domain", membership: "join" },
         ]);
         const props = {
             events: events,
@@ -630,9 +630,9 @@ describe('MemberEventListSummary', function() {
 
     it('handles a summary length = 2, with 1 "other"', function() {
         const events = generateEvents([
-            {userId: "@user_1:some.domain", membership: "join"},
-            {userId: "@user_2:some.domain", membership: "join"},
-            {userId: "@user_3:some.domain", membership: "join"},
+            { userId: "@user_1:some.domain", membership: "join" },
+            { userId: "@user_2:some.domain", membership: "join" },
+            { userId: "@user_3:some.domain", membership: "join" },
         ]);
         const props = {
             events: events,
@@ -657,7 +657,7 @@ describe('MemberEventListSummary', function() {
 
     it('handles a summary length = 2, with many "others"', function() {
         const events = generateEventsForUsers("@user_$:some.domain", 20, [
-            {membership: "join"},
+            { membership: "join" },
         ]);
         const props = {
             events: events,
diff --git a/test/components/views/elements/ReplyThread-test.js b/test/components/views/elements/ReplyThread-test.js
new file mode 100644
index 0000000000..ee81c2f210
--- /dev/null
+++ b/test/components/views/elements/ReplyThread-test.js
@@ -0,0 +1,209 @@
+import "../../../skinned-sdk";
+import * as testUtils from '../../../test-utils';
+import ReplyThread from '../../../../src/components/views/elements/ReplyThread';
+
+describe("ReplyThread", () => {
+    describe('getParentEventId', () => {
+        it('retrieves relation reply from unedited event', () => {
+            const originalEventWithRelation = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n foo",
+                    "m.relates_to": {
+                        "m.in_reply_to": {
+                            "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og",
+                        },
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            expect(ReplyThread.getParentEventId(originalEventWithRelation))
+                .toStrictEqual('$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og');
+        });
+
+        it('retrieves relation reply from original event when edited', () => {
+            const originalEventWithRelation = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n foo",
+                    "m.relates_to": {
+                        "m.in_reply_to": {
+                            "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og",
+                        },
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            const editEvent = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n * foo bar",
+                    "m.new_content": {
+                        "msgtype": "m.text",
+                        "body": "foo bar",
+                    },
+                    "m.relates_to": {
+                        "rel_type": "m.replace",
+                        "event_id": originalEventWithRelation.event_id,
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            // The edit replaces the original event
+            originalEventWithRelation.makeReplaced(editEvent);
+
+            // The relation should be pulled from the original event
+            expect(ReplyThread.getParentEventId(originalEventWithRelation))
+                .toStrictEqual('$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og');
+        });
+
+        it('retrieves relation reply from edit event when provided', () => {
+            const originalEvent = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    msgtype: "m.text",
+                    body: "foo",
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            const editEvent = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n * foo bar",
+                    "m.new_content": {
+                        "msgtype": "m.text",
+                        "body": "foo bar",
+                        "m.relates_to": {
+                            "m.in_reply_to": {
+                                "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og",
+                            },
+                        },
+                    },
+                    "m.relates_to": {
+                        "rel_type": "m.replace",
+                        "event_id": originalEvent.event_id,
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            // The edit replaces the original event
+            originalEvent.makeReplaced(editEvent);
+
+            // The relation should be pulled from the edit event
+            expect(ReplyThread.getParentEventId(originalEvent))
+                .toStrictEqual('$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og');
+        });
+
+        it('prefers relation reply from edit event over original event', () => {
+            const originalEventWithRelation = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n foo",
+                    "m.relates_to": {
+                        "m.in_reply_to": {
+                            "event_id": "$111",
+                        },
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            const editEvent = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n * foo bar",
+                    "m.new_content": {
+                        "msgtype": "m.text",
+                        "body": "foo bar",
+                        "m.relates_to": {
+                            "m.in_reply_to": {
+                                "event_id": "$999",
+                            },
+                        },
+                    },
+                    "m.relates_to": {
+                        "rel_type": "m.replace",
+                        "event_id": originalEventWithRelation.event_id,
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            // The edit replaces the original event
+            originalEventWithRelation.makeReplaced(editEvent);
+
+            // The relation should be pulled from the edit event
+            expect(ReplyThread.getParentEventId(originalEventWithRelation)).toStrictEqual('$999');
+        });
+
+        it('able to clear relation reply from original event by providing empty relation field', () => {
+            const originalEventWithRelation = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n foo",
+                    "m.relates_to": {
+                        "m.in_reply_to": {
+                            "event_id": "$111",
+                        },
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            const editEvent = testUtils.mkEvent({
+                event: true,
+                type: "m.room.message",
+                content: {
+                    "msgtype": "m.text",
+                    "body": "> Reply to this message\n\n * foo bar",
+                    "m.new_content": {
+                        "msgtype": "m.text",
+                        "body": "foo bar",
+                        // Clear the relation from the original event
+                        "m.relates_to": {},
+                    },
+                    "m.relates_to": {
+                        "rel_type": "m.replace",
+                        "event_id": originalEventWithRelation.event_id,
+                    },
+                },
+                user: "some_other_user",
+                room: "room_id",
+            });
+
+            // The edit replaces the original event
+            originalEventWithRelation.makeReplaced(editEvent);
+
+            // The relation should be pulled from the edit event
+            expect(ReplyThread.getParentEventId(originalEventWithRelation)).toStrictEqual(undefined);
+        });
+    });
+});
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 39720177cc..7e01540d38 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -19,7 +19,7 @@ import ReactDOM from "react-dom";
 import ReactTestUtils from "react-dom/test-utils";
 
 import MockHttpBackend from "matrix-mock-request";
-import {MatrixClientPeg} from "../../../../src/MatrixClientPeg";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import sdk from "../../../skinned-sdk";
 import Matrix from "matrix-js-sdk";
 
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 0a6d47a72b..85a02aad7b 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -15,15 +15,18 @@ limitations under the License.
 */
 
 import React from "react";
-import Adapter from "enzyme-adapter-react-16";
+import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure, mount } from "enzyme";
 
 import sdk from "../../../skinned-sdk";
-import {mkEvent, mkStubRoom} from "../../../test-utils";
-import {MatrixClientPeg} from "../../../../src/MatrixClientPeg";
+import { mkEvent, mkStubRoom } from "../../../test-utils";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import * as languageHandler from "../../../../src/languageHandler";
+import * as TestUtils from "../../../test-utils";
+import DMRoomMap from "../../../../src/utils/DMRoomMap";
 
-const TextualBody = sdk.getComponent("views.messages.TextualBody");
+const _TextualBody = sdk.getComponent("views.messages.TextualBody");
+const TextualBody = TestUtils.wrapInMatrixClientContext(_TextualBody);
 
 configure({ adapter: new Adapter() });
 
@@ -39,6 +42,7 @@ describe("<TextualBody />", () => {
             isGuest: () => false,
             mxcUrlToHttp: (s) => s,
         };
+        DMRoomMap.makeShared();
 
         const ev = mkEvent({
             type: "m.room.message",
@@ -64,6 +68,7 @@ describe("<TextualBody />", () => {
             isGuest: () => false,
             mxcUrlToHttp: (s) => s,
         };
+        DMRoomMap.makeShared();
 
         const ev = mkEvent({
             type: "m.room.message",
@@ -90,6 +95,7 @@ describe("<TextualBody />", () => {
                 isGuest: () => false,
                 mxcUrlToHttp: (s) => s,
             };
+            DMRoomMap.makeShared();
         });
 
         it("simple message renders as expected", () => {
@@ -144,6 +150,7 @@ describe("<TextualBody />", () => {
                 isGuest: () => false,
                 mxcUrlToHttp: (s) => s,
             };
+            DMRoomMap.makeShared();
         });
 
         it("italics, bold, underline and strikethrough render as expected", () => {
@@ -290,6 +297,7 @@ describe("<TextualBody />", () => {
             isGuest: () => false,
             mxcUrlToHttp: (s) => s,
         };
+        DMRoomMap.makeShared();
 
         const ev = mkEvent({
             type: "m.room.message",
@@ -302,13 +310,12 @@ describe("<TextualBody />", () => {
             event: true,
         });
 
-        const wrapper = mount(<TextualBody mxEvent={ev} showUrlPreview={true} />);
+        const wrapper = mount(<TextualBody mxEvent={ev} showUrlPreview={true} onHeightChanged={() => {}} />);
         expect(wrapper.text()).toBe(ev.getContent().body);
 
-        let widgets = wrapper.find("LinkPreviewWidget");
-        // at this point we should have exactly one widget
-        expect(widgets.length).toBe(1);
-        expect(widgets.at(0).prop("link")).toBe("https://matrix.org/");
+        let widgets = wrapper.find("LinkPreviewGroup");
+        // at this point we should have exactly one link
+        expect(widgets.at(0).prop("links")).toEqual(["https://matrix.org/"]);
 
         // simulate an event edit and check the transition from the old URL preview to the new one
         const ev2 = mkEvent({
@@ -333,14 +340,11 @@ describe("<TextualBody />", () => {
 
             // XXX: this is to give TextualBody enough time for state to settle
             wrapper.setState({}, () => {
-                widgets = wrapper.find("LinkPreviewWidget");
-                // at this point we should have exactly two widgets (not the matrix.org one anymore)
-                expect(widgets.length).toBe(2);
-                expect(widgets.at(0).prop("link")).toBe("https://vector.im/");
-                expect(widgets.at(1).prop("link")).toBe("https://riot.im/");
+                widgets = wrapper.find("LinkPreviewGroup");
+                // at this point we should have exactly two links (not the matrix.org one anymore)
+                expect(widgets.at(0).prop("links")).toEqual(["https://vector.im/", "https://riot.im/"]);
             });
         });
     });
 });
 
-
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.tsx
similarity index 87%
rename from test/components/views/rooms/MemberList-test.js
rename to test/components/views/rooms/MemberList-test.tsx
index 28fead770c..f720bc7a6d 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.tsx
@@ -1,21 +1,38 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 "../../../skinned-sdk";
+
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
 
 import * as TestUtils from '../../../test-utils';
-
-import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
-import sdk from '../../../skinned-sdk';
-
-import {Room, RoomMember, User} from 'matrix-js-sdk';
-
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import { User } from "matrix-js-sdk/src/models/user";
 import { compare } from "../../../../src/utils/strings";
+import MemberList from "../../../../src/components/views/rooms/MemberList";
+import MemberTile from '../../../../src/components/views/rooms/MemberTile';
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
 }
 
-
 describe('MemberList', () => {
     function createRoom(opts) {
         const room = new Room(generateRoomId(), null, client.getUserId());
@@ -97,13 +114,19 @@ describe('MemberList', () => {
             memberListRoom.currentState.members[member.userId] = member;
         }
 
-        const MemberList = sdk.getComponent('views.rooms.MemberList');
         const WrappedMemberList = TestUtils.wrapInMatrixClientContext(MemberList);
         const gatherWrappedRef = (r) => {
             memberList = r;
         };
-        root = ReactDOM.render(<WrappedMemberList roomId={memberListRoom.roomId}
-            wrappedRef={gatherWrappedRef} />, parentDiv);
+        root = ReactDOM.render(
+            (
+                <WrappedMemberList
+                    roomId={memberListRoom.roomId}
+                    wrappedRef={gatherWrappedRef}
+                />
+            ),
+            parentDiv,
+        );
     });
 
     afterEach((done) => {
@@ -185,7 +208,6 @@ describe('MemberList', () => {
     }
 
     function itDoesOrderMembersCorrectly(enablePresence) {
-        const MemberTile = sdk.getComponent("rooms.MemberTile");
         describe('does order members correctly', () => {
             // Note: even if presence is disabled, we still expect that the presence
             // tests will pass. All expectOrderedByPresenceAndPowerLevel does is ensure
@@ -213,8 +235,8 @@ describe('MemberList', () => {
                 });
 
                 // Bypass all the event listeners and skip to the good part
-                memberList._showPresence = enablePresence;
-                memberList._updateListNow();
+                memberList.showPresence = enablePresence;
+                memberList.updateListNow();
 
                 const tiles = ReactTestUtils.scryRenderedComponentsWithType(root, MemberTile);
                 expectOrderedByPresenceAndPowerLevel(tiles, enablePresence);
@@ -225,7 +247,7 @@ describe('MemberList', () => {
 
                 // Bypass all the event listeners and skip to the good part
                 memberList._showPresence = enablePresence;
-                memberList._updateListNow();
+                memberList.updateListNow();
 
                 const tiles = ReactTestUtils.scryRenderedComponentsWithType(root, MemberTile);
                 expectOrderedByPresenceAndPowerLevel(tiles, enablePresence);
@@ -254,8 +276,8 @@ describe('MemberList', () => {
                 });
 
                 // Bypass all the event listeners and skip to the good part
-                memberList._showPresence = enablePresence;
-                memberList._updateListNow();
+                memberList.showPresence = enablePresence;
+                memberList.updateListNow();
 
                 const tiles = ReactTestUtils.scryRenderedComponentsWithType(root, MemberTile);
                 expectOrderedByPresenceAndPowerLevel(tiles, enablePresence);
@@ -273,8 +295,8 @@ describe('MemberList', () => {
                 });
 
                 // Bypass all the event listeners and skip to the good part
-                memberList._showPresence = enablePresence;
-                memberList._updateListNow();
+                memberList.showPresence = enablePresence;
+                memberList.updateListNow();
 
                 const tiles = ReactTestUtils.scryRenderedComponentsWithType(root, MemberTile);
                 expectOrderedByPresenceAndPowerLevel(tiles, enablePresence);
@@ -291,4 +313,3 @@ describe('MemberList', () => {
     });
 });
 
-
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index bfb8e1afd4..760aee69a8 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -4,29 +4,21 @@ import ReactDOM from 'react-dom';
 
 import * as TestUtils from '../../../test-utils';
 
-import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import sdk from '../../../skinned-sdk';
-import { DragDropContext } from 'react-beautiful-dnd';
 
 import dis from '../../../../src/dispatcher/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
-import GroupStore from '../../../../src/stores/GroupStore';
 
 import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
-import {DefaultTagID} from "../../../../src/stores/room-list/models";
-import RoomListStore, { LISTS_UPDATE_EVENT, RoomListStoreClass } from "../../../../src/stores/room-list/RoomListStore";
+import { DefaultTagID } from "../../../../src/stores/room-list/models";
+import RoomListStore, { RoomListStoreClass } from "../../../../src/stores/room-list/RoomListStore";
 import RoomListLayoutStore from "../../../../src/stores/room-list/RoomListLayoutStore";
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
 }
 
-function waitForRoomListStoreUpdate() {
-    return new Promise((resolve) => {
-        RoomListStore.instance.once(LISTS_UPDATE_EVENT, () => resolve());
-    });
-}
-
 describe('RoomList', () => {
     function createRoom(opts) {
         const room = new Room(generateRoomId(), MatrixClientPeg.get(), client.getUserId(), {
@@ -56,7 +48,7 @@ describe('RoomList', () => {
 
         TestUtils.stubClient();
         client = MatrixClientPeg.get();
-        client.credentials = {userId: myUserId};
+        client.credentials = { userId: myUserId };
         //revert this to prototype method as the test-utils monkey-patches this to return a hardcoded value
         client.getUserId = MatrixClient.prototype.getUserId;
 
@@ -68,14 +60,12 @@ describe('RoomList', () => {
         const RoomList = sdk.getComponent('views.rooms.RoomList');
         const WrappedRoomList = TestUtils.wrapInMatrixClientContext(RoomList);
         root = ReactDOM.render(
-            <DragDropContext>
-                <WrappedRoomList searchFilter="" onResize={() => {}} />
-            </DragDropContext>,
+            <WrappedRoomList searchFilter="" onResize={() => {}} />,
             parentDiv,
         );
         ReactTestUtils.findRenderedComponentWithType(root, RoomList);
 
-        movingRoom = createRoom({name: 'Moving room'});
+        movingRoom = createRoom({ name: 'Moving room' });
         expect(movingRoom.roomId).not.toBe(null);
 
         // Mock joined member
@@ -86,7 +76,7 @@ describe('RoomList', () => {
             [client.credentials.userId]: myMember,
         }[userId]);
 
-        otherRoom = createRoom({name: 'Other room'});
+        otherRoom = createRoom({ name: 'Other room' });
         myOtherMember = new RoomMember(otherRoom.roomId, myUserId);
         myOtherMember.membership = 'join';
         otherRoom.updateMyMembership('join');
@@ -98,10 +88,10 @@ describe('RoomList', () => {
         client.getRooms = () => [
             movingRoom,
             otherRoom,
-            createRoom({tags: {'m.favourite': {order: 0.1}}, name: 'Some other room'}),
-            createRoom({tags: {'m.favourite': {order: 0.2}}, name: 'Some other room 2'}),
-            createRoom({tags: {'m.lowpriority': {}}, name: 'Some unimportant room'}),
-            createRoom({tags: {'custom.tag': {}}, name: 'Some room customly tagged'}),
+            createRoom({ tags: { 'm.favourite': { order: 0.1 } }, name: 'Some other room' }),
+            createRoom({ tags: { 'm.favourite': { order: 0.2 } }, name: 'Some other room 2' }),
+            createRoom({ tags: { 'm.lowpriority': {} }, name: 'Some unimportant room' }),
+            createRoom({ tags: { 'custom.tag': {} }, name: 'Some room customly tagged' }),
         ];
         client.getVisibleRooms = client.getRooms;
 
@@ -141,7 +131,7 @@ describe('RoomList', () => {
         let expectedRoomTile;
         try {
             const roomTiles = ReactTestUtils.scryRenderedComponentsWithType(containingSubList, RoomTile);
-            console.info({roomTiles: roomTiles.length});
+            console.info({ roomTiles: roomTiles.length });
             expectedRoomTile = roomTiles.find((tile) => tile.props.room === room);
         } catch (err) {
             // truncate the error message because it's spammy
@@ -167,7 +157,7 @@ describe('RoomList', () => {
         // Set up the room that will be moved such that it has the correct state for a room in
         // the section for oldTagId
         if (oldTagId === DefaultTagID.Favourite || oldTagId === DefaultTagID.LowPriority) {
-            movingRoom.tags = {[oldTagId]: {}};
+            movingRoom.tags = { [oldTagId]: {} };
         } else if (oldTagId === DefaultTagID.DM) {
             // Mock inverse m.direct
             DMRoomMap.shared().roomToUser = {
@@ -175,13 +165,13 @@ describe('RoomList', () => {
             };
         }
 
-        dis.dispatch({action: 'MatrixActions.sync', prevState: null, state: 'PREPARED', matrixClient: client});
+        dis.dispatch({ action: 'MatrixActions.sync', prevState: null, state: 'PREPARED', matrixClient: client });
 
         expectRoomInSubList(movingRoom, srcSubListTest);
 
-        dis.dispatch({action: 'RoomListActions.tagRoom.pending', request: {
+        dis.dispatch({ action: 'RoomListActions.tagRoom.pending', request: {
             oldTagId, newTagId, room: movingRoom,
-        }});
+        } });
 
         expectRoomInSubList(movingRoom, destSubListTest);
     }
@@ -242,74 +232,6 @@ describe('RoomList', () => {
         });
     }
 
-    describe('when no tags are selected', () => {
-        itDoesCorrectOptimisticUpdatesForDraggedRoomTiles();
-    });
-
-    describe('when tags are selected', () => {
-        function setupSelectedTag() {
-            // Simulate a complete sync BEFORE dispatching anything else
-            dis.dispatch({
-                action: 'MatrixActions.sync',
-                prevState: null,
-                state: 'PREPARED',
-                matrixClient: client,
-            }, true);
-
-            // Simulate joined groups being received
-            dis.dispatch({
-                action: 'GroupActions.fetchJoinedGroups.success',
-                result: {
-                    groups: ['+group:domain'],
-                },
-            }, true);
-
-            // Simulate receiving tag ordering account data
-            dis.dispatch({
-                action: 'MatrixActions.accountData',
-                event_type: 'im.vector.web.tag_ordering',
-                event_content: {
-                    tags: ['+group:domain'],
-                },
-            }, true);
-
-            // GroupStore is not flux, mock and notify
-            GroupStore.getGroupRooms = (groupId) => {
-                return [movingRoom];
-            };
-            GroupStore._notifyListeners();
-
-            // We also have to mock the client's getGroup function for the room list to filter it.
-            // It's not smart enough to tell the difference between a real group and a template though.
-            client.getGroup = (groupId) => {
-                return {groupId};
-            };
-
-            // Select tag
-            dis.dispatch({action: 'select_tag', tag: '+group:domain'}, true);
-        }
-
-        beforeEach(() => {
-            setupSelectedTag();
-        });
-
-        it('displays the correct rooms when the groups rooms are changed', async () => {
-            GroupStore.getGroupRooms = (groupId) => {
-                return [movingRoom, otherRoom];
-            };
-            GroupStore._notifyListeners();
-
-            await waitForRoomListStoreUpdate();
-
-            // XXX: Even though the store updated, it can take a bit before the update makes
-            // it to the components. This gives it plenty of time to figure out what to do.
-            await (new Promise(resolve => setTimeout(resolve, 500)));
-
-            expectRoomInSubList(otherRoom, (s) => s.props.tagId === DefaultTagID.Untagged);
-        });
-
-        itDoesCorrectOptimisticUpdatesForDraggedRoomTiles();
-    });
+    itDoesCorrectOptimisticUpdatesForDraggedRoomTiles();
 });
 
-
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 3b4989ccab..cd70b81cd7 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -3,10 +3,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import * as testUtils from '../../../test-utils';
 import sdk from '../../../skinned-sdk';
-import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import SettingsStore from '../../../../src/settings/SettingsStore';
 
-
 describe.skip('RoomSettings', () => {
     const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
 
@@ -36,7 +35,7 @@ describe.skip('RoomSettings', () => {
     beforeEach(function(done) {
         testUtils.stubClient();
         client = MatrixClientPeg.get();
-        client.credentials = {userId: '@me:domain.com'};
+        client.credentials = { userId: '@me:domain.com' };
 
         client.setRoomName = jest.fn().mockReturnValue(Promise.resolve());
         client.setRoomTopic = jest.fn().mockReturnValue(Promise.resolve());
@@ -128,7 +127,7 @@ describe.skip('RoomSettings', () => {
         roomSettings.save().then(() => {
             expectSentStateEvent(
                 "!DdJkzRliezrwpNebLk:matrix.org",
-                "m.room.history_visibility", {history_visibility: historyVisibility},
+                "m.room.history_visibility", { history_visibility: historyVisibility },
             );
             done();
         });
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.tsx
similarity index 57%
rename from test/components/views/rooms/SendMessageComposer-test.js
rename to test/components/views/rooms/SendMessageComposer-test.tsx
index 64a90eee81..73fa388767 100644
--- a/test/components/views/rooms/SendMessageComposer-test.js
+++ b/test/components/views/rooms/SendMessageComposer-test.tsx
@@ -15,37 +15,80 @@ limitations under the License.
 */
 
 import '../../../skinned-sdk'; // Must be first for skinning to work
-import Adapter from "enzyme-adapter-react-16";
+import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure, mount } from "enzyme";
 import React from "react";
-import {act} from "react-dom/test-utils";
+import { act } from "react-dom/test-utils";
+import { sleep } from "matrix-js-sdk/src/utils";
+
 import SendMessageComposer, {
     createMessageContent,
     isQuickReaction,
+    SendMessageComposer as SendMessageComposerClass,
 } from "../../../../src/components/views/rooms/SendMessageComposer";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
+import RoomContext, { TimelineRenderingType } from "../../../../src/contexts/RoomContext";
 import EditorModel from "../../../../src/editor/model";
-import {createPartCreator, createRenderer} from "../../../editor/mock";
-import {createTestClient, mkEvent, mkStubRoom} from "../../../test-utils";
+import { createPartCreator, createRenderer } from "../../../editor/mock";
+import { createTestClient, mkEvent, mkStubRoom } from "../../../test-utils";
 import BasicMessageComposer from "../../../../src/components/views/rooms/BasicMessageComposer";
-import {MatrixClientPeg} from "../../../../src/MatrixClientPeg";
-import {sleep} from "../../../../src/utils/promise";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import SpecPermalinkConstructor from "../../../../src/utils/permalinks/SpecPermalinkConstructor";
 import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
+import DocumentOffset from '../../../../src/editor/offset';
+import { Layout } from '../../../../src/settings/Layout';
 
 jest.mock("../../../../src/stores/RoomViewStore");
 
 configure({ adapter: new Adapter() });
 
 describe('<SendMessageComposer/>', () => {
+    const roomContext = {
+        roomLoading: true,
+        peekLoading: false,
+        shouldPeek: true,
+        membersLoaded: false,
+        numUnreadMessages: 0,
+        draggingFile: false,
+        searching: false,
+        guestsCanJoin: false,
+        canPeek: false,
+        showApps: false,
+        isPeeking: false,
+        showRightPanel: true,
+        joining: false,
+        atEndOfLiveTimeline: true,
+        atEndOfLiveTimelineInit: false,
+        showTopUnreadMessagesBar: false,
+        statusBarVisible: false,
+        canReact: false,
+        canReply: false,
+        layout: Layout.Group,
+        lowBandwidth: false,
+        alwaysShowTimestamps: false,
+        showTwelveHourTimestamps: false,
+        readMarkerInViewThresholdMs: 3000,
+        readMarkerOutOfViewThresholdMs: 30000,
+        showHiddenEventsInTimeline: false,
+        showReadReceipts: true,
+        showRedactions: true,
+        showJoinLeaves: true,
+        showAvatarChanges: true,
+        showDisplaynameChanges: true,
+        matrixClientIsReady: false,
+        dragCounter: 0,
+        timelineRenderingType: TimelineRenderingType.Room,
+        liveTimeline: undefined,
+    };
     describe("createMessageContent", () => {
-        const permalinkCreator = jest.fn();
+        const permalinkCreator = jest.fn() as any;
 
         it("sends plaintext messages correctly", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("hello world", "insertText", {offset: 11, atNodeEnd: true});
+            const documentOffset = new DocumentOffset(11, true);
+            model.update("hello world", "insertText", documentOffset);
 
-            const content = createMessageContent(model, permalinkCreator);
+            const content = createMessageContent(model, null, false, permalinkCreator);
 
             expect(content).toEqual({
                 body: "hello world",
@@ -55,9 +98,10 @@ describe('<SendMessageComposer/>', () => {
 
         it("sends markdown messages correctly", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("hello *world*", "insertText", {offset: 13, atNodeEnd: true});
+            const documentOffset = new DocumentOffset(13, true);
+            model.update("hello *world*", "insertText", documentOffset);
 
-            const content = createMessageContent(model, permalinkCreator);
+            const content = createMessageContent(model, null, false, permalinkCreator);
 
             expect(content).toEqual({
                 body: "hello *world*",
@@ -69,9 +113,10 @@ describe('<SendMessageComposer/>', () => {
 
         it("strips /me from messages and marks them as m.emote accordingly", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("/me blinks __quickly__", "insertText", {offset: 22, atNodeEnd: true});
+            const documentOffset = new DocumentOffset(22, true);
+            model.update("/me blinks __quickly__", "insertText", documentOffset);
 
-            const content = createMessageContent(model, permalinkCreator);
+            const content = createMessageContent(model, null, false, permalinkCreator);
 
             expect(content).toEqual({
                 body: "blinks __quickly__",
@@ -83,9 +128,11 @@ describe('<SendMessageComposer/>', () => {
 
         it("allows sending double-slash escaped slash commands correctly", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("//dev/null is my favourite place", "insertText", {offset: 32, atNodeEnd: true});
+            const documentOffset = new DocumentOffset(32, true);
 
-            const content = createMessageContent(model, permalinkCreator);
+            model.update("//dev/null is my favourite place", "insertText", documentOffset);
+
+            const content = createMessageContent(model, null, false, permalinkCreator);
 
             expect(content).toEqual({
                 body: "/dev/null is my favourite place",
@@ -96,9 +143,11 @@ describe('<SendMessageComposer/>', () => {
 
     describe("functions correctly mounted", () => {
         const mockClient = MatrixClientPeg.matrixClient = createTestClient();
-        const mockRoom = mkStubRoom();
+        const mockRoom = mkStubRoom('myfakeroom') as any;
         const mockEvent = mkEvent({
             type: "m.room.message",
+            room: 'myfakeroom',
+            user: 'myfakeuser',
             content: "Replying to this",
             event: true,
         });
@@ -115,11 +164,13 @@ describe('<SendMessageComposer/>', () => {
 
         it("renders text and placeholder correctly", () => {
             const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <SendMessageComposer
-                    room={mockRoom}
-                    placeholder="placeholder string"
-                    permalinkCreator={new SpecPermalinkConstructor()}
-                />
+                <RoomContext.Provider value={roomContext}>
+                    <SendMessageComposer
+                        room={mockRoom as any}
+                        placeholder="placeholder string"
+                        permalinkCreator={new SpecPermalinkConstructor() as any}
+                    />
+                </RoomContext.Provider>
             </MatrixClientContext.Provider>);
 
             expect(wrapper.find('[aria-label="placeholder string"]')).toHaveLength(1);
@@ -134,12 +185,15 @@ describe('<SendMessageComposer/>', () => {
 
         it("correctly persists state to and from localStorage", () => {
             const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <SendMessageComposer
-                    room={mockRoom}
-                    placeholder=""
-                    permalinkCreator={new SpecPermalinkConstructor()}
-                    replyToEvent={mockEvent}
-                />
+                <RoomContext.Provider value={roomContext}>
+
+                    <SendMessageComposer
+                        room={mockRoom as any}
+                        placeholder=""
+                        permalinkCreator={new SpecPermalinkConstructor() as any}
+                        replyToEvent={mockEvent}
+                    />
+                </RoomContext.Provider>
             </MatrixClientContext.Provider>);
 
             act(() => {
@@ -147,7 +201,7 @@ describe('<SendMessageComposer/>', () => {
                 wrapper.update();
             });
 
-            const key = wrapper.find(SendMessageComposer).instance()._editorStateKey;
+            const key = wrapper.find(SendMessageComposerClass).instance().editorStateKey;
 
             expect(wrapper.text()).toBe("Test Text");
             expect(localStorage.getItem(key)).toBeNull();
@@ -155,7 +209,7 @@ describe('<SendMessageComposer/>', () => {
             // ensure the right state was persisted to localStorage
             wrapper.unmount();
             expect(JSON.parse(localStorage.getItem(key))).toStrictEqual({
-                parts: [{"type": "plain", "text": "Test Text"}],
+                parts: [{ "type": "plain", "text": "Test Text" }],
                 replyEventId: mockEvent.getId(),
             });
 
@@ -176,11 +230,14 @@ describe('<SendMessageComposer/>', () => {
 
         it("persists state correctly without replyToEvent onbeforeunload", () => {
             const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <SendMessageComposer
-                    room={mockRoom}
-                    placeholder=""
-                    permalinkCreator={new SpecPermalinkConstructor()}
-                />
+                <RoomContext.Provider value={roomContext}>
+
+                    <SendMessageComposer
+                        room={mockRoom as any}
+                        placeholder=""
+                        permalinkCreator={new SpecPermalinkConstructor() as any}
+                    />
+                </RoomContext.Provider>
             </MatrixClientContext.Provider>);
 
             act(() => {
@@ -188,7 +245,7 @@ describe('<SendMessageComposer/>', () => {
                 wrapper.update();
             });
 
-            const key = wrapper.find(SendMessageComposer).instance()._editorStateKey;
+            const key = wrapper.find(SendMessageComposerClass).instance().editorStateKey;
 
             expect(wrapper.text()).toBe("Hello World");
             expect(localStorage.getItem(key)).toBeNull();
@@ -196,18 +253,21 @@ describe('<SendMessageComposer/>', () => {
             // ensure the right state was persisted to localStorage
             window.dispatchEvent(new Event('beforeunload'));
             expect(JSON.parse(localStorage.getItem(key))).toStrictEqual({
-                parts: [{"type": "plain", "text": "Hello World"}],
+                parts: [{ "type": "plain", "text": "Hello World" }],
             });
         });
 
         it("persists to session history upon sending", async () => {
             const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <SendMessageComposer
-                    room={mockRoom}
-                    placeholder="placeholder"
-                    permalinkCreator={new SpecPermalinkConstructor()}
-                    replyToEvent={mockEvent}
-                />
+                <RoomContext.Provider value={roomContext}>
+
+                    <SendMessageComposer
+                        room={mockRoom as any}
+                        placeholder="placeholder"
+                        permalinkCreator={new SpecPermalinkConstructor() as any}
+                        replyToEvent={mockEvent}
+                    />
+                </RoomContext.Provider>
             </MatrixClientContext.Provider>);
 
             act(() => {
@@ -225,16 +285,42 @@ describe('<SendMessageComposer/>', () => {
             expect(wrapper.text()).toBe("");
             const str = sessionStorage.getItem(`mx_cider_history_${mockRoom.roomId}[0]`);
             expect(JSON.parse(str)).toStrictEqual({
-                parts: [{"type": "plain", "text": "This is a message"}],
+                parts: [{ "type": "plain", "text": "This is a message" }],
                 replyEventId: mockEvent.getId(),
             });
         });
+
+        it('correctly sets the editorStateKey for threads', () => {
+            const mockThread ={
+                getThread: () => {
+                    return {
+                        id: 'myFakeThreadId',
+                    };
+                },
+            } as any;
+            const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
+                <RoomContext.Provider value={roomContext}>
+
+                    <SendMessageComposer
+                        room={mockRoom as any}
+                        placeholder=""
+                        permalinkCreator={new SpecPermalinkConstructor() as any}
+                        replyToEvent={mockThread}
+                    />
+                </RoomContext.Provider>
+            </MatrixClientContext.Provider>);
+
+            const instance = wrapper.find(SendMessageComposerClass).instance();
+            const key = instance.editorStateKey;
+
+            expect(key).toEqual('mx_cider_state_myfakeroom_myFakeThreadId');
+        });
     });
 
     describe("isQuickReaction", () => {
         it("correctly detects quick reaction", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("+😊", "insertText", {offset: 3, atNodeEnd: true});
+            model.update("+😊", "insertText", new DocumentOffset(3, true));
 
             const isReaction = isQuickReaction(model);
 
@@ -243,7 +329,7 @@ describe('<SendMessageComposer/>', () => {
 
         it("correctly detects quick reaction with space", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("+ 😊", "insertText", {offset: 4, atNodeEnd: true});
+            model.update("+ 😊", "insertText", new DocumentOffset(4, true));
 
             const isReaction = isQuickReaction(model);
 
@@ -255,10 +341,10 @@ describe('<SendMessageComposer/>', () => {
             const model2 = new EditorModel([], createPartCreator(), createRenderer());
             const model3 = new EditorModel([], createPartCreator(), createRenderer());
             const model4 = new EditorModel([], createPartCreator(), createRenderer());
-            model.update("+😊hello", "insertText", {offset: 8, atNodeEnd: true});
-            model2.update(" +😊", "insertText", {offset: 4, atNodeEnd: true});
-            model3.update("+ 😊😊", "insertText", {offset: 6, atNodeEnd: true});
-            model4.update("+smiley", "insertText", {offset: 7, atNodeEnd: true});
+            model.update("+😊hello", "insertText", new DocumentOffset( 8, true));
+            model2.update(" +😊", "insertText", new DocumentOffset( 4, true));
+            model3.update("+ 😊😊", "insertText", new DocumentOffset( 6, true));
+            model4.update("+smiley", "insertText", new DocumentOffset( 7, true));
 
             expect(isQuickReaction(model)).toBeFalsy();
             expect(isQuickReaction(model2)).toBeFalsy();
@@ -268,4 +354,3 @@ describe('<SendMessageComposer/>', () => {
     });
 });
 
-
diff --git a/test/createRoom-test.js b/test/createRoom-test.js
index ed8f9779f7..11cb7edf5d 100644
--- a/test/createRoom-test.js
+++ b/test/createRoom-test.js
@@ -1,6 +1,6 @@
 import './skinned-sdk'; // Must be first for skinning to work
-import {_waitForMember, canEncryptToAllUsers} from '../src/createRoom';
-import {EventEmitter} from 'events';
+import { waitForMember, canEncryptToAllUsers } from '../src/createRoom';
+import { EventEmitter } from 'events';
 
 /* Shorter timeout, we've got tests to run */
 const timeout = 30;
@@ -13,7 +13,7 @@ describe("waitForMember", () => {
     });
 
     it("resolves with false if the timeout is reached", (done) => {
-        _waitForMember(client, "", "", { timeout: 0 }).then((r) => {
+        waitForMember(client, "", "", { timeout: 0 }).then((r) => {
             expect(r).toBe(false);
             done();
         });
@@ -22,7 +22,7 @@ describe("waitForMember", () => {
     it("resolves with false if the timeout is reached, even if other RoomState.newMember events fire", (done) => {
         const roomId = "!roomId:domain";
         const userId = "@clientId:domain";
-        _waitForMember(client, roomId, userId, { timeout }).then((r) => {
+        waitForMember(client, roomId, userId, { timeout }).then((r) => {
             expect(r).toBe(false);
             done();
         });
@@ -32,7 +32,7 @@ describe("waitForMember", () => {
     it("resolves with true if RoomState.newMember fires", (done) => {
         const roomId = "!roomId:domain";
         const userId = "@clientId:domain";
-        _waitForMember(client, roomId, userId, { timeout }).then((r) => {
+        waitForMember(client, roomId, userId, { timeout }).then((r) => {
             expect(r).toBe(true);
             expect(client.listeners("RoomState.newMember").length).toBe(0);
             done();
@@ -61,10 +61,9 @@ describe("canEncryptToAllUsers", () => {
         done();
     });
 
-
     it("returns false if not all users have crypto", async (done) => {
         const client = {
-            downloadKeys: async function(userIds) { return {...trueUser, ...falseUser}; },
+            downloadKeys: async function(userIds) { return { ...trueUser, ...falseUser }; },
         };
         const response = await canEncryptToAllUsers(client, ["@goodUser:localhost", "@badUser:localhost"]);
         expect(response).toBe(false);
diff --git a/test/editor/caret-test.js b/test/editor/caret-test.js
index f0c171c7c9..33b40e1c64 100644
--- a/test/editor/caret-test.js
+++ b/test/editor/caret-test.js
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {getLineAndNodePosition} from "../../src/editor/caret";
+import "../skinned-sdk"; // Must be first for skinning to work
+import { getLineAndNodePosition } from "../../src/editor/caret";
 import EditorModel from "../../src/editor/model";
-import {createPartCreator} from "./mock";
+import { createPartCreator } from "./mock";
 
 describe('editor/caret: DOM position for caret', function() {
     describe('basic text handling', function() {
@@ -25,8 +26,8 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.plain("hello"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 0, offset: 5});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 0, offset: 5 });
             expect(lineIndex).toBe(0);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(5);
@@ -36,8 +37,8 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.plain("hello"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 0, offset: 0});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 0, offset: 0 });
             expect(lineIndex).toBe(0);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(0);
@@ -47,8 +48,8 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.plain("hello"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 0, offset: 2});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 0, offset: 2 });
             expect(lineIndex).toBe(0);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(2);
@@ -62,8 +63,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.newline(),
                 pc.plain("world"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 2, offset: 5});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 2, offset: 5 });
             expect(lineIndex).toBe(1);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(5);
@@ -75,8 +76,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.newline(),
                 pc.plain("world"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 2, offset: 0});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 2, offset: 0 });
             expect(lineIndex).toBe(1);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(0);
@@ -89,8 +90,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.newline(),
                 pc.plain("world"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 1, offset: 1});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 1, offset: 1 });
             expect(lineIndex).toBe(1);
             expect(nodeIndex).toBe(-1);
             expect(offset).toBe(0);
@@ -103,8 +104,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.newline(),
                 pc.plain("world"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 3, offset: 0});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 3, offset: 0 });
             expect(lineIndex).toBe(2);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(0);
@@ -118,8 +119,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.plain("!"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 1, offset: 0});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 1, offset: 0 });
             expect(lineIndex).toBe(0);
             expect(nodeIndex).toBe(0);
             expect(offset).toBe(5);
@@ -131,8 +132,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.plain("!"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 1, offset: 2});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 1, offset: 2 });
             expect(lineIndex).toBe(0);
             expect(nodeIndex).toBe(2);
             expect(offset).toBe(0);
@@ -142,8 +143,8 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 0, offset: 0});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 0, offset: 0 });
             expect(lineIndex).toBe(0);
             //presumed nodes on line are (caret, pill, caret)
             expect(nodeIndex).toBe(0);
@@ -154,8 +155,8 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 0, offset: 1});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 0, offset: 1 });
             expect(lineIndex).toBe(0);
             //presumed nodes on line are (caret, pill, caret)
             expect(nodeIndex).toBe(2);
@@ -167,8 +168,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.userPill("Bob", "@bob:hs.tld"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 0, offset: 1});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 0, offset: 1 });
             expect(lineIndex).toBe(0);
             //presumed nodes on line are (caret, pill, caret, pill, caret)
             expect(nodeIndex).toBe(2);
@@ -180,8 +181,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.userPill("Bob", "@bob:hs.tld"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 1, offset: 0});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 1, offset: 0 });
             expect(lineIndex).toBe(0);
             //presumed nodes on line are (caret, pill, caret, pill, caret)
             expect(nodeIndex).toBe(2);
@@ -193,8 +194,8 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.userPill("Bob", "@bob:hs.tld"),
             ]);
-            const {offset, lineIndex, nodeIndex} =
-                getLineAndNodePosition(model, {index: 1, offset: 1});
+            const { offset, lineIndex, nodeIndex } =
+                getLineAndNodePosition(model, { index: 1, offset: 1 });
             expect(lineIndex).toBe(0);
             //presumed nodes on line are (caret, pill, caret, pill, caret)
             expect(nodeIndex).toBe(4);
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index 7c7a2f84fb..17e8a31780 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import '../skinned-sdk'; // Must be first for skinning to work
-import {parseEvent} from "../../src/editor/deserialize";
-import {createPartCreator} from "./mock";
+import { parseEvent } from "../../src/editor/deserialize";
+import { createPartCreator } from "./mock";
 
 function htmlMessage(formattedBody, msgtype = "m.text") {
     return {
@@ -71,22 +71,22 @@ describe('editor/deserialize', function() {
     describe('text messages', function() {
         it('test with newlines', function() {
             const parts = normalize(parseEvent(textMessage("hello\nworld"), createPartCreator()));
-            expect(parts[0]).toStrictEqual({type: "plain", text: "hello"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "world"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "hello" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "world" });
             expect(parts.length).toBe(3);
         });
         it('@room pill', function() {
             const parts = normalize(parseEvent(textMessage("text message for @room"), createPartCreator()));
             expect(parts.length).toBe(2);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "text message for "});
-            expect(parts[1]).toStrictEqual({type: "at-room-pill", text: "@room"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "text message for " });
+            expect(parts[1]).toStrictEqual({ type: "at-room-pill", text: "@room" });
         });
         it('emote', function() {
             const text = "says DON'T SHOUT!";
             const parts = normalize(parseEvent(textMessage(text, "m.emote"), createPartCreator()));
             expect(parts.length).toBe(1);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "/me says DON'T SHOUT!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "/me says DON'T SHOUT!" });
         });
     });
     describe('html messages', function() {
@@ -94,159 +94,159 @@ describe('editor/deserialize', function() {
             const html = "<strong>bold</strong> and <em>emphasized</em> text";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(1);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "**bold** and _emphasized_ text"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "**bold** and _emphasized_ text" });
         });
         it('hyperlink', function() {
             const html = 'click <a href="http://example.com/">this</a>!';
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(1);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "click [this](http://example.com/)!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "click [this](http://example.com/)!" });
         });
         it('multiple lines with paragraphs', function() {
             const html = '<p>hello</p><p>world</p>';
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(4);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "hello"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[3]).toStrictEqual({type: "plain", text: "world"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "hello" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[3]).toStrictEqual({ type: "plain", text: "world" });
         });
         it('multiple lines with line breaks', function() {
             const html = 'hello<br>world';
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "hello"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "world"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "hello" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "world" });
         });
         it('multiple lines mixing paragraphs and line breaks', function() {
             const html = '<p>hello<br>warm</p><p>world</p>';
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(6);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "hello"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "warm"});
-            expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[4]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[5]).toStrictEqual({type: "plain", text: "world"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "hello" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "warm" });
+            expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[4]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[5]).toStrictEqual({ type: "plain", text: "world" });
         });
         it('quote', function() {
             const html = '<blockquote><p><em>wise</em><br><strong>words</strong></p></blockquote><p>indeed</p>';
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(6);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "> _wise_"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "> **words**"});
-            expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[4]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[5]).toStrictEqual({type: "plain", text: "indeed"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "> _wise_" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "> **words**" });
+            expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[4]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[5]).toStrictEqual({ type: "plain", text: "indeed" });
         });
         it('user pill', function() {
             const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
-            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice", resourceId: "@alice:hs.tld"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "Hi " });
+            expect(parts[1]).toStrictEqual({ type: "user-pill", text: "Alice", resourceId: "@alice:hs.tld" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "!" });
         });
         it('user pill with displayname containing backslash', function() {
             const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice\\</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
-            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice\\", resourceId: "@alice:hs.tld"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "Hi " });
+            expect(parts[1]).toStrictEqual({ type: "user-pill", text: "Alice\\", resourceId: "@alice:hs.tld" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "!" });
         });
         it('user pill with displayname containing opening square bracket', function() {
             const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice[[</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
-            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice[[", resourceId: "@alice:hs.tld"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "Hi " });
+            expect(parts[1]).toStrictEqual({ type: "user-pill", text: "Alice[[", resourceId: "@alice:hs.tld" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "!" });
         });
         it('user pill with displayname containing closing square bracket', function() {
             const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice]</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
-            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice]", resourceId: "@alice:hs.tld"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "Hi " });
+            expect(parts[1]).toStrictEqual({ type: "user-pill", text: "Alice]", resourceId: "@alice:hs.tld" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "!" });
         });
         it('room pill', function() {
             const html = "Try <a href=\"https://matrix.to/#/#room:hs.tld\">#room:hs.tld</a>?";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "Try "});
-            expect(parts[1]).toStrictEqual({type: "room-pill", text: "#room:hs.tld", resourceId: "#room:hs.tld"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "?"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "Try " });
+            expect(parts[1]).toStrictEqual({ type: "room-pill", text: "#room:hs.tld", resourceId: "#room:hs.tld" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "?" });
         });
         it('@room pill', function() {
             const html = "<em>formatted</em> message for @room";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(2);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "_formatted_ message for "});
-            expect(parts[1]).toStrictEqual({type: "at-room-pill", text: "@room"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "_formatted_ message for " });
+            expect(parts[1]).toStrictEqual({ type: "at-room-pill", text: "@room" });
         });
         it('inline code', function() {
             const html = "there is no place like <code>127.0.0.1</code>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(1);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "there is no place like `127.0.0.1`!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "there is no place like `127.0.0.1`!" });
         });
         it('code block with no trailing text', function() {
             const html = "<pre><code>0xDEADBEEF\n</code></pre>\n";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             console.log(parts);
             expect(parts.length).toBe(5);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "```"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "0xDEADBEEF"});
-            expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[4]).toStrictEqual({type: "plain", text: "```"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "```" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "0xDEADBEEF" });
+            expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[4]).toStrictEqual({ type: "plain", text: "```" });
         });
         // failing likely because of https://github.com/vector-im/element-web/issues/10316
         xit('code block with no trailing text and no newlines', function() {
             const html = "<pre><code>0xDEADBEEF</code></pre>";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(5);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "```"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "0xDEADBEEF"});
-            expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[4]).toStrictEqual({type: "plain", text: "```"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "```" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "0xDEADBEEF" });
+            expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[4]).toStrictEqual({ type: "plain", text: "```" });
         });
         it('unordered lists', function() {
             const html = "<ul><li>Oak</li><li>Spruce</li><li>Birch</li></ul>";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(5);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "- Oak"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "- Spruce"});
-            expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[4]).toStrictEqual({type: "plain", text: "- Birch"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "- Oak" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "- Spruce" });
+            expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[4]).toStrictEqual({ type: "plain", text: "- Birch" });
         });
         it('ordered lists', function() {
             const html = "<ol><li>Start</li><li>Continue</li><li>Finish</li></ol>";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(5);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "1. Start"});
-            expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[2]).toStrictEqual({type: "plain", text: "2. Continue"});
-            expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
-            expect(parts[4]).toStrictEqual({type: "plain", text: "3. Finish"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "1. Start" });
+            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: "2. Continue" });
+            expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
+            expect(parts[4]).toStrictEqual({ type: "plain", text: "3. Finish" });
         });
         it('mx-reply is stripped', function() {
             const html = "<mx-reply>foo</mx-reply>bar";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(1);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "bar"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "bar" });
         });
         it('emote', function() {
             const html = "says <em>DON'T SHOUT</em>!";
             const parts = normalize(parseEvent(htmlMessage(html, "m.emote"), createPartCreator()));
             expect(parts.length).toBe(1);
-            expect(parts[0]).toStrictEqual({type: "plain", text: "/me says _DON'T SHOUT_!"});
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "/me says _DON'T SHOUT_!" });
         });
     });
 });
diff --git a/test/editor/diff-test.js b/test/editor/diff-test.js
index 4637206b27..e525731340 100644
--- a/test/editor/diff-test.js
+++ b/test/editor/diff-test.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {diffDeletion, diffAtCaret} from "../../src/editor/diff";
+import { diffDeletion, diffAtCaret } from "../../src/editor/diff";
 
 describe('editor/diff', function() {
     describe('diffDeletion', function() {
diff --git a/test/editor/history-test.js b/test/editor/history-test.js
index e54c1e7ea9..e3ae3e16f6 100644
--- a/test/editor/history-test.js
+++ b/test/editor/history-test.js
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import HistoryManager, {MAX_STEP_LENGTH} from "../../src/editor/history";
+import HistoryManager, { MAX_STEP_LENGTH } from "../../src/editor/history";
 
 describe('editor/history', function() {
     it('push, then undo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         const caret1 = {};
         const result1 = history.tryPush(model, caret1);
         expect(result1).toEqual(true);
@@ -35,7 +35,7 @@ describe('editor/history', function() {
     it('push, undo, then redo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         history.tryPush(model, {});
         parts[0] = "hello world";
         const caret2 = {};
@@ -51,7 +51,7 @@ describe('editor/history', function() {
     it('push, undo, push, ensure you can`t redo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         history.tryPush(model, {});
         parts[0] = "hello world";
         history.tryPush(model, {});
@@ -63,10 +63,10 @@ describe('editor/history', function() {
     it('not every keystroke stores a history step', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         const firstCaret = {};
         history.tryPush(model, firstCaret);
-        const diff = {added: "o"};
+        const diff = { added: "o" };
         let keystrokeCount = 0;
         do {
             parts[0] = parts[0] + diff.added;
@@ -80,24 +80,24 @@ describe('editor/history', function() {
     });
     it('history step is added at word boundary', function() {
         const history = new HistoryManager();
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         const parts = ["h"];
-        let diff = {added: "h"};
+        let diff = { added: "h" };
         expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
-        diff = {added: "i"};
+        diff = { added: "i" };
         parts[0] = "hi";
         expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
-        diff = {added: " "};
+        diff = { added: " " };
         parts[0] = "hi ";
         const spaceCaret = {};
         expect(history.tryPush(model, spaceCaret, "insertText", diff)).toEqual(true);
-        diff = {added: "y"};
+        diff = { added: "y" };
         parts[0] = "hi y";
         expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
-        diff = {added: "o"};
+        diff = { added: "o" };
         parts[0] = "hi yo";
         expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
-        diff = {added: "u"};
+        diff = { added: "u" };
         parts[0] = "hi you";
 
         expect(history.canUndo()).toEqual(true);
@@ -108,11 +108,11 @@ describe('editor/history', function() {
     it('keystroke that didn\'t add a step can undo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         const firstCaret = {};
         history.tryPush(model, {});
         parts[0] = "helloo";
-        const result = history.tryPush(model, {}, "insertText", {added: "o"});
+        const result = history.tryPush(model, {}, "insertText", { added: "o" });
         expect(result).toEqual(false);
         expect(history.canUndo()).toEqual(true);
         const undoState = history.undo(model);
@@ -122,11 +122,11 @@ describe('editor/history', function() {
     it('undo after keystroke that didn\'t add a step is able to redo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         history.tryPush(model, {});
         parts[0] = "helloo";
-        const caret = {last: true};
-        history.tryPush(model, caret, "insertText", {added: "o"});
+        const caret = { last: true };
+        history.tryPush(model, caret, "insertText", { added: "o" });
         history.undo(model);
         expect(history.canRedo()).toEqual(true);
         const redoState = history.redo();
@@ -136,10 +136,10 @@ describe('editor/history', function() {
     it('overwriting text always stores a step', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = {serializeParts: () => parts.slice()};
+        const model = { serializeParts: () => parts.slice() };
         const firstCaret = {};
         history.tryPush(model, firstCaret);
-        const diff = {at: 1, added: "a", removed: "e"};
+        const diff = { at: 1, added: "a", removed: "e" };
         const result = history.tryPush(model, {}, "insertText", diff);
         expect(result).toEqual(true);
     });
diff --git a/test/editor/mock.js b/test/editor/mock.js
index 6de65cf23d..2d82d22033 100644
--- a/test/editor/mock.js
+++ b/test/editor/mock.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {PartCreator} from "../../src/editor/parts";
+import { PartCreator } from "../../src/editor/parts";
 
 class MockAutoComplete {
     constructor(updateCallback, partCreator, completions) {
@@ -25,7 +25,7 @@ class MockAutoComplete {
     }
 
     close() {
-        this._updateCallback({close: true});
+        this._updateCallback({ close: true });
     }
 
     tryComplete(close = true) {
@@ -40,7 +40,7 @@ class MockAutoComplete {
             } else {
                 pill = this._partCreator.roomPill(match.resourceId);
             }
-            this._updateCallback({replaceParts: [pill], close});
+            this._updateCallback({ replaceParts: [pill], close });
         }
     }
 
diff --git a/test/editor/model-test.js b/test/editor/model-test.js
index 2df9fdd573..15c5af5806 100644
--- a/test/editor/model-test.js
+++ b/test/editor/model-test.js
@@ -14,15 +14,16 @@ 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 EditorModel from "../../src/editor/model";
-import {createPartCreator, createRenderer} from "./mock";
+import { createPartCreator, createRenderer } from "./mock";
 
 describe('editor/model', function() {
     describe('plain text manipulation', function() {
         it('insert text into empty document', function() {
             const renderer = createRenderer();
             const model = new EditorModel([], createPartCreator(), renderer);
-            model.update("hello", "insertText", {offset: 5, atNodeEnd: true});
+            model.update("hello", "insertText", { offset: 5, atNodeEnd: true });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(5);
@@ -34,7 +35,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("hello")], pc, renderer);
-            model.update("hello world", "insertText", {offset: 11, atNodeEnd: true});
+            model.update("hello world", "insertText", { offset: 11, atNodeEnd: true });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(11);
@@ -46,7 +47,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("world")], pc, renderer);
-            model.update("hello world", "insertText", {offset: 6, atNodeEnd: false});
+            model.update("hello world", "insertText", { offset: 6, atNodeEnd: false });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(6);
@@ -60,7 +61,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("hello")], pc, renderer);
-            model.update("hello\n", "insertText", {offset: 6, atNodeEnd: true});
+            model.update("hello\n", "insertText", { offset: 6, atNodeEnd: true });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(1);
             expect(renderer.caret.offset).toBe(1);
@@ -74,7 +75,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("hello")], pc, renderer);
-            model.update("hello\n\n\nworld!", "insertText", {offset: 14, atNodeEnd: true});
+            model.update("hello\n\n\nworld!", "insertText", { offset: 14, atNodeEnd: true });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(4);
             expect(renderer.caret.offset).toBe(6);
@@ -99,7 +100,7 @@ describe('editor/model', function() {
                 pc.newline(),
                 pc.plain("world"),
             ], pc, renderer);
-            model.update("hello\nwarm\nworld", "insertText", {offset: 10, atNodeEnd: true});
+            model.update("hello\nwarm\nworld", "insertText", { offset: 10, atNodeEnd: true });
             console.log(model.serializeParts());
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(2);
@@ -125,7 +126,7 @@ describe('editor/model', function() {
                 pc.plain("try "),
                 pc.roomPill("#someroom"),
             ], pc, renderer);
-            model.update("try foo#someroom", "insertText", {offset: 7, atNodeEnd: false});
+            model.update("try foo#someroom", "insertText", { offset: 7, atNodeEnd: false });
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(7);
             expect(model.parts.length).toBe(2);
@@ -142,7 +143,7 @@ describe('editor/model', function() {
                 pc.roomPill("#someroom"),
                 pc.plain("?"),
             ], pc, renderer);
-            model.update("try #some perhapsroom?", "insertText", {offset: 17, atNodeEnd: false});
+            model.update("try #some perhapsroom?", "insertText", { offset: 17, atNodeEnd: false });
             expect(renderer.caret.index).toBe(2);
             expect(renderer.caret.offset).toBe(8);
             expect(model.parts.length).toBe(3);
@@ -157,7 +158,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.roomPill("#someroom")], pc, renderer);
-            model.update("#someroo", "deleteContentBackward", {offset: 8, atNodeEnd: true});
+            model.update("#someroo", "deleteContentBackward", { offset: 8, atNodeEnd: true });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(-1);
             expect(renderer.caret.offset).toBe(0);
@@ -167,7 +168,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.roomPill("#someroom")], pc, renderer);
-            model.update("someroom", "deleteContentForward", {offset: 0, atNodeEnd: false});
+            model.update("someroom", "deleteContentForward", { offset: 0, atNodeEnd: false });
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(-1);
             expect(renderer.caret.offset).toBe(0);
@@ -177,10 +178,10 @@ describe('editor/model', function() {
     describe('auto-complete', function() {
         it('insert user pill', function() {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "@alice", label: "Alice"}]);
+            const pc = createPartCreator([{ resourceId: "@alice", label: "Alice" }]);
             const model = new EditorModel([pc.plain("hello ")], pc, renderer);
 
-            model.update("hello @a", "insertText", {offset: 8, atNodeEnd: true});
+            model.update("hello @a", "insertText", { offset: 8, atNodeEnd: true });
 
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(1);
@@ -205,10 +206,10 @@ describe('editor/model', function() {
 
         it('insert room pill', function() {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "#riot-dev"}]);
+            const pc = createPartCreator([{ resourceId: "#riot-dev" }]);
             const model = new EditorModel([pc.plain("hello ")], pc, renderer);
 
-            model.update("hello #r", "insertText", {offset: 8, atNodeEnd: true});
+            model.update("hello #r", "insertText", { offset: 8, atNodeEnd: true });
 
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(1);
@@ -233,12 +234,12 @@ describe('editor/model', function() {
 
         it('type after inserting pill', function() {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "#riot-dev"}]);
+            const pc = createPartCreator([{ resourceId: "#riot-dev" }]);
             const model = new EditorModel([pc.plain("hello ")], pc, renderer);
 
-            model.update("hello #r", "insertText", {offset: 8, atNodeEnd: true});
+            model.update("hello #r", "insertText", { offset: 8, atNodeEnd: true });
             model.autoComplete.tryComplete(); // see MockAutoComplete
-            model.update("hello #riot-dev!!", "insertText", {offset: 17, atNodeEnd: true});
+            model.update("hello #riot-dev!!", "insertText", { offset: 17, atNodeEnd: true });
 
             expect(renderer.count).toBe(3);
             expect(renderer.caret.index).toBe(2);
@@ -254,10 +255,10 @@ describe('editor/model', function() {
 
         it('pasting text does not trigger auto-complete', function() {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "#define-room"}]);
+            const pc = createPartCreator([{ resourceId: "#define-room" }]);
             const model = new EditorModel([pc.plain("try ")], pc, renderer);
 
-            model.update("try #define", "insertFromPaste", {offset: 11, atNodeEnd: true});
+            model.update("try #define", "insertFromPaste", { offset: 11, atNodeEnd: true });
 
             expect(model.autoComplete).toBeFalsy();
             expect(renderer.caret.index).toBe(0);
@@ -269,10 +270,10 @@ describe('editor/model', function() {
 
         it('dropping text does not trigger auto-complete', function() {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "#define-room"}]);
+            const pc = createPartCreator([{ resourceId: "#define-room" }]);
             const model = new EditorModel([pc.plain("try ")], pc, renderer);
 
-            model.update("try #define", "insertFromDrop", {offset: 11, atNodeEnd: true});
+            model.update("try #define", "insertFromDrop", { offset: 11, atNodeEnd: true });
 
             expect(model.autoComplete).toBeFalsy();
             expect(renderer.caret.index).toBe(0);
@@ -284,17 +285,17 @@ describe('editor/model', function() {
 
         it('insert room pill without splitting at the colon', () => {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "#room:server"}]);
+            const pc = createPartCreator([{ resourceId: "#room:server" }]);
             const model = new EditorModel([], pc, renderer);
 
-            model.update("#roo", "insertText", {offset: 4, atNodeEnd: true});
+            model.update("#roo", "insertText", { offset: 4, atNodeEnd: true });
 
             expect(renderer.count).toBe(1);
             expect(model.parts.length).toBe(1);
             expect(model.parts[0].type).toBe("pill-candidate");
             expect(model.parts[0].text).toBe("#roo");
 
-            model.update("#room:s", "insertText", {offset: 7, atNodeEnd: true});
+            model.update("#room:s", "insertText", { offset: 7, atNodeEnd: true });
 
             expect(renderer.count).toBe(2);
             expect(model.parts.length).toBe(1);
@@ -304,10 +305,10 @@ describe('editor/model', function() {
 
         it('allow typing e-mail addresses without splitting at the @', () => {
             const renderer = createRenderer();
-            const pc = createPartCreator([{resourceId: "@alice", label: "Alice"}]);
+            const pc = createPartCreator([{ resourceId: "@alice", label: "Alice" }]);
             const model = new EditorModel([], pc, renderer);
 
-            model.update("foo@a", "insertText", {offset: 5, atNodeEnd: true});
+            model.update("foo@a", "insertText", { offset: 5, atNodeEnd: true });
 
             expect(renderer.count).toBe(1);
             expect(model.parts.length).toBe(1);
diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
index 90a9812306..17a4c8ba11 100644
--- a/test/editor/operations-test.js
+++ b/test/editor/operations-test.js
@@ -14,11 +14,12 @@ 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 EditorModel from "../../src/editor/model";
-import {createPartCreator, createRenderer} from "./mock";
-import {toggleInlineFormat} from "../../src/editor/operations";
+import { createPartCreator, createRenderer } from "./mock";
+import { toggleInlineFormat } from "../../src/editor/operations";
 
-const SERIALIZED_NEWLINE = {"text": "\n", "type": "newline"};
+const SERIALIZED_NEWLINE = { "text": "\n", "type": "newline" };
 
 describe('editor/operations: formatting operations', () => {
     describe('toggleInlineFormat', () => {
@@ -33,9 +34,9 @@ describe('editor/operations: formatting operations', () => {
                 model.positionForOffset(11, false));  // around "world"
 
             expect(range.parts[0].text).toBe("world");
-            expect(model.serializeParts()).toEqual([{"text": "hello world!", "type": "plain"}]);
+            expect(model.serializeParts()).toEqual([{ "text": "hello world!", "type": "plain" }]);
             toggleInlineFormat(range, "_");
-            expect(model.serializeParts()).toEqual([{"text": "hello _world_!", "type": "plain"}]);
+            expect(model.serializeParts()).toEqual([{ "text": "hello _world_!", "type": "plain" }]);
         });
 
         it('works for parts of words', () => {
@@ -49,9 +50,9 @@ describe('editor/operations: formatting operations', () => {
                 model.positionForOffset(10, false));  // around "orl"
 
             expect(range.parts[0].text).toBe("orl");
-            expect(model.serializeParts()).toEqual([{"text": "hello world!", "type": "plain"}]);
+            expect(model.serializeParts()).toEqual([{ "text": "hello world!", "type": "plain" }]);
             toggleInlineFormat(range, "*");
-            expect(model.serializeParts()).toEqual([{"text": "hello w*orl*d!", "type": "plain"}]);
+            expect(model.serializeParts()).toEqual([{ "text": "hello w*orl*d!", "type": "plain" }]);
         });
 
         it('works for around pills', () => {
@@ -68,15 +69,15 @@ describe('editor/operations: formatting operations', () => {
 
             expect(range.parts.map(p => p.text).join("")).toBe("there @room, how are you");
             expect(model.serializeParts()).toEqual([
-                {"text": "hello there ", "type": "plain"},
-                {"text": "@room", "type": "at-room-pill"},
-                {"text": ", how are you doing?", "type": "plain"},
+                { "text": "hello there ", "type": "plain" },
+                { "text": "@room", "type": "at-room-pill" },
+                { "text": ", how are you doing?", "type": "plain" },
             ]);
             toggleInlineFormat(range, "_");
             expect(model.serializeParts()).toEqual([
-                {"text": "hello _there ", "type": "plain"},
-                {"text": "@room", "type": "at-room-pill"},
-                {"text": ", how are you_ doing?", "type": "plain"},
+                { "text": "hello _there ", "type": "plain" },
+                { "text": "@room", "type": "at-room-pill" },
+                { "text": ", how are you_ doing?", "type": "plain" },
             ]);
         });
 
@@ -94,15 +95,15 @@ describe('editor/operations: formatting operations', () => {
 
             expect(range.parts.map(p => p.text).join("")).toBe("world,\nhow");
             expect(model.serializeParts()).toEqual([
-                {"text": "hello world,", "type": "plain"},
+                { "text": "hello world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how are you doing?", "type": "plain"},
+                { "text": "how are you doing?", "type": "plain" },
             ]);
             toggleInlineFormat(range, "**");
             expect(model.serializeParts()).toEqual([
-                {"text": "hello **world,", "type": "plain"},
+                { "text": "hello **world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how** are you doing?", "type": "plain"},
+                { "text": "how** are you doing?", "type": "plain" },
             ]);
         });
 
@@ -125,9 +126,9 @@ describe('editor/operations: formatting operations', () => {
             expect(model.serializeParts()).toEqual([
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
-                {"text": "hello world,", "type": "plain"},
+                { "text": "hello world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how are you doing?", "type": "plain"},
+                { "text": "how are you doing?", "type": "plain" },
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
             ]);
@@ -135,9 +136,9 @@ describe('editor/operations: formatting operations', () => {
             expect(model.serializeParts()).toEqual([
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
-                {"text": "**hello world,", "type": "plain"},
+                { "text": "**hello world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how are you doing?**", "type": "plain"},
+                { "text": "how are you doing?**", "type": "plain" },
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
             ]);
@@ -158,32 +159,32 @@ describe('editor/operations: formatting operations', () => {
             let range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
 
             expect(model.serializeParts()).toEqual([
-                {"text": "hello world,", "type": "plain"},
+                { "text": "hello world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how are you doing?", "type": "plain"},
+                { "text": "how are you doing?", "type": "plain" },
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
-                {"text": "new paragraph", "type": "plain"},
+                { "text": "new paragraph", "type": "plain" },
             ]);
             toggleInlineFormat(range, "__");
             expect(model.serializeParts()).toEqual([
-                {"text": "__hello world,", "type": "plain"},
+                { "text": "__hello world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how are you doing?__", "type": "plain"},
+                { "text": "how are you doing?__", "type": "plain" },
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
-                {"text": "__new paragraph__", "type": "plain"},
+                { "text": "__new paragraph__", "type": "plain" },
             ]);
             range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
             console.log("RANGE", range.parts);
             toggleInlineFormat(range, "__");
             expect(model.serializeParts()).toEqual([
-                {"text": "hello world,", "type": "plain"},
+                { "text": "hello world,", "type": "plain" },
                 SERIALIZED_NEWLINE,
-                {"text": "how are you doing?", "type": "plain"},
+                { "text": "how are you doing?", "type": "plain" },
                 SERIALIZED_NEWLINE,
                 SERIALIZED_NEWLINE,
-                {"text": "new paragraph", "type": "plain"},
+                { "text": "new paragraph", "type": "plain" },
             ]);
         });
     });
diff --git a/test/editor/position-test.js b/test/editor/position-test.js
index 90f40c21a7..ea8658b216 100644
--- a/test/editor/position-test.js
+++ b/test/editor/position-test.js
@@ -14,8 +14,9 @@ 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 EditorModel from "../../src/editor/model";
-import {createPartCreator} from "./mock";
+import { createPartCreator } from "./mock";
 
 function createRenderer() {
     const render = (c) => {
diff --git a/test/editor/range-test.js b/test/editor/range-test.js
index 60055af824..87c5b06e44 100644
--- a/test/editor/range-test.js
+++ b/test/editor/range-test.js
@@ -14,8 +14,9 @@ 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 EditorModel from "../../src/editor/model";
-import {createPartCreator, createRenderer} from "./mock";
+import { createPartCreator, createRenderer } from "./mock";
 
 const pillChannel = "#riot-dev:matrix.org";
 
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index f0d577ea21..085a8afdba 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -14,9 +14,10 @@ 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 EditorModel from "../../src/editor/model";
-import {htmlSerializeIfNeeded} from "../../src/editor/serialize";
-import {createPartCreator} from "./mock";
+import { htmlSerializeIfNeeded } from "../../src/editor/serialize";
+import { createPartCreator } from "./mock";
 
 describe('editor/serialize', function() {
     it('user pill turns message into html', function() {
diff --git a/test/end-to-end-tests/element/install.sh b/test/end-to-end-tests/element/install.sh
index e38f795df1..e1df709c68 100755
--- a/test/end-to-end-tests/element/install.sh
+++ b/test/end-to-end-tests/element/install.sh
@@ -12,5 +12,5 @@ unzip -q element.zip
 rm element.zip
 mv element-web-${ELEMENT_BRANCH} element-web
 cd element-web
-yarn install
+yarn install --pure-lockfile
 yarn run build
diff --git a/test/end-to-end-tests/install.sh b/test/end-to-end-tests/install.sh
index bbe7a24c9b..b2254a4ea7 100755
--- a/test/end-to-end-tests/install.sh
+++ b/test/end-to-end-tests/install.sh
@@ -4,4 +4,4 @@ set -e
 ./synapse/install.sh
 # local testing doesn't need a Element fetched from master,
 # so not installing that by default
-yarn install
+yarn install --pure-lockfile
diff --git a/test/end-to-end-tests/package.json b/test/end-to-end-tests/package.json
index 8372039258..6f0c12e195 100644
--- a/test/end-to-end-tests/package.json
+++ b/test/end-to-end-tests/package.json
@@ -11,7 +11,7 @@
     "dependencies": {
         "cheerio": "^1.0.0-rc.2",
         "commander": "^2.19.0",
-        "puppeteer": "^1.14.0",
+        "puppeteer": "10.0.0",
         "request": "^2.88.0",
         "request-promise-native": "^1.0.7",
         "uuid": "^3.3.2"
diff --git a/test/end-to-end-tests/src/rest/consent.js b/test/end-to-end-tests/src/rest/consent.js
index 956441571b..8be27258d0 100644
--- a/test/end-to-end-tests/src/rest/consent.js
+++ b/test/end-to-end-tests/src/rest/consent.js
@@ -27,5 +27,5 @@ module.exports.approveConsent = async function(consentUrl) {
     const h = doc("input[name=h]").val();
     const formAction = doc("form").attr("action");
     const absAction = url.resolve(consentUrl, formAction);
-    await request.post(absAction).form({v, u, h});
+    await request.post(absAction).form({ v, u, h });
 };
diff --git a/test/end-to-end-tests/src/rest/creator.js b/test/end-to-end-tests/src/rest/creator.js
index 03b2e099bc..f01a325a71 100644
--- a/test/end-to-end-tests/src/rest/creator.js
+++ b/test/end-to-end-tests/src/rest/creator.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {exec} = require('child_process');
+const { exec } = require('child_process');
 const request = require('request-promise-native');
 const RestSession = require('./session');
 const RestMultiSession = require('./multi');
@@ -26,7 +26,7 @@ function execAsync(command, options) {
             if (error) {
                 reject(error);
             } else {
-                resolve({stdout, stderr});
+                resolve({ stdout, stderr });
             }
         });
     });
@@ -67,7 +67,7 @@ module.exports = class RestSessionCreator {
             registerCmd,
         ].join(' && ');
 
-        await execAsync(allCmds, {cwd: this.cwd, encoding: 'utf-8'});
+        await execAsync(allCmds, { cwd: this.cwd, encoding: 'utf-8' });
     }
 
     async _authenticate(username, password) {
@@ -80,7 +80,7 @@ module.exports = class RestSessionCreator {
             "password": password,
         };
         const url = `${this.hsUrl}/_matrix/client/r0/login`;
-        const responseBody = await request.post({url, json: true, body: requestBody});
+        const responseBody = await request.post({ url, json: true, body: requestBody });
         return {
             accessToken: responseBody.access_token,
             homeServer: responseBody.home_server,
diff --git a/test/end-to-end-tests/src/rest/session.js b/test/end-to-end-tests/src/rest/session.js
index 5b97824f5c..3c04592d02 100644
--- a/test/end-to-end-tests/src/rest/session.js
+++ b/test/end-to-end-tests/src/rest/session.js
@@ -17,7 +17,7 @@ limitations under the License.
 const request = require('request-promise-native');
 const Logger = require('../logger');
 const RestRoom = require('./room');
-const {approveConsent} = require('./consent');
+const { approveConsent } = require('./consent');
 
 module.exports = class RestSession {
     constructor(credentials) {
diff --git a/test/end-to-end-tests/src/scenario.js b/test/end-to-end-tests/src/scenario.js
index 2191d630ac..b6581d4930 100644
--- a/test/end-to-end-tests/src/scenario.js
+++ b/test/end-to-end-tests/src/scenario.js
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
-const {range} = require('./util');
+const { range } = require('./util');
 const signup = require('./usecases/signup');
 const toastScenarios = require('./scenarios/toast');
 const roomDirectoryScenarios = require('./scenarios/directory');
@@ -44,6 +43,9 @@ module.exports = async function scenario(createSession, restCreator) {
     console.log("create REST users:");
     const charlies = await createRestUsers(restCreator);
     await lazyLoadingScenarios(alice, bob, charlies);
+    // do spaces scenarios last as the rest of the tests may get confused by spaces
+    // XXX: disabled for now as fails in CI but succeeds locally
+    // await spacesScenarios(alice, bob);
 };
 
 async function createRestUsers(restCreator) {
diff --git a/test/end-to-end-tests/src/scenarios/directory.js b/test/end-to-end-tests/src/scenarios/directory.js
index b5be9ed4f4..fffca2b05c 100644
--- a/test/end-to-end-tests/src/scenarios/directory.js
+++ b/test/end-to-end-tests/src/scenarios/directory.js
@@ -15,23 +15,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 const join = require('../usecases/join');
 const sendMessage = require('../usecases/send-message');
-const {receiveMessage} = require('../usecases/timeline');
-const {createRoom} = require('../usecases/create-room');
-const {changeRoomSettings} = require('../usecases/room-settings');
+const { receiveMessage } = require('../usecases/timeline');
+const { createRoom } = require('../usecases/create-room');
+const { changeRoomSettings } = require('../usecases/room-settings');
 
 module.exports = async function roomDirectoryScenarios(alice, bob) {
     console.log(" creating a public room and join through directory:");
     const room = 'test';
     await createRoom(alice, room);
-    await changeRoomSettings(alice, {directory: true, visibility: "public_no_guests", alias: "#test"});
+    await changeRoomSettings(alice, { directory: true, visibility: "public", alias: "#test" });
     await join(bob, room); //looks up room in directory
     const bobMessage = "hi Alice!";
     await sendMessage(bob, bobMessage);
-    await receiveMessage(alice, {sender: "bob", body: bobMessage});
+    await receiveMessage(alice, { sender: "bob", body: bobMessage });
     const aliceMessage = "hi Bob, welcome!";
     await sendMessage(alice, aliceMessage);
-    await receiveMessage(bob, {sender: "alice", body: aliceMessage});
+    await receiveMessage(bob, { sender: "alice", body: aliceMessage });
 };
diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index 20e8af2947..23234b85ce 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -17,32 +17,35 @@ limitations under the License.
 
 const sendMessage = require('../usecases/send-message');
 const acceptInvite = require('../usecases/accept-invite');
-const {receiveMessage} = require('../usecases/timeline');
-const {createDm} = require('../usecases/create-room');
-const {checkRoomSettings} = require('../usecases/room-settings');
-const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
+const { receiveMessage } = require('../usecases/timeline');
+const { createDm } = require('../usecases/create-room');
+const { checkRoomSettings } = require('../usecases/room-settings');
+const { startSasVerification, acceptSasVerification } = require('../usecases/verify');
 const { setupSecureBackup } = require('../usecases/security');
 const assert = require('assert');
+const { measureStart, measureStop } = require('../util');
 
 module.exports = async function e2eEncryptionScenarios(alice, bob) {
     console.log(" creating an e2e encrypted DM and join through invite:");
     await createDm(bob, ['@alice:localhost']);
-    await checkRoomSettings(bob, {encryption: true}); // for sanity, should be e2e-by-default
+    await checkRoomSettings(bob, { encryption: true }); // for sanity, should be e2e-by-default
     await acceptInvite(alice, 'bob');
     // do sas verifcation
     bob.log.step(`starts SAS verification with ${alice.username}`);
-    const bobSasPromise = startSasVerifcation(bob, alice.username);
+    await measureStart(bob, "mx_VerifyE2EEUser");
+    const bobSasPromise = startSasVerification(bob, alice.username);
     const aliceSasPromise = acceptSasVerification(alice, bob.username);
     // wait in parallel, so they don't deadlock on each other
     // the logs get a bit messy here, but that's fine enough for debugging (hopefully)
     const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
     assert.deepEqual(bobSas, aliceSas);
+    await measureStop(bob, "mx_VerifyE2EEUser");
     bob.log.done(`done (match for ${bobSas.join(", ")})`);
     const aliceMessage = "Guess what I just heard?!";
     await sendMessage(alice, aliceMessage);
-    await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
+    await receiveMessage(bob, { sender: "alice", body: aliceMessage, encrypted: true });
     const bobMessage = "You've got to tell me!";
     await sendMessage(bob, bobMessage);
-    await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+    await receiveMessage(alice, { sender: "bob", body: bobMessage, encrypted: true });
     await setupSecureBackup(alice);
 };
diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
index 6d321dc737..406f7b24a3 100644
--- a/test/end-to-end-tests/src/scenarios/lazy-loading.js
+++ b/test/end-to-end-tests/src/scenarios/lazy-loading.js
@@ -15,17 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
-const {delay} = require('../util');
+const { delay } = require('../util');
 const join = require('../usecases/join');
 const sendMessage = require('../usecases/send-message');
 const {
     checkTimelineContains,
     scrollToTimelineTop,
 } = require('../usecases/timeline');
-const {createRoom} = require('../usecases/create-room');
-const {getMembersInMemberlist} = require('../usecases/memberlist');
-const {changeRoomSettings} = require('../usecases/room-settings');
+const { createRoom } = require('../usecases/create-room');
+const { getMembersInMemberlist } = require('../usecases/memberlist');
+const { changeRoomSettings } = require('../usecases/room-settings');
 const assert = require('assert');
 
 module.exports = async function lazyLoadingScenarios(alice, bob, charlies) {
@@ -52,7 +51,7 @@ const charlyMsg2 = "how's it going??";
 
 async function setupRoomWithBobAliceAndCharlies(alice, bob, charlies) {
     await createRoom(bob, room);
-    await changeRoomSettings(bob, {directory: true, visibility: "public_no_guests", alias});
+    await changeRoomSettings(bob, { directory: true, visibility: "public", alias });
     // wait for alias to be set by server after clicking "save"
     // so the charlies can join it.
     await bob.delay(500);
diff --git a/test/end-to-end-tests/src/scenarios/spaces.js b/test/end-to-end-tests/src/scenarios/spaces.js
new file mode 100644
index 0000000000..303db65593
--- /dev/null
+++ b/test/end-to-end-tests/src/scenarios/spaces.js
@@ -0,0 +1,32 @@
+/*
+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.
+*/
+
+const { createSpace, inviteSpace } = require("../usecases/create-space");
+
+module.exports = async function spacesScenarios(alice, bob) {
+    console.log(" creating a space for spaces scenarios:");
+
+    await alice.delay(1000); // wait for dialogs to close
+    await setupSpaceUsingAliceAndInviteBob(alice, bob);
+};
+
+const space = "Test Space";
+
+async function setupSpaceUsingAliceAndInviteBob(alice, bob) {
+    await createSpace(alice, space);
+    await inviteSpace(alice, space, "@bob:localhost");
+    await bob.query(`.mx_SpaceButton[aria-label="${space}"]`); // assert invite received
+}
diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 8b23dbcabc..40b480c3fa 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {assertNoToasts, acceptToast, rejectToast} = require("../usecases/toasts");
+const { assertNoToasts, acceptToast, rejectToast } = require("../usecases/toasts");
 
 module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 6c68929a0b..f5d20fde28 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -18,7 +18,7 @@ limitations under the License.
 const puppeteer = require('puppeteer');
 const Logger = require('./logger');
 const LogBuffer = require('./logbuffer');
-const {delay} = require('./util');
+const { delay } = require('./util');
 
 const DEFAULT_TIMEOUT = 20000;
 
@@ -112,7 +112,7 @@ module.exports = class ElementSession {
 
     async replaceInputText(input, text) {
         // click 3 times to select all text
-        await input.click({clickCount: 3});
+        await input.click({ clickCount: 3 });
         // waiting here solves not having selected all the text by the 3x click above,
         // presumably because of the Field label animation.
         await this.delay(300);
@@ -123,7 +123,7 @@ module.exports = class ElementSession {
     }
 
     query(selector, timeout = DEFAULT_TIMEOUT, hidden = false) {
-        return this.page.waitForSelector(selector, {visible: true, timeout, hidden});
+        return this.page.waitForSelector(selector, { visible: true, timeout, hidden });
     }
 
     async queryAll(selector) {
diff --git a/test/end-to-end-tests/src/usecases/accept-invite.js b/test/end-to-end-tests/src/usecases/accept-invite.js
index d7c024ac4b..50d685dc74 100644
--- a/test/end-to-end-tests/src/usecases/accept-invite.js
+++ b/test/end-to-end-tests/src/usecases/accept-invite.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {findSublist} = require("./create-room");
+const { findSublist } = require("./create-room");
 
 module.exports = async function acceptInvite(session, name) {
     session.log.step(`accepts "${name}" invite`);
@@ -23,9 +23,9 @@ module.exports = async function acceptInvite(session, name) {
     const invitesHandles = await inviteSublist.$$(".mx_RoomTile_name");
     const invitesWithText = await Promise.all(invitesHandles.map(async (inviteHandle) => {
         const text = await session.innerText(inviteHandle);
-        return {inviteHandle, text};
+        return { inviteHandle, text };
     }));
-    const inviteHandle = invitesWithText.find(({inviteHandle, text}) => {
+    const inviteHandle = invitesWithText.find(({ inviteHandle, text }) => {
         return text.trim() === name;
     }).inviteHandle;
 
diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index 3830e3e0da..b644ad0309 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+const { measureStart, measureStop } = require('../util');
+
 async function openRoomDirectory(session) {
     const roomDirectoryButton = await session.query('.mx_LeftPanel_exploreButton');
     await roomDirectoryButton.click();
@@ -52,6 +54,8 @@ async function createRoom(session, roomName, encrypted=false) {
 async function createDm(session, invitees) {
     session.log.step(`creates DM with ${JSON.stringify(invitees)}`);
 
+    await measureStart(session, "mx_CreateDM");
+
     const dmsSublist = await findSublist(session, "people");
     const startChatButton = await dmsSublist.$(".mx_RoomSublist_auxButton");
     await startChatButton.click();
@@ -76,6 +80,8 @@ async function createDm(session, invitees) {
 
     await session.query('.mx_MessageComposer');
     session.log.done();
+
+    await measureStop(session, "mx_CreateDM");
 }
 
-module.exports = {openRoomDirectory, findSublist, createRoom, createDm};
+module.exports = { openRoomDirectory, findSublist, createRoom, createDm };
diff --git a/test/end-to-end-tests/src/usecases/create-space.js b/test/end-to-end-tests/src/usecases/create-space.js
new file mode 100644
index 0000000000..f1dbfa6b5a
--- /dev/null
+++ b/test/end-to-end-tests/src/usecases/create-space.js
@@ -0,0 +1,80 @@
+/*
+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.
+*/
+
+async function openSpaceCreateMenu(session) {
+    const spaceCreateButton = await session.query('.mx_SpaceButton_new');
+    await spaceCreateButton.click();
+}
+
+async function createSpace(session, name, isPublic = false) {
+    session.log.step(`creates space "${name}"`);
+
+    await openSpaceCreateMenu(session);
+    const className = isPublic ? ".mx_SpaceCreateMenuType_public" : ".mx_SpaceCreateMenuType_private";
+    const visibilityButton = await session.query(className);
+    await visibilityButton.click();
+
+    const nameInput = await session.query('input[name="spaceName"]');
+    await session.replaceInputText(nameInput, name);
+
+    await session.delay(100);
+
+    const createButton = await session.query('.mx_SpaceCreateMenu_wrapper .mx_AccessibleButton_kind_primary');
+    await createButton.click();
+
+    if (!isPublic) {
+        const justMeButton = await session.query('.mx_SpaceRoomView_privateScope_justMeButton');
+        await justMeButton.click();
+        const continueButton = await session.query('.mx_AddExistingToSpace_footer .mx_AccessibleButton_kind_primary');
+        await continueButton.click();
+    } else {
+        for (let i = 0; i < 2; i++) {
+            const continueButton = await session.query('.mx_SpaceRoomView_buttons .mx_AccessibleButton_kind_primary');
+            await continueButton.click();
+        }
+    }
+
+    session.log.done();
+}
+
+async function inviteSpace(session, spaceName, userId) {
+    session.log.step(`invites "${userId}" to space "${spaceName}"`);
+
+    const spaceButton = await session.query(`.mx_SpaceButton[aria-label="${spaceName}"]`);
+    await spaceButton.click({
+        button: 'right',
+    });
+
+    const inviteButton = await session.query('[aria-label="Invite people"]');
+    await inviteButton.click();
+
+    try {
+        const button = await session.query('.mx_SpacePublicShare_inviteButton');
+        await button.click();
+    } catch (e) {
+        // ignore
+    }
+
+    const inviteTextArea = await session.query(".mx_InviteDialog_editor input");
+    await inviteTextArea.type(userId);
+    const selectUserItem = await session.query(".mx_InviteDialog_roomTile");
+    await selectUserItem.click();
+    const confirmButton = await session.query(".mx_InviteDialog_goButton");
+    await confirmButton.click();
+    session.log.done();
+}
+
+module.exports = { openSpaceCreateMenu, createSpace, inviteSpace };
diff --git a/test/end-to-end-tests/src/usecases/join.js b/test/end-to-end-tests/src/usecases/join.js
index 655c0be686..1dff5fc45b 100644
--- a/test/end-to-end-tests/src/usecases/join.js
+++ b/test/end-to-end-tests/src/usecases/join.js
@@ -15,10 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {openRoomDirectory} = require('./create-room');
+const { openRoomDirectory } = require('./create-room');
+const { measureStart, measureStop } = require('../util');
 
 module.exports = async function join(session, roomName) {
     session.log.step(`joins room "${roomName}"`);
+    await measureStart(session, "mx_JoinRoom");
     await openRoomDirectory(session);
     const roomInput = await session.query('.mx_DirectorySearchBox input');
     await session.replaceInputText(roomInput, roomName);
@@ -26,5 +28,6 @@ module.exports = async function join(session, roomName) {
     const joinFirstLink = await session.query('.mx_RoomDirectory_table .mx_RoomDirectory_join .mx_AccessibleButton');
     await joinFirstLink.click();
     await session.query('.mx_MessageComposer');
+    await measureStop(session, "mx_JoinRoom");
     session.log.done();
 };
diff --git a/test/end-to-end-tests/src/usecases/memberlist.js b/test/end-to-end-tests/src/usecases/memberlist.js
index ed7f0e389b..26c0c39755 100644
--- a/test/end-to-end-tests/src/usecases/memberlist.js
+++ b/test/end-to-end-tests/src/usecases/memberlist.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 const assert = require('assert');
-const {openRoomSummaryCard} = require("./rightpanel");
+const { openRoomSummaryCard } = require("./rightpanel");
 
 async function openMemberInfo(session, name) {
     const membersAndNames = await getMembersInMemberlist(session);
@@ -49,7 +49,6 @@ module.exports.verifyDeviceForUser = async function(session, name, expectedDevic
     const sasLabels = await Promise.all(sasLabelElements.map(e => session.innerText(e)));
     console.log("my sas labels", sasLabels);
 
-
     const dialogCodeFields = await session.queryAll(".mx_QuestionDialog code");
     assert.equal(dialogCodeFields.length, 2);
     const deviceId = await session.innerText(dialogCodeFields[0]);
@@ -71,7 +70,7 @@ async function getMembersInMemberlist(session) {
 
     const memberNameElements = await session.queryAll(".mx_MemberList .mx_EntityTile_name");
     return Promise.all(memberNameElements.map(async (el) => {
-        return {label: el, displayName: await session.innerText(el)};
+        return { label: el, displayName: await session.innerText(el) };
     }));
 }
 
diff --git a/test/end-to-end-tests/src/usecases/rightpanel.js b/test/end-to-end-tests/src/usecases/rightpanel.js
index ae6bb2c771..00a8cde5a6 100644
--- a/test/end-to-end-tests/src/usecases/rightpanel.js
+++ b/test/end-to-end-tests/src/usecases/rightpanel.js
@@ -32,7 +32,11 @@ module.exports.goBackToRoomSummaryCard = async function(session) {
             // Sometimes our tests have this opened to MemberInfo
             await backButton.click();
         } catch (e) {
-            break; // stop trying to go further back
+            // explicitly check for TimeoutError as this sometimes returned
+            // `Error: Node is detached from document` due to a re-render race or similar
+            if (e.name === "TimeoutError") {
+                break; // stop trying to go further back
+            }
         }
     }
 };
diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index abd4488db2..83d6fd79a8 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -16,8 +16,8 @@ limitations under the License.
 */
 
 const assert = require('assert');
-const {openRoomSummaryCard} = require("./rightpanel");
-const {acceptDialog} = require('./dialog');
+const { openRoomSummaryCard } = require("./rightpanel");
+const { acceptDialog } = require('./dialog');
 
 async function setSettingsToggle(session, toggle, enabled) {
     const className = await session.getElementProperty(toggle, "className");
@@ -57,13 +57,13 @@ async function findTabs(session) {
     const tabLabels = await Promise.all(tabButtons.map(t => session.innerText(t)));
     const securityTabButton = tabButtons[tabLabels.findIndex(l => l.toLowerCase().includes("security"))];
 
-    return {securityTabButton};
+    return { securityTabButton };
 }
 
 async function checkRoomSettings(session, expectedSettings) {
     session.log.startGroup(`checks the room settings`);
 
-    const {securityTabButton} = await findTabs(session);
+    const { securityTabButton } = await findTabs(session);
     const generalSwitches = await session.queryAll(".mx_RoomSettingsDialog .mx_ToggleSwitch");
     const isDirectory = generalSwitches[0];
 
@@ -98,18 +98,14 @@ async function checkRoomSettings(session, expectedSettings) {
     if (expectedSettings.visibility) {
         session.log.step(`checks visibility is ${expectedSettings.visibility}`);
         const radios = await session.queryAll(".mx_RoomSettingsDialog input[type=radio]");
-        assert.equal(radios.length, 7);
-        const inviteOnly = radios[0];
-        const publicNoGuests = radios[1];
-        const publicWithGuests = radios[2];
+        assert.equal(radios.length, 6);
+        const [inviteOnlyRoom, publicRoom] = radios;
 
         let expectedRadio = null;
         if (expectedSettings.visibility === "invite_only") {
-            expectedRadio = inviteOnly;
-        } else if (expectedSettings.visibility === "public_no_guests") {
-            expectedRadio = publicNoGuests;
-        } else if (expectedSettings.visibility === "public_with_guests") {
-            expectedRadio = publicWithGuests;
+            expectedRadio = inviteOnlyRoom;
+        } else if (expectedSettings.visibility === "public") {
+            expectedRadio = publicRoom;
         } else {
             throw new Error(`unrecognized room visibility setting: ${expectedSettings.visibility}`);
         }
@@ -129,7 +125,7 @@ async function checkRoomSettings(session, expectedSettings) {
 async function changeRoomSettings(session, settings) {
     session.log.startGroup(`changes the room settings`);
 
-    const {securityTabButton} = await findTabs(session);
+    const { securityTabButton } = await findTabs(session);
     const generalSwitches = await session.queryAll(".mx_RoomSettingsDialog .mx_ToggleSwitch");
     const isDirectory = generalSwitches[0];
 
@@ -140,8 +136,6 @@ async function changeRoomSettings(session, settings) {
 
     if (settings.alias) {
         session.log.step(`sets alias to ${settings.alias}`);
-        const summary = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings summary");
-        await summary.click();
         const aliasField = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings details input[type=text]");
         await session.replaceInputText(aliasField, settings.alias.substring(1, settings.alias.lastIndexOf(":")));
         const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings details .mx_AccessibleButton");
@@ -168,16 +162,12 @@ async function changeRoomSettings(session, settings) {
         session.log.step(`sets visibility to ${settings.visibility}`);
         const radios = await session.queryAll(".mx_RoomSettingsDialog label");
         assert.equal(radios.length, 7);
-        const inviteOnly = radios[0];
-        const publicNoGuests = radios[1];
-        const publicWithGuests = radios[2];
+        const [inviteOnlyRoom,, publicRoom] = radios;
 
         if (settings.visibility === "invite_only") {
-            await inviteOnly.click();
-        } else if (settings.visibility === "public_no_guests") {
-            await publicNoGuests.click();
-        } else if (settings.visibility === "public_with_guests") {
-            await publicWithGuests.click();
+            await inviteOnlyRoom.click();
+        } else if (settings.visibility === "public") {
+            await publicRoom.click();
         } else {
             throw new Error(`unrecognized room visibility setting: ${settings.visibility}`);
         }
@@ -190,4 +180,4 @@ async function changeRoomSettings(session, settings) {
     session.log.endGroup();
 }
 
-module.exports = {checkRoomSettings, changeRoomSettings};
+module.exports = { checkRoomSettings, changeRoomSettings };
diff --git a/test/end-to-end-tests/src/usecases/settings.js b/test/end-to-end-tests/src/usecases/settings.js
index 52e4bb7e0a..509e0b4a07 100644
--- a/test/end-to-end-tests/src/usecases/settings.js
+++ b/test/end-to-end-tests/src/usecases/settings.js
@@ -51,5 +51,5 @@ module.exports.getE2EDeviceFromSettings = async function(session) {
     const closeButton = await session.query(".mx_UserSettingsDialog .mx_Dialog_cancelButton");
     await closeButton.click();
     session.log.done();
-    return {id, key};
+    return { id, key };
 };
diff --git a/test/end-to-end-tests/src/usecases/timeline.js b/test/end-to-end-tests/src/usecases/timeline.js
index 3889dce108..f9d7300ff1 100644
--- a/test/end-to-end-tests/src/usecases/timeline.js
+++ b/test/end-to-end-tests/src/usecases/timeline.js
@@ -69,7 +69,6 @@ module.exports.receiveMessage = async function(session, expectedMessage) {
     session.log.done();
 };
 
-
 module.exports.checkTimelineContains = async function(session, expectedMessages, sendersDescription) {
     session.log.step(`checks timeline contains ${expectedMessages.length} ` +
         `given messages${sendersDescription ? ` from ${sendersDescription}`:""}`);
@@ -122,7 +121,7 @@ function getAllEventTiles(session) {
 }
 
 async function getMessageFromEventTile(eventTile) {
-    const senderElement = await eventTile.$(".mx_SenderProfile_name");
+    const senderElement = await eventTile.$(".mx_SenderProfile_displayName");
     const className = await (await eventTile.getProperty("className")).jsonValue();
     const classNames = className.split(" ");
     const bodyElement = await eventTile.$(".mx_EventTile_body");
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index db78352f2b..8650ff1400 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -40,8 +40,8 @@ async function acceptToast(session, expectedTitle) {
 
 async function rejectToast(session, expectedTitle) {
     await assertToast(session, expectedTitle);
-    const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+    const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger_outline');
     await btn.click();
 }
 
-module.exports = {assertNoToasts, assertToast, acceptToast, rejectToast};
+module.exports = { assertNoToasts, assertToast, acceptToast, rejectToast };
diff --git a/test/end-to-end-tests/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
index ea5b9961a4..a1f600833d 100644
--- a/test/end-to-end-tests/src/usecases/verify.js
+++ b/test/end-to-end-tests/src/usecases/verify.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 const assert = require('assert');
-const {openMemberInfo} = require("./memberlist");
+const { openMemberInfo } = require("./memberlist");
 
 async function startVerification(session, name) {
     session.log.step("opens their opponent's profile and starts verification");
@@ -74,7 +74,7 @@ async function doSasVerification(session) {
     return sasCodes;
 }
 
-module.exports.startSasVerifcation = async function(session, name) {
+module.exports.startSasVerification = async function(session, name) {
     session.log.startGroup("starts verification");
     await startVerification(session, name);
 
diff --git a/test/end-to-end-tests/src/util.js b/test/end-to-end-tests/src/util.js
index cc7391fa9f..5abb110df4 100644
--- a/test/end-to-end-tests/src/util.js
+++ b/test/end-to-end-tests/src/util.js
@@ -26,3 +26,15 @@ module.exports.range = function(start, amount, step = 1) {
 module.exports.delay = function(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 };
+
+module.exports.measureStart = function(session, name) {
+    return session.page.evaluate(_name => {
+        window.mxPerformanceMonitor.start(_name);
+    }, name);
+};
+
+module.exports.measureStop = function(session, name) {
+    return session.page.evaluate(_name => {
+        window.mxPerformanceMonitor.stop(_name);
+    }, name);
+};
diff --git a/test/end-to-end-tests/start.js b/test/end-to-end-tests/start.js
index f29b485c84..f65d6137f4 100644
--- a/test/end-to-end-tests/start.js
+++ b/test/end-to-end-tests/start.js
@@ -79,7 +79,7 @@ async function runTests() {
         await new Promise((resolve) => setTimeout(resolve, 5 * 60 * 1000));
     }
 
-    const performanceEntries = {};
+    let performanceEntries;
 
     await Promise.all(sessions.map(async (session) => {
         // Collecting all performance monitoring data before closing the session
@@ -88,6 +88,10 @@ async function runTests() {
             window.mxPerformanceMonitor.addPerformanceDataCallback({
                 entryNames: [
                     window.mxPerformanceEntryNames.REGISTER,
+                    window.mxPerformanceEntryNames.LOGIN,
+                    window.mxPerformanceEntryNames.JOIN_ROOM,
+                    window.mxPerformanceEntryNames.CREATE_DM,
+                    window.mxPerformanceEntryNames.VERIFY_E2EE_USER,
                 ],
                 callback: (events) => {
                     measurements = JSON.stringify(events);
@@ -95,7 +99,11 @@ async function runTests() {
             }, true);
             return measurements;
         });
-        performanceEntries[session.username] = JSON.parse(measurements);
+
+        /**
+         * TODO: temporary only use one user session data
+         */
+        performanceEntries = JSON.parse(measurements);
         return session.close();
     }));
     fs.writeFileSync(`performance-entries.json`, JSON.stringify(performanceEntries));
@@ -125,7 +133,7 @@ async function writeLogs(sessions, dir) {
         fs.writeFileSync(appHtmlName, documentHtml);
         fs.writeFileSync(networkLogName, session.networkLogs());
         fs.writeFileSync(consoleLogName, session.consoleLogs());
-        await session.page.screenshot({path: `${userLogDir}/screenshot.png`});
+        await session.page.screenshot({ path: `${userLogDir}/screenshot.png` });
     }
     return logs;
 }
diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index deb750666f..13aea8d18d 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -572,11 +572,11 @@ uploads_path: "{{SYNAPSE_ROOT}}uploads"
 ## Captcha ##
 # See docs/CAPTCHA_SETUP for full details of configuring this.
 
-# This Home Server's ReCAPTCHA public key.
+# This homeserver's ReCAPTCHA public key.
 #
 #recaptcha_public_key: "YOUR_PUBLIC_KEY"
 
-# This Home Server's ReCAPTCHA private key.
+# This homeserver's ReCAPTCHA private key.
 #
 #recaptcha_private_key: "YOUR_PRIVATE_KEY"
 
@@ -685,7 +685,7 @@ registration_shared_secret: "{{REGISTRATION_SHARED_SECRET}}"
 # The list of identity servers trusted to verify third party
 # identifiers by this server.
 #
-# Also defines the ID server which will be called when an account is
+# Also defines the identity server which will be called when an account is
 # deactivated (one will be picked arbitrarily).
 #
 #trusted_third_party_id_servers:
@@ -889,7 +889,7 @@ email:
    smtp_user: "exampleusername"
    smtp_pass: "examplepassword"
    require_transport_security: False
-   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
+   notif_from: "Your Friendly %(app)s homeserver <noreply@example.com>"
    app_name: Matrix
    # if template_dir is unset, uses the example templates that are part of
    # the Synapse distribution.
diff --git a/test/end-to-end-tests/yarn.lock b/test/end-to-end-tests/yarn.lock
index 97b348fe50..985c883ad6 100644
--- a/test/end-to-end-tests/yarn.lock
+++ b/test/end-to-end-tests/yarn.lock
@@ -7,12 +7,19 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.12.1.tgz#d90123f6c61fdf2f7cddd286ddae891586dd3488"
   integrity sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==
 
-agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+"@types/yauzl@^2.9.1":
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
+  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
   dependencies:
-    es6-promisify "^5.0.0"
+    "@types/node" "*"
+
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
 
 ajv@^6.5.5:
   version "6.10.0"
@@ -36,11 +43,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -61,6 +63,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
@@ -68,6 +75,15 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -86,10 +102,13 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+buffer@^5.2.1, buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -108,6 +127,11 @@ cheerio@^1.0.0-rc.2:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
@@ -125,17 +149,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
@@ -162,21 +176,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.0:
+debug@4, debug@4.3.1, debug@^4.1.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
@@ -188,6 +188,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+devtools-protocol@0.0.883894:
+  version "0.0.883894"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz#d403f2c75cd6d71c916aee8dde9258da988a4da9"
+  integrity sha512-33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg==
+
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
@@ -232,37 +237,33 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-extract-zip@^1.6.6:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
+    debug "^4.1.1"
+    get-stream "^5.1.0"
     yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
 
 extsprintf@1.3.0:
   version "1.3.0"
@@ -291,6 +292,14 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -305,11 +314,23 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -363,13 +384,18 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+https-proxy-agent@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
   dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
+    agent-base "6"
+    debug "4"
+
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -379,7 +405,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3, inherits@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -394,11 +420,6 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -434,6 +455,13 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 lodash@^4.15.0, lodash@^4.17.11:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -451,11 +479,6 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.38.0"
 
-mime@^2.0.3:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
-  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
-
 minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -468,27 +491,22 @@ minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-mkdirp@^0.5.4:
+mkdirp@^0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+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==
 
 nth-check@~1.0.1:
   version "1.0.2"
@@ -502,13 +520,32 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-once@^1.3.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
@@ -516,6 +553,11 @@ parse5@^3.0.1:
   dependencies:
     "@types/node" "*"
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -531,17 +573,19 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-process-nextick-args@~2.0.0:
+pkg-dir@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+progress@2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
+  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
 
-progress@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-proxy-from-env@^1.0.0:
+proxy-from-env@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -551,6 +595,14 @@ psl@^1.1.24, psl@^1.1.28:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
   integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -561,38 +613,29 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@^1.14.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.20.0.tgz#e3d267786f74e1d87cf2d15acc59177f471bbe38"
-  integrity sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==
+puppeteer@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.0.0.tgz#1b597c956103e2d989ca17f41ba4693b20a3640c"
+  integrity sha512-AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A==
   dependencies:
-    debug "^4.1.0"
-    extract-zip "^1.6.6"
-    https-proxy-agent "^2.2.1"
-    mime "^2.0.3"
-    progress "^2.0.1"
-    proxy-from-env "^1.0.0"
-    rimraf "^2.6.1"
-    ws "^6.1.0"
+    debug "4.3.1"
+    devtools-protocol "0.0.883894"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    node-fetch "2.6.1"
+    pkg-dir "4.2.0"
+    progress "2.0.1"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    tar-fs "2.0.0"
+    unbzip2-stream "1.3.3"
+    ws "7.4.6"
 
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
@@ -602,6 +645,15 @@ readable-stream@^3.1.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 request-promise-core@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
@@ -644,14 +696,14 @@ request@^2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-rimraf@^2.6.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+rimraf@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -688,12 +740,31 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+tar-fs@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
+  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
   dependencies:
-    safe-buffer "~5.1.0"
+    chownr "^1.1.1"
+    mkdirp "^0.5.1"
+    pump "^3.0.0"
+    tar-stream "^2.0.0"
+
+tar-stream@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 tough-cookie@^2.3.3:
   version "2.5.0"
@@ -723,10 +794,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+unbzip2-stream@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
+  integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
 
 uri-js@^4.2.2:
   version "4.2.2"
@@ -735,7 +809,7 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -759,12 +833,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@7.4.6:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 yauzl@^2.10.0:
   version "2.10.0"
diff --git a/test/mock-clock.js b/test/mock-clock.js
deleted file mode 100644
index 1a4d6086de..0000000000
--- a/test/mock-clock.js
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-Copyright (c) 2008-2015 Pivotal Labs
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* This is jasmine's implementation of a mock clock, lifted from the depths of
- * jasmine-core and exposed as a standalone module. The interface is just the
- * same as that of jasmine.clock. For example:
- *
- *    var mock_clock = require("../../mock-clock").clock();
- *    mock_clock.install();
- *    setTimeout(function() {
- *        timerCallback();
- *    }, 100);
- *
- *    expect(timerCallback).not.toHaveBeenCalled();
- *    mock_clock.tick(101);
- *    expect(timerCallback).toHaveBeenCalled();
- *
- *    mock_clock.uninstall();
- *
- *
- * The reason for C&Ping jasmine's clock here is that jasmine itself is
- * difficult to webpack, and we don't really want all of it. Sinon also has a
- * mock-clock implementation, but again, it is difficult to webpack.
- */
-
-const j$ = {};
-
-j$.Clock = function() {
-  function Clock(global, delayedFunctionSchedulerFactory, mockDate) {
-    let self = this,
-      realTimingFunctions = {
-        setTimeout: global.setTimeout,
-        clearTimeout: global.clearTimeout,
-        setInterval: global.setInterval,
-        clearInterval: global.clearInterval,
-      },
-      fakeTimingFunctions = {
-        setTimeout: setTimeout,
-        clearTimeout: clearTimeout,
-        setInterval: setInterval,
-        clearInterval: clearInterval,
-      },
-      installed = false,
-      delayedFunctionScheduler,
-      timer;
-
-
-    self.install = function() {
-      if(!originalTimingFunctionsIntact()) {
-        throw new Error('Jasmine Clock was unable to install over custom global timer functions. Is the clock already installed?');
-      }
-      replace(global, fakeTimingFunctions);
-      timer = fakeTimingFunctions;
-      delayedFunctionScheduler = delayedFunctionSchedulerFactory();
-      installed = true;
-
-      return self;
-    };
-
-    self.uninstall = function() {
-      delayedFunctionScheduler = null;
-      mockDate.uninstall();
-      replace(global, realTimingFunctions);
-
-      timer = realTimingFunctions;
-      installed = false;
-    };
-
-    self.withMock = function(closure) {
-      this.install();
-      try {
-        closure();
-      } finally {
-        this.uninstall();
-      }
-    };
-
-    self.mockDate = function(initialDate) {
-      mockDate.install(initialDate);
-    };
-
-    self.setTimeout = function(fn, delay, params) {
-      if (legacyIE()) {
-        if (arguments.length > 2) {
-          throw new Error('IE < 9 cannot support extra params to setTimeout without a polyfill');
-        }
-        return timer.setTimeout(fn, delay);
-      }
-      return Function.prototype.apply.apply(timer.setTimeout, [global, arguments]);
-    };
-
-    self.setInterval = function(fn, delay, params) {
-      if (legacyIE()) {
-        if (arguments.length > 2) {
-          throw new Error('IE < 9 cannot support extra params to setInterval without a polyfill');
-        }
-        return timer.setInterval(fn, delay);
-      }
-      return Function.prototype.apply.apply(timer.setInterval, [global, arguments]);
-    };
-
-    self.clearTimeout = function(id) {
-      return Function.prototype.call.apply(timer.clearTimeout, [global, id]);
-    };
-
-    self.clearInterval = function(id) {
-      return Function.prototype.call.apply(timer.clearInterval, [global, id]);
-    };
-
-    self.tick = function(millis) {
-      if (installed) {
-        mockDate.tick(millis);
-        delayedFunctionScheduler.tick(millis);
-      } else {
-        throw new Error('Mock clock is not installed, use jasmine.clock().install()');
-      }
-    };
-
-    return self;
-
-    function originalTimingFunctionsIntact() {
-      return global.setTimeout === realTimingFunctions.setTimeout &&
-        global.clearTimeout === realTimingFunctions.clearTimeout &&
-        global.setInterval === realTimingFunctions.setInterval &&
-        global.clearInterval === realTimingFunctions.clearInterval;
-    }
-
-    function legacyIE() {
-      //if these methods are polyfilled, apply will be present
-      return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply;
-    }
-
-    function replace(dest, source) {
-      for (const prop in source) {
-        dest[prop] = source[prop];
-      }
-    }
-
-    function setTimeout(fn, delay) {
-      return delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2));
-    }
-
-    function clearTimeout(id) {
-      return delayedFunctionScheduler.removeFunctionWithId(id);
-    }
-
-    function setInterval(fn, interval) {
-      return delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true);
-    }
-
-    function clearInterval(id) {
-      return delayedFunctionScheduler.removeFunctionWithId(id);
-    }
-
-    function argSlice(argsObj, n) {
-      return Array.prototype.slice.call(argsObj, n);
-    }
-  }
-
-  return Clock;
-}();
-
-
-j$.DelayedFunctionScheduler = function() {
-  function DelayedFunctionScheduler() {
-    const self = this;
-    const scheduledLookup = [];
-    const scheduledFunctions = {};
-    let currentTime = 0;
-    let delayedFnCount = 0;
-
-    self.tick = function(millis) {
-      millis = millis || 0;
-      const endTime = currentTime + millis;
-
-      runScheduledFunctions(endTime);
-      currentTime = endTime;
-    };
-
-    self.scheduleFunction = function(funcToCall, millis, params, recurring, timeoutKey, runAtMillis) {
-      let f;
-      if (typeof(funcToCall) === 'string') {
-        /* jshint evil: true */
-        f = function() { return eval(funcToCall); };
-        /* jshint evil: false */
-      } else {
-        f = funcToCall;
-      }
-
-      millis = millis || 0;
-      timeoutKey = timeoutKey || ++delayedFnCount;
-      runAtMillis = runAtMillis || (currentTime + millis);
-
-      const funcToSchedule = {
-        runAtMillis: runAtMillis,
-        funcToCall: f,
-        recurring: recurring,
-        params: params,
-        timeoutKey: timeoutKey,
-        millis: millis,
-      };
-
-      if (runAtMillis in scheduledFunctions) {
-        scheduledFunctions[runAtMillis].push(funcToSchedule);
-      } else {
-        scheduledFunctions[runAtMillis] = [funcToSchedule];
-        scheduledLookup.push(runAtMillis);
-        scheduledLookup.sort(function(a, b) {
-          return a - b;
-        });
-      }
-
-      return timeoutKey;
-    };
-
-    self.removeFunctionWithId = function(timeoutKey) {
-      for (const runAtMillis in scheduledFunctions) {
-        const funcs = scheduledFunctions[runAtMillis];
-        const i = indexOfFirstToPass(funcs, function(func) {
-          return func.timeoutKey === timeoutKey;
-        });
-
-        if (i > -1) {
-          if (funcs.length === 1) {
-            delete scheduledFunctions[runAtMillis];
-            deleteFromLookup(runAtMillis);
-          } else {
-            funcs.splice(i, 1);
-          }
-
-          // intervals get rescheduled when executed, so there's never more
-          // than a single scheduled function with a given timeoutKey
-          break;
-        }
-      }
-    };
-
-    return self;
-
-    function indexOfFirstToPass(array, testFn) {
-      let index = -1;
-
-      for (let i = 0; i < array.length; ++i) {
-        if (testFn(array[i])) {
-          index = i;
-          break;
-        }
-      }
-
-      return index;
-    }
-
-    function deleteFromLookup(key) {
-      const value = Number(key);
-      const i = indexOfFirstToPass(scheduledLookup, function(millis) {
-        return millis === value;
-      });
-
-      if (i > -1) {
-        scheduledLookup.splice(i, 1);
-      }
-    }
-
-    function reschedule(scheduledFn) {
-      self.scheduleFunction(scheduledFn.funcToCall,
-        scheduledFn.millis,
-        scheduledFn.params,
-        true,
-        scheduledFn.timeoutKey,
-        scheduledFn.runAtMillis + scheduledFn.millis);
-    }
-
-    function forEachFunction(funcsToRun, callback) {
-      for (let i = 0; i < funcsToRun.length; ++i) {
-        callback(funcsToRun[i]);
-      }
-    }
-
-    function runScheduledFunctions(endTime) {
-      if (scheduledLookup.length === 0 || scheduledLookup[0] > endTime) {
-        return;
-      }
-
-      do {
-        currentTime = scheduledLookup.shift();
-
-        const funcsToRun = scheduledFunctions[currentTime];
-        delete scheduledFunctions[currentTime];
-
-        forEachFunction(funcsToRun, function(funcToRun) {
-          if (funcToRun.recurring) {
-            reschedule(funcToRun);
-          }
-        });
-
-        forEachFunction(funcsToRun, function(funcToRun) {
-          funcToRun.funcToCall.apply(null, funcToRun.params || []);
-        });
-      } while (scheduledLookup.length > 0 &&
-              // checking first if we're out of time prevents setTimeout(0)
-              // scheduled in a funcToRun from forcing an extra iteration
-                 currentTime !== endTime &&
-                 scheduledLookup[0] <= endTime);
-    }
-  }
-
-  return DelayedFunctionScheduler;
-}();
-
-
-j$.MockDate = function() {
-  function MockDate(global) {
-    const self = this;
-    let currentTime = 0;
-
-    if (!global || !global.Date) {
-      self.install = function() {};
-      self.tick = function() {};
-      self.uninstall = function() {};
-      return self;
-    }
-
-    const GlobalDate = global.Date;
-
-    self.install = function(mockDate) {
-      if (mockDate instanceof GlobalDate) {
-        currentTime = mockDate.getTime();
-      } else {
-        currentTime = new GlobalDate().getTime();
-      }
-
-      global.Date = FakeDate;
-    };
-
-    self.tick = function(millis) {
-      millis = millis || 0;
-      currentTime = currentTime + millis;
-    };
-
-    self.uninstall = function() {
-      currentTime = 0;
-      global.Date = GlobalDate;
-    };
-
-    createDateProperties();
-
-    return self;
-
-    function FakeDate() {
-      switch(arguments.length) {
-        case 0:
-          return new GlobalDate(currentTime);
-        case 1:
-          return new GlobalDate(arguments[0]);
-        case 2:
-          return new GlobalDate(arguments[0], arguments[1]);
-        case 3:
-          return new GlobalDate(arguments[0], arguments[1], arguments[2]);
-        case 4:
-          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3]);
-        case 5:
-          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3],
-                                arguments[4]);
-        case 6:
-          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3],
-                                arguments[4], arguments[5]);
-        default:
-          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3],
-                                arguments[4], arguments[5], arguments[6]);
-      }
-    }
-
-    function createDateProperties() {
-      FakeDate.prototype = GlobalDate.prototype;
-
-      FakeDate.now = function() {
-        if (GlobalDate.now) {
-          return currentTime;
-        } else {
-          throw new Error('Browser does not support Date.now()');
-        }
-      };
-
-      FakeDate.toSource = GlobalDate.toSource;
-      FakeDate.toString = GlobalDate.toString;
-      FakeDate.parse = GlobalDate.parse;
-      FakeDate.UTC = GlobalDate.UTC;
-    }
-	}
-
-  return MockDate;
-}();
-
-const _clock = new j$.Clock(global, function() { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));
-
-export function clock() {
-    return _clock;
-}
-
-
diff --git a/test/notifications/ContentRules-test.js b/test/notifications/ContentRules-test.js
index ca25edf5b1..2b18a18488 100644
--- a/test/notifications/ContentRules-test.js
+++ b/test/notifications/ContentRules-test.js
@@ -52,13 +52,12 @@ const USERNAME_RULE = {
     rule_id: ".m.rule.contains_user_name",
 };
 
-
 describe("ContentRules", function() {
     describe("parseContentRules", function() {
         it("should handle there being no keyword rules", function() {
             const rules = { 'global': { 'content': [
-                    USERNAME_RULE,
-            ]}};
+                USERNAME_RULE,
+            ] } };
             const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules).toEqual([]);
             expect(parsed.vectorState).toEqual(PushRuleVectorState.ON);
@@ -69,7 +68,7 @@ describe("ContentRules", function() {
             const rules = { 'global': { 'content': [
                 NORMAL_RULE,
                 USERNAME_RULE,
-            ]}};
+            ] } };
 
             const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules.length).toEqual(1);
@@ -82,7 +81,7 @@ describe("ContentRules", function() {
             const rules = { 'global': { 'content': [
                 LOUD_RULE,
                 USERNAME_RULE,
-            ]}};
+            ] } };
 
             const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules.length).toEqual(1);
@@ -96,7 +95,7 @@ describe("ContentRules", function() {
                 LOUD_RULE,
                 NORMAL_RULE,
                 USERNAME_RULE,
-            ]}};
+            ] } };
 
             const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules.length).toEqual(1);
diff --git a/test/setupTests.js b/test/setupTests.js
index 6d37d48987..9da412a7e8 100644
--- a/test/setupTests.js
+++ b/test/setupTests.js
@@ -1,6 +1,12 @@
 import * as languageHandler from "../src/languageHandler";
+import { TextEncoder, TextDecoder } from 'util';
 
 languageHandler.setLanguage('en');
 languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
 
 require('jest-fetch-mock').enableMocks();
+
+// polyfilling TextEncoder as it is not available on JSDOM
+// view https://github.com/facebook/jest/issues/9983
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder;
diff --git a/test/skinned-sdk.js b/test/skinned-sdk.js
index 876a188cc0..9de13d20a1 100644
--- a/test/skinned-sdk.js
+++ b/test/skinned-sdk.js
@@ -18,12 +18,12 @@ components['structures.RightPanel'] = stubComponent();
 components['structures.RoomDirectory'] = stubComponent();
 components['views.globals.GuestWarningBar'] = stubComponent();
 components['views.globals.NewVersionBar'] = stubComponent();
-components['views.elements.Spinner'] = stubComponent({displayName: 'Spinner'});
-components['views.messages.DateSeparator'] = stubComponent({displayName: 'DateSeparator'});
-components['views.messages.MessageTimestamp'] = stubComponent({displayName: 'MessageTimestamp'});
-components['views.messages.SenderProfile'] = stubComponent({displayName: 'SenderProfile'});
+components['views.elements.Spinner'] = stubComponent({ displayName: 'Spinner' });
+components['views.messages.DateSeparator'] = stubComponent({ displayName: 'DateSeparator' });
+components['views.messages.MessageTimestamp'] = stubComponent({ displayName: 'MessageTimestamp' });
+components['views.messages.SenderProfile'] = stubComponent({ displayName: 'SenderProfile' });
 components['views.rooms.SearchBar'] = stubComponent();
 
-sdk.loadSkin({components});
+sdk.loadSkin({ components });
 
 export default sdk;
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 41252103e7..cb5d7d21f0 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -1,6 +1,6 @@
 import RoomViewStore from '../../src/stores/RoomViewStore';
 
-import {MatrixClientPeg as peg} from '../../src/MatrixClientPeg';
+import { MatrixClientPeg as peg } from '../../src/MatrixClientPeg';
 
 import * as testUtils from '../test-utils';
 
@@ -36,7 +36,7 @@ describe('RoomViewStore', function() {
             }
         });
 
-        peg.get().getRoomIdForAlias.mockResolvedValue({room_id: "!randomcharacters:aser.ver"});
+        peg.get().getRoomIdForAlias.mockResolvedValue({ room_id: "!randomcharacters:aser.ver" });
         peg.get().joinRoom = async (roomAddress) => {
             token.remove(); // stop RVS listener
             expect(roomAddress).toBe("#somealias2:aser.ver");
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index 20c48c29db..e7ca727e28 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -16,85 +16,44 @@ limitations under the License.
 
 import { EventEmitter } from "events";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
 import "../skinned-sdk"; // Must be first for skinning to work
 import SpaceStore, {
+    UPDATE_HOME_BEHAVIOUR,
     UPDATE_INVITED_SPACES,
     UPDATE_SELECTED_SPACE,
-    UPDATE_TOP_LEVEL_SPACES
+    UPDATE_TOP_LEVEL_SPACES,
 } from "../../src/stores/SpaceStore";
-import { resetAsyncStoreWithClient, setupAsyncStoreWithClient } from "../utils/test-utils";
-import { mkEvent, mkStubRoom, stubClient } from "../test-utils";
-import { EnhancedMap } from "../../src/utils/maps";
-import SettingsStore from "../../src/settings/SettingsStore";
+import * as testUtils from "../utils/test-utils";
+import { mkEvent, stubClient } from "../test-utils";
 import DMRoomMap from "../../src/utils/DMRoomMap";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import defaultDispatcher from "../../src/dispatcher/dispatcher";
-
-type MatrixEvent = any; // importing from js-sdk upsets things
+import SettingsStore from "../../src/settings/SettingsStore";
+import { SettingLevel } from "../../src/settings/SettingLevel";
 
 jest.useFakeTimers();
 
-const mockStateEventImplementation = (events: MatrixEvent[]) => {
-    const stateMap = new EnhancedMap<string, Map<string, MatrixEvent>>();
-    events.forEach(event => {
-        stateMap.getOrCreate(event.getType(), new Map()).set(event.getStateKey(), event);
-    });
-
-    return (eventType: string, stateKey?: string) => {
-        if (stateKey || stateKey === "") {
-            return stateMap.get(eventType)?.get(stateKey) || null;
-        }
-        return Array.from(stateMap.get(eventType)?.values() || []);
-    };
-};
-
-const emitPromise = (e: EventEmitter, k: string | symbol) => new Promise(r => e.once(k, r));
-
 const testUserId = "@test:user";
 
-let rooms = [];
-
-const mkRoom = (roomId: string) => {
-    const room = mkStubRoom(roomId);
-    room.currentState.getStateEvents.mockImplementation(mockStateEventImplementation([]));
-    rooms.push(room);
-    return room;
-};
-
-const mkSpace = (spaceId: string, children: string[] = []) => {
-    const space = mkRoom(spaceId);
-    space.isSpaceRoom.mockReturnValue(true);
-    space.currentState.getStateEvents.mockImplementation(mockStateEventImplementation(children.map(roomId =>
-        mkEvent({
-            event: true,
-            type: EventType.SpaceChild,
-            room: spaceId,
-            user: testUserId,
-            skey: roomId,
-            content: { via: [] },
-            ts: Date.now(),
-        }),
-    )));
-    return space;
-};
-
-const getValue = jest.fn();
-SettingsStore.getValue = getValue;
-
 const getUserIdForRoomId = jest.fn();
+const getDMRoomsForUserId = jest.fn();
 // @ts-ignore
-DMRoomMap.sharedInstance = { getUserIdForRoomId };
+DMRoomMap.sharedInstance = { getUserIdForRoomId, getDMRoomsForUserId };
 
 const fav1 = "!fav1:server";
 const fav2 = "!fav2:server";
 const fav3 = "!fav3:server";
 const dm1 = "!dm1:server";
-const dm1Partner = "@dm1Partner:server";
+const dm1Partner = new RoomMember(dm1, "@dm1Partner:server");
+dm1Partner.membership = "join";
 const dm2 = "!dm2:server";
-const dm2Partner = "@dm2Partner:server";
+const dm2Partner = new RoomMember(dm2, "@dm2Partner:server");
+dm2Partner.membership = "join";
 const dm3 = "!dm3:server";
-const dm3Partner = "@dm3Partner:server";
+const dm3Partner = new RoomMember(dm3, "@dm3Partner:server");
+dm3Partner.membership = "join";
 const orphan1 = "!orphan1:server";
 const orphan2 = "!orphan2:server";
 const invite1 = "!invite1:server";
@@ -111,25 +70,31 @@ describe("SpaceStore", () => {
     const store = SpaceStore.instance;
     const client = MatrixClientPeg.get();
 
+    let rooms = [];
+    const mkRoom = (roomId: string) => testUtils.mkRoom(client, roomId, rooms);
+    const mkSpace = (spaceId: string, children: string[] = []) => testUtils.mkSpace(client, spaceId, rooms, children);
     const viewRoom = roomId => defaultDispatcher.dispatch({ action: "view_room", room_id: roomId }, true);
 
     const run = async () => {
         client.getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
-        await setupAsyncStoreWithClient(store, client);
+        await testUtils.setupAsyncStoreWithClient(store, client);
         jest.runAllTimers();
     };
 
+    const setShowAllRooms = async (value: boolean) => {
+        if (store.allRoomsInHome === value) return;
+        const emitProm = testUtils.emitPromise(store, UPDATE_HOME_BEHAVIOUR);
+        await SettingsStore.setValue("Spaces.allRoomsInHome", null, SettingLevel.DEVICE, value);
+        jest.runAllTimers(); // run async dispatch
+        await emitProm;
+    };
+
     beforeEach(() => {
-        jest.runAllTimers();
+        jest.runAllTimers(); // run async dispatch
         client.getVisibleRooms.mockReturnValue(rooms = []);
-        getValue.mockImplementation(settingName => {
-            if (settingName === "feature_spaces") {
-                return true;
-            }
-        });
     });
     afterEach(async () => {
-        await resetAsyncStoreWithClient(store);
+        await testUtils.resetAsyncStoreWithClient(store);
     });
 
     describe("static hierarchy resolution tests", () => {
@@ -310,10 +275,12 @@ describe("SpaceStore", () => {
 
         describe("test fixture 1", () => {
             beforeEach(async () => {
-                [fav1, fav2, fav3, dm1, dm2, dm3, orphan1, orphan2, invite1, invite2, room1].forEach(mkRoom);
+                [fav1, fav2, fav3, dm1, dm2, dm3, orphan1, orphan2, invite1, invite2, room1, room2, room3]
+                    .forEach(mkRoom);
                 mkSpace(space1, [fav1, room1]);
                 mkSpace(space2, [fav1, fav2, fav3, room1]);
                 mkSpace(space3, [invite2]);
+                // client.getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
 
                 [fav1, fav2, fav3].forEach(roomId => {
                     client.getRoom(roomId).tags = {
@@ -329,11 +296,82 @@ describe("SpaceStore", () => {
 
                 getUserIdForRoomId.mockImplementation(roomId => {
                     return {
-                        [dm1]: dm1Partner,
-                        [dm2]: dm2Partner,
-                        [dm3]: dm3Partner,
+                        [dm1]: dm1Partner.userId,
+                        [dm2]: dm2Partner.userId,
+                        [dm3]: dm3Partner.userId,
                     }[roomId];
                 });
+                getDMRoomsForUserId.mockImplementation(userId => {
+                    switch (userId) {
+                        case dm1Partner.userId:
+                            return [dm1];
+                        case dm2Partner.userId:
+                            return [dm2];
+                        case dm3Partner.userId:
+                            return [dm3];
+                        default:
+                            return [];
+                    }
+                });
+
+                // have dmPartner1 be in space1 with you
+                const mySpace1Member = new RoomMember(space1, testUserId);
+                mySpace1Member.membership = "join";
+                (rooms.find(r => r.roomId === space1).getMembers as jest.Mock).mockReturnValue([
+                    mySpace1Member,
+                    dm1Partner,
+                ]);
+                // have dmPartner2 be in space2 with you
+                const mySpace2Member = new RoomMember(space2, testUserId);
+                mySpace2Member.membership = "join";
+                (rooms.find(r => r.roomId === space2).getMembers as jest.Mock).mockReturnValue([
+                    mySpace2Member,
+                    dm2Partner,
+                ]);
+                // dmPartner3 is not in any common spaces with you
+
+                // room 2 claims to be a child of space2 and is so via a valid m.space.parent
+                const cliRoom2 = client.getRoom(room2);
+                cliRoom2.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
+                    mkEvent({
+                        event: true,
+                        type: EventType.SpaceParent,
+                        room: room2,
+                        user: client.getUserId(),
+                        skey: space2,
+                        content: { via: [], canonical: true },
+                        ts: Date.now(),
+                    }),
+                ]));
+                const cliSpace2 = client.getRoom(space2);
+                cliSpace2.currentState.maySendStateEvent.mockImplementation((evType: string, userId: string) => {
+                    if (evType === EventType.SpaceChild) {
+                        return userId === client.getUserId();
+                    }
+                    return true;
+                });
+
+                // room 3 claims to be a child of space3 but is not due to invalid m.space.parent (permissions)
+                const cliRoom3 = client.getRoom(room3);
+                cliRoom3.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
+                    mkEvent({
+                        event: true,
+                        type: EventType.SpaceParent,
+                        room: room3,
+                        user: client.getUserId(),
+                        skey: space3,
+                        content: { via: [], canonical: true },
+                        ts: Date.now(),
+                    }),
+                ]));
+                const cliSpace3 = client.getRoom(space3);
+                cliSpace3.currentState.maySendStateEvent.mockImplementation((evType: string, userId: string) => {
+                    if (evType === EventType.SpaceChild) {
+                        return false;
+                    }
+                    return true;
+                });
+
                 await run();
             });
 
@@ -362,10 +400,16 @@ describe("SpaceStore", () => {
                 expect(store.getSpaceFilteredRoomIds(null).has(invite2)).toBeTruthy();
             });
 
-            it("home space does contain rooms/low priority even if they are also shown in a space", () => {
+            it("all rooms space does contain rooms/low priority even if they are also shown in a space", async () => {
+                await setShowAllRooms(true);
                 expect(store.getSpaceFilteredRoomIds(null).has(room1)).toBeTruthy();
             });
 
+            it("home space doesn't contain rooms/low priority if they are also shown in a space", async () => {
+                await setShowAllRooms(false);
+                expect(store.getSpaceFilteredRoomIds(null).has(room1)).toBeFalsy();
+            });
+
             it("space contains child rooms", () => {
                 const space = client.getRoom(space1);
                 expect(store.getSpaceFilteredRoomIds(space).has(fav1)).toBeTruthy();
@@ -384,6 +428,74 @@ describe("SpaceStore", () => {
                 const space = client.getRoom(space3);
                 expect(store.getSpaceFilteredRoomIds(space).has(invite2)).toBeTruthy();
             });
+
+            it("spaces contain dms which you have with members of that space", () => {
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space1)).has(dm1)).toBeTruthy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space2)).has(dm1)).toBeFalsy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space3)).has(dm1)).toBeFalsy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space1)).has(dm2)).toBeFalsy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space2)).has(dm2)).toBeTruthy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space3)).has(dm2)).toBeFalsy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space1)).has(dm3)).toBeFalsy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space2)).has(dm3)).toBeFalsy();
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space3)).has(dm3)).toBeFalsy();
+            });
+
+            it("dms are only added to Notification States for only the Home Space", () => {
+                // XXX: All rooms space is forcibly enabled, as part of a future PR test Home space better
+                // [dm1, dm2, dm3].forEach(d => {
+                //     expect(store.getNotificationState(HOME_SPACE).rooms.map(r => r.roomId).includes(d)).toBeTruthy();
+                // });
+                [space1, space2, space3].forEach(s => {
+                    [dm1, dm2, dm3].forEach(d => {
+                        expect(store.getNotificationState(s).rooms.map(r => r.roomId).includes(d)).toBeFalsy();
+                    });
+                });
+            });
+
+            it("orphan rooms are added to Notification States for only the Home Space", () => {
+                // XXX: All rooms space is forcibly enabled, as part of a future PR test Home space better
+                // [orphan1, orphan2].forEach(d => {
+                //     expect(store.getNotificationState(HOME_SPACE).rooms.map(r => r.roomId).includes(d)).toBeTruthy();
+                // });
+                [space1, space2, space3].forEach(s => {
+                    [orphan1, orphan2].forEach(d => {
+                        expect(store.getNotificationState(s).rooms.map(r => r.roomId).includes(d)).toBeFalsy();
+                    });
+                });
+            });
+
+            it("favourites are added to Notification States for all spaces containing the room inc Home", () => {
+                // XXX: All rooms space is forcibly enabled, as part of a future PR test Home space better
+                // [fav1, fav2, fav3].forEach(d => {
+                //     expect(store.getNotificationState(HOME_SPACE).rooms.map(r => r.roomId).includes(d)).toBeTruthy();
+                // });
+                expect(store.getNotificationState(space1).rooms.map(r => r.roomId).includes(fav1)).toBeTruthy();
+                expect(store.getNotificationState(space1).rooms.map(r => r.roomId).includes(fav2)).toBeFalsy();
+                expect(store.getNotificationState(space1).rooms.map(r => r.roomId).includes(fav3)).toBeFalsy();
+                expect(store.getNotificationState(space2).rooms.map(r => r.roomId).includes(fav1)).toBeTruthy();
+                expect(store.getNotificationState(space2).rooms.map(r => r.roomId).includes(fav2)).toBeTruthy();
+                expect(store.getNotificationState(space2).rooms.map(r => r.roomId).includes(fav3)).toBeTruthy();
+                expect(store.getNotificationState(space3).rooms.map(r => r.roomId).includes(fav1)).toBeFalsy();
+                expect(store.getNotificationState(space3).rooms.map(r => r.roomId).includes(fav2)).toBeFalsy();
+                expect(store.getNotificationState(space3).rooms.map(r => r.roomId).includes(fav3)).toBeFalsy();
+            });
+
+            it("other rooms are added to Notification States for all spaces containing the room exc Home", () => {
+                // XXX: All rooms space is forcibly enabled, as part of a future PR test Home space better
+                // expect(store.getNotificationState(HOME_SPACE).rooms.map(r => r.roomId).includes(room1)).toBeFalsy();
+                expect(store.getNotificationState(space1).rooms.map(r => r.roomId).includes(room1)).toBeTruthy();
+                expect(store.getNotificationState(space2).rooms.map(r => r.roomId).includes(room1)).toBeTruthy();
+                expect(store.getNotificationState(space3).rooms.map(r => r.roomId).includes(room1)).toBeFalsy();
+            });
+
+            it("honours m.space.parent if sender has permission in parent space", () => {
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space2)).has(room2)).toBeTruthy();
+            });
+
+            it("does not honour m.space.parent if sender does not have permission in parent space", () => {
+                expect(store.getSpaceFilteredRoomIds(client.getRoom(space3)).has(room3)).toBeFalsy();
+            });
         });
     });
 
@@ -403,7 +515,7 @@ describe("SpaceStore", () => {
             await run();
             expect(store.spacePanelSpaces).toStrictEqual([]);
             const space = mkSpace(space1);
-            const prom = emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
+            const prom = testUtils.emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
             emitter.emit("Room", space);
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([space]);
@@ -416,7 +528,7 @@ describe("SpaceStore", () => {
 
             expect(store.spacePanelSpaces).toStrictEqual([space]);
             space.getMyMembership.mockReturnValue("leave");
-            const prom = emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
+            const prom = testUtils.emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
             emitter.emit("Room.myMembership", space, "leave", "join");
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([]);
@@ -428,7 +540,7 @@ describe("SpaceStore", () => {
             expect(store.invitedSpaces).toStrictEqual([]);
             const space = mkSpace(space1);
             space.getMyMembership.mockReturnValue("invite");
-            const prom = emitPromise(store, UPDATE_INVITED_SPACES);
+            const prom = testUtils.emitPromise(store, UPDATE_INVITED_SPACES);
             emitter.emit("Room", space);
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([]);
@@ -443,7 +555,7 @@ describe("SpaceStore", () => {
             expect(store.spacePanelSpaces).toStrictEqual([]);
             expect(store.invitedSpaces).toStrictEqual([space]);
             space.getMyMembership.mockReturnValue("join");
-            const prom = emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
+            const prom = testUtils.emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
             emitter.emit("Room.myMembership", space, "join", "invite");
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([space]);
@@ -458,7 +570,7 @@ describe("SpaceStore", () => {
             expect(store.spacePanelSpaces).toStrictEqual([]);
             expect(store.invitedSpaces).toStrictEqual([space]);
             space.getMyMembership.mockReturnValue("leave");
-            const prom = emitPromise(store, UPDATE_INVITED_SPACES);
+            const prom = testUtils.emitPromise(store, UPDATE_INVITED_SPACES);
             emitter.emit("Room.myMembership", space, "leave", "invite");
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([]);
@@ -478,7 +590,7 @@ describe("SpaceStore", () => {
 
             const invite = mkRoom(invite1);
             invite.getMyMembership.mockReturnValue("invite");
-            const prom = emitPromise(store, space1);
+            const prom = testUtils.emitPromise(store, space1);
             emitter.emit("Room", space);
             await prom;
 
@@ -501,7 +613,7 @@ describe("SpaceStore", () => {
             ]);
             mkSpace(space3).getMyMembership.mockReturnValue("invite");
             await run();
-            await store.setActiveSpace(null);
+            store.setActiveSpace(null);
             expect(store.activeSpace).toBe(null);
         });
         afterEach(() => {
@@ -509,31 +621,31 @@ describe("SpaceStore", () => {
         });
 
         it("switch to home space", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             fn.mockClear();
 
-            await store.setActiveSpace(null);
+            store.setActiveSpace(null);
             expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, null);
             expect(store.activeSpace).toBe(null);
         });
 
         it("switch to invited space", async () => {
             const space = client.getRoom(space3);
-            await store.setActiveSpace(space);
+            store.setActiveSpace(space);
             expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
             expect(store.activeSpace).toBe(space);
         });
 
         it("switch to top level space", async () => {
             const space = client.getRoom(space1);
-            await store.setActiveSpace(space);
+            store.setActiveSpace(space);
             expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
             expect(store.activeSpace).toBe(space);
         });
 
         it("switch to subspace", async () => {
             const space = client.getRoom(space2);
-            await store.setActiveSpace(space);
+            store.setActiveSpace(space);
             expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
             expect(store.activeSpace).toBe(space);
         });
@@ -541,75 +653,93 @@ describe("SpaceStore", () => {
         it("switch to unknown space is a nop", async () => {
             expect(store.activeSpace).toBe(null);
             const space = client.getRoom(room1); // not a space
-            await store.setActiveSpace(space);
+            store.setActiveSpace(space);
             expect(fn).not.toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
             expect(store.activeSpace).toBe(null);
         });
     });
 
     describe("context switching tests", () => {
-        const fn = jest.spyOn(defaultDispatcher, "dispatch");
+        let dispatcherRef;
+        let currentRoom = null;
 
         beforeEach(async () => {
             [room1, room2, orphan1].forEach(mkRoom);
             mkSpace(space1, [room1, room2]);
             mkSpace(space2, [room2]);
             await run();
+
+            dispatcherRef = defaultDispatcher.register(payload => {
+                if (payload.action === "view_room" || payload.action === "view_home_page") {
+                    currentRoom = payload.room_id || null;
+                }
+            });
         });
         afterEach(() => {
-            fn.mockClear();
             localStorage.clear();
+            defaultDispatcher.unregister(dispatcherRef);
         });
 
-        const getCurrentRoom = () => fn.mock.calls.reverse().find(([p]) => p.action === "view_room")?.[0].room_id;
+        const getCurrentRoom = () => {
+            jest.runAllTimers();
+            return currentRoom;
+        };
 
         it("last viewed room in target space is the current viewed and in both spaces", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             viewRoom(room2);
-            await store.setActiveSpace(client.getRoom(space2));
+            store.setActiveSpace(client.getRoom(space2));
             viewRoom(room2);
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             expect(getCurrentRoom()).toBe(room2);
         });
 
         it("last viewed room in target space is in the current space", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             viewRoom(room2);
-            await store.setActiveSpace(client.getRoom(space2));
+            store.setActiveSpace(client.getRoom(space2));
             expect(getCurrentRoom()).toBe(space2);
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             expect(getCurrentRoom()).toBe(room2);
         });
 
         it("last viewed room in target space is not in the current space", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             viewRoom(room1);
-            await store.setActiveSpace(client.getRoom(space2));
+            store.setActiveSpace(client.getRoom(space2));
             viewRoom(room2);
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             expect(getCurrentRoom()).toBe(room1);
         });
 
         it("last viewed room is target space is not known", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             viewRoom(room1);
             localStorage.setItem(`mx_space_context_${space2}`, orphan2);
-            await store.setActiveSpace(client.getRoom(space2));
+            store.setActiveSpace(client.getRoom(space2));
             expect(getCurrentRoom()).toBe(space2);
         });
 
-        it("no last viewed room in target space", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+        it("last viewed room is target space is no longer in that space", async () => {
+            store.setActiveSpace(client.getRoom(space1));
             viewRoom(room1);
-            await store.setActiveSpace(client.getRoom(space2));
+            localStorage.setItem(`mx_space_context_${space2}`, room1);
+            store.setActiveSpace(client.getRoom(space2));
+            expect(getCurrentRoom()).toBe(space2); // Space home instead of room1
+        });
+
+        it("no last viewed room in target space", async () => {
+            store.setActiveSpace(client.getRoom(space1));
+            viewRoom(room1);
+            store.setActiveSpace(client.getRoom(space2));
             expect(getCurrentRoom()).toBe(space2);
         });
 
         it("no last viewed room in home space", async () => {
-            await store.setActiveSpace(client.getRoom(space1));
+            store.setActiveSpace(client.getRoom(space1));
             viewRoom(room1);
-            await store.setActiveSpace(null);
-            expect(fn.mock.calls[fn.mock.calls.length - 1][0]).toStrictEqual({ action: "view_home_page" });
+            store.setActiveSpace(null);
+            expect(getCurrentRoom()).toBeNull(); // Home
         });
     });
 
@@ -619,7 +749,8 @@ describe("SpaceStore", () => {
             mkSpace(space1, [room1, room2, room3]);
             mkSpace(space2, [room1, room2]);
 
-            client.getRoom(room2).currentState.getStateEvents.mockImplementation(mockStateEventImplementation([
+            const cliRoom2 = client.getRoom(room2);
+            cliRoom2.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
                 mkEvent({
                     event: true,
                     type: EventType.SpaceParent,
@@ -635,35 +766,36 @@ describe("SpaceStore", () => {
 
         it("no switch required, room is in current space", async () => {
             viewRoom(room1);
-            await store.setActiveSpace(client.getRoom(space1), false);
+            store.setActiveSpace(client.getRoom(space1), false);
             viewRoom(room2);
             expect(store.activeSpace).toBe(client.getRoom(space1));
         });
 
         it("switch to canonical parent space for room", async () => {
             viewRoom(room1);
-            await store.setActiveSpace(client.getRoom(space2), false);
+            store.setActiveSpace(client.getRoom(space2), false);
             viewRoom(room2);
             expect(store.activeSpace).toBe(client.getRoom(space2));
         });
 
         it("switch to first containing space for room", async () => {
             viewRoom(room2);
-            await store.setActiveSpace(client.getRoom(space2), false);
+            store.setActiveSpace(client.getRoom(space2), false);
             viewRoom(room3);
             expect(store.activeSpace).toBe(client.getRoom(space1));
         });
 
         it("switch to home for orphaned room", async () => {
             viewRoom(room1);
-            await store.setActiveSpace(client.getRoom(space1), false);
+            store.setActiveSpace(client.getRoom(space1), false);
             viewRoom(orphan1);
             expect(store.activeSpace).toBeNull();
         });
 
         it("when switching rooms in the all rooms home space don't switch to related space", async () => {
+            await setShowAllRooms(true);
             viewRoom(room2);
-            await store.setActiveSpace(null, false);
+            store.setActiveSpace(null, false);
             viewRoom(room1);
             expect(store.activeSpace).toBeNull();
         });
diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts
new file mode 100644
index 0000000000..cb2394349a
--- /dev/null
+++ b/test/stores/room-list/SpaceWatcher-test.ts
@@ -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.
+*/
+
+import "../../skinned-sdk"; // Must be first for skinning to work
+import { SpaceWatcher } from "../../../src/stores/room-list/SpaceWatcher";
+import type { RoomListStoreClass } from "../../../src/stores/room-list/RoomListStore";
+import SettingsStore from "../../../src/settings/SettingsStore";
+import SpaceStore, { UPDATE_HOME_BEHAVIOUR } from "../../../src/stores/SpaceStore";
+import { stubClient } from "../../test-utils";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import { setupAsyncStoreWithClient } from "../../utils/test-utils";
+import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
+import * as testUtils from "../../utils/test-utils";
+import { SpaceFilterCondition } from "../../../src/stores/room-list/filters/SpaceFilterCondition";
+
+let filter: SpaceFilterCondition = null;
+
+const mockRoomListStore = {
+    addFilter: f => filter = f,
+    removeFilter: () => filter = null,
+} as unknown as RoomListStoreClass;
+
+const space1Id = "!space1:server";
+const space2Id = "!space2:server";
+
+describe("SpaceWatcher", () => {
+    stubClient();
+    const store = SpaceStore.instance;
+    const client = MatrixClientPeg.get();
+
+    let rooms = [];
+    const mkSpace = (spaceId: string, children: string[] = []) => testUtils.mkSpace(client, spaceId, rooms, children);
+
+    const setShowAllRooms = async (value: boolean) => {
+        if (store.allRoomsInHome === value) return;
+        await SettingsStore.setValue("Spaces.allRoomsInHome", null, SettingLevel.DEVICE, value);
+        await testUtils.emitPromise(store, UPDATE_HOME_BEHAVIOUR);
+    };
+
+    let space1;
+    let space2;
+
+    beforeEach(async () => {
+        filter = null;
+        store.removeAllListeners();
+        store.setActiveSpace(null);
+        client.getVisibleRooms.mockReturnValue(rooms = []);
+
+        space1 = mkSpace(space1Id);
+        space2 = mkSpace(space2Id);
+
+        client.getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
+        await setupAsyncStoreWithClient(store, client);
+    });
+
+    it("initialises sanely with home behaviour", async () => {
+        await setShowAllRooms(false);
+        new SpaceWatcher(mockRoomListStore);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+    });
+
+    it("initialises sanely with all behaviour", async () => {
+        await setShowAllRooms(true);
+        new SpaceWatcher(mockRoomListStore);
+
+        expect(filter).toBeNull();
+    });
+
+    it("sets space=null filter for all -> home transition", async () => {
+        await setShowAllRooms(true);
+        new SpaceWatcher(mockRoomListStore);
+
+        await setShowAllRooms(false);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBeNull();
+    });
+
+    it("sets filter correctly for all -> space transition", async () => {
+        await setShowAllRooms(true);
+        new SpaceWatcher(mockRoomListStore);
+
+        SpaceStore.instance.setActiveSpace(space1);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+    });
+
+    it("removes filter for home -> all transition", async () => {
+        await setShowAllRooms(false);
+        new SpaceWatcher(mockRoomListStore);
+
+        await setShowAllRooms(true);
+
+        expect(filter).toBeNull();
+    });
+
+    it("sets filter correctly for home -> space transition", async () => {
+        await setShowAllRooms(false);
+        new SpaceWatcher(mockRoomListStore);
+
+        SpaceStore.instance.setActiveSpace(space1);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+    });
+
+    it("removes filter for space -> all transition", async () => {
+        await setShowAllRooms(true);
+        new SpaceWatcher(mockRoomListStore);
+
+        SpaceStore.instance.setActiveSpace(space1);
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+        SpaceStore.instance.setActiveSpace(null);
+
+        expect(filter).toBeNull();
+    });
+
+    it("updates filter correctly for space -> home transition", async () => {
+        await setShowAllRooms(false);
+        SpaceStore.instance.setActiveSpace(space1);
+
+        new SpaceWatcher(mockRoomListStore);
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+        SpaceStore.instance.setActiveSpace(null);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(null);
+    });
+
+    it("updates filter correctly for space -> space transition", async () => {
+        await setShowAllRooms(false);
+        SpaceStore.instance.setActiveSpace(space1);
+
+        new SpaceWatcher(mockRoomListStore);
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+        SpaceStore.instance.setActiveSpace(space2);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space2);
+    });
+
+    it("doesn't change filter when changing showAllRooms mode to true", async () => {
+        await setShowAllRooms(false);
+        SpaceStore.instance.setActiveSpace(space1);
+
+        new SpaceWatcher(mockRoomListStore);
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+        await setShowAllRooms(true);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+    });
+
+    it("doesn't change filter when changing showAllRooms mode to false", async () => {
+        await setShowAllRooms(true);
+        SpaceStore.instance.setActiveSpace(space1);
+
+        new SpaceWatcher(mockRoomListStore);
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+        await setShowAllRooms(false);
+
+        expect(filter).toBeInstanceOf(SpaceFilterCondition);
+        expect(filter["space"]).toBe(space1);
+    });
+});
diff --git a/test/test-utils.js b/test/test-utils.js
index b9014f4876..c06149991f 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -1,11 +1,11 @@
 import React from 'react';
-import {MatrixClientPeg as peg} from '../src/MatrixClientPeg';
+import { MatrixClientPeg as peg } from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher/dispatcher';
-import {makeType} from "../src/utils/TypeUtils";
-import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
+import { makeType } from "../src/utils/TypeUtils";
+import { ValidatedServerConfig } from "../src/utils/AutoDiscoveryUtils";
 import ShallowRenderer from 'react-test-renderer/shallow';
 import MatrixClientContext from "../src/contexts/MatrixClientContext";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 export function getRenderer() {
     // Old: ReactTestUtils.createRenderer();
@@ -78,15 +78,15 @@ export function createTestClient() {
         },
         mxcUrlToHttp: (mxc) => 'http://this.is.a.url/',
         setAccountData: jest.fn(),
+        setRoomAccountData: jest.fn(),
         sendTyping: jest.fn().mockResolvedValue({}),
         sendMessage: () => jest.fn().mockResolvedValue({}),
         getSyncState: () => "SYNCING",
         generateClientSecret: () => "t35tcl1Ent5ECr3T",
         isGuest: () => false,
         isCryptoEnabled: () => false,
-        getSpaceSummary: jest.fn().mockReturnValue({
+        getRoomHierarchy: jest.fn().mockReturnValue({
             rooms: [],
-            events: [],
         }),
 
         // Used by various internal bits we aren't concerned with (yet)
@@ -95,7 +95,10 @@ export function createTestClient() {
                 getItem: jest.fn(),
             },
         },
+        pushRules: {},
         decryptEventIfNeeded: () => Promise.resolve(),
+        isUserIgnored: jest.fn().mockReturnValue(false),
+        getCapabilities: jest.fn().mockResolvedValue({}),
     };
 }
 
@@ -109,6 +112,7 @@ export function createTestClient() {
  * @param {number=} opts.ts   Optional. Timestamp for the event
  * @param {Object} opts.content The event.content
  * @param {boolean} opts.event True to make a MatrixEvent.
+ * @param {unsigned=} opts.unsigned
  * @return {Object} a JSON object representing this event.
  */
 export function mkEvent(opts) {
@@ -127,8 +131,8 @@ export function mkEvent(opts) {
     if (opts.skey) {
         event.state_key = opts.skey;
     } else if (["m.room.name", "m.room.topic", "m.room.create", "m.room.join_rules",
-         "m.room.power_levels", "m.room.topic", "m.room.history_visibility", "m.room.encryption",
-         "com.example.state"].indexOf(opts.type) !== -1) {
+        "m.room.power_levels", "m.room.topic", "m.room.history_visibility", "m.room.encryption",
+        "com.example.state"].indexOf(opts.type) !== -1) {
         event.state_key = "";
     }
     return opts.event ? new MatrixEvent(event) : event;
@@ -163,12 +167,13 @@ export function mkPresence(opts) {
  * @param {string} opts.room The room ID for the event.
  * @param {string} opts.mship The content.membership for the event.
  * @param {string} opts.prevMship The prev_content.membership for the event.
+ * @param {number=} opts.ts   Optional. Timestamp for the event
  * @param {string} opts.user The user ID for the event.
  * @param {RoomMember} opts.target The target of the event.
- * @param {string} opts.skey The other user ID for the event if applicable
+ * @param {string=} opts.skey The other user ID for the event if applicable
  * e.g. for invites/bans.
  * @param {string} opts.name The content.displayname for the event.
- * @param {string} opts.url The content.avatar_url for the event.
+ * @param {string=} opts.url The content.avatar_url for the event.
  * @param {boolean} opts.event True to make a MatrixEvent.
  * @return {Object|MatrixEvent} The event
  */
@@ -200,8 +205,9 @@ export function mkMembership(opts) {
  * @param {Object} opts Values for the message
  * @param {string} opts.room The room ID for the event.
  * @param {string} opts.user The user ID for the event.
- * @param {string} opts.msg Optional. The content.body for the event.
+ * @param {number} opts.ts The timestamp for the event.
  * @param {boolean} opts.event True to make a MatrixEvent.
+ * @param {string=} opts.msg Optional. The content.body for the event.
  * @return {Object|MatrixEvent} The event
  */
 export function mkMessage(opts) {
@@ -219,7 +225,7 @@ export function mkMessage(opts) {
     return mkEvent(opts);
 }
 
-export function mkStubRoom(roomId = null) {
+export function mkStubRoom(roomId = null, name, client) {
     const stubTimeline = { getEvents: () => [] };
     return {
         roomId,
@@ -234,10 +240,12 @@ export function mkStubRoom(roomId = null) {
         }),
         getMembersWithMembership: jest.fn().mockReturnValue([]),
         getJoinedMembers: jest.fn().mockReturnValue([]),
+        getJoinedMemberCount: jest.fn().mockReturnValue(1),
         getMembers: jest.fn().mockReturnValue([]),
         getPendingEvents: () => [],
         getLiveTimeline: () => stubTimeline,
         getUnfilteredTimelineSet: () => null,
+        findEventById: () => null,
         getAccountData: () => null,
         hasMembershipState: () => null,
         getVersion: () => '1',
@@ -255,14 +263,20 @@ export function mkStubRoom(roomId = null) {
         tags: {},
         setBlacklistUnverifiedDevices: jest.fn(),
         on: jest.fn(),
+        off: jest.fn(),
         removeListener: jest.fn(),
         getDMInviter: jest.fn(),
+        name,
         getAvatarUrl: () => 'mxc://avatar.url/room.png',
         getMxcAvatarUrl: () => 'mxc://avatar.url/room.png',
         isSpaceRoom: jest.fn(() => false),
         getUnreadNotificationCount: jest.fn(() => 0),
         getEventReadUpTo: jest.fn(() => null),
+        getCanonicalAlias: jest.fn(),
+        getAltAliases: jest.fn().mockReturnValue([]),
         timeline: [],
+        getJoinRule: jest.fn().mockReturnValue("invite"),
+        client,
     };
 }
 
diff --git a/test/utils/AnimationUtils-test.ts b/test/utils/AnimationUtils-test.ts
new file mode 100644
index 0000000000..b6d75a706f
--- /dev/null
+++ b/test/utils/AnimationUtils-test.ts
@@ -0,0 +1,35 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { lerp } from "../../src/utils/AnimationUtils";
+
+describe("lerp", () => {
+    it("correctly interpolates", () => {
+        expect(lerp(0, 100, 0.5)).toBe(50);
+        expect(lerp(50, 100, 0.5)).toBe(75);
+        expect(lerp(0, 1, 0.1)).toBe(0.1);
+    });
+
+    it("clamps the interpolant", () => {
+        expect(lerp(0, 100, 50)).toBe(100);
+        expect(lerp(0, 100, -50)).toBe(0);
+    });
+
+    it("handles negative numbers", () => {
+        expect(lerp(-100, 0, 0.5)).toBe(-50);
+        expect(lerp(100, -100, 0.5)).toBe(0);
+    });
+});
diff --git a/test/utils/DateUtils-test.ts b/test/utils/DateUtils-test.ts
new file mode 100644
index 0000000000..ad0530c87e
--- /dev/null
+++ b/test/utils/DateUtils-test.ts
@@ -0,0 +1,31 @@
+/*
+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.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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 { formatSeconds } from "../../src/DateUtils";
+
+describe("formatSeconds", () => {
+    it("correctly formats time with hours", () => {
+        expect(formatSeconds((60 * 60 * 3) + (60 * 31) + (55))).toBe("03:31:55");
+        expect(formatSeconds((60 * 60 * 3) + (60 * 0) + (55))).toBe("03:00:55");
+        expect(formatSeconds((60 * 60 * 3) + (60 * 31) + (0))).toBe("03:31:00");
+    });
+
+    it("correctly formats time without hours", () => {
+        expect(formatSeconds((60 * 60 * 0) + (60 * 31) + (55))).toBe("31:55");
+        expect(formatSeconds((60 * 60 * 0) + (60 * 0) + (55))).toBe("00:55");
+        expect(formatSeconds((60 * 60 * 0) + (60 * 31) + (0))).toBe("31:00");
+    });
+});
diff --git a/test/utils/FixedRollingArray-test.ts b/test/utils/FixedRollingArray-test.ts
new file mode 100644
index 0000000000..732a4f175e
--- /dev/null
+++ b/test/utils/FixedRollingArray-test.ts
@@ -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 { FixedRollingArray } from "../../src/utils/FixedRollingArray";
+
+describe('FixedRollingArray', () => {
+    it('should seed the array with the given value', () => {
+        const seed = "test";
+        const width = 24;
+        const array = new FixedRollingArray(width, seed);
+
+        expect(array.value.length).toBe(width);
+        expect(array.value.every(v => v === seed)).toBe(true);
+    });
+
+    it('should insert at the correct end', () => {
+        const seed = "test";
+        const value = "changed";
+        const width = 24;
+        const array = new FixedRollingArray(width, seed);
+        array.pushValue(value);
+
+        expect(array.value.length).toBe(width);
+        expect(array.value[0]).toBe(value);
+    });
+
+    it('should roll over', () => {
+        const seed = -1;
+        const width = 24;
+        const array = new FixedRollingArray(width, seed);
+
+        const maxValue = width * 2;
+        const minValue = width; // because we're forcing a rollover
+        for (let i = 0; i <= maxValue; i++) {
+            array.pushValue(i);
+        }
+
+        expect(array.value.length).toBe(width);
+
+        for (let i = 1; i < width; i++) {
+            const current = array.value[i];
+            const previous = array.value[i - 1];
+            expect(previous - current).toBe(1);
+
+            if (i === 1) {
+                expect(previous).toBe(maxValue);
+            } else if (i === width) {
+                expect(current).toBe(minValue);
+            }
+        }
+    });
+});
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index 07ec03860b..39ffed25f1 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {TextEncoder} from "util";
+import { TextEncoder } from "util";
 import nodeCrypto from "crypto";
 import { Crypto } from "@peculiar/webcrypto";
 
@@ -144,7 +144,7 @@ cissyYBxjsfsAn
             const password = 'my super secret passphrase';
 
             return MegolmExportEncryption.encryptMegolmKeyFile(
-                input, password, {kdf_rounds: 1000},
+                input, password, { kdf_rounds: 1000 },
             ).then((ciphertext) => {
                 return MegolmExportEncryption.decryptMegolmKeyFile(
                     ciphertext, password,
diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index fdf4f527ee..85f9de3150 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -49,12 +49,12 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
     it.each(
         [[true, true], [true, false],
-        [false, true], [false, false]],
+            [false, true], [false, false]],
     )("2 unverified: returns 'normal', self-trust = %s, DM = %s", async (trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@FF1:h", "@FF2:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF1:h", "@FF2:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual("normal");
@@ -62,12 +62,12 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
     it.each(
         [["verified", true, true], ["verified", true, false],
-        ["verified", false, true], ["warning", false, false]],
+            ["verified", false, true], ["warning", false, false]],
     )("2 verified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@TT2:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@TT2:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -75,12 +75,12 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
     it.each(
         [["normal", true, true], ["normal", true, false],
-        ["normal", false, true], ["warning", false, false]],
+            ["normal", false, true], ["warning", false, false]],
     )("2 mixed: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@FF2:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@FF2:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -88,12 +88,12 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
     it.each(
         [["verified", true, true], ["verified", true, false],
-        ["warning", false, true], ["warning", false, false]],
+            ["warning", false, true], ["warning", false, false]],
     )("0 others: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -101,12 +101,12 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
     it.each(
         [["verified", true, true], ["verified", true, false],
-        ["verified", false, true], ["verified", false, false]],
+            ["verified", false, true], ["verified", false, false]],
     )("1 verified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@TT:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TT:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -114,12 +114,12 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
     it.each(
         [["normal", true, true], ["normal", true, false],
-        ["normal", false, true], ["normal", false, false]],
+            ["normal", false, true], ["normal", false, false]],
     )("1 unverified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -139,7 +139,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -151,7 +151,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -163,7 +163,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -175,7 +175,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@WF:h", "@FT:h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@WF:h", "@FT:h"].map((userId) => ({ userId })),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
diff --git a/test/utils/Singleflight-test.ts b/test/utils/Singleflight-test.ts
index 80258701bb..148388dc71 100644
--- a/test/utils/Singleflight-test.ts
+++ b/test/utils/Singleflight-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Singleflight} from "../../src/utils/Singleflight";
+import { Singleflight } from "../../src/utils/Singleflight";
 
 describe('Singleflight', () => {
     afterEach(() => {
diff --git a/test/utils/arrays-test.ts b/test/utils/arrays-test.ts
index 5974915965..277260bf29 100644
--- a/test/utils/arrays-test.ts
+++ b/test/utils/arrays-test.ts
@@ -29,7 +29,6 @@ import {
     ArrayUtil,
     GroupedArray,
 } from "../../src/utils/arrays";
-import {objectFromEntries} from "../../src/utils/objects";
 
 function expectSample(i: number, input: number[], expected: number[], smooth = false) {
     console.log(`Resample case index: ${i}`); // for debugging test failures
@@ -43,26 +42,26 @@ describe('arrays', () => {
     describe('arrayFastResample', () => {
         it('should downsample', () => {
             [
-                {input: [1, 2, 3, 4, 5], output: [1, 4]}, // Odd -> Even
-                {input: [1, 2, 3, 4, 5], output: [1, 3, 5]}, // Odd -> Odd
-                {input: [1, 2, 3, 4], output: [1, 2, 3]}, // Even -> Odd
-                {input: [1, 2, 3, 4], output: [1, 3]}, // Even -> Even
+                { input: [1, 2, 3, 4, 5], output: [1, 4] }, // Odd -> Even
+                { input: [1, 2, 3, 4, 5], output: [1, 3, 5] }, // Odd -> Odd
+                { input: [1, 2, 3, 4], output: [1, 2, 3] }, // Even -> Odd
+                { input: [1, 2, 3, 4], output: [1, 3] }, // Even -> Even
             ].forEach((c, i) => expectSample(i, c.input, c.output));
         });
 
         it('should upsample', () => {
             [
-                {input: [1, 2, 3], output: [1, 1, 2, 2, 3, 3]}, // Odd -> Even
-                {input: [1, 2, 3], output: [1, 1, 2, 2, 3]}, // Odd -> Odd
-                {input: [1, 2], output: [1, 1, 1, 2, 2]}, // Even -> Odd
-                {input: [1, 2], output: [1, 1, 1, 2, 2, 2]}, // Even -> Even
+                { input: [1, 2, 3], output: [1, 1, 2, 2, 3, 3] }, // Odd -> Even
+                { input: [1, 2, 3], output: [1, 1, 2, 2, 3] }, // Odd -> Odd
+                { input: [1, 2], output: [1, 1, 1, 2, 2] }, // Even -> Odd
+                { input: [1, 2], output: [1, 1, 1, 2, 2, 2] }, // Even -> Even
             ].forEach((c, i) => expectSample(i, c.input, c.output));
         });
 
         it('should maintain sample', () => {
             [
-                {input: [1, 2, 3], output: [1, 2, 3]}, // Odd
-                {input: [1, 2], output: [1, 2]}, // Even
+                { input: [1, 2, 3], output: [1, 2, 3] }, // Odd
+                { input: [1, 2], output: [1, 2] }, // Even
             ].forEach((c, i) => expectSample(i, c.input, c.output));
         });
     });
@@ -73,26 +72,26 @@ describe('arrays', () => {
             // we'd be feeding a thousand values in and seeing what a curve of 250 values looks like,
             // but that's not really feasible to manually verify accuracy.
             [
-                {input: [4, 4, 1, 4, 4, 1, 4, 4, 1], output: [3, 3, 3, 3]}, // Odd -> Even
-                {input: [4, 4, 1, 4, 4, 1, 4, 4, 1], output: [3, 3, 3]}, // Odd -> Odd
-                {input: [4, 4, 1, 4, 4, 1, 4, 4], output: [3, 3, 3]}, // Even -> Odd
-                {input: [4, 4, 1, 4, 4, 1, 4, 4], output: [3, 3]}, // Even -> Even
+                { input: [4, 4, 1, 4, 4, 1, 4, 4, 1], output: [3, 3, 3, 3] }, // Odd -> Even
+                { input: [4, 4, 1, 4, 4, 1, 4, 4, 1], output: [3, 3, 3] }, // Odd -> Odd
+                { input: [4, 4, 1, 4, 4, 1, 4, 4], output: [3, 3, 3] }, // Even -> Odd
+                { input: [4, 4, 1, 4, 4, 1, 4, 4], output: [3, 3] }, // Even -> Even
             ].forEach((c, i) => expectSample(i, c.input, c.output, true));
         });
 
         it('should upsample', () => {
             [
-                {input: [2, 0, 2], output: [2, 2, 0, 0, 2, 2]}, // Odd -> Even
-                {input: [2, 0, 2], output: [2, 2, 0, 0, 2]}, // Odd -> Odd
-                {input: [2, 0], output: [2, 2, 2, 0, 0]}, // Even -> Odd
-                {input: [2, 0], output: [2, 2, 2, 0, 0, 0]}, // Even -> Even
+                { input: [2, 0, 2], output: [2, 2, 0, 0, 2, 2] }, // Odd -> Even
+                { input: [2, 0, 2], output: [2, 2, 0, 0, 2] }, // Odd -> Odd
+                { input: [2, 0], output: [2, 2, 2, 0, 0] }, // Even -> Odd
+                { input: [2, 0], output: [2, 2, 2, 0, 0, 0] }, // Even -> Even
             ].forEach((c, i) => expectSample(i, c.input, c.output, true));
         });
 
         it('should maintain sample', () => {
             [
-                {input: [2, 0, 2], output: [2, 0, 2]}, // Odd
-                {input: [2, 0], output: [2, 0]}, // Even
+                { input: [2, 0, 2], output: [2, 0, 2] }, // Odd
+                { input: [2, 0], output: [2, 0] }, // Even
             ].forEach((c, i) => expectSample(i, c.input, c.output, true));
         });
     });
@@ -336,7 +335,7 @@ describe('arrays', () => {
             expect(result).toBeDefined();
             expect(result.value).toBeDefined();
 
-            const asObject = objectFromEntries(result.value.entries());
+            const asObject = Object.fromEntries(result.value.entries());
             expect(asObject).toMatchObject(output);
         });
     });
diff --git a/test/utils/enums-test.ts b/test/utils/enums-test.ts
index 423b135f77..e1d34ee688 100644
--- a/test/utils/enums-test.ts
+++ b/test/utils/enums-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {getEnumValues, isEnumValue} from "../../src/utils/enums";
+import { getEnumValues, isEnumValue } from "../../src/utils/enums";
 
 enum TestStringEnum {
     First = "__first__",
diff --git a/test/utils/export-test.tsx b/test/utils/export-test.tsx
new file mode 100644
index 0000000000..66436da9c5
--- /dev/null
+++ b/test/utils/export-test.tsx
@@ -0,0 +1,274 @@
+/*
+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 { IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk";
+import { MatrixClientPeg } from "../../src/MatrixClientPeg";
+import { IExportOptions, ExportType, ExportFormat } from "../../src/utils/exportUtils/exportUtils";
+import '../skinned-sdk';
+import PlainTextExporter from "../../src/utils/exportUtils/PlainTextExport";
+import HTMLExporter from "../../src/utils/exportUtils/HtmlExport";
+import * as TestUtilsMatrix from '../test-utils';
+import { stubClient } from '../test-utils';
+import { renderToString } from "react-dom/server";
+
+let client: MatrixClient;
+
+const MY_USER_ID = "@me:here";
+
+function generateRoomId() {
+    return '!' + Math.random().toString().slice(2, 10) + ':domain';
+}
+
+interface ITestContent extends IContent {
+    expectedText: string;
+}
+
+describe('export', function() {
+    stubClient();
+    client = MatrixClientPeg.get();
+    client.getUserId = () => {
+        return MY_USER_ID;
+    };
+
+    const mockExportOptions: IExportOptions = {
+        numberOfMessages: 5,
+        maxSize: 100 * 1024 * 1024,
+        attachmentsIncluded: false,
+    };
+
+    const invalidExportOptions: IExportOptions[] = [
+        {
+            numberOfMessages: 10**9,
+            maxSize: 1024 * 1024 * 1024,
+            attachmentsIncluded: false,
+        },
+        {
+            numberOfMessages: -1,
+            maxSize: 4096 * 1024 * 1024,
+            attachmentsIncluded: false,
+        },
+        {
+            numberOfMessages: 0,
+            maxSize: 0,
+            attachmentsIncluded: false,
+        },
+    ];
+
+    function createRoom() {
+        const room = new Room(generateRoomId(), null, client.getUserId());
+        return room;
+    }
+    const mockRoom = createRoom();
+
+    const ts0 = Date.now();
+
+    function mkRedactedEvent(i = 0) {
+        return new MatrixEvent({
+            type: "m.room.message",
+            sender: MY_USER_ID,
+            content: {},
+            unsigned: {
+                "age": 72,
+                "transaction_id": "m1212121212.23",
+                "redacted_because": {
+                    "content": {},
+                    "origin_server_ts": ts0 + i*1000,
+                    "redacts": "$9999999999999999999999999999999999999999998",
+                    "sender": "@me:here",
+                    "type": "m.room.redaction",
+                    "unsigned": {
+                        "age": 94,
+                        "transaction_id": "m1111111111.1",
+                    },
+                    "event_id": "$9999999999999999999999999999999999999999998",
+                    "room_id": mockRoom.roomId,
+                },
+            },
+            event_id: "$9999999999999999999999999999999999999999999",
+            room_id: mockRoom.roomId,
+        });
+    }
+
+    function mkFileEvent() {
+        return new MatrixEvent({
+            "content": {
+                "body": "index.html",
+                "info": {
+                    "mimetype": "text/html",
+                    "size": 31613,
+                },
+                "msgtype": "m.file",
+                "url": "mxc://test.org",
+            },
+            "origin_server_ts": 1628872988364,
+            "sender": MY_USER_ID,
+            "type": "m.room.message",
+            "unsigned": {
+                "age": 266,
+                "transaction_id": "m99999999.2",
+            },
+            "event_id": "$99999999999999999999",
+            "room_id": mockRoom.roomId,
+        });
+    }
+
+    function mkEvents() {
+        const matrixEvents = [];
+        let i: number;
+        // plain text
+        for (i = 0; i < 10; i++) {
+            matrixEvents.push(TestUtilsMatrix.mkMessage({
+                event: true, room: "!room:id", user: "@user:id",
+                ts: ts0 + i * 1000,
+            }));
+        }
+        // reply events
+        for (i = 0; i < 10; i++) {
+            matrixEvents.push(TestUtilsMatrix.mkEvent({
+                "content": {
+                    "body": "> <@me:here> Hi\n\nTest",
+                    "format": "org.matrix.custom.html",
+                    "m.relates_to": {
+                        "m.in_reply_to": {
+                            "event_id": "$" + Math.random() + "-" + Math.random(),
+                        },
+                    },
+                    "msgtype": "m.text",
+                },
+                "user": "@me:here",
+                "type": "m.room.message",
+                "room": mockRoom.roomId,
+                "event": true,
+            }));
+        }
+        // membership events
+        for (i = 0; i < 10; i++) {
+            matrixEvents.push(TestUtilsMatrix.mkMembership({
+                event: true, room: "!room:id", user: "@user:id",
+                target: {
+                    userId: "@user:id",
+                    name: "Bob",
+                    getAvatarUrl: () => {
+                        return "avatar.jpeg";
+                    },
+                    getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
+                },
+                ts: ts0 + i*1000,
+                mship: 'join',
+                prevMship: 'join',
+                name: 'A user',
+            }));
+        }
+        // emote
+        matrixEvents.push(TestUtilsMatrix.mkEvent({
+            "content": {
+                "body": "waves",
+                "msgtype": "m.emote",
+            },
+            "user": "@me:here",
+            "type": "m.room.message",
+            "room": mockRoom.roomId,
+            "event": true,
+        }));
+        // redacted events
+        for (i = 0; i < 10; i++) {
+            matrixEvents.push(mkRedactedEvent(i));
+        }
+        return matrixEvents;
+    }
+
+    const events: MatrixEvent[] = mkEvents();
+
+    it('checks if the export format is valid', function() {
+        function isValidFormat(format: string): boolean {
+            const options: string[] = Object.values(ExportFormat);
+            return options.includes(format);
+        }
+        expect(isValidFormat("Html")).toBeTruthy();
+        expect(isValidFormat("Json")).toBeTruthy();
+        expect(isValidFormat("PlainText")).toBeTruthy();
+        expect(isValidFormat("Pdf")).toBeFalsy();
+    });
+
+    it("checks if the icons' html corresponds to export regex", function() {
+        const exporter = new HTMLExporter(mockRoom, ExportType.Beginning, mockExportOptions, null);
+        const fileRegex = /<span class="mx_MFileBody_info_icon">.*?<\/span>/;
+        expect(fileRegex.test(
+            renderToString(exporter.getEventTile(mkFileEvent(), true))),
+        ).toBeTruthy();
+    });
+
+    it('checks if the export options are valid', function() {
+        for (const exportOption of invalidExportOptions) {
+            expect(
+                () =>
+                    new PlainTextExporter(mockRoom, ExportType.Beginning, exportOption, null),
+            ).toThrowError("Invalid export options");
+        }
+    });
+
+    it('tests the file extension splitter', function() {
+        const exporter = new PlainTextExporter(mockRoom, ExportType.Beginning, mockExportOptions, null);
+        const fileNameWithExtensions = {
+            "": ["", ""],
+            "name": ["name", ""],
+            "name.txt": ["name", ".txt"],
+            ".htpasswd": ["", ".htpasswd"],
+            "name.with.many.dots.myext": ["name.with.many.dots", ".myext"],
+        };
+        for (const fileName in fileNameWithExtensions) {
+            expect(exporter.splitFileName(fileName)).toStrictEqual(fileNameWithExtensions[fileName]);
+        }
+    });
+
+    it('checks if the reply regex executes correctly', function() {
+        const eventContents: ITestContent[] = [
+            {
+                "msgtype": "m.text",
+                "body": "> <@me:here> Source\n\nReply",
+                "expectedText": "<@me:here \"Source\"> Reply",
+            },
+            {
+                "msgtype": "m.text",
+                // if the reply format is invalid, then return the body
+                "body": "Invalid reply format",
+                "expectedText": "Invalid reply format",
+            },
+            {
+                "msgtype": "m.text",
+                "body": "> <@me:here> The source is more than 32 characters\n\nReply",
+                "expectedText": "<@me:here \"The source is more than 32 chara...\"> Reply",
+            },
+            {
+                "msgtype": "m.text",
+                "body": "> <@me:here> This\nsource\nhas\nnew\nlines\n\nReply",
+                "expectedText": "<@me:here \"This\"> Reply",
+            },
+        ];
+        const exporter = new PlainTextExporter(mockRoom, ExportType.Beginning, mockExportOptions, null);
+        for (const content of eventContents) {
+            expect(exporter.textForReplyEvent(content)).toBe(content.expectedText);
+        }
+    });
+
+    it("checks if the render to string doesn't throw any error for different types of events", function() {
+        const exporter = new HTMLExporter(mockRoom, ExportType.Beginning, mockExportOptions, null);
+        for (const event of events) {
+            expect(renderToString(exporter.getEventTile(event, false))).toBeTruthy();
+        }
+    });
+});
+
diff --git a/test/utils/iterables-test.ts b/test/utils/iterables-test.ts
index 9b30b6241c..5c1e2241f4 100644
--- a/test/utils/iterables-test.ts
+++ b/test/utils/iterables-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {iterableDiff, iterableUnion} from "../../src/utils/iterables";
+import { iterableDiff, iterableUnion } from "../../src/utils/iterables";
 
 describe('iterables', () => {
     describe('iterableUnion', () => {
diff --git a/test/utils/maps-test.ts b/test/utils/maps-test.ts
index 8764a8f2cf..097f3ef9c9 100644
--- a/test/utils/maps-test.ts
+++ b/test/utils/maps-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {EnhancedMap, mapDiff, mapKeyChanges} from "../../src/utils/maps";
+import { EnhancedMap, mapDiff, mapKeyChanges } from "../../src/utils/maps";
 
 describe('maps', () => {
     describe('mapDiff', () => {
@@ -187,7 +187,7 @@ describe('maps', () => {
         });
 
         it('should use the provided entries', () => {
-            const obj = {a: 1, b: 2};
+            const obj = { a: 1, b: 2 };
             const result = new EnhancedMap(Object.entries(obj));
             expect(result.size).toBe(2);
             expect(result.get('a')).toBe(1);
diff --git a/test/utils/numbers-test.ts b/test/utils/numbers-test.ts
index 36e7d4f7e7..340ffe3302 100644
--- a/test/utils/numbers-test.ts
+++ b/test/utils/numbers-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {clamp, defaultNumber, percentageOf, percentageWithin, sum} from "../../src/utils/numbers";
+import { clamp, defaultNumber, percentageOf, percentageWithin, sum } from "../../src/utils/numbers";
 
 describe('numbers', () => {
     describe('defaultNumber', () => {
diff --git a/test/utils/objects-test.ts b/test/utils/objects-test.ts
index b7a80e6761..b360fbd1d1 100644
--- a/test/utils/objects-test.ts
+++ b/test/utils/objects-test.ts
@@ -18,7 +18,6 @@ import {
     objectClone,
     objectDiff,
     objectExcluding,
-    objectFromEntries,
     objectHasDiff,
     objectKeyChanges,
     objectShallowClone,
@@ -28,8 +27,8 @@ import {
 describe('objects', () => {
     describe('objectExcluding', () => {
         it('should exclude the given properties', () => {
-            const input = {hello: "world", test: true};
-            const output = {hello: "world"};
+            const input = { hello: "world", test: true };
+            const output = { hello: "world" };
             const props = ["test", "doesnotexist"]; // we also make sure it doesn't explode on missing props
             const result = objectExcluding(input, <any>props); // any is to test the missing prop
             expect(result).toBeDefined();
@@ -39,8 +38,8 @@ describe('objects', () => {
 
     describe('objectWithOnly', () => {
         it('should exclusively use the given properties', () => {
-            const input = {hello: "world", test: true};
-            const output = {hello: "world"};
+            const input = { hello: "world", test: true };
+            const output = { hello: "world" };
             const props = ["hello", "doesnotexist"]; // we also make sure it doesn't explode on missing props
             const result = objectWithOnly(input, <any>props); // any is to test the missing prop
             expect(result).toBeDefined();
@@ -50,7 +49,7 @@ describe('objects', () => {
 
     describe('objectShallowClone', () => {
         it('should create a new object', () => {
-            const input = {test: 1};
+            const input = { test: 1 };
             const result = objectShallowClone(input);
             expect(result).toBeDefined();
             expect(result).not.toBe(input);
@@ -58,7 +57,7 @@ describe('objects', () => {
         });
 
         it('should only clone the top level properties', () => {
-            const input = {a: 1, b: {c: 2}};
+            const input = { a: 1, b: { c: 2 } };
             const result = objectShallowClone(input);
             expect(result).toBeDefined();
             expect(result).toMatchObject(input);
@@ -66,8 +65,8 @@ describe('objects', () => {
         });
 
         it('should support custom clone functions', () => {
-            const input = {a: 1, b: 2};
-            const output = {a: 4, b: 8};
+            const input = { a: 1, b: 2 };
+            const output = { a: 4, b: 8 };
             const result = objectShallowClone(input, (k, v) => {
                 // XXX: inverted expectation for ease of assertion
                 expect(Object.keys(input)).toContain(k);
@@ -87,29 +86,29 @@ describe('objects', () => {
         });
 
         it('should return true if keys for A > keys for B', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 1};
+            const a = { a: 1, b: 2 };
+            const b = { a: 1 };
             const result = objectHasDiff(a, b);
             expect(result).toBe(true);
         });
 
         it('should return true if keys for A < keys for B', () => {
-            const a = {a: 1};
-            const b = {a: 1, b: 2};
+            const a = { a: 1 };
+            const b = { a: 1, b: 2 };
             const result = objectHasDiff(a, b);
             expect(result).toBe(true);
         });
 
         it('should return false if the objects are the same but different pointers', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 1, b: 2};
+            const a = { a: 1, b: 2 };
+            const b = { a: 1, b: 2 };
             const result = objectHasDiff(a, b);
             expect(result).toBe(false);
         });
 
         it('should consider pointers when testing values', () => {
-            const a = {a: {}, b: 2}; // `{}` is shorthand for `new Object()`
-            const b = {a: {}, b: 2};
+            const a = { a: {}, b: 2 }; // `{}` is shorthand for `new Object()`
+            const b = { a: {}, b: 2 };
             const result = objectHasDiff(a, b);
             expect(result).toBe(true); // even though the keys are the same, the value pointers vary
         });
@@ -117,8 +116,8 @@ describe('objects', () => {
 
     describe('objectDiff', () => {
         it('should return empty sets for the same object', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 1, b: 2};
+            const a = { a: 1, b: 2 };
+            const b = { a: 1, b: 2 };
             const result = objectDiff(a, b);
             expect(result).toBeDefined();
             expect(result.changed).toBeDefined();
@@ -130,7 +129,7 @@ describe('objects', () => {
         });
 
         it('should return empty sets for the same object pointer', () => {
-            const a = {a: 1, b: 2};
+            const a = { a: 1, b: 2 };
             const result = objectDiff(a, a);
             expect(result).toBeDefined();
             expect(result.changed).toBeDefined();
@@ -142,8 +141,8 @@ describe('objects', () => {
         });
 
         it('should indicate when property changes are made', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 11, b: 2};
+            const a = { a: 1, b: 2 };
+            const b = { a: 11, b: 2 };
             const result = objectDiff(a, b);
             expect(result.changed).toBeDefined();
             expect(result.added).toBeDefined();
@@ -155,8 +154,8 @@ describe('objects', () => {
         });
 
         it('should indicate when properties are added', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 1, b: 2, c: 3};
+            const a = { a: 1, b: 2 };
+            const b = { a: 1, b: 2, c: 3 };
             const result = objectDiff(a, b);
             expect(result.changed).toBeDefined();
             expect(result.added).toBeDefined();
@@ -168,8 +167,8 @@ describe('objects', () => {
         });
 
         it('should indicate when properties are removed', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 1};
+            const a = { a: 1, b: 2 };
+            const b = { a: 1 };
             const result = objectDiff(a, b);
             expect(result.changed).toBeDefined();
             expect(result.added).toBeDefined();
@@ -181,8 +180,8 @@ describe('objects', () => {
         });
 
         it('should indicate when multiple aspects change', () => {
-            const a = {a: 1, b: 2, c: 3};
-            const b: (typeof a | {d: number}) = {a: 1, b: 22, d: 4};
+            const a = { a: 1, b: 2, c: 3 };
+            const b: (typeof a | {d: number}) = { a: 1, b: 22, d: 4 };
             const result = objectDiff(a, b);
             expect(result.changed).toBeDefined();
             expect(result.added).toBeDefined();
@@ -198,23 +197,23 @@ describe('objects', () => {
 
     describe('objectKeyChanges', () => {
         it('should return an empty set if no properties changed', () => {
-            const a = {a: 1, b: 2};
-            const b = {a: 1, b: 2};
+            const a = { a: 1, b: 2 };
+            const b = { a: 1, b: 2 };
             const result = objectKeyChanges(a, b);
             expect(result).toBeDefined();
             expect(result).toHaveLength(0);
         });
 
         it('should return an empty set if no properties changed for the same pointer', () => {
-            const a = {a: 1, b: 2};
+            const a = { a: 1, b: 2 };
             const result = objectKeyChanges(a, a);
             expect(result).toBeDefined();
             expect(result).toHaveLength(0);
         });
 
         it('should return properties which were changed, added, or removed', () => {
-            const a = {a: 1, b: 2, c: 3};
-            const b: (typeof a | {d: number}) = {a: 1, b: 22, d: 4};
+            const a = { a: 1, b: 2, c: 3 };
+            const b: (typeof a | {d: number}) = { a: 1, b: 22, d: 4 };
             const result = objectKeyChanges(a, b);
             expect(result).toBeDefined();
             expect(result).toHaveLength(3);
@@ -242,21 +241,4 @@ describe('objects', () => {
             expect(result.test.third).not.toBe(a.test.third);
         });
     });
-
-    describe('objectFromEntries', () => {
-        it('should create an object from an array of entries', () => {
-            const output = {a: 1, b: 2, c: 3};
-            const result = objectFromEntries(Object.entries(output));
-            expect(result).toBeDefined();
-            expect(result).toMatchObject(output);
-        });
-
-        it('should maintain pointers in values', () => {
-            const output = {a: {}, b: 2, c: 3};
-            const result = objectFromEntries(Object.entries(output));
-            expect(result).toBeDefined();
-            expect(result).toMatchObject(output);
-            expect(result['a']).toBe(output.a);
-        });
-    });
 });
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index 0bd4466d97..41cce7f98d 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg as peg} from '../../../src/MatrixClientPeg';
+import { MatrixClientPeg as peg } from '../../../src/MatrixClientPeg';
 import {
     makeGroupPermalink,
     makeRoomPermalink,
@@ -34,7 +34,7 @@ function mockRoom(roomId, members, serverACL) {
 
     return {
         roomId,
-        getCanonicalAlias: () => roomId,
+        getCanonicalAlias: () => null,
         getJoinedMembers: () => members,
         getMember: (userId) => members.find(m => m.userId === userId),
         currentState: {
@@ -48,7 +48,7 @@ function mockRoom(roomId, members, serverACL) {
                         content = serverACL;
                         break;
                     case "m.room.power_levels":
-                        content = {users: powerLevelsUsers, users_default: 0};
+                        content = { users: powerLevelsUsers, users_default: 0 };
                         break;
                 }
                 if (content) {
diff --git a/test/utils/sets-test.ts b/test/utils/sets-test.ts
index 98dc218309..fec6cab0f3 100644
--- a/test/utils/sets-test.ts
+++ b/test/utils/sets-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {setHasDiff} from "../../src/utils/sets";
+import { setHasDiff } from "../../src/utils/sets";
 
 describe('sets', () => {
     describe('setHasDiff', () => {
diff --git a/test/utils/stringOrderField-test.ts b/test/utils/stringOrderField-test.ts
new file mode 100644
index 0000000000..331627dfc0
--- /dev/null
+++ b/test/utils/stringOrderField-test.ts
@@ -0,0 +1,291 @@
+/*
+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 { sortBy } from "lodash";
+import { averageBetweenStrings, DEFAULT_ALPHABET } from "matrix-js-sdk/src/utils";
+
+import { midPointsBetweenStrings, reorderLexicographically } from "../../src/utils/stringOrderField";
+
+const moveLexicographicallyTest = (
+    orders: Array<string | undefined>,
+    fromIndex: number,
+    toIndex: number,
+    expectedChanges: number,
+    maxLength?: number,
+): void => {
+    const ops = reorderLexicographically(orders, fromIndex, toIndex, maxLength);
+
+    const zipped: Array<[number, string | undefined]> = orders.map((o, i) => [i, o]);
+    ops.forEach(({ index, order }) => {
+        zipped[index][1] = order;
+    });
+
+    const newOrders = sortBy(zipped, i => i[1]);
+    expect(newOrders[toIndex][0]).toBe(fromIndex);
+    expect(ops).toHaveLength(expectedChanges);
+};
+
+describe("stringOrderField", () => {
+    describe("midPointsBetweenStrings", () => {
+        it("should work", () => {
+            expect(averageBetweenStrings("!!", "##")).toBe('""');
+            const midpoints = ["a", ...midPointsBetweenStrings("a", "e", 3, 1), "e"].sort();
+            expect(midpoints[0]).toBe("a");
+            expect(midpoints[4]).toBe("e");
+            expect(midPointsBetweenStrings("      ", "!'Tu:}", 1, 50)).toStrictEqual([" S:J\\~"]);
+        });
+
+        it("should return empty array when the request is not possible", () => {
+            expect(midPointsBetweenStrings("a", "e", 0, 1)).toStrictEqual([]);
+            expect(midPointsBetweenStrings("a", "e", 4, 1)).toStrictEqual([]);
+        });
+    });
+
+    describe("reorderLexicographically", () => {
+        it("should work when moving left", () => {
+            moveLexicographicallyTest(["a", "c", "e", "g", "i"], 2, 1, 1);
+        });
+
+        it("should work when moving right", () => {
+            moveLexicographicallyTest(["a", "c", "e", "g", "i"], 1, 2, 1);
+        });
+
+        it("should work when all orders are undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined, undefined, undefined],
+                4,
+                1,
+                2,
+            );
+        });
+
+        it("should work when moving to end and all orders are undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined, undefined, undefined],
+                1,
+                4,
+                5,
+            );
+        });
+
+        it("should work when moving left and some orders are undefined", () => {
+            moveLexicographicallyTest(
+                ["a", "c", "e", undefined, undefined, undefined],
+                5,
+                2,
+                1,
+            );
+
+            moveLexicographicallyTest(
+                ["a", "a", "e", undefined, undefined, undefined],
+                5,
+                1,
+                2,
+            );
+        });
+
+        it("should work moving to the start when all is undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined],
+                2,
+                0,
+                1,
+            );
+        });
+
+        it("should work moving to the end when all is undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined],
+                1,
+                3,
+                4,
+            );
+        });
+
+        it("should work moving left when all is undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined, undefined, undefined],
+                4,
+                1,
+                2,
+            );
+        });
+
+        it("should work moving right when all is undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined],
+                1,
+                2,
+                3,
+            );
+        });
+
+        it("should work moving more right when all is undefined", () => {
+            moveLexicographicallyTest(
+                [undefined, undefined, undefined, undefined, undefined, /**/ undefined, undefined],
+                1,
+                4,
+                5,
+            );
+        });
+
+        it("should work moving left when right is undefined", () => {
+            moveLexicographicallyTest(
+                ["20", undefined, undefined, undefined, undefined, undefined],
+                4,
+                2,
+                2,
+            );
+        });
+
+        it("should work moving right when right is undefined", () => {
+            moveLexicographicallyTest(
+                ["50", undefined, undefined, undefined, undefined, /**/ undefined, undefined],
+                1,
+                4,
+                4,
+            );
+        });
+
+        it("should work moving left when right is defined", () => {
+            moveLexicographicallyTest(
+                ["10", "20", "30", "40", undefined, undefined],
+                3,
+                1,
+                1,
+            );
+        });
+
+        it("should work moving right when right is defined", () => {
+            moveLexicographicallyTest(
+                ["10", "20", "30", "40", "50", undefined],
+                1,
+                3,
+                1,
+            );
+        });
+
+        it("should work moving left when all is defined", () => {
+            moveLexicographicallyTest(
+                ["11", "13", "15", "17", "19"],
+                2,
+                1,
+                1,
+            );
+        });
+
+        it("should work moving right when all is defined", () => {
+            moveLexicographicallyTest(
+                ["11", "13", "15", "17", "19"],
+                1,
+                2,
+                1,
+            );
+        });
+
+        it("should work moving left into no left space", () => {
+            moveLexicographicallyTest(
+                ["11", "12", "13", "14", "19"],
+                3,
+                1,
+                2,
+                2,
+            );
+
+            moveLexicographicallyTest(
+                [
+                    DEFAULT_ALPHABET.charAt(0),
+                    // Target
+                    DEFAULT_ALPHABET.charAt(1),
+                    DEFAULT_ALPHABET.charAt(2),
+                    DEFAULT_ALPHABET.charAt(3),
+                    DEFAULT_ALPHABET.charAt(4),
+                    DEFAULT_ALPHABET.charAt(5),
+                ],
+                5,
+                1,
+                5,
+                1,
+            );
+        });
+
+        it("should work moving right into no right space", () => {
+            moveLexicographicallyTest(
+                ["15", "16", "17", "18", "19"],
+                1,
+                3,
+                3,
+                2,
+            );
+
+            moveLexicographicallyTest(
+                [
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 5),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 4),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 3),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 2),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 1),
+                ],
+                1,
+                3,
+                3,
+                1,
+            );
+        });
+
+        it("should work moving right into no left space", () => {
+            moveLexicographicallyTest(
+                ["11", "12", "13", "14", "15", "16", undefined],
+                1,
+                3,
+                3,
+            );
+
+            moveLexicographicallyTest(
+                ["0", "1", "2", "3", "4", "5"],
+                1,
+                3,
+                3,
+                1,
+            );
+        });
+
+        it("should work moving left into no right space", () => {
+            moveLexicographicallyTest(
+                ["15", "16", "17", "18", "19"],
+                4,
+                3,
+                4,
+                2,
+            );
+
+            moveLexicographicallyTest(
+                [
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 5),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 4),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 3),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 2),
+                    DEFAULT_ALPHABET.charAt(DEFAULT_ALPHABET.length - 1),
+                ],
+                4,
+                3,
+                4,
+                1,
+            );
+        });
+    });
+});
+
diff --git a/test/utils/test-utils.ts b/test/utils/test-utils.ts
index af92987a3d..8bc602fe35 100644
--- a/test/utils/test-utils.ts
+++ b/test/utils/test-utils.ts
@@ -15,7 +15,13 @@ limitations under the License.
 */
 
 import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
 import { AsyncStoreWithClient } from "../../src/stores/AsyncStoreWithClient";
+import { mkEvent, mkStubRoom } from "../test-utils";
+import { EnhancedMap } from "../../src/utils/maps";
+import { EventEmitter } from "events";
 
 // These methods make some use of some private methods on the AsyncStoreWithClient to simplify getting into a consistent
 // ready state without needing to wire up a dispatcher and pretend to be a js-sdk client.
@@ -31,3 +37,48 @@ export const resetAsyncStoreWithClient = async (store: AsyncStoreWithClient<any>
     // @ts-ignore
     await store.onNotReady();
 };
+
+export const mockStateEventImplementation = (events: MatrixEvent[]) => {
+    const stateMap = new EnhancedMap<string, Map<string, MatrixEvent>>();
+    events.forEach(event => {
+        stateMap.getOrCreate(event.getType(), new Map()).set(event.getStateKey(), event);
+    });
+
+    return (eventType: string, stateKey?: string) => {
+        if (stateKey || stateKey === "") {
+            return stateMap.get(eventType)?.get(stateKey) || null;
+        }
+        return Array.from(stateMap.get(eventType)?.values() || []);
+    };
+};
+
+export const mkRoom = (client: MatrixClient, roomId: string, rooms?: ReturnType<typeof mkStubRoom>[]) => {
+    const room = mkStubRoom(roomId, roomId, client);
+    room.currentState.getStateEvents.mockImplementation(mockStateEventImplementation([]));
+    rooms?.push(room);
+    return room;
+};
+
+export const mkSpace = (
+    client: MatrixClient,
+    spaceId: string,
+    rooms?: ReturnType<typeof mkStubRoom>[],
+    children: string[] = [],
+) => {
+    const space = mkRoom(client, spaceId, rooms);
+    space.isSpaceRoom.mockReturnValue(true);
+    space.currentState.getStateEvents.mockImplementation(mockStateEventImplementation(children.map(roomId =>
+        mkEvent({
+            event: true,
+            type: EventType.SpaceChild,
+            room: spaceId,
+            user: "@user:server",
+            skey: roomId,
+            content: { via: [] },
+            ts: Date.now(),
+        }),
+    )));
+    return space;
+};
+
+export const emitPromise = (e: EventEmitter, k: string | symbol) => new Promise(r => e.once(k, r));
diff --git a/tsconfig.json b/tsconfig.json
index b139e8e8d1..02904af9d1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,20 +12,14 @@
     "outDir": "./lib",
     "declaration": true,
     "jsx": "react",
-    "types": [
-      "node",
-      "react",
-      "flux",
-      "react-transition-group"
-    ],
     "lib": [
       "es2019",
       "dom",
       "dom.iterable"
-    ]
+    ],
   },
   "include": [
     "./src/**/*.ts",
     "./src/**/*.tsx"
-  ]
+  ],
 }
diff --git a/yarn.lock b/yarn.lock
index 0ff235a660..ec2d9e08ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,450 +2,469 @@
 # yarn lockfile v1
 
 
+"@actions/core@^1.4.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.5.0.tgz#885b864700001a1b9a6fba247833a036e75ad9d3"
+  integrity sha512-eDOLH1Nq9zh+PJlYLqEMkS/jLQxhksPNmUGNBHfa4G+tQmnIhzpctxmchETtVGyBOvXgOVVpYuE40+eS4cUnwQ==
+
+"@actions/github@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz#1754127976c50bd88b2e905f10d204d76d1472f8"
+  integrity sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==
+  dependencies:
+    "@actions/http-client" "^1.0.11"
+    "@octokit/core" "^3.4.0"
+    "@octokit/plugin-paginate-rest" "^2.13.3"
+    "@octokit/plugin-rest-endpoint-methods" "^5.1.1"
+
+"@actions/http-client@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
+  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
+  dependencies:
+    tunnel "0.0.6"
+
 "@babel/cli@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.10.tgz#67a1015b1cd505bde1696196febf910c4c339a48"
-  integrity sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.15.4.tgz#00e21e192b738dec7900c8bb36270e377217c0a4"
+  integrity sha512-9RhhQ7tgKRcSO/jI3rNLxalLSk30cHqeM8bb+nGOJTyYBDpkoXw/A9QHZ2SYjlslAt4tr90pZQGIEobwWHSIDw==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
-    lodash "^4.17.19"
     make-dir "^2.1.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents"
+    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.2"
     chokidar "^3.4.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
   dependencies:
-    "@babel/highlight" "^7.10.4"
+    "@babel/highlight" "^7.14.5"
 
-"@babel/code-frame@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
-  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
+  integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
 
 "@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.7.5":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
-  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
+  version "7.15.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+  integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.10"
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helpers" "^7.12.5"
-    "@babel/parser" "^7.12.10"
-    "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.10"
-    "@babel/types" "^7.12.10"
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helpers" "^7.15.4"
+    "@babel/parser" "^7.15.5"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
+    gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.19"
-    semver "^5.4.1"
+    semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
-  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
+"@babel/eslint-parser@^7.12.10":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz#46385943726291fb3e8db99522c8099b15684387"
+  integrity sha512-hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw==
   dependencies:
-    "@babel/types" "^7.12.11"
+    eslint-scope "^5.1.1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.0"
+
+"@babel/eslint-plugin@^7.12.10":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.14.5.tgz#70b76608d49094062e8da2a2614d50fec775c00f"
+  integrity sha512-nzt/YMnOOIRikvSn2hk9+W2omgJBy6U8TN0R+WTTmqapA+HnZTuviZaketdTE9W7/k/+E/DfZlt1ey1NSE39pg==
+  dependencies:
+    eslint-rule-composer "^0.3.0"
+
+"@babel/generator@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
+  integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
+  dependencies:
+    "@babel/types" "^7.15.4"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
-  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
+"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
   dependencies:
-    "@babel/types" "^7.13.16"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
-  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+  integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
   dependencies:
-    "@babel/types" "^7.12.10"
+    "@babel/helper-explode-assignable-expression" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
-  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
+    semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
-  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
   dependencies:
-    "@babel/compat-data" "^7.12.5"
-    "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.14.5"
-    semver "^5.5.0"
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
 
-"@babel/helper-create-class-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
-  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
   dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-
-"@babel/helper-create-regexp-features-plugin@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
-  integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-map@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
-  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
+"@babel/helper-define-polyfill-provider@^0.2.2":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
   dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
 
-"@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
-  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+  integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
-  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.12.10"
-    "@babel/template" "^7.12.7"
-    "@babel/types" "^7.12.11"
+    "@babel/helper-get-function-arity" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+"@babel/helper-get-function-arity@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-get-function-arity@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
-  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
+"@babel/helper-hoist-variables@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
   dependencies:
-    "@babel/types" "^7.12.10"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+"@babel/helper-member-expression-to-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-hoist-variables@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
-  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+  integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
-  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
+"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz#962cc629a7f7f9a082dd62d0307fa75fe8788d7c"
+  integrity sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/helper-module-imports" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-simple-access" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/helper-validator-identifier" "^7.14.9"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
-  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+"@babel/helper-optimise-call-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-module-transforms@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
-  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
+  integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-simple-access" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/helper-validator-identifier" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-wrap-function" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
-  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
   dependencies:
-    "@babel/types" "^7.12.10"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
-  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
-
-"@babel/helper-remap-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
-  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
+"@babel/helper-simple-access@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-replace-supers@^7.12.1":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
-  integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
+  integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.7"
-    "@babel/helper-optimise-call-expression" "^7.12.10"
-    "@babel/traverse" "^7.12.10"
-    "@babel/types" "^7.12.11"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-simple-access@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
-  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
+"@babel/helper-split-export-declaration@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48"
+  integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==
+
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helper-wrap-function@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
+  integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
-  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
+"@babel/helpers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+  integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
   dependencies:
-    "@babel/types" "^7.12.11"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+"@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
   dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-
-"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
-  integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
-
-"@babel/helper-wrap-function@^7.10.4":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
-  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helpers@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
-  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
-  dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
-
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.14.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.12.13":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.13.16", "@babel/parser@^7.15.4", "@babel/parser@^7.15.5":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
+  integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
+  integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
-  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
-
-"@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
-  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
-
-"@babel/plugin-proposal-async-generator-functions@^7.12.1":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566"
-  integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==
+"@babel/plugin-proposal-async-generator-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
+  integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.15.4"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
-  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
+"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-class-static-block@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
+  integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-decorators@^7.12.12":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.12.tgz#067a6d3d6ca86d54cf56bb183239199c20daeafe"
-  integrity sha512-fhkE9lJYpw2mjHelBpM2zCbaA11aov2GJs7q4cFaXNrWx0H3bW58H9Esy2rdtYOghFBEYUDRIpvlgi+ZD+AvvQ==
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
+  integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-decorators" "^7.12.1"
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-decorators" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
-  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
+"@babel/plugin-proposal-dynamic-import@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
+  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-proposal-export-default-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz#c6e62d668a8abcfe0d28b82f560395fecb611c5a"
-  integrity sha512-z5Q4Ke7j0AexQRfgUvnD+BdCSgpTEKnqQ3kskk2jWtOBulxICzd1X9BGt7kmWftxZ2W3++OZdt5gtmC8KLxdRQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz#8931a6560632c650f92a8e5948f6e73019d6d321"
+  integrity sha512-T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-export-default-from" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-export-default-from" "^7.14.5"
 
-"@babel/plugin-proposal-export-namespace-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
-  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
+  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
-  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
+"@babel/plugin-proposal-json-strings@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
+  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
-  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
+"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
+  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
-  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
-  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
+"@babel/plugin-proposal-numeric-separator@^7.12.7", "@babel/plugin-proposal-numeric-separator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
+  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
-  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.15.6":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
+  integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.15.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
-  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
+"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
-  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
+"@babel/plugin-proposal-optional-chaining@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
-  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
+"@babel/plugin-proposal-private-methods@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
+  integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
-  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
+"@babel/plugin-proposal-private-property-in-object@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
+  integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
+  integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -459,33 +478,40 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
-  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
+"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-decorators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
-  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0":
+"@babel/plugin-syntax-decorators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
+  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz#a9eb31881f4f9a1115a3d2c6d64ac3f6016b5a9d"
-  integrity sha512-dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw==
+"@babel/plugin-syntax-export-default-from@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.14.5.tgz#cdfa9d43d2b2c89b6f1af3e83518e8c8b9ed0dbc"
+  integrity sha512-snWDxjuaPEobRBnhpqEfZ8RMxDbHt8+87fiEioGuE+Uc0xAKgSD8QiuL3lF93hPVQfZFAcYwrrf+H5qUhike3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
@@ -494,13 +520,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-flow@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz#a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"
-  integrity sha512-1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -508,19 +527,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
-  integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
+"@babel/plugin-syntax-jsx@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
+  integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -529,7 +548,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -543,439 +562,430 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
-  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
-  integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
+"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
-  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
+"@babel/plugin-syntax-typescript@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
+  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
-  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
+"@babel/plugin-transform-arrow-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
-  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
+"@babel/plugin-transform-async-to-generator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
 
-"@babel/plugin-transform-block-scoping@^7.12.11":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca"
-  integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==
+"@babel/plugin-transform-block-scoped-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
-  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
+"@babel/plugin-transform-block-scoping@^7.15.3":
+  version "7.15.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
+  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-define-map" "^7.10.4"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
+  integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
-  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
+"@babel/plugin-transform-computed-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-destructuring@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
-  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
+"@babel/plugin-transform-destructuring@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
+  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
-  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
+"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
+  integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
-  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
+"@babel/plugin-transform-duplicate-keys@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
+  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
-  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
+"@babel/plugin-transform-exponentiation-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-flow-comments@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.12.1.tgz#92fe5a27e635bd6d2e46f616094d60edff895a0b"
-  integrity sha512-jQd0UQUg98j95JJVQL74mOrzES7dYyd8hy+ZDiMj1wjHw1Nj0Pzkk7tKZdqqAoSZV/yTYLp0lJ0/PTozy2cNDg==
+"@babel/plugin-transform-for-of@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
+  integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
   dependencies:
-    "@babel/generator" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-flow" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-flow-strip-types@^7.12.1":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz#d85e30ecfa68093825773b7b857e5085bbd32c95"
-  integrity sha512-0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg==
+"@babel/plugin-transform-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-flow" "^7.12.1"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-for-of@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
-  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
+"@babel/plugin-transform-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-function-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
-  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
+"@babel/plugin-transform-member-expression-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
   dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
-  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
+"@babel/plugin-transform-modules-amd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
+  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-member-expression-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
-  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-modules-amd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
-  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
-  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
+"@babel/plugin-transform-modules-commonjs@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
+  integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.12.1"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-simple-access" "^7.15.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
-  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
+"@babel/plugin-transform-modules-systemjs@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
+  integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.9"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
-  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
+"@babel/plugin-transform-modules-umd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
+  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
-  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
+  integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
 
-"@babel/plugin-transform-new-target@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
-  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
+"@babel/plugin-transform-new-target@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
+  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-object-super@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
-  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
+"@babel/plugin-transform-object-super@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
 
-"@babel/plugin-transform-parameters@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
-  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
+"@babel/plugin-transform-parameters@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
+  integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
-  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
+"@babel/plugin-transform-property-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-react-display-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"
-  integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==
+"@babel/plugin-transform-react-display-name@^7.14.5":
+  version "7.15.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz#6aaac6099f1fcf6589d35ae6be1b6e10c8c602b9"
+  integrity sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-react-jsx-development@^7.12.7":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7"
-  integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg==
+"@babel/plugin-transform-react-jsx-development@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz#1a6c73e2f7ed2c42eebc3d2ad60b0c7494fcb9af"
+  integrity sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.12.12"
+    "@babel/plugin-transform-react-jsx" "^7.14.5"
 
-"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e"
-  integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw==
+"@babel/plugin-transform-react-jsx@^7.14.5":
+  version "7.14.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c"
+  integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.10"
-    "@babel/helper-module-imports" "^7.12.5"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.12.1"
-    "@babel/types" "^7.12.12"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-jsx" "^7.14.5"
+    "@babel/types" "^7.14.9"
 
-"@babel/plugin-transform-react-pure-annotations@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
-  integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==
+"@babel/plugin-transform-react-pure-annotations@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz#18de612b84021e3a9802cbc212c9d9f46d0d11fc"
+  integrity sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-regenerator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
-  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
+"@babel/plugin-transform-regenerator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
-  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
+"@babel/plugin-transform-reserved-words@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
+  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-runtime@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
-  integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
+  integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.5"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    semver "^5.5.1"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
-  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
+"@babel/plugin-transform-shorthand-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
-  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
+"@babel/plugin-transform-spread@^7.14.6":
+  version "7.14.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
+  integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
 
-"@babel/plugin-transform-sticky-regex@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
-  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
+"@babel/plugin-transform-sticky-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-template-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
-  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
+"@babel/plugin-transform-template-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
-  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
+"@babel/plugin-transform-typeof-symbol@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
+  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
-  integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==
+"@babel/plugin-transform-typescript@^7.15.0":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
+  integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-typescript" "^7.12.1"
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-typescript" "^7.14.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
-  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
+"@babel/plugin-transform-unicode-escapes@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
+  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-unicode-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
-  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
+"@babel/plugin-transform-unicode-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/preset-env@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
-  integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
+  integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
   dependencies:
-    "@babel/compat-data" "^7.12.7"
-    "@babel/helper-compilation-targets" "^7.12.5"
-    "@babel/helper-module-imports" "^7.12.5"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.11"
-    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
-    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
-    "@babel/plugin-proposal-json-strings" "^7.12.1"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
-    "@babel/plugin-proposal-private-methods" "^7.12.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-class-static-block" "^7.15.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+    "@babel/plugin-proposal-json-strings" "^7.14.5"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-private-methods" "^7.14.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.12.1"
-    "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-async-to-generator" "^7.12.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.11"
-    "@babel/plugin-transform-classes" "^7.12.1"
-    "@babel/plugin-transform-computed-properties" "^7.12.1"
-    "@babel/plugin-transform-destructuring" "^7.12.1"
-    "@babel/plugin-transform-dotall-regex" "^7.12.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
-    "@babel/plugin-transform-for-of" "^7.12.1"
-    "@babel/plugin-transform-function-name" "^7.12.1"
-    "@babel/plugin-transform-literals" "^7.12.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
-    "@babel/plugin-transform-modules-amd" "^7.12.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
-    "@babel/plugin-transform-modules-umd" "^7.12.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
-    "@babel/plugin-transform-new-target" "^7.12.1"
-    "@babel/plugin-transform-object-super" "^7.12.1"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-    "@babel/plugin-transform-property-literals" "^7.12.1"
-    "@babel/plugin-transform-regenerator" "^7.12.1"
-    "@babel/plugin-transform-reserved-words" "^7.12.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
-    "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-sticky-regex" "^7.12.7"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
-    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
-    "@babel/plugin-transform-unicode-regex" "^7.12.1"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.11"
-    core-js-compat "^3.8.0"
-    semver "^5.5.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.14.5"
+    "@babel/plugin-transform-async-to-generator" "^7.14.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+    "@babel/plugin-transform-block-scoping" "^7.15.3"
+    "@babel/plugin-transform-classes" "^7.15.4"
+    "@babel/plugin-transform-computed-properties" "^7.14.5"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-dotall-regex" "^7.14.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+    "@babel/plugin-transform-for-of" "^7.15.4"
+    "@babel/plugin-transform-function-name" "^7.14.5"
+    "@babel/plugin-transform-literals" "^7.14.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+    "@babel/plugin-transform-modules-amd" "^7.14.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.15.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
+    "@babel/plugin-transform-modules-umd" "^7.14.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
+    "@babel/plugin-transform-new-target" "^7.14.5"
+    "@babel/plugin-transform-object-super" "^7.14.5"
+    "@babel/plugin-transform-parameters" "^7.15.4"
+    "@babel/plugin-transform-property-literals" "^7.14.5"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-reserved-words" "^7.14.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+    "@babel/plugin-transform-spread" "^7.14.6"
+    "@babel/plugin-transform-sticky-regex" "^7.14.5"
+    "@babel/plugin-transform-template-literals" "^7.14.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+    "@babel/plugin-transform-unicode-regex" "^7.14.5"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.15.6"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    core-js-compat "^3.16.0"
+    semver "^6.3.0"
 
-"@babel/preset-flow@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.12.1.tgz#1a81d376c5a9549e75352a3888f8c273455ae940"
-  integrity sha512-UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-flow-strip-types" "^7.12.1"
-
-"@babel/preset-modules@^0.1.3":
+"@babel/preset-modules@^0.1.4":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
   integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
@@ -987,105 +997,74 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
-  integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c"
+  integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.10"
-    "@babel/plugin-transform-react-jsx-development" "^7.12.7"
-    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-react-display-name" "^7.14.5"
+    "@babel/plugin-transform-react-jsx" "^7.14.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.14.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
 
 "@babel/preset-typescript@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz#fc7df8199d6aae747896f1e6c61fc872056632a3"
-  integrity sha512-nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz#e8fca638a1a0f64f14e1119f7fe4500277840945"
+  integrity sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
-    "@babel/plugin-transform-typescript" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-typescript" "^7.15.0"
 
 "@babel/register@^7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.12.10.tgz#19b87143f17128af4dbe7af54c735663b3999f60"
-  integrity sha512-EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ==
+  version "7.15.3"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.15.3.tgz#6b40a549e06ec06c885b2ec42c3dd711f55fe752"
+  integrity sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==
   dependencies:
+    clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
-    lodash "^4.17.19"
     make-dir "^2.1.0"
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
-  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
-  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
+"@babel/template@^7.15.4", "@babel/template@^7.3.3":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/code-frame" "^7.14.5"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/template@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.12", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.17", "@babel/traverse@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+  integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
   dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.12", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
-  integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==
-  dependencies:
-    "@babel/code-frame" "^7.12.11"
-    "@babel/generator" "^7.12.11"
-    "@babel/helper-function-name" "^7.12.11"
-    "@babel/helper-split-export-declaration" "^7.12.11"
-    "@babel/parser" "^7.12.11"
-    "@babel/types" "^7.12.12"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.13.17":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
-  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.16"
-    "@babel/types" "^7.13.17"
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.12.12"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
-  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
+"@babel/types@^7.0.0", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+  integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.13", "@babel/types@^7.13.16", "@babel/types@^7.13.17":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
-  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1129,9 +1108,9 @@
     resolve-from "^5.0.0"
 
 "@istanbuljs/schema@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
-  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
 "@jest/console@^26.6.2":
   version "26.6.2"
@@ -1329,15 +1308,15 @@
   version "3.2.3"
   resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz#cc332fdd25c08ef0e40f4d33fc3f822a0f98b6f4"
 
-"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents":
-  version "2.1.8-no-fsevents"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz#da7c3996b8e6e19ebd14d82eaced2313e7769f9b"
-  integrity sha512-+nb9vWloHNNMFHjGofEam3wopE3m1yuambrrd/fnPc+lFOMB9ROTqQlche9ByFWNkdNqfSgR/kkQtQ8DzEWt2w==
+"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.2":
+  version "2.1.8-no-fsevents.2"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.2.tgz#e324c0a247a5567192dd7180647709d7e2faf94b"
+  integrity sha512-Fb8WxUFOBQVl+CX4MWet5o7eCc6Pj04rXIwVKZ6h1NnqTo45eOQW6aWyhG25NIODvWFwTDMwBsYxrQ3imxpetg==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
     braces "^2.3.2"
-    glob-parent "^3.1.0"
+    glob-parent "^5.1.2"
     inherits "^2.0.3"
     is-binary-path "^1.0.0"
     is-glob "^4.0.0"
@@ -1346,36 +1325,137 @@
     readdirp "^2.2.1"
     upath "^1.1.1"
 
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
-    "@nodelib/fs.stat" "2.0.4"
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@peculiar/asn1-schema@^2.0.12", "@peculiar/asn1-schema@^2.0.26":
-  version "2.0.27"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.27.tgz#1ee3b2b869ff3200bcc8ec60e6c87bd5a6f03fe0"
-  integrity sha512-1tIx7iL3Ma3HtnNS93nB7nhyI0soUJypElj9owd4tpMrRDmeJ8eZubsdq1sb0KSaCs5RqZNoABCP6m5WtnlVhQ==
+"@octokit/auth-token@^2.4.4":
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz#568ccfb8cb46f36441fac094ce34f7a875b197f3"
+  integrity sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==
   dependencies:
-    "@types/asn1js" "^2.0.0"
-    asn1js "^2.0.26"
-    pvtsutils "^1.1.1"
-    tslib "^2.0.3"
+    "@octokit/types" "^6.0.3"
+
+"@octokit/core@^3.4.0", "@octokit/core@^3.5.1":
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
+  integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
+  dependencies:
+    "@octokit/auth-token" "^2.4.4"
+    "@octokit/graphql" "^4.5.8"
+    "@octokit/request" "^5.6.0"
+    "@octokit/request-error" "^2.0.5"
+    "@octokit/types" "^6.0.3"
+    before-after-hook "^2.2.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/endpoint@^6.0.1":
+  version "6.0.12"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
+  integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+    is-plain-object "^5.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/graphql@^4.5.8":
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3"
+  integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
+  dependencies:
+    "@octokit/request" "^5.6.0"
+    "@octokit/types" "^6.0.3"
+    universal-user-agent "^6.0.0"
+
+"@octokit/openapi-types@^10.2.2":
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-10.2.2.tgz#6c1c839d7d169feabaf1d2a69c79439c75d979cd"
+  integrity sha512-EVcXQ+ZrC04cg17AMg1ofocWMxHDn17cB66ZHgYc0eUwjFtxS0oBzkyw2VqIrHBwVgtfoYrq1WMQfQmMjUwthw==
+
+"@octokit/plugin-paginate-rest@^2.13.3", "@octokit/plugin-paginate-rest@^2.16.0":
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.3.tgz#6dbf74a12a53e04da6ca731d4c93f20c0b5c6fe9"
+  integrity sha512-kdc65UEsqze/9fCISq6BxLzeB9qf0vKvKojIfzgwf4tEF+Wy6c9dXnPFE6vgpoDFB1Z5Jek5WFVU6vL1w22+Iw==
+  dependencies:
+    "@octokit/types" "^6.28.1"
+
+"@octokit/plugin-request-log@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
+
+"@octokit/plugin-rest-endpoint-methods@^5.1.1", "@octokit/plugin-rest-endpoint-methods@^5.9.0":
+  version "5.10.4"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.10.4.tgz#97e85eb7375e30b9bf193894670f9da205e79408"
+  integrity sha512-Dh+EAMCYR9RUHwQChH94Skl0lM8Fh99auT8ggck/xTzjJrwVzvsd0YH68oRPqp/HxICzmUjLfaQ9sy1o1sfIiA==
+  dependencies:
+    "@octokit/types" "^6.28.1"
+    deprecation "^2.3.1"
+
+"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
+  integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+    deprecation "^2.0.0"
+    once "^1.4.0"
+
+"@octokit/request@^5.6.0":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.1.tgz#f97aff075c37ab1d427c49082fefeef0dba2d8ce"
+  integrity sha512-Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ==
+  dependencies:
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.1.0"
+    "@octokit/types" "^6.16.1"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
+    universal-user-agent "^6.0.0"
+
+"@octokit/rest@^18.6.7":
+  version "18.10.0"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.10.0.tgz#8a0add9611253e0e31d3ed5b4bc941a3795a7648"
+  integrity sha512-esHR5OKy38bccL/sajHqZudZCvmv4yjovMJzyXlphaUo7xykmtOdILGJ3aAm0mFHmMLmPFmDMJXf39cAjNJsrw==
+  dependencies:
+    "@octokit/core" "^3.5.1"
+    "@octokit/plugin-paginate-rest" "^2.16.0"
+    "@octokit/plugin-request-log" "^1.0.4"
+    "@octokit/plugin-rest-endpoint-methods" "^5.9.0"
+
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.28.1":
+  version "6.28.1"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.28.1.tgz#ab990d1fe952226055e81c7650480e6bacfb877c"
+  integrity sha512-XlxDoQLFO5JnFZgKVQTYTvXRsQFfr/GwDUU108NJ9R5yFPkA2qXhTJjYuul3vE4eLXP40FA2nysOu2zd6boE+w==
+  dependencies:
+    "@octokit/openapi-types" "^10.2.2"
+
+"@peculiar/asn1-schema@^2.0.32", "@peculiar/asn1-schema@^2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.38.tgz#98b6f12daad275ecd6774dfe31fb62f362900412"
+  integrity sha512-zZ64UpCTm9me15nuCpPgJghSdbEm8atcDQPCyK+bKXjZAQ1735NCZXCSCfbckbQ4MH36Rm9403n/qMq77LFDzQ==
+  dependencies:
+    "@types/asn1js" "^2.0.2"
+    asn1js "^2.1.1"
+    pvtsutils "^1.2.0"
+    tslib "^2.3.0"
 
 "@peculiar/json-schema@^1.1.12":
   version "1.1.12"
@@ -1385,20 +1465,83 @@
     tslib "^2.0.0"
 
 "@peculiar/webcrypto@^1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.1.4.tgz#cbbe2195e5e6f879780bdac9a66bcbaca75c483c"
-  integrity sha512-gEVxfbseFDV0Za3AmjTrRB+wigEMOejHDzoo571e8/YWD33Ejmk0XPF3+G+VaN8+5C5IWZx4CPvxQZ7mF2dvNA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.1.7.tgz#ff02008612e67ab7cc2a92fce04a7f0e2a04b71c"
+  integrity sha512-aCNLYdHZkvGH+T8/YBOY33jrVGVuLIa3bpizeHXqwN+P4ZtixhA+kxEEWM1amZwUY2nY/iuj+5jdZn/zB7EPPQ==
   dependencies:
-    "@peculiar/asn1-schema" "^2.0.26"
+    "@peculiar/asn1-schema" "^2.0.32"
     "@peculiar/json-schema" "^1.1.12"
-    pvtsutils "^1.1.1"
-    tslib "^2.0.3"
-    webcrypto-core "^1.1.8"
+    pvtsutils "^1.1.6"
+    tslib "^2.2.0"
+    webcrypto-core "^1.2.0"
+
+"@sentry/browser@^6.11.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.12.0.tgz#970cd68fa117a1e1336fdb373e3b1fa76cd63e2d"
+  integrity sha512-wsJi1NLOmfwtPNYxEC50dpDcVY7sdYckzwfqz1/zHrede1mtxpqSw+7iP4bHADOJXuF+ObYYTHND0v38GSXznQ==
+  dependencies:
+    "@sentry/core" "6.12.0"
+    "@sentry/types" "6.12.0"
+    "@sentry/utils" "6.12.0"
+    tslib "^1.9.3"
+
+"@sentry/core@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.12.0.tgz#bc7c5f0785b6a392d9ad47bd9b1fae3f5389996c"
+  integrity sha512-mU/zdjlzFHzdXDZCPZm8OeCw7c9xsbL49Mq0TrY0KJjLt4CJBkiq5SDTGfRsenBLgTedYhe5Z/J8Z+xVVq+MfQ==
+  dependencies:
+    "@sentry/hub" "6.12.0"
+    "@sentry/minimal" "6.12.0"
+    "@sentry/types" "6.12.0"
+    "@sentry/utils" "6.12.0"
+    tslib "^1.9.3"
+
+"@sentry/hub@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.12.0.tgz#29e323ab6a95e178fb14fffb684aa0e09707197f"
+  integrity sha512-yR/UQVU+ukr42bSYpeqvb989SowIXlKBanU0cqLFDmv5LPCnaQB8PGeXwJAwWhQgx44PARhmB82S6Xor8gYNxg==
+  dependencies:
+    "@sentry/types" "6.12.0"
+    "@sentry/utils" "6.12.0"
+    tslib "^1.9.3"
+
+"@sentry/minimal@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.12.0.tgz#cbe20e95056cedb9709d7d5b2119ef95206a9f8c"
+  integrity sha512-r3C54Q1KN+xIqUvcgX9DlcoWE7ezWvFk2pSu1Ojx9De81hVqR9u5T3sdSAP2Xma+um0zr6coOtDJG4WtYlOtsw==
+  dependencies:
+    "@sentry/hub" "6.12.0"
+    "@sentry/types" "6.12.0"
+    tslib "^1.9.3"
+
+"@sentry/tracing@^6.11.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.12.0.tgz#a05c8985ee7fed7310b029b147d8f9f14f2a2e67"
+  integrity sha512-u10QHNknPBzbWSUUNMkvuH53sQd5NaBo6YdNPj4p5b7sE7445Sh0PwBpRbY3ZiUUiwyxV59fx9UQ4yVnPGxZQA==
+  dependencies:
+    "@sentry/hub" "6.12.0"
+    "@sentry/minimal" "6.12.0"
+    "@sentry/types" "6.12.0"
+    "@sentry/utils" "6.12.0"
+    tslib "^1.9.3"
+
+"@sentry/types@6.12.0", "@sentry/types@^6.10.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.12.0.tgz#b7395688a79403c6df8d8bb8d81deb8222519853"
+  integrity sha512-urtgLzE4EDMAYQHYdkgC0Ei9QvLajodK1ntg71bGn0Pm84QUpaqpPDfHRU+i6jLeteyC7kWwa5O5W1m/jrjGXA==
+
+"@sentry/utils@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.12.0.tgz#3de261e8d11bdfdc7add64a3065d43517802e975"
+  integrity sha512-oRHQ7TH5TSsJqoP9Gqq25Jvn9LKexXfAh/OoKwjMhYCGKGhqpDNUIZVgl9DWsGw5A5N5xnQyLOxDfyRV5RshdA==
+  dependencies:
+    "@sentry/types" "6.12.0"
+    tslib "^1.9.3"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
-  integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -1410,9 +1553,9 @@
     "@sinonjs/commons" "^1.7.0"
 
 "@sinonjs/fake-timers@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.0.2.tgz#a53e71d4154ee704ea9b36a6d0b0780e246fadd1"
-  integrity sha512-dF84L5YC90gIOegPDCYymPIsDmwMWWSh7BwfDXQYePi8lVIEp7IZ1UVGkME8FjXOsDPxan12x4aaK+Lo6wVh9A==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
+  integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
@@ -1431,15 +1574,20 @@
     remark "^13.0.0"
     unist-util-find-all-after "^3.0.2"
 
-"@types/asn1js@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/asn1js/-/asn1js-2.0.0.tgz#10ca75692575744d0117098148a8dc84cbee6682"
-  integrity sha512-Jjzp5EqU0hNpADctc/UqhiFbY1y2MqIxBVa2S4dBlbnZHTLPMuggoL5q43X63LpsOIINRDirBjP56DUUKIUWIA==
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
+"@types/asn1js@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/asn1js/-/asn1js-2.0.2.tgz#bb1992291381b5f06e22a829f2ae009267cdf8c5"
+  integrity sha512-t4YHCgtD+ERvH0FyxvNlYwJ2ezhqw7t+Ygh4urQ7dJER8i185JPv6oIM3ey5YQmGN6Zp9EMbpohkjZi9t3UxwA==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.12"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
-  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
+  version "7.1.16"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+  integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1448,37 +1596,54 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
-  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
+  integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
-  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
-  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
   dependencies:
     "@babel/types" "^7.3.0"
 
 "@types/classnames@^2.2.11":
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf"
-  integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd"
+  integrity sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==
+  dependencies:
+    classnames "*"
+
+"@types/commonmark@^0.27.4":
+  version "0.27.5"
+  resolved "https://registry.yarnpkg.com/@types/commonmark/-/commonmark-0.27.5.tgz#008f2e8fb845c906146aa97510d66953d916aed2"
+  integrity sha512-vIqgmHyLsc8Or3EWLz6QkhI8/v61FNeH0yxRupA7VqSbA2eFMoHHJAhZSHudplAV89wqg1CKSmShE016ziRXuw==
 
 "@types/counterpart@^0.18.1":
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/@types/counterpart/-/counterpart-0.18.1.tgz#b1b784d9e54d9879f0a8cb12f2caedab65430fe8"
   integrity sha512-PRuFlBBkvdDOtxlIASzTmkEFar+S66Ek48NVVTWMUjtJAdn5vyMSN8y6IZIoIymGpR36q2nZbIYazBWyFxL+IQ==
 
+"@types/css-font-loading-module@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@types/css-font-loading-module/-/css-font-loading-module-0.0.6.tgz#1ac3417ed31eeb953134d29b56bca921644b87c0"
+  integrity sha512-MBvSMSxXFtIukyXRU3HhzL369rIWaqMVQD5kmDCYIFFD6Fe3lJ4c9UnLD02MLdTp7Z6ti7rO3SQtuDo7C80mmw==
+
+"@types/diff-match-patch@^1.0.32":
+  version "1.0.32"
+  resolved "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz#d9c3b8c914aa8229485351db4865328337a3d09f"
+  integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A==
+
 "@types/events@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -1489,21 +1654,34 @@
   resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
   integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
 
+"@types/file-saver@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.3.tgz#b734c4f5a04d20615eaed3dc106e2ab321082009"
+  integrity sha512-MBIou8pd/41jkff7s97B47bc9+p0BszqqDJsO51yDm49uUxeKzrfuNl5fSLC6BpLEWKA8zlwyqALVmXrFwoBHQ==
+
 "@types/flux@^3.1.9":
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.9.tgz#ddfc9641ee2e2e6cb6cd730c6a48ef82e2076711"
-  integrity sha512-bSbDf4tTuN9wn3LTGPnH9wnSSLtR5rV7UPWFpM00NJ1pSTBwCzeZG07XsZ9lBkxwngrqjDtM97PLt5IuIdCQUA==
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.10.tgz#7c6306e86ecb434d00f38cb82f092640c7bd4098"
+  integrity sha512-ozohyJ77OJl8ND9x15wMvj5KvykCrBF7RA94YeDzritv1rKpl4E02ur4/k5ArLr4tSztPWN6gJ8VSGNBgW0gbw==
   dependencies:
     "@types/fbemitter" "*"
     "@types/react" "*"
 
 "@types/graceful-fs@^4.1.2":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753"
-  integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
   dependencies:
     "@types/node" "*"
 
+"@types/hoist-non-react-statics@^3.3.0":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
+  dependencies:
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -1525,73 +1703,73 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
-  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@^26.0.20":
-  version "26.0.20"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
-  integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
+  version "26.0.24"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a"
+  integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
-"@types/json-schema@^7.0.3":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
+  integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
 
 "@types/linkifyjs@^2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@types/linkifyjs/-/linkifyjs-2.1.3.tgz#80195c3c88c5e75d9f660e3046ce4a42be2c2fa4"
-  integrity sha512-V3Xt9wgaOvDPXcpOy3dC8qXCxy3cs0Lr/Hqgd9Bi6m3sf/vpbpTtfmVR0LJklrqYEjaAmc7e3Xh/INT2rCAKjQ==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@types/linkifyjs/-/linkifyjs-2.1.4.tgz#6b14e35d8d211f2666f602dcabcdc6859617516f"
+  integrity sha512-UuF0hyWNnLTT4xNJdrQx6OWYMNlPRBtt3fKCaROIx48boQyXkQ4YDDwTEQNi9mlsRX0Hpc6AnFKkDZ6IXkxD4g==
   dependencies:
     "@types/react" "*"
 
 "@types/lodash@^4.14.168":
-  version "4.14.168"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
-  integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
+  version "4.14.172"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
+  integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
 
 "@types/mdast@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
-  integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
   dependencies:
     "@types/unist" "*"
 
 "@types/minimist@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
-  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/modernizr@^3.5.3":
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/@types/modernizr/-/modernizr-3.5.3.tgz#8ef99e6252191c1d88647809109dc29884ba6d7a"
   integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
 
-"@types/node@*", "@types/node@^14.14.22":
-  version "14.14.22"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
-  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
+"@types/node@*":
+  version "16.9.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
+  integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
+
+"@types/node@^14.14.22":
+  version "14.17.16"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.16.tgz#2b9252bd4fdf0393696190cd9550901dd967c777"
+  integrity sha512-WiFf2izl01P1CpeY8WqFAeKWwByMueBEkND38EcN8N68qb0aDG3oIS1P5MhAX5kUdr469qRyqsY/MjanLjsFbQ==
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/pako@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-1.0.1.tgz#33b237f3c9aff44d0f82fe63acffa4a365ef4a61"
-  integrity sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-1.0.2.tgz#17c9b136877f33d9ecc8e73cd26944f1f6dd39a1"
+  integrity sha512-8UJl2MjkqqS6ncpLZqRZ5LmGiFBkbYxocD4e4jmBqGvfRG1RS23gKsBQbdtV9O9GvRyjFTiRHRByjSlKCLlmZw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1599,160 +1777,211 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/parse5@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.0.tgz#38590dc2c3cf5717154064e3ee9b6947ee21b299"
-  integrity sha512-oPwPSj4a1wu9rsXTEGIJz91ISU725t0BmSnUhb57sI+M8XEmvUop84lzuiYdq0Y5M6xLY8DBPg0C2xEQKLyvBA==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.1.tgz#f8ae4fbcd2b9ba4ff934698e28778961f9cb22ca"
+  integrity sha512-ARATsLdrGPUnaBvxLhUlnltcMgn7pQG312S8ccdYlnyijabrX9RN/KN/iGj9Am96CoW8e/K9628BA7Bv4XHdrA==
 
 "@types/prettier@^2.0.0":
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03"
-  integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3"
+  integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==
 
 "@types/prop-types@*":
-  version "15.7.3"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
-  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+  version "15.7.4"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
+  integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
 "@types/qrcode@^1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.5.tgz#9c97cc2875f03e2b16a0d89856fc48414e380c38"
-  integrity sha512-92QMnMb9m0ErBU20za5Eqtf4lzUcSkk5w/Cz30q5qod0lWHm2loztmFs2EnCY06yT51GY1+m/oFq2D8qVK2Bjg==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.4.1.tgz#0689f400c3a95d2db040c99c99834faa09ee9dc1"
+  integrity sha512-vxMyr7JM7tYPxu8vUE83NiosWX5DZieCyYeJRoOIg0pAkyofCBzknJ2ycUZkPGDFis2RS8GN/BeJLnRnAPxeCA==
   dependencies:
     "@types/node" "*"
 
-"@types/react-dom@^16.9.10":
-  version "16.9.10"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.10.tgz#4485b0bec3d41f856181b717f45fd7831101156f"
-  integrity sha512-ItatOrnXDMAYpv6G8UCk2VhbYVTjZT9aorLtA/OzDN9XJ2GKcfam68jutoAcILdRjsRUO8qb7AmyObF77Q8QFw==
-  dependencies:
-    "@types/react" "^16"
-
-"@types/react-transition-group@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
-  integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==
+"@types/react-beautiful-dnd@^13.0.0":
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.2.tgz#510405abb09f493afdfd898bf83995dc6385c130"
+  integrity sha512-+OvPkB8CdE/bGdXKyIhc/Lm2U7UAYCCJgsqmopFmh9gbAudmslkI8eOrPDjg4JhwSE6wytz4a3/wRjKtovHVJg==
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16", "@types/react@^16.14", "@types/react@^16.9":
-  version "16.14.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c"
-  integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ==
+"@types/react-dom@17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
+  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-redux@^7.1.16":
+  version "7.1.18"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04"
+  integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ==
+  dependencies:
+    "@types/hoist-non-react-statics" "^3.3.0"
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+    redux "^4.0.0"
+
+"@types/react-transition-group@^4.4.0":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.2.tgz#38890fd9db68bf1f2252b99a942998dc7877c5b3"
+  integrity sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@17.0.14":
+  version "17.0.14"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f"
+  integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==
   dependencies:
     "@types/prop-types" "*"
+    "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/retry@^0.12.0":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
+  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+
 "@types/sanitize-html@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.3.1.tgz#094d696b83b7394b016e96342bbffa6a028795ce"
-  integrity sha512-+UT/XRluJuCunRftwO6OzG6WOBgJ+J3sROIoSJWX+7PB2FtTJTEJLrHCcNwzCQc0r60bej3WAbaigK+VZtZCGw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.3.2.tgz#ed234985fd8a07af8dd7ced488021f44ccfa2e91"
+  integrity sha512-DnmoXsiqG2/RoSf6/lD3Hrs+TCM8ILtzNuuSjmOtRaP/ud9Sy3M3ctwD+SB50EIDs5GzVFF1dJk2Fq/ID/PNCQ==
   dependencies:
     htmlparser2 "^6.0.0"
 
+"@types/scheduler@*":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
+  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
-  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
-  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
+  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
 
 "@types/yargs-parser@*":
-  version "20.2.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
-  integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
+  version "20.2.1"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
+  integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
 
 "@types/yargs@^15.0.0":
-  version "15.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
-  integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
+  version "15.0.14"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
+  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@types/zxcvbn@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609"
-  integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/@types/zxcvbn/-/zxcvbn-4.4.1.tgz#46e42cbdcee681b22181478feaf4af2bc4c1abd2"
+  integrity sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==
 
-"@typescript-eslint/eslint-plugin@^4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz#92db8e7c357ed7d69632d6843ca70b71be3a721d"
-  integrity sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww==
+"@typescript-eslint/eslint-plugin@^4.17.0":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz#e938603a136f01dcabeece069da5fb2e331d4498"
+  integrity sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.14.0"
-    "@typescript-eslint/scope-manager" "4.14.0"
-    debug "^4.1.1"
+    "@typescript-eslint/experimental-utils" "4.31.1"
+    "@typescript-eslint/scope-manager" "4.31.1"
+    debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
-    lodash "^4.17.15"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    regexpp "^3.1.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz#5aa7b006736634f588a69ee343ca959cd09988df"
-  integrity sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ==
+"@typescript-eslint/experimental-utils@4.31.1":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz#0c900f832f270b88e13e51753647b02d08371ce5"
+  integrity sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==
   dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.14.0"
-    "@typescript-eslint/types" "4.14.0"
-    "@typescript-eslint/typescript-estree" "4.14.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+    "@types/json-schema" "^7.0.7"
+    "@typescript-eslint/scope-manager" "4.31.1"
+    "@typescript-eslint/types" "4.31.1"
+    "@typescript-eslint/typescript-estree" "4.31.1"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.14.0.tgz#62d4cd2079d5c06683e9bfb200c758f292c4dee7"
-  integrity sha512-sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg==
+"@typescript-eslint/parser@^4.17.0":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.1.tgz#8f9a2672033e6f6d33b1c0260eebdc0ddf539064"
+  integrity sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.14.0"
-    "@typescript-eslint/types" "4.14.0"
-    "@typescript-eslint/typescript-estree" "4.14.0"
-    debug "^4.1.1"
+    "@typescript-eslint/scope-manager" "4.31.1"
+    "@typescript-eslint/types" "4.31.1"
+    "@typescript-eslint/typescript-estree" "4.31.1"
+    debug "^4.3.1"
 
-"@typescript-eslint/scope-manager@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz#55a4743095d684e1f7b7180c4bac2a0a3727f517"
-  integrity sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q==
+"@typescript-eslint/scope-manager@4.31.1":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz#0c21e8501f608d6a25c842fcf59541ef4f1ab561"
+  integrity sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==
   dependencies:
-    "@typescript-eslint/types" "4.14.0"
-    "@typescript-eslint/visitor-keys" "4.14.0"
+    "@typescript-eslint/types" "4.31.1"
+    "@typescript-eslint/visitor-keys" "4.31.1"
 
-"@typescript-eslint/types@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.14.0.tgz#d8a8202d9b58831d6fd9cee2ba12f8a5a5dd44b6"
-  integrity sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A==
+"@typescript-eslint/types@4.31.1":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.1.tgz#5f255b695627a13401d2fdba5f7138bc79450d66"
+  integrity sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==
 
-"@typescript-eslint/typescript-estree@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz#4bcd67486e9acafc3d0c982b23a9ab8ac8911ed7"
-  integrity sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag==
+"@typescript-eslint/typescript-estree@4.31.1":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz#4a04d5232cf1031232b7124a9c0310b577a62d17"
+  integrity sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==
   dependencies:
-    "@typescript-eslint/types" "4.14.0"
-    "@typescript-eslint/visitor-keys" "4.14.0"
-    debug "^4.1.1"
-    globby "^11.0.1"
+    "@typescript-eslint/types" "4.31.1"
+    "@typescript-eslint/visitor-keys" "4.31.1"
+    debug "^4.3.1"
+    globby "^11.0.3"
     is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz#b1090d9d2955b044b2ea2904a22496849acbdf54"
-  integrity sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA==
+"@typescript-eslint/visitor-keys@4.31.1":
+  version "4.31.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz#f2e7a14c7f20c4ae07d7fc3c5878c4441a1da9cc"
+  integrity sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==
   dependencies:
-    "@typescript-eslint/types" "4.14.0"
+    "@typescript-eslint/types" "4.31.1"
     eslint-visitor-keys "^2.0.0"
 
-abab@^2.0.3:
+"@wojtekmaj/enzyme-adapter-react-17@^0.6.1":
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.3.tgz#bf7cd6007d99996bd7d98c843644b213a3ecc74e"
+  integrity sha512-Kp1ZJxtHkKEnUksaWrcMABNTOgL4wOt8VI6k2xOek2aH9PtZcWRXJNUEgnKrdJrqg5UqIjRslbVF9uUqwQJtFg==
+  dependencies:
+    "@wojtekmaj/enzyme-adapter-utils" "^0.1.1"
+    enzyme-shallow-equal "^1.0.0"
+    has "^1.0.0"
+    object.assign "^4.1.0"
+    object.values "^1.1.0"
+    prop-types "^15.7.0"
+    react-is "^17.0.2"
+    react-test-renderer "^17.0.0"
+
+"@wojtekmaj/enzyme-adapter-utils@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.1.tgz#17773cf264570fbcfc0d33bb74e4002c17f2f1ec"
+  integrity sha512-bNPWtN/d8huKOkC6j1E3EkSamnRrHHT7YuR6f9JppAQqtoAm3v4/vERe4J14jQKmHLCyEBHXrlgb7H6l817hVg==
+  dependencies:
+    function.prototype.name "^1.1.0"
+    has "^1.0.0"
+    object.assign "^4.1.0"
+    object.fromentries "^2.0.0"
+    prop-types "^15.7.0"
+
+abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
   integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
@@ -1765,10 +1994,10 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+acorn-jsx@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^7.1.1:
   version "7.2.0"
@@ -1780,22 +2009,24 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-airbnb-prop-types@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2"
-  integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==
-  dependencies:
-    array.prototype.find "^2.1.1"
-    function.prototype.name "^1.1.2"
-    is-regex "^1.1.0"
-    object-is "^1.1.2"
-    object.assign "^4.1.0"
-    object.entries "^1.1.2"
-    prop-types "^15.7.2"
-    prop-types-exact "^1.2.0"
-    react-is "^16.13.1"
+acorn@^8.2.4:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+  integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1805,16 +2036,30 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
-  integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
+ajv@^8.0.1:
+  version "8.6.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+allchange@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.3.tgz#f8814ddfbcfe39a01bf4570778ee7e6d9ff0ebb3"
+  integrity sha512-UZkfz5SkNEMFQFLr8vZcXHaph2EbJxmkVNF5Nt6D9RIa5pmAar7oAMfNdda714jg7IQijvaFty5PYazXLgd5WA==
+  dependencies:
+    "@actions/core" "^1.4.0"
+    "@actions/github" "^5.0.0"
+    "@octokit/rest" "^18.6.7"
+    cli-color "^2.0.0"
+    js-yaml "^4.1.0"
+    loglevel "^1.7.1"
+    semver "^7.3.5"
+    yargs "^17.0.1"
+
 another-json@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
@@ -1826,11 +2071,16 @@ ansi-colors@^4.1.1:
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    type-fest "^0.11.0"
+    type-fest "^0.21.3"
+
+ansi-regex@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^4.1.0:
   version "4.1.0"
@@ -1838,9 +2088,9 @@ ansi-regex@^4.1.0:
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -1864,10 +2114,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+anymatch@^3.0.3, anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -1879,6 +2129,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -1894,20 +2149,15 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
-  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
-
-array-includes@^3.1.1, array-includes@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
-  integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
+array-includes@^3.1.2, array-includes@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
+  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    get-intrinsic "^1.0.1"
+    es-abstract "^1.18.0-next.2"
+    get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
 array-union@^2.1.0:
@@ -1920,13 +2170,16 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.find@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c"
-  integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==
+array.prototype.filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz#24d63e38983cdc6bf023a3c574b2f2a3f384c301"
+  integrity sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.4"
+    es-abstract "^1.18.0"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.5"
 
 array.prototype.flat@^1.2.3:
   version "1.2.4"
@@ -1937,7 +2190,7 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
-array.prototype.flatmap@^1.2.3:
+array.prototype.flatmap@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
   integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==
@@ -1964,10 +2217,10 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
-asn1js@^2.0.26:
-  version "2.0.26"
-  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.0.26.tgz#0a6d435000f556a96c6012969d9704d981b71251"
-  integrity sha512-yG89F0j9B4B0MKIcFyWWxnpZPLaNTjCj4tkE3fjbAoo0qmpGw0PYYqSbX/4ebnd9Icn8ZgK4K1fvDyEtW1JYtQ==
+asn1js@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.1.1.tgz#bb3896191ebb5fb1caeda73436a6c6e20a2eedff"
+  integrity sha512-t9u0dU0rJN4ML+uxgN6VM2Z4H5jWIYm0w8LsZLzMJaQsgL3IJNbxHgmbWDvJAwspyHpDFuzUaUFh4c05UB4+6g==
   dependencies:
     pvutils latest
 
@@ -1981,11 +2234,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -2019,6 +2267,11 @@ autoprefixer@^9.8.6:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 await-lock@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.1.0.tgz#bc78c51d229a34d5d90965a1c94770e772c6145e"
@@ -2034,18 +2287,6 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-babel-eslint@^10.0.1, babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
 babel-jest@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
@@ -2088,6 +2329,30 @@ babel-plugin-jest-hoist@^26.6.2:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
+babel-plugin-polyfill-corejs2@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9"
+  integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.14.0"
+
+babel-plugin-polyfill-regenerator@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
@@ -2114,23 +2379,20 @@ babel-preset-jest@^26.6.2:
     babel-plugin-jest-hoist "^26.6.2"
     babel-preset-current-node-syntax "^1.0.0"
 
-babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 bail@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
   integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+balanced-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
 
 base-x@^3.0.2:
   version "3.0.8"
@@ -2164,6 +2426,16 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+before-after-hook@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
+  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -2179,10 +2451,10 @@ bluebird@^3.5.0:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-blueimp-canvas-to-blob@^3.28.0:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.28.0.tgz#c8ab4dc6bb08774a7f273798cdf94b0776adf6c8"
-  integrity sha512-5q+YHzgGsuHQ01iouGgJaPJXod2AzTxJXmVv90PpGrRxU7G7IqgPqWXz+PBmt3520jKKi6irWbNV87DicEa7wg==
+blurhash@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.4.tgz#a7010ceb3019cd2c9809b17c910ebf6175d29244"
+  integrity sha512-MXIPz6zwYUKayju+Uidf83KhH0vodZfeRl6Ich8Gu+KGl0JgKiFq9LsfqV7cVU5fKD/AotmduZqvOfrGKOfTaA==
 
 boolbase@^1.0.0:
   version "1.0.0"
@@ -2235,16 +2507,16 @@ browser-request@^0.3.3:
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
 
-browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1:
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766"
-  integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==
+browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.0:
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c"
+  integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==
   dependencies:
-    caniuse-lite "^1.0.30001173"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.634"
+    caniuse-lite "^1.0.30001254"
+    colorette "^1.3.0"
+    electron-to-chromium "^1.3.830"
     escalade "^3.1.1"
-    node-releases "^1.1.69"
+    node-releases "^1.1.75"
 
 bs58@^4.0.1:
   version "4.0.1"
@@ -2279,9 +2551,9 @@ buffer-fill@^1.0.0:
   integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0, buffer-from@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer@^5.4.3:
   version "5.7.1"
@@ -2338,10 +2610,10 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173:
-  version "1.0.30001178"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc"
-  integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ==
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001254:
+  version "1.0.30001257"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz#150aaf649a48bee531104cfeda57f92ce587f6e5"
+  integrity sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2355,7 +2627,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2372,10 +2644,10 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -2400,29 +2672,24 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-cheerio-select@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz#3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"
-  integrity sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew==
+cheerio-select@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823"
+  integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==
   dependencies:
-    css-select "^4.1.2"
-    css-what "^5.0.0"
+    css-select "^4.1.3"
+    css-what "^5.0.1"
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
-    domutils "^2.6.0"
+    domutils "^2.7.0"
 
 cheerio@^1.0.0-rc.3, cheerio@^1.0.0-rc.9:
-  version "1.0.0-rc.9"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz#a3ae6b7ce7af80675302ff836f628e7cb786a67f"
-  integrity sha512-QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng==
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
+  integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
   dependencies:
-    cheerio-select "^1.4.0"
-    dom-serializer "^1.3.1"
+    cheerio-select "^1.5.0"
+    dom-serializer "^1.3.2"
     domhandler "^4.2.0"
     htmlparser2 "^6.1.0"
     parse5 "^6.0.1"
@@ -2430,19 +2697,19 @@ cheerio@^1.0.0-rc.3, cheerio@^1.0.0-rc.9:
     tslib "^2.2.0"
 
 chokidar@^3.4.0, chokidar@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
-    anymatch "~3.1.1"
+    anymatch "~3.1.2"
     braces "~3.0.2"
-    glob-parent "~5.1.0"
+    glob-parent "~5.1.2"
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.5.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    fsevents "~2.3.1"
+    fsevents "~2.3.2"
 
 ci-info@^2.0.0:
   version "2.0.0"
@@ -2464,22 +2731,22 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
+classnames@*, classnames@^2.2.6:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
+  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+cli-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.0.tgz#11ecfb58a79278cf6035a60c54e338f9d837897c"
+  integrity sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==
   dependencies:
-    restore-cursor "^3.1.0"
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+    ansi-regex "^2.1.1"
+    d "^1.0.1"
+    es5-ext "^0.10.51"
+    es6-iterator "^2.0.3"
+    memoizee "^0.4.14"
+    timers-ext "^0.1.7"
 
 cliui@^5.0.0:
   version "5.0.0"
@@ -2499,6 +2766,24 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
 clone-regexp@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
@@ -2548,12 +2833,12 @@ color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -2610,20 +2895,15 @@ concurrently@^5.3.0:
     tree-kill "^1.2.2"
     yargs "^13.3.0"
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
-
 content-type@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   dependencies:
     safe-buffer "~5.1.1"
 
@@ -2632,12 +2912,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.8.0:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f"
-  integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==
+core-js-compat@^3.14.0, core-js-compat@^3.16.0:
+  version "3.17.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.3.tgz#b39c8e4dec71ecdc735c653ce5233466e561324e"
+  integrity sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==
   dependencies:
-    browserslist "^4.16.1"
+    browserslist "^4.17.0"
     semver "7.0.0"
 
 core-js@^1.0.0:
@@ -2645,20 +2925,20 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
 cosmiconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
-  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -2683,13 +2963,13 @@ crc-32@^0.3.0:
   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==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
+  integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
   dependencies:
     node-fetch "2.6.1"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2709,10 +2989,17 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-select@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz#8b52b6714ed3a80d8221ec971c543f3b12653286"
-  integrity sha512-nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw==
+css-box-model@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
+  integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
+  dependencies:
+    tiny-invariant "^1.0.6"
+
+css-select@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
   dependencies:
     boolbase "^1.0.0"
     css-what "^5.0.0"
@@ -2720,10 +3007,10 @@ css-select@^4.1.2:
     domutils "^2.6.0"
     nth-check "^2.0.0"
 
-css-what@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.0.tgz#f0bf4f8bac07582722346ab243f6a35b512cfc47"
-  integrity sha512-qxyKHQvgKwzwDWC/rGbT821eJalfupxYW2qbSJSAtdSTimsr/MlaGONoNLllaUPZWf8QnbcKM/kPVYUQuEKAFA==
+css-what@^5.0.0, css-what@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
+  integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -2745,7 +3032,7 @@ cssom@~0.3.6:
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssstyle@^2.2.0:
+cssstyle@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
@@ -2753,9 +3040,17 @@ cssstyle@^2.2.0:
     cssom "~0.3.6"
 
 csstype@^3.0.2:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
-  integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
+  integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==
+
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -2774,29 +3069,29 @@ data-urls@^2.0.0:
     whatwg-url "^8.0.0"
 
 date-fns@^2.0.1:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
-  integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
+  integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
 
 date-names@^0.1.11:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
   integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
 
-debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
+debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -2810,10 +3105,10 @@ decamelize@^1.1.0, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+decimal.js@^10.2.1:
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
+  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -2821,9 +3116,9 @@ decode-uri-component@^0.2.0:
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^4.2.2:
   version "4.2.2"
@@ -2864,15 +3159,20 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+deprecation@^2.0.0, deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
 detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-detect-node-es@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.0.0.tgz#c0318b9e539a5256ca780dd9575c9345af05b8ed"
-  integrity sha512-S4AHriUkTX9FoFvL4G8hXDcx6t3gp2HpfCza3Q0v6S78gul2hKWifLQbeW+ZF89+hSm2ZIc/uF3J97ZgytgTRg==
+detect-node-es@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
+  integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
 
 diff-dom@^4.2.2:
   version "4.2.2"
@@ -2890,9 +3190,9 @@ diff-sequences@^26.6.2:
   integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 dijkstrajs@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
-  integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257"
+  integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -2906,14 +3206,6 @@ discontinuous-range@1.0.0:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -2944,13 +3236,13 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
-dom-serializer@^1.0.1, dom-serializer@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be"
-  integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q==
+dom-serializer@^1.0.1, dom-serializer@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^4.0.0"
+    domhandler "^4.2.0"
     entities "^2.0.0"
 
 domelementtype@1, domelementtype@^1.3.1:
@@ -2978,9 +3270,9 @@ domhandler@^2.3.0:
     domelementtype "1"
 
 domhandler@^4.0.0, domhandler@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
-  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+  integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
   dependencies:
     domelementtype "^2.2.0"
 
@@ -2992,10 +3284,10 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.4.4, domutils@^2.5.2, domutils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
-  integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==
+domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.2.0"
@@ -3009,10 +3301,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.634:
-  version "1.3.642"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz#8b884f50296c2ae2a9997f024d0e3e57facc2b94"
-  integrity sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==
+electron-to-chromium@^1.3.830:
+  version "1.3.839"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.839.tgz#27a5b21468e9fefb0e328a029403617f20acec9c"
+  integrity sha512-0O7uPs9LJNjQ/U5mW78qW8gXv9H6Ba3DHZ5/yt8aBsvomOWDkV3MddT7enUYvLQEUVOURjWmgJJWVZ3K98tIwQ==
 
 emittery@^0.7.1:
   version "0.7.2"
@@ -3029,15 +3321,20 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.1.1.tgz#0a0d63dd07ce1376b3d27642f28cafa46f651de6"
-  integrity sha512-za/ma5SfogHjwUmGFnDbTvSfm8GGFvFaPS27GPti16YZSp5EPgz+UDsZCATXvJGit+oRNBbG/FtybXHKi2UQgQ==
+emojibase-data@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-6.2.0.tgz#db6c75c36905284fa623f4aa5f468d2be6ed364a"
+  integrity sha512-SWKaXD2QeQs06IE7qfJftsI5924Dqzp+V9xaa5RzZIEWhmlrG6Jt2iKwfgOPHu+5S8MEtOI7GdpKsXj46chXOw==
 
-emojibase-regex@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.1.1.tgz#6e781aca520281600fe7a177f1582c33cf1fc545"
-  integrity sha512-KSigB1zQkNKFygLZ5bAfHs87LJa1ni8QTQtq8lc53Y74NF3Dk2r7kfa8MpooTO8JBb5Xz660X4tSjDB+I+7elA==
+emojibase-regex@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-5.1.3.tgz#f0ef621ed6ec624becd2326f999fd4ea01b94554"
+  integrity sha512-gT8T9LxLA8VJdI+8KQtyykB9qKzd7WuUL3M2yw6y9tplFeufOUANg3UKVaKUvkMcRNvZsSElWhxcJrx8WPE12g==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
 encoding@^0.1.11:
   version "0.1.13"
@@ -3066,44 +3363,16 @@ entities@^1.1.1:
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 entities@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 entities@~2.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
-enzyme-adapter-react-16@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz#fd677a658d62661ac5afd7f7f541f141f8085901"
-  integrity sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==
-  dependencies:
-    enzyme-adapter-utils "^1.14.0"
-    enzyme-shallow-equal "^1.0.4"
-    has "^1.0.3"
-    object.assign "^4.1.2"
-    object.values "^1.1.2"
-    prop-types "^15.7.2"
-    react-is "^16.13.1"
-    react-test-renderer "^16.0.0-0"
-    semver "^5.7.0"
-
-enzyme-adapter-utils@^1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0"
-  integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==
-  dependencies:
-    airbnb-prop-types "^2.16.0"
-    function.prototype.name "^1.1.3"
-    has "^1.0.3"
-    object.assign "^4.1.2"
-    object.fromentries "^2.0.3"
-    prop-types "^15.7.2"
-    semver "^5.7.1"
-
-enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4:
+enzyme-shallow-equal@^1.0.0, enzyme-shallow-equal@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e"
   integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==
@@ -3139,61 +3408,53 @@ enzyme@^3.11.0:
     rst-selector-parser "^2.2.3"
     string.prototype.trim "^1.2.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.4:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
-  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2"
-  integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==
+es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5, es-abstract@^1.18.6:
+  version "1.18.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
+  integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
     is-negative-zero "^2.0.1"
-    is-regex "^1.1.1"
-    object-inspect "^1.9.0"
+    is-regex "^1.1.4"
+    is-string "^1.0.7"
+    object-inspect "^1.11.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.3"
-    string.prototype.trimstart "^1.0.3"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
 
-es-get-iterator@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9"
-  integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-get-iterator@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
+  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.1"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.0"
     has-symbols "^1.0.1"
-    is-arguments "^1.0.4"
-    is-map "^2.0.1"
-    is-set "^2.0.1"
+    is-arguments "^1.1.0"
+    is-map "^2.0.2"
+    is-set "^2.0.2"
     is-string "^1.0.5"
     isarray "^2.0.5"
 
@@ -3206,6 +3467,42 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.51, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.53"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.3"
+    next-tick "~1.0.0"
+
+es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
+es6-weak-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.46"
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.1"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -3231,165 +3528,57 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.14.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
     esprima "^4.0.1"
-    estraverse "^4.2.0"
+    estraverse "^5.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-esnext@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz#8695b858fcf40d28c1aedca181f700528c7b60c6"
-  integrity sha512-GhfVEXdqYKEIIj7j+Fw2SQdL9qyZMekgXfq6PyXM66cQw0B435ddjz3P3kxOBVihMRJ0xGYjosaveQz5Y6z0uA==
-  dependencies:
-    babel-eslint "^10.0.1"
-    eslint "^6.8.0"
-    eslint-plugin-babel "^5.2.1"
-    eslint-plugin-import "^2.14.0"
-
 eslint-config-google@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
 
-eslint-config-matrix-org@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.2.0.tgz#27571c7c3a9ab6cc1e9d0f3d53a3739d1b004a7f"
-  integrity sha512-Hwgm1Qk0atjWgj5SWxpFPvxy6k6bDlPb9Pqjvb1i59nx8Zm6jDPy1C5vKQpkFpc0ntr+gJHa+ejYhuhaofu6Mw==
-  dependencies:
-    "@typescript-eslint/eslint-plugin" "^4.14.0"
-    "@typescript-eslint/parser" "^4.14.0"
-    babel-eslint "^10.1.0"
-    eslint-config-google "^0.14.0"
-    eslint-config-recommended "^4.1.0"
-    eslint-plugin-babel "^5.3.1"
-    typescript "^4.1.3"
-
-eslint-config-node@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz#fc1f13946d83766d6b83b0e67699e2071a56f417"
-  integrity sha512-Wz17xV5O2WFG8fGdMYEBdbiL6TL7YNJSJvSX9V4sXQownewfYmoqlly7wxqLkOUv/57pq6LnnotMiQQrrPjCqQ==
-  dependencies:
-    eslint "^6.8.0"
-    eslint-config-esnext "^4.1.0"
-
-eslint-config-react-native@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz#63e9401c7fac146804785f609e7df8f15b3e04eb"
-  integrity sha512-kNND+cs+ztawH7wgajf/K6FfNshjlDsFDAkkFZF9HAXDgH1w1sNMIfTfwzufg0hOcSK7rbiL4qbG/gg/oR507Q==
-  dependencies:
-    eslint "^6.8.0"
-    eslint-config-esnext "^4.1.0"
-    eslint-plugin-react "^7.19.0"
-    eslint-plugin-react-native "^3.8.1"
-
-eslint-config-recommended@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz#1adff90e0716d439be471d192977f233de171a46"
-  integrity sha512-2evA0SX1VqtyFiExmBI2WAO4XQCKlr7wmNELE8rcT5PyZY2ixsY881ofVZWKuI/dywpgLiES1gR/XUQcnVLRzQ==
-  dependencies:
-    eslint "^6.8.0"
-    eslint-config-esnext "^4.1.0"
-    eslint-config-node "^4.1.0"
-    eslint-config-react-native "^4.1.0"
-
-eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
-  dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
-
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
-  dependencies:
-    debug "^2.6.9"
-    pkg-dir "^2.0.0"
-
-eslint-plugin-babel@^5.2.1, eslint-plugin-babel@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560"
-  integrity sha512-VsQEr6NH3dj664+EyxJwO4FCYm/00JhYb3Sk3ft8o+fpKuIfQ9TaW6uVUfvwMXHcf/lsnRIoyFPsLMyiWCSL/g==
-  dependencies:
-    eslint-rule-composer "^0.3.0"
-
-eslint-plugin-flowtype@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.2.0.tgz#a4bef5dc18f9b2bdb41569a4ab05d73805a3d261"
-  integrity sha512-z7ULdTxuhlRJcEe1MVljePXricuPOrsWfScRXFhNzVD5dmTHWjIF57AxD0e7AbEoLSbjSsaA5S+hCg43WvpXJQ==
-  dependencies:
-    lodash "^4.17.15"
-    string-natural-compare "^3.0.1"
-
-eslint-plugin-import@^2.14.0:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
-  dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+"eslint-plugin-matrix-org@github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945":
+  version "0.3.5"
+  resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945"
 
 eslint-plugin-react-hooks@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
   integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
 
-eslint-plugin-react-native-globals@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
-  integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
-
-eslint-plugin-react-native@^3.8.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.10.0.tgz#240f7e6979a908af3dfd9ba9652434c33f4d64cd"
-  integrity sha512-4f5+hHYYq5wFhB5eptkPEAR7FfvqbS7AzScUOANfAMZtYw5qgnCxRq45bpfBaQF+iyPMim5Q8pubcpvLv75NAg==
+eslint-plugin-react@^7.22.0:
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz#9286b7cd9bf917d40309760f403e53016eda8331"
+  integrity sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==
   dependencies:
-    "@babel/traverse" "^7.7.4"
-    eslint-plugin-react-native-globals "^0.1.1"
-
-eslint-plugin-react@^7.19.0, eslint-plugin-react@^7.22.0:
-  version "7.22.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269"
-  integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA==
-  dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flatmap "^1.2.3"
+    array-includes "^3.1.3"
+    array.prototype.flatmap "^1.2.4"
     doctrine "^2.1.0"
+    estraverse "^5.2.0"
     has "^1.0.3"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
-    object.entries "^1.1.2"
-    object.fromentries "^2.0.2"
-    object.values "^1.1.1"
+    minimatch "^3.0.4"
+    object.entries "^1.1.4"
+    object.fromentries "^2.0.4"
+    object.values "^1.1.4"
     prop-types "^15.7.2"
-    resolve "^1.18.1"
-    string.prototype.matchall "^4.0.2"
+    resolve "^2.0.0-next.3"
+    string.prototype.matchall "^4.0.5"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3397,29 +3586,29 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
 eslint@7.18.0:
   version "7.18.0"
@@ -3464,58 +3653,6 @@ eslint@7.18.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-eslint@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.3"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
-
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
@@ -3530,10 +3667,10 @@ esprima@^4.0.0, esprima@^4.0.1:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1, esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+esquery@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"
 
@@ -3544,7 +3681,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3559,10 +3696,18 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
 events@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 except@^0.1.3:
   version "0.1.3"
@@ -3572,9 +3717,9 @@ except@^0.1.3:
     indexof "0.0.1"
 
 exec-sh@^0.3.2:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
-  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -3654,6 +3799,13 @@ expect@^26.6.2:
     jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
+ext@^1.1.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+  integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
+  dependencies:
+    type "^2.5.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3674,15 +3826,6 @@ extend@^3.0.0, extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3713,16 +3856,15 @@ fast-deep-equal@^3.1.1:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.1.1, fast-glob@^3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
+    glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
+    micromatch "^4.0.4"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -3745,9 +3887,9 @@ fastest-levenshtein@^1.0.12:
   integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
 
 fastq@^1.6.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb"
-  integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
   dependencies:
     reusify "^1.0.4"
 
@@ -3787,24 +3929,15 @@ fbjs@^0.8.4:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
+fflate@^0.4.1:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
+  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
-file-entry-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
-  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
+file-entry-cache@^6.0.0, file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
@@ -3844,13 +3977,6 @@ find-cache-dir@^2.0.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -3866,15 +3992,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -3883,15 +4000,10 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
 flatted@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
+  integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
 
 flux@2.1.1:
   version "2.1.1"
@@ -3902,12 +4014,12 @@ flux@2.1.1:
     fbjs "0.1.0-alpha.7"
     immutable "^3.7.4"
 
-focus-lock@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.8.1.tgz#bb36968abf77a2063fa173cb6c47b12ac8599d33"
-  integrity sha512-/LFZOIo82WDsyyv7h7oc0MJF9ACOvDRdx9rWPZ2pgMfNWu/z8hQDBtOchuB/0BVLmuFOZjV02YwUVzNsWx/EzA==
+focus-lock@^0.9.1:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.9.2.tgz#9d30918aaa99b1b97677731053d017f82a540d5b"
+  integrity sha512-YtHxjX7a0IC0ZACL5wsX8QdncXofWpGPNoVMuI/nZUrPGp6LmNI6+D5j0pPj+v8Kw5EpweA+T5yImK0rnWf7oQ==
   dependencies:
-    tslib "^1.9.3"
+    tslib "^2.0.3"
 
 focus-visible@^5.2.0:
   version "5.2.0"
@@ -3919,6 +4031,11 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
 foreachasync@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
@@ -3929,6 +4046,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -3955,50 +4081,50 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^2.1.2, fsevents@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
-  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
+fsevents@^2.1.2, fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.2, function.prototype.name@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.3.tgz#0bb034bb308e7682826f215eb6b2ae64918847fe"
-  integrity sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag==
+function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototype.name@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.4.tgz#e4ea839b9d3672ae99d0efd9f38d9191c5eaac83"
+  integrity sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    functions-have-names "^1.2.1"
+    es-abstract "^1.18.0-next.2"
+    functions-have-names "^1.2.2"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.0, functions-have-names@^1.2.1:
+functions-have-names@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21"
   integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==
 
-gensync@^1.0.0-beta.1:
+gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.1, get-intrinsic@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49"
-  integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
@@ -4028,6 +4154,14 @@ get-stream@^5.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4045,18 +4179,10 @@ gfm.css@^1.1.2:
   resolved "https://registry.yarnpkg.com/gfm.css/-/gfm.css-1.1.2.tgz#94acfa600672663b9dd0fd4b6ee5d11c8dbc161e"
   integrity sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ==
 
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
@@ -4066,9 +4192,9 @@ glob-to-regexp@^0.4.1:
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
 glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4105,10 +4231,10 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-globby@^11.0.1, globby@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
-  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
+globby@^11.0.3:
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
+  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -4129,10 +4255,10 @@ gonzales-pe@^4.3.0:
   dependencies:
     minimist "^1.2.5"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+graceful-fs@^4.1.11, graceful-fs@^4.2.4:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
 growly@^1.3.0:
   version "1.3.0"
@@ -4157,6 +4283,11 @@ hard-rejection@^2.1.0:
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -4167,10 +4298,17 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+has-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
 
 has-value@^0.3.1:
   version "0.3.1"
@@ -4203,7 +4341,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1, has@^1.0.3:
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -4211,11 +4349,11 @@ has@^1.0.1, has@^1.0.3:
     function-bind "^1.1.1"
 
 highlight.js@^10.5.0:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.5.0.tgz#3f09fede6a865757378f2d9ebdcbc15ba268f98f"
-  integrity sha512-xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw==
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
+  integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-hoist-non-react-statics@^3.3.0:
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -4227,19 +4365,20 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hosted-git-info@^3.0.6:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c"
-  integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==
+hosted-git-info@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
+  integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
   dependencies:
     lru-cache "^6.0.0"
 
 html-element-map@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22"
-  integrity sha512-0uXq8HsuG1v2TmQ8QkIhzbrqeskE4kn52Q18QJ9iAA/SnHoEKXWiUxHQtclRsCFWEUD2So34X+0+pZZu862nnw==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.1.tgz#44b2cbcfa7be7aa4ff59779e47e51012e1c73c08"
+  integrity sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==
   dependencies:
-    array-filter "^1.0.0"
+    array.prototype.filter "^1.0.0"
+    call-bind "^1.0.2"
 
 html-encoding-sniffer@^2.0.1:
   version "2.0.1"
@@ -4275,17 +4414,7 @@ htmlparser2@^3.10.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-htmlparser2@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.0.tgz#c2da005030390908ca4c91e5629e418e0665ac01"
-  integrity sha512-numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
-    domutils "^2.4.4"
-    entities "^2.0.0"
-
-htmlparser2@^6.1.0:
+htmlparser2@^6.0.0, htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
   integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
@@ -4295,6 +4424,15 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4304,12 +4442,20 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4317,9 +4463,9 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
-  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
@@ -4338,6 +4484,11 @@ ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 immutable@^3.7.4:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
@@ -4374,11 +4525,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -4402,50 +4548,19 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
   dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
-internal-slot@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
-  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
-  dependencies:
-    es-abstract "^1.17.0-next.1"
+    get-intrinsic "^1.1.0"
     has "^1.0.3"
-    side-channel "^1.0.2"
-
-invariant@^2.2.2, invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+    side-channel "^1.0.4"
 
 ip-regex@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.2.0.tgz#a03f5eb661d9a154e3973a03de8b23dd0ad6892e"
-  integrity sha512-n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
+  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -4474,12 +4589,13 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-arguments@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
-  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+is-arguments@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -4493,10 +4609,17 @@ is-arrow-function@^2.0.3:
   dependencies:
     is-callable "^1.0.4"
 
-is-bigint@^1.0.0, is-bigint@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
-  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+is-async-fn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-async-fn/-/is-async-fn-1.1.0.tgz#a1a15b11d4a1155cc23b11e91b301b45a3caad16"
+  integrity sha1-oaFbEdShFVzCOxHpGzAbRaPKrRY=
+
+is-bigint@^1.0.1, is-bigint@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
 
 is-binary-path@^1.0.0:
   version "1.0.1"
@@ -4512,12 +4635,13 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.0, is-boolean-object@^1.0.1, is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+is-boolean-object@^1.0.1, is-boolean-object@^1.1.0, is-boolean-object@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
@@ -4529,10 +4653,10 @@ is-buffer@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -4541,10 +4665,10 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+is-core-module@^2.2.0, is-core-module@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
+  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
   dependencies:
     has "^1.0.3"
 
@@ -4562,10 +4686,12 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+is-date-object@^1.0.1, is-date-object@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-decimal@^1.0.0:
   version "1.0.4"
@@ -4591,33 +4717,36 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     kind-of "^6.0.2"
 
 is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-equal@^1.5.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.1.tgz#74fafde5060fcaf187041c05f11f0b9f020bb9b3"
-  integrity sha512-3/79QTolnfNFrxQAvqH8M+O01uGWsVq54BUPG2mXQH7zi4BE/0TY+fmA444t8xSBvIwyNMvsTmCZ5ViVDlqPJg==
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.3.tgz#7f5578799a644cfb6dc82285ce9168f151e23259"
+  integrity sha512-LTIjMaisYvuz8FhWSCc/Lux7MSE6Ucv7G+C2lixnn2vW+pOMgyTWGq3JPeyqFOfcv0Jb1fMpvQ121rjbfF0Z+A==
   dependencies:
-    es-get-iterator "^1.0.1"
-    functions-have-names "^1.2.0"
+    es-get-iterator "^1.1.2"
+    functions-have-names "^1.2.2"
     has "^1.0.3"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
     is-arrow-function "^2.0.3"
-    is-bigint "^1.0.0"
-    is-boolean-object "^1.0.0"
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-generator-function "^1.0.7"
-    is-number-object "^1.0.3"
-    is-regex "^1.0.4"
-    is-string "^1.0.4"
-    is-symbol "^1.0.3"
+    is-bigint "^1.0.3"
+    is-boolean-object "^1.1.2"
+    is-callable "^1.2.4"
+    is-date-object "^1.0.5"
+    is-generator-function "^1.0.10"
+    is-number-object "^1.0.6"
+    is-regex "^1.1.4"
+    is-string "^1.0.7"
+    is-symbol "^1.0.4"
     isarray "^2.0.5"
-    object-inspect "^1.7.0"
-    object.entries "^1.1.0"
-    which-boxed-primitive "^1.0.1"
-    which-collection "^1.0.0"
+    object-inspect "^1.11.0"
+    object.entries "^1.1.4"
+    object.getprototypeof "^1.0.1"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -4631,11 +4760,16 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-finalizationregistry@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.1.tgz#4c8a8d4a72c49ea4b0f7e4f82203373abd4b8e38"
+  integrity sha512-7ljq3NfRoVd2mwe9CvvU6Io1ZtdLf8x9MUMYC6vATTKTciKVS6c0ZOAHf2YAD9woY7afIhv+rchAYXxkCn0ubg==
+
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -4651,17 +4785,12 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-generator-function@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
-  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+is-generator-function@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
   dependencies:
-    is-extglob "^2.1.0"
+    has-tostringtag "^1.0.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
@@ -4682,7 +4811,7 @@ is-ip@^3.1.0:
   dependencies:
     ip-regex "^4.0.0"
 
-is-map@^2.0.1:
+is-map@^2.0.1, is-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
@@ -4692,10 +4821,12 @@ is-negative-zero@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
   integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
-is-number-object@^1.0.3, is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+is-number-object@^1.0.4, is-number-object@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
+  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -4731,24 +4862,30 @@ is-plain-object@^5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+is-promise@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+
+is-regex@^1.0.3, is-regex@^1.0.5, is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
 is-regexp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
   integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
 
-is-set@^2.0.1:
+is-set@^2.0.1, is-set@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
   integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
@@ -4759,37 +4896,62 @@ is-stream@^1.0.1, is-stream@^1.1.0:
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-string@^1.0.4, is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
   integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+is-symbol@^1.0.2, is-symbol@^1.0.3, is-symbol@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
+
+is-typed-array@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79"
+  integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-abstract "^1.18.5"
+    foreach "^2.0.5"
+    has-tostringtag "^1.0.0"
 
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-weakmap@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
   integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-weakset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
@@ -4807,7 +4969,7 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -4889,9 +5051,9 @@ istanbul-reports@^3.0.2:
     istanbul-lib-report "^3.0.0"
 
 jest-canvas-mock@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.3.0.tgz#50f4cc178ae52c4c0e2ce4fd3a3ad2a41ad4eb36"
-  integrity sha512-3TMyR66VG2MzAW8Negzec03bbcIjVJMfGNvKzrEnbws1CYKqMNkvIJ8LbkoGYfp42tKqDmhIpQq3v+MNLW2A2w==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.3.1.tgz#9535d14bc18ccf1493be36ac37dd349928387826"
+  integrity sha512-5FnSZPrX3Q2ZfsbYNE3wqKR3+XorN8qFzDzB5o0golWgt6EOX1+emBnpOc9IAQ+NXFj8Nzm3h7ZdE/9H0ylBcg==
   dependencies:
     cssfontparser "^1.2.1"
     moo-color "^1.0.2"
@@ -5136,6 +5298,11 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
+jest-raw-loader@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz#ce9f56d54650f157c4a7d16d224ba5d613bcd626"
+  integrity sha1-zp9W1UZQ8VfEp9FtIkul1hO81iY=
+
 jest-regex-util@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
@@ -5332,41 +5499,49 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^16.2.1, jsdom@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
-  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
   dependencies:
-    abab "^2.0.3"
-    acorn "^7.1.1"
+    abab "^2.0.5"
+    acorn "^8.2.4"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
-    cssstyle "^2.2.0"
+    cssstyle "^2.3.0"
     data-urls "^2.0.0"
-    decimal.js "^10.2.0"
+    decimal.js "^10.2.1"
     domexception "^2.0.1"
-    escodegen "^1.14.1"
+    escodegen "^2.0.0"
+    form-data "^3.0.0"
     html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
     nwsapi "^2.2.0"
-    parse5 "5.1.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.8"
-    saxes "^5.0.0"
+    parse5 "6.0.1"
+    saxes "^5.0.1"
     symbol-tree "^3.2.4"
-    tough-cookie "^3.0.1"
+    tough-cookie "^4.0.0"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
     webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.2.3"
+    whatwg-url "^8.5.0"
+    ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
@@ -5414,17 +5589,10 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
 json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
@@ -5446,6 +5614,16 @@ jsprim@^1.2.2:
     array-includes "^3.1.2"
     object.assign "^4.1.2"
 
+jszip@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.0.tgz#9b8b995a4e7c9024653ce743e902076a82fdf4e6"
+  integrity sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
 katex@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/katex/-/katex-0.12.0.tgz#2fb1c665dbd2b043edcf8a1f5c555f46beaa0cb9"
@@ -5487,24 +5665,16 @@ klona@^2.0.3:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
 
-known-css-properties@^0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.20.0.tgz#0570831661b47dd835293218381166090ff60e96"
-  integrity sha512-URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==
+known-css-properties@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
+  integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==
 
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -5513,6 +5683,21 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -5523,23 +5708,14 @@ linkifyjs@^2.1.9:
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.9.tgz#af06e45a2866ff06c4766582590d098a4d584702"
   integrity sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==
 
-load-json-file@^2.0.0:
+loader-utils@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
   dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
 
 locate-path@^3.0.0:
   version "3.0.0"
@@ -5556,10 +5732,15 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash-es@^4.2.1:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.20.tgz#29f6332eefc60e849f869c264bc71126ad61e8f7"
-  integrity sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA==
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.escape@^4.0.1:
   version "4.0.1"
@@ -5576,22 +5757,23 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.2.1:
+lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
-    chalk "^4.0.0"
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
 
 loglevel@^1.7.1:
   version "1.7.1"
@@ -5624,6 +5806,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
+  dependencies:
+    es5-ext "~0.10.2"
+
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -5657,9 +5846,9 @@ map-obj@^1.0.0:
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
-  integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7"
+  integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==
 
 map-visit@^1.0.0:
   version "1.0.0"
@@ -5674,8 +5863,8 @@ mathml-tag-names@^2.1.3:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "11.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/acb9bc8cc5234326a7583514a8e120a4ac42eedc"
+  version "13.0.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2515d07c8fc3bf5e1afc8352e3e330cca30dde85"
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -5683,6 +5872,7 @@ mathml-tag-names@^2.1.3:
     bs58 "^4.0.1"
     content-type "^1.0.4"
     loglevel "^1.7.1"
+    p-retry "^4.5.0"
     qs "^6.9.6"
     request "^2.88.2"
     unhomoglyph "^1.0.6"
@@ -5695,31 +5885,31 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-test-utils@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
-  integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
+matrix-react-test-utils@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.3.tgz#27653f9d6bbfddd1856e51860fad1503b039d617"
+  integrity sha512-NKZDlMEQzDZDQhBYyKBUtqidRvpkww3n9/GmGICkxtU2D6NetyBIfvm1Lf9o7167KSkPHJUVvDS9dzaS55jUnA==
 
 "matrix-web-i18n@github:matrix-org/matrix-web-i18n":
   version "1.1.2"
-  resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/63f9119bc0bc304e83d4e8e22364caa7850e7671"
+  resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/e5c7071e0cdf715de87ef39dc8260e11d7add2f8"
   dependencies:
     "@babel/parser" "^7.13.16"
     "@babel/traverse" "^7.13.17"
     walk "^2.3.14"
 
-matrix-widget-api@^0.1.0-beta.14:
-  version "0.1.0-beta.14"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.14.tgz#e38beed71c5ebd62c1ac1d79ef262d7150b42c70"
-  integrity sha512-5tC6LO1vCblKg/Hfzf5U1eHPz1nHUZIobAm3gkEKV5vpYPgRpr8KdkLiGB78VZid0tB17CVtAb4VKI8CQ3lhAQ==
+matrix-widget-api@^0.1.0-beta.16:
+  version "0.1.0-beta.16"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.16.tgz#32655f05cab48239b97fe4111a1d0858f2aad61a"
+  integrity sha512-9zqaNLaM14YDHfFb7WGSUOivGOjYw+w5Su84ZfOl6A4IUy1xT9QPp0nsSA8wNfz0LpxOIPn3nuoF8Tn/40F5tg==
   dependencies:
     "@types/events" "^3.0.0"
     events "^3.2.0"
 
 mdast-util-from-markdown@^0.8.0:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz#2882100c1b9fc967d3f83806802f303666682d32"
-  integrity sha512-jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw==
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
+  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
   dependencies:
     "@types/mdast" "^3.0.0"
     mdast-util-to-string "^2.0.0"
@@ -5728,9 +5918,9 @@ mdast-util-from-markdown@^0.8.0:
     unist-util-stringify-position "^2.0.0"
 
 mdast-util-to-markdown@^0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.2.tgz#8fe6f42a2683c43c5609dfb40407c095409c85b4"
-  integrity sha512-iRczns6WMvu0hUw02LXsPDJshBIwtUPbvHBWo19IQeU0YqmzlA8Pd30U8V7uiI0VPkxzS7A/NXBXH6u+HS87Zg==
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
+  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
   dependencies:
     "@types/unist" "^2.0.0"
     longest-streak "^2.0.0"
@@ -5749,10 +5939,24 @@ mdurl@~1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-memoize-one@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17"
-  integrity sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA==
+memoize-one@^5.1.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
+  integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
+
+memoizee@^0.4.14:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
+  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.53"
+    es6-weak-map "^2.0.3"
+    event-emitter "^0.3.5"
+    is-promise "^2.2.2"
+    lru-queue "^0.1.0"
+    next-tick "^1.1.0"
+    timers-ext "^0.1.7"
 
 meow@^9.0.0:
   version "9.0.0"
@@ -5783,9 +5987,9 @@ merge2@^1.3.0:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromark@~2.11.0:
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35"
-  integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ==
+  version "2.11.4"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
+  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
   dependencies:
     debug "^4.0.0"
     parse-entities "^2.0.0"
@@ -5809,25 +6013,25 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
-mime-db@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+mime-db@1.49.0:
+  version "1.49.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
+  integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+  version "2.1.32"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
+  integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
   dependencies:
-    mime-db "1.45.0"
+    mime-db "1.49.0"
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -5868,13 +6072,6 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
 moo-color@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.2.tgz#837c40758d2d58763825d1359a84e330531eca64"
@@ -5897,15 +6094,10 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-nanoid@^3.1.20:
-  version "3.1.20"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
-  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
+nanoid@^3.1.23:
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -5939,6 +6131,16 @@ nearley@^2.7.10:
     railroad-diagrams "^1.0.0"
     randexp "0.4.6"
 
+next-tick@1, next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
+next-tick@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -5957,6 +6159,11 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-fetch@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0"
+  integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -5968,9 +6175,9 @@ node-modules-regexp@^1.0.0:
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
-  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
+  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
@@ -5979,10 +6186,10 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.69:
-  version "1.1.70"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
-  integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==
+node-releases@^1.1.75:
+  version "1.1.75"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+  integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -5995,13 +6202,13 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
     validate-npm-package-license "^3.0.1"
 
 normalize-package-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a"
-  integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^3.0.6"
-    resolve "^1.17.0"
-    semver "^7.3.2"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
@@ -6041,9 +6248,9 @@ npm-run-path@^4.0.0:
     path-key "^3.0.0"
 
 nth-check@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
-  integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
   dependencies:
     boolbase "^1.0.0"
 
@@ -6076,17 +6283,17 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.1.0, object-inspect@^1.7.0, object-inspect@^1.8.0, object-inspect@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+object-inspect@^1.1.0, object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
 object-is@^1.0.2, object-is@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
-  integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
 
 object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
@@ -6101,7 +6308,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
+object.assign@^4.1.0, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -6111,25 +6318,34 @@ object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.0, object.entries@^1.1.1, object.entries@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
-  integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
+object.entries@^1.1.1, object.entries@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"
+  integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
+    es-abstract "^1.18.2"
+
+object.fromentries@^2.0.0, object.fromentries@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8"
+  integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
     has "^1.0.3"
 
-object.fromentries@^2.0.2, object.fromentries@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
-  integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
+object.getprototypeof@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object.getprototypeof/-/object.getprototypeof-1.0.2.tgz#a993d88ca63d68f9c328186dd17d76d4188b3624"
+  integrity sha512-7KoF7BcUJi6YZ+7g9XqbaJzxsmp4jSjUw8TkOSdN/GF9ZAhDM/ssERDddC+WR556niTKtCk9HtwwsbnaEeWNlg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    has "^1.0.3"
+    es-abstract "^1.18.6"
+    reflect.getprototypeof "^1.0.0"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -6138,15 +6354,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1, object.values@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
-  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
+object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -6162,7 +6377,7 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-optionator@^0.8.1, optionator@^0.8.3:
+optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -6187,14 +6402,9 @@ optionator@^0.9.1:
     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"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.4.tgz#c4cdbb8bb94d17aa406934b58dcf9caab6c79b09"
+  integrity sha512-nWwLH5BySgNDHdpkOMV+igl9iyS99g60ap/0LycIgbSXykZvUpweuWCgAl3mTKSL0773yvKohlO5dOv5RQqG/Q==
 
 p-each-series@^2.1.0:
   version "2.2.0"
@@ -6206,13 +6416,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -6220,13 +6423,6 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -6241,10 +6437,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+p-retry@^4.5.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
+  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
+  dependencies:
+    "@types/retry" "^0.12.0"
+    retry "^0.13.1"
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -6252,9 +6451,14 @@ p-try@^2.0.0:
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pako@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.3.tgz#cdf475e31b678565251406de9e759196a0ea7a43"
-  integrity sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d"
+  integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==
+
+pako@~1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -6275,13 +6479,6 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6312,12 +6509,7 @@ parse5-htmlparser2-tree-adapter@^6.0.1:
   dependencies:
     parse5 "^6.0.1"
 
-parse5@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
-parse5@^6.0.1:
+parse5@6.0.1, parse5@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
@@ -6327,11 +6519,6 @@ pascalcase@^0.1.1:
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6358,41 +6545,24 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-pify@^2.0.0:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
 pify@^3.0.0:
   version "3.0.0"
@@ -6411,13 +6581,6 @@ pirates@^4.0.0, pirates@^4.0.1:
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -6500,14 +6663,12 @@ postcss-scss@^2.1.1:
   dependencies:
     postcss "^7.0.6"
 
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.5:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
   dependencies:
     cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
 postcss-syntax@^0.36.2:
@@ -6521,22 +6682,29 @@ postcss-value-parser@^4.1.0:
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
 postcss@^8.0.2:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04"
-  integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
+  integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
   dependencies:
-    colorette "^1.2.1"
-    nanoid "^3.1.20"
-    source-map "^0.6.1"
+    colorette "^1.2.2"
+    nanoid "^3.1.23"
+    source-map-js "^0.6.2"
+
+posthog-js@1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.12.2.tgz#ff76e26634067e003f8af7df654d7ea0e647d946"
+  integrity sha512-I0d6c+Yu2f91PFidz65AIkkqZM219EY9Z1wlbTkW5Zqfq5oXqogBMKS8BaDBOrMc46LjLX7IH67ytCcBFRo1uw==
+  dependencies:
+    fflate "^0.4.1"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -6581,23 +6749,14 @@ promise@^7.0.3, promise@^7.1.1:
     asap "~2.0.3"
 
 prompts@^2.0.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
-  integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
+  integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
   dependencies:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types-exact@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
-  integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==
-  dependencies:
-    has "^1.0.3"
-    object.assign "^4.1.0"
-    reflect.ownkeys "^0.2.0"
-
-prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.6.2, prop-types@^15.7.0, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -6606,7 +6765,7 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2,
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
-psl@^1.1.28:
+psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -6629,12 +6788,12 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pvtsutils@^1.0.11, pvtsutils@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.1.1.tgz#22c2d7689139d2c36d7ef3ac3d5e29bcd818d38a"
-  integrity sha512-Evbhe6L4Sxwu4SPLQ4LQZhgfWDQO3qa1lju9jM5cxsQp8vE10VipcSmo7hiJW48TmiHgVLgDtC2TL6/+ND+IVg==
+pvtsutils@^1.1.6, pvtsutils@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.2.0.tgz#619e4767093d23cd600482600c16f4c36d3025bb"
+  integrity sha512-IDefMJEQl7HX0FP2hIKJFnAR11klP1js2ixCrOaMhe3kXFK6RQ2ABUCuwWaaD4ib0hSbh2fGTICvWJJhDfNecA==
   dependencies:
-    tslib "^2.0.3"
+    tslib "^2.2.0"
 
 pvutils@latest:
   version "1.0.17"
@@ -6655,9 +6814,11 @@ qrcode@^1.4.4:
     yargs "^13.2.4"
 
 qs@^6.9.6:
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
-  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  dependencies:
+    side-channel "^1.0.4"
 
 qs@~6.5.2:
   version "6.5.2"
@@ -6669,17 +6830,22 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-raf-schd@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-2.1.2.tgz#ec622b5167f2912089f054dc03ebd5bcf33c8f62"
-  integrity sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g==
+raf-schd@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
+  integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
 
-raf@^3.1.0, raf@^3.4.1:
+raf@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
   integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
@@ -6699,131 +6865,124 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
+raw-loader@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
+  integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 re-resizable@^6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.0.tgz#9c3059b389ced6ade602234cc5bb1e12d231cd47"
-  integrity sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c"
+  integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==
   dependencies:
     fast-memoize "^2.5.1"
 
-react-beautiful-dnd@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz#3b0a49bf6be75af351176c904f012611dd292b81"
-  integrity sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==
+react-beautiful-dnd@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d"
+  integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA==
   dependencies:
-    babel-runtime "^6.26.0"
-    invariant "^2.2.2"
-    memoize-one "^3.0.1"
-    prop-types "^15.6.0"
-    raf-schd "^2.1.0"
-    react-motion "^0.5.2"
-    react-redux "^5.0.6"
-    redux "^3.7.2"
-    redux-thunk "^2.2.0"
-    reselect "^3.0.1"
+    "@babel/runtime" "^7.9.2"
+    css-box-model "^1.2.0"
+    memoize-one "^5.1.1"
+    raf-schd "^4.0.2"
+    react-redux "^7.2.0"
+    redux "^4.0.4"
+    use-memo-one "^1.1.1"
 
-react-clientside-effect@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.3.tgz#95c95f520addfb71743608b990bfe01eb002012b"
-  integrity sha512-96HOmjJjjemxZD4qMdaMWFl3d/3Dqm/MAXnThoP8+jQihevYs8VzooqYWlVEPmkp9tVIa06i67R7FF1qsuzUwQ==
+react-blurhash@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/react-blurhash/-/react-blurhash-0.1.3.tgz#735f28f8f07fb358d7efe7e7e6dc65a7272bf89e"
+  integrity sha512-Q9lqbXg92NU6/2DoIl/cBM8YWL+Z4X66OiG4aT9ozOgjBwx104LHFCH5stf6aF+s0Q9Wf310Ul+dG+VXJltmPg==
+
+react-clientside-effect@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.5.tgz#e2c4dc3c9ee109f642fac4f5b6e9bf5bcd2219a3"
+  integrity sha512-2bL8qFW1TGBHozGGbVeyvnggRpMjibeZM2536AKNENLECutp2yfs44IL8Hmpn8qjFQ2K7A9PnYf3vc7aQq/cPA==
   dependencies:
-    "@babel/runtime" "^7.0.0"
+    "@babel/runtime" "^7.12.13"
 
-react-dom@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
-  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
+react-dom@17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
+  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
+    scheduler "^0.20.2"
 
 react-focus-lock@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.5.0.tgz#12e3a3940e897c26e2c2a0408cd25ea3c99b3709"
-  integrity sha512-XLxj6uTXgz0US8TmqNU2jMfnXwZG0mH2r/afQqvPEaX6nyEll5LHVcEXk2XDUQ34RVeLPkO/xK5x6c/qiuSq/A==
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.5.2.tgz#f1e4db5e25cd8789351f2bd5ebe91e9dcb9c2922"
+  integrity sha512-WzpdOnEqjf+/A3EH9opMZWauag7gV0BxFl+EY4ElA4qFqYsUsBLnmo2sELbN5OC30S16GAWMy16B9DLPpdJKAQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.8.1"
+    focus-lock "^0.9.1"
     prop-types "^15.6.2"
-    react-clientside-effect "^1.2.2"
-    use-callback-ref "^1.2.1"
-    use-sidecar "^1.0.1"
+    react-clientside-effect "^1.2.5"
+    use-callback-ref "^1.2.5"
+    use-sidecar "^1.0.5"
 
-react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
+"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+
+react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
-
-react-lifecycles-compat@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
-
-react-motion@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"
-  integrity sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==
+react-redux@^7.2.0:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.5.tgz#213c1b05aa1187d9c940ddfc0b29450957f6a3b8"
+  integrity sha512-Dt29bNyBsbQaysp6s/dN0gUodcq+dVKKER8Qv82UrpeygwYeX1raTtil7O/fftw/rFqzaf6gJhDZRkkZnn6bjg==
   dependencies:
-    performance-now "^0.2.0"
-    prop-types "^15.5.8"
-    raf "^3.1.0"
+    "@babel/runtime" "^7.12.1"
+    "@types/react-redux" "^7.1.16"
+    hoist-non-react-statics "^3.3.2"
+    loose-envify "^1.4.0"
+    prop-types "^15.7.2"
+    react-is "^16.13.1"
 
-react-redux@^5.0.6:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57"
-  integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    hoist-non-react-statics "^3.3.0"
-    invariant "^2.2.4"
-    loose-envify "^1.1.0"
-    prop-types "^15.6.1"
-    react-is "^16.6.0"
-    react-lifecycles-compat "^3.0.0"
-
-react-test-renderer@^16.0.0-0, react-test-renderer@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae"
-  integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==
+react-shallow-renderer@^16.13.1:
+  version "16.14.1"
+  resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz#bf0d02df8a519a558fd9b8215442efa5c840e124"
+  integrity sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg==
   dependencies:
     object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    react-is "^16.8.6"
-    scheduler "^0.19.1"
+    react-is "^16.12.0 || ^17.0.0"
+
+react-test-renderer@^17.0.0, react-test-renderer@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c"
+  integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==
+  dependencies:
+    object-assign "^4.1.1"
+    react-is "^17.0.2"
+    react-shallow-renderer "^16.13.1"
+    scheduler "^0.20.2"
 
 react-transition-group@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
-  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
+  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
+react@17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
+  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
@@ -6834,15 +6993,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
@@ -6862,7 +7012,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@^2.0.2:
+readable-stream@^2.0.2, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -6893,10 +7043,10 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
@@ -6908,47 +7058,40 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-redux-thunk@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
-  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
-
-redux@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
-  integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
+redux@^4.0.0, redux@^4.0.4:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47"
+  integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==
   dependencies:
-    lodash "^4.2.1"
-    lodash-es "^4.2.1"
-    loose-envify "^1.1.0"
-    symbol-observable "^1.0.3"
+    "@babel/runtime" "^7.9.2"
 
-reflect.ownkeys@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
-  integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
-
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+reflect.getprototypeof@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.1.tgz#f113f15e19d103d60b8d52ce7e0d45867efdddfc"
+  integrity sha512-z0FhUSaxXxnFQi+YyGfAvUJjCGPPwe0AO51LU/HtRLj/+a4LROrmSD6eYA3zr6aAK6GSbl8BCh/m5SAqUdAgTg==
   dependencies:
-    regenerate "^1.4.0"
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.6"
+    get-intrinsic "^1.1.1"
+    which-builtin-type "^1.1.1"
 
-regenerate@^1.4.0:
+regenerate-unicode-properties@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
+  dependencies:
+    regenerate "^1.4.2"
+
+regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
 regenerator-runtime@^0.13.4:
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
 regenerator-transform@^0.14.2:
   version "0.14.5"
@@ -6965,7 +7108,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.0:
+regexp.prototype.flags@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
   integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
@@ -6973,37 +7116,32 @@ regexp.prototype.flags@^1.3.0:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpp@^3.0.0, regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexpp@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^9.0.0"
+    regjsgen "^0.5.2"
+    regjsparser "^0.7.0"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.5.1:
+regjsgen@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
   integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
-regjsparser@^0.6.4:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a"
-  integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==
+regjsparser@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -7036,31 +7174,15 @@ remove-trailing-separator@^1.0.1:
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.0.0, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.8:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
 request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -7102,11 +7224,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-reselect@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
-  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
-
 resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -7134,43 +7251,41 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.18.1:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
-    is-core-module "^2.1.0"
+    is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+resolve@^2.0.0-next.3:
+  version "2.0.0-next.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
+  integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
   dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
 
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+retry@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfc4648@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.4.0.tgz#c75b2856ad2e2d588b6ddb985d556f1f7f2a2abd"
-  integrity sha512-3qIzGhHlMHA6PoT6+cdPKZ+ZqtxkIvg8DZGKA5z6PQ33/uuhoJ+Ws/D/J9rXW6gXodgH8QYlz2UCl+sdUDmNIg==
-
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.5.0.tgz#1ba940ec1649685ec4d88788dc57fb8e18855055"
+  integrity sha512-FA6W9lDNeX8WbMY31io1xWg+TpZCbeDKsBo0ocwACZiWnh9TUAyk9CCuBQuOPmYnwwdEQZmraQ2ZK7yJsxErBg==
 
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
@@ -7179,6 +7294,11 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rrweb-snapshot@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/rrweb-snapshot/-/rrweb-snapshot-1.1.7.tgz#92a3b47b1112a1b566c2fae2edb02fa48a6f6653"
+  integrity sha512-+f2kCCvIQ1hbEeCWnV7mPVPDEdWEExqwcYqMd/r1nfK52QE7qU52jefUOyTe85Vy67rZGqWnfK/B25e/OTSgYg==
+
 rst-selector-parser@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
@@ -7192,20 +7312,17 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
 run-parallel@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
-  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
 
-rxjs@^6.5.2, rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+rxjs@^6.5.2:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -7247,9 +7364,9 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-html@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.3.tgz#3db382c9a621cce4c46d90f10c64f1e9da9e8353"
-  integrity sha512-DCFXPt7Di0c6JUnlT90eIgrjs6TsJl/8HYU3KLdmrVclFN4O0heTcVbJiMa23OKVr6aR051XYtsgd8EWwEBwUA==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.5.1.tgz#f49998dc54c8180153940440d3a7294b09e4258a"
+  integrity sha512-hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -7259,22 +7376,31 @@ sanitize-html@^2.3.2:
     parse-srcset "^1.0.2"
     postcss "^8.0.2"
 
-saxes@^5.0.0:
+saxes@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
   integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
-  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
+scheduler@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
+  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+schema-utils@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7284,15 +7410,15 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -7301,6 +7427,11 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -7316,6 +7447,13 @@ setimmediate@^1.0.5:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -7345,7 +7483,7 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-side-channel@^1.0.2, side-channel@^1.0.3:
+side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
@@ -7374,15 +7512,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -7422,6 +7551,11 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+source-map-js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
+  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -7433,18 +7567,18 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@^0.5.16, source-map-support@^0.5.20, source-map-support@^0.5.6:
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
@@ -7488,9 +7622,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b"
+  integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==
 
 specificity@^0.4.1:
   version "0.4.1"
@@ -7530,18 +7664,19 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 stack-utils@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8"
-  integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b"
+  integrity sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
 stack-utils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
-  integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+  integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
   dependencies:
     escape-string-regexp "^2.0.0"
+    source-map-support "^0.5.20"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -7551,24 +7686,14 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 string-length@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
-  integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-natural-compare@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
-  integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -7578,27 +7703,28 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.matchall@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a"
-  integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==
+string.prototype.matchall@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
+  integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    has-symbols "^1.0.1"
-    internal-slot "^1.0.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.3"
+    es-abstract "^1.18.2"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
 
 string.prototype.repeat@^0.2.0:
   version "0.2.0"
@@ -7606,28 +7732,28 @@ string.prototype.repeat@^0.2.0:
   integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=
 
 string.prototype.trim@^1.2.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz#d23a22fde01c1e6571a7fadcb9be11decd8061a7"
-  integrity sha512-16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd"
+  integrity sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
+    es-abstract "^1.18.0-next.2"
 
-string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
-  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
-  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
 
 string_decoder@^1.1.1:
@@ -7658,11 +7784,6 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
 strip-bom@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
@@ -7685,7 +7806,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -7708,9 +7829,9 @@ stylelint-config-standard@^20.0.0:
     stylelint-config-recommended "^3.0.0"
 
 stylelint-scss@^3.18.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.18.0.tgz#8f06371c223909bf3f62e839548af1badeed31e9"
-  integrity sha512-LD7+hv/6/ApNGt7+nR/50ft7cezKP2HM5rI8avIdGaUWre3xlHfV4jKO/DRZhscfuN+Ewy9FMhcTq0CcS0C/SA==
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.21.0.tgz#9f50898691b16b1c1ca3945837381d98c5b22331"
+  integrity sha512-CMI2wSHL+XVlNExpauy/+DbUcB/oUZLARDtMIXkpV/5yd8nthzylYd1cdHeDMJVBXeYHldsnebUX6MoV5zPW4A==
   dependencies:
     lodash "^4.17.15"
     postcss-media-query-parser "^0.2.3"
@@ -7719,35 +7840,35 @@ stylelint-scss@^3.18.0:
     postcss-value-parser "^4.1.0"
 
 stylelint@^13.9.0:
-  version "13.9.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.9.0.tgz#93921ee6e11d4556b9f31131f485dc813b68e32a"
-  integrity sha512-VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==
+  version "13.13.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c"
+  integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==
   dependencies:
     "@stylelint/postcss-css-in-js" "^0.37.2"
     "@stylelint/postcss-markdown" "^0.36.2"
     autoprefixer "^9.8.6"
-    balanced-match "^1.0.0"
-    chalk "^4.1.0"
+    balanced-match "^2.0.0"
+    chalk "^4.1.1"
     cosmiconfig "^7.0.0"
     debug "^4.3.1"
     execall "^2.0.0"
     fast-glob "^3.2.5"
     fastest-levenshtein "^1.0.12"
-    file-entry-cache "^6.0.0"
+    file-entry-cache "^6.0.1"
     get-stdin "^8.0.0"
     global-modules "^2.0.0"
-    globby "^11.0.2"
+    globby "^11.0.3"
     globjoin "^0.1.4"
     html-tags "^3.1.0"
     ignore "^5.1.8"
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.20.0"
-    lodash "^4.17.20"
-    log-symbols "^4.0.0"
+    known-css-properties "^0.21.0"
+    lodash "^4.17.21"
+    log-symbols "^4.1.0"
     mathml-tag-names "^2.1.3"
     meow "^9.0.0"
-    micromatch "^4.0.2"
+    micromatch "^4.0.4"
     normalize-selector "^0.2.0"
     postcss "^7.0.35"
     postcss-html "^0.36.0"
@@ -7757,19 +7878,19 @@ stylelint@^13.9.0:
     postcss-safe-parser "^4.0.2"
     postcss-sass "^0.4.4"
     postcss-scss "^2.1.1"
-    postcss-selector-parser "^6.0.4"
+    postcss-selector-parser "^6.0.5"
     postcss-syntax "^0.36.2"
     postcss-value-parser "^4.1.0"
     resolve-from "^5.0.0"
     slash "^3.0.0"
     specificity "^0.4.1"
-    string-width "^4.2.0"
+    string-width "^4.2.2"
     strip-ansi "^6.0.0"
     style-search "^0.1.0"
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^6.0.7"
-    v8-compile-cache "^2.2.0"
+    table "^6.6.0"
+    v8-compile-cache "^2.3.0"
     write-file-atomic "^3.0.3"
 
 sugarss@^2.0.0:
@@ -7801,9 +7922,9 @@ supports-color@^7.0.0, supports-color@^7.1.0:
     has-flag "^4.0.0"
 
 supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
+  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
@@ -7813,35 +7934,22 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
 
-symbol-observable@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+table@^6.0.4, table@^6.6.0:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
+  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
   dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-table@^6.0.4, table@^6.0.7:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
-  integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
-  dependencies:
-    ajv "^7.0.2"
-    lodash "^4.17.20"
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 
 tar-js@^0.3.0:
   version "0.3.0"
@@ -7865,11 +7973,6 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-text-encoding-utf-8@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
-  integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7880,27 +7983,28 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+timers-ext@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
+  dependencies:
+    es5-ext "~0.10.46"
+    next-tick "1"
+
+tiny-invariant@^1.0.6:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
+  integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
 
 tmatch@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
   integrity sha1-DFYkbzPzDaG409colauvFmYPOM8=
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
@@ -7939,7 +8043,16 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
+tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -7947,19 +8060,10 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+tr46@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
   dependencies:
     punycode "^2.1.1"
 
@@ -7969,44 +8073,29 @@ tree-kill@^1.2.2:
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
 trim-newlines@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
-  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 trough@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
-  dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.0"
-    strip-bom "^3.0.0"
-
 tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
-  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tslib@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
-  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
-
-tsutils@^3.17.1:
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.19.1.tgz#d8566e0c51c82f32f9c25a4d367cd62409a547a9"
-  integrity sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
   dependencies:
     tslib "^1.8.1"
 
@@ -8017,6 +8106,11 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tunnel@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -8041,16 +8135,16 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
-
 type-fest@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -8061,6 +8155,16 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
+  integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -8068,48 +8172,58 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
-  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
+typescript@4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
 
 ua-parser-js@^0.7.18:
   version "0.7.28"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
   integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
 
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
 unhomoglyph@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3"
   integrity sha512-7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg==
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
 unified@^9.1.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
-  integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975"
+  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
   dependencies:
     bail "^1.0.0"
     extend "^3.0.0"
@@ -8128,11 +8242,6 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 unist-util-find-all-after@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
@@ -8141,9 +8250,9 @@ unist-util-find-all-after@^3.0.2:
     unist-util-is "^4.0.0"
 
 unist-util-is@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50"
-  integrity sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
+  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
 
 unist-util-stringify-position@^2.0.0:
   version "2.0.3"
@@ -8152,6 +8261,16 @@ unist-util-stringify-position@^2.0.0:
   dependencies:
     "@types/unist" "^2.0.2"
 
+universal-user-agent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+
+universalify@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -8185,17 +8304,22 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-callback-ref@^1.2.1:
+use-callback-ref@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5"
   integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==
 
-use-sidecar@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.4.tgz#38398c3723727f9f924bed2343dfa3db6aaaee46"
-  integrity sha512-A5ggIS3/qTdxCAlcy05anO2/oqXOfpmxnpRE1Jm+fHHtCvUvNSZDGqgOSAXPriBVAcw2fMFFkh5v5KqrFFhCMA==
+use-memo-one@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20"
+  integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ==
+
+use-sidecar@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.5.tgz#ffff2a17c1df42e348624b699ba6e5c220527f2b"
+  integrity sha512-k9jnrjYNwN6xYLj1iaGhonDghfvmeTmYjAiGvOr7clwKfPjMXJf4/HOr7oT5tJwYafgp2tG2l3eZEOfoELiMcA==
   dependencies:
-    detect-node-es "^1.0.0"
+    detect-node-es "^1.1.0"
     tslib "^1.9.3"
 
 use@^3.1.0:
@@ -8218,15 +8342,15 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
-  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"
-  integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
+  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -8295,16 +8419,16 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-webcrypto-core@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.1.8.tgz#91720c07f4f2edd181111b436647ea5a282af0a9"
-  integrity sha512-hKnFXsqh0VloojNeTfrwFoRM4MnaWzH6vtXcaFcGjPEu+8HmBdQZnps3/2ikOFqS8bJN1RYr6mI2P/FJzyZnXg==
+webcrypto-core@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.2.1.tgz#33f451a4c4faf159e74589436c80ca33998abad6"
+  integrity sha512-5+h1/e/A4eegCRTg+oQ9ehTJRTMwFhZazJ2RH1FP0VC3q1/0xl7x6SzzTwPxd/VTGc7kjuSEJGnfNgoLe5jNRQ==
   dependencies:
-    "@peculiar/asn1-schema" "^2.0.12"
+    "@peculiar/asn1-schema" "^2.0.38"
     "@peculiar/json-schema" "^1.1.12"
-    asn1js "^2.0.26"
-    pvtsutils "^1.0.11"
-    tslib "^2.0.1"
+    asn1js "^2.1.1"
+    pvtsutils "^1.2.0"
+    tslib "^2.3.1"
 
 webidl-conversions@^5.0.0:
   version "5.0.0"
@@ -8329,9 +8453,9 @@ whatwg-encoding@^1.0.5:
     iconv-lite "0.4.24"
 
 whatwg-fetch@>=0.10.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
-  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
+  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
 whatwg-fetch@^0.9.0:
   version "0.9.0"
@@ -8343,16 +8467,16 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
-  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
+    lodash "^4.7.0"
+    tr46 "^2.1.0"
     webidl-conversions "^6.1.0"
 
-which-boxed-primitive@^1.0.1:
+which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
@@ -8363,7 +8487,25 @@ which-boxed-primitive@^1.0.1:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-collection@^1.0.0:
+which-builtin-type@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.1.tgz#1d14bb1b69b5680ebdddd7244689574678a1d83c"
+  integrity sha512-zY3bUNzl/unBfSDS6ePT+/dwu6hZ7RMVMqHFvYxZEhisGEwCV/pYnXQ70nd3Hn2X6l8BNOWge5sHk3wAR3L42w==
+  dependencies:
+    function.prototype.name "^1.1.4"
+    has-tostringtag "^1.0.0"
+    is-async-fn "^1.1.0"
+    is-date-object "^1.0.5"
+    is-finalizationregistry "^1.0.1"
+    is-generator-function "^1.0.10"
+    is-regex "^1.1.4"
+    is-weakref "^1.0.1"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.5"
+
+which-collection@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
   integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
@@ -8378,6 +8520,18 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which-typed-array@^1.1.5:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793"
+  integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-abstract "^1.18.5"
+    foreach "^2.0.5"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.7"
+
 which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -8415,6 +8569,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -8430,17 +8593,10 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@^7.2.3:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ws@^7.4.6:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+  integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -8453,9 +8609,14 @@ xmlchars@^2.2.0:
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
 y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^4.0.0:
   version "4.0.0"
@@ -8463,9 +8624,9 @@ yallist@^4.0.0:
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yaml@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
-  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^13.1.2:
   version "13.1.2"
@@ -8483,10 +8644,10 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.3:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs@^13.2.4, yargs@^13.3.0:
   version "13.3.2"
@@ -8521,6 +8682,19 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^17.0.1:
+  version "17.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"
+  integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"